diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 00000000000..e3f65ef6a5a --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,8 @@ +housekeeping: + - "*.md" + - .github/PULL_REQUEST_TEMPLATE/*.md + - .github/pull_request_template.md + - docs/** + +outdated: + - base-branch: '!16-dev' diff --git a/.github/release.yml b/.github/release.yml index 968b64dcc2f..d15e13133a6 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -3,7 +3,7 @@ changelog: labels: - bot authors: - - renovate + - renovate[bot] - lawnchair-bot - crowdin-bot categories: @@ -18,6 +18,3 @@ changelog: - title: 🧹 Housekeeping labels: - housekeeping - - title: 🧑‍💻 Dependencies - labels: - - dependencies diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef32b63e951..c0eaf5a72cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: echo ${{ secrets.KEYSTORE }} | base64 --decode > ${{ github.workspace }}/key.jks fi - name: Build debug APK - run: ./gradlew assembleLawnWithQuickstepGithubDebug assembleLawnWithQuickstepPlayDebug assembleLawnWithQuickstepNightlyRelease --no-configuration-cache + run: ./gradlew assembleLawnWithQuickstepNightlyRelease assembleLawnWithQuickstepGithubDebug assembleLawnWithQuickstepPlayDebug --no-configuration-cache - name: Upload artifact uses: actions/upload-artifact@v6 with: @@ -118,7 +118,8 @@ jobs: nightly-release: runs-on: ubuntu-latest - if: github.repository_owner == 'LawnchairLauncher' && github.event_name == 'push' && github.ref == 'refs/heads/15-dev' + if: false + # if: github.repository_owner == 'LawnchairLauncher' && github.event_name == 'push' && github.ref == 'refs/heads/15-dev' needs: build-debug-apk permissions: contents: write diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 123e8e84350..043c6a8bdcd 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -24,7 +24,7 @@ jobs: upload_translations: false upload_sources: true download_translations: true - localization_branch_name: 15-dev-localization + localization_branch_name: 16-dev-localization create_pull_request: true base_url: 'https://lawnchair.crowdin.com' env: diff --git a/.github/workflows/crowdin_download.yml b/.github/workflows/crowdin_download.yml index 19fe5136d67..ac393db7f42 100644 --- a/.github/workflows/crowdin_download.yml +++ b/.github/workflows/crowdin_download.yml @@ -26,7 +26,7 @@ jobs: upload_translations: false upload_sources: false download_translations: true - localization_branch_name: 15-dev-localization + localization_branch_name: 16-dev-localization create_pull_request: true base_url: 'https://lawnchair.crowdin.com' env: diff --git a/.github/workflows/crowdin_upload.yml b/.github/workflows/crowdin_upload.yml index f85f0803060..83091af2a61 100644 --- a/.github/workflows/crowdin_upload.yml +++ b/.github/workflows/crowdin_upload.yml @@ -22,7 +22,7 @@ jobs: upload_translations: false upload_sources: true download_translations: false - localization_branch_name: 15-dev-localization + localization_branch_name: 16-dev-localization create_pull_request: false base_url: 'https://lawnchair.crowdin.com' env: diff --git a/.gitmodules b/.gitmodules index cf7551ac413..f2284aca652 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "platform_frameworks_libs_systemui"] path = platform_frameworks_libs_systemui url = https://github.com/LawnchairLauncher/platform_frameworks_libs_systemui + branch = 16-dev diff --git a/Android.bp b/Android.bp index eb033ee0daf..c71e8cf2d81 100644 --- a/Android.bp +++ b/Android.bp @@ -17,7 +17,19 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -min_launcher3_sdk_version = "30" +min_launcher3_sdk_version = "31" + +// Targets that don't inherit framework aconfig libs (i.e., those that don't set +// `platform_apis: true`) must manually link them. +java_defaults { + name: "launcher-non-platform-apis-defaults", + static_libs: [ + "android.os.flags-aconfig-java", + "android.multiuser.flags-aconfig-java", + "android.appwidget.flags-aconfig-java", + "com.android.window.flags.window-aconfig-java", + ], +} // Common source files used to build launcher (java and kotlin) // All sources are split so they can be reused in many other libraries/apps in other folders @@ -31,12 +43,152 @@ filegroup { ], } +// Main Launcher source for compose, excluding the build config +filegroup { + name: "launcher-compose-enabled-src", + srcs: [ + "compose/facade/enabled/**/*.kt", + "compose/facade/core/**/*.kt", + "compose/features/**/*.kt", + ], +} + +filegroup { + name: "launcher-compose-disabled-src", + srcs: [ + "compose/facade/core/**/*.kt", + "compose/facade/disabled/**/*.kt", + ], +} + +filegroup { + name: "launcher-compose-test-helpers-src", + srcs: [ + "compose/tests/com/android/launcher3/helper/TestHelper.kt", + ], +} + +// Tests for features that are enabled only when compose dependency is enabled & run as part of +// Launcher3Tests +filegroup { + name: "launcher-compose-unit-tests-src", + srcs: [ + "compose/tests/com/android/launcher3/widget/AddWidgetConfigTest.kt", + "compose/tests/com/android/launcher3/widgetpicker/repository/WidgetsRepositoryImplTest.kt", + ], +} + +filegroup { + name: "launcher-compose-tests-src", + srcs: [ + "compose/tests/**/*.kt", + ], +} + // Source code for quickstep build, on top of launcher-src filegroup { name: "launcher-quickstep-src", srcs: [ - "quickstep/src/**/*.java", "quickstep/src/**/*.kt", + "quickstep/src/**/*.java", + ], + device_common_srcs: [ + ":launcher-quickstep-processed-protolog-src", + ], +} + +filegroup { + name: "quickstep-compose-tests-src", + srcs: [ + "quickstep/compose/tests/**/*.kt", + ], +} + +// Launcher ProtoLog support +filegroup { + name: "launcher-quickstep-unprocessed-protolog-src", + srcs: [ + "quickstep/src_protolog/**/*.java", + ], +} + +java_library { + name: "launcher-quickstep_protolog-groups", + srcs: [ + "quickstep/src_protolog/**/*.java", + ], + static_libs: [ + "protolog-group", + "androidx.annotation_annotation", + "com_android_launcher3_flags_lib", + ], +} + +java_genrule { + name: "launcher-quickstep-processed-protolog-src", + srcs: [ + ":protolog-impl", + ":launcher-quickstep-unprocessed-protolog-src", + ":launcher-quickstep_protolog-groups", + ], + tools: ["protologtool"], + cmd: "$(location protologtool) transform-protolog-calls " + + "--protolog-class com.android.internal.protolog.common.ProtoLog " + + "--loggroups-class com.android.quickstep.util.QuickstepProtoLogGroup " + + "--loggroups-jar $(location :launcher-quickstep_protolog-groups) " + + "--viewer-config-file-path /system_ext/etc/launcher.quickstep.protolog.pb " + + "--output-srcjar $(out) " + + "$(locations :launcher-quickstep-unprocessed-protolog-src)", + out: ["launcher.quickstep.protolog.srcjar"], +} + +java_genrule { + name: "gen-launcher.quickstep.protolog.pb", + srcs: [ + ":launcher-quickstep-unprocessed-protolog-src", + ":launcher-quickstep_protolog-groups", + ], + tools: ["protologtool"], + cmd: "$(location protologtool) generate-viewer-config " + + "--protolog-class com.android.internal.protolog.common.ProtoLog " + + "--loggroups-class com.android.quickstep.util.QuickstepProtoLogGroup " + + "--loggroups-jar $(location :launcher-quickstep_protolog-groups) " + + "--viewer-config $(out) " + + "$(locations :launcher-quickstep-unprocessed-protolog-src)", + out: ["launcher.quickstep.protolog.pb"], +} + +prebuilt_etc { + name: "launcher.quickstep.protolog.pb", + system_ext_specific: true, + src: ":gen-launcher.quickstep.protolog.pb", + filename_from_src: true, +} + +// Source code for quickstep dagger +filegroup { + name: "launcher-quickstep-dagger", + srcs: [ + "quickstep/dagger/**/*.java", + "quickstep/dagger/**/*.kt", + ], +} + +// Source code for quickstep build with compose enabled, on top of launcher-src +filegroup { + name: "launcher-quickstep-compose-enabled-src", + srcs: [ + "quickstep/compose/facade/core/*.kt", + "quickstep/compose/facade/enabled/*.kt", + "quickstep/compose/features/**/*.kt", + ], +} + +filegroup { + name: "launcher-quickstep-compose-disabled-src", + srcs: [ + "quickstep/compose/facade/core/*.kt", + "quickstep/compose/facade/disabled/*.kt", ], } @@ -63,10 +215,132 @@ filegroup { srcs: ["proguard.flags"], } +soong_config_bool_variable { + name: "release_enable_compose_in_launcher", +} + +// Opt-in configuration for Launcher3 code depending on Jetpack Compose. +soong_config_module_type { + name: "launcher_compose_java_defaults", + module_type: "java_defaults", + config_namespace: "ANDROID", + bool_variables: ["release_enable_compose_in_launcher"], + properties: [ + "srcs", + "static_libs", + ], +} + +launcher_compose_java_defaults { + name: "launcher_compose_defaults", + soong_config_variables: { + release_enable_compose_in_launcher: { + srcs: [ + ":launcher-compose-enabled-src", + ], + + static_libs: [ + "widget_picker_component", + // Compose dependencies + "androidx.compose.runtime_runtime", + "androidx.compose.material3_material3", + "androidx.compose.ui_ui-tooling-preview", + "androidx.compose.ui_ui-tooling", + ], + + // By default, Compose is disabled and we compile the ComposeFacade + // in compose/launcher3/facade/disabled/. + conditions_default: { + srcs: [ + ":launcher-compose-disabled-src", + ], + static_libs: [], + }, + }, + }, +} + +soong_config_module_type { + name: "launcher_compose_tests_java_defaults", + module_type: "java_defaults", + config_namespace: "ANDROID", + bool_variables: ["release_enable_compose_in_launcher"], + properties: [ + "srcs", + "static_libs", + ], +} + +launcher_compose_tests_java_defaults { + name: "launcher_compose_tests_defaults", + soong_config_variables: { + release_enable_compose_in_launcher: { + srcs: [ + ":launcher-compose-test-helpers-src", + ":launcher-compose-unit-tests-src", + ], + // Compose dependencies + static_libs: [ + "widget_picker_component", + "androidx.compose.runtime_runtime", + "androidx.compose.ui_ui-test-junit4", + "androidx.compose.ui_ui-test-manifest", + ], + + conditions_default: { + srcs: [], + static_libs: [], + }, + }, + }, +} + +// Opt-in configuration for Launcher Quickstep code depending on Jetpack Compose. +soong_config_module_type { + name: "quickstep_compose_java_defaults", + module_type: "java_defaults", + config_namespace: "ANDROID", + bool_variables: ["release_enable_compose_in_launcher"], + properties: [ + "srcs", + "static_libs", + ], +} + +quickstep_compose_java_defaults { + name: "quickstep_compose_defaults", + soong_config_variables: { + release_enable_compose_in_launcher: { + srcs: [ + ":launcher-quickstep-compose-enabled-src", + ], + + // Compose dependencies + static_libs: [ + "androidx.compose.runtime_runtime", + "androidx.compose.material3_material3", + "androidx.compose.material_material-icons-extended", + "androidx.compose.ui_ui-tooling-preview", + "androidx.compose.ui_ui-tooling", + "PlatformComposeCore", + ], + + // By default, Compose is disabled and we compile the ComposeFacade + // in compose/quickstep/facade/disabled/. + conditions_default: { + srcs: [ + ":launcher-quickstep-compose-disabled-src", + ], + static_libs: [], + }, + }, + }, +} + android_library { name: "launcher-aosp-tapl", libs: [ - "framework-statsd", + "framework-statsd.stubs.module_lib", ], static_libs: [ "androidx.annotation_annotation", @@ -76,11 +350,14 @@ android_library { "androidx.preference_preference", "SystemUISharedLib", "//frameworks/libs/systemui:animationlib", + "//frameworks/libs/systemui:contextualeducationlib", "launcher-testing-shared", ], srcs: [ "tests/tapl/**/*.java", "tests/tapl/**/*.kt", + "tests/src_tapl_build_config/**/*.java", + "tests/src_tapl_build_config/**/*.kt", ], resource_dirs: [], manifest: "tests/tapl/AndroidManifest.xml", @@ -141,7 +418,6 @@ android_library { static_libs: [ "LauncherPluginLib", "launcher_quickstep_log_protos_lite", - "android.os.flags-aconfig-java", "androidx-constraintlayout_constraintlayout", "androidx.recyclerview_recyclerview", "androidx.dynamicanimation_dynamicanimation", @@ -154,7 +430,11 @@ android_library { "//frameworks/libs/systemui:iconloader_base", "//frameworks/libs/systemui:view_capture", "//frameworks/libs/systemui:animationlib", + "//frameworks/libs/systemui:contextualeducationlib", + "//frameworks/libs/systemui:mechanics", + "//frameworks/libs/systemui:msdl", "SystemUI-statsd", + "WindowManager-Shell-shared-AOSP", "launcher-testing-shared", "androidx.lifecycle_lifecycle-common-java8", "androidx.lifecycle_lifecycle-extensions", @@ -163,8 +443,12 @@ android_library { "kotlinx_coroutines", "com_android_launcher3_flags_lib", "com_android_wm_shell_flags_lib", - "android.appwidget.flags-aconfig-java", - "com.android.window.flags.window-aconfig-java", + "dagger2", + "jsr330", + "com_android_systemui_shared_flags_lib", + "launcher-dagger-qualifiers", + "launcher-executor-qualifiers", + "launcher-executors-module", ], manifest: "AndroidManifest-common.xml", sdk_version: "current", @@ -172,6 +456,9 @@ android_library { lint: { baseline_filename: "lint-baseline.xml", }, + flags_packages: [ + "com_android_launcher3_flags", + ], } // @@ -179,6 +466,10 @@ android_library { // android_app { name: "Launcher3", + defaults: [ + "launcher-non-platform-apis-defaults", + "launcher_compose_defaults", + ], static_libs: [ "Launcher3ResLib", @@ -190,7 +481,7 @@ android_app { ], optimize: { - proguard_flags_files: ["proguard.pro"], + proguard_flags_files: [":launcher-proguard-rules"], // Proguard is disable for testing. Derivarive prjects to keep proguard enabled enabled: false, }, @@ -198,6 +489,7 @@ android_app { sdk_version: "current", min_sdk_version: min_launcher3_sdk_version, target_sdk_version: "current", + plugins: ["dagger2-compiler"], privileged: true, system_ext_specific: true, @@ -214,8 +506,12 @@ android_app { "AndroidManifest-common.xml", ], lint: { + extra_check_modules: ["Launcher3LintChecker"], baseline_filename: "lint-baseline.xml", }, + kotlincflags: [ + "-Xjvm-default=all", + ], } // Library with all the dependencies for building quickstep @@ -226,24 +522,39 @@ android_library { "quickstep/res", ], libs: [ - "framework-statsd", + "framework-statsd.stubs.module_lib", ], static_libs: [ "Launcher3ResLib", "lottie", "SystemUISharedLib", "SettingsLibSettingsTheme", + "dagger2", + "protolog-group", + "displaylib", + "com.android.window.flags.window-aconfig-java", ], manifest: "quickstep/AndroidManifest.xml", min_sdk_version: "current", + lint: { + disabled_checks: ["MissingClass"], + }, + flags_packages: [ + "com.android.window.flags.window-aconfig", + ], } // Library with all the source code and dependencies for building Launcher Go android_library { name: "Launcher3GoLib", + defaults: [ + "launcher_compose_defaults", + "quickstep_compose_defaults", + ], srcs: [ ":launcher-src", ":launcher-quickstep-src", + ":launcher-quickstep-dagger", "go/quickstep/src/**/*.java", "go/quickstep/src/**/*.kt", ], @@ -258,7 +569,10 @@ android_library { "QuickstepResLib", "androidx.room_room-runtime", ], - plugins: ["androidx.room_room-compiler-plugin"], + plugins: [ + "androidx.room_room-compiler-plugin", + "dagger2-compiler", + ], manifest: "quickstep/AndroidManifest.xml", additional_manifests: [ "go/AndroidManifest.xml", @@ -267,19 +581,27 @@ android_library { min_sdk_version: "current", // TODO(b/319712088): re-enable use_resource_processor use_resource_processor: false, + kotlincflags: [ + "-Xjvm-default=all", + ], } // Library with all the source code and dependencies for building Quickstep android_library { name: "Launcher3QuickStepLib", + defaults: [ + "launcher_compose_defaults", + "quickstep_compose_defaults", + ], srcs: [ ":launcher-src", ":launcher-quickstep-src", + ":launcher-quickstep-dagger", ":launcher-build-config", ], resource_dirs: [], libs: [ - "framework-statsd", + "framework-statsd.stubs.module_lib", ], // Note the ordering here is important when it comes to resource // overriding. We want the most specific resource overrides defined @@ -291,18 +613,23 @@ android_library { ], manifest: "quickstep/AndroidManifest.xml", platform_apis: true, + plugins: ["dagger2-compiler"], min_sdk_version: "current", // TODO(b/319712088): re-enable use_resource_processor use_resource_processor: false, + kotlincflags: [ + "-Xjvm-default=all", + ], } // Build rule for Quickstep app. android_app { name: "Launcher3QuickStep", - static_libs: ["Launcher3QuickStepLib"], optimize: { - enabled: false, + proguard_flags_files: [":launcher-proguard-rules"], + enabled: true, + shrink_resources: true, }, platform_apis: true, @@ -316,7 +643,10 @@ android_app { "Launcher2", "Launcher3", ], - required: ["privapp_whitelist_com.android.launcher3"], + required: [ + "privapp_whitelist_com.android.launcher3", + "launcher.quickstep.protolog.pb", + ], resource_dirs: ["quickstep/res"], @@ -332,13 +662,11 @@ android_app { } - // Build rule for Launcher3 Go app with quickstep for Android Go devices. // Note that the following two rules are exactly same, and should // eventually be merged into a single target android_app { name: "Launcher3Go", - static_libs: ["Launcher3GoLib"], resource_dirs: [], @@ -349,6 +677,7 @@ android_app { optimize: { proguard_flags_files: ["proguard.flags"], enabled: true, + shrink_resources: true, }, privileged: true, @@ -372,9 +701,9 @@ android_app { include_filter: ["com.android.launcher3.*"], }, } + android_app { name: "Launcher3QuickStepGo", - static_libs: ["Launcher3GoLib"], resource_dirs: [], @@ -385,6 +714,7 @@ android_app { optimize: { proguard_flags_files: ["proguard.flags"], enabled: true, + shrink_resources: true, }, privileged: true, diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index e8fa644e1fd..cb2a38c8824 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -50,24 +50,12 @@ - - + android:name="${applicationId}.permission.GRID_CONTROL" + android:knownCerts="@array/grid_control_known_signers" + android:protectionLevel="signature|knownSigner"/> - - + + android:writePermission="android.permission.ACCESS_LAUNCHER_DATA" + android:readPermission="android.permission.ACCESS_LAUNCHER_DATA" /> + The content provider for exposing various launcher grid options. + The caller should hold one of the following permissions: + - android.permission.BIND_WALLPAPER + - ${applicationId}.permission.GRID_CONTROL + --> diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9e5f3e62998..7c7b2388e8b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -28,6 +28,10 @@ Refer comments around specific entries on how to extend individual components. --> + + + + @@ -73,5 +78,18 @@ android:value="${packageName}.grid_control" /> + + + + + + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e35466f91a0..a4c7e9cea60 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,6 +17,10 @@ feel free to reach out on [Telegram][telegram] or [Discord][discord]. > Use the [Lawnchair Nightly builds][nightly] when reporting bugs, as your issue may have already > been fixed. +> [!WARNING] +> For [security vulnerability][security-report], please do not open an issue. Instead, follow +> the instructions in our [Security Policy][security-policy]. + - For **[bug reports][bug-reports]**, please be as detailed as possible and provide clear steps to reproduce the issue. - For **[feature requests][feature-requests]**, clearly describe the feature and its potential @@ -40,13 +44,13 @@ For translations, please visit **[Lawnchair on Crowdin][crowdin]**. 2. Open the project in Android Studio. 3. Select the `lawnWithQuickstepGithubDebug` build variant. -If you encounter errors with the `iconloaderlib` or `searchuilib` modules, run -`git submodule update --init --recursive`. +If you encounter errors with modules that ends with `lib` suffix like `iconloaderlib` or `searchuilib`, +run `git submodule update --init --recursive`. Here are some contribution tips to help you get started: - Always make sure that you're up-to-date with **Lawnchair** by setting your base branch to - `15-dev`. + `16-dev`. - Make sure your code is logical and well-formatted. If using Kotlin, see [“Coding conventions” in the Kotlin documentation][kotlin-coding-conventions]; - [The `lawnchair` package][lawnchair-package] @@ -57,10 +61,12 @@ Here are some contribution tips to help you get started: ### Additional documentation - [Lawnchair roadmap](ROADMAP.md) +- [Lawnchair verification](VERIFICATION.md) - [The Lawnchair Wiki](https://github.com/LawnchairLauncher/lawnchair/wiki) - [Lawnchair Visual Guidelines](/docs/assets/README.md) - [Lawnchair Quickstep Compat Library](compatLib/README.md) - [Lawnchair Preferences Components](lawnchair/src/app/lawnchair/ui/preferences/components/README.md) +- [Lawnchair Platform Frameworks Library SystemUI](platform_frameworks_libs_systemui/README.md) - [SystemUI Module](systemUI/README.md) - [ViewCapture](systemUI/viewcapture/README.md) - [Common](systemUI/common/README.md) @@ -69,7 +75,7 @@ Here are some contribution tips to help you get started: ### Development workflow We use a tiered workflow to balance development speed with stability. The process for merging a -change depends on its complexity and risk. All PRs should target the `15-dev` branch. +change depends on its complexity and risk. All PRs should target the `16-dev` branch. | Tier | Definition | Examples | Protocol | |-----------------------------|-------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| @@ -88,8 +94,7 @@ We follow the **[Conventional Commits specification][conventional-commits]**. ### Versioning scheme -As of Lawnchair 15 Beta 1, Lawnchair’s version code is composed of four parts, separated by -underscores: +Lawnchair’s version code is composed of five parts, separated by underscores:

@@ -101,39 +106,21 @@ underscores: 1. Android major version 2. Android minor version -3. Lawnchair development status +3. Lawnchair development stage 4. Lawnchair development version +5. Revision/Release number -#### Android major & minor versions - -These represent the Android version in which Lawnchair is based on. -They make up the first two parts of the version code: - -- Major version: Indicates the main Android version. -- Minor version: Reflects any point release or update within the major version. - -Example: Android 11 will be `11_00_XX_XX` while Android 12.1 will be `12_01_XX_XX`. - -#### Development status & version - -The third and fourth parts of the version code refer to Lawnchair's development stage -and the specific version within that stage: +#### Lawnchair development stage -- Development status: Shows the current development stage of the Lawnchair build (e.g., Alpha, - Beta). -- Development version: Specifies the incremental version within the same development stage. +This table show list of development stages in use by Lawnchair: -The table below shows release phase used by Lawnchair: - -| Status | Stage | -|-------------------|-------| -| Development | 00 | -| Alpha | 01 | -| Beta | 02 | -| Release Candidate | 03 | -| Release | 04 | - -Example: Alpha 5 will be `XX_XX_01_05` and Beta 3 will be `XX_XX_02_03`. +| Stage | Denote | +|-------------------|--------| +| Development | 00 | +| Alpha | 01 | +| Beta | 02 | +| Release Candidate | 03 | +| Release | 04 | ### String naming @@ -154,25 +141,33 @@ Strings `names` in `strings.xml` should follow this format: Lawnchair uses a locally stored JSON file (`google_fonts.json`) to list available fonts from Google Fonts. This file should be updated periodically or before release to include the latest fonts. -To update Lawnchair's font listing, follow these steps: +To update Lawnchair’s font listing, follow these steps: -1. Acquire +1. Get a [Google Fonts Developer API key][google-fonts-api-key]. 2. Download the JSON file from `https://www.googleapis.com/webfonts/v1/webfonts?key=API_KEY`, replacing `API_KEY` with the API key from step 1. 3. Replace the content of [`google_fonts.json`](lawnchair/assets/google_fonts.json) with the API response. +#### Writing or updating Lawnchair documentation + +Lawnchair’s documentations are written in Markdown and follow a style guides from +[Google developer documentation style guide](https://developers.google.com/style). + [telegram]: https://t.me/lccommunity [discord]: https://discord.com/invite/3x8qNWxgGZ [nightly]: https://github.com/LawnchairLauncher/lawnchair/releases/tag/nightly +[security-report]: https://github.com/LawnchairLauncher/lawnchair/security/advisories/new +[security-policy]: https://github.com/LawnchairLauncher/lawnchair/security/policy [bug-reports]: https://github.com/LawnchairLauncher/lawnchair/issues/new?assignees=&labels=bug&projects=&template=bug_report.yaml&title=%5BBUG%5D+ [feature-requests]: https://github.com/LawnchairLauncher/lawnchair/issues/new?assignees=&labels=feature%2Cenhancement&projects=&template=feature_request.yaml&title=%5BFEATURE%5D+ [code-of-conduct]: CODE_OF_CONDUCT.md [crowdin]: https://lawnchair.crowdin.com [kotlin-coding-conventions]: https://kotlinlang.org/docs/coding-conventions.html -[lawnchair-package]: https://github.com/LawnchairLauncher/lawnchair/tree/15-dev/lawnchair -[src-package]: https://github.com/LawnchairLauncher/lawnchair/tree/15-dev/src +[lawnchair-package]: https://github.com/LawnchairLauncher/lawnchair/tree/16-dev/lawnchair +[src-package]: https://github.com/LawnchairLauncher/lawnchair/tree/16-dev/src [conventional-commits]: https://www.conventionalcommits.org/en/v1.0.0/ [google-fonts-api-key]: https://developers.google.com/fonts/docs/developer_api#APIKey + diff --git a/GITHUB_CHANGELOG.md b/GITHUB_CHANGELOG.md index 1f919beb043..8341e025f0f 100644 --- a/GITHUB_CHANGELOG.md +++ b/GITHUB_CHANGELOG.md @@ -1,18 +1,487 @@ -Lawnchair 15 Beta 2 is now available. This is a stability-focused release that addresses numerous bugs from Beta 1, while adding a few quality of life improvements. - -### New features -* Redesigned the search UI and backend architecture for a more stable and extensible foundation. -* Improved the "About" screen to support new links -* Added an option in Settings to clear all items from the home screen. -* Added support for infinite home screen scrolling. -* Added the ability to reorder apps within app drawer folders. - -### Bug fixes and improvements -* Fixed an issue that caused the search widget to fail to launch the Google app on Android 14 and above. -* Addressed multiple crashes on older Android versions. -* Resolved a race condition that could cause a crash when customizing an app that was being uninstalled. -* Fixed an issue where the search state would not clear correctly when the app drawer was closed. -* Corrected various visual bugs, including the page indicator being partially displayed and incorrect icon scaling in the app drawer. -* Established a public roadmap and a new, simplified triage system for our issue tracker. - -Thanks to +# Bubble Tea + +## Bubble Tea [QPR2] + +### 🥞 SNAPSHOT 12 + +Build: BS11.0712 (latest), BS11.0612 + +Initial QPR2 merge, buildable stage, fastest ever in any merge. + +This is a developer-focused change log: +* Add Quickstep compose facade to build +* Add SystemUI Pods +* Merge some lawnchair code change back +* Merge some launcher3 code change back +* More workaround for some trivial files +* Move from BuildConfig to BuildConfigs when identifying studio build +~~* Updated Compatlib to frameworks 16 (Compatibility not tested)~~ + +### SNAPSHOT 11 + +Build: BS11.0412-b (latest), BS11.0412, BS11.1212 (Botched use BS11.0312 instead) + +Initial QPR2 merge, this is the first time that Lawnchair is able to get pass KSP stage +(and first time that rebase is faster than previous attempt, this rebase took 2 days to finish +instead of more than a week.). + +This is a developer-focused change log: +* Codebase updated to Android 16-0.0_r4 (Android 16.0.0 Release 4) +* Prebuilt updated to Android 16-0.0_r4 (Android 16.0.0 Release 4) +* Flags updated to Android 16-0.0_r4 (Android 16.0.0 Release 4) +* Platform libs updated to Android 16-0.0_r4 (Android 16.0.0 Release 4) + +## Bubble Tea [QPR1] + +### 🥞 Development 4 Release 1 (Snapshot 10) + +~~Bug fixes only~~ You may see duplicated changelogs in this release because of merged diverged timeline. + +In this release, the initial 16-dev branch has now merged to QPR1 branch, +meaning you'll have tons of improvements from upstream Launcher3 source. + +Build: BD4.2412 (latest), BD4.2112, BD4.2012, BD4.2311, BS10.2111, BS10.2011 + +Compatibility list: + +| 🏗️ Crash | 🥞 Fully supported | +|-------------|--------------------| +| Android 8.1 | Android 12.0 | +| Android 9 | Android 12.1 | +| Android 10 | Android 13 | +| Android 11 | Android 14 | +| | Android 15 | +| | Android 16 | + + +#### Features + +* [Launcher] Move to Google Sans Flex font (TODO)* +* [Lawnchair] Material 3 Expressive Settings (Phase 2, TODO)* +~~* [Lawnchair] Better At-a-Glance perceptive wallpaper colour luminance detection*~~ + ~~* Big word that means Lawnchair will take system default hint bright/dark theme and fallback to luminosity detection for bright/dark mode detection in At a Glance.*~~ +~~* [Launcher] Enable Material Expressive Folder Expansion animation flag~~* + * Disabled due to rendering bugs* +* [Launcher/Font] Variable font for Launcher3 (????????)* +* [Launcher/Popup] Dynamically get app widget popup icon* +* [Launcher] Foldable support (actually real)* +* [Launcher] Google Sans Flex font uses almost the exact same configuration as Pixel* +* [Launcher] Enable bulk loading by default* +* [Launcher] Tablet support (ish)* + +#### Fixes +* [Launcher] Fix a lot of internal basic functionality* +* [Lawnchair] Re-added some Lawnchair-specific code* +* [Launcher] Fix workspace navigation* +* [Launcher] Fix allapps navigation* +* [Launcher] Fix folder navigation* +* [Launcher] Support Android 12.0/12.1/13/14/15* +* [Lawnchair/Smartspace] At-a-Glance can't launch activity due to background startup restrictions on Android 14 and above* +* [Launcher] Use Lawnchair theming colour for allapps* +* [WM-Shell] Fix conflict with prebuilts aidl, make Release build work again* +* [Launcher/Desktop] Correct deviceHasLargeScreen check for Baklava* +* [Lawnchair/Search] Make search layout changes work* +* [Lawnchair/Smartspace] Allow disabling the smartspace feature* +* [Launcher3] Widget preview crash for no reason at all on compatible Android version* +* [Launcher3] Correct fallback (blur unsupported) allapps colour + +### Snapshot 9 (Development 4 Release 1) + +This snapshot marks the first time Bubble Tea QPR1 is able to assemble the APK without errors, +all that's left is bug bash testing. Limited visibility closed testing is available. + +Build: BS9.2011 + +This is a developer-focused change log: +* Re-added searchuilib +* SearchUiLib updated to latest commits before being private +* Exclude disabled variant of Compose launcher3 features +* Fix all errors in Lawnchair side + +### Snapshot 8 (Development 4 Release 1) + +Build: BS8.1811 + +This snapshot marks the first time Bubble Tea QPR1 is able to compile ALL of the Launcher3 code +without errors, that leaves Lawnchair code as the remaining task before successfully compiling +Bubble Tea QPR1 + +This is a developer-focused change log: +* Migrate some functions to new changes +* WM-Shell (and WM-Shell Shared) updated to Android 16-0.0_r3 (Android 16.0.0 Release 3) +* Add Mechanics (SystemUI Platform Library) +* Some unresolved reference in Lawnchair code + +### Snapshot 7 (Development 4 Release 1) + +Build: BS7.1711 + +This snapshot marks the first time Bubble Tea QPR1 is able to pass KSP build stage without any +hiccups, the next 1 or 2 snapshots will be focusing on compilation stage, which should be the last +stage before we can get started on pE Development 4. + +This is a developer-focused change log: +* Codebase updated to Android 16-0.0_r3 (Android 16.0.0 Release 3) +* Prebuilt updated to Android 16-0.0_r3 (Android 16.0.0 Release 3) +* Platform libs updated to Android 16-0.0_r3 (Android 16.0.0 Release 3) + * Move ViewCapture to platform lib + * Add Displaylib +* Flags updated to Android 16-0.0_r3 (Android 16.0.0 Release 3) +* Pull concurrent, dagger (the launcher3) as module + * TODO? We might need to migrate it to build source like compose instead +* Lots of prebuilt documentations update +* Add compose as part of launcher3 build source + * Removed test because I hate configuration gradle + * cc: @validcube fix me, cc: too bad + +## Bubble Tea [r2] + +Lawnchair 16 pE Development 3 is here! Contributors are encouraged to target this branch instead of +older (i.e., Lawnchair `15-dev`). + +### 🥞 Development 3 Release 3 + +Build: BD3.2012 (latest), BD3.1312, BD3.0812, BD3.0712 + +Compatibility list: + +| 🏗️ Crash | 🥞 Fully supported | +|-------------|--------------------| +| Android 8.1 | Android 12.0 | +| Android 9 | Android 12.1 | +| Android 10 | Android 13 | +| Android 11 | Android 14 | +| | Android 15 | +| | Android 16 | + +#### Features +* [Lawnchair] Features from Lawnchair 15-dev 07122025 +* [Launcher] Google Sans Flex font uses almost the exact same configuration as Pixel +* [Launcher] Enable bulk loading by default +* [Launcher] Tablet support (ish) +* [Launcher] Refreshed Material 3 Expressive +* [Lawnchair] Refreshed Material 3 Expressive +* [Launcher] Foldable support (ish) +* [Lawnchair] Warn when nightly updater is updating to next major version +* [Lawnchair/Smartspace] Add Lunar calendar option +* [Lawnchair/Smartspace] Promote smartspace calendar to stable +* [Lawnchair] Expressive redesign Phase 2 +* [Lawnchair] GestureNavContract toggle in experimental features +* [Lawnchair] Set GestureNavContract on by default on Google device +* [Lawnchair] Set GestureNavContract on by default on Nothing device +* [Lawnchair] Don't show warning on known compatible device +* [Lawnchair] Swipe to dismiss announcement perform haptic on successful dismiss +* [Lawnchair] Remove Inter v3 fonts from Lawnchair entirely (to reduce apk size) +* [Lawnchair] Add Google Sans variable font as fallback to Google Sans Flex (to support the most of the world languages, yes that increases sizes) +* [Launcher] Google Sans variable normal style +* [Lawnchair] Improve Google device compatibility check +* [Lawnchair] Improve Samsung device compatibility check + +#### Fixes +* [Launcher3] Widget preview crash for no reason at all on compatible Android version +* [Launcher] Hotseat Google provider failed to open due to Android pending intent restrictions on Android 14/15/16/16.1 +* [Launcher3/DeviceProfile] Positioning of first folder during Lawnchair setup +* [Lawnchair/AllApps] Reimplement app drawer opacity +* [Lawnchair/Recents] Reimplement recents overview opacity +* [Lawnchair/Preference] Misaligned slider and text preference +* [Lawnchair/Smartspace] Allow disabling the smartspace feature +* [Lawnchair] Settings now correctly animate expand/shrink items +* [Lawnchair] Correctly display warning in experimental features (race conditions) +* [Project] Support for Android Studio 2025.2.3 Canary 5 (Bump to AGP 9.0.0-beta05) +* [Lawnchair] Offer a toggle to disable/enable suggestions instead of linking it to ASI if the device is not Google Pixel + +### 🥞 Development 3 Release 2 + +Build: BD3.2211 + +Compatibility list: + +| 🏗️ Crash | 💫 Limited features | 🥞 Fully supported | +|-------------|---------------------|--------------------| +| Android 8.1 | | Android 12.0 | +| Android 9 | | Android 12.1 | +| Android 10 | | Android 13 | +| Android 11 | | Android 14 | +| | | Android 15 | +| | | Android 16 | + +#### Features +* [Lawnchair] Updated screenshots compressions and fastlane screenshot +* [Lawnchair] Features from Lawnchair 15-dev +* [Launcher3] Widget preview crash for no reason at all on compatible Android version + +#### Fixes +* [Lawnchair] Conflict from Lawnchair 15-dev + +### Development 3 Release 1 + +Build: BD3.1711 + +The biggest change log ever, this marked the end of Bubble Tea [r2] branch as future development +switched to Bubble Tea [QPR1]. See you at Snapshot 7 or Development 4! + +(Again) Originally going to launch D3 if most of the issue on tracker have been resolved, but hit a +stability milestone instead. + +This release includes 4 new features, and 33 bug fixes, +Reimplemented some of Lawnchair features, better sizing of home screen, updated README.md screenshot +and the inclusion of Bubble Tea project into the official Lawnchair repository as 16-dev! + +This release have been tested with: +* ☁️ Pixel 6 (Android 12.0) +* 📱 Nothing (3a)-series (Android 15, Android 16.0) +* 📱 Vivo Y21 (Android 12.0) +* 📱 HTC Wildfire E3 lite (Android 12.0) +* Many more! Unfortunately I only count build from pE Open testing! + +Compatibility list: + +| 🏗️ Crash | 💫 Limited features | 🥞 Fully supported | +|-------------|---------------------|--------------------| +| Android 8.1 | | Android 12.0 | +| Android 9 | | Android 12.1 | +| Android 10 | | Android 13 | +| Android 11 | | Android 14 | +| | | Android 15 | +| | | Android 16 | + +> [!NOTE] +> QuickSwitch compatibility have not been tested at any time during the development of Bubble Tea! + +#### Features +* [Lawnchair] Complex Clover icon shape +* [Lawnchair] Very Sunny icon shape +* [Lawnchair/Font] Update Google Fonts listing to 25102025 +* [Lawnchair/Gesture] Allow Open Quick Settings* + +#### Fixes +* Disable OEM override on launcher settings, (reimplement `ENABLE_AUTO_INSTALLS_LAYOUT` | c51b2a221838aefb610b7146fc4ef7cb34e5e495) +* [Lawnchair/Iconloaderlib] Reimplement custom app name +* [Lawnchair] Reimplement Launcher3 debug page +* [Lawnchair] Reimplement Caddy and App drawer folder +* [Lawnchair] Reimplement Hotseat toggle +* [Lawnchair] Reimplement Favorite application label +* [Lawnchair] Hotseat positioning with favorite icon label enabled placed the same even if label is disabled +* [Lawnchair] Hotseat background now have a reasonably sized margin compared to D2 +* [Lawnchair] Qsb sizing now correctly estimate the width based on width of the app/widget layout or DeviceProfile on device with inlined Qsb +* [Lawnchair] Reimplement Allapps opacity configuration +* [DeviceProfile] Crash from createWindowContext on less than Android 12.0 +* [QuickstepLauncher] Ignore trying to set SystemUiProxy icon sizes on less than Android 12.1 +* [Lawnchair/BlankActivity] Apply Material 3 Expressive button animations +* [Launcher] Disable add widget button if home screen is locked +* [Lawnchair/Iconloaderlib] Crash when trying to set `null` monochrome icon on less than Android 12.1 +* [SystemUI/Unfold] Crash when getting configuration for foldable-specific resources +* [Lawnchair/Iconloaderlib] Don't parse monochrome drawable in Android 12.1 or less +* [Launcher3/AllApps] Allow theming of Expressive allapps +* ~~[Lawnchair] Lawnchair can now be compiled in release mode~~ + * [Lawnchair] Fix crashes with WM-Shell +* [Lawnchair] Bottom sheet blur will only trigger when your device supported blur* +* [Lawnchair/Lazy] Corner radii of lazy component now matched radius of non-lazy* +* [Lawnchair/Debug] Cleanup the debug menu* +* [Lawnchair/Docs] Warn off danger using 16-dev branch* +* [Launcher3] Crash with predictive back on some device using Android 13/14 +* [Launcher3] WindowInsets crash in Android 11 +* [Launcher3] Widgets crash on some device using Android 12 +* [Launcher3/PrivateSpace] Use custom icons of Private Space lock* +* [Launcher3/Iconloaderlib] App badges for work profile* +* [Lawnchair] Update spacing for dock search settings* +* [Launcher3] Quickstep dispatcher crash on Android 13 +* [Launcher3] Crash due to missing resources for Android 8.0 +* [Lawnchair/Docs] Update screenshot to 16-dev + +### 🥞 Development 2 + +Originally going to launch D2 if most of the comestic bug fixes have been resolved, but hit a +stability milestone instead. + +This release includes 15 new features, and 20 bug fixes, +Lawnchair settings now takes shape of initial material 3 expressive redesign, [(but by no mean finish!)][Lawnget] +launcher should now render icons better than D1 milestone, with auto-adaptive icons feature reimplemented. + +This release have been tested with: +* ☁️ Pixel 6 (Android 12.0) - Build: Ad-hoc +* ☁️ Pixel 6a (Android 12.1) - Build: Ad-hoc +* ☁️ Pixel 7 (Android 13) - Build: Ad-hoc +* ☁️ Pixel 9 (Android 15, Android 16.0) - Build: Ad-hoc +* ☁️ Pixel 9 Pro Fold (Android 14, Android 15) - Build: Ad-hoc +* ☁️ Vivo V40 (Android 15) - Build: Ad-hoc +* ☁️ Xiaomi MIX (Android 15) - Build: Ad-hoc +* 📱 Nothing (3a)-series (Android 15) - Build: pE-`15102025` +* 📱 Pixel 9 Pro XL (Android 16.0 QPR2 Beta 2) - Build: pE-`02102025` +* 📱 BLU View 5 Pro (Android 14) - Build: pE-`02102025` +* 📱🔥 Vivo Y21 (Android 12.0) - Build: pE-`08102025` + +> [!NOTE] +> QuickSwitch compatibility have not been tested at any time during the development of Bubble Tea! + +[Lawnget]: https://www.google.com/teapot + +Compatibility list: + +| 🏗️ Crash | 💫 Limited features | 🥞 Fully supported | +|-------------|---------------------|--------------------| +| Android 8.1 | Android 12.0 | Android 12.1 | +| Android 9 | | Android 13 | +| Android 10 | | Android 14 | +| Android 11 | | Android 15 | +| | | Android 16 | + +#### Features + +* Enable All Apps Blur Flags on Phone (oops, forgot about the allAppsSheetForHandheld flag) +* Make Safe Mode check more reliable +* Smartspace Battery now reports battery charging status of Fast (more than 90% of 20 W) and Slow (less than 90% of 5 W) charging +* Show pseudonym version to Settings +* Resizing workspace calculate items position more accurately +* Update Lawnchair default grid size to 4×7 (or 4×6 with smartspace widget) +* Reimplement Hotseat background customisation +* Make haptic on a locked workspace use Google MSDL vibration +* Make Launcher3 colour more accurate to upstream Android 16 +* ProvideComposeSheetHandler now have expressive blur +* Lawnchair Settings now uses Material 3 Expressive +* Animate keyboard on/off state on app drawer search (Try enabling automatically show keyboard in app drawer settings and swipe up and down or directly tap “Apps list” in popup menu) -> (Backport not possible) +* Add LeakCanary check to all debug variant of the application +* [DEBUG] Launcher3 feature status diagnostic check in debug menu +* [Documentation] Add more visibility into both app certificate and SLSA verification for app authenticity check [VERIFICATION.md](VERIFICATION.md) +* [Documentation] Initial drafting of Improve documentation v6 (pave-path) +* [Launcher] Widget animations during resize +* [Iconloaderlib] Enable second hand for the clock app + +#### Fixes + +* Fix unable to access preview for icon style +* Popup's Arrow Theme now has the correct theme +* Widget should open normally after a workaround (C7evQZDJ) +* Fix (1) Search bar and Dock, (2) Folders and App Drawer settings didn't open due to init problems +* Lawnchair should hopefully remember what grid they should be using +* Most if not all of Lawnchair settings should be usable without crashes +* Correct Baseline Profile from old `market` to `play` variant, and now should calculate profile for `nightly` +* Fix Private Space crash when Lawnchair is set as Launcher due to flags only available on A16 +* Fix crash on a device with strict export receiver requirements on A14 +* Interactable widget crashing due to App Transition Manager being null (C7evQZDJ) +* Icon not responding to mouse cursor -> (Backported to Lawnchair 15) +* Rare NoSuchMethodError crash on IMS canImeRenderGesturalNavButtons +* [Lawnchair] Reimplement Bulk icons toggle +* SettingsCache crashing with SecurityException with unreadable keys (@hide) in Android 12 and newer (assume false) +* Assume flags `enableMovingContentIntoPrivateSpace` is false when ClassNotFoundException on Android 16 devices +* Rare NoSuchMethodError crash on SurfaceControl setEarlyWakeupStart and setEarlyWakeupEnd +* Properly align built-in smartspace in workspace +* Use WM Proxy from Lawnchair instead of System, fix Android 8.1/9/10/11/12.0/12.1 regarding SE, NSME like SystemBarUtils -> (dWkyIGw9), (reworked CllOXHJv) + * LawnchairWindowManagerProxy have been migrated to Dagger + * SystemWindowManagerProxy have been left unused +* [Lawnchair/Iconloaderlib] Update CustomAdaptiveIconDrawable to latest AOSP 13 +* [Iconloaderlib] Reset most of the changes to favour more AOSP 16_r02 code then Lawnchair (need rewrite) + * fix icon loaded in monochrome and always monochrome when it is not supposed to + * fix notification dots being twice the size with notification count +* [Lawnchair/Iconloaderlib] Reimplement Lawnchair Iconloaderlib (adaptive icons, monochrome, regular icon) + +#### Known Bugs +* Preview can't show device wallpaper -> (lIxkAYGg) +* IDP Preview doesn't refresh on settings change -> workaround is to hit apply and re-open the preview -> (ZbLX3438) +* Workspace theme doesn't refresh until restart -> (ZbLX3438) -> Fixed as part of (31lLEflf, 1MevNrzp) +* Lawnchair Colour can't handle restart causing default colour to be used instead -> Fixed? -> Properly fixed as part of (31lLEflf, 1MevNrzp) +* (Investigating) Work profile switch on widget selector *may* have reverted to Lawnchair 15 style +* Full lists: https://trello.com/b/8IdvO81K/pe-lawnchair + +### Development 1 + +First development milestone! Basic launcher functionality should be stable enough. + +* Make Lawnchair Launcher launchable in Android 12.1, 13, 14, 15, 16 +* Remove two deprecated features (Use Material U Popup, and Use dot pagination) +* Add pseudonym version in debug settings +* Adapt Lawnchair code to Launcher3 16 +* Make basic features of Launcher work (App Drawer, Home Screen, Search, Folders, Widgets) +* Enable Material Expressive Flags (Try swiping through launcher page) +* Enable All Apps Blur Flags (Try opening All Apps on supported devices) +* Enable MSDL Haptics Feedback Flags (Try gliding widget or icons across the homescreen) +* Make Predictive Back Gesture work on Android 13, 14, 15, 16 (Try swiping left or right on gesture-based navigational) +* Programmatically set Safe Mode status + +#### Known Bugs + +* App Icon may sometimes render with less than 0 in height/width causing blank icon to be rendered and crashing ISE on customising icons -> (31lLEflf) +* Any Lawnchair settings using IDP will crash the launcher -> Fixed in Lawnchair 16 pE Development 2 +* Icon pack isn't usable -> (DXo69Qzd) +* Dynamic icons will not be themed by launcher +* Full lists: https://trello.com/b/8IdvO81K/pe-lawnchair + +### Snapshot 6 + +This is a developer-focused change log: + +This snapshot marks the first time Lawnchair 16 is able to compile and build an APK! + +* Fix all issues with Java files in both `lawn` and `src` +* Make Lawnchair compilable (with instant crash) +* Move to KSP for Dagger code generation + +### Snapshot 5 + +This is a developer-focused change log: + +This snapshot now able to compile all sources (Kotlin files only) + +* Fix MORE MORE MORE `lawn` issues +* Use Gradle Version Catalog for consistent dependency version across all modules (Full implementation @ LawnchairLauncher/Lawnchair#5753) +* Magically fix ASM Instrumentation issues (I didn't do anything, it just works now) +* Fix ALL the issues in kotlin stage (`compileLawnWithQuickstepNightlyDebugKotlin`) +* Reintroduce some features from Lawnchair +* Add compatibility checks and workarounds for them +* Fix most issues with Java files in both `lawn` and `src` + +### Snapshot 4 + +This is a developer-focused change log: + +This snapshot marks the first time Lawnchair 16 is able to compile all Launcher3 sources! + +* Add `MSDLLib` to `platform_frameworks_libs_systemui` +* Add `contextualeducationlib` to `platform_frameworks_libs_systemui` +* Fix issues in both `lawn` and `src` modules +* Fix AIDL sources +* Resolve Lawnchair/LC-TODO lists +* Merge `wmshell.shared` res with res from `wmshell` +* Consistent build reproducibility by specifying dependencies in `build.gradle` +* Some ASM Instrumentation issues (and re-add some…) +* Update documentations + +### Snapshot 3 + +This is a developer-focused change log: + +Not a lot of errors left to go! + +* Finish correctly implementing all Dagger functions (?) +* Merge Lawnchair 15 Beta 1 into Bubble Tea + * Support for 16-kb page size devices +* Repository rebased and dropped commit + * Switch back from turbine-combined variant to javac variant for prebuilt SystemUI-core-16 because issues with LFS + * MORE MORE fixes regarding turbine-combined to javac +* Publish `platform_frameworks_libs_systemui` to pe 16-dev branch +* ATLEAST check to almost every launcher3 source file +* `Utils` module (stripped) +* Fix Dagger duplicated classes (because of Dagger dependency ksp/kapt mixing) +* Build reproducibility improvements by specifying dependencies in `build.gradle` files +* Fix some of the issues in both `lawn` and `src` modules + +### Snapshot 2 + +This is a developer-focused change log: + +This snapshot milestone marked the first time Lawnchair now able to compile all supplementary +modules, `src` + `lawn` will be in Snapshot 5 or Development 1 milestone. + +* Merge flags +* Fix some issues with launcher3 sources. +* A temporary workaround with framworks.jar not adding in anim module. +* Shared not having access to animationlib. +* **Switch from javac variant to turbine-combined variant for prebuilt SystemUI-core-16**. + +### From Initial snapshot 0 and 1 + +This is a developer-focused change log: +* Prebuilt updated to Android 16-0.0_r2 (Android 16.0.0 Release 2) +* Submodule have also been refreshed to A16r2 +* Baklava Compatlib (QuickSwitch compatibility not guaranteed) +* Refreshed internal documentation like prebuilt, systemUI diff --git a/OWNERS b/OWNERS index a66bf54b58f..2633f4a396b 100644 --- a/OWNERS +++ b/OWNERS @@ -6,15 +6,11 @@ adamcohen@google.com hyunyoungs@google.com -twickham@google.com vadimt@google.com winsonc@google.com -jonmiranda@google.com -awickham@google.com agvard@google.com # Launcher workspace eng team -captaincole@google.com sunnygoyal@google.com charlander@google.com fbaron@google.com @@ -22,20 +18,22 @@ fengjial@google.com fransebas@google.com pinyaoting@google.com andonian@google.com -sihua@google.com +abegovic@google.com # Multitasking eng team tracyzhou@google.com peanutbutter@google.com jeremysim@google.com atsjenk@google.com -brianji@google.com +hwwang@google.com # Overview eng team alexchau@google.com samcackett@google.com -silvajordan@google.com uwaisashraf@google.com +vinayjoglekar@google.com +willosborn@google.com +jmokut@google.com # Physical Keyboard & Trackpad eng team patmanning@google.com @@ -45,11 +43,37 @@ helencheuk@google.com shamalip@google.com zakcohen@google.com +# System Navigation team +brianji@google.com +jonmiranda@google.com +jagrutdesai@google.com +randypfohl@google.com +saumyaprakash@google.com +twickham@google.com +victortulias@google.com + +## Note: some of the below overlap and also work on other integrations like Circle to Search. + +# All Apps / QSB team +awickham@google.com +brdayauon@google.com +ganjam@google.com +kylim@google.com + +# Smartspace team +xilei@google.com +davidct@google.com +iamiam@google.com +jiuyu@google.com + +# Desktop Experiences team +gsennton@google.com + per-file FeatureFlags.java, globs = set noparent -per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com +per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, abegovic@google.com per-file DeviceConfigWrapper.java, globs = set noparent -per-file DeviceConfigWrapper.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com +per-file DeviceConfigWrapper.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, abegovic@google.com # Predictive Back -per-file LauncherBackAnimationController.java = shanh@google.com, gallmann@google.com \ No newline at end of file +per-file LauncherBackAnimationController.java = shanh@google.com, gallmann@google.com diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 9051ca8562b..768ba652de5 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -1,8 +1,10 @@ [Builtin Hooks] ktfmt = true +bpfmt = true [Builtin Hooks Options] ktfmt = --kotlinlang-style +bpfmt = -d [Tool Paths] ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh @@ -10,4 +12,3 @@ ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh [Hook Scripts] checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --config_xml tools/checkstyle.xml --sha ${PREUPLOAD_COMMIT} -flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH} diff --git a/README.md b/README.md index 694336fea52..1c651f2780b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Lawnchair 15 +# Lawnchair 16 [![Build debug APK](https://github.com/LawnchairLauncher/lawnchair/actions/workflows/ci.yml/badge.svg)](https://github.com/LawnchairLauncher/lawnchair/actions/workflows/ci.yml) [![Build release APK](https://github.com/LawnchairLauncher/lawnchair/actions/workflows/release_update.yml/badge.svg)](https://github.com/LawnchairLauncher/lawnchair/actions/workflows/release_update.yml) @@ -9,25 +9,31 @@ [![GitHub Downloads](https://img.shields.io/github/downloads/LawnchairLauncher/lawnchair/total.svg?label=GitHub%20Downloads&logo=github)](https://github.com/LawnchairLauncher/lawnchair/releases) [![Play Store Installs](https://img.shields.io/endpoint?color=green&logo=googleplay&logoColor=green&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dapp.lawnchair.play%26l%3DPlay%2520Store%2520Installs%26m%3D%24shortinstalls)](https://play.google.com/store/apps/details?id=app.lawnchair.play) +> [!WARNING] +> This branch contains major changes from the rebase of Launcher3, including breaking changes and refactors that can cause Lawnchair to break. +> +> If you wish to contribute, read our [contributing guidelines](CONTRIBUTING.md). Note that this branch will undergo many changes as we slowly refactor our codebase, so the `16-dev` branch may be particularly unfriendly to new contributors. It is still possible to submit changes to `15-dev`, but new feature development will be focused on this branch. +> +> For regular users, we recommend staying on `15-dev` for stability purposes. + - - - - Google Pixel running Lawnchair Launcher with green wallpaper + + A device running Lawnchair Launcher with green flower wallpaper Lawnchair is a free, open-source home app for Android. Taking Launcher3—Android’s default home app—as a starting point, it ports Pixel Launcher features and introduces rich customization options. -This branch houses the codebase of Lawnchair 15, which is currently in beta and is based on Launcher3 from Android 15. For Lawnchair 9 to 14, see the branches with the `9-` to `14-` prefixes, respectively. +This branch houses the codebase of Lawnchair 16, which is currently in development and is based on Launcher3 from Android 16. For Lawnchair 9 to 15, see the branches with the `9-` to `15-` prefixes, respectively. ## Features -- **Material You Theming:** Adapts to your wallpaper and system theme. +- **Material Expressive Theming:** Adapts to your wallpaper and system theme. - **At a Glance Widget:** Displays information *at a glance* with support for [Smartspacer](https://github.com/KieronQuinn/Smartspacer). -- **QuickSwitch Support:** Integrates with Android Recents on Android 10 and newer. (requires root) +- **QuickSwitch Support:** Integrates with Android Recents on Android 10-15. (requires root) - **Global Search:** Allows quick access to apps, contacts, and web results from the home screen. - **Customization Options:** Provides options to tweak icons, fonts, and colors to your liking. - And more! @@ -38,26 +44,26 @@ This branch houses the codebase of Lawnchair 15, which is currently in beta and - - Get it on Google Play + + Get it on Google Play - - Get it on IzzyOnDroid + + Get it on IzzyOnDroid - - Get it on Obtainium + + Get it on Obtainium - - Get it on GitHub + + Get it on GitHub

@@ -74,21 +80,11 @@ These builds offer the latest features and bug fixes at a cost of being slower a ### Verification -Verify the integrity of your Lawnchair download using these SHA-256 hashes: - -###### Google Play -``` -47:AC:92:63:1C:60:35:13:CC:8D:26:DD:9C:FF:E0:71:9A:8B:36:55:44:DC:CE:C2:09:58:24:EC:25:61:20:A7 -``` - -###### Elsewhere -``` -74:7C:36:45:B3:57:25:8B:2E:23:E8:51:E5:3C:96:74:7F:E0:AD:D0:07:E5:BA:2C:D9:7E:8C:85:57:2E:4D:C5 -``` +Please visit [Lawnchair Verification](VERIFICATION.md) on way to verify Lawnchair. ## Contributing -Please visit the [Lawnchair Contributing Guidelines](CONTRIBUTING.md) for information and tips on contributing to Lawnchair. +Please visit the [Lawnchair contributing guidelines](CONTRIBUTING.md) for information and tips on contributing to Lawnchair. ## Supporting Lawnchair diff --git a/SECURITY.md b/SECURITY.md index 9aa0b671f60..430d3a7682a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -9,8 +9,9 @@ The latest version of Lawnchair is the only supported version. | Version | Supported | -| -------------- | ------------------ | +|----------------|--------------------| | Nightly build | :white_check_mark: | +| 16 | :white_check_mark: | | 15 | :white_check_mark: | | 14 | :x: | | 13 | :x: | diff --git a/TELEGRAM_CHANGELOG.txt b/TELEGRAM_CHANGELOG.txt index 47db6009765..4a3f5cbf9ab 100644 --- a/TELEGRAM_CHANGELOG.txt +++ b/TELEGRAM_CHANGELOG.txt @@ -1,10 +1,18 @@ -*Lawnchair 15 Beta 1 is here!* +# Bubble Tea -We're excited to release the first beta for Lawnchair 15, a foundational update based on Android 15. +## Bubble Tea [QPR2] -The biggest new feature is one of our most requested ever: **App Drawer Folders**. You can now create and reorder custom folders to finally organize your app drawer. +### 🥞 SNAPSHOT 12 -This release is packed with many other improvements, from a more powerful dock to dozens of UI refinements. +Build: BS11.0712 (latest), BS11.0612 -**Read the full announcement on our blog:** -https://lawnchair.app/blog/lawnchair-15-beta-1 +Initial QPR2 merge, buildable stage, fastest ever in any merge. + +This is a developer-focused change log: +* Add Quickstep compose facade to build +* Add SystemUI Pods +* Merge some lawnchair code change back +* Merge some launcher3 code change back +* More workaround for some trivial files +* Move from BuildConfig to BuildConfigs when identifying studio build +* Updated Compatlib to frameworks 16 (Compatibility not tested) diff --git a/VERIFICATION.md b/VERIFICATION.md new file mode 100644 index 00000000000..90f65d56f8a --- /dev/null +++ b/VERIFICATION.md @@ -0,0 +1,33 @@ +# Lawnchair verification + +Lawnchair apk are cryptographically signed and can be verified using two verifications system. +1. GitHub or SLSA attestations +2. SHA256 of android app certificate + +## SLSA Attestation + +Lawnchair repository is SLSA-Level 2 compliance and can be verified using a provenance. + +> [!NOTE] +> It is possible to verify without GitHub CLI by cross-referencing check from +> [GitHub Attestation][github-attestation] with [Sigstore Rekor][sigstore-rekor] + +1. Install GitHub CLI +2. Download the APK and attestation from [GitHub Attestation][github-attestation] +3. Run `gh attestation verify APK -R LawnchairLauncher/lawnchair`, replace {APK} with the + actual APK file +4. Done + +## Android App Certificate + +Lawnchair have two app certificates: +* Google Play: + `47:AC:92:63:1C:60:35:13:CC:8D:26:DD:9C:FF:E0:71:9A:8B:36:55:44:DC:CE:C2:09:58:24:EC:25:61:20:A7` +* Elsewhere: + `74:7C:36:45:B3:57:25:8B:2E:23:E8:51:E5:3C:96:74:7F:E0:AD:D0:07:E5:BA:2C:D9:7E:8C:85:57:2E:4D:C5` + +On Android, using a verification app like [AppVerifier][3p-appverifier] can ease up the verifying process. + +[github-attestation]: https://github.com/LawnchairLauncher/lawnchair/attestations +[sigstore-rekor]: https://search.sigstore.dev/ +[3p-appverifier]: https://github.com/soupslurpr/AppVerifier diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig index f1f9966f783..946a454462c 100644 --- a/aconfig/launcher.aconfig +++ b/aconfig/launcher.aconfig @@ -22,20 +22,6 @@ flag { bug: "316027081" } -flag { - name: "enable_grid_only_overview" - namespace: "launcher" - description: "Enable a grid-only overview without a focused task." - bug: "257950105" -} - -flag { - name: "enable_cursor_hover_states" - namespace: "launcher" - description: "Enables cursor hover states for certain elements." - bug: "243191650" -} - flag { name: "enable_responsive_workspace" namespace: "launcher" @@ -43,13 +29,6 @@ flag { bug: "302189128" } -flag { - name: "enable_overview_icon_menu" - namespace: "launcher" - description: "Enable updated overview icon and menu within task." - bug: "257950105" -} - flag { name: "enable_focus_outline" namespace: "launcher" @@ -86,10 +65,13 @@ flag { } flag { - name: "enable_unfolded_two_pane_picker" - namespace: "launcher" - description: "Enables two pane widget picker for unfolded foldables" - bug: "313922374" + name: "enable_taskbar_icon_container" + namespace: "launcher" + description: "Enables code path that uses TaskbarIconsContainer" + bug: "437189890" + metadata { + purpose: PURPOSE_BUGFIX + } } flag { @@ -106,20 +88,6 @@ flag { bug: "204463748" } -flag { - name: "enable_predictive_back_gesture" - namespace: "launcher" - description: "Enable predictive back gesture on Launcher (including all apps and widget picker)." - bug: "238475505" -} - -flag { - name: "enable_shortcut_dont_suggest_app" - namespace: "launcher" - description: "Enables don't suggest app shortcut for suggested apps" - bug: "319250810" -} - flag { name: "enable_support_for_archiving" namespace: "launcher" @@ -127,13 +95,6 @@ flag { bug: "210590852" } -flag { - name: "enable_private_space_install_shortcut" - namespace: "launcher" - description: "Enables long-press shortcut to install a copy of an app to Private space" - bug: "316118005" -} - flag { name: "enable_launcher_br_metrics_fixed" namespace: "launcher" @@ -149,13 +110,6 @@ flag { bug: "298231234" } -flag { - name: "enable_workspace_inflation" - namespace: "launcher" - description: "Enables asnc inflation of workspace icons" - bug: "318539160" -} - flag { name: "enable_unfold_state_animation" namespace: "launcher" @@ -163,13 +117,6 @@ flag { bug: "297057373" } -flag { - name: "enable_generated_previews" - namespace: "launcher" - description: "Enables support for RemoteViews previews in the widget picker." - bug: "306546610" -} - flag { name: "enable_categorized_widget_suggestions" namespace: "launcher" @@ -185,134 +132,521 @@ flag { } flag { - name: "enable_add_app_widget_via_config_activity_v2" + name: "enable_narrow_grid_restore" + namespace: "launcher" + description: "Using only the most recent workspace when restoring to avoid confusion." + is_fixed_read_only: true + bug: "325285743" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_fallback_overview_in_window" + namespace: "lse_desktop_experience" + description: "Enables fallback recents opening inside of a window instead of an activity." + bug: "292269949" +} + +flag { + name: "enabled_folders_in_all_apps" + namespace: "launcher" + description: "Enables folders in all apps" + bug: "341582436" +} + +flag { + name: "enable_recents_in_taskbar" + namespace: "launcher" + description: "Replace hybrid hotseat app predictions with strictly Recent Apps" + bug: "315354060" +} + +flag { + name: "enable_first_screen_broadcast_archiving_extras" namespace: "launcher" - description: "When adding app widget through config activity, directly add it to workspace to reduce flicker" - bug: "284236964" + description: "adds Extras to first screen broadcast for archived apps" + bug: "322314760" + is_fixed_read_only: true metadata { purpose: PURPOSE_BUGFIX } } flag { - name: "use_activity_overlay" + name: "floating_search_bar" namespace: "launcher" - description: "Use an activity for home screen overlay" - bug: "273828110" + description: "Search bar persists at the bottom of the screen across Launcher states" + bug: "346408388" } flag { - name: "enable_grid_migration_fix" + name: "all_apps_sheet_for_handheld" namespace: "launcher" - description: "Keep items in place when migrating to a bigger grid" - bug: "325286145" - is_fixed_read_only: true + description: "All Apps will be presented on a bottom sheet in handheld mode" + bug: "374186088" +} + +flag { + name: "all_apps_blur" + namespace: "launcher" + description: "Content behind the all apps panel in Launcher will be blurred." + bug: "400827727" +} + +flag { + name: "blurred_home_animation" + namespace: "launcher" + description: "Launcher will be blurred when the user swipes to home." + bug: "441691917" metadata { purpose: PURPOSE_BUGFIX } } flag { - name: "enable_narrow_grid_restore" + name: "enable_multi_instance_menu_taskbar" namespace: "launcher" - description: "Using only the most recent workspace when restoring to avoid confusion." - is_fixed_read_only: true - bug: "325285743" + description: "Menu in Taskbar with options to launch and manage multiple instances of the same app" + bug: "355237285" +} + +flag { + name: "use_new_icon_for_archived_apps" + namespace: "launcher" + description: "Archived apps will use new cloud icon in app title instead of overlay" + bug: "350758155" metadata { purpose: PURPOSE_BUGFIX } } flag { - name: "enable_scaling_reveal_home_animation" + name: "letter_fast_scroller" namespace: "launcher" - description: "Enables the Home gesture animation" - bug: "308801666" + description: "Change fast scroller to a lettered list" + bug: "358673724" } flag { - name: "enable_widget_tap_to_add" + name: "ignore_three_finger_trackpad_for_nav_handle_long_press" namespace: "launcher" - description: "Enables an add button in the widget picker" - bug: "323886237" + description: "Ignore three finger trackpad event for nav handle long press" + bug: "342143522" + metadata { + purpose: PURPOSE_BUGFIX + } } flag { - name: "enable_refactor_task_thumbnail" + name: "work_scheduler_in_work_profile" namespace: "launcher" - description: "Enables rewritten version of TaskThumbnailViews in Overview" - bug: "331753115" + description: "Enables work scheduler view above the work pause button in work profile." + bug: "361589193" +} + +flag { + name: "one_grid_specs" + namespace: "launcher" + description: "Defines the new specs for grids based on OneGrid" + bug: "364711064" +} + +flag { + name: "one_grid_mounted_mode" + namespace: "launcher" + description: "Support a fixed landscape mode for handheld devices" + bug: "364711735" +} + +flag { + name: "one_grid_rotation_handling" + namespace: "launcher" + description: "New landscape approach for the workspace using different rows and columns in landscape and portrait" + bug: "364711814" +} + +flag { + name: "accessibility_scroll_on_allapps" + namespace: "launcher" + description: "Scroll to item position if accessibility focused" + bug: "265392261" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_all_apps_button_in_hotseat" + namespace: "launcher" + description: "Enables displaying the all apps button in the hotseat." + bug: "270393897" +} + +flag { + name: "taskbar_quiet_mode_change_support" + namespace: "launcher" + description: "Support changing quiet mode for user profiles in taskbar." + bug: "345760034" +} + +flag { + name: "enable_recents_window_proto_log" + namespace: "lse_desktop_experience" + description: "Enables tracking recents window logs in ProtoLog" + bug: "292269949" +} + +flag { + name: "enable_state_manager_proto_log" + namespace: "lse_desktop_experience" + description: "Enables tracking state manager logs in ProtoLog" + bug: "292269949" +} + +flag { + name: "enable_tiered_widgets_by_default_in_picker" + namespace: "launcher" + description: "Shows filtered set of widgets by default and an option to show all widgets in the widget picker" + bug: "356127021" +} + +flag { + name: "show_taskbar_pinning_popup_from_anywhere" + namespace: "launcher" + description: "Shows the pinning popup view after long-pressing or right-clicking anywhere on the pinned taskbar" + bug: "297325541" +} + +flag { + name: "enable_launcher_overview_in_window" + namespace: "lse_desktop_experience" + description: "Enables launcher recents opening inside of a window instead of being hosted in launcher activity." + bug: "292269949" +} + +flag { + name: "use_system_radius_for_app_widgets" + namespace: "launcher" + description: "Use system radius for enforced widget corners instead of a separate 16.dp value" + bug: "373351337" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_contrast_tiles" + namespace: "launcher" + description: "Enable launcher app contrast tiles." + bug: "341217082" +} + +flag { + name: "msdl_feedback" + namespace: "launcher" + description: "Enable MSDL feedback for Launcher interactions" + bug: "377496684" +} + +flag { + name: "enable_launcher_icon_shapes" + namespace: "launcher" + description: "Enable launcher icon shape customizations" + bug: "348708061" } flag { - name: "enable_handle_delayed_gesture_callbacks" + name: "enable_launcher_visual_refresh" namespace: "launcher" - description: "Enables additional handling for delayed mid-gesture callbacks" - bug: "285636175" + description: "Adds refresh for font family, app longpress menu icons, and pagination dots" + bug: "395145453" +} + +flag { + name: "restore_archived_shortcuts" + namespace: "launcher" + description: "Makes sure pre-archived pinned shortcuts also get restored" + bug: "375414891" metadata { purpose: PURPOSE_BUGFIX } } flag { - name: "enable_fallback_overview_in_window" - namespace: "launcher" - description: "Enables fallback recents opening inside of a window instead of an activity." - bug: "292269949" + name: "restore_archived_app_icons_from_db" + namespace: "launcher" + description: "Restores pre-archived icons from db when available, mimicing promise icons" + bug: "391913214" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_mouse_interaction_changes" + namespace: "launcher" + description: "Changes mouse interaction behavior" + bug: "388897603" +} + +flag { + name: "enable_alt_tab_kqs_on_connected_displays" + namespace: "lse_desktop_experience" + description: "Enable Alt + Tab KQS support on connected displays" + bug: "394007677" +} + +flag { + name: "enable_strict_mode" + namespace: "launcher" + description: "Enable Strict Mode for the Launcher app" + bug: "394651876" +} + +flag { + name: "enable_alt_tab_kqs_flatenning" + namespace: "lse_desktop_experience" + description: "Enable Alt + Tab KQS view to show apps in flattened structure" + bug: "382769617" +} + +flag { + name: "enable_gesture_nav_on_connected_displays" + namespace: "lse_desktop_experience" + description: "Enables gesture navigation handling on connected displays" + bug: "382130680" +} + +flag { + name: "enable_taskbar_behind_shade" + namespace: "lse_desktop_experience" + description: "Keeps taskbar behind notification shade when its pulled down" + bug: "343194358" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_scalability_for_desktop_experience" + namespace: "launcher" + description: "Enable more grid scale options on the launcher for desktop experience" + bug: "375491272" +} + +flag { + name: "sync_app_launch_with_taskbar_stash" + namespace: "launcher" + description: "Syncs the two animations (app launch, taskbar stash) so they play at the same time." + bug: "319162553" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "remove_apps_refresh_on_right_click" + namespace: "launcher" + description: "Remove predicted apps refresh on right click" + bug: "343650193" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_taskbar_for_direct_boot" + namespace: "launcher" + description: "Initializes parts of Taskbar before onUserUnlocked" + bug: "324485921" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_taskbar_ui_thread" + namespace: "launcher" + description: "Enable per-window thread for taskbar" + bug: "404636836" +} + +flag { + name: "refactor_taskbar_ui_state" + namespace: "launcher" + description: "Refactor taskbar ui states into TaskbarUiState class." + bug: "404636836" +} + +flag { + name: "enable_expressive_folder_expansion" + namespace: "launcher" + description: "Enables expressive folder expansion motion" + bug: "348708061" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "model_repository" + namespace: "launcher" + description: "Adds various data repositories for the model" + bug: "390572144" +} + +flag { + name: "simplified_launcher_model_binding" + namespace: "launcher" + description: "Simplified approach to binding launcher model asynchronously" + bug: "390572144" +} + +flag { + name: "home_screen_edit_improvements" + namespace: "launcher" + description: "Improves item removal and resizing within home screen" + bug: "416087474" } flag { - name: "enable_smartspace_as_a_widget" + name: "enable_widget_picker_refactor" + namespace: "launcher" + description: "Enables the refactored code for widget picker using separate activity and module" + bug: "370950552" +} + +flag { + name: "enable_reversible_home_action_corner" namespace: "launcher" - description: "Enables smartspace as a widget" - bug: "300140279" + description: "Enables home action corner to be reversible" + bug: "416664984" } flag { - name: "enable_smartspace_removal_toggle" + name: "enable_new_all_set_animation" + namespace: "launcher" + description: "Enables the new animation for the All Set page" + bug: "424506400" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + namespace: "multitasking" + name: "avoid_display_cutout_bubble_bar" + description: "Use the DisplayCutout insets to avoid intersecting with the bubble bar." + bug: "329903073" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "injectable_model_items" namespace: "launcher" - description: "Enables smartspace removal toggle" - bug: "303471576" + description: "Enable model items to be provided by dagger" + bug: "423957181" } flag { - name: "enable_additional_home_animations" + name: "enable_taskbar_recents_themed_icons" namespace: "launcher" - description: "Enables custom home animations for non-running tasks" - bug: "237638627" + description: "Have recent icons in Taskbar respect icon theme preferences" + bug: "407950127" metadata { purpose: PURPOSE_BUGFIX } } flag { - name: "enabled_folders_in_all_apps" + name: "enable_taskbar_drag_and_drop" + namespace: "launcher" + description: "Enable dragging and dropping app icons on the taskbar." + bug: "442605300" +} + +flag { + name: "first_page_pinned_widget_removal_toggle" namespace: "launcher" - description: "Enables folders in all apps" - bug: "341582436" + description: "Enable first page pinned widget removal toggle" + bug: "427478072" } flag { - name: "enable_recents_in_taskbar" + name: "unpin_first_page_pinned_widget" namespace: "launcher" - description: "Replace hybrid hotseat app predictions with strictly Recent Apps" - bug: "315354060" + description: "Enable making the first page pinned widget movable" + bug: "427478072" } flag { - name: "enable_first_screen_broadcast_archiving_extras" + name: "show_files_on_home_screen" + namespace: "launcher" + description: "Enables file and folder items on the home screen" + bug: "375644352" +} + +flag { + name: "enable_system_drag" + namespace: "launcher" + description: "Enables system-level drag-and-drop" + bug: "402183121" +} + +flag { + name: "force_monochrome_app_icons_adapt_colors" namespace: "launcher" - description: "adds Extras to first screen broadcast for archived apps" - bug: "322314760" - is_fixed_read_only: true + description: "Adapt colors for monochromatic icons, only valid if force_monochrome_app_icons is enabled" + bug: "418850749" metadata { purpose: PURPOSE_BUGFIX } } flag { - name: "floating_search_bar" + name: "enable_custom_height_for_all_apps_on_cd" + namespace: "launcher" + description: "Enables custom height for all apps on CD" + bug: "416220478" + metadata { + purpose: PURPOSE_BUGFIX + } + } + +flag { + name: "enable_auto_stash_connected_display_taskbar" + namespace: "launcher" + description: "Enables auto stashing of connected display taskbar when in full or split screen" + bug: "394486228" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "expandable_long_press_menu" namespace: "launcher" - description: "Search bar persists at the bottom of the screen across Launcher states" - bug: "346408388" + description: "Enables expandable long press menu" + bug: "444003708" +} + +flag { + name: "enable_app_widget_picker_refactor" + namespace: "launcher" + description: "Migrates the small widget pickers to compose" + bug: "436344835" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_cursor_driven_workflows" + namespace: "launcher" + description: "Enables mouse based workflows for interacting with launcher" + bug: "388897603" } diff --git a/aconfig/launcher_growth.aconfig b/aconfig/launcher_growth.aconfig new file mode 100644 index 00000000000..a880538dbff --- /dev/null +++ b/aconfig/launcher_growth.aconfig @@ -0,0 +1,9 @@ +package: "com.android.launcher3" +container: "system_ext" + +flag { + name: "enable_growth_nudge" + namespace: "desktop_oobe" + description: "Add growth nudge in launcher" + bug: "396165728" +} diff --git a/aconfig/launcher_overview.aconfig b/aconfig/launcher_overview.aconfig new file mode 100644 index 00000000000..ad34f269b61 --- /dev/null +++ b/aconfig/launcher_overview.aconfig @@ -0,0 +1,123 @@ +package: "com.android.launcher3" +container: "system_ext" + +flag { + name: "enable_grid_only_overview" + namespace: "launcher_overview" + description: "Enable a grid-only overview without a focused task." + bug: "360204325" +} + +flag { + name: "enable_overview_icon_menu" + namespace: "launcher_overview" + description: "Enable updated overview icon and menu within task." + bug: "360205084" +} + +flag { + name: "enable_refactor_task_thumbnail" + namespace: "launcher_overview" + description: "Enables rewritten version of TaskThumbnailViews in Overview" + bug: "331754864" +} + +flag { + name: "enable_later_is_locked_check" + namespace: "launcher_overview" + description: "Checks if users associated with tasks are locked later in the data flow to prevent stale data" + bug: "417220811" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_desktop_exploded_view" + namespace: "launcher_overview" + description: "Enables the non-overlapping layout for desktop windows in Overview mode." + bug: "378011776" +} + +flag { + name: "enable_expressive_dismiss_task_motion" + namespace: "launcher_overview" + description: "Enables expressive motion and animations for dismissing a task in Overview." + bug: "381239462" +} + +flag { + name: "enable_meta_tab_toggle_in_overview" + namespace: "launcher_overview" + description: "Enables Meta-Tab toggle between Overview and recent tasks." + bug: "385128447" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "enable_overview_on_connected_displays" + namespace: "launcher_overview" + description: "Enable overview on connected displays." + bug: "363251602" +} + +flag { + name: "enable_overview_background_wallpaper_blur" + namespace: "launcher_overview" + description: "Enable wallpaper blur in overview." + bug: "360297985" +} + +flag { + name: "enable_overview_desktop_tile_wallpaper_background" + namespace: "launcher_overview" + description: "Enable wallpaper background for desktop tasks in overview." + bug: "363257721" +} + +flag { + name: "enable_refactor_digital_wellbeing_toast" + namespace: "launcher_overview" + description: "Enables rewritten version of digital wellbeing toast in overview." + bug: "404838605" +} + +flag { + name: "enable_refactor_task_content_view" + namespace: "launcher_overview" + description: "Enables refactor wrapping TaskThumbnailView in a TaskContentView." + bug: "408971730" +} + +flag { + name: "enable_simultaneous_overview_trigger_on_extended_desktop" + namespace: "launcher_overview" + description: "Enable Overview to launch and exit simultaneously on default and external displays wherever it was triggered or quit from" + bug: "421128035" +} + +flag { + name: "enable_predictive_back_in_overview" + namespace: "launcher_overview" + description: "Enables predictive back animation in Overview on back navigation" + bug: "421292121" +} + +flag { + name: "show_close_button_on_taskview_hover" + namespace: "launcher_overview" + description: "Enables showing a button to close the task in Overview when the TaskView is hovered." + bug: "426125944" +} + +flag { + name: "enable_prevent_overview_mouse_drag" + namespace: "launcher_overview" + description: "Prevents the user from scrolling overview with a mouse via click and drag" + bug: "433705336" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/aconfig/launcher_search.aconfig b/aconfig/launcher_search.aconfig index b98eee6e32b..0014c673960 100644 --- a/aconfig/launcher_search.aconfig +++ b/aconfig/launcher_search.aconfig @@ -22,13 +22,6 @@ flag { bug: "308054233" } -flag { - name: "private_space_app_installer_button" - namespace: "launcher_search" - description: "This flag enables addition of App Installer button in Private Space container." - bug: "308064949" -} - flag { name: "private_space_restrict_accessibility_drag" namespace: "launcher_search" @@ -43,6 +36,15 @@ flag { bug: "289223923" } +flag { + name: "nudge_pill" + namespace: "launcher_search" + description: "This flag enables change the nav or 3 button to nudge related edu (pill or icon) for CtS." + bug: "409121556" + metadata { + purpose: PURPOSE_BUGFIX + } +} flag { name: "private_space_add_floating_mask_view" @@ -53,3 +55,19 @@ flag { purpose: PURPOSE_BUGFIX } } +flag { + name: "enable_qsb_on_hotseat" + namespace: "launcher_search" + description: "Enable Search App's widget on hotseat" + bug: "405226308" +} + +flag { + name: "clear_scrim_on_reset" + namespace: "launcher_search" + description: "This flag enables the clearing of the scrim upon reset of All apps. " + bug: "426397329" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/androidx-lib/build.gradle b/androidx-lib/build.gradle index ec0c42af04c..39d8e886183 100644 --- a/androidx-lib/build.gradle +++ b/androidx-lib/build.gradle @@ -12,5 +12,5 @@ android { } } -addFrameworkJar('framework-15.jar') +addFrameworkJar('framework-16.jar') compileOnlyCommonJars() diff --git a/application.backup b/application.backup new file mode 100644 index 00000000000..bbfdd135218 Binary files /dev/null and b/application.backup differ diff --git a/baseline-profile/build.gradle b/baseline-profile/build.gradle index 292b9057dd8..0d8e47903c3 100644 --- a/baseline-profile/build.gradle +++ b/baseline-profile/build.gradle @@ -1,5 +1,3 @@ -import com.android.build.api.dsl.ManagedVirtualDevice - plugins { alias(libs.plugins.android.test) alias(libs.plugins.androidx.baselineprofile) @@ -20,11 +18,17 @@ android { lawn { dimension = "app" } withQuickstep { dimension = "recents" } github { dimension = "channel" } + nightly { dimension = "channel" } play { dimension = "channel" } } - testOptions.managedDevices.devices { - pixel6Api33(ManagedVirtualDevice) { + testOptions.managedDevices.localDevices { + create("pixel7Api36") { + device = "Pixel 7" + apiLevel = 36 + systemImageSource = "google" + } + create("pixel6Api33") { device = "Pixel 6" apiLevel = 33 systemImageSource = "google" @@ -35,7 +39,7 @@ android { // This is the configuration block for the Baseline Profile plugin. // You can specify to run the generators on a managed devices or connected devices. baselineProfile { - managedDevices += "pixel6Api33" + managedDevices += ["pixel6Api33", "pixel7Api36"] useConnectedDevices = false } diff --git a/baseline-profile/src/main/java/app/lawnchair/baseline/BaselineProfileGenerator.kt b/baseline-profile/src/main/java/app/lawnchair/baseline/BaselineProfileGenerator.kt index a55a86c1bd3..c4fdc13af7a 100644 --- a/baseline-profile/src/main/java/app/lawnchair/baseline/BaselineProfileGenerator.kt +++ b/baseline-profile/src/main/java/app/lawnchair/baseline/BaselineProfileGenerator.kt @@ -1,5 +1,7 @@ package app.lawnchair.baseline +import android.os.Build +import androidx.annotation.RequiresApi import androidx.benchmark.macro.junit4.BaselineProfileRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest @@ -33,9 +35,11 @@ import org.junit.runner.RunWith class BaselineProfileGenerator { @get:Rule + @RequiresApi(Build.VERSION_CODES.P) val rule = BaselineProfileRule() @Test + @RequiresApi(Build.VERSION_CODES.P) fun generate() { rule.collect(Constants.PACKAGE_NAME) { // This block defines the app's critical user journey. Here we are interested in diff --git a/build.gradle b/build.gradle index 59550abcfea..2084ce3b079 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,6 @@ plugins { alias(libs.plugins.diffplug.spotless) } - allprojects { plugins.withType(AndroidBasePlugin).configureEach { android { @@ -32,7 +31,7 @@ allprojects { } defaultConfig { minSdk 26 - targetSdk 35 + targetSdk 36 vectorDrawables.useSupportLibrary = true } lint { @@ -46,6 +45,7 @@ allprojects { } dependencies { implementation libs.androidx.core.ktx + implementation libs.androidx.core.animation } } @@ -119,9 +119,9 @@ allprojects { compileOnlyCommonJars = { dependencies { - compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-core.jar') - compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd.jar') - compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-15.jar') + compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-core-16.jar') + compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd-16.jar') + compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-16.jar') compileOnly projects.compatLib compileOnly projects.compatLib.compatLibVQ @@ -130,6 +130,7 @@ allprojects { compileOnly projects.compatLib.compatLibVT compileOnly projects.compatLib.compatLibVU compileOnly projects.compatLib.compatLibVV + compileOnly projects.compatLib.compatLibVBaklava } } } @@ -144,20 +145,22 @@ final def ciRef = System.getenv("GITHUB_REF") ?: "" final def ciRunNumber = System.getenv("GITHUB_RUN_NUMBER") ?: "" final def isReleaseBuild = ciBuild && ciRef.contains("beta") final def devReleaseName = ciBuild ? "Dev.(#${ciRunNumber})" : "Dev.(${buildCommit})" -final def version = "15" -final def releaseName = "Beta 1" +final def version = "16" +final def releaseName = "Development 4 Release 1" final def versionDisplayName = "${version}.${isReleaseBuild ? releaseName : devReleaseName}" final def majorVersion = versionDisplayName.split("\\.")[0] final def quickstepMinSdk = "29" -final def quickstepMaxSdk = "35" +final def quickstepMaxSdk = "36" android { namespace "com.android.launcher3" defaultConfig { - // Lawnchair Launcher 15.0 Beta 1 - // See CONTRIBUTING.md#versioning-scheme - versionCode 15_00_02_01 + /* + * Lawnchair Launcher 16.0 Development 4 Release 1 + * see CONTRIBUTING.md#versioning-scheme + */ + versionCode 16_00_01_04_01 versionName "${versionDisplayName}" buildConfigField "String", "VERSION_DISPLAY_NAME", "\"${versionDisplayName}\"" buildConfigField "String", "MAJOR_VERSION", "\"${majorVersion}\"" @@ -245,12 +248,18 @@ android { debug { applicationIdSuffix ".debug" resValue("string", "derived_app_name", "Lawnchair (Debug)") + + manifestPlaceholders.quickstepMinSdk = "0" + manifestPlaceholders.quickstepMaxSdk = "100000" + buildConfigField "int", "QUICKSTEP_MIN_SDK", "0" + buildConfigField "int", "QUICKSTEP_MAX_SDK", "100000" } release { resValue("string", "derived_app_name", "Lawnchair") minifyEnabled true shrinkResources true + pseudoLocalesEnabled false proguardFiles proguardFilesFromAosp + "proguard.pro" } } @@ -301,7 +310,7 @@ android { sourceSets { main { res.srcDirs = ['res'] - java.srcDirs = ['src', 'src_plugins'] + java.srcDirs = ['src', 'src_plugins', 'compose/facade/core', 'compose/facade/enabled', 'compose/features'] // Lawnchair-TODO: Don't include Compose Disabled, but there's has to be another way of making this NOT long manifest.srcFile 'AndroidManifest-common.xml' proto { srcDirs = ['protos/', 'quickstep/protos_overrides/'] @@ -343,7 +352,10 @@ android { withQuickstep { res.srcDirs = ['quickstep/res', 'quickstep/recents_ui_overrides/res'] - java.srcDirs = ['quickstep/src', 'quickstep/recents_ui_overrides/src'] + java.srcDirs = ['quickstep/src', 'quickstep/dagger', + 'quickstep/recents_ui_overrides/src', 'quickstep/src_protolog', + 'quickstep/compose/facade/core', 'quickstep/compose/facade/enabled', + 'quickstep/compose/features'] // pE-TODO(QPR2): Fix compose/facade/disabled manifest.srcFile "quickstep/AndroidManifest.xml" } } @@ -356,23 +368,29 @@ composeCompiler { reportsDestination = layout.buildDirectory.dir("compose_build_reports") } -addFrameworkJar('framework-15.jar') +addFrameworkJar('framework-16.jar') dependencies { implementation projects.iconloaderlib implementation projects.searchuilib implementation projects.animationlib + implementation projects.msdllib + implementation projects.contextualeducationlib + implementation projects.viewcapturelib + implementation projects.displaylib + implementation projects.mechanics // Recents lib dependency withQuickstepCompileOnly projects.hiddenApi withQuickstepImplementation projects.shared - withQuickstepImplementation projects.anim + withQuickstepImplementation projects.animation withQuickstepImplementation projects.unfold - withQuickstepImplementation projects.viewcapture withQuickstepImplementation projects.log withQuickstepCompileOnly projects.plugin withQuickstepImplementation projects.plugincore withQuickstepCompileOnly projects.common + withQuickstepCompileOnly projects.utils + withQuickstepCompileOnly projects.pods.internal // QuickSwitch Compat withQuickstepImplementation projects.compatLib @@ -382,13 +400,20 @@ dependencies { withQuickstepImplementation projects.compatLib.compatLibVT withQuickstepImplementation projects.compatLib.compatLibVU withQuickstepImplementation projects.compatLib.compatLibVV + withQuickstepImplementation projects.compatLib.compatLibVBaklava withQuickstepImplementation projects.wmshell + withQuickstepImplementation projects.wmshell.shared withQuickstepImplementation projects.flags + withQuickstepImplementation projects.dagger + withQuickstepImplementation projects.modules.concurrent +// withQuickstepImplementation projects.compose + withQuickstepImplementation projects.modules.widgetpicker implementation libs.androidx.dynamicanimation - implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd-15.jar') - implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-15.jar') - withQuickstepCompileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'framework-15.jar') + implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd-16.jar') + implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-16.jar') + withQuickstepCompileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'framework-16.jar') + baselineProfile projects.baselineProfile coreLibraryDesugaring libs.android.desugarJdkLibs @@ -398,14 +423,21 @@ dependencies { implementation libs.androidx.recyclerview implementation libs.androidx.preference.ktx + implementation libs.javax.inject implementation libs.kotlinx.coroutines.android implementation libs.kotlinx.serialization.json implementation libs.chickenhook.restrictionbypass implementation libs.rikka.refine.runtime + implementation libs.androidx.activity.compose + implementation libs.androidx.constraintlayout + implementation libs.androidx.datastore.preferences + implementation platform(libs.compose.bom) implementation libs.compose.ui implementation libs.compose.ui.util + implementation libs.compose.ui.graphics + implementation libs.bundles.graphics debugImplementation libs.compose.ui.tooling implementation libs.compose.ui.tooling.preview implementation libs.compose.ui.google.fonts @@ -437,9 +469,6 @@ dependencies { implementation libs.libsu.service - // Persian Date - implementation libs.persian.date - implementation libs.airbnb.lottie // Compose drag and drop library @@ -453,10 +482,19 @@ dependencies { implementation libs.hoko.blur implementation libs.androidx.window + + ksp libs.dagger.compiler + implementation libs.dagger.hilt.android + ksp libs.dagger.hilt.compiler + + implementation libs.google.guava + + debugImplementation libs.leakcanary.android } ksp { arg("room.schemaLocation", "$projectDir/schemas") + arg("dagger.hilt.disableModulesHaveInstallInCheck", "true") } diff --git a/checks/Android.bp b/checks/Android.bp new file mode 100644 index 00000000000..dfd701efe05 --- /dev/null +++ b/checks/Android.bp @@ -0,0 +1,46 @@ +// Copyright (C) 2025 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_team: "trendy_team_system_ui_please_use_a_more_specific_subteam_if_possible_", + default_applicable_licenses: ["Android-Apache-2.0"], +} + +java_library_host { + name: "Launcher3LintChecker", + srcs: ["src/**/*.kt"], + plugins: ["auto_service_plugin"], + libs: [ + "auto_service_annotations", + "lint_api", + ], + kotlincflags: ["-Xjvm-default=all"], +} + +java_test_host { + name: "Launcher3LintCheckerTest", + defaults: ["AndroidLintCheckerTestDefaults"], + srcs: ["tests/**/*.kt"], + data: [ + ":androidx.annotation_annotation", + ":dagger2", + ":kotlinx-coroutines-core", + ], + device_common_data: [ + ":framework", + ], + static_libs: [ + "Launcher3LintChecker", + ], +} diff --git a/checks/src/com/android/internal/launcher3/lint/CustomDialogDetector.kt b/checks/src/com/android/internal/launcher3/lint/CustomDialogDetector.kt new file mode 100644 index 00000000000..37358bbc0b2 --- /dev/null +++ b/checks/src/com/android/internal/launcher3/lint/CustomDialogDetector.kt @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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 + +/** Detector to identify custom usage of Android's Dialog within the Launcher3 codebase. */ +class CustomDialogDetector : Detector(), SourceCodeScanner { + + override fun applicableSuperClasses(): List { + return listOf(DIALOG_CLASS_NAME) + } + + override fun visitClass(context: JavaContext, declaration: UClass) { + val superTypeClassNames = declaration.superTypes.mapNotNull { it.resolve()?.qualifiedName } + if (superTypeClassNames.contains(DIALOG_CLASS_NAME)) { + context.report( + ISSUE, + declaration, + context.getNameLocation(declaration), + "Class implements Dialog", + ) + } + } + + companion object { + private const val DIALOG_CLASS_NAME = "android.app.Dialog" + + @JvmField + val ISSUE = + Issue.create( + id = "IllegalUseOfCustomDialog", + briefDescription = "dialogs should not be used in Launcher", + explanation = + """ + Don't use custom Dialogs within the launcher code base, instead consider utilizing + AbstractFloatingView to display content that should float above the launcher where + it can be correctly managed for dismissal. + """ + .trimIndent(), + category = Category.CORRECTNESS, + priority = 10, + severity = Severity.ERROR, + implementation = + Implementation(CustomDialogDetector::class.java, Scope.JAVA_FILE_SCOPE), + ) + } +} diff --git a/checks/src/com/android/internal/launcher3/lint/Launcher3IssueRegistry.kt b/checks/src/com/android/internal/launcher3/lint/Launcher3IssueRegistry.kt new file mode 100644 index 00000000000..c77c42bf5d1 --- /dev/null +++ b/checks/src/com/android/internal/launcher3/lint/Launcher3IssueRegistry.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.lint + +import CustomDialogDetector +import com.android.tools.lint.client.api.IssueRegistry +import com.android.tools.lint.client.api.Vendor +import com.android.tools.lint.detector.api.CURRENT_API +import com.android.tools.lint.detector.api.Issue +import com.google.auto.service.AutoService + +@AutoService(IssueRegistry::class) +@Suppress("UnstableApiUsage") +class Launcher3IssueRegistry : IssueRegistry() { + override val issues: List + get() = listOf(CustomDialogDetector.ISSUE) + + override val api: Int + get() = CURRENT_API + + override val minApi: Int + get() = 8 + + override val vendor: Vendor = + Vendor( + vendorName = "Android", + feedbackUrl = "http://b/issues/new?component=78010", + contact = "abegovic@google.com", + ) +} diff --git a/checks/tests/com/android/internal/launcher3/lint/CustomDialogDetectorTest.kt b/checks/tests/com/android/internal/launcher3/lint/CustomDialogDetectorTest.kt new file mode 100644 index 00000000000..2a379530387 --- /dev/null +++ b/checks/tests/com/android/internal/launcher3/lint/CustomDialogDetectorTest.kt @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.lint + +import CustomDialogDetector +import com.android.tools.lint.checks.infrastructure.TestFiles +import com.android.tools.lint.detector.api.Detector +import com.android.tools.lint.detector.api.Issue +import org.junit.Test + +/** Test for [CustomDialogDetector]. */ +class CustomDialogDetectorTest : Launcher3LintDetectorTest() { + override fun getDetector(): Detector = CustomDialogDetector() + + override fun getIssues(): List = listOf(CustomDialogDetector.ISSUE) + + @Test + fun classDoesNotExtendDialog_noViolation() { + lint() + .files( + TestFiles.kotlin( + """ + package test.pkg + + class SomeClass + """ + .trimIndent() + ), + *androidStubs, + ) + .issues(CustomDialogDetector.ISSUE) + .run() + .expectClean() + } + + @Test + fun classDoesExtendDialog_violation() { + lint() + .files( + TestFiles.kotlin( + """ + package test.pkg + + import android.app.Dialog + + class SomeClass(context: Context) : Dialog(context) + """ + .trimIndent() + ), + *androidStubs, + ) + .issues(CustomDialogDetector.ISSUE) + .run() + .expect( + (""" + src/test/pkg/SomeClass.kt:5: Error: Class implements Dialog [IllegalUseOfCustomDialog] + class SomeClass(context: Context) : Dialog(context) + ~~~~~~~~~ + 1 errors, 0 warnings + """) + .trimIndent() + ) + } +} diff --git a/checks/tests/com/android/internal/launcher3/lint/Launcher3LintDetectorTest.kt b/checks/tests/com/android/internal/launcher3/lint/Launcher3LintDetectorTest.kt new file mode 100644 index 00000000000..09085c7c95e --- /dev/null +++ b/checks/tests/com/android/internal/launcher3/lint/Launcher3LintDetectorTest.kt @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.lint + +import com.android.tools.lint.checks.infrastructure.LintDetectorTest +import com.android.tools.lint.checks.infrastructure.TestFiles +import com.android.tools.lint.checks.infrastructure.TestLintTask +import java.io.File +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + +/** + * Abstract class that should be used by any test for launcher 3 lint detectors. + * + * When you write your test, ensure that you pass [androidStubs] as part of your [TestFiles] + * definition. + */ +@RunWith(JUnit4::class) +abstract class Launcher3LintDetectorTest : LintDetectorTest() { + + /** + * Customize the lint task to disable SDK usage completely. This ensures that running the tests + * in Android Studio has the same result as running the tests in atest + */ + override fun lint(): TestLintTask = + super.lint().allowMissingSdk(true).sdkHome(File("/dev/null")) + + companion object { + private val libraryNames = + arrayOf( + "androidx.annotation_annotation.jar", + "dagger2.jar", + "framework.jar", + "kotlinx-coroutines-core.jar", + ) + + /** + * This file contains stubs of framework APIs and System UI classes for testing purposes + * only. The stubs are not used in the lint detectors themselves. + */ + val androidStubs = + libraryNames + .map { TestFiles.LibraryReferenceTestFile(File(it).canonicalFile) } + .toTypedArray() + } +} diff --git a/compatLib/README.md b/compatLib/README.md index 2698ccba017..82a31bfe9a6 100644 --- a/compatLib/README.md +++ b/compatLib/README.md @@ -1,15 +1,24 @@ # Lawnchair Quickstep Compat Library -The `compatLib` library helps integrate Lawnchair with QuickSwitch while ensuring backward-compatibility with older Android versions. +The `compatLib` library helps integrate Lawnchair with Recents +(also known as QuickSwitch, Quickstep, or sometimes, Lawnstep) +while ensuring backward-compatibility with older Android versions. Each subdirectory of the `compatLib`, denoted by a letter (e.g., `compatLibVQ` for Android 10), refers to the compatibility code for that specific Android version. -| Library | Android version | -|-------------|-----------------| -| compatLibVQ | 10 | -| compatLibVR | 11 | -| compatLibVS | 12 | -| compatLibVT | 13 | -| compatLibVU | 14 | -| compatLibVV | 15 | +Starting with Android 16 and above, the `compatLib` will denoted by the codename of the Android version +(e.g., `compatLibVBaklava` for Android 16). + +| Library | Android version | +|-------------------|-----------------| +| compatLibVQ | 10 | +| compatLibVR | 11 | +| compatLibVS | 12 | +| compatLibVT | 13 | +| compatLibVU | 14 | +| compatLibVV | 15 | +| compatLibVBaklava | 16 | + +Keep in mind that this list does not guarantee Recents compatibility with your Android versions, +as the implementation may still be in progress or not fully functional. diff --git a/compatLib/build.gradle b/compatLib/build.gradle index 7813d645c47..5c3b5a0e136 100644 --- a/compatLib/build.gradle +++ b/compatLib/build.gradle @@ -3,6 +3,7 @@ plugins { } android { + buildToolsVersion "36.1.0" namespace "app.lawnchair.compatlib" buildFeatures { diff --git a/compatLib/compatLibVBaklava/build.gradle b/compatLib/compatLibVBaklava/build.gradle new file mode 100644 index 00000000000..21fb60ec361 --- /dev/null +++ b/compatLib/compatLibVBaklava/build.gradle @@ -0,0 +1,13 @@ +plugins { + id 'com.android.library' +} + +android { + namespace 'app.lawnchair.compatlib.sixteen' +} + +addFrameworkJar('framework-16.jar') + +dependencies { + api projects.compatLib.compatLibVV +} diff --git a/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityManagerCompatVBaklava.java b/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityManagerCompatVBaklava.java new file mode 100644 index 00000000000..736200c667f --- /dev/null +++ b/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityManagerCompatVBaklava.java @@ -0,0 +1,7 @@ +package app.lawnchair.compatlib.sixteen; + +import androidx.annotation.RequiresApi; +import app.lawnchair.compatlib.fifteen.ActivityManagerCompatVV; + +@RequiresApi(36) +public class ActivityManagerCompatVBaklava extends ActivityManagerCompatVV {} diff --git a/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityOptionsCompatVBaklava.java b/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityOptionsCompatVBaklava.java new file mode 100644 index 00000000000..83da4a7ed6a --- /dev/null +++ b/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/ActivityOptionsCompatVBaklava.java @@ -0,0 +1,45 @@ +package app.lawnchair.compatlib.sixteen; + +import android.app.ActivityOptions; +import android.content.Context; +import android.os.Handler; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import app.lawnchair.compatlib.fifteen.ActivityOptionsCompatVV; + +@RequiresApi(36) +public class ActivityOptionsCompatVBaklava extends ActivityOptionsCompatVV { + @NonNull + @Override + public ActivityOptions makeCustomAnimation( + @NonNull Context context, + int enterResId, + int exitResId, + @NonNull final Handler callbackHandler, + @Nullable final Runnable startedListener, + @Nullable final Runnable finishedListener) { + return ActivityOptions.makeCustomAnimation( + context, + enterResId, + exitResId, + 0, + callbackHandler, + new ActivityOptions.OnAnimationStartedListener() { + @Override + public void onAnimationStarted(long elapsedRealTime) { + if (startedListener != null) { + startedListener.run(); + } + } + }, + new ActivityOptions.OnAnimationFinishedListener() { + @Override + public void onAnimationFinished(long elapsedRealTime) { + if (finishedListener != null) { + finishedListener.run(); + } + } + }); + } +} diff --git a/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/QuickstepCompatFactoryVBaklava.java b/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/QuickstepCompatFactoryVBaklava.java new file mode 100644 index 00000000000..223828f1fe9 --- /dev/null +++ b/compatLib/compatLibVBaklava/src/main/java/app/lawnchair/compatlib/sixteen/QuickstepCompatFactoryVBaklava.java @@ -0,0 +1,31 @@ +package app.lawnchair.compatlib.sixteen; + +import android.window.RemoteTransition; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; +import app.lawnchair.compatlib.ActivityManagerCompat; +import app.lawnchair.compatlib.ActivityOptionsCompat; +import app.lawnchair.compatlib.RemoteTransitionCompat; +import app.lawnchair.compatlib.fifteen.QuickstepCompatFactoryVV; + +@RequiresApi(36) +public class QuickstepCompatFactoryVBaklava extends QuickstepCompatFactoryVV { + + @NonNull + @Override + public ActivityManagerCompat getActivityManagerCompat() { + return new ActivityManagerCompatVBaklava(); + } + + @NonNull + @Override + public ActivityOptionsCompat getActivityOptionsCompat() { + return new ActivityOptionsCompatVBaklava(); + } + + @NonNull + @Override + public RemoteTransitionCompat getRemoteTransitionCompat() { + return RemoteTransition::new; + } +} diff --git a/compose/facade/core/BaseComposeFacade.kt b/compose/facade/core/BaseComposeFacade.kt new file mode 100644 index 00000000000..47f4631f32b --- /dev/null +++ b/compose/facade/core/BaseComposeFacade.kt @@ -0,0 +1,28 @@ +/* + * 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.launcher3.compose.core + +import android.content.Context +import android.view.View + +interface BaseComposeFacade { + fun isComposeAvailable(): Boolean + + fun initComposeView(appContext: Context): View + + fun disposeComposition(view: View) +} diff --git a/compose/facade/core/widgetpicker/NoOpWidgetPickerModule.kt b/compose/facade/core/widgetpicker/NoOpWidgetPickerModule.kt new file mode 100644 index 00000000000..3cba82d54e0 --- /dev/null +++ b/compose/facade/core/widgetpicker/NoOpWidgetPickerModule.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.compose.core.widgetpicker + +import dagger.Binds +import dagger.Module + +/** + * A module that provides a no-op [WidgetPickerComposeWrapper] for dagger graph that doesn't + * involve widget picker e.g. launcher preview OR when compose is disabled via build flag. + */ +@Module +interface NoOpWidgetPickerModule { + @Binds + fun bindWidgetPickerWrapper(noOp: NoOpWidgetPickerComposeWrapper): WidgetPickerComposeWrapper +} \ No newline at end of file diff --git a/compose/facade/core/widgetpicker/WidgetPickerComposeWrapper.kt b/compose/facade/core/widgetpicker/WidgetPickerComposeWrapper.kt new file mode 100644 index 00000000000..93bf32a83ed --- /dev/null +++ b/compose/facade/core/widgetpicker/WidgetPickerComposeWrapper.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.compose.core.widgetpicker + +import com.android.launcher3.widgetpicker.WidgetPickerActivity +import com.android.launcher3.widgetpicker.WidgetPickerConfig +import javax.annotation.Nonnull +import javax.inject.Inject + +/** + * A wrapper for widget picker activity that is responsible for displaying the compose based + * widget picker in [WidgetPickerActivity] when compose is enabled via build flag. + */ +interface WidgetPickerComposeWrapper { + fun showAllWidgets( + activity: WidgetPickerActivity, + @Nonnull + widgetPickerConfig: WidgetPickerConfig + ) +} + +/** + * A No-op [WidgetPickerComposeWrapper] that doesn't include widget picker in dagger graph that + * don't involve widget picker e.g. launcher preview OR when compose is disabled via build flag. + */ +class NoOpWidgetPickerComposeWrapper @Inject constructor() : WidgetPickerComposeWrapper { + override fun showAllWidgets( + activity: WidgetPickerActivity, + @Nonnull + widgetPickerConfig: WidgetPickerConfig + ) { + error("Widget picker with compose is not supported") + } +} diff --git a/compose/facade/disabled/ComposeFacade.kt b/compose/facade/disabled/ComposeFacade.kt new file mode 100644 index 00000000000..16c66d1d712 --- /dev/null +++ b/compose/facade/disabled/ComposeFacade.kt @@ -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. + */ + +package com.android.launcher3.compose + +import android.content.Context +import android.view.View +import com.android.launcher3.compose.core.BaseComposeFacade + +object ComposeFacade : BaseComposeFacade { + override fun isComposeAvailable(): Boolean = false + + override fun initComposeView(appContext: Context): View { + error( + "Compose is not available. Make sure to check isComposeAvailable() before calling any" + + " other function on ComposeFacade." + ) + } + + override fun disposeComposition(view: View) { + error( + "Compose is not available. Make sure to check isComposeAvailable() before calling any" + + " other function on ComposeFacade." + ) + } +} diff --git a/compose/facade/disabled/widgetpicker/LauncherWidgetPickerModule.kt b/compose/facade/disabled/widgetpicker/LauncherWidgetPickerModule.kt new file mode 100644 index 00000000000..65635817e09 --- /dev/null +++ b/compose/facade/disabled/widgetpicker/LauncherWidgetPickerModule.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.compose.widgetpicker + +import com.android.launcher3.compose.core.widgetpicker.NoOpWidgetPickerModule +import dagger.Module + +/** + * A no-op module that is used when compose is disabled in launcher. + */ +@Module(includes = [NoOpWidgetPickerModule::class]) +class LauncherWidgetPickerModule diff --git a/compose/facade/enabled/ComposeFacade.kt b/compose/facade/enabled/ComposeFacade.kt new file mode 100644 index 00000000000..11de7f49710 --- /dev/null +++ b/compose/facade/enabled/ComposeFacade.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.launcher3.compose + +import android.content.Context +import android.view.View +import androidx.compose.ui.platform.ComposeView +import com.android.launcher3.compose.core.BaseComposeFacade + +object ComposeFacade : BaseComposeFacade { + override fun isComposeAvailable(): Boolean = true + + override fun initComposeView(appContext: Context): View = ComposeView(appContext) + + override fun disposeComposition(view: View) { + (view as? ComposeView)?.disposeComposition() + } +} diff --git a/compose/facade/enabled/widgetpicker/LauncherWidgetPickerModule.kt b/compose/facade/enabled/widgetpicker/LauncherWidgetPickerModule.kt new file mode 100644 index 00000000000..76940777609 --- /dev/null +++ b/compose/facade/enabled/widgetpicker/LauncherWidgetPickerModule.kt @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.compose.widgetpicker + +import com.android.launcher3.compose.core.widgetpicker.WidgetPickerComposeWrapper +import com.android.launcher3.widgetpicker.WidgetPickerComponent +import com.android.launcher3.widgetpicker.WidgetPickerComposeWrapperImpl +import com.android.launcher3.widgetpicker.data.repository.WidgetAppIconsRepository +import com.android.launcher3.widgetpicker.data.repository.WidgetUsersRepository +import com.android.launcher3.widgetpicker.data.repository.WidgetsRepository +import com.android.launcher3.widgetpicker.datasource.ConfigResourceFeaturedWidgetsDataSource +import com.android.launcher3.widgetpicker.datasource.FeaturedWidgetsDataSource +import com.android.launcher3.widgetpicker.datasource.InMemoryWidgetSearchAlgorithm +import com.android.launcher3.widgetpicker.datasource.WidgetsSearchAlgorithm +import com.android.launcher3.widgetpicker.repository.WidgetsRepositoryImpl +import com.android.launcher3.widgetpicker.repository.WidgetAppIconsRepositoryImpl +import com.android.launcher3.widgetpicker.repository.WidgetUsersRepositoryImpl +import dagger.Binds +import dagger.Module + +/** + * A module that installs widget picker for launcher. + */ +@Module(subcomponents = [WidgetPickerComponent::class]) +interface LauncherWidgetPickerModule { + @Binds + fun bindWidgetPickerComposeWrapper( + impl: WidgetPickerComposeWrapperImpl + ): WidgetPickerComposeWrapper + + @Binds + fun bindWidgetUsersRepository(impl: WidgetUsersRepositoryImpl): WidgetUsersRepository + + @Binds + fun bindWidgetsRepository(impl: WidgetsRepositoryImpl): WidgetsRepository + + @Binds + fun bindWidgetAppIconsRepository(impl: WidgetAppIconsRepositoryImpl): WidgetAppIconsRepository + + @Binds + fun bindFeaturedWidgetsDataSource( + impl: ConfigResourceFeaturedWidgetsDataSource + ): FeaturedWidgetsDataSource + + @Binds + fun bindWidgetsSearchAlgorithm( + impl: InMemoryWidgetSearchAlgorithm + ): WidgetsSearchAlgorithm +} diff --git a/compose/features/com/android/launcher3/util/ComposeUtils.kt b/compose/features/com/android/launcher3/util/ComposeUtils.kt new file mode 100644 index 00000000000..ad7319a411d --- /dev/null +++ b/compose/features/com/android/launcher3/util/ComposeUtils.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.util + +import android.animation.TimeInterpolator +import android.graphics.drawable.Drawable +import androidx.compose.animation.core.Easing +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.graphics.painter.BitmapPainter +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.tooling.preview.Preview +import androidx.core.graphics.drawable.toBitmap + +/** + * Converts a [TimeInterpolator] to a compose [Easing]. + * + * This function allows you to use Android's [TimeInterpolator] instances, such as those defined in + * `android.R.interpolator`, directly with Compose animations that expect an [Easing]. + */ +fun TimeInterpolator.toComposeEasing(): Easing = Easing { fraction -> getInterpolation(fraction) } + +/** + * A composable function that takes a [Drawable] and converts it into a [Painter] which can be used + * to draw the drawable on a Compose canvas. + * + * This function uses [remember] to cache the conversion of the [Drawable] to an [ImageBitmap]. This + * means that if the same [Drawable] instance is provided across recompositions, the conversion will + * only happen once, improving performance. + */ +@Composable +fun painterResource(drawable: Drawable): Painter { + val imageBitmap = remember(drawable) { drawable.toBitmap().asImageBitmap() } + return BitmapPainter(imageBitmap) +} + + +/** + * A multi-preview annotation that displays the same Composable with different font scales. + */ +@Preview(name = "normal font", group = "font scales", fontScale = 1f) +@Preview(name = "large font", group = "font scales", fontScale = 2f) +annotation class FontScalePreviews diff --git a/compose/features/com/android/launcher3/util/TextStyleFromResource.kt b/compose/features/com/android/launcher3/util/TextStyleFromResource.kt new file mode 100644 index 00000000000..ba76276ad94 --- /dev/null +++ b/compose/features/com/android/launcher3/util/TextStyleFromResource.kt @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.util + +import androidx.annotation.StyleRes +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.DeviceFontFamilyName +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.TextUnit +import com.android.launcher3.R + +/** + * Creates a Jetpack Compose [TextStyle] from an Android [R.style] resource ID. + * + * Extracts basic text-related attributes from the provided style resource and maps them to the + * corresponding [TextStyle] properties. + * + * @param styleResId The resource ID of the Android style (e.g., `R.style.MyTextStyle`). + * @return A [TextStyle] object populated with attributes from the R.style. + */ +@Composable +fun textStyleFromResource(@StyleRes styleResId: Int): TextStyle { + val context = LocalContext.current + val density = LocalDensity.current + val theme = context.theme + + var textSize: TextUnit = TextUnit.Unspecified + var fontFamily: FontFamily? = null + var fontWeight: FontWeight? = null + var lineHeight: TextUnit = TextUnit.Unspecified + + // -- Separate groups of similar typed attributes. -- + + theme.obtainStyledAttributes(styleResId, intArrayOf(android.R.attr.fontFamily)) + .use { typedArray -> + if (typedArray.hasValue(0)) { + typedArray.getString(0)?.let { fontName -> + fontFamily = FontFamily( + Font(DeviceFontFamilyName(fontName), weight = FontWeight.Medium), + Font(DeviceFontFamilyName(fontName), weight = FontWeight.Normal), + ) + } + } + } + + theme.obtainStyledAttributes( + styleResId, + intArrayOf(android.R.attr.textSize, android.R.attr.lineHeight) + ) + .use { typedArray -> + if (typedArray.hasValue(0)) { + val textSizePx = typedArray.getDimensionPixelSize(0, 0) + if (textSizePx != 0) { + textSize = with(density) { textSizePx.toSp() } + } + } + if (typedArray.hasValue(1)) { + val lineHeightPx = typedArray.getDimensionPixelSize(1, 0) + if (lineHeightPx != 0) { + lineHeight = with(density) { lineHeightPx.toSp() } + } + } + } + + theme.obtainStyledAttributes( + styleResId, + intArrayOf(android.R.attr.fontWeight) + ).use { typedArray -> + if (typedArray.hasValue(0)) { + val fontWeightInt = typedArray.getInt(0, -1) + if (fontWeightInt != -1) { + fontWeight = FontWeight(fontWeightInt) + } + } + } + + return TextStyle( + fontSize = textSize, + lineHeight = lineHeight, + fontFamily = fontFamily, + fontWeight = fontWeight, + ) +} diff --git a/compose/features/com/android/launcher3/widgetpicker/WidgetPickerComposeWrapperImpl.kt b/compose/features/com/android/launcher3/widgetpicker/WidgetPickerComposeWrapperImpl.kt new file mode 100644 index 00000000000..425af3fbde1 --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/WidgetPickerComposeWrapperImpl.kt @@ -0,0 +1,277 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker + +import android.app.Activity.RESULT_OK +import android.content.Context +import android.content.Intent +import android.util.Log +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.platform.LocalView +import com.android.launcher3.Launcher +import com.android.launcher3.LauncherSettings.Favorites +import com.android.launcher3.R +import com.android.launcher3.compose.ComposeFacade +import com.android.launcher3.compose.core.widgetpicker.WidgetPickerComposeWrapper +import com.android.launcher3.concurrent.annotations.BackgroundContext +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.util.ApiWrapper +import com.android.launcher3.widgetpicker.WidgetPickerConfig.Companion.EXTRA_IS_PENDING_WIDGET_DRAG +import com.android.launcher3.widgetpicker.data.repository.WidgetAppIconsRepository +import com.android.launcher3.widgetpicker.data.repository.WidgetUsersRepository +import com.android.launcher3.widgetpicker.data.repository.WidgetsRepository +import com.android.launcher3.widgetpicker.listeners.WidgetPickerAddItemListener +import com.android.launcher3.widgetpicker.listeners.WidgetPickerDragItemListener +import com.android.launcher3.widgetpicker.logging.LauncherWidgetPickerCuiReporter +import com.android.launcher3.widgetpicker.shared.model.CloseBehavior +import com.android.launcher3.widgetpicker.shared.model.HostConstraint +import com.android.launcher3.widgetpicker.shared.model.WidgetHostInfo +import com.android.launcher3.widgetpicker.shared.model.isAppWidget +import com.android.launcher3.widgetpicker.theme.LauncherWidgetPickerTheme +import com.android.launcher3.widgetpicker.ui.WidgetInteractionInfo +import com.android.launcher3.widgetpicker.ui.WidgetInteractionSource +import com.android.launcher3.widgetpicker.ui.WidgetPickerEventListeners +import javax.inject.Inject +import javax.inject.Provider +import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.launch + +/** + * An helper that bootstraps widget picker UI (from [WidgetPickerComponent]) in to + * [WidgetPickerActivity] when compose is available and widget picker refactor flags are on. + * + * Sets up the bindings necessary for widget picker component. + */ +class WidgetPickerComposeWrapperImpl +@Inject +constructor( + private val widgetPickerComponentProvider: Provider, + private val widgetsRepository: WidgetsRepository, + private val widgetUsersRepository: WidgetUsersRepository, + private val widgetAppIconsRepository: WidgetAppIconsRepository, + @BackgroundContext private val backgroundContext: CoroutineContext, + @ApplicationContext private val appContext: Context, + private val apiWrapper: ApiWrapper, +) : WidgetPickerComposeWrapper { + + override fun showAllWidgets( + activity: WidgetPickerActivity, + widgetPickerConfig: WidgetPickerConfig, + ) { + val widgetPickerComponent = newWidgetPickerComponent(widgetPickerConfig) + val callbacks = activity.buildEventListeners(widgetPickerConfig, apiWrapper) + val uiEventsReporter = LauncherWidgetPickerCuiReporter(activity.statsLogManager) + + val fullWidgetsCatalog = widgetPickerComponent.getFullWidgetsCatalog() + val composeView = ComposeFacade.initComposeView(activity.asContext()) as ComposeView + + composeView.apply { + setContent { + val scope = rememberCoroutineScope() + val view = LocalView.current + + LauncherWidgetPickerTheme { + val eventListeners = remember { callbacks } + fullWidgetsCatalog.Content(eventListeners, uiEventsReporter) + } + + DisposableEffect(view) { + scope.launch { initializeRepositories() } + + onDispose { cleanUpRepositories() } + } + } + } + + checkNotNull(activity.dragLayer).addView(composeView) + } + + private fun newWidgetPickerComponent( + widgetPickerConfig: WidgetPickerConfig + ): WidgetPickerComponent { + return widgetPickerComponentProvider + .get() + .build( + widgetsRepository = widgetsRepository, + widgetUsersRepository = widgetUsersRepository, + widgetAppIconsRepository = widgetAppIconsRepository, + widgetHostInfo = + WidgetHostInfo( + title = + widgetPickerConfig.title + ?: appContext.resources.getString(R.string.widget_button_text), + description = widgetPickerConfig.description, + constraints = widgetPickerConfig.asHostConstraints(), + showDragShadow = !widgetPickerConfig.isForHomeScreen, + enableSwipeUpToDismiss = widgetPickerConfig.enableSwipeUpToDismiss, + closeBehavior = + if (widgetPickerConfig.isDesktopFormFactor) CloseBehavior.CLOSE_BUTTON + else CloseBehavior.DRAG_HANDLE, + ), + backgroundContext = backgroundContext, + ) + } + + private fun initializeRepositories() { + widgetsRepository.initialize() + widgetUsersRepository.initialize() + widgetAppIconsRepository.initialize() + } + + private fun cleanUpRepositories() { + widgetsRepository.cleanUp() + widgetUsersRepository.cleanUp() + widgetAppIconsRepository.cleanUp() + } + + companion object { + private const val TAG = "WidgetPickerComposeWrapperImpl" + private const val HOME_SCREEN_WIDGET_INTERACTION_REASON_STRING = + "WidgetPickerActivity.OnWidgetInteraction" + + private fun WidgetPickerActivity.buildEventListeners( + widgetPickerConfig: WidgetPickerConfig, + apiWrapper: ApiWrapper, + ) = + object : WidgetPickerEventListeners { + override fun onClose() { + Log.d(TAG, "Closing widget picker") + finish() + } + + override fun onWidgetInteraction(widgetInteractionInfo: WidgetInteractionInfo) { + if (widgetPickerConfig.isForHomeScreen) { + handleWidgetInteractionForHomeScreen(widgetInteractionInfo, apiWrapper) + } else { + handleWidgetInteractionForExternalHost(widgetInteractionInfo) + } + } + } + + /** + * Handles communication with the home screen about the "add" and "drag" interactions on + * widgets within widget picker. + * + * For home screen, we register a listener that is called back when home screen is shown; + * - WidgetPickerDragItemListener: bootstraps the drag helper that displays the shadow and + * handles the drag until completion. + * - WidgetPickerAddItemListener: once launcher is shown, triggers the flow to add the + * widget to workspace. + */ + private fun WidgetPickerActivity.handleWidgetInteractionForHomeScreen( + interactionInfo: WidgetInteractionInfo, + apiWrapper: ApiWrapper, + ) { + val interactionListener = + when (interactionInfo) { + is WidgetInteractionInfo.WidgetDragInfo -> + WidgetPickerDragItemListener( + container = interactionInfo.source.toContainer(), + mimeType = interactionInfo.mimeType, + widgetInfo = interactionInfo.widgetInfo, + widgetPreview = interactionInfo.previewInfo, + previewRect = interactionInfo.bounds, + previewWidth = interactionInfo.widthPx, + ) + + is WidgetInteractionInfo.WidgetAddInfo -> + WidgetPickerAddItemListener( + container = interactionInfo.source.toContainer(), + widgetInfo = interactionInfo.widgetInfo, + ) + } + Launcher.ACTIVITY_TRACKER.registerCallback( + interactionListener, + HOME_SCREEN_WIDGET_INTERACTION_REASON_STRING, + ) + startActivity( + /*intent=*/ Intent(Intent.ACTION_MAIN) + .addCategory(Intent.CATEGORY_HOME) + .setPackage(packageName) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + /*options=*/ apiWrapper.createFadeOutAnimOptions().toBundle(), + ) + finish() + } + + /** + * Handles communication with the external host about the "add" and "drag" interactions on + * widgets within widget picker. + * - In case of drag and drop, finishes the activity with result indicating that there is a + * pending drag [EXTRA_IS_PENDING_WIDGET_DRAG] (that would contain the widget info as part + * of clip data) that the host should be handling. + * - In case of add, finishes the activity with result containing extra information about + * the widget being added (namely [Intent.EXTRA_COMPONENT_NAME] and [Intent.EXTRA_USER]. + */ + private fun WidgetPickerActivity.handleWidgetInteractionForExternalHost( + widgetInteractionInfo: WidgetInteractionInfo + ) { + when (widgetInteractionInfo) { + is WidgetInteractionInfo.WidgetDragInfo -> + setResult(RESULT_OK, Intent().putExtra(EXTRA_IS_PENDING_WIDGET_DRAG, true)) + + is WidgetInteractionInfo.WidgetAddInfo -> { + val widgetInfo = widgetInteractionInfo.widgetInfo + if (widgetInfo.isAppWidget()) { + val providerInfo = widgetInfo.appWidgetProviderInfo + setResult( + RESULT_OK, + Intent().apply { + putExtra(Intent.EXTRA_COMPONENT_NAME, providerInfo.provider) + putExtra(Intent.EXTRA_USER, providerInfo.profile) + }, + ) + } else { + throw IllegalStateException( + "AppWidgetInfo not provided for external host drag" + ) + } + } + } + + finish() + } + + /** Builds the host constraints to provide to the widget picker module. */ + fun WidgetPickerConfig.asHostConstraints() = buildList { + if (filteredUsers.isNotEmpty()) { + add(HostConstraint.HostUserConstraint(filteredUsers)) + } + if (!isForHomeScreen) { + add(HostConstraint.NoShortcutsConstraint) + } + if (categoryInclusionFilter != 0 || categoryExclusionFilter != 0) { + add( + HostConstraint.HostCategoryConstraint( + categoryInclusionMask = categoryInclusionFilter, + categoryExclusionMask = categoryExclusionFilter, + ) + ) + } + } + + private fun WidgetInteractionSource.toContainer(): Int = + when (this) { + WidgetInteractionSource.FEATURED -> Favorites.CONTAINER_WIDGETS_PREDICTION + WidgetInteractionSource.SEARCH, + WidgetInteractionSource.BROWSE -> Favorites.CONTAINER_WIDGETS_TRAY + } + } +} diff --git a/compose/features/com/android/launcher3/widgetpicker/datasource/ConfigResourceFeaturedWidgetsDataSource.kt b/compose/features/com/android/launcher3/widgetpicker/datasource/ConfigResourceFeaturedWidgetsDataSource.kt new file mode 100644 index 00000000000..5c11c7fe848 --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/datasource/ConfigResourceFeaturedWidgetsDataSource.kt @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.datasource + +import android.content.Context +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.R +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.widget.picker.util.WidgetPreviewContainerSize +import com.android.launcher3.widgetpicker.shared.model.PickableWidget +import com.android.launcher3.widgetpicker.shared.model.WidgetApp +import com.android.launcher3.widgetpicker.shared.model.isAppWidget +import java.util.Arrays +import java.util.stream.Collectors +import javax.inject.Inject + +/** + * An implementation of [FeaturedWidgetsDataSource] that provides featured widgets based on a static + * configuration from resources and pre-defined size templates. + * + * Only appwidgets; no shortcuts + */ +@LauncherAppSingleton +class ConfigResourceFeaturedWidgetsDataSource +@Inject +constructor( + @ApplicationContext private val appContext: Context, + private val idp: InvariantDeviceProfile, +) : FeaturedWidgetsDataSource { + // the package part in component name e.g. "com.example" in {com.example/widget.Provider} + private var eligiblePackages: Set = emptySet() + + override suspend fun initialize() { + if (eligiblePackages.isEmpty()) { + eligiblePackages = + Arrays.stream( + appContext.resources.getStringArray(R.array.default_featured_widget_apps) + ) + .collect(Collectors.toSet()) + } + } + + override suspend fun getFeaturedWidgets(widgetApps: List): List { + val widgetsByContainerSize = + widgetApps + .shuffled() + // pick only one of user profiles + .distinctBy { Pair(it.id.packageName, it.id.category) } + .flatMap { it.widgets } + .filter { + eligiblePackages.isEmpty() || + eligiblePackages.contains(it.id.componentName.packageName) + } + .groupBy { + WidgetPreviewContainerSize( + it.sizeInfo.containerSpanX, + it.sizeInfo.containerSpanY, + ) + } + + val selected: MutableList = mutableListOf() + val usedAppIds: MutableSet = mutableSetOf() + + val sizesToPick = + WidgetPreviewContainerSize.pickTemplateForFeaturedWidgets( + idp.getDeviceProfile(appContext) + ) + for (sizeToPick in sizesToPick) { + widgetsByContainerSize[sizeToPick]?.shuffled()?.let { items -> + for (item in items) { + if ( + item.widgetInfo.isAppWidget() && + !usedAppIds.contains(item.appId.packageName) + ) { + selected.add(item) + usedAppIds.add(item.appId.packageName) + break + } + } + } + } + + return selected + } + + override fun cleanup() { + eligiblePackages = emptySet() + } +} diff --git a/compose/features/com/android/launcher3/widgetpicker/datasource/FeaturedWidgetsDataSource.kt b/compose/features/com/android/launcher3/widgetpicker/datasource/FeaturedWidgetsDataSource.kt new file mode 100644 index 00000000000..2438d9fcc70 --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/datasource/FeaturedWidgetsDataSource.kt @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.datasource + +import com.android.launcher3.widgetpicker.shared.model.PickableWidget +import com.android.launcher3.widgetpicker.shared.model.WidgetApp + +/** + * An interface representing a datasource that provides featured widgets. + */ +interface FeaturedWidgetsDataSource { + /** + * Perform any initializations here. + */ + suspend fun initialize() + + /** + * Provides widgets from the given list that can be featured in widget picker. + */ + suspend fun getFeaturedWidgets(widgetApps: List): List + + /** + * Clear any service bindings or state here. + */ + fun cleanup() +} diff --git a/compose/features/com/android/launcher3/widgetpicker/datasource/InMemoryWidgetsSearchAlgorithm.kt b/compose/features/com/android/launcher3/widgetpicker/datasource/InMemoryWidgetsSearchAlgorithm.kt new file mode 100644 index 00000000000..16e8ca48cd5 --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/datasource/InMemoryWidgetsSearchAlgorithm.kt @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.datasource + +import com.android.launcher3.concurrent.annotations.BackgroundContext +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.widgetpicker.shared.model.WidgetApp +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.coroutineScope +import javax.inject.Inject +import kotlin.coroutines.CoroutineContext + +/** + * A simple in-memory implementation of [WidgetsSearchAlgorithm] that matches input query against + * the app labels, widget title and description. + * + * More weight is given to app names than widget title; and description has lowest weight in scoring + * the results. + */ +@LauncherAppSingleton +class InMemoryWidgetSearchAlgorithm @Inject constructor( + @BackgroundContext + private val backgroundContext: CoroutineContext, +) : WidgetsSearchAlgorithm { + override suspend fun initialize() {} + + override suspend fun searchWidgets( + query: String, + corpus: List + ): List = coroutineScope { + // Ideally, uses search only one word, but supporting multiple words. + val queryWords = query.trim().lowercase().split("\\s+".toRegex()) + .filter { it.isNotBlank() } + + if (queryWords.isEmpty()) { + return@coroutineScope emptyList() + } + + val results = corpus.map { widgetApp -> + async(backgroundContext) { + matchAndScoreWidgetApp(widgetApp, queryWords) + } + } + + results.awaitAll() + .filter { it.first.widgets.isNotEmpty() && it.second > 0 } + .sortedByDescending { it.second } + .map { it.first } // Return just the WidgetApp + } + + private fun matchAndScoreWidgetApp( + widgetApp: WidgetApp, + queryWords: List + ): Pair { + val appTitleScore = widgetApp.title?.let { + matchAndCalculateScore( + queryWords = queryWords, + targetText = widgetApp.title.toString(), + matchType = MatchType.APP_TITLE + ) + } ?: 0 + + val scoredWidgets = widgetApp.widgets.map { widget -> + val labelScore = + matchAndCalculateScore( + queryWords = queryWords, + targetText = widget.label, + matchType = MatchType.WIDGET_LABEL + ) + val descriptionScore = widget.description?.let { + matchAndCalculateScore( + queryWords = queryWords, + targetText = it.toString(), + matchType = MatchType.WIDGET_DESCRIPTION + ) + } ?: 0 + + val totalWidgetScore = labelScore + descriptionScore + widget to totalWidgetScore + } + .filter { it.second > 0 } + .sortedByDescending { it.second } + + val totalAppScore = appTitleScore + scoredWidgets.sumOf { it.second } + + return if (appTitleScore > 0) { + widgetApp to appTitleScore + totalAppScore + } else { + widgetApp.copy( + widgets = scoredWidgets.map { it.first } + ) to totalAppScore + } + } + + private fun matchAndCalculateScore( + queryWords: List, + targetText: String, + matchType: MatchType + ): Int { + var totalScore = 0 + val wordsInTarget = targetText + .lowercase() + .split("\\s+".toRegex()).filter { it.isNotBlank() } + + for (queryWord in queryWords) { + var wordScore = 0 + + for (targetWord in wordsInTarget) { + wordScore = wordScore.coerceAtLeast( + calculateSingleWordScore( + queryWord, + targetWord, + matchType + ) + ) + } + totalScore += wordScore + } + return totalScore + } + + private fun calculateSingleWordScore( + queryWord: String, + targetWord: String, + matchType: MatchType + ): Int { + val baseScore = when { + // exact matches are score higher. + targetWord == queryWord -> 2 + // Then the matches that begin with given input as prefix + targetWord.startsWith(queryWord) -> 1 + else -> 0 + } + + return baseScore * matchType.weightFactor + } + + private enum class MatchType(val weightFactor: Int) { + // Highest weight to app title matches; users are likely to search for apps + APP_TITLE(12), + + // Medium weight to widget labels (lower than app title as some widgets might have app title + // in name and based on number of items, might add unnecessary weight). + WIDGET_LABEL(3), + + // Lowest weight to description; description might might not be as impactful as the labels + // or app title; but, it might still help in cases where alternate words for the widgets + // functionality are used (e.g. stocks vs watchlist). + WIDGET_DESCRIPTION(1) + } + + override fun cleanup() {} +} diff --git a/compose/features/com/android/launcher3/widgetpicker/datasource/WidgetsSearchAlgorithm.kt b/compose/features/com/android/launcher3/widgetpicker/datasource/WidgetsSearchAlgorithm.kt new file mode 100644 index 00000000000..e4a98bb3621 --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/datasource/WidgetsSearchAlgorithm.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.datasource + +import com.android.launcher3.widgetpicker.shared.model.WidgetApp + +/** + * An interface representing algorithm used to search widgets for widget picker. + */ +interface WidgetsSearchAlgorithm { + /** + * Perform any initializations here + */ + suspend fun initialize() + + /** + * Returns apps and its widgets that match the given input string. + */ + suspend fun searchWidgets(query: String, corpus: List): List + + /** + * Clear any service bindings or state here. + */ + fun cleanup() +} diff --git a/compose/features/com/android/launcher3/widgetpicker/listeners/WidgetPickerAddItemListener.kt b/compose/features/com/android/launcher3/widgetpicker/listeners/WidgetPickerAddItemListener.kt new file mode 100644 index 00000000000..09eb085799e --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/listeners/WidgetPickerAddItemListener.kt @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.listeners + +import android.view.View +import com.android.launcher3.Launcher +import com.android.launcher3.PendingAddItemInfo +import com.android.launcher3.logging.StatsLogManager.LauncherEvent +import com.android.launcher3.pm.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO +import com.android.launcher3.util.ContextTracker.SchedulerCallback +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo +import com.android.launcher3.widget.PendingAddShortcutInfo +import com.android.launcher3.widget.PendingAddWidgetInfo +import com.android.launcher3.widgetpicker.shared.model.WidgetInfo + +/** + * A callback listener (for tap-to-add flow) that handles adding a widget from a separate widget + * picker activity. Invoked once widget picker is closed and home screen is showing / ready. + * + * Also logs to stats logger once widget is added. + * + * @param container the Favorites container that the widget was interacted from e.g. + * CONTAINER_WIDGETS_PREDICTION; enables the stats logs to capture the source container. + * @param widgetInfo metadata of the widget being added + */ +class WidgetPickerAddItemListener(private val container: Int, private val widgetInfo: WidgetInfo) : + SchedulerCallback { + override fun init(launcher: Launcher?, isHomeStarted: Boolean): Boolean { + checkNotNull(launcher) + + val pendingAddItemInfo: PendingAddItemInfo = + when (widgetInfo) { + is WidgetInfo.AppWidgetInfo -> { + val launcherProviderInfo = + LauncherAppWidgetProviderInfo.fromProviderInfo( + launcher, + widgetInfo.appWidgetProviderInfo, + ) + PendingAddWidgetInfo(launcherProviderInfo, container) + } + + is WidgetInfo.ShortcutInfo -> + PendingAddShortcutInfo( + ShortcutConfigActivityInfoVO(widgetInfo.launcherActivityInfo) + ) + } + + val view = View(launcher) + view.tag = pendingAddItemInfo + + launcher.accessibilityDelegate?.addToWorkspace( + /*item=*/ pendingAddItemInfo, + /*accessibility=*/ false, + ) { + launcher.statsLogManager + .logger() + .withItemInfo(pendingAddItemInfo) + .log(LauncherEvent.LAUNCHER_WIDGET_ADD_BUTTON_TAP) + } + return false // don't receive any more callbacks as we got launcher and handled it + } +} diff --git a/compose/features/com/android/launcher3/widgetpicker/listeners/WidgetPickerDragItemListener.kt b/compose/features/com/android/launcher3/widgetpicker/listeners/WidgetPickerDragItemListener.kt new file mode 100644 index 00000000000..52848a45651 --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/listeners/WidgetPickerDragItemListener.kt @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.listeners + +import android.graphics.Point +import android.graphics.Rect +import android.view.View +import com.android.launcher3.PendingAddItemInfo +import com.android.launcher3.dragndrop.BaseItemDragListener +import com.android.launcher3.dragndrop.DragOptions +import com.android.launcher3.pm.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO +import com.android.launcher3.widget.DatabaseWidgetPreviewLoader.WidgetPreviewInfo +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo +import com.android.launcher3.widget.PendingAddShortcutInfo +import com.android.launcher3.widget.PendingAddWidgetInfo +import com.android.launcher3.widget.PendingItemDragHelper +import com.android.launcher3.widgetpicker.shared.model.WidgetInfo +import com.android.launcher3.widgetpicker.shared.model.WidgetPreview +import com.android.launcher3.widgetpicker.shared.model.isAppWidget + +/** + * A callback listener of type [BaseItemDragListener] that handles widget drag and drop from widget + * picker hosted in a separate activity than home screen. + * + * Responsible for initializing the [PendingItemDragHelper] that then handles the rest of the drag + * and drop (including showing a drag shadow for the widget). + * + * @param container the source container in which widget was interacted with; enables the stats logs + * to capture the source container. + * @param mimeType a mime type used by widget picker when attaching this listener for a specific + * widget's drag and drop session. + * @param widgetInfo metadata of the widget being dragged + * @param widgetPreview provides the preview information for widgets + * @param previewRect the bounds of widget's preview offset by the point of long press + * @param previewWidth width of the preview as it appears in the widget picker. + */ +class WidgetPickerDragItemListener( + private val container: Int, + private val mimeType: String, + private val widgetInfo: WidgetInfo, + private val widgetPreview: WidgetPreview, + previewRect: Rect, + previewWidth: Int, +) : BaseItemDragListener(previewRect, previewWidth, previewWidth) { + override fun getMimeType(): String = mimeType + + override fun startDrag( + previewRect: Rect, + previewBitmapWidth: Int, + previewViewWidth: Int, + screenPos: Point, + options: DragOptions, + ) { + val pendingAddItemInfo: PendingAddItemInfo = + when (widgetInfo) { + is WidgetInfo.AppWidgetInfo -> { + val launcherProviderInfo = + LauncherAppWidgetProviderInfo.fromProviderInfo( + mLauncher, + widgetInfo.appWidgetProviderInfo, + ) + PendingAddWidgetInfo(launcherProviderInfo, container) + } + + is WidgetInfo.ShortcutInfo -> + PendingAddShortcutInfo( + ShortcutConfigActivityInfoVO(widgetInfo.launcherActivityInfo) + ) + } + + val view = View(mLauncher) + view.tag = pendingAddItemInfo + + val dragHelper = PendingItemDragHelper(view) + + if (widgetInfo.isAppWidget()) { + setAppWidgetPreviewInfo(widgetPreview, widgetInfo, dragHelper) + } // shortcut preview is fetched by home screen. + + dragHelper.startDrag( + previewRect, + previewBitmapWidth, + previewViewWidth, + screenPos, + /*source=*/ this, + options, + ) + } + + private fun setAppWidgetPreviewInfo( + appWidgetPreview: WidgetPreview, + widgetInfo: WidgetInfo.AppWidgetInfo, + dragHelper: PendingItemDragHelper, + ) { + val info = WidgetPreviewInfo() + when (appWidgetPreview) { + is WidgetPreview.BitmapWidgetPreview -> { + info.previewBitmap = appWidgetPreview.bitmap + info.providerInfo = widgetInfo.appWidgetProviderInfo + } + + is WidgetPreview.ProviderInfoWidgetPreview -> { + info.providerInfo = appWidgetPreview.providerInfo + } + + is WidgetPreview.RemoteViewsWidgetPreview -> { + info.remoteViews = appWidgetPreview.remoteViews + info.providerInfo = widgetInfo.appWidgetProviderInfo + } + + else -> + throw IllegalStateException( + "Unsupported preview type when dropping widget to launcher" + ) + } + dragHelper.setWidgetPreviewInfo(info) + } +} diff --git a/compose/features/com/android/launcher3/widgetpicker/logging/LauncherWidgetPickerCuiReporter.kt b/compose/features/com/android/launcher3/widgetpicker/logging/LauncherWidgetPickerCuiReporter.kt new file mode 100644 index 00000000000..4852c77a16e --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/logging/LauncherWidgetPickerCuiReporter.kt @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.logging + +import android.view.View +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_PICKER_APP_EXPAND_ANIMATION_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_PICKER_APP_EXPAND_ANIMATION_END +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_PICKER_OPEN_ANIMATION_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_PICKER_OPEN_ANIMATION_END +import com.android.launcher3.widgetpicker.ui.WidgetPickerCui +import com.android.launcher3.widgetpicker.ui.WidgetPickerCuiReporter + +/** Reports widget picker's UI events to stats logger for instrumentation purposes. */ +class LauncherWidgetPickerCuiReporter(private val statsLogManager: StatsLogManager) : + WidgetPickerCuiReporter { + override fun report(event: WidgetPickerCui, view: View) { + val launcherUiEvent = + when (event) { + WidgetPickerCui.OPEN_ANIMATION_BEGIN -> LAUNCHER_WIDGET_PICKER_OPEN_ANIMATION_BEGIN + + WidgetPickerCui.OPEN_ANIMATION_END -> LAUNCHER_WIDGET_PICKER_OPEN_ANIMATION_END + + WidgetPickerCui.WIDGET_APP_EXPAND_BEGIN -> + LAUNCHER_WIDGET_PICKER_APP_EXPAND_ANIMATION_BEGIN + + WidgetPickerCui.WIDGET_APP_EXPAND_END -> + LAUNCHER_WIDGET_PICKER_APP_EXPAND_ANIMATION_END + } + + statsLogManager.logger().sendToInteractionJankMonitor(launcherUiEvent, view) + } +} diff --git a/compose/features/com/android/launcher3/widgetpicker/repository/WidgetAppIconsRepositoryImpl.kt b/compose/features/com/android/launcher3/widgetpicker/repository/WidgetAppIconsRepositoryImpl.kt new file mode 100644 index 00000000000..003c5b9fc15 --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/repository/WidgetAppIconsRepositoryImpl.kt @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.repository + +import com.android.launcher3.icons.BitmapInfo +import com.android.launcher3.icons.IconCache +import com.android.launcher3.icons.cache.CacheLookupFlag +import com.android.launcher3.model.data.PackageItemInfo +import com.android.launcher3.widgetpicker.data.repository.WidgetAppIconsRepository +import com.android.launcher3.widgetpicker.shared.model.AppIcon +import com.android.launcher3.widgetpicker.shared.model.AppIconBadge +import com.android.launcher3.widgetpicker.shared.model.WidgetAppIcon +import com.android.launcher3.widgetpicker.shared.model.WidgetAppId +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.callbackFlow +import javax.inject.Inject + +/** + * An implementation of [WidgetAppIconsRepository] that provides the app icons for the widget picker + * using the [IconCache]. + */ +class WidgetAppIconsRepositoryImpl @Inject constructor( + private val iconCache: IconCache +) : WidgetAppIconsRepository { + override fun initialize() {} // nothing to do here. + + override fun getAppIcon(widgetAppId: WidgetAppId) = callbackFlow { + trySend(WidgetAppIcon(AppIcon.PlaceHolderAppIcon, AppIconBadge.NoBadge)) + + val category = widgetAppId.category + val packageItemInfo = if (category != null) { + PackageItemInfo(widgetAppId.packageName, category, widgetAppId.userHandle) + } else { + PackageItemInfo(widgetAppId.packageName, widgetAppId.userHandle) + } + + iconCache.updateIconInBackground({ itemInfoWithIcon -> + itemInfoWithIcon?.let { + if (itemInfoWithIcon.bitmap.isLowRes) { + trySend( + WidgetAppIcon( + icon = AppIcon.LowResColorIcon(itemInfoWithIcon.bitmap.color), + badge = AppIconBadge.NoBadge + ) + ) + } else { + trySend( + WidgetAppIcon( + icon = AppIcon.HighResBitmapIcon( + bitmap = itemInfoWithIcon.bitmap.icon, + isFullBleed = itemInfoWithIcon.bitmap.flags and + BitmapInfo.FLAG_FULL_BLEED == BitmapInfo.FLAG_FULL_BLEED + ), + badge = itemInfoWithIcon.bitmap.getBadgeDrawableInfo()?.let { + AppIconBadge.DrawableBadge( + it.drawableRes, + it.colorRes + ) + } ?: AppIconBadge.NoBadge + ) + ) + } + } + }, packageItemInfo, CacheLookupFlag.DEFAULT_LOOKUP_FLAG) + + awaitClose() + } + + override fun cleanUp() {} // nothing to do here. +} diff --git a/compose/features/com/android/launcher3/widgetpicker/repository/WidgetUsersRepositoryImpl.kt b/compose/features/com/android/launcher3/widgetpicker/repository/WidgetUsersRepositoryImpl.kt new file mode 100644 index 00000000000..70cd52f467c --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/repository/WidgetUsersRepositoryImpl.kt @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.repository + +import android.content.Context +import android.os.UserHandle +import com.android.launcher3.concurrent.annotations.BackgroundContext +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.model.StringCache +import com.android.launcher3.pm.UserCache +import com.android.launcher3.util.SafeCloseable +import com.android.launcher3.widgetpicker.data.repository.WidgetUsersRepository +import com.android.launcher3.widgetpicker.shared.model.WidgetUserProfile +import com.android.launcher3.widgetpicker.shared.model.WidgetUserProfileType +import com.android.launcher3.widgetpicker.shared.model.WidgetUserProfiles +import javax.inject.Inject +import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.CoroutineName +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch + +/** + * An implementation of [WidgetUsersRepository] that provides user profile info to widget picker by + * looking up the [UserCache]. + */ +class WidgetUsersRepositoryImpl +@Inject +constructor( + @ApplicationContext private val appContext: Context, + private val userCache: UserCache, + @BackgroundContext private val backgroundContext: CoroutineContext, +) : WidgetUsersRepository { + private var stringCache: StringCache = StringCache.EMPTY + private var closableUseChangeListener: SafeCloseable? = null + private val _userProfiles = MutableStateFlow(null) + private var workProfileUser: UserHandle? = null + private var backgroundScope = + CoroutineScope( + SupervisorJob() + + backgroundContext + + CoroutineName("widgetUsersRepositoryBackgroundWork") + ) + + override fun initialize() { + backgroundScope.launch { + stringCache = StringCache.fromContext(appContext) + maybeUpdate(changedUser = null) + + closableUseChangeListener?.close() + closableUseChangeListener = + userCache.addUserEventListener { userHandle, _ -> maybeUpdate(userHandle) } + } + } + + override fun observeUserProfiles(): Flow = _userProfiles.asStateFlow() + + override fun getWorkProfileUser(): UserHandle? = workProfileUser + + override fun cleanUp() { + closableUseChangeListener?.close() + backgroundScope.apply { + if (isActive) { + cancel() + } + } + } + + private fun maybeUpdate(changedUser: UserHandle?) { + + workProfileUser = userCache.userProfiles.firstOrNull { userCache.getUserInfo(it).isWork } + val needsUpdate = changedUser == null || changedUser == workProfileUser + + if (needsUpdate) { + val isUserQuiet = + workProfileUser?.let { userCache.userManagerState.isUserQuiet(it) } ?: false + + _userProfiles.update { + WidgetUserProfiles( + personal = + WidgetUserProfile( + type = WidgetUserProfileType.PERSONAL, + label = stringCache.widgetsPersonalTab ?: "", + paused = false, + pausedProfileMessage = null, + ), + work = + workProfileUser?.let { + WidgetUserProfile( + type = WidgetUserProfileType.WORK, + label = stringCache.widgetsWorkTab ?: "", + paused = isUserQuiet, + pausedProfileMessage = stringCache.workProfilePausedTitle, + ) + }, + ) + } + } + } +} diff --git a/compose/features/com/android/launcher3/widgetpicker/repository/WidgetsRepositoryImpl.kt b/compose/features/com/android/launcher3/widgetpicker/repository/WidgetsRepositoryImpl.kt new file mode 100644 index 00000000000..63c29c519cc --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/repository/WidgetsRepositoryImpl.kt @@ -0,0 +1,228 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.repository + +import android.content.Context +import com.android.launcher3.DeviceProfile +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.concurrent.annotations.BackgroundContext +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.model.WidgetItem +import com.android.launcher3.model.WidgetsModel +import com.android.launcher3.model.data.PackageItemInfo +import com.android.launcher3.pm.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO +import com.android.launcher3.util.ComponentKey +import com.android.launcher3.util.Executors.MODEL_EXECUTOR +import com.android.launcher3.util.PackageUserKey +import com.android.launcher3.widget.DatabaseWidgetPreviewLoader +import com.android.launcher3.widget.picker.util.WidgetPreviewContainerSize +import com.android.launcher3.widget.util.WidgetSizes +import com.android.launcher3.widgetpicker.data.repository.WidgetsRepository +import com.android.launcher3.widgetpicker.datasource.FeaturedWidgetsDataSource +import com.android.launcher3.widgetpicker.datasource.WidgetsSearchAlgorithm +import com.android.launcher3.widgetpicker.shared.model.PickableWidget +import com.android.launcher3.widgetpicker.shared.model.WidgetApp +import com.android.launcher3.widgetpicker.shared.model.WidgetAppId +import com.android.launcher3.widgetpicker.shared.model.WidgetId +import com.android.launcher3.widgetpicker.shared.model.WidgetInfo +import com.android.launcher3.widgetpicker.shared.model.WidgetPreview +import com.android.launcher3.widgetpicker.shared.model.WidgetSizeInfo +import javax.inject.Inject +import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.CoroutineName +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +/** + * An implementation of the [WidgetsRepository] that provides widgets for widget picker using the + * [WidgetsModel], [FeaturedWidgetsDataSource] & enables search using the provided + * [WidgetsSearchAlgorithm]. + */ +class WidgetsRepositoryImpl +@Inject +constructor( + @ApplicationContext private val appContext: Context, + idp: InvariantDeviceProfile, + private val widgetsModel: WidgetsModel, + private val featuredWidgetsDataSource: FeaturedWidgetsDataSource, + private val searchAlgorithm: WidgetsSearchAlgorithm, + @BackgroundContext private val backgroundContext: CoroutineContext, +) : WidgetsRepository { + private val deviceProfile = idp.getDeviceProfile(appContext) + private val backgroundScope = + CoroutineScope(SupervisorJob() + backgroundContext + CoroutineName("WidgetsRepository")) + + private val _widgetItemsByPackage = MutableStateFlow>(emptyList()) + private val databaseWidgetPreviewLoader = DatabaseWidgetPreviewLoader(appContext, deviceProfile) + + override fun initialize(options: WidgetsRepository.InitializationOptions) { + val packageUserKeyOrAll = + options.widgetAppId?.let { + checkNotNull(it.packageName) { "invalid package name passed" } + PackageUserKey(it.packageName, it.userHandle) + } + + // TODO(b/419495339): Remove the model executor requirement from widgets model and replace + // with scope.launch + MODEL_EXECUTOR.execute { + widgetsModel.update(/* packageUser= */ packageUserKeyOrAll) + _widgetItemsByPackage.update { + widgetsModel.widgetsByPackageItemForPicker.toPickableWidgets(deviceProfile) + } + } + + if (options.loadFeaturedWidgets) { + backgroundScope.launch { featuredWidgetsDataSource.initialize() } + } + } + + override fun observeWidgets(): Flow> = _widgetItemsByPackage.asStateFlow() + + override fun observeWidgetApp(widgetAppId: WidgetAppId): Flow = + _widgetItemsByPackage + .map { apps -> apps.firstOrNull { it.id == widgetAppId } } + .distinctUntilChanged() + + override suspend fun getWidgetPreview(id: WidgetId): WidgetPreview { + val componentKey = ComponentKey(id.componentName, id.userHandle) + val widgetItem = + widgetsModel.widgetsByComponentKey[componentKey] + ?: return WidgetPreview.PlaceholderWidgetPreview + + val previewSizePx = WidgetSizes.getWidgetItemSizePx(appContext, deviceProfile, widgetItem) + val preview = + withContext(backgroundContext) { + val result = + databaseWidgetPreviewLoader.generatePreviewInfoBg( + widgetItem, + previewSizePx.width, + previewSizePx.height, + ) + when { + result.remoteViews != null -> + WidgetPreview.RemoteViewsWidgetPreview(result.remoteViews) + + result.providerInfo != null -> + WidgetPreview.ProviderInfoWidgetPreview(result.providerInfo) + + result.previewBitmap != null -> + WidgetPreview.BitmapWidgetPreview(result.previewBitmap) + + else -> WidgetPreview.PlaceholderWidgetPreview + } + } + + return preview + } + + override suspend fun searchWidgets(query: String): List = + searchAlgorithm.searchWidgets(query, _widgetItemsByPackage.value) + + override fun cleanUp() { + _widgetItemsByPackage.update { emptyList() } + backgroundScope.apply { + if (isActive) { + cancel() + } + } + } + + override fun getFeaturedWidgets(): Flow> { + return _widgetItemsByPackage + .map { widgets -> featuredWidgetsDataSource.getFeaturedWidgets(widgets) } + .flowOn(backgroundContext) + } + + companion object { + private fun Map>.toPickableWidgets( + deviceProfile: DeviceProfile + ) = map { (packageItemInfo, widgetItems) -> + val widgetAppId = + WidgetAppId( + packageName = packageItemInfo.packageName, + userHandle = packageItemInfo.user, + category = packageItemInfo.widgetCategory, + ) + + WidgetApp( + id = widgetAppId, + title = packageItemInfo.title, + widgets = + widgetItems.map { widgetItem -> + val previewSize = + WidgetSizes.getWidgetSizePx( + deviceProfile, + widgetItem.spanX, + widgetItem.spanY, + ) + val containerSpan = + WidgetPreviewContainerSize.forItem(widgetItem, deviceProfile) + val containerSize = + WidgetSizes.getWidgetSizePx( + deviceProfile, + containerSpan.spanX, + containerSpan.spanY, + ) + + PickableWidget( + id = + WidgetId( + componentName = widgetItem.componentName, + userHandle = widgetItem.user, + ), + appId = widgetAppId, + label = widgetItem.label, + description = widgetItem.description, + widgetInfo = + if (widgetItem.widgetInfo != null) { + WidgetInfo.AppWidgetInfo( + appWidgetProviderInfo = widgetItem.widgetInfo.clone() + ) + } else { + check(widgetItem.activityInfo is ShortcutConfigActivityInfoVO) + WidgetInfo.ShortcutInfo( + launcherActivityInfo = widgetItem.activityInfo.mInfo + ) + }, + sizeInfo = + WidgetSizeInfo( + spanX = widgetItem.spanX, + spanY = widgetItem.spanY, + widthPx = previewSize.width, + heightPx = previewSize.height, + containerSpanX = containerSpan.spanX, + containerSpanY = containerSpan.spanY, + containerWidthPx = containerSize.width, + containerHeightPx = containerSize.height, + ), + ) + }, + ) + } + } +} diff --git a/compose/features/com/android/launcher3/widgetpicker/theme/Colors.kt b/compose/features/com/android/launcher3/widgetpicker/theme/Colors.kt new file mode 100644 index 00000000000..e35c65682bc --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/theme/Colors.kt @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.theme + +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.colorResource +import com.android.launcher3.R +import com.android.launcher3.widgetpicker.ui.theme.WidgetPickerColors + +/** + * An adapter that maps the resource tokens for widget picker dark colors to the + * [WidgetPickerColors] accepted by the widget picker module. + */ +@Composable +fun darkWidgetPickerColors() = + WidgetPickerColors( + // Bottom Sheet + sheetBackground = colorResource(R.color.widget_picker_primary_surface_color_dark), + dragHandle = colorResource(R.color.widget_picker_collapse_handle_color_dark), + sheetTitle = colorResource(R.color.widget_picker_title_color_dark), + sheetDescription = colorResource(R.color.widget_picker_description_color_dark), + + // Expand collapse list + expandCollapseIndicatorIcon = + colorResource(R.color.widget_picker_expand_icon_button_color_dark), + expandCollapseIndicatorBackground = + colorResource(R.color.widget_picker_expand_icon_button_background_dark), + expandableListItemsBackground = + colorResource(R.color.widget_picker_expandable_list_items_background_dark), + expandableListHeaderTitle = + colorResource(R.color.widget_picker_header_app_title_color_dark), + expandableListHeaderSubTitle = + colorResource(R.color.widget_picker_header_app_subtitle_color_dark), + + // List header + selectedListHeaderBackground = + colorResource(R.color.widget_picker_clickable_list_header_background_dark), + unselectedListHeaderBackground = Color.Transparent, + featuredHeaderLeadingIconBackground = + colorResource(R.color.widget_picker_featured_header_icon_background_dark), + featuredHeaderLeadingIcon = + colorResource(R.color.widget_picker_featured_header_icon_color_dark), + unSelectedListHeaderTitle = + colorResource(R.color.widget_picker_header_app_title_color_dark), + unSelectedListHeaderSubTitle = + colorResource(R.color.widget_picker_header_app_subtitle_color_dark), + selectedListHeaderTitle = + colorResource(R.color.widget_picker_selected_header_app_title_color_dark), + selectedListHeaderSubTitle = + colorResource(R.color.widget_picker_selected_header_app_subtitle_color_dark), + + // Error message + noWidgetsErrorText = colorResource(R.color.widget_picker_no_widget_error_color_dark), + + // Widgets container + widgetsContainerBackground = + colorResource(R.color.widget_picker_widgets_container_background_dark), + + // App icon + placeholderAppIcon = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.2f), + + // Widget details + widgetLabel = colorResource(R.color.widget_cell_title_color_dark), + widgetSpanText = colorResource(R.color.widget_cell_subtitle_color_dark), + widgetDescription = colorResource(R.color.widget_cell_subtitle_color_dark), + addButtonContent = colorResource(R.color.widget_picker_add_button_text_color_dark), + addButtonBackground = colorResource(R.color.widget_picker_add_button_background_color_dark), + + // Widget preview + widgetPlaceholderBackground = + colorResource(R.color.widget_picker_preview_placeholder_background_dark), + widgetPlaceholderContent = + colorResource(R.color.widget_picker_preview_placeholder_content_dark), + + // Floating Toolbar + toolbarBackground = colorResource(R.color.widget_picker_toolbar_background_dark), + toolbarTabSelectedBackground = + colorResource(R.color.widget_picker_toolbar_selected_tab_background_dark), + toolbarTabUnSelectedBackground = + colorResource(R.color.widget_picker_toolbar_unselected_tab_background_dark), + toolbarSelectedTabContent = + colorResource(R.color.widget_picker_toolbar_selected_tab_content_color_dark), + toolbarUnSelectedTabContent = + colorResource(R.color.widget_picker_toolbar_unselected_tab_content_color_dark), + // Search bar + searchBarBackground = colorResource(R.color.widget_picker_search_bar_background_color_dark), + searchBarPlaceholderText = colorResource(R.color.widget_picker_search_text_color_dark), + searchBarText = colorResource(R.color.widget_picker_search_text_color_dark), + searchBarSearchIcon = colorResource(R.color.widget_picker_search_text_color_dark), + searchBarClearButtonIcon = colorResource(R.color.widget_picker_search_text_color_dark), + searchBarBackButtonIcon = colorResource(R.color.widget_picker_search_text_color_dark), + searchBarCursor = colorResource(R.color.widget_picker_search_cursor_color_dark), + focusOutline = colorResource(R.color.widget_picker_focus_outline_color_dark), + ) + +/** + * An adapter that maps the resource tokens for widget picker light colors to the + * [WidgetPickerColors] accepted by the widget picker module + */ +@Composable +fun lightWidgetPickerColors() = + WidgetPickerColors( + // Bottom Sheet + sheetBackground = colorResource(R.color.widget_picker_primary_surface_color_light), + dragHandle = colorResource(R.color.widget_picker_collapse_handle_color_light), + sheetTitle = colorResource(R.color.widget_picker_title_color_light), + sheetDescription = colorResource(R.color.widget_picker_description_color_light), + + // Expand collapse list + expandCollapseIndicatorIcon = + colorResource(R.color.widget_picker_expand_icon_button_color_light), + expandCollapseIndicatorBackground = + colorResource(R.color.widget_picker_expand_icon_button_background_light), + expandableListItemsBackground = + colorResource(R.color.widget_picker_expandable_list_items_background_light), + expandableListHeaderTitle = + colorResource(R.color.widget_picker_header_app_title_color_light), + expandableListHeaderSubTitle = + colorResource(R.color.widget_picker_header_app_subtitle_color_light), + + // List header + selectedListHeaderBackground = + colorResource(R.color.widget_picker_clickable_list_header_background_light), + unselectedListHeaderBackground = Color.Transparent, + featuredHeaderLeadingIconBackground = + colorResource(R.color.widget_picker_featured_header_icon_background_light), + featuredHeaderLeadingIcon = + colorResource(R.color.widget_picker_featured_header_icon_color_light), + selectedListHeaderTitle = + colorResource(R.color.widget_picker_selected_header_app_title_color_light), + selectedListHeaderSubTitle = + colorResource(R.color.widget_picker_selected_header_app_subtitle_color_light), + unSelectedListHeaderTitle = + colorResource(R.color.widget_picker_header_app_title_color_light), + unSelectedListHeaderSubTitle = + colorResource(R.color.widget_picker_header_app_subtitle_color_light), + + // Error message + noWidgetsErrorText = colorResource(R.color.widget_picker_no_widget_error_color_light), + + // Widgets container + widgetsContainerBackground = + colorResource(R.color.widget_picker_widgets_container_background_light), + + // App icon + placeholderAppIcon = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.2f), + + // Widget details + widgetLabel = colorResource(R.color.widget_cell_title_color_light), + widgetSpanText = colorResource(R.color.widget_cell_subtitle_color_light), + widgetDescription = colorResource(R.color.widget_cell_subtitle_color_light), + addButtonContent = colorResource(R.color.widget_picker_add_button_text_color_light), + addButtonBackground = + colorResource(R.color.widget_picker_add_button_background_color_light), + + // Widget preview + widgetPlaceholderBackground = + colorResource(R.color.widget_picker_preview_placeholder_background_light), + widgetPlaceholderContent = + colorResource(R.color.widget_picker_preview_placeholder_content_light), + + // Floating Toolbar + toolbarBackground = colorResource(R.color.widget_picker_toolbar_background_light), + toolbarTabSelectedBackground = + colorResource(R.color.widget_picker_toolbar_selected_tab_background_light), + toolbarTabUnSelectedBackground = + colorResource(R.color.widget_picker_toolbar_unselected_tab_background_light), + toolbarSelectedTabContent = + colorResource(R.color.widget_picker_toolbar_selected_tab_content_color_light), + toolbarUnSelectedTabContent = + colorResource(R.color.widget_picker_toolbar_unselected_tab_content_color_light), + + // Search bar + searchBarBackground = + colorResource(R.color.widget_picker_search_bar_background_color_light), + searchBarPlaceholderText = colorResource(R.color.widget_picker_search_text_color_light), + searchBarText = colorResource(R.color.widget_picker_search_text_color_light), + searchBarSearchIcon = colorResource(R.color.widget_picker_search_text_color_light), + searchBarClearButtonIcon = colorResource(R.color.widget_picker_search_text_color_light), + searchBarBackButtonIcon = colorResource(R.color.widget_picker_search_text_color_light), + searchBarCursor = colorResource(R.color.widget_picker_search_cursor_color_light), + focusOutline = colorResource(R.color.widget_picker_focus_outline_color_light), + ) diff --git a/compose/features/com/android/launcher3/widgetpicker/theme/Theme.kt b/compose/features/com/android/launcher3/widgetpicker/theme/Theme.kt new file mode 100644 index 00000000000..a8877d0edf0 --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/theme/Theme.kt @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import com.android.launcher3.widgetpicker.ui.theme.WidgetPickerTheme + +/** Contains theme that launcher applies to the widget picker. */ +@Composable +fun LauncherWidgetPickerTheme(content: @Composable () -> Unit) { + val widgetPickerColors = + if (isSystemInDarkTheme()) { + darkWidgetPickerColors() + } else { + lightWidgetPickerColors() + } + + MaterialTheme { + WidgetPickerTheme( + colors = widgetPickerColors, + textStyles = launcherWidgetPickerTextStyles() + ) { + content() + } + } +} diff --git a/compose/features/com/android/launcher3/widgetpicker/theme/Typography.kt b/compose/features/com/android/launcher3/widgetpicker/theme/Typography.kt new file mode 100644 index 00000000000..b8215651f1c --- /dev/null +++ b/compose/features/com/android/launcher3/widgetpicker/theme/Typography.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.theme + +import androidx.compose.runtime.Composable +import com.android.launcher3.R +import com.android.launcher3.util.textStyleFromResource +import com.android.launcher3.widgetpicker.ui.theme.WidgetPickerTextStyles + +/** + * Parses styles from resources (R.style) to prepare [WidgetPickerTextStyles] for use in compose + * theme for widget picker. + */ +@Composable +fun launcherWidgetPickerTextStyles(): WidgetPickerTextStyles { + val searchBarTextStyle = textStyleFromResource(R.style.WidgetSearchBarText) + val widgetHeaderTitleStyle = textStyleFromResource(R.style.WidgetListHeader_Title) + val widgetHeaderSubTitleStyle = textStyleFromResource(R.style.WidgetListHeader_SubTitle) + + return WidgetPickerTextStyles( + sheetTitle = textStyleFromResource(R.style.WidgetsTitle), + sheetDescription = textStyleFromResource(R.style.WidgetPickerDescription), + expandableListHeaderTitle = widgetHeaderTitleStyle, + expandableListHeaderSubTitle = widgetHeaderSubTitleStyle, + unSelectedListHeaderTitle = widgetHeaderTitleStyle, + selectedListHeaderTitle = textStyleFromResource(R.style.WidgetListHeader_Title_Selected), + unSelectedListHeaderSubTitle = widgetHeaderSubTitleStyle, + selectedListHeaderSubTitle = + textStyleFromResource(R.style.WidgetListHeader_SubTitle_Selected), + widgetLabel = textStyleFromResource(R.style.WidgetLabel), + widgetDescription = textStyleFromResource(R.style.WidgetDescription), + widgetSpanText = textStyleFromResource(R.style.WidgetDims), + addWidgetButtonLabel = textStyleFromResource(R.style.WidgetAddButton), + toolbarUnSelectedTabLabel = textStyleFromResource(R.style.WidgetToolbarTabLabel), + toolbarSelectedTabLabel = textStyleFromResource(R.style.WidgetToolbarTabLabel_Selected), + searchBarText = searchBarTextStyle, + searchBarPlaceholderText = searchBarTextStyle, + noWidgetsErrorText = textStyleFromResource(R.style.WidgetErrorText), + ) +} diff --git a/compose/tests/com/android/launcher3/widgetpicker/repository/WidgetsRepositoryImplTest.kt b/compose/tests/com/android/launcher3/widgetpicker/repository/WidgetsRepositoryImplTest.kt new file mode 100644 index 00000000000..68a38a09190 --- /dev/null +++ b/compose/tests/com/android/launcher3/widgetpicker/repository/WidgetsRepositoryImplTest.kt @@ -0,0 +1,485 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widgetpicker.repository + +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProviderInfo +import android.appwidget.AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN +import android.content.ComponentName +import android.content.pm.ActivityInfo +import android.content.pm.ApplicationInfo +import android.content.pm.LauncherActivityInfo +import android.content.pm.LauncherApps +import android.graphics.Bitmap +import android.graphics.drawable.BitmapDrawable +import android.os.Build +import android.os.UserHandle +import android.widget.RemoteViews +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn +import com.android.launcher3.AppFilter +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.LauncherAppState +import com.android.launcher3.R +import com.android.launcher3.icons.IconCache +import com.android.launcher3.icons.cache.CachedObject +import com.android.launcher3.model.WidgetsModel +import com.android.launcher3.model.data.PackageItemInfo +import com.android.launcher3.pm.ShortcutConfigActivityInfo +import com.android.launcher3.util.Executors +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.TestActivityContext +import com.android.launcher3.util.TestUtil +import com.android.launcher3.util.UserIconInfo +import com.android.launcher3.util.WidgetUtils +import com.android.launcher3.util.rule.MockUsersRule +import com.android.launcher3.util.rule.MockUsersRule.MockUser +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo +import com.android.launcher3.widgetpicker.data.repository.WidgetsRepository +import com.android.launcher3.widgetpicker.datasource.FeaturedWidgetsDataSource +import com.android.launcher3.widgetpicker.datasource.InMemoryWidgetSearchAlgorithm +import com.android.launcher3.widgetpicker.shared.model.PickableWidget +import com.android.launcher3.widgetpicker.shared.model.WidgetApp +import com.android.launcher3.widgetpicker.shared.model.WidgetAppId +import com.android.launcher3.widgetpicker.shared.model.WidgetId +import com.android.launcher3.widgetpicker.shared.model.WidgetPreview +import com.android.launcher3.widgetpicker.shared.model.isAppWidget +import com.android.launcher3.widgetpicker.shared.model.isShortcut +import com.google.common.truth.Truth.assertThat +import kotlin.test.assertNotNull +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.runTest +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +@MockUser(userType = UserIconInfo.TYPE_MAIN) +@OptIn(ExperimentalCoroutinesApi::class) +class WidgetsRepositoryImplTest { + @get:Rule val mockitoRule: MockitoRule = MockitoJUnit.rule() + + @get:Rule val context = SandboxApplication() + + @get:Rule val uiContext = TestActivityContext(context, R.style.WidgetContainerTheme) + + @get:Rule var mMockUsersRule: MockUsersRule = MockUsersRule(context) + + private val testDispatcher = UnconfinedTestDispatcher() + private val testScope = TestScope(testDispatcher) + + @Mock private lateinit var iconCacheMock: IconCache + + @Mock private lateinit var appFilterMock: AppFilter + + @Mock lateinit var mockShortcutLauncherActivityInfo: LauncherActivityInfo + + @Mock lateinit var mockActivityInfo: ActivityInfo + + @Mock lateinit var mockApplicationInfo: ApplicationInfo + + private lateinit var user: UserHandle + private lateinit var idp: InvariantDeviceProfile + private lateinit var appWidgetManager: AppWidgetManager + private lateinit var launcherApps: LauncherApps + private lateinit var generatedPreview: RemoteViews + + private lateinit var underTest: WidgetsRepository + + @Before + fun setup() { + idp = InvariantDeviceProfile.INSTANCE[uiContext] + + underTest = + WidgetsRepositoryImpl( + appContext = context, + idp = idp, + widgetsModel = WidgetsModel(context, idp, iconCacheMock, appFilterMock), + featuredWidgetsDataSource = FakeFeaturedDataSource, + searchAlgorithm = InMemoryWidgetSearchAlgorithm(testDispatcher), + backgroundContext = testDispatcher, + ) + + generatedPreview = RemoteViews(context.packageName, GENERATED_PREVIEW_LAYOUT_ID) + appWidgetManager = context.spyService(AppWidgetManager::class.java) + launcherApps = context.spyService(LauncherApps::class.java) + + whenever(appFilterMock.shouldShowApp(any())).thenReturn(true) + seedAppTitles() + seedWidgetAndShortcutTitles() + + user = mMockUsersRule.findUser { it.isMain } + seedShortcutInLauncherApps(user) + seedWidgetsInAppWidgetManager(user) + } + + @After + fun tearDown() { + underTest.cleanUp() + } + + private fun seedAppTitles() { + whenever(iconCacheMock.getTitleAndIconForApp(any(), any())).thenAnswer { + (it.arguments[0] as PackageItemInfo).apply { title = packageName.simpleName() } + } + } + + private fun seedWidgetAndShortcutTitles() { + whenever(iconCacheMock.getTitleNoCache(any())).thenAnswer { + (it.arguments[0] as CachedObject).let { info -> + when (info) { + is LauncherAppWidgetProviderInfo -> { + info.component.className + } + + is ShortcutConfigActivityInfo -> { + info.component.className + } + + else -> "title" + } + } + } + } + + private fun seedWidgetsInAppWidgetManager(user: UserHandle) { + whenever(appWidgetManager.getInstalledProvidersForProfile(user)) + .thenReturn(listOf(App1Widget1ProviderInfo, App2Widget1ProviderInfo)) + whenever(appWidgetManager.getInstalledProvidersForPackage(APP_1_PACKAGE_NAME, user)) + .thenReturn(listOf(App1Widget1ProviderInfo)) + whenever(appWidgetManager.getInstalledProvidersForPackage(APP_2_PACKAGE_NAME, user)) + .thenReturn(listOf(App2Widget1ProviderInfo)) + + doAnswer { i -> + generatedPreview.takeIf { + i.arguments[0] == App2Widget1ProviderName && + i.arguments[1] == user && + i.arguments[2] == WIDGET_CATEGORY_HOME_SCREEN + } + } + .whenever(appWidgetManager) + .getWidgetPreview(any(), any(), any()) + } + + private fun seedShortcutInLauncherApps(user: UserHandle) { + mockApplicationInfo.targetSdkVersion = Build.VERSION_CODES.BAKLAVA + mockActivityInfo.apply { whenever(componentName).thenReturn(App1Shortcut1Name) } + + mockShortcutLauncherActivityInfo.apply { + whenever(componentName).thenReturn(App1Shortcut1Name) + whenever(applicationInfo).thenReturn(mockApplicationInfo) + whenever(activityInfo).thenReturn(mockActivityInfo) + whenever(getUser()).thenReturn(user) + } + + whenever(launcherApps.getShortcutConfigActivityList(eq(null), eq(user))) + .thenReturn(listOf(mockShortcutLauncherActivityInfo)) + whenever(launcherApps.getShortcutConfigActivityList(eq(APP_1_PACKAGE_NAME), eq(user))) + .thenReturn(listOf(mockShortcutLauncherActivityInfo)) + whenever(launcherApps.getShortcutConfigActivityList(eq(APP_2_PACKAGE_NAME), eq(user))) + .thenReturn(listOf()) + + val iconCache = LauncherAppState.INSTANCE[context].iconCache + spyOn(iconCache) + doReturn(ShortcutPreviewDrawable).whenever(iconCache).getFullResIcon(any()) + } + + @Test + @MockUser(userType = UserIconInfo.TYPE_MAIN) + fun initializeAndObserveWidgets_widgetsAndShortcutsMappedCorrectly() = + testScope.runTest { + underTest.initialize() + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + val widgetApps = underTest.observeWidgets().first() + + // 2 apps; first with a widget an shortcut and second with just a widget + assertThat(widgetApps).hasSize(2) + val expectedWidgetApp1Id = + WidgetAppId(packageName = APP_1_PACKAGE_NAME, userHandle = user, category = -1) + val expectedWidgetApp2Id = + WidgetAppId(packageName = APP_2_PACKAGE_NAME, userHandle = user, category = -1) + val expectedWidget1AId = WidgetId(App1Widget1ProviderName, user) + val expectedShortcut1BId = WidgetId(App1Shortcut1Name, user) + val expectedWidget2AId = WidgetId(App2Widget1ProviderName, user) + + val app1 = assertNotNull(widgetApps.find { it.id == expectedWidgetApp1Id }) + app1.apply { + assertThat(title).isEqualTo(APP_1) + assertThat(widgets).hasSize(2) + + val widget1A = assertNotNull(app1.widgets.find { it.id == expectedWidget1AId }) + assertThat(widget1A.widgetInfo.isAppWidget()).isTrue() + assertThat(widget1A.label).isEqualTo(WIDGET_1A_NAME) + + val shortcut1B = assertNotNull(app1.widgets.find { it.id == expectedShortcut1BId }) + assertThat(shortcut1B.widgetInfo.isShortcut()).isTrue() + assertThat(shortcut1B.label).isEqualTo(SHORTCUT_1B_NAME) + } + + val app2 = assertNotNull(widgetApps.find { it.id == expectedWidgetApp2Id }) + app2.apply { + assertThat(app2.title).isEqualTo(APP_2) + assertThat(app2.widgets).hasSize(1) + + val widget2A = assertNotNull(app2.widgets.find { it.id == expectedWidget2AId }) + assertThat(widget2A.widgetInfo.isAppWidget()).isTrue() + assertThat(widget2A.label).isEqualTo(WIDGET_2A_NAME) + } + } + + @Test + fun initializeWidgetAppAndObserve_appOne_hasAWidgetAndAShortcut() = + testScope.runTest { + val widgetAppId = + WidgetAppId(packageName = APP_1_PACKAGE_NAME, userHandle = user, category = -1) + + underTest.initialize( + WidgetsRepository.InitializationOptions( + widgetAppId = widgetAppId, + loadFeaturedWidgets = false, + ) + ) + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + val widgetApp = underTest.observeWidgetApp(widgetAppId = widgetAppId).first() + + assertThat(widgetApp).isNotNull() + widgetApp?.apply { + assertThat(title).isEqualTo(APP_1) + assertThat(widgets).hasSize(2) + + val expectedWidget1AId = WidgetId(App1Widget1ProviderName, user) + val widget1A = assertNotNull(widgets.find { it.id == expectedWidget1AId }) + assertThat(widget1A.widgetInfo.isAppWidget()).isTrue() + assertThat(widget1A.label).isEqualTo(WIDGET_1A_NAME) + + val expectedShortcut1BId = WidgetId(App1Shortcut1Name, user) + val shortcut1B = assertNotNull(widgets.find { it.id == expectedShortcut1BId }) + assertThat(shortcut1B.widgetInfo.isShortcut()).isTrue() + assertThat(shortcut1B.label).isEqualTo(SHORTCUT_1B_NAME) + } + } + + @Test + fun initializeWidgetAppAndObserve_appTwo_hasOnlyAWidget() = + testScope.runTest { + val widgetAppId = + WidgetAppId(packageName = APP_2_PACKAGE_NAME, userHandle = user, category = -1) + + underTest.initialize( + WidgetsRepository.InitializationOptions( + widgetAppId = widgetAppId, + loadFeaturedWidgets = false, + ) + ) + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + val widgetApp = underTest.observeWidgetApp(widgetAppId = widgetAppId).first() + + assertThat(widgetApp).isNotNull() + widgetApp?.apply { + assertThat(title).isEqualTo(APP_2) + assertThat(widgets).hasSize(1) + + val expectedWidget2AId = WidgetId(App2Widget1ProviderName, user) + val widget2A = assertNotNull(widgets.find { it.id == expectedWidget2AId }) + assertThat(widget2A.widgetInfo.isAppWidget()).isTrue() + assertThat(widget2A.label).isEqualTo(WIDGET_2A_NAME) + } + } + + @Test + fun searchWidgets_returnsMatchedWidgetsAndShortcuts() = + testScope.runTest { + val query = APP_1 + underTest.initialize() + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + val result = underTest.searchWidgets(query) + + assertThat(result).hasSize(1) + assertThat(result[0].title).isEqualTo(APP_1) + // the widget and the shortcut from app1 + assertThat(result[0].widgets).hasSize(2) + } + + @Test + fun getWidgetPreview_widgetInfoNotAvailable_returnsPlaceholder() = + testScope.runTest { + underTest.initialize() + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + // If for some reason, widget's info wasn't available, maybe package updated, a + // placeholder + // will show up + val preview = + underTest.getWidgetPreview( + WidgetId( + componentName = ComponentName("unknownPackage", "unknownWidget"), + userHandle = user, + ) + ) + + assertThat(preview).isInstanceOf(WidgetPreview.PlaceholderWidgetPreview::class.java) + } + + @Test + fun getWidgetPreview_layoutXml_returnsProviderInfoPreview() = + testScope.runTest { + underTest.initialize() + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + // in the seeded data, widget 1 from app1 uses layout xml + val preview = underTest.getWidgetPreview(WidgetId(App1Widget1ProviderName, user)) + + assertThat(preview).isInstanceOf(WidgetPreview.ProviderInfoWidgetPreview::class.java) + // Initial layout set as the preview layout. + assertThat( + (preview as WidgetPreview.ProviderInfoWidgetPreview).providerInfo.initialLayout + ) + .isEqualTo(PREVIEW_LAYOUT_ID) + } + + @Test + fun getWidgetPreview_generatedPreview_returnsRemoteViewsPreview() = + testScope.runTest { + underTest.initialize() + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + // in the seeded data, widget 1 from app2 uses generated preview + val preview = underTest.getWidgetPreview(WidgetId(App2Widget1ProviderName, user)) + + assertThat(preview).isInstanceOf(WidgetPreview.RemoteViewsWidgetPreview::class.java) + assertThat((preview as WidgetPreview.RemoteViewsWidgetPreview).remoteViews.layoutId) + .isEqualTo(GENERATED_PREVIEW_LAYOUT_ID) + } + + @Test + fun getWidgetPreview_shortcut_returnsBitmapPreview() = + testScope.runTest { + underTest.initialize() + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + val preview = underTest.getWidgetPreview(WidgetId(App1Shortcut1Name, user)) + + assertThat(preview).isInstanceOf(WidgetPreview.BitmapWidgetPreview::class.java) + } + + @Test + fun cleanUp_clearsState() = + testScope.runTest { + underTest.initialize() + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + assertThat(underTest.observeWidgets().first()).isNotEmpty() + assertThat(underTest.getFeaturedWidgets().first()).isNotEmpty() + + underTest.cleanUp() + + assertThat(underTest.observeWidgets().first()).isEmpty() + assertThat(underTest.getFeaturedWidgets().first()).isEmpty() + } + + @Test + fun getFeaturedWidgets_returnsFromDataSource() = + testScope.runTest { + underTest.initialize() + TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) {} + + val result = underTest.getFeaturedWidgets().first() + + assertThat(result).hasSize(1) + } + + companion object { + const val APP_1 = "app1" + const val APP_1_PACKAGE_NAME = "com.test.app1" + const val WIDGET_1A_NAME = "TestWidgetProvider1A" + const val SHORTCUT_1B_NAME = "TestShortcut1B" + + const val APP_2 = "app2" + const val APP_2_PACKAGE_NAME = "com.test.app2" + const val WIDGET_2A_NAME = "TestWidgetProvider2A" + + private val PREVIEW_LAYOUT_ID = + getInstrumentation().context.run { + resources.getIdentifier("test_layout_appwidget_view", "layout", packageName) + } + private val GENERATED_PREVIEW_LAYOUT_ID = + getInstrumentation().context.run { + resources.getIdentifier("test_layout_appwidget_blue", "layout", packageName) + } + private val ShortcutPreviewDrawable = + BitmapDrawable( + getInstrumentation().context.resources, + Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888), + ) + + val App1Widget1ProviderName = ComponentName(APP_1_PACKAGE_NAME, WIDGET_1A_NAME) + val App1Widget1ProviderInfo: AppWidgetProviderInfo = + WidgetUtils.createAppWidgetProviderInfo(App1Widget1ProviderName).apply { + previewLayout = PREVIEW_LAYOUT_ID + } + + val App1Shortcut1Name = ComponentName(APP_1_PACKAGE_NAME, SHORTCUT_1B_NAME) + + val App2Widget1ProviderName = ComponentName(APP_2_PACKAGE_NAME, WIDGET_2A_NAME) + val App2Widget1ProviderInfo: AppWidgetProviderInfo = + WidgetUtils.createAppWidgetProviderInfo(App2Widget1ProviderName).apply { + generatedPreviewCategories = WIDGET_CATEGORY_HOME_SCREEN + } + + private fun String.simpleName() = split(".").last() + + val FakeFeaturedDataSource = + object : FeaturedWidgetsDataSource { + var eligibleApps = emptyList() + + override suspend fun initialize() { + eligibleApps = listOf(APP_2_PACKAGE_NAME) + } + + override suspend fun getFeaturedWidgets( + widgetApps: List + ): List = + widgetApps + .filter { eligibleApps.contains(it.id.packageName) } + .map { it.widgets[0] } + + override fun cleanup() { + eligibleApps = emptyList() + } + } + } +} diff --git a/dagger/Android.bp b/dagger/Android.bp new file mode 100644 index 00000000000..b37e1d60d63 --- /dev/null +++ b/dagger/Android.bp @@ -0,0 +1,31 @@ +// Copyright (C) 2025 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +java_library { + name: "launcher-dagger-qualifiers", + srcs: [ + "src/com/android/launcher3/dagger/ActivityContextSingleton.java", + "src/com/android/launcher3/dagger/ApplicationContext.java", + "src/com/android/launcher3/dagger/LauncherAppSingleton.java", + ], + static_libs: [ + "androidx.annotation_annotation", + "jsr330", + ], +} diff --git a/dagger/build.gradle b/dagger/build.gradle new file mode 100644 index 00000000000..376a1f8e388 --- /dev/null +++ b/dagger/build.gradle @@ -0,0 +1,17 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +android { + namespace "com.android.launcher3.dagger" + sourceSets { + main { + java.srcDirs = ['src'] + } + } +} + +dependencies { + implementation libs.javax.inject +} diff --git a/dagger/src/com/android/launcher3/dagger/ActivityContextSingleton.java b/dagger/src/com/android/launcher3/dagger/ActivityContextSingleton.java new file mode 100644 index 00000000000..dd7510cea91 --- /dev/null +++ b/dagger/src/com/android/launcher3/dagger/ActivityContextSingleton.java @@ -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.launcher3.dagger; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import javax.inject.Scope; + +/** + * Scope annotation for singletons associated with Launcher activity context. + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Scope +public @interface ActivityContextSingleton { +} diff --git a/dagger/src/com/android/launcher3/dagger/ApplicationContext.java b/dagger/src/com/android/launcher3/dagger/ApplicationContext.java new file mode 100644 index 00000000000..9a5b08b51bc --- /dev/null +++ b/dagger/src/com/android/launcher3/dagger/ApplicationContext.java @@ -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.launcher3.dagger; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import javax.inject.Qualifier; + +/** + * Qualifier for Launcher application context. + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Qualifier +public @interface ApplicationContext { +} diff --git a/dagger/src/com/android/launcher3/dagger/LauncherAppSingleton.java b/dagger/src/com/android/launcher3/dagger/LauncherAppSingleton.java new file mode 100644 index 00000000000..92c00b6d859 --- /dev/null +++ b/dagger/src/com/android/launcher3/dagger/LauncherAppSingleton.java @@ -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.launcher3.dagger; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import javax.inject.Scope; + +/** + * Scope annotation for singleton items within the LauncherAppComponent. + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Scope +public @interface LauncherAppSingleton { +} diff --git a/docs/assets/README.md b/docs/assets/README.md index 51ef527d050..30e6cb75683 100644 --- a/docs/assets/README.md +++ b/docs/assets/README.md @@ -1,21 +1,19 @@ -# Lawnchair Visual Guidelines +# Lawnchair Assets Guidelines This directory lists all the decoration & visual explainers used in the Lawnchair Documentation. -All assets created should use Material 3 design with `#47B84F` as source color and +All assets created should use Material 3 design with `#47B84F` as source color, and the [Inter](https://fonts.google.com/specimen/Inter) ([OFL v1.1](https://github.com/rsms/inter/?tab=OFL-1.1-1-ov-file#readme)) -typography. Visit the [Material 3 theme builder][material-theme-builder] for more information. +typography. -When creating device mockups for Lawnchair, make sure that you're using the latest commits of -Lawnchair or use Lawnchair Nightly as base. +Visit the [Material 3 theme builder][material-theme-builder] for more information on color. -## Device Mockup +## Device mockup -Use in: [README](/README.md) - -* Icon pack: [Lawnicons](https://github.com/LawnchairLauncher/lawnicons) -* Wallpaper: https://unsplash.com/photos/photography-of-green-leaves-ZVKr8wADhpc -* Color Extraction Technique: Tonal Spot from Lawnchair -* License: https://unsplash.com/license +When creating device mockups for Lawnchair, make sure the latest stable commits of Lawnchair is use +as base. All wallpapers, fonts and icon packs are allowed as long as they're free-to-use +under a permissive license like the licenses from Creative-Common. Using vanilla out-of-the-box +experience is recommended because they show the user what to expect from Lawnchair Launcher when +they first use it. [material-theme-builder]: https://material-foundation.github.io/material-theme-builder/?primary=%2347B84F&bodyFont=Inter&displayFont=Inter&colorMatch=false diff --git a/docs/assets/badge-github.png b/docs/assets/badge-github.png deleted file mode 100644 index 5129ff38b71..00000000000 Binary files a/docs/assets/badge-github.png and /dev/null differ diff --git a/docs/assets/badge-github.webp b/docs/assets/badge-github.webp new file mode 100644 index 00000000000..591b6b5a51a Binary files /dev/null and b/docs/assets/badge-github.webp differ diff --git a/docs/assets/badge-google-play.png b/docs/assets/badge-google-play.png deleted file mode 100644 index 1d17b6aa53a..00000000000 Binary files a/docs/assets/badge-google-play.png and /dev/null differ diff --git a/docs/assets/badge-google-play.webp b/docs/assets/badge-google-play.webp new file mode 100644 index 00000000000..0f0a32ac035 Binary files /dev/null and b/docs/assets/badge-google-play.webp differ diff --git a/docs/assets/badge-izzyondroid.png b/docs/assets/badge-izzyondroid.png deleted file mode 100644 index c97854de0b0..00000000000 Binary files a/docs/assets/badge-izzyondroid.png and /dev/null differ diff --git a/docs/assets/badge-izzyondroid.webp b/docs/assets/badge-izzyondroid.webp new file mode 100644 index 00000000000..e9ff9482088 Binary files /dev/null and b/docs/assets/badge-izzyondroid.webp differ diff --git a/docs/assets/badge-obtainium.png b/docs/assets/badge-obtainium.png deleted file mode 100644 index c5cee26fca8..00000000000 Binary files a/docs/assets/badge-obtainium.png and /dev/null differ diff --git a/docs/assets/badge-obtainium.webp b/docs/assets/badge-obtainium.webp new file mode 100644 index 00000000000..2629c812c2e Binary files /dev/null and b/docs/assets/badge-obtainium.webp differ diff --git a/docs/assets/device-frame.png b/docs/assets/device-frame.png deleted file mode 100644 index 46a4d3fa126..00000000000 Binary files a/docs/assets/device-frame.png and /dev/null differ diff --git a/docs/assets/device-frame.webp b/docs/assets/device-frame.webp new file mode 100644 index 00000000000..c90e3539341 Binary files /dev/null and b/docs/assets/device-frame.webp differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/device-frame.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-frame.jpg index 70a926b3c8d..e67c6542414 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/device-frame.jpg and b/fastlane/metadata/android/en-US/images/phoneScreenshots/device-frame.jpg differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt index 7af858c97b3..7a8ca7d1d36 100644 --- a/fastlane/metadata/android/en-US/short_description.txt +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -1 +1 @@ -Homescreen based on on Launcher3 from AOSP \ No newline at end of file +Homescreen based on Launcher3 from AOSP diff --git a/flags/README.md b/flags/README.md new file mode 100644 index 00000000000..a2330d711e0 --- /dev/null +++ b/flags/README.md @@ -0,0 +1,33 @@ +# Flags + +Turn SRCJAR into JAR and paste the launcher3 contents into the current Launcher3 flags. + +Remove all aconfig flags + +## Launcher3 Flags + +out\soong\.intermediates\packages\apps\Launcher3\aconfig\com_android_launcher3_flags_lib\android_common\gen\com_android_launcher3_flags_lib.srcjar + +## SystemUI + +out\soong\.intermediates\frameworks\base\packages\SystemUI\aconfig\com_android_systemui_flags_lib\android_common\gen\com_android_systemui_flags_lib.srcjar + +### SystemUI Shared + +out\soong\.intermediates\frameworks\libs\systemui\aconfig\com_android_systemui_shared_flags_lib\android_common\gen\com_android_systemui_shared_flags_lib.srcjar + +## Window.flags2 + +out\soong\.intermediates\frameworks\base\com.android.window.flags.window-aconfig-java\android_common\gen\com.android.window.flags.window-aconfig-java.srcjar + +Change from windows.flag to windows.flags2 + +## WM Shell + +out\soong\.intermediates\frameworks\base\libs\WindowManager\Shell\aconfig\com_android_wm_shell_flags_lib\android_common\gen\com_android_wm_shell_flags_lib.srcjar + +## AM (ActivityManager) + +out\soong\.intermediates\frameworks\base\services\core\java\com\android\server\am\am_flags_lib\android_common\gen\am_flags_lib.srcjar + +Command: `m am` diff --git a/flags/build.gradle b/flags/build.gradle index 0dd01c027a8..0c48461a595 100644 --- a/flags/build.gradle +++ b/flags/build.gradle @@ -12,5 +12,5 @@ android { } } -addFrameworkJar('framework-15.jar') +addFrameworkJar('framework-16.jar') compileOnlyCommonJars() diff --git a/flags/src/com/android/launcher3/CustomFeatureFlags.java b/flags/src/com/android/launcher3/CustomFeatureFlags.java index e3b74b8dbc3..51f4192d0fb 100644 --- a/flags/src/com/android/launcher3/CustomFeatureFlags.java +++ b/flags/src/com/android/launcher3/CustomFeatureFlags.java @@ -1,12 +1,12 @@ package com.android.launcher3; + import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.BiPredicate; import java.util.function.Predicate; - /** @hide */ public class CustomFeatureFlags implements FeatureFlags { @@ -16,307 +16,777 @@ public CustomFeatureFlags(BiPredicate> getValueI mGetValueImpl = getValueImpl; } @Override - public boolean enableAddAppWidgetViaConfigActivityV2() { - return getValue(Flags.FLAG_ENABLE_ADD_APP_WIDGET_VIA_CONFIG_ACTIVITY_V2, - FeatureFlags::enableAddAppWidgetViaConfigActivityV2); + + public boolean accessibilityScrollOnAllapps() { + return getValue(Flags.FLAG_ACCESSIBILITY_SCROLL_ON_ALLAPPS, + FeatureFlags::accessibilityScrollOnAllapps); + } + + @Override + + public boolean allAppsBlur() { + return getValue(Flags.FLAG_ALL_APPS_BLUR, + FeatureFlags::allAppsBlur); + } + + @Override + + public boolean allAppsSheetForHandheld() { + return getValue(Flags.FLAG_ALL_APPS_SHEET_FOR_HANDHELD, + FeatureFlags::allAppsSheetForHandheld); + } + + @Override + + public boolean avoidDisplayCutoutBubbleBar() { + return getValue(Flags.FLAG_AVOID_DISPLAY_CUTOUT_BUBBLE_BAR, + FeatureFlags::avoidDisplayCutoutBubbleBar); + } + + @Override + + public boolean blurredHomeAnimation() { + return getValue(Flags.FLAG_BLURRED_HOME_ANIMATION, + FeatureFlags::blurredHomeAnimation); + } + + @Override + + public boolean clearScrimOnReset() { + return getValue(Flags.FLAG_CLEAR_SCRIM_ON_RESET, + FeatureFlags::clearScrimOnReset); + } + + @Override + + public boolean enableAllAppsButtonInHotseat() { + return getValue(Flags.FLAG_ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT, + FeatureFlags::enableAllAppsButtonInHotseat); + } + + @Override + + public boolean enableAltTabKqsFlatenning() { + return getValue(Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING, + FeatureFlags::enableAltTabKqsFlatenning); + } + + @Override + + public boolean enableAltTabKqsOnConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS, + FeatureFlags::enableAltTabKqsOnConnectedDisplays); + } + + @Override + + public boolean enableAppWidgetPickerRefactor() { + return getValue(Flags.FLAG_ENABLE_APP_WIDGET_PICKER_REFACTOR, + FeatureFlags::enableAppWidgetPickerRefactor); } @Override - public boolean enableAdditionalHomeAnimations() { - return getValue(Flags.FLAG_ENABLE_ADDITIONAL_HOME_ANIMATIONS, - FeatureFlags::enableAdditionalHomeAnimations); + + public boolean enableAutoStashConnectedDisplayTaskbar() { + return getValue(Flags.FLAG_ENABLE_AUTO_STASH_CONNECTED_DISPLAY_TASKBAR, + FeatureFlags::enableAutoStashConnectedDisplayTaskbar); } @Override + public boolean enableCategorizedWidgetSuggestions() { return getValue(Flags.FLAG_ENABLE_CATEGORIZED_WIDGET_SUGGESTIONS, - FeatureFlags::enableCategorizedWidgetSuggestions); + FeatureFlags::enableCategorizedWidgetSuggestions); + } + + @Override + + public boolean enableContrastTiles() { + return getValue(Flags.FLAG_ENABLE_CONTRAST_TILES, + FeatureFlags::enableContrastTiles); } @Override - public boolean enableCursorHoverStates() { - return getValue(Flags.FLAG_ENABLE_CURSOR_HOVER_STATES, - FeatureFlags::enableCursorHoverStates); + + public boolean enableCursorDrivenWorkflows() { + return getValue(Flags.FLAG_ENABLE_CURSOR_DRIVEN_WORKFLOWS, + FeatureFlags::enableCursorDrivenWorkflows); } @Override + + public boolean enableCustomHeightForAllAppsOnCd() { + return getValue(Flags.FLAG_ENABLE_CUSTOM_HEIGHT_FOR_ALL_APPS_ON_CD, + FeatureFlags::enableCustomHeightForAllAppsOnCd); + } + + @Override + + public boolean enableDesktopExplodedView() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_EXPLODED_VIEW, + FeatureFlags::enableDesktopExplodedView); + } + + @Override + public boolean enableExpandingPauseWorkButton() { return getValue(Flags.FLAG_ENABLE_EXPANDING_PAUSE_WORK_BUTTON, - FeatureFlags::enableExpandingPauseWorkButton); + FeatureFlags::enableExpandingPauseWorkButton); + } + + @Override + + public boolean enableExpressiveDismissTaskMotion() { + return getValue(Flags.FLAG_ENABLE_EXPRESSIVE_DISMISS_TASK_MOTION, + FeatureFlags::enableExpressiveDismissTaskMotion); + } + + @Override + + public boolean enableExpressiveFolderExpansion() { + return getValue(Flags.FLAG_ENABLE_EXPRESSIVE_FOLDER_EXPANSION, + FeatureFlags::enableExpressiveFolderExpansion); } @Override + public boolean enableFallbackOverviewInWindow() { return getValue(Flags.FLAG_ENABLE_FALLBACK_OVERVIEW_IN_WINDOW, - FeatureFlags::enableFallbackOverviewInWindow); + FeatureFlags::enableFallbackOverviewInWindow); } @Override + public boolean enableFirstScreenBroadcastArchivingExtras() { return getValue(Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS, - FeatureFlags::enableFirstScreenBroadcastArchivingExtras); + FeatureFlags::enableFirstScreenBroadcastArchivingExtras); } @Override + public boolean enableFocusOutline() { return getValue(Flags.FLAG_ENABLE_FOCUS_OUTLINE, - FeatureFlags::enableFocusOutline); + FeatureFlags::enableFocusOutline); } @Override - public boolean enableGeneratedPreviews() { - return getValue(Flags.FLAG_ENABLE_GENERATED_PREVIEWS, - FeatureFlags::enableGeneratedPreviews); - } - @Override - public boolean enableGridMigrationFix() { - return getValue(Flags.FLAG_ENABLE_GRID_MIGRATION_FIX, - FeatureFlags::enableGridMigrationFix); + public boolean enableGestureNavOnConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS, + FeatureFlags::enableGestureNavOnConnectedDisplays); } @Override + public boolean enableGridOnlyOverview() { return getValue(Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, - FeatureFlags::enableGridOnlyOverview); + FeatureFlags::enableGridOnlyOverview); } @Override - public boolean enableHandleDelayedGestureCallbacks() { - return getValue(Flags.FLAG_ENABLE_HANDLE_DELAYED_GESTURE_CALLBACKS, - FeatureFlags::enableHandleDelayedGestureCallbacks); + + public boolean enableGrowthNudge() { + return getValue(Flags.FLAG_ENABLE_GROWTH_NUDGE, + FeatureFlags::enableGrowthNudge); } @Override + public boolean enableHomeTransitionListener() { return getValue(Flags.FLAG_ENABLE_HOME_TRANSITION_LISTENER, - FeatureFlags::enableHomeTransitionListener); + FeatureFlags::enableHomeTransitionListener); } @Override + + public boolean enableLaterIsLockedCheck() { + return getValue(Flags.FLAG_ENABLE_LATER_IS_LOCKED_CHECK, + FeatureFlags::enableLaterIsLockedCheck); + } + + @Override + public boolean enableLauncherBrMetricsFixed() { return getValue(Flags.FLAG_ENABLE_LAUNCHER_BR_METRICS_FIXED, - FeatureFlags::enableLauncherBrMetricsFixed); + FeatureFlags::enableLauncherBrMetricsFixed); } @Override + + public boolean enableLauncherIconShapes() { + return getValue(Flags.FLAG_ENABLE_LAUNCHER_ICON_SHAPES, + FeatureFlags::enableLauncherIconShapes); + } + + @Override + + public boolean enableLauncherOverviewInWindow() { + return getValue(Flags.FLAG_ENABLE_LAUNCHER_OVERVIEW_IN_WINDOW, + FeatureFlags::enableLauncherOverviewInWindow); + } + + @Override + + public boolean enableLauncherVisualRefresh() { + return getValue(Flags.FLAG_ENABLE_LAUNCHER_VISUAL_REFRESH, + FeatureFlags::enableLauncherVisualRefresh); + } + + @Override + + public boolean enableMetaTabToggleInOverview() { + return getValue(Flags.FLAG_ENABLE_META_TAB_TOGGLE_IN_OVERVIEW, + FeatureFlags::enableMetaTabToggleInOverview); + } + + @Override + + public boolean enableMouseInteractionChanges() { + return getValue(Flags.FLAG_ENABLE_MOUSE_INTERACTION_CHANGES, + FeatureFlags::enableMouseInteractionChanges); + } + + @Override + + public boolean enableMultiInstanceMenuTaskbar() { + return getValue(Flags.FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR, + FeatureFlags::enableMultiInstanceMenuTaskbar); + } + + @Override + public boolean enableNarrowGridRestore() { return getValue(Flags.FLAG_ENABLE_NARROW_GRID_RESTORE, - FeatureFlags::enableNarrowGridRestore); + FeatureFlags::enableNarrowGridRestore); + } + + @Override + + public boolean enableNewAllSetAnimation() { + return getValue(Flags.FLAG_ENABLE_NEW_ALL_SET_ANIMATION, + FeatureFlags::enableNewAllSetAnimation); } @Override + + public boolean enableOverviewBackgroundWallpaperBlur() { + return getValue(Flags.FLAG_ENABLE_OVERVIEW_BACKGROUND_WALLPAPER_BLUR, + FeatureFlags::enableOverviewBackgroundWallpaperBlur); + } + + @Override + + public boolean enableOverviewDesktopTileWallpaperBackground() { + return getValue(Flags.FLAG_ENABLE_OVERVIEW_DESKTOP_TILE_WALLPAPER_BACKGROUND, + FeatureFlags::enableOverviewDesktopTileWallpaperBackground); + } + + @Override + public boolean enableOverviewIconMenu() { return getValue(Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, - FeatureFlags::enableOverviewIconMenu); + FeatureFlags::enableOverviewIconMenu); } @Override - public boolean enablePredictiveBackGesture() { - return getValue(Flags.FLAG_ENABLE_PREDICTIVE_BACK_GESTURE, - FeatureFlags::enablePredictiveBackGesture); + + public boolean enableOverviewOnConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_OVERVIEW_ON_CONNECTED_DISPLAYS, + FeatureFlags::enableOverviewOnConnectedDisplays); + } + + @Override + + public boolean enablePredictiveBackInOverview() { + return getValue(Flags.FLAG_ENABLE_PREDICTIVE_BACK_IN_OVERVIEW, + FeatureFlags::enablePredictiveBackInOverview); } @Override + + public boolean enablePreventOverviewMouseDrag() { + return getValue(Flags.FLAG_ENABLE_PREVENT_OVERVIEW_MOUSE_DRAG, + FeatureFlags::enablePreventOverviewMouseDrag); + } + + @Override + public boolean enablePrivateSpace() { return getValue(Flags.FLAG_ENABLE_PRIVATE_SPACE, - FeatureFlags::enablePrivateSpace); + FeatureFlags::enablePrivateSpace); } @Override - public boolean enablePrivateSpaceInstallShortcut() { - return getValue(Flags.FLAG_ENABLE_PRIVATE_SPACE_INSTALL_SHORTCUT, - FeatureFlags::enablePrivateSpaceInstallShortcut); + + public boolean enableQsbOnHotseat() { + return getValue(Flags.FLAG_ENABLE_QSB_ON_HOTSEAT, + FeatureFlags::enableQsbOnHotseat); } @Override + public boolean enableRebootUnlockAnimation() { return getValue(Flags.FLAG_ENABLE_REBOOT_UNLOCK_ANIMATION, - FeatureFlags::enableRebootUnlockAnimation); + FeatureFlags::enableRebootUnlockAnimation); } @Override + public boolean enableRecentsInTaskbar() { return getValue(Flags.FLAG_ENABLE_RECENTS_IN_TASKBAR, - FeatureFlags::enableRecentsInTaskbar); + FeatureFlags::enableRecentsInTaskbar); + } + + @Override + + public boolean enableRecentsWindowProtoLog() { + return getValue(Flags.FLAG_ENABLE_RECENTS_WINDOW_PROTO_LOG, + FeatureFlags::enableRecentsWindowProtoLog); + } + + @Override + + public boolean enableRefactorDigitalWellbeingToast() { + return getValue(Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST, + FeatureFlags::enableRefactorDigitalWellbeingToast); + } + + @Override + + public boolean enableRefactorTaskContentView() { + return getValue(Flags.FLAG_ENABLE_REFACTOR_TASK_CONTENT_VIEW, + FeatureFlags::enableRefactorTaskContentView); } @Override + public boolean enableRefactorTaskThumbnail() { return getValue(Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL, - FeatureFlags::enableRefactorTaskThumbnail); + FeatureFlags::enableRefactorTaskThumbnail); } @Override + public boolean enableResponsiveWorkspace() { return getValue(Flags.FLAG_ENABLE_RESPONSIVE_WORKSPACE, - FeatureFlags::enableResponsiveWorkspace); + FeatureFlags::enableResponsiveWorkspace); } @Override - public boolean enableScalingRevealHomeAnimation() { - return getValue(Flags.FLAG_ENABLE_SCALING_REVEAL_HOME_ANIMATION, - FeatureFlags::enableScalingRevealHomeAnimation); + + public boolean enableReversibleHomeActionCorner() { + return getValue(Flags.FLAG_ENABLE_REVERSIBLE_HOME_ACTION_CORNER, + FeatureFlags::enableReversibleHomeActionCorner); } @Override - public boolean enableShortcutDontSuggestApp() { - return getValue(Flags.FLAG_ENABLE_SHORTCUT_DONT_SUGGEST_APP, - FeatureFlags::enableShortcutDontSuggestApp); + + public boolean enableScalabilityForDesktopExperience() { + return getValue(Flags.FLAG_ENABLE_SCALABILITY_FOR_DESKTOP_EXPERIENCE, + FeatureFlags::enableScalabilityForDesktopExperience); } @Override - public boolean enableSmartspaceAsAWidget() { - return getValue(Flags.FLAG_ENABLE_SMARTSPACE_AS_A_WIDGET, - FeatureFlags::enableSmartspaceAsAWidget); + + public boolean enableSimultaneousOverviewTriggerOnExtendedDesktop() { + return getValue(Flags.FLAG_ENABLE_SIMULTANEOUS_OVERVIEW_TRIGGER_ON_EXTENDED_DESKTOP, + FeatureFlags::enableSimultaneousOverviewTriggerOnExtendedDesktop); } @Override - public boolean enableSmartspaceRemovalToggle() { - return getValue(Flags.FLAG_ENABLE_SMARTSPACE_REMOVAL_TOGGLE, - FeatureFlags::enableSmartspaceRemovalToggle); + + public boolean enableStateManagerProtoLog() { + return getValue(Flags.FLAG_ENABLE_STATE_MANAGER_PROTO_LOG, + FeatureFlags::enableStateManagerProtoLog); } @Override + + public boolean enableStrictMode() { + return getValue(Flags.FLAG_ENABLE_STRICT_MODE, + FeatureFlags::enableStrictMode); + } + + @Override + public boolean enableSupportForArchiving() { return getValue(Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING, - FeatureFlags::enableSupportForArchiving); + FeatureFlags::enableSupportForArchiving); + } + + @Override + + public boolean enableSystemDrag() { + return getValue(Flags.FLAG_ENABLE_SYSTEM_DRAG, + FeatureFlags::enableSystemDrag); } @Override + public boolean enableTabletTwoPanePickerV2() { return getValue(Flags.FLAG_ENABLE_TABLET_TWO_PANE_PICKER_V2, - FeatureFlags::enableTabletTwoPanePickerV2); + FeatureFlags::enableTabletTwoPanePickerV2); + } + + @Override + + public boolean enableTaskbarBehindShade() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_BEHIND_SHADE, + FeatureFlags::enableTaskbarBehindShade); } @Override + public boolean enableTaskbarCustomization() { return getValue(Flags.FLAG_ENABLE_TASKBAR_CUSTOMIZATION, - FeatureFlags::enableTaskbarCustomization); + FeatureFlags::enableTaskbarCustomization); + } + + @Override + + public boolean enableTaskbarDragAndDrop() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_DRAG_AND_DROP, + FeatureFlags::enableTaskbarDragAndDrop); + } + + @Override + + public boolean enableTaskbarForDirectBoot() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT, + FeatureFlags::enableTaskbarForDirectBoot); + } + + @Override + + public boolean enableTaskbarIconContainer() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_ICON_CONTAINER, + FeatureFlags::enableTaskbarIconContainer); } @Override + public boolean enableTaskbarNoRecreate() { return getValue(Flags.FLAG_ENABLE_TASKBAR_NO_RECREATE, - FeatureFlags::enableTaskbarNoRecreate); + FeatureFlags::enableTaskbarNoRecreate); } @Override + public boolean enableTaskbarPinning() { return getValue(Flags.FLAG_ENABLE_TASKBAR_PINNING, - FeatureFlags::enableTaskbarPinning); + FeatureFlags::enableTaskbarPinning); + } + + @Override + + public boolean enableTaskbarRecentsThemedIcons() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_RECENTS_THEMED_ICONS, + FeatureFlags::enableTaskbarRecentsThemedIcons); } @Override + + public boolean enableTaskbarUiThread() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_UI_THREAD, + FeatureFlags::enableTaskbarUiThread); + } + + @Override + + public boolean enableTieredWidgetsByDefaultInPicker() { + return getValue(Flags.FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER, + FeatureFlags::enableTieredWidgetsByDefaultInPicker); + } + + @Override + public boolean enableTwoPaneLauncherSettings() { return getValue(Flags.FLAG_ENABLE_TWO_PANE_LAUNCHER_SETTINGS, - FeatureFlags::enableTwoPaneLauncherSettings); + FeatureFlags::enableTwoPaneLauncherSettings); } @Override + public boolean enableTwolineAllapps() { return getValue(Flags.FLAG_ENABLE_TWOLINE_ALLAPPS, - FeatureFlags::enableTwolineAllapps); + FeatureFlags::enableTwolineAllapps); } @Override + public boolean enableTwolineToggle() { return getValue(Flags.FLAG_ENABLE_TWOLINE_TOGGLE, - FeatureFlags::enableTwolineToggle); + FeatureFlags::enableTwolineToggle); } @Override + public boolean enableUnfoldStateAnimation() { return getValue(Flags.FLAG_ENABLE_UNFOLD_STATE_ANIMATION, - FeatureFlags::enableUnfoldStateAnimation); + FeatureFlags::enableUnfoldStateAnimation); } @Override - public boolean enableUnfoldedTwoPanePicker() { - return getValue(Flags.FLAG_ENABLE_UNFOLDED_TWO_PANE_PICKER, - FeatureFlags::enableUnfoldedTwoPanePicker); + + public boolean enableWidgetPickerRefactor() { + return getValue(Flags.FLAG_ENABLE_WIDGET_PICKER_REFACTOR, + FeatureFlags::enableWidgetPickerRefactor); } @Override - public boolean enableWidgetTapToAdd() { - return getValue(Flags.FLAG_ENABLE_WIDGET_TAP_TO_ADD, - FeatureFlags::enableWidgetTapToAdd); + + public boolean enabledFoldersInAllApps() { + return getValue(Flags.FLAG_ENABLED_FOLDERS_IN_ALL_APPS, + FeatureFlags::enabledFoldersInAllApps); } @Override - public boolean enableWorkspaceInflation() { - return getValue(Flags.FLAG_ENABLE_WORKSPACE_INFLATION, - FeatureFlags::enableWorkspaceInflation); + + public boolean expandableLongPressMenu() { + return getValue(Flags.FLAG_EXPANDABLE_LONG_PRESS_MENU, + FeatureFlags::expandableLongPressMenu); } @Override - public boolean enabledFoldersInAllApps() { - return getValue(Flags.FLAG_ENABLED_FOLDERS_IN_ALL_APPS, - FeatureFlags::enabledFoldersInAllApps); + + public boolean firstPagePinnedWidgetRemovalToggle() { + return getValue(Flags.FLAG_FIRST_PAGE_PINNED_WIDGET_REMOVAL_TOGGLE, + FeatureFlags::firstPagePinnedWidgetRemovalToggle); } @Override + public boolean floatingSearchBar() { return getValue(Flags.FLAG_FLOATING_SEARCH_BAR, - FeatureFlags::floatingSearchBar); + FeatureFlags::floatingSearchBar); } @Override + public boolean forceMonochromeAppIcons() { return getValue(Flags.FLAG_FORCE_MONOCHROME_APP_ICONS, - FeatureFlags::forceMonochromeAppIcons); + FeatureFlags::forceMonochromeAppIcons); + } + + @Override + + public boolean forceMonochromeAppIconsAdaptColors() { + return getValue(Flags.FLAG_FORCE_MONOCHROME_APP_ICONS_ADAPT_COLORS, + FeatureFlags::forceMonochromeAppIconsAdaptColors); + } + + @Override + + public boolean homeScreenEditImprovements() { + return getValue(Flags.FLAG_HOME_SCREEN_EDIT_IMPROVEMENTS, + FeatureFlags::homeScreenEditImprovements); + } + + @Override + + public boolean ignoreThreeFingerTrackpadForNavHandleLongPress() { + return getValue(Flags.FLAG_IGNORE_THREE_FINGER_TRACKPAD_FOR_NAV_HANDLE_LONG_PRESS, + FeatureFlags::ignoreThreeFingerTrackpadForNavHandleLongPress); + } + + @Override + + public boolean injectableModelItems() { + return getValue(Flags.FLAG_INJECTABLE_MODEL_ITEMS, + FeatureFlags::injectableModelItems); + } + + @Override + + public boolean letterFastScroller() { + return getValue(Flags.FLAG_LETTER_FAST_SCROLLER, + FeatureFlags::letterFastScroller); + } + + @Override + + public boolean modelRepository() { + return getValue(Flags.FLAG_MODEL_REPOSITORY, + FeatureFlags::modelRepository); + } + + @Override + + public boolean msdlFeedback() { + return getValue(Flags.FLAG_MSDL_FEEDBACK, + FeatureFlags::msdlFeedback); } @Override + + public boolean nudgePill() { + return getValue(Flags.FLAG_NUDGE_PILL, + FeatureFlags::nudgePill); + } + + @Override + + public boolean oneGridMountedMode() { + return getValue(Flags.FLAG_ONE_GRID_MOUNTED_MODE, + FeatureFlags::oneGridMountedMode); + } + + @Override + + public boolean oneGridRotationHandling() { + return getValue(Flags.FLAG_ONE_GRID_ROTATION_HANDLING, + FeatureFlags::oneGridRotationHandling); + } + + @Override + + public boolean oneGridSpecs() { + return getValue(Flags.FLAG_ONE_GRID_SPECS, + FeatureFlags::oneGridSpecs); + } + + @Override + public boolean privateSpaceAddFloatingMaskView() { return getValue(Flags.FLAG_PRIVATE_SPACE_ADD_FLOATING_MASK_VIEW, - FeatureFlags::privateSpaceAddFloatingMaskView); + FeatureFlags::privateSpaceAddFloatingMaskView); } @Override + public boolean privateSpaceAnimation() { return getValue(Flags.FLAG_PRIVATE_SPACE_ANIMATION, - FeatureFlags::privateSpaceAnimation); + FeatureFlags::privateSpaceAnimation); } @Override - public boolean privateSpaceAppInstallerButton() { - return getValue(Flags.FLAG_PRIVATE_SPACE_APP_INSTALLER_BUTTON, - FeatureFlags::privateSpaceAppInstallerButton); - } - @Override public boolean privateSpaceRestrictAccessibilityDrag() { return getValue(Flags.FLAG_PRIVATE_SPACE_RESTRICT_ACCESSIBILITY_DRAG, - FeatureFlags::privateSpaceRestrictAccessibilityDrag); + FeatureFlags::privateSpaceRestrictAccessibilityDrag); } @Override + public boolean privateSpaceRestrictItemDrag() { return getValue(Flags.FLAG_PRIVATE_SPACE_RESTRICT_ITEM_DRAG, - FeatureFlags::privateSpaceRestrictItemDrag); + FeatureFlags::privateSpaceRestrictItemDrag); } @Override + public boolean privateSpaceSysAppsSeparation() { return getValue(Flags.FLAG_PRIVATE_SPACE_SYS_APPS_SEPARATION, - FeatureFlags::privateSpaceSysAppsSeparation); + FeatureFlags::privateSpaceSysAppsSeparation); + } + + @Override + + public boolean refactorTaskbarUiState() { + return getValue(Flags.FLAG_REFACTOR_TASKBAR_UI_STATE, + FeatureFlags::refactorTaskbarUiState); + } + + @Override + + public boolean removeAppsRefreshOnRightClick() { + return getValue(Flags.FLAG_REMOVE_APPS_REFRESH_ON_RIGHT_CLICK, + FeatureFlags::removeAppsRefreshOnRightClick); + } + + @Override + + public boolean restoreArchivedAppIconsFromDb() { + return getValue(Flags.FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB, + FeatureFlags::restoreArchivedAppIconsFromDb); + } + + @Override + + public boolean restoreArchivedShortcuts() { + return getValue(Flags.FLAG_RESTORE_ARCHIVED_SHORTCUTS, + FeatureFlags::restoreArchivedShortcuts); } @Override - public boolean useActivityOverlay() { - return getValue(Flags.FLAG_USE_ACTIVITY_OVERLAY, - FeatureFlags::useActivityOverlay); + + public boolean showCloseButtonOnTaskviewHover() { + return getValue(Flags.FLAG_SHOW_CLOSE_BUTTON_ON_TASKVIEW_HOVER, + FeatureFlags::showCloseButtonOnTaskviewHover); + } + + @Override + + public boolean showFilesOnHomeScreen() { + return getValue(Flags.FLAG_SHOW_FILES_ON_HOME_SCREEN, + FeatureFlags::showFilesOnHomeScreen); + } + + @Override + + public boolean showTaskbarPinningPopupFromAnywhere() { + return getValue(Flags.FLAG_SHOW_TASKBAR_PINNING_POPUP_FROM_ANYWHERE, + FeatureFlags::showTaskbarPinningPopupFromAnywhere); + } + + @Override + + public boolean simplifiedLauncherModelBinding() { + return getValue(Flags.FLAG_SIMPLIFIED_LAUNCHER_MODEL_BINDING, + FeatureFlags::simplifiedLauncherModelBinding); + } + + @Override + + public boolean syncAppLaunchWithTaskbarStash() { + return getValue(Flags.FLAG_SYNC_APP_LAUNCH_WITH_TASKBAR_STASH, + FeatureFlags::syncAppLaunchWithTaskbarStash); + } + + @Override + + public boolean taskbarQuietModeChangeSupport() { + return getValue(Flags.FLAG_TASKBAR_QUIET_MODE_CHANGE_SUPPORT, + FeatureFlags::taskbarQuietModeChangeSupport); + } + + @Override + + public boolean unpinFirstPagePinnedWidget() { + return getValue(Flags.FLAG_UNPIN_FIRST_PAGE_PINNED_WIDGET, + FeatureFlags::unpinFirstPagePinnedWidget); + } + + @Override + + public boolean useNewIconForArchivedApps() { + return getValue(Flags.FLAG_USE_NEW_ICON_FOR_ARCHIVED_APPS, + FeatureFlags::useNewIconForArchivedApps); + } + + @Override + + public boolean useSystemRadiusForAppWidgets() { + return getValue(Flags.FLAG_USE_SYSTEM_RADIUS_FOR_APP_WIDGETS, + FeatureFlags::useSystemRadiusForAppWidgets); + } + + @Override + + public boolean workSchedulerInWorkProfile() { + return getValue(Flags.FLAG_WORK_SCHEDULER_IN_WORK_PROFILE, + FeatureFlags::workSchedulerInWorkProfile); } public boolean isFlagReadOnlyOptimized(String flagName) { if (mReadOnlyFlagsSet.contains(flagName) && - isOptimizationEnabled()) { - return true; + isOptimizationEnabled()) { + return true; } return false; } + private boolean isOptimizationEnabled() { return false; } @@ -327,65 +797,230 @@ protected boolean getValue(String flagName, Predicate getter) { public List getFlagNames() { return Arrays.asList( - Flags.FLAG_ENABLE_ADD_APP_WIDGET_VIA_CONFIG_ACTIVITY_V2, - Flags.FLAG_ENABLE_ADDITIONAL_HOME_ANIMATIONS, - Flags.FLAG_ENABLE_CATEGORIZED_WIDGET_SUGGESTIONS, - Flags.FLAG_ENABLE_CURSOR_HOVER_STATES, - Flags.FLAG_ENABLE_EXPANDING_PAUSE_WORK_BUTTON, - Flags.FLAG_ENABLE_FALLBACK_OVERVIEW_IN_WINDOW, - Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS, - Flags.FLAG_ENABLE_FOCUS_OUTLINE, - Flags.FLAG_ENABLE_GENERATED_PREVIEWS, - Flags.FLAG_ENABLE_GRID_MIGRATION_FIX, - Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, - Flags.FLAG_ENABLE_HANDLE_DELAYED_GESTURE_CALLBACKS, - Flags.FLAG_ENABLE_HOME_TRANSITION_LISTENER, - Flags.FLAG_ENABLE_LAUNCHER_BR_METRICS_FIXED, - Flags.FLAG_ENABLE_NARROW_GRID_RESTORE, - Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, - Flags.FLAG_ENABLE_PREDICTIVE_BACK_GESTURE, - Flags.FLAG_ENABLE_PRIVATE_SPACE, - Flags.FLAG_ENABLE_PRIVATE_SPACE_INSTALL_SHORTCUT, - Flags.FLAG_ENABLE_REBOOT_UNLOCK_ANIMATION, - Flags.FLAG_ENABLE_RECENTS_IN_TASKBAR, - Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL, - Flags.FLAG_ENABLE_RESPONSIVE_WORKSPACE, - Flags.FLAG_ENABLE_SCALING_REVEAL_HOME_ANIMATION, - Flags.FLAG_ENABLE_SHORTCUT_DONT_SUGGEST_APP, - Flags.FLAG_ENABLE_SMARTSPACE_AS_A_WIDGET, - Flags.FLAG_ENABLE_SMARTSPACE_REMOVAL_TOGGLE, - Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING, - Flags.FLAG_ENABLE_TABLET_TWO_PANE_PICKER_V2, - Flags.FLAG_ENABLE_TASKBAR_CUSTOMIZATION, - Flags.FLAG_ENABLE_TASKBAR_NO_RECREATE, - Flags.FLAG_ENABLE_TASKBAR_PINNING, - Flags.FLAG_ENABLE_TWO_PANE_LAUNCHER_SETTINGS, - Flags.FLAG_ENABLE_TWOLINE_ALLAPPS, - Flags.FLAG_ENABLE_TWOLINE_TOGGLE, - Flags.FLAG_ENABLE_UNFOLD_STATE_ANIMATION, - Flags.FLAG_ENABLE_UNFOLDED_TWO_PANE_PICKER, - Flags.FLAG_ENABLE_WIDGET_TAP_TO_ADD, - Flags.FLAG_ENABLE_WORKSPACE_INFLATION, - Flags.FLAG_ENABLED_FOLDERS_IN_ALL_APPS, - Flags.FLAG_FLOATING_SEARCH_BAR, - Flags.FLAG_FORCE_MONOCHROME_APP_ICONS, - Flags.FLAG_PRIVATE_SPACE_ADD_FLOATING_MASK_VIEW, - Flags.FLAG_PRIVATE_SPACE_ANIMATION, - Flags.FLAG_PRIVATE_SPACE_APP_INSTALLER_BUTTON, - Flags.FLAG_PRIVATE_SPACE_RESTRICT_ACCESSIBILITY_DRAG, - Flags.FLAG_PRIVATE_SPACE_RESTRICT_ITEM_DRAG, - Flags.FLAG_PRIVATE_SPACE_SYS_APPS_SEPARATION, - Flags.FLAG_USE_ACTIVITY_OVERLAY + Flags.FLAG_ACCESSIBILITY_SCROLL_ON_ALLAPPS, + Flags.FLAG_ALL_APPS_BLUR, + Flags.FLAG_ALL_APPS_SHEET_FOR_HANDHELD, + Flags.FLAG_AVOID_DISPLAY_CUTOUT_BUBBLE_BAR, + Flags.FLAG_BLURRED_HOME_ANIMATION, + Flags.FLAG_CLEAR_SCRIM_ON_RESET, + Flags.FLAG_ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT, + Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING, + Flags.FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_APP_WIDGET_PICKER_REFACTOR, + Flags.FLAG_ENABLE_AUTO_STASH_CONNECTED_DISPLAY_TASKBAR, + Flags.FLAG_ENABLE_CATEGORIZED_WIDGET_SUGGESTIONS, + Flags.FLAG_ENABLE_CONTRAST_TILES, + Flags.FLAG_ENABLE_CURSOR_DRIVEN_WORKFLOWS, + Flags.FLAG_ENABLE_CUSTOM_HEIGHT_FOR_ALL_APPS_ON_CD, + Flags.FLAG_ENABLE_DESKTOP_EXPLODED_VIEW, + Flags.FLAG_ENABLE_EXPANDING_PAUSE_WORK_BUTTON, + Flags.FLAG_ENABLE_EXPRESSIVE_DISMISS_TASK_MOTION, + Flags.FLAG_ENABLE_EXPRESSIVE_FOLDER_EXPANSION, + Flags.FLAG_ENABLE_FALLBACK_OVERVIEW_IN_WINDOW, + Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS, + Flags.FLAG_ENABLE_FOCUS_OUTLINE, + Flags.FLAG_ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, + Flags.FLAG_ENABLE_GROWTH_NUDGE, + Flags.FLAG_ENABLE_HOME_TRANSITION_LISTENER, + Flags.FLAG_ENABLE_LATER_IS_LOCKED_CHECK, + Flags.FLAG_ENABLE_LAUNCHER_BR_METRICS_FIXED, + Flags.FLAG_ENABLE_LAUNCHER_ICON_SHAPES, + Flags.FLAG_ENABLE_LAUNCHER_OVERVIEW_IN_WINDOW, + Flags.FLAG_ENABLE_LAUNCHER_VISUAL_REFRESH, + Flags.FLAG_ENABLE_META_TAB_TOGGLE_IN_OVERVIEW, + Flags.FLAG_ENABLE_MOUSE_INTERACTION_CHANGES, + Flags.FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR, + Flags.FLAG_ENABLE_NARROW_GRID_RESTORE, + Flags.FLAG_ENABLE_NEW_ALL_SET_ANIMATION, + Flags.FLAG_ENABLE_OVERVIEW_BACKGROUND_WALLPAPER_BLUR, + Flags.FLAG_ENABLE_OVERVIEW_DESKTOP_TILE_WALLPAPER_BACKGROUND, + Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, + Flags.FLAG_ENABLE_OVERVIEW_ON_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_PREDICTIVE_BACK_IN_OVERVIEW, + Flags.FLAG_ENABLE_PREVENT_OVERVIEW_MOUSE_DRAG, + Flags.FLAG_ENABLE_PRIVATE_SPACE, + Flags.FLAG_ENABLE_QSB_ON_HOTSEAT, + Flags.FLAG_ENABLE_REBOOT_UNLOCK_ANIMATION, + Flags.FLAG_ENABLE_RECENTS_IN_TASKBAR, + Flags.FLAG_ENABLE_RECENTS_WINDOW_PROTO_LOG, + Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST, + Flags.FLAG_ENABLE_REFACTOR_TASK_CONTENT_VIEW, + Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL, + Flags.FLAG_ENABLE_RESPONSIVE_WORKSPACE, + Flags.FLAG_ENABLE_REVERSIBLE_HOME_ACTION_CORNER, + Flags.FLAG_ENABLE_SCALABILITY_FOR_DESKTOP_EXPERIENCE, + Flags.FLAG_ENABLE_SIMULTANEOUS_OVERVIEW_TRIGGER_ON_EXTENDED_DESKTOP, + Flags.FLAG_ENABLE_STATE_MANAGER_PROTO_LOG, + Flags.FLAG_ENABLE_STRICT_MODE, + Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING, + Flags.FLAG_ENABLE_SYSTEM_DRAG, + Flags.FLAG_ENABLE_TABLET_TWO_PANE_PICKER_V2, + Flags.FLAG_ENABLE_TASKBAR_BEHIND_SHADE, + Flags.FLAG_ENABLE_TASKBAR_CUSTOMIZATION, + Flags.FLAG_ENABLE_TASKBAR_DRAG_AND_DROP, + Flags.FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT, + Flags.FLAG_ENABLE_TASKBAR_ICON_CONTAINER, + Flags.FLAG_ENABLE_TASKBAR_NO_RECREATE, + Flags.FLAG_ENABLE_TASKBAR_PINNING, + Flags.FLAG_ENABLE_TASKBAR_RECENTS_THEMED_ICONS, + Flags.FLAG_ENABLE_TASKBAR_UI_THREAD, + Flags.FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER, + Flags.FLAG_ENABLE_TWO_PANE_LAUNCHER_SETTINGS, + Flags.FLAG_ENABLE_TWOLINE_ALLAPPS, + Flags.FLAG_ENABLE_TWOLINE_TOGGLE, + Flags.FLAG_ENABLE_UNFOLD_STATE_ANIMATION, + Flags.FLAG_ENABLE_WIDGET_PICKER_REFACTOR, + Flags.FLAG_ENABLED_FOLDERS_IN_ALL_APPS, + Flags.FLAG_EXPANDABLE_LONG_PRESS_MENU, + Flags.FLAG_FIRST_PAGE_PINNED_WIDGET_REMOVAL_TOGGLE, + Flags.FLAG_FLOATING_SEARCH_BAR, + Flags.FLAG_FORCE_MONOCHROME_APP_ICONS, + Flags.FLAG_FORCE_MONOCHROME_APP_ICONS_ADAPT_COLORS, + Flags.FLAG_HOME_SCREEN_EDIT_IMPROVEMENTS, + Flags.FLAG_IGNORE_THREE_FINGER_TRACKPAD_FOR_NAV_HANDLE_LONG_PRESS, + Flags.FLAG_INJECTABLE_MODEL_ITEMS, + Flags.FLAG_LETTER_FAST_SCROLLER, + Flags.FLAG_MODEL_REPOSITORY, + Flags.FLAG_MSDL_FEEDBACK, + Flags.FLAG_NUDGE_PILL, + Flags.FLAG_ONE_GRID_MOUNTED_MODE, + Flags.FLAG_ONE_GRID_ROTATION_HANDLING, + Flags.FLAG_ONE_GRID_SPECS, + Flags.FLAG_PRIVATE_SPACE_ADD_FLOATING_MASK_VIEW, + Flags.FLAG_PRIVATE_SPACE_ANIMATION, + Flags.FLAG_PRIVATE_SPACE_RESTRICT_ACCESSIBILITY_DRAG, + Flags.FLAG_PRIVATE_SPACE_RESTRICT_ITEM_DRAG, + Flags.FLAG_PRIVATE_SPACE_SYS_APPS_SEPARATION, + Flags.FLAG_REFACTOR_TASKBAR_UI_STATE, + Flags.FLAG_REMOVE_APPS_REFRESH_ON_RIGHT_CLICK, + Flags.FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB, + Flags.FLAG_RESTORE_ARCHIVED_SHORTCUTS, + Flags.FLAG_SHOW_CLOSE_BUTTON_ON_TASKVIEW_HOVER, + Flags.FLAG_SHOW_FILES_ON_HOME_SCREEN, + Flags.FLAG_SHOW_TASKBAR_PINNING_POPUP_FROM_ANYWHERE, + Flags.FLAG_SIMPLIFIED_LAUNCHER_MODEL_BINDING, + Flags.FLAG_SYNC_APP_LAUNCH_WITH_TASKBAR_STASH, + Flags.FLAG_TASKBAR_QUIET_MODE_CHANGE_SUPPORT, + Flags.FLAG_UNPIN_FIRST_PAGE_PINNED_WIDGET, + Flags.FLAG_USE_NEW_ICON_FOR_ARCHIVED_APPS, + Flags.FLAG_USE_SYSTEM_RADIUS_FOR_APP_WIDGETS, + Flags.FLAG_WORK_SCHEDULER_IN_WORK_PROFILE ); } private Set mReadOnlyFlagsSet = new HashSet<>( - Arrays.asList( - Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS, - Flags.FLAG_ENABLE_GRID_MIGRATION_FIX, - Flags.FLAG_ENABLE_LAUNCHER_BR_METRICS_FIXED, - Flags.FLAG_ENABLE_NARROW_GRID_RESTORE, - "" - ) + Arrays.asList( + Flags.FLAG_ACCESSIBILITY_SCROLL_ON_ALLAPPS, + Flags.FLAG_ALL_APPS_BLUR, + Flags.FLAG_ALL_APPS_SHEET_FOR_HANDHELD, + Flags.FLAG_AVOID_DISPLAY_CUTOUT_BUBBLE_BAR, + Flags.FLAG_BLURRED_HOME_ANIMATION, + Flags.FLAG_CLEAR_SCRIM_ON_RESET, + Flags.FLAG_ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT, + Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING, + Flags.FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_APP_WIDGET_PICKER_REFACTOR, + Flags.FLAG_ENABLE_AUTO_STASH_CONNECTED_DISPLAY_TASKBAR, + Flags.FLAG_ENABLE_CATEGORIZED_WIDGET_SUGGESTIONS, + Flags.FLAG_ENABLE_CONTRAST_TILES, + Flags.FLAG_ENABLE_CURSOR_DRIVEN_WORKFLOWS, + Flags.FLAG_ENABLE_CUSTOM_HEIGHT_FOR_ALL_APPS_ON_CD, + Flags.FLAG_ENABLE_DESKTOP_EXPLODED_VIEW, + Flags.FLAG_ENABLE_EXPANDING_PAUSE_WORK_BUTTON, + Flags.FLAG_ENABLE_EXPRESSIVE_DISMISS_TASK_MOTION, + Flags.FLAG_ENABLE_EXPRESSIVE_FOLDER_EXPANSION, + Flags.FLAG_ENABLE_FALLBACK_OVERVIEW_IN_WINDOW, + Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS, + Flags.FLAG_ENABLE_FOCUS_OUTLINE, + Flags.FLAG_ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, + Flags.FLAG_ENABLE_GROWTH_NUDGE, + Flags.FLAG_ENABLE_HOME_TRANSITION_LISTENER, + Flags.FLAG_ENABLE_LATER_IS_LOCKED_CHECK, + Flags.FLAG_ENABLE_LAUNCHER_BR_METRICS_FIXED, + Flags.FLAG_ENABLE_LAUNCHER_ICON_SHAPES, + Flags.FLAG_ENABLE_LAUNCHER_OVERVIEW_IN_WINDOW, + Flags.FLAG_ENABLE_LAUNCHER_VISUAL_REFRESH, + Flags.FLAG_ENABLE_META_TAB_TOGGLE_IN_OVERVIEW, + Flags.FLAG_ENABLE_MOUSE_INTERACTION_CHANGES, + Flags.FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR, + Flags.FLAG_ENABLE_NARROW_GRID_RESTORE, + Flags.FLAG_ENABLE_NEW_ALL_SET_ANIMATION, + Flags.FLAG_ENABLE_OVERVIEW_BACKGROUND_WALLPAPER_BLUR, + Flags.FLAG_ENABLE_OVERVIEW_DESKTOP_TILE_WALLPAPER_BACKGROUND, + Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, + Flags.FLAG_ENABLE_OVERVIEW_ON_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_PREDICTIVE_BACK_IN_OVERVIEW, + Flags.FLAG_ENABLE_PREVENT_OVERVIEW_MOUSE_DRAG, + Flags.FLAG_ENABLE_PRIVATE_SPACE, + Flags.FLAG_ENABLE_QSB_ON_HOTSEAT, + Flags.FLAG_ENABLE_REBOOT_UNLOCK_ANIMATION, + Flags.FLAG_ENABLE_RECENTS_IN_TASKBAR, + Flags.FLAG_ENABLE_RECENTS_WINDOW_PROTO_LOG, + Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST, + Flags.FLAG_ENABLE_REFACTOR_TASK_CONTENT_VIEW, + Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL, + Flags.FLAG_ENABLE_RESPONSIVE_WORKSPACE, + Flags.FLAG_ENABLE_REVERSIBLE_HOME_ACTION_CORNER, + Flags.FLAG_ENABLE_SCALABILITY_FOR_DESKTOP_EXPERIENCE, + Flags.FLAG_ENABLE_SIMULTANEOUS_OVERVIEW_TRIGGER_ON_EXTENDED_DESKTOP, + Flags.FLAG_ENABLE_STATE_MANAGER_PROTO_LOG, + Flags.FLAG_ENABLE_STRICT_MODE, + Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING, + Flags.FLAG_ENABLE_SYSTEM_DRAG, + Flags.FLAG_ENABLE_TABLET_TWO_PANE_PICKER_V2, + Flags.FLAG_ENABLE_TASKBAR_BEHIND_SHADE, + Flags.FLAG_ENABLE_TASKBAR_CUSTOMIZATION, + Flags.FLAG_ENABLE_TASKBAR_DRAG_AND_DROP, + Flags.FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT, + Flags.FLAG_ENABLE_TASKBAR_ICON_CONTAINER, + Flags.FLAG_ENABLE_TASKBAR_NO_RECREATE, + Flags.FLAG_ENABLE_TASKBAR_PINNING, + Flags.FLAG_ENABLE_TASKBAR_RECENTS_THEMED_ICONS, + Flags.FLAG_ENABLE_TASKBAR_UI_THREAD, + Flags.FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER, + Flags.FLAG_ENABLE_TWO_PANE_LAUNCHER_SETTINGS, + Flags.FLAG_ENABLE_TWOLINE_ALLAPPS, + Flags.FLAG_ENABLE_TWOLINE_TOGGLE, + Flags.FLAG_ENABLE_UNFOLD_STATE_ANIMATION, + Flags.FLAG_ENABLE_WIDGET_PICKER_REFACTOR, + Flags.FLAG_ENABLED_FOLDERS_IN_ALL_APPS, + Flags.FLAG_EXPANDABLE_LONG_PRESS_MENU, + Flags.FLAG_FIRST_PAGE_PINNED_WIDGET_REMOVAL_TOGGLE, + Flags.FLAG_FLOATING_SEARCH_BAR, + Flags.FLAG_FORCE_MONOCHROME_APP_ICONS, + Flags.FLAG_FORCE_MONOCHROME_APP_ICONS_ADAPT_COLORS, + Flags.FLAG_HOME_SCREEN_EDIT_IMPROVEMENTS, + Flags.FLAG_IGNORE_THREE_FINGER_TRACKPAD_FOR_NAV_HANDLE_LONG_PRESS, + Flags.FLAG_INJECTABLE_MODEL_ITEMS, + Flags.FLAG_LETTER_FAST_SCROLLER, + Flags.FLAG_MODEL_REPOSITORY, + Flags.FLAG_MSDL_FEEDBACK, + Flags.FLAG_NUDGE_PILL, + Flags.FLAG_ONE_GRID_MOUNTED_MODE, + Flags.FLAG_ONE_GRID_ROTATION_HANDLING, + Flags.FLAG_ONE_GRID_SPECS, + Flags.FLAG_PRIVATE_SPACE_ADD_FLOATING_MASK_VIEW, + Flags.FLAG_PRIVATE_SPACE_ANIMATION, + Flags.FLAG_PRIVATE_SPACE_RESTRICT_ACCESSIBILITY_DRAG, + Flags.FLAG_PRIVATE_SPACE_RESTRICT_ITEM_DRAG, + Flags.FLAG_PRIVATE_SPACE_SYS_APPS_SEPARATION, + Flags.FLAG_REFACTOR_TASKBAR_UI_STATE, + Flags.FLAG_REMOVE_APPS_REFRESH_ON_RIGHT_CLICK, + Flags.FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB, + Flags.FLAG_RESTORE_ARCHIVED_SHORTCUTS, + Flags.FLAG_SHOW_CLOSE_BUTTON_ON_TASKVIEW_HOVER, + Flags.FLAG_SHOW_FILES_ON_HOME_SCREEN, + Flags.FLAG_SHOW_TASKBAR_PINNING_POPUP_FROM_ANYWHERE, + Flags.FLAG_SIMPLIFIED_LAUNCHER_MODEL_BINDING, + Flags.FLAG_SYNC_APP_LAUNCH_WITH_TASKBAR_STASH, + Flags.FLAG_TASKBAR_QUIET_MODE_CHANGE_SUPPORT, + Flags.FLAG_UNPIN_FIRST_PAGE_PINNED_WIDGET, + Flags.FLAG_USE_NEW_ICON_FOR_ARCHIVED_APPS, + Flags.FLAG_USE_SYSTEM_RADIUS_FOR_APP_WIDGETS, + Flags.FLAG_WORK_SCHEDULER_IN_WORK_PROFILE, + "" + ) ); } diff --git a/flags/src/com/android/launcher3/FakeFeatureFlagsImpl.java b/flags/src/com/android/launcher3/FakeFeatureFlagsImpl.java index 1dc6e623ae1..9a0c4ad89b8 100644 --- a/flags/src/com/android/launcher3/FakeFeatureFlagsImpl.java +++ b/flags/src/com/android/launcher3/FakeFeatureFlagsImpl.java @@ -3,11 +3,11 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Predicate; - /** @hide */ public class FakeFeatureFlagsImpl extends CustomFeatureFlags { private final Map mFlagMap = new HashMap<>(); private final FeatureFlags mDefaults; + private final boolean IS_EXPORTED = false; public FakeFeatureFlagsImpl() { this(null); @@ -35,7 +35,7 @@ protected boolean getValue(String flagName, Predicate getter) { } public void setFlag(String flagName, boolean value) { - if (!this.mFlagMap.containsKey(flagName)) { + if (!this.mFlagMap.containsKey(flagName) && !IS_EXPORTED) { throw new IllegalArgumentException("no such flag " + flagName); } this.mFlagMap.put(flagName, value); diff --git a/flags/src/com/android/launcher3/FeatureFlags.java b/flags/src/com/android/launcher3/FeatureFlags.java index 7cd0b034f28..2ac673b5389 100644 --- a/flags/src/com/android/launcher3/FeatureFlags.java +++ b/flags/src/com/android/launcher3/FeatureFlags.java @@ -1,103 +1,442 @@ package com.android.launcher3; + /** @hide */ public interface FeatureFlags { - boolean enableAddAppWidgetViaConfigActivityV2(); - boolean enableAdditionalHomeAnimations(); + + boolean accessibilityScrollOnAllapps(); + + + + boolean allAppsBlur(); + + + + boolean allAppsSheetForHandheld(); + + + + boolean avoidDisplayCutoutBubbleBar(); + + + + boolean blurredHomeAnimation(); + + + + boolean clearScrimOnReset(); + + + + boolean enableAllAppsButtonInHotseat(); + + + + boolean enableAltTabKqsFlatenning(); + + + + boolean enableAltTabKqsOnConnectedDisplays(); + + + + boolean enableAppWidgetPickerRefactor(); + + + + boolean enableAutoStashConnectedDisplayTaskbar(); + + boolean enableCategorizedWidgetSuggestions(); - boolean enableCursorHoverStates(); + + + boolean enableContrastTiles(); + + + + boolean enableCursorDrivenWorkflows(); + + + + boolean enableCustomHeightForAllAppsOnCd(); + + + + boolean enableDesktopExplodedView(); + + boolean enableExpandingPauseWorkButton(); + + + boolean enableExpressiveDismissTaskMotion(); + + + + boolean enableExpressiveFolderExpansion(); + + + boolean enableFallbackOverviewInWindow(); + + boolean enableFirstScreenBroadcastArchivingExtras(); + + boolean enableFocusOutline(); - boolean enableGeneratedPreviews(); - boolean enableGridMigrationFix(); + + boolean enableGestureNavOnConnectedDisplays(); + + boolean enableGridOnlyOverview(); - boolean enableHandleDelayedGestureCallbacks(); + + + boolean enableGrowthNudge(); + + boolean enableHomeTransitionListener(); + + + boolean enableLaterIsLockedCheck(); + + + boolean enableLauncherBrMetricsFixed(); + + + boolean enableLauncherIconShapes(); + + + + boolean enableLauncherOverviewInWindow(); + + + + boolean enableLauncherVisualRefresh(); + + + + boolean enableMetaTabToggleInOverview(); + + + + boolean enableMouseInteractionChanges(); + + + + boolean enableMultiInstanceMenuTaskbar(); + + + boolean enableNarrowGridRestore(); + + + boolean enableNewAllSetAnimation(); + + + + boolean enableOverviewBackgroundWallpaperBlur(); + + + + boolean enableOverviewDesktopTileWallpaperBackground(); + + + boolean enableOverviewIconMenu(); - boolean enablePredictiveBackGesture(); + + + boolean enableOverviewOnConnectedDisplays(); + + + + boolean enablePredictiveBackInOverview(); + + + + boolean enablePreventOverviewMouseDrag(); + + boolean enablePrivateSpace(); - boolean enablePrivateSpaceInstallShortcut(); + + + boolean enableQsbOnHotseat(); + + boolean enableRebootUnlockAnimation(); + + boolean enableRecentsInTaskbar(); + + + boolean enableRecentsWindowProtoLog(); + + + + boolean enableRefactorDigitalWellbeingToast(); + + + + boolean enableRefactorTaskContentView(); + + + boolean enableRefactorTaskThumbnail(); + + boolean enableResponsiveWorkspace(); - boolean enableScalingRevealHomeAnimation(); - boolean enableShortcutDontSuggestApp(); - boolean enableSmartspaceAsAWidget(); + boolean enableReversibleHomeActionCorner(); + + + + boolean enableScalabilityForDesktopExperience(); + + + + boolean enableSimultaneousOverviewTriggerOnExtendedDesktop(); + + + + boolean enableStateManagerProtoLog(); + + + + boolean enableStrictMode(); + - boolean enableSmartspaceRemovalToggle(); boolean enableSupportForArchiving(); + + + boolean enableSystemDrag(); + + + boolean enableTabletTwoPanePickerV2(); + + + boolean enableTaskbarBehindShade(); + + + boolean enableTaskbarCustomization(); + + + boolean enableTaskbarDragAndDrop(); + + + + boolean enableTaskbarForDirectBoot(); + + + + boolean enableTaskbarIconContainer(); + + + boolean enableTaskbarNoRecreate(); + + boolean enableTaskbarPinning(); + + + boolean enableTaskbarRecentsThemedIcons(); + + + + boolean enableTaskbarUiThread(); + + + + boolean enableTieredWidgetsByDefaultInPicker(); + + + boolean enableTwoPaneLauncherSettings(); + + boolean enableTwolineAllapps(); + + boolean enableTwolineToggle(); + + boolean enableUnfoldStateAnimation(); - boolean enableUnfoldedTwoPanePicker(); - boolean enableWidgetTapToAdd(); - boolean enableWorkspaceInflation(); + boolean enableWidgetPickerRefactor(); + + boolean enabledFoldersInAllApps(); + + + boolean expandableLongPressMenu(); + + + + boolean firstPagePinnedWidgetRemovalToggle(); + + + boolean floatingSearchBar(); + + boolean forceMonochromeAppIcons(); + + + boolean forceMonochromeAppIconsAdaptColors(); + + + + boolean homeScreenEditImprovements(); + + + + boolean ignoreThreeFingerTrackpadForNavHandleLongPress(); + + + + boolean injectableModelItems(); + + + + boolean letterFastScroller(); + + + + boolean modelRepository(); + + + + boolean msdlFeedback(); + + + + boolean nudgePill(); + + + + boolean oneGridMountedMode(); + + + + boolean oneGridRotationHandling(); + + + + boolean oneGridSpecs(); + + + boolean privateSpaceAddFloatingMaskView(); + + boolean privateSpaceAnimation(); - boolean privateSpaceAppInstallerButton(); + boolean privateSpaceRestrictAccessibilityDrag(); + + boolean privateSpaceRestrictItemDrag(); + + boolean privateSpaceSysAppsSeparation(); - boolean useActivityOverlay(); -} \ No newline at end of file + + + boolean refactorTaskbarUiState(); + + + + boolean removeAppsRefreshOnRightClick(); + + + + boolean restoreArchivedAppIconsFromDb(); + + + + boolean restoreArchivedShortcuts(); + + + + boolean showCloseButtonOnTaskviewHover(); + + + + boolean showFilesOnHomeScreen(); + + + + boolean showTaskbarPinningPopupFromAnywhere(); + + + + boolean simplifiedLauncherModelBinding(); + + + + boolean syncAppLaunchWithTaskbarStash(); + + + + boolean taskbarQuietModeChangeSupport(); + + + + boolean unpinFirstPagePinnedWidget(); + + + + boolean useNewIconForArchivedApps(); + + + + boolean useSystemRadiusForAppWidgets(); + + + + boolean workSchedulerInWorkProfile(); +} diff --git a/flags/src/com/android/launcher3/FeatureFlagsImpl.java b/flags/src/com/android/launcher3/FeatureFlagsImpl.java index d0aad19aaa5..e7fbc65422b 100644 --- a/flags/src/com/android/launcher3/FeatureFlagsImpl.java +++ b/flags/src/com/android/launcher3/FeatureFlagsImpl.java @@ -1,880 +1,768 @@ package com.android.launcher3; -// TODO(b/303773055): Remove the annotation after access issue is resolved. -import androidx.core.os.BuildCompat; -import com.android.quickstep.util.DeviceConfigHelper; - -import java.nio.file.Files; -import java.nio.file.Paths; /** @hide */ public final class FeatureFlagsImpl implements FeatureFlags { - private static final boolean isReadFromNew = Files.exists(Paths.get("/metadata/aconfig/boot/enable_only_new_storage")); - private static volatile boolean isCached = false; - private static volatile boolean launcher_is_cached = false; - private static volatile boolean launcher_search_is_cached = false; - private static boolean enableAddAppWidgetViaConfigActivityV2 = true; - private static boolean enableAdditionalHomeAnimations = true; - private static boolean enableCategorizedWidgetSuggestions = true; - private static boolean enableCursorHoverStates = true; - private static boolean enableExpandingPauseWorkButton = true; - private static boolean enableFallbackOverviewInWindow = false; - private static boolean enableFocusOutline = true; - private static boolean enableGeneratedPreviews = true; - private static boolean enableGridOnlyOverview = false; - private static boolean enableHandleDelayedGestureCallbacks = true; - private static boolean enableHomeTransitionListener = true; - private static boolean enableOverviewIconMenu = false; - private static boolean enablePredictiveBackGesture = true; - private static boolean enablePrivateSpace = true; - private static boolean enablePrivateSpaceInstallShortcut = true; - private static boolean enableRebootUnlockAnimation = false; - private static boolean enableRecentsInTaskbar = false; - private static boolean enableRefactorTaskThumbnail = false; - private static boolean enableResponsiveWorkspace = true; - private static boolean enableScalingRevealHomeAnimation = true; - private static boolean enableShortcutDontSuggestApp = true; - private static boolean enableSmartspaceAsAWidget = false; - private static boolean enableSmartspaceRemovalToggle = false; - private static boolean enableSupportForArchiving = false; - private static boolean enableTabletTwoPanePickerV2 = false; - private static boolean enableTaskbarCustomization = false; - private static boolean enableTaskbarNoRecreate = false; - private static boolean enableTaskbarPinning = true; - private static boolean enableTwoPaneLauncherSettings = false; - private static boolean enableTwolineAllapps = false; - private static boolean enableTwolineToggle = true; - private static boolean enableUnfoldStateAnimation = false; - private static boolean enableUnfoldedTwoPanePicker = true; - private static boolean enableWidgetTapToAdd = true; - private static boolean enableWorkspaceInflation = true; - private static boolean enabledFoldersInAllApps = false; - private static boolean floatingSearchBar = false; - private static boolean forceMonochromeAppIcons = false; - private static boolean privateSpaceAddFloatingMaskView = false; - private static boolean privateSpaceAnimation = true; - private static boolean privateSpaceAppInstallerButton = true; - private static boolean privateSpaceRestrictAccessibilityDrag = true; - private static boolean privateSpaceRestrictItemDrag = true; - private static boolean privateSpaceSysAppsSeparation = true; - private static boolean useActivityOverlay = true; - - - private void init() { - isCached = true; - } - - private void load_overrides_launcher() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - enableAddAppWidgetViaConfigActivityV2 = - properties.getBoolean(Flags.FLAG_ENABLE_ADD_APP_WIDGET_VIA_CONFIG_ACTIVITY_V2, true); - enableAdditionalHomeAnimations = - properties.getBoolean(Flags.FLAG_ENABLE_ADDITIONAL_HOME_ANIMATIONS, true); - enableCategorizedWidgetSuggestions = - properties.getBoolean(Flags.FLAG_ENABLE_CATEGORIZED_WIDGET_SUGGESTIONS, true); - enableCursorHoverStates = - properties.getBoolean(Flags.FLAG_ENABLE_CURSOR_HOVER_STATES, true); - enableExpandingPauseWorkButton = - properties.getBoolean(Flags.FLAG_ENABLE_EXPANDING_PAUSE_WORK_BUTTON, true); - enableFallbackOverviewInWindow = - properties.getBoolean(Flags.FLAG_ENABLE_FALLBACK_OVERVIEW_IN_WINDOW, false); - enableFocusOutline = - properties.getBoolean(Flags.FLAG_ENABLE_FOCUS_OUTLINE, true); - enableGeneratedPreviews = - properties.getBoolean(Flags.FLAG_ENABLE_GENERATED_PREVIEWS, true); - enableGridOnlyOverview = - properties.getBoolean(Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, false); - enableHandleDelayedGestureCallbacks = - properties.getBoolean(Flags.FLAG_ENABLE_HANDLE_DELAYED_GESTURE_CALLBACKS, true); - enableHomeTransitionListener = - properties.getBoolean(Flags.FLAG_ENABLE_HOME_TRANSITION_LISTENER, true); - enableOverviewIconMenu = - properties.getBoolean(Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, false); - enablePredictiveBackGesture = - properties.getBoolean(Flags.FLAG_ENABLE_PREDICTIVE_BACK_GESTURE, true); - enablePrivateSpaceInstallShortcut = - properties.getBoolean(Flags.FLAG_ENABLE_PRIVATE_SPACE_INSTALL_SHORTCUT, true); - enableRebootUnlockAnimation = - properties.getBoolean(Flags.FLAG_ENABLE_REBOOT_UNLOCK_ANIMATION, false); - enableRecentsInTaskbar = - properties.getBoolean(Flags.FLAG_ENABLE_RECENTS_IN_TASKBAR, false); - enableRefactorTaskThumbnail = - properties.getBoolean(Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL, false); - enableResponsiveWorkspace = - properties.getBoolean(Flags.FLAG_ENABLE_RESPONSIVE_WORKSPACE, true); - enableScalingRevealHomeAnimation = - properties.getBoolean(Flags.FLAG_ENABLE_SCALING_REVEAL_HOME_ANIMATION, true); - enableShortcutDontSuggestApp = - properties.getBoolean(Flags.FLAG_ENABLE_SHORTCUT_DONT_SUGGEST_APP, true); - enableSmartspaceAsAWidget = - properties.getBoolean(Flags.FLAG_ENABLE_SMARTSPACE_AS_A_WIDGET, false); - enableSmartspaceRemovalToggle = - properties.getBoolean(Flags.FLAG_ENABLE_SMARTSPACE_REMOVAL_TOGGLE, true); - enableSupportForArchiving = - properties.getBoolean(Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING, BuildCompat.isAtLeastU()); - enableTabletTwoPanePickerV2 = - properties.getBoolean(Flags.FLAG_ENABLE_TABLET_TWO_PANE_PICKER_V2, false); - enableTaskbarCustomization = - properties.getBoolean(Flags.FLAG_ENABLE_TASKBAR_CUSTOMIZATION, false); - enableTaskbarNoRecreate = - properties.getBoolean(Flags.FLAG_ENABLE_TASKBAR_NO_RECREATE, false); - enableTaskbarPinning = - properties.getBoolean(Flags.FLAG_ENABLE_TASKBAR_PINNING, true); - enableTwoPaneLauncherSettings = - properties.getBoolean(Flags.FLAG_ENABLE_TWO_PANE_LAUNCHER_SETTINGS, true); - enableTwolineAllapps = - properties.getBoolean(Flags.FLAG_ENABLE_TWOLINE_ALLAPPS, false); - enableTwolineToggle = - properties.getBoolean(Flags.FLAG_ENABLE_TWOLINE_TOGGLE, true); - enableUnfoldStateAnimation = - properties.getBoolean(Flags.FLAG_ENABLE_UNFOLD_STATE_ANIMATION, false); - enableUnfoldedTwoPanePicker = - properties.getBoolean(Flags.FLAG_ENABLE_UNFOLDED_TWO_PANE_PICKER, true); - enableWidgetTapToAdd = - properties.getBoolean(Flags.FLAG_ENABLE_WIDGET_TAP_TO_ADD, true); - enableWorkspaceInflation = - properties.getBoolean(Flags.FLAG_ENABLE_WORKSPACE_INFLATION, true); - enabledFoldersInAllApps = - properties.getBoolean(Flags.FLAG_ENABLED_FOLDERS_IN_ALL_APPS, false); - floatingSearchBar = - properties.getBoolean(Flags.FLAG_FLOATING_SEARCH_BAR, false); - forceMonochromeAppIcons = - properties.getBoolean(Flags.FLAG_FORCE_MONOCHROME_APP_ICONS, true); - useActivityOverlay = - properties.getBoolean(Flags.FLAG_USE_ACTIVITY_OVERLAY, true); - } catch (NullPointerException e) { - // Ignored - } - launcher_is_cached = true; - } - - private void load_overrides_launcher_search() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - enablePrivateSpace = - properties.getBoolean(Flags.FLAG_ENABLE_PRIVATE_SPACE, BuildCompat.isAtLeastU()); - privateSpaceAddFloatingMaskView = - properties.getBoolean(Flags.FLAG_PRIVATE_SPACE_ADD_FLOATING_MASK_VIEW, BuildCompat.isAtLeastU()); - privateSpaceAnimation = - properties.getBoolean(Flags.FLAG_PRIVATE_SPACE_ANIMATION, BuildCompat.isAtLeastU()); - privateSpaceAppInstallerButton = - properties.getBoolean(Flags.FLAG_PRIVATE_SPACE_APP_INSTALLER_BUTTON, BuildCompat.isAtLeastU()); - privateSpaceRestrictAccessibilityDrag = - properties.getBoolean(Flags.FLAG_PRIVATE_SPACE_RESTRICT_ACCESSIBILITY_DRAG, BuildCompat.isAtLeastU()); - privateSpaceRestrictItemDrag = - properties.getBoolean(Flags.FLAG_PRIVATE_SPACE_RESTRICT_ITEM_DRAG, BuildCompat.isAtLeastU()); - privateSpaceSysAppsSeparation = - properties.getBoolean(Flags.FLAG_PRIVATE_SPACE_SYS_APPS_SEPARATION, BuildCompat.isAtLeastU()); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace launcher_search " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } - launcher_search_is_cached = true; - } - - @Override - public boolean enableAddAppWidgetViaConfigActivityV2() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableAddAppWidgetViaConfigActivityV2; - - } - - public boolean enableAdditionalHomeAnimations() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableAdditionalHomeAnimations; + @Override + + + public boolean accessibilityScrollOnAllapps() { + return true; + } + + @Override + + + public boolean allAppsBlur() { + return true; + } + + @Override + + + public boolean allAppsSheetForHandheld() { + return true; + } + + @Override + + + public boolean avoidDisplayCutoutBubbleBar() { + return false; + } + @Override + + + public boolean blurredHomeAnimation() { + return false; } @Override + + + public boolean clearScrimOnReset() { + return true; + } + + @Override + + + public boolean enableAllAppsButtonInHotseat() { + return false; + } + + @Override + + + public boolean enableAltTabKqsFlatenning() { + return true; + } + + @Override + + + public boolean enableAltTabKqsOnConnectedDisplays() { + return true; + } + + @Override + + + public boolean enableAppWidgetPickerRefactor() { + return false; + } + + @Override + + + public boolean enableAutoStashConnectedDisplayTaskbar() { + return true; + } + + @Override + + public boolean enableCategorizedWidgetSuggestions() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableCategorizedWidgetSuggestions; + return true; + } + + @Override + + public boolean enableContrastTiles() { + return false; } @Override - public boolean enableCursorHoverStates() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableCursorHoverStates; + + public boolean enableCursorDrivenWorkflows() { + return false; } @Override + + + public boolean enableCustomHeightForAllAppsOnCd() { + return true; + } + + @Override + + + public boolean enableDesktopExplodedView() { + return true; + } + + @Override + + public boolean enableExpandingPauseWorkButton() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableExpandingPauseWorkButton; + return true; + } + @Override + + + public boolean enableExpressiveDismissTaskMotion() { + return true; } @Override - public boolean enableFallbackOverviewInWindow() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableFallbackOverviewInWindow; + + public boolean enableExpressiveFolderExpansion() { + return false; } @Override - public boolean enableFirstScreenBroadcastArchivingExtras() { + + + public boolean enableFallbackOverviewInWindow() { return false; + } + @Override + + + public boolean enableFirstScreenBroadcastArchivingExtras() { + return true; } @Override + + public boolean enableFocusOutline() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableFocusOutline; + return true; + } + + @Override + + + public boolean enableGestureNavOnConnectedDisplays() { + return true; + } + + @Override + + + public boolean enableGridOnlyOverview() { + return true; + } + + @Override + + public boolean enableGrowthNudge() { + return false; } @Override - public boolean enableGeneratedPreviews() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableGeneratedPreviews; + + public boolean enableHomeTransitionListener() { + return true; } @Override - public boolean enableGridMigrationFix() { + + + public boolean enableLaterIsLockedCheck() { return false; + } + + @Override + + public boolean enableLauncherBrMetricsFixed() { + return true; } @Override - public boolean enableGridOnlyOverview() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableGridOnlyOverview; + + public boolean enableLauncherIconShapes() { + return true; } @Override - public boolean enableHandleDelayedGestureCallbacks() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableHandleDelayedGestureCallbacks; + + public boolean enableLauncherOverviewInWindow() { + return false; } @Override - public boolean enableHomeTransitionListener() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableHomeTransitionListener; + + public boolean enableLauncherVisualRefresh() { + return true; } @Override - public boolean enableLauncherBrMetricsFixed() { + + + public boolean enableMetaTabToggleInOverview() { return true; + } + + @Override + + public boolean enableMouseInteractionChanges() { + return false; } @Override + + + public boolean enableMultiInstanceMenuTaskbar() { + return true; + } + + @Override + + public boolean enableNarrowGridRestore() { - return false; + return true; + } + + @Override + + public boolean enableNewAllSetAnimation() { + return true; } @Override + + + public boolean enableOverviewBackgroundWallpaperBlur() { + return true; + } + + @Override + + + public boolean enableOverviewDesktopTileWallpaperBackground() { + return false; + } + + @Override + + public boolean enableOverviewIconMenu() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableOverviewIconMenu; + return true; + } + + @Override + + public boolean enableOverviewOnConnectedDisplays() { + return true; } @Override - public boolean enablePredictiveBackGesture() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enablePredictiveBackGesture; + + public boolean enablePredictiveBackInOverview() { + return false; } @Override - public boolean enablePrivateSpace() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_search_is_cached) { - load_overrides_launcher_search(); - } - } - return enablePrivateSpace; + + public boolean enablePreventOverviewMouseDrag() { + return false; } @Override - public boolean enablePrivateSpaceInstallShortcut() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enablePrivateSpaceInstallShortcut; + + public boolean enablePrivateSpace() { + return true; } @Override - public boolean enableRebootUnlockAnimation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableRebootUnlockAnimation; + + public boolean enableQsbOnHotseat() { + return false; } @Override + + + public boolean enableRebootUnlockAnimation() { + return false; + } + + @Override + + public boolean enableRecentsInTaskbar() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableRecentsInTaskbar; + return false; + } + @Override + + + public boolean enableRecentsWindowProtoLog() { + return false; } @Override - public boolean enableRefactorTaskThumbnail() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableRefactorTaskThumbnail; + + public boolean enableRefactorDigitalWellbeingToast() { + return false; + } + + @Override + + + public boolean enableRefactorTaskContentView() { + return true; + } + + @Override + + + public boolean enableRefactorTaskThumbnail() { + return true; } @Override + + public boolean enableResponsiveWorkspace() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableResponsiveWorkspace; + return true; + } + + @Override + + public boolean enableReversibleHomeActionCorner() { + return false; } @Override - public boolean enableScalingRevealHomeAnimation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableScalingRevealHomeAnimation; + + public boolean enableScalabilityForDesktopExperience() { + return false; } @Override - public boolean enableShortcutDontSuggestApp() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableShortcutDontSuggestApp; + + public boolean enableSimultaneousOverviewTriggerOnExtendedDesktop() { + return false; } @Override - public boolean enableSmartspaceAsAWidget() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableSmartspaceAsAWidget; + + public boolean enableStateManagerProtoLog() { + return false; } @Override - public boolean enableSmartspaceRemovalToggle() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableSmartspaceRemovalToggle; + + public boolean enableStrictMode() { + return false; } @Override + + public boolean enableSupportForArchiving() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableSupportForArchiving; + return true; + } + + @Override + + public boolean enableSystemDrag() { + return false; } @Override + + public boolean enableTabletTwoPanePickerV2() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableTabletTwoPanePickerV2; + return false; + } + + @Override + + public boolean enableTaskbarBehindShade() { + return false; } @Override + + public boolean enableTaskbarCustomization() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableTaskbarCustomization; + return false; + } + + @Override + + public boolean enableTaskbarDragAndDrop() { + return false; } @Override - public boolean enableTaskbarNoRecreate() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableTaskbarNoRecreate; + + public boolean enableTaskbarForDirectBoot() { + return true; + } + + @Override + + + public boolean enableTaskbarIconContainer() { + return false; } @Override + + + public boolean enableTaskbarNoRecreate() { + return false; + } + + @Override + + public boolean enableTaskbarPinning() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableTaskbarPinning; + return true; + } + + @Override + + public boolean enableTaskbarRecentsThemedIcons() { + return true; } @Override - public boolean enableTwoPaneLauncherSettings() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableTwoPaneLauncherSettings; + + public boolean enableTaskbarUiThread() { + return false; } @Override - public boolean enableTwolineAllapps() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableTwolineAllapps; + + public boolean enableTieredWidgetsByDefaultInPicker() { + return false; } @Override - public boolean enableTwolineToggle() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableTwolineToggle; + + public boolean enableTwoPaneLauncherSettings() { + return false; } @Override - public boolean enableUnfoldStateAnimation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableUnfoldStateAnimation; + + public boolean enableTwolineAllapps() { + return false; } @Override - public boolean enableUnfoldedTwoPanePicker() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableUnfoldedTwoPanePicker; + + public boolean enableTwolineToggle() { + return true; } @Override - public boolean enableWidgetTapToAdd() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableWidgetTapToAdd; + + public boolean enableUnfoldStateAnimation() { + return false; } @Override - public boolean enableWorkspaceInflation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enableWorkspaceInflation; + + public boolean enableWidgetPickerRefactor() { + return true; } @Override + + public boolean enabledFoldersInAllApps() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return enabledFoldersInAllApps; + return false; + } + + @Override + + public boolean expandableLongPressMenu() { + return false; } @Override - public boolean floatingSearchBar() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return floatingSearchBar; + + public boolean firstPagePinnedWidgetRemovalToggle() { + return false; } @Override + + + public boolean floatingSearchBar() { + return false; + } + + @Override + + public boolean forceMonochromeAppIcons() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return forceMonochromeAppIcons; + return true; + } + + @Override + + + public boolean forceMonochromeAppIconsAdaptColors() { + return false; + } + + @Override + + public boolean homeScreenEditImprovements() { + return false; } @Override - public boolean privateSpaceAddFloatingMaskView() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_search_is_cached) { - load_overrides_launcher_search(); - } - } - return privateSpaceAddFloatingMaskView; + + public boolean ignoreThreeFingerTrackpadForNavHandleLongPress() { + return true; } @Override - public boolean privateSpaceAnimation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_search_is_cached) { - load_overrides_launcher_search(); - } - } - return privateSpaceAnimation; + + public boolean injectableModelItems() { + return false; } @Override - public boolean privateSpaceAppInstallerButton() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_search_is_cached) { - load_overrides_launcher_search(); - } - } - return privateSpaceAppInstallerButton; + + public boolean letterFastScroller() { + return false; } @Override - public boolean privateSpaceRestrictAccessibilityDrag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_search_is_cached) { - load_overrides_launcher_search(); - } - } - return privateSpaceRestrictAccessibilityDrag; + + public boolean modelRepository() { + return false; } @Override - public boolean privateSpaceRestrictItemDrag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_search_is_cached) { - load_overrides_launcher_search(); - } - } - return privateSpaceRestrictItemDrag; + + public boolean msdlFeedback() { + return true; } @Override + + + public boolean nudgePill() { + return false; + } + + @Override + + + public boolean oneGridMountedMode() { + return false; + } + + @Override + + + public boolean oneGridRotationHandling() { + return false; + } + + @Override + + + public boolean oneGridSpecs() { + return true; + } + + @Override + + + public boolean privateSpaceAddFloatingMaskView() { + return true; + } + + @Override + + + public boolean privateSpaceAnimation() { + return true; + } + + @Override + + + public boolean privateSpaceRestrictAccessibilityDrag() { + return true; + } + + @Override + + + public boolean privateSpaceRestrictItemDrag() { + return true; + } + + @Override + + public boolean privateSpaceSysAppsSeparation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_search_is_cached) { - load_overrides_launcher_search(); - } - } - return privateSpaceSysAppsSeparation; + return true; + } + + @Override + + public boolean refactorTaskbarUiState() { + return true; } @Override - public boolean useActivityOverlay() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!launcher_is_cached) { - load_overrides_launcher(); - } - } - return useActivityOverlay; + + public boolean removeAppsRefreshOnRightClick() { + return true; } -} + @Override + + + public boolean restoreArchivedAppIconsFromDb() { + return true; + } + + @Override + + + public boolean restoreArchivedShortcuts() { + return true; + } + + @Override + + + public boolean showCloseButtonOnTaskviewHover() { + return true; + } + + @Override + + + public boolean showFilesOnHomeScreen() { + return false; + } + + @Override + + + public boolean showTaskbarPinningPopupFromAnywhere() { + return true; + } + + @Override + + + public boolean simplifiedLauncherModelBinding() { + return false; + } + + @Override + + + public boolean syncAppLaunchWithTaskbarStash() { + return true; + } + @Override + + + public boolean taskbarQuietModeChangeSupport() { + return false; + } + + @Override + + + public boolean unpinFirstPagePinnedWidget() { + return false; + } + + @Override + + + public boolean useNewIconForArchivedApps() { + return true; + } + + @Override + + + public boolean useSystemRadiusForAppWidgets() { + return true; + } + + @Override + + + public boolean workSchedulerInWorkProfile() { + return true; + } + +} diff --git a/flags/src/com/android/launcher3/Flags.java b/flags/src/com/android/launcher3/Flags.java index 3e37a8f2a89..576bf61fa6c 100644 --- a/flags/src/com/android/launcher3/Flags.java +++ b/flags/src/com/android/launcher3/Flags.java @@ -1,72 +1,147 @@ package com.android.launcher3; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + + /** @hide */ public final class Flags { /** @hide */ - public static final String FLAG_ENABLE_ADD_APP_WIDGET_VIA_CONFIG_ACTIVITY_V2 = "com.android.launcher3.enable_add_app_widget_via_config_activity_v2"; + public static final String FLAG_ACCESSIBILITY_SCROLL_ON_ALLAPPS = "com.android.launcher3.accessibility_scroll_on_allapps"; + /** @hide */ + public static final String FLAG_ALL_APPS_BLUR = "com.android.launcher3.all_apps_blur"; + /** @hide */ + public static final String FLAG_ALL_APPS_SHEET_FOR_HANDHELD = "com.android.launcher3.all_apps_sheet_for_handheld"; + /** @hide */ + public static final String FLAG_AVOID_DISPLAY_CUTOUT_BUBBLE_BAR = "com.android.launcher3.avoid_display_cutout_bubble_bar"; + /** @hide */ + public static final String FLAG_BLURRED_HOME_ANIMATION = "com.android.launcher3.blurred_home_animation"; + /** @hide */ + public static final String FLAG_CLEAR_SCRIM_ON_RESET = "com.android.launcher3.clear_scrim_on_reset"; + /** @hide */ + public static final String FLAG_ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT = "com.android.launcher3.enable_all_apps_button_in_hotseat"; + /** @hide */ + public static final String FLAG_ENABLE_ALT_TAB_KQS_FLATENNING = "com.android.launcher3.enable_alt_tab_kqs_flatenning"; + /** @hide */ + public static final String FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS = "com.android.launcher3.enable_alt_tab_kqs_on_connected_displays"; /** @hide */ - public static final String FLAG_ENABLE_ADDITIONAL_HOME_ANIMATIONS = "com.android.launcher3.enable_additional_home_animations"; + public static final String FLAG_ENABLE_APP_WIDGET_PICKER_REFACTOR = "com.android.launcher3.enable_app_widget_picker_refactor"; + /** @hide */ + public static final String FLAG_ENABLE_AUTO_STASH_CONNECTED_DISPLAY_TASKBAR = "com.android.launcher3.enable_auto_stash_connected_display_taskbar"; /** @hide */ public static final String FLAG_ENABLE_CATEGORIZED_WIDGET_SUGGESTIONS = "com.android.launcher3.enable_categorized_widget_suggestions"; /** @hide */ - public static final String FLAG_ENABLE_CURSOR_HOVER_STATES = "com.android.launcher3.enable_cursor_hover_states"; + public static final String FLAG_ENABLE_CONTRAST_TILES = "com.android.launcher3.enable_contrast_tiles"; + /** @hide */ + public static final String FLAG_ENABLE_CURSOR_DRIVEN_WORKFLOWS = "com.android.launcher3.enable_cursor_driven_workflows"; + /** @hide */ + public static final String FLAG_ENABLE_CUSTOM_HEIGHT_FOR_ALL_APPS_ON_CD = "com.android.launcher3.enable_custom_height_for_all_apps_on_cd"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_EXPLODED_VIEW = "com.android.launcher3.enable_desktop_exploded_view"; /** @hide */ public static final String FLAG_ENABLE_EXPANDING_PAUSE_WORK_BUTTON = "com.android.launcher3.enable_expanding_pause_work_button"; /** @hide */ + public static final String FLAG_ENABLE_EXPRESSIVE_DISMISS_TASK_MOTION = "com.android.launcher3.enable_expressive_dismiss_task_motion"; + /** @hide */ + public static final String FLAG_ENABLE_EXPRESSIVE_FOLDER_EXPANSION = "com.android.launcher3.enable_expressive_folder_expansion"; + /** @hide */ public static final String FLAG_ENABLE_FALLBACK_OVERVIEW_IN_WINDOW = "com.android.launcher3.enable_fallback_overview_in_window"; /** @hide */ public static final String FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS = "com.android.launcher3.enable_first_screen_broadcast_archiving_extras"; /** @hide */ public static final String FLAG_ENABLE_FOCUS_OUTLINE = "com.android.launcher3.enable_focus_outline"; /** @hide */ - public static final String FLAG_ENABLE_GENERATED_PREVIEWS = "com.android.launcher3.enable_generated_previews"; - /** @hide */ - public static final String FLAG_ENABLE_GRID_MIGRATION_FIX = "com.android.launcher3.enable_grid_migration_fix"; + public static final String FLAG_ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS = "com.android.launcher3.enable_gesture_nav_on_connected_displays"; /** @hide */ public static final String FLAG_ENABLE_GRID_ONLY_OVERVIEW = "com.android.launcher3.enable_grid_only_overview"; /** @hide */ - public static final String FLAG_ENABLE_HANDLE_DELAYED_GESTURE_CALLBACKS = "com.android.launcher3.enable_handle_delayed_gesture_callbacks"; + public static final String FLAG_ENABLE_GROWTH_NUDGE = "com.android.launcher3.enable_growth_nudge"; /** @hide */ public static final String FLAG_ENABLE_HOME_TRANSITION_LISTENER = "com.android.launcher3.enable_home_transition_listener"; /** @hide */ + public static final String FLAG_ENABLE_LATER_IS_LOCKED_CHECK = "com.android.launcher3.enable_later_is_locked_check"; + /** @hide */ public static final String FLAG_ENABLE_LAUNCHER_BR_METRICS_FIXED = "com.android.launcher3.enable_launcher_br_metrics_fixed"; /** @hide */ + public static final String FLAG_ENABLE_LAUNCHER_ICON_SHAPES = "com.android.launcher3.enable_launcher_icon_shapes"; + /** @hide */ + public static final String FLAG_ENABLE_LAUNCHER_OVERVIEW_IN_WINDOW = "com.android.launcher3.enable_launcher_overview_in_window"; + /** @hide */ + public static final String FLAG_ENABLE_LAUNCHER_VISUAL_REFRESH = "com.android.launcher3.enable_launcher_visual_refresh"; + /** @hide */ + public static final String FLAG_ENABLE_META_TAB_TOGGLE_IN_OVERVIEW = "com.android.launcher3.enable_meta_tab_toggle_in_overview"; + /** @hide */ + public static final String FLAG_ENABLE_MOUSE_INTERACTION_CHANGES = "com.android.launcher3.enable_mouse_interaction_changes"; + /** @hide */ + public static final String FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR = "com.android.launcher3.enable_multi_instance_menu_taskbar"; + /** @hide */ public static final String FLAG_ENABLE_NARROW_GRID_RESTORE = "com.android.launcher3.enable_narrow_grid_restore"; /** @hide */ + public static final String FLAG_ENABLE_NEW_ALL_SET_ANIMATION = "com.android.launcher3.enable_new_all_set_animation"; + /** @hide */ + public static final String FLAG_ENABLE_OVERVIEW_BACKGROUND_WALLPAPER_BLUR = "com.android.launcher3.enable_overview_background_wallpaper_blur"; + /** @hide */ + public static final String FLAG_ENABLE_OVERVIEW_DESKTOP_TILE_WALLPAPER_BACKGROUND = "com.android.launcher3.enable_overview_desktop_tile_wallpaper_background"; + /** @hide */ public static final String FLAG_ENABLE_OVERVIEW_ICON_MENU = "com.android.launcher3.enable_overview_icon_menu"; /** @hide */ - public static final String FLAG_ENABLE_PREDICTIVE_BACK_GESTURE = "com.android.launcher3.enable_predictive_back_gesture"; + public static final String FLAG_ENABLE_OVERVIEW_ON_CONNECTED_DISPLAYS = "com.android.launcher3.enable_overview_on_connected_displays"; + /** @hide */ + public static final String FLAG_ENABLE_PREDICTIVE_BACK_IN_OVERVIEW = "com.android.launcher3.enable_predictive_back_in_overview"; + /** @hide */ + public static final String FLAG_ENABLE_PREVENT_OVERVIEW_MOUSE_DRAG = "com.android.launcher3.enable_prevent_overview_mouse_drag"; /** @hide */ public static final String FLAG_ENABLE_PRIVATE_SPACE = "com.android.launcher3.enable_private_space"; /** @hide */ - public static final String FLAG_ENABLE_PRIVATE_SPACE_INSTALL_SHORTCUT = "com.android.launcher3.enable_private_space_install_shortcut"; + public static final String FLAG_ENABLE_QSB_ON_HOTSEAT = "com.android.launcher3.enable_qsb_on_hotseat"; /** @hide */ public static final String FLAG_ENABLE_REBOOT_UNLOCK_ANIMATION = "com.android.launcher3.enable_reboot_unlock_animation"; /** @hide */ public static final String FLAG_ENABLE_RECENTS_IN_TASKBAR = "com.android.launcher3.enable_recents_in_taskbar"; /** @hide */ + public static final String FLAG_ENABLE_RECENTS_WINDOW_PROTO_LOG = "com.android.launcher3.enable_recents_window_proto_log"; + /** @hide */ + public static final String FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST = "com.android.launcher3.enable_refactor_digital_wellbeing_toast"; + /** @hide */ + public static final String FLAG_ENABLE_REFACTOR_TASK_CONTENT_VIEW = "com.android.launcher3.enable_refactor_task_content_view"; + /** @hide */ public static final String FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL = "com.android.launcher3.enable_refactor_task_thumbnail"; /** @hide */ public static final String FLAG_ENABLE_RESPONSIVE_WORKSPACE = "com.android.launcher3.enable_responsive_workspace"; /** @hide */ - public static final String FLAG_ENABLE_SCALING_REVEAL_HOME_ANIMATION = "com.android.launcher3.enable_scaling_reveal_home_animation"; + public static final String FLAG_ENABLE_REVERSIBLE_HOME_ACTION_CORNER = "com.android.launcher3.enable_reversible_home_action_corner"; + /** @hide */ + public static final String FLAG_ENABLE_SCALABILITY_FOR_DESKTOP_EXPERIENCE = "com.android.launcher3.enable_scalability_for_desktop_experience"; /** @hide */ - public static final String FLAG_ENABLE_SHORTCUT_DONT_SUGGEST_APP = "com.android.launcher3.enable_shortcut_dont_suggest_app"; + public static final String FLAG_ENABLE_SIMULTANEOUS_OVERVIEW_TRIGGER_ON_EXTENDED_DESKTOP = "com.android.launcher3.enable_simultaneous_overview_trigger_on_extended_desktop"; /** @hide */ - public static final String FLAG_ENABLE_SMARTSPACE_AS_A_WIDGET = "com.android.launcher3.enable_smartspace_as_a_widget"; + public static final String FLAG_ENABLE_STATE_MANAGER_PROTO_LOG = "com.android.launcher3.enable_state_manager_proto_log"; /** @hide */ - public static final String FLAG_ENABLE_SMARTSPACE_REMOVAL_TOGGLE = "com.android.launcher3.enable_smartspace_removal_toggle"; + public static final String FLAG_ENABLE_STRICT_MODE = "com.android.launcher3.enable_strict_mode"; /** @hide */ public static final String FLAG_ENABLE_SUPPORT_FOR_ARCHIVING = "com.android.launcher3.enable_support_for_archiving"; /** @hide */ + public static final String FLAG_ENABLE_SYSTEM_DRAG = "com.android.launcher3.enable_system_drag"; + /** @hide */ public static final String FLAG_ENABLE_TABLET_TWO_PANE_PICKER_V2 = "com.android.launcher3.enable_tablet_two_pane_picker_v2"; /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_BEHIND_SHADE = "com.android.launcher3.enable_taskbar_behind_shade"; + /** @hide */ public static final String FLAG_ENABLE_TASKBAR_CUSTOMIZATION = "com.android.launcher3.enable_taskbar_customization"; /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_DRAG_AND_DROP = "com.android.launcher3.enable_taskbar_drag_and_drop"; + /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT = "com.android.launcher3.enable_taskbar_for_direct_boot"; + /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_ICON_CONTAINER = "com.android.launcher3.enable_taskbar_icon_container"; + /** @hide */ public static final String FLAG_ENABLE_TASKBAR_NO_RECREATE = "com.android.launcher3.enable_taskbar_no_recreate"; /** @hide */ public static final String FLAG_ENABLE_TASKBAR_PINNING = "com.android.launcher3.enable_taskbar_pinning"; /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_RECENTS_THEMED_ICONS = "com.android.launcher3.enable_taskbar_recents_themed_icons"; + /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_UI_THREAD = "com.android.launcher3.enable_taskbar_ui_thread"; + /** @hide */ + public static final String FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER = "com.android.launcher3.enable_tiered_widgets_by_default_in_picker"; + /** @hide */ public static final String FLAG_ENABLE_TWO_PANE_LAUNCHER_SETTINGS = "com.android.launcher3.enable_two_pane_launcher_settings"; /** @hide */ public static final String FLAG_ENABLE_TWOLINE_ALLAPPS = "com.android.launcher3.enable_twoline_allapps"; @@ -75,228 +150,732 @@ public final class Flags { /** @hide */ public static final String FLAG_ENABLE_UNFOLD_STATE_ANIMATION = "com.android.launcher3.enable_unfold_state_animation"; /** @hide */ - public static final String FLAG_ENABLE_UNFOLDED_TWO_PANE_PICKER = "com.android.launcher3.enable_unfolded_two_pane_picker"; + public static final String FLAG_ENABLE_WIDGET_PICKER_REFACTOR = "com.android.launcher3.enable_widget_picker_refactor"; /** @hide */ - public static final String FLAG_ENABLE_WIDGET_TAP_TO_ADD = "com.android.launcher3.enable_widget_tap_to_add"; + public static final String FLAG_ENABLED_FOLDERS_IN_ALL_APPS = "com.android.launcher3.enabled_folders_in_all_apps"; /** @hide */ - public static final String FLAG_ENABLE_WORKSPACE_INFLATION = "com.android.launcher3.enable_workspace_inflation"; + public static final String FLAG_EXPANDABLE_LONG_PRESS_MENU = "com.android.launcher3.expandable_long_press_menu"; /** @hide */ - public static final String FLAG_ENABLED_FOLDERS_IN_ALL_APPS = "com.android.launcher3.enabled_folders_in_all_apps"; + public static final String FLAG_FIRST_PAGE_PINNED_WIDGET_REMOVAL_TOGGLE = "com.android.launcher3.first_page_pinned_widget_removal_toggle"; /** @hide */ public static final String FLAG_FLOATING_SEARCH_BAR = "com.android.launcher3.floating_search_bar"; /** @hide */ public static final String FLAG_FORCE_MONOCHROME_APP_ICONS = "com.android.launcher3.force_monochrome_app_icons"; /** @hide */ + public static final String FLAG_FORCE_MONOCHROME_APP_ICONS_ADAPT_COLORS = "com.android.launcher3.force_monochrome_app_icons_adapt_colors"; + /** @hide */ + public static final String FLAG_HOME_SCREEN_EDIT_IMPROVEMENTS = "com.android.launcher3.home_screen_edit_improvements"; + /** @hide */ + public static final String FLAG_IGNORE_THREE_FINGER_TRACKPAD_FOR_NAV_HANDLE_LONG_PRESS = "com.android.launcher3.ignore_three_finger_trackpad_for_nav_handle_long_press"; + /** @hide */ + public static final String FLAG_INJECTABLE_MODEL_ITEMS = "com.android.launcher3.injectable_model_items"; + /** @hide */ + public static final String FLAG_LETTER_FAST_SCROLLER = "com.android.launcher3.letter_fast_scroller"; + /** @hide */ + public static final String FLAG_MODEL_REPOSITORY = "com.android.launcher3.model_repository"; + /** @hide */ + public static final String FLAG_MSDL_FEEDBACK = "com.android.launcher3.msdl_feedback"; + /** @hide */ + public static final String FLAG_NUDGE_PILL = "com.android.launcher3.nudge_pill"; + /** @hide */ + public static final String FLAG_ONE_GRID_MOUNTED_MODE = "com.android.launcher3.one_grid_mounted_mode"; + /** @hide */ + public static final String FLAG_ONE_GRID_ROTATION_HANDLING = "com.android.launcher3.one_grid_rotation_handling"; + /** @hide */ + public static final String FLAG_ONE_GRID_SPECS = "com.android.launcher3.one_grid_specs"; + /** @hide */ public static final String FLAG_PRIVATE_SPACE_ADD_FLOATING_MASK_VIEW = "com.android.launcher3.private_space_add_floating_mask_view"; /** @hide */ public static final String FLAG_PRIVATE_SPACE_ANIMATION = "com.android.launcher3.private_space_animation"; /** @hide */ - public static final String FLAG_PRIVATE_SPACE_APP_INSTALLER_BUTTON = "com.android.launcher3.private_space_app_installer_button"; - /** @hide */ public static final String FLAG_PRIVATE_SPACE_RESTRICT_ACCESSIBILITY_DRAG = "com.android.launcher3.private_space_restrict_accessibility_drag"; /** @hide */ public static final String FLAG_PRIVATE_SPACE_RESTRICT_ITEM_DRAG = "com.android.launcher3.private_space_restrict_item_drag"; /** @hide */ public static final String FLAG_PRIVATE_SPACE_SYS_APPS_SEPARATION = "com.android.launcher3.private_space_sys_apps_separation"; /** @hide */ - public static final String FLAG_USE_ACTIVITY_OVERLAY = "com.android.launcher3.use_activity_overlay"; + public static final String FLAG_REFACTOR_TASKBAR_UI_STATE = "com.android.launcher3.refactor_taskbar_ui_state"; + /** @hide */ + public static final String FLAG_REMOVE_APPS_REFRESH_ON_RIGHT_CLICK = "com.android.launcher3.remove_apps_refresh_on_right_click"; + /** @hide */ + public static final String FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB = "com.android.launcher3.restore_archived_app_icons_from_db"; + /** @hide */ + public static final String FLAG_RESTORE_ARCHIVED_SHORTCUTS = "com.android.launcher3.restore_archived_shortcuts"; + /** @hide */ + public static final String FLAG_SHOW_CLOSE_BUTTON_ON_TASKVIEW_HOVER = "com.android.launcher3.show_close_button_on_taskview_hover"; + /** @hide */ + public static final String FLAG_SHOW_FILES_ON_HOME_SCREEN = "com.android.launcher3.show_files_on_home_screen"; + /** @hide */ + public static final String FLAG_SHOW_TASKBAR_PINNING_POPUP_FROM_ANYWHERE = "com.android.launcher3.show_taskbar_pinning_popup_from_anywhere"; + /** @hide */ + public static final String FLAG_SIMPLIFIED_LAUNCHER_MODEL_BINDING = "com.android.launcher3.simplified_launcher_model_binding"; + /** @hide */ + public static final String FLAG_SYNC_APP_LAUNCH_WITH_TASKBAR_STASH = "com.android.launcher3.sync_app_launch_with_taskbar_stash"; + /** @hide */ + public static final String FLAG_TASKBAR_QUIET_MODE_CHANGE_SUPPORT = "com.android.launcher3.taskbar_quiet_mode_change_support"; + /** @hide */ + public static final String FLAG_UNPIN_FIRST_PAGE_PINNED_WIDGET = "com.android.launcher3.unpin_first_page_pinned_widget"; + /** @hide */ + public static final String FLAG_USE_NEW_ICON_FOR_ARCHIVED_APPS = "com.android.launcher3.use_new_icon_for_archived_apps"; + /** @hide */ + public static final String FLAG_USE_SYSTEM_RADIUS_FOR_APP_WIDGETS = "com.android.launcher3.use_system_radius_for_app_widgets"; + /** @hide */ + public static final String FLAG_WORK_SCHEDULER_IN_WORK_PROFILE = "com.android.launcher3.work_scheduler_in_work_profile"; - public static boolean enableAddAppWidgetViaConfigActivityV2() { - return FEATURE_FLAGS.enableAddAppWidgetViaConfigActivityV2(); + + public static boolean accessibilityScrollOnAllapps() { + + return FEATURE_FLAGS.accessibilityScrollOnAllapps(); } - public static boolean enableAdditionalHomeAnimations() { - return FEATURE_FLAGS.enableAdditionalHomeAnimations(); + + public static boolean allAppsBlur() { + + return FEATURE_FLAGS.allAppsBlur(); + } + + + public static boolean allAppsSheetForHandheld() { + + return FEATURE_FLAGS.allAppsSheetForHandheld(); } + + public static boolean avoidDisplayCutoutBubbleBar() { + + return FEATURE_FLAGS.avoidDisplayCutoutBubbleBar(); + } + + + public static boolean blurredHomeAnimation() { + + return FEATURE_FLAGS.blurredHomeAnimation(); + } + + + public static boolean clearScrimOnReset() { + + return FEATURE_FLAGS.clearScrimOnReset(); + } + + + public static boolean enableAllAppsButtonInHotseat() { + + return FEATURE_FLAGS.enableAllAppsButtonInHotseat(); + } + + + public static boolean enableAltTabKqsFlatenning() { + + return FEATURE_FLAGS.enableAltTabKqsFlatenning(); + } + + + public static boolean enableAltTabKqsOnConnectedDisplays() { + + return FEATURE_FLAGS.enableAltTabKqsOnConnectedDisplays(); + } + + + public static boolean enableAppWidgetPickerRefactor() { + + return FEATURE_FLAGS.enableAppWidgetPickerRefactor(); + } + + + public static boolean enableAutoStashConnectedDisplayTaskbar() { + + return FEATURE_FLAGS.enableAutoStashConnectedDisplayTaskbar(); + } + + public static boolean enableCategorizedWidgetSuggestions() { + return FEATURE_FLAGS.enableCategorizedWidgetSuggestions(); } - public static boolean enableCursorHoverStates() { - return FEATURE_FLAGS.enableCursorHoverStates(); + + public static boolean enableContrastTiles() { + + return FEATURE_FLAGS.enableContrastTiles(); + } + + + public static boolean enableCursorDrivenWorkflows() { + + return FEATURE_FLAGS.enableCursorDrivenWorkflows(); } + + public static boolean enableCustomHeightForAllAppsOnCd() { + + return FEATURE_FLAGS.enableCustomHeightForAllAppsOnCd(); + } + + + public static boolean enableDesktopExplodedView() { + + return FEATURE_FLAGS.enableDesktopExplodedView(); + } + + public static boolean enableExpandingPauseWorkButton() { + return FEATURE_FLAGS.enableExpandingPauseWorkButton(); } + + public static boolean enableExpressiveDismissTaskMotion() { + + return FEATURE_FLAGS.enableExpressiveDismissTaskMotion(); + } + + + public static boolean enableExpressiveFolderExpansion() { + + return FEATURE_FLAGS.enableExpressiveFolderExpansion(); + } + + public static boolean enableFallbackOverviewInWindow() { + return FEATURE_FLAGS.enableFallbackOverviewInWindow(); } + public static boolean enableFirstScreenBroadcastArchivingExtras() { + return FEATURE_FLAGS.enableFirstScreenBroadcastArchivingExtras(); } + public static boolean enableFocusOutline() { + return FEATURE_FLAGS.enableFocusOutline(); } - public static boolean enableGeneratedPreviews() { - return FEATURE_FLAGS.enableGeneratedPreviews(); - } - public static boolean enableGridMigrationFix() { - return FEATURE_FLAGS.enableGridMigrationFix(); + public static boolean enableGestureNavOnConnectedDisplays() { + + return FEATURE_FLAGS.enableGestureNavOnConnectedDisplays(); } + public static boolean enableGridOnlyOverview() { + return FEATURE_FLAGS.enableGridOnlyOverview(); } - public static boolean enableHandleDelayedGestureCallbacks() { - return FEATURE_FLAGS.enableHandleDelayedGestureCallbacks(); + + public static boolean enableGrowthNudge() { + + return FEATURE_FLAGS.enableGrowthNudge(); } + public static boolean enableHomeTransitionListener() { + return FEATURE_FLAGS.enableHomeTransitionListener(); } + + public static boolean enableLaterIsLockedCheck() { + + return FEATURE_FLAGS.enableLaterIsLockedCheck(); + } + + public static boolean enableLauncherBrMetricsFixed() { + return FEATURE_FLAGS.enableLauncherBrMetricsFixed(); } + + public static boolean enableLauncherIconShapes() { + + return FEATURE_FLAGS.enableLauncherIconShapes(); + } + + + public static boolean enableLauncherOverviewInWindow() { + + return FEATURE_FLAGS.enableLauncherOverviewInWindow(); + } + + + public static boolean enableLauncherVisualRefresh() { + + return FEATURE_FLAGS.enableLauncherVisualRefresh(); + } + + + public static boolean enableMetaTabToggleInOverview() { + + return FEATURE_FLAGS.enableMetaTabToggleInOverview(); + } + + + public static boolean enableMouseInteractionChanges() { + + return FEATURE_FLAGS.enableMouseInteractionChanges(); + } + + + public static boolean enableMultiInstanceMenuTaskbar() { + + return FEATURE_FLAGS.enableMultiInstanceMenuTaskbar(); + } + + public static boolean enableNarrowGridRestore() { + return FEATURE_FLAGS.enableNarrowGridRestore(); } + + public static boolean enableNewAllSetAnimation() { + + return FEATURE_FLAGS.enableNewAllSetAnimation(); + } + + + public static boolean enableOverviewBackgroundWallpaperBlur() { + + return FEATURE_FLAGS.enableOverviewBackgroundWallpaperBlur(); + } + + + public static boolean enableOverviewDesktopTileWallpaperBackground() { + + return FEATURE_FLAGS.enableOverviewDesktopTileWallpaperBackground(); + } + + public static boolean enableOverviewIconMenu() { + return FEATURE_FLAGS.enableOverviewIconMenu(); } - public static boolean enablePredictiveBackGesture() { - return FEATURE_FLAGS.enablePredictiveBackGesture(); + + public static boolean enableOverviewOnConnectedDisplays() { + + return FEATURE_FLAGS.enableOverviewOnConnectedDisplays(); + } + + + public static boolean enablePredictiveBackInOverview() { + + return FEATURE_FLAGS.enablePredictiveBackInOverview(); } + + public static boolean enablePreventOverviewMouseDrag() { + + return FEATURE_FLAGS.enablePreventOverviewMouseDrag(); + } + + public static boolean enablePrivateSpace() { + return FEATURE_FLAGS.enablePrivateSpace(); } - public static boolean enablePrivateSpaceInstallShortcut() { - return FEATURE_FLAGS.enablePrivateSpaceInstallShortcut(); + + public static boolean enableQsbOnHotseat() { + + return FEATURE_FLAGS.enableQsbOnHotseat(); } + public static boolean enableRebootUnlockAnimation() { + return FEATURE_FLAGS.enableRebootUnlockAnimation(); } + public static boolean enableRecentsInTaskbar() { + return FEATURE_FLAGS.enableRecentsInTaskbar(); } + + public static boolean enableRecentsWindowProtoLog() { + + return FEATURE_FLAGS.enableRecentsWindowProtoLog(); + } + + + public static boolean enableRefactorDigitalWellbeingToast() { + + return FEATURE_FLAGS.enableRefactorDigitalWellbeingToast(); + } + + + public static boolean enableRefactorTaskContentView() { + + return FEATURE_FLAGS.enableRefactorTaskContentView(); + } + + public static boolean enableRefactorTaskThumbnail() { + return FEATURE_FLAGS.enableRefactorTaskThumbnail(); } + public static boolean enableResponsiveWorkspace() { + return FEATURE_FLAGS.enableResponsiveWorkspace(); } - public static boolean enableScalingRevealHomeAnimation() { - return FEATURE_FLAGS.enableScalingRevealHomeAnimation(); + + public static boolean enableReversibleHomeActionCorner() { + + return FEATURE_FLAGS.enableReversibleHomeActionCorner(); } - public static boolean enableShortcutDontSuggestApp() { - return FEATURE_FLAGS.enableShortcutDontSuggestApp(); + + public static boolean enableScalabilityForDesktopExperience() { + + return FEATURE_FLAGS.enableScalabilityForDesktopExperience(); } - public static boolean enableSmartspaceAsAWidget() { - return FEATURE_FLAGS.enableSmartspaceAsAWidget(); + + public static boolean enableSimultaneousOverviewTriggerOnExtendedDesktop() { + + return FEATURE_FLAGS.enableSimultaneousOverviewTriggerOnExtendedDesktop(); } - public static boolean enableSmartspaceRemovalToggle() { - return FEATURE_FLAGS.enableSmartspaceRemovalToggle(); + + public static boolean enableStateManagerProtoLog() { + + return FEATURE_FLAGS.enableStateManagerProtoLog(); } + + public static boolean enableStrictMode() { + + return FEATURE_FLAGS.enableStrictMode(); + } + + public static boolean enableSupportForArchiving() { + return FEATURE_FLAGS.enableSupportForArchiving(); } + + public static boolean enableSystemDrag() { + + return FEATURE_FLAGS.enableSystemDrag(); + } + + public static boolean enableTabletTwoPanePickerV2() { + return FEATURE_FLAGS.enableTabletTwoPanePickerV2(); } + + public static boolean enableTaskbarBehindShade() { + + return FEATURE_FLAGS.enableTaskbarBehindShade(); + } + + public static boolean enableTaskbarCustomization() { + return FEATURE_FLAGS.enableTaskbarCustomization(); } + + public static boolean enableTaskbarDragAndDrop() { + + return FEATURE_FLAGS.enableTaskbarDragAndDrop(); + } + + + public static boolean enableTaskbarForDirectBoot() { + + return FEATURE_FLAGS.enableTaskbarForDirectBoot(); + } + + + public static boolean enableTaskbarIconContainer() { + + return FEATURE_FLAGS.enableTaskbarIconContainer(); + } + + public static boolean enableTaskbarNoRecreate() { + return FEATURE_FLAGS.enableTaskbarNoRecreate(); } + public static boolean enableTaskbarPinning() { + return FEATURE_FLAGS.enableTaskbarPinning(); } + + public static boolean enableTaskbarRecentsThemedIcons() { + + return FEATURE_FLAGS.enableTaskbarRecentsThemedIcons(); + } + + + public static boolean enableTaskbarUiThread() { + + return FEATURE_FLAGS.enableTaskbarUiThread(); + } + + + public static boolean enableTieredWidgetsByDefaultInPicker() { + + return FEATURE_FLAGS.enableTieredWidgetsByDefaultInPicker(); + } + + public static boolean enableTwoPaneLauncherSettings() { + return FEATURE_FLAGS.enableTwoPaneLauncherSettings(); } + public static boolean enableTwolineAllapps() { + return FEATURE_FLAGS.enableTwolineAllapps(); } + public static boolean enableTwolineToggle() { + return FEATURE_FLAGS.enableTwolineToggle(); } + public static boolean enableUnfoldStateAnimation() { + return FEATURE_FLAGS.enableUnfoldStateAnimation(); } - public static boolean enableUnfoldedTwoPanePicker() { - return FEATURE_FLAGS.enableUnfoldedTwoPanePicker(); - } - public static boolean enableWidgetTapToAdd() { - return FEATURE_FLAGS.enableWidgetTapToAdd(); + public static boolean enableWidgetPickerRefactor() { + + return FEATURE_FLAGS.enableWidgetPickerRefactor(); } - public static boolean enableWorkspaceInflation() { - return FEATURE_FLAGS.enableWorkspaceInflation(); - } public static boolean enabledFoldersInAllApps() { + return FEATURE_FLAGS.enabledFoldersInAllApps(); } + + public static boolean expandableLongPressMenu() { + + return FEATURE_FLAGS.expandableLongPressMenu(); + } + + + public static boolean firstPagePinnedWidgetRemovalToggle() { + + return FEATURE_FLAGS.firstPagePinnedWidgetRemovalToggle(); + } + + public static boolean floatingSearchBar() { + return FEATURE_FLAGS.floatingSearchBar(); } + public static boolean forceMonochromeAppIcons() { + return FEATURE_FLAGS.forceMonochromeAppIcons(); } + + public static boolean forceMonochromeAppIconsAdaptColors() { + + return FEATURE_FLAGS.forceMonochromeAppIconsAdaptColors(); + } + + + public static boolean homeScreenEditImprovements() { + + return FEATURE_FLAGS.homeScreenEditImprovements(); + } + + + public static boolean ignoreThreeFingerTrackpadForNavHandleLongPress() { + + return FEATURE_FLAGS.ignoreThreeFingerTrackpadForNavHandleLongPress(); + } + + + public static boolean injectableModelItems() { + + return FEATURE_FLAGS.injectableModelItems(); + } + + + public static boolean letterFastScroller() { + + return FEATURE_FLAGS.letterFastScroller(); + } + + + public static boolean modelRepository() { + + return FEATURE_FLAGS.modelRepository(); + } + + + public static boolean msdlFeedback() { + + return FEATURE_FLAGS.msdlFeedback(); + } + + + public static boolean nudgePill() { + + return FEATURE_FLAGS.nudgePill(); + } + + + public static boolean oneGridMountedMode() { + + return FEATURE_FLAGS.oneGridMountedMode(); + } + + + public static boolean oneGridRotationHandling() { + + return FEATURE_FLAGS.oneGridRotationHandling(); + } + + + public static boolean oneGridSpecs() { + + return FEATURE_FLAGS.oneGridSpecs(); + } + + public static boolean privateSpaceAddFloatingMaskView() { + return FEATURE_FLAGS.privateSpaceAddFloatingMaskView(); } + public static boolean privateSpaceAnimation() { + return FEATURE_FLAGS.privateSpaceAnimation(); } - public static boolean privateSpaceAppInstallerButton() { - return FEATURE_FLAGS.privateSpaceAppInstallerButton(); - } public static boolean privateSpaceRestrictAccessibilityDrag() { + return FEATURE_FLAGS.privateSpaceRestrictAccessibilityDrag(); } + public static boolean privateSpaceRestrictItemDrag() { + return FEATURE_FLAGS.privateSpaceRestrictItemDrag(); } + public static boolean privateSpaceSysAppsSeparation() { + return FEATURE_FLAGS.privateSpaceSysAppsSeparation(); } - public static boolean useActivityOverlay() { - return FEATURE_FLAGS.useActivityOverlay(); + + public static boolean refactorTaskbarUiState() { + + return FEATURE_FLAGS.refactorTaskbarUiState(); + } + + + public static boolean removeAppsRefreshOnRightClick() { + + return FEATURE_FLAGS.removeAppsRefreshOnRightClick(); + } + + + public static boolean restoreArchivedAppIconsFromDb() { + + return FEATURE_FLAGS.restoreArchivedAppIconsFromDb(); + } + + + public static boolean restoreArchivedShortcuts() { + + return FEATURE_FLAGS.restoreArchivedShortcuts(); + } + + + public static boolean showCloseButtonOnTaskviewHover() { + + return FEATURE_FLAGS.showCloseButtonOnTaskviewHover(); + } + + + public static boolean showFilesOnHomeScreen() { + + return FEATURE_FLAGS.showFilesOnHomeScreen(); + } + + + public static boolean showTaskbarPinningPopupFromAnywhere() { + + return FEATURE_FLAGS.showTaskbarPinningPopupFromAnywhere(); + } + + + public static boolean simplifiedLauncherModelBinding() { + + return FEATURE_FLAGS.simplifiedLauncherModelBinding(); + } + + + public static boolean syncAppLaunchWithTaskbarStash() { + + return FEATURE_FLAGS.syncAppLaunchWithTaskbarStash(); + } + + + public static boolean taskbarQuietModeChangeSupport() { + + return FEATURE_FLAGS.taskbarQuietModeChangeSupport(); + } + + + public static boolean unpinFirstPagePinnedWidget() { + + return FEATURE_FLAGS.unpinFirstPagePinnedWidget(); + } + + + public static boolean useNewIconForArchivedApps() { + + return FEATURE_FLAGS.useNewIconForArchivedApps(); + } + + + public static boolean useSystemRadiusForAppWidgets() { + + return FEATURE_FLAGS.useSystemRadiusForAppWidgets(); + } + + + public static boolean workSchedulerInWorkProfile() { + + return FEATURE_FLAGS.workSchedulerInWorkProfile(); } private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl(); -} \ No newline at end of file +} diff --git a/flags/src/com/android/quickstep/util/DeviceConfigHelper.kt b/flags/src/com/android/quickstep/util/DeviceConfigHelper.kt index a8a2991fd1c..d8716a5e8d8 100644 --- a/flags/src/com/android/quickstep/util/DeviceConfigHelper.kt +++ b/flags/src/com/android/quickstep/util/DeviceConfigHelper.kt @@ -20,61 +20,72 @@ import android.app.ActivityThread import android.content.Context import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener +import android.provider.DeviceConfig +import android.provider.DeviceConfig.OnPropertiesChangedListener +import android.provider.DeviceConfig.Properties import androidx.annotation.WorkerThread +import java.util.concurrent.CopyOnWriteArrayList /** Utility class to manage a set of device configurations */ class DeviceConfigHelper(private val factory: (PropReader) -> ConfigType) { var config: ConfigType private set + private val allKeys: Set + private val propertiesListener = OnPropertiesChangedListener { onDevicePropsChanges(it) } private val sharedPrefChangeListener = OnSharedPreferenceChangeListener { _, _ -> recreateConfig() } - private val changeListeners = mutableListOf() + private val changeListeners = CopyOnWriteArrayList() init { // Initialize the default config once. allKeys = HashSet() - config = factory( - PropReader( - object : PropProvider { - override fun get(key: String, fallback: T): T { - val prefs = prefs - allKeys.add(key) - return when (fallback) { - is Int -> prefs.getInt(key, fallback) as T - is Boolean -> prefs.getBoolean(key, fallback) as T - else -> fallback + config = + factory( + PropReader( + object : PropProvider { + override fun get(key: String, fallback: T): T { + val prefs = prefs + if (fallback is Int) { + allKeys.add(key) + return prefs.getInt(key, fallback) as T + } else if (fallback is Boolean) { + allKeys.add(key) + return prefs.getBoolean(key, fallback) as T + } else return fallback } } - } + ) ) - ) - prefs.registerOnSharedPreferenceChangeListener(sharedPrefChangeListener) } @WorkerThread - private fun onDevicePropsChanges() { + private fun onDevicePropsChanges(properties: Properties) { + if (NAMESPACE_LAUNCHER != properties.namespace) return + if (!allKeys.any(properties.keyset::contains)) return recreateConfig() } private fun recreateConfig() { - config = factory( - PropReader( - object : PropProvider { - override fun get(key: String, fallback: T): T { - return when (fallback) { - is Int -> prefs.getInt(key, fallback) as T - is Boolean -> prefs.getBoolean(key, fallback) as T - else -> fallback + val myProps = + DeviceConfig.getProperties(NAMESPACE_LAUNCHER, *allKeys.toTypedArray()) + config = + factory( + PropReader( + object : PropProvider { + override fun get(key: String, fallback: T): T { + if (fallback is Int) return myProps.getInt(key, fallback) as T + else if (fallback is Boolean) + return myProps.getBoolean(key, fallback) as T + else return fallback } } - } + ) ) - ) } /** Adds a listener for property changes */ @@ -84,6 +95,7 @@ class DeviceConfigHelper(private val factory: (PropReader) -> Config fun removeChangeListener(r: Runnable) = changeListeners.remove(r) fun close() { + DeviceConfig.removeOnPropertiesChangedListener(propertiesListener) prefs.unregisterOnSharedPreferenceChangeListener(sharedPrefChangeListener) } diff --git a/flags/src/com/android/server/am/CustomFeatureFlags.java b/flags/src/com/android/server/am/CustomFeatureFlags.java new file mode 100644 index 00000000000..e67413e1970 --- /dev/null +++ b/flags/src/com/android/server/am/CustomFeatureFlags.java @@ -0,0 +1,351 @@ +package com.android.server.am; + + +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.function.BiPredicate; +import java.util.function.Predicate; +/** @hide */ +public class CustomFeatureFlags implements FeatureFlags { + + private BiPredicate> mGetValueImpl; + + public CustomFeatureFlags(BiPredicate> getValueImpl) { + mGetValueImpl = getValueImpl; + } + @Override + + public boolean appStartInfoProcessNameFix() { + return getValue(Flags.FLAG_APP_START_INFO_PROCESS_NAME_FIX, + FeatureFlags::appStartInfoProcessNameFix); + } + + @Override + + public boolean autoTriggerOomadjUpdates() { + return getValue(Flags.FLAG_AUTO_TRIGGER_OOMADJ_UPDATES, + FeatureFlags::autoTriggerOomadjUpdates); + } + + @Override + + public boolean bfgsManagedNetworkAccess() { + return getValue(Flags.FLAG_BFGS_MANAGED_NETWORK_ACCESS, + FeatureFlags::bfgsManagedNetworkAccess); + } + + @Override + + public boolean collectLogcatOnRunSynchronously() { + return getValue(Flags.FLAG_COLLECT_LOGCAT_ON_RUN_SYNCHRONOUSLY, + FeatureFlags::collectLogcatOnRunSynchronously); + } + + @Override + + public boolean consolidateCollectReachable() { + return getValue(Flags.FLAG_CONSOLIDATE_COLLECT_REACHABLE, + FeatureFlags::consolidateCollectReachable); + } + + @Override + + public boolean cpuTimeCapabilityBasedFreezePolicy() { + return getValue(Flags.FLAG_CPU_TIME_CAPABILITY_BASED_FREEZE_POLICY, + FeatureFlags::cpuTimeCapabilityBasedFreezePolicy); + } + + @Override + + public boolean deferOutgoingBroadcasts() { + return getValue(Flags.FLAG_DEFER_OUTGOING_BROADCASTS, + FeatureFlags::deferOutgoingBroadcasts); + } + + @Override + + public boolean enableActivityManagerStructuredService() { + return getValue(Flags.FLAG_ENABLE_ACTIVITY_MANAGER_STRUCTURED_SERVICE, + FeatureFlags::enableActivityManagerStructuredService); + } + + @Override + + public boolean enableDropboxWatchdogHeaders() { + return getValue(Flags.FLAG_ENABLE_DROPBOX_WATCHDOG_HEADERS, + FeatureFlags::enableDropboxWatchdogHeaders); + } + + @Override + + public boolean enableLongMethodTracingOnAnrTimer() { + return getValue(Flags.FLAG_ENABLE_LONG_METHOD_TRACING_ON_ANR_TIMER, + FeatureFlags::enableLongMethodTracingOnAnrTimer); + } + + @Override + + public boolean expediteActivityLaunchOnColdStart() { + return getValue(Flags.FLAG_EXPEDITE_ACTIVITY_LAUNCH_ON_COLD_START, + FeatureFlags::expediteActivityLaunchOnColdStart); + } + + @Override + + public boolean fgsAbuseDetection() { + return getValue(Flags.FLAG_FGS_ABUSE_DETECTION, + FeatureFlags::fgsAbuseDetection); + } + + @Override + + public boolean fixApplyOomadjOrder() { + return getValue(Flags.FLAG_FIX_APPLY_OOMADJ_ORDER, + FeatureFlags::fixApplyOomadjOrder); + } + + @Override + + public boolean limitLogcatCollection() { + return getValue(Flags.FLAG_LIMIT_LOGCAT_COLLECTION, + FeatureFlags::limitLogcatCollection); + } + + @Override + + public boolean logBroadcastProcessedEvent() { + return getValue(Flags.FLAG_LOG_BROADCAST_PROCESSED_EVENT, + FeatureFlags::logBroadcastProcessedEvent); + } + + @Override + + public boolean logcatLongerTimeout() { + return getValue(Flags.FLAG_LOGCAT_LONGER_TIMEOUT, + FeatureFlags::logcatLongerTimeout); + } + + @Override + + public boolean lowerSmsOomImportance() { + return getValue(Flags.FLAG_LOWER_SMS_OOM_IMPORTANCE, + FeatureFlags::lowerSmsOomImportance); + } + + @Override + + public boolean notSkipConnectionRecomputeForBindScheduleLikeTopApp() { + return getValue(Flags.FLAG_NOT_SKIP_CONNECTION_RECOMPUTE_FOR_BIND_SCHEDULE_LIKE_TOP_APP, + FeatureFlags::notSkipConnectionRecomputeForBindScheduleLikeTopApp); + } + + @Override + + public boolean oomadjusterCachedAppTiers() { + return getValue(Flags.FLAG_OOMADJUSTER_CACHED_APP_TIERS, + FeatureFlags::oomadjusterCachedAppTiers); + } + + @Override + + public boolean oomadjusterPrevLaddering() { + return getValue(Flags.FLAG_OOMADJUSTER_PREV_LADDERING, + FeatureFlags::oomadjusterPrevLaddering); + } + + @Override + + public boolean oomadjusterVisLaddering() { + return getValue(Flags.FLAG_OOMADJUSTER_VIS_LADDERING, + FeatureFlags::oomadjusterVisLaddering); + } + + @Override + + public boolean perceptibleTasks() { + return getValue(Flags.FLAG_PERCEPTIBLE_TASKS, + FeatureFlags::perceptibleTasks); + } + + @Override + + public boolean prototypeAggressiveFreezing() { + return getValue(Flags.FLAG_PROTOTYPE_AGGRESSIVE_FREEZING, + FeatureFlags::prototypeAggressiveFreezing); + } + + @Override + + public boolean pscBatchServiceUpdates() { + return getValue(Flags.FLAG_PSC_BATCH_SERVICE_UPDATES, + FeatureFlags::pscBatchServiceUpdates); + } + + @Override + + public boolean pscBatchUpdate() { + return getValue(Flags.FLAG_PSC_BATCH_UPDATE, + FeatureFlags::pscBatchUpdate); + } + + @Override + + public boolean pushActivityStateToOomadjuster() { + return getValue(Flags.FLAG_PUSH_ACTIVITY_STATE_TO_OOMADJUSTER, + FeatureFlags::pushActivityStateToOomadjuster); + } + + @Override + + public boolean pushBroadcastStateToOomadjuster() { + return getValue(Flags.FLAG_PUSH_BROADCAST_STATE_TO_OOMADJUSTER, + FeatureFlags::pushBroadcastStateToOomadjuster); + } + + @Override + + public boolean pushGlobalStateToOomadjuster() { + return getValue(Flags.FLAG_PUSH_GLOBAL_STATE_TO_OOMADJUSTER, + FeatureFlags::pushGlobalStateToOomadjuster); + } + + @Override + + public boolean removeLruSpamPrevention() { + return getValue(Flags.FLAG_REMOVE_LRU_SPAM_PREVENTION, + FeatureFlags::removeLruSpamPrevention); + } + + @Override + + public boolean rolloutComputerControl() { + return getValue(Flags.FLAG_ROLLOUT_COMPUTER_CONTROL, + FeatureFlags::rolloutComputerControl); + } + + @Override + + public boolean skipUnimportantConnections() { + return getValue(Flags.FLAG_SKIP_UNIMPORTANT_CONNECTIONS, + FeatureFlags::skipUnimportantConnections); + } + + @Override + + public boolean syncmanagerOffMainThread() { + return getValue(Flags.FLAG_SYNCMANAGER_OFF_MAIN_THREAD, + FeatureFlags::syncmanagerOffMainThread); + } + + @Override + + public boolean traceUpdateAppFreezeStateLsp() { + return getValue(Flags.FLAG_TRACE_UPDATE_APP_FREEZE_STATE_LSP, + FeatureFlags::traceUpdateAppFreezeStateLsp); + } + + @Override + + public boolean useMemcgForCompaction() { + return getValue(Flags.FLAG_USE_MEMCG_FOR_COMPACTION, + FeatureFlags::useMemcgForCompaction); + } + + public boolean isFlagReadOnlyOptimized(String flagName) { + if (mReadOnlyFlagsSet.contains(flagName) && + isOptimizationEnabled()) { + return true; + } + return false; + } + + + private boolean isOptimizationEnabled() { + return false; + } + + protected boolean getValue(String flagName, Predicate getter) { + return mGetValueImpl.test(flagName, getter); + } + + public List getFlagNames() { + return Arrays.asList( + Flags.FLAG_APP_START_INFO_PROCESS_NAME_FIX, + Flags.FLAG_AUTO_TRIGGER_OOMADJ_UPDATES, + Flags.FLAG_BFGS_MANAGED_NETWORK_ACCESS, + Flags.FLAG_COLLECT_LOGCAT_ON_RUN_SYNCHRONOUSLY, + Flags.FLAG_CONSOLIDATE_COLLECT_REACHABLE, + Flags.FLAG_CPU_TIME_CAPABILITY_BASED_FREEZE_POLICY, + Flags.FLAG_DEFER_OUTGOING_BROADCASTS, + Flags.FLAG_ENABLE_ACTIVITY_MANAGER_STRUCTURED_SERVICE, + Flags.FLAG_ENABLE_DROPBOX_WATCHDOG_HEADERS, + Flags.FLAG_ENABLE_LONG_METHOD_TRACING_ON_ANR_TIMER, + Flags.FLAG_EXPEDITE_ACTIVITY_LAUNCH_ON_COLD_START, + Flags.FLAG_FGS_ABUSE_DETECTION, + Flags.FLAG_FIX_APPLY_OOMADJ_ORDER, + Flags.FLAG_LIMIT_LOGCAT_COLLECTION, + Flags.FLAG_LOG_BROADCAST_PROCESSED_EVENT, + Flags.FLAG_LOGCAT_LONGER_TIMEOUT, + Flags.FLAG_LOWER_SMS_OOM_IMPORTANCE, + Flags.FLAG_NOT_SKIP_CONNECTION_RECOMPUTE_FOR_BIND_SCHEDULE_LIKE_TOP_APP, + Flags.FLAG_OOMADJUSTER_CACHED_APP_TIERS, + Flags.FLAG_OOMADJUSTER_PREV_LADDERING, + Flags.FLAG_OOMADJUSTER_VIS_LADDERING, + Flags.FLAG_PERCEPTIBLE_TASKS, + Flags.FLAG_PROTOTYPE_AGGRESSIVE_FREEZING, + Flags.FLAG_PSC_BATCH_SERVICE_UPDATES, + Flags.FLAG_PSC_BATCH_UPDATE, + Flags.FLAG_PUSH_ACTIVITY_STATE_TO_OOMADJUSTER, + Flags.FLAG_PUSH_BROADCAST_STATE_TO_OOMADJUSTER, + Flags.FLAG_PUSH_GLOBAL_STATE_TO_OOMADJUSTER, + Flags.FLAG_REMOVE_LRU_SPAM_PREVENTION, + Flags.FLAG_ROLLOUT_COMPUTER_CONTROL, + Flags.FLAG_SKIP_UNIMPORTANT_CONNECTIONS, + Flags.FLAG_SYNCMANAGER_OFF_MAIN_THREAD, + Flags.FLAG_TRACE_UPDATE_APP_FREEZE_STATE_LSP, + Flags.FLAG_USE_MEMCG_FOR_COMPACTION + ); + } + + private Set mReadOnlyFlagsSet = new HashSet<>( + Arrays.asList( + Flags.FLAG_APP_START_INFO_PROCESS_NAME_FIX, + Flags.FLAG_AUTO_TRIGGER_OOMADJ_UPDATES, + Flags.FLAG_BFGS_MANAGED_NETWORK_ACCESS, + Flags.FLAG_COLLECT_LOGCAT_ON_RUN_SYNCHRONOUSLY, + Flags.FLAG_CONSOLIDATE_COLLECT_REACHABLE, + Flags.FLAG_CPU_TIME_CAPABILITY_BASED_FREEZE_POLICY, + Flags.FLAG_DEFER_OUTGOING_BROADCASTS, + Flags.FLAG_ENABLE_ACTIVITY_MANAGER_STRUCTURED_SERVICE, + Flags.FLAG_ENABLE_DROPBOX_WATCHDOG_HEADERS, + Flags.FLAG_ENABLE_LONG_METHOD_TRACING_ON_ANR_TIMER, + Flags.FLAG_EXPEDITE_ACTIVITY_LAUNCH_ON_COLD_START, + Flags.FLAG_FGS_ABUSE_DETECTION, + Flags.FLAG_FIX_APPLY_OOMADJ_ORDER, + Flags.FLAG_LIMIT_LOGCAT_COLLECTION, + Flags.FLAG_LOG_BROADCAST_PROCESSED_EVENT, + Flags.FLAG_LOGCAT_LONGER_TIMEOUT, + Flags.FLAG_LOWER_SMS_OOM_IMPORTANCE, + Flags.FLAG_NOT_SKIP_CONNECTION_RECOMPUTE_FOR_BIND_SCHEDULE_LIKE_TOP_APP, + Flags.FLAG_OOMADJUSTER_CACHED_APP_TIERS, + Flags.FLAG_OOMADJUSTER_PREV_LADDERING, + Flags.FLAG_OOMADJUSTER_VIS_LADDERING, + Flags.FLAG_PERCEPTIBLE_TASKS, + Flags.FLAG_PROTOTYPE_AGGRESSIVE_FREEZING, + Flags.FLAG_PSC_BATCH_SERVICE_UPDATES, + Flags.FLAG_PSC_BATCH_UPDATE, + Flags.FLAG_PUSH_ACTIVITY_STATE_TO_OOMADJUSTER, + Flags.FLAG_PUSH_BROADCAST_STATE_TO_OOMADJUSTER, + Flags.FLAG_PUSH_GLOBAL_STATE_TO_OOMADJUSTER, + Flags.FLAG_REMOVE_LRU_SPAM_PREVENTION, + Flags.FLAG_ROLLOUT_COMPUTER_CONTROL, + Flags.FLAG_SKIP_UNIMPORTANT_CONNECTIONS, + Flags.FLAG_SYNCMANAGER_OFF_MAIN_THREAD, + Flags.FLAG_TRACE_UPDATE_APP_FREEZE_STATE_LSP, + Flags.FLAG_USE_MEMCG_FOR_COMPACTION, + "" + ) + ); +} diff --git a/flags/src/com/android/server/am/FakeFeatureFlagsImpl.java b/flags/src/com/android/server/am/FakeFeatureFlagsImpl.java new file mode 100644 index 00000000000..0ddf258870b --- /dev/null +++ b/flags/src/com/android/server/am/FakeFeatureFlagsImpl.java @@ -0,0 +1,49 @@ +package com.android.server.am; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Predicate; +/** @hide */ +public class FakeFeatureFlagsImpl extends CustomFeatureFlags { + private final Map mFlagMap = new HashMap<>(); + private final FeatureFlags mDefaults; + private final boolean IS_EXPORTED = false; + + public FakeFeatureFlagsImpl() { + this(null); + } + + public FakeFeatureFlagsImpl(FeatureFlags defaults) { + super(null); + mDefaults = defaults; + // Initialize the map with null values + for (String flagName : getFlagNames()) { + mFlagMap.put(flagName, null); + } + } + + @Override + protected boolean getValue(String flagName, Predicate getter) { + Boolean value = this.mFlagMap.get(flagName); + if (value != null) { + return value; + } + if (mDefaults != null) { + return getter.test(mDefaults); + } + throw new IllegalArgumentException(flagName + " is not set"); + } + + public void setFlag(String flagName, boolean value) { + if (!this.mFlagMap.containsKey(flagName) && !IS_EXPORTED) { + throw new IllegalArgumentException("no such flag " + flagName); + } + this.mFlagMap.put(flagName, value); + } + + public void resetAll() { + for (Map.Entry entry : mFlagMap.entrySet()) { + entry.setValue(null); + } + } +} diff --git a/flags/src/com/android/server/am/FeatureFlags.java b/flags/src/com/android/server/am/FeatureFlags.java new file mode 100644 index 00000000000..13ea094262b --- /dev/null +++ b/flags/src/com/android/server/am/FeatureFlags.java @@ -0,0 +1,142 @@ +package com.android.server.am; + +/** @hide */ +public interface FeatureFlags { + + + + + boolean appStartInfoProcessNameFix(); + + + + boolean autoTriggerOomadjUpdates(); + + + + boolean bfgsManagedNetworkAccess(); + + + + boolean collectLogcatOnRunSynchronously(); + + + + boolean consolidateCollectReachable(); + + + + boolean cpuTimeCapabilityBasedFreezePolicy(); + + + + boolean deferOutgoingBroadcasts(); + + + + boolean enableActivityManagerStructuredService(); + + + + boolean enableDropboxWatchdogHeaders(); + + + + boolean enableLongMethodTracingOnAnrTimer(); + + + + boolean expediteActivityLaunchOnColdStart(); + + + + boolean fgsAbuseDetection(); + + + + boolean fixApplyOomadjOrder(); + + + + boolean limitLogcatCollection(); + + + + boolean logBroadcastProcessedEvent(); + + + + boolean logcatLongerTimeout(); + + + + boolean lowerSmsOomImportance(); + + + + boolean notSkipConnectionRecomputeForBindScheduleLikeTopApp(); + + + + boolean oomadjusterCachedAppTiers(); + + + + boolean oomadjusterPrevLaddering(); + + + + boolean oomadjusterVisLaddering(); + + + + boolean perceptibleTasks(); + + + + boolean prototypeAggressiveFreezing(); + + + + boolean pscBatchServiceUpdates(); + + + + boolean pscBatchUpdate(); + + + + boolean pushActivityStateToOomadjuster(); + + + + boolean pushBroadcastStateToOomadjuster(); + + + + boolean pushGlobalStateToOomadjuster(); + + + + boolean removeLruSpamPrevention(); + + + + boolean rolloutComputerControl(); + + + + boolean skipUnimportantConnections(); + + + + boolean syncmanagerOffMainThread(); + + + + boolean traceUpdateAppFreezeStateLsp(); + + + + boolean useMemcgForCompaction(); +} diff --git a/flags/src/com/android/server/am/FeatureFlagsImpl.java b/flags/src/com/android/server/am/FeatureFlagsImpl.java new file mode 100644 index 00000000000..9641cd4ce95 --- /dev/null +++ b/flags/src/com/android/server/am/FeatureFlagsImpl.java @@ -0,0 +1,243 @@ +package com.android.server.am; + +/** @hide */ +public final class FeatureFlagsImpl implements FeatureFlags { + @Override + + + public boolean appStartInfoProcessNameFix() { + return true; + } + + @Override + + + public boolean autoTriggerOomadjUpdates() { + return false; + } + + @Override + + + public boolean bfgsManagedNetworkAccess() { + return false; + } + + @Override + + + public boolean collectLogcatOnRunSynchronously() { + return true; + } + + @Override + + + public boolean consolidateCollectReachable() { + return true; + } + + @Override + + + public boolean cpuTimeCapabilityBasedFreezePolicy() { + return true; + } + + @Override + + + public boolean deferOutgoingBroadcasts() { + return false; + } + + @Override + + + public boolean enableActivityManagerStructuredService() { + return false; + } + + @Override + + + public boolean enableDropboxWatchdogHeaders() { + return true; + } + + @Override + + + public boolean enableLongMethodTracingOnAnrTimer() { + return false; + } + + @Override + + + public boolean expediteActivityLaunchOnColdStart() { + return false; + } + + @Override + + + public boolean fgsAbuseDetection() { + return false; + } + + @Override + + + public boolean fixApplyOomadjOrder() { + return false; + } + + @Override + + + public boolean limitLogcatCollection() { + return true; + } + + @Override + + + public boolean logBroadcastProcessedEvent() { + return true; + } + + @Override + + + public boolean logcatLongerTimeout() { + return true; + } + + @Override + + + public boolean lowerSmsOomImportance() { + return true; + } + + @Override + + + public boolean notSkipConnectionRecomputeForBindScheduleLikeTopApp() { + return true; + } + + @Override + + + public boolean oomadjusterCachedAppTiers() { + return false; + } + + @Override + + + public boolean oomadjusterPrevLaddering() { + return false; + } + + @Override + + + public boolean oomadjusterVisLaddering() { + return false; + } + + @Override + + + public boolean perceptibleTasks() { + return false; + } + + @Override + + + public boolean prototypeAggressiveFreezing() { + return false; + } + + @Override + + + public boolean pscBatchServiceUpdates() { + return false; + } + + @Override + + + public boolean pscBatchUpdate() { + return false; + } + + @Override + + + public boolean pushActivityStateToOomadjuster() { + return true; + } + + @Override + + + public boolean pushBroadcastStateToOomadjuster() { + return true; + } + + @Override + + + public boolean pushGlobalStateToOomadjuster() { + return true; + } + + @Override + + + public boolean removeLruSpamPrevention() { + return false; + } + + @Override + + + public boolean rolloutComputerControl() { + return false; + } + + @Override + + + public boolean skipUnimportantConnections() { + return false; + } + + @Override + + + public boolean syncmanagerOffMainThread() { + return false; + } + + @Override + + + public boolean traceUpdateAppFreezeStateLsp() { + return true; + } + + @Override + + + public boolean useMemcgForCompaction() { + return false; + } + +} diff --git a/flags/src/com/android/server/am/Flags.java b/flags/src/com/android/server/am/Flags.java new file mode 100644 index 00000000000..fa2eb88ae49 --- /dev/null +++ b/flags/src/com/android/server/am/Flags.java @@ -0,0 +1,281 @@ +package com.android.server.am; + + +/** @hide */ +public final class Flags { + /** @hide */ + public static final String FLAG_APP_START_INFO_PROCESS_NAME_FIX = "com.android.server.am.app_start_info_process_name_fix"; + /** @hide */ + public static final String FLAG_AUTO_TRIGGER_OOMADJ_UPDATES = "com.android.server.am.auto_trigger_oomadj_updates"; + /** @hide */ + public static final String FLAG_BFGS_MANAGED_NETWORK_ACCESS = "com.android.server.am.bfgs_managed_network_access"; + /** @hide */ + public static final String FLAG_COLLECT_LOGCAT_ON_RUN_SYNCHRONOUSLY = "com.android.server.am.collect_logcat_on_run_synchronously"; + /** @hide */ + public static final String FLAG_CONSOLIDATE_COLLECT_REACHABLE = "com.android.server.am.consolidate_collect_reachable"; + /** @hide */ + public static final String FLAG_CPU_TIME_CAPABILITY_BASED_FREEZE_POLICY = "com.android.server.am.cpu_time_capability_based_freeze_policy"; + /** @hide */ + public static final String FLAG_DEFER_OUTGOING_BROADCASTS = "com.android.server.am.defer_outgoing_broadcasts"; + /** @hide */ + public static final String FLAG_ENABLE_ACTIVITY_MANAGER_STRUCTURED_SERVICE = "com.android.server.am.enable_activity_manager_structured_service"; + /** @hide */ + public static final String FLAG_ENABLE_DROPBOX_WATCHDOG_HEADERS = "com.android.server.am.enable_dropbox_watchdog_headers"; + /** @hide */ + public static final String FLAG_ENABLE_LONG_METHOD_TRACING_ON_ANR_TIMER = "com.android.server.am.enable_long_method_tracing_on_anr_timer"; + /** @hide */ + public static final String FLAG_EXPEDITE_ACTIVITY_LAUNCH_ON_COLD_START = "com.android.server.am.expedite_activity_launch_on_cold_start"; + /** @hide */ + public static final String FLAG_FGS_ABUSE_DETECTION = "com.android.server.am.fgs_abuse_detection"; + /** @hide */ + public static final String FLAG_FIX_APPLY_OOMADJ_ORDER = "com.android.server.am.fix_apply_oomadj_order"; + /** @hide */ + public static final String FLAG_LIMIT_LOGCAT_COLLECTION = "com.android.server.am.limit_logcat_collection"; + /** @hide */ + public static final String FLAG_LOG_BROADCAST_PROCESSED_EVENT = "com.android.server.am.log_broadcast_processed_event"; + /** @hide */ + public static final String FLAG_LOGCAT_LONGER_TIMEOUT = "com.android.server.am.logcat_longer_timeout"; + /** @hide */ + public static final String FLAG_LOWER_SMS_OOM_IMPORTANCE = "com.android.server.am.lower_sms_oom_importance"; + /** @hide */ + public static final String FLAG_NOT_SKIP_CONNECTION_RECOMPUTE_FOR_BIND_SCHEDULE_LIKE_TOP_APP = "com.android.server.am.not_skip_connection_recompute_for_bind_schedule_like_top_app"; + /** @hide */ + public static final String FLAG_OOMADJUSTER_CACHED_APP_TIERS = "com.android.server.am.oomadjuster_cached_app_tiers"; + /** @hide */ + public static final String FLAG_OOMADJUSTER_PREV_LADDERING = "com.android.server.am.oomadjuster_prev_laddering"; + /** @hide */ + public static final String FLAG_OOMADJUSTER_VIS_LADDERING = "com.android.server.am.oomadjuster_vis_laddering"; + /** @hide */ + public static final String FLAG_PERCEPTIBLE_TASKS = "com.android.server.am.perceptible_tasks"; + /** @hide */ + public static final String FLAG_PROTOTYPE_AGGRESSIVE_FREEZING = "com.android.server.am.prototype_aggressive_freezing"; + /** @hide */ + public static final String FLAG_PSC_BATCH_SERVICE_UPDATES = "com.android.server.am.psc_batch_service_updates"; + /** @hide */ + public static final String FLAG_PSC_BATCH_UPDATE = "com.android.server.am.psc_batch_update"; + /** @hide */ + public static final String FLAG_PUSH_ACTIVITY_STATE_TO_OOMADJUSTER = "com.android.server.am.push_activity_state_to_oomadjuster"; + /** @hide */ + public static final String FLAG_PUSH_BROADCAST_STATE_TO_OOMADJUSTER = "com.android.server.am.push_broadcast_state_to_oomadjuster"; + /** @hide */ + public static final String FLAG_PUSH_GLOBAL_STATE_TO_OOMADJUSTER = "com.android.server.am.push_global_state_to_oomadjuster"; + /** @hide */ + public static final String FLAG_REMOVE_LRU_SPAM_PREVENTION = "com.android.server.am.remove_lru_spam_prevention"; + /** @hide */ + public static final String FLAG_ROLLOUT_COMPUTER_CONTROL = "com.android.server.am.rollout_computer_control"; + /** @hide */ + public static final String FLAG_SKIP_UNIMPORTANT_CONNECTIONS = "com.android.server.am.skip_unimportant_connections"; + /** @hide */ + public static final String FLAG_SYNCMANAGER_OFF_MAIN_THREAD = "com.android.server.am.syncmanager_off_main_thread"; + /** @hide */ + public static final String FLAG_TRACE_UPDATE_APP_FREEZE_STATE_LSP = "com.android.server.am.trace_update_app_freeze_state_lsp"; + /** @hide */ + public static final String FLAG_USE_MEMCG_FOR_COMPACTION = "com.android.server.am.use_memcg_for_compaction"; + + + public static boolean appStartInfoProcessNameFix() { + + return FEATURE_FLAGS.appStartInfoProcessNameFix(); + } + + + public static boolean autoTriggerOomadjUpdates() { + + return FEATURE_FLAGS.autoTriggerOomadjUpdates(); + } + + + public static boolean bfgsManagedNetworkAccess() { + + return FEATURE_FLAGS.bfgsManagedNetworkAccess(); + } + + + public static boolean collectLogcatOnRunSynchronously() { + + return FEATURE_FLAGS.collectLogcatOnRunSynchronously(); + } + + + public static boolean consolidateCollectReachable() { + + return FEATURE_FLAGS.consolidateCollectReachable(); + } + + + public static boolean cpuTimeCapabilityBasedFreezePolicy() { + + return FEATURE_FLAGS.cpuTimeCapabilityBasedFreezePolicy(); + } + + + public static boolean deferOutgoingBroadcasts() { + + return FEATURE_FLAGS.deferOutgoingBroadcasts(); + } + + + public static boolean enableActivityManagerStructuredService() { + + return FEATURE_FLAGS.enableActivityManagerStructuredService(); + } + + + public static boolean enableDropboxWatchdogHeaders() { + + return FEATURE_FLAGS.enableDropboxWatchdogHeaders(); + } + + + public static boolean enableLongMethodTracingOnAnrTimer() { + + return FEATURE_FLAGS.enableLongMethodTracingOnAnrTimer(); + } + + + public static boolean expediteActivityLaunchOnColdStart() { + + return FEATURE_FLAGS.expediteActivityLaunchOnColdStart(); + } + + + public static boolean fgsAbuseDetection() { + + return FEATURE_FLAGS.fgsAbuseDetection(); + } + + + public static boolean fixApplyOomadjOrder() { + + return FEATURE_FLAGS.fixApplyOomadjOrder(); + } + + + public static boolean limitLogcatCollection() { + + return FEATURE_FLAGS.limitLogcatCollection(); + } + + + public static boolean logBroadcastProcessedEvent() { + + return FEATURE_FLAGS.logBroadcastProcessedEvent(); + } + + + public static boolean logcatLongerTimeout() { + + return FEATURE_FLAGS.logcatLongerTimeout(); + } + + + public static boolean lowerSmsOomImportance() { + + return FEATURE_FLAGS.lowerSmsOomImportance(); + } + + + public static boolean notSkipConnectionRecomputeForBindScheduleLikeTopApp() { + + return FEATURE_FLAGS.notSkipConnectionRecomputeForBindScheduleLikeTopApp(); + } + + + public static boolean oomadjusterCachedAppTiers() { + + return FEATURE_FLAGS.oomadjusterCachedAppTiers(); + } + + + public static boolean oomadjusterPrevLaddering() { + + return FEATURE_FLAGS.oomadjusterPrevLaddering(); + } + + + public static boolean oomadjusterVisLaddering() { + + return FEATURE_FLAGS.oomadjusterVisLaddering(); + } + + + public static boolean perceptibleTasks() { + + return FEATURE_FLAGS.perceptibleTasks(); + } + + + public static boolean prototypeAggressiveFreezing() { + + return FEATURE_FLAGS.prototypeAggressiveFreezing(); + } + + + public static boolean pscBatchServiceUpdates() { + + return FEATURE_FLAGS.pscBatchServiceUpdates(); + } + + + public static boolean pscBatchUpdate() { + + return FEATURE_FLAGS.pscBatchUpdate(); + } + + + public static boolean pushActivityStateToOomadjuster() { + + return FEATURE_FLAGS.pushActivityStateToOomadjuster(); + } + + + public static boolean pushBroadcastStateToOomadjuster() { + + return FEATURE_FLAGS.pushBroadcastStateToOomadjuster(); + } + + + public static boolean pushGlobalStateToOomadjuster() { + + return FEATURE_FLAGS.pushGlobalStateToOomadjuster(); + } + + + public static boolean removeLruSpamPrevention() { + + return FEATURE_FLAGS.removeLruSpamPrevention(); + } + + + public static boolean rolloutComputerControl() { + + return FEATURE_FLAGS.rolloutComputerControl(); + } + + + public static boolean skipUnimportantConnections() { + + return FEATURE_FLAGS.skipUnimportantConnections(); + } + + + public static boolean syncmanagerOffMainThread() { + + return FEATURE_FLAGS.syncmanagerOffMainThread(); + } + + + public static boolean traceUpdateAppFreezeStateLsp() { + + return FEATURE_FLAGS.traceUpdateAppFreezeStateLsp(); + } + + + public static boolean useMemcgForCompaction() { + + return FEATURE_FLAGS.useMemcgForCompaction(); + } + + private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl(); + +} diff --git a/flags/src/com/android/systemui/CustomFeatureFlags.java b/flags/src/com/android/systemui/CustomFeatureFlags.java index bba7a59f652..31f83221491 100644 --- a/flags/src/com/android/systemui/CustomFeatureFlags.java +++ b/flags/src/com/android/systemui/CustomFeatureFlags.java @@ -1,13 +1,12 @@ package com.android.systemui; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.BiPredicate; import java.util.function.Predicate; - /** @hide */ public class CustomFeatureFlags implements FeatureFlags { @@ -17,925 +16,1960 @@ public CustomFeatureFlags(BiPredicate> getValueI mGetValueImpl = getValueImpl; } @Override + public boolean activityTransitionUseLargestWindow() { return getValue(Flags.FLAG_ACTIVITY_TRANSITION_USE_LARGEST_WINDOW, - FeatureFlags::activityTransitionUseLargestWindow); + FeatureFlags::activityTransitionUseLargestWindow); } @Override - public boolean ambientTouchMonitorListenToDisplayChanges() { - return getValue(Flags.FLAG_AMBIENT_TOUCH_MONITOR_LISTEN_TO_DISPLAY_CHANGES, - FeatureFlags::ambientTouchMonitorListenToDisplayChanges); + + public boolean allowDozeTouchesForLockIcon() { + return getValue(Flags.FLAG_ALLOW_DOZE_TOUCHES_FOR_LOCK_ICON, + FeatureFlags::allowDozeTouchesForLockIcon); } @Override - public boolean appClipsBacklinks() { - return getValue(Flags.FLAG_APP_CLIPS_BACKLINKS, - FeatureFlags::appClipsBacklinks); + + public boolean ambientCuePlugin() { + return getValue(Flags.FLAG_AMBIENT_CUE_PLUGIN, + FeatureFlags::ambientCuePlugin); } @Override - public boolean bindKeyguardMediaVisibility() { - return getValue(Flags.FLAG_BIND_KEYGUARD_MEDIA_VISIBILITY, - FeatureFlags::bindKeyguardMediaVisibility); + + public boolean ambientTouchMonitorListenToDisplayChanges() { + return getValue(Flags.FLAG_AMBIENT_TOUCH_MONITOR_LISTEN_TO_DISPLAY_CHANGES, + FeatureFlags::ambientTouchMonitorListenToDisplayChanges); } @Override - public boolean bpTalkback() { - return getValue(Flags.FLAG_BP_TALKBACK, - FeatureFlags::bpTalkback); + + public boolean animationLibraryShellMigration() { + return getValue(Flags.FLAG_ANIMATION_LIBRARY_SHELL_MIGRATION, + FeatureFlags::animationLibraryShellMigration); } @Override - public boolean brightnessSliderFocusState() { - return getValue(Flags.FLAG_BRIGHTNESS_SLIDER_FOCUS_STATE, - FeatureFlags::brightnessSliderFocusState); + + public boolean appClipsBacklinks() { + return getValue(Flags.FLAG_APP_CLIPS_BACKLINKS, + FeatureFlags::appClipsBacklinks); } @Override - public boolean centralizedStatusBarHeightFix() { - return getValue(Flags.FLAG_CENTRALIZED_STATUS_BAR_HEIGHT_FIX, - FeatureFlags::centralizedStatusBarHeightFix); + + public boolean avalancheReplaceHunWhenCritical() { + return getValue(Flags.FLAG_AVALANCHE_REPLACE_HUN_WHEN_CRITICAL, + FeatureFlags::avalancheReplaceHunWhenCritical); } @Override - public boolean clipboardNoninteractiveOnLockscreen() { - return getValue(Flags.FLAG_CLIPBOARD_NONINTERACTIVE_ON_LOCKSCREEN, - FeatureFlags::clipboardNoninteractiveOnLockscreen); + + public boolean backButtonOnBouncer() { + return getValue(Flags.FLAG_BACK_BUTTON_ON_BOUNCER, + FeatureFlags::backButtonOnBouncer); } @Override - public boolean clockReactiveVariants() { - return getValue(Flags.FLAG_CLOCK_REACTIVE_VARIANTS, - FeatureFlags::clockReactiveVariants); + + public boolean blockMouseEdgeBackGesture() { + return getValue(Flags.FLAG_BLOCK_MOUSE_EDGE_BACK_GESTURE, + FeatureFlags::blockMouseEdgeBackGesture); } @Override - public boolean communalBouncerDoNotModifyPluginOpen() { - return getValue(Flags.FLAG_COMMUNAL_BOUNCER_DO_NOT_MODIFY_PLUGIN_OPEN, - FeatureFlags::communalBouncerDoNotModifyPluginOpen); + + public boolean blurOnMoreSurfaces() { + return getValue(Flags.FLAG_BLUR_ON_MORE_SURFACES, + FeatureFlags::blurOnMoreSurfaces); } @Override - public boolean communalHub() { - return getValue(Flags.FLAG_COMMUNAL_HUB, - FeatureFlags::communalHub); + + public boolean blurSettingsToggle() { + return getValue(Flags.FLAG_BLUR_SETTINGS_TOGGLE, + FeatureFlags::blurSettingsToggle); } @Override - public boolean composeBouncer() { - return getValue(Flags.FLAG_COMPOSE_BOUNCER, - FeatureFlags::composeBouncer); + + public boolean bouncerUiRevamp() { + return getValue(Flags.FLAG_BOUNCER_UI_REVAMP, + FeatureFlags::bouncerUiRevamp); } @Override - public boolean composeLockscreen() { - return getValue(Flags.FLAG_COMPOSE_LOCKSCREEN, - FeatureFlags::composeLockscreen); + + public boolean bouncerUiRevamp2() { + return getValue(Flags.FLAG_BOUNCER_UI_REVAMP_2, + FeatureFlags::bouncerUiRevamp2); } @Override - public boolean confineNotificationTouchToViewWidth() { - return getValue(Flags.FLAG_CONFINE_NOTIFICATION_TOUCH_TO_VIEW_WIDTH, - FeatureFlags::confineNotificationTouchToViewWidth); + + public boolean bpColors() { + return getValue(Flags.FLAG_BP_COLORS, + FeatureFlags::bpColors); } @Override - public boolean constraintBp() { - return getValue(Flags.FLAG_CONSTRAINT_BP, - FeatureFlags::constraintBp); + + public boolean brightnessSliderFocusState() { + return getValue(Flags.FLAG_BRIGHTNESS_SLIDER_FOCUS_STATE, + FeatureFlags::brightnessSliderFocusState); } @Override - public boolean contextualTipsAssistantDismissFix() { - return getValue(Flags.FLAG_CONTEXTUAL_TIPS_ASSISTANT_DISMISS_FIX, - FeatureFlags::contextualTipsAssistantDismissFix); + + public boolean captionsToggleInVolumeDialogV1() { + return getValue(Flags.FLAG_CAPTIONS_TOGGLE_IN_VOLUME_DIALOG_V1, + FeatureFlags::captionsToggleInVolumeDialogV1); } @Override - public boolean coroutineTracing() { - return getValue(Flags.FLAG_COROUTINE_TRACING, - FeatureFlags::coroutineTracing); + + public boolean checkDesktopModeForSpacialModelAppPushback() { + return getValue(Flags.FLAG_CHECK_DESKTOP_MODE_FOR_SPACIAL_MODEL_APP_PUSHBACK, + FeatureFlags::checkDesktopModeForSpacialModelAppPushback); } @Override - public boolean createWindowlessWindowMagnifier() { - return getValue(Flags.FLAG_CREATE_WINDOWLESS_WINDOW_MAGNIFIER, - FeatureFlags::createWindowlessWindowMagnifier); + + public boolean classicFlagsMultiUser() { + return getValue(Flags.FLAG_CLASSIC_FLAGS_MULTI_USER, + FeatureFlags::classicFlagsMultiUser); } @Override - public boolean dedicatedNotifInflationThread() { - return getValue(Flags.FLAG_DEDICATED_NOTIF_INFLATION_THREAD, - FeatureFlags::dedicatedNotifInflationThread); + + public boolean cleanupInstancesWhenDisplayRemoved() { + return getValue(Flags.FLAG_CLEANUP_INSTANCES_WHEN_DISPLAY_REMOVED, + FeatureFlags::cleanupInstancesWhenDisplayRemoved); } @Override - public boolean delayShowMagnificationButton() { - return getValue(Flags.FLAG_DELAY_SHOW_MAGNIFICATION_BUTTON, - FeatureFlags::delayShowMagnificationButton); + + public boolean clearShortcutIconTint() { + return getValue(Flags.FLAG_CLEAR_SHORTCUT_ICON_TINT, + FeatureFlags::clearShortcutIconTint); } @Override - public boolean delayedWakelockReleaseOnBackgroundThread() { - return getValue(Flags.FLAG_DELAYED_WAKELOCK_RELEASE_ON_BACKGROUND_THREAD, - FeatureFlags::delayedWakelockReleaseOnBackgroundThread); + + public boolean clipboardOverlayMultiuser() { + return getValue(Flags.FLAG_CLIPBOARD_OVERLAY_MULTIUSER, + FeatureFlags::clipboardOverlayMultiuser); } @Override - public boolean deviceEntryUdfpsRefactor() { - return getValue(Flags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR, - FeatureFlags::deviceEntryUdfpsRefactor); + + public boolean clipboardUseDescriptionMimetype() { + return getValue(Flags.FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE, + FeatureFlags::clipboardUseDescriptionMimetype); } @Override - public boolean disableContextualTipsFrequencyCheck() { - return getValue(Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_FREQUENCY_CHECK, - FeatureFlags::disableContextualTipsFrequencyCheck); + + public boolean clockFidgetAnimation() { + return getValue(Flags.FLAG_CLOCK_FIDGET_ANIMATION, + FeatureFlags::clockFidgetAnimation); } @Override - public boolean disableContextualTipsIosSwitcherCheck() { - return getValue(Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_IOS_SWITCHER_CHECK, - FeatureFlags::disableContextualTipsIosSwitcherCheck); + + public boolean clockModernization() { + return getValue(Flags.FLAG_CLOCK_MODERNIZATION, + FeatureFlags::clockModernization); } @Override - public boolean dozeuiSchedulingAlarmsBackgroundExecution() { - return getValue(Flags.FLAG_DOZEUI_SCHEDULING_ALARMS_BACKGROUND_EXECUTION, - FeatureFlags::dozeuiSchedulingAlarmsBackgroundExecution); + + public boolean communalBouncerDoNotModifyPluginOpen() { + return getValue(Flags.FLAG_COMMUNAL_BOUNCER_DO_NOT_MODIFY_PLUGIN_OPEN, + FeatureFlags::communalBouncerDoNotModifyPluginOpen); } @Override - public boolean dreamInputSessionPilferOnce() { - return getValue(Flags.FLAG_DREAM_INPUT_SESSION_PILFER_ONCE, - FeatureFlags::dreamInputSessionPilferOnce); + + public boolean communalEditWidgetsActivityFinishFix() { + return getValue(Flags.FLAG_COMMUNAL_EDIT_WIDGETS_ACTIVITY_FINISH_FIX, + FeatureFlags::communalEditWidgetsActivityFinishFix); } @Override - public boolean dreamOverlayBouncerSwipeDirectionFiltering() { - return getValue(Flags.FLAG_DREAM_OVERLAY_BOUNCER_SWIPE_DIRECTION_FILTERING, - FeatureFlags::dreamOverlayBouncerSwipeDirectionFiltering); + + public boolean communalHub() { + return getValue(Flags.FLAG_COMMUNAL_HUB, + FeatureFlags::communalHub); } @Override - public boolean dualShade() { - return getValue(Flags.FLAG_DUAL_SHADE, - FeatureFlags::dualShade); + + public boolean communalHubUseThreadPoolForWidgets() { + return getValue(Flags.FLAG_COMMUNAL_HUB_USE_THREAD_POOL_FOR_WIDGETS, + FeatureFlags::communalHubUseThreadPoolForWidgets); } @Override - public boolean edgeBackGestureHandlerThread() { - return getValue(Flags.FLAG_EDGE_BACK_GESTURE_HANDLER_THREAD, - FeatureFlags::edgeBackGestureHandlerThread); + + public boolean communalPowerTransitionFix() { + return getValue(Flags.FLAG_COMMUNAL_POWER_TRANSITION_FIX, + FeatureFlags::communalPowerTransitionFix); } @Override - public boolean edgebackGestureHandlerGetRunningTasksBackground() { - return getValue(Flags.FLAG_EDGEBACK_GESTURE_HANDLER_GET_RUNNING_TASKS_BACKGROUND, - FeatureFlags::edgebackGestureHandlerGetRunningTasksBackground); + + public boolean communalResponsiveGrid() { + return getValue(Flags.FLAG_COMMUNAL_RESPONSIVE_GRID, + FeatureFlags::communalResponsiveGrid); } @Override - public boolean enableBackgroundKeyguardOndrawnCallback() { - return getValue(Flags.FLAG_ENABLE_BACKGROUND_KEYGUARD_ONDRAWN_CALLBACK, - FeatureFlags::enableBackgroundKeyguardOndrawnCallback); + + public boolean communalShadeTouchHandlingFixes() { + return getValue(Flags.FLAG_COMMUNAL_SHADE_TOUCH_HANDLING_FIXES, + FeatureFlags::communalShadeTouchHandlingFixes); } @Override - public boolean enableContextualTipForMuteVolume() { - return getValue(Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_MUTE_VOLUME, - FeatureFlags::enableContextualTipForMuteVolume); + + public boolean communalStandaloneSupport() { + return getValue(Flags.FLAG_COMMUNAL_STANDALONE_SUPPORT, + FeatureFlags::communalStandaloneSupport); } @Override - public boolean enableContextualTipForPowerOff() { - return getValue(Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_POWER_OFF, - FeatureFlags::enableContextualTipForPowerOff); + + public boolean communalTimerFlickerFix() { + return getValue(Flags.FLAG_COMMUNAL_TIMER_FLICKER_FIX, + FeatureFlags::communalTimerFlickerFix); } @Override - public boolean enableContextualTipForTakeScreenshot() { - return getValue(Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_TAKE_SCREENSHOT, - FeatureFlags::enableContextualTipForTakeScreenshot); + + public boolean communalWidgetResizing() { + return getValue(Flags.FLAG_COMMUNAL_WIDGET_RESIZING, + FeatureFlags::communalWidgetResizing); } @Override - public boolean enableContextualTips() { - return getValue(Flags.FLAG_ENABLE_CONTEXTUAL_TIPS, - FeatureFlags::enableContextualTips); + + public boolean communalWidgetTrampolineFix() { + return getValue(Flags.FLAG_COMMUNAL_WIDGET_TRAMPOLINE_FIX, + FeatureFlags::communalWidgetTrampolineFix); } @Override - public boolean enableEfficientDisplayRepository() { - return getValue(Flags.FLAG_ENABLE_EFFICIENT_DISPLAY_REPOSITORY, - FeatureFlags::enableEfficientDisplayRepository); + + public boolean composeBouncer() { + return getValue(Flags.FLAG_COMPOSE_BOUNCER, + FeatureFlags::composeBouncer); } @Override - public boolean enableLayoutTracing() { - return getValue(Flags.FLAG_ENABLE_LAYOUT_TRACING, - FeatureFlags::enableLayoutTracing); + + public boolean confineNotificationTouchToViewWidth() { + return getValue(Flags.FLAG_CONFINE_NOTIFICATION_TOUCH_TO_VIEW_WIDTH, + FeatureFlags::confineNotificationTouchToViewWidth); } @Override - public boolean enableViewCaptureTracing() { - return getValue(Flags.FLAG_ENABLE_VIEW_CAPTURE_TRACING, - FeatureFlags::enableViewCaptureTracing); + + public boolean contAuthPlugin() { + return getValue(Flags.FLAG_CONT_AUTH_PLUGIN, + FeatureFlags::contAuthPlugin); } @Override - public boolean enableWidgetPickerSizeFilter() { - return getValue(Flags.FLAG_ENABLE_WIDGET_PICKER_SIZE_FILTER, - FeatureFlags::enableWidgetPickerSizeFilter); + + public boolean coroutineTracing() { + return getValue(Flags.FLAG_COROUTINE_TRACING, + FeatureFlags::coroutineTracing); } @Override - public boolean enforceBrightnessBaseUserRestriction() { - return getValue(Flags.FLAG_ENFORCE_BRIGHTNESS_BASE_USER_RESTRICTION, - FeatureFlags::enforceBrightnessBaseUserRestriction); + + public boolean decoupleViewControllerInAnimlib() { + return getValue(Flags.FLAG_DECOUPLE_VIEW_CONTROLLER_IN_ANIMLIB, + FeatureFlags::decoupleViewControllerInAnimlib); } @Override - public boolean exampleFlag() { - return getValue(Flags.FLAG_EXAMPLE_FLAG, - FeatureFlags::exampleFlag); + + public boolean deferDozeTransitionOnShadeDrag() { + return getValue(Flags.FLAG_DEFER_DOZE_TRANSITION_ON_SHADE_DRAG, + FeatureFlags::deferDozeTransitionOnShadeDrag); } @Override - public boolean fastUnlockTransition() { - return getValue(Flags.FLAG_FAST_UNLOCK_TRANSITION, - FeatureFlags::fastUnlockTransition); + + public boolean desktopAvControlsPopup() { + return getValue(Flags.FLAG_DESKTOP_AV_CONTROLS_POPUP, + FeatureFlags::desktopAvControlsPopup); } @Override - public boolean fixImageWallpaperCrashSurfaceAlreadyReleased() { - return getValue(Flags.FLAG_FIX_IMAGE_WALLPAPER_CRASH_SURFACE_ALREADY_RELEASED, - FeatureFlags::fixImageWallpaperCrashSurfaceAlreadyReleased); + + public boolean desktopEffectsQsTile() { + return getValue(Flags.FLAG_DESKTOP_EFFECTS_QS_TILE, + FeatureFlags::desktopEffectsQsTile); } @Override - public boolean fixScreenshotActionDismissSystemWindows() { - return getValue(Flags.FLAG_FIX_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS, - FeatureFlags::fixScreenshotActionDismissSystemWindows); + + public boolean desktopSizing() { + return getValue(Flags.FLAG_DESKTOP_SIZING, + FeatureFlags::desktopSizing); } @Override - public boolean floatingMenuAnimatedTuck() { - return getValue(Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK, - FeatureFlags::floatingMenuAnimatedTuck); + + public boolean dialogAnimEndStateUpdate() { + return getValue(Flags.FLAG_DIALOG_ANIM_END_STATE_UPDATE, + FeatureFlags::dialogAnimEndStateUpdate); } @Override - public boolean floatingMenuDragToEdit() { - return getValue(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT, - FeatureFlags::floatingMenuDragToEdit); + + public boolean disableContextualTipsFrequencyCheck() { + return getValue(Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_FREQUENCY_CHECK, + FeatureFlags::disableContextualTipsFrequencyCheck); } @Override - public boolean floatingMenuDragToHide() { - return getValue(Flags.FLAG_FLOATING_MENU_DRAG_TO_HIDE, - FeatureFlags::floatingMenuDragToHide); + + public boolean disableContextualTipsIosSwitcherCheck() { + return getValue(Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_IOS_SWITCHER_CHECK, + FeatureFlags::disableContextualTipsIosSwitcherCheck); } @Override - public boolean floatingMenuImeDisplacementAnimation() { - return getValue(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION, - FeatureFlags::floatingMenuImeDisplacementAnimation); + + public boolean disableDoubleClickSwapOnBouncer() { + return getValue(Flags.FLAG_DISABLE_DOUBLE_CLICK_SWAP_ON_BOUNCER, + FeatureFlags::disableDoubleClickSwapOnBouncer); } @Override - public boolean floatingMenuNarrowTargetContentObserver() { - return getValue(Flags.FLAG_FLOATING_MENU_NARROW_TARGET_CONTENT_OBSERVER, - FeatureFlags::floatingMenuNarrowTargetContentObserver); + + public boolean disableUserSwitcherDropdownOnBouncer() { + return getValue(Flags.FLAG_DISABLE_USER_SWITCHER_DROPDOWN_ON_BOUNCER, + FeatureFlags::disableUserSwitcherDropdownOnBouncer); } @Override - public boolean floatingMenuOverlapsNavBarsFlag() { - return getValue(Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG, - FeatureFlags::floatingMenuOverlapsNavBarsFlag); + + public boolean doNotUseImmediateCoroutineDispatcher() { + return getValue(Flags.FLAG_DO_NOT_USE_IMMEDIATE_COROUTINE_DISPATCHER, + FeatureFlags::doNotUseImmediateCoroutineDispatcher); } @Override - public boolean floatingMenuRadiiAnimation() { - return getValue(Flags.FLAG_FLOATING_MENU_RADII_ANIMATION, - FeatureFlags::floatingMenuRadiiAnimation); + + public boolean doNotUseRunBlocking() { + return getValue(Flags.FLAG_DO_NOT_USE_RUN_BLOCKING, + FeatureFlags::doNotUseRunBlocking); } - + @Override - public boolean generatedPreviews() { - return getValue(Flags.FLAG_GENERATED_PREVIEWS, - FeatureFlags::generatedPreviews); + + public boolean doubleTapToSleep() { + return getValue(Flags.FLAG_DOUBLE_TAP_TO_SLEEP, + FeatureFlags::doubleTapToSleep); } @Override - public boolean getConnectedDeviceNameUnsynchronized() { - return getValue(Flags.FLAG_GET_CONNECTED_DEVICE_NAME_UNSYNCHRONIZED, - FeatureFlags::getConnectedDeviceNameUnsynchronized); + + public boolean dreamBiometricPromptFixes() { + return getValue(Flags.FLAG_DREAM_BIOMETRIC_PROMPT_FIXES, + FeatureFlags::dreamBiometricPromptFixes); } @Override - public boolean glanceableHubAllowKeyguardWhenDreaming() { - return getValue(Flags.FLAG_GLANCEABLE_HUB_ALLOW_KEYGUARD_WHEN_DREAMING, - FeatureFlags::glanceableHubAllowKeyguardWhenDreaming); + + public boolean dreamBouncerTransitionFix() { + return getValue(Flags.FLAG_DREAM_BOUNCER_TRANSITION_FIX, + FeatureFlags::dreamBouncerTransitionFix); } @Override - public boolean glanceableHubFullscreenSwipe() { - return getValue(Flags.FLAG_GLANCEABLE_HUB_FULLSCREEN_SWIPE, - FeatureFlags::glanceableHubFullscreenSwipe); + + public boolean dreamInputSessionPilferOnce() { + return getValue(Flags.FLAG_DREAM_INPUT_SESSION_PILFER_ONCE, + FeatureFlags::dreamInputSessionPilferOnce); } @Override - public boolean glanceableHubGestureHandle() { - return getValue(Flags.FLAG_GLANCEABLE_HUB_GESTURE_HANDLE, - FeatureFlags::glanceableHubGestureHandle); + + public boolean dreamOverlayBouncerSwipeDirectionFiltering() { + return getValue(Flags.FLAG_DREAM_OVERLAY_BOUNCER_SWIPE_DIRECTION_FILTERING, + FeatureFlags::dreamOverlayBouncerSwipeDirectionFiltering); } @Override - public boolean glanceableHubShortcutButton() { - return getValue(Flags.FLAG_GLANCEABLE_HUB_SHORTCUT_BUTTON, - FeatureFlags::glanceableHubShortcutButton); + + public boolean dreamOverlayUpdatedUi() { + return getValue(Flags.FLAG_DREAM_OVERLAY_UPDATED_UI, + FeatureFlags::dreamOverlayUpdatedUi); } @Override - public boolean hapticBrightnessSlider() { - return getValue(Flags.FLAG_HAPTIC_BRIGHTNESS_SLIDER, - FeatureFlags::hapticBrightnessSlider); + + public boolean dreamSuppression() { + return getValue(Flags.FLAG_DREAM_SUPPRESSION, + FeatureFlags::dreamSuppression); } @Override - public boolean hapticVolumeSlider() { - return getValue(Flags.FLAG_HAPTIC_VOLUME_SLIDER, - FeatureFlags::hapticVolumeSlider); + + public boolean edgeBackGestureHandlerThread() { + return getValue(Flags.FLAG_EDGE_BACK_GESTURE_HANDLER_THREAD, + FeatureFlags::edgeBackGestureHandlerThread); } @Override - public boolean hearingAidsQsTileDialog() { - return getValue(Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG, - FeatureFlags::hearingAidsQsTileDialog); + + public boolean edgebackGestureHandlerGetRunningTasksBackground() { + return getValue(Flags.FLAG_EDGEBACK_GESTURE_HANDLER_GET_RUNNING_TASKS_BACKGROUND, + FeatureFlags::edgebackGestureHandlerGetRunningTasksBackground); } @Override - public boolean hearingDevicesDialogRelatedTools() { - return getValue(Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS, - FeatureFlags::hearingDevicesDialogRelatedTools); + + public boolean enableBackgroundKeyguardOndrawnCallback() { + return getValue(Flags.FLAG_ENABLE_BACKGROUND_KEYGUARD_ONDRAWN_CALLBACK, + FeatureFlags::enableBackgroundKeyguardOndrawnCallback); } @Override - public boolean keyboardDockingIndicator() { - return getValue(Flags.FLAG_KEYBOARD_DOCKING_INDICATOR, - FeatureFlags::keyboardDockingIndicator); + + public boolean enableConstraintLayoutLockscreenOnExternalDisplay() { + return getValue(Flags.FLAG_ENABLE_CONSTRAINT_LAYOUT_LOCKSCREEN_ON_EXTERNAL_DISPLAY, + FeatureFlags::enableConstraintLayoutLockscreenOnExternalDisplay); } @Override - public boolean keyboardShortcutHelperRewrite() { - return getValue(Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE, - FeatureFlags::keyboardShortcutHelperRewrite); + + public boolean enableContextualTipForMuteVolume() { + return getValue(Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_MUTE_VOLUME, + FeatureFlags::enableContextualTipForMuteVolume); } @Override - public boolean keyguardBottomAreaRefactor() { - return getValue(Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, - FeatureFlags::keyguardBottomAreaRefactor); + + public boolean enableCueBarAnimatedIcon() { + return getValue(Flags.FLAG_ENABLE_CUE_BAR_ANIMATED_ICON, + FeatureFlags::enableCueBarAnimatedIcon); } @Override - public boolean keyguardWmStateRefactor() { - return getValue(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR, - FeatureFlags::keyguardWmStateRefactor); + + public boolean enableDesktopGrowth() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_GROWTH, + FeatureFlags::enableDesktopGrowth); } @Override - public boolean lightRevealMigration() { - return getValue(Flags.FLAG_LIGHT_REVEAL_MIGRATION, - FeatureFlags::lightRevealMigration); + + public boolean enableEfficientDisplayRepository() { + return getValue(Flags.FLAG_ENABLE_EFFICIENT_DISPLAY_REPOSITORY, + FeatureFlags::enableEfficientDisplayRepository); } @Override - public boolean mediaControlsLockscreenShadeBugFix() { - return getValue(Flags.FLAG_MEDIA_CONTROLS_LOCKSCREEN_SHADE_BUG_FIX, - FeatureFlags::mediaControlsLockscreenShadeBugFix); + + public boolean enableLayoutTracing() { + return getValue(Flags.FLAG_ENABLE_LAYOUT_TRACING, + FeatureFlags::enableLayoutTracing); } @Override - public boolean mediaControlsRefactor() { - return getValue(Flags.FLAG_MEDIA_CONTROLS_REFACTOR, - FeatureFlags::mediaControlsRefactor); + + public boolean enableMinmode() { + return getValue(Flags.FLAG_ENABLE_MINMODE, + FeatureFlags::enableMinmode); } @Override - public boolean mediaControlsUserInitiatedDeleteintent() { - return getValue(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT, - FeatureFlags::mediaControlsUserInitiatedDeleteintent); + + public boolean enableOutputSwitcherAudioSharingButton() { + return getValue(Flags.FLAG_ENABLE_OUTPUT_SWITCHER_AUDIO_SHARING_BUTTON, + FeatureFlags::enableOutputSwitcherAudioSharingButton); } @Override - public boolean migrateClocksToBlueprint() { - return getValue(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, - FeatureFlags::migrateClocksToBlueprint); + + public boolean enableSuggestedDeviceUi() { + return getValue(Flags.FLAG_ENABLE_SUGGESTED_DEVICE_UI, + FeatureFlags::enableSuggestedDeviceUi); } @Override - public boolean newAodTransition() { - return getValue(Flags.FLAG_NEW_AOD_TRANSITION, - FeatureFlags::newAodTransition); + + public boolean enableUnderlay() { + return getValue(Flags.FLAG_ENABLE_UNDERLAY, + FeatureFlags::enableUnderlay); } @Override - public boolean newTouchpadGesturesTutorial() { - return getValue(Flags.FLAG_NEW_TOUCHPAD_GESTURES_TUTORIAL, - FeatureFlags::newTouchpadGesturesTutorial); + + public boolean enableViewCaptureTracing() { + return getValue(Flags.FLAG_ENABLE_VIEW_CAPTURE_TRACING, + FeatureFlags::enableViewCaptureTracing); } @Override - public boolean newVolumePanel() { - return getValue(Flags.FLAG_NEW_VOLUME_PANEL, - FeatureFlags::newVolumePanel); + + public boolean exampleFlag() { + return getValue(Flags.FLAG_EXAMPLE_FLAG, + FeatureFlags::exampleFlag); } @Override - public boolean notificationAsyncGroupHeaderInflation() { - return getValue(Flags.FLAG_NOTIFICATION_ASYNC_GROUP_HEADER_INFLATION, - FeatureFlags::notificationAsyncGroupHeaderInflation); + + public boolean expandCollapsePrivacyDialog() { + return getValue(Flags.FLAG_EXPAND_COLLAPSE_PRIVACY_DIALOG, + FeatureFlags::expandCollapsePrivacyDialog); } @Override - public boolean notificationAsyncHybridViewInflation() { - return getValue(Flags.FLAG_NOTIFICATION_ASYNC_HYBRID_VIEW_INFLATION, - FeatureFlags::notificationAsyncHybridViewInflation); + + public boolean expandHeadsUpOnInlineReply() { + return getValue(Flags.FLAG_EXPAND_HEADS_UP_ON_INLINE_REPLY, + FeatureFlags::expandHeadsUpOnInlineReply); } @Override - public boolean notificationAvalancheSuppression() { - return getValue(Flags.FLAG_NOTIFICATION_AVALANCHE_SUPPRESSION, - FeatureFlags::notificationAvalancheSuppression); + + public boolean expandableUseModifierImplementation() { + return getValue(Flags.FLAG_EXPANDABLE_USE_MODIFIER_IMPLEMENTATION, + FeatureFlags::expandableUseModifierImplementation); } @Override - public boolean notificationAvalancheThrottleHun() { - return getValue(Flags.FLAG_NOTIFICATION_AVALANCHE_THROTTLE_HUN, - FeatureFlags::notificationAvalancheThrottleHun); + + public boolean expandedPrivacyIndicatorsOnLargeScreen() { + return getValue(Flags.FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN, + FeatureFlags::expandedPrivacyIndicatorsOnLargeScreen); } @Override - public boolean notificationBackgroundTintOptimization() { - return getValue(Flags.FLAG_NOTIFICATION_BACKGROUND_TINT_OPTIMIZATION, - FeatureFlags::notificationBackgroundTintOptimization); + + public boolean extendedAppsShortcutCategory() { + return getValue(Flags.FLAG_EXTENDED_APPS_SHORTCUT_CATEGORY, + FeatureFlags::extendedAppsShortcutCategory); } @Override - public boolean notificationColorUpdateLogger() { - return getValue(Flags.FLAG_NOTIFICATION_COLOR_UPDATE_LOGGER, - FeatureFlags::notificationColorUpdateLogger); + + public boolean faceScanningAnimationNpeFix() { + return getValue(Flags.FLAG_FACE_SCANNING_ANIMATION_NPE_FIX, + FeatureFlags::faceScanningAnimationNpeFix); } @Override - public boolean notificationContentAlphaOptimization() { - return getValue(Flags.FLAG_NOTIFICATION_CONTENT_ALPHA_OPTIMIZATION, - FeatureFlags::notificationContentAlphaOptimization); + + public boolean fetchBookmarksXmlKeyboardShortcuts() { + return getValue(Flags.FLAG_FETCH_BOOKMARKS_XML_KEYBOARD_SHORTCUTS, + FeatureFlags::fetchBookmarksXmlKeyboardShortcuts); } @Override - public boolean notificationFooterBackgroundTintOptimization() { - return getValue(Flags.FLAG_NOTIFICATION_FOOTER_BACKGROUND_TINT_OPTIMIZATION, - FeatureFlags::notificationFooterBackgroundTintOptimization); + + public boolean fixShadeHeaderWrongIconSize() { + return getValue(Flags.FLAG_FIX_SHADE_HEADER_WRONG_ICON_SIZE, + FeatureFlags::fixShadeHeaderWrongIconSize); } @Override - public boolean notificationMediaManagerBackgroundExecution() { - return getValue(Flags.FLAG_NOTIFICATION_MEDIA_MANAGER_BACKGROUND_EXECUTION, - FeatureFlags::notificationMediaManagerBackgroundExecution); + + public boolean flashlightStrength() { + return getValue(Flags.FLAG_FLASHLIGHT_STRENGTH, + FeatureFlags::flashlightStrength); } @Override - public boolean notificationMinimalismPrototype() { - return getValue(Flags.FLAG_NOTIFICATION_MINIMALISM_PROTOTYPE, - FeatureFlags::notificationMinimalismPrototype); + + public boolean floatingMenuDragToHide() { + return getValue(Flags.FLAG_FLOATING_MENU_DRAG_TO_HIDE, + FeatureFlags::floatingMenuDragToHide); } @Override - public boolean notificationOverExpansionClippingFix() { - return getValue(Flags.FLAG_NOTIFICATION_OVER_EXPANSION_CLIPPING_FIX, - FeatureFlags::notificationOverExpansionClippingFix); + + public boolean floatingMenuHearingDeviceStatusIcon() { + return getValue(Flags.FLAG_FLOATING_MENU_HEARING_DEVICE_STATUS_ICON, + FeatureFlags::floatingMenuHearingDeviceStatusIcon); } @Override - public boolean notificationPulsingFix() { - return getValue(Flags.FLAG_NOTIFICATION_PULSING_FIX, - FeatureFlags::notificationPulsingFix); + + public boolean floatingMenuRadiiAnimation() { + return getValue(Flags.FLAG_FLOATING_MENU_RADII_ANIMATION, + FeatureFlags::floatingMenuRadiiAnimation); } @Override - public boolean notificationRowContentBinderRefactor() { - return getValue(Flags.FLAG_NOTIFICATION_ROW_CONTENT_BINDER_REFACTOR, - FeatureFlags::notificationRowContentBinderRefactor); + + public boolean gestureBetweenHubAndLockscreenMotion() { + return getValue(Flags.FLAG_GESTURE_BETWEEN_HUB_AND_LOCKSCREEN_MOTION, + FeatureFlags::gestureBetweenHubAndLockscreenMotion); } @Override - public boolean notificationRowUserContext() { - return getValue(Flags.FLAG_NOTIFICATION_ROW_USER_CONTEXT, - FeatureFlags::notificationRowUserContext); + + public boolean getConnectedDeviceNameUnsynchronized() { + return getValue(Flags.FLAG_GET_CONNECTED_DEVICE_NAME_UNSYNCHRONIZED, + FeatureFlags::getConnectedDeviceNameUnsynchronized); } @Override - public boolean notificationViewFlipperPausingV2() { - return getValue(Flags.FLAG_NOTIFICATION_VIEW_FLIPPER_PAUSING_V2, - FeatureFlags::notificationViewFlipperPausingV2); + + public boolean glanceableHubAllowKeyguardWhenDreaming() { + return getValue(Flags.FLAG_GLANCEABLE_HUB_ALLOW_KEYGUARD_WHEN_DREAMING, + FeatureFlags::glanceableHubAllowKeyguardWhenDreaming); } @Override - public boolean notificationsBackgroundIcons() { - return getValue(Flags.FLAG_NOTIFICATIONS_BACKGROUND_ICONS, - FeatureFlags::notificationsBackgroundIcons); + + public boolean glanceableHubBlurredBackground() { + return getValue(Flags.FLAG_GLANCEABLE_HUB_BLURRED_BACKGROUND, + FeatureFlags::glanceableHubBlurredBackground); } @Override - public boolean notificationsFooterViewRefactor() { - return getValue(Flags.FLAG_NOTIFICATIONS_FOOTER_VIEW_REFACTOR, - FeatureFlags::notificationsFooterViewRefactor); + + public boolean glanceableHubDirectEditMode() { + return getValue(Flags.FLAG_GLANCEABLE_HUB_DIRECT_EDIT_MODE, + FeatureFlags::glanceableHubDirectEditMode); } @Override - public boolean notificationsHeadsUpRefactor() { - return getValue(Flags.FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR, - FeatureFlags::notificationsHeadsUpRefactor); + + public boolean glanceableHubEnabledByDefault() { + return getValue(Flags.FLAG_GLANCEABLE_HUB_ENABLED_BY_DEFAULT, + FeatureFlags::glanceableHubEnabledByDefault); } @Override - public boolean notificationsHideOnDisplaySwitch() { - return getValue(Flags.FLAG_NOTIFICATIONS_HIDE_ON_DISPLAY_SWITCH, - FeatureFlags::notificationsHideOnDisplaySwitch); + + public boolean glanceableHubV2() { + return getValue(Flags.FLAG_GLANCEABLE_HUB_V2, + FeatureFlags::glanceableHubV2); } @Override - public boolean notificationsIconContainerRefactor() { - return getValue(Flags.FLAG_NOTIFICATIONS_ICON_CONTAINER_REFACTOR, - FeatureFlags::notificationsIconContainerRefactor); + + public boolean glanceableHubV2Resources() { + return getValue(Flags.FLAG_GLANCEABLE_HUB_V2_RESOURCES, + FeatureFlags::glanceableHubV2Resources); } @Override - public boolean notificationsImprovedHunAnimation() { - return getValue(Flags.FLAG_NOTIFICATIONS_IMPROVED_HUN_ANIMATION, - FeatureFlags::notificationsImprovedHunAnimation); + + public boolean globalActionsEmphasizedFont() { + return getValue(Flags.FLAG_GLOBAL_ACTIONS_EMPHASIZED_FONT, + FeatureFlags::globalActionsEmphasizedFont); } @Override - public boolean notificationsLiveDataStoreRefactor() { - return getValue(Flags.FLAG_NOTIFICATIONS_LIVE_DATA_STORE_REFACTOR, - FeatureFlags::notificationsLiveDataStoreRefactor); + + public boolean hardwareColorStyles() { + return getValue(Flags.FLAG_HARDWARE_COLOR_STYLES, + FeatureFlags::hardwareColorStyles); } @Override - public boolean notifyPowerManagerUserActivityBackground() { - return getValue(Flags.FLAG_NOTIFY_POWER_MANAGER_USER_ACTIVITY_BACKGROUND, - FeatureFlags::notifyPowerManagerUserActivityBackground); + + public boolean hearingAidsQsTileDialog() { + return getValue(Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG, + FeatureFlags::hearingAidsQsTileDialog); } @Override - public boolean pinInputFieldStyledFocusState() { - return getValue(Flags.FLAG_PIN_INPUT_FIELD_STYLED_FOCUS_STATE, - FeatureFlags::pinInputFieldStyledFocusState); + + public boolean hearingDevicesDialogRelatedTools() { + return getValue(Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS, + FeatureFlags::hearingDevicesDialogRelatedTools); } @Override - public boolean predictiveBackAnimateBouncer() { - return getValue(Flags.FLAG_PREDICTIVE_BACK_ANIMATE_BOUNCER, - FeatureFlags::predictiveBackAnimateBouncer); + + public boolean hideRingerButtonInSingleVolumeMode() { + return getValue(Flags.FLAG_HIDE_RINGER_BUTTON_IN_SINGLE_VOLUME_MODE, + FeatureFlags::hideRingerButtonInSingleVolumeMode); } @Override - public boolean predictiveBackAnimateDialogs() { - return getValue(Flags.FLAG_PREDICTIVE_BACK_ANIMATE_DIALOGS, - FeatureFlags::predictiveBackAnimateDialogs); + + public boolean homeControlsDreamHsum() { + return getValue(Flags.FLAG_HOME_CONTROLS_DREAM_HSUM, + FeatureFlags::homeControlsDreamHsum); } @Override - public boolean predictiveBackAnimateShade() { - return getValue(Flags.FLAG_PREDICTIVE_BACK_ANIMATE_SHADE, - FeatureFlags::predictiveBackAnimateShade); + + public boolean hsuQsChanges() { + return getValue(Flags.FLAG_HSU_QS_CHANGES, + FeatureFlags::hsuQsChanges); } @Override - public boolean predictiveBackSysui() { - return getValue(Flags.FLAG_PREDICTIVE_BACK_SYSUI, - FeatureFlags::predictiveBackSysui); + + public boolean hubBlurredByShadeFix() { + return getValue(Flags.FLAG_HUB_BLURRED_BY_SHADE_FIX, + FeatureFlags::hubBlurredByShadeFix); } @Override - public boolean priorityPeopleSection() { - return getValue(Flags.FLAG_PRIORITY_PEOPLE_SECTION, - FeatureFlags::priorityPeopleSection); + + public boolean hubEditModeTouchAdjustments() { + return getValue(Flags.FLAG_HUB_EDIT_MODE_TOUCH_ADJUSTMENTS, + FeatureFlags::hubEditModeTouchAdjustments); } @Override - public boolean privacyDotUnfoldWrongCornerFix() { - return getValue(Flags.FLAG_PRIVACY_DOT_UNFOLD_WRONG_CORNER_FIX, - FeatureFlags::privacyDotUnfoldWrongCornerFix); + + public boolean hubEditModeTransition() { + return getValue(Flags.FLAG_HUB_EDIT_MODE_TRANSITION, + FeatureFlags::hubEditModeTransition); } @Override - public boolean pssAppSelectorAbruptExitFix() { - return getValue(Flags.FLAG_PSS_APP_SELECTOR_ABRUPT_EXIT_FIX, - FeatureFlags::pssAppSelectorAbruptExitFix); + + public boolean iconRefresh2025() { + return getValue(Flags.FLAG_ICON_REFRESH_2025, + FeatureFlags::iconRefresh2025); } @Override - public boolean pssAppSelectorRecentsSplitScreen() { - return getValue(Flags.FLAG_PSS_APP_SELECTOR_RECENTS_SPLIT_SCREEN, - FeatureFlags::pssAppSelectorRecentsSplitScreen); + + public boolean indicationTextA11yFix() { + return getValue(Flags.FLAG_INDICATION_TEXT_A11Y_FIX, + FeatureFlags::indicationTextA11yFix); } @Override - public boolean pssTaskSwitcher() { - return getValue(Flags.FLAG_PSS_TASK_SWITCHER, - FeatureFlags::pssTaskSwitcher); + + public boolean keyboardDockingIndicator() { + return getValue(Flags.FLAG_KEYBOARD_DOCKING_INDICATOR, + FeatureFlags::keyboardDockingIndicator); } @Override - public boolean qsCustomTileClickGuaranteedBugFix() { - return getValue(Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX, - FeatureFlags::qsCustomTileClickGuaranteedBugFix); + + public boolean keyboardShortcutHelperRewrite() { + return getValue(Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE, + FeatureFlags::keyboardShortcutHelperRewrite); } @Override - public boolean qsNewPipeline() { - return getValue(Flags.FLAG_QS_NEW_PIPELINE, - FeatureFlags::qsNewPipeline); + + public boolean keyboardTouchpadContextualEducation() { + return getValue(Flags.FLAG_KEYBOARD_TOUCHPAD_CONTEXTUAL_EDUCATION, + FeatureFlags::keyboardTouchpadContextualEducation); } @Override - public boolean qsNewTiles() { - return getValue(Flags.FLAG_QS_NEW_TILES, - FeatureFlags::qsNewTiles); + + public boolean keyguardTransitionForceFinishOnScreenOff() { + return getValue(Flags.FLAG_KEYGUARD_TRANSITION_FORCE_FINISH_ON_SCREEN_OFF, + FeatureFlags::keyguardTransitionForceFinishOnScreenOff); } @Override - public boolean qsNewTilesFuture() { - return getValue(Flags.FLAG_QS_NEW_TILES_FUTURE, - FeatureFlags::qsNewTilesFuture); + + public boolean keyguardWmStateRefactor() { + return getValue(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR, + FeatureFlags::keyguardWmStateRefactor); + } + + @Override + + public boolean largeScreenRecording() { + return getValue(Flags.FLAG_LARGE_SCREEN_RECORDING, + FeatureFlags::largeScreenRecording); + } + + @Override + + public boolean largeScreenScreencapture() { + return getValue(Flags.FLAG_LARGE_SCREEN_SCREENCAPTURE, + FeatureFlags::largeScreenScreencapture); + } + + @Override + + public boolean largeScreenScreenshotAppWindow() { + return getValue(Flags.FLAG_LARGE_SCREEN_SCREENSHOT_APP_WINDOW, + FeatureFlags::largeScreenScreenshotAppWindow); + } + + @Override + + public boolean largeScreenSharing() { + return getValue(Flags.FLAG_LARGE_SCREEN_SHARING, + FeatureFlags::largeScreenSharing); + } + + @Override + + public boolean lockscreenShadeToDreamTransitionFix() { + return getValue(Flags.FLAG_LOCKSCREEN_SHADE_TO_DREAM_TRANSITION_FIX, + FeatureFlags::lockscreenShadeToDreamTransitionFix); + } + + @Override + + public boolean lowLightClockDream() { + return getValue(Flags.FLAG_LOW_LIGHT_CLOCK_DREAM, + FeatureFlags::lowLightClockDream); + } + + @Override + + public boolean lowlightClockSetBrightness() { + return getValue(Flags.FLAG_LOWLIGHT_CLOCK_SET_BRIGHTNESS, + FeatureFlags::lowlightClockSetBrightness); + } + + @Override + + public boolean lowlightClockUsesKeyguardChargingStatus() { + return getValue(Flags.FLAG_LOWLIGHT_CLOCK_USES_KEYGUARD_CHARGING_STATUS, + FeatureFlags::lowlightClockUsesKeyguardChargingStatus); + } + + @Override + + public boolean magneticNotificationSwipes() { + return getValue(Flags.FLAG_MAGNETIC_NOTIFICATION_SWIPES, + FeatureFlags::magneticNotificationSwipes); + } + + @Override + + public boolean mediaCarouselArrows() { + return getValue(Flags.FLAG_MEDIA_CAROUSEL_ARROWS, + FeatureFlags::mediaCarouselArrows); + } + + @Override + + public boolean mediaControlsButtonMedia3() { + return getValue(Flags.FLAG_MEDIA_CONTROLS_BUTTON_MEDIA3, + FeatureFlags::mediaControlsButtonMedia3); + } + + @Override + + public boolean mediaControlsButtonMedia3Placement() { + return getValue(Flags.FLAG_MEDIA_CONTROLS_BUTTON_MEDIA3_PLACEMENT, + FeatureFlags::mediaControlsButtonMedia3Placement); + } + + @Override + + public boolean mediaControlsInCompose() { + return getValue(Flags.FLAG_MEDIA_CONTROLS_IN_COMPOSE, + FeatureFlags::mediaControlsInCompose); + } + + @Override + + public boolean mediaControlsTranslationFix() { + return getValue(Flags.FLAG_MEDIA_CONTROLS_TRANSLATION_FIX, + FeatureFlags::mediaControlsTranslationFix); + } + + @Override + + public boolean mediaFrameDimensionsFix() { + return getValue(Flags.FLAG_MEDIA_FRAME_DIMENSIONS_FIX, + FeatureFlags::mediaFrameDimensionsFix); + } + + @Override + + public boolean mediaProjectionDialogBehindLockscreen() { + return getValue(Flags.FLAG_MEDIA_PROJECTION_DIALOG_BEHIND_LOCKSCREEN, + FeatureFlags::mediaProjectionDialogBehindLockscreen); + } + + @Override + + public boolean mediaProjectionGreyErrorText() { + return getValue(Flags.FLAG_MEDIA_PROJECTION_GREY_ERROR_TEXT, + FeatureFlags::mediaProjectionGreyErrorText); + } + + @Override + + public boolean modesUiDialogPaging() { + return getValue(Flags.FLAG_MODES_UI_DIALOG_PAGING, + FeatureFlags::modesUiDialogPaging); + } + + @Override + + public boolean moveTransitionAnimationLayer() { + return getValue(Flags.FLAG_MOVE_TRANSITION_ANIMATION_LAYER, + FeatureFlags::moveTransitionAnimationLayer); + } + + @Override + + public boolean msdlFeedback() { + return getValue(Flags.FLAG_MSDL_FEEDBACK, + FeatureFlags::msdlFeedback); + } + + @Override + + public boolean multiuserOpenUserSwitcherDialog() { + return getValue(Flags.FLAG_MULTIUSER_OPEN_USER_SWITCHER_DIALOG, + FeatureFlags::multiuserOpenUserSwitcherDialog); + } + + @Override + + public boolean multiuserWifiPickerTrackerSupport() { + return getValue(Flags.FLAG_MULTIUSER_WIFI_PICKER_TRACKER_SUPPORT, + FeatureFlags::multiuserWifiPickerTrackerSupport); + } + + @Override + + public boolean newAodTransition() { + return getValue(Flags.FLAG_NEW_AOD_TRANSITION, + FeatureFlags::newAodTransition); + } + + @Override + + public boolean newDozingKeyguardStates() { + return getValue(Flags.FLAG_NEW_DOZING_KEYGUARD_STATES, + FeatureFlags::newDozingKeyguardStates); + } + + @Override + + public boolean newScreenRecordToolbar() { + return getValue(Flags.FLAG_NEW_SCREEN_RECORD_TOOLBAR, + FeatureFlags::newScreenRecordToolbar); + } + + @Override + + public boolean newVolumePanel() { + return getValue(Flags.FLAG_NEW_VOLUME_PANEL, + FeatureFlags::newVolumePanel); + } + + @Override + + public boolean noExpansionOnOverscroll() { + return getValue(Flags.FLAG_NO_EXPANSION_ON_OVERSCROLL, + FeatureFlags::noExpansionOnOverscroll); + } + + @Override + + public boolean noShadeBlurOnDreamStart() { + return getValue(Flags.FLAG_NO_SHADE_BLUR_ON_DREAM_START, + FeatureFlags::noShadeBlurOnDreamStart); + } + + @Override + + public boolean nonTouchscreenDevicesBypassFalsing() { + return getValue(Flags.FLAG_NON_TOUCHSCREEN_DEVICES_BYPASS_FALSING, + FeatureFlags::nonTouchscreenDevicesBypassFalsing); + } + + @Override + + public boolean notesRoleQsTile() { + return getValue(Flags.FLAG_NOTES_ROLE_QS_TILE, + FeatureFlags::notesRoleQsTile); + } + + @Override + + public boolean notificationAddXOnHoverToDismiss() { + return getValue(Flags.FLAG_NOTIFICATION_ADD_X_ON_HOVER_TO_DISMISS, + FeatureFlags::notificationAddXOnHoverToDismiss); + } + + @Override + + public boolean notificationAmbientSuppressionAfterInflation() { + return getValue(Flags.FLAG_NOTIFICATION_AMBIENT_SUPPRESSION_AFTER_INFLATION, + FeatureFlags::notificationAmbientSuppressionAfterInflation); + } + + @Override + + public boolean notificationAnimatedActionsTreatment() { + return getValue(Flags.FLAG_NOTIFICATION_ANIMATED_ACTIONS_TREATMENT, + FeatureFlags::notificationAnimatedActionsTreatment); + } + + @Override + + public boolean notificationAppearNonlinear() { + return getValue(Flags.FLAG_NOTIFICATION_APPEAR_NONLINEAR, + FeatureFlags::notificationAppearNonlinear); + } + + @Override + + public boolean notificationAsyncGroupHeaderInflation() { + return getValue(Flags.FLAG_NOTIFICATION_ASYNC_GROUP_HEADER_INFLATION, + FeatureFlags::notificationAsyncGroupHeaderInflation); + } + + @Override + + public boolean notificationAvalancheSuppression() { + return getValue(Flags.FLAG_NOTIFICATION_AVALANCHE_SUPPRESSION, + FeatureFlags::notificationAvalancheSuppression); + } + + @Override + + public boolean notificationAvalancheThrottleHun() { + return getValue(Flags.FLAG_NOTIFICATION_AVALANCHE_THROTTLE_HUN, + FeatureFlags::notificationAvalancheThrottleHun); + } + + @Override + + public boolean notificationBackgroundTintOptimization() { + return getValue(Flags.FLAG_NOTIFICATION_BACKGROUND_TINT_OPTIMIZATION, + FeatureFlags::notificationBackgroundTintOptimization); + } + + @Override + + public boolean notificationBundleUi() { + return getValue(Flags.FLAG_NOTIFICATION_BUNDLE_UI, + FeatureFlags::notificationBundleUi); + } + + @Override + + public boolean notificationChildrenContainerMinHeight() { + return getValue(Flags.FLAG_NOTIFICATION_CHILDREN_CONTAINER_MIN_HEIGHT, + FeatureFlags::notificationChildrenContainerMinHeight); + } + + @Override + + public boolean notificationColorUpdateLogger() { + return getValue(Flags.FLAG_NOTIFICATION_COLOR_UPDATE_LOGGER, + FeatureFlags::notificationColorUpdateLogger); + } + + @Override + + public boolean notificationFixHunShadows() { + return getValue(Flags.FLAG_NOTIFICATION_FIX_HUN_SHADOWS, + FeatureFlags::notificationFixHunShadows); + } + + @Override + + public boolean notificationFooterBackgroundTintOptimization() { + return getValue(Flags.FLAG_NOTIFICATION_FOOTER_BACKGROUND_TINT_OPTIMIZATION, + FeatureFlags::notificationFooterBackgroundTintOptimization); + } + + @Override + + public boolean notificationRowIsRemovedFix() { + return getValue(Flags.FLAG_NOTIFICATION_ROW_IS_REMOVED_FIX, + FeatureFlags::notificationRowIsRemovedFix); + } + + @Override + + public boolean notificationRowTransparency() { + return getValue(Flags.FLAG_NOTIFICATION_ROW_TRANSPARENCY, + FeatureFlags::notificationRowTransparency); + } + + @Override + + public boolean notificationShadeBlur() { + return getValue(Flags.FLAG_NOTIFICATION_SHADE_BLUR, + FeatureFlags::notificationShadeBlur); + } + + @Override + + public boolean notificationShadeUiThread() { + return getValue(Flags.FLAG_NOTIFICATION_SHADE_UI_THREAD, + FeatureFlags::notificationShadeUiThread); + } + + @Override + + public boolean notificationSkipSilentUpdates() { + return getValue(Flags.FLAG_NOTIFICATION_SKIP_SILENT_UPDATES, + FeatureFlags::notificationSkipSilentUpdates); + } + + @Override + + public boolean notificationTransparentHeaderFix() { + return getValue(Flags.FLAG_NOTIFICATION_TRANSPARENT_HEADER_FIX, + FeatureFlags::notificationTransparentHeaderFix); + } + + @Override + + public boolean notificationsHideOnDisplaySwitch() { + return getValue(Flags.FLAG_NOTIFICATIONS_HIDE_ON_DISPLAY_SWITCH, + FeatureFlags::notificationsHideOnDisplaySwitch); + } + + @Override + + public boolean notificationsIconContainerRefactor() { + return getValue(Flags.FLAG_NOTIFICATIONS_ICON_CONTAINER_REFACTOR, + FeatureFlags::notificationsIconContainerRefactor); + } + + @Override + + public boolean notificationsRedesignFooterView() { + return getValue(Flags.FLAG_NOTIFICATIONS_REDESIGN_FOOTER_VIEW, + FeatureFlags::notificationsRedesignFooterView); + } + + @Override + + public boolean ongoingActivityChipsOnDream() { + return getValue(Flags.FLAG_ONGOING_ACTIVITY_CHIPS_ON_DREAM, + FeatureFlags::ongoingActivityChipsOnDream); + } + + @Override + + public boolean overrideSuppressOverlayCondition() { + return getValue(Flags.FLAG_OVERRIDE_SUPPRESS_OVERLAY_CONDITION, + FeatureFlags::overrideSuppressOverlayCondition); + } + + @Override + + public boolean permissionHelperInlineUiRichOngoing() { + return getValue(Flags.FLAG_PERMISSION_HELPER_INLINE_UI_RICH_ONGOING, + FeatureFlags::permissionHelperInlineUiRichOngoing); + } + + @Override + + public boolean permissionHelperUiRichOngoing() { + return getValue(Flags.FLAG_PERMISSION_HELPER_UI_RICH_ONGOING, + FeatureFlags::permissionHelperUiRichOngoing); + } + + @Override + + public boolean physicalNotificationMovement() { + return getValue(Flags.FLAG_PHYSICAL_NOTIFICATION_MOVEMENT, + FeatureFlags::physicalNotificationMovement); + } + + @Override + + public boolean pinInputFieldStyledFocusState() { + return getValue(Flags.FLAG_PIN_INPUT_FIELD_STYLED_FOCUS_STATE, + FeatureFlags::pinInputFieldStyledFocusState); + } + + @Override + + public boolean predictiveBackAnimateShade() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_ANIMATE_SHADE, + FeatureFlags::predictiveBackAnimateShade); + } + + @Override + + public boolean privacyDotLiveRegion() { + return getValue(Flags.FLAG_PRIVACY_DOT_LIVE_REGION, + FeatureFlags::privacyDotLiveRegion); + } + + @Override + + public boolean promoteNotificationsAutomatically() { + return getValue(Flags.FLAG_PROMOTE_NOTIFICATIONS_AUTOMATICALLY, + FeatureFlags::promoteNotificationsAutomatically); + } + + @Override + + public boolean pssTaskSwitcher() { + return getValue(Flags.FLAG_PSS_TASK_SWITCHER, + FeatureFlags::pssTaskSwitcher); + } + + @Override + + public boolean qsComposeFragmentEarlyExpansion() { + return getValue(Flags.FLAG_QS_COMPOSE_FRAGMENT_EARLY_EXPANSION, + FeatureFlags::qsComposeFragmentEarlyExpansion); + } + + @Override + + public boolean qsEditModeTooltip() { + return getValue(Flags.FLAG_QS_EDIT_MODE_TOOLTIP, + FeatureFlags::qsEditModeTooltip); + } + + @Override + + public boolean qsEditModeV2() { + return getValue(Flags.FLAG_QS_EDIT_MODE_V2, + FeatureFlags::qsEditModeV2); + } + + @Override + + public boolean qsMaterialExpressiveTiles() { + return getValue(Flags.FLAG_QS_MATERIAL_EXPRESSIVE_TILES, + FeatureFlags::qsMaterialExpressiveTiles); + } + + @Override + + public boolean qsNewTiles() { + return getValue(Flags.FLAG_QS_NEW_TILES, + FeatureFlags::qsNewTiles); + } + + @Override + + public boolean qsNewTilesFuture() { + return getValue(Flags.FLAG_QS_NEW_TILES_FUTURE, + FeatureFlags::qsNewTilesFuture); + } + + @Override + + public boolean qsSplitInternetTile() { + return getValue(Flags.FLAG_QS_SPLIT_INTERNET_TILE, + FeatureFlags::qsSplitInternetTile); + } + + @Override + + public boolean qsTileDetailedView() { + return getValue(Flags.FLAG_QS_TILE_DETAILED_VIEW, + FeatureFlags::qsTileDetailedView); + } + + @Override + + public boolean qsTileFocusState() { + return getValue(Flags.FLAG_QS_TILE_FOCUS_STATE, + FeatureFlags::qsTileFocusState); + } + + @Override + + public boolean qsTileTransitionInteractionRefinement() { + return getValue(Flags.FLAG_QS_TILE_TRANSITION_INTERACTION_REFINEMENT, + FeatureFlags::qsTileTransitionInteractionRefinement); + } + + @Override + + public boolean qsUiRefactorComposeFragment() { + return getValue(Flags.FLAG_QS_UI_REFACTOR_COMPOSE_FRAGMENT, + FeatureFlags::qsUiRefactorComposeFragment); + } + + @Override + + public boolean qsWifiConfig() { + return getValue(Flags.FLAG_QS_WIFI_CONFIG, + FeatureFlags::qsWifiConfig); + } + + @Override + + public boolean recordIssueQsTile() { + return getValue(Flags.FLAG_RECORD_ISSUE_QS_TILE, + FeatureFlags::recordIssueQsTile); + } + + @Override + + public boolean redesignMagnificationWindowSize() { + return getValue(Flags.FLAG_REDESIGN_MAGNIFICATION_WINDOW_SIZE, + FeatureFlags::redesignMagnificationWindowSize); + } + + @Override + + public boolean registerWallpaperNotifierBackground() { + return getValue(Flags.FLAG_REGISTER_WALLPAPER_NOTIFIER_BACKGROUND, + FeatureFlags::registerWallpaperNotifierBackground); + } + + @Override + + public boolean removeDreamOverlayHideOnTouch() { + return getValue(Flags.FLAG_REMOVE_DREAM_OVERLAY_HIDE_ON_TOUCH, + FeatureFlags::removeDreamOverlayHideOnTouch); + } + + @Override + + public boolean removeNearbyShareTileAnimation() { + return getValue(Flags.FLAG_REMOVE_NEARBY_SHARE_TILE_ANIMATION, + FeatureFlags::removeNearbyShareTileAnimation); + } + + @Override + + public boolean removeUpdateListenerInQsIconViewImpl() { + return getValue(Flags.FLAG_REMOVE_UPDATE_LISTENER_IN_QS_ICON_VIEW_IMPL, + FeatureFlags::removeUpdateListenerInQsIconViewImpl); + } + + @Override + + public boolean resetTilesRemovesCustomTiles() { + return getValue(Flags.FLAG_RESET_TILES_REMOVES_CUSTOM_TILES, + FeatureFlags::resetTilesRemovesCustomTiles); + } + + @Override + + public boolean restToUnlock() { + return getValue(Flags.FLAG_REST_TO_UNLOCK, + FeatureFlags::restToUnlock); + } + + @Override + + public boolean restartDreamOnUnocclude() { + return getValue(Flags.FLAG_RESTART_DREAM_ON_UNOCCLUDE, + FeatureFlags::restartDreamOnUnocclude); + } + + @Override + + public boolean restoreShowTapsSetting() { + return getValue(Flags.FLAG_RESTORE_SHOW_TAPS_SETTING, + FeatureFlags::restoreShowTapsSetting); } @Override - public boolean qsTileFocusState() { - return getValue(Flags.FLAG_QS_TILE_FOCUS_STATE, - FeatureFlags::qsTileFocusState); + + public boolean restrictCommunalAppWidgetHostListening() { + return getValue(Flags.FLAG_RESTRICT_COMMUNAL_APP_WIDGET_HOST_LISTENING, + FeatureFlags::restrictCommunalAppWidgetHostListening); } @Override - public boolean qsUiRefactor() { - return getValue(Flags.FLAG_QS_UI_REFACTOR, - FeatureFlags::qsUiRefactor); + + public boolean restrictCommunalShadeToWhenIdle() { + return getValue(Flags.FLAG_RESTRICT_COMMUNAL_SHADE_TO_WHEN_IDLE, + FeatureFlags::restrictCommunalShadeToWhenIdle); } @Override - public boolean quickSettingsVisualHapticsLongpress() { - return getValue(Flags.FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS, - FeatureFlags::quickSettingsVisualHapticsLongpress); + + public boolean revampedBouncerMessages() { + return getValue(Flags.FLAG_REVAMPED_BOUNCER_MESSAGES, + FeatureFlags::revampedBouncerMessages); } @Override - public boolean recordIssueQsTile() { - return getValue(Flags.FLAG_RECORD_ISSUE_QS_TILE, - FeatureFlags::recordIssueQsTile); + + public boolean runFingerprintDetectOnDismissibleKeyguard() { + return getValue(Flags.FLAG_RUN_FINGERPRINT_DETECT_ON_DISMISSIBLE_KEYGUARD, + FeatureFlags::runFingerprintDetectOnDismissibleKeyguard); } @Override - public boolean refactorGetCurrentUser() { - return getValue(Flags.FLAG_REFACTOR_GET_CURRENT_USER, - FeatureFlags::refactorGetCurrentUser); + + public boolean sceneContainer() { + return getValue(Flags.FLAG_SCENE_CONTAINER, + FeatureFlags::sceneContainer); } @Override - public boolean registerBatteryControllerReceiversInCorestartable() { - return getValue(Flags.FLAG_REGISTER_BATTERY_CONTROLLER_RECEIVERS_IN_CORESTARTABLE, - FeatureFlags::registerBatteryControllerReceiversInCorestartable); + + public boolean screenOffAnimationGuardEnabled() { + return getValue(Flags.FLAG_SCREEN_OFF_ANIMATION_GUARD_ENABLED, + FeatureFlags::screenOffAnimationGuardEnabled); } @Override - public boolean registerNewWalletCardInBackground() { - return getValue(Flags.FLAG_REGISTER_NEW_WALLET_CARD_IN_BACKGROUND, - FeatureFlags::registerNewWalletCardInBackground); + + public boolean screenReactions() { + return getValue(Flags.FLAG_SCREEN_REACTIONS, + FeatureFlags::screenReactions); } @Override - public boolean registerWallpaperNotifierBackground() { - return getValue(Flags.FLAG_REGISTER_WALLPAPER_NOTIFIER_BACKGROUND, - FeatureFlags::registerWallpaperNotifierBackground); + + public boolean screenshareNotificationHidingBugFix() { + return getValue(Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX, + FeatureFlags::screenshareNotificationHidingBugFix); } @Override - public boolean registerZenModeContentObserverBackground() { - return getValue(Flags.FLAG_REGISTER_ZEN_MODE_CONTENT_OBSERVER_BACKGROUND, - FeatureFlags::registerZenModeContentObserverBackground); + + public boolean screenshotAnnounceLiveRegion() { + return getValue(Flags.FLAG_SCREENSHOT_ANNOUNCE_LIVE_REGION, + FeatureFlags::screenshotAnnounceLiveRegion); } @Override - public boolean removeDreamOverlayHideOnTouch() { - return getValue(Flags.FLAG_REMOVE_DREAM_OVERLAY_HIDE_ON_TOUCH, - FeatureFlags::removeDreamOverlayHideOnTouch); + + public boolean screenshotDismissalSpring() { + return getValue(Flags.FLAG_SCREENSHOT_DISMISSAL_SPRING, + FeatureFlags::screenshotDismissalSpring); } @Override - public boolean restToUnlock() { - return getValue(Flags.FLAG_REST_TO_UNLOCK, - FeatureFlags::restToUnlock); + + public boolean screenshotForceShutterSound() { + return getValue(Flags.FLAG_SCREENSHOT_FORCE_SHUTTER_SOUND, + FeatureFlags::screenshotForceShutterSound); } @Override - public boolean restartDreamOnUnocclude() { - return getValue(Flags.FLAG_RESTART_DREAM_ON_UNOCCLUDE, - FeatureFlags::restartDreamOnUnocclude); + + public boolean screenshotMultidisplayFocusChange() { + return getValue(Flags.FLAG_SCREENSHOT_MULTIDISPLAY_FOCUS_CHANGE, + FeatureFlags::screenshotMultidisplayFocusChange); } @Override - public boolean revampedBouncerMessages() { - return getValue(Flags.FLAG_REVAMPED_BOUNCER_MESSAGES, - FeatureFlags::revampedBouncerMessages); + + public boolean screenshotPolicySplitAndDesktopMode() { + return getValue(Flags.FLAG_SCREENSHOT_POLICY_SPLIT_AND_DESKTOP_MODE, + FeatureFlags::screenshotPolicySplitAndDesktopMode); } @Override - public boolean runFingerprintDetectOnDismissibleKeyguard() { - return getValue(Flags.FLAG_RUN_FINGERPRINT_DETECT_ON_DISMISSIBLE_KEYGUARD, - FeatureFlags::runFingerprintDetectOnDismissibleKeyguard); + + public boolean screenshotScrollCropViewCrashFix() { + return getValue(Flags.FLAG_SCREENSHOT_SCROLL_CROP_VIEW_CRASH_FIX, + FeatureFlags::screenshotScrollCropViewCrashFix); } @Override - public boolean saveAndRestoreMagnificationSettingsButtons() { - return getValue(Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS, - FeatureFlags::saveAndRestoreMagnificationSettingsButtons); + + public boolean scrimFix() { + return getValue(Flags.FLAG_SCRIM_FIX, + FeatureFlags::scrimFix); } @Override - public boolean sceneContainer() { - return getValue(Flags.FLAG_SCENE_CONTAINER, - FeatureFlags::sceneContainer); + + public boolean secondaryUserWidgetHost() { + return getValue(Flags.FLAG_SECONDARY_USER_WIDGET_HOST, + FeatureFlags::secondaryUserWidgetHost); } @Override - public boolean screenshareNotificationHidingBugFix() { - return getValue(Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX, - FeatureFlags::screenshareNotificationHidingBugFix); + + public boolean settingsExtRegisterContentObserverOnBgThread() { + return getValue(Flags.FLAG_SETTINGS_EXT_REGISTER_CONTENT_OBSERVER_ON_BG_THREAD, + FeatureFlags::settingsExtRegisterContentObserverOnBgThread); } @Override - public boolean screenshotActionDismissSystemWindows() { - return getValue(Flags.FLAG_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS, - FeatureFlags::screenshotActionDismissSystemWindows); + + public boolean shadeAppLaunchAnimationSkipInDesktop() { + return getValue(Flags.FLAG_SHADE_APP_LAUNCH_ANIMATION_SKIP_IN_DESKTOP, + FeatureFlags::shadeAppLaunchAnimationSkipInDesktop); } @Override - public boolean screenshotPrivateProfileAccessibilityAnnouncementFix() { - return getValue(Flags.FLAG_SCREENSHOT_PRIVATE_PROFILE_ACCESSIBILITY_ANNOUNCEMENT_FIX, - FeatureFlags::screenshotPrivateProfileAccessibilityAnnouncementFix); + + public boolean shadeExpandsOnStatusBarLongPress() { + return getValue(Flags.FLAG_SHADE_EXPANDS_ON_STATUS_BAR_LONG_PRESS, + FeatureFlags::shadeExpandsOnStatusBarLongPress); } @Override - public boolean screenshotPrivateProfileBehaviorFix() { - return getValue(Flags.FLAG_SCREENSHOT_PRIVATE_PROFILE_BEHAVIOR_FIX, - FeatureFlags::screenshotPrivateProfileBehaviorFix); + + public boolean shadeHeaderBlurFontColor() { + return getValue(Flags.FLAG_SHADE_HEADER_BLUR_FONT_COLOR, + FeatureFlags::shadeHeaderBlurFontColor); } @Override - public boolean screenshotScrollCropViewCrashFix() { - return getValue(Flags.FLAG_SCREENSHOT_SCROLL_CROP_VIEW_CRASH_FIX, - FeatureFlags::screenshotScrollCropViewCrashFix); + + public boolean shadeHeaderFontUpdate() { + return getValue(Flags.FLAG_SHADE_HEADER_FONT_UPDATE, + FeatureFlags::shadeHeaderFontUpdate); } @Override - public boolean screenshotShelfUi2() { - return getValue(Flags.FLAG_SCREENSHOT_SHELF_UI2, - FeatureFlags::screenshotShelfUi2); + + public boolean shadeQsvisibleLogic() { + return getValue(Flags.FLAG_SHADE_QSVISIBLE_LOGIC, + FeatureFlags::shadeQsvisibleLogic); } @Override - public boolean shadeCollapseActivityLaunchFix() { - return getValue(Flags.FLAG_SHADE_COLLAPSE_ACTIVITY_LAUNCH_FIX, - FeatureFlags::shadeCollapseActivityLaunchFix); + + public boolean shadeWindowGoesAround() { + return getValue(Flags.FLAG_SHADE_WINDOW_GOES_AROUND, + FeatureFlags::shadeWindowGoesAround); } @Override + public boolean shaderlibLoadingEffectRefactor() { return getValue(Flags.FLAG_SHADERLIB_LOADING_EFFECT_REFACTOR, - FeatureFlags::shaderlibLoadingEffectRefactor); + FeatureFlags::shaderlibLoadingEffectRefactor); } @Override - public boolean sliceBroadcastRelayInBackground() { - return getValue(Flags.FLAG_SLICE_BROADCAST_RELAY_IN_BACKGROUND, - FeatureFlags::sliceBroadcastRelayInBackground); + + public boolean shortcutHelperKeyGlyph() { + return getValue(Flags.FLAG_SHORTCUT_HELPER_KEY_GLYPH, + FeatureFlags::shortcutHelperKeyGlyph); } @Override - public boolean sliceManagerBinderCallBackground() { - return getValue(Flags.FLAG_SLICE_MANAGER_BINDER_CALL_BACKGROUND, - FeatureFlags::sliceManagerBinderCallBackground); + + public boolean shortcutHelperMultiDisplaySupport() { + return getValue(Flags.FLAG_SHORTCUT_HELPER_MULTI_DISPLAY_SUPPORT, + FeatureFlags::shortcutHelperMultiDisplaySupport); + } + + @Override + + public boolean showAudioSharingSliderInVolumePanel() { + return getValue(Flags.FLAG_SHOW_AUDIO_SHARING_SLIDER_IN_VOLUME_PANEL, + FeatureFlags::showAudioSharingSliderInVolumePanel); + } + + @Override + + public boolean showClipboardIndication() { + return getValue(Flags.FLAG_SHOW_CLIPBOARD_INDICATION, + FeatureFlags::showClipboardIndication); + } + + @Override + + public boolean showIconInEmptyShade() { + return getValue(Flags.FLAG_SHOW_ICON_IN_EMPTY_SHADE, + FeatureFlags::showIconInEmptyShade); + } + + @Override + + public boolean showLockedByYourWatchKeyguardIndicator() { + return getValue(Flags.FLAG_SHOW_LOCKED_BY_YOUR_WATCH_KEYGUARD_INDICATOR, + FeatureFlags::showLockedByYourWatchKeyguardIndicator); + } + + @Override + + public boolean signOutButtonOnKeyguardStatusBar() { + return getValue(Flags.FLAG_SIGN_OUT_BUTTON_ON_KEYGUARD_STATUS_BAR, + FeatureFlags::signOutButtonOnKeyguardStatusBar); + } + + @Override + + public boolean simPinBouncerReset() { + return getValue(Flags.FLAG_SIM_PIN_BOUNCER_RESET, + FeatureFlags::simPinBouncerReset); } @Override - public boolean smartspaceLockscreenViewmodel() { - return getValue(Flags.FLAG_SMARTSPACE_LOCKSCREEN_VIEWMODEL, - FeatureFlags::smartspaceLockscreenViewmodel); + + public boolean sliceManagerBinderCallBackground() { + return getValue(Flags.FLAG_SLICE_MANAGER_BINDER_CALL_BACKGROUND, + FeatureFlags::sliceManagerBinderCallBackground); } @Override + public boolean smartspaceRelocateToBottom() { return getValue(Flags.FLAG_SMARTSPACE_RELOCATE_TO_BOTTOM, - FeatureFlags::smartspaceRelocateToBottom); + FeatureFlags::smartspaceRelocateToBottom); + } + + @Override + + public boolean smartspaceSwipeEventLoggingFix() { + return getValue(Flags.FLAG_SMARTSPACE_SWIPE_EVENT_LOGGING_FIX, + FeatureFlags::smartspaceSwipeEventLoggingFix); + } + + @Override + + public boolean smartspaceViewpager2() { + return getValue(Flags.FLAG_SMARTSPACE_VIEWPAGER2, + FeatureFlags::smartspaceViewpager2); + } + + @Override + + public boolean sounddoseCustomization() { + return getValue(Flags.FLAG_SOUNDDOSE_CUSTOMIZATION, + FeatureFlags::sounddoseCustomization); + } + + @Override + + public boolean spatialModelAppPushback() { + return getValue(Flags.FLAG_SPATIAL_MODEL_APP_PUSHBACK, + FeatureFlags::spatialModelAppPushback); + } + + @Override + + public boolean spatialModelBouncerPushback() { + return getValue(Flags.FLAG_SPATIAL_MODEL_BOUNCER_PUSHBACK, + FeatureFlags::spatialModelBouncerPushback); + } + + @Override + + public boolean spatialModelPushbackInShader() { + return getValue(Flags.FLAG_SPATIAL_MODEL_PUSHBACK_IN_SHADER, + FeatureFlags::spatialModelPushbackInShader); + } + + @Override + + public boolean stabilizeHeadsUpGroupV2() { + return getValue(Flags.FLAG_STABILIZE_HEADS_UP_GROUP_V2, + FeatureFlags::stabilizeHeadsUpGroupV2); + } + + @Override + + public boolean statusBarAlwaysCheckUnderlyingNetworks() { + return getValue(Flags.FLAG_STATUS_BAR_ALWAYS_CHECK_UNDERLYING_NETWORKS, + FeatureFlags::statusBarAlwaysCheckUnderlyingNetworks); + } + + @Override + + public boolean statusBarAlwaysScheduleAutoHide() { + return getValue(Flags.FLAG_STATUS_BAR_ALWAYS_SCHEDULE_AUTO_HIDE, + FeatureFlags::statusBarAlwaysScheduleAutoHide); + } + + @Override + + public boolean statusBarAlwaysUseRegionSampling() { + return getValue(Flags.FLAG_STATUS_BAR_ALWAYS_USE_REGION_SAMPLING, + FeatureFlags::statusBarAlwaysUseRegionSampling); + } + + @Override + + public boolean statusBarAppHandleTracking() { + return getValue(Flags.FLAG_STATUS_BAR_APP_HANDLE_TRACKING, + FeatureFlags::statusBarAppHandleTracking); + } + + @Override + + public boolean statusBarBatteryNoConflation() { + return getValue(Flags.FLAG_STATUS_BAR_BATTERY_NO_CONFLATION, + FeatureFlags::statusBarBatteryNoConflation); + } + + @Override + + public boolean statusBarCallChipUseIsHidden() { + return getValue(Flags.FLAG_STATUS_BAR_CALL_CHIP_USE_IS_HIDDEN, + FeatureFlags::statusBarCallChipUseIsHidden); + } + + @Override + + public boolean statusBarChipToHunAnimation() { + return getValue(Flags.FLAG_STATUS_BAR_CHIP_TO_HUN_ANIMATION, + FeatureFlags::statusBarChipToHunAnimation); + } + + @Override + + public boolean statusBarChipsModernization() { + return getValue(Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION, + FeatureFlags::statusBarChipsModernization); + } + + @Override + + public boolean statusBarChipsReturnAnimations() { + return getValue(Flags.FLAG_STATUS_BAR_CHIPS_RETURN_ANIMATIONS, + FeatureFlags::statusBarChipsReturnAnimations); + } + + @Override + + public boolean statusBarDarkIconInteractorMixedFix() { + return getValue(Flags.FLAG_STATUS_BAR_DARK_ICON_INTERACTOR_MIXED_FIX, + FeatureFlags::statusBarDarkIconInteractorMixedFix); + } + + @Override + + public boolean statusBarDate() { + return getValue(Flags.FLAG_STATUS_BAR_DATE, + FeatureFlags::statusBarDate); + } + + @Override + + public boolean statusBarFontUpdates() { + return getValue(Flags.FLAG_STATUS_BAR_FONT_UPDATES, + FeatureFlags::statusBarFontUpdates); + } + + @Override + + public boolean statusBarForDesktop() { + return getValue(Flags.FLAG_STATUS_BAR_FOR_DESKTOP, + FeatureFlags::statusBarForDesktop); + } + + @Override + + public boolean statusBarMobileIconKairos() { + return getValue(Flags.FLAG_STATUS_BAR_MOBILE_ICON_KAIROS, + FeatureFlags::statusBarMobileIconKairos); + } + + @Override + + public boolean statusBarNoHunBehavior() { + return getValue(Flags.FLAG_STATUS_BAR_NO_HUN_BEHAVIOR, + FeatureFlags::statusBarNoHunBehavior); + } + + @Override + + public boolean statusBarPopupChips() { + return getValue(Flags.FLAG_STATUS_BAR_POPUP_CHIPS, + FeatureFlags::statusBarPopupChips); + } + + @Override + + public boolean statusBarPrivacyChipAnimationExemption() { + return getValue(Flags.FLAG_STATUS_BAR_PRIVACY_CHIP_ANIMATION_EXEMPTION, + FeatureFlags::statusBarPrivacyChipAnimationExemption); + } + + @Override + + public boolean statusBarRegionSampling() { + return getValue(Flags.FLAG_STATUS_BAR_REGION_SAMPLING, + FeatureFlags::statusBarRegionSampling); + } + + @Override + + public boolean statusBarRootModernization() { + return getValue(Flags.FLAG_STATUS_BAR_ROOT_MODERNIZATION, + FeatureFlags::statusBarRootModernization); } @Override - public boolean smartspaceRemoteviewsRendering() { - return getValue(Flags.FLAG_SMARTSPACE_REMOTEVIEWS_RENDERING, - FeatureFlags::smartspaceRemoteviewsRendering); + + public boolean statusBarRudimentaryBattery() { + return getValue(Flags.FLAG_STATUS_BAR_RUDIMENTARY_BATTERY, + FeatureFlags::statusBarRudimentaryBattery); } @Override - public boolean statusBarMonochromeIconsFix() { - return getValue(Flags.FLAG_STATUS_BAR_MONOCHROME_ICONS_FIX, - FeatureFlags::statusBarMonochromeIconsFix); + + public boolean statusBarShareDialogWithAppName() { + return getValue(Flags.FLAG_STATUS_BAR_SHARE_DIALOG_WITH_APP_NAME, + FeatureFlags::statusBarShareDialogWithAppName); } @Override - public boolean statusBarScreenSharingChips() { - return getValue(Flags.FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, - FeatureFlags::statusBarScreenSharingChips); + + public boolean statusBarShowIconsInSecureCamera() { + return getValue(Flags.FLAG_STATUS_BAR_SHOW_ICONS_IN_SECURE_CAMERA, + FeatureFlags::statusBarShowIconsInSecureCamera); } @Override + public boolean statusBarStaticInoutIndicators() { return getValue(Flags.FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS, - FeatureFlags::statusBarStaticInoutIndicators); + FeatureFlags::statusBarStaticInoutIndicators); + } + + @Override + + public boolean statusBarSwitchToSpnFromDataSpn() { + return getValue(Flags.FLAG_STATUS_BAR_SWITCH_TO_SPN_FROM_DATA_SPN, + FeatureFlags::statusBarSwitchToSpnFromDataSpn); + } + + @Override + + public boolean statusBarSystemStatusIconsInCompose() { + return getValue(Flags.FLAG_STATUS_BAR_SYSTEM_STATUS_ICONS_IN_COMPOSE, + FeatureFlags::statusBarSystemStatusIconsInCompose); + } + + @Override + + public boolean statusBarUiThread() { + return getValue(Flags.FLAG_STATUS_BAR_UI_THREAD, + FeatureFlags::statusBarUiThread); + } + + @Override + + public boolean statusBarUniversalBatteryDataSource() { + return getValue(Flags.FLAG_STATUS_BAR_UNIVERSAL_BATTERY_DATA_SOURCE, + FeatureFlags::statusBarUniversalBatteryDataSource); + } + + @Override + + public boolean stuckHearingDevicesQsTileFix() { + return getValue(Flags.FLAG_STUCK_HEARING_DEVICES_QS_TILE_FIX, + FeatureFlags::stuckHearingDevicesQsTileFix); } @Override + public boolean switchUserOnBg() { return getValue(Flags.FLAG_SWITCH_USER_ON_BG, - FeatureFlags::switchUserOnBg); + FeatureFlags::switchUserOnBg); + } + + @Override + + public boolean sysuiIntrinsicLockDispatcher() { + return getValue(Flags.FLAG_SYSUI_INTRINSIC_LOCK_DISPATCHER, + FeatureFlags::sysuiIntrinsicLockDispatcher); } @Override + public boolean sysuiTeamfood() { return getValue(Flags.FLAG_SYSUI_TEAMFOOD, - FeatureFlags::sysuiTeamfood); + FeatureFlags::sysuiTeamfood); } @Override + public boolean themeOverlayControllerWakefulnessDeprecation() { return getValue(Flags.FLAG_THEME_OVERLAY_CONTROLLER_WAKEFULNESS_DEPRECATION, - FeatureFlags::themeOverlayControllerWakefulnessDeprecation); + FeatureFlags::themeOverlayControllerWakefulnessDeprecation); } @Override - public boolean translucentOccludingActivityFix() { - return getValue(Flags.FLAG_TRANSLUCENT_OCCLUDING_ACTIVITY_FIX, - FeatureFlags::translucentOccludingActivityFix); - } - @Override - public boolean truncatedStatusBarIconsFix() { - return getValue(Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX, - FeatureFlags::truncatedStatusBarIconsFix); + public boolean thinScreenRecordingService() { + return getValue(Flags.FLAG_THIN_SCREEN_RECORDING_SERVICE, + FeatureFlags::thinScreenRecordingService); } @Override - public boolean udfpsViewPerformance() { - return getValue(Flags.FLAG_UDFPS_VIEW_PERFORMANCE, - FeatureFlags::udfpsViewPerformance); - } - @Override public boolean unfoldAnimationBackgroundProgress() { return getValue(Flags.FLAG_UNFOLD_ANIMATION_BACKGROUND_PROGRESS, - FeatureFlags::unfoldAnimationBackgroundProgress); + FeatureFlags::unfoldAnimationBackgroundProgress); + } + + @Override + + public boolean updateKeyguardOnWakeAndUnlockEarlier() { + return getValue(Flags.FLAG_UPDATE_KEYGUARD_ON_WAKE_AND_UNLOCK_EARLIER, + FeatureFlags::updateKeyguardOnWakeAndUnlockEarlier); } @Override + public boolean updateUserSwitcherBackground() { return getValue(Flags.FLAG_UPDATE_USER_SWITCHER_BACKGROUND, - FeatureFlags::updateUserSwitcherBackground); + FeatureFlags::updateUserSwitcherBackground); + } + + @Override + + public boolean updateWindowMagnifierBottomBoundaryWithMouse() { + return getValue(Flags.FLAG_UPDATE_WINDOW_MAGNIFIER_BOTTOM_BOUNDARY_WITH_MOUSE, + FeatureFlags::updateWindowMagnifierBottomBoundaryWithMouse); + } + + @Override + + public boolean useAadProxSensorIfPresent() { + return getValue(Flags.FLAG_USE_AAD_PROX_SENSOR_IF_PRESENT, + FeatureFlags::useAadProxSensorIfPresent); + } + + @Override + + public boolean userEncryptedSource() { + return getValue(Flags.FLAG_USER_ENCRYPTED_SOURCE, + FeatureFlags::userEncryptedSource); } @Override - public boolean validateKeyboardShortcutHelperIconUri() { - return getValue(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI, - FeatureFlags::validateKeyboardShortcutHelperIconUri); + + public boolean userSwitcherAddSignOutOption() { + return getValue(Flags.FLAG_USER_SWITCHER_ADD_SIGN_OUT_OPTION, + FeatureFlags::userSwitcherAddSignOutOption); } @Override + public boolean visualInterruptionsRefactor() { return getValue(Flags.FLAG_VISUAL_INTERRUPTIONS_REFACTOR, - FeatureFlags::visualInterruptionsRefactor); + FeatureFlags::visualInterruptionsRefactor); + } + + @Override + + public boolean volumeRedesign() { + return getValue(Flags.FLAG_VOLUME_REDESIGN, + FeatureFlags::volumeRedesign); + } + + @Override + + public boolean windowMagnificationMoveWithMouseOnEdge() { + return getValue(Flags.FLAG_WINDOW_MAGNIFICATION_MOVE_WITH_MOUSE_ON_EDGE, + FeatureFlags::windowMagnificationMoveWithMouseOnEdge); } public boolean isFlagReadOnlyOptimized(String flagName) { if (mReadOnlyFlagsSet.contains(flagName) && - isOptimizationEnabled()) { - return true; + isOptimizationEnabled()) { + return true; } return false; } + private boolean isOptimizationEnabled() { return false; } @@ -946,163 +1980,568 @@ protected boolean getValue(String flagName, Predicate getter) { public List getFlagNames() { return Arrays.asList( - Flags.FLAG_ACTIVITY_TRANSITION_USE_LARGEST_WINDOW, - Flags.FLAG_AMBIENT_TOUCH_MONITOR_LISTEN_TO_DISPLAY_CHANGES, - Flags.FLAG_APP_CLIPS_BACKLINKS, - Flags.FLAG_BIND_KEYGUARD_MEDIA_VISIBILITY, - Flags.FLAG_BP_TALKBACK, - Flags.FLAG_BRIGHTNESS_SLIDER_FOCUS_STATE, - Flags.FLAG_CENTRALIZED_STATUS_BAR_HEIGHT_FIX, - Flags.FLAG_CLIPBOARD_NONINTERACTIVE_ON_LOCKSCREEN, - Flags.FLAG_CLOCK_REACTIVE_VARIANTS, - Flags.FLAG_COMMUNAL_BOUNCER_DO_NOT_MODIFY_PLUGIN_OPEN, - Flags.FLAG_COMMUNAL_HUB, - Flags.FLAG_COMPOSE_BOUNCER, - Flags.FLAG_COMPOSE_LOCKSCREEN, - Flags.FLAG_CONFINE_NOTIFICATION_TOUCH_TO_VIEW_WIDTH, - Flags.FLAG_CONSTRAINT_BP, - Flags.FLAG_CONTEXTUAL_TIPS_ASSISTANT_DISMISS_FIX, - Flags.FLAG_COROUTINE_TRACING, - Flags.FLAG_CREATE_WINDOWLESS_WINDOW_MAGNIFIER, - Flags.FLAG_DEDICATED_NOTIF_INFLATION_THREAD, - Flags.FLAG_DELAY_SHOW_MAGNIFICATION_BUTTON, - Flags.FLAG_DELAYED_WAKELOCK_RELEASE_ON_BACKGROUND_THREAD, - Flags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR, - Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_FREQUENCY_CHECK, - Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_IOS_SWITCHER_CHECK, - Flags.FLAG_DOZEUI_SCHEDULING_ALARMS_BACKGROUND_EXECUTION, - Flags.FLAG_DREAM_INPUT_SESSION_PILFER_ONCE, - Flags.FLAG_DREAM_OVERLAY_BOUNCER_SWIPE_DIRECTION_FILTERING, - Flags.FLAG_DUAL_SHADE, - Flags.FLAG_EDGE_BACK_GESTURE_HANDLER_THREAD, - Flags.FLAG_EDGEBACK_GESTURE_HANDLER_GET_RUNNING_TASKS_BACKGROUND, - Flags.FLAG_ENABLE_BACKGROUND_KEYGUARD_ONDRAWN_CALLBACK, - Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_MUTE_VOLUME, - Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_POWER_OFF, - Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_TAKE_SCREENSHOT, - Flags.FLAG_ENABLE_CONTEXTUAL_TIPS, - Flags.FLAG_ENABLE_EFFICIENT_DISPLAY_REPOSITORY, - Flags.FLAG_ENABLE_LAYOUT_TRACING, - Flags.FLAG_ENABLE_VIEW_CAPTURE_TRACING, - Flags.FLAG_ENABLE_WIDGET_PICKER_SIZE_FILTER, - Flags.FLAG_ENFORCE_BRIGHTNESS_BASE_USER_RESTRICTION, - Flags.FLAG_EXAMPLE_FLAG, - Flags.FLAG_FAST_UNLOCK_TRANSITION, - Flags.FLAG_FIX_IMAGE_WALLPAPER_CRASH_SURFACE_ALREADY_RELEASED, - Flags.FLAG_FIX_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS, - Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK, - Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT, - Flags.FLAG_FLOATING_MENU_DRAG_TO_HIDE, - Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION, - Flags.FLAG_FLOATING_MENU_NARROW_TARGET_CONTENT_OBSERVER, - Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG, - Flags.FLAG_FLOATING_MENU_RADII_ANIMATION, - Flags.FLAG_GET_CONNECTED_DEVICE_NAME_UNSYNCHRONIZED, - Flags.FLAG_GLANCEABLE_HUB_ALLOW_KEYGUARD_WHEN_DREAMING, - Flags.FLAG_GLANCEABLE_HUB_FULLSCREEN_SWIPE, - Flags.FLAG_GLANCEABLE_HUB_GESTURE_HANDLE, - Flags.FLAG_GLANCEABLE_HUB_SHORTCUT_BUTTON, - Flags.FLAG_HAPTIC_BRIGHTNESS_SLIDER, - Flags.FLAG_HAPTIC_VOLUME_SLIDER, - Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG, - Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS, - Flags.FLAG_KEYBOARD_DOCKING_INDICATOR, - Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE, - Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, - Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR, - Flags.FLAG_LIGHT_REVEAL_MIGRATION, - Flags.FLAG_MEDIA_CONTROLS_LOCKSCREEN_SHADE_BUG_FIX, - Flags.FLAG_MEDIA_CONTROLS_REFACTOR, - Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT, - Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, - Flags.FLAG_NEW_AOD_TRANSITION, - Flags.FLAG_NEW_TOUCHPAD_GESTURES_TUTORIAL, - Flags.FLAG_NEW_VOLUME_PANEL, - Flags.FLAG_NOTIFICATION_ASYNC_GROUP_HEADER_INFLATION, - Flags.FLAG_NOTIFICATION_ASYNC_HYBRID_VIEW_INFLATION, - Flags.FLAG_NOTIFICATION_AVALANCHE_SUPPRESSION, - Flags.FLAG_NOTIFICATION_AVALANCHE_THROTTLE_HUN, - Flags.FLAG_NOTIFICATION_BACKGROUND_TINT_OPTIMIZATION, - Flags.FLAG_NOTIFICATION_COLOR_UPDATE_LOGGER, - Flags.FLAG_NOTIFICATION_CONTENT_ALPHA_OPTIMIZATION, - Flags.FLAG_NOTIFICATION_FOOTER_BACKGROUND_TINT_OPTIMIZATION, - Flags.FLAG_NOTIFICATION_MEDIA_MANAGER_BACKGROUND_EXECUTION, - Flags.FLAG_NOTIFICATION_MINIMALISM_PROTOTYPE, - Flags.FLAG_NOTIFICATION_OVER_EXPANSION_CLIPPING_FIX, - Flags.FLAG_NOTIFICATION_PULSING_FIX, - Flags.FLAG_NOTIFICATION_ROW_CONTENT_BINDER_REFACTOR, - Flags.FLAG_NOTIFICATION_ROW_USER_CONTEXT, - Flags.FLAG_NOTIFICATION_VIEW_FLIPPER_PAUSING_V2, - Flags.FLAG_NOTIFICATIONS_BACKGROUND_ICONS, - Flags.FLAG_NOTIFICATIONS_FOOTER_VIEW_REFACTOR, - Flags.FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR, - Flags.FLAG_NOTIFICATIONS_HIDE_ON_DISPLAY_SWITCH, - Flags.FLAG_NOTIFICATIONS_ICON_CONTAINER_REFACTOR, - Flags.FLAG_NOTIFICATIONS_IMPROVED_HUN_ANIMATION, - Flags.FLAG_NOTIFICATIONS_LIVE_DATA_STORE_REFACTOR, - Flags.FLAG_NOTIFY_POWER_MANAGER_USER_ACTIVITY_BACKGROUND, - Flags.FLAG_PIN_INPUT_FIELD_STYLED_FOCUS_STATE, - Flags.FLAG_PREDICTIVE_BACK_ANIMATE_BOUNCER, - Flags.FLAG_PREDICTIVE_BACK_ANIMATE_DIALOGS, - Flags.FLAG_PREDICTIVE_BACK_ANIMATE_SHADE, - Flags.FLAG_PREDICTIVE_BACK_SYSUI, - Flags.FLAG_PRIORITY_PEOPLE_SECTION, - Flags.FLAG_PRIVACY_DOT_UNFOLD_WRONG_CORNER_FIX, - Flags.FLAG_PSS_APP_SELECTOR_ABRUPT_EXIT_FIX, - Flags.FLAG_PSS_APP_SELECTOR_RECENTS_SPLIT_SCREEN, - Flags.FLAG_PSS_TASK_SWITCHER, - Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX, - Flags.FLAG_QS_NEW_PIPELINE, - Flags.FLAG_QS_NEW_TILES, - Flags.FLAG_QS_NEW_TILES_FUTURE, - Flags.FLAG_QS_TILE_FOCUS_STATE, - Flags.FLAG_QS_UI_REFACTOR, - Flags.FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS, - Flags.FLAG_RECORD_ISSUE_QS_TILE, - Flags.FLAG_REFACTOR_GET_CURRENT_USER, - Flags.FLAG_REGISTER_BATTERY_CONTROLLER_RECEIVERS_IN_CORESTARTABLE, - Flags.FLAG_REGISTER_NEW_WALLET_CARD_IN_BACKGROUND, - Flags.FLAG_REGISTER_WALLPAPER_NOTIFIER_BACKGROUND, - Flags.FLAG_REGISTER_ZEN_MODE_CONTENT_OBSERVER_BACKGROUND, - Flags.FLAG_REMOVE_DREAM_OVERLAY_HIDE_ON_TOUCH, - Flags.FLAG_REST_TO_UNLOCK, - Flags.FLAG_RESTART_DREAM_ON_UNOCCLUDE, - Flags.FLAG_REVAMPED_BOUNCER_MESSAGES, - Flags.FLAG_RUN_FINGERPRINT_DETECT_ON_DISMISSIBLE_KEYGUARD, - Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS, - Flags.FLAG_SCENE_CONTAINER, - Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX, - Flags.FLAG_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS, - Flags.FLAG_SCREENSHOT_PRIVATE_PROFILE_ACCESSIBILITY_ANNOUNCEMENT_FIX, - Flags.FLAG_SCREENSHOT_PRIVATE_PROFILE_BEHAVIOR_FIX, - Flags.FLAG_SCREENSHOT_SCROLL_CROP_VIEW_CRASH_FIX, - Flags.FLAG_SCREENSHOT_SHELF_UI2, - Flags.FLAG_SHADE_COLLAPSE_ACTIVITY_LAUNCH_FIX, - Flags.FLAG_SHADERLIB_LOADING_EFFECT_REFACTOR, - Flags.FLAG_SLICE_BROADCAST_RELAY_IN_BACKGROUND, - Flags.FLAG_SLICE_MANAGER_BINDER_CALL_BACKGROUND, - Flags.FLAG_SMARTSPACE_LOCKSCREEN_VIEWMODEL, - Flags.FLAG_SMARTSPACE_RELOCATE_TO_BOTTOM, - Flags.FLAG_SMARTSPACE_REMOTEVIEWS_RENDERING, - Flags.FLAG_STATUS_BAR_MONOCHROME_ICONS_FIX, - Flags.FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, - Flags.FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS, - Flags.FLAG_SWITCH_USER_ON_BG, - Flags.FLAG_SYSUI_TEAMFOOD, - Flags.FLAG_THEME_OVERLAY_CONTROLLER_WAKEFULNESS_DEPRECATION, - Flags.FLAG_TRANSLUCENT_OCCLUDING_ACTIVITY_FIX, - Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX, - Flags.FLAG_UDFPS_VIEW_PERFORMANCE, - Flags.FLAG_UNFOLD_ANIMATION_BACKGROUND_PROGRESS, - Flags.FLAG_UPDATE_USER_SWITCHER_BACKGROUND, - Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI, - Flags.FLAG_VISUAL_INTERRUPTIONS_REFACTOR + Flags.FLAG_ACTIVITY_TRANSITION_USE_LARGEST_WINDOW, + Flags.FLAG_ALLOW_DOZE_TOUCHES_FOR_LOCK_ICON, + Flags.FLAG_AMBIENT_CUE_PLUGIN, + Flags.FLAG_AMBIENT_TOUCH_MONITOR_LISTEN_TO_DISPLAY_CHANGES, + Flags.FLAG_ANIMATION_LIBRARY_SHELL_MIGRATION, + Flags.FLAG_APP_CLIPS_BACKLINKS, + Flags.FLAG_AVALANCHE_REPLACE_HUN_WHEN_CRITICAL, + Flags.FLAG_BACK_BUTTON_ON_BOUNCER, + Flags.FLAG_BLOCK_MOUSE_EDGE_BACK_GESTURE, + Flags.FLAG_BLUR_ON_MORE_SURFACES, + Flags.FLAG_BLUR_SETTINGS_TOGGLE, + Flags.FLAG_BOUNCER_UI_REVAMP, + Flags.FLAG_BOUNCER_UI_REVAMP_2, + Flags.FLAG_BP_COLORS, + Flags.FLAG_BRIGHTNESS_SLIDER_FOCUS_STATE, + Flags.FLAG_CAPTIONS_TOGGLE_IN_VOLUME_DIALOG_V1, + Flags.FLAG_CHECK_DESKTOP_MODE_FOR_SPACIAL_MODEL_APP_PUSHBACK, + Flags.FLAG_CLASSIC_FLAGS_MULTI_USER, + Flags.FLAG_CLEANUP_INSTANCES_WHEN_DISPLAY_REMOVED, + Flags.FLAG_CLEAR_SHORTCUT_ICON_TINT, + Flags.FLAG_CLIPBOARD_OVERLAY_MULTIUSER, + Flags.FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE, + Flags.FLAG_CLOCK_FIDGET_ANIMATION, + Flags.FLAG_CLOCK_MODERNIZATION, + Flags.FLAG_COMMUNAL_BOUNCER_DO_NOT_MODIFY_PLUGIN_OPEN, + Flags.FLAG_COMMUNAL_EDIT_WIDGETS_ACTIVITY_FINISH_FIX, + Flags.FLAG_COMMUNAL_HUB, + Flags.FLAG_COMMUNAL_HUB_USE_THREAD_POOL_FOR_WIDGETS, + Flags.FLAG_COMMUNAL_POWER_TRANSITION_FIX, + Flags.FLAG_COMMUNAL_RESPONSIVE_GRID, + Flags.FLAG_COMMUNAL_SHADE_TOUCH_HANDLING_FIXES, + Flags.FLAG_COMMUNAL_STANDALONE_SUPPORT, + Flags.FLAG_COMMUNAL_TIMER_FLICKER_FIX, + Flags.FLAG_COMMUNAL_WIDGET_RESIZING, + Flags.FLAG_COMMUNAL_WIDGET_TRAMPOLINE_FIX, + Flags.FLAG_COMPOSE_BOUNCER, + Flags.FLAG_CONFINE_NOTIFICATION_TOUCH_TO_VIEW_WIDTH, + Flags.FLAG_CONT_AUTH_PLUGIN, + Flags.FLAG_COROUTINE_TRACING, + Flags.FLAG_DECOUPLE_VIEW_CONTROLLER_IN_ANIMLIB, + Flags.FLAG_DEFER_DOZE_TRANSITION_ON_SHADE_DRAG, + Flags.FLAG_DESKTOP_AV_CONTROLS_POPUP, + Flags.FLAG_DESKTOP_EFFECTS_QS_TILE, + Flags.FLAG_DESKTOP_SIZING, + Flags.FLAG_DIALOG_ANIM_END_STATE_UPDATE, + Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_FREQUENCY_CHECK, + Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_IOS_SWITCHER_CHECK, + Flags.FLAG_DISABLE_DOUBLE_CLICK_SWAP_ON_BOUNCER, + Flags.FLAG_DISABLE_USER_SWITCHER_DROPDOWN_ON_BOUNCER, + Flags.FLAG_DO_NOT_USE_IMMEDIATE_COROUTINE_DISPATCHER, + Flags.FLAG_DO_NOT_USE_RUN_BLOCKING, + Flags.FLAG_DOUBLE_TAP_TO_SLEEP, + Flags.FLAG_DREAM_BIOMETRIC_PROMPT_FIXES, + Flags.FLAG_DREAM_BOUNCER_TRANSITION_FIX, + Flags.FLAG_DREAM_INPUT_SESSION_PILFER_ONCE, + Flags.FLAG_DREAM_OVERLAY_BOUNCER_SWIPE_DIRECTION_FILTERING, + Flags.FLAG_DREAM_OVERLAY_UPDATED_UI, + Flags.FLAG_DREAM_SUPPRESSION, + Flags.FLAG_EDGE_BACK_GESTURE_HANDLER_THREAD, + Flags.FLAG_EDGEBACK_GESTURE_HANDLER_GET_RUNNING_TASKS_BACKGROUND, + Flags.FLAG_ENABLE_BACKGROUND_KEYGUARD_ONDRAWN_CALLBACK, + Flags.FLAG_ENABLE_CONSTRAINT_LAYOUT_LOCKSCREEN_ON_EXTERNAL_DISPLAY, + Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_MUTE_VOLUME, + Flags.FLAG_ENABLE_CUE_BAR_ANIMATED_ICON, + Flags.FLAG_ENABLE_DESKTOP_GROWTH, + Flags.FLAG_ENABLE_EFFICIENT_DISPLAY_REPOSITORY, + Flags.FLAG_ENABLE_LAYOUT_TRACING, + Flags.FLAG_ENABLE_MINMODE, + Flags.FLAG_ENABLE_OUTPUT_SWITCHER_AUDIO_SHARING_BUTTON, + Flags.FLAG_ENABLE_SUGGESTED_DEVICE_UI, + Flags.FLAG_ENABLE_UNDERLAY, + Flags.FLAG_ENABLE_VIEW_CAPTURE_TRACING, + Flags.FLAG_EXAMPLE_FLAG, + Flags.FLAG_EXPAND_COLLAPSE_PRIVACY_DIALOG, + Flags.FLAG_EXPAND_HEADS_UP_ON_INLINE_REPLY, + Flags.FLAG_EXPANDABLE_USE_MODIFIER_IMPLEMENTATION, + Flags.FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN, + Flags.FLAG_EXTENDED_APPS_SHORTCUT_CATEGORY, + Flags.FLAG_FACE_SCANNING_ANIMATION_NPE_FIX, + Flags.FLAG_FETCH_BOOKMARKS_XML_KEYBOARD_SHORTCUTS, + Flags.FLAG_FIX_SHADE_HEADER_WRONG_ICON_SIZE, + Flags.FLAG_FLASHLIGHT_STRENGTH, + Flags.FLAG_FLOATING_MENU_DRAG_TO_HIDE, + Flags.FLAG_FLOATING_MENU_HEARING_DEVICE_STATUS_ICON, + Flags.FLAG_FLOATING_MENU_RADII_ANIMATION, + Flags.FLAG_GESTURE_BETWEEN_HUB_AND_LOCKSCREEN_MOTION, + Flags.FLAG_GET_CONNECTED_DEVICE_NAME_UNSYNCHRONIZED, + Flags.FLAG_GLANCEABLE_HUB_ALLOW_KEYGUARD_WHEN_DREAMING, + Flags.FLAG_GLANCEABLE_HUB_BLURRED_BACKGROUND, + Flags.FLAG_GLANCEABLE_HUB_DIRECT_EDIT_MODE, + Flags.FLAG_GLANCEABLE_HUB_ENABLED_BY_DEFAULT, + Flags.FLAG_GLANCEABLE_HUB_V2, + Flags.FLAG_GLANCEABLE_HUB_V2_RESOURCES, + Flags.FLAG_GLOBAL_ACTIONS_EMPHASIZED_FONT, + Flags.FLAG_HARDWARE_COLOR_STYLES, + Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG, + Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS, + Flags.FLAG_HIDE_RINGER_BUTTON_IN_SINGLE_VOLUME_MODE, + Flags.FLAG_HOME_CONTROLS_DREAM_HSUM, + Flags.FLAG_HSU_QS_CHANGES, + Flags.FLAG_HUB_BLURRED_BY_SHADE_FIX, + Flags.FLAG_HUB_EDIT_MODE_TOUCH_ADJUSTMENTS, + Flags.FLAG_HUB_EDIT_MODE_TRANSITION, + Flags.FLAG_ICON_REFRESH_2025, + Flags.FLAG_INDICATION_TEXT_A11Y_FIX, + Flags.FLAG_KEYBOARD_DOCKING_INDICATOR, + Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE, + Flags.FLAG_KEYBOARD_TOUCHPAD_CONTEXTUAL_EDUCATION, + Flags.FLAG_KEYGUARD_TRANSITION_FORCE_FINISH_ON_SCREEN_OFF, + Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR, + Flags.FLAG_LARGE_SCREEN_RECORDING, + Flags.FLAG_LARGE_SCREEN_SCREENCAPTURE, + Flags.FLAG_LARGE_SCREEN_SCREENSHOT_APP_WINDOW, + Flags.FLAG_LARGE_SCREEN_SHARING, + Flags.FLAG_LOCKSCREEN_SHADE_TO_DREAM_TRANSITION_FIX, + Flags.FLAG_LOW_LIGHT_CLOCK_DREAM, + Flags.FLAG_LOWLIGHT_CLOCK_SET_BRIGHTNESS, + Flags.FLAG_LOWLIGHT_CLOCK_USES_KEYGUARD_CHARGING_STATUS, + Flags.FLAG_MAGNETIC_NOTIFICATION_SWIPES, + Flags.FLAG_MEDIA_CAROUSEL_ARROWS, + Flags.FLAG_MEDIA_CONTROLS_BUTTON_MEDIA3, + Flags.FLAG_MEDIA_CONTROLS_BUTTON_MEDIA3_PLACEMENT, + Flags.FLAG_MEDIA_CONTROLS_IN_COMPOSE, + Flags.FLAG_MEDIA_CONTROLS_TRANSLATION_FIX, + Flags.FLAG_MEDIA_FRAME_DIMENSIONS_FIX, + Flags.FLAG_MEDIA_PROJECTION_DIALOG_BEHIND_LOCKSCREEN, + Flags.FLAG_MEDIA_PROJECTION_GREY_ERROR_TEXT, + Flags.FLAG_MODES_UI_DIALOG_PAGING, + Flags.FLAG_MOVE_TRANSITION_ANIMATION_LAYER, + Flags.FLAG_MSDL_FEEDBACK, + Flags.FLAG_MULTIUSER_OPEN_USER_SWITCHER_DIALOG, + Flags.FLAG_MULTIUSER_WIFI_PICKER_TRACKER_SUPPORT, + Flags.FLAG_NEW_AOD_TRANSITION, + Flags.FLAG_NEW_DOZING_KEYGUARD_STATES, + Flags.FLAG_NEW_SCREEN_RECORD_TOOLBAR, + Flags.FLAG_NEW_VOLUME_PANEL, + Flags.FLAG_NO_EXPANSION_ON_OVERSCROLL, + Flags.FLAG_NO_SHADE_BLUR_ON_DREAM_START, + Flags.FLAG_NON_TOUCHSCREEN_DEVICES_BYPASS_FALSING, + Flags.FLAG_NOTES_ROLE_QS_TILE, + Flags.FLAG_NOTIFICATION_ADD_X_ON_HOVER_TO_DISMISS, + Flags.FLAG_NOTIFICATION_AMBIENT_SUPPRESSION_AFTER_INFLATION, + Flags.FLAG_NOTIFICATION_ANIMATED_ACTIONS_TREATMENT, + Flags.FLAG_NOTIFICATION_APPEAR_NONLINEAR, + Flags.FLAG_NOTIFICATION_ASYNC_GROUP_HEADER_INFLATION, + Flags.FLAG_NOTIFICATION_AVALANCHE_SUPPRESSION, + Flags.FLAG_NOTIFICATION_AVALANCHE_THROTTLE_HUN, + Flags.FLAG_NOTIFICATION_BACKGROUND_TINT_OPTIMIZATION, + Flags.FLAG_NOTIFICATION_BUNDLE_UI, + Flags.FLAG_NOTIFICATION_CHILDREN_CONTAINER_MIN_HEIGHT, + Flags.FLAG_NOTIFICATION_COLOR_UPDATE_LOGGER, + Flags.FLAG_NOTIFICATION_FIX_HUN_SHADOWS, + Flags.FLAG_NOTIFICATION_FOOTER_BACKGROUND_TINT_OPTIMIZATION, + Flags.FLAG_NOTIFICATION_ROW_IS_REMOVED_FIX, + Flags.FLAG_NOTIFICATION_ROW_TRANSPARENCY, + Flags.FLAG_NOTIFICATION_SHADE_BLUR, + Flags.FLAG_NOTIFICATION_SHADE_UI_THREAD, + Flags.FLAG_NOTIFICATION_SKIP_SILENT_UPDATES, + Flags.FLAG_NOTIFICATION_TRANSPARENT_HEADER_FIX, + Flags.FLAG_NOTIFICATIONS_HIDE_ON_DISPLAY_SWITCH, + Flags.FLAG_NOTIFICATIONS_ICON_CONTAINER_REFACTOR, + Flags.FLAG_NOTIFICATIONS_REDESIGN_FOOTER_VIEW, + Flags.FLAG_ONGOING_ACTIVITY_CHIPS_ON_DREAM, + Flags.FLAG_OVERRIDE_SUPPRESS_OVERLAY_CONDITION, + Flags.FLAG_PERMISSION_HELPER_INLINE_UI_RICH_ONGOING, + Flags.FLAG_PERMISSION_HELPER_UI_RICH_ONGOING, + Flags.FLAG_PHYSICAL_NOTIFICATION_MOVEMENT, + Flags.FLAG_PIN_INPUT_FIELD_STYLED_FOCUS_STATE, + Flags.FLAG_PREDICTIVE_BACK_ANIMATE_SHADE, + Flags.FLAG_PRIVACY_DOT_LIVE_REGION, + Flags.FLAG_PROMOTE_NOTIFICATIONS_AUTOMATICALLY, + Flags.FLAG_PSS_TASK_SWITCHER, + Flags.FLAG_QS_COMPOSE_FRAGMENT_EARLY_EXPANSION, + Flags.FLAG_QS_EDIT_MODE_TOOLTIP, + Flags.FLAG_QS_EDIT_MODE_V2, + Flags.FLAG_QS_MATERIAL_EXPRESSIVE_TILES, + Flags.FLAG_QS_NEW_TILES, + Flags.FLAG_QS_NEW_TILES_FUTURE, + Flags.FLAG_QS_SPLIT_INTERNET_TILE, + Flags.FLAG_QS_TILE_DETAILED_VIEW, + Flags.FLAG_QS_TILE_FOCUS_STATE, + Flags.FLAG_QS_TILE_TRANSITION_INTERACTION_REFINEMENT, + Flags.FLAG_QS_UI_REFACTOR_COMPOSE_FRAGMENT, + Flags.FLAG_QS_WIFI_CONFIG, + Flags.FLAG_RECORD_ISSUE_QS_TILE, + Flags.FLAG_REDESIGN_MAGNIFICATION_WINDOW_SIZE, + Flags.FLAG_REGISTER_WALLPAPER_NOTIFIER_BACKGROUND, + Flags.FLAG_REMOVE_DREAM_OVERLAY_HIDE_ON_TOUCH, + Flags.FLAG_REMOVE_NEARBY_SHARE_TILE_ANIMATION, + Flags.FLAG_REMOVE_UPDATE_LISTENER_IN_QS_ICON_VIEW_IMPL, + Flags.FLAG_RESET_TILES_REMOVES_CUSTOM_TILES, + Flags.FLAG_REST_TO_UNLOCK, + Flags.FLAG_RESTART_DREAM_ON_UNOCCLUDE, + Flags.FLAG_RESTORE_SHOW_TAPS_SETTING, + Flags.FLAG_RESTRICT_COMMUNAL_APP_WIDGET_HOST_LISTENING, + Flags.FLAG_RESTRICT_COMMUNAL_SHADE_TO_WHEN_IDLE, + Flags.FLAG_REVAMPED_BOUNCER_MESSAGES, + Flags.FLAG_RUN_FINGERPRINT_DETECT_ON_DISMISSIBLE_KEYGUARD, + Flags.FLAG_SCENE_CONTAINER, + Flags.FLAG_SCREEN_OFF_ANIMATION_GUARD_ENABLED, + Flags.FLAG_SCREEN_REACTIONS, + Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX, + Flags.FLAG_SCREENSHOT_ANNOUNCE_LIVE_REGION, + Flags.FLAG_SCREENSHOT_DISMISSAL_SPRING, + Flags.FLAG_SCREENSHOT_FORCE_SHUTTER_SOUND, + Flags.FLAG_SCREENSHOT_MULTIDISPLAY_FOCUS_CHANGE, + Flags.FLAG_SCREENSHOT_POLICY_SPLIT_AND_DESKTOP_MODE, + Flags.FLAG_SCREENSHOT_SCROLL_CROP_VIEW_CRASH_FIX, + Flags.FLAG_SCRIM_FIX, + Flags.FLAG_SECONDARY_USER_WIDGET_HOST, + Flags.FLAG_SETTINGS_EXT_REGISTER_CONTENT_OBSERVER_ON_BG_THREAD, + Flags.FLAG_SHADE_APP_LAUNCH_ANIMATION_SKIP_IN_DESKTOP, + Flags.FLAG_SHADE_EXPANDS_ON_STATUS_BAR_LONG_PRESS, + Flags.FLAG_SHADE_HEADER_BLUR_FONT_COLOR, + Flags.FLAG_SHADE_HEADER_FONT_UPDATE, + Flags.FLAG_SHADE_QSVISIBLE_LOGIC, + Flags.FLAG_SHADE_WINDOW_GOES_AROUND, + Flags.FLAG_SHADERLIB_LOADING_EFFECT_REFACTOR, + Flags.FLAG_SHORTCUT_HELPER_KEY_GLYPH, + Flags.FLAG_SHORTCUT_HELPER_MULTI_DISPLAY_SUPPORT, + Flags.FLAG_SHOW_AUDIO_SHARING_SLIDER_IN_VOLUME_PANEL, + Flags.FLAG_SHOW_CLIPBOARD_INDICATION, + Flags.FLAG_SHOW_ICON_IN_EMPTY_SHADE, + Flags.FLAG_SHOW_LOCKED_BY_YOUR_WATCH_KEYGUARD_INDICATOR, + Flags.FLAG_SIGN_OUT_BUTTON_ON_KEYGUARD_STATUS_BAR, + Flags.FLAG_SIM_PIN_BOUNCER_RESET, + Flags.FLAG_SLICE_MANAGER_BINDER_CALL_BACKGROUND, + Flags.FLAG_SMARTSPACE_RELOCATE_TO_BOTTOM, + Flags.FLAG_SMARTSPACE_SWIPE_EVENT_LOGGING_FIX, + Flags.FLAG_SMARTSPACE_VIEWPAGER2, + Flags.FLAG_SOUNDDOSE_CUSTOMIZATION, + Flags.FLAG_SPATIAL_MODEL_APP_PUSHBACK, + Flags.FLAG_SPATIAL_MODEL_BOUNCER_PUSHBACK, + Flags.FLAG_SPATIAL_MODEL_PUSHBACK_IN_SHADER, + Flags.FLAG_STABILIZE_HEADS_UP_GROUP_V2, + Flags.FLAG_STATUS_BAR_ALWAYS_CHECK_UNDERLYING_NETWORKS, + Flags.FLAG_STATUS_BAR_ALWAYS_SCHEDULE_AUTO_HIDE, + Flags.FLAG_STATUS_BAR_ALWAYS_USE_REGION_SAMPLING, + Flags.FLAG_STATUS_BAR_APP_HANDLE_TRACKING, + Flags.FLAG_STATUS_BAR_BATTERY_NO_CONFLATION, + Flags.FLAG_STATUS_BAR_CALL_CHIP_USE_IS_HIDDEN, + Flags.FLAG_STATUS_BAR_CHIP_TO_HUN_ANIMATION, + Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION, + Flags.FLAG_STATUS_BAR_CHIPS_RETURN_ANIMATIONS, + Flags.FLAG_STATUS_BAR_DARK_ICON_INTERACTOR_MIXED_FIX, + Flags.FLAG_STATUS_BAR_DATE, + Flags.FLAG_STATUS_BAR_FONT_UPDATES, + Flags.FLAG_STATUS_BAR_FOR_DESKTOP, + Flags.FLAG_STATUS_BAR_MOBILE_ICON_KAIROS, + Flags.FLAG_STATUS_BAR_NO_HUN_BEHAVIOR, + Flags.FLAG_STATUS_BAR_POPUP_CHIPS, + Flags.FLAG_STATUS_BAR_PRIVACY_CHIP_ANIMATION_EXEMPTION, + Flags.FLAG_STATUS_BAR_REGION_SAMPLING, + Flags.FLAG_STATUS_BAR_ROOT_MODERNIZATION, + Flags.FLAG_STATUS_BAR_RUDIMENTARY_BATTERY, + Flags.FLAG_STATUS_BAR_SHARE_DIALOG_WITH_APP_NAME, + Flags.FLAG_STATUS_BAR_SHOW_ICONS_IN_SECURE_CAMERA, + Flags.FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS, + Flags.FLAG_STATUS_BAR_SWITCH_TO_SPN_FROM_DATA_SPN, + Flags.FLAG_STATUS_BAR_SYSTEM_STATUS_ICONS_IN_COMPOSE, + Flags.FLAG_STATUS_BAR_UI_THREAD, + Flags.FLAG_STATUS_BAR_UNIVERSAL_BATTERY_DATA_SOURCE, + Flags.FLAG_STUCK_HEARING_DEVICES_QS_TILE_FIX, + Flags.FLAG_SWITCH_USER_ON_BG, + Flags.FLAG_SYSUI_INTRINSIC_LOCK_DISPATCHER, + Flags.FLAG_SYSUI_TEAMFOOD, + Flags.FLAG_THEME_OVERLAY_CONTROLLER_WAKEFULNESS_DEPRECATION, + Flags.FLAG_THIN_SCREEN_RECORDING_SERVICE, + Flags.FLAG_UNFOLD_ANIMATION_BACKGROUND_PROGRESS, + Flags.FLAG_UPDATE_KEYGUARD_ON_WAKE_AND_UNLOCK_EARLIER, + Flags.FLAG_UPDATE_USER_SWITCHER_BACKGROUND, + Flags.FLAG_UPDATE_WINDOW_MAGNIFIER_BOTTOM_BOUNDARY_WITH_MOUSE, + Flags.FLAG_USE_AAD_PROX_SENSOR_IF_PRESENT, + Flags.FLAG_USER_ENCRYPTED_SOURCE, + Flags.FLAG_USER_SWITCHER_ADD_SIGN_OUT_OPTION, + Flags.FLAG_VISUAL_INTERRUPTIONS_REFACTOR, + Flags.FLAG_VOLUME_REDESIGN, + Flags.FLAG_WINDOW_MAGNIFICATION_MOVE_WITH_MOUSE_ON_EDGE ); } private Set mReadOnlyFlagsSet = new HashSet<>( - Arrays.asList( - "" - ) + Arrays.asList( + Flags.FLAG_ACTIVITY_TRANSITION_USE_LARGEST_WINDOW, + Flags.FLAG_ALLOW_DOZE_TOUCHES_FOR_LOCK_ICON, + Flags.FLAG_AMBIENT_CUE_PLUGIN, + Flags.FLAG_AMBIENT_TOUCH_MONITOR_LISTEN_TO_DISPLAY_CHANGES, + Flags.FLAG_ANIMATION_LIBRARY_SHELL_MIGRATION, + Flags.FLAG_APP_CLIPS_BACKLINKS, + Flags.FLAG_AVALANCHE_REPLACE_HUN_WHEN_CRITICAL, + Flags.FLAG_BACK_BUTTON_ON_BOUNCER, + Flags.FLAG_BLOCK_MOUSE_EDGE_BACK_GESTURE, + Flags.FLAG_BLUR_ON_MORE_SURFACES, + Flags.FLAG_BLUR_SETTINGS_TOGGLE, + Flags.FLAG_BOUNCER_UI_REVAMP, + Flags.FLAG_BOUNCER_UI_REVAMP_2, + Flags.FLAG_BP_COLORS, + Flags.FLAG_BRIGHTNESS_SLIDER_FOCUS_STATE, + Flags.FLAG_CAPTIONS_TOGGLE_IN_VOLUME_DIALOG_V1, + Flags.FLAG_CHECK_DESKTOP_MODE_FOR_SPACIAL_MODEL_APP_PUSHBACK, + Flags.FLAG_CLASSIC_FLAGS_MULTI_USER, + Flags.FLAG_CLEANUP_INSTANCES_WHEN_DISPLAY_REMOVED, + Flags.FLAG_CLEAR_SHORTCUT_ICON_TINT, + Flags.FLAG_CLIPBOARD_OVERLAY_MULTIUSER, + Flags.FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE, + Flags.FLAG_CLOCK_FIDGET_ANIMATION, + Flags.FLAG_CLOCK_MODERNIZATION, + Flags.FLAG_COMMUNAL_BOUNCER_DO_NOT_MODIFY_PLUGIN_OPEN, + Flags.FLAG_COMMUNAL_EDIT_WIDGETS_ACTIVITY_FINISH_FIX, + Flags.FLAG_COMMUNAL_HUB, + Flags.FLAG_COMMUNAL_HUB_USE_THREAD_POOL_FOR_WIDGETS, + Flags.FLAG_COMMUNAL_POWER_TRANSITION_FIX, + Flags.FLAG_COMMUNAL_RESPONSIVE_GRID, + Flags.FLAG_COMMUNAL_SHADE_TOUCH_HANDLING_FIXES, + Flags.FLAG_COMMUNAL_STANDALONE_SUPPORT, + Flags.FLAG_COMMUNAL_TIMER_FLICKER_FIX, + Flags.FLAG_COMMUNAL_WIDGET_RESIZING, + Flags.FLAG_COMMUNAL_WIDGET_TRAMPOLINE_FIX, + Flags.FLAG_COMPOSE_BOUNCER, + Flags.FLAG_CONFINE_NOTIFICATION_TOUCH_TO_VIEW_WIDTH, + Flags.FLAG_CONT_AUTH_PLUGIN, + Flags.FLAG_COROUTINE_TRACING, + Flags.FLAG_DECOUPLE_VIEW_CONTROLLER_IN_ANIMLIB, + Flags.FLAG_DEFER_DOZE_TRANSITION_ON_SHADE_DRAG, + Flags.FLAG_DESKTOP_AV_CONTROLS_POPUP, + Flags.FLAG_DESKTOP_EFFECTS_QS_TILE, + Flags.FLAG_DESKTOP_SIZING, + Flags.FLAG_DIALOG_ANIM_END_STATE_UPDATE, + Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_FREQUENCY_CHECK, + Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_IOS_SWITCHER_CHECK, + Flags.FLAG_DISABLE_DOUBLE_CLICK_SWAP_ON_BOUNCER, + Flags.FLAG_DISABLE_USER_SWITCHER_DROPDOWN_ON_BOUNCER, + Flags.FLAG_DO_NOT_USE_IMMEDIATE_COROUTINE_DISPATCHER, + Flags.FLAG_DO_NOT_USE_RUN_BLOCKING, + Flags.FLAG_DOUBLE_TAP_TO_SLEEP, + Flags.FLAG_DREAM_BIOMETRIC_PROMPT_FIXES, + Flags.FLAG_DREAM_BOUNCER_TRANSITION_FIX, + Flags.FLAG_DREAM_INPUT_SESSION_PILFER_ONCE, + Flags.FLAG_DREAM_OVERLAY_BOUNCER_SWIPE_DIRECTION_FILTERING, + Flags.FLAG_DREAM_OVERLAY_UPDATED_UI, + Flags.FLAG_DREAM_SUPPRESSION, + Flags.FLAG_EDGE_BACK_GESTURE_HANDLER_THREAD, + Flags.FLAG_EDGEBACK_GESTURE_HANDLER_GET_RUNNING_TASKS_BACKGROUND, + Flags.FLAG_ENABLE_BACKGROUND_KEYGUARD_ONDRAWN_CALLBACK, + Flags.FLAG_ENABLE_CONSTRAINT_LAYOUT_LOCKSCREEN_ON_EXTERNAL_DISPLAY, + Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_MUTE_VOLUME, + Flags.FLAG_ENABLE_CUE_BAR_ANIMATED_ICON, + Flags.FLAG_ENABLE_DESKTOP_GROWTH, + Flags.FLAG_ENABLE_EFFICIENT_DISPLAY_REPOSITORY, + Flags.FLAG_ENABLE_LAYOUT_TRACING, + Flags.FLAG_ENABLE_MINMODE, + Flags.FLAG_ENABLE_OUTPUT_SWITCHER_AUDIO_SHARING_BUTTON, + Flags.FLAG_ENABLE_SUGGESTED_DEVICE_UI, + Flags.FLAG_ENABLE_UNDERLAY, + Flags.FLAG_ENABLE_VIEW_CAPTURE_TRACING, + Flags.FLAG_EXAMPLE_FLAG, + Flags.FLAG_EXPAND_COLLAPSE_PRIVACY_DIALOG, + Flags.FLAG_EXPAND_HEADS_UP_ON_INLINE_REPLY, + Flags.FLAG_EXPANDABLE_USE_MODIFIER_IMPLEMENTATION, + Flags.FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN, + Flags.FLAG_EXTENDED_APPS_SHORTCUT_CATEGORY, + Flags.FLAG_FACE_SCANNING_ANIMATION_NPE_FIX, + Flags.FLAG_FETCH_BOOKMARKS_XML_KEYBOARD_SHORTCUTS, + Flags.FLAG_FIX_SHADE_HEADER_WRONG_ICON_SIZE, + Flags.FLAG_FLASHLIGHT_STRENGTH, + Flags.FLAG_FLOATING_MENU_DRAG_TO_HIDE, + Flags.FLAG_FLOATING_MENU_HEARING_DEVICE_STATUS_ICON, + Flags.FLAG_FLOATING_MENU_RADII_ANIMATION, + Flags.FLAG_GESTURE_BETWEEN_HUB_AND_LOCKSCREEN_MOTION, + Flags.FLAG_GET_CONNECTED_DEVICE_NAME_UNSYNCHRONIZED, + Flags.FLAG_GLANCEABLE_HUB_ALLOW_KEYGUARD_WHEN_DREAMING, + Flags.FLAG_GLANCEABLE_HUB_BLURRED_BACKGROUND, + Flags.FLAG_GLANCEABLE_HUB_DIRECT_EDIT_MODE, + Flags.FLAG_GLANCEABLE_HUB_ENABLED_BY_DEFAULT, + Flags.FLAG_GLANCEABLE_HUB_V2, + Flags.FLAG_GLANCEABLE_HUB_V2_RESOURCES, + Flags.FLAG_GLOBAL_ACTIONS_EMPHASIZED_FONT, + Flags.FLAG_HARDWARE_COLOR_STYLES, + Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG, + Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS, + Flags.FLAG_HIDE_RINGER_BUTTON_IN_SINGLE_VOLUME_MODE, + Flags.FLAG_HOME_CONTROLS_DREAM_HSUM, + Flags.FLAG_HSU_QS_CHANGES, + Flags.FLAG_HUB_BLURRED_BY_SHADE_FIX, + Flags.FLAG_HUB_EDIT_MODE_TOUCH_ADJUSTMENTS, + Flags.FLAG_HUB_EDIT_MODE_TRANSITION, + Flags.FLAG_ICON_REFRESH_2025, + Flags.FLAG_INDICATION_TEXT_A11Y_FIX, + Flags.FLAG_KEYBOARD_DOCKING_INDICATOR, + Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE, + Flags.FLAG_KEYBOARD_TOUCHPAD_CONTEXTUAL_EDUCATION, + Flags.FLAG_KEYGUARD_TRANSITION_FORCE_FINISH_ON_SCREEN_OFF, + Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR, + Flags.FLAG_LARGE_SCREEN_RECORDING, + Flags.FLAG_LARGE_SCREEN_SCREENCAPTURE, + Flags.FLAG_LARGE_SCREEN_SCREENSHOT_APP_WINDOW, + Flags.FLAG_LARGE_SCREEN_SHARING, + Flags.FLAG_LOCKSCREEN_SHADE_TO_DREAM_TRANSITION_FIX, + Flags.FLAG_LOW_LIGHT_CLOCK_DREAM, + Flags.FLAG_LOWLIGHT_CLOCK_SET_BRIGHTNESS, + Flags.FLAG_LOWLIGHT_CLOCK_USES_KEYGUARD_CHARGING_STATUS, + Flags.FLAG_MAGNETIC_NOTIFICATION_SWIPES, + Flags.FLAG_MEDIA_CAROUSEL_ARROWS, + Flags.FLAG_MEDIA_CONTROLS_BUTTON_MEDIA3, + Flags.FLAG_MEDIA_CONTROLS_BUTTON_MEDIA3_PLACEMENT, + Flags.FLAG_MEDIA_CONTROLS_IN_COMPOSE, + Flags.FLAG_MEDIA_CONTROLS_TRANSLATION_FIX, + Flags.FLAG_MEDIA_FRAME_DIMENSIONS_FIX, + Flags.FLAG_MEDIA_PROJECTION_DIALOG_BEHIND_LOCKSCREEN, + Flags.FLAG_MEDIA_PROJECTION_GREY_ERROR_TEXT, + Flags.FLAG_MODES_UI_DIALOG_PAGING, + Flags.FLAG_MOVE_TRANSITION_ANIMATION_LAYER, + Flags.FLAG_MSDL_FEEDBACK, + Flags.FLAG_MULTIUSER_OPEN_USER_SWITCHER_DIALOG, + Flags.FLAG_MULTIUSER_WIFI_PICKER_TRACKER_SUPPORT, + Flags.FLAG_NEW_AOD_TRANSITION, + Flags.FLAG_NEW_DOZING_KEYGUARD_STATES, + Flags.FLAG_NEW_SCREEN_RECORD_TOOLBAR, + Flags.FLAG_NEW_VOLUME_PANEL, + Flags.FLAG_NO_EXPANSION_ON_OVERSCROLL, + Flags.FLAG_NO_SHADE_BLUR_ON_DREAM_START, + Flags.FLAG_NON_TOUCHSCREEN_DEVICES_BYPASS_FALSING, + Flags.FLAG_NOTES_ROLE_QS_TILE, + Flags.FLAG_NOTIFICATION_ADD_X_ON_HOVER_TO_DISMISS, + Flags.FLAG_NOTIFICATION_AMBIENT_SUPPRESSION_AFTER_INFLATION, + Flags.FLAG_NOTIFICATION_ANIMATED_ACTIONS_TREATMENT, + Flags.FLAG_NOTIFICATION_APPEAR_NONLINEAR, + Flags.FLAG_NOTIFICATION_ASYNC_GROUP_HEADER_INFLATION, + Flags.FLAG_NOTIFICATION_AVALANCHE_SUPPRESSION, + Flags.FLAG_NOTIFICATION_AVALANCHE_THROTTLE_HUN, + Flags.FLAG_NOTIFICATION_BACKGROUND_TINT_OPTIMIZATION, + Flags.FLAG_NOTIFICATION_BUNDLE_UI, + Flags.FLAG_NOTIFICATION_CHILDREN_CONTAINER_MIN_HEIGHT, + Flags.FLAG_NOTIFICATION_COLOR_UPDATE_LOGGER, + Flags.FLAG_NOTIFICATION_FIX_HUN_SHADOWS, + Flags.FLAG_NOTIFICATION_FOOTER_BACKGROUND_TINT_OPTIMIZATION, + Flags.FLAG_NOTIFICATION_ROW_IS_REMOVED_FIX, + Flags.FLAG_NOTIFICATION_ROW_TRANSPARENCY, + Flags.FLAG_NOTIFICATION_SHADE_BLUR, + Flags.FLAG_NOTIFICATION_SHADE_UI_THREAD, + Flags.FLAG_NOTIFICATION_SKIP_SILENT_UPDATES, + Flags.FLAG_NOTIFICATION_TRANSPARENT_HEADER_FIX, + Flags.FLAG_NOTIFICATIONS_HIDE_ON_DISPLAY_SWITCH, + Flags.FLAG_NOTIFICATIONS_ICON_CONTAINER_REFACTOR, + Flags.FLAG_NOTIFICATIONS_REDESIGN_FOOTER_VIEW, + Flags.FLAG_ONGOING_ACTIVITY_CHIPS_ON_DREAM, + Flags.FLAG_OVERRIDE_SUPPRESS_OVERLAY_CONDITION, + Flags.FLAG_PERMISSION_HELPER_INLINE_UI_RICH_ONGOING, + Flags.FLAG_PERMISSION_HELPER_UI_RICH_ONGOING, + Flags.FLAG_PHYSICAL_NOTIFICATION_MOVEMENT, + Flags.FLAG_PIN_INPUT_FIELD_STYLED_FOCUS_STATE, + Flags.FLAG_PREDICTIVE_BACK_ANIMATE_SHADE, + Flags.FLAG_PRIVACY_DOT_LIVE_REGION, + Flags.FLAG_PROMOTE_NOTIFICATIONS_AUTOMATICALLY, + Flags.FLAG_PSS_TASK_SWITCHER, + Flags.FLAG_QS_COMPOSE_FRAGMENT_EARLY_EXPANSION, + Flags.FLAG_QS_EDIT_MODE_TOOLTIP, + Flags.FLAG_QS_EDIT_MODE_V2, + Flags.FLAG_QS_MATERIAL_EXPRESSIVE_TILES, + Flags.FLAG_QS_NEW_TILES, + Flags.FLAG_QS_NEW_TILES_FUTURE, + Flags.FLAG_QS_SPLIT_INTERNET_TILE, + Flags.FLAG_QS_TILE_DETAILED_VIEW, + Flags.FLAG_QS_TILE_FOCUS_STATE, + Flags.FLAG_QS_TILE_TRANSITION_INTERACTION_REFINEMENT, + Flags.FLAG_QS_UI_REFACTOR_COMPOSE_FRAGMENT, + Flags.FLAG_QS_WIFI_CONFIG, + Flags.FLAG_RECORD_ISSUE_QS_TILE, + Flags.FLAG_REDESIGN_MAGNIFICATION_WINDOW_SIZE, + Flags.FLAG_REGISTER_WALLPAPER_NOTIFIER_BACKGROUND, + Flags.FLAG_REMOVE_DREAM_OVERLAY_HIDE_ON_TOUCH, + Flags.FLAG_REMOVE_NEARBY_SHARE_TILE_ANIMATION, + Flags.FLAG_REMOVE_UPDATE_LISTENER_IN_QS_ICON_VIEW_IMPL, + Flags.FLAG_RESET_TILES_REMOVES_CUSTOM_TILES, + Flags.FLAG_REST_TO_UNLOCK, + Flags.FLAG_RESTART_DREAM_ON_UNOCCLUDE, + Flags.FLAG_RESTORE_SHOW_TAPS_SETTING, + Flags.FLAG_RESTRICT_COMMUNAL_APP_WIDGET_HOST_LISTENING, + Flags.FLAG_RESTRICT_COMMUNAL_SHADE_TO_WHEN_IDLE, + Flags.FLAG_REVAMPED_BOUNCER_MESSAGES, + Flags.FLAG_RUN_FINGERPRINT_DETECT_ON_DISMISSIBLE_KEYGUARD, + Flags.FLAG_SCENE_CONTAINER, + Flags.FLAG_SCREEN_OFF_ANIMATION_GUARD_ENABLED, + Flags.FLAG_SCREEN_REACTIONS, + Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX, + Flags.FLAG_SCREENSHOT_ANNOUNCE_LIVE_REGION, + Flags.FLAG_SCREENSHOT_DISMISSAL_SPRING, + Flags.FLAG_SCREENSHOT_FORCE_SHUTTER_SOUND, + Flags.FLAG_SCREENSHOT_MULTIDISPLAY_FOCUS_CHANGE, + Flags.FLAG_SCREENSHOT_POLICY_SPLIT_AND_DESKTOP_MODE, + Flags.FLAG_SCREENSHOT_SCROLL_CROP_VIEW_CRASH_FIX, + Flags.FLAG_SCRIM_FIX, + Flags.FLAG_SECONDARY_USER_WIDGET_HOST, + Flags.FLAG_SETTINGS_EXT_REGISTER_CONTENT_OBSERVER_ON_BG_THREAD, + Flags.FLAG_SHADE_APP_LAUNCH_ANIMATION_SKIP_IN_DESKTOP, + Flags.FLAG_SHADE_EXPANDS_ON_STATUS_BAR_LONG_PRESS, + Flags.FLAG_SHADE_HEADER_BLUR_FONT_COLOR, + Flags.FLAG_SHADE_HEADER_FONT_UPDATE, + Flags.FLAG_SHADE_QSVISIBLE_LOGIC, + Flags.FLAG_SHADE_WINDOW_GOES_AROUND, + Flags.FLAG_SHADERLIB_LOADING_EFFECT_REFACTOR, + Flags.FLAG_SHORTCUT_HELPER_KEY_GLYPH, + Flags.FLAG_SHORTCUT_HELPER_MULTI_DISPLAY_SUPPORT, + Flags.FLAG_SHOW_AUDIO_SHARING_SLIDER_IN_VOLUME_PANEL, + Flags.FLAG_SHOW_CLIPBOARD_INDICATION, + Flags.FLAG_SHOW_ICON_IN_EMPTY_SHADE, + Flags.FLAG_SHOW_LOCKED_BY_YOUR_WATCH_KEYGUARD_INDICATOR, + Flags.FLAG_SIGN_OUT_BUTTON_ON_KEYGUARD_STATUS_BAR, + Flags.FLAG_SIM_PIN_BOUNCER_RESET, + Flags.FLAG_SLICE_MANAGER_BINDER_CALL_BACKGROUND, + Flags.FLAG_SMARTSPACE_RELOCATE_TO_BOTTOM, + Flags.FLAG_SMARTSPACE_SWIPE_EVENT_LOGGING_FIX, + Flags.FLAG_SMARTSPACE_VIEWPAGER2, + Flags.FLAG_SOUNDDOSE_CUSTOMIZATION, + Flags.FLAG_SPATIAL_MODEL_APP_PUSHBACK, + Flags.FLAG_SPATIAL_MODEL_BOUNCER_PUSHBACK, + Flags.FLAG_SPATIAL_MODEL_PUSHBACK_IN_SHADER, + Flags.FLAG_STABILIZE_HEADS_UP_GROUP_V2, + Flags.FLAG_STATUS_BAR_ALWAYS_CHECK_UNDERLYING_NETWORKS, + Flags.FLAG_STATUS_BAR_ALWAYS_SCHEDULE_AUTO_HIDE, + Flags.FLAG_STATUS_BAR_ALWAYS_USE_REGION_SAMPLING, + Flags.FLAG_STATUS_BAR_APP_HANDLE_TRACKING, + Flags.FLAG_STATUS_BAR_BATTERY_NO_CONFLATION, + Flags.FLAG_STATUS_BAR_CALL_CHIP_USE_IS_HIDDEN, + Flags.FLAG_STATUS_BAR_CHIP_TO_HUN_ANIMATION, + Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION, + Flags.FLAG_STATUS_BAR_CHIPS_RETURN_ANIMATIONS, + Flags.FLAG_STATUS_BAR_DARK_ICON_INTERACTOR_MIXED_FIX, + Flags.FLAG_STATUS_BAR_DATE, + Flags.FLAG_STATUS_BAR_FONT_UPDATES, + Flags.FLAG_STATUS_BAR_FOR_DESKTOP, + Flags.FLAG_STATUS_BAR_MOBILE_ICON_KAIROS, + Flags.FLAG_STATUS_BAR_NO_HUN_BEHAVIOR, + Flags.FLAG_STATUS_BAR_POPUP_CHIPS, + Flags.FLAG_STATUS_BAR_PRIVACY_CHIP_ANIMATION_EXEMPTION, + Flags.FLAG_STATUS_BAR_REGION_SAMPLING, + Flags.FLAG_STATUS_BAR_ROOT_MODERNIZATION, + Flags.FLAG_STATUS_BAR_RUDIMENTARY_BATTERY, + Flags.FLAG_STATUS_BAR_SHARE_DIALOG_WITH_APP_NAME, + Flags.FLAG_STATUS_BAR_SHOW_ICONS_IN_SECURE_CAMERA, + Flags.FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS, + Flags.FLAG_STATUS_BAR_SWITCH_TO_SPN_FROM_DATA_SPN, + Flags.FLAG_STATUS_BAR_SYSTEM_STATUS_ICONS_IN_COMPOSE, + Flags.FLAG_STATUS_BAR_UI_THREAD, + Flags.FLAG_STATUS_BAR_UNIVERSAL_BATTERY_DATA_SOURCE, + Flags.FLAG_STUCK_HEARING_DEVICES_QS_TILE_FIX, + Flags.FLAG_SWITCH_USER_ON_BG, + Flags.FLAG_SYSUI_INTRINSIC_LOCK_DISPATCHER, + Flags.FLAG_SYSUI_TEAMFOOD, + Flags.FLAG_THEME_OVERLAY_CONTROLLER_WAKEFULNESS_DEPRECATION, + Flags.FLAG_THIN_SCREEN_RECORDING_SERVICE, + Flags.FLAG_UNFOLD_ANIMATION_BACKGROUND_PROGRESS, + Flags.FLAG_UPDATE_KEYGUARD_ON_WAKE_AND_UNLOCK_EARLIER, + Flags.FLAG_UPDATE_USER_SWITCHER_BACKGROUND, + Flags.FLAG_UPDATE_WINDOW_MAGNIFIER_BOTTOM_BOUNDARY_WITH_MOUSE, + Flags.FLAG_USE_AAD_PROX_SENSOR_IF_PRESENT, + Flags.FLAG_USER_ENCRYPTED_SOURCE, + Flags.FLAG_USER_SWITCHER_ADD_SIGN_OUT_OPTION, + Flags.FLAG_VISUAL_INTERRUPTIONS_REFACTOR, + Flags.FLAG_VOLUME_REDESIGN, + Flags.FLAG_WINDOW_MAGNIFICATION_MOVE_WITH_MOUSE_ON_EDGE, + "" + ) ); } diff --git a/flags/src/com/android/systemui/FakeFeatureFlagsImpl.java b/flags/src/com/android/systemui/FakeFeatureFlagsImpl.java index 0054d4f3a50..9983359c8ea 100644 --- a/flags/src/com/android/systemui/FakeFeatureFlagsImpl.java +++ b/flags/src/com/android/systemui/FakeFeatureFlagsImpl.java @@ -3,11 +3,11 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Predicate; - /** @hide */ public class FakeFeatureFlagsImpl extends CustomFeatureFlags { private final Map mFlagMap = new HashMap<>(); private final FeatureFlags mDefaults; + private final boolean IS_EXPORTED = false; public FakeFeatureFlagsImpl() { this(null); @@ -35,7 +35,7 @@ protected boolean getValue(String flagName, Predicate getter) { } public void setFlag(String flagName, boolean value) { - if (!this.mFlagMap.containsKey(flagName)) { + if (!this.mFlagMap.containsKey(flagName) && !IS_EXPORTED) { throw new IllegalArgumentException("no such flag " + flagName); } this.mFlagMap.put(flagName, value); diff --git a/flags/src/com/android/systemui/FeatureFlags.java b/flags/src/com/android/systemui/FeatureFlags.java index 6ce51d50c32..03496a13837 100644 --- a/flags/src/com/android/systemui/FeatureFlags.java +++ b/flags/src/com/android/systemui/FeatureFlags.java @@ -1,310 +1,1118 @@ package com.android.systemui; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + /** @hide */ public interface FeatureFlags { - + + + boolean activityTransitionUseLargestWindow(); - + + + + boolean allowDozeTouchesForLockIcon(); + + + + boolean ambientCuePlugin(); + + + boolean ambientTouchMonitorListenToDisplayChanges(); - + + + + boolean animationLibraryShellMigration(); + + + boolean appClipsBacklinks(); - - boolean bindKeyguardMediaVisibility(); - - boolean bpTalkback(); - + + + + boolean avalancheReplaceHunWhenCritical(); + + + + boolean backButtonOnBouncer(); + + + + boolean blockMouseEdgeBackGesture(); + + + + boolean blurOnMoreSurfaces(); + + + + boolean blurSettingsToggle(); + + + + boolean bouncerUiRevamp(); + + + + boolean bouncerUiRevamp2(); + + + + boolean bpColors(); + + + boolean brightnessSliderFocusState(); - - boolean centralizedStatusBarHeightFix(); - - boolean clipboardNoninteractiveOnLockscreen(); - - boolean clockReactiveVariants(); - + + + + boolean captionsToggleInVolumeDialogV1(); + + + + boolean checkDesktopModeForSpacialModelAppPushback(); + + + + boolean classicFlagsMultiUser(); + + + + boolean cleanupInstancesWhenDisplayRemoved(); + + + + boolean clearShortcutIconTint(); + + + + boolean clipboardOverlayMultiuser(); + + + + boolean clipboardUseDescriptionMimetype(); + + + + boolean clockFidgetAnimation(); + + + + boolean clockModernization(); + + + boolean communalBouncerDoNotModifyPluginOpen(); - + + + + boolean communalEditWidgetsActivityFinishFix(); + + + boolean communalHub(); - + + + + boolean communalHubUseThreadPoolForWidgets(); + + + + boolean communalPowerTransitionFix(); + + + + boolean communalResponsiveGrid(); + + + + boolean communalShadeTouchHandlingFixes(); + + + + boolean communalStandaloneSupport(); + + + + boolean communalTimerFlickerFix(); + + + + boolean communalWidgetResizing(); + + + + boolean communalWidgetTrampolineFix(); + + + boolean composeBouncer(); - - boolean composeLockscreen(); - + + + boolean confineNotificationTouchToViewWidth(); - - boolean constraintBp(); - - boolean contextualTipsAssistantDismissFix(); - + + + + boolean contAuthPlugin(); + + + boolean coroutineTracing(); - - boolean createWindowlessWindowMagnifier(); - - boolean dedicatedNotifInflationThread(); - - boolean delayShowMagnificationButton(); - - boolean delayedWakelockReleaseOnBackgroundThread(); - - boolean deviceEntryUdfpsRefactor(); - + + + + boolean decoupleViewControllerInAnimlib(); + + + + boolean deferDozeTransitionOnShadeDrag(); + + + + boolean desktopAvControlsPopup(); + + + + boolean desktopEffectsQsTile(); + + + + boolean desktopSizing(); + + + + boolean dialogAnimEndStateUpdate(); + + + boolean disableContextualTipsFrequencyCheck(); - + + + boolean disableContextualTipsIosSwitcherCheck(); - - boolean dozeuiSchedulingAlarmsBackgroundExecution(); - + + + + boolean disableDoubleClickSwapOnBouncer(); + + + + boolean disableUserSwitcherDropdownOnBouncer(); + + + + boolean doNotUseImmediateCoroutineDispatcher(); + + + + boolean doNotUseRunBlocking(); + + + + boolean doubleTapToSleep(); + + + + boolean dreamBiometricPromptFixes(); + + + + boolean dreamBouncerTransitionFix(); + + + boolean dreamInputSessionPilferOnce(); - + + + boolean dreamOverlayBouncerSwipeDirectionFiltering(); - - boolean dualShade(); - + + + + boolean dreamOverlayUpdatedUi(); + + + + boolean dreamSuppression(); + + + boolean edgeBackGestureHandlerThread(); - + + + boolean edgebackGestureHandlerGetRunningTasksBackground(); - + + + boolean enableBackgroundKeyguardOndrawnCallback(); - + + + + boolean enableConstraintLayoutLockscreenOnExternalDisplay(); + + + boolean enableContextualTipForMuteVolume(); - - boolean enableContextualTipForPowerOff(); - - boolean enableContextualTipForTakeScreenshot(); - - boolean enableContextualTips(); - + + + + boolean enableCueBarAnimatedIcon(); + + + + boolean enableDesktopGrowth(); + + + boolean enableEfficientDisplayRepository(); - + + + boolean enableLayoutTracing(); - + + + + boolean enableMinmode(); + + + + boolean enableOutputSwitcherAudioSharingButton(); + + + + boolean enableSuggestedDeviceUi(); + + + + boolean enableUnderlay(); + + + boolean enableViewCaptureTracing(); - - boolean enableWidgetPickerSizeFilter(); - - boolean enforceBrightnessBaseUserRestriction(); - + + + boolean exampleFlag(); - - boolean fastUnlockTransition(); - - boolean fixImageWallpaperCrashSurfaceAlreadyReleased(); - - boolean fixScreenshotActionDismissSystemWindows(); - - boolean floatingMenuAnimatedTuck(); - - boolean floatingMenuDragToEdit(); - + + + + boolean expandCollapsePrivacyDialog(); + + + + boolean expandHeadsUpOnInlineReply(); + + + + boolean expandableUseModifierImplementation(); + + + + boolean expandedPrivacyIndicatorsOnLargeScreen(); + + + + boolean extendedAppsShortcutCategory(); + + + + boolean faceScanningAnimationNpeFix(); + + + + boolean fetchBookmarksXmlKeyboardShortcuts(); + + + + boolean fixShadeHeaderWrongIconSize(); + + + + boolean flashlightStrength(); + + + boolean floatingMenuDragToHide(); - - boolean floatingMenuImeDisplacementAnimation(); - - boolean floatingMenuNarrowTargetContentObserver(); - - boolean floatingMenuOverlapsNavBarsFlag(); - + + + + boolean floatingMenuHearingDeviceStatusIcon(); + + + boolean floatingMenuRadiiAnimation(); - - boolean generatedPreviews(); - + + + + boolean gestureBetweenHubAndLockscreenMotion(); + + + boolean getConnectedDeviceNameUnsynchronized(); - + + + boolean glanceableHubAllowKeyguardWhenDreaming(); - - boolean glanceableHubFullscreenSwipe(); - - boolean glanceableHubGestureHandle(); - - boolean glanceableHubShortcutButton(); - - boolean hapticBrightnessSlider(); - - boolean hapticVolumeSlider(); - + + + + boolean glanceableHubBlurredBackground(); + + + + boolean glanceableHubDirectEditMode(); + + + + boolean glanceableHubEnabledByDefault(); + + + + boolean glanceableHubV2(); + + + + boolean glanceableHubV2Resources(); + + + + boolean globalActionsEmphasizedFont(); + + + + boolean hardwareColorStyles(); + + + boolean hearingAidsQsTileDialog(); - + + + boolean hearingDevicesDialogRelatedTools(); - + + + + boolean hideRingerButtonInSingleVolumeMode(); + + + + boolean homeControlsDreamHsum(); + + + + boolean hsuQsChanges(); + + + + boolean hubBlurredByShadeFix(); + + + + boolean hubEditModeTouchAdjustments(); + + + + boolean hubEditModeTransition(); + + + + boolean iconRefresh2025(); + + + + boolean indicationTextA11yFix(); + + + boolean keyboardDockingIndicator(); - + + + boolean keyboardShortcutHelperRewrite(); - - boolean keyguardBottomAreaRefactor(); - + + + + boolean keyboardTouchpadContextualEducation(); + + + + boolean keyguardTransitionForceFinishOnScreenOff(); + + + boolean keyguardWmStateRefactor(); - - boolean lightRevealMigration(); - - boolean mediaControlsLockscreenShadeBugFix(); - - boolean mediaControlsRefactor(); - - boolean mediaControlsUserInitiatedDeleteintent(); - - boolean migrateClocksToBlueprint(); - + + + + boolean largeScreenRecording(); + + + + boolean largeScreenScreencapture(); + + + + boolean largeScreenScreenshotAppWindow(); + + + + boolean largeScreenSharing(); + + + + boolean lockscreenShadeToDreamTransitionFix(); + + + + boolean lowLightClockDream(); + + + + boolean lowlightClockSetBrightness(); + + + + boolean lowlightClockUsesKeyguardChargingStatus(); + + + + boolean magneticNotificationSwipes(); + + + + boolean mediaCarouselArrows(); + + + + boolean mediaControlsButtonMedia3(); + + + + boolean mediaControlsButtonMedia3Placement(); + + + + boolean mediaControlsInCompose(); + + + + boolean mediaControlsTranslationFix(); + + + + boolean mediaFrameDimensionsFix(); + + + + boolean mediaProjectionDialogBehindLockscreen(); + + + + boolean mediaProjectionGreyErrorText(); + + + + boolean modesUiDialogPaging(); + + + + boolean moveTransitionAnimationLayer(); + + + + boolean msdlFeedback(); + + + + boolean multiuserOpenUserSwitcherDialog(); + + + + boolean multiuserWifiPickerTrackerSupport(); + + + boolean newAodTransition(); - - boolean newTouchpadGesturesTutorial(); - + + + + boolean newDozingKeyguardStates(); + + + + boolean newScreenRecordToolbar(); + + + boolean newVolumePanel(); - + + + + boolean noExpansionOnOverscroll(); + + + + boolean noShadeBlurOnDreamStart(); + + + + boolean nonTouchscreenDevicesBypassFalsing(); + + + + boolean notesRoleQsTile(); + + + + boolean notificationAddXOnHoverToDismiss(); + + + + boolean notificationAmbientSuppressionAfterInflation(); + + + + boolean notificationAnimatedActionsTreatment(); + + + + boolean notificationAppearNonlinear(); + + + boolean notificationAsyncGroupHeaderInflation(); - - boolean notificationAsyncHybridViewInflation(); - + + + boolean notificationAvalancheSuppression(); - + + + boolean notificationAvalancheThrottleHun(); - + + + boolean notificationBackgroundTintOptimization(); - + + + + boolean notificationBundleUi(); + + + + boolean notificationChildrenContainerMinHeight(); + + + boolean notificationColorUpdateLogger(); - - boolean notificationContentAlphaOptimization(); - + + + + boolean notificationFixHunShadows(); + + + boolean notificationFooterBackgroundTintOptimization(); - - boolean notificationMediaManagerBackgroundExecution(); - - boolean notificationMinimalismPrototype(); - - boolean notificationOverExpansionClippingFix(); - - boolean notificationPulsingFix(); - - boolean notificationRowContentBinderRefactor(); - - boolean notificationRowUserContext(); - - boolean notificationViewFlipperPausingV2(); - - boolean notificationsBackgroundIcons(); - - boolean notificationsFooterViewRefactor(); - - boolean notificationsHeadsUpRefactor(); - + + + + boolean notificationRowIsRemovedFix(); + + + + boolean notificationRowTransparency(); + + + + boolean notificationShadeBlur(); + + + + boolean notificationShadeUiThread(); + + + + boolean notificationSkipSilentUpdates(); + + + + boolean notificationTransparentHeaderFix(); + + + boolean notificationsHideOnDisplaySwitch(); - + + + boolean notificationsIconContainerRefactor(); - - boolean notificationsImprovedHunAnimation(); - - boolean notificationsLiveDataStoreRefactor(); - - boolean notifyPowerManagerUserActivityBackground(); - + + + + boolean notificationsRedesignFooterView(); + + + + boolean ongoingActivityChipsOnDream(); + + + + boolean overrideSuppressOverlayCondition(); + + + + boolean permissionHelperInlineUiRichOngoing(); + + + + boolean permissionHelperUiRichOngoing(); + + + + boolean physicalNotificationMovement(); + + + boolean pinInputFieldStyledFocusState(); - - boolean predictiveBackAnimateBouncer(); - - boolean predictiveBackAnimateDialogs(); - + + + boolean predictiveBackAnimateShade(); - - boolean predictiveBackSysui(); - - boolean priorityPeopleSection(); - - boolean privacyDotUnfoldWrongCornerFix(); - - boolean pssAppSelectorAbruptExitFix(); - - boolean pssAppSelectorRecentsSplitScreen(); - - boolean pssTaskSwitcher(); - - boolean qsCustomTileClickGuaranteedBugFix(); - - boolean qsNewPipeline(); - - boolean qsNewTiles(); - - boolean qsNewTilesFuture(); - - boolean qsTileFocusState(); - - boolean qsUiRefactor(); - - boolean quickSettingsVisualHapticsLongpress(); - + + + + boolean privacyDotLiveRegion(); + + + + boolean promoteNotificationsAutomatically(); + + + + boolean pssTaskSwitcher(); + + + + boolean qsComposeFragmentEarlyExpansion(); + + + + boolean qsEditModeTooltip(); + + + + boolean qsEditModeV2(); + + + + boolean qsMaterialExpressiveTiles(); + + + + boolean qsNewTiles(); + + + + boolean qsNewTilesFuture(); + + + + boolean qsSplitInternetTile(); + + + + boolean qsTileDetailedView(); + + + + boolean qsTileFocusState(); + + + + boolean qsTileTransitionInteractionRefinement(); + + + + boolean qsUiRefactorComposeFragment(); + + + + boolean qsWifiConfig(); + + + boolean recordIssueQsTile(); - - boolean refactorGetCurrentUser(); - - boolean registerBatteryControllerReceiversInCorestartable(); - - boolean registerNewWalletCardInBackground(); - + + + + boolean redesignMagnificationWindowSize(); + + + boolean registerWallpaperNotifierBackground(); - - boolean registerZenModeContentObserverBackground(); - + + + boolean removeDreamOverlayHideOnTouch(); - + + + + boolean removeNearbyShareTileAnimation(); + + + + boolean removeUpdateListenerInQsIconViewImpl(); + + + + boolean resetTilesRemovesCustomTiles(); + + + boolean restToUnlock(); - + + + boolean restartDreamOnUnocclude(); - + + + + boolean restoreShowTapsSetting(); + + + + boolean restrictCommunalAppWidgetHostListening(); + + + + boolean restrictCommunalShadeToWhenIdle(); + + + boolean revampedBouncerMessages(); - + + + boolean runFingerprintDetectOnDismissibleKeyguard(); - - boolean saveAndRestoreMagnificationSettingsButtons(); - + + + boolean sceneContainer(); - + + + + boolean screenOffAnimationGuardEnabled(); + + + + boolean screenReactions(); + + + boolean screenshareNotificationHidingBugFix(); - - boolean screenshotActionDismissSystemWindows(); - - boolean screenshotPrivateProfileAccessibilityAnnouncementFix(); - - boolean screenshotPrivateProfileBehaviorFix(); - + + + + boolean screenshotAnnounceLiveRegion(); + + + + boolean screenshotDismissalSpring(); + + + + boolean screenshotForceShutterSound(); + + + + boolean screenshotMultidisplayFocusChange(); + + + + boolean screenshotPolicySplitAndDesktopMode(); + + + boolean screenshotScrollCropViewCrashFix(); - - boolean screenshotShelfUi2(); - - boolean shadeCollapseActivityLaunchFix(); - + + + + boolean scrimFix(); + + + + boolean secondaryUserWidgetHost(); + + + + boolean settingsExtRegisterContentObserverOnBgThread(); + + + + boolean shadeAppLaunchAnimationSkipInDesktop(); + + + + boolean shadeExpandsOnStatusBarLongPress(); + + + + boolean shadeHeaderBlurFontColor(); + + + + boolean shadeHeaderFontUpdate(); + + + + boolean shadeQsvisibleLogic(); + + + + boolean shadeWindowGoesAround(); + + + boolean shaderlibLoadingEffectRefactor(); - - boolean sliceBroadcastRelayInBackground(); - + + + + boolean shortcutHelperKeyGlyph(); + + + + boolean shortcutHelperMultiDisplaySupport(); + + + + boolean showAudioSharingSliderInVolumePanel(); + + + + boolean showClipboardIndication(); + + + + boolean showIconInEmptyShade(); + + + + boolean showLockedByYourWatchKeyguardIndicator(); + + + + boolean signOutButtonOnKeyguardStatusBar(); + + + + boolean simPinBouncerReset(); + + + boolean sliceManagerBinderCallBackground(); - - boolean smartspaceLockscreenViewmodel(); - + + + boolean smartspaceRelocateToBottom(); - - boolean smartspaceRemoteviewsRendering(); - - boolean statusBarMonochromeIconsFix(); - - boolean statusBarScreenSharingChips(); - + + + + boolean smartspaceSwipeEventLoggingFix(); + + + + boolean smartspaceViewpager2(); + + + + boolean sounddoseCustomization(); + + + + boolean spatialModelAppPushback(); + + + + boolean spatialModelBouncerPushback(); + + + + boolean spatialModelPushbackInShader(); + + + + boolean stabilizeHeadsUpGroupV2(); + + + + boolean statusBarAlwaysCheckUnderlyingNetworks(); + + + + boolean statusBarAlwaysScheduleAutoHide(); + + + + boolean statusBarAlwaysUseRegionSampling(); + + + + boolean statusBarAppHandleTracking(); + + + + boolean statusBarBatteryNoConflation(); + + + + boolean statusBarCallChipUseIsHidden(); + + + + boolean statusBarChipToHunAnimation(); + + + + boolean statusBarChipsModernization(); + + + + boolean statusBarChipsReturnAnimations(); + + + + boolean statusBarDarkIconInteractorMixedFix(); + + + + boolean statusBarDate(); + + + + boolean statusBarFontUpdates(); + + + + boolean statusBarForDesktop(); + + + + boolean statusBarMobileIconKairos(); + + + + boolean statusBarNoHunBehavior(); + + + + boolean statusBarPopupChips(); + + + + boolean statusBarPrivacyChipAnimationExemption(); + + + + boolean statusBarRegionSampling(); + + + + boolean statusBarRootModernization(); + + + + boolean statusBarRudimentaryBattery(); + + + + boolean statusBarShareDialogWithAppName(); + + + + boolean statusBarShowIconsInSecureCamera(); + + + boolean statusBarStaticInoutIndicators(); - + + + + boolean statusBarSwitchToSpnFromDataSpn(); + + + + boolean statusBarSystemStatusIconsInCompose(); + + + + boolean statusBarUiThread(); + + + + boolean statusBarUniversalBatteryDataSource(); + + + + boolean stuckHearingDevicesQsTileFix(); + + + boolean switchUserOnBg(); - + + + + boolean sysuiIntrinsicLockDispatcher(); + + + boolean sysuiTeamfood(); - + + + boolean themeOverlayControllerWakefulnessDeprecation(); - - boolean translucentOccludingActivityFix(); - - boolean truncatedStatusBarIconsFix(); - - boolean udfpsViewPerformance(); - + + + + boolean thinScreenRecordingService(); + + + boolean unfoldAnimationBackgroundProgress(); - + + + + boolean updateKeyguardOnWakeAndUnlockEarlier(); + + + boolean updateUserSwitcherBackground(); - - boolean validateKeyboardShortcutHelperIconUri(); - + + + + boolean updateWindowMagnifierBottomBoundaryWithMouse(); + + + + boolean useAadProxSensorIfPresent(); + + + + boolean userEncryptedSource(); + + + + boolean userSwitcherAddSignOutOption(); + + + boolean visualInterruptionsRefactor(); + + + + boolean volumeRedesign(); + + + + boolean windowMagnificationMoveWithMouseOnEdge(); } diff --git a/flags/src/com/android/systemui/FeatureFlagsImpl.java b/flags/src/com/android/systemui/FeatureFlagsImpl.java index 32049600d55..129398aaeeb 100644 --- a/flags/src/com/android/systemui/FeatureFlagsImpl.java +++ b/flags/src/com/android/systemui/FeatureFlagsImpl.java @@ -1,3178 +1,1951 @@ package com.android.systemui; -// TODO(b/303773055): Remove the annotation after access issue is resolved. -import com.android.quickstep.util.DeviceConfigHelper; - -import java.nio.file.Files; -import java.nio.file.Paths; /** @hide */ public final class FeatureFlagsImpl implements FeatureFlags { - private static final boolean isReadFromNew = Files.exists(Paths.get("/metadata/aconfig/boot/enable_only_new_storage")); - private static volatile boolean isCached = false; - private static volatile boolean accessibility_is_cached = false; - private static volatile boolean biometrics_framework_is_cached = false; - private static volatile boolean communal_is_cached = false; - private static volatile boolean systemui_is_cached = false; - private static boolean activityTransitionUseLargestWindow = true; - private static boolean ambientTouchMonitorListenToDisplayChanges = false; - private static boolean appClipsBacklinks = false; - private static boolean bindKeyguardMediaVisibility = true; - private static boolean bpTalkback = true; - private static boolean brightnessSliderFocusState = false; - private static boolean centralizedStatusBarHeightFix = true; - private static boolean clipboardNoninteractiveOnLockscreen = false; - private static boolean clockReactiveVariants = false; - private static boolean communalBouncerDoNotModifyPluginOpen = false; - private static boolean communalHub = true; - private static boolean composeBouncer = false; - private static boolean composeLockscreen = false; - private static boolean confineNotificationTouchToViewWidth = true; - private static boolean constraintBp = true; - private static boolean contextualTipsAssistantDismissFix = true; - private static boolean coroutineTracing = true; - private static boolean createWindowlessWindowMagnifier = true; - private static boolean dedicatedNotifInflationThread = true; - private static boolean delayShowMagnificationButton = true; - private static boolean delayedWakelockReleaseOnBackgroundThread = true; - private static boolean deviceEntryUdfpsRefactor = true; - private static boolean disableContextualTipsFrequencyCheck = true; - private static boolean disableContextualTipsIosSwitcherCheck = true; - private static boolean dozeuiSchedulingAlarmsBackgroundExecution = false; - private static boolean dreamInputSessionPilferOnce = false; - private static boolean dreamOverlayBouncerSwipeDirectionFiltering = true; - private static boolean dualShade = false; - private static boolean edgeBackGestureHandlerThread = false; - private static boolean edgebackGestureHandlerGetRunningTasksBackground = true; - private static boolean enableBackgroundKeyguardOndrawnCallback = true; - private static boolean enableContextualTipForMuteVolume = false; - private static boolean enableContextualTipForPowerOff = true; - private static boolean enableContextualTipForTakeScreenshot = true; - private static boolean enableContextualTips = true; - private static boolean enableEfficientDisplayRepository = false; - private static boolean enableLayoutTracing = false; - private static boolean enableViewCaptureTracing = false; - private static boolean enableWidgetPickerSizeFilter = false; - private static boolean enforceBrightnessBaseUserRestriction = true; - private static boolean exampleFlag = false; - private static boolean fastUnlockTransition = false; - private static boolean fixImageWallpaperCrashSurfaceAlreadyReleased = true; - private static boolean fixScreenshotActionDismissSystemWindows = true; - private static boolean floatingMenuAnimatedTuck = true; - private static boolean floatingMenuDragToEdit = true; - private static boolean floatingMenuDragToHide = false; - private static boolean floatingMenuImeDisplacementAnimation = true; - private static boolean floatingMenuNarrowTargetContentObserver = true; - private static boolean floatingMenuOverlapsNavBarsFlag = true; - private static boolean floatingMenuRadiiAnimation = true; - private static boolean generatedPreviews = true; - private static boolean getConnectedDeviceNameUnsynchronized = true; - private static boolean glanceableHubAllowKeyguardWhenDreaming = false; - private static boolean glanceableHubFullscreenSwipe = false; - private static boolean glanceableHubGestureHandle = false; - private static boolean glanceableHubShortcutButton = false; - private static boolean hapticBrightnessSlider = true; - private static boolean hapticVolumeSlider = true; - private static boolean hearingAidsQsTileDialog = true; - private static boolean hearingDevicesDialogRelatedTools = true; - private static boolean keyboardDockingIndicator = true; - private static boolean keyboardShortcutHelperRewrite = false; - private static boolean keyguardBottomAreaRefactor = true; - private static boolean keyguardWmStateRefactor = false; - private static boolean lightRevealMigration = true; - private static boolean mediaControlsLockscreenShadeBugFix = true; - private static boolean mediaControlsRefactor = true; - private static boolean mediaControlsUserInitiatedDeleteintent = true; - private static boolean migrateClocksToBlueprint = true; - private static boolean newAodTransition = true; - private static boolean newTouchpadGesturesTutorial = false; - private static boolean newVolumePanel = true; - private static boolean notificationAsyncGroupHeaderInflation = true; - private static boolean notificationAsyncHybridViewInflation = true; - private static boolean notificationAvalancheSuppression = true; - private static boolean notificationAvalancheThrottleHun = true; - private static boolean notificationBackgroundTintOptimization = true; - private static boolean notificationColorUpdateLogger = false; - private static boolean notificationContentAlphaOptimization = true; - private static boolean notificationFooterBackgroundTintOptimization = false; - private static boolean notificationMediaManagerBackgroundExecution = true; - private static boolean notificationMinimalismPrototype = false; - private static boolean notificationOverExpansionClippingFix = true; - private static boolean notificationPulsingFix = true; - private static boolean notificationRowContentBinderRefactor = false; - private static boolean notificationRowUserContext = true; - private static boolean notificationViewFlipperPausingV2 = true; - private static boolean notificationsBackgroundIcons = false; - private static boolean notificationsFooterViewRefactor = true; - private static boolean notificationsHeadsUpRefactor = true; - private static boolean notificationsHideOnDisplaySwitch = false; - private static boolean notificationsIconContainerRefactor = true; - private static boolean notificationsImprovedHunAnimation = true; - private static boolean notificationsLiveDataStoreRefactor = true; - private static boolean notifyPowerManagerUserActivityBackground = true; - private static boolean pinInputFieldStyledFocusState = true; - private static boolean predictiveBackAnimateBouncer = true; - private static boolean predictiveBackAnimateDialogs = true; - private static boolean predictiveBackAnimateShade = false; - private static boolean predictiveBackSysui = true; - private static boolean priorityPeopleSection = true; - private static boolean privacyDotUnfoldWrongCornerFix = true; - private static boolean pssAppSelectorAbruptExitFix = true; - private static boolean pssAppSelectorRecentsSplitScreen = true; - private static boolean pssTaskSwitcher = false; - private static boolean qsCustomTileClickGuaranteedBugFix = true; - private static boolean qsNewPipeline = true; - private static boolean qsNewTiles = false; - private static boolean qsNewTilesFuture = false; - private static boolean qsTileFocusState = true; - private static boolean qsUiRefactor = false; - private static boolean quickSettingsVisualHapticsLongpress = true; - private static boolean recordIssueQsTile = true; - private static boolean refactorGetCurrentUser = true; - private static boolean registerBatteryControllerReceiversInCorestartable = false; - private static boolean registerNewWalletCardInBackground = true; - private static boolean registerWallpaperNotifierBackground = true; - private static boolean registerZenModeContentObserverBackground = true; - private static boolean removeDreamOverlayHideOnTouch = true; - private static boolean restToUnlock = false; - private static boolean restartDreamOnUnocclude = false; - private static boolean revampedBouncerMessages = true; - private static boolean runFingerprintDetectOnDismissibleKeyguard = true; - private static boolean saveAndRestoreMagnificationSettingsButtons = false; - private static boolean sceneContainer = false; - private static boolean screenshareNotificationHidingBugFix = true; - private static boolean screenshotActionDismissSystemWindows = true; - private static boolean screenshotPrivateProfileAccessibilityAnnouncementFix = true; - private static boolean screenshotPrivateProfileBehaviorFix = true; - private static boolean screenshotScrollCropViewCrashFix = true; - private static boolean screenshotShelfUi2 = true; - private static boolean shadeCollapseActivityLaunchFix = false; - private static boolean shaderlibLoadingEffectRefactor = true; - private static boolean sliceBroadcastRelayInBackground = true; - private static boolean sliceManagerBinderCallBackground = true; - private static boolean smartspaceLockscreenViewmodel = true; - private static boolean smartspaceRelocateToBottom = false; - private static boolean smartspaceRemoteviewsRendering = false; - private static boolean statusBarMonochromeIconsFix = true; - private static boolean statusBarScreenSharingChips = true; - private static boolean statusBarStaticInoutIndicators = false; - private static boolean switchUserOnBg = true; - private static boolean sysuiTeamfood = true; - private static boolean themeOverlayControllerWakefulnessDeprecation = false; - private static boolean translucentOccludingActivityFix = false; - private static boolean truncatedStatusBarIconsFix = true; - private static boolean udfpsViewPerformance = true; - private static boolean unfoldAnimationBackgroundProgress = true; - private static boolean updateUserSwitcherBackground = true; - private static boolean validateKeyboardShortcutHelperIconUri = true; - private static boolean visualInterruptionsRefactor = true; - - - private void init() { - boolean foundPackage = true; - - createWindowlessWindowMagnifier = foundPackage; - - - delayShowMagnificationButton = foundPackage; - - - floatingMenuAnimatedTuck = foundPackage; - - - floatingMenuDragToEdit = foundPackage; - - - floatingMenuDragToHide = foundPackage; - - - floatingMenuImeDisplacementAnimation = foundPackage; - - - floatingMenuNarrowTargetContentObserver = foundPackage; - - - floatingMenuOverlapsNavBarsFlag = foundPackage; - - - floatingMenuRadiiAnimation = foundPackage; - - - hearingDevicesDialogRelatedTools = foundPackage; - - saveAndRestoreMagnificationSettingsButtons = foundPackage; - bpTalkback = foundPackage; - constraintBp = foundPackage; - communalHub = foundPackage; - enableWidgetPickerSizeFilter = foundPackage; - activityTransitionUseLargestWindow = foundPackage; - ambientTouchMonitorListenToDisplayChanges = foundPackage; - appClipsBacklinks = foundPackage; - bindKeyguardMediaVisibility = foundPackage; - brightnessSliderFocusState = foundPackage; - centralizedStatusBarHeightFix = foundPackage; - clipboardNoninteractiveOnLockscreen = foundPackage; - clockReactiveVariants = foundPackage; - communalBouncerDoNotModifyPluginOpen = foundPackage; - composeBouncer = foundPackage; - composeLockscreen = foundPackage; - confineNotificationTouchToViewWidth = foundPackage; - contextualTipsAssistantDismissFix = foundPackage; - coroutineTracing = foundPackage; - dedicatedNotifInflationThread = foundPackage; - delayedWakelockReleaseOnBackgroundThread = foundPackage; - deviceEntryUdfpsRefactor = foundPackage; - disableContextualTipsFrequencyCheck = foundPackage; - disableContextualTipsIosSwitcherCheck = foundPackage; - dozeuiSchedulingAlarmsBackgroundExecution = foundPackage; - dreamInputSessionPilferOnce = foundPackage; - dreamOverlayBouncerSwipeDirectionFiltering = foundPackage; - dualShade = foundPackage; - edgeBackGestureHandlerThread = foundPackage; - edgebackGestureHandlerGetRunningTasksBackground = foundPackage; - enableBackgroundKeyguardOndrawnCallback = foundPackage; - enableContextualTipForMuteVolume = foundPackage; - enableContextualTipForPowerOff = foundPackage; - enableContextualTipForTakeScreenshot = foundPackage; - enableContextualTips = foundPackage; - enableEfficientDisplayRepository = foundPackage; - enableLayoutTracing = foundPackage; - enableViewCaptureTracing = foundPackage; - enforceBrightnessBaseUserRestriction = foundPackage; - exampleFlag = foundPackage; - fastUnlockTransition = foundPackage; - fixImageWallpaperCrashSurfaceAlreadyReleased = foundPackage; - fixScreenshotActionDismissSystemWindows = foundPackage; - generatedPreviews = foundPackage; - getConnectedDeviceNameUnsynchronized = foundPackage; - glanceableHubAllowKeyguardWhenDreaming = foundPackage; - glanceableHubFullscreenSwipe = foundPackage; - glanceableHubGestureHandle = foundPackage; - glanceableHubShortcutButton = foundPackage; - hapticBrightnessSlider = foundPackage; - hapticVolumeSlider = foundPackage; - hearingAidsQsTileDialog = foundPackage; - keyboardDockingIndicator = foundPackage; - keyboardShortcutHelperRewrite = foundPackage; - keyguardBottomAreaRefactor = foundPackage; - keyguardWmStateRefactor = foundPackage; - lightRevealMigration = foundPackage; - mediaControlsLockscreenShadeBugFix = foundPackage; - mediaControlsRefactor = foundPackage; - mediaControlsUserInitiatedDeleteintent = foundPackage; - migrateClocksToBlueprint = foundPackage; - newAodTransition = foundPackage; - newTouchpadGesturesTutorial = foundPackage; - newVolumePanel = foundPackage; - notificationAsyncGroupHeaderInflation = foundPackage; - notificationAsyncHybridViewInflation = foundPackage; - notificationAvalancheSuppression = foundPackage; - notificationAvalancheThrottleHun = foundPackage; - notificationBackgroundTintOptimization = foundPackage; - notificationColorUpdateLogger = foundPackage; - notificationContentAlphaOptimization = foundPackage; - notificationFooterBackgroundTintOptimization = foundPackage; - notificationMediaManagerBackgroundExecution = foundPackage; - notificationMinimalismPrototype = foundPackage; - notificationOverExpansionClippingFix = foundPackage; - notificationPulsingFix = foundPackage; - notificationRowContentBinderRefactor = foundPackage; - notificationRowUserContext = foundPackage; - notificationViewFlipperPausingV2 = foundPackage; - notificationsBackgroundIcons = foundPackage; - notificationsFooterViewRefactor = foundPackage; - notificationsHeadsUpRefactor = foundPackage; - notificationsHideOnDisplaySwitch = foundPackage; - notificationsIconContainerRefactor = foundPackage; - notificationsImprovedHunAnimation = foundPackage; - notificationsLiveDataStoreRefactor = foundPackage; - notifyPowerManagerUserActivityBackground = foundPackage; - pinInputFieldStyledFocusState = foundPackage; - predictiveBackAnimateBouncer = foundPackage; - predictiveBackAnimateDialogs = foundPackage; - predictiveBackAnimateShade = foundPackage; - predictiveBackSysui = foundPackage; - priorityPeopleSection = foundPackage; - privacyDotUnfoldWrongCornerFix = foundPackage; - pssAppSelectorAbruptExitFix = foundPackage; - pssAppSelectorRecentsSplitScreen = foundPackage; - pssTaskSwitcher = foundPackage; - qsCustomTileClickGuaranteedBugFix = foundPackage; - qsNewPipeline = foundPackage; - qsNewTiles = foundPackage; - qsNewTilesFuture = foundPackage; - qsTileFocusState = foundPackage; - qsUiRefactor = foundPackage; - quickSettingsVisualHapticsLongpress = foundPackage; - recordIssueQsTile = foundPackage; - refactorGetCurrentUser = foundPackage; - registerBatteryControllerReceiversInCorestartable = foundPackage; - registerNewWalletCardInBackground = foundPackage; - registerWallpaperNotifierBackground = foundPackage; - registerZenModeContentObserverBackground = foundPackage; - removeDreamOverlayHideOnTouch = foundPackage; - restToUnlock = foundPackage; - restartDreamOnUnocclude = foundPackage; - revampedBouncerMessages = foundPackage; - runFingerprintDetectOnDismissibleKeyguard = foundPackage; - sceneContainer = foundPackage; - screenshareNotificationHidingBugFix = foundPackage; - screenshotActionDismissSystemWindows = foundPackage; - screenshotPrivateProfileAccessibilityAnnouncementFix = foundPackage; - screenshotPrivateProfileBehaviorFix = foundPackage; - screenshotScrollCropViewCrashFix = foundPackage; - screenshotShelfUi2 = foundPackage; - shadeCollapseActivityLaunchFix = foundPackage; - shaderlibLoadingEffectRefactor = foundPackage; - sliceBroadcastRelayInBackground = foundPackage; - sliceManagerBinderCallBackground = foundPackage; - smartspaceLockscreenViewmodel = foundPackage; - smartspaceRelocateToBottom = foundPackage; - smartspaceRemoteviewsRendering = foundPackage; - - - statusBarMonochromeIconsFix = foundPackage; - - - statusBarScreenSharingChips = foundPackage; - - - statusBarStaticInoutIndicators = foundPackage; - - - switchUserOnBg = foundPackage; - - - sysuiTeamfood = foundPackage; - - - themeOverlayControllerWakefulnessDeprecation = foundPackage; - - - translucentOccludingActivityFix = foundPackage; - - - truncatedStatusBarIconsFix = foundPackage; - - - udfpsViewPerformance = foundPackage; - - - unfoldAnimationBackgroundProgress = foundPackage; - - - updateUserSwitcherBackground = foundPackage; - - - validateKeyboardShortcutHelperIconUri = foundPackage; - - - visualInterruptionsRefactor = foundPackage; - - isCached = true; - } - - - - - private void load_overrides_accessibility() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - createWindowlessWindowMagnifier = - properties.getBoolean(Flags.FLAG_CREATE_WINDOWLESS_WINDOW_MAGNIFIER, true); - delayShowMagnificationButton = - properties.getBoolean(Flags.FLAG_DELAY_SHOW_MAGNIFICATION_BUTTON, true); - floatingMenuAnimatedTuck = - properties.getBoolean(Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK, true); - floatingMenuDragToEdit = - properties.getBoolean(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT, true); - floatingMenuDragToHide = - properties.getBoolean(Flags.FLAG_FLOATING_MENU_DRAG_TO_HIDE, false); - floatingMenuImeDisplacementAnimation = - properties.getBoolean(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION, true); - floatingMenuNarrowTargetContentObserver = - properties.getBoolean(Flags.FLAG_FLOATING_MENU_NARROW_TARGET_CONTENT_OBSERVER, true); - floatingMenuOverlapsNavBarsFlag = - properties.getBoolean(Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG, true); - floatingMenuRadiiAnimation = - properties.getBoolean(Flags.FLAG_FLOATING_MENU_RADII_ANIMATION, true); - hearingDevicesDialogRelatedTools = - properties.getBoolean(Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS, true); - saveAndRestoreMagnificationSettingsButtons = - properties.getBoolean(Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS, false); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace accessibility " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } - accessibility_is_cached = true; - } - - private void load_overrides_biometrics_framework() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - bpTalkback = - properties.getBoolean(Flags.FLAG_BP_TALKBACK, true); - constraintBp = - properties.getBoolean(Flags.FLAG_CONSTRAINT_BP, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace biometrics_framework " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } - biometrics_framework_is_cached = true; - } - - private void load_overrides_communal() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - communalHub = - properties.getBoolean(Flags.FLAG_COMMUNAL_HUB, true); - enableWidgetPickerSizeFilter = - properties.getBoolean(Flags.FLAG_ENABLE_WIDGET_PICKER_SIZE_FILTER, false); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace communal " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } - communal_is_cached = true; - } - - private void load_overrides_systemui() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - activityTransitionUseLargestWindow = - properties.getBoolean(Flags.FLAG_ACTIVITY_TRANSITION_USE_LARGEST_WINDOW, true); - ambientTouchMonitorListenToDisplayChanges = - properties.getBoolean(Flags.FLAG_AMBIENT_TOUCH_MONITOR_LISTEN_TO_DISPLAY_CHANGES, false); - appClipsBacklinks = - properties.getBoolean(Flags.FLAG_APP_CLIPS_BACKLINKS, false); - bindKeyguardMediaVisibility = - properties.getBoolean(Flags.FLAG_BIND_KEYGUARD_MEDIA_VISIBILITY, true); - brightnessSliderFocusState = - properties.getBoolean(Flags.FLAG_BRIGHTNESS_SLIDER_FOCUS_STATE, false); - centralizedStatusBarHeightFix = - properties.getBoolean(Flags.FLAG_CENTRALIZED_STATUS_BAR_HEIGHT_FIX, true); - clipboardNoninteractiveOnLockscreen = - properties.getBoolean(Flags.FLAG_CLIPBOARD_NONINTERACTIVE_ON_LOCKSCREEN, false); - clockReactiveVariants = - properties.getBoolean(Flags.FLAG_CLOCK_REACTIVE_VARIANTS, false); - communalBouncerDoNotModifyPluginOpen = - properties.getBoolean(Flags.FLAG_COMMUNAL_BOUNCER_DO_NOT_MODIFY_PLUGIN_OPEN, false); - composeBouncer = - properties.getBoolean(Flags.FLAG_COMPOSE_BOUNCER, false); - composeLockscreen = - properties.getBoolean(Flags.FLAG_COMPOSE_LOCKSCREEN, false); - confineNotificationTouchToViewWidth = - properties.getBoolean(Flags.FLAG_CONFINE_NOTIFICATION_TOUCH_TO_VIEW_WIDTH, true); - contextualTipsAssistantDismissFix = - properties.getBoolean(Flags.FLAG_CONTEXTUAL_TIPS_ASSISTANT_DISMISS_FIX, true); - coroutineTracing = - properties.getBoolean(Flags.FLAG_COROUTINE_TRACING, true); - dedicatedNotifInflationThread = - properties.getBoolean(Flags.FLAG_DEDICATED_NOTIF_INFLATION_THREAD, true); - delayedWakelockReleaseOnBackgroundThread = - properties.getBoolean(Flags.FLAG_DELAYED_WAKELOCK_RELEASE_ON_BACKGROUND_THREAD, true); - deviceEntryUdfpsRefactor = - properties.getBoolean(Flags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR, true); - disableContextualTipsFrequencyCheck = - properties.getBoolean(Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_FREQUENCY_CHECK, true); - disableContextualTipsIosSwitcherCheck = - properties.getBoolean(Flags.FLAG_DISABLE_CONTEXTUAL_TIPS_IOS_SWITCHER_CHECK, true); - dozeuiSchedulingAlarmsBackgroundExecution = - properties.getBoolean(Flags.FLAG_DOZEUI_SCHEDULING_ALARMS_BACKGROUND_EXECUTION, false); - dreamInputSessionPilferOnce = - properties.getBoolean(Flags.FLAG_DREAM_INPUT_SESSION_PILFER_ONCE, false); - dreamOverlayBouncerSwipeDirectionFiltering = - properties.getBoolean(Flags.FLAG_DREAM_OVERLAY_BOUNCER_SWIPE_DIRECTION_FILTERING, true); - dualShade = - properties.getBoolean(Flags.FLAG_DUAL_SHADE, false); - edgeBackGestureHandlerThread = - properties.getBoolean(Flags.FLAG_EDGE_BACK_GESTURE_HANDLER_THREAD, false); - edgebackGestureHandlerGetRunningTasksBackground = - properties.getBoolean(Flags.FLAG_EDGEBACK_GESTURE_HANDLER_GET_RUNNING_TASKS_BACKGROUND, true); - enableBackgroundKeyguardOndrawnCallback = - properties.getBoolean(Flags.FLAG_ENABLE_BACKGROUND_KEYGUARD_ONDRAWN_CALLBACK, true); - enableContextualTipForMuteVolume = - properties.getBoolean(Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_MUTE_VOLUME, false); - enableContextualTipForPowerOff = - properties.getBoolean(Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_POWER_OFF, true); - enableContextualTipForTakeScreenshot = - properties.getBoolean(Flags.FLAG_ENABLE_CONTEXTUAL_TIP_FOR_TAKE_SCREENSHOT, true); - enableContextualTips = - properties.getBoolean(Flags.FLAG_ENABLE_CONTEXTUAL_TIPS, true); - enableEfficientDisplayRepository = - properties.getBoolean(Flags.FLAG_ENABLE_EFFICIENT_DISPLAY_REPOSITORY, false); - enableLayoutTracing = - properties.getBoolean(Flags.FLAG_ENABLE_LAYOUT_TRACING, false); - enableViewCaptureTracing = - properties.getBoolean(Flags.FLAG_ENABLE_VIEW_CAPTURE_TRACING, false); - enforceBrightnessBaseUserRestriction = - properties.getBoolean(Flags.FLAG_ENFORCE_BRIGHTNESS_BASE_USER_RESTRICTION, true); - exampleFlag = - properties.getBoolean(Flags.FLAG_EXAMPLE_FLAG, false); - fastUnlockTransition = - properties.getBoolean(Flags.FLAG_FAST_UNLOCK_TRANSITION, false); - fixImageWallpaperCrashSurfaceAlreadyReleased = - properties.getBoolean(Flags.FLAG_FIX_IMAGE_WALLPAPER_CRASH_SURFACE_ALREADY_RELEASED, true); - fixScreenshotActionDismissSystemWindows = - properties.getBoolean(Flags.FLAG_FIX_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS, true); - generatedPreviews = - properties.getBoolean(Flags.FLAG_GENERATED_PREVIEWS, true); - getConnectedDeviceNameUnsynchronized = - properties.getBoolean(Flags.FLAG_GET_CONNECTED_DEVICE_NAME_UNSYNCHRONIZED, true); - glanceableHubAllowKeyguardWhenDreaming = - properties.getBoolean(Flags.FLAG_GLANCEABLE_HUB_ALLOW_KEYGUARD_WHEN_DREAMING, false); - glanceableHubFullscreenSwipe = - properties.getBoolean(Flags.FLAG_GLANCEABLE_HUB_FULLSCREEN_SWIPE, false); - glanceableHubGestureHandle = - properties.getBoolean(Flags.FLAG_GLANCEABLE_HUB_GESTURE_HANDLE, false); - glanceableHubShortcutButton = - properties.getBoolean(Flags.FLAG_GLANCEABLE_HUB_SHORTCUT_BUTTON, false); - hapticBrightnessSlider = - properties.getBoolean(Flags.FLAG_HAPTIC_BRIGHTNESS_SLIDER, true); - hapticVolumeSlider = - properties.getBoolean(Flags.FLAG_HAPTIC_VOLUME_SLIDER, true); - hearingAidsQsTileDialog = - properties.getBoolean(Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG, true); - keyboardDockingIndicator = - properties.getBoolean(Flags.FLAG_KEYBOARD_DOCKING_INDICATOR, true); - keyboardShortcutHelperRewrite = - properties.getBoolean(Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE, false); - keyguardBottomAreaRefactor = - properties.getBoolean(Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, true); - keyguardWmStateRefactor = - properties.getBoolean(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR, false); - lightRevealMigration = - properties.getBoolean(Flags.FLAG_LIGHT_REVEAL_MIGRATION, true); - mediaControlsLockscreenShadeBugFix = - properties.getBoolean(Flags.FLAG_MEDIA_CONTROLS_LOCKSCREEN_SHADE_BUG_FIX, true); - mediaControlsRefactor = - properties.getBoolean(Flags.FLAG_MEDIA_CONTROLS_REFACTOR, true); - mediaControlsUserInitiatedDeleteintent = - properties.getBoolean(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT, true); - migrateClocksToBlueprint = - properties.getBoolean(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, true); - newAodTransition = - properties.getBoolean(Flags.FLAG_NEW_AOD_TRANSITION, true); - newTouchpadGesturesTutorial = - properties.getBoolean(Flags.FLAG_NEW_TOUCHPAD_GESTURES_TUTORIAL, false); - newVolumePanel = - properties.getBoolean(Flags.FLAG_NEW_VOLUME_PANEL, true); - notificationAsyncGroupHeaderInflation = - properties.getBoolean(Flags.FLAG_NOTIFICATION_ASYNC_GROUP_HEADER_INFLATION, true); - notificationAsyncHybridViewInflation = - properties.getBoolean(Flags.FLAG_NOTIFICATION_ASYNC_HYBRID_VIEW_INFLATION, true); - notificationAvalancheSuppression = - properties.getBoolean(Flags.FLAG_NOTIFICATION_AVALANCHE_SUPPRESSION, true); - notificationAvalancheThrottleHun = - properties.getBoolean(Flags.FLAG_NOTIFICATION_AVALANCHE_THROTTLE_HUN, true); - notificationBackgroundTintOptimization = - properties.getBoolean(Flags.FLAG_NOTIFICATION_BACKGROUND_TINT_OPTIMIZATION, true); - notificationColorUpdateLogger = - properties.getBoolean(Flags.FLAG_NOTIFICATION_COLOR_UPDATE_LOGGER, false); - notificationContentAlphaOptimization = - properties.getBoolean(Flags.FLAG_NOTIFICATION_CONTENT_ALPHA_OPTIMIZATION, true); - notificationFooterBackgroundTintOptimization = - properties.getBoolean(Flags.FLAG_NOTIFICATION_FOOTER_BACKGROUND_TINT_OPTIMIZATION, false); - notificationMediaManagerBackgroundExecution = - properties.getBoolean(Flags.FLAG_NOTIFICATION_MEDIA_MANAGER_BACKGROUND_EXECUTION, true); - notificationMinimalismPrototype = - properties.getBoolean(Flags.FLAG_NOTIFICATION_MINIMALISM_PROTOTYPE, false); - notificationOverExpansionClippingFix = - properties.getBoolean(Flags.FLAG_NOTIFICATION_OVER_EXPANSION_CLIPPING_FIX, true); - notificationPulsingFix = - properties.getBoolean(Flags.FLAG_NOTIFICATION_PULSING_FIX, true); - notificationRowContentBinderRefactor = - properties.getBoolean(Flags.FLAG_NOTIFICATION_ROW_CONTENT_BINDER_REFACTOR, false); - notificationRowUserContext = - properties.getBoolean(Flags.FLAG_NOTIFICATION_ROW_USER_CONTEXT, true); - notificationViewFlipperPausingV2 = - properties.getBoolean(Flags.FLAG_NOTIFICATION_VIEW_FLIPPER_PAUSING_V2, true); - notificationsBackgroundIcons = - properties.getBoolean(Flags.FLAG_NOTIFICATIONS_BACKGROUND_ICONS, false); - notificationsFooterViewRefactor = - properties.getBoolean(Flags.FLAG_NOTIFICATIONS_FOOTER_VIEW_REFACTOR, true); - notificationsHeadsUpRefactor = - properties.getBoolean(Flags.FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR, true); - notificationsHideOnDisplaySwitch = - properties.getBoolean(Flags.FLAG_NOTIFICATIONS_HIDE_ON_DISPLAY_SWITCH, false); - notificationsIconContainerRefactor = - properties.getBoolean(Flags.FLAG_NOTIFICATIONS_ICON_CONTAINER_REFACTOR, true); - notificationsImprovedHunAnimation = - properties.getBoolean(Flags.FLAG_NOTIFICATIONS_IMPROVED_HUN_ANIMATION, true); - notificationsLiveDataStoreRefactor = - properties.getBoolean(Flags.FLAG_NOTIFICATIONS_LIVE_DATA_STORE_REFACTOR, true); - notifyPowerManagerUserActivityBackground = - properties.getBoolean(Flags.FLAG_NOTIFY_POWER_MANAGER_USER_ACTIVITY_BACKGROUND, true); - pinInputFieldStyledFocusState = - properties.getBoolean(Flags.FLAG_PIN_INPUT_FIELD_STYLED_FOCUS_STATE, true); - predictiveBackAnimateBouncer = - properties.getBoolean(Flags.FLAG_PREDICTIVE_BACK_ANIMATE_BOUNCER, true); - predictiveBackAnimateDialogs = - properties.getBoolean(Flags.FLAG_PREDICTIVE_BACK_ANIMATE_DIALOGS, true); - predictiveBackAnimateShade = - properties.getBoolean(Flags.FLAG_PREDICTIVE_BACK_ANIMATE_SHADE, false); - predictiveBackSysui = - properties.getBoolean(Flags.FLAG_PREDICTIVE_BACK_SYSUI, true); - priorityPeopleSection = - properties.getBoolean(Flags.FLAG_PRIORITY_PEOPLE_SECTION, true); - privacyDotUnfoldWrongCornerFix = - properties.getBoolean(Flags.FLAG_PRIVACY_DOT_UNFOLD_WRONG_CORNER_FIX, true); - pssAppSelectorAbruptExitFix = - properties.getBoolean(Flags.FLAG_PSS_APP_SELECTOR_ABRUPT_EXIT_FIX, true); - pssAppSelectorRecentsSplitScreen = - properties.getBoolean(Flags.FLAG_PSS_APP_SELECTOR_RECENTS_SPLIT_SCREEN, true); - pssTaskSwitcher = - properties.getBoolean(Flags.FLAG_PSS_TASK_SWITCHER, false); - qsCustomTileClickGuaranteedBugFix = - properties.getBoolean(Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX, true); - qsNewPipeline = - properties.getBoolean(Flags.FLAG_QS_NEW_PIPELINE, true); - qsNewTiles = - properties.getBoolean(Flags.FLAG_QS_NEW_TILES, false); - qsNewTilesFuture = - properties.getBoolean(Flags.FLAG_QS_NEW_TILES_FUTURE, false); - qsTileFocusState = - properties.getBoolean(Flags.FLAG_QS_TILE_FOCUS_STATE, true); - qsUiRefactor = - properties.getBoolean(Flags.FLAG_QS_UI_REFACTOR, false); - quickSettingsVisualHapticsLongpress = - properties.getBoolean(Flags.FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS, true); - recordIssueQsTile = - properties.getBoolean(Flags.FLAG_RECORD_ISSUE_QS_TILE, true); - refactorGetCurrentUser = - properties.getBoolean(Flags.FLAG_REFACTOR_GET_CURRENT_USER, true); - registerBatteryControllerReceiversInCorestartable = - properties.getBoolean(Flags.FLAG_REGISTER_BATTERY_CONTROLLER_RECEIVERS_IN_CORESTARTABLE, false); - registerNewWalletCardInBackground = - properties.getBoolean(Flags.FLAG_REGISTER_NEW_WALLET_CARD_IN_BACKGROUND, true); - registerWallpaperNotifierBackground = - properties.getBoolean(Flags.FLAG_REGISTER_WALLPAPER_NOTIFIER_BACKGROUND, true); - registerZenModeContentObserverBackground = - properties.getBoolean(Flags.FLAG_REGISTER_ZEN_MODE_CONTENT_OBSERVER_BACKGROUND, true); - removeDreamOverlayHideOnTouch = - properties.getBoolean(Flags.FLAG_REMOVE_DREAM_OVERLAY_HIDE_ON_TOUCH, true); - restToUnlock = - properties.getBoolean(Flags.FLAG_REST_TO_UNLOCK, false); - restartDreamOnUnocclude = - properties.getBoolean(Flags.FLAG_RESTART_DREAM_ON_UNOCCLUDE, false); - revampedBouncerMessages = - properties.getBoolean(Flags.FLAG_REVAMPED_BOUNCER_MESSAGES, true); - runFingerprintDetectOnDismissibleKeyguard = - properties.getBoolean(Flags.FLAG_RUN_FINGERPRINT_DETECT_ON_DISMISSIBLE_KEYGUARD, true); - sceneContainer = - properties.getBoolean(Flags.FLAG_SCENE_CONTAINER, false); - screenshareNotificationHidingBugFix = - properties.getBoolean(Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX, true); - screenshotActionDismissSystemWindows = - properties.getBoolean(Flags.FLAG_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS, true); - screenshotPrivateProfileAccessibilityAnnouncementFix = - properties.getBoolean(Flags.FLAG_SCREENSHOT_PRIVATE_PROFILE_ACCESSIBILITY_ANNOUNCEMENT_FIX, true); - screenshotPrivateProfileBehaviorFix = - properties.getBoolean(Flags.FLAG_SCREENSHOT_PRIVATE_PROFILE_BEHAVIOR_FIX, true); - screenshotScrollCropViewCrashFix = - properties.getBoolean(Flags.FLAG_SCREENSHOT_SCROLL_CROP_VIEW_CRASH_FIX, true); - screenshotShelfUi2 = - properties.getBoolean(Flags.FLAG_SCREENSHOT_SHELF_UI2, true); - shadeCollapseActivityLaunchFix = - properties.getBoolean(Flags.FLAG_SHADE_COLLAPSE_ACTIVITY_LAUNCH_FIX, false); - shaderlibLoadingEffectRefactor = - properties.getBoolean(Flags.FLAG_SHADERLIB_LOADING_EFFECT_REFACTOR, true); - sliceBroadcastRelayInBackground = - properties.getBoolean(Flags.FLAG_SLICE_BROADCAST_RELAY_IN_BACKGROUND, true); - sliceManagerBinderCallBackground = - properties.getBoolean(Flags.FLAG_SLICE_MANAGER_BINDER_CALL_BACKGROUND, true); - smartspaceLockscreenViewmodel = - properties.getBoolean(Flags.FLAG_SMARTSPACE_LOCKSCREEN_VIEWMODEL, true); - smartspaceRelocateToBottom = - properties.getBoolean(Flags.FLAG_SMARTSPACE_RELOCATE_TO_BOTTOM, false); - smartspaceRemoteviewsRendering = - properties.getBoolean(Flags.FLAG_SMARTSPACE_REMOTEVIEWS_RENDERING, false); - statusBarMonochromeIconsFix = - properties.getBoolean(Flags.FLAG_STATUS_BAR_MONOCHROME_ICONS_FIX, true); - statusBarScreenSharingChips = - properties.getBoolean(Flags.FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, true); - statusBarStaticInoutIndicators = - properties.getBoolean(Flags.FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS, false); - switchUserOnBg = - properties.getBoolean(Flags.FLAG_SWITCH_USER_ON_BG, true); - sysuiTeamfood = - properties.getBoolean(Flags.FLAG_SYSUI_TEAMFOOD, true); - themeOverlayControllerWakefulnessDeprecation = - properties.getBoolean(Flags.FLAG_THEME_OVERLAY_CONTROLLER_WAKEFULNESS_DEPRECATION, false); - translucentOccludingActivityFix = - properties.getBoolean(Flags.FLAG_TRANSLUCENT_OCCLUDING_ACTIVITY_FIX, false); - truncatedStatusBarIconsFix = - properties.getBoolean(Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX, true); - udfpsViewPerformance = - properties.getBoolean(Flags.FLAG_UDFPS_VIEW_PERFORMANCE, true); - unfoldAnimationBackgroundProgress = - properties.getBoolean(Flags.FLAG_UNFOLD_ANIMATION_BACKGROUND_PROGRESS, true); - updateUserSwitcherBackground = - properties.getBoolean(Flags.FLAG_UPDATE_USER_SWITCHER_BACKGROUND, true); - validateKeyboardShortcutHelperIconUri = - properties.getBoolean(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI, true); - visualInterruptionsRefactor = - properties.getBoolean(Flags.FLAG_VISUAL_INTERRUPTIONS_REFACTOR, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace systemui " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } - systemui_is_cached = true; - } - - @Override - + @Override + + public boolean activityTransitionUseLargestWindow() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return activityTransitionUseLargestWindow; + return true; + } + + @Override + + + public boolean allowDozeTouchesForLockIcon() { + return false; + } + + @Override + + + public boolean ambientCuePlugin() { + return false; + } + + @Override + + + public boolean ambientTouchMonitorListenToDisplayChanges() { + return true; + } + + @Override + + + public boolean animationLibraryShellMigration() { + return false; + } + + @Override + + + public boolean appClipsBacklinks() { + return true; + } + + @Override + + + public boolean avalancheReplaceHunWhenCritical() { + return true; + } + + @Override + + + public boolean backButtonOnBouncer() { + return false; + } + + @Override + + + public boolean blockMouseEdgeBackGesture() { + return true; + } + + @Override + + + public boolean blurOnMoreSurfaces() { + return false; + } + + @Override + + + public boolean blurSettingsToggle() { + return true; + } + + @Override + + + public boolean bouncerUiRevamp() { + return true; + } + + @Override + + + public boolean bouncerUiRevamp2() { + return true; + } + + @Override + + + public boolean bpColors() { + return true; + } + + @Override + + + public boolean brightnessSliderFocusState() { + return false; + } + + @Override + + + public boolean captionsToggleInVolumeDialogV1() { + return true; + } + + @Override + + + public boolean checkDesktopModeForSpacialModelAppPushback() { + return false; + } + + @Override + + + public boolean classicFlagsMultiUser() { + return true; + } + + @Override + + + public boolean cleanupInstancesWhenDisplayRemoved() { + return false; + } + + @Override + + + public boolean clearShortcutIconTint() { + return true; + } + + @Override + + + public boolean clipboardOverlayMultiuser() { + return false; + } + + @Override + + + public boolean clipboardUseDescriptionMimetype() { + return true; + } + + @Override + + + public boolean clockFidgetAnimation() { + return true; + } + + @Override + + + public boolean clockModernization() { + return false; + } + + @Override + + + public boolean communalBouncerDoNotModifyPluginOpen() { + return true; + } + + @Override + + + public boolean communalEditWidgetsActivityFinishFix() { + return true; + } + + @Override + + + public boolean communalHub() { + return true; + } + + @Override + + + public boolean communalHubUseThreadPoolForWidgets() { + return true; + } + + @Override + + + public boolean communalPowerTransitionFix() { + return true; + } + + @Override + + + public boolean communalResponsiveGrid() { + return true; + } + + @Override + + + public boolean communalShadeTouchHandlingFixes() { + return true; + } + + @Override + + + public boolean communalStandaloneSupport() { + return false; + } + + @Override + + + public boolean communalTimerFlickerFix() { + return true; + } + + @Override + + + public boolean communalWidgetResizing() { + return true; + } + + @Override + + + public boolean communalWidgetTrampolineFix() { + return true; + } + + @Override + + + public boolean composeBouncer() { + return false; + } + + @Override + + + public boolean confineNotificationTouchToViewWidth() { + return false; + } + + @Override + + + public boolean contAuthPlugin() { + return true; + } + + @Override + + + public boolean coroutineTracing() { + return true; + } + + @Override + + + public boolean decoupleViewControllerInAnimlib() { + return false; + } + + @Override + + + public boolean deferDozeTransitionOnShadeDrag() { + return false; + } + + @Override + + + public boolean desktopAvControlsPopup() { + return false; + } + + @Override + + + public boolean desktopEffectsQsTile() { + return false; + } + + @Override + + + public boolean desktopSizing() { + return false; + } + + @Override + + + public boolean dialogAnimEndStateUpdate() { + return false; + } + + @Override + + + public boolean disableContextualTipsFrequencyCheck() { + return false; + } + + @Override + + + public boolean disableContextualTipsIosSwitcherCheck() { + return false; + } + + @Override + + + public boolean disableDoubleClickSwapOnBouncer() { + return false; + } + + @Override + + + public boolean disableUserSwitcherDropdownOnBouncer() { + return false; + } + + @Override + + + public boolean doNotUseImmediateCoroutineDispatcher() { + return false; + } + + @Override + + + public boolean doNotUseRunBlocking() { + return false; + } + + @Override + + + public boolean doubleTapToSleep() { + return false; + } + + @Override + + + public boolean dreamBiometricPromptFixes() { + return true; + } + + @Override + + + public boolean dreamBouncerTransitionFix() { + return true; + } + + @Override + + + public boolean dreamInputSessionPilferOnce() { + return true; + } + + @Override + + + public boolean dreamOverlayBouncerSwipeDirectionFiltering() { + return true; + } + + @Override + + + public boolean dreamOverlayUpdatedUi() { + return true; + } + + @Override + + + public boolean dreamSuppression() { + return true; + } + + @Override + + + public boolean edgeBackGestureHandlerThread() { + return false; + } + + @Override + + + public boolean edgebackGestureHandlerGetRunningTasksBackground() { + return true; + } + + @Override + + + public boolean enableBackgroundKeyguardOndrawnCallback() { + return true; + } + + @Override + + + public boolean enableConstraintLayoutLockscreenOnExternalDisplay() { + return true; + } + + @Override + + + public boolean enableContextualTipForMuteVolume() { + return true; + } + + @Override + + + public boolean enableCueBarAnimatedIcon() { + return false; + } + + @Override + + + public boolean enableDesktopGrowth() { + return false; + } + + @Override + + + public boolean enableEfficientDisplayRepository() { + return true; + } + + @Override + + + public boolean enableLayoutTracing() { + return false; + } + + @Override + + + public boolean enableMinmode() { + return true; + } + + @Override + + + public boolean enableOutputSwitcherAudioSharingButton() { + return true; + } + + @Override + + + public boolean enableSuggestedDeviceUi() { + return true; + } + + @Override + + + public boolean enableUnderlay() { + return true; + } + + @Override + + + public boolean enableViewCaptureTracing() { + return false; + } + + @Override + + + public boolean exampleFlag() { + return false; + } + + @Override + + + public boolean expandCollapsePrivacyDialog() { + return true; + } + + @Override + + + public boolean expandHeadsUpOnInlineReply() { + return true; + } + + @Override + + + public boolean expandableUseModifierImplementation() { + return true; + } + + @Override + + + public boolean expandedPrivacyIndicatorsOnLargeScreen() { + return false; + } + + @Override + + + public boolean extendedAppsShortcutCategory() { + return true; + } + + @Override + + + public boolean faceScanningAnimationNpeFix() { + return true; + } + + @Override + + + public boolean fetchBookmarksXmlKeyboardShortcuts() { + return true; + } + + @Override + + + public boolean fixShadeHeaderWrongIconSize() { + return true; + } + + @Override + + + public boolean flashlightStrength() { + return false; + } + + @Override + + + public boolean floatingMenuDragToHide() { + return false; + } + + @Override + + + public boolean floatingMenuHearingDeviceStatusIcon() { + return false; + } + + @Override + + + public boolean floatingMenuRadiiAnimation() { + return false; + } + + @Override + + + public boolean gestureBetweenHubAndLockscreenMotion() { + return true; + } + + @Override + + + public boolean getConnectedDeviceNameUnsynchronized() { + return true; + } + + @Override + + + public boolean glanceableHubAllowKeyguardWhenDreaming() { + return false; + } + + @Override + + + public boolean glanceableHubBlurredBackground() { + return true; + } + + @Override + + + public boolean glanceableHubDirectEditMode() { + return true; + } + + @Override + + + public boolean glanceableHubEnabledByDefault() { + return false; + } + + @Override + + + public boolean glanceableHubV2() { + return true; + } + + @Override + + + public boolean glanceableHubV2Resources() { + return true; + } + + @Override + + + public boolean globalActionsEmphasizedFont() { + return true; + } + + @Override + + + public boolean hardwareColorStyles() { + return true; + } + + @Override + + + public boolean hearingAidsQsTileDialog() { + return true; + } + + @Override + + + public boolean hearingDevicesDialogRelatedTools() { + return true; + } + + @Override + + + public boolean hideRingerButtonInSingleVolumeMode() { + return false; + } + + @Override + + + public boolean homeControlsDreamHsum() { + return true; + } + + @Override + + + public boolean hsuQsChanges() { + return false; + } + + @Override + + + public boolean hubBlurredByShadeFix() { + return true; + } + + @Override + + + public boolean hubEditModeTouchAdjustments() { + return true; + } + + @Override + + + public boolean hubEditModeTransition() { + return true; + } + + @Override + + + public boolean iconRefresh2025() { + return true; + } + + @Override + + + public boolean indicationTextA11yFix() { + return true; + } + + @Override + + + public boolean keyboardDockingIndicator() { + return false; + } + + @Override + + + public boolean keyboardShortcutHelperRewrite() { + return true; + } + + @Override + + + public boolean keyboardTouchpadContextualEducation() { + return true; + } + + @Override + + + public boolean keyguardTransitionForceFinishOnScreenOff() { + return false; + } + + @Override + + + public boolean keyguardWmStateRefactor() { + return false; + } + + @Override + + + public boolean largeScreenRecording() { + return false; + } + + @Override + + + public boolean largeScreenScreencapture() { + return false; + } + + @Override + + + public boolean largeScreenScreenshotAppWindow() { + return false; + } + + @Override + + + public boolean largeScreenSharing() { + return false; + } + + @Override + + + public boolean lockscreenShadeToDreamTransitionFix() { + return true; + } + + @Override + + + public boolean lowLightClockDream() { + return false; + } + + @Override + + + public boolean lowlightClockSetBrightness() { + return true; + } + + @Override + + + public boolean lowlightClockUsesKeyguardChargingStatus() { + return true; + } + + @Override + + + public boolean magneticNotificationSwipes() { + return true; + } + + @Override + + + public boolean mediaCarouselArrows() { + return true; + } + + @Override + + + public boolean mediaControlsButtonMedia3() { + return false; + } + + @Override + + + public boolean mediaControlsButtonMedia3Placement() { + return false; + } + + @Override + + + public boolean mediaControlsInCompose() { + return false; + } + + @Override + + + public boolean mediaControlsTranslationFix() { + return true; + } + + @Override + + + public boolean mediaFrameDimensionsFix() { + return true; + } + + @Override + + + public boolean mediaProjectionDialogBehindLockscreen() { + return true; + } + + @Override + + public boolean mediaProjectionGreyErrorText() { + return true; } @Override - - public boolean ambientTouchMonitorListenToDisplayChanges() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return ambientTouchMonitorListenToDisplayChanges; + + public boolean modesUiDialogPaging() { + return false; } @Override - - public boolean appClipsBacklinks() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return appClipsBacklinks; + + public boolean moveTransitionAnimationLayer() { + return true; } @Override - - public boolean bindKeyguardMediaVisibility() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return bindKeyguardMediaVisibility; + + public boolean msdlFeedback() { + return true; } @Override - - public boolean bpTalkback() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!biometrics_framework_is_cached) { - load_overrides_biometrics_framework(); - } - } - return bpTalkback; + + public boolean multiuserOpenUserSwitcherDialog() { + return true; } @Override - - public boolean brightnessSliderFocusState() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return brightnessSliderFocusState; + + public boolean multiuserWifiPickerTrackerSupport() { + return false; } @Override - - public boolean centralizedStatusBarHeightFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return centralizedStatusBarHeightFix; + + public boolean newAodTransition() { + return true; } @Override - - public boolean clipboardNoninteractiveOnLockscreen() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return clipboardNoninteractiveOnLockscreen; + + public boolean newDozingKeyguardStates() { + return true; } @Override - - public boolean clockReactiveVariants() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return clockReactiveVariants; + + public boolean newScreenRecordToolbar() { + return false; } @Override - - public boolean communalBouncerDoNotModifyPluginOpen() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return communalBouncerDoNotModifyPluginOpen; + + public boolean newVolumePanel() { + return true; } @Override - - public boolean communalHub() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!communal_is_cached) { - load_overrides_communal(); - } - } - return communalHub; + + public boolean noExpansionOnOverscroll() { + return true; } @Override - - public boolean composeBouncer() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return composeBouncer; + + public boolean noShadeBlurOnDreamStart() { + return false; } @Override - - public boolean composeLockscreen() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return composeLockscreen; + + public boolean nonTouchscreenDevicesBypassFalsing() { + return false; } @Override - - public boolean confineNotificationTouchToViewWidth() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return confineNotificationTouchToViewWidth; + + public boolean notesRoleQsTile() { + return false; } @Override - - public boolean constraintBp() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!biometrics_framework_is_cached) { - load_overrides_biometrics_framework(); - } - } - return constraintBp; + + public boolean notificationAddXOnHoverToDismiss() { + return false; } @Override - - public boolean contextualTipsAssistantDismissFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return contextualTipsAssistantDismissFix; + + public boolean notificationAmbientSuppressionAfterInflation() { + return false; } @Override - - public boolean coroutineTracing() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return coroutineTracing; + + public boolean notificationAnimatedActionsTreatment() { + return true; } @Override - - public boolean createWindowlessWindowMagnifier() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return createWindowlessWindowMagnifier; + + public boolean notificationAppearNonlinear() { + return true; } @Override - - public boolean dedicatedNotifInflationThread() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return dedicatedNotifInflationThread; + + public boolean notificationAsyncGroupHeaderInflation() { + return true; } @Override - - public boolean delayShowMagnificationButton() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return delayShowMagnificationButton; + + public boolean notificationAvalancheSuppression() { + return true; } @Override - - public boolean delayedWakelockReleaseOnBackgroundThread() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return delayedWakelockReleaseOnBackgroundThread; + + public boolean notificationAvalancheThrottleHun() { + return true; } @Override - - public boolean deviceEntryUdfpsRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return deviceEntryUdfpsRefactor; + + public boolean notificationBackgroundTintOptimization() { + return true; } @Override - - public boolean disableContextualTipsFrequencyCheck() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return disableContextualTipsFrequencyCheck; + + public boolean notificationBundleUi() { + return true; } @Override - - public boolean disableContextualTipsIosSwitcherCheck() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return disableContextualTipsIosSwitcherCheck; + + public boolean notificationChildrenContainerMinHeight() { + return false; } @Override - - public boolean dozeuiSchedulingAlarmsBackgroundExecution() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return dozeuiSchedulingAlarmsBackgroundExecution; + + public boolean notificationColorUpdateLogger() { + return false; } @Override - - public boolean dreamInputSessionPilferOnce() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return dreamInputSessionPilferOnce; + + public boolean notificationFixHunShadows() { + return false; } @Override - - public boolean dreamOverlayBouncerSwipeDirectionFiltering() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return dreamOverlayBouncerSwipeDirectionFiltering; + + public boolean notificationFooterBackgroundTintOptimization() { + return false; } @Override - - public boolean dualShade() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return dualShade; + + public boolean notificationRowIsRemovedFix() { + return true; } @Override - - public boolean edgeBackGestureHandlerThread() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return edgeBackGestureHandlerThread; + + public boolean notificationRowTransparency() { + return true; } @Override - - public boolean edgebackGestureHandlerGetRunningTasksBackground() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return edgebackGestureHandlerGetRunningTasksBackground; + + public boolean notificationShadeBlur() { + return true; } @Override - - public boolean enableBackgroundKeyguardOndrawnCallback() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableBackgroundKeyguardOndrawnCallback; + + public boolean notificationShadeUiThread() { + return false; } @Override - - public boolean enableContextualTipForMuteVolume() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableContextualTipForMuteVolume; + + public boolean notificationSkipSilentUpdates() { + return true; } @Override - - public boolean enableContextualTipForPowerOff() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableContextualTipForPowerOff; + + public boolean notificationTransparentHeaderFix() { + return true; } @Override - - public boolean enableContextualTipForTakeScreenshot() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableContextualTipForTakeScreenshot; + + public boolean notificationsHideOnDisplaySwitch() { + return false; } @Override - - public boolean enableContextualTips() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableContextualTips; + + public boolean notificationsIconContainerRefactor() { + return true; } @Override - - public boolean enableEfficientDisplayRepository() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableEfficientDisplayRepository; + + public boolean notificationsRedesignFooterView() { + return true; } @Override - - public boolean enableLayoutTracing() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableLayoutTracing; + + public boolean ongoingActivityChipsOnDream() { + return false; } @Override - - public boolean enableViewCaptureTracing() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableViewCaptureTracing; + + public boolean overrideSuppressOverlayCondition() { + return false; } @Override - - public boolean enableWidgetPickerSizeFilter() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!communal_is_cached) { - load_overrides_communal(); - } - } - return enableWidgetPickerSizeFilter; + + public boolean permissionHelperInlineUiRichOngoing() { + return false; } @Override - - public boolean enforceBrightnessBaseUserRestriction() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enforceBrightnessBaseUserRestriction; + + public boolean permissionHelperUiRichOngoing() { + return true; } @Override - - public boolean exampleFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return exampleFlag; + + public boolean physicalNotificationMovement() { + return true; } @Override - - public boolean fastUnlockTransition() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return fastUnlockTransition; + + public boolean pinInputFieldStyledFocusState() { + return true; } @Override - - public boolean fixImageWallpaperCrashSurfaceAlreadyReleased() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return fixImageWallpaperCrashSurfaceAlreadyReleased; + + public boolean predictiveBackAnimateShade() { + return false; } @Override - - public boolean fixScreenshotActionDismissSystemWindows() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return fixScreenshotActionDismissSystemWindows; + + public boolean privacyDotLiveRegion() { + return false; } @Override - - public boolean floatingMenuAnimatedTuck() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return floatingMenuAnimatedTuck; + + public boolean promoteNotificationsAutomatically() { + return false; } @Override - - public boolean floatingMenuDragToEdit() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return floatingMenuDragToEdit; + + public boolean pssTaskSwitcher() { + return false; } @Override - - public boolean floatingMenuDragToHide() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return floatingMenuDragToHide; + + public boolean qsComposeFragmentEarlyExpansion() { + return true; } @Override - - public boolean floatingMenuImeDisplacementAnimation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return floatingMenuImeDisplacementAnimation; + + public boolean qsEditModeTooltip() { + return true; } @Override - - public boolean floatingMenuNarrowTargetContentObserver() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return floatingMenuNarrowTargetContentObserver; + + public boolean qsEditModeV2() { + return false; } @Override - - public boolean floatingMenuOverlapsNavBarsFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return floatingMenuOverlapsNavBarsFlag; + + public boolean qsMaterialExpressiveTiles() { + return false; } @Override - - public boolean floatingMenuRadiiAnimation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return floatingMenuRadiiAnimation; + + public boolean qsNewTiles() { + return false; } - + @Override - - public boolean generatedPreviews() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return generatedPreviews; + + public boolean qsNewTilesFuture() { + return false; } @Override - - public boolean getConnectedDeviceNameUnsynchronized() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return getConnectedDeviceNameUnsynchronized; + + public boolean qsSplitInternetTile() { + return false; } @Override - - public boolean glanceableHubAllowKeyguardWhenDreaming() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return glanceableHubAllowKeyguardWhenDreaming; + + public boolean qsTileDetailedView() { + return false; } @Override - - public boolean glanceableHubFullscreenSwipe() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return glanceableHubFullscreenSwipe; + + public boolean qsTileFocusState() { + return true; } @Override - - public boolean glanceableHubGestureHandle() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return glanceableHubGestureHandle; + + public boolean qsTileTransitionInteractionRefinement() { + return true; } @Override - - public boolean glanceableHubShortcutButton() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return glanceableHubShortcutButton; + + public boolean qsUiRefactorComposeFragment() { + return true; } @Override - - public boolean hapticBrightnessSlider() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return hapticBrightnessSlider; + + public boolean qsWifiConfig() { + return false; } @Override - - public boolean hapticVolumeSlider() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return hapticVolumeSlider; + + public boolean recordIssueQsTile() { + return true; } @Override - - public boolean hearingAidsQsTileDialog() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return hearingAidsQsTileDialog; + + public boolean redesignMagnificationWindowSize() { + return false; } @Override - - public boolean hearingDevicesDialogRelatedTools() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return hearingDevicesDialogRelatedTools; + + public boolean registerWallpaperNotifierBackground() { + return true; } @Override - - public boolean keyboardDockingIndicator() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return keyboardDockingIndicator; + + public boolean removeDreamOverlayHideOnTouch() { + return true; } @Override - - public boolean keyboardShortcutHelperRewrite() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return keyboardShortcutHelperRewrite; + + public boolean removeNearbyShareTileAnimation() { + return false; } @Override - - public boolean keyguardBottomAreaRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return keyguardBottomAreaRefactor; + + public boolean removeUpdateListenerInQsIconViewImpl() { + return true; } @Override - - public boolean keyguardWmStateRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return keyguardWmStateRefactor; + + public boolean resetTilesRemovesCustomTiles() { + return true; } @Override - - public boolean lightRevealMigration() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return lightRevealMigration; + + public boolean restToUnlock() { + return false; } @Override - - public boolean mediaControlsLockscreenShadeBugFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return mediaControlsLockscreenShadeBugFix; + + public boolean restartDreamOnUnocclude() { + return false; } @Override - - public boolean mediaControlsRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return mediaControlsRefactor; + + public boolean restoreShowTapsSetting() { + return true; } @Override - - public boolean mediaControlsUserInitiatedDeleteintent() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return mediaControlsUserInitiatedDeleteintent; + + public boolean restrictCommunalAppWidgetHostListening() { + return true; } @Override - - public boolean migrateClocksToBlueprint() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return migrateClocksToBlueprint; + + public boolean restrictCommunalShadeToWhenIdle() { + return true; } @Override - - public boolean newAodTransition() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return newAodTransition; + + public boolean revampedBouncerMessages() { + return true; } @Override - - public boolean newTouchpadGesturesTutorial() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return newTouchpadGesturesTutorial; + + public boolean runFingerprintDetectOnDismissibleKeyguard() { + return false; } @Override - - public boolean newVolumePanel() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return newVolumePanel; + + public boolean sceneContainer() { + return false; } @Override - - public boolean notificationAsyncGroupHeaderInflation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationAsyncGroupHeaderInflation; + + public boolean screenOffAnimationGuardEnabled() { + return true; } @Override - - public boolean notificationAsyncHybridViewInflation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationAsyncHybridViewInflation; + + public boolean screenReactions() { + return false; } @Override - - public boolean notificationAvalancheSuppression() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationAvalancheSuppression; + + public boolean screenshareNotificationHidingBugFix() { + return true; } @Override - - public boolean notificationAvalancheThrottleHun() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationAvalancheThrottleHun; + + public boolean screenshotAnnounceLiveRegion() { + return true; } @Override - - public boolean notificationBackgroundTintOptimization() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationBackgroundTintOptimization; + + public boolean screenshotDismissalSpring() { + return false; } @Override - - public boolean notificationColorUpdateLogger() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationColorUpdateLogger; + + public boolean screenshotForceShutterSound() { + return true; } @Override - - public boolean notificationContentAlphaOptimization() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationContentAlphaOptimization; + + public boolean screenshotMultidisplayFocusChange() { + return true; } @Override - - public boolean notificationFooterBackgroundTintOptimization() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationFooterBackgroundTintOptimization; + + public boolean screenshotPolicySplitAndDesktopMode() { + return true; } @Override - - public boolean notificationMediaManagerBackgroundExecution() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationMediaManagerBackgroundExecution; + + public boolean screenshotScrollCropViewCrashFix() { + return true; } @Override - - public boolean notificationMinimalismPrototype() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationMinimalismPrototype; + + public boolean scrimFix() { + return true; } @Override - - public boolean notificationOverExpansionClippingFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationOverExpansionClippingFix; + + public boolean secondaryUserWidgetHost() { + return false; } @Override - - public boolean notificationPulsingFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationPulsingFix; + + public boolean settingsExtRegisterContentObserverOnBgThread() { + return true; } @Override - - public boolean notificationRowContentBinderRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationRowContentBinderRefactor; + + public boolean shadeAppLaunchAnimationSkipInDesktop() { + return true; } @Override - - public boolean notificationRowUserContext() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationRowUserContext; + + public boolean shadeExpandsOnStatusBarLongPress() { + return true; } @Override - - public boolean notificationViewFlipperPausingV2() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationViewFlipperPausingV2; + + public boolean shadeHeaderBlurFontColor() { + return true; } @Override - - public boolean notificationsBackgroundIcons() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationsBackgroundIcons; + + public boolean shadeHeaderFontUpdate() { + return true; } @Override - - public boolean notificationsFooterViewRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationsFooterViewRefactor; + + public boolean shadeQsvisibleLogic() { + return false; } @Override - - public boolean notificationsHeadsUpRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationsHeadsUpRefactor; + + public boolean shadeWindowGoesAround() { + return true; } @Override - - public boolean notificationsHideOnDisplaySwitch() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationsHideOnDisplaySwitch; + + public boolean shaderlibLoadingEffectRefactor() { + return true; } @Override - - public boolean notificationsIconContainerRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationsIconContainerRefactor; + + public boolean shortcutHelperKeyGlyph() { + return true; } @Override - - public boolean notificationsImprovedHunAnimation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationsImprovedHunAnimation; + + public boolean shortcutHelperMultiDisplaySupport() { + return true; } @Override - - public boolean notificationsLiveDataStoreRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notificationsLiveDataStoreRefactor; + + public boolean showAudioSharingSliderInVolumePanel() { + return true; } @Override - - public boolean notifyPowerManagerUserActivityBackground() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return notifyPowerManagerUserActivityBackground; + + public boolean showClipboardIndication() { + return false; } @Override - - public boolean pinInputFieldStyledFocusState() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return pinInputFieldStyledFocusState; + + public boolean showIconInEmptyShade() { + return false; } @Override - - public boolean predictiveBackAnimateBouncer() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return predictiveBackAnimateBouncer; + + public boolean showLockedByYourWatchKeyguardIndicator() { + return false; } @Override - - public boolean predictiveBackAnimateDialogs() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return predictiveBackAnimateDialogs; + + public boolean signOutButtonOnKeyguardStatusBar() { + return false; } @Override - - public boolean predictiveBackAnimateShade() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return predictiveBackAnimateShade; + + public boolean simPinBouncerReset() { + return true; } @Override - - public boolean predictiveBackSysui() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return predictiveBackSysui; + + public boolean sliceManagerBinderCallBackground() { + return true; } @Override - - public boolean priorityPeopleSection() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return priorityPeopleSection; + + public boolean smartspaceRelocateToBottom() { + return false; } @Override - - public boolean privacyDotUnfoldWrongCornerFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return privacyDotUnfoldWrongCornerFix; + + public boolean smartspaceSwipeEventLoggingFix() { + return true; } @Override - - public boolean pssAppSelectorAbruptExitFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return pssAppSelectorAbruptExitFix; + + public boolean smartspaceViewpager2() { + return true; } @Override - - public boolean pssAppSelectorRecentsSplitScreen() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return pssAppSelectorRecentsSplitScreen; + + public boolean sounddoseCustomization() { + return true; } @Override - - public boolean pssTaskSwitcher() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return pssTaskSwitcher; + + public boolean spatialModelAppPushback() { + return true; } @Override - - public boolean qsCustomTileClickGuaranteedBugFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return qsCustomTileClickGuaranteedBugFix; + + public boolean spatialModelBouncerPushback() { + return false; } @Override - - public boolean qsNewPipeline() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return qsNewPipeline; + + public boolean spatialModelPushbackInShader() { + return true; } @Override - - public boolean qsNewTiles() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return qsNewTiles; + + public boolean stabilizeHeadsUpGroupV2() { + return true; } @Override - - public boolean qsNewTilesFuture() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return qsNewTilesFuture; + + public boolean statusBarAlwaysCheckUnderlyingNetworks() { + return true; } @Override - - public boolean qsTileFocusState() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return qsTileFocusState; + + public boolean statusBarAlwaysScheduleAutoHide() { + return false; } @Override - - public boolean qsUiRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return qsUiRefactor; + + public boolean statusBarAlwaysUseRegionSampling() { + return false; } @Override - - public boolean quickSettingsVisualHapticsLongpress() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return quickSettingsVisualHapticsLongpress; + + public boolean statusBarAppHandleTracking() { + return true; } @Override - - public boolean recordIssueQsTile() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return recordIssueQsTile; + + public boolean statusBarBatteryNoConflation() { + return true; } @Override - - public boolean refactorGetCurrentUser() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return refactorGetCurrentUser; + + public boolean statusBarCallChipUseIsHidden() { + return true; } @Override - - public boolean registerBatteryControllerReceiversInCorestartable() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return registerBatteryControllerReceiversInCorestartable; + + public boolean statusBarChipToHunAnimation() { + return false; } @Override - - public boolean registerNewWalletCardInBackground() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return registerNewWalletCardInBackground; + + public boolean statusBarChipsModernization() { + return true; } @Override - - public boolean registerWallpaperNotifierBackground() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return registerWallpaperNotifierBackground; + + public boolean statusBarChipsReturnAnimations() { + return false; } @Override - - public boolean registerZenModeContentObserverBackground() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return registerZenModeContentObserverBackground; + + public boolean statusBarDarkIconInteractorMixedFix() { + return true; } @Override - - public boolean removeDreamOverlayHideOnTouch() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return removeDreamOverlayHideOnTouch; + + public boolean statusBarDate() { + return false; } @Override - - public boolean restToUnlock() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return restToUnlock; + + public boolean statusBarFontUpdates() { + return true; } @Override - - public boolean restartDreamOnUnocclude() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return restartDreamOnUnocclude; + + public boolean statusBarForDesktop() { + return false; } @Override - - public boolean revampedBouncerMessages() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return revampedBouncerMessages; + + public boolean statusBarMobileIconKairos() { + return false; } @Override - - public boolean runFingerprintDetectOnDismissibleKeyguard() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return runFingerprintDetectOnDismissibleKeyguard; + + public boolean statusBarNoHunBehavior() { + return true; } @Override - - public boolean saveAndRestoreMagnificationSettingsButtons() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return saveAndRestoreMagnificationSettingsButtons; + + public boolean statusBarPopupChips() { + return false; } @Override - - public boolean sceneContainer() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return sceneContainer; + + public boolean statusBarPrivacyChipAnimationExemption() { + return true; } @Override - - public boolean screenshareNotificationHidingBugFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return screenshareNotificationHidingBugFix; + + public boolean statusBarRegionSampling() { + return true; } @Override - - public boolean screenshotActionDismissSystemWindows() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return screenshotActionDismissSystemWindows; + + public boolean statusBarRootModernization() { + return true; } @Override - - public boolean screenshotPrivateProfileAccessibilityAnnouncementFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return screenshotPrivateProfileAccessibilityAnnouncementFix; + + public boolean statusBarRudimentaryBattery() { + return false; } @Override - - public boolean screenshotPrivateProfileBehaviorFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return screenshotPrivateProfileBehaviorFix; + + public boolean statusBarShareDialogWithAppName() { + return true; } @Override - - public boolean screenshotScrollCropViewCrashFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return screenshotScrollCropViewCrashFix; + + public boolean statusBarShowIconsInSecureCamera() { + return false; } @Override - - public boolean screenshotShelfUi2() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return screenshotShelfUi2; + + public boolean statusBarStaticInoutIndicators() { + return false; } @Override - - public boolean shadeCollapseActivityLaunchFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return shadeCollapseActivityLaunchFix; + + public boolean statusBarSwitchToSpnFromDataSpn() { + return true; } @Override - - public boolean shaderlibLoadingEffectRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return shaderlibLoadingEffectRefactor; + + public boolean statusBarSystemStatusIconsInCompose() { + return false; } @Override - - public boolean sliceBroadcastRelayInBackground() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return sliceBroadcastRelayInBackground; + + public boolean statusBarUiThread() { + return false; } @Override - - public boolean sliceManagerBinderCallBackground() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return sliceManagerBinderCallBackground; + + public boolean statusBarUniversalBatteryDataSource() { + return true; } @Override - - public boolean smartspaceLockscreenViewmodel() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return smartspaceLockscreenViewmodel; + + public boolean stuckHearingDevicesQsTileFix() { + return true; } @Override - - public boolean smartspaceRelocateToBottom() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return smartspaceRelocateToBottom; + + public boolean switchUserOnBg() { + return true; } @Override - - public boolean smartspaceRemoteviewsRendering() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return smartspaceRemoteviewsRendering; + + public boolean sysuiIntrinsicLockDispatcher() { + return false; } @Override - - public boolean statusBarMonochromeIconsFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return statusBarMonochromeIconsFix; + + public boolean sysuiTeamfood() { + return false; } @Override - - public boolean statusBarScreenSharingChips() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return statusBarScreenSharingChips; + + public boolean themeOverlayControllerWakefulnessDeprecation() { + return false; } @Override - - public boolean statusBarStaticInoutIndicators() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return statusBarStaticInoutIndicators; + + public boolean thinScreenRecordingService() { + return false; } @Override - - public boolean switchUserOnBg() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return switchUserOnBg; + + public boolean unfoldAnimationBackgroundProgress() { + return true; } @Override - - public boolean sysuiTeamfood() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return sysuiTeamfood; + + public boolean updateKeyguardOnWakeAndUnlockEarlier() { + return true; } @Override - - public boolean themeOverlayControllerWakefulnessDeprecation() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return themeOverlayControllerWakefulnessDeprecation; + + public boolean updateUserSwitcherBackground() { + return true; } @Override - - public boolean translucentOccludingActivityFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return translucentOccludingActivityFix; + + public boolean updateWindowMagnifierBottomBoundaryWithMouse() { + return true; } @Override - - public boolean truncatedStatusBarIconsFix() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return truncatedStatusBarIconsFix; + + public boolean useAadProxSensorIfPresent() { + return false; } @Override - - public boolean udfpsViewPerformance() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return udfpsViewPerformance; + + public boolean userEncryptedSource() { + return true; } @Override - - public boolean unfoldAnimationBackgroundProgress() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return unfoldAnimationBackgroundProgress; + + public boolean userSwitcherAddSignOutOption() { + return false; } @Override - - public boolean updateUserSwitcherBackground() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return updateUserSwitcherBackground; + + public boolean visualInterruptionsRefactor() { + return true; } @Override - - public boolean validateKeyboardShortcutHelperIconUri() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return validateKeyboardShortcutHelperIconUri; + + public boolean volumeRedesign() { + return true; } @Override - - public boolean visualInterruptionsRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return visualInterruptionsRefactor; + + public boolean windowMagnificationMoveWithMouseOnEdge() { + return true; } } - diff --git a/flags/src/com/android/systemui/Flags.java b/flags/src/com/android/systemui/Flags.java index dd9dc1fb734..f5d2ead1b5d 100644 --- a/flags/src/com/android/systemui/Flags.java +++ b/flags/src/com/android/systemui/Flags.java @@ -1,63 +1,124 @@ package com.android.systemui; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + + /** @hide */ public final class Flags { /** @hide */ public static final String FLAG_ACTIVITY_TRANSITION_USE_LARGEST_WINDOW = "com.android.systemui.activity_transition_use_largest_window"; /** @hide */ + public static final String FLAG_ALLOW_DOZE_TOUCHES_FOR_LOCK_ICON = "com.android.systemui.allow_doze_touches_for_lock_icon"; + /** @hide */ + public static final String FLAG_AMBIENT_CUE_PLUGIN = "com.android.systemui.ambient_cue_plugin"; + /** @hide */ public static final String FLAG_AMBIENT_TOUCH_MONITOR_LISTEN_TO_DISPLAY_CHANGES = "com.android.systemui.ambient_touch_monitor_listen_to_display_changes"; /** @hide */ + public static final String FLAG_ANIMATION_LIBRARY_SHELL_MIGRATION = "com.android.systemui.animation_library_shell_migration"; + /** @hide */ public static final String FLAG_APP_CLIPS_BACKLINKS = "com.android.systemui.app_clips_backlinks"; /** @hide */ - public static final String FLAG_BIND_KEYGUARD_MEDIA_VISIBILITY = "com.android.systemui.bind_keyguard_media_visibility"; + public static final String FLAG_AVALANCHE_REPLACE_HUN_WHEN_CRITICAL = "com.android.systemui.avalanche_replace_hun_when_critical"; + /** @hide */ + public static final String FLAG_BACK_BUTTON_ON_BOUNCER = "com.android.systemui.back_button_on_bouncer"; + /** @hide */ + public static final String FLAG_BLOCK_MOUSE_EDGE_BACK_GESTURE = "com.android.systemui.block_mouse_edge_back_gesture"; + /** @hide */ + public static final String FLAG_BLUR_ON_MORE_SURFACES = "com.android.systemui.blur_on_more_surfaces"; /** @hide */ - public static final String FLAG_BP_TALKBACK = "com.android.systemui.bp_talkback"; + public static final String FLAG_BLUR_SETTINGS_TOGGLE = "com.android.systemui.blur_settings_toggle"; + /** @hide */ + public static final String FLAG_BOUNCER_UI_REVAMP = "com.android.systemui.bouncer_ui_revamp"; + /** @hide */ + public static final String FLAG_BOUNCER_UI_REVAMP_2 = "com.android.systemui.bouncer_ui_revamp_2"; + /** @hide */ + public static final String FLAG_BP_COLORS = "com.android.systemui.bp_colors"; /** @hide */ public static final String FLAG_BRIGHTNESS_SLIDER_FOCUS_STATE = "com.android.systemui.brightness_slider_focus_state"; /** @hide */ - public static final String FLAG_CENTRALIZED_STATUS_BAR_HEIGHT_FIX = "com.android.systemui.centralized_status_bar_height_fix"; + public static final String FLAG_CAPTIONS_TOGGLE_IN_VOLUME_DIALOG_V1 = "com.android.systemui.captions_toggle_in_volume_dialog_v1"; + /** @hide */ + public static final String FLAG_CHECK_DESKTOP_MODE_FOR_SPACIAL_MODEL_APP_PUSHBACK = "com.android.systemui.check_desktop_mode_for_spacial_model_app_pushback"; + /** @hide */ + public static final String FLAG_CLASSIC_FLAGS_MULTI_USER = "com.android.systemui.classic_flags_multi_user"; + /** @hide */ + public static final String FLAG_CLEANUP_INSTANCES_WHEN_DISPLAY_REMOVED = "com.android.systemui.cleanup_instances_when_display_removed"; + /** @hide */ + public static final String FLAG_CLEAR_SHORTCUT_ICON_TINT = "com.android.systemui.clear_shortcut_icon_tint"; + /** @hide */ + public static final String FLAG_CLIPBOARD_OVERLAY_MULTIUSER = "com.android.systemui.clipboard_overlay_multiuser"; /** @hide */ - public static final String FLAG_CLIPBOARD_NONINTERACTIVE_ON_LOCKSCREEN = "com.android.systemui.clipboard_noninteractive_on_lockscreen"; + public static final String FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE = "com.android.systemui.clipboard_use_description_mimetype"; /** @hide */ - public static final String FLAG_CLOCK_REACTIVE_VARIANTS = "com.android.systemui.clock_reactive_variants"; + public static final String FLAG_CLOCK_FIDGET_ANIMATION = "com.android.systemui.clock_fidget_animation"; + /** @hide */ + public static final String FLAG_CLOCK_MODERNIZATION = "com.android.systemui.clock_modernization"; /** @hide */ public static final String FLAG_COMMUNAL_BOUNCER_DO_NOT_MODIFY_PLUGIN_OPEN = "com.android.systemui.communal_bouncer_do_not_modify_plugin_open"; /** @hide */ + public static final String FLAG_COMMUNAL_EDIT_WIDGETS_ACTIVITY_FINISH_FIX = "com.android.systemui.communal_edit_widgets_activity_finish_fix"; + /** @hide */ public static final String FLAG_COMMUNAL_HUB = "com.android.systemui.communal_hub"; /** @hide */ - public static final String FLAG_COMPOSE_BOUNCER = "com.android.systemui.compose_bouncer"; + public static final String FLAG_COMMUNAL_HUB_USE_THREAD_POOL_FOR_WIDGETS = "com.android.systemui.communal_hub_use_thread_pool_for_widgets"; /** @hide */ - public static final String FLAG_COMPOSE_LOCKSCREEN = "com.android.systemui.compose_lockscreen"; + public static final String FLAG_COMMUNAL_POWER_TRANSITION_FIX = "com.android.systemui.communal_power_transition_fix"; /** @hide */ - public static final String FLAG_CONFINE_NOTIFICATION_TOUCH_TO_VIEW_WIDTH = "com.android.systemui.confine_notification_touch_to_view_width"; + public static final String FLAG_COMMUNAL_RESPONSIVE_GRID = "com.android.systemui.communal_responsive_grid"; + /** @hide */ + public static final String FLAG_COMMUNAL_SHADE_TOUCH_HANDLING_FIXES = "com.android.systemui.communal_shade_touch_handling_fixes"; + /** @hide */ + public static final String FLAG_COMMUNAL_STANDALONE_SUPPORT = "com.android.systemui.communal_standalone_support"; + /** @hide */ + public static final String FLAG_COMMUNAL_TIMER_FLICKER_FIX = "com.android.systemui.communal_timer_flicker_fix"; + /** @hide */ + public static final String FLAG_COMMUNAL_WIDGET_RESIZING = "com.android.systemui.communal_widget_resizing"; /** @hide */ - public static final String FLAG_CONSTRAINT_BP = "com.android.systemui.constraint_bp"; + public static final String FLAG_COMMUNAL_WIDGET_TRAMPOLINE_FIX = "com.android.systemui.communal_widget_trampoline_fix"; /** @hide */ - public static final String FLAG_CONTEXTUAL_TIPS_ASSISTANT_DISMISS_FIX = "com.android.systemui.contextual_tips_assistant_dismiss_fix"; + public static final String FLAG_COMPOSE_BOUNCER = "com.android.systemui.compose_bouncer"; + /** @hide */ + public static final String FLAG_CONFINE_NOTIFICATION_TOUCH_TO_VIEW_WIDTH = "com.android.systemui.confine_notification_touch_to_view_width"; + /** @hide */ + public static final String FLAG_CONT_AUTH_PLUGIN = "com.android.systemui.cont_auth_plugin"; /** @hide */ public static final String FLAG_COROUTINE_TRACING = "com.android.systemui.coroutine_tracing"; /** @hide */ - public static final String FLAG_CREATE_WINDOWLESS_WINDOW_MAGNIFIER = "com.android.systemui.create_windowless_window_magnifier"; + public static final String FLAG_DECOUPLE_VIEW_CONTROLLER_IN_ANIMLIB = "com.android.systemui.decouple_view_controller_in_animlib"; /** @hide */ - public static final String FLAG_DEDICATED_NOTIF_INFLATION_THREAD = "com.android.systemui.dedicated_notif_inflation_thread"; + public static final String FLAG_DEFER_DOZE_TRANSITION_ON_SHADE_DRAG = "com.android.systemui.defer_doze_transition_on_shade_drag"; /** @hide */ - public static final String FLAG_DELAY_SHOW_MAGNIFICATION_BUTTON = "com.android.systemui.delay_show_magnification_button"; + public static final String FLAG_DESKTOP_AV_CONTROLS_POPUP = "com.android.systemui.desktop_av_controls_popup"; /** @hide */ - public static final String FLAG_DELAYED_WAKELOCK_RELEASE_ON_BACKGROUND_THREAD = "com.android.systemui.delayed_wakelock_release_on_background_thread"; + public static final String FLAG_DESKTOP_EFFECTS_QS_TILE = "com.android.systemui.desktop_effects_qs_tile"; /** @hide */ - public static final String FLAG_DEVICE_ENTRY_UDFPS_REFACTOR = "com.android.systemui.device_entry_udfps_refactor"; + public static final String FLAG_DESKTOP_SIZING = "com.android.systemui.desktop_sizing"; + /** @hide */ + public static final String FLAG_DIALOG_ANIM_END_STATE_UPDATE = "com.android.systemui.dialog_anim_end_state_update"; /** @hide */ public static final String FLAG_DISABLE_CONTEXTUAL_TIPS_FREQUENCY_CHECK = "com.android.systemui.disable_contextual_tips_frequency_check"; /** @hide */ public static final String FLAG_DISABLE_CONTEXTUAL_TIPS_IOS_SWITCHER_CHECK = "com.android.systemui.disable_contextual_tips_ios_switcher_check"; /** @hide */ - public static final String FLAG_DOZEUI_SCHEDULING_ALARMS_BACKGROUND_EXECUTION = "com.android.systemui.dozeui_scheduling_alarms_background_execution"; + public static final String FLAG_DISABLE_DOUBLE_CLICK_SWAP_ON_BOUNCER = "com.android.systemui.disable_double_click_swap_on_bouncer"; + /** @hide */ + public static final String FLAG_DISABLE_USER_SWITCHER_DROPDOWN_ON_BOUNCER = "com.android.systemui.disable_user_switcher_dropdown_on_bouncer"; + /** @hide */ + public static final String FLAG_DO_NOT_USE_IMMEDIATE_COROUTINE_DISPATCHER = "com.android.systemui.do_not_use_immediate_coroutine_dispatcher"; + /** @hide */ + public static final String FLAG_DO_NOT_USE_RUN_BLOCKING = "com.android.systemui.do_not_use_run_blocking"; + /** @hide */ + public static final String FLAG_DOUBLE_TAP_TO_SLEEP = "com.android.systemui.double_tap_to_sleep"; + /** @hide */ + public static final String FLAG_DREAM_BIOMETRIC_PROMPT_FIXES = "com.android.systemui.dream_biometric_prompt_fixes"; + /** @hide */ + public static final String FLAG_DREAM_BOUNCER_TRANSITION_FIX = "com.android.systemui.dream_bouncer_transition_fix"; /** @hide */ public static final String FLAG_DREAM_INPUT_SESSION_PILFER_ONCE = "com.android.systemui.dream_input_session_pilfer_once"; /** @hide */ public static final String FLAG_DREAM_OVERLAY_BOUNCER_SWIPE_DIRECTION_FILTERING = "com.android.systemui.dream_overlay_bouncer_swipe_direction_filtering"; /** @hide */ - public static final String FLAG_DUAL_SHADE = "com.android.systemui.dual_shade"; + public static final String FLAG_DREAM_OVERLAY_UPDATED_UI = "com.android.systemui.dream_overlay_updated_ui"; + /** @hide */ + public static final String FLAG_DREAM_SUPPRESSION = "com.android.systemui.dream_suppression"; /** @hide */ public static final String FLAG_EDGE_BACK_GESTURE_HANDLER_THREAD = "com.android.systemui.edge_back_gesture_handler_thread"; /** @hide */ @@ -65,93 +126,173 @@ public final class Flags { /** @hide */ public static final String FLAG_ENABLE_BACKGROUND_KEYGUARD_ONDRAWN_CALLBACK = "com.android.systemui.enable_background_keyguard_ondrawn_callback"; /** @hide */ - public static final String FLAG_ENABLE_CONTEXTUAL_TIP_FOR_MUTE_VOLUME = "com.android.systemui.enable_contextual_tip_for_mute_volume"; + public static final String FLAG_ENABLE_CONSTRAINT_LAYOUT_LOCKSCREEN_ON_EXTERNAL_DISPLAY = "com.android.systemui.enable_constraint_layout_lockscreen_on_external_display"; /** @hide */ - public static final String FLAG_ENABLE_CONTEXTUAL_TIP_FOR_POWER_OFF = "com.android.systemui.enable_contextual_tip_for_power_off"; + public static final String FLAG_ENABLE_CONTEXTUAL_TIP_FOR_MUTE_VOLUME = "com.android.systemui.enable_contextual_tip_for_mute_volume"; /** @hide */ - public static final String FLAG_ENABLE_CONTEXTUAL_TIP_FOR_TAKE_SCREENSHOT = "com.android.systemui.enable_contextual_tip_for_take_screenshot"; + public static final String FLAG_ENABLE_CUE_BAR_ANIMATED_ICON = "com.android.systemui.enable_cue_bar_animated_icon"; /** @hide */ - public static final String FLAG_ENABLE_CONTEXTUAL_TIPS = "com.android.systemui.enable_contextual_tips"; + public static final String FLAG_ENABLE_DESKTOP_GROWTH = "com.android.systemui.enable_desktop_growth"; /** @hide */ public static final String FLAG_ENABLE_EFFICIENT_DISPLAY_REPOSITORY = "com.android.systemui.enable_efficient_display_repository"; /** @hide */ public static final String FLAG_ENABLE_LAYOUT_TRACING = "com.android.systemui.enable_layout_tracing"; /** @hide */ - public static final String FLAG_ENABLE_VIEW_CAPTURE_TRACING = "com.android.systemui.enable_view_capture_tracing"; + public static final String FLAG_ENABLE_MINMODE = "com.android.systemui.enable_minmode"; + /** @hide */ + public static final String FLAG_ENABLE_OUTPUT_SWITCHER_AUDIO_SHARING_BUTTON = "com.android.systemui.enable_output_switcher_audio_sharing_button"; /** @hide */ - public static final String FLAG_ENABLE_WIDGET_PICKER_SIZE_FILTER = "com.android.systemui.enable_widget_picker_size_filter"; + public static final String FLAG_ENABLE_SUGGESTED_DEVICE_UI = "com.android.systemui.enable_suggested_device_ui"; /** @hide */ - public static final String FLAG_ENFORCE_BRIGHTNESS_BASE_USER_RESTRICTION = "com.android.systemui.enforce_brightness_base_user_restriction"; + public static final String FLAG_ENABLE_UNDERLAY = "com.android.systemui.enable_underlay"; + /** @hide */ + public static final String FLAG_ENABLE_VIEW_CAPTURE_TRACING = "com.android.systemui.enable_view_capture_tracing"; /** @hide */ public static final String FLAG_EXAMPLE_FLAG = "com.android.systemui.example_flag"; /** @hide */ - public static final String FLAG_FAST_UNLOCK_TRANSITION = "com.android.systemui.fast_unlock_transition"; + public static final String FLAG_EXPAND_COLLAPSE_PRIVACY_DIALOG = "com.android.systemui.expand_collapse_privacy_dialog"; /** @hide */ - public static final String FLAG_FIX_IMAGE_WALLPAPER_CRASH_SURFACE_ALREADY_RELEASED = "com.android.systemui.fix_image_wallpaper_crash_surface_already_released"; + public static final String FLAG_EXPAND_HEADS_UP_ON_INLINE_REPLY = "com.android.systemui.expand_heads_up_on_inline_reply"; /** @hide */ - public static final String FLAG_FIX_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS = "com.android.systemui.fix_screenshot_action_dismiss_system_windows"; + public static final String FLAG_EXPANDABLE_USE_MODIFIER_IMPLEMENTATION = "com.android.systemui.expandable_use_modifier_implementation"; /** @hide */ - public static final String FLAG_FLOATING_MENU_ANIMATED_TUCK = "com.android.systemui.floating_menu_animated_tuck"; + public static final String FLAG_EXPANDED_PRIVACY_INDICATORS_ON_LARGE_SCREEN = "com.android.systemui.expanded_privacy_indicators_on_large_screen"; /** @hide */ - public static final String FLAG_FLOATING_MENU_DRAG_TO_EDIT = "com.android.systemui.floating_menu_drag_to_edit"; + public static final String FLAG_EXTENDED_APPS_SHORTCUT_CATEGORY = "com.android.systemui.extended_apps_shortcut_category"; /** @hide */ - public static final String FLAG_FLOATING_MENU_DRAG_TO_HIDE = "com.android.systemui.floating_menu_drag_to_hide"; + public static final String FLAG_FACE_SCANNING_ANIMATION_NPE_FIX = "com.android.systemui.face_scanning_animation_npe_fix"; + /** @hide */ + public static final String FLAG_FETCH_BOOKMARKS_XML_KEYBOARD_SHORTCUTS = "com.android.systemui.fetch_bookmarks_xml_keyboard_shortcuts"; /** @hide */ - public static final String FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION = "com.android.systemui.floating_menu_ime_displacement_animation"; + public static final String FLAG_FIX_SHADE_HEADER_WRONG_ICON_SIZE = "com.android.systemui.fix_shade_header_wrong_icon_size"; /** @hide */ - public static final String FLAG_FLOATING_MENU_NARROW_TARGET_CONTENT_OBSERVER = "com.android.systemui.floating_menu_narrow_target_content_observer"; + public static final String FLAG_FLASHLIGHT_STRENGTH = "com.android.systemui.flashlight_strength"; /** @hide */ - public static final String FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG = "com.android.systemui.floating_menu_overlaps_nav_bars_flag"; + public static final String FLAG_FLOATING_MENU_DRAG_TO_HIDE = "com.android.systemui.floating_menu_drag_to_hide"; + /** @hide */ + public static final String FLAG_FLOATING_MENU_HEARING_DEVICE_STATUS_ICON = "com.android.systemui.floating_menu_hearing_device_status_icon"; /** @hide */ public static final String FLAG_FLOATING_MENU_RADII_ANIMATION = "com.android.systemui.floating_menu_radii_animation"; /** @hide */ - public static final String FLAG_GENERATED_PREVIEWS = "android.appwidget.flags.generated_previews"; + public static final String FLAG_GESTURE_BETWEEN_HUB_AND_LOCKSCREEN_MOTION = "com.android.systemui.gesture_between_hub_and_lockscreen_motion"; /** @hide */ public static final String FLAG_GET_CONNECTED_DEVICE_NAME_UNSYNCHRONIZED = "com.android.systemui.get_connected_device_name_unsynchronized"; /** @hide */ public static final String FLAG_GLANCEABLE_HUB_ALLOW_KEYGUARD_WHEN_DREAMING = "com.android.systemui.glanceable_hub_allow_keyguard_when_dreaming"; /** @hide */ - public static final String FLAG_GLANCEABLE_HUB_FULLSCREEN_SWIPE = "com.android.systemui.glanceable_hub_fullscreen_swipe"; + public static final String FLAG_GLANCEABLE_HUB_BLURRED_BACKGROUND = "com.android.systemui.glanceable_hub_blurred_background"; + /** @hide */ + public static final String FLAG_GLANCEABLE_HUB_DIRECT_EDIT_MODE = "com.android.systemui.glanceable_hub_direct_edit_mode"; + /** @hide */ + public static final String FLAG_GLANCEABLE_HUB_ENABLED_BY_DEFAULT = "com.android.systemui.glanceable_hub_enabled_by_default"; /** @hide */ - public static final String FLAG_GLANCEABLE_HUB_GESTURE_HANDLE = "com.android.systemui.glanceable_hub_gesture_handle"; + public static final String FLAG_GLANCEABLE_HUB_V2 = "com.android.systemui.glanceable_hub_v2"; /** @hide */ - public static final String FLAG_GLANCEABLE_HUB_SHORTCUT_BUTTON = "com.android.systemui.glanceable_hub_shortcut_button"; + public static final String FLAG_GLANCEABLE_HUB_V2_RESOURCES = "com.android.systemui.glanceable_hub_v2_resources"; /** @hide */ - public static final String FLAG_HAPTIC_BRIGHTNESS_SLIDER = "com.android.systemui.haptic_brightness_slider"; + public static final String FLAG_GLOBAL_ACTIONS_EMPHASIZED_FONT = "com.android.systemui.global_actions_emphasized_font"; /** @hide */ - public static final String FLAG_HAPTIC_VOLUME_SLIDER = "com.android.systemui.haptic_volume_slider"; + public static final String FLAG_HARDWARE_COLOR_STYLES = "com.android.systemui.hardware_color_styles"; /** @hide */ public static final String FLAG_HEARING_AIDS_QS_TILE_DIALOG = "com.android.systemui.hearing_aids_qs_tile_dialog"; /** @hide */ public static final String FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS = "com.android.systemui.hearing_devices_dialog_related_tools"; /** @hide */ + public static final String FLAG_HIDE_RINGER_BUTTON_IN_SINGLE_VOLUME_MODE = "com.android.systemui.hide_ringer_button_in_single_volume_mode"; + /** @hide */ + public static final String FLAG_HOME_CONTROLS_DREAM_HSUM = "com.android.systemui.home_controls_dream_hsum"; + /** @hide */ + public static final String FLAG_HSU_QS_CHANGES = "com.android.systemui.hsu_qs_changes"; + /** @hide */ + public static final String FLAG_HUB_BLURRED_BY_SHADE_FIX = "com.android.systemui.hub_blurred_by_shade_fix"; + /** @hide */ + public static final String FLAG_HUB_EDIT_MODE_TOUCH_ADJUSTMENTS = "com.android.systemui.hub_edit_mode_touch_adjustments"; + /** @hide */ + public static final String FLAG_HUB_EDIT_MODE_TRANSITION = "com.android.systemui.hub_edit_mode_transition"; + /** @hide */ + public static final String FLAG_ICON_REFRESH_2025 = "com.android.systemui.icon_refresh_2025"; + /** @hide */ + public static final String FLAG_INDICATION_TEXT_A11Y_FIX = "com.android.systemui.indication_text_a11y_fix"; + /** @hide */ public static final String FLAG_KEYBOARD_DOCKING_INDICATOR = "com.android.systemui.keyboard_docking_indicator"; /** @hide */ public static final String FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE = "com.android.systemui.keyboard_shortcut_helper_rewrite"; /** @hide */ - public static final String FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR = "com.android.systemui.keyguard_bottom_area_refactor"; + public static final String FLAG_KEYBOARD_TOUCHPAD_CONTEXTUAL_EDUCATION = "com.android.systemui.keyboard_touchpad_contextual_education"; + /** @hide */ + public static final String FLAG_KEYGUARD_TRANSITION_FORCE_FINISH_ON_SCREEN_OFF = "com.android.systemui.keyguard_transition_force_finish_on_screen_off"; /** @hide */ public static final String FLAG_KEYGUARD_WM_STATE_REFACTOR = "com.android.systemui.keyguard_wm_state_refactor"; /** @hide */ - public static final String FLAG_LIGHT_REVEAL_MIGRATION = "com.android.systemui.light_reveal_migration"; + public static final String FLAG_LARGE_SCREEN_RECORDING = "com.android.systemui.large_screen_recording"; + /** @hide */ + public static final String FLAG_LARGE_SCREEN_SCREENCAPTURE = "com.android.systemui.large_screen_screencapture"; + /** @hide */ + public static final String FLAG_LARGE_SCREEN_SCREENSHOT_APP_WINDOW = "com.android.systemui.large_screen_screenshot_app_window"; + /** @hide */ + public static final String FLAG_LARGE_SCREEN_SHARING = "com.android.systemui.large_screen_sharing"; + /** @hide */ + public static final String FLAG_LOCKSCREEN_SHADE_TO_DREAM_TRANSITION_FIX = "com.android.systemui.lockscreen_shade_to_dream_transition_fix"; + /** @hide */ + public static final String FLAG_LOW_LIGHT_CLOCK_DREAM = "com.android.systemui.low_light_clock_dream"; + /** @hide */ + public static final String FLAG_LOWLIGHT_CLOCK_SET_BRIGHTNESS = "com.android.systemui.lowlight_clock_set_brightness"; + /** @hide */ + public static final String FLAG_LOWLIGHT_CLOCK_USES_KEYGUARD_CHARGING_STATUS = "com.android.systemui.lowlight_clock_uses_keyguard_charging_status"; /** @hide */ - public static final String FLAG_MEDIA_CONTROLS_LOCKSCREEN_SHADE_BUG_FIX = "com.android.systemui.media_controls_lockscreen_shade_bug_fix"; + public static final String FLAG_MAGNETIC_NOTIFICATION_SWIPES = "com.android.systemui.magnetic_notification_swipes"; /** @hide */ - public static final String FLAG_MEDIA_CONTROLS_REFACTOR = "com.android.systemui.media_controls_refactor"; + public static final String FLAG_MEDIA_CAROUSEL_ARROWS = "com.android.systemui.media_carousel_arrows"; /** @hide */ - public static final String FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT = "com.android.systemui.media_controls_user_initiated_deleteintent"; + public static final String FLAG_MEDIA_CONTROLS_BUTTON_MEDIA3 = "com.android.systemui.media_controls_button_media3"; /** @hide */ - public static final String FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT = "com.android.systemui.migrate_clocks_to_blueprint"; + public static final String FLAG_MEDIA_CONTROLS_BUTTON_MEDIA3_PLACEMENT = "com.android.systemui.media_controls_button_media3_placement"; + /** @hide */ + public static final String FLAG_MEDIA_CONTROLS_IN_COMPOSE = "com.android.systemui.media_controls_in_compose"; + /** @hide */ + public static final String FLAG_MEDIA_CONTROLS_TRANSLATION_FIX = "com.android.systemui.media_controls_translation_fix"; + /** @hide */ + public static final String FLAG_MEDIA_FRAME_DIMENSIONS_FIX = "com.android.systemui.media_frame_dimensions_fix"; + /** @hide */ + public static final String FLAG_MEDIA_PROJECTION_DIALOG_BEHIND_LOCKSCREEN = "com.android.systemui.media_projection_dialog_behind_lockscreen"; + /** @hide */ + public static final String FLAG_MEDIA_PROJECTION_GREY_ERROR_TEXT = "com.android.systemui.media_projection_grey_error_text"; + /** @hide */ + public static final String FLAG_MODES_UI_DIALOG_PAGING = "com.android.systemui.modes_ui_dialog_paging"; + /** @hide */ + public static final String FLAG_MOVE_TRANSITION_ANIMATION_LAYER = "com.android.systemui.move_transition_animation_layer"; + /** @hide */ + public static final String FLAG_MSDL_FEEDBACK = "com.android.systemui.msdl_feedback"; + /** @hide */ + public static final String FLAG_MULTIUSER_OPEN_USER_SWITCHER_DIALOG = "com.android.systemui.multiuser_open_user_switcher_dialog"; + /** @hide */ + public static final String FLAG_MULTIUSER_WIFI_PICKER_TRACKER_SUPPORT = "com.android.systemui.multiuser_wifi_picker_tracker_support"; /** @hide */ public static final String FLAG_NEW_AOD_TRANSITION = "com.android.systemui.new_aod_transition"; /** @hide */ - public static final String FLAG_NEW_TOUCHPAD_GESTURES_TUTORIAL = "com.android.systemui.new_touchpad_gestures_tutorial"; + public static final String FLAG_NEW_DOZING_KEYGUARD_STATES = "com.android.systemui.new_dozing_keyguard_states"; + /** @hide */ + public static final String FLAG_NEW_SCREEN_RECORD_TOOLBAR = "com.android.systemui.new_screen_record_toolbar"; /** @hide */ public static final String FLAG_NEW_VOLUME_PANEL = "com.android.systemui.new_volume_panel"; /** @hide */ - public static final String FLAG_NOTIFICATION_ASYNC_GROUP_HEADER_INFLATION = "com.android.systemui.notification_async_group_header_inflation"; + public static final String FLAG_NO_EXPANSION_ON_OVERSCROLL = "com.android.systemui.no_expansion_on_overscroll"; + /** @hide */ + public static final String FLAG_NO_SHADE_BLUR_ON_DREAM_START = "com.android.systemui.no_shade_blur_on_dream_start"; + /** @hide */ + public static final String FLAG_NON_TOUCHSCREEN_DEVICES_BYPASS_FALSING = "com.android.systemui.non_touchscreen_devices_bypass_falsing"; + /** @hide */ + public static final String FLAG_NOTES_ROLE_QS_TILE = "com.android.systemui.notes_role_qs_tile"; + /** @hide */ + public static final String FLAG_NOTIFICATION_ADD_X_ON_HOVER_TO_DISMISS = "com.android.systemui.notification_add_x_on_hover_to_dismiss"; /** @hide */ - public static final String FLAG_NOTIFICATION_ASYNC_HYBRID_VIEW_INFLATION = "com.android.systemui.notification_async_hybrid_view_inflation"; + public static final String FLAG_NOTIFICATION_AMBIENT_SUPPRESSION_AFTER_INFLATION = "com.android.systemui.notification_ambient_suppression_after_inflation"; + /** @hide */ + public static final String FLAG_NOTIFICATION_ANIMATED_ACTIONS_TREATMENT = "com.android.systemui.notification_animated_actions_treatment"; + /** @hide */ + public static final String FLAG_NOTIFICATION_APPEAR_NONLINEAR = "com.android.systemui.notification_appear_nonlinear"; + /** @hide */ + public static final String FLAG_NOTIFICATION_ASYNC_GROUP_HEADER_INFLATION = "com.android.systemui.notification_async_group_header_inflation"; /** @hide */ public static final String FLAG_NOTIFICATION_AVALANCHE_SUPPRESSION = "com.android.systemui.notification_avalanche_suppression"; /** @hide */ @@ -159,762 +300,1934 @@ public final class Flags { /** @hide */ public static final String FLAG_NOTIFICATION_BACKGROUND_TINT_OPTIMIZATION = "com.android.systemui.notification_background_tint_optimization"; /** @hide */ - public static final String FLAG_NOTIFICATION_COLOR_UPDATE_LOGGER = "com.android.systemui.notification_color_update_logger"; - /** @hide */ - public static final String FLAG_NOTIFICATION_CONTENT_ALPHA_OPTIMIZATION = "com.android.systemui.notification_content_alpha_optimization"; - /** @hide */ - public static final String FLAG_NOTIFICATION_FOOTER_BACKGROUND_TINT_OPTIMIZATION = "com.android.systemui.notification_footer_background_tint_optimization"; + public static final String FLAG_NOTIFICATION_BUNDLE_UI = "com.android.systemui.notification_bundle_ui"; /** @hide */ - public static final String FLAG_NOTIFICATION_MEDIA_MANAGER_BACKGROUND_EXECUTION = "com.android.systemui.notification_media_manager_background_execution"; + public static final String FLAG_NOTIFICATION_CHILDREN_CONTAINER_MIN_HEIGHT = "com.android.systemui.notification_children_container_min_height"; /** @hide */ - public static final String FLAG_NOTIFICATION_MINIMALISM_PROTOTYPE = "com.android.systemui.notification_minimalism_prototype"; + public static final String FLAG_NOTIFICATION_COLOR_UPDATE_LOGGER = "com.android.systemui.notification_color_update_logger"; /** @hide */ - public static final String FLAG_NOTIFICATION_OVER_EXPANSION_CLIPPING_FIX = "com.android.systemui.notification_over_expansion_clipping_fix"; + public static final String FLAG_NOTIFICATION_FIX_HUN_SHADOWS = "com.android.systemui.notification_fix_hun_shadows"; /** @hide */ - public static final String FLAG_NOTIFICATION_PULSING_FIX = "com.android.systemui.notification_pulsing_fix"; + public static final String FLAG_NOTIFICATION_FOOTER_BACKGROUND_TINT_OPTIMIZATION = "com.android.systemui.notification_footer_background_tint_optimization"; /** @hide */ - public static final String FLAG_NOTIFICATION_ROW_CONTENT_BINDER_REFACTOR = "com.android.systemui.notification_row_content_binder_refactor"; + public static final String FLAG_NOTIFICATION_ROW_IS_REMOVED_FIX = "com.android.systemui.notification_row_is_removed_fix"; /** @hide */ - public static final String FLAG_NOTIFICATION_ROW_USER_CONTEXT = "com.android.systemui.notification_row_user_context"; + public static final String FLAG_NOTIFICATION_ROW_TRANSPARENCY = "com.android.systemui.notification_row_transparency"; /** @hide */ - public static final String FLAG_NOTIFICATION_VIEW_FLIPPER_PAUSING_V2 = "com.android.systemui.notification_view_flipper_pausing_v2"; + public static final String FLAG_NOTIFICATION_SHADE_BLUR = "com.android.systemui.notification_shade_blur"; /** @hide */ - public static final String FLAG_NOTIFICATIONS_BACKGROUND_ICONS = "com.android.systemui.notifications_background_icons"; + public static final String FLAG_NOTIFICATION_SHADE_UI_THREAD = "com.android.systemui.notification_shade_ui_thread"; /** @hide */ - public static final String FLAG_NOTIFICATIONS_FOOTER_VIEW_REFACTOR = "com.android.systemui.notifications_footer_view_refactor"; + public static final String FLAG_NOTIFICATION_SKIP_SILENT_UPDATES = "com.android.systemui.notification_skip_silent_updates"; /** @hide */ - public static final String FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR = "com.android.systemui.notifications_heads_up_refactor"; + public static final String FLAG_NOTIFICATION_TRANSPARENT_HEADER_FIX = "com.android.systemui.notification_transparent_header_fix"; /** @hide */ public static final String FLAG_NOTIFICATIONS_HIDE_ON_DISPLAY_SWITCH = "com.android.systemui.notifications_hide_on_display_switch"; /** @hide */ public static final String FLAG_NOTIFICATIONS_ICON_CONTAINER_REFACTOR = "com.android.systemui.notifications_icon_container_refactor"; /** @hide */ - public static final String FLAG_NOTIFICATIONS_IMPROVED_HUN_ANIMATION = "com.android.systemui.notifications_improved_hun_animation"; + public static final String FLAG_NOTIFICATIONS_REDESIGN_FOOTER_VIEW = "com.android.systemui.notifications_redesign_footer_view"; /** @hide */ - public static final String FLAG_NOTIFICATIONS_LIVE_DATA_STORE_REFACTOR = "com.android.systemui.notifications_live_data_store_refactor"; + public static final String FLAG_ONGOING_ACTIVITY_CHIPS_ON_DREAM = "com.android.systemui.ongoing_activity_chips_on_dream"; /** @hide */ - public static final String FLAG_NOTIFY_POWER_MANAGER_USER_ACTIVITY_BACKGROUND = "com.android.systemui.notify_power_manager_user_activity_background"; + public static final String FLAG_OVERRIDE_SUPPRESS_OVERLAY_CONDITION = "com.android.systemui.override_suppress_overlay_condition"; /** @hide */ - public static final String FLAG_PIN_INPUT_FIELD_STYLED_FOCUS_STATE = "com.android.systemui.pin_input_field_styled_focus_state"; + public static final String FLAG_PERMISSION_HELPER_INLINE_UI_RICH_ONGOING = "com.android.systemui.permission_helper_inline_ui_rich_ongoing"; /** @hide */ - public static final String FLAG_PREDICTIVE_BACK_ANIMATE_BOUNCER = "com.android.systemui.predictive_back_animate_bouncer"; + public static final String FLAG_PERMISSION_HELPER_UI_RICH_ONGOING = "com.android.systemui.permission_helper_ui_rich_ongoing"; /** @hide */ - public static final String FLAG_PREDICTIVE_BACK_ANIMATE_DIALOGS = "com.android.systemui.predictive_back_animate_dialogs"; + public static final String FLAG_PHYSICAL_NOTIFICATION_MOVEMENT = "com.android.systemui.physical_notification_movement"; /** @hide */ - public static final String FLAG_PREDICTIVE_BACK_ANIMATE_SHADE = "com.android.systemui.predictive_back_animate_shade"; + public static final String FLAG_PIN_INPUT_FIELD_STYLED_FOCUS_STATE = "com.android.systemui.pin_input_field_styled_focus_state"; /** @hide */ - public static final String FLAG_PREDICTIVE_BACK_SYSUI = "com.android.systemui.predictive_back_sysui"; + public static final String FLAG_PREDICTIVE_BACK_ANIMATE_SHADE = "com.android.systemui.predictive_back_animate_shade"; /** @hide */ - public static final String FLAG_PRIORITY_PEOPLE_SECTION = "com.android.systemui.priority_people_section"; + public static final String FLAG_PRIVACY_DOT_LIVE_REGION = "com.android.systemui.privacy_dot_live_region"; /** @hide */ - public static final String FLAG_PRIVACY_DOT_UNFOLD_WRONG_CORNER_FIX = "com.android.systemui.privacy_dot_unfold_wrong_corner_fix"; + public static final String FLAG_PROMOTE_NOTIFICATIONS_AUTOMATICALLY = "com.android.systemui.promote_notifications_automatically"; /** @hide */ - public static final String FLAG_PSS_APP_SELECTOR_ABRUPT_EXIT_FIX = "com.android.systemui.pss_app_selector_abrupt_exit_fix"; + public static final String FLAG_PSS_TASK_SWITCHER = "com.android.systemui.pss_task_switcher"; /** @hide */ - public static final String FLAG_PSS_APP_SELECTOR_RECENTS_SPLIT_SCREEN = "com.android.systemui.pss_app_selector_recents_split_screen"; + public static final String FLAG_QS_COMPOSE_FRAGMENT_EARLY_EXPANSION = "com.android.systemui.qs_compose_fragment_early_expansion"; /** @hide */ - public static final String FLAG_PSS_TASK_SWITCHER = "com.android.systemui.pss_task_switcher"; + public static final String FLAG_QS_EDIT_MODE_TOOLTIP = "com.android.systemui.qs_edit_mode_tooltip"; /** @hide */ - public static final String FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX = "com.android.systemui.qs_custom_tile_click_guaranteed_bug_fix"; + public static final String FLAG_QS_EDIT_MODE_V2 = "com.android.systemui.qs_edit_mode_v2"; /** @hide */ - public static final String FLAG_QS_NEW_PIPELINE = "com.android.systemui.qs_new_pipeline"; + public static final String FLAG_QS_MATERIAL_EXPRESSIVE_TILES = "com.android.systemui.qs_material_expressive_tiles"; /** @hide */ public static final String FLAG_QS_NEW_TILES = "com.android.systemui.qs_new_tiles"; /** @hide */ public static final String FLAG_QS_NEW_TILES_FUTURE = "com.android.systemui.qs_new_tiles_future"; /** @hide */ + public static final String FLAG_QS_SPLIT_INTERNET_TILE = "com.android.systemui.qs_split_internet_tile"; + /** @hide */ + public static final String FLAG_QS_TILE_DETAILED_VIEW = "com.android.systemui.qs_tile_detailed_view"; + /** @hide */ public static final String FLAG_QS_TILE_FOCUS_STATE = "com.android.systemui.qs_tile_focus_state"; /** @hide */ - public static final String FLAG_QS_UI_REFACTOR = "com.android.systemui.qs_ui_refactor"; + public static final String FLAG_QS_TILE_TRANSITION_INTERACTION_REFINEMENT = "com.android.systemui.qs_tile_transition_interaction_refinement"; /** @hide */ - public static final String FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS = "com.android.systemui.quick_settings_visual_haptics_longpress"; + public static final String FLAG_QS_UI_REFACTOR_COMPOSE_FRAGMENT = "com.android.systemui.qs_ui_refactor_compose_fragment"; + /** @hide */ + public static final String FLAG_QS_WIFI_CONFIG = "com.android.systemui.qs_wifi_config"; /** @hide */ public static final String FLAG_RECORD_ISSUE_QS_TILE = "com.android.systemui.record_issue_qs_tile"; /** @hide */ - public static final String FLAG_REFACTOR_GET_CURRENT_USER = "com.android.systemui.refactor_get_current_user"; + public static final String FLAG_REDESIGN_MAGNIFICATION_WINDOW_SIZE = "com.android.systemui.redesign_magnification_window_size"; /** @hide */ - public static final String FLAG_REGISTER_BATTERY_CONTROLLER_RECEIVERS_IN_CORESTARTABLE = "com.android.systemui.register_battery_controller_receivers_in_corestartable"; + public static final String FLAG_REGISTER_WALLPAPER_NOTIFIER_BACKGROUND = "com.android.systemui.register_wallpaper_notifier_background"; /** @hide */ - public static final String FLAG_REGISTER_NEW_WALLET_CARD_IN_BACKGROUND = "com.android.systemui.register_new_wallet_card_in_background"; + public static final String FLAG_REMOVE_DREAM_OVERLAY_HIDE_ON_TOUCH = "com.android.systemui.remove_dream_overlay_hide_on_touch"; /** @hide */ - public static final String FLAG_REGISTER_WALLPAPER_NOTIFIER_BACKGROUND = "com.android.systemui.register_wallpaper_notifier_background"; + public static final String FLAG_REMOVE_NEARBY_SHARE_TILE_ANIMATION = "com.android.systemui.remove_nearby_share_tile_animation"; /** @hide */ - public static final String FLAG_REGISTER_ZEN_MODE_CONTENT_OBSERVER_BACKGROUND = "com.android.systemui.register_zen_mode_content_observer_background"; + public static final String FLAG_REMOVE_UPDATE_LISTENER_IN_QS_ICON_VIEW_IMPL = "com.android.systemui.remove_update_listener_in_qs_icon_view_impl"; /** @hide */ - public static final String FLAG_REMOVE_DREAM_OVERLAY_HIDE_ON_TOUCH = "com.android.systemui.remove_dream_overlay_hide_on_touch"; + public static final String FLAG_RESET_TILES_REMOVES_CUSTOM_TILES = "com.android.systemui.reset_tiles_removes_custom_tiles"; /** @hide */ public static final String FLAG_REST_TO_UNLOCK = "com.android.systemui.rest_to_unlock"; /** @hide */ public static final String FLAG_RESTART_DREAM_ON_UNOCCLUDE = "com.android.systemui.restart_dream_on_unocclude"; /** @hide */ + public static final String FLAG_RESTORE_SHOW_TAPS_SETTING = "com.android.systemui.restore_show_taps_setting"; + /** @hide */ + public static final String FLAG_RESTRICT_COMMUNAL_APP_WIDGET_HOST_LISTENING = "com.android.systemui.restrict_communal_app_widget_host_listening"; + /** @hide */ + public static final String FLAG_RESTRICT_COMMUNAL_SHADE_TO_WHEN_IDLE = "com.android.systemui.restrict_communal_shade_to_when_idle"; + /** @hide */ public static final String FLAG_REVAMPED_BOUNCER_MESSAGES = "com.android.systemui.revamped_bouncer_messages"; /** @hide */ public static final String FLAG_RUN_FINGERPRINT_DETECT_ON_DISMISSIBLE_KEYGUARD = "com.android.systemui.run_fingerprint_detect_on_dismissible_keyguard"; /** @hide */ - public static final String FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS = "com.android.systemui.save_and_restore_magnification_settings_buttons"; - /** @hide */ public static final String FLAG_SCENE_CONTAINER = "com.android.systemui.scene_container"; /** @hide */ + public static final String FLAG_SCREEN_OFF_ANIMATION_GUARD_ENABLED = "com.android.systemui.screen_off_animation_guard_enabled"; + /** @hide */ + public static final String FLAG_SCREEN_REACTIONS = "com.android.systemui.screen_reactions"; + /** @hide */ public static final String FLAG_SCREENSHARE_NOTIFICATION_HIDING_BUG_FIX = "com.android.systemui.screenshare_notification_hiding_bug_fix"; /** @hide */ - public static final String FLAG_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS = "com.android.systemui.screenshot_action_dismiss_system_windows"; + public static final String FLAG_SCREENSHOT_ANNOUNCE_LIVE_REGION = "com.android.systemui.screenshot_announce_live_region"; + /** @hide */ + public static final String FLAG_SCREENSHOT_DISMISSAL_SPRING = "com.android.systemui.screenshot_dismissal_spring"; /** @hide */ - public static final String FLAG_SCREENSHOT_PRIVATE_PROFILE_ACCESSIBILITY_ANNOUNCEMENT_FIX = "com.android.systemui.screenshot_private_profile_accessibility_announcement_fix"; + public static final String FLAG_SCREENSHOT_FORCE_SHUTTER_SOUND = "com.android.systemui.screenshot_force_shutter_sound"; /** @hide */ - public static final String FLAG_SCREENSHOT_PRIVATE_PROFILE_BEHAVIOR_FIX = "com.android.systemui.screenshot_private_profile_behavior_fix"; + public static final String FLAG_SCREENSHOT_MULTIDISPLAY_FOCUS_CHANGE = "com.android.systemui.screenshot_multidisplay_focus_change"; + /** @hide */ + public static final String FLAG_SCREENSHOT_POLICY_SPLIT_AND_DESKTOP_MODE = "com.android.systemui.screenshot_policy_split_and_desktop_mode"; /** @hide */ public static final String FLAG_SCREENSHOT_SCROLL_CROP_VIEW_CRASH_FIX = "com.android.systemui.screenshot_scroll_crop_view_crash_fix"; /** @hide */ - public static final String FLAG_SCREENSHOT_SHELF_UI2 = "com.android.systemui.screenshot_shelf_ui2"; + public static final String FLAG_SCRIM_FIX = "com.android.systemui.scrim_fix"; + /** @hide */ + public static final String FLAG_SECONDARY_USER_WIDGET_HOST = "com.android.systemui.secondary_user_widget_host"; /** @hide */ - public static final String FLAG_SHADE_COLLAPSE_ACTIVITY_LAUNCH_FIX = "com.android.systemui.shade_collapse_activity_launch_fix"; + public static final String FLAG_SETTINGS_EXT_REGISTER_CONTENT_OBSERVER_ON_BG_THREAD = "com.android.systemui.settings_ext_register_content_observer_on_bg_thread"; + /** @hide */ + public static final String FLAG_SHADE_APP_LAUNCH_ANIMATION_SKIP_IN_DESKTOP = "com.android.systemui.shade_app_launch_animation_skip_in_desktop"; + /** @hide */ + public static final String FLAG_SHADE_EXPANDS_ON_STATUS_BAR_LONG_PRESS = "com.android.systemui.shade_expands_on_status_bar_long_press"; + /** @hide */ + public static final String FLAG_SHADE_HEADER_BLUR_FONT_COLOR = "com.android.systemui.shade_header_blur_font_color"; + /** @hide */ + public static final String FLAG_SHADE_HEADER_FONT_UPDATE = "com.android.systemui.shade_header_font_update"; + /** @hide */ + public static final String FLAG_SHADE_QSVISIBLE_LOGIC = "com.android.systemui.shade_qsvisible_logic"; + /** @hide */ + public static final String FLAG_SHADE_WINDOW_GOES_AROUND = "com.android.systemui.shade_window_goes_around"; /** @hide */ public static final String FLAG_SHADERLIB_LOADING_EFFECT_REFACTOR = "com.android.systemui.shaderlib_loading_effect_refactor"; /** @hide */ - public static final String FLAG_SLICE_BROADCAST_RELAY_IN_BACKGROUND = "com.android.systemui.slice_broadcast_relay_in_background"; + public static final String FLAG_SHORTCUT_HELPER_KEY_GLYPH = "com.android.systemui.shortcut_helper_key_glyph"; /** @hide */ - public static final String FLAG_SLICE_MANAGER_BINDER_CALL_BACKGROUND = "com.android.systemui.slice_manager_binder_call_background"; + public static final String FLAG_SHORTCUT_HELPER_MULTI_DISPLAY_SUPPORT = "com.android.systemui.shortcut_helper_multi_display_support"; + /** @hide */ + public static final String FLAG_SHOW_AUDIO_SHARING_SLIDER_IN_VOLUME_PANEL = "com.android.systemui.show_audio_sharing_slider_in_volume_panel"; /** @hide */ - public static final String FLAG_SMARTSPACE_LOCKSCREEN_VIEWMODEL = "com.android.systemui.smartspace_lockscreen_viewmodel"; + public static final String FLAG_SHOW_CLIPBOARD_INDICATION = "com.android.systemui.show_clipboard_indication"; + /** @hide */ + public static final String FLAG_SHOW_ICON_IN_EMPTY_SHADE = "com.android.systemui.show_icon_in_empty_shade"; + /** @hide */ + public static final String FLAG_SHOW_LOCKED_BY_YOUR_WATCH_KEYGUARD_INDICATOR = "com.android.systemui.show_locked_by_your_watch_keyguard_indicator"; + /** @hide */ + public static final String FLAG_SIGN_OUT_BUTTON_ON_KEYGUARD_STATUS_BAR = "com.android.systemui.sign_out_button_on_keyguard_status_bar"; + /** @hide */ + public static final String FLAG_SIM_PIN_BOUNCER_RESET = "com.android.systemui.sim_pin_bouncer_reset"; + /** @hide */ + public static final String FLAG_SLICE_MANAGER_BINDER_CALL_BACKGROUND = "com.android.systemui.slice_manager_binder_call_background"; /** @hide */ public static final String FLAG_SMARTSPACE_RELOCATE_TO_BOTTOM = "com.android.systemui.smartspace_relocate_to_bottom"; /** @hide */ - public static final String FLAG_SMARTSPACE_REMOTEVIEWS_RENDERING = "com.android.systemui.smartspace_remoteviews_rendering"; + public static final String FLAG_SMARTSPACE_SWIPE_EVENT_LOGGING_FIX = "com.android.systemui.smartspace_swipe_event_logging_fix"; + /** @hide */ + public static final String FLAG_SMARTSPACE_VIEWPAGER2 = "com.android.systemui.smartspace_viewpager2"; + /** @hide */ + public static final String FLAG_SOUNDDOSE_CUSTOMIZATION = "com.android.systemui.sounddose_customization"; /** @hide */ - public static final String FLAG_STATUS_BAR_MONOCHROME_ICONS_FIX = "com.android.systemui.status_bar_monochrome_icons_fix"; + public static final String FLAG_SPATIAL_MODEL_APP_PUSHBACK = "com.android.systemui.spatial_model_app_pushback"; /** @hide */ - public static final String FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS = "com.android.systemui.status_bar_screen_sharing_chips"; + public static final String FLAG_SPATIAL_MODEL_BOUNCER_PUSHBACK = "com.android.systemui.spatial_model_bouncer_pushback"; + /** @hide */ + public static final String FLAG_SPATIAL_MODEL_PUSHBACK_IN_SHADER = "com.android.systemui.spatial_model_pushback_in_shader"; + /** @hide */ + public static final String FLAG_STABILIZE_HEADS_UP_GROUP_V2 = "com.android.systemui.stabilize_heads_up_group_v2"; + /** @hide */ + public static final String FLAG_STATUS_BAR_ALWAYS_CHECK_UNDERLYING_NETWORKS = "com.android.systemui.status_bar_always_check_underlying_networks"; + /** @hide */ + public static final String FLAG_STATUS_BAR_ALWAYS_SCHEDULE_AUTO_HIDE = "com.android.systemui.status_bar_always_schedule_auto_hide"; + /** @hide */ + public static final String FLAG_STATUS_BAR_ALWAYS_USE_REGION_SAMPLING = "com.android.systemui.status_bar_always_use_region_sampling"; + /** @hide */ + public static final String FLAG_STATUS_BAR_APP_HANDLE_TRACKING = "com.android.systemui.status_bar_app_handle_tracking"; + /** @hide */ + public static final String FLAG_STATUS_BAR_BATTERY_NO_CONFLATION = "com.android.systemui.status_bar_battery_no_conflation"; + /** @hide */ + public static final String FLAG_STATUS_BAR_CALL_CHIP_USE_IS_HIDDEN = "com.android.systemui.status_bar_call_chip_use_is_hidden"; + /** @hide */ + public static final String FLAG_STATUS_BAR_CHIP_TO_HUN_ANIMATION = "com.android.systemui.status_bar_chip_to_hun_animation"; + /** @hide */ + public static final String FLAG_STATUS_BAR_CHIPS_MODERNIZATION = "com.android.systemui.status_bar_chips_modernization"; + /** @hide */ + public static final String FLAG_STATUS_BAR_CHIPS_RETURN_ANIMATIONS = "com.android.systemui.status_bar_chips_return_animations"; + /** @hide */ + public static final String FLAG_STATUS_BAR_DARK_ICON_INTERACTOR_MIXED_FIX = "com.android.systemui.status_bar_dark_icon_interactor_mixed_fix"; + /** @hide */ + public static final String FLAG_STATUS_BAR_DATE = "com.android.systemui.status_bar_date"; + /** @hide */ + public static final String FLAG_STATUS_BAR_FONT_UPDATES = "com.android.systemui.status_bar_font_updates"; + /** @hide */ + public static final String FLAG_STATUS_BAR_FOR_DESKTOP = "com.android.systemui.status_bar_for_desktop"; + /** @hide */ + public static final String FLAG_STATUS_BAR_MOBILE_ICON_KAIROS = "com.android.systemui.status_bar_mobile_icon_kairos"; + /** @hide */ + public static final String FLAG_STATUS_BAR_NO_HUN_BEHAVIOR = "com.android.systemui.status_bar_no_hun_behavior"; + /** @hide */ + public static final String FLAG_STATUS_BAR_POPUP_CHIPS = "com.android.systemui.status_bar_popup_chips"; + /** @hide */ + public static final String FLAG_STATUS_BAR_PRIVACY_CHIP_ANIMATION_EXEMPTION = "com.android.systemui.status_bar_privacy_chip_animation_exemption"; + /** @hide */ + public static final String FLAG_STATUS_BAR_REGION_SAMPLING = "com.android.systemui.status_bar_region_sampling"; + /** @hide */ + public static final String FLAG_STATUS_BAR_ROOT_MODERNIZATION = "com.android.systemui.status_bar_root_modernization"; + /** @hide */ + public static final String FLAG_STATUS_BAR_RUDIMENTARY_BATTERY = "com.android.systemui.status_bar_rudimentary_battery"; + /** @hide */ + public static final String FLAG_STATUS_BAR_SHARE_DIALOG_WITH_APP_NAME = "com.android.systemui.status_bar_share_dialog_with_app_name"; + /** @hide */ + public static final String FLAG_STATUS_BAR_SHOW_ICONS_IN_SECURE_CAMERA = "com.android.systemui.status_bar_show_icons_in_secure_camera"; /** @hide */ public static final String FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS = "com.android.systemui.status_bar_static_inout_indicators"; /** @hide */ + public static final String FLAG_STATUS_BAR_SWITCH_TO_SPN_FROM_DATA_SPN = "com.android.systemui.status_bar_switch_to_spn_from_data_spn"; + /** @hide */ + public static final String FLAG_STATUS_BAR_SYSTEM_STATUS_ICONS_IN_COMPOSE = "com.android.systemui.status_bar_system_status_icons_in_compose"; + /** @hide */ + public static final String FLAG_STATUS_BAR_UI_THREAD = "com.android.systemui.status_bar_ui_thread"; + /** @hide */ + public static final String FLAG_STATUS_BAR_UNIVERSAL_BATTERY_DATA_SOURCE = "com.android.systemui.status_bar_universal_battery_data_source"; + /** @hide */ + public static final String FLAG_STUCK_HEARING_DEVICES_QS_TILE_FIX = "com.android.systemui.stuck_hearing_devices_qs_tile_fix"; + /** @hide */ public static final String FLAG_SWITCH_USER_ON_BG = "com.android.systemui.switch_user_on_bg"; /** @hide */ + public static final String FLAG_SYSUI_INTRINSIC_LOCK_DISPATCHER = "com.android.systemui.sysui_intrinsic_lock_dispatcher"; + /** @hide */ public static final String FLAG_SYSUI_TEAMFOOD = "com.android.systemui.sysui_teamfood"; /** @hide */ public static final String FLAG_THEME_OVERLAY_CONTROLLER_WAKEFULNESS_DEPRECATION = "com.android.systemui.theme_overlay_controller_wakefulness_deprecation"; /** @hide */ - public static final String FLAG_TRANSLUCENT_OCCLUDING_ACTIVITY_FIX = "com.android.systemui.translucent_occluding_activity_fix"; - /** @hide */ - public static final String FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX = "com.android.systemui.truncated_status_bar_icons_fix"; - /** @hide */ - public static final String FLAG_UDFPS_VIEW_PERFORMANCE = "com.android.systemui.udfps_view_performance"; + public static final String FLAG_THIN_SCREEN_RECORDING_SERVICE = "com.android.systemui.thin_screen_recording_service"; /** @hide */ public static final String FLAG_UNFOLD_ANIMATION_BACKGROUND_PROGRESS = "com.android.systemui.unfold_animation_background_progress"; /** @hide */ + public static final String FLAG_UPDATE_KEYGUARD_ON_WAKE_AND_UNLOCK_EARLIER = "com.android.systemui.update_keyguard_on_wake_and_unlock_earlier"; + /** @hide */ public static final String FLAG_UPDATE_USER_SWITCHER_BACKGROUND = "com.android.systemui.update_user_switcher_background"; /** @hide */ - public static final String FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI = "com.android.systemui.validate_keyboard_shortcut_helper_icon_uri"; + public static final String FLAG_UPDATE_WINDOW_MAGNIFIER_BOTTOM_BOUNDARY_WITH_MOUSE = "com.android.systemui.update_window_magnifier_bottom_boundary_with_mouse"; + /** @hide */ + public static final String FLAG_USE_AAD_PROX_SENSOR_IF_PRESENT = "com.android.systemui.use_aad_prox_sensor_if_present"; + /** @hide */ + public static final String FLAG_USER_ENCRYPTED_SOURCE = "com.android.systemui.user_encrypted_source"; + /** @hide */ + public static final String FLAG_USER_SWITCHER_ADD_SIGN_OUT_OPTION = "com.android.systemui.user_switcher_add_sign_out_option"; /** @hide */ public static final String FLAG_VISUAL_INTERRUPTIONS_REFACTOR = "com.android.systemui.visual_interruptions_refactor"; - + /** @hide */ + public static final String FLAG_VOLUME_REDESIGN = "com.android.systemui.volume_redesign"; + /** @hide */ + public static final String FLAG_WINDOW_MAGNIFICATION_MOVE_WITH_MOUSE_ON_EDGE = "com.android.systemui.window_magnification_move_with_mouse_on_edge"; + + public static boolean activityTransitionUseLargestWindow() { + return FEATURE_FLAGS.activityTransitionUseLargestWindow(); } - + + + public static boolean allowDozeTouchesForLockIcon() { + + return FEATURE_FLAGS.allowDozeTouchesForLockIcon(); + } + + + public static boolean ambientCuePlugin() { + + return FEATURE_FLAGS.ambientCuePlugin(); + } + + public static boolean ambientTouchMonitorListenToDisplayChanges() { + return FEATURE_FLAGS.ambientTouchMonitorListenToDisplayChanges(); } - + + + public static boolean animationLibraryShellMigration() { + + return FEATURE_FLAGS.animationLibraryShellMigration(); + } + + public static boolean appClipsBacklinks() { + return FEATURE_FLAGS.appClipsBacklinks(); } - - public static boolean bindKeyguardMediaVisibility() { - return FEATURE_FLAGS.bindKeyguardMediaVisibility(); - } - - public static boolean bpTalkback() { - return FEATURE_FLAGS.bpTalkback(); + + + public static boolean avalancheReplaceHunWhenCritical() { + + return FEATURE_FLAGS.avalancheReplaceHunWhenCritical(); } - - public static boolean brightnessSliderFocusState() { - return FEATURE_FLAGS.brightnessSliderFocusState(); + + + public static boolean backButtonOnBouncer() { + + return FEATURE_FLAGS.backButtonOnBouncer(); } - - public static boolean centralizedStatusBarHeightFix() { - return FEATURE_FLAGS.centralizedStatusBarHeightFix(); + + + public static boolean blockMouseEdgeBackGesture() { + + return FEATURE_FLAGS.blockMouseEdgeBackGesture(); } - - public static boolean clipboardNoninteractiveOnLockscreen() { - return FEATURE_FLAGS.clipboardNoninteractiveOnLockscreen(); + + + public static boolean blurOnMoreSurfaces() { + + return FEATURE_FLAGS.blurOnMoreSurfaces(); } - - public static boolean clockReactiveVariants() { - return FEATURE_FLAGS.clockReactiveVariants(); + + + public static boolean blurSettingsToggle() { + + return FEATURE_FLAGS.blurSettingsToggle(); } - - public static boolean communalBouncerDoNotModifyPluginOpen() { - return FEATURE_FLAGS.communalBouncerDoNotModifyPluginOpen(); + + + public static boolean bouncerUiRevamp() { + + return FEATURE_FLAGS.bouncerUiRevamp(); } - - public static boolean communalHub() { - return FEATURE_FLAGS.communalHub(); + + + public static boolean bouncerUiRevamp2() { + + return FEATURE_FLAGS.bouncerUiRevamp2(); } - - public static boolean composeBouncer() { - return FEATURE_FLAGS.composeBouncer(); + + + public static boolean bpColors() { + + return FEATURE_FLAGS.bpColors(); } - - public static boolean composeLockscreen() { - return FEATURE_FLAGS.composeLockscreen(); + + + public static boolean brightnessSliderFocusState() { + + return FEATURE_FLAGS.brightnessSliderFocusState(); } - - public static boolean confineNotificationTouchToViewWidth() { - return FEATURE_FLAGS.confineNotificationTouchToViewWidth(); + + + public static boolean captionsToggleInVolumeDialogV1() { + + return FEATURE_FLAGS.captionsToggleInVolumeDialogV1(); } - - public static boolean constraintBp() { - return FEATURE_FLAGS.constraintBp(); + + + public static boolean checkDesktopModeForSpacialModelAppPushback() { + + return FEATURE_FLAGS.checkDesktopModeForSpacialModelAppPushback(); } - - public static boolean contextualTipsAssistantDismissFix() { - return FEATURE_FLAGS.contextualTipsAssistantDismissFix(); + + + public static boolean classicFlagsMultiUser() { + + return FEATURE_FLAGS.classicFlagsMultiUser(); } - - public static boolean coroutineTracing() { - return FEATURE_FLAGS.coroutineTracing(); + + + public static boolean cleanupInstancesWhenDisplayRemoved() { + + return FEATURE_FLAGS.cleanupInstancesWhenDisplayRemoved(); } - - public static boolean createWindowlessWindowMagnifier() { - return FEATURE_FLAGS.createWindowlessWindowMagnifier(); + + + public static boolean clearShortcutIconTint() { + + return FEATURE_FLAGS.clearShortcutIconTint(); } - - public static boolean dedicatedNotifInflationThread() { - return FEATURE_FLAGS.dedicatedNotifInflationThread(); + + + public static boolean clipboardOverlayMultiuser() { + + return FEATURE_FLAGS.clipboardOverlayMultiuser(); } - - public static boolean delayShowMagnificationButton() { - return FEATURE_FLAGS.delayShowMagnificationButton(); + + + public static boolean clipboardUseDescriptionMimetype() { + + return FEATURE_FLAGS.clipboardUseDescriptionMimetype(); } - - public static boolean delayedWakelockReleaseOnBackgroundThread() { - return FEATURE_FLAGS.delayedWakelockReleaseOnBackgroundThread(); + + + public static boolean clockFidgetAnimation() { + + return FEATURE_FLAGS.clockFidgetAnimation(); } - - public static boolean deviceEntryUdfpsRefactor() { - return FEATURE_FLAGS.deviceEntryUdfpsRefactor(); + + + public static boolean clockModernization() { + + return FEATURE_FLAGS.clockModernization(); } - - public static boolean disableContextualTipsFrequencyCheck() { - return FEATURE_FLAGS.disableContextualTipsFrequencyCheck(); + + + public static boolean communalBouncerDoNotModifyPluginOpen() { + + return FEATURE_FLAGS.communalBouncerDoNotModifyPluginOpen(); } - - public static boolean disableContextualTipsIosSwitcherCheck() { - return FEATURE_FLAGS.disableContextualTipsIosSwitcherCheck(); + + + public static boolean communalEditWidgetsActivityFinishFix() { + + return FEATURE_FLAGS.communalEditWidgetsActivityFinishFix(); } - - public static boolean dozeuiSchedulingAlarmsBackgroundExecution() { - return FEATURE_FLAGS.dozeuiSchedulingAlarmsBackgroundExecution(); + + + public static boolean communalHub() { + + return FEATURE_FLAGS.communalHub(); } - - public static boolean dreamInputSessionPilferOnce() { - return FEATURE_FLAGS.dreamInputSessionPilferOnce(); + + + public static boolean communalHubUseThreadPoolForWidgets() { + + return FEATURE_FLAGS.communalHubUseThreadPoolForWidgets(); } - - public static boolean dreamOverlayBouncerSwipeDirectionFiltering() { - return FEATURE_FLAGS.dreamOverlayBouncerSwipeDirectionFiltering(); + + + public static boolean communalPowerTransitionFix() { + + return FEATURE_FLAGS.communalPowerTransitionFix(); } - - public static boolean dualShade() { - return FEATURE_FLAGS.dualShade(); + + + public static boolean communalResponsiveGrid() { + + return FEATURE_FLAGS.communalResponsiveGrid(); } - + + + public static boolean communalShadeTouchHandlingFixes() { + + return FEATURE_FLAGS.communalShadeTouchHandlingFixes(); + } + + + public static boolean communalStandaloneSupport() { + + return FEATURE_FLAGS.communalStandaloneSupport(); + } + + + public static boolean communalTimerFlickerFix() { + + return FEATURE_FLAGS.communalTimerFlickerFix(); + } + + + public static boolean communalWidgetResizing() { + + return FEATURE_FLAGS.communalWidgetResizing(); + } + + + public static boolean communalWidgetTrampolineFix() { + + return FEATURE_FLAGS.communalWidgetTrampolineFix(); + } + + + public static boolean composeBouncer() { + + return FEATURE_FLAGS.composeBouncer(); + } + + + public static boolean confineNotificationTouchToViewWidth() { + + return FEATURE_FLAGS.confineNotificationTouchToViewWidth(); + } + + + public static boolean contAuthPlugin() { + + return FEATURE_FLAGS.contAuthPlugin(); + } + + + public static boolean coroutineTracing() { + + return FEATURE_FLAGS.coroutineTracing(); + } + + + public static boolean decoupleViewControllerInAnimlib() { + + return FEATURE_FLAGS.decoupleViewControllerInAnimlib(); + } + + + public static boolean deferDozeTransitionOnShadeDrag() { + + return FEATURE_FLAGS.deferDozeTransitionOnShadeDrag(); + } + + + public static boolean desktopAvControlsPopup() { + + return FEATURE_FLAGS.desktopAvControlsPopup(); + } + + + public static boolean desktopEffectsQsTile() { + + return FEATURE_FLAGS.desktopEffectsQsTile(); + } + + + public static boolean desktopSizing() { + + return FEATURE_FLAGS.desktopSizing(); + } + + + public static boolean dialogAnimEndStateUpdate() { + + return FEATURE_FLAGS.dialogAnimEndStateUpdate(); + } + + + public static boolean disableContextualTipsFrequencyCheck() { + + return FEATURE_FLAGS.disableContextualTipsFrequencyCheck(); + } + + + public static boolean disableContextualTipsIosSwitcherCheck() { + + return FEATURE_FLAGS.disableContextualTipsIosSwitcherCheck(); + } + + + public static boolean disableDoubleClickSwapOnBouncer() { + + return FEATURE_FLAGS.disableDoubleClickSwapOnBouncer(); + } + + + public static boolean disableUserSwitcherDropdownOnBouncer() { + + return FEATURE_FLAGS.disableUserSwitcherDropdownOnBouncer(); + } + + + public static boolean doNotUseImmediateCoroutineDispatcher() { + + return FEATURE_FLAGS.doNotUseImmediateCoroutineDispatcher(); + } + + + public static boolean doNotUseRunBlocking() { + + return FEATURE_FLAGS.doNotUseRunBlocking(); + } + + + public static boolean doubleTapToSleep() { + + return FEATURE_FLAGS.doubleTapToSleep(); + } + + + public static boolean dreamBiometricPromptFixes() { + + return FEATURE_FLAGS.dreamBiometricPromptFixes(); + } + + + public static boolean dreamBouncerTransitionFix() { + + return FEATURE_FLAGS.dreamBouncerTransitionFix(); + } + + + public static boolean dreamInputSessionPilferOnce() { + + return FEATURE_FLAGS.dreamInputSessionPilferOnce(); + } + + + public static boolean dreamOverlayBouncerSwipeDirectionFiltering() { + + return FEATURE_FLAGS.dreamOverlayBouncerSwipeDirectionFiltering(); + } + + + public static boolean dreamOverlayUpdatedUi() { + + return FEATURE_FLAGS.dreamOverlayUpdatedUi(); + } + + + public static boolean dreamSuppression() { + + return FEATURE_FLAGS.dreamSuppression(); + } + + public static boolean edgeBackGestureHandlerThread() { + return FEATURE_FLAGS.edgeBackGestureHandlerThread(); } - + + public static boolean edgebackGestureHandlerGetRunningTasksBackground() { + return FEATURE_FLAGS.edgebackGestureHandlerGetRunningTasksBackground(); } - + + public static boolean enableBackgroundKeyguardOndrawnCallback() { + return FEATURE_FLAGS.enableBackgroundKeyguardOndrawnCallback(); } - + + + public static boolean enableConstraintLayoutLockscreenOnExternalDisplay() { + + return FEATURE_FLAGS.enableConstraintLayoutLockscreenOnExternalDisplay(); + } + + public static boolean enableContextualTipForMuteVolume() { + return FEATURE_FLAGS.enableContextualTipForMuteVolume(); } - - public static boolean enableContextualTipForPowerOff() { - return FEATURE_FLAGS.enableContextualTipForPowerOff(); - } - - public static boolean enableContextualTipForTakeScreenshot() { - return FEATURE_FLAGS.enableContextualTipForTakeScreenshot(); + + + public static boolean enableCueBarAnimatedIcon() { + + return FEATURE_FLAGS.enableCueBarAnimatedIcon(); } - - public static boolean enableContextualTips() { - return FEATURE_FLAGS.enableContextualTips(); + + + public static boolean enableDesktopGrowth() { + + return FEATURE_FLAGS.enableDesktopGrowth(); } - + + public static boolean enableEfficientDisplayRepository() { + return FEATURE_FLAGS.enableEfficientDisplayRepository(); } - + + public static boolean enableLayoutTracing() { + return FEATURE_FLAGS.enableLayoutTracing(); } - - public static boolean enableViewCaptureTracing() { - return FEATURE_FLAGS.enableViewCaptureTracing(); + + + public static boolean enableMinmode() { + + return FEATURE_FLAGS.enableMinmode(); + } + + + public static boolean enableOutputSwitcherAudioSharingButton() { + + return FEATURE_FLAGS.enableOutputSwitcherAudioSharingButton(); + } + + + public static boolean enableSuggestedDeviceUi() { + + return FEATURE_FLAGS.enableSuggestedDeviceUi(); } - - public static boolean enableWidgetPickerSizeFilter() { - return FEATURE_FLAGS.enableWidgetPickerSizeFilter(); + + + public static boolean enableUnderlay() { + + return FEATURE_FLAGS.enableUnderlay(); } - - public static boolean enforceBrightnessBaseUserRestriction() { - return FEATURE_FLAGS.enforceBrightnessBaseUserRestriction(); + + + public static boolean enableViewCaptureTracing() { + + return FEATURE_FLAGS.enableViewCaptureTracing(); } - + + public static boolean exampleFlag() { + return FEATURE_FLAGS.exampleFlag(); } - - public static boolean fastUnlockTransition() { - return FEATURE_FLAGS.fastUnlockTransition(); + + + public static boolean expandCollapsePrivacyDialog() { + + return FEATURE_FLAGS.expandCollapsePrivacyDialog(); + } + + + public static boolean expandHeadsUpOnInlineReply() { + + return FEATURE_FLAGS.expandHeadsUpOnInlineReply(); + } + + + public static boolean expandableUseModifierImplementation() { + + return FEATURE_FLAGS.expandableUseModifierImplementation(); } - - public static boolean fixImageWallpaperCrashSurfaceAlreadyReleased() { - return FEATURE_FLAGS.fixImageWallpaperCrashSurfaceAlreadyReleased(); + + + public static boolean expandedPrivacyIndicatorsOnLargeScreen() { + + return FEATURE_FLAGS.expandedPrivacyIndicatorsOnLargeScreen(); } - - public static boolean fixScreenshotActionDismissSystemWindows() { - return FEATURE_FLAGS.fixScreenshotActionDismissSystemWindows(); + + + public static boolean extendedAppsShortcutCategory() { + + return FEATURE_FLAGS.extendedAppsShortcutCategory(); } - - public static boolean floatingMenuAnimatedTuck() { - return FEATURE_FLAGS.floatingMenuAnimatedTuck(); + + + public static boolean faceScanningAnimationNpeFix() { + + return FEATURE_FLAGS.faceScanningAnimationNpeFix(); } - - public static boolean floatingMenuDragToEdit() { - return FEATURE_FLAGS.floatingMenuDragToEdit(); + + + public static boolean fetchBookmarksXmlKeyboardShortcuts() { + + return FEATURE_FLAGS.fetchBookmarksXmlKeyboardShortcuts(); } - - public static boolean floatingMenuDragToHide() { - return FEATURE_FLAGS.floatingMenuDragToHide(); + + + public static boolean fixShadeHeaderWrongIconSize() { + + return FEATURE_FLAGS.fixShadeHeaderWrongIconSize(); } - - public static boolean floatingMenuImeDisplacementAnimation() { - return FEATURE_FLAGS.floatingMenuImeDisplacementAnimation(); + + + public static boolean flashlightStrength() { + + return FEATURE_FLAGS.flashlightStrength(); } - - public static boolean floatingMenuNarrowTargetContentObserver() { - return FEATURE_FLAGS.floatingMenuNarrowTargetContentObserver(); + + + public static boolean floatingMenuDragToHide() { + + return FEATURE_FLAGS.floatingMenuDragToHide(); } - - public static boolean floatingMenuOverlapsNavBarsFlag() { - return FEATURE_FLAGS.floatingMenuOverlapsNavBarsFlag(); + + + public static boolean floatingMenuHearingDeviceStatusIcon() { + + return FEATURE_FLAGS.floatingMenuHearingDeviceStatusIcon(); } - + + public static boolean floatingMenuRadiiAnimation() { + return FEATURE_FLAGS.floatingMenuRadiiAnimation(); } - public static boolean generatedPreviews() { - return FEATURE_FLAGS.generatedPreviews(); + + public static boolean gestureBetweenHubAndLockscreenMotion() { + + return FEATURE_FLAGS.gestureBetweenHubAndLockscreenMotion(); } - + + public static boolean getConnectedDeviceNameUnsynchronized() { + return FEATURE_FLAGS.getConnectedDeviceNameUnsynchronized(); } - + + public static boolean glanceableHubAllowKeyguardWhenDreaming() { + return FEATURE_FLAGS.glanceableHubAllowKeyguardWhenDreaming(); } - - public static boolean glanceableHubFullscreenSwipe() { - return FEATURE_FLAGS.glanceableHubFullscreenSwipe(); + + + public static boolean glanceableHubBlurredBackground() { + + return FEATURE_FLAGS.glanceableHubBlurredBackground(); + } + + + public static boolean glanceableHubDirectEditMode() { + + return FEATURE_FLAGS.glanceableHubDirectEditMode(); + } + + + public static boolean glanceableHubEnabledByDefault() { + + return FEATURE_FLAGS.glanceableHubEnabledByDefault(); } - - public static boolean glanceableHubGestureHandle() { - return FEATURE_FLAGS.glanceableHubGestureHandle(); + + + public static boolean glanceableHubV2() { + + return FEATURE_FLAGS.glanceableHubV2(); } - - public static boolean glanceableHubShortcutButton() { - return FEATURE_FLAGS.glanceableHubShortcutButton(); + + + public static boolean glanceableHubV2Resources() { + + return FEATURE_FLAGS.glanceableHubV2Resources(); } - - public static boolean hapticBrightnessSlider() { - return FEATURE_FLAGS.hapticBrightnessSlider(); + + + public static boolean globalActionsEmphasizedFont() { + + return FEATURE_FLAGS.globalActionsEmphasizedFont(); } - - public static boolean hapticVolumeSlider() { - return FEATURE_FLAGS.hapticVolumeSlider(); + + + public static boolean hardwareColorStyles() { + + return FEATURE_FLAGS.hardwareColorStyles(); } - + + public static boolean hearingAidsQsTileDialog() { + return FEATURE_FLAGS.hearingAidsQsTileDialog(); } - + + public static boolean hearingDevicesDialogRelatedTools() { + return FEATURE_FLAGS.hearingDevicesDialogRelatedTools(); } - + + + public static boolean hideRingerButtonInSingleVolumeMode() { + + return FEATURE_FLAGS.hideRingerButtonInSingleVolumeMode(); + } + + + public static boolean homeControlsDreamHsum() { + + return FEATURE_FLAGS.homeControlsDreamHsum(); + } + + + public static boolean hsuQsChanges() { + + return FEATURE_FLAGS.hsuQsChanges(); + } + + + public static boolean hubBlurredByShadeFix() { + + return FEATURE_FLAGS.hubBlurredByShadeFix(); + } + + + public static boolean hubEditModeTouchAdjustments() { + + return FEATURE_FLAGS.hubEditModeTouchAdjustments(); + } + + + public static boolean hubEditModeTransition() { + + return FEATURE_FLAGS.hubEditModeTransition(); + } + + + public static boolean iconRefresh2025() { + + return FEATURE_FLAGS.iconRefresh2025(); + } + + + public static boolean indicationTextA11yFix() { + + return FEATURE_FLAGS.indicationTextA11yFix(); + } + + public static boolean keyboardDockingIndicator() { + return FEATURE_FLAGS.keyboardDockingIndicator(); } - + + public static boolean keyboardShortcutHelperRewrite() { + return FEATURE_FLAGS.keyboardShortcutHelperRewrite(); } - - public static boolean keyguardBottomAreaRefactor() { - return FEATURE_FLAGS.keyguardBottomAreaRefactor(); + + + public static boolean keyboardTouchpadContextualEducation() { + + return FEATURE_FLAGS.keyboardTouchpadContextualEducation(); } - + + + public static boolean keyguardTransitionForceFinishOnScreenOff() { + + return FEATURE_FLAGS.keyguardTransitionForceFinishOnScreenOff(); + } + + public static boolean keyguardWmStateRefactor() { + return FEATURE_FLAGS.keyguardWmStateRefactor(); } - - public static boolean lightRevealMigration() { - return FEATURE_FLAGS.lightRevealMigration(); + + + public static boolean largeScreenRecording() { + + return FEATURE_FLAGS.largeScreenRecording(); + } + + + public static boolean largeScreenScreencapture() { + + return FEATURE_FLAGS.largeScreenScreencapture(); } - - public static boolean mediaControlsLockscreenShadeBugFix() { - return FEATURE_FLAGS.mediaControlsLockscreenShadeBugFix(); + + + public static boolean largeScreenScreenshotAppWindow() { + + return FEATURE_FLAGS.largeScreenScreenshotAppWindow(); } - - public static boolean mediaControlsRefactor() { - return FEATURE_FLAGS.mediaControlsRefactor(); + + + public static boolean largeScreenSharing() { + + return FEATURE_FLAGS.largeScreenSharing(); } - - public static boolean mediaControlsUserInitiatedDeleteintent() { - return FEATURE_FLAGS.mediaControlsUserInitiatedDeleteintent(); + + + public static boolean lockscreenShadeToDreamTransitionFix() { + + return FEATURE_FLAGS.lockscreenShadeToDreamTransitionFix(); } - - public static boolean migrateClocksToBlueprint() { - return FEATURE_FLAGS.migrateClocksToBlueprint(); + + + public static boolean lowLightClockDream() { + + return FEATURE_FLAGS.lowLightClockDream(); + } + + + public static boolean lowlightClockSetBrightness() { + + return FEATURE_FLAGS.lowlightClockSetBrightness(); + } + + + public static boolean lowlightClockUsesKeyguardChargingStatus() { + + return FEATURE_FLAGS.lowlightClockUsesKeyguardChargingStatus(); + } + + + public static boolean magneticNotificationSwipes() { + + return FEATURE_FLAGS.magneticNotificationSwipes(); + } + + + public static boolean mediaCarouselArrows() { + + return FEATURE_FLAGS.mediaCarouselArrows(); + } + + + public static boolean mediaControlsButtonMedia3() { + + return FEATURE_FLAGS.mediaControlsButtonMedia3(); } - + + + public static boolean mediaControlsButtonMedia3Placement() { + + return FEATURE_FLAGS.mediaControlsButtonMedia3Placement(); + } + + + public static boolean mediaControlsInCompose() { + + return FEATURE_FLAGS.mediaControlsInCompose(); + } + + + public static boolean mediaControlsTranslationFix() { + + return FEATURE_FLAGS.mediaControlsTranslationFix(); + } + + + public static boolean mediaFrameDimensionsFix() { + + return FEATURE_FLAGS.mediaFrameDimensionsFix(); + } + + + public static boolean mediaProjectionDialogBehindLockscreen() { + + return FEATURE_FLAGS.mediaProjectionDialogBehindLockscreen(); + } + + + public static boolean mediaProjectionGreyErrorText() { + + return FEATURE_FLAGS.mediaProjectionGreyErrorText(); + } + + + public static boolean modesUiDialogPaging() { + + return FEATURE_FLAGS.modesUiDialogPaging(); + } + + + public static boolean moveTransitionAnimationLayer() { + + return FEATURE_FLAGS.moveTransitionAnimationLayer(); + } + + + public static boolean msdlFeedback() { + + return FEATURE_FLAGS.msdlFeedback(); + } + + + public static boolean multiuserOpenUserSwitcherDialog() { + + return FEATURE_FLAGS.multiuserOpenUserSwitcherDialog(); + } + + + public static boolean multiuserWifiPickerTrackerSupport() { + + return FEATURE_FLAGS.multiuserWifiPickerTrackerSupport(); + } + + public static boolean newAodTransition() { + return FEATURE_FLAGS.newAodTransition(); } - - public static boolean newTouchpadGesturesTutorial() { - return FEATURE_FLAGS.newTouchpadGesturesTutorial(); + + + public static boolean newDozingKeyguardStates() { + + return FEATURE_FLAGS.newDozingKeyguardStates(); + } + + + public static boolean newScreenRecordToolbar() { + + return FEATURE_FLAGS.newScreenRecordToolbar(); + } + + + public static boolean newVolumePanel() { + + return FEATURE_FLAGS.newVolumePanel(); + } + + + public static boolean noExpansionOnOverscroll() { + + return FEATURE_FLAGS.noExpansionOnOverscroll(); + } + + + public static boolean noShadeBlurOnDreamStart() { + + return FEATURE_FLAGS.noShadeBlurOnDreamStart(); + } + + + public static boolean nonTouchscreenDevicesBypassFalsing() { + + return FEATURE_FLAGS.nonTouchscreenDevicesBypassFalsing(); + } + + + public static boolean notesRoleQsTile() { + + return FEATURE_FLAGS.notesRoleQsTile(); + } + + + public static boolean notificationAddXOnHoverToDismiss() { + + return FEATURE_FLAGS.notificationAddXOnHoverToDismiss(); + } + + + public static boolean notificationAmbientSuppressionAfterInflation() { + + return FEATURE_FLAGS.notificationAmbientSuppressionAfterInflation(); + } + + + public static boolean notificationAnimatedActionsTreatment() { + + return FEATURE_FLAGS.notificationAnimatedActionsTreatment(); + } + + + public static boolean notificationAppearNonlinear() { + + return FEATURE_FLAGS.notificationAppearNonlinear(); + } + + + public static boolean notificationAsyncGroupHeaderInflation() { + + return FEATURE_FLAGS.notificationAsyncGroupHeaderInflation(); + } + + + public static boolean notificationAvalancheSuppression() { + + return FEATURE_FLAGS.notificationAvalancheSuppression(); + } + + + public static boolean notificationAvalancheThrottleHun() { + + return FEATURE_FLAGS.notificationAvalancheThrottleHun(); + } + + + public static boolean notificationBackgroundTintOptimization() { + + return FEATURE_FLAGS.notificationBackgroundTintOptimization(); + } + + + public static boolean notificationBundleUi() { + + return FEATURE_FLAGS.notificationBundleUi(); + } + + + public static boolean notificationChildrenContainerMinHeight() { + + return FEATURE_FLAGS.notificationChildrenContainerMinHeight(); + } + + + public static boolean notificationColorUpdateLogger() { + + return FEATURE_FLAGS.notificationColorUpdateLogger(); + } + + + public static boolean notificationFixHunShadows() { + + return FEATURE_FLAGS.notificationFixHunShadows(); + } + + + public static boolean notificationFooterBackgroundTintOptimization() { + + return FEATURE_FLAGS.notificationFooterBackgroundTintOptimization(); + } + + + public static boolean notificationRowIsRemovedFix() { + + return FEATURE_FLAGS.notificationRowIsRemovedFix(); + } + + + public static boolean notificationRowTransparency() { + + return FEATURE_FLAGS.notificationRowTransparency(); + } + + + public static boolean notificationShadeBlur() { + + return FEATURE_FLAGS.notificationShadeBlur(); + } + + + public static boolean notificationShadeUiThread() { + + return FEATURE_FLAGS.notificationShadeUiThread(); + } + + + public static boolean notificationSkipSilentUpdates() { + + return FEATURE_FLAGS.notificationSkipSilentUpdates(); + } + + + public static boolean notificationTransparentHeaderFix() { + + return FEATURE_FLAGS.notificationTransparentHeaderFix(); + } + + + public static boolean notificationsHideOnDisplaySwitch() { + + return FEATURE_FLAGS.notificationsHideOnDisplaySwitch(); + } + + + public static boolean notificationsIconContainerRefactor() { + + return FEATURE_FLAGS.notificationsIconContainerRefactor(); + } + + + public static boolean notificationsRedesignFooterView() { + + return FEATURE_FLAGS.notificationsRedesignFooterView(); + } + + + public static boolean ongoingActivityChipsOnDream() { + + return FEATURE_FLAGS.ongoingActivityChipsOnDream(); + } + + + public static boolean overrideSuppressOverlayCondition() { + + return FEATURE_FLAGS.overrideSuppressOverlayCondition(); + } + + + public static boolean permissionHelperInlineUiRichOngoing() { + + return FEATURE_FLAGS.permissionHelperInlineUiRichOngoing(); + } + + + public static boolean permissionHelperUiRichOngoing() { + + return FEATURE_FLAGS.permissionHelperUiRichOngoing(); + } + + + public static boolean physicalNotificationMovement() { + + return FEATURE_FLAGS.physicalNotificationMovement(); + } + + + public static boolean pinInputFieldStyledFocusState() { + + return FEATURE_FLAGS.pinInputFieldStyledFocusState(); + } + + + public static boolean predictiveBackAnimateShade() { + + return FEATURE_FLAGS.predictiveBackAnimateShade(); + } + + + public static boolean privacyDotLiveRegion() { + + return FEATURE_FLAGS.privacyDotLiveRegion(); + } + + + public static boolean promoteNotificationsAutomatically() { + + return FEATURE_FLAGS.promoteNotificationsAutomatically(); + } + + + public static boolean pssTaskSwitcher() { + + return FEATURE_FLAGS.pssTaskSwitcher(); + } + + + public static boolean qsComposeFragmentEarlyExpansion() { + + return FEATURE_FLAGS.qsComposeFragmentEarlyExpansion(); + } + + + public static boolean qsEditModeTooltip() { + + return FEATURE_FLAGS.qsEditModeTooltip(); + } + + + public static boolean qsEditModeV2() { + + return FEATURE_FLAGS.qsEditModeV2(); + } + + + public static boolean qsMaterialExpressiveTiles() { + + return FEATURE_FLAGS.qsMaterialExpressiveTiles(); + } + + + public static boolean qsNewTiles() { + + return FEATURE_FLAGS.qsNewTiles(); + } + + + public static boolean qsNewTilesFuture() { + + return FEATURE_FLAGS.qsNewTilesFuture(); + } + + + public static boolean qsSplitInternetTile() { + + return FEATURE_FLAGS.qsSplitInternetTile(); + } + + + public static boolean qsTileDetailedView() { + + return FEATURE_FLAGS.qsTileDetailedView(); + } + + + public static boolean qsTileFocusState() { + + return FEATURE_FLAGS.qsTileFocusState(); + } + + + public static boolean qsTileTransitionInteractionRefinement() { + + return FEATURE_FLAGS.qsTileTransitionInteractionRefinement(); + } + + + public static boolean qsUiRefactorComposeFragment() { + + return FEATURE_FLAGS.qsUiRefactorComposeFragment(); + } + + + public static boolean qsWifiConfig() { + + return FEATURE_FLAGS.qsWifiConfig(); + } + + + public static boolean recordIssueQsTile() { + + return FEATURE_FLAGS.recordIssueQsTile(); + } + + + public static boolean redesignMagnificationWindowSize() { + + return FEATURE_FLAGS.redesignMagnificationWindowSize(); + } + + + public static boolean registerWallpaperNotifierBackground() { + + return FEATURE_FLAGS.registerWallpaperNotifierBackground(); + } + + + public static boolean removeDreamOverlayHideOnTouch() { + + return FEATURE_FLAGS.removeDreamOverlayHideOnTouch(); + } + + + public static boolean removeNearbyShareTileAnimation() { + + return FEATURE_FLAGS.removeNearbyShareTileAnimation(); + } + + + public static boolean removeUpdateListenerInQsIconViewImpl() { + + return FEATURE_FLAGS.removeUpdateListenerInQsIconViewImpl(); + } + + + public static boolean resetTilesRemovesCustomTiles() { + + return FEATURE_FLAGS.resetTilesRemovesCustomTiles(); + } + + + public static boolean restToUnlock() { + + return FEATURE_FLAGS.restToUnlock(); + } + + + public static boolean restartDreamOnUnocclude() { + + return FEATURE_FLAGS.restartDreamOnUnocclude(); } - - public static boolean newVolumePanel() { - return FEATURE_FLAGS.newVolumePanel(); + + + public static boolean restoreShowTapsSetting() { + + return FEATURE_FLAGS.restoreShowTapsSetting(); } - - public static boolean notificationAsyncGroupHeaderInflation() { - return FEATURE_FLAGS.notificationAsyncGroupHeaderInflation(); + + + public static boolean restrictCommunalAppWidgetHostListening() { + + return FEATURE_FLAGS.restrictCommunalAppWidgetHostListening(); } - - public static boolean notificationAsyncHybridViewInflation() { - return FEATURE_FLAGS.notificationAsyncHybridViewInflation(); + + + public static boolean restrictCommunalShadeToWhenIdle() { + + return FEATURE_FLAGS.restrictCommunalShadeToWhenIdle(); } - - public static boolean notificationAvalancheSuppression() { - return FEATURE_FLAGS.notificationAvalancheSuppression(); + + + public static boolean revampedBouncerMessages() { + + return FEATURE_FLAGS.revampedBouncerMessages(); } - - public static boolean notificationAvalancheThrottleHun() { - return FEATURE_FLAGS.notificationAvalancheThrottleHun(); + + + public static boolean runFingerprintDetectOnDismissibleKeyguard() { + + return FEATURE_FLAGS.runFingerprintDetectOnDismissibleKeyguard(); } - - public static boolean notificationBackgroundTintOptimization() { - return FEATURE_FLAGS.notificationBackgroundTintOptimization(); + + + public static boolean sceneContainer() { + + return FEATURE_FLAGS.sceneContainer(); } - - public static boolean notificationColorUpdateLogger() { - return FEATURE_FLAGS.notificationColorUpdateLogger(); + + + public static boolean screenOffAnimationGuardEnabled() { + + return FEATURE_FLAGS.screenOffAnimationGuardEnabled(); } - - public static boolean notificationContentAlphaOptimization() { - return FEATURE_FLAGS.notificationContentAlphaOptimization(); + + + public static boolean screenReactions() { + + return FEATURE_FLAGS.screenReactions(); } - - public static boolean notificationFooterBackgroundTintOptimization() { - return FEATURE_FLAGS.notificationFooterBackgroundTintOptimization(); + + + public static boolean screenshareNotificationHidingBugFix() { + + return FEATURE_FLAGS.screenshareNotificationHidingBugFix(); } - - public static boolean notificationMediaManagerBackgroundExecution() { - return FEATURE_FLAGS.notificationMediaManagerBackgroundExecution(); + + + public static boolean screenshotAnnounceLiveRegion() { + + return FEATURE_FLAGS.screenshotAnnounceLiveRegion(); } - - public static boolean notificationMinimalismPrototype() { - return FEATURE_FLAGS.notificationMinimalismPrototype(); + + + public static boolean screenshotDismissalSpring() { + + return FEATURE_FLAGS.screenshotDismissalSpring(); } - - public static boolean notificationOverExpansionClippingFix() { - return FEATURE_FLAGS.notificationOverExpansionClippingFix(); + + + public static boolean screenshotForceShutterSound() { + + return FEATURE_FLAGS.screenshotForceShutterSound(); } - - public static boolean notificationPulsingFix() { - return FEATURE_FLAGS.notificationPulsingFix(); + + + public static boolean screenshotMultidisplayFocusChange() { + + return FEATURE_FLAGS.screenshotMultidisplayFocusChange(); } - - public static boolean notificationRowContentBinderRefactor() { - return FEATURE_FLAGS.notificationRowContentBinderRefactor(); + + + public static boolean screenshotPolicySplitAndDesktopMode() { + + return FEATURE_FLAGS.screenshotPolicySplitAndDesktopMode(); } - - public static boolean notificationRowUserContext() { - return FEATURE_FLAGS.notificationRowUserContext(); + + + public static boolean screenshotScrollCropViewCrashFix() { + + return FEATURE_FLAGS.screenshotScrollCropViewCrashFix(); } - - public static boolean notificationViewFlipperPausingV2() { - return FEATURE_FLAGS.notificationViewFlipperPausingV2(); + + + public static boolean scrimFix() { + + return FEATURE_FLAGS.scrimFix(); } - - public static boolean notificationsBackgroundIcons() { - return FEATURE_FLAGS.notificationsBackgroundIcons(); + + + public static boolean secondaryUserWidgetHost() { + + return FEATURE_FLAGS.secondaryUserWidgetHost(); } - - public static boolean notificationsFooterViewRefactor() { - return FEATURE_FLAGS.notificationsFooterViewRefactor(); + + + public static boolean settingsExtRegisterContentObserverOnBgThread() { + + return FEATURE_FLAGS.settingsExtRegisterContentObserverOnBgThread(); } - - public static boolean notificationsHeadsUpRefactor() { - return FEATURE_FLAGS.notificationsHeadsUpRefactor(); + + + public static boolean shadeAppLaunchAnimationSkipInDesktop() { + + return FEATURE_FLAGS.shadeAppLaunchAnimationSkipInDesktop(); } - - public static boolean notificationsHideOnDisplaySwitch() { - return FEATURE_FLAGS.notificationsHideOnDisplaySwitch(); + + + public static boolean shadeExpandsOnStatusBarLongPress() { + + return FEATURE_FLAGS.shadeExpandsOnStatusBarLongPress(); } - - public static boolean notificationsIconContainerRefactor() { - return FEATURE_FLAGS.notificationsIconContainerRefactor(); + + + public static boolean shadeHeaderBlurFontColor() { + + return FEATURE_FLAGS.shadeHeaderBlurFontColor(); } - - public static boolean notificationsImprovedHunAnimation() { - return FEATURE_FLAGS.notificationsImprovedHunAnimation(); + + + public static boolean shadeHeaderFontUpdate() { + + return FEATURE_FLAGS.shadeHeaderFontUpdate(); } - - public static boolean notificationsLiveDataStoreRefactor() { - return FEATURE_FLAGS.notificationsLiveDataStoreRefactor(); + + + public static boolean shadeQsvisibleLogic() { + + return FEATURE_FLAGS.shadeQsvisibleLogic(); } - - public static boolean notifyPowerManagerUserActivityBackground() { - return FEATURE_FLAGS.notifyPowerManagerUserActivityBackground(); + + + public static boolean shadeWindowGoesAround() { + + return FEATURE_FLAGS.shadeWindowGoesAround(); } - - public static boolean pinInputFieldStyledFocusState() { - return FEATURE_FLAGS.pinInputFieldStyledFocusState(); + + + public static boolean shaderlibLoadingEffectRefactor() { + + return FEATURE_FLAGS.shaderlibLoadingEffectRefactor(); } - - public static boolean predictiveBackAnimateBouncer() { - return FEATURE_FLAGS.predictiveBackAnimateBouncer(); + + + public static boolean shortcutHelperKeyGlyph() { + + return FEATURE_FLAGS.shortcutHelperKeyGlyph(); } - - public static boolean predictiveBackAnimateDialogs() { - return FEATURE_FLAGS.predictiveBackAnimateDialogs(); + + + public static boolean shortcutHelperMultiDisplaySupport() { + + return FEATURE_FLAGS.shortcutHelperMultiDisplaySupport(); } - - public static boolean predictiveBackAnimateShade() { - return FEATURE_FLAGS.predictiveBackAnimateShade(); + + + public static boolean showAudioSharingSliderInVolumePanel() { + + return FEATURE_FLAGS.showAudioSharingSliderInVolumePanel(); } - - public static boolean predictiveBackSysui() { - return FEATURE_FLAGS.predictiveBackSysui(); + + + public static boolean showClipboardIndication() { + + return FEATURE_FLAGS.showClipboardIndication(); } - - public static boolean priorityPeopleSection() { - return FEATURE_FLAGS.priorityPeopleSection(); + + + public static boolean showIconInEmptyShade() { + + return FEATURE_FLAGS.showIconInEmptyShade(); } - - public static boolean privacyDotUnfoldWrongCornerFix() { - return FEATURE_FLAGS.privacyDotUnfoldWrongCornerFix(); + + + public static boolean showLockedByYourWatchKeyguardIndicator() { + + return FEATURE_FLAGS.showLockedByYourWatchKeyguardIndicator(); } - - public static boolean pssAppSelectorAbruptExitFix() { - return FEATURE_FLAGS.pssAppSelectorAbruptExitFix(); + + + public static boolean signOutButtonOnKeyguardStatusBar() { + + return FEATURE_FLAGS.signOutButtonOnKeyguardStatusBar(); } - - public static boolean pssAppSelectorRecentsSplitScreen() { - return FEATURE_FLAGS.pssAppSelectorRecentsSplitScreen(); + + + public static boolean simPinBouncerReset() { + + return FEATURE_FLAGS.simPinBouncerReset(); } - - public static boolean pssTaskSwitcher() { - return FEATURE_FLAGS.pssTaskSwitcher(); + + + public static boolean sliceManagerBinderCallBackground() { + + return FEATURE_FLAGS.sliceManagerBinderCallBackground(); } - - public static boolean qsCustomTileClickGuaranteedBugFix() { - return FEATURE_FLAGS.qsCustomTileClickGuaranteedBugFix(); + + + public static boolean smartspaceRelocateToBottom() { + + return FEATURE_FLAGS.smartspaceRelocateToBottom(); } - - public static boolean qsNewPipeline() { - return FEATURE_FLAGS.qsNewPipeline(); + + + public static boolean smartspaceSwipeEventLoggingFix() { + + return FEATURE_FLAGS.smartspaceSwipeEventLoggingFix(); } - - public static boolean qsNewTiles() { - return FEATURE_FLAGS.qsNewTiles(); + + + public static boolean smartspaceViewpager2() { + + return FEATURE_FLAGS.smartspaceViewpager2(); } - - public static boolean qsNewTilesFuture() { - return FEATURE_FLAGS.qsNewTilesFuture(); + + + public static boolean sounddoseCustomization() { + + return FEATURE_FLAGS.sounddoseCustomization(); } - - public static boolean qsTileFocusState() { - return FEATURE_FLAGS.qsTileFocusState(); + + + public static boolean spatialModelAppPushback() { + + return FEATURE_FLAGS.spatialModelAppPushback(); } - - public static boolean qsUiRefactor() { - return FEATURE_FLAGS.qsUiRefactor(); + + + public static boolean spatialModelBouncerPushback() { + + return FEATURE_FLAGS.spatialModelBouncerPushback(); } - - public static boolean quickSettingsVisualHapticsLongpress() { - return FEATURE_FLAGS.quickSettingsVisualHapticsLongpress(); + + + public static boolean spatialModelPushbackInShader() { + + return FEATURE_FLAGS.spatialModelPushbackInShader(); } - - public static boolean recordIssueQsTile() { - return FEATURE_FLAGS.recordIssueQsTile(); + + + public static boolean stabilizeHeadsUpGroupV2() { + + return FEATURE_FLAGS.stabilizeHeadsUpGroupV2(); } - - public static boolean refactorGetCurrentUser() { - return FEATURE_FLAGS.refactorGetCurrentUser(); + + + public static boolean statusBarAlwaysCheckUnderlyingNetworks() { + + return FEATURE_FLAGS.statusBarAlwaysCheckUnderlyingNetworks(); } - - public static boolean registerBatteryControllerReceiversInCorestartable() { - return FEATURE_FLAGS.registerBatteryControllerReceiversInCorestartable(); + + + public static boolean statusBarAlwaysScheduleAutoHide() { + + return FEATURE_FLAGS.statusBarAlwaysScheduleAutoHide(); } - - public static boolean registerNewWalletCardInBackground() { - return FEATURE_FLAGS.registerNewWalletCardInBackground(); + + + public static boolean statusBarAlwaysUseRegionSampling() { + + return FEATURE_FLAGS.statusBarAlwaysUseRegionSampling(); } - - public static boolean registerWallpaperNotifierBackground() { - return FEATURE_FLAGS.registerWallpaperNotifierBackground(); + + + public static boolean statusBarAppHandleTracking() { + + return FEATURE_FLAGS.statusBarAppHandleTracking(); } - - public static boolean registerZenModeContentObserverBackground() { - return FEATURE_FLAGS.registerZenModeContentObserverBackground(); + + + public static boolean statusBarBatteryNoConflation() { + + return FEATURE_FLAGS.statusBarBatteryNoConflation(); } - - public static boolean removeDreamOverlayHideOnTouch() { - return FEATURE_FLAGS.removeDreamOverlayHideOnTouch(); + + + public static boolean statusBarCallChipUseIsHidden() { + + return FEATURE_FLAGS.statusBarCallChipUseIsHidden(); } - - public static boolean restToUnlock() { - return FEATURE_FLAGS.restToUnlock(); + + + public static boolean statusBarChipToHunAnimation() { + + return FEATURE_FLAGS.statusBarChipToHunAnimation(); } - - public static boolean restartDreamOnUnocclude() { - return FEATURE_FLAGS.restartDreamOnUnocclude(); + + + public static boolean statusBarChipsModernization() { + + return FEATURE_FLAGS.statusBarChipsModernization(); } - - public static boolean revampedBouncerMessages() { - return FEATURE_FLAGS.revampedBouncerMessages(); + + + public static boolean statusBarChipsReturnAnimations() { + + return FEATURE_FLAGS.statusBarChipsReturnAnimations(); } - - public static boolean runFingerprintDetectOnDismissibleKeyguard() { - return FEATURE_FLAGS.runFingerprintDetectOnDismissibleKeyguard(); + + + public static boolean statusBarDarkIconInteractorMixedFix() { + + return FEATURE_FLAGS.statusBarDarkIconInteractorMixedFix(); } - - public static boolean saveAndRestoreMagnificationSettingsButtons() { - return FEATURE_FLAGS.saveAndRestoreMagnificationSettingsButtons(); + + + public static boolean statusBarDate() { + + return FEATURE_FLAGS.statusBarDate(); } - - public static boolean sceneContainer() { - return FEATURE_FLAGS.sceneContainer(); + + + public static boolean statusBarFontUpdates() { + + return FEATURE_FLAGS.statusBarFontUpdates(); } - - public static boolean screenshareNotificationHidingBugFix() { - return FEATURE_FLAGS.screenshareNotificationHidingBugFix(); + + + public static boolean statusBarForDesktop() { + + return FEATURE_FLAGS.statusBarForDesktop(); } - - public static boolean screenshotActionDismissSystemWindows() { - return FEATURE_FLAGS.screenshotActionDismissSystemWindows(); + + + public static boolean statusBarMobileIconKairos() { + + return FEATURE_FLAGS.statusBarMobileIconKairos(); } - - public static boolean screenshotPrivateProfileAccessibilityAnnouncementFix() { - return FEATURE_FLAGS.screenshotPrivateProfileAccessibilityAnnouncementFix(); + + + public static boolean statusBarNoHunBehavior() { + + return FEATURE_FLAGS.statusBarNoHunBehavior(); } - - public static boolean screenshotPrivateProfileBehaviorFix() { - return FEATURE_FLAGS.screenshotPrivateProfileBehaviorFix(); + + + public static boolean statusBarPopupChips() { + + return FEATURE_FLAGS.statusBarPopupChips(); } - - public static boolean screenshotScrollCropViewCrashFix() { - return FEATURE_FLAGS.screenshotScrollCropViewCrashFix(); + + + public static boolean statusBarPrivacyChipAnimationExemption() { + + return FEATURE_FLAGS.statusBarPrivacyChipAnimationExemption(); } - - public static boolean screenshotShelfUi2() { - return FEATURE_FLAGS.screenshotShelfUi2(); + + + public static boolean statusBarRegionSampling() { + + return FEATURE_FLAGS.statusBarRegionSampling(); } - - public static boolean shadeCollapseActivityLaunchFix() { - return FEATURE_FLAGS.shadeCollapseActivityLaunchFix(); + + + public static boolean statusBarRootModernization() { + + return FEATURE_FLAGS.statusBarRootModernization(); } - - public static boolean shaderlibLoadingEffectRefactor() { - return FEATURE_FLAGS.shaderlibLoadingEffectRefactor(); + + + public static boolean statusBarRudimentaryBattery() { + + return FEATURE_FLAGS.statusBarRudimentaryBattery(); } - - public static boolean sliceBroadcastRelayInBackground() { - return FEATURE_FLAGS.sliceBroadcastRelayInBackground(); + + + public static boolean statusBarShareDialogWithAppName() { + + return FEATURE_FLAGS.statusBarShareDialogWithAppName(); } - - public static boolean sliceManagerBinderCallBackground() { - return FEATURE_FLAGS.sliceManagerBinderCallBackground(); + + + public static boolean statusBarShowIconsInSecureCamera() { + + return FEATURE_FLAGS.statusBarShowIconsInSecureCamera(); } - - public static boolean smartspaceLockscreenViewmodel() { - return FEATURE_FLAGS.smartspaceLockscreenViewmodel(); + + + public static boolean statusBarStaticInoutIndicators() { + + return FEATURE_FLAGS.statusBarStaticInoutIndicators(); } - - public static boolean smartspaceRelocateToBottom() { - return FEATURE_FLAGS.smartspaceRelocateToBottom(); + + + public static boolean statusBarSwitchToSpnFromDataSpn() { + + return FEATURE_FLAGS.statusBarSwitchToSpnFromDataSpn(); } - - public static boolean smartspaceRemoteviewsRendering() { - return FEATURE_FLAGS.smartspaceRemoteviewsRendering(); + + + public static boolean statusBarSystemStatusIconsInCompose() { + + return FEATURE_FLAGS.statusBarSystemStatusIconsInCompose(); } - - public static boolean statusBarMonochromeIconsFix() { - return FEATURE_FLAGS.statusBarMonochromeIconsFix(); + + + public static boolean statusBarUiThread() { + + return FEATURE_FLAGS.statusBarUiThread(); } - - public static boolean statusBarScreenSharingChips() { - return FEATURE_FLAGS.statusBarScreenSharingChips(); + + + public static boolean statusBarUniversalBatteryDataSource() { + + return FEATURE_FLAGS.statusBarUniversalBatteryDataSource(); } - - public static boolean statusBarStaticInoutIndicators() { - return FEATURE_FLAGS.statusBarStaticInoutIndicators(); + + + public static boolean stuckHearingDevicesQsTileFix() { + + return FEATURE_FLAGS.stuckHearingDevicesQsTileFix(); } - + + public static boolean switchUserOnBg() { + return FEATURE_FLAGS.switchUserOnBg(); } - + + + public static boolean sysuiIntrinsicLockDispatcher() { + + return FEATURE_FLAGS.sysuiIntrinsicLockDispatcher(); + } + + public static boolean sysuiTeamfood() { + return FEATURE_FLAGS.sysuiTeamfood(); } - + + public static boolean themeOverlayControllerWakefulnessDeprecation() { + return FEATURE_FLAGS.themeOverlayControllerWakefulnessDeprecation(); } - - public static boolean translucentOccludingActivityFix() { - return FEATURE_FLAGS.translucentOccludingActivityFix(); - } - - public static boolean truncatedStatusBarIconsFix() { - return FEATURE_FLAGS.truncatedStatusBarIconsFix(); - } - - public static boolean udfpsViewPerformance() { - return FEATURE_FLAGS.udfpsViewPerformance(); + + + public static boolean thinScreenRecordingService() { + + return FEATURE_FLAGS.thinScreenRecordingService(); } - + + public static boolean unfoldAnimationBackgroundProgress() { + return FEATURE_FLAGS.unfoldAnimationBackgroundProgress(); } - + + + public static boolean updateKeyguardOnWakeAndUnlockEarlier() { + + return FEATURE_FLAGS.updateKeyguardOnWakeAndUnlockEarlier(); + } + + public static boolean updateUserSwitcherBackground() { + return FEATURE_FLAGS.updateUserSwitcherBackground(); } - - public static boolean validateKeyboardShortcutHelperIconUri() { - return FEATURE_FLAGS.validateKeyboardShortcutHelperIconUri(); + + + public static boolean updateWindowMagnifierBottomBoundaryWithMouse() { + + return FEATURE_FLAGS.updateWindowMagnifierBottomBoundaryWithMouse(); + } + + + public static boolean useAadProxSensorIfPresent() { + + return FEATURE_FLAGS.useAadProxSensorIfPresent(); + } + + + public static boolean userEncryptedSource() { + + return FEATURE_FLAGS.userEncryptedSource(); + } + + + public static boolean userSwitcherAddSignOutOption() { + + return FEATURE_FLAGS.userSwitcherAddSignOutOption(); } - + + public static boolean visualInterruptionsRefactor() { + return FEATURE_FLAGS.visualInterruptionsRefactor(); } + + public static boolean volumeRedesign() { + + return FEATURE_FLAGS.volumeRedesign(); + } + + + public static boolean windowMagnificationMoveWithMouseOnEdge() { + + return FEATURE_FLAGS.windowMagnificationMoveWithMouseOnEdge(); + } + private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl(); } diff --git a/flags/src/com/android/systemui/shared/CustomFeatureFlags.java b/flags/src/com/android/systemui/shared/CustomFeatureFlags.java index b301340b4a1..e0abb38e2e2 100644 --- a/flags/src/com/android/systemui/shared/CustomFeatureFlags.java +++ b/flags/src/com/android/systemui/shared/CustomFeatureFlags.java @@ -1,13 +1,12 @@ package com.android.systemui.shared; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.BiPredicate; import java.util.function.Predicate; - /** @hide */ public class CustomFeatureFlags implements FeatureFlags { @@ -17,56 +16,210 @@ public CustomFeatureFlags(BiPredicate> getValueI mGetValueImpl = getValueImpl; } @Override - + + public boolean ambientAod() { + return getValue(Flags.FLAG_AMBIENT_AOD, + FeatureFlags::ambientAod); + } + + @Override + public boolean bouncerAreaExclusion() { return getValue(Flags.FLAG_BOUNCER_AREA_EXCLUSION, - FeatureFlags::bouncerAreaExclusion); + FeatureFlags::bouncerAreaExclusion); } @Override - + + public boolean clockReactiveSmartspaceLayout() { + return getValue(Flags.FLAG_CLOCK_REACTIVE_SMARTSPACE_LAYOUT, + FeatureFlags::clockReactiveSmartspaceLayout); + } + + @Override + + public boolean clockReactiveVariants() { + return getValue(Flags.FLAG_CLOCK_REACTIVE_VARIANTS, + FeatureFlags::clockReactiveVariants); + } + + @Override + + public boolean cursorHotCorner() { + return getValue(Flags.FLAG_CURSOR_HOT_CORNER, + FeatureFlags::cursorHotCorner); + } + + @Override + public boolean enableHomeDelay() { return getValue(Flags.FLAG_ENABLE_HOME_DELAY, - FeatureFlags::enableHomeDelay); + FeatureFlags::enableHomeDelay); + } + + @Override + + public boolean enableLppAssistInvocationEffect() { + return getValue(Flags.FLAG_ENABLE_LPP_ASSIST_INVOCATION_EFFECT, + FeatureFlags::enableLppAssistInvocationEffect); } @Override - + + public boolean enableLppAssistInvocationHapticEffect() { + return getValue(Flags.FLAG_ENABLE_LPP_ASSIST_INVOCATION_HAPTIC_EFFECT, + FeatureFlags::enableLppAssistInvocationHapticEffect); + } + + @Override + public boolean exampleSharedFlag() { return getValue(Flags.FLAG_EXAMPLE_SHARED_FLAG, - FeatureFlags::exampleSharedFlag); + FeatureFlags::exampleSharedFlag); + } + + @Override + + public boolean extendedWallpaperEffects() { + return getValue(Flags.FLAG_EXTENDED_WALLPAPER_EFFECTS, + FeatureFlags::extendedWallpaperEffects); + } + + @Override + + public boolean extendibleThemeManager() { + return getValue(Flags.FLAG_EXTENDIBLE_THEME_MANAGER, + FeatureFlags::extendibleThemeManager); } @Override - - public boolean returnAnimationFrameworkLibrary() { - return getValue(Flags.FLAG_RETURN_ANIMATION_FRAMEWORK_LIBRARY, - FeatureFlags::returnAnimationFrameworkLibrary); + + public boolean lockscreenCustomClocks() { + return getValue(Flags.FLAG_LOCKSCREEN_CUSTOM_CLOCKS, + FeatureFlags::lockscreenCustomClocks); + } + + @Override + + public boolean newCustomizationPickerUi() { + return getValue(Flags.FLAG_NEW_CUSTOMIZATION_PICKER_UI, + FeatureFlags::newCustomizationPickerUi); + } + + @Override + + public boolean newTouchpadGesturesTutorial() { + return getValue(Flags.FLAG_NEW_TOUCHPAD_GESTURES_TUTORIAL, + FeatureFlags::newTouchpadGesturesTutorial); } @Override - + + public boolean notificationDotContrastBorder() { + return getValue(Flags.FLAG_NOTIFICATION_DOT_CONTRAST_BORDER, + FeatureFlags::notificationDotContrastBorder); + } + + @Override + + public boolean panAndZoomInExtendedWallpaperEffects() { + return getValue(Flags.FLAG_PAN_AND_ZOOM_IN_EXTENDED_WALLPAPER_EFFECTS, + FeatureFlags::panAndZoomInExtendedWallpaperEffects); + } + + @Override + + public boolean screenshotContextUrl() { + return getValue(Flags.FLAG_SCREENSHOT_CONTEXT_URL, + FeatureFlags::screenshotContextUrl); + } + + @Override + public boolean shadeAllowBackGesture() { return getValue(Flags.FLAG_SHADE_ALLOW_BACK_GESTURE, - FeatureFlags::shadeAllowBackGesture); + FeatureFlags::shadeAllowBackGesture); } @Override - + public boolean sidefpsControllerRefactor() { return getValue(Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR, - FeatureFlags::sidefpsControllerRefactor); + FeatureFlags::sidefpsControllerRefactor); + } + + @Override + + public boolean smartspaceAqiUpdatedDesign() { + return getValue(Flags.FLAG_SMARTSPACE_AQI_UPDATED_DESIGN, + FeatureFlags::smartspaceAqiUpdatedDesign); + } + + @Override + + public boolean smartspaceSemanticWeatherData() { + return getValue(Flags.FLAG_SMARTSPACE_SEMANTIC_WEATHER_DATA, + FeatureFlags::smartspaceSemanticWeatherData); + } + + @Override + + public boolean smartspaceSportsCardBackground() { + return getValue(Flags.FLAG_SMARTSPACE_SPORTS_CARD_BACKGROUND, + FeatureFlags::smartspaceSportsCardBackground); + } + + @Override + + public boolean smartspaceUiUpdate() { + return getValue(Flags.FLAG_SMARTSPACE_UI_UPDATE, + FeatureFlags::smartspaceUiUpdate); + } + + @Override + + public boolean smartspaceUiUpdateResources() { + return getValue(Flags.FLAG_SMARTSPACE_UI_UPDATE_RESOURCES, + FeatureFlags::smartspaceUiUpdateResources); + } + + @Override + + public boolean smartspaceWeatherUseMonochromeFontIcons() { + return getValue(Flags.FLAG_SMARTSPACE_WEATHER_USE_MONOCHROME_FONT_ICONS, + FeatureFlags::smartspaceWeatherUseMonochromeFontIcons); + } + + @Override + + public boolean statusBarConnectedDisplays() { + return getValue(Flags.FLAG_STATUS_BAR_CONNECTED_DISPLAYS, + FeatureFlags::statusBarConnectedDisplays); + } + + @Override + + public boolean threeButtonCornerSwipe() { + return getValue(Flags.FLAG_THREE_BUTTON_CORNER_SWIPE, + FeatureFlags::threeButtonCornerSwipe); + } + + @Override + + public boolean usePreferredImageEditor() { + return getValue(Flags.FLAG_USE_PREFERRED_IMAGE_EDITOR, + FeatureFlags::usePreferredImageEditor); } public boolean isFlagReadOnlyOptimized(String flagName) { if (mReadOnlyFlagsSet.contains(flagName) && - isOptimizationEnabled()) { - return true; + isOptimizationEnabled()) { + return true; } return false; } - + private boolean isOptimizationEnabled() { return false; } @@ -77,18 +230,68 @@ protected boolean getValue(String flagName, Predicate getter) { public List getFlagNames() { return Arrays.asList( - Flags.FLAG_BOUNCER_AREA_EXCLUSION, - Flags.FLAG_ENABLE_HOME_DELAY, - Flags.FLAG_EXAMPLE_SHARED_FLAG, - Flags.FLAG_RETURN_ANIMATION_FRAMEWORK_LIBRARY, - Flags.FLAG_SHADE_ALLOW_BACK_GESTURE, - Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR + Flags.FLAG_AMBIENT_AOD, + Flags.FLAG_BOUNCER_AREA_EXCLUSION, + Flags.FLAG_CLOCK_REACTIVE_SMARTSPACE_LAYOUT, + Flags.FLAG_CLOCK_REACTIVE_VARIANTS, + Flags.FLAG_CURSOR_HOT_CORNER, + Flags.FLAG_ENABLE_HOME_DELAY, + Flags.FLAG_ENABLE_LPP_ASSIST_INVOCATION_EFFECT, + Flags.FLAG_ENABLE_LPP_ASSIST_INVOCATION_HAPTIC_EFFECT, + Flags.FLAG_EXAMPLE_SHARED_FLAG, + Flags.FLAG_EXTENDED_WALLPAPER_EFFECTS, + Flags.FLAG_EXTENDIBLE_THEME_MANAGER, + Flags.FLAG_LOCKSCREEN_CUSTOM_CLOCKS, + Flags.FLAG_NEW_CUSTOMIZATION_PICKER_UI, + Flags.FLAG_NEW_TOUCHPAD_GESTURES_TUTORIAL, + Flags.FLAG_NOTIFICATION_DOT_CONTRAST_BORDER, + Flags.FLAG_PAN_AND_ZOOM_IN_EXTENDED_WALLPAPER_EFFECTS, + Flags.FLAG_SCREENSHOT_CONTEXT_URL, + Flags.FLAG_SHADE_ALLOW_BACK_GESTURE, + Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR, + Flags.FLAG_SMARTSPACE_AQI_UPDATED_DESIGN, + Flags.FLAG_SMARTSPACE_SEMANTIC_WEATHER_DATA, + Flags.FLAG_SMARTSPACE_SPORTS_CARD_BACKGROUND, + Flags.FLAG_SMARTSPACE_UI_UPDATE, + Flags.FLAG_SMARTSPACE_UI_UPDATE_RESOURCES, + Flags.FLAG_SMARTSPACE_WEATHER_USE_MONOCHROME_FONT_ICONS, + Flags.FLAG_STATUS_BAR_CONNECTED_DISPLAYS, + Flags.FLAG_THREE_BUTTON_CORNER_SWIPE, + Flags.FLAG_USE_PREFERRED_IMAGE_EDITOR ); } private Set mReadOnlyFlagsSet = new HashSet<>( - Arrays.asList( - "" - ) + Arrays.asList( + Flags.FLAG_AMBIENT_AOD, + Flags.FLAG_BOUNCER_AREA_EXCLUSION, + Flags.FLAG_CLOCK_REACTIVE_SMARTSPACE_LAYOUT, + Flags.FLAG_CLOCK_REACTIVE_VARIANTS, + Flags.FLAG_CURSOR_HOT_CORNER, + Flags.FLAG_ENABLE_HOME_DELAY, + Flags.FLAG_ENABLE_LPP_ASSIST_INVOCATION_EFFECT, + Flags.FLAG_ENABLE_LPP_ASSIST_INVOCATION_HAPTIC_EFFECT, + Flags.FLAG_EXAMPLE_SHARED_FLAG, + Flags.FLAG_EXTENDED_WALLPAPER_EFFECTS, + Flags.FLAG_EXTENDIBLE_THEME_MANAGER, + Flags.FLAG_LOCKSCREEN_CUSTOM_CLOCKS, + Flags.FLAG_NEW_CUSTOMIZATION_PICKER_UI, + Flags.FLAG_NEW_TOUCHPAD_GESTURES_TUTORIAL, + Flags.FLAG_NOTIFICATION_DOT_CONTRAST_BORDER, + Flags.FLAG_PAN_AND_ZOOM_IN_EXTENDED_WALLPAPER_EFFECTS, + Flags.FLAG_SCREENSHOT_CONTEXT_URL, + Flags.FLAG_SHADE_ALLOW_BACK_GESTURE, + Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR, + Flags.FLAG_SMARTSPACE_AQI_UPDATED_DESIGN, + Flags.FLAG_SMARTSPACE_SEMANTIC_WEATHER_DATA, + Flags.FLAG_SMARTSPACE_SPORTS_CARD_BACKGROUND, + Flags.FLAG_SMARTSPACE_UI_UPDATE, + Flags.FLAG_SMARTSPACE_UI_UPDATE_RESOURCES, + Flags.FLAG_SMARTSPACE_WEATHER_USE_MONOCHROME_FONT_ICONS, + Flags.FLAG_STATUS_BAR_CONNECTED_DISPLAYS, + Flags.FLAG_THREE_BUTTON_CORNER_SWIPE, + Flags.FLAG_USE_PREFERRED_IMAGE_EDITOR, + "" + ) ); } diff --git a/flags/src/com/android/systemui/shared/FakeFeatureFlagsImpl.java b/flags/src/com/android/systemui/shared/FakeFeatureFlagsImpl.java index c223248bbfa..d086ece067f 100644 --- a/flags/src/com/android/systemui/shared/FakeFeatureFlagsImpl.java +++ b/flags/src/com/android/systemui/shared/FakeFeatureFlagsImpl.java @@ -3,11 +3,11 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Predicate; - /** @hide */ public class FakeFeatureFlagsImpl extends CustomFeatureFlags { private final Map mFlagMap = new HashMap<>(); private final FeatureFlags mDefaults; + private final boolean IS_EXPORTED = false; public FakeFeatureFlagsImpl() { this(null); @@ -35,7 +35,7 @@ protected boolean getValue(String flagName, Predicate getter) { } public void setFlag(String flagName, boolean value) { - if (!this.mFlagMap.containsKey(flagName)) { + if (!this.mFlagMap.containsKey(flagName) && !IS_EXPORTED) { throw new IllegalArgumentException("no such flag " + flagName); } this.mFlagMap.put(flagName, value); diff --git a/flags/src/com/android/systemui/shared/FeatureFlags.java b/flags/src/com/android/systemui/shared/FeatureFlags.java index e9fe9c71446..d46d228dbd3 100644 --- a/flags/src/com/android/systemui/shared/FeatureFlags.java +++ b/flags/src/com/android/systemui/shared/FeatureFlags.java @@ -1,24 +1,118 @@ package com.android.systemui.shared; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + /** @hide */ public interface FeatureFlags { - - + + + + boolean ambientAod(); + + + boolean bouncerAreaExclusion(); - - + + + + boolean clockReactiveSmartspaceLayout(); + + + + boolean clockReactiveVariants(); + + + + boolean cursorHotCorner(); + + + boolean enableHomeDelay(); - - + + + + boolean enableLppAssistInvocationEffect(); + + + + boolean enableLppAssistInvocationHapticEffect(); + + + boolean exampleSharedFlag(); - - - boolean returnAnimationFrameworkLibrary(); - - + + + + boolean extendedWallpaperEffects(); + + + + boolean extendibleThemeManager(); + + + + boolean lockscreenCustomClocks(); + + + + boolean newCustomizationPickerUi(); + + + + boolean newTouchpadGesturesTutorial(); + + + + boolean notificationDotContrastBorder(); + + + + boolean panAndZoomInExtendedWallpaperEffects(); + + + + boolean screenshotContextUrl(); + + + boolean shadeAllowBackGesture(); - - + + + boolean sidefpsControllerRefactor(); + + + + boolean smartspaceAqiUpdatedDesign(); + + + + boolean smartspaceSemanticWeatherData(); + + + + boolean smartspaceSportsCardBackground(); + + + + boolean smartspaceUiUpdate(); + + + + boolean smartspaceUiUpdateResources(); + + + + boolean smartspaceWeatherUseMonochromeFontIcons(); + + + + boolean statusBarConnectedDisplays(); + + + + boolean threeButtonCornerSwipe(); + + + + boolean usePreferredImageEditor(); } diff --git a/flags/src/com/android/systemui/shared/FeatureFlagsImpl.java b/flags/src/com/android/systemui/shared/FeatureFlagsImpl.java index 39a1f0ee3ac..5167fdc537c 100644 --- a/flags/src/com/android/systemui/shared/FeatureFlagsImpl.java +++ b/flags/src/com/android/systemui/shared/FeatureFlagsImpl.java @@ -1,195 +1,201 @@ package com.android.systemui.shared; -// TODO(b/303773055): Remove the annotation after access issue is resolved. -import com.android.quickstep.util.DeviceConfigHelper; - -import java.nio.file.Files; -import java.nio.file.Paths; /** @hide */ public final class FeatureFlagsImpl implements FeatureFlags { - private static final boolean isReadFromNew = Files.exists(Paths.get("/metadata/aconfig/boot/enable_only_new_storage")); - private static volatile boolean isCached = false; - private static volatile boolean biometrics_framework_is_cached = false; - private static volatile boolean systemui_is_cached = false; - private static boolean bouncerAreaExclusion = true; - private static boolean enableHomeDelay = false; - private static boolean exampleSharedFlag = false; - private static boolean returnAnimationFrameworkLibrary = false; - private static boolean shadeAllowBackGesture = false; - private static boolean sidefpsControllerRefactor = true; + @Override - private void init() { - boolean foundPackage = true; + public boolean ambientAod() { + return true; + } - sidefpsControllerRefactor = foundPackage; + @Override - bouncerAreaExclusion = foundPackage; + public boolean bouncerAreaExclusion() { + return true; + } + @Override - enableHomeDelay = foundPackage; + public boolean clockReactiveSmartspaceLayout() { + return true; + } - exampleSharedFlag = foundPackage; + @Override - returnAnimationFrameworkLibrary = foundPackage ; + public boolean clockReactiveVariants() { + return true; + } + @Override - shadeAllowBackGesture = foundPackage; - isCached = true; + public boolean cursorHotCorner() { + return true; } + @Override + + public boolean enableHomeDelay() { + return false; + } + + @Override - private void load_overrides_biometrics_framework() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - sidefpsControllerRefactor = - properties.getBoolean(Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace biometrics_framework " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } - biometrics_framework_is_cached = true; + public boolean enableLppAssistInvocationEffect() { + return true; } - private void load_overrides_systemui() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - bouncerAreaExclusion = - properties.getBoolean(Flags.FLAG_BOUNCER_AREA_EXCLUSION, true); - enableHomeDelay = - properties.getBoolean(Flags.FLAG_ENABLE_HOME_DELAY, false); - exampleSharedFlag = - properties.getBoolean(Flags.FLAG_EXAMPLE_SHARED_FLAG, false); - returnAnimationFrameworkLibrary = - properties.getBoolean(Flags.FLAG_RETURN_ANIMATION_FRAMEWORK_LIBRARY, false); - shadeAllowBackGesture = - properties.getBoolean(Flags.FLAG_SHADE_ALLOW_BACK_GESTURE, false); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace systemui " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } - systemui_is_cached = true; + @Override + + + public boolean enableLppAssistInvocationHapticEffect() { + return true; } @Override - - - public boolean bouncerAreaExclusion() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return bouncerAreaExclusion; + + public boolean exampleSharedFlag() { + return false; } @Override - - - public boolean enableHomeDelay() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return enableHomeDelay; + + public boolean extendedWallpaperEffects() { + return true; } @Override - - - public boolean exampleSharedFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return exampleSharedFlag; + + public boolean extendibleThemeManager() { + return false; } @Override - - - public boolean returnAnimationFrameworkLibrary() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return returnAnimationFrameworkLibrary; + + public boolean lockscreenCustomClocks() { + return true; + } + + @Override + + + public boolean newCustomizationPickerUi() { + return true; + } + + @Override + + + public boolean newTouchpadGesturesTutorial() { + return true; } @Override - - - public boolean shadeAllowBackGesture() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return shadeAllowBackGesture; + + public boolean notificationDotContrastBorder() { + return false; } @Override - - + + + public boolean panAndZoomInExtendedWallpaperEffects() { + return false; + } + + @Override + + + public boolean screenshotContextUrl() { + return true; + } + + @Override + + + public boolean shadeAllowBackGesture() { + return false; + } + + @Override + + public boolean sidefpsControllerRefactor() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!biometrics_framework_is_cached) { - load_overrides_biometrics_framework(); - } - } - return sidefpsControllerRefactor; + return true; + } + @Override + + + public boolean smartspaceAqiUpdatedDesign() { + return false; } -} + @Override + + public boolean smartspaceSemanticWeatherData() { + return false; + } + + @Override + + + public boolean smartspaceSportsCardBackground() { + return false; + } + + @Override + + + public boolean smartspaceUiUpdate() { + return true; + } + + @Override + + + public boolean smartspaceUiUpdateResources() { + return true; + } + + @Override + + + public boolean smartspaceWeatherUseMonochromeFontIcons() { + return false; + } + + @Override + + + public boolean statusBarConnectedDisplays() { + return true; + } + + @Override + + + public boolean threeButtonCornerSwipe() { + return false; + } + + @Override + + + public boolean usePreferredImageEditor() { + return true; + } + +} diff --git a/flags/src/com/android/systemui/shared/Flags.java b/flags/src/com/android/systemui/shared/Flags.java index 4b817be4ef3..e5665b330da 100644 --- a/flags/src/com/android/systemui/shared/Flags.java +++ b/flags/src/com/android/systemui/shared/Flags.java @@ -1,50 +1,233 @@ package com.android.systemui.shared; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + + /** @hide */ public final class Flags { + /** @hide */ + public static final String FLAG_AMBIENT_AOD = "com.android.systemui.shared.ambient_aod"; /** @hide */ public static final String FLAG_BOUNCER_AREA_EXCLUSION = "com.android.systemui.shared.bouncer_area_exclusion"; /** @hide */ + public static final String FLAG_CLOCK_REACTIVE_SMARTSPACE_LAYOUT = "com.android.systemui.shared.clock_reactive_smartspace_layout"; + /** @hide */ + public static final String FLAG_CLOCK_REACTIVE_VARIANTS = "com.android.systemui.shared.clock_reactive_variants"; + /** @hide */ + public static final String FLAG_CURSOR_HOT_CORNER = "com.android.systemui.shared.cursor_hot_corner"; + /** @hide */ public static final String FLAG_ENABLE_HOME_DELAY = "com.android.systemui.shared.enable_home_delay"; /** @hide */ + public static final String FLAG_ENABLE_LPP_ASSIST_INVOCATION_EFFECT = "com.android.systemui.shared.enable_lpp_assist_invocation_effect"; + /** @hide */ + public static final String FLAG_ENABLE_LPP_ASSIST_INVOCATION_HAPTIC_EFFECT = "com.android.systemui.shared.enable_lpp_assist_invocation_haptic_effect"; + /** @hide */ public static final String FLAG_EXAMPLE_SHARED_FLAG = "com.android.systemui.shared.example_shared_flag"; /** @hide */ - public static final String FLAG_RETURN_ANIMATION_FRAMEWORK_LIBRARY = "com.android.systemui.shared.return_animation_framework_library"; + public static final String FLAG_EXTENDED_WALLPAPER_EFFECTS = "com.android.systemui.shared.extended_wallpaper_effects"; + /** @hide */ + public static final String FLAG_EXTENDIBLE_THEME_MANAGER = "com.android.systemui.shared.extendible_theme_manager"; + /** @hide */ + public static final String FLAG_LOCKSCREEN_CUSTOM_CLOCKS = "com.android.systemui.shared.lockscreen_custom_clocks"; + /** @hide */ + public static final String FLAG_NEW_CUSTOMIZATION_PICKER_UI = "com.android.systemui.shared.new_customization_picker_ui"; + /** @hide */ + public static final String FLAG_NEW_TOUCHPAD_GESTURES_TUTORIAL = "com.android.systemui.shared.new_touchpad_gestures_tutorial"; + /** @hide */ + public static final String FLAG_NOTIFICATION_DOT_CONTRAST_BORDER = "com.android.systemui.shared.notification_dot_contrast_border"; + /** @hide */ + public static final String FLAG_PAN_AND_ZOOM_IN_EXTENDED_WALLPAPER_EFFECTS = "com.android.systemui.shared.pan_and_zoom_in_extended_wallpaper_effects"; + /** @hide */ + public static final String FLAG_SCREENSHOT_CONTEXT_URL = "com.android.systemui.shared.screenshot_context_url"; /** @hide */ public static final String FLAG_SHADE_ALLOW_BACK_GESTURE = "com.android.systemui.shared.shade_allow_back_gesture"; /** @hide */ public static final String FLAG_SIDEFPS_CONTROLLER_REFACTOR = "com.android.systemui.shared.sidefps_controller_refactor"; - - + /** @hide */ + public static final String FLAG_SMARTSPACE_AQI_UPDATED_DESIGN = "com.android.systemui.shared.smartspace_aqi_updated_design"; + /** @hide */ + public static final String FLAG_SMARTSPACE_SEMANTIC_WEATHER_DATA = "com.android.systemui.shared.smartspace_semantic_weather_data"; + /** @hide */ + public static final String FLAG_SMARTSPACE_SPORTS_CARD_BACKGROUND = "com.android.systemui.shared.smartspace_sports_card_background"; + /** @hide */ + public static final String FLAG_SMARTSPACE_UI_UPDATE = "com.android.systemui.shared.smartspace_ui_update"; + /** @hide */ + public static final String FLAG_SMARTSPACE_UI_UPDATE_RESOURCES = "com.android.systemui.shared.smartspace_ui_update_resources"; + /** @hide */ + public static final String FLAG_SMARTSPACE_WEATHER_USE_MONOCHROME_FONT_ICONS = "com.android.systemui.shared.smartspace_weather_use_monochrome_font_icons"; + /** @hide */ + public static final String FLAG_STATUS_BAR_CONNECTED_DISPLAYS = "com.android.systemui.shared.status_bar_connected_displays"; + /** @hide */ + public static final String FLAG_THREE_BUTTON_CORNER_SWIPE = "com.android.systemui.shared.three_button_corner_swipe"; + /** @hide */ + public static final String FLAG_USE_PREFERRED_IMAGE_EDITOR = "com.android.systemui.shared.use_preferred_image_editor"; + + + public static boolean ambientAod() { + + return FEATURE_FLAGS.ambientAod(); + } + + public static boolean bouncerAreaExclusion() { + return FEATURE_FLAGS.bouncerAreaExclusion(); } - - + + + public static boolean clockReactiveSmartspaceLayout() { + + return FEATURE_FLAGS.clockReactiveSmartspaceLayout(); + } + + + public static boolean clockReactiveVariants() { + + return FEATURE_FLAGS.clockReactiveVariants(); + } + + + public static boolean cursorHotCorner() { + + return FEATURE_FLAGS.cursorHotCorner(); + } + + public static boolean enableHomeDelay() { + return FEATURE_FLAGS.enableHomeDelay(); } - - + + + public static boolean enableLppAssistInvocationEffect() { + + return FEATURE_FLAGS.enableLppAssistInvocationEffect(); + } + + + public static boolean enableLppAssistInvocationHapticEffect() { + + return FEATURE_FLAGS.enableLppAssistInvocationHapticEffect(); + } + + public static boolean exampleSharedFlag() { + return FEATURE_FLAGS.exampleSharedFlag(); } - - - public static boolean returnAnimationFrameworkLibrary() { - return FEATURE_FLAGS.returnAnimationFrameworkLibrary(); + + + public static boolean extendedWallpaperEffects() { + + return FEATURE_FLAGS.extendedWallpaperEffects(); + } + + + public static boolean extendibleThemeManager() { + + return FEATURE_FLAGS.extendibleThemeManager(); + } + + + public static boolean lockscreenCustomClocks() { + + return FEATURE_FLAGS.lockscreenCustomClocks(); + } + + + public static boolean newCustomizationPickerUi() { + + return FEATURE_FLAGS.newCustomizationPickerUi(); + } + + + public static boolean newTouchpadGesturesTutorial() { + + return FEATURE_FLAGS.newTouchpadGesturesTutorial(); + } + + + public static boolean notificationDotContrastBorder() { + + return FEATURE_FLAGS.notificationDotContrastBorder(); + } + + + public static boolean panAndZoomInExtendedWallpaperEffects() { + + return FEATURE_FLAGS.panAndZoomInExtendedWallpaperEffects(); + } + + + public static boolean screenshotContextUrl() { + + return FEATURE_FLAGS.screenshotContextUrl(); } - - + + public static boolean shadeAllowBackGesture() { + return FEATURE_FLAGS.shadeAllowBackGesture(); } - - + + public static boolean sidefpsControllerRefactor() { + return FEATURE_FLAGS.sidefpsControllerRefactor(); } + + public static boolean smartspaceAqiUpdatedDesign() { + + return FEATURE_FLAGS.smartspaceAqiUpdatedDesign(); + } + + + public static boolean smartspaceSemanticWeatherData() { + + return FEATURE_FLAGS.smartspaceSemanticWeatherData(); + } + + + public static boolean smartspaceSportsCardBackground() { + + return FEATURE_FLAGS.smartspaceSportsCardBackground(); + } + + + public static boolean smartspaceUiUpdate() { + + return FEATURE_FLAGS.smartspaceUiUpdate(); + } + + + public static boolean smartspaceUiUpdateResources() { + + return FEATURE_FLAGS.smartspaceUiUpdateResources(); + } + + + public static boolean smartspaceWeatherUseMonochromeFontIcons() { + + return FEATURE_FLAGS.smartspaceWeatherUseMonochromeFontIcons(); + } + + + public static boolean statusBarConnectedDisplays() { + + return FEATURE_FLAGS.statusBarConnectedDisplays(); + } + + + public static boolean threeButtonCornerSwipe() { + + return FEATURE_FLAGS.threeButtonCornerSwipe(); + } + + + public static boolean usePreferredImageEditor() { + + return FEATURE_FLAGS.usePreferredImageEditor(); + } + private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl(); } diff --git a/flags/src/com/android/window/flags2/CustomFeatureFlags.java b/flags/src/com/android/window/flags2/CustomFeatureFlags.java index c52b5a4bb9a..3c4a36c102c 100644 --- a/flags/src/com/android/window/flags2/CustomFeatureFlags.java +++ b/flags/src/com/android/window/flags2/CustomFeatureFlags.java @@ -1,13 +1,12 @@ package com.android.window.flags2; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.BiPredicate; import java.util.function.Predicate; - /** @hide */ public class CustomFeatureFlags implements FeatureFlags { @@ -17,742 +16,2437 @@ public CustomFeatureFlags(BiPredicate> getValueI mGetValueImpl = getValueImpl; } @Override - - public boolean activityEmbeddingAnimationCustomizationFlag() { - return getValue(Flags.FLAG_ACTIVITY_EMBEDDING_ANIMATION_CUSTOMIZATION_FLAG, - FeatureFlags::activityEmbeddingAnimationCustomizationFlag); - } - @Override - - public boolean activityEmbeddingInteractiveDividerFlag() { - return getValue(Flags.FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG, - FeatureFlags::activityEmbeddingInteractiveDividerFlag); + public boolean activityEmbeddingAbortCrossUidLaunchInFinishingTaskFragment() { + return getValue(Flags.FLAG_ACTIVITY_EMBEDDING_ABORT_CROSS_UID_LAUNCH_IN_FINISHING_TASK_FRAGMENT, + FeatureFlags::activityEmbeddingAbortCrossUidLaunchInFinishingTaskFragment); } @Override - - public boolean activityEmbeddingOverlayPresentationFlag() { - return getValue(Flags.FLAG_ACTIVITY_EMBEDDING_OVERLAY_PRESENTATION_FLAG, - FeatureFlags::activityEmbeddingOverlayPresentationFlag); + + public boolean activityEmbeddingDelayTaskFragmentFinishForActivityLaunch() { + return getValue(Flags.FLAG_ACTIVITY_EMBEDDING_DELAY_TASK_FRAGMENT_FINISH_FOR_ACTIVITY_LAUNCH, + FeatureFlags::activityEmbeddingDelayTaskFragmentFinishForActivityLaunch); } @Override - - public boolean activitySnapshotByDefault() { - return getValue(Flags.FLAG_ACTIVITY_SNAPSHOT_BY_DEFAULT, - FeatureFlags::activitySnapshotByDefault); + + public boolean activityEmbeddingInteractiveDividerFlag() { + return getValue(Flags.FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG, + FeatureFlags::activityEmbeddingInteractiveDividerFlag); } @Override - - public boolean activityWindowInfoFlag() { - return getValue(Flags.FLAG_ACTIVITY_WINDOW_INFO_FLAG, - FeatureFlags::activityWindowInfoFlag); + + public boolean activityEmbeddingMetrics() { + return getValue(Flags.FLAG_ACTIVITY_EMBEDDING_METRICS, + FeatureFlags::activityEmbeddingMetrics); } @Override - + public boolean allowDisableActivityRecordInputSink() { return getValue(Flags.FLAG_ALLOW_DISABLE_ACTIVITY_RECORD_INPUT_SINK, - FeatureFlags::allowDisableActivityRecordInputSink); + FeatureFlags::allowDisableActivityRecordInputSink); } @Override - - public boolean allowHideScmButton() { - return getValue(Flags.FLAG_ALLOW_HIDE_SCM_BUTTON, - FeatureFlags::allowHideScmButton); - } - @Override - - public boolean allowsScreenSizeDecoupledFromStatusBarAndCutout() { - return getValue(Flags.FLAG_ALLOWS_SCREEN_SIZE_DECOUPLED_FROM_STATUS_BAR_AND_CUTOUT, - FeatureFlags::allowsScreenSizeDecoupledFromStatusBarAndCutout); + public boolean alwaysDrawMagnificationFullscreenBorder() { + return getValue(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER, + FeatureFlags::alwaysDrawMagnificationFullscreenBorder); } @Override - - public boolean alwaysDeferTransitionWhenApplyWct() { - return getValue(Flags.FLAG_ALWAYS_DEFER_TRANSITION_WHEN_APPLY_WCT, - FeatureFlags::alwaysDeferTransitionWhenApplyWct); + + public boolean alwaysSeqIdLayout() { + return getValue(Flags.FLAG_ALWAYS_SEQ_ID_LAYOUT, + FeatureFlags::alwaysSeqIdLayout); } @Override - - public boolean alwaysDrawMagnificationFullscreenBorder() { - return getValue(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER, - FeatureFlags::alwaysDrawMagnificationFullscreenBorder); + + public boolean alwaysSeqIdLayoutWear() { + return getValue(Flags.FLAG_ALWAYS_SEQ_ID_LAYOUT_WEAR, + FeatureFlags::alwaysSeqIdLayoutWear); } @Override - + public boolean alwaysUpdateWallpaperPermission() { return getValue(Flags.FLAG_ALWAYS_UPDATE_WALLPAPER_PERMISSION, - FeatureFlags::alwaysUpdateWallpaperPermission); + FeatureFlags::alwaysUpdateWallpaperPermission); + } + + @Override + + public boolean aodTransition() { + return getValue(Flags.FLAG_AOD_TRANSITION, + FeatureFlags::aodTransition); } @Override - + public boolean appCompatPropertiesApi() { return getValue(Flags.FLAG_APP_COMPAT_PROPERTIES_API, - FeatureFlags::appCompatPropertiesApi); + FeatureFlags::appCompatPropertiesApi); } @Override - + public boolean appCompatRefactoring() { return getValue(Flags.FLAG_APP_COMPAT_REFACTORING, - FeatureFlags::appCompatRefactoring); + FeatureFlags::appCompatRefactoring); } @Override - - public boolean balDontBringExistingBackgroundTaskStackToFg() { - return getValue(Flags.FLAG_BAL_DONT_BRING_EXISTING_BACKGROUND_TASK_STACK_TO_FG, - FeatureFlags::balDontBringExistingBackgroundTaskStackToFg); + + public boolean appCompatRefactoringFixMultiwindowTaskHierarchy() { + return getValue(Flags.FLAG_APP_COMPAT_REFACTORING_FIX_MULTIWINDOW_TASK_HIERARCHY, + FeatureFlags::appCompatRefactoringFixMultiwindowTaskHierarchy); + } + + @Override + + public boolean appCompatRefactoringForceChangeForLetterboxTransitions() { + return getValue(Flags.FLAG_APP_COMPAT_REFACTORING_FORCE_CHANGE_FOR_LETTERBOX_TRANSITIONS, + FeatureFlags::appCompatRefactoringForceChangeForLetterboxTransitions); + } + + @Override + + public boolean appCompatRefactoringRoundedCorners() { + return getValue(Flags.FLAG_APP_COMPAT_REFACTORING_ROUNDED_CORNERS, + FeatureFlags::appCompatRefactoringRoundedCorners); + } + + @Override + + public boolean appCompatRefactoringRoundedCornersAnimation() { + return getValue(Flags.FLAG_APP_COMPAT_REFACTORING_ROUNDED_CORNERS_ANIMATION, + FeatureFlags::appCompatRefactoringRoundedCornersAnimation); + } + + @Override + + public boolean appCompatRefactoringSetAppboundsToNullWhenEmpty() { + return getValue(Flags.FLAG_APP_COMPAT_REFACTORING_SET_APPBOUNDS_TO_NULL_WHEN_EMPTY, + FeatureFlags::appCompatRefactoringSetAppboundsToNullWhenEmpty); + } + + @Override + + public boolean appCompatRefactoringSkipStartingWindowLetterbox() { + return getValue(Flags.FLAG_APP_COMPAT_REFACTORING_SKIP_STARTING_WINDOW_LETTERBOX, + FeatureFlags::appCompatRefactoringSkipStartingWindowLetterbox); + } + + @Override + + public boolean appCompatRefactoringUseActivityLeashForLetterboxing() { + return getValue(Flags.FLAG_APP_COMPAT_REFACTORING_USE_ACTIVITY_LEASH_FOR_LETTERBOXING, + FeatureFlags::appCompatRefactoringUseActivityLeashForLetterboxing); + } + + @Override + + public boolean appCompatUiFramework() { + return getValue(Flags.FLAG_APP_COMPAT_UI_FRAMEWORK, + FeatureFlags::appCompatUiFramework); + } + + @Override + + public boolean appHandleNoRelayoutOnExclusionChange() { + return getValue(Flags.FLAG_APP_HANDLE_NO_RELAYOUT_ON_EXCLUSION_CHANGE, + FeatureFlags::appHandleNoRelayoutOnExclusionChange); + } + + @Override + + public boolean applyDeskActivationOnUserSwitch() { + return getValue(Flags.FLAG_APPLY_DESK_ACTIVATION_ON_USER_SWITCH, + FeatureFlags::applyDeskActivationOnUserSwitch); + } + + @Override + + public boolean applyLifecycleOnPipChange() { + return getValue(Flags.FLAG_APPLY_LIFECYCLE_ON_PIP_CHANGE, + FeatureFlags::applyLifecycleOnPipChange); + } + + @Override + + public boolean avoidRebindingIntentionallyDisconnectedWallpaper() { + return getValue(Flags.FLAG_AVOID_REBINDING_INTENTIONALLY_DISCONNECTED_WALLPAPER, + FeatureFlags::avoidRebindingIntentionallyDisconnectedWallpaper); + } + + @Override + + public boolean backupAndRestoreForUserAspectRatioSettings() { + return getValue(Flags.FLAG_BACKUP_AND_RESTORE_FOR_USER_ASPECT_RATIO_SETTINGS, + FeatureFlags::backupAndRestoreForUserAspectRatioSettings); + } + + @Override + + public boolean balAdditionalStartModes() { + return getValue(Flags.FLAG_BAL_ADDITIONAL_START_MODES, + FeatureFlags::balAdditionalStartModes); + } + + @Override + + public boolean balCheckBroadcastWhenDispatched() { + return getValue(Flags.FLAG_BAL_CHECK_BROADCAST_WHEN_DISPATCHED, + FeatureFlags::balCheckBroadcastWhenDispatched); } @Override - - public boolean balImproveRealCallerVisibilityCheck() { - return getValue(Flags.FLAG_BAL_IMPROVE_REAL_CALLER_VISIBILITY_CHECK, - FeatureFlags::balImproveRealCallerVisibilityCheck); + + public boolean balCoverIntentSender() { + return getValue(Flags.FLAG_BAL_COVER_INTENT_SENDER, + FeatureFlags::balCoverIntentSender); } @Override - - public boolean balImprovedMetrics() { - return getValue(Flags.FLAG_BAL_IMPROVED_METRICS, - FeatureFlags::balImprovedMetrics); + + public boolean balDontBringExistingBackgroundTaskStackToFg() { + return getValue(Flags.FLAG_BAL_DONT_BRING_EXISTING_BACKGROUND_TASK_STACK_TO_FG, + FeatureFlags::balDontBringExistingBackgroundTaskStackToFg); } @Override - - public boolean balRequireOptInByPendingIntentCreator() { - return getValue(Flags.FLAG_BAL_REQUIRE_OPT_IN_BY_PENDING_INTENT_CREATOR, - FeatureFlags::balRequireOptInByPendingIntentCreator); + + public boolean balReduceGracePeriod() { + return getValue(Flags.FLAG_BAL_REDUCE_GRACE_PERIOD, + FeatureFlags::balReduceGracePeriod); } @Override - - public boolean balRequireOptInSameUid() { - return getValue(Flags.FLAG_BAL_REQUIRE_OPT_IN_SAME_UID, - FeatureFlags::balRequireOptInSameUid); + + public boolean balReportAbortedActivityStarts() { + return getValue(Flags.FLAG_BAL_REPORT_ABORTED_ACTIVITY_STARTS, + FeatureFlags::balReportAbortedActivityStarts); } @Override - + public boolean balRespectAppSwitchStateWhenCheckBoundByForegroundUid() { return getValue(Flags.FLAG_BAL_RESPECT_APP_SWITCH_STATE_WHEN_CHECK_BOUND_BY_FOREGROUND_UID, - FeatureFlags::balRespectAppSwitchStateWhenCheckBoundByForegroundUid); + FeatureFlags::balRespectAppSwitchStateWhenCheckBoundByForegroundUid); + } + + @Override + + public boolean balSendIntentWithOptions() { + return getValue(Flags.FLAG_BAL_SEND_INTENT_WITH_OPTIONS, + FeatureFlags::balSendIntentWithOptions); } @Override - - public boolean balShowToasts() { - return getValue(Flags.FLAG_BAL_SHOW_TOASTS, - FeatureFlags::balShowToasts); + + public boolean balStrictModeRo() { + return getValue(Flags.FLAG_BAL_STRICT_MODE_RO, + FeatureFlags::balStrictModeRo); } @Override - - public boolean balShowToastsBlocked() { - return getValue(Flags.FLAG_BAL_SHOW_TOASTS_BLOCKED, - FeatureFlags::balShowToastsBlocked); + + public boolean cameraCompatFullscreenPickSameTaskActivity() { + return getValue(Flags.FLAG_CAMERA_COMPAT_FULLSCREEN_PICK_SAME_TASK_ACTIVITY, + FeatureFlags::cameraCompatFullscreenPickSameTaskActivity); } @Override - - public boolean blastSyncNotificationShadeOnDisplaySwitch() { - return getValue(Flags.FLAG_BLAST_SYNC_NOTIFICATION_SHADE_ON_DISPLAY_SWITCH, - FeatureFlags::blastSyncNotificationShadeOnDisplaySwitch); + + public boolean cameraCompatLandscapeCameraSupport() { + return getValue(Flags.FLAG_CAMERA_COMPAT_LANDSCAPE_CAMERA_SUPPORT, + FeatureFlags::cameraCompatLandscapeCameraSupport); } @Override - - public boolean bundleClientTransactionFlag() { - return getValue(Flags.FLAG_BUNDLE_CLIENT_TRANSACTION_FLAG, - FeatureFlags::bundleClientTransactionFlag); + + public boolean cameraCompatUnifyCameraPolicies() { + return getValue(Flags.FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES, + FeatureFlags::cameraCompatUnifyCameraPolicies); } @Override - - public boolean cameraCompatForFreeform() { - return getValue(Flags.FLAG_CAMERA_COMPAT_FOR_FREEFORM, - FeatureFlags::cameraCompatForFreeform); + + public boolean clearReusableScvhOnRelease() { + return getValue(Flags.FLAG_CLEAR_REUSABLE_SCVH_ON_RELEASE, + FeatureFlags::clearReusableScvhOnRelease); } @Override - - public boolean closeToSquareConfigIncludesStatusBar() { - return getValue(Flags.FLAG_CLOSE_TO_SQUARE_CONFIG_INCLUDES_STATUS_BAR, - FeatureFlags::closeToSquareConfigIncludesStatusBar); + + public boolean closeFullscreenAndSplitscreenKeyboardShortcut() { + return getValue(Flags.FLAG_CLOSE_FULLSCREEN_AND_SPLITSCREEN_KEYBOARD_SHORTCUT, + FeatureFlags::closeFullscreenAndSplitscreenKeyboardShortcut); } @Override - - public boolean configurableFontScaleDefault() { - return getValue(Flags.FLAG_CONFIGURABLE_FONT_SCALE_DEFAULT, - FeatureFlags::configurableFontScaleDefault); + + public boolean closeTaskKeyboardShortcut() { + return getValue(Flags.FLAG_CLOSE_TASK_KEYBOARD_SHORTCUT, + FeatureFlags::closeTaskKeyboardShortcut); } @Override - - public boolean coverDisplayOptIn() { - return getValue(Flags.FLAG_COVER_DISPLAY_OPT_IN, - FeatureFlags::coverDisplayOptIn); + + public boolean closeToSquareConfigIncludesStatusBar() { + return getValue(Flags.FLAG_CLOSE_TO_SQUARE_CONFIG_INCLUDES_STATUS_BAR, + FeatureFlags::closeToSquareConfigIncludesStatusBar); } @Override - - public boolean deferDisplayUpdates() { - return getValue(Flags.FLAG_DEFER_DISPLAY_UPDATES, - FeatureFlags::deferDisplayUpdates); + + public boolean coverDisplayOptIn() { + return getValue(Flags.FLAG_COVER_DISPLAY_OPT_IN, + FeatureFlags::coverDisplayOptIn); } @Override - - public boolean delayNotificationToMagnificationWhenRecentsWindowToFrontTransition() { - return getValue(Flags.FLAG_DELAY_NOTIFICATION_TO_MAGNIFICATION_WHEN_RECENTS_WINDOW_TO_FRONT_TRANSITION, - FeatureFlags::delayNotificationToMagnificationWhenRecentsWindowToFrontTransition); + + public boolean currentAnimatorScaleUsesSharedMemory() { + return getValue(Flags.FLAG_CURRENT_ANIMATOR_SCALE_USES_SHARED_MEMORY, + FeatureFlags::currentAnimatorScaleUsesSharedMemory); } @Override - - public boolean delegateUnhandledDrags() { - return getValue(Flags.FLAG_DELEGATE_UNHANDLED_DRAGS, - FeatureFlags::delegateUnhandledDrags); + + public boolean defaultDeskWithoutWarmupMigration() { + return getValue(Flags.FLAG_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION, + FeatureFlags::defaultDeskWithoutWarmupMigration); } @Override - - public boolean deleteCaptureDisplay() { - return getValue(Flags.FLAG_DELETE_CAPTURE_DISPLAY, - FeatureFlags::deleteCaptureDisplay); + + public boolean deferResumeFocusInNonFocusedWindow() { + return getValue(Flags.FLAG_DEFER_RESUME_FOCUS_IN_NON_FOCUSED_WINDOW, + FeatureFlags::deferResumeFocusInNonFocusedWindow); } @Override - + public boolean density390Api() { return getValue(Flags.FLAG_DENSITY_390_API, - FeatureFlags::density390Api); + FeatureFlags::density390Api); + } + + @Override + + public boolean deprecateSurfaceAnimationFrameCallback() { + return getValue(Flags.FLAG_DEPRECATE_SURFACE_ANIMATION_FRAME_CALLBACK, + FeatureFlags::deprecateSurfaceAnimationFrameCallback); + } + + @Override + + public boolean deprecateWindowAnimatorFrameCallback() { + return getValue(Flags.FLAG_DEPRECATE_WINDOW_ANIMATOR_FRAME_CALLBACK, + FeatureFlags::deprecateWindowAnimatorFrameCallback); + } + + @Override + + public boolean dimmingWallpaperForMaximizedAndTiled() { + return getValue(Flags.FLAG_DIMMING_WALLPAPER_FOR_MAXIMIZED_AND_TILED, + FeatureFlags::dimmingWallpaperForMaximizedAndTiled); } @Override - - public boolean disableObjectPool() { - return getValue(Flags.FLAG_DISABLE_OBJECT_POOL, - FeatureFlags::disableObjectPool); + + public boolean disableDesktopLaunchParamsOutsideDesktopBugFix() { + return getValue(Flags.FLAG_DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX, + FeatureFlags::disableDesktopLaunchParamsOutsideDesktopBugFix); } @Override - - public boolean disableThinLetterboxingPolicy() { - return getValue(Flags.FLAG_DISABLE_THIN_LETTERBOXING_POLICY, - FeatureFlags::disableThinLetterboxingPolicy); + + public boolean disableNonResizableAppSnapResizing() { + return getValue(Flags.FLAG_DISABLE_NON_RESIZABLE_APP_SNAP_RESIZING, + FeatureFlags::disableNonResizableAppSnapResizing); } @Override - - public boolean doNotCheckIntersectionWhenNonMagnifiableWindowTransitions() { - return getValue(Flags.FLAG_DO_NOT_CHECK_INTERSECTION_WHEN_NON_MAGNIFIABLE_WINDOW_TRANSITIONS, - FeatureFlags::doNotCheckIntersectionWhenNonMagnifiableWindowTransitions); + + public boolean disableRestoreNonFullscreenBoundsOnConfigurationChange() { + return getValue(Flags.FLAG_DISABLE_RESTORE_NON_FULLSCREEN_BOUNDS_ON_CONFIGURATION_CHANGE, + FeatureFlags::disableRestoreNonFullscreenBoundsOnConfigurationChange); } @Override - - public boolean drawSnapshotAspectRatioMatch() { - return getValue(Flags.FLAG_DRAW_SNAPSHOT_ASPECT_RATIO_MATCH, - FeatureFlags::drawSnapshotAspectRatioMatch); + + public boolean doNotForceWallpaperForFreeformTask() { + return getValue(Flags.FLAG_DO_NOT_FORCE_WALLPAPER_FOR_FREEFORM_TASK, + FeatureFlags::doNotForceWallpaperForFreeformTask); } @Override - - public boolean edgeToEdgeByDefault() { - return getValue(Flags.FLAG_EDGE_TO_EDGE_BY_DEFAULT, - FeatureFlags::edgeToEdgeByDefault); + + public boolean enableAccessibleCustomHeaders() { + return getValue(Flags.FLAG_ENABLE_ACCESSIBLE_CUSTOM_HEADERS, + FeatureFlags::enableAccessibleCustomHeaders); } @Override - - public boolean embeddedActivityBackNavFlag() { - return getValue(Flags.FLAG_EMBEDDED_ACTIVITY_BACK_NAV_FLAG, - FeatureFlags::embeddedActivityBackNavFlag); + + public boolean enableActivityEmbeddingSupportForConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_ACTIVITY_EMBEDDING_SUPPORT_FOR_CONNECTED_DISPLAYS, + FeatureFlags::enableActivityEmbeddingSupportForConnectedDisplays); } @Override - - public boolean enableAdditionalWindowsAboveStatusBar() { - return getValue(Flags.FLAG_ENABLE_ADDITIONAL_WINDOWS_ABOVE_STATUS_BAR, - FeatureFlags::enableAdditionalWindowsAboveStatusBar); + + public boolean enableAppHandlePositionReporting() { + return getValue(Flags.FLAG_ENABLE_APP_HANDLE_POSITION_REPORTING, + FeatureFlags::enableAppHandlePositionReporting); } @Override - + public boolean enableAppHeaderWithTaskDensity() { return getValue(Flags.FLAG_ENABLE_APP_HEADER_WITH_TASK_DENSITY, - FeatureFlags::enableAppHeaderWithTaskDensity); + FeatureFlags::enableAppHeaderWithTaskDensity); } @Override - - public boolean enableBufferTransformHintFromDisplay() { - return getValue(Flags.FLAG_ENABLE_BUFFER_TRANSFORM_HINT_FROM_DISPLAY, - FeatureFlags::enableBufferTransformHintFromDisplay); + + public boolean enableAppToWebEducationAnimation() { + return getValue(Flags.FLAG_ENABLE_APP_TO_WEB_EDUCATION_ANIMATION, + FeatureFlags::enableAppToWebEducationAnimation); } @Override - - public boolean enableCameraCompatForDesktopWindowing() { - return getValue(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING, - FeatureFlags::enableCameraCompatForDesktopWindowing); + + public boolean enableAutoRestartOnDisplayMove() { + return getValue(Flags.FLAG_ENABLE_AUTO_RESTART_ON_DISPLAY_MOVE, + FeatureFlags::enableAutoRestartOnDisplayMove); } @Override - - public boolean enableCompatuiSysuiLauncher() { - return getValue(Flags.FLAG_ENABLE_COMPATUI_SYSUI_LAUNCHER, - FeatureFlags::enableCompatuiSysuiLauncher); + + public boolean enableBackupAndRestoreDisplayWindowSettings() { + return getValue(Flags.FLAG_ENABLE_BACKUP_AND_RESTORE_DISPLAY_WINDOW_SETTINGS, + FeatureFlags::enableBackupAndRestoreDisplayWindowSettings); } @Override - - public boolean enableDesktopWindowingImmersiveHandleHiding() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_IMMERSIVE_HANDLE_HIDING, - FeatureFlags::enableDesktopWindowingImmersiveHandleHiding); + + public boolean enableBlockNonDesktopDisplayWindowDragBugfix() { + return getValue(Flags.FLAG_ENABLE_BLOCK_NON_DESKTOP_DISPLAY_WINDOW_DRAG_BUGFIX, + FeatureFlags::enableBlockNonDesktopDisplayWindowDragBugfix); } @Override - - public boolean enableDesktopWindowingModalsPolicy() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, - FeatureFlags::enableDesktopWindowingModalsPolicy); + + public boolean enableBorderSettings() { + return getValue(Flags.FLAG_ENABLE_BORDER_SETTINGS, + FeatureFlags::enableBorderSettings); } @Override - - public boolean enableDesktopWindowingMode() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, - FeatureFlags::enableDesktopWindowingMode); + + public boolean enableBoundsRestoringOnTilingExit() { + return getValue(Flags.FLAG_ENABLE_BOUNDS_RESTORING_ON_TILING_EXIT, + FeatureFlags::enableBoundsRestoringOnTilingExit); } @Override - - public boolean enableDesktopWindowingQuickSwitch() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH, - FeatureFlags::enableDesktopWindowingQuickSwitch); + + public boolean enableBoxShadowSettings() { + return getValue(Flags.FLAG_ENABLE_BOX_SHADOW_SETTINGS, + FeatureFlags::enableBoxShadowSettings); } @Override - - public boolean enableDesktopWindowingScvhCache() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SCVH_CACHE, - FeatureFlags::enableDesktopWindowingScvhCache); + + public boolean enableBugFixesForSecondaryDisplay() { + return getValue(Flags.FLAG_ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY, + FeatureFlags::enableBugFixesForSecondaryDisplay); } @Override - - public boolean enableDesktopWindowingSizeConstraints() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS, - FeatureFlags::enableDesktopWindowingSizeConstraints); + + public boolean enableCameraCompatCompatibilityInfoRotateAndCropBugfix() { + return getValue(Flags.FLAG_ENABLE_CAMERA_COMPAT_COMPATIBILITY_INFO_ROTATE_AND_CROP_BUGFIX, + FeatureFlags::enableCameraCompatCompatibilityInfoRotateAndCropBugfix); } @Override - - public boolean enableDesktopWindowingTaskLimit() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASK_LIMIT, - FeatureFlags::enableDesktopWindowingTaskLimit); + + public boolean enableCameraCompatExternalDisplayRotationBugfix() { + return getValue(Flags.FLAG_ENABLE_CAMERA_COMPAT_EXTERNAL_DISPLAY_ROTATION_BUGFIX, + FeatureFlags::enableCameraCompatExternalDisplayRotationBugfix); } @Override - - public boolean enableDesktopWindowingTaskbarRunningApps() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS, - FeatureFlags::enableDesktopWindowingTaskbarRunningApps); + + public boolean enableCameraCompatForDesktopWindowing() { + return getValue(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING, + FeatureFlags::enableCameraCompatForDesktopWindowing); } @Override - - public boolean enableDesktopWindowingWallpaperActivity() { - return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, - FeatureFlags::enableDesktopWindowingWallpaperActivity); + + public boolean enableCameraCompatForDesktopWindowingOptOut() { + return getValue(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT, + FeatureFlags::enableCameraCompatForDesktopWindowingOptOut); } @Override - - public boolean enableScaledResizing() { - return getValue(Flags.FLAG_ENABLE_SCALED_RESIZING, - FeatureFlags::enableScaledResizing); + + public boolean enableCameraCompatForDesktopWindowingOptOutApi() { + return getValue(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT_API, + FeatureFlags::enableCameraCompatForDesktopWindowingOptOutApi); } @Override - - public boolean enableTaskStackObserverInShell() { - return getValue(Flags.FLAG_ENABLE_TASK_STACK_OBSERVER_IN_SHELL, - FeatureFlags::enableTaskStackObserverInShell); + + public boolean enableCameraCompatSandboxDisplayRotationOnExternalDisplaysBugfix() { + return getValue(Flags.FLAG_ENABLE_CAMERA_COMPAT_SANDBOX_DISPLAY_ROTATION_ON_EXTERNAL_DISPLAYS_BUGFIX, + FeatureFlags::enableCameraCompatSandboxDisplayRotationOnExternalDisplaysBugfix); } @Override - - public boolean enableThemedAppHeaders() { - return getValue(Flags.FLAG_ENABLE_THEMED_APP_HEADERS, - FeatureFlags::enableThemedAppHeaders); + + public boolean enableCameraCompatTrackTaskAndAppBugfix() { + return getValue(Flags.FLAG_ENABLE_CAMERA_COMPAT_TRACK_TASK_AND_APP_BUGFIX, + FeatureFlags::enableCameraCompatTrackTaskAndAppBugfix); } @Override - - public boolean enableWindowingDynamicInitialBounds() { - return getValue(Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, - FeatureFlags::enableWindowingDynamicInitialBounds); + + public boolean enableCaptionCompatInsetConversion() { + return getValue(Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_CONVERSION, + FeatureFlags::enableCaptionCompatInsetConversion); } @Override - - public boolean enableWindowingEdgeDragResize() { - return getValue(Flags.FLAG_ENABLE_WINDOWING_EDGE_DRAG_RESIZE, - FeatureFlags::enableWindowingEdgeDragResize); + + public boolean enableCaptionCompatInsetForceConsumption() { + return getValue(Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION, + FeatureFlags::enableCaptionCompatInsetForceConsumption); } @Override - - public boolean enableWmExtensionsForAllFlag() { - return getValue(Flags.FLAG_ENABLE_WM_EXTENSIONS_FOR_ALL_FLAG, - FeatureFlags::enableWmExtensionsForAllFlag); + + public boolean enableCaptionCompatInsetForceConsumptionAlways() { + return getValue(Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS, + FeatureFlags::enableCaptionCompatInsetForceConsumptionAlways); } @Override - - public boolean enforceEdgeToEdge() { - return getValue(Flags.FLAG_ENFORCE_EDGE_TO_EDGE, - FeatureFlags::enforceEdgeToEdge); + + public boolean enableCascadingWindows() { + return getValue(Flags.FLAG_ENABLE_CASCADING_WINDOWS, + FeatureFlags::enableCascadingWindows); } @Override - - public boolean ensureWallpaperInTransitions() { - return getValue(Flags.FLAG_ENSURE_WALLPAPER_IN_TRANSITIONS, - FeatureFlags::ensureWallpaperInTransitions); + + public boolean enableCloseLidInteraction() { + return getValue(Flags.FLAG_ENABLE_CLOSE_LID_INTERACTION, + FeatureFlags::enableCloseLidInteraction); } @Override - - public boolean explicitRefreshRateHints() { - return getValue(Flags.FLAG_EXPLICIT_REFRESH_RATE_HINTS, - FeatureFlags::explicitRefreshRateHints); + + public boolean enableCompatUiDesktopModeSynchronizationBugfix() { + return getValue(Flags.FLAG_ENABLE_COMPAT_UI_DESKTOP_MODE_SYNCHRONIZATION_BUGFIX, + FeatureFlags::enableCompatUiDesktopModeSynchronizationBugfix); } @Override - - public boolean fifoPriorityForMajorUiProcesses() { - return getValue(Flags.FLAG_FIFO_PRIORITY_FOR_MAJOR_UI_PROCESSES, - FeatureFlags::fifoPriorityForMajorUiProcesses); + + public boolean enableCompatUiVisibilityStatus() { + return getValue(Flags.FLAG_ENABLE_COMPAT_UI_VISIBILITY_STATUS, + FeatureFlags::enableCompatUiVisibilityStatus); } @Override - - public boolean fixNoContainerUpdateWithoutResize() { - return getValue(Flags.FLAG_FIX_NO_CONTAINER_UPDATE_WITHOUT_RESIZE, - FeatureFlags::fixNoContainerUpdateWithoutResize); + + public boolean enableCompatuiSysuiLauncherFix() { + return getValue(Flags.FLAG_ENABLE_COMPATUI_SYSUI_LAUNCHER_FIX, + FeatureFlags::enableCompatuiSysuiLauncherFix); } @Override - - public boolean fixPipRestoreToOverlay() { - return getValue(Flags.FLAG_FIX_PIP_RESTORE_TO_OVERLAY, - FeatureFlags::fixPipRestoreToOverlay); + + public boolean enableConnectedDisplaysDnd() { + return getValue(Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_DND, + FeatureFlags::enableConnectedDisplaysDnd); } @Override - - public boolean fullscreenDimFlag() { - return getValue(Flags.FLAG_FULLSCREEN_DIM_FLAG, - FeatureFlags::fullscreenDimFlag); + + public boolean enableConnectedDisplaysPip() { + return getValue(Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_PIP, + FeatureFlags::enableConnectedDisplaysPip); } @Override - - public boolean getDimmerOnClosing() { - return getValue(Flags.FLAG_GET_DIMMER_ON_CLOSING, - FeatureFlags::getDimmerOnClosing); + + public boolean enableConnectedDisplaysWallpaperPresentations() { + return getValue(Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WALLPAPER_PRESENTATIONS, + FeatureFlags::enableConnectedDisplaysWallpaperPresentations); } @Override - - public boolean immersiveAppRepositioning() { - return getValue(Flags.FLAG_IMMERSIVE_APP_REPOSITIONING, - FeatureFlags::immersiveAppRepositioning); + + public boolean enableConnectedDisplaysWindowDrag() { + return getValue(Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG, + FeatureFlags::enableConnectedDisplaysWindowDrag); } @Override - - public boolean insetsControlChangedItem() { - return getValue(Flags.FLAG_INSETS_CONTROL_CHANGED_ITEM, - FeatureFlags::insetsControlChangedItem); + + public boolean enableCrashLoggingForDesktop() { + return getValue(Flags.FLAG_ENABLE_CRASH_LOGGING_FOR_DESKTOP, + FeatureFlags::enableCrashLoggingForDesktop); } @Override - - public boolean insetsControlSeq() { - return getValue(Flags.FLAG_INSETS_CONTROL_SEQ, - FeatureFlags::insetsControlSeq); + + public boolean enableCrossDisplaysAppLaunchTransition() { + return getValue(Flags.FLAG_ENABLE_CROSS_DISPLAYS_APP_LAUNCH_TRANSITION, + FeatureFlags::enableCrossDisplaysAppLaunchTransition); } @Override - - public boolean insetsDecoupledConfiguration() { - return getValue(Flags.FLAG_INSETS_DECOUPLED_CONFIGURATION, - FeatureFlags::insetsDecoupledConfiguration); + + public boolean enableCrossDisplaysPipTaskLaunch() { + return getValue(Flags.FLAG_ENABLE_CROSS_DISPLAYS_PIP_TASK_LAUNCH, + FeatureFlags::enableCrossDisplaysPipTaskLaunch); } @Override - - public boolean introduceSmootherDimmer() { - return getValue(Flags.FLAG_INTRODUCE_SMOOTHER_DIMMER, - FeatureFlags::introduceSmootherDimmer); + + public boolean enableDesktopAppHandleAnimation() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_APP_HANDLE_ANIMATION, + FeatureFlags::enableDesktopAppHandleAnimation); } @Override - - public boolean keyguardAppearTransition() { - return getValue(Flags.FLAG_KEYGUARD_APPEAR_TRANSITION, - FeatureFlags::keyguardAppearTransition); + + public boolean enableDesktopAppHeaderStateChangeAnnouncements() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_APP_HEADER_STATE_CHANGE_ANNOUNCEMENTS, + FeatureFlags::enableDesktopAppHeaderStateChangeAnnouncements); } @Override - - public boolean letterboxBackgroundWallpaper() { - return getValue(Flags.FLAG_LETTERBOX_BACKGROUND_WALLPAPER, - FeatureFlags::letterboxBackgroundWallpaper); + + public boolean enableDesktopAppLaunchAlttabTransitions() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS, + FeatureFlags::enableDesktopAppLaunchAlttabTransitions); } @Override - - public boolean movableCutoutConfiguration() { - return getValue(Flags.FLAG_MOVABLE_CUTOUT_CONFIGURATION, - FeatureFlags::movableCutoutConfiguration); + + public boolean enableDesktopAppLaunchAlttabTransitionsBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX, + FeatureFlags::enableDesktopAppLaunchAlttabTransitionsBugfix); } @Override - - public boolean moveAnimationOptionsToChange() { - return getValue(Flags.FLAG_MOVE_ANIMATION_OPTIONS_TO_CHANGE, - FeatureFlags::moveAnimationOptionsToChange); + + public boolean enableDesktopAppLaunchBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX, + FeatureFlags::enableDesktopAppLaunchBugfix); } @Override - - public boolean multiCrop() { - return getValue(Flags.FLAG_MULTI_CROP, - FeatureFlags::multiCrop); + + public boolean enableDesktopAppLaunchTransitions() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS, + FeatureFlags::enableDesktopAppLaunchTransitions); } @Override - - public boolean navBarTransparentByDefault() { - return getValue(Flags.FLAG_NAV_BAR_TRANSPARENT_BY_DEFAULT, - FeatureFlags::navBarTransparentByDefault); + + public boolean enableDesktopAppLaunchTransitionsBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX, + FeatureFlags::enableDesktopAppLaunchTransitionsBugfix); } @Override - - public boolean noConsecutiveVisibilityEvents() { - return getValue(Flags.FLAG_NO_CONSECUTIVE_VISIBILITY_EVENTS, - FeatureFlags::noConsecutiveVisibilityEvents); + + public boolean enableDesktopCloseShortcutBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_CLOSE_SHORTCUT_BUGFIX, + FeatureFlags::enableDesktopCloseShortcutBugfix); } @Override - - public boolean noVisibilityEventOnDisplayStateChange() { - return getValue(Flags.FLAG_NO_VISIBILITY_EVENT_ON_DISPLAY_STATE_CHANGE, - FeatureFlags::noVisibilityEventOnDisplayStateChange); + + public boolean enableDesktopCloseTaskAnimationInDtcBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_CLOSE_TASK_ANIMATION_IN_DTC_BUGFIX, + FeatureFlags::enableDesktopCloseTaskAnimationInDtcBugfix); } @Override - - public boolean offloadColorExtraction() { - return getValue(Flags.FLAG_OFFLOAD_COLOR_EXTRACTION, - FeatureFlags::offloadColorExtraction); + + public boolean enableDesktopFirstBasedDefaultToDesktopBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX, + FeatureFlags::enableDesktopFirstBasedDefaultToDesktopBugfix); } @Override - - public boolean predictiveBackSystemAnims() { - return getValue(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS, - FeatureFlags::predictiveBackSystemAnims); + + public boolean enableDesktopFirstBasedDragToMaximize() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DRAG_TO_MAXIMIZE, + FeatureFlags::enableDesktopFirstBasedDragToMaximize); } @Override - - public boolean rearDisplayDisableForceDesktopSystemDecorations() { - return getValue(Flags.FLAG_REAR_DISPLAY_DISABLE_FORCE_DESKTOP_SYSTEM_DECORATIONS, - FeatureFlags::rearDisplayDisableForceDesktopSystemDecorations); + + public boolean enableDesktopFirstFullscreenRefocusBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_FIRST_FULLSCREEN_REFOCUS_BUGFIX, + FeatureFlags::enableDesktopFirstFullscreenRefocusBugfix); } @Override - - public boolean releaseSnapshotAggressively() { - return getValue(Flags.FLAG_RELEASE_SNAPSHOT_AGGRESSIVELY, - FeatureFlags::releaseSnapshotAggressively); + + public boolean enableDesktopFirstListener() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_FIRST_LISTENER, + FeatureFlags::enableDesktopFirstListener); } @Override - - public boolean removePrepareSurfaceInPlacement() { - return getValue(Flags.FLAG_REMOVE_PREPARE_SURFACE_IN_PLACEMENT, - FeatureFlags::removePrepareSurfaceInPlacement); + + public boolean enableDesktopFirstPolicyInLpm() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_FIRST_POLICY_IN_LPM, + FeatureFlags::enableDesktopFirstPolicyInLpm); } @Override - - public boolean screenRecordingCallbacks() { - return getValue(Flags.FLAG_SCREEN_RECORDING_CALLBACKS, - FeatureFlags::screenRecordingCallbacks); + + public boolean enableDesktopFirstTopFullscreenBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_FIRST_TOP_FULLSCREEN_BUGFIX, + FeatureFlags::enableDesktopFirstTopFullscreenBugfix); } @Override - - public boolean sdkDesiredPresentTime() { - return getValue(Flags.FLAG_SDK_DESIRED_PRESENT_TIME, - FeatureFlags::sdkDesiredPresentTime); + + public boolean enableDesktopImeBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_IME_BUGFIX, + FeatureFlags::enableDesktopImeBugfix); } @Override - - public boolean secureWindowState() { - return getValue(Flags.FLAG_SECURE_WINDOW_STATE, - FeatureFlags::secureWindowState); + + public boolean enableDesktopImmersiveDragBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_IMMERSIVE_DRAG_BUGFIX, + FeatureFlags::enableDesktopImmersiveDragBugfix); } @Override - - public boolean setScPropertiesInClient() { - return getValue(Flags.FLAG_SET_SC_PROPERTIES_IN_CLIENT, - FeatureFlags::setScPropertiesInClient); + + public boolean enableDesktopIndicatorInSeparateThreadBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_INDICATOR_IN_SEPARATE_THREAD_BUGFIX, + FeatureFlags::enableDesktopIndicatorInSeparateThreadBugfix); } @Override - - public boolean skipSleepingWhenSwitchingDisplay() { - return getValue(Flags.FLAG_SKIP_SLEEPING_WHEN_SWITCHING_DISPLAY, - FeatureFlags::skipSleepingWhenSwitchingDisplay); + + public boolean enableDesktopInvisibleTaskRemovalCleanupBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_INVISIBLE_TASK_REMOVAL_CLEANUP_BUGFIX, + FeatureFlags::enableDesktopInvisibleTaskRemovalCleanupBugfix); } @Override - - public boolean supportsMultiInstanceSystemUi() { - return getValue(Flags.FLAG_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI, - FeatureFlags::supportsMultiInstanceSystemUi); + + public boolean enableDesktopModeThroughDevOption() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION, + FeatureFlags::enableDesktopModeThroughDevOption); } @Override - - public boolean surfaceControlInputReceiver() { - return getValue(Flags.FLAG_SURFACE_CONTROL_INPUT_RECEIVER, - FeatureFlags::surfaceControlInputReceiver); + + public boolean enableDesktopOpeningDeeplinkMinimizeAnimationBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_OPENING_DEEPLINK_MINIMIZE_ANIMATION_BUGFIX, + FeatureFlags::enableDesktopOpeningDeeplinkMinimizeAnimationBugfix); } @Override - - public boolean surfaceTrustedOverlay() { - return getValue(Flags.FLAG_SURFACE_TRUSTED_OVERLAY, - FeatureFlags::surfaceTrustedOverlay); + + public boolean enableDesktopRecentsTransitionsCornersBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX, + FeatureFlags::enableDesktopRecentsTransitionsCornersBugfix); } @Override - - public boolean syncScreenCapture() { - return getValue(Flags.FLAG_SYNC_SCREEN_CAPTURE, - FeatureFlags::syncScreenCapture); + + public boolean enableDesktopSplitscreenTransitionBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_SPLITSCREEN_TRANSITION_BUGFIX, + FeatureFlags::enableDesktopSplitscreenTransitionBugfix); } @Override - - public boolean taskFragmentSystemOrganizerFlag() { - return getValue(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG, - FeatureFlags::taskFragmentSystemOrganizerFlag); + + public boolean enableDesktopSystemDialogsTransitions() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS, + FeatureFlags::enableDesktopSystemDialogsTransitions); } @Override - - public boolean transitReadyTracking() { - return getValue(Flags.FLAG_TRANSIT_READY_TRACKING, - FeatureFlags::transitReadyTracking); + + public boolean enableDesktopTabTearingLaunchAnimation() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_LAUNCH_ANIMATION, + FeatureFlags::enableDesktopTabTearingLaunchAnimation); } @Override - - public boolean trustedPresentationListenerForWindow() { - return getValue(Flags.FLAG_TRUSTED_PRESENTATION_LISTENER_FOR_WINDOW, - FeatureFlags::trustedPresentationListenerForWindow); + + public boolean enableDesktopTabTearingMinimizeAnimationBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_MINIMIZE_ANIMATION_BUGFIX, + FeatureFlags::enableDesktopTabTearingMinimizeAnimationBugfix); } @Override - - public boolean untrustedEmbeddingAnyAppPermission() { - return getValue(Flags.FLAG_UNTRUSTED_EMBEDDING_ANY_APP_PERMISSION, - FeatureFlags::untrustedEmbeddingAnyAppPermission); + + public boolean enableDesktopTaskLimitSeparateTransition() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_TASK_LIMIT_SEPARATE_TRANSITION, + FeatureFlags::enableDesktopTaskLimitSeparateTransition); } @Override - - public boolean untrustedEmbeddingStateSharing() { - return getValue(Flags.FLAG_UNTRUSTED_EMBEDDING_STATE_SHARING, - FeatureFlags::untrustedEmbeddingStateSharing); + + public boolean enableDesktopTaskbarOnFreeformDisplays() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_TASKBAR_ON_FREEFORM_DISPLAYS, + FeatureFlags::enableDesktopTaskbarOnFreeformDisplays); } @Override - - public boolean useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds() { - return getValue(Flags.FLAG_USE_WINDOW_ORIGINAL_TOUCHABLE_REGION_WHEN_MAGNIFICATION_RECOMPUTE_BOUNDS, - FeatureFlags::useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds); + + public boolean enableDesktopTrampolineCloseAnimationBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX, + FeatureFlags::enableDesktopTrampolineCloseAnimationBugfix); } @Override - - public boolean userMinAspectRatioAppDefault() { - return getValue(Flags.FLAG_USER_MIN_ASPECT_RATIO_APP_DEFAULT, - FeatureFlags::userMinAspectRatioAppDefault); + + public boolean enableDesktopWallpaperActivityForSystemUser() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER, + FeatureFlags::enableDesktopWallpaperActivityForSystemUser); } @Override - - public boolean waitForTransitionOnDisplaySwitch() { - return getValue(Flags.FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH, - FeatureFlags::waitForTransitionOnDisplaySwitch); + + public boolean enableDesktopWindowingAppHandleEducation() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_HANDLE_EDUCATION, + FeatureFlags::enableDesktopWindowingAppHandleEducation); } @Override - - public boolean wallpaperOffsetAsync() { - return getValue(Flags.FLAG_WALLPAPER_OFFSET_ASYNC, - FeatureFlags::wallpaperOffsetAsync); + + public boolean enableDesktopWindowingAppToWeb() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB, + FeatureFlags::enableDesktopWindowingAppToWeb); } @Override - - public boolean windowSessionRelayoutInfo() { - return getValue(Flags.FLAG_WINDOW_SESSION_RELAYOUT_INFO, - FeatureFlags::windowSessionRelayoutInfo); + + public boolean enableDesktopWindowingAppToWebEducation() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION, + FeatureFlags::enableDesktopWindowingAppToWebEducation); } @Override - - public boolean windowTokenConfigThreadSafe() { - return getValue(Flags.FLAG_WINDOW_TOKEN_CONFIG_THREAD_SAFE, - FeatureFlags::windowTokenConfigThreadSafe); - } - public boolean isFlagReadOnlyOptimized(String flagName) { - if (mReadOnlyFlagsSet.contains(flagName) && - isOptimizationEnabled()) { - return true; - } - return false; + public boolean enableDesktopWindowingAppToWebEducationIntegration() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION_INTEGRATION, + FeatureFlags::enableDesktopWindowingAppToWebEducationIntegration); } - private boolean isOptimizationEnabled() { + @Override + + public boolean enableDesktopWindowingBackNavigation() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION, + FeatureFlags::enableDesktopWindowingBackNavigation); + } + + @Override + + public boolean enableDesktopWindowingEnterTransitionBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITION_BUGFIX, + FeatureFlags::enableDesktopWindowingEnterTransitionBugfix); + } + + @Override + + public boolean enableDesktopWindowingEnterTransitions() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS, + FeatureFlags::enableDesktopWindowingEnterTransitions); + } + + @Override + + public boolean enableDesktopWindowingEnterpriseBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTERPRISE_BUGFIX, + FeatureFlags::enableDesktopWindowingEnterpriseBugfix); + } + + @Override + + public boolean enableDesktopWindowingExitByMinimizeTransitionBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_BY_MINIMIZE_TRANSITION_BUGFIX, + FeatureFlags::enableDesktopWindowingExitByMinimizeTransitionBugfix); + } + + @Override + + public boolean enableDesktopWindowingExitTransitions() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS, + FeatureFlags::enableDesktopWindowingExitTransitions); + } + + @Override + + public boolean enableDesktopWindowingExitTransitionsBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX, + FeatureFlags::enableDesktopWindowingExitTransitionsBugfix); + } + + @Override + + public boolean enableDesktopWindowingHsum() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_HSUM, + FeatureFlags::enableDesktopWindowingHsum); + } + + @Override + + public boolean enableDesktopWindowingImmersiveHandleHiding() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_IMMERSIVE_HANDLE_HIDING, + FeatureFlags::enableDesktopWindowingImmersiveHandleHiding); + } + + @Override + + public boolean enableDesktopWindowingModalsPolicy() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + FeatureFlags::enableDesktopWindowingModalsPolicy); + } + + @Override + + public boolean enableDesktopWindowingMode() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, + FeatureFlags::enableDesktopWindowingMode); + } + + @Override + + public boolean enableDesktopWindowingMultiInstanceFeatures() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES, + FeatureFlags::enableDesktopWindowingMultiInstanceFeatures); + } + + @Override + + public boolean enableDesktopWindowingPersistence() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE, + FeatureFlags::enableDesktopWindowingPersistence); + } + + @Override + + public boolean enableDesktopWindowingPip() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP, + FeatureFlags::enableDesktopWindowingPip); + } + + @Override + + public boolean enableDesktopWindowingPipInOverviewBugfix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP_IN_OVERVIEW_BUGFIX, + FeatureFlags::enableDesktopWindowingPipInOverviewBugfix); + } + + @Override + + public boolean enableDesktopWindowingQuickSwitch() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH, + FeatureFlags::enableDesktopWindowingQuickSwitch); + } + + @Override + + public boolean enableDesktopWindowingScvhCacheBugFix() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SCVH_CACHE_BUG_FIX, + FeatureFlags::enableDesktopWindowingScvhCacheBugFix); + } + + @Override + + public boolean enableDesktopWindowingSizeConstraints() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS, + FeatureFlags::enableDesktopWindowingSizeConstraints); + } + + @Override + + public boolean enableDesktopWindowingTaskLimit() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASK_LIMIT, + FeatureFlags::enableDesktopWindowingTaskLimit); + } + + @Override + + public boolean enableDesktopWindowingTaskbarRunningApps() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS, + FeatureFlags::enableDesktopWindowingTaskbarRunningApps); + } + + @Override + + public boolean enableDesktopWindowingTransitions() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS, + FeatureFlags::enableDesktopWindowingTransitions); + } + + @Override + + public boolean enableDesktopWindowingWallpaperActivity() { + return getValue(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + FeatureFlags::enableDesktopWindowingWallpaperActivity); + } + + @Override + + public boolean enableDeviceStateAutoRotateSettingLogging() { + return getValue(Flags.FLAG_ENABLE_DEVICE_STATE_AUTO_ROTATE_SETTING_LOGGING, + FeatureFlags::enableDeviceStateAutoRotateSettingLogging); + } + + @Override + + public boolean enableDeviceStateAutoRotateSettingRefactor() { + return getValue(Flags.FLAG_ENABLE_DEVICE_STATE_AUTO_ROTATE_SETTING_REFACTOR, + FeatureFlags::enableDeviceStateAutoRotateSettingRefactor); + } + + @Override + + public boolean enableDialogDisplayFixes() { + return getValue(Flags.FLAG_ENABLE_DIALOG_DISPLAY_FIXES, + FeatureFlags::enableDialogDisplayFixes); + } + + @Override + + public boolean enableDisplayCompatMode() { + return getValue(Flags.FLAG_ENABLE_DISPLAY_COMPAT_MODE, + FeatureFlags::enableDisplayCompatMode); + } + + @Override + + public boolean enableDisplayDisconnectInteraction() { + return getValue(Flags.FLAG_ENABLE_DISPLAY_DISCONNECT_INTERACTION, + FeatureFlags::enableDisplayDisconnectInteraction); + } + + @Override + + public boolean enableDisplayFocusInShellTransitions() { + return getValue(Flags.FLAG_ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS, + FeatureFlags::enableDisplayFocusInShellTransitions); + } + + @Override + + public boolean enableDisplayReconnectInteraction() { + return getValue(Flags.FLAG_ENABLE_DISPLAY_RECONNECT_INTERACTION, + FeatureFlags::enableDisplayReconnectInteraction); + } + + @Override + + public boolean enableDisplayWindowingModeSwitching() { + return getValue(Flags.FLAG_ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING, + FeatureFlags::enableDisplayWindowingModeSwitching); + } + + @Override + + public boolean enableDragEndStableBoundsReset() { + return getValue(Flags.FLAG_ENABLE_DRAG_END_STABLE_BOUNDS_RESET, + FeatureFlags::enableDragEndStableBoundsReset); + } + + @Override + + public boolean enableDragResizeSetUpInBgThread() { + return getValue(Flags.FLAG_ENABLE_DRAG_RESIZE_SET_UP_IN_BG_THREAD, + FeatureFlags::enableDragResizeSetUpInBgThread); + } + + @Override + + public boolean enableDragToDesktopIncomingTransitionsBugfix() { + return getValue(Flags.FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX, + FeatureFlags::enableDragToDesktopIncomingTransitionsBugfix); + } + + @Override + + public boolean enableDragToMaximize() { + return getValue(Flags.FLAG_ENABLE_DRAG_TO_MAXIMIZE, + FeatureFlags::enableDragToMaximize); + } + + @Override + + public boolean enableDraggingPipAcrossDisplays() { + return getValue(Flags.FLAG_ENABLE_DRAGGING_PIP_ACROSS_DISPLAYS, + FeatureFlags::enableDraggingPipAcrossDisplays); + } + + @Override + + public boolean enableDrawingAppHandle() { + return getValue(Flags.FLAG_ENABLE_DRAWING_APP_HANDLE, + FeatureFlags::enableDrawingAppHandle); + } + + @Override + + public boolean enableDreamActivityWindowingExclusion() { + return getValue(Flags.FLAG_ENABLE_DREAM_ACTIVITY_WINDOWING_EXCLUSION, + FeatureFlags::enableDreamActivityWindowingExclusion); + } + + @Override + + public boolean enableDynamicRadiusComputationBugfix() { + return getValue(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX, + FeatureFlags::enableDynamicRadiusComputationBugfix); + } + + @Override + + public boolean enableEmptyDeskOnMinimize() { + return getValue(Flags.FLAG_ENABLE_EMPTY_DESK_ON_MINIMIZE, + FeatureFlags::enableEmptyDeskOnMinimize); + } + + @Override + + public boolean enableExperimentalBubblesController() { + return getValue(Flags.FLAG_ENABLE_EXPERIMENTAL_BUBBLES_CONTROLLER, + FeatureFlags::enableExperimentalBubblesController); + } + + @Override + + public boolean enableExternalDisplayPersistenceBugfix() { + return getValue(Flags.FLAG_ENABLE_EXTERNAL_DISPLAY_PERSISTENCE_BUGFIX, + FeatureFlags::enableExternalDisplayPersistenceBugfix); + } + + @Override + + public boolean enableFreeformBoxShadows() { + return getValue(Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS, + FeatureFlags::enableFreeformBoxShadows); + } + + @Override + + public boolean enableFreeformDisplayLaunchParams() { + return getValue(Flags.FLAG_ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS, + FeatureFlags::enableFreeformDisplayLaunchParams); + } + + @Override + + public boolean enableFullScreenWindowOnRemovingSplitScreenStageBugfix() { + return getValue(Flags.FLAG_ENABLE_FULL_SCREEN_WINDOW_ON_REMOVING_SPLIT_SCREEN_STAGE_BUGFIX, + FeatureFlags::enableFullScreenWindowOnRemovingSplitScreenStageBugfix); + } + + @Override + + public boolean enableFullscreenWindowControls() { + return getValue(Flags.FLAG_ENABLE_FULLSCREEN_WINDOW_CONTROLS, + FeatureFlags::enableFullscreenWindowControls); + } + + @Override + + public boolean enableFullyImmersiveInDesktop() { + return getValue(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP, + FeatureFlags::enableFullyImmersiveInDesktop); + } + + @Override + + public boolean enableHandleInputFix() { + return getValue(Flags.FLAG_ENABLE_HANDLE_INPUT_FIX, + FeatureFlags::enableHandleInputFix); + } + + @Override + + public boolean enableHandlersDebuggingMode() { + return getValue(Flags.FLAG_ENABLE_HANDLERS_DEBUGGING_MODE, + FeatureFlags::enableHandlersDebuggingMode); + } + + @Override + + public boolean enableHoldToDragAppHandle() { + return getValue(Flags.FLAG_ENABLE_HOLD_TO_DRAG_APP_HANDLE, + FeatureFlags::enableHoldToDragAppHandle); + } + + @Override + + public boolean enableIndependentBackInProjected() { + return getValue(Flags.FLAG_ENABLE_INDEPENDENT_BACK_IN_PROJECTED, + FeatureFlags::enableIndependentBackInProjected); + } + + @Override + + public boolean enableInorderTransitionCallbacksForDesktop() { + return getValue(Flags.FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP, + FeatureFlags::enableInorderTransitionCallbacksForDesktop); + } + + @Override + + public boolean enableInputLayerTransitionFix() { + return getValue(Flags.FLAG_ENABLE_INPUT_LAYER_TRANSITION_FIX, + FeatureFlags::enableInputLayerTransitionFix); + } + + @Override + + public boolean enableInteractionDependentTabTearingBounds() { + return getValue(Flags.FLAG_ENABLE_INTERACTION_DEPENDENT_TAB_TEARING_BOUNDS, + FeatureFlags::enableInteractionDependentTabTearingBounds); + } + + @Override + + public boolean enableInteractivePictureInPicture() { + return getValue(Flags.FLAG_ENABLE_INTERACTIVE_PICTURE_IN_PICTURE, + FeatureFlags::enableInteractivePictureInPicture); + } + + @Override + + public boolean enableKeyGestureHandlerForSysui() { + return getValue(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_SYSUI, + FeatureFlags::enableKeyGestureHandlerForSysui); + } + + @Override + + public boolean enableLauncherHandleGoHomeKeyboardShortcut() { + return getValue(Flags.FLAG_ENABLE_LAUNCHER_HANDLE_GO_HOME_KEYBOARD_SHORTCUT, + FeatureFlags::enableLauncherHandleGoHomeKeyboardShortcut); + } + + @Override + + public boolean enableMinimizeButton() { + return getValue(Flags.FLAG_ENABLE_MINIMIZE_BUTTON, + FeatureFlags::enableMinimizeButton); + } + + @Override + + public boolean enableMirrorDisplayNoActivity() { + return getValue(Flags.FLAG_ENABLE_MIRROR_DISPLAY_NO_ACTIVITY, + FeatureFlags::enableMirrorDisplayNoActivity); + } + + @Override + + public boolean enableModalsFullscreenWithPermission() { + return getValue(Flags.FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PERMISSION, + FeatureFlags::enableModalsFullscreenWithPermission); + } + + @Override + + public boolean enableModalsFullscreenWithPlatformSignature() { + return getValue(Flags.FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PLATFORM_SIGNATURE, + FeatureFlags::enableModalsFullscreenWithPlatformSignature); + } + + @Override + + public boolean enableMoveToNextDisplayShortcut() { + return getValue(Flags.FLAG_ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT, + FeatureFlags::enableMoveToNextDisplayShortcut); + } + + @Override + + public boolean enableMultiDisplayHomeFocusBugFix() { + return getValue(Flags.FLAG_ENABLE_MULTI_DISPLAY_HOME_FOCUS_BUG_FIX, + FeatureFlags::enableMultiDisplayHomeFocusBugFix); + } + + @Override + + public boolean enableMultiDisplaySplit() { + return getValue(Flags.FLAG_ENABLE_MULTI_DISPLAY_SPLIT, + FeatureFlags::enableMultiDisplaySplit); + } + + @Override + + public boolean enableMultidisplayTrackpadBackGesture() { + return getValue(Flags.FLAG_ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE, + FeatureFlags::enableMultidisplayTrackpadBackGesture); + } + + @Override + + public boolean enableMultipleDesktopsBackend() { + return getValue(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, + FeatureFlags::enableMultipleDesktopsBackend); + } + + @Override + + public boolean enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays() { + return getValue(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_DEFAULT_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS, + FeatureFlags::enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays); + } + + @Override + + public boolean enableMultipleDesktopsFrontend() { + return getValue(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, + FeatureFlags::enableMultipleDesktopsFrontend); + } + + @Override + + public boolean enableNoWindowDecorationForDesks() { + return getValue(Flags.FLAG_ENABLE_NO_WINDOW_DECORATION_FOR_DESKS, + FeatureFlags::enableNoWindowDecorationForDesks); + } + + @Override + + public boolean enableNonDefaultDisplaySplit() { + return getValue(Flags.FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT, + FeatureFlags::enableNonDefaultDisplaySplit); + } + + @Override + + public boolean enableNonDefaultDisplaySplitBugfix() { + return getValue(Flags.FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX, + FeatureFlags::enableNonDefaultDisplaySplitBugfix); + } + + @Override + + public boolean enableOpaqueBackgroundForTransparentWindows() { + return getValue(Flags.FLAG_ENABLE_OPAQUE_BACKGROUND_FOR_TRANSPARENT_WINDOWS, + FeatureFlags::enableOpaqueBackgroundForTransparentWindows); + } + + @Override + + public boolean enableOverflowButtonForTaskbarPinnedItems() { + return getValue(Flags.FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS, + FeatureFlags::enableOverflowButtonForTaskbarPinnedItems); + } + + @Override + + public boolean enablePerDisplayDesktopWallpaperActivity() { + return getValue(Flags.FLAG_ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY, + FeatureFlags::enablePerDisplayDesktopWallpaperActivity); + } + + @Override + + public boolean enablePerDisplayPackageContextCacheInStatusbarNotif() { + return getValue(Flags.FLAG_ENABLE_PER_DISPLAY_PACKAGE_CONTEXT_CACHE_IN_STATUSBAR_NOTIF, + FeatureFlags::enablePerDisplayPackageContextCacheInStatusbarNotif); + } + + @Override + + public boolean enablePerDisplayWindowDecorViewHostPool() { + return getValue(Flags.FLAG_ENABLE_PER_DISPLAY_WINDOW_DECOR_VIEW_HOST_POOL, + FeatureFlags::enablePerDisplayWindowDecorViewHostPool); + } + + @Override + + public boolean enablePersistingDisplaySizeForConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS, + FeatureFlags::enablePersistingDisplaySizeForConnectedDisplays); + } + + @Override + + public boolean enablePinningAppWithContextMenu() { + return getValue(Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU, + FeatureFlags::enablePinningAppWithContextMenu); + } + + @Override + + public boolean enablePipParamsUpdateNotificationBugfix() { + return getValue(Flags.FLAG_ENABLE_PIP_PARAMS_UPDATE_NOTIFICATION_BUGFIX, + FeatureFlags::enablePipParamsUpdateNotificationBugfix); + } + + @Override + + public boolean enablePresentationDisallowedOnUnfocusedHostTask() { + return getValue(Flags.FLAG_ENABLE_PRESENTATION_DISALLOWED_ON_UNFOCUSED_HOST_TASK, + FeatureFlags::enablePresentationDisallowedOnUnfocusedHostTask); + } + + @Override + + public boolean enablePresentationForConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS, + FeatureFlags::enablePresentationForConnectedDisplays); + } + + @Override + + public boolean enableProjectedDisplayDesktopMode() { + return getValue(Flags.FLAG_ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE, + FeatureFlags::enableProjectedDisplayDesktopMode); + } + + @Override + + public boolean enableQuickswitchDesktopSplitBugfix() { + return getValue(Flags.FLAG_ENABLE_QUICKSWITCH_DESKTOP_SPLIT_BUGFIX, + FeatureFlags::enableQuickswitchDesktopSplitBugfix); + } + + @Override + + public boolean enableRejectHomeTransition() { + return getValue(Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION, + FeatureFlags::enableRejectHomeTransition); + } + + @Override + + public boolean enableRemoveStatusBarInputLayer() { + return getValue(Flags.FLAG_ENABLE_REMOVE_STATUS_BAR_INPUT_LAYER, + FeatureFlags::enableRemoveStatusBarInputLayer); + } + + @Override + + public boolean enableRequestFullscreenBugfix() { + return getValue(Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_BUGFIX, + FeatureFlags::enableRequestFullscreenBugfix); + } + + @Override + + public boolean enableRequestFullscreenRefactor() { + return getValue(Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_REFACTOR, + FeatureFlags::enableRequestFullscreenRefactor); + } + + @Override + + public boolean enableRequestFullscreenRestoreFreeformBugfix() { + return getValue(Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_RESTORE_FREEFORM_BUGFIX, + FeatureFlags::enableRequestFullscreenRestoreFreeformBugfix); + } + + @Override + + public boolean enableResizingMetrics() { + return getValue(Flags.FLAG_ENABLE_RESIZING_METRICS, + FeatureFlags::enableResizingMetrics); + } + + @Override + + public boolean enableRestartMenuForConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_RESTART_MENU_FOR_CONNECTED_DISPLAYS, + FeatureFlags::enableRestartMenuForConnectedDisplays); + } + + @Override + + public boolean enableRestoreToPreviousSizeFromDesktopImmersive() { + return getValue(Flags.FLAG_ENABLE_RESTORE_TO_PREVIOUS_SIZE_FROM_DESKTOP_IMMERSIVE, + FeatureFlags::enableRestoreToPreviousSizeFromDesktopImmersive); + } + + @Override + + public boolean enableSeeThroughTaskFragments() { + return getValue(Flags.FLAG_ENABLE_SEE_THROUGH_TASK_FRAGMENTS, + FeatureFlags::enableSeeThroughTaskFragments); + } + + @Override + + public boolean enableShellInitialBoundsRegressionBugFix() { + return getValue(Flags.FLAG_ENABLE_SHELL_INITIAL_BOUNDS_REGRESSION_BUG_FIX, + FeatureFlags::enableShellInitialBoundsRegressionBugFix); + } + + @Override + + public boolean enableShrinkWindowBoundsAfterDrag() { + return getValue(Flags.FLAG_ENABLE_SHRINK_WINDOW_BOUNDS_AFTER_DRAG, + FeatureFlags::enableShrinkWindowBoundsAfterDrag); + } + + @Override + + public boolean enableSizeCompatModeImprovementsForConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS, + FeatureFlags::enableSizeCompatModeImprovementsForConnectedDisplays); + } + + @Override + + public boolean enableStartLaunchTransitionFromTaskbarBugfix() { + return getValue(Flags.FLAG_ENABLE_START_LAUNCH_TRANSITION_FROM_TASKBAR_BUGFIX, + FeatureFlags::enableStartLaunchTransitionFromTaskbarBugfix); + } + + @Override + + public boolean enableSysDecorsCallbacksViaWm() { + return getValue(Flags.FLAG_ENABLE_SYS_DECORS_CALLBACKS_VIA_WM, + FeatureFlags::enableSysDecorsCallbacksViaWm); + } + + @Override + + public boolean enableTallAppHeaders() { + return getValue(Flags.FLAG_ENABLE_TALL_APP_HEADERS, + FeatureFlags::enableTallAppHeaders); + } + + @Override + + public boolean enableTaskResizingKeyboardShortcuts() { + return getValue(Flags.FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS, + FeatureFlags::enableTaskResizingKeyboardShortcuts); + } + + @Override + + public boolean enableTaskStackObserverInShell() { + return getValue(Flags.FLAG_ENABLE_TASK_STACK_OBSERVER_IN_SHELL, + FeatureFlags::enableTaskStackObserverInShell); + } + + @Override + + public boolean enableTaskbarConnectedDisplays() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_CONNECTED_DISPLAYS, + FeatureFlags::enableTaskbarConnectedDisplays); + } + + @Override + + public boolean enableTaskbarOverflow() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_OVERFLOW, + FeatureFlags::enableTaskbarOverflow); + } + + @Override + + public boolean enableTaskbarRecentTasksThrottleBugfix() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX, + FeatureFlags::enableTaskbarRecentTasksThrottleBugfix); + } + + @Override + + public boolean enableTaskbarRecentsLayoutTransition() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_RECENTS_LAYOUT_TRANSITION, + FeatureFlags::enableTaskbarRecentsLayoutTransition); + } + + @Override + + public boolean enableThemedAppHeaders() { + return getValue(Flags.FLAG_ENABLE_THEMED_APP_HEADERS, + FeatureFlags::enableThemedAppHeaders); + } + + @Override + + public boolean enableTileResizing() { + return getValue(Flags.FLAG_ENABLE_TILE_RESIZING, + FeatureFlags::enableTileResizing); + } + + @Override + + public boolean enableTopVisibleRootTaskPerUserTracking() { + return getValue(Flags.FLAG_ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING, + FeatureFlags::enableTopVisibleRootTaskPerUserTracking); + } + + @Override + + public boolean enableTransitionOnActivitySetRequestedOrientation() { + return getValue(Flags.FLAG_ENABLE_TRANSITION_ON_ACTIVITY_SET_REQUESTED_ORIENTATION, + FeatureFlags::enableTransitionOnActivitySetRequestedOrientation); + } + + @Override + + public boolean enableUpdatedDisplayConnectionDialog() { + return getValue(Flags.FLAG_ENABLE_UPDATED_DISPLAY_CONNECTION_DIALOG, + FeatureFlags::enableUpdatedDisplayConnectionDialog); + } + + @Override + + public boolean enableUpscalingSizeCompatOnExitingDesktopBugfix() { + return getValue(Flags.FLAG_ENABLE_UPSCALING_SIZE_COMPAT_ON_EXITING_DESKTOP_BUGFIX, + FeatureFlags::enableUpscalingSizeCompatOnExitingDesktopBugfix); + } + + @Override + + public boolean enableVisualIndicatorInTransitionBugfix() { + return getValue(Flags.FLAG_ENABLE_VISUAL_INDICATOR_IN_TRANSITION_BUGFIX, + FeatureFlags::enableVisualIndicatorInTransitionBugfix); + } + + @Override + + public boolean enableWindowContextResourcesUpdateOnConfigChange() { + return getValue(Flags.FLAG_ENABLE_WINDOW_CONTEXT_RESOURCES_UPDATE_ON_CONFIG_CHANGE, + FeatureFlags::enableWindowContextResourcesUpdateOnConfigChange); + } + + @Override + + public boolean enableWindowDecorationRefactor() { + return getValue(Flags.FLAG_ENABLE_WINDOW_DECORATION_REFACTOR, + FeatureFlags::enableWindowDecorationRefactor); + } + + @Override + + public boolean enableWindowDropSmoothTransition() { + return getValue(Flags.FLAG_ENABLE_WINDOW_DROP_SMOOTH_TRANSITION, + FeatureFlags::enableWindowDropSmoothTransition); + } + + @Override + + public boolean enableWindowRepositioningApi() { + return getValue(Flags.FLAG_ENABLE_WINDOW_REPOSITIONING_API, + FeatureFlags::enableWindowRepositioningApi); + } + + @Override + + public boolean enableWindowingDynamicInitialBounds() { + return getValue(Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, + FeatureFlags::enableWindowingDynamicInitialBounds); + } + + @Override + + public boolean enableWindowingEdgeDragResize() { + return getValue(Flags.FLAG_ENABLE_WINDOWING_EDGE_DRAG_RESIZE, + FeatureFlags::enableWindowingEdgeDragResize); + } + + @Override + + public boolean enableWindowingScaledResizing() { + return getValue(Flags.FLAG_ENABLE_WINDOWING_SCALED_RESIZING, + FeatureFlags::enableWindowingScaledResizing); + } + + @Override + + public boolean enableWindowingTaskStackOrderBugfix() { + return getValue(Flags.FLAG_ENABLE_WINDOWING_TASK_STACK_ORDER_BUGFIX, + FeatureFlags::enableWindowingTaskStackOrderBugfix); + } + + @Override + + public boolean enableWindowingTransitionHandlersObservers() { + return getValue(Flags.FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS, + FeatureFlags::enableWindowingTransitionHandlersObservers); + } + + @Override + + public boolean enforceEdgeToEdge() { + return getValue(Flags.FLAG_ENFORCE_EDGE_TO_EDGE, + FeatureFlags::enforceEdgeToEdge); + } + + @Override + + public boolean ensureKeyguardDoesTransitionStartingBugFix() { + return getValue(Flags.FLAG_ENSURE_KEYGUARD_DOES_TRANSITION_STARTING_BUG_FIX, + FeatureFlags::ensureKeyguardDoesTransitionStartingBugFix); + } + + @Override + + public boolean ensureWallpaperDrawnOnDisplaySwitch() { + return getValue(Flags.FLAG_ENSURE_WALLPAPER_DRAWN_ON_DISPLAY_SWITCH, + FeatureFlags::ensureWallpaperDrawnOnDisplaySwitch); + } + + @Override + + public boolean enterDesktopByDefaultOnFreeformDisplays() { + return getValue(Flags.FLAG_ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS, + FeatureFlags::enterDesktopByDefaultOnFreeformDisplays); + } + + @Override + + public boolean excludeCaptionFromAppBounds() { + return getValue(Flags.FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS, + FeatureFlags::excludeCaptionFromAppBounds); + } + + @Override + + public boolean excludeDeskRootsFromDesktopTasks() { + return getValue(Flags.FLAG_EXCLUDE_DESK_ROOTS_FROM_DESKTOP_TASKS, + FeatureFlags::excludeDeskRootsFromDesktopTasks); + } + + @Override + + public boolean excludingLayerFromTaskSnapshot() { + return getValue(Flags.FLAG_EXCLUDING_LAYER_FROM_TASK_SNAPSHOT, + FeatureFlags::excludingLayerFromTaskSnapshot); + } + + @Override + + public boolean fallbackToFocusedDisplay() { + return getValue(Flags.FLAG_FALLBACK_TO_FOCUSED_DISPLAY, + FeatureFlags::fallbackToFocusedDisplay); + } + + @Override + + public boolean fallbackTransitionPlayer() { + return getValue(Flags.FLAG_FALLBACK_TRANSITION_PLAYER, + FeatureFlags::fallbackTransitionPlayer); + } + + @Override + + public boolean fifoPriorityForMajorUiProcesses() { + return getValue(Flags.FLAG_FIFO_PRIORITY_FOR_MAJOR_UI_PROCESSES, + FeatureFlags::fifoPriorityForMajorUiProcesses); + } + + @Override + + public boolean fixBalReparentExistingTask() { + return getValue(Flags.FLAG_FIX_BAL_REPARENT_EXISTING_TASK, + FeatureFlags::fixBalReparentExistingTask); + } + + @Override + + public boolean fixBubbleTrampolineAnimation() { + return getValue(Flags.FLAG_FIX_BUBBLE_TRAMPOLINE_ANIMATION, + FeatureFlags::fixBubbleTrampolineAnimation); + } + + @Override + + public boolean fixHideOverlayApi() { + return getValue(Flags.FLAG_FIX_HIDE_OVERLAY_API, + FeatureFlags::fixHideOverlayApi); + } + + @Override + + public boolean fixLeakingVisualIndicator() { + return getValue(Flags.FLAG_FIX_LEAKING_VISUAL_INDICATOR, + FeatureFlags::fixLeakingVisualIndicator); + } + + @Override + + public boolean fixRapidTopResumedSwitch() { + return getValue(Flags.FLAG_FIX_RAPID_TOP_RESUMED_SWITCH, + FeatureFlags::fixRapidTopResumedSwitch); + } + + @Override + + public boolean forceCloseTopTransparentFullscreenTask() { + return getValue(Flags.FLAG_FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK, + FeatureFlags::forceCloseTopTransparentFullscreenTask); + } + + @Override + + public boolean formFactorBasedDesktopFirstSwitch() { + return getValue(Flags.FLAG_FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH, + FeatureFlags::formFactorBasedDesktopFirstSwitch); + } + + @Override + + public boolean grantManageKeyGesturesToRecents() { + return getValue(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS, + FeatureFlags::grantManageKeyGesturesToRecents); + } + + @Override + + public boolean handleIncompatibleTasksInDesktopLaunchParams() { + return getValue(Flags.FLAG_HANDLE_INCOMPATIBLE_TASKS_IN_DESKTOP_LAUNCH_PARAMS, + FeatureFlags::handleIncompatibleTasksInDesktopLaunchParams); + } + + @Override + + public boolean ignoreAspectRatioRestrictionsForResizeableFreeformActivities() { + return getValue(Flags.FLAG_IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES, + FeatureFlags::ignoreAspectRatioRestrictionsForResizeableFreeformActivities); + } + + @Override + + public boolean ignoreCornerRadiusAndShadows() { + return getValue(Flags.FLAG_IGNORE_CORNER_RADIUS_AND_SHADOWS, + FeatureFlags::ignoreCornerRadiusAndShadows); + } + + @Override + + public boolean ignoreCurrentParamsInDesktopLaunchParams() { + return getValue(Flags.FLAG_IGNORE_CURRENT_PARAMS_IN_DESKTOP_LAUNCH_PARAMS, + FeatureFlags::ignoreCurrentParamsInDesktopLaunchParams); + } + + @Override + + public boolean ignoreOverrideTaskBoundsIfIncompatibleWithDisplay() { + return getValue(Flags.FLAG_IGNORE_OVERRIDE_TASK_BOUNDS_IF_INCOMPATIBLE_WITH_DISPLAY, + FeatureFlags::ignoreOverrideTaskBoundsIfIncompatibleWithDisplay); + } + + @Override + + public boolean imeBackCallbackLeakPrevention() { + return getValue(Flags.FLAG_IME_BACK_CALLBACK_LEAK_PREVENTION, + FeatureFlags::imeBackCallbackLeakPrevention); + } + + @Override + + public boolean includeTopTransparentFullscreenTaskInDesktopHeuristic() { + return getValue(Flags.FLAG_INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC, + FeatureFlags::includeTopTransparentFullscreenTaskInDesktopHeuristic); + } + + @Override + + public boolean inheritTaskBoundsForTrampolineTaskLaunches() { + return getValue(Flags.FLAG_INHERIT_TASK_BOUNDS_FOR_TRAMPOLINE_TASK_LAUNCHES, + FeatureFlags::inheritTaskBoundsForTrampolineTaskLaunches); + } + + @Override + + public boolean jankApi() { + return getValue(Flags.FLAG_JANK_API, + FeatureFlags::jankApi); + } + + @Override + + public boolean keyboardShortcutsToSwitchDesks() { + return getValue(Flags.FLAG_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS, + FeatureFlags::keyboardShortcutsToSwitchDesks); + } + + @Override + + public boolean keyguardRemoveDefaultDisplayUsage() { + return getValue(Flags.FLAG_KEYGUARD_REMOVE_DEFAULT_DISPLAY_USAGE, + FeatureFlags::keyguardRemoveDefaultDisplayUsage); + } + + @Override + + public boolean letterboxBackgroundWallpaper() { + return getValue(Flags.FLAG_LETTERBOX_BACKGROUND_WALLPAPER, + FeatureFlags::letterboxBackgroundWallpaper); + } + + @Override + + public boolean limitSystemFullscreenOverrideToDefaultDisplay() { + return getValue(Flags.FLAG_LIMIT_SYSTEM_FULLSCREEN_OVERRIDE_TO_DEFAULT_DISPLAY, + FeatureFlags::limitSystemFullscreenOverrideToDefaultDisplay); + } + + @Override + + public boolean migrateBasicLegacyReady() { + return getValue(Flags.FLAG_MIGRATE_BASIC_LEGACY_READY, + FeatureFlags::migrateBasicLegacyReady); + } + + @Override + + public boolean moveToExternalDisplayShortcut() { + return getValue(Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, + FeatureFlags::moveToExternalDisplayShortcut); + } + + @Override + + public boolean moveToNextDisplayShortcutWithProjectedMode() { + return getValue(Flags.FLAG_MOVE_TO_NEXT_DISPLAY_SHORTCUT_WITH_PROJECTED_MODE, + FeatureFlags::moveToNextDisplayShortcutWithProjectedMode); + } + + @Override + + public boolean multiCrop() { + return getValue(Flags.FLAG_MULTI_CROP, + FeatureFlags::multiCrop); + } + + @Override + + public boolean multipleSystemNavigationObserverCallbacks() { + return getValue(Flags.FLAG_MULTIPLE_SYSTEM_NAVIGATION_OBSERVER_CALLBACKS, + FeatureFlags::multipleSystemNavigationObserverCallbacks); + } + + @Override + + public boolean nestedTasksWithIndependentBoundsBugfix() { + return getValue(Flags.FLAG_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX, + FeatureFlags::nestedTasksWithIndependentBoundsBugfix); + } + + @Override + + public boolean noAlphaRotationEnterAnimation() { + return getValue(Flags.FLAG_NO_ALPHA_ROTATION_ENTER_ANIMATION, + FeatureFlags::noAlphaRotationEnterAnimation); + } + + @Override + + public boolean optOutOverrideOrientationToUser() { + return getValue(Flags.FLAG_OPT_OUT_OVERRIDE_ORIENTATION_TO_USER, + FeatureFlags::optOutOverrideOrientationToUser); + } + + @Override + + public boolean parallelCdTransitionsDuringRecents() { + return getValue(Flags.FLAG_PARALLEL_CD_TRANSITIONS_DURING_RECENTS, + FeatureFlags::parallelCdTransitionsDuringRecents); + } + + @Override + + public boolean polishCloseWallpaperIncludesOpenChange() { + return getValue(Flags.FLAG_POLISH_CLOSE_WALLPAPER_INCLUDES_OPEN_CHANGE, + FeatureFlags::polishCloseWallpaperIncludesOpenChange); + } + + @Override + + public boolean portWindowSizeAnimation() { + return getValue(Flags.FLAG_PORT_WINDOW_SIZE_ANIMATION, + FeatureFlags::portWindowSizeAnimation); + } + + @Override + + public boolean predictiveBackCallbackCancellationFix() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_CALLBACK_CANCELLATION_FIX, + FeatureFlags::predictiveBackCallbackCancellationFix); + } + + @Override + + public boolean predictiveBackDelayWmTransition() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_DELAY_WM_TRANSITION, + FeatureFlags::predictiveBackDelayWmTransition); + } + + @Override + + public boolean predictiveBackInterceptTransition() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_INTERCEPT_TRANSITION, + FeatureFlags::predictiveBackInterceptTransition); + } + + @Override + + public boolean predictiveBackPrioritySystemNavigationObserver() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER, + FeatureFlags::predictiveBackPrioritySystemNavigationObserver); + } + + @Override + + public boolean predictiveBackStopKeycodeBackForwarding() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_STOP_KEYCODE_BACK_FORWARDING, + FeatureFlags::predictiveBackStopKeycodeBackForwarding); + } + + @Override + + public boolean predictiveBackSwipeEdgeNoneApi() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_SWIPE_EDGE_NONE_API, + FeatureFlags::predictiveBackSwipeEdgeNoneApi); + } + + @Override + + public boolean predictiveBackSystemOverrideCallback() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_OVERRIDE_CALLBACK, + FeatureFlags::predictiveBackSystemOverrideCallback); + } + + @Override + + public boolean predictiveBackTimestampApi() { + return getValue(Flags.FLAG_PREDICTIVE_BACK_TIMESTAMP_API, + FeatureFlags::predictiveBackTimestampApi); + } + + @Override + + public boolean preserveRecentsTaskConfigurationOnRelaunch() { + return getValue(Flags.FLAG_PRESERVE_RECENTS_TASK_CONFIGURATION_ON_RELAUNCH, + FeatureFlags::preserveRecentsTaskConfigurationOnRelaunch); + } + + @Override + + public boolean rearDisplayDisableForceDesktopSystemDecorations() { + return getValue(Flags.FLAG_REAR_DISPLAY_DISABLE_FORCE_DESKTOP_SYSTEM_DECORATIONS, + FeatureFlags::rearDisplayDisableForceDesktopSystemDecorations); + } + + @Override + + public boolean reduceChangedExclusionRectsMsgs() { + return getValue(Flags.FLAG_REDUCE_CHANGED_EXCLUSION_RECTS_MSGS, + FeatureFlags::reduceChangedExclusionRectsMsgs); + } + + @Override + + public boolean reduceTaskSnapshotMemoryUsage() { + return getValue(Flags.FLAG_REDUCE_TASK_SNAPSHOT_MEMORY_USAGE, + FeatureFlags::reduceTaskSnapshotMemoryUsage); + } + + @Override + + public boolean reenableAppHandleAnimations() { + return getValue(Flags.FLAG_REENABLE_APP_HANDLE_ANIMATIONS, + FeatureFlags::reenableAppHandleAnimations); + } + + @Override + + public boolean reenableAppHandleColorAnimations() { + return getValue(Flags.FLAG_REENABLE_APP_HANDLE_COLOR_ANIMATIONS, + FeatureFlags::reenableAppHandleColorAnimations); + } + + @Override + + public boolean refactorMatchParentBounds() { + return getValue(Flags.FLAG_REFACTOR_MATCH_PARENT_BOUNDS, + FeatureFlags::refactorMatchParentBounds); + } + + @Override + + public boolean relativeInsets() { + return getValue(Flags.FLAG_RELATIVE_INSETS, + FeatureFlags::relativeInsets); + } + + @Override + + public boolean releaseAllTransitionSurfaces() { + return getValue(Flags.FLAG_RELEASE_ALL_TRANSITION_SURFACES, + FeatureFlags::releaseAllTransitionSurfaces); + } + + @Override + + public boolean removeDeskOnLastTaskRemoval() { + return getValue(Flags.FLAG_REMOVE_DESK_ON_LAST_TASK_REMOVAL, + FeatureFlags::removeDeskOnLastTaskRemoval); + } + + @Override + + public boolean removeGetDimmer() { + return getValue(Flags.FLAG_REMOVE_GET_DIMMER, + FeatureFlags::removeGetDimmer); + } + + @Override + + public boolean reparentWindowTokenApi() { + return getValue(Flags.FLAG_REPARENT_WINDOW_TOKEN_API, + FeatureFlags::reparentWindowTokenApi); + } + + @Override + + public boolean repositoryBasedPersistence() { + return getValue(Flags.FLAG_REPOSITORY_BASED_PERSISTENCE, + FeatureFlags::repositoryBasedPersistence); + } + + @Override + + public boolean repositoryBasedPersistenceBgThread() { + return getValue(Flags.FLAG_REPOSITORY_BASED_PERSISTENCE_BG_THREAD, + FeatureFlags::repositoryBasedPersistenceBgThread); + } + + @Override + + public boolean respectFullscreenActivityOptionInDesktopLaunchParams() { + return getValue(Flags.FLAG_RESPECT_FULLSCREEN_ACTIVITY_OPTION_IN_DESKTOP_LAUNCH_PARAMS, + FeatureFlags::respectFullscreenActivityOptionInDesktopLaunchParams); + } + + @Override + + public boolean respectOrientationChangeForUnresizeable() { + return getValue(Flags.FLAG_RESPECT_ORIENTATION_CHANGE_FOR_UNRESIZEABLE, + FeatureFlags::respectOrientationChangeForUnresizeable); + } + + @Override + + public boolean respectRequestedTaskSnapshotResolution() { + return getValue(Flags.FLAG_RESPECT_REQUESTED_TASK_SNAPSHOT_RESOLUTION, + FeatureFlags::respectRequestedTaskSnapshotResolution); + } + + @Override + + public boolean restoreUserAspectRatioSettingsUsingService() { + return getValue(Flags.FLAG_RESTORE_USER_ASPECT_RATIO_SETTINGS_USING_SERVICE, + FeatureFlags::restoreUserAspectRatioSettingsUsingService); + } + + @Override + + public boolean restrictFreeformHiddenSystemBarsToFillingTasks() { + return getValue(Flags.FLAG_RESTRICT_FREEFORM_HIDDEN_SYSTEM_BARS_TO_FILLING_TASKS, + FeatureFlags::restrictFreeformHiddenSystemBarsToFillingTasks); + } + + @Override + + public boolean returnAllVisibleActivitiesForVis() { + return getValue(Flags.FLAG_RETURN_ALL_VISIBLE_ACTIVITIES_FOR_VIS, + FeatureFlags::returnAllVisibleActivitiesForVis); + } + + @Override + + public boolean rootTaskForBubble() { + return getValue(Flags.FLAG_ROOT_TASK_FOR_BUBBLE, + FeatureFlags::rootTaskForBubble); + } + + @Override + + public boolean safeRegionLetterboxingV1() { + return getValue(Flags.FLAG_SAFE_REGION_LETTERBOXING_V1, + FeatureFlags::safeRegionLetterboxingV1); + } + + @Override + + public boolean screenRecordingCallbacks() { + return getValue(Flags.FLAG_SCREEN_RECORDING_CALLBACKS, + FeatureFlags::screenRecordingCallbacks); + } + + @Override + + public boolean scrollingFromLetterbox() { + return getValue(Flags.FLAG_SCROLLING_FROM_LETTERBOX, + FeatureFlags::scrollingFromLetterbox); + } + + @Override + + public boolean scvhSetFocusable() { + return getValue(Flags.FLAG_SCVH_SET_FOCUSABLE, + FeatureFlags::scvhSetFocusable); + } + + @Override + + public boolean scvhSurfaceControlLifetimeFix() { + return getValue(Flags.FLAG_SCVH_SURFACE_CONTROL_LIFETIME_FIX, + FeatureFlags::scvhSurfaceControlLifetimeFix); + } + + @Override + + public boolean sdkDesiredPresentTime() { + return getValue(Flags.FLAG_SDK_DESIRED_PRESENT_TIME, + FeatureFlags::sdkDesiredPresentTime); + } + + @Override + + public boolean setScPropertiesInClient() { + return getValue(Flags.FLAG_SET_SC_PROPERTIES_IN_CLIENT, + FeatureFlags::setScPropertiesInClient); + } + + @Override + + public boolean showAppHandleLargeScreens() { + return getValue(Flags.FLAG_SHOW_APP_HANDLE_LARGE_SCREENS, + FeatureFlags::showAppHandleLargeScreens); + } + + @Override + + public boolean showBiometricPromptSecondaryDisplayMessage() { + return getValue(Flags.FLAG_SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_MESSAGE, + FeatureFlags::showBiometricPromptSecondaryDisplayMessage); + } + + @Override + + public boolean showDesktopExperienceDevOption() { + return getValue(Flags.FLAG_SHOW_DESKTOP_EXPERIENCE_DEV_OPTION, + FeatureFlags::showDesktopExperienceDevOption); + } + + @Override + + public boolean showDesktopWindowingDevOption() { + return getValue(Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION, + FeatureFlags::showDesktopWindowingDevOption); + } + + @Override + + public boolean showHomeBehindDesktop() { + return getValue(Flags.FLAG_SHOW_HOME_BEHIND_DESKTOP, + FeatureFlags::showHomeBehindDesktop); + } + + @Override + + public boolean skipCompatUiEducationInDesktopMode() { + return getValue(Flags.FLAG_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE, + FeatureFlags::skipCompatUiEducationInDesktopMode); + } + + @Override + + public boolean skipDeactivationOfDeskWithNothingInFront() { + return getValue(Flags.FLAG_SKIP_DEACTIVATION_OF_DESK_WITH_NOTHING_IN_FRONT, + FeatureFlags::skipDeactivationOfDeskWithNothingInFront); + } + + @Override + + public boolean skipDecorViewRelayoutWhenClosingBugfix() { + return getValue(Flags.FLAG_SKIP_DECOR_VIEW_RELAYOUT_WHEN_CLOSING_BUGFIX, + FeatureFlags::skipDecorViewRelayoutWhenClosingBugfix); + } + + @Override + + public boolean supportGeminiOnMultiDisplay() { + return getValue(Flags.FLAG_SUPPORT_GEMINI_ON_MULTI_DISPLAY, + FeatureFlags::supportGeminiOnMultiDisplay); + } + + @Override + + public boolean systemContentPriority() { + return getValue(Flags.FLAG_SYSTEM_CONTENT_PRIORITY, + FeatureFlags::systemContentPriority); + } + + @Override + + public boolean systemUiPostAnimationEnd() { + return getValue(Flags.FLAG_SYSTEM_UI_POST_ANIMATION_END, + FeatureFlags::systemUiPostAnimationEnd); + } + + @Override + + public boolean taskFragmentCompanionActivity() { + return getValue(Flags.FLAG_TASK_FRAGMENT_COMPANION_ACTIVITY, + FeatureFlags::taskFragmentCompanionActivity); + } + + @Override + + public boolean taskbarRunningTasksInSplitscreenSelect() { + return getValue(Flags.FLAG_TASKBAR_RUNNING_TASKS_IN_SPLITSCREEN_SELECT, + FeatureFlags::taskbarRunningTasksInSplitscreenSelect); + } + + @Override + + public boolean toggleFullscreenStateViaFullscreenKey() { + return getValue(Flags.FLAG_TOGGLE_FULLSCREEN_STATE_VIA_FULLSCREEN_KEY, + FeatureFlags::toggleFullscreenStateViaFullscreenKey); + } + + @Override + + public boolean touchPassThroughOptIn() { + return getValue(Flags.FLAG_TOUCH_PASS_THROUGH_OPT_IN, + FeatureFlags::touchPassThroughOptIn); + } + + @Override + + public boolean transferStartingWindowToNextWhenInvisible() { + return getValue(Flags.FLAG_TRANSFER_STARTING_WINDOW_TO_NEXT_WHEN_INVISIBLE, + FeatureFlags::transferStartingWindowToNextWhenInvisible); + } + + @Override + + public boolean transitReadyTracking() { + return getValue(Flags.FLAG_TRANSIT_READY_TRACKING, + FeatureFlags::transitReadyTracking); + } + + @Override + + public boolean transitTrackerPlumbing() { + return getValue(Flags.FLAG_TRANSIT_TRACKER_PLUMBING, + FeatureFlags::transitTrackerPlumbing); + } + + @Override + + public boolean transitionHandlerCujTags() { + return getValue(Flags.FLAG_TRANSITION_HANDLER_CUJ_TAGS, + FeatureFlags::transitionHandlerCujTags); + } + + @Override + + public boolean unifyShellBinders() { + return getValue(Flags.FLAG_UNIFY_SHELL_BINDERS, + FeatureFlags::unifyShellBinders); + } + + @Override + + public boolean universalResizableByDefault() { + return getValue(Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT, + FeatureFlags::universalResizableByDefault); + } + + @Override + + public boolean untrustedEmbeddingAnyAppPermission() { + return getValue(Flags.FLAG_UNTRUSTED_EMBEDDING_ANY_APP_PERMISSION, + FeatureFlags::untrustedEmbeddingAnyAppPermission); + } + + @Override + + public boolean untrustedEmbeddingStateSharing() { + return getValue(Flags.FLAG_UNTRUSTED_EMBEDDING_STATE_SHARING, + FeatureFlags::untrustedEmbeddingStateSharing); + } + + @Override + + public boolean updateDimsWhenWindowShown() { + return getValue(Flags.FLAG_UPDATE_DIMS_WHEN_WINDOW_SHOWN, + FeatureFlags::updateDimsWhenWindowShown); + } + + @Override + + public boolean updateTaskCropInSync() { + return getValue(Flags.FLAG_UPDATE_TASK_CROP_IN_SYNC, + FeatureFlags::updateTaskCropInSync); + } + + @Override + + public boolean useInputReportedFocusForAccessibility() { + return getValue(Flags.FLAG_USE_INPUT_REPORTED_FOCUS_FOR_ACCESSIBILITY, + FeatureFlags::useInputReportedFocusForAccessibility); + } + + @Override + + public boolean vdmForceAppUniversalResizableApi() { + return getValue(Flags.FLAG_VDM_FORCE_APP_UNIVERSAL_RESIZABLE_API, + FeatureFlags::vdmForceAppUniversalResizableApi); + } + + @Override + + public boolean waitForPresentFenceOnDisplaySwitch() { + return getValue(Flags.FLAG_WAIT_FOR_PRESENT_FENCE_ON_DISPLAY_SWITCH, + FeatureFlags::waitForPresentFenceOnDisplaySwitch); + } + + public boolean isFlagReadOnlyOptimized(String flagName) { + if (mReadOnlyFlagsSet.contains(flagName) && + isOptimizationEnabled()) { + return true; + } + return false; + } + + + private boolean isOptimizationEnabled() { return false; } @@ -762,162 +2456,704 @@ protected boolean getValue(String flagName, Predicate getter) { public List getFlagNames() { return Arrays.asList( - Flags.FLAG_ACTIVITY_EMBEDDING_ANIMATION_CUSTOMIZATION_FLAG, - Flags.FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG, - Flags.FLAG_ACTIVITY_EMBEDDING_OVERLAY_PRESENTATION_FLAG, - Flags.FLAG_ACTIVITY_SNAPSHOT_BY_DEFAULT, - Flags.FLAG_ACTIVITY_WINDOW_INFO_FLAG, - Flags.FLAG_ALLOW_DISABLE_ACTIVITY_RECORD_INPUT_SINK, - Flags.FLAG_ALLOW_HIDE_SCM_BUTTON, - Flags.FLAG_ALLOWS_SCREEN_SIZE_DECOUPLED_FROM_STATUS_BAR_AND_CUTOUT, - Flags.FLAG_ALWAYS_DEFER_TRANSITION_WHEN_APPLY_WCT, - Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER, - Flags.FLAG_ALWAYS_UPDATE_WALLPAPER_PERMISSION, - Flags.FLAG_APP_COMPAT_PROPERTIES_API, - Flags.FLAG_APP_COMPAT_REFACTORING, - Flags.FLAG_BAL_DONT_BRING_EXISTING_BACKGROUND_TASK_STACK_TO_FG, - Flags.FLAG_BAL_IMPROVE_REAL_CALLER_VISIBILITY_CHECK, - Flags.FLAG_BAL_IMPROVED_METRICS, - Flags.FLAG_BAL_REQUIRE_OPT_IN_BY_PENDING_INTENT_CREATOR, - Flags.FLAG_BAL_REQUIRE_OPT_IN_SAME_UID, - Flags.FLAG_BAL_RESPECT_APP_SWITCH_STATE_WHEN_CHECK_BOUND_BY_FOREGROUND_UID, - Flags.FLAG_BAL_SHOW_TOASTS, - Flags.FLAG_BAL_SHOW_TOASTS_BLOCKED, - Flags.FLAG_BLAST_SYNC_NOTIFICATION_SHADE_ON_DISPLAY_SWITCH, - Flags.FLAG_BUNDLE_CLIENT_TRANSACTION_FLAG, - Flags.FLAG_CAMERA_COMPAT_FOR_FREEFORM, - Flags.FLAG_CLOSE_TO_SQUARE_CONFIG_INCLUDES_STATUS_BAR, - Flags.FLAG_CONFIGURABLE_FONT_SCALE_DEFAULT, - Flags.FLAG_COVER_DISPLAY_OPT_IN, - Flags.FLAG_DEFER_DISPLAY_UPDATES, - Flags.FLAG_DELAY_NOTIFICATION_TO_MAGNIFICATION_WHEN_RECENTS_WINDOW_TO_FRONT_TRANSITION, - Flags.FLAG_DELEGATE_UNHANDLED_DRAGS, - Flags.FLAG_DELETE_CAPTURE_DISPLAY, - Flags.FLAG_DENSITY_390_API, - Flags.FLAG_DISABLE_OBJECT_POOL, - Flags.FLAG_DISABLE_THIN_LETTERBOXING_POLICY, - Flags.FLAG_DO_NOT_CHECK_INTERSECTION_WHEN_NON_MAGNIFIABLE_WINDOW_TRANSITIONS, - Flags.FLAG_DRAW_SNAPSHOT_ASPECT_RATIO_MATCH, - Flags.FLAG_EDGE_TO_EDGE_BY_DEFAULT, - Flags.FLAG_EMBEDDED_ACTIVITY_BACK_NAV_FLAG, - Flags.FLAG_ENABLE_ADDITIONAL_WINDOWS_ABOVE_STATUS_BAR, - Flags.FLAG_ENABLE_APP_HEADER_WITH_TASK_DENSITY, - Flags.FLAG_ENABLE_BUFFER_TRANSFORM_HINT_FROM_DISPLAY, - Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING, - Flags.FLAG_ENABLE_COMPATUI_SYSUI_LAUNCHER, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_IMMERSIVE_HANDLE_HIDING, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SCVH_CACHE, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASK_LIMIT, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, - Flags.FLAG_ENABLE_SCALED_RESIZING, - Flags.FLAG_ENABLE_TASK_STACK_OBSERVER_IN_SHELL, - Flags.FLAG_ENABLE_THEMED_APP_HEADERS, - Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, - Flags.FLAG_ENABLE_WINDOWING_EDGE_DRAG_RESIZE, - Flags.FLAG_ENABLE_WM_EXTENSIONS_FOR_ALL_FLAG, - Flags.FLAG_ENFORCE_EDGE_TO_EDGE, - Flags.FLAG_ENSURE_WALLPAPER_IN_TRANSITIONS, - Flags.FLAG_EXPLICIT_REFRESH_RATE_HINTS, - Flags.FLAG_FIFO_PRIORITY_FOR_MAJOR_UI_PROCESSES, - Flags.FLAG_FIX_NO_CONTAINER_UPDATE_WITHOUT_RESIZE, - Flags.FLAG_FIX_PIP_RESTORE_TO_OVERLAY, - Flags.FLAG_FULLSCREEN_DIM_FLAG, - Flags.FLAG_GET_DIMMER_ON_CLOSING, - Flags.FLAG_IMMERSIVE_APP_REPOSITIONING, - Flags.FLAG_INSETS_CONTROL_CHANGED_ITEM, - Flags.FLAG_INSETS_CONTROL_SEQ, - Flags.FLAG_INSETS_DECOUPLED_CONFIGURATION, - Flags.FLAG_INTRODUCE_SMOOTHER_DIMMER, - Flags.FLAG_KEYGUARD_APPEAR_TRANSITION, - Flags.FLAG_LETTERBOX_BACKGROUND_WALLPAPER, - Flags.FLAG_MOVABLE_CUTOUT_CONFIGURATION, - Flags.FLAG_MOVE_ANIMATION_OPTIONS_TO_CHANGE, - Flags.FLAG_MULTI_CROP, - Flags.FLAG_NAV_BAR_TRANSPARENT_BY_DEFAULT, - Flags.FLAG_NO_CONSECUTIVE_VISIBILITY_EVENTS, - Flags.FLAG_NO_VISIBILITY_EVENT_ON_DISPLAY_STATE_CHANGE, - Flags.FLAG_OFFLOAD_COLOR_EXTRACTION, - Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS, - Flags.FLAG_REAR_DISPLAY_DISABLE_FORCE_DESKTOP_SYSTEM_DECORATIONS, - Flags.FLAG_RELEASE_SNAPSHOT_AGGRESSIVELY, - Flags.FLAG_REMOVE_PREPARE_SURFACE_IN_PLACEMENT, - Flags.FLAG_SCREEN_RECORDING_CALLBACKS, - Flags.FLAG_SDK_DESIRED_PRESENT_TIME, - Flags.FLAG_SECURE_WINDOW_STATE, - Flags.FLAG_SET_SC_PROPERTIES_IN_CLIENT, - Flags.FLAG_SKIP_SLEEPING_WHEN_SWITCHING_DISPLAY, - Flags.FLAG_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI, - Flags.FLAG_SURFACE_CONTROL_INPUT_RECEIVER, - Flags.FLAG_SURFACE_TRUSTED_OVERLAY, - Flags.FLAG_SYNC_SCREEN_CAPTURE, - Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG, - Flags.FLAG_TRANSIT_READY_TRACKING, - Flags.FLAG_TRUSTED_PRESENTATION_LISTENER_FOR_WINDOW, - Flags.FLAG_UNTRUSTED_EMBEDDING_ANY_APP_PERMISSION, - Flags.FLAG_UNTRUSTED_EMBEDDING_STATE_SHARING, - Flags.FLAG_USE_WINDOW_ORIGINAL_TOUCHABLE_REGION_WHEN_MAGNIFICATION_RECOMPUTE_BOUNDS, - Flags.FLAG_USER_MIN_ASPECT_RATIO_APP_DEFAULT, - Flags.FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH, - Flags.FLAG_WALLPAPER_OFFSET_ASYNC, - Flags.FLAG_WINDOW_SESSION_RELAYOUT_INFO, - Flags.FLAG_WINDOW_TOKEN_CONFIG_THREAD_SAFE + Flags.FLAG_ACTIVITY_EMBEDDING_ABORT_CROSS_UID_LAUNCH_IN_FINISHING_TASK_FRAGMENT, + Flags.FLAG_ACTIVITY_EMBEDDING_DELAY_TASK_FRAGMENT_FINISH_FOR_ACTIVITY_LAUNCH, + Flags.FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG, + Flags.FLAG_ACTIVITY_EMBEDDING_METRICS, + Flags.FLAG_ALLOW_DISABLE_ACTIVITY_RECORD_INPUT_SINK, + Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER, + Flags.FLAG_ALWAYS_SEQ_ID_LAYOUT, + Flags.FLAG_ALWAYS_SEQ_ID_LAYOUT_WEAR, + Flags.FLAG_ALWAYS_UPDATE_WALLPAPER_PERMISSION, + Flags.FLAG_AOD_TRANSITION, + Flags.FLAG_APP_COMPAT_PROPERTIES_API, + Flags.FLAG_APP_COMPAT_REFACTORING, + Flags.FLAG_APP_COMPAT_REFACTORING_FIX_MULTIWINDOW_TASK_HIERARCHY, + Flags.FLAG_APP_COMPAT_REFACTORING_FORCE_CHANGE_FOR_LETTERBOX_TRANSITIONS, + Flags.FLAG_APP_COMPAT_REFACTORING_ROUNDED_CORNERS, + Flags.FLAG_APP_COMPAT_REFACTORING_ROUNDED_CORNERS_ANIMATION, + Flags.FLAG_APP_COMPAT_REFACTORING_SET_APPBOUNDS_TO_NULL_WHEN_EMPTY, + Flags.FLAG_APP_COMPAT_REFACTORING_SKIP_STARTING_WINDOW_LETTERBOX, + Flags.FLAG_APP_COMPAT_REFACTORING_USE_ACTIVITY_LEASH_FOR_LETTERBOXING, + Flags.FLAG_APP_COMPAT_UI_FRAMEWORK, + Flags.FLAG_APP_HANDLE_NO_RELAYOUT_ON_EXCLUSION_CHANGE, + Flags.FLAG_APPLY_DESK_ACTIVATION_ON_USER_SWITCH, + Flags.FLAG_APPLY_LIFECYCLE_ON_PIP_CHANGE, + Flags.FLAG_AVOID_REBINDING_INTENTIONALLY_DISCONNECTED_WALLPAPER, + Flags.FLAG_BACKUP_AND_RESTORE_FOR_USER_ASPECT_RATIO_SETTINGS, + Flags.FLAG_BAL_ADDITIONAL_START_MODES, + Flags.FLAG_BAL_CHECK_BROADCAST_WHEN_DISPATCHED, + Flags.FLAG_BAL_COVER_INTENT_SENDER, + Flags.FLAG_BAL_DONT_BRING_EXISTING_BACKGROUND_TASK_STACK_TO_FG, + Flags.FLAG_BAL_REDUCE_GRACE_PERIOD, + Flags.FLAG_BAL_REPORT_ABORTED_ACTIVITY_STARTS, + Flags.FLAG_BAL_RESPECT_APP_SWITCH_STATE_WHEN_CHECK_BOUND_BY_FOREGROUND_UID, + Flags.FLAG_BAL_SEND_INTENT_WITH_OPTIONS, + Flags.FLAG_BAL_STRICT_MODE_RO, + Flags.FLAG_CAMERA_COMPAT_FULLSCREEN_PICK_SAME_TASK_ACTIVITY, + Flags.FLAG_CAMERA_COMPAT_LANDSCAPE_CAMERA_SUPPORT, + Flags.FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES, + Flags.FLAG_CLEAR_REUSABLE_SCVH_ON_RELEASE, + Flags.FLAG_CLOSE_FULLSCREEN_AND_SPLITSCREEN_KEYBOARD_SHORTCUT, + Flags.FLAG_CLOSE_TASK_KEYBOARD_SHORTCUT, + Flags.FLAG_CLOSE_TO_SQUARE_CONFIG_INCLUDES_STATUS_BAR, + Flags.FLAG_COVER_DISPLAY_OPT_IN, + Flags.FLAG_CURRENT_ANIMATOR_SCALE_USES_SHARED_MEMORY, + Flags.FLAG_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION, + Flags.FLAG_DEFER_RESUME_FOCUS_IN_NON_FOCUSED_WINDOW, + Flags.FLAG_DENSITY_390_API, + Flags.FLAG_DEPRECATE_SURFACE_ANIMATION_FRAME_CALLBACK, + Flags.FLAG_DEPRECATE_WINDOW_ANIMATOR_FRAME_CALLBACK, + Flags.FLAG_DIMMING_WALLPAPER_FOR_MAXIMIZED_AND_TILED, + Flags.FLAG_DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX, + Flags.FLAG_DISABLE_NON_RESIZABLE_APP_SNAP_RESIZING, + Flags.FLAG_DISABLE_RESTORE_NON_FULLSCREEN_BOUNDS_ON_CONFIGURATION_CHANGE, + Flags.FLAG_DO_NOT_FORCE_WALLPAPER_FOR_FREEFORM_TASK, + Flags.FLAG_ENABLE_ACCESSIBLE_CUSTOM_HEADERS, + Flags.FLAG_ENABLE_ACTIVITY_EMBEDDING_SUPPORT_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_APP_HANDLE_POSITION_REPORTING, + Flags.FLAG_ENABLE_APP_HEADER_WITH_TASK_DENSITY, + Flags.FLAG_ENABLE_APP_TO_WEB_EDUCATION_ANIMATION, + Flags.FLAG_ENABLE_AUTO_RESTART_ON_DISPLAY_MOVE, + Flags.FLAG_ENABLE_BACKUP_AND_RESTORE_DISPLAY_WINDOW_SETTINGS, + Flags.FLAG_ENABLE_BLOCK_NON_DESKTOP_DISPLAY_WINDOW_DRAG_BUGFIX, + Flags.FLAG_ENABLE_BORDER_SETTINGS, + Flags.FLAG_ENABLE_BOUNDS_RESTORING_ON_TILING_EXIT, + Flags.FLAG_ENABLE_BOX_SHADOW_SETTINGS, + Flags.FLAG_ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY, + Flags.FLAG_ENABLE_CAMERA_COMPAT_COMPATIBILITY_INFO_ROTATE_AND_CROP_BUGFIX, + Flags.FLAG_ENABLE_CAMERA_COMPAT_EXTERNAL_DISPLAY_ROTATION_BUGFIX, + Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING, + Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT, + Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT_API, + Flags.FLAG_ENABLE_CAMERA_COMPAT_SANDBOX_DISPLAY_ROTATION_ON_EXTERNAL_DISPLAYS_BUGFIX, + Flags.FLAG_ENABLE_CAMERA_COMPAT_TRACK_TASK_AND_APP_BUGFIX, + Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_CONVERSION, + Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION, + Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS, + Flags.FLAG_ENABLE_CASCADING_WINDOWS, + Flags.FLAG_ENABLE_CLOSE_LID_INTERACTION, + Flags.FLAG_ENABLE_COMPAT_UI_DESKTOP_MODE_SYNCHRONIZATION_BUGFIX, + Flags.FLAG_ENABLE_COMPAT_UI_VISIBILITY_STATUS, + Flags.FLAG_ENABLE_COMPATUI_SYSUI_LAUNCHER_FIX, + Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_DND, + Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_PIP, + Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WALLPAPER_PRESENTATIONS, + Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG, + Flags.FLAG_ENABLE_CRASH_LOGGING_FOR_DESKTOP, + Flags.FLAG_ENABLE_CROSS_DISPLAYS_APP_LAUNCH_TRANSITION, + Flags.FLAG_ENABLE_CROSS_DISPLAYS_PIP_TASK_LAUNCH, + Flags.FLAG_ENABLE_DESKTOP_APP_HANDLE_ANIMATION, + Flags.FLAG_ENABLE_DESKTOP_APP_HEADER_STATE_CHANGE_ANNOUNCEMENTS, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_CLOSE_SHORTCUT_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_CLOSE_TASK_ANIMATION_IN_DTC_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DRAG_TO_MAXIMIZE, + Flags.FLAG_ENABLE_DESKTOP_FIRST_FULLSCREEN_REFOCUS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_FIRST_LISTENER, + Flags.FLAG_ENABLE_DESKTOP_FIRST_POLICY_IN_LPM, + Flags.FLAG_ENABLE_DESKTOP_FIRST_TOP_FULLSCREEN_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_IME_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_IMMERSIVE_DRAG_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_INDICATOR_IN_SEPARATE_THREAD_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_INVISIBLE_TASK_REMOVAL_CLEANUP_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION, + Flags.FLAG_ENABLE_DESKTOP_OPENING_DEEPLINK_MINIMIZE_ANIMATION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_SPLITSCREEN_TRANSITION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_LAUNCH_ANIMATION, + Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_MINIMIZE_ANIMATION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_TASK_LIMIT_SEPARATE_TRANSITION, + Flags.FLAG_ENABLE_DESKTOP_TASKBAR_ON_FREEFORM_DISPLAYS, + Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_HANDLE_EDUCATION, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION_INTEGRATION, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTERPRISE_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_BY_MINIMIZE_TRANSITION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_HSUM, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_IMMERSIVE_HANDLE_HIDING, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP_IN_OVERVIEW_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SCVH_CACHE_BUG_FIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASK_LIMIT, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DEVICE_STATE_AUTO_ROTATE_SETTING_LOGGING, + Flags.FLAG_ENABLE_DEVICE_STATE_AUTO_ROTATE_SETTING_REFACTOR, + Flags.FLAG_ENABLE_DIALOG_DISPLAY_FIXES, + Flags.FLAG_ENABLE_DISPLAY_COMPAT_MODE, + Flags.FLAG_ENABLE_DISPLAY_DISCONNECT_INTERACTION, + Flags.FLAG_ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS, + Flags.FLAG_ENABLE_DISPLAY_RECONNECT_INTERACTION, + Flags.FLAG_ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING, + Flags.FLAG_ENABLE_DRAG_END_STABLE_BOUNDS_RESET, + Flags.FLAG_ENABLE_DRAG_RESIZE_SET_UP_IN_BG_THREAD, + Flags.FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX, + Flags.FLAG_ENABLE_DRAG_TO_MAXIMIZE, + Flags.FLAG_ENABLE_DRAGGING_PIP_ACROSS_DISPLAYS, + Flags.FLAG_ENABLE_DRAWING_APP_HANDLE, + Flags.FLAG_ENABLE_DREAM_ACTIVITY_WINDOWING_EXCLUSION, + Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX, + Flags.FLAG_ENABLE_EMPTY_DESK_ON_MINIMIZE, + Flags.FLAG_ENABLE_EXPERIMENTAL_BUBBLES_CONTROLLER, + Flags.FLAG_ENABLE_EXTERNAL_DISPLAY_PERSISTENCE_BUGFIX, + Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS, + Flags.FLAG_ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS, + Flags.FLAG_ENABLE_FULL_SCREEN_WINDOW_ON_REMOVING_SPLIT_SCREEN_STAGE_BUGFIX, + Flags.FLAG_ENABLE_FULLSCREEN_WINDOW_CONTROLS, + Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP, + Flags.FLAG_ENABLE_HANDLE_INPUT_FIX, + Flags.FLAG_ENABLE_HANDLERS_DEBUGGING_MODE, + Flags.FLAG_ENABLE_HOLD_TO_DRAG_APP_HANDLE, + Flags.FLAG_ENABLE_INDEPENDENT_BACK_IN_PROJECTED, + Flags.FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP, + Flags.FLAG_ENABLE_INPUT_LAYER_TRANSITION_FIX, + Flags.FLAG_ENABLE_INTERACTION_DEPENDENT_TAB_TEARING_BOUNDS, + Flags.FLAG_ENABLE_INTERACTIVE_PICTURE_IN_PICTURE, + Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_SYSUI, + Flags.FLAG_ENABLE_LAUNCHER_HANDLE_GO_HOME_KEYBOARD_SHORTCUT, + Flags.FLAG_ENABLE_MINIMIZE_BUTTON, + Flags.FLAG_ENABLE_MIRROR_DISPLAY_NO_ACTIVITY, + Flags.FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PERMISSION, + Flags.FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PLATFORM_SIGNATURE, + Flags.FLAG_ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT, + Flags.FLAG_ENABLE_MULTI_DISPLAY_HOME_FOCUS_BUG_FIX, + Flags.FLAG_ENABLE_MULTI_DISPLAY_SPLIT, + Flags.FLAG_ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE, + Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, + Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_DEFAULT_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS, + Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, + Flags.FLAG_ENABLE_NO_WINDOW_DECORATION_FOR_DESKS, + Flags.FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT, + Flags.FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX, + Flags.FLAG_ENABLE_OPAQUE_BACKGROUND_FOR_TRANSPARENT_WINDOWS, + Flags.FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS, + Flags.FLAG_ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_PER_DISPLAY_PACKAGE_CONTEXT_CACHE_IN_STATUSBAR_NOTIF, + Flags.FLAG_ENABLE_PER_DISPLAY_WINDOW_DECOR_VIEW_HOST_POOL, + Flags.FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU, + Flags.FLAG_ENABLE_PIP_PARAMS_UPDATE_NOTIFICATION_BUGFIX, + Flags.FLAG_ENABLE_PRESENTATION_DISALLOWED_ON_UNFOCUSED_HOST_TASK, + Flags.FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE, + Flags.FLAG_ENABLE_QUICKSWITCH_DESKTOP_SPLIT_BUGFIX, + Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION, + Flags.FLAG_ENABLE_REMOVE_STATUS_BAR_INPUT_LAYER, + Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_BUGFIX, + Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_REFACTOR, + Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_RESTORE_FREEFORM_BUGFIX, + Flags.FLAG_ENABLE_RESIZING_METRICS, + Flags.FLAG_ENABLE_RESTART_MENU_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_RESTORE_TO_PREVIOUS_SIZE_FROM_DESKTOP_IMMERSIVE, + Flags.FLAG_ENABLE_SEE_THROUGH_TASK_FRAGMENTS, + Flags.FLAG_ENABLE_SHELL_INITIAL_BOUNDS_REGRESSION_BUG_FIX, + Flags.FLAG_ENABLE_SHRINK_WINDOW_BOUNDS_AFTER_DRAG, + Flags.FLAG_ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_START_LAUNCH_TRANSITION_FROM_TASKBAR_BUGFIX, + Flags.FLAG_ENABLE_SYS_DECORS_CALLBACKS_VIA_WM, + Flags.FLAG_ENABLE_TALL_APP_HEADERS, + Flags.FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS, + Flags.FLAG_ENABLE_TASK_STACK_OBSERVER_IN_SHELL, + Flags.FLAG_ENABLE_TASKBAR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_TASKBAR_OVERFLOW, + Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX, + Flags.FLAG_ENABLE_TASKBAR_RECENTS_LAYOUT_TRANSITION, + Flags.FLAG_ENABLE_THEMED_APP_HEADERS, + Flags.FLAG_ENABLE_TILE_RESIZING, + Flags.FLAG_ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING, + Flags.FLAG_ENABLE_TRANSITION_ON_ACTIVITY_SET_REQUESTED_ORIENTATION, + Flags.FLAG_ENABLE_UPDATED_DISPLAY_CONNECTION_DIALOG, + Flags.FLAG_ENABLE_UPSCALING_SIZE_COMPAT_ON_EXITING_DESKTOP_BUGFIX, + Flags.FLAG_ENABLE_VISUAL_INDICATOR_IN_TRANSITION_BUGFIX, + Flags.FLAG_ENABLE_WINDOW_CONTEXT_RESOURCES_UPDATE_ON_CONFIG_CHANGE, + Flags.FLAG_ENABLE_WINDOW_DECORATION_REFACTOR, + Flags.FLAG_ENABLE_WINDOW_DROP_SMOOTH_TRANSITION, + Flags.FLAG_ENABLE_WINDOW_REPOSITIONING_API, + Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, + Flags.FLAG_ENABLE_WINDOWING_EDGE_DRAG_RESIZE, + Flags.FLAG_ENABLE_WINDOWING_SCALED_RESIZING, + Flags.FLAG_ENABLE_WINDOWING_TASK_STACK_ORDER_BUGFIX, + Flags.FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS, + Flags.FLAG_ENFORCE_EDGE_TO_EDGE, + Flags.FLAG_ENSURE_KEYGUARD_DOES_TRANSITION_STARTING_BUG_FIX, + Flags.FLAG_ENSURE_WALLPAPER_DRAWN_ON_DISPLAY_SWITCH, + Flags.FLAG_ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS, + Flags.FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS, + Flags.FLAG_EXCLUDE_DESK_ROOTS_FROM_DESKTOP_TASKS, + Flags.FLAG_EXCLUDING_LAYER_FROM_TASK_SNAPSHOT, + Flags.FLAG_FALLBACK_TO_FOCUSED_DISPLAY, + Flags.FLAG_FALLBACK_TRANSITION_PLAYER, + Flags.FLAG_FIFO_PRIORITY_FOR_MAJOR_UI_PROCESSES, + Flags.FLAG_FIX_BAL_REPARENT_EXISTING_TASK, + Flags.FLAG_FIX_BUBBLE_TRAMPOLINE_ANIMATION, + Flags.FLAG_FIX_HIDE_OVERLAY_API, + Flags.FLAG_FIX_LEAKING_VISUAL_INDICATOR, + Flags.FLAG_FIX_RAPID_TOP_RESUMED_SWITCH, + Flags.FLAG_FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK, + Flags.FLAG_FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH, + Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS, + Flags.FLAG_HANDLE_INCOMPATIBLE_TASKS_IN_DESKTOP_LAUNCH_PARAMS, + Flags.FLAG_IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES, + Flags.FLAG_IGNORE_CORNER_RADIUS_AND_SHADOWS, + Flags.FLAG_IGNORE_CURRENT_PARAMS_IN_DESKTOP_LAUNCH_PARAMS, + Flags.FLAG_IGNORE_OVERRIDE_TASK_BOUNDS_IF_INCOMPATIBLE_WITH_DISPLAY, + Flags.FLAG_IME_BACK_CALLBACK_LEAK_PREVENTION, + Flags.FLAG_INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC, + Flags.FLAG_INHERIT_TASK_BOUNDS_FOR_TRAMPOLINE_TASK_LAUNCHES, + Flags.FLAG_JANK_API, + Flags.FLAG_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS, + Flags.FLAG_KEYGUARD_REMOVE_DEFAULT_DISPLAY_USAGE, + Flags.FLAG_LETTERBOX_BACKGROUND_WALLPAPER, + Flags.FLAG_LIMIT_SYSTEM_FULLSCREEN_OVERRIDE_TO_DEFAULT_DISPLAY, + Flags.FLAG_MIGRATE_BASIC_LEGACY_READY, + Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, + Flags.FLAG_MOVE_TO_NEXT_DISPLAY_SHORTCUT_WITH_PROJECTED_MODE, + Flags.FLAG_MULTI_CROP, + Flags.FLAG_MULTIPLE_SYSTEM_NAVIGATION_OBSERVER_CALLBACKS, + Flags.FLAG_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX, + Flags.FLAG_NO_ALPHA_ROTATION_ENTER_ANIMATION, + Flags.FLAG_OPT_OUT_OVERRIDE_ORIENTATION_TO_USER, + Flags.FLAG_PARALLEL_CD_TRANSITIONS_DURING_RECENTS, + Flags.FLAG_POLISH_CLOSE_WALLPAPER_INCLUDES_OPEN_CHANGE, + Flags.FLAG_PORT_WINDOW_SIZE_ANIMATION, + Flags.FLAG_PREDICTIVE_BACK_CALLBACK_CANCELLATION_FIX, + Flags.FLAG_PREDICTIVE_BACK_DELAY_WM_TRANSITION, + Flags.FLAG_PREDICTIVE_BACK_INTERCEPT_TRANSITION, + Flags.FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER, + Flags.FLAG_PREDICTIVE_BACK_STOP_KEYCODE_BACK_FORWARDING, + Flags.FLAG_PREDICTIVE_BACK_SWIPE_EDGE_NONE_API, + Flags.FLAG_PREDICTIVE_BACK_SYSTEM_OVERRIDE_CALLBACK, + Flags.FLAG_PREDICTIVE_BACK_TIMESTAMP_API, + Flags.FLAG_PRESERVE_RECENTS_TASK_CONFIGURATION_ON_RELAUNCH, + Flags.FLAG_REAR_DISPLAY_DISABLE_FORCE_DESKTOP_SYSTEM_DECORATIONS, + Flags.FLAG_REDUCE_CHANGED_EXCLUSION_RECTS_MSGS, + Flags.FLAG_REDUCE_TASK_SNAPSHOT_MEMORY_USAGE, + Flags.FLAG_REENABLE_APP_HANDLE_ANIMATIONS, + Flags.FLAG_REENABLE_APP_HANDLE_COLOR_ANIMATIONS, + Flags.FLAG_REFACTOR_MATCH_PARENT_BOUNDS, + Flags.FLAG_RELATIVE_INSETS, + Flags.FLAG_RELEASE_ALL_TRANSITION_SURFACES, + Flags.FLAG_REMOVE_DESK_ON_LAST_TASK_REMOVAL, + Flags.FLAG_REMOVE_GET_DIMMER, + Flags.FLAG_REPARENT_WINDOW_TOKEN_API, + Flags.FLAG_REPOSITORY_BASED_PERSISTENCE, + Flags.FLAG_REPOSITORY_BASED_PERSISTENCE_BG_THREAD, + Flags.FLAG_RESPECT_FULLSCREEN_ACTIVITY_OPTION_IN_DESKTOP_LAUNCH_PARAMS, + Flags.FLAG_RESPECT_ORIENTATION_CHANGE_FOR_UNRESIZEABLE, + Flags.FLAG_RESPECT_REQUESTED_TASK_SNAPSHOT_RESOLUTION, + Flags.FLAG_RESTORE_USER_ASPECT_RATIO_SETTINGS_USING_SERVICE, + Flags.FLAG_RESTRICT_FREEFORM_HIDDEN_SYSTEM_BARS_TO_FILLING_TASKS, + Flags.FLAG_RETURN_ALL_VISIBLE_ACTIVITIES_FOR_VIS, + Flags.FLAG_ROOT_TASK_FOR_BUBBLE, + Flags.FLAG_SAFE_REGION_LETTERBOXING_V1, + Flags.FLAG_SCREEN_RECORDING_CALLBACKS, + Flags.FLAG_SCROLLING_FROM_LETTERBOX, + Flags.FLAG_SCVH_SET_FOCUSABLE, + Flags.FLAG_SCVH_SURFACE_CONTROL_LIFETIME_FIX, + Flags.FLAG_SDK_DESIRED_PRESENT_TIME, + Flags.FLAG_SET_SC_PROPERTIES_IN_CLIENT, + Flags.FLAG_SHOW_APP_HANDLE_LARGE_SCREENS, + Flags.FLAG_SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_MESSAGE, + Flags.FLAG_SHOW_DESKTOP_EXPERIENCE_DEV_OPTION, + Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION, + Flags.FLAG_SHOW_HOME_BEHIND_DESKTOP, + Flags.FLAG_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE, + Flags.FLAG_SKIP_DEACTIVATION_OF_DESK_WITH_NOTHING_IN_FRONT, + Flags.FLAG_SKIP_DECOR_VIEW_RELAYOUT_WHEN_CLOSING_BUGFIX, + Flags.FLAG_SUPPORT_GEMINI_ON_MULTI_DISPLAY, + Flags.FLAG_SYSTEM_CONTENT_PRIORITY, + Flags.FLAG_SYSTEM_UI_POST_ANIMATION_END, + Flags.FLAG_TASK_FRAGMENT_COMPANION_ACTIVITY, + Flags.FLAG_TASKBAR_RUNNING_TASKS_IN_SPLITSCREEN_SELECT, + Flags.FLAG_TOGGLE_FULLSCREEN_STATE_VIA_FULLSCREEN_KEY, + Flags.FLAG_TOUCH_PASS_THROUGH_OPT_IN, + Flags.FLAG_TRANSFER_STARTING_WINDOW_TO_NEXT_WHEN_INVISIBLE, + Flags.FLAG_TRANSIT_READY_TRACKING, + Flags.FLAG_TRANSIT_TRACKER_PLUMBING, + Flags.FLAG_TRANSITION_HANDLER_CUJ_TAGS, + Flags.FLAG_UNIFY_SHELL_BINDERS, + Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT, + Flags.FLAG_UNTRUSTED_EMBEDDING_ANY_APP_PERMISSION, + Flags.FLAG_UNTRUSTED_EMBEDDING_STATE_SHARING, + Flags.FLAG_UPDATE_DIMS_WHEN_WINDOW_SHOWN, + Flags.FLAG_UPDATE_TASK_CROP_IN_SYNC, + Flags.FLAG_USE_INPUT_REPORTED_FOCUS_FOR_ACCESSIBILITY, + Flags.FLAG_VDM_FORCE_APP_UNIVERSAL_RESIZABLE_API, + Flags.FLAG_WAIT_FOR_PRESENT_FENCE_ON_DISPLAY_SWITCH ); } private Set mReadOnlyFlagsSet = new HashSet<>( - Arrays.asList( - Flags.FLAG_ACTIVITY_SNAPSHOT_BY_DEFAULT, - Flags.FLAG_ACTIVITY_WINDOW_INFO_FLAG, - Flags.FLAG_ALLOW_DISABLE_ACTIVITY_RECORD_INPUT_SINK, - Flags.FLAG_ALLOWS_SCREEN_SIZE_DECOUPLED_FROM_STATUS_BAR_AND_CUTOUT, - Flags.FLAG_APP_COMPAT_PROPERTIES_API, - Flags.FLAG_APP_COMPAT_REFACTORING, - Flags.FLAG_BUNDLE_CLIENT_TRANSACTION_FLAG, - Flags.FLAG_CAMERA_COMPAT_FOR_FREEFORM, - Flags.FLAG_CONFIGURABLE_FONT_SCALE_DEFAULT, - Flags.FLAG_COVER_DISPLAY_OPT_IN, - Flags.FLAG_DEFER_DISPLAY_UPDATES, - Flags.FLAG_DELEGATE_UNHANDLED_DRAGS, - Flags.FLAG_DELETE_CAPTURE_DISPLAY, - Flags.FLAG_DENSITY_390_API, - Flags.FLAG_DISABLE_OBJECT_POOL, - Flags.FLAG_DRAW_SNAPSHOT_ASPECT_RATIO_MATCH, - Flags.FLAG_ENABLE_BUFFER_TRANSFORM_HINT_FROM_DISPLAY, - Flags.FLAG_ENABLE_SCALED_RESIZING, - Flags.FLAG_ENABLE_WM_EXTENSIONS_FOR_ALL_FLAG, - Flags.FLAG_ENFORCE_EDGE_TO_EDGE, - Flags.FLAG_EXPLICIT_REFRESH_RATE_HINTS, - Flags.FLAG_FIFO_PRIORITY_FOR_MAJOR_UI_PROCESSES, - Flags.FLAG_FIX_NO_CONTAINER_UPDATE_WITHOUT_RESIZE, - Flags.FLAG_GET_DIMMER_ON_CLOSING, - Flags.FLAG_INSETS_CONTROL_SEQ, - Flags.FLAG_INSETS_DECOUPLED_CONFIGURATION, - Flags.FLAG_INTRODUCE_SMOOTHER_DIMMER, - Flags.FLAG_KEYGUARD_APPEAR_TRANSITION, - Flags.FLAG_MOVABLE_CUTOUT_CONFIGURATION, - Flags.FLAG_REAR_DISPLAY_DISABLE_FORCE_DESKTOP_SYSTEM_DECORATIONS, - Flags.FLAG_RELEASE_SNAPSHOT_AGGRESSIVELY, - Flags.FLAG_REMOVE_PREPARE_SURFACE_IN_PLACEMENT, - Flags.FLAG_SCREEN_RECORDING_CALLBACKS, - Flags.FLAG_SDK_DESIRED_PRESENT_TIME, - Flags.FLAG_SECURE_WINDOW_STATE, - Flags.FLAG_SET_SC_PROPERTIES_IN_CLIENT, - Flags.FLAG_SKIP_SLEEPING_WHEN_SWITCHING_DISPLAY, - Flags.FLAG_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI, - Flags.FLAG_SURFACE_CONTROL_INPUT_RECEIVER, - Flags.FLAG_SURFACE_TRUSTED_OVERLAY, - Flags.FLAG_SYNC_SCREEN_CAPTURE, - Flags.FLAG_TRUSTED_PRESENTATION_LISTENER_FOR_WINDOW, - Flags.FLAG_UNTRUSTED_EMBEDDING_ANY_APP_PERMISSION, - Flags.FLAG_UNTRUSTED_EMBEDDING_STATE_SHARING, - Flags.FLAG_WALLPAPER_OFFSET_ASYNC, - Flags.FLAG_WINDOW_SESSION_RELAYOUT_INFO, - "" - ) + Arrays.asList( + Flags.FLAG_ACTIVITY_EMBEDDING_ABORT_CROSS_UID_LAUNCH_IN_FINISHING_TASK_FRAGMENT, + Flags.FLAG_ACTIVITY_EMBEDDING_DELAY_TASK_FRAGMENT_FINISH_FOR_ACTIVITY_LAUNCH, + Flags.FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG, + Flags.FLAG_ACTIVITY_EMBEDDING_METRICS, + Flags.FLAG_ALLOW_DISABLE_ACTIVITY_RECORD_INPUT_SINK, + Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER, + Flags.FLAG_ALWAYS_SEQ_ID_LAYOUT, + Flags.FLAG_ALWAYS_SEQ_ID_LAYOUT_WEAR, + Flags.FLAG_ALWAYS_UPDATE_WALLPAPER_PERMISSION, + Flags.FLAG_AOD_TRANSITION, + Flags.FLAG_APP_COMPAT_PROPERTIES_API, + Flags.FLAG_APP_COMPAT_REFACTORING, + Flags.FLAG_APP_COMPAT_REFACTORING_FIX_MULTIWINDOW_TASK_HIERARCHY, + Flags.FLAG_APP_COMPAT_REFACTORING_FORCE_CHANGE_FOR_LETTERBOX_TRANSITIONS, + Flags.FLAG_APP_COMPAT_REFACTORING_ROUNDED_CORNERS, + Flags.FLAG_APP_COMPAT_REFACTORING_ROUNDED_CORNERS_ANIMATION, + Flags.FLAG_APP_COMPAT_REFACTORING_SET_APPBOUNDS_TO_NULL_WHEN_EMPTY, + Flags.FLAG_APP_COMPAT_REFACTORING_SKIP_STARTING_WINDOW_LETTERBOX, + Flags.FLAG_APP_COMPAT_REFACTORING_USE_ACTIVITY_LEASH_FOR_LETTERBOXING, + Flags.FLAG_APP_COMPAT_UI_FRAMEWORK, + Flags.FLAG_APP_HANDLE_NO_RELAYOUT_ON_EXCLUSION_CHANGE, + Flags.FLAG_APPLY_DESK_ACTIVATION_ON_USER_SWITCH, + Flags.FLAG_APPLY_LIFECYCLE_ON_PIP_CHANGE, + Flags.FLAG_AVOID_REBINDING_INTENTIONALLY_DISCONNECTED_WALLPAPER, + Flags.FLAG_BACKUP_AND_RESTORE_FOR_USER_ASPECT_RATIO_SETTINGS, + Flags.FLAG_BAL_ADDITIONAL_START_MODES, + Flags.FLAG_BAL_CHECK_BROADCAST_WHEN_DISPATCHED, + Flags.FLAG_BAL_COVER_INTENT_SENDER, + Flags.FLAG_BAL_DONT_BRING_EXISTING_BACKGROUND_TASK_STACK_TO_FG, + Flags.FLAG_BAL_REDUCE_GRACE_PERIOD, + Flags.FLAG_BAL_REPORT_ABORTED_ACTIVITY_STARTS, + Flags.FLAG_BAL_RESPECT_APP_SWITCH_STATE_WHEN_CHECK_BOUND_BY_FOREGROUND_UID, + Flags.FLAG_BAL_SEND_INTENT_WITH_OPTIONS, + Flags.FLAG_BAL_STRICT_MODE_RO, + Flags.FLAG_CAMERA_COMPAT_FULLSCREEN_PICK_SAME_TASK_ACTIVITY, + Flags.FLAG_CAMERA_COMPAT_LANDSCAPE_CAMERA_SUPPORT, + Flags.FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES, + Flags.FLAG_CLEAR_REUSABLE_SCVH_ON_RELEASE, + Flags.FLAG_CLOSE_FULLSCREEN_AND_SPLITSCREEN_KEYBOARD_SHORTCUT, + Flags.FLAG_CLOSE_TASK_KEYBOARD_SHORTCUT, + Flags.FLAG_CLOSE_TO_SQUARE_CONFIG_INCLUDES_STATUS_BAR, + Flags.FLAG_COVER_DISPLAY_OPT_IN, + Flags.FLAG_CURRENT_ANIMATOR_SCALE_USES_SHARED_MEMORY, + Flags.FLAG_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION, + Flags.FLAG_DEFER_RESUME_FOCUS_IN_NON_FOCUSED_WINDOW, + Flags.FLAG_DENSITY_390_API, + Flags.FLAG_DEPRECATE_SURFACE_ANIMATION_FRAME_CALLBACK, + Flags.FLAG_DEPRECATE_WINDOW_ANIMATOR_FRAME_CALLBACK, + Flags.FLAG_DIMMING_WALLPAPER_FOR_MAXIMIZED_AND_TILED, + Flags.FLAG_DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX, + Flags.FLAG_DISABLE_NON_RESIZABLE_APP_SNAP_RESIZING, + Flags.FLAG_DISABLE_RESTORE_NON_FULLSCREEN_BOUNDS_ON_CONFIGURATION_CHANGE, + Flags.FLAG_DO_NOT_FORCE_WALLPAPER_FOR_FREEFORM_TASK, + Flags.FLAG_ENABLE_ACCESSIBLE_CUSTOM_HEADERS, + Flags.FLAG_ENABLE_ACTIVITY_EMBEDDING_SUPPORT_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_APP_HANDLE_POSITION_REPORTING, + Flags.FLAG_ENABLE_APP_HEADER_WITH_TASK_DENSITY, + Flags.FLAG_ENABLE_APP_TO_WEB_EDUCATION_ANIMATION, + Flags.FLAG_ENABLE_AUTO_RESTART_ON_DISPLAY_MOVE, + Flags.FLAG_ENABLE_BACKUP_AND_RESTORE_DISPLAY_WINDOW_SETTINGS, + Flags.FLAG_ENABLE_BLOCK_NON_DESKTOP_DISPLAY_WINDOW_DRAG_BUGFIX, + Flags.FLAG_ENABLE_BORDER_SETTINGS, + Flags.FLAG_ENABLE_BOUNDS_RESTORING_ON_TILING_EXIT, + Flags.FLAG_ENABLE_BOX_SHADOW_SETTINGS, + Flags.FLAG_ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY, + Flags.FLAG_ENABLE_CAMERA_COMPAT_COMPATIBILITY_INFO_ROTATE_AND_CROP_BUGFIX, + Flags.FLAG_ENABLE_CAMERA_COMPAT_EXTERNAL_DISPLAY_ROTATION_BUGFIX, + Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING, + Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT, + Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT_API, + Flags.FLAG_ENABLE_CAMERA_COMPAT_SANDBOX_DISPLAY_ROTATION_ON_EXTERNAL_DISPLAYS_BUGFIX, + Flags.FLAG_ENABLE_CAMERA_COMPAT_TRACK_TASK_AND_APP_BUGFIX, + Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_CONVERSION, + Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION, + Flags.FLAG_ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS, + Flags.FLAG_ENABLE_CASCADING_WINDOWS, + Flags.FLAG_ENABLE_CLOSE_LID_INTERACTION, + Flags.FLAG_ENABLE_COMPAT_UI_DESKTOP_MODE_SYNCHRONIZATION_BUGFIX, + Flags.FLAG_ENABLE_COMPAT_UI_VISIBILITY_STATUS, + Flags.FLAG_ENABLE_COMPATUI_SYSUI_LAUNCHER_FIX, + Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_DND, + Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_PIP, + Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WALLPAPER_PRESENTATIONS, + Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG, + Flags.FLAG_ENABLE_CRASH_LOGGING_FOR_DESKTOP, + Flags.FLAG_ENABLE_CROSS_DISPLAYS_APP_LAUNCH_TRANSITION, + Flags.FLAG_ENABLE_CROSS_DISPLAYS_PIP_TASK_LAUNCH, + Flags.FLAG_ENABLE_DESKTOP_APP_HANDLE_ANIMATION, + Flags.FLAG_ENABLE_DESKTOP_APP_HEADER_STATE_CHANGE_ANNOUNCEMENTS, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_CLOSE_SHORTCUT_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_CLOSE_TASK_ANIMATION_IN_DTC_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DRAG_TO_MAXIMIZE, + Flags.FLAG_ENABLE_DESKTOP_FIRST_FULLSCREEN_REFOCUS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_FIRST_LISTENER, + Flags.FLAG_ENABLE_DESKTOP_FIRST_POLICY_IN_LPM, + Flags.FLAG_ENABLE_DESKTOP_FIRST_TOP_FULLSCREEN_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_IME_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_IMMERSIVE_DRAG_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_INDICATOR_IN_SEPARATE_THREAD_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_INVISIBLE_TASK_REMOVAL_CLEANUP_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION, + Flags.FLAG_ENABLE_DESKTOP_OPENING_DEEPLINK_MINIMIZE_ANIMATION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_SPLITSCREEN_TRANSITION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_LAUNCH_ANIMATION, + Flags.FLAG_ENABLE_DESKTOP_TAB_TEARING_MINIMIZE_ANIMATION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_TASK_LIMIT_SEPARATE_TRANSITION, + Flags.FLAG_ENABLE_DESKTOP_TASKBAR_ON_FREEFORM_DISPLAYS, + Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_HANDLE_EDUCATION, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION_INTEGRATION, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_ENTERPRISE_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_BY_MINIMIZE_TRANSITION_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_HSUM, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_IMMERSIVE_HANDLE_HIDING, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP_IN_OVERVIEW_BUGFIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SCVH_CACHE_BUG_FIX, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASK_LIMIT, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DEVICE_STATE_AUTO_ROTATE_SETTING_LOGGING, + Flags.FLAG_ENABLE_DEVICE_STATE_AUTO_ROTATE_SETTING_REFACTOR, + Flags.FLAG_ENABLE_DIALOG_DISPLAY_FIXES, + Flags.FLAG_ENABLE_DISPLAY_COMPAT_MODE, + Flags.FLAG_ENABLE_DISPLAY_DISCONNECT_INTERACTION, + Flags.FLAG_ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS, + Flags.FLAG_ENABLE_DISPLAY_RECONNECT_INTERACTION, + Flags.FLAG_ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING, + Flags.FLAG_ENABLE_DRAG_END_STABLE_BOUNDS_RESET, + Flags.FLAG_ENABLE_DRAG_RESIZE_SET_UP_IN_BG_THREAD, + Flags.FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX, + Flags.FLAG_ENABLE_DRAG_TO_MAXIMIZE, + Flags.FLAG_ENABLE_DRAGGING_PIP_ACROSS_DISPLAYS, + Flags.FLAG_ENABLE_DRAWING_APP_HANDLE, + Flags.FLAG_ENABLE_DREAM_ACTIVITY_WINDOWING_EXCLUSION, + Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX, + Flags.FLAG_ENABLE_EMPTY_DESK_ON_MINIMIZE, + Flags.FLAG_ENABLE_EXPERIMENTAL_BUBBLES_CONTROLLER, + Flags.FLAG_ENABLE_EXTERNAL_DISPLAY_PERSISTENCE_BUGFIX, + Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS, + Flags.FLAG_ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS, + Flags.FLAG_ENABLE_FULL_SCREEN_WINDOW_ON_REMOVING_SPLIT_SCREEN_STAGE_BUGFIX, + Flags.FLAG_ENABLE_FULLSCREEN_WINDOW_CONTROLS, + Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP, + Flags.FLAG_ENABLE_HANDLE_INPUT_FIX, + Flags.FLAG_ENABLE_HANDLERS_DEBUGGING_MODE, + Flags.FLAG_ENABLE_HOLD_TO_DRAG_APP_HANDLE, + Flags.FLAG_ENABLE_INDEPENDENT_BACK_IN_PROJECTED, + Flags.FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP, + Flags.FLAG_ENABLE_INPUT_LAYER_TRANSITION_FIX, + Flags.FLAG_ENABLE_INTERACTION_DEPENDENT_TAB_TEARING_BOUNDS, + Flags.FLAG_ENABLE_INTERACTIVE_PICTURE_IN_PICTURE, + Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_SYSUI, + Flags.FLAG_ENABLE_LAUNCHER_HANDLE_GO_HOME_KEYBOARD_SHORTCUT, + Flags.FLAG_ENABLE_MINIMIZE_BUTTON, + Flags.FLAG_ENABLE_MIRROR_DISPLAY_NO_ACTIVITY, + Flags.FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PERMISSION, + Flags.FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PLATFORM_SIGNATURE, + Flags.FLAG_ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT, + Flags.FLAG_ENABLE_MULTI_DISPLAY_HOME_FOCUS_BUG_FIX, + Flags.FLAG_ENABLE_MULTI_DISPLAY_SPLIT, + Flags.FLAG_ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE, + Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, + Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_DEFAULT_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS, + Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, + Flags.FLAG_ENABLE_NO_WINDOW_DECORATION_FOR_DESKS, + Flags.FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT, + Flags.FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX, + Flags.FLAG_ENABLE_OPAQUE_BACKGROUND_FOR_TRANSPARENT_WINDOWS, + Flags.FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS, + Flags.FLAG_ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_PER_DISPLAY_PACKAGE_CONTEXT_CACHE_IN_STATUSBAR_NOTIF, + Flags.FLAG_ENABLE_PER_DISPLAY_WINDOW_DECOR_VIEW_HOST_POOL, + Flags.FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU, + Flags.FLAG_ENABLE_PIP_PARAMS_UPDATE_NOTIFICATION_BUGFIX, + Flags.FLAG_ENABLE_PRESENTATION_DISALLOWED_ON_UNFOCUSED_HOST_TASK, + Flags.FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE, + Flags.FLAG_ENABLE_QUICKSWITCH_DESKTOP_SPLIT_BUGFIX, + Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION, + Flags.FLAG_ENABLE_REMOVE_STATUS_BAR_INPUT_LAYER, + Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_BUGFIX, + Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_REFACTOR, + Flags.FLAG_ENABLE_REQUEST_FULLSCREEN_RESTORE_FREEFORM_BUGFIX, + Flags.FLAG_ENABLE_RESIZING_METRICS, + Flags.FLAG_ENABLE_RESTART_MENU_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_RESTORE_TO_PREVIOUS_SIZE_FROM_DESKTOP_IMMERSIVE, + Flags.FLAG_ENABLE_SEE_THROUGH_TASK_FRAGMENTS, + Flags.FLAG_ENABLE_SHELL_INITIAL_BOUNDS_REGRESSION_BUG_FIX, + Flags.FLAG_ENABLE_SHRINK_WINDOW_BOUNDS_AFTER_DRAG, + Flags.FLAG_ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_START_LAUNCH_TRANSITION_FROM_TASKBAR_BUGFIX, + Flags.FLAG_ENABLE_SYS_DECORS_CALLBACKS_VIA_WM, + Flags.FLAG_ENABLE_TALL_APP_HEADERS, + Flags.FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS, + Flags.FLAG_ENABLE_TASK_STACK_OBSERVER_IN_SHELL, + Flags.FLAG_ENABLE_TASKBAR_CONNECTED_DISPLAYS, + Flags.FLAG_ENABLE_TASKBAR_OVERFLOW, + Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX, + Flags.FLAG_ENABLE_TASKBAR_RECENTS_LAYOUT_TRANSITION, + Flags.FLAG_ENABLE_THEMED_APP_HEADERS, + Flags.FLAG_ENABLE_TILE_RESIZING, + Flags.FLAG_ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING, + Flags.FLAG_ENABLE_TRANSITION_ON_ACTIVITY_SET_REQUESTED_ORIENTATION, + Flags.FLAG_ENABLE_UPDATED_DISPLAY_CONNECTION_DIALOG, + Flags.FLAG_ENABLE_UPSCALING_SIZE_COMPAT_ON_EXITING_DESKTOP_BUGFIX, + Flags.FLAG_ENABLE_VISUAL_INDICATOR_IN_TRANSITION_BUGFIX, + Flags.FLAG_ENABLE_WINDOW_CONTEXT_RESOURCES_UPDATE_ON_CONFIG_CHANGE, + Flags.FLAG_ENABLE_WINDOW_DECORATION_REFACTOR, + Flags.FLAG_ENABLE_WINDOW_DROP_SMOOTH_TRANSITION, + Flags.FLAG_ENABLE_WINDOW_REPOSITIONING_API, + Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, + Flags.FLAG_ENABLE_WINDOWING_EDGE_DRAG_RESIZE, + Flags.FLAG_ENABLE_WINDOWING_SCALED_RESIZING, + Flags.FLAG_ENABLE_WINDOWING_TASK_STACK_ORDER_BUGFIX, + Flags.FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS, + Flags.FLAG_ENFORCE_EDGE_TO_EDGE, + Flags.FLAG_ENSURE_KEYGUARD_DOES_TRANSITION_STARTING_BUG_FIX, + Flags.FLAG_ENSURE_WALLPAPER_DRAWN_ON_DISPLAY_SWITCH, + Flags.FLAG_ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS, + Flags.FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS, + Flags.FLAG_EXCLUDE_DESK_ROOTS_FROM_DESKTOP_TASKS, + Flags.FLAG_EXCLUDING_LAYER_FROM_TASK_SNAPSHOT, + Flags.FLAG_FALLBACK_TO_FOCUSED_DISPLAY, + Flags.FLAG_FALLBACK_TRANSITION_PLAYER, + Flags.FLAG_FIFO_PRIORITY_FOR_MAJOR_UI_PROCESSES, + Flags.FLAG_FIX_BAL_REPARENT_EXISTING_TASK, + Flags.FLAG_FIX_BUBBLE_TRAMPOLINE_ANIMATION, + Flags.FLAG_FIX_HIDE_OVERLAY_API, + Flags.FLAG_FIX_LEAKING_VISUAL_INDICATOR, + Flags.FLAG_FIX_RAPID_TOP_RESUMED_SWITCH, + Flags.FLAG_FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK, + Flags.FLAG_FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH, + Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS, + Flags.FLAG_HANDLE_INCOMPATIBLE_TASKS_IN_DESKTOP_LAUNCH_PARAMS, + Flags.FLAG_IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES, + Flags.FLAG_IGNORE_CORNER_RADIUS_AND_SHADOWS, + Flags.FLAG_IGNORE_CURRENT_PARAMS_IN_DESKTOP_LAUNCH_PARAMS, + Flags.FLAG_IGNORE_OVERRIDE_TASK_BOUNDS_IF_INCOMPATIBLE_WITH_DISPLAY, + Flags.FLAG_IME_BACK_CALLBACK_LEAK_PREVENTION, + Flags.FLAG_INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC, + Flags.FLAG_INHERIT_TASK_BOUNDS_FOR_TRAMPOLINE_TASK_LAUNCHES, + Flags.FLAG_JANK_API, + Flags.FLAG_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS, + Flags.FLAG_KEYGUARD_REMOVE_DEFAULT_DISPLAY_USAGE, + Flags.FLAG_LETTERBOX_BACKGROUND_WALLPAPER, + Flags.FLAG_LIMIT_SYSTEM_FULLSCREEN_OVERRIDE_TO_DEFAULT_DISPLAY, + Flags.FLAG_MIGRATE_BASIC_LEGACY_READY, + Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, + Flags.FLAG_MOVE_TO_NEXT_DISPLAY_SHORTCUT_WITH_PROJECTED_MODE, + Flags.FLAG_MULTI_CROP, + Flags.FLAG_MULTIPLE_SYSTEM_NAVIGATION_OBSERVER_CALLBACKS, + Flags.FLAG_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX, + Flags.FLAG_NO_ALPHA_ROTATION_ENTER_ANIMATION, + Flags.FLAG_OPT_OUT_OVERRIDE_ORIENTATION_TO_USER, + Flags.FLAG_PARALLEL_CD_TRANSITIONS_DURING_RECENTS, + Flags.FLAG_POLISH_CLOSE_WALLPAPER_INCLUDES_OPEN_CHANGE, + Flags.FLAG_PORT_WINDOW_SIZE_ANIMATION, + Flags.FLAG_PREDICTIVE_BACK_CALLBACK_CANCELLATION_FIX, + Flags.FLAG_PREDICTIVE_BACK_DELAY_WM_TRANSITION, + Flags.FLAG_PREDICTIVE_BACK_INTERCEPT_TRANSITION, + Flags.FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER, + Flags.FLAG_PREDICTIVE_BACK_STOP_KEYCODE_BACK_FORWARDING, + Flags.FLAG_PREDICTIVE_BACK_SWIPE_EDGE_NONE_API, + Flags.FLAG_PREDICTIVE_BACK_SYSTEM_OVERRIDE_CALLBACK, + Flags.FLAG_PREDICTIVE_BACK_TIMESTAMP_API, + Flags.FLAG_PRESERVE_RECENTS_TASK_CONFIGURATION_ON_RELAUNCH, + Flags.FLAG_REAR_DISPLAY_DISABLE_FORCE_DESKTOP_SYSTEM_DECORATIONS, + Flags.FLAG_REDUCE_CHANGED_EXCLUSION_RECTS_MSGS, + Flags.FLAG_REDUCE_TASK_SNAPSHOT_MEMORY_USAGE, + Flags.FLAG_REENABLE_APP_HANDLE_ANIMATIONS, + Flags.FLAG_REENABLE_APP_HANDLE_COLOR_ANIMATIONS, + Flags.FLAG_REFACTOR_MATCH_PARENT_BOUNDS, + Flags.FLAG_RELATIVE_INSETS, + Flags.FLAG_RELEASE_ALL_TRANSITION_SURFACES, + Flags.FLAG_REMOVE_DESK_ON_LAST_TASK_REMOVAL, + Flags.FLAG_REMOVE_GET_DIMMER, + Flags.FLAG_REPARENT_WINDOW_TOKEN_API, + Flags.FLAG_REPOSITORY_BASED_PERSISTENCE, + Flags.FLAG_REPOSITORY_BASED_PERSISTENCE_BG_THREAD, + Flags.FLAG_RESPECT_FULLSCREEN_ACTIVITY_OPTION_IN_DESKTOP_LAUNCH_PARAMS, + Flags.FLAG_RESPECT_ORIENTATION_CHANGE_FOR_UNRESIZEABLE, + Flags.FLAG_RESPECT_REQUESTED_TASK_SNAPSHOT_RESOLUTION, + Flags.FLAG_RESTORE_USER_ASPECT_RATIO_SETTINGS_USING_SERVICE, + Flags.FLAG_RESTRICT_FREEFORM_HIDDEN_SYSTEM_BARS_TO_FILLING_TASKS, + Flags.FLAG_RETURN_ALL_VISIBLE_ACTIVITIES_FOR_VIS, + Flags.FLAG_ROOT_TASK_FOR_BUBBLE, + Flags.FLAG_SAFE_REGION_LETTERBOXING_V1, + Flags.FLAG_SCREEN_RECORDING_CALLBACKS, + Flags.FLAG_SCROLLING_FROM_LETTERBOX, + Flags.FLAG_SCVH_SET_FOCUSABLE, + Flags.FLAG_SCVH_SURFACE_CONTROL_LIFETIME_FIX, + Flags.FLAG_SDK_DESIRED_PRESENT_TIME, + Flags.FLAG_SET_SC_PROPERTIES_IN_CLIENT, + Flags.FLAG_SHOW_APP_HANDLE_LARGE_SCREENS, + Flags.FLAG_SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_MESSAGE, + Flags.FLAG_SHOW_DESKTOP_EXPERIENCE_DEV_OPTION, + Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION, + Flags.FLAG_SHOW_HOME_BEHIND_DESKTOP, + Flags.FLAG_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE, + Flags.FLAG_SKIP_DEACTIVATION_OF_DESK_WITH_NOTHING_IN_FRONT, + Flags.FLAG_SKIP_DECOR_VIEW_RELAYOUT_WHEN_CLOSING_BUGFIX, + Flags.FLAG_SUPPORT_GEMINI_ON_MULTI_DISPLAY, + Flags.FLAG_SYSTEM_CONTENT_PRIORITY, + Flags.FLAG_SYSTEM_UI_POST_ANIMATION_END, + Flags.FLAG_TASK_FRAGMENT_COMPANION_ACTIVITY, + Flags.FLAG_TASKBAR_RUNNING_TASKS_IN_SPLITSCREEN_SELECT, + Flags.FLAG_TOGGLE_FULLSCREEN_STATE_VIA_FULLSCREEN_KEY, + Flags.FLAG_TOUCH_PASS_THROUGH_OPT_IN, + Flags.FLAG_TRANSFER_STARTING_WINDOW_TO_NEXT_WHEN_INVISIBLE, + Flags.FLAG_TRANSIT_READY_TRACKING, + Flags.FLAG_TRANSIT_TRACKER_PLUMBING, + Flags.FLAG_TRANSITION_HANDLER_CUJ_TAGS, + Flags.FLAG_UNIFY_SHELL_BINDERS, + Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT, + Flags.FLAG_UNTRUSTED_EMBEDDING_ANY_APP_PERMISSION, + Flags.FLAG_UNTRUSTED_EMBEDDING_STATE_SHARING, + Flags.FLAG_UPDATE_DIMS_WHEN_WINDOW_SHOWN, + Flags.FLAG_UPDATE_TASK_CROP_IN_SYNC, + Flags.FLAG_USE_INPUT_REPORTED_FOCUS_FOR_ACCESSIBILITY, + Flags.FLAG_VDM_FORCE_APP_UNIVERSAL_RESIZABLE_API, + Flags.FLAG_WAIT_FOR_PRESENT_FENCE_ON_DISPLAY_SWITCH, + "" + ) ); } diff --git a/flags/src/com/android/window/flags2/FakeFeatureFlagsImpl.java b/flags/src/com/android/window/flags2/FakeFeatureFlagsImpl.java index 3fd351436e7..ab1b1d0c4e3 100644 --- a/flags/src/com/android/window/flags2/FakeFeatureFlagsImpl.java +++ b/flags/src/com/android/window/flags2/FakeFeatureFlagsImpl.java @@ -3,11 +3,11 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Predicate; - /** @hide */ public class FakeFeatureFlagsImpl extends CustomFeatureFlags { private final Map mFlagMap = new HashMap<>(); private final FeatureFlags mDefaults; + private final boolean IS_EXPORTED = false; public FakeFeatureFlagsImpl() { this(null); @@ -35,7 +35,7 @@ protected boolean getValue(String flagName, Predicate getter) { } public void setFlag(String flagName, boolean value) { - if (!this.mFlagMap.containsKey(flagName)) { + if (!this.mFlagMap.containsKey(flagName) && !IS_EXPORTED) { throw new IllegalArgumentException("no such flag " + flagName); } this.mFlagMap.put(flagName, value); diff --git a/flags/src/com/android/window/flags2/FeatureFlags.java b/flags/src/com/android/window/flags2/FeatureFlags.java index bba4aabe121..c2a5d93499f 100644 --- a/flags/src/com/android/window/flags2/FeatureFlags.java +++ b/flags/src/com/android/window/flags2/FeatureFlags.java @@ -1,214 +1,1390 @@ package com.android.window.flags2; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + /** @hide */ public interface FeatureFlags { - - boolean activityEmbeddingAnimationCustomizationFlag(); - + + + + boolean activityEmbeddingAbortCrossUidLaunchInFinishingTaskFragment(); + + + + boolean activityEmbeddingDelayTaskFragmentFinishForActivityLaunch(); + + + boolean activityEmbeddingInteractiveDividerFlag(); - - boolean activityEmbeddingOverlayPresentationFlag(); - - boolean activitySnapshotByDefault(); - - boolean activityWindowInfoFlag(); - + + + + boolean activityEmbeddingMetrics(); + + + boolean allowDisableActivityRecordInputSink(); - - boolean allowHideScmButton(); - - boolean allowsScreenSizeDecoupledFromStatusBarAndCutout(); - - boolean alwaysDeferTransitionWhenApplyWct(); - + + + boolean alwaysDrawMagnificationFullscreenBorder(); - + + + + boolean alwaysSeqIdLayout(); + + + + boolean alwaysSeqIdLayoutWear(); + + + boolean alwaysUpdateWallpaperPermission(); - + + + + boolean aodTransition(); + + + boolean appCompatPropertiesApi(); - + + + boolean appCompatRefactoring(); - + + + + boolean appCompatRefactoringFixMultiwindowTaskHierarchy(); + + + + boolean appCompatRefactoringForceChangeForLetterboxTransitions(); + + + + boolean appCompatRefactoringRoundedCorners(); + + + + boolean appCompatRefactoringRoundedCornersAnimation(); + + + + boolean appCompatRefactoringSetAppboundsToNullWhenEmpty(); + + + + boolean appCompatRefactoringSkipStartingWindowLetterbox(); + + + + boolean appCompatRefactoringUseActivityLeashForLetterboxing(); + + + + boolean appCompatUiFramework(); + + + + boolean appHandleNoRelayoutOnExclusionChange(); + + + + boolean applyDeskActivationOnUserSwitch(); + + + + boolean applyLifecycleOnPipChange(); + + + + boolean avoidRebindingIntentionallyDisconnectedWallpaper(); + + + + boolean backupAndRestoreForUserAspectRatioSettings(); + + + + boolean balAdditionalStartModes(); + + + + boolean balCheckBroadcastWhenDispatched(); + + + + boolean balCoverIntentSender(); + + + boolean balDontBringExistingBackgroundTaskStackToFg(); - - boolean balImproveRealCallerVisibilityCheck(); - - boolean balImprovedMetrics(); - - boolean balRequireOptInByPendingIntentCreator(); - - boolean balRequireOptInSameUid(); - + + + + boolean balReduceGracePeriod(); + + + + boolean balReportAbortedActivityStarts(); + + + boolean balRespectAppSwitchStateWhenCheckBoundByForegroundUid(); - - boolean balShowToasts(); - - boolean balShowToastsBlocked(); - - boolean blastSyncNotificationShadeOnDisplaySwitch(); - - boolean bundleClientTransactionFlag(); - - boolean cameraCompatForFreeform(); - + + + + boolean balSendIntentWithOptions(); + + + + boolean balStrictModeRo(); + + + + boolean cameraCompatFullscreenPickSameTaskActivity(); + + + + boolean cameraCompatLandscapeCameraSupport(); + + + + boolean cameraCompatUnifyCameraPolicies(); + + + + boolean clearReusableScvhOnRelease(); + + + + boolean closeFullscreenAndSplitscreenKeyboardShortcut(); + + + + boolean closeTaskKeyboardShortcut(); + + + boolean closeToSquareConfigIncludesStatusBar(); - - boolean configurableFontScaleDefault(); - + + + boolean coverDisplayOptIn(); - - boolean deferDisplayUpdates(); - - boolean delayNotificationToMagnificationWhenRecentsWindowToFrontTransition(); - - boolean delegateUnhandledDrags(); - - boolean deleteCaptureDisplay(); - + + + + boolean currentAnimatorScaleUsesSharedMemory(); + + + + boolean defaultDeskWithoutWarmupMigration(); + + + + boolean deferResumeFocusInNonFocusedWindow(); + + + boolean density390Api(); - - boolean disableObjectPool(); - - boolean disableThinLetterboxingPolicy(); - - boolean doNotCheckIntersectionWhenNonMagnifiableWindowTransitions(); - - boolean drawSnapshotAspectRatioMatch(); - - boolean edgeToEdgeByDefault(); - - boolean embeddedActivityBackNavFlag(); - - boolean enableAdditionalWindowsAboveStatusBar(); - + + + + boolean deprecateSurfaceAnimationFrameCallback(); + + + + boolean deprecateWindowAnimatorFrameCallback(); + + + + boolean dimmingWallpaperForMaximizedAndTiled(); + + + + boolean disableDesktopLaunchParamsOutsideDesktopBugFix(); + + + + boolean disableNonResizableAppSnapResizing(); + + + + boolean disableRestoreNonFullscreenBoundsOnConfigurationChange(); + + + + boolean doNotForceWallpaperForFreeformTask(); + + + + boolean enableAccessibleCustomHeaders(); + + + + boolean enableActivityEmbeddingSupportForConnectedDisplays(); + + + + boolean enableAppHandlePositionReporting(); + + + boolean enableAppHeaderWithTaskDensity(); - - boolean enableBufferTransformHintFromDisplay(); - + + + + boolean enableAppToWebEducationAnimation(); + + + + boolean enableAutoRestartOnDisplayMove(); + + + + boolean enableBackupAndRestoreDisplayWindowSettings(); + + + + boolean enableBlockNonDesktopDisplayWindowDragBugfix(); + + + + boolean enableBorderSettings(); + + + + boolean enableBoundsRestoringOnTilingExit(); + + + + boolean enableBoxShadowSettings(); + + + + boolean enableBugFixesForSecondaryDisplay(); + + + + boolean enableCameraCompatCompatibilityInfoRotateAndCropBugfix(); + + + + boolean enableCameraCompatExternalDisplayRotationBugfix(); + + + boolean enableCameraCompatForDesktopWindowing(); - - boolean enableCompatuiSysuiLauncher(); - - boolean enableDesktopWindowingImmersiveHandleHiding(); - - boolean enableDesktopWindowingModalsPolicy(); - - boolean enableDesktopWindowingMode(); - - boolean enableDesktopWindowingQuickSwitch(); - - boolean enableDesktopWindowingScvhCache(); - - boolean enableDesktopWindowingSizeConstraints(); - - boolean enableDesktopWindowingTaskLimit(); - - boolean enableDesktopWindowingTaskbarRunningApps(); - - boolean enableDesktopWindowingWallpaperActivity(); - - boolean enableScaledResizing(); - - boolean enableTaskStackObserverInShell(); - - boolean enableThemedAppHeaders(); - - boolean enableWindowingDynamicInitialBounds(); - - boolean enableWindowingEdgeDragResize(); - - boolean enableWmExtensionsForAllFlag(); - - boolean enforceEdgeToEdge(); - - boolean ensureWallpaperInTransitions(); - - boolean explicitRefreshRateHints(); - - boolean fifoPriorityForMajorUiProcesses(); - - boolean fixNoContainerUpdateWithoutResize(); - - boolean fixPipRestoreToOverlay(); - - boolean fullscreenDimFlag(); - - boolean getDimmerOnClosing(); - - boolean immersiveAppRepositioning(); - - boolean insetsControlChangedItem(); - - boolean insetsControlSeq(); - - boolean insetsDecoupledConfiguration(); - - boolean introduceSmootherDimmer(); - - boolean keyguardAppearTransition(); - - boolean letterboxBackgroundWallpaper(); - - boolean movableCutoutConfiguration(); - - boolean moveAnimationOptionsToChange(); - - boolean multiCrop(); - - boolean navBarTransparentByDefault(); - - boolean noConsecutiveVisibilityEvents(); - - boolean noVisibilityEventOnDisplayStateChange(); - - boolean offloadColorExtraction(); - - boolean predictiveBackSystemAnims(); - - boolean rearDisplayDisableForceDesktopSystemDecorations(); - - boolean releaseSnapshotAggressively(); - - boolean removePrepareSurfaceInPlacement(); - - boolean screenRecordingCallbacks(); - - boolean sdkDesiredPresentTime(); - - boolean secureWindowState(); - - boolean setScPropertiesInClient(); - - boolean skipSleepingWhenSwitchingDisplay(); - - boolean supportsMultiInstanceSystemUi(); - - boolean surfaceControlInputReceiver(); - - boolean surfaceTrustedOverlay(); - - boolean syncScreenCapture(); - - boolean taskFragmentSystemOrganizerFlag(); - - boolean transitReadyTracking(); - - boolean trustedPresentationListenerForWindow(); - - boolean untrustedEmbeddingAnyAppPermission(); - - boolean untrustedEmbeddingStateSharing(); - - boolean useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds(); - - boolean userMinAspectRatioAppDefault(); - - boolean waitForTransitionOnDisplaySwitch(); - - boolean wallpaperOffsetAsync(); - - boolean windowSessionRelayoutInfo(); - - boolean windowTokenConfigThreadSafe(); + + + + boolean enableCameraCompatForDesktopWindowingOptOut(); + + + + boolean enableCameraCompatForDesktopWindowingOptOutApi(); + + + + boolean enableCameraCompatSandboxDisplayRotationOnExternalDisplaysBugfix(); + + + + boolean enableCameraCompatTrackTaskAndAppBugfix(); + + + + boolean enableCaptionCompatInsetConversion(); + + + + boolean enableCaptionCompatInsetForceConsumption(); + + + + boolean enableCaptionCompatInsetForceConsumptionAlways(); + + + + boolean enableCascadingWindows(); + + + + boolean enableCloseLidInteraction(); + + + + boolean enableCompatUiDesktopModeSynchronizationBugfix(); + + + + boolean enableCompatUiVisibilityStatus(); + + + + boolean enableCompatuiSysuiLauncherFix(); + + + + boolean enableConnectedDisplaysDnd(); + + + + boolean enableConnectedDisplaysPip(); + + + + boolean enableConnectedDisplaysWallpaperPresentations(); + + + + boolean enableConnectedDisplaysWindowDrag(); + + + + boolean enableCrashLoggingForDesktop(); + + + + boolean enableCrossDisplaysAppLaunchTransition(); + + + + boolean enableCrossDisplaysPipTaskLaunch(); + + + + boolean enableDesktopAppHandleAnimation(); + + + + boolean enableDesktopAppHeaderStateChangeAnnouncements(); + + + + boolean enableDesktopAppLaunchAlttabTransitions(); + + + + boolean enableDesktopAppLaunchAlttabTransitionsBugfix(); + + + + boolean enableDesktopAppLaunchBugfix(); + + + + boolean enableDesktopAppLaunchTransitions(); + + + + boolean enableDesktopAppLaunchTransitionsBugfix(); + + + + boolean enableDesktopCloseShortcutBugfix(); + + + + boolean enableDesktopCloseTaskAnimationInDtcBugfix(); + + + + boolean enableDesktopFirstBasedDefaultToDesktopBugfix(); + + + + boolean enableDesktopFirstBasedDragToMaximize(); + + + + boolean enableDesktopFirstFullscreenRefocusBugfix(); + + + + boolean enableDesktopFirstListener(); + + + + boolean enableDesktopFirstPolicyInLpm(); + + + + boolean enableDesktopFirstTopFullscreenBugfix(); + + + + boolean enableDesktopImeBugfix(); + + + + boolean enableDesktopImmersiveDragBugfix(); + + + + boolean enableDesktopIndicatorInSeparateThreadBugfix(); + + + + boolean enableDesktopInvisibleTaskRemovalCleanupBugfix(); + + + + boolean enableDesktopModeThroughDevOption(); + + + + boolean enableDesktopOpeningDeeplinkMinimizeAnimationBugfix(); + + + + boolean enableDesktopRecentsTransitionsCornersBugfix(); + + + + boolean enableDesktopSplitscreenTransitionBugfix(); + + + + boolean enableDesktopSystemDialogsTransitions(); + + + + boolean enableDesktopTabTearingLaunchAnimation(); + + + + boolean enableDesktopTabTearingMinimizeAnimationBugfix(); + + + + boolean enableDesktopTaskLimitSeparateTransition(); + + + + boolean enableDesktopTaskbarOnFreeformDisplays(); + + + + boolean enableDesktopTrampolineCloseAnimationBugfix(); + + + + boolean enableDesktopWallpaperActivityForSystemUser(); + + + + boolean enableDesktopWindowingAppHandleEducation(); + + + + boolean enableDesktopWindowingAppToWeb(); + + + + boolean enableDesktopWindowingAppToWebEducation(); + + + + boolean enableDesktopWindowingAppToWebEducationIntegration(); + + + + boolean enableDesktopWindowingBackNavigation(); + + + + boolean enableDesktopWindowingEnterTransitionBugfix(); + + + + boolean enableDesktopWindowingEnterTransitions(); + + + + boolean enableDesktopWindowingEnterpriseBugfix(); + + + + boolean enableDesktopWindowingExitByMinimizeTransitionBugfix(); + + + + boolean enableDesktopWindowingExitTransitions(); + + + + boolean enableDesktopWindowingExitTransitionsBugfix(); + + + + boolean enableDesktopWindowingHsum(); + + + + boolean enableDesktopWindowingImmersiveHandleHiding(); + + + + boolean enableDesktopWindowingModalsPolicy(); + + + + boolean enableDesktopWindowingMode(); + + + + boolean enableDesktopWindowingMultiInstanceFeatures(); + + + + boolean enableDesktopWindowingPersistence(); + + + + boolean enableDesktopWindowingPip(); + + + + boolean enableDesktopWindowingPipInOverviewBugfix(); + + + + boolean enableDesktopWindowingQuickSwitch(); + + + + boolean enableDesktopWindowingScvhCacheBugFix(); + + + + boolean enableDesktopWindowingSizeConstraints(); + + + + boolean enableDesktopWindowingTaskLimit(); + + + + boolean enableDesktopWindowingTaskbarRunningApps(); + + + + boolean enableDesktopWindowingTransitions(); + + + + boolean enableDesktopWindowingWallpaperActivity(); + + + + boolean enableDeviceStateAutoRotateSettingLogging(); + + + + boolean enableDeviceStateAutoRotateSettingRefactor(); + + + + boolean enableDialogDisplayFixes(); + + + + boolean enableDisplayCompatMode(); + + + + boolean enableDisplayDisconnectInteraction(); + + + + boolean enableDisplayFocusInShellTransitions(); + + + + boolean enableDisplayReconnectInteraction(); + + + + boolean enableDisplayWindowingModeSwitching(); + + + + boolean enableDragEndStableBoundsReset(); + + + + boolean enableDragResizeSetUpInBgThread(); + + + + boolean enableDragToDesktopIncomingTransitionsBugfix(); + + + + boolean enableDragToMaximize(); + + + + boolean enableDraggingPipAcrossDisplays(); + + + + boolean enableDrawingAppHandle(); + + + + boolean enableDreamActivityWindowingExclusion(); + + + + boolean enableDynamicRadiusComputationBugfix(); + + + + boolean enableEmptyDeskOnMinimize(); + + + + boolean enableExperimentalBubblesController(); + + + + boolean enableExternalDisplayPersistenceBugfix(); + + + + boolean enableFreeformBoxShadows(); + + + + boolean enableFreeformDisplayLaunchParams(); + + + + boolean enableFullScreenWindowOnRemovingSplitScreenStageBugfix(); + + + + boolean enableFullscreenWindowControls(); + + + + boolean enableFullyImmersiveInDesktop(); + + + + boolean enableHandleInputFix(); + + + + boolean enableHandlersDebuggingMode(); + + + + boolean enableHoldToDragAppHandle(); + + + + boolean enableIndependentBackInProjected(); + + + + boolean enableInorderTransitionCallbacksForDesktop(); + + + + boolean enableInputLayerTransitionFix(); + + + + boolean enableInteractionDependentTabTearingBounds(); + + + + boolean enableInteractivePictureInPicture(); + + + + boolean enableKeyGestureHandlerForSysui(); + + + + boolean enableLauncherHandleGoHomeKeyboardShortcut(); + + + + boolean enableMinimizeButton(); + + + + boolean enableMirrorDisplayNoActivity(); + + + + boolean enableModalsFullscreenWithPermission(); + + + + boolean enableModalsFullscreenWithPlatformSignature(); + + + + boolean enableMoveToNextDisplayShortcut(); + + + + boolean enableMultiDisplayHomeFocusBugFix(); + + + + boolean enableMultiDisplaySplit(); + + + + boolean enableMultidisplayTrackpadBackGesture(); + + + + boolean enableMultipleDesktopsBackend(); + + + + boolean enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays(); + + + + boolean enableMultipleDesktopsFrontend(); + + + + boolean enableNoWindowDecorationForDesks(); + + + + boolean enableNonDefaultDisplaySplit(); + + + + boolean enableNonDefaultDisplaySplitBugfix(); + + + + boolean enableOpaqueBackgroundForTransparentWindows(); + + + + boolean enableOverflowButtonForTaskbarPinnedItems(); + + + + boolean enablePerDisplayDesktopWallpaperActivity(); + + + + boolean enablePerDisplayPackageContextCacheInStatusbarNotif(); + + + + boolean enablePerDisplayWindowDecorViewHostPool(); + + + + boolean enablePersistingDisplaySizeForConnectedDisplays(); + + + + boolean enablePinningAppWithContextMenu(); + + + + boolean enablePipParamsUpdateNotificationBugfix(); + + + + boolean enablePresentationDisallowedOnUnfocusedHostTask(); + + + + boolean enablePresentationForConnectedDisplays(); + + + + boolean enableProjectedDisplayDesktopMode(); + + + + boolean enableQuickswitchDesktopSplitBugfix(); + + + + boolean enableRejectHomeTransition(); + + + + boolean enableRemoveStatusBarInputLayer(); + + + + boolean enableRequestFullscreenBugfix(); + + + + boolean enableRequestFullscreenRefactor(); + + + + boolean enableRequestFullscreenRestoreFreeformBugfix(); + + + + boolean enableResizingMetrics(); + + + + boolean enableRestartMenuForConnectedDisplays(); + + + + boolean enableRestoreToPreviousSizeFromDesktopImmersive(); + + + + boolean enableSeeThroughTaskFragments(); + + + + boolean enableShellInitialBoundsRegressionBugFix(); + + + + boolean enableShrinkWindowBoundsAfterDrag(); + + + + boolean enableSizeCompatModeImprovementsForConnectedDisplays(); + + + + boolean enableStartLaunchTransitionFromTaskbarBugfix(); + + + + boolean enableSysDecorsCallbacksViaWm(); + + + + boolean enableTallAppHeaders(); + + + + boolean enableTaskResizingKeyboardShortcuts(); + + + + boolean enableTaskStackObserverInShell(); + + + + boolean enableTaskbarConnectedDisplays(); + + + + boolean enableTaskbarOverflow(); + + + + boolean enableTaskbarRecentTasksThrottleBugfix(); + + + + boolean enableTaskbarRecentsLayoutTransition(); + + + + boolean enableThemedAppHeaders(); + + + + boolean enableTileResizing(); + + + + boolean enableTopVisibleRootTaskPerUserTracking(); + + + + boolean enableTransitionOnActivitySetRequestedOrientation(); + + + + boolean enableUpdatedDisplayConnectionDialog(); + + + + boolean enableUpscalingSizeCompatOnExitingDesktopBugfix(); + + + + boolean enableVisualIndicatorInTransitionBugfix(); + + + + boolean enableWindowContextResourcesUpdateOnConfigChange(); + + + + boolean enableWindowDecorationRefactor(); + + + + boolean enableWindowDropSmoothTransition(); + + + + boolean enableWindowRepositioningApi(); + + + + boolean enableWindowingDynamicInitialBounds(); + + + + boolean enableWindowingEdgeDragResize(); + + + + boolean enableWindowingScaledResizing(); + + + + boolean enableWindowingTaskStackOrderBugfix(); + + + + boolean enableWindowingTransitionHandlersObservers(); + + + + boolean enforceEdgeToEdge(); + + + + boolean ensureKeyguardDoesTransitionStartingBugFix(); + + + + boolean ensureWallpaperDrawnOnDisplaySwitch(); + + + + boolean enterDesktopByDefaultOnFreeformDisplays(); + + + + boolean excludeCaptionFromAppBounds(); + + + + boolean excludeDeskRootsFromDesktopTasks(); + + + + boolean excludingLayerFromTaskSnapshot(); + + + + boolean fallbackToFocusedDisplay(); + + + + boolean fallbackTransitionPlayer(); + + + + boolean fifoPriorityForMajorUiProcesses(); + + + + boolean fixBalReparentExistingTask(); + + + + boolean fixBubbleTrampolineAnimation(); + + + + boolean fixHideOverlayApi(); + + + + boolean fixLeakingVisualIndicator(); + + + + boolean fixRapidTopResumedSwitch(); + + + + boolean forceCloseTopTransparentFullscreenTask(); + + + + boolean formFactorBasedDesktopFirstSwitch(); + + + + boolean grantManageKeyGesturesToRecents(); + + + + boolean handleIncompatibleTasksInDesktopLaunchParams(); + + + + boolean ignoreAspectRatioRestrictionsForResizeableFreeformActivities(); + + + + boolean ignoreCornerRadiusAndShadows(); + + + + boolean ignoreCurrentParamsInDesktopLaunchParams(); + + + + boolean ignoreOverrideTaskBoundsIfIncompatibleWithDisplay(); + + + + boolean imeBackCallbackLeakPrevention(); + + + + boolean includeTopTransparentFullscreenTaskInDesktopHeuristic(); + + + + boolean inheritTaskBoundsForTrampolineTaskLaunches(); + + + + boolean jankApi(); + + + + boolean keyboardShortcutsToSwitchDesks(); + + + + boolean keyguardRemoveDefaultDisplayUsage(); + + + + boolean letterboxBackgroundWallpaper(); + + + + boolean limitSystemFullscreenOverrideToDefaultDisplay(); + + + + boolean migrateBasicLegacyReady(); + + + + boolean moveToExternalDisplayShortcut(); + + + + boolean moveToNextDisplayShortcutWithProjectedMode(); + + + + boolean multiCrop(); + + + + boolean multipleSystemNavigationObserverCallbacks(); + + + + boolean nestedTasksWithIndependentBoundsBugfix(); + + + + boolean noAlphaRotationEnterAnimation(); + + + + boolean optOutOverrideOrientationToUser(); + + + + boolean parallelCdTransitionsDuringRecents(); + + + + boolean polishCloseWallpaperIncludesOpenChange(); + + + + boolean portWindowSizeAnimation(); + + + + boolean predictiveBackCallbackCancellationFix(); + + + + boolean predictiveBackDelayWmTransition(); + + + + boolean predictiveBackInterceptTransition(); + + + + boolean predictiveBackPrioritySystemNavigationObserver(); + + + + boolean predictiveBackStopKeycodeBackForwarding(); + + + + boolean predictiveBackSwipeEdgeNoneApi(); + + + + boolean predictiveBackSystemOverrideCallback(); + + + + boolean predictiveBackTimestampApi(); + + + + boolean preserveRecentsTaskConfigurationOnRelaunch(); + + + + boolean rearDisplayDisableForceDesktopSystemDecorations(); + + + + boolean reduceChangedExclusionRectsMsgs(); + + + + boolean reduceTaskSnapshotMemoryUsage(); + + + + boolean reenableAppHandleAnimations(); + + + + boolean reenableAppHandleColorAnimations(); + + + + boolean refactorMatchParentBounds(); + + + + boolean relativeInsets(); + + + + boolean releaseAllTransitionSurfaces(); + + + + boolean removeDeskOnLastTaskRemoval(); + + + + boolean removeGetDimmer(); + + + + boolean reparentWindowTokenApi(); + + + + boolean repositoryBasedPersistence(); + + + + boolean repositoryBasedPersistenceBgThread(); + + + + boolean respectFullscreenActivityOptionInDesktopLaunchParams(); + + + + boolean respectOrientationChangeForUnresizeable(); + + + + boolean respectRequestedTaskSnapshotResolution(); + + + + boolean restoreUserAspectRatioSettingsUsingService(); + + + + boolean restrictFreeformHiddenSystemBarsToFillingTasks(); + + + + boolean returnAllVisibleActivitiesForVis(); + + + + boolean rootTaskForBubble(); + + + + boolean safeRegionLetterboxingV1(); + + + + boolean screenRecordingCallbacks(); + + + + boolean scrollingFromLetterbox(); + + + + boolean scvhSetFocusable(); + + + + boolean scvhSurfaceControlLifetimeFix(); + + + + boolean sdkDesiredPresentTime(); + + + + boolean setScPropertiesInClient(); + + + + boolean showAppHandleLargeScreens(); + + + + boolean showBiometricPromptSecondaryDisplayMessage(); + + + + boolean showDesktopExperienceDevOption(); + + + + boolean showDesktopWindowingDevOption(); + + + + boolean showHomeBehindDesktop(); + + + + boolean skipCompatUiEducationInDesktopMode(); + + + + boolean skipDeactivationOfDeskWithNothingInFront(); + + + + boolean skipDecorViewRelayoutWhenClosingBugfix(); + + + + boolean supportGeminiOnMultiDisplay(); + + + + boolean systemContentPriority(); + + + + boolean systemUiPostAnimationEnd(); + + + + boolean taskFragmentCompanionActivity(); + + + + boolean taskbarRunningTasksInSplitscreenSelect(); + + + + boolean toggleFullscreenStateViaFullscreenKey(); + + + + boolean touchPassThroughOptIn(); + + + + boolean transferStartingWindowToNextWhenInvisible(); + + + + boolean transitReadyTracking(); + + + + boolean transitTrackerPlumbing(); + + + + boolean transitionHandlerCujTags(); + + + + boolean unifyShellBinders(); + + + + boolean universalResizableByDefault(); + + + + boolean untrustedEmbeddingAnyAppPermission(); + + + + boolean untrustedEmbeddingStateSharing(); + + + + boolean updateDimsWhenWindowShown(); + + + + boolean updateTaskCropInSync(); + + + + boolean useInputReportedFocusForAccessibility(); + + + + boolean vdmForceAppUniversalResizableApi(); + + + + boolean waitForPresentFenceOnDisplaySwitch(); } diff --git a/flags/src/com/android/window/flags2/FeatureFlagsImpl.java b/flags/src/com/android/window/flags2/FeatureFlagsImpl.java index 56df1ad9a19..7ae519f673a 100644 --- a/flags/src/com/android/window/flags2/FeatureFlagsImpl.java +++ b/flags/src/com/android/window/flags2/FeatureFlagsImpl.java @@ -1,1638 +1,2427 @@ package com.android.window.flags2; -// TODO(b/303773055): Remove the annotation after access issue is resolved. -import com.android.quickstep.util.DeviceConfigHelper; - -import java.nio.file.Files; -import java.nio.file.Paths; /** @hide */ public final class FeatureFlagsImpl implements FeatureFlags { - private static final boolean isReadFromNew = Files.exists(Paths.get("/metadata/aconfig/boot/enable_only_new_storage")); - private static volatile boolean isCached = false; - private static volatile boolean accessibility_is_cached = false; - private static volatile boolean large_screen_experiences_app_compat_is_cached = false; - private static volatile boolean lse_desktop_experience_is_cached = false; - private static volatile boolean multitasking_is_cached = false; - private static volatile boolean responsible_apis_is_cached = false; - private static volatile boolean systemui_is_cached = false; - private static volatile boolean wear_frameworks_is_cached = false; - private static volatile boolean window_surfaces_is_cached = false; - private static volatile boolean windowing_frontend_is_cached = false; - private static volatile boolean windowing_sdk_is_cached = false; - private static boolean activityEmbeddingAnimationCustomizationFlag = false; - private static boolean activityEmbeddingInteractiveDividerFlag = true; - private static boolean activityEmbeddingOverlayPresentationFlag = true; - private static boolean allowHideScmButton = true; - private static boolean alwaysDeferTransitionWhenApplyWct = true; - private static boolean alwaysDrawMagnificationFullscreenBorder = true; - private static boolean alwaysUpdateWallpaperPermission = true; - private static boolean balDontBringExistingBackgroundTaskStackToFg = true; - private static boolean balImproveRealCallerVisibilityCheck = true; - private static boolean balImprovedMetrics = true; - private static boolean balRequireOptInByPendingIntentCreator = true; - private static boolean balRequireOptInSameUid = false; - private static boolean balRespectAppSwitchStateWhenCheckBoundByForegroundUid = true; - private static boolean balShowToasts = false; - private static boolean balShowToastsBlocked = true; - private static boolean blastSyncNotificationShadeOnDisplaySwitch = true; - private static boolean closeToSquareConfigIncludesStatusBar = false; - private static boolean delayNotificationToMagnificationWhenRecentsWindowToFrontTransition = true; - private static boolean disableThinLetterboxingPolicy = true; - private static boolean doNotCheckIntersectionWhenNonMagnifiableWindowTransitions = true; - private static boolean edgeToEdgeByDefault = false; - private static boolean embeddedActivityBackNavFlag = true; - private static boolean enableAdditionalWindowsAboveStatusBar = false; - private static boolean enableAppHeaderWithTaskDensity = true; - private static boolean enableCameraCompatForDesktopWindowing = true; - private static boolean enableCompatuiSysuiLauncher = false; - private static boolean enableDesktopWindowingImmersiveHandleHiding = false; - private static boolean enableDesktopWindowingModalsPolicy = true; - private static boolean enableDesktopWindowingMode = false; - private static boolean enableDesktopWindowingQuickSwitch = false; - private static boolean enableDesktopWindowingScvhCache = false; - private static boolean enableDesktopWindowingSizeConstraints = false; - private static boolean enableDesktopWindowingTaskLimit = true; - private static boolean enableDesktopWindowingTaskbarRunningApps = true; - private static boolean enableDesktopWindowingWallpaperActivity = false; - private static boolean enableTaskStackObserverInShell = true; - private static boolean enableThemedAppHeaders = true; - private static boolean enableWindowingDynamicInitialBounds = false; - private static boolean enableWindowingEdgeDragResize = false; - private static boolean ensureWallpaperInTransitions = false; - private static boolean fixPipRestoreToOverlay = true; - private static boolean fullscreenDimFlag = true; - private static boolean immersiveAppRepositioning = true; - private static boolean insetsControlChangedItem = false; - private static boolean letterboxBackgroundWallpaper = false; - private static boolean moveAnimationOptionsToChange = true; - private static boolean multiCrop = true; - private static boolean navBarTransparentByDefault = true; - private static boolean noConsecutiveVisibilityEvents = true; - private static boolean noVisibilityEventOnDisplayStateChange = true; - private static boolean offloadColorExtraction = false; - private static boolean predictiveBackSystemAnims = true; - private static boolean taskFragmentSystemOrganizerFlag = true; - private static boolean transitReadyTracking = false; - private static boolean useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds = true; - private static boolean userMinAspectRatioAppDefault = true; - private static boolean waitForTransitionOnDisplaySwitch = true; - private static boolean windowTokenConfigThreadSafe = true; - - - private void init() { - isCached = true; - } - - - - - private void load_overrides_accessibility() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - alwaysDrawMagnificationFullscreenBorder = - properties.getBoolean(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER, true); - delayNotificationToMagnificationWhenRecentsWindowToFrontTransition = - properties.getBoolean(Flags.FLAG_DELAY_NOTIFICATION_TO_MAGNIFICATION_WHEN_RECENTS_WINDOW_TO_FRONT_TRANSITION, true); - doNotCheckIntersectionWhenNonMagnifiableWindowTransitions = - properties.getBoolean(Flags.FLAG_DO_NOT_CHECK_INTERSECTION_WHEN_NON_MAGNIFIABLE_WINDOW_TRANSITIONS, true); - useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds = - properties.getBoolean(Flags.FLAG_USE_WINDOW_ORIGINAL_TOUCHABLE_REGION_WHEN_MAGNIFICATION_RECOMPUTE_BOUNDS, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace accessibility " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - accessibility_is_cached = true; - } - - private void load_overrides_large_screen_experiences_app_compat() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - allowHideScmButton = - properties.getBoolean(Flags.FLAG_ALLOW_HIDE_SCM_BUTTON, true); - disableThinLetterboxingPolicy = - properties.getBoolean(Flags.FLAG_DISABLE_THIN_LETTERBOXING_POLICY, true); - enableCompatuiSysuiLauncher = - properties.getBoolean(Flags.FLAG_ENABLE_COMPATUI_SYSUI_LAUNCHER, false); - immersiveAppRepositioning = - properties.getBoolean(Flags.FLAG_IMMERSIVE_APP_REPOSITIONING, true); - letterboxBackgroundWallpaper = - properties.getBoolean(Flags.FLAG_LETTERBOX_BACKGROUND_WALLPAPER, false); - userMinAspectRatioAppDefault = - properties.getBoolean(Flags.FLAG_USER_MIN_ASPECT_RATIO_APP_DEFAULT, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace large_screen_experiences_app_compat " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - large_screen_experiences_app_compat_is_cached = true; - } - - private void load_overrides_lse_desktop_experience() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - enableAdditionalWindowsAboveStatusBar = - properties.getBoolean(Flags.FLAG_ENABLE_ADDITIONAL_WINDOWS_ABOVE_STATUS_BAR, false); - enableAppHeaderWithTaskDensity = - properties.getBoolean(Flags.FLAG_ENABLE_APP_HEADER_WITH_TASK_DENSITY, true); - enableCameraCompatForDesktopWindowing = - properties.getBoolean(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING, true); - enableDesktopWindowingImmersiveHandleHiding = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_IMMERSIVE_HANDLE_HIDING, false); - enableDesktopWindowingModalsPolicy = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, true); - enableDesktopWindowingMode = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, true); - enableDesktopWindowingQuickSwitch = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH, false); - enableDesktopWindowingScvhCache = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SCVH_CACHE, false); - enableDesktopWindowingSizeConstraints = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS, false); - enableDesktopWindowingTaskLimit = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASK_LIMIT, true); - enableDesktopWindowingTaskbarRunningApps = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS, true); - enableDesktopWindowingWallpaperActivity = - properties.getBoolean(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, false); - enableTaskStackObserverInShell = - properties.getBoolean(Flags.FLAG_ENABLE_TASK_STACK_OBSERVER_IN_SHELL, true); - enableThemedAppHeaders = - properties.getBoolean(Flags.FLAG_ENABLE_THEMED_APP_HEADERS, true); - enableWindowingDynamicInitialBounds = - properties.getBoolean(Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, false); - enableWindowingEdgeDragResize = - properties.getBoolean(Flags.FLAG_ENABLE_WINDOWING_EDGE_DRAG_RESIZE, false); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace lse_desktop_experience " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - lse_desktop_experience_is_cached = true; - } - - private void load_overrides_multitasking() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace multitasking " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - multitasking_is_cached = true; - } - - private void load_overrides_responsible_apis() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - balDontBringExistingBackgroundTaskStackToFg = - properties.getBoolean(Flags.FLAG_BAL_DONT_BRING_EXISTING_BACKGROUND_TASK_STACK_TO_FG, true); - balImproveRealCallerVisibilityCheck = - properties.getBoolean(Flags.FLAG_BAL_IMPROVE_REAL_CALLER_VISIBILITY_CHECK, true); - balImprovedMetrics = - properties.getBoolean(Flags.FLAG_BAL_IMPROVED_METRICS, true); - balRequireOptInByPendingIntentCreator = - properties.getBoolean(Flags.FLAG_BAL_REQUIRE_OPT_IN_BY_PENDING_INTENT_CREATOR, true); - balRequireOptInSameUid = - properties.getBoolean(Flags.FLAG_BAL_REQUIRE_OPT_IN_SAME_UID, false); - balRespectAppSwitchStateWhenCheckBoundByForegroundUid = - properties.getBoolean(Flags.FLAG_BAL_RESPECT_APP_SWITCH_STATE_WHEN_CHECK_BOUND_BY_FOREGROUND_UID, true); - balShowToasts = - properties.getBoolean(Flags.FLAG_BAL_SHOW_TOASTS, false); - balShowToastsBlocked = - properties.getBoolean(Flags.FLAG_BAL_SHOW_TOASTS_BLOCKED, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace responsible_apis " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - responsible_apis_is_cached = true; - } - - private void load_overrides_systemui() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - multiCrop = - properties.getBoolean(Flags.FLAG_MULTI_CROP, true); - noConsecutiveVisibilityEvents = - properties.getBoolean(Flags.FLAG_NO_CONSECUTIVE_VISIBILITY_EVENTS, true); - offloadColorExtraction = - properties.getBoolean(Flags.FLAG_OFFLOAD_COLOR_EXTRACTION, false); - predictiveBackSystemAnims = - properties.getBoolean(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace systemui " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - systemui_is_cached = true; - } - - private void load_overrides_wear_frameworks() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - alwaysUpdateWallpaperPermission = - properties.getBoolean(Flags.FLAG_ALWAYS_UPDATE_WALLPAPER_PERMISSION, true); - noVisibilityEventOnDisplayStateChange = - properties.getBoolean(Flags.FLAG_NO_VISIBILITY_EVENT_ON_DISPLAY_STATE_CHANGE, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace wear_frameworks " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - wear_frameworks_is_cached = true; - } - - private void load_overrides_window_surfaces() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace window_surfaces " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - window_surfaces_is_cached = true; - } - - private void load_overrides_windowing_frontend() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - blastSyncNotificationShadeOnDisplaySwitch = - properties.getBoolean(Flags.FLAG_BLAST_SYNC_NOTIFICATION_SHADE_ON_DISPLAY_SWITCH, true); - closeToSquareConfigIncludesStatusBar = - properties.getBoolean(Flags.FLAG_CLOSE_TO_SQUARE_CONFIG_INCLUDES_STATUS_BAR, false); - edgeToEdgeByDefault = - properties.getBoolean(Flags.FLAG_EDGE_TO_EDGE_BY_DEFAULT, false); - ensureWallpaperInTransitions = - properties.getBoolean(Flags.FLAG_ENSURE_WALLPAPER_IN_TRANSITIONS, false); - navBarTransparentByDefault = - properties.getBoolean(Flags.FLAG_NAV_BAR_TRANSPARENT_BY_DEFAULT, true); - transitReadyTracking = - properties.getBoolean(Flags.FLAG_TRANSIT_READY_TRACKING, false); - waitForTransitionOnDisplaySwitch = - properties.getBoolean(Flags.FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace windowing_frontend " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - windowing_frontend_is_cached = true; - } - - private void load_overrides_windowing_sdk() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - activityEmbeddingAnimationCustomizationFlag = - properties.getBoolean(Flags.FLAG_ACTIVITY_EMBEDDING_ANIMATION_CUSTOMIZATION_FLAG, false); - activityEmbeddingInteractiveDividerFlag = - properties.getBoolean(Flags.FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG, true); - activityEmbeddingOverlayPresentationFlag = - properties.getBoolean(Flags.FLAG_ACTIVITY_EMBEDDING_OVERLAY_PRESENTATION_FLAG, true); - alwaysDeferTransitionWhenApplyWct = - properties.getBoolean(Flags.FLAG_ALWAYS_DEFER_TRANSITION_WHEN_APPLY_WCT, true); - embeddedActivityBackNavFlag = - properties.getBoolean(Flags.FLAG_EMBEDDED_ACTIVITY_BACK_NAV_FLAG, true); - fixPipRestoreToOverlay = - properties.getBoolean(Flags.FLAG_FIX_PIP_RESTORE_TO_OVERLAY, true); - fullscreenDimFlag = - properties.getBoolean(Flags.FLAG_FULLSCREEN_DIM_FLAG, true); - insetsControlChangedItem = - properties.getBoolean(Flags.FLAG_INSETS_CONTROL_CHANGED_ITEM, false); - moveAnimationOptionsToChange = - properties.getBoolean(Flags.FLAG_MOVE_ANIMATION_OPTIONS_TO_CHANGE, true); - taskFragmentSystemOrganizerFlag = - properties.getBoolean(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG, true); - windowTokenConfigThreadSafe = - properties.getBoolean(Flags.FLAG_WINDOW_TOKEN_CONFIG_THREAD_SAFE, true); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace windowing_sdk " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } catch (SecurityException e) { - // for isolated process case, skip loading flag value from the storage, use the default - } - windowing_sdk_is_cached = true; - } - - @Override - - public boolean activityEmbeddingAnimationCustomizationFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return activityEmbeddingAnimationCustomizationFlag; - - } - - @Override - + @Override + + + public boolean activityEmbeddingAbortCrossUidLaunchInFinishingTaskFragment() { + return true; + } + + @Override + + + public boolean activityEmbeddingDelayTaskFragmentFinishForActivityLaunch() { + return true; + } + + @Override + + public boolean activityEmbeddingInteractiveDividerFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return activityEmbeddingInteractiveDividerFlag; + return true; + } + + @Override + + + public boolean activityEmbeddingMetrics() { + return false; + } + + @Override + + + public boolean allowDisableActivityRecordInputSink() { + return true; + } + + @Override + + + public boolean alwaysDrawMagnificationFullscreenBorder() { + return true; + } + + @Override + + + public boolean alwaysSeqIdLayout() { + return false; + } + + @Override + + + public boolean alwaysSeqIdLayoutWear() { + return false; + } + + @Override + + + public boolean alwaysUpdateWallpaperPermission() { + return true; + } + + @Override + + + public boolean aodTransition() { + return false; + } + + @Override + + + public boolean appCompatPropertiesApi() { + return true; + } + + @Override + + + public boolean appCompatRefactoring() { + return true; + } + + @Override + + + public boolean appCompatRefactoringFixMultiwindowTaskHierarchy() { + return true; + } + + @Override + + + public boolean appCompatRefactoringForceChangeForLetterboxTransitions() { + return false; + } + + @Override + + + public boolean appCompatRefactoringRoundedCorners() { + return false; + } + + @Override + + + public boolean appCompatRefactoringRoundedCornersAnimation() { + return false; + } + + @Override + + + public boolean appCompatRefactoringSetAppboundsToNullWhenEmpty() { + return true; + } + + @Override + + + public boolean appCompatRefactoringSkipStartingWindowLetterbox() { + return false; + } + + @Override + + + public boolean appCompatRefactoringUseActivityLeashForLetterboxing() { + return false; + } + + @Override + + + public boolean appCompatUiFramework() { + return false; + } + + @Override + + + public boolean appHandleNoRelayoutOnExclusionChange() { + return true; + } + + @Override + + + public boolean applyDeskActivationOnUserSwitch() { + return true; + } + + @Override + + + public boolean applyLifecycleOnPipChange() { + return false; + } + + @Override + + + public boolean avoidRebindingIntentionallyDisconnectedWallpaper() { + return true; + } + + @Override + + + public boolean backupAndRestoreForUserAspectRatioSettings() { + return true; + } + + @Override + + + public boolean balAdditionalStartModes() { + return true; + } + + @Override + + + public boolean balCheckBroadcastWhenDispatched() { + return true; + } + + @Override + + + public boolean balCoverIntentSender() { + return false; + } + + @Override + + + public boolean balDontBringExistingBackgroundTaskStackToFg() { + return true; + } + + @Override + + + public boolean balReduceGracePeriod() { + return false; + } + + @Override + + + public boolean balReportAbortedActivityStarts() { + return false; + } + + @Override + + + public boolean balRespectAppSwitchStateWhenCheckBoundByForegroundUid() { + return true; + } + + @Override + + + public boolean balSendIntentWithOptions() { + return true; + } + + @Override + + + public boolean balStrictModeRo() { + return true; + } + + @Override + + + public boolean cameraCompatFullscreenPickSameTaskActivity() { + return true; + } + + @Override + + + public boolean cameraCompatLandscapeCameraSupport() { + return false; + } + + @Override + + + public boolean cameraCompatUnifyCameraPolicies() { + return false; + } + + @Override + + + public boolean clearReusableScvhOnRelease() { + return true; + } + + @Override + + + public boolean closeFullscreenAndSplitscreenKeyboardShortcut() { + return false; + } + + @Override + + + public boolean closeTaskKeyboardShortcut() { + return true; + } + + @Override + + + public boolean closeToSquareConfigIncludesStatusBar() { + return false; + } + + @Override + + + public boolean coverDisplayOptIn() { + return true; + } + + @Override + + + public boolean currentAnimatorScaleUsesSharedMemory() { + return false; + } + + @Override + + + public boolean defaultDeskWithoutWarmupMigration() { + return false; + } + + @Override + + + public boolean deferResumeFocusInNonFocusedWindow() { + return false; + } + + @Override + + + public boolean density390Api() { + return true; + } + + @Override + + + public boolean deprecateSurfaceAnimationFrameCallback() { + return false; + } + + @Override + + + public boolean deprecateWindowAnimatorFrameCallback() { + return false; + } + + @Override + + + public boolean dimmingWallpaperForMaximizedAndTiled() { + return false; + } + + @Override + + + public boolean disableDesktopLaunchParamsOutsideDesktopBugFix() { + return true; + } + + @Override + + + public boolean disableNonResizableAppSnapResizing() { + return true; + } + + @Override + + + public boolean disableRestoreNonFullscreenBoundsOnConfigurationChange() { + return false; + } + + @Override + + + public boolean doNotForceWallpaperForFreeformTask() { + return true; + } + + @Override + + + public boolean enableAccessibleCustomHeaders() { + return true; + } + + @Override + + + public boolean enableActivityEmbeddingSupportForConnectedDisplays() { + return true; + } + + @Override + + + public boolean enableAppHandlePositionReporting() { + return true; + } + + @Override + + + public boolean enableAppHeaderWithTaskDensity() { + return true; + } + + @Override + + + public boolean enableAppToWebEducationAnimation() { + return true; + } + + @Override + + + public boolean enableAutoRestartOnDisplayMove() { + return true; + } + + @Override + + + public boolean enableBackupAndRestoreDisplayWindowSettings() { + return true; + } + + @Override + + + public boolean enableBlockNonDesktopDisplayWindowDragBugfix() { + return true; + } + + @Override + + + public boolean enableBorderSettings() { + return false; + } + + @Override + + + public boolean enableBoundsRestoringOnTilingExit() { + return false; + } + + @Override + + + public boolean enableBoxShadowSettings() { + return false; + } + + @Override + + + public boolean enableBugFixesForSecondaryDisplay() { + return true; + } + + @Override + + + public boolean enableCameraCompatCompatibilityInfoRotateAndCropBugfix() { + return true; + } + + @Override + + + public boolean enableCameraCompatExternalDisplayRotationBugfix() { + return true; + } + + @Override + + + public boolean enableCameraCompatForDesktopWindowing() { + return true; + } + + @Override + + + public boolean enableCameraCompatForDesktopWindowingOptOut() { + return true; + } + + @Override + + + public boolean enableCameraCompatForDesktopWindowingOptOutApi() { + return true; + } + + @Override + + + public boolean enableCameraCompatSandboxDisplayRotationOnExternalDisplaysBugfix() { + return true; + } + + @Override + + + public boolean enableCameraCompatTrackTaskAndAppBugfix() { + return true; + } + + @Override + + + public boolean enableCaptionCompatInsetConversion() { + return false; + } + + @Override + + + public boolean enableCaptionCompatInsetForceConsumption() { + return true; + } + + @Override + + + public boolean enableCaptionCompatInsetForceConsumptionAlways() { + return true; + } + + @Override + + + public boolean enableCascadingWindows() { + return true; + } + + @Override + + + public boolean enableCloseLidInteraction() { + return false; + } + + @Override + + + public boolean enableCompatUiDesktopModeSynchronizationBugfix() { + return true; + } + + @Override + + + public boolean enableCompatUiVisibilityStatus() { + return true; + } + + @Override + + + public boolean enableCompatuiSysuiLauncherFix() { + return false; + } + + @Override + + + public boolean enableConnectedDisplaysDnd() { + return true; + } + + @Override + + + public boolean enableConnectedDisplaysPip() { + return true; + } + + @Override + + + public boolean enableConnectedDisplaysWallpaperPresentations() { + return false; + } + + @Override + + + public boolean enableConnectedDisplaysWindowDrag() { + return true; + } + + @Override + + + public boolean enableCrashLoggingForDesktop() { + return true; + } + + @Override + + + public boolean enableCrossDisplaysAppLaunchTransition() { + return false; + } + + @Override + + + public boolean enableCrossDisplaysPipTaskLaunch() { + return true; + } + + @Override + + + public boolean enableDesktopAppHandleAnimation() { + return true; + } + + @Override + + + public boolean enableDesktopAppHeaderStateChangeAnnouncements() { + return true; + } + + @Override + + + public boolean enableDesktopAppLaunchAlttabTransitions() { + return false; + } + + @Override + + + public boolean enableDesktopAppLaunchAlttabTransitionsBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopAppLaunchBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopAppLaunchTransitions() { + return false; + } + + @Override + + + public boolean enableDesktopAppLaunchTransitionsBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopCloseShortcutBugfix() { + return false; + } + + @Override + + + public boolean enableDesktopCloseTaskAnimationInDtcBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopFirstBasedDefaultToDesktopBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopFirstBasedDragToMaximize() { + return true; + } + + @Override + + + public boolean enableDesktopFirstFullscreenRefocusBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopFirstListener() { + return true; + } + + @Override + + + public boolean enableDesktopFirstPolicyInLpm() { + return false; + } + + @Override + + + public boolean enableDesktopFirstTopFullscreenBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopImeBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopImmersiveDragBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopIndicatorInSeparateThreadBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopInvisibleTaskRemovalCleanupBugfix() { + return false; + } + + @Override + + + public boolean enableDesktopModeThroughDevOption() { + return false; + } + + @Override + + + public boolean enableDesktopOpeningDeeplinkMinimizeAnimationBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopRecentsTransitionsCornersBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopSplitscreenTransitionBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopSystemDialogsTransitions() { + return true; + } + + @Override + + + public boolean enableDesktopTabTearingLaunchAnimation() { + return true; + } + + @Override + + + public boolean enableDesktopTabTearingMinimizeAnimationBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopTaskLimitSeparateTransition() { + return true; + } + + @Override + + + public boolean enableDesktopTaskbarOnFreeformDisplays() { + return true; + } + + @Override + + + public boolean enableDesktopTrampolineCloseAnimationBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopWallpaperActivityForSystemUser() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingAppHandleEducation() { + return false; + } + + @Override + + + public boolean enableDesktopWindowingAppToWeb() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingAppToWebEducation() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingAppToWebEducationIntegration() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingBackNavigation() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingEnterTransitionBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingEnterTransitions() { + return false; + } + + @Override + + + public boolean enableDesktopWindowingEnterpriseBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingExitByMinimizeTransitionBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingExitTransitions() { + return false; + } + + @Override + + + public boolean enableDesktopWindowingExitTransitionsBugfix() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingHsum() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingImmersiveHandleHiding() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingModalsPolicy() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingMode() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingMultiInstanceFeatures() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingPersistence() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingPip() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingPipInOverviewBugfix() { + return false; + } + + @Override + + + public boolean enableDesktopWindowingQuickSwitch() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingScvhCacheBugFix() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingSizeConstraints() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingTaskLimit() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingTaskbarRunningApps() { + return true; + } + + @Override + + + public boolean enableDesktopWindowingTransitions() { + return false; + } + + @Override + + + public boolean enableDesktopWindowingWallpaperActivity() { + return true; + } + + @Override + + + public boolean enableDeviceStateAutoRotateSettingLogging() { + return false; + } + + @Override + + + public boolean enableDeviceStateAutoRotateSettingRefactor() { + return true; + } + + @Override + + + public boolean enableDialogDisplayFixes() { + return true; + } + + @Override + + + public boolean enableDisplayCompatMode() { + return true; + } + + @Override + + + public boolean enableDisplayDisconnectInteraction() { + return true; + } + + @Override + + + public boolean enableDisplayFocusInShellTransitions() { + return true; + } + + @Override + + + public boolean enableDisplayReconnectInteraction() { + return true; + } + + @Override + + + public boolean enableDisplayWindowingModeSwitching() { + return true; + } + + @Override + + + public boolean enableDragEndStableBoundsReset() { + return true; + } + + @Override + + + public boolean enableDragResizeSetUpInBgThread() { + return true; + } + + @Override + + + public boolean enableDragToDesktopIncomingTransitionsBugfix() { + return true; + } + + @Override + + + public boolean enableDragToMaximize() { + return true; + } + + @Override + + + public boolean enableDraggingPipAcrossDisplays() { + return true; + } + + @Override + + + public boolean enableDrawingAppHandle() { + return true; + } + + @Override + + + public boolean enableDreamActivityWindowingExclusion() { + return true; + } + + @Override + + + public boolean enableDynamicRadiusComputationBugfix() { + return true; + } + + @Override + + + public boolean enableEmptyDeskOnMinimize() { + return true; + } + + @Override + + + public boolean enableExperimentalBubblesController() { + return false; + } + + @Override + + + public boolean enableExternalDisplayPersistenceBugfix() { + return true; + } + + @Override + + + public boolean enableFreeformBoxShadows() { + return false; + } + + @Override + + + public boolean enableFreeformDisplayLaunchParams() { + return true; + } + + @Override + + + public boolean enableFullScreenWindowOnRemovingSplitScreenStageBugfix() { + return true; + } + + @Override + + + public boolean enableFullscreenWindowControls() { + return false; + } + + @Override + + + public boolean enableFullyImmersiveInDesktop() { + return true; + } + + @Override + + + public boolean enableHandleInputFix() { + return true; + } + + @Override + + + public boolean enableHandlersDebuggingMode() { + return false; + } + + @Override + + + public boolean enableHoldToDragAppHandle() { + return true; + } + + @Override + + + public boolean enableIndependentBackInProjected() { + return true; + } + + @Override + + + public boolean enableInorderTransitionCallbacksForDesktop() { + return true; + } + + @Override + + + public boolean enableInputLayerTransitionFix() { + return true; + } + + @Override + + + public boolean enableInteractionDependentTabTearingBounds() { + return false; + } + + @Override + + + public boolean enableInteractivePictureInPicture() { + return false; + } + + @Override + + + public boolean enableKeyGestureHandlerForSysui() { + return true; + } + + @Override + + + public boolean enableLauncherHandleGoHomeKeyboardShortcut() { + return true; + } + + @Override + + + public boolean enableMinimizeButton() { + return true; + } + + @Override + + + public boolean enableMirrorDisplayNoActivity() { + return true; + } + + @Override + + + public boolean enableModalsFullscreenWithPermission() { + return true; + } + + @Override + + + public boolean enableModalsFullscreenWithPlatformSignature() { + return true; + } + + @Override + + + public boolean enableMoveToNextDisplayShortcut() { + return true; + } + + @Override + + + public boolean enableMultiDisplayHomeFocusBugFix() { + return false; + } + + @Override + + + public boolean enableMultiDisplaySplit() { + return false; + } + + @Override + + + public boolean enableMultidisplayTrackpadBackGesture() { + return true; + } + + @Override + + + public boolean enableMultipleDesktopsBackend() { + return true; + } + + @Override + + + public boolean enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays() { + return false; + } + + @Override + + + public boolean enableMultipleDesktopsFrontend() { + return true; + } + + @Override + + + public boolean enableNoWindowDecorationForDesks() { + return true; + } + + @Override + + + public boolean enableNonDefaultDisplaySplit() { + return false; + } + + @Override + + + public boolean enableNonDefaultDisplaySplitBugfix() { + return false; + } + + @Override + + + public boolean enableOpaqueBackgroundForTransparentWindows() { + return true; + } + + @Override + + + public boolean enableOverflowButtonForTaskbarPinnedItems() { + return false; + } + + @Override + + + public boolean enablePerDisplayDesktopWallpaperActivity() { + return true; + } + + @Override + + + public boolean enablePerDisplayPackageContextCacheInStatusbarNotif() { + return true; + } + + @Override + + + public boolean enablePerDisplayWindowDecorViewHostPool() { + return true; + } + + @Override + + + public boolean enablePersistingDisplaySizeForConnectedDisplays() { + return true; + } + + @Override + + + public boolean enablePinningAppWithContextMenu() { + return true; + } + + @Override + + + public boolean enablePipParamsUpdateNotificationBugfix() { + return true; + } + + @Override + + + public boolean enablePresentationDisallowedOnUnfocusedHostTask() { + return true; + } + + @Override + + + public boolean enablePresentationForConnectedDisplays() { + return false; + } + + @Override + + + public boolean enableProjectedDisplayDesktopMode() { + return true; + } + + @Override + + + public boolean enableQuickswitchDesktopSplitBugfix() { + return true; + } + + @Override + + + public boolean enableRejectHomeTransition() { + return true; + } + + @Override + + + public boolean enableRemoveStatusBarInputLayer() { + return true; + } + + @Override + + + public boolean enableRequestFullscreenBugfix() { + return true; + } + + @Override + + + public boolean enableRequestFullscreenRefactor() { + return false; + } + + @Override + + + public boolean enableRequestFullscreenRestoreFreeformBugfix() { + return true; + } + + @Override + + + public boolean enableResizingMetrics() { + return true; + } + + @Override + + + public boolean enableRestartMenuForConnectedDisplays() { + return true; + } + + @Override + + + public boolean enableRestoreToPreviousSizeFromDesktopImmersive() { + return true; + } + + @Override + + + public boolean enableSeeThroughTaskFragments() { + return true; + } + + @Override + + + public boolean enableShellInitialBoundsRegressionBugFix() { + return true; + } + + @Override + + + public boolean enableShrinkWindowBoundsAfterDrag() { + return true; + } + + @Override + + + public boolean enableSizeCompatModeImprovementsForConnectedDisplays() { + return true; + } + + @Override + + + public boolean enableStartLaunchTransitionFromTaskbarBugfix() { + return true; + } + + @Override + + + public boolean enableSysDecorsCallbacksViaWm() { + return true; + } + + @Override + + + public boolean enableTallAppHeaders() { + return true; + } + + @Override + + + public boolean enableTaskResizingKeyboardShortcuts() { + return true; + } + + @Override + + + public boolean enableTaskStackObserverInShell() { + return true; + } + + @Override + + + public boolean enableTaskbarConnectedDisplays() { + return false; + } + + @Override + + + public boolean enableTaskbarOverflow() { + return true; + } + + @Override + + + public boolean enableTaskbarRecentTasksThrottleBugfix() { + return true; + } + + @Override + + + public boolean enableTaskbarRecentsLayoutTransition() { + return true; + } + + @Override + + + public boolean enableThemedAppHeaders() { + return true; + } + + @Override + + + public boolean enableTileResizing() { + return true; + } + + @Override + + + public boolean enableTopVisibleRootTaskPerUserTracking() { + return true; + } + + @Override + + + public boolean enableTransitionOnActivitySetRequestedOrientation() { + return true; + } + + @Override + + + public boolean enableUpdatedDisplayConnectionDialog() { + return true; + } + + @Override + + + public boolean enableUpscalingSizeCompatOnExitingDesktopBugfix() { + return true; + } + + @Override + + + public boolean enableVisualIndicatorInTransitionBugfix() { + return true; + } + + @Override + + + public boolean enableWindowContextResourcesUpdateOnConfigChange() { + return true; + } + + @Override + + + public boolean enableWindowDecorationRefactor() { + return false; + } + + @Override + + + public boolean enableWindowDropSmoothTransition() { + return true; + } + + @Override + + + public boolean enableWindowRepositioningApi() { + return false; + } + + @Override + + + public boolean enableWindowingDynamicInitialBounds() { + return true; + } + + @Override + + + public boolean enableWindowingEdgeDragResize() { + return true; + } + + @Override + + + public boolean enableWindowingScaledResizing() { + return true; + } + + @Override + + + public boolean enableWindowingTaskStackOrderBugfix() { + return true; + } + + @Override + + + public boolean enableWindowingTransitionHandlersObservers() { + return true; + } + + @Override + + + public boolean enforceEdgeToEdge() { + return true; + } + + @Override + + + public boolean ensureKeyguardDoesTransitionStartingBugFix() { + return false; + } + + @Override + + + public boolean ensureWallpaperDrawnOnDisplaySwitch() { + return false; + } + + @Override + + + public boolean enterDesktopByDefaultOnFreeformDisplays() { + return true; + } + + @Override + + + public boolean excludeCaptionFromAppBounds() { + return true; + } + + @Override + + + public boolean excludeDeskRootsFromDesktopTasks() { + return true; + } + + @Override + + + public boolean excludingLayerFromTaskSnapshot() { + return true; + } + + @Override + + + public boolean fallbackToFocusedDisplay() { + return true; + } + + @Override + + + public boolean fallbackTransitionPlayer() { + return false; + } + + @Override + + + public boolean fifoPriorityForMajorUiProcesses() { + return false; + } + + @Override + + + public boolean fixBalReparentExistingTask() { + return true; + } + + @Override + + + public boolean fixBubbleTrampolineAnimation() { + return false; + } + + @Override + + + public boolean fixHideOverlayApi() { + return true; + } + + @Override + + + public boolean fixLeakingVisualIndicator() { + return true; + } + + @Override + + + public boolean fixRapidTopResumedSwitch() { + return true; + } + + @Override + + + public boolean forceCloseTopTransparentFullscreenTask() { + return true; + } + + @Override + + + public boolean formFactorBasedDesktopFirstSwitch() { + return true; + } + + @Override + + + public boolean grantManageKeyGesturesToRecents() { + return true; + } + + @Override + + + public boolean handleIncompatibleTasksInDesktopLaunchParams() { + return true; + } + + @Override + + + public boolean ignoreAspectRatioRestrictionsForResizeableFreeformActivities() { + return true; + } + + @Override + + + public boolean ignoreCornerRadiusAndShadows() { + return false; + } + + @Override + + + public boolean ignoreCurrentParamsInDesktopLaunchParams() { + return true; + } + + @Override + + + public boolean ignoreOverrideTaskBoundsIfIncompatibleWithDisplay() { + return true; + } + + @Override + + public boolean imeBackCallbackLeakPrevention() { + return false; } @Override - - public boolean activityEmbeddingOverlayPresentationFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return activityEmbeddingOverlayPresentationFlag; - } - @Override - - public boolean activitySnapshotByDefault() { + public boolean includeTopTransparentFullscreenTaskInDesktopHeuristic() { return true; - } @Override - - public boolean activityWindowInfoFlag() { - return true; - } - @Override - - public boolean allowDisableActivityRecordInputSink() { + public boolean inheritTaskBoundsForTrampolineTaskLaunches() { return true; - } @Override - - public boolean allowHideScmButton() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!large_screen_experiences_app_compat_is_cached) { - load_overrides_large_screen_experiences_app_compat(); - } - } - return allowHideScmButton; - } - @Override - - public boolean allowsScreenSizeDecoupledFromStatusBarAndCutout() { + public boolean jankApi() { return true; - } @Override - - public boolean alwaysDeferTransitionWhenApplyWct() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return alwaysDeferTransitionWhenApplyWct; + + public boolean keyboardShortcutsToSwitchDesks() { + return true; } @Override - - public boolean alwaysDrawMagnificationFullscreenBorder() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return alwaysDrawMagnificationFullscreenBorder; + + public boolean keyguardRemoveDefaultDisplayUsage() { + return true; } @Override - - public boolean alwaysUpdateWallpaperPermission() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!wear_frameworks_is_cached) { - load_overrides_wear_frameworks(); - } - } - return alwaysUpdateWallpaperPermission; + + public boolean letterboxBackgroundWallpaper() { + return false; } @Override - - public boolean appCompatPropertiesApi() { - return true; + + public boolean limitSystemFullscreenOverrideToDefaultDisplay() { + return true; } @Override - - public boolean appCompatRefactoring() { - return false; + + public boolean migrateBasicLegacyReady() { + return false; } @Override - - public boolean balDontBringExistingBackgroundTaskStackToFg() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!responsible_apis_is_cached) { - load_overrides_responsible_apis(); - } - } - return balDontBringExistingBackgroundTaskStackToFg; + + public boolean moveToExternalDisplayShortcut() { + return false; } @Override - - public boolean balImproveRealCallerVisibilityCheck() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!responsible_apis_is_cached) { - load_overrides_responsible_apis(); - } - } - return balImproveRealCallerVisibilityCheck; + + public boolean moveToNextDisplayShortcutWithProjectedMode() { + return true; } @Override - - public boolean balImprovedMetrics() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!responsible_apis_is_cached) { - load_overrides_responsible_apis(); - } - } - return balImprovedMetrics; + + public boolean multiCrop() { + return true; } @Override - - public boolean balRequireOptInByPendingIntentCreator() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!responsible_apis_is_cached) { - load_overrides_responsible_apis(); - } - } - return balRequireOptInByPendingIntentCreator; + + public boolean multipleSystemNavigationObserverCallbacks() { + return true; } @Override - - public boolean balRequireOptInSameUid() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!responsible_apis_is_cached) { - load_overrides_responsible_apis(); - } - } - return balRequireOptInSameUid; + + public boolean nestedTasksWithIndependentBoundsBugfix() { + return true; } @Override - - public boolean balRespectAppSwitchStateWhenCheckBoundByForegroundUid() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!responsible_apis_is_cached) { - load_overrides_responsible_apis(); - } - } - return balRespectAppSwitchStateWhenCheckBoundByForegroundUid; + + public boolean noAlphaRotationEnterAnimation() { + return false; } @Override - - public boolean balShowToasts() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!responsible_apis_is_cached) { - load_overrides_responsible_apis(); - } - } - return balShowToasts; + + public boolean optOutOverrideOrientationToUser() { + return false; } @Override - - public boolean balShowToastsBlocked() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!responsible_apis_is_cached) { - load_overrides_responsible_apis(); - } - } - return balShowToastsBlocked; + + public boolean parallelCdTransitionsDuringRecents() { + return true; } @Override - - public boolean blastSyncNotificationShadeOnDisplaySwitch() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_frontend_is_cached) { - load_overrides_windowing_frontend(); - } - } - return blastSyncNotificationShadeOnDisplaySwitch; + + public boolean polishCloseWallpaperIncludesOpenChange() { + return false; } @Override - - public boolean bundleClientTransactionFlag() { - return true; + + public boolean portWindowSizeAnimation() { + return false; } @Override - - public boolean cameraCompatForFreeform() { - return true; + + public boolean predictiveBackCallbackCancellationFix() { + return true; } @Override - - public boolean closeToSquareConfigIncludesStatusBar() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_frontend_is_cached) { - load_overrides_windowing_frontend(); - } - } - return closeToSquareConfigIncludesStatusBar; - } - @Override - - public boolean configurableFontScaleDefault() { + public boolean predictiveBackDelayWmTransition() { return true; - } @Override - - public boolean coverDisplayOptIn() { - return true; - } - @Override - - public boolean deferDisplayUpdates() { + public boolean predictiveBackInterceptTransition() { return true; - } @Override - - public boolean delayNotificationToMagnificationWhenRecentsWindowToFrontTransition() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return delayNotificationToMagnificationWhenRecentsWindowToFrontTransition; - } - @Override - - public boolean delegateUnhandledDrags() { + public boolean predictiveBackPrioritySystemNavigationObserver() { return true; - } @Override - - public boolean deleteCaptureDisplay() { - return true; + + public boolean predictiveBackStopKeycodeBackForwarding() { + return false; } @Override - - public boolean density390Api() { - return true; - } - @Override - - public boolean disableObjectPool() { + public boolean predictiveBackSwipeEdgeNoneApi() { return true; - } @Override - - public boolean disableThinLetterboxingPolicy() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!large_screen_experiences_app_compat_is_cached) { - load_overrides_large_screen_experiences_app_compat(); - } - } - return disableThinLetterboxingPolicy; + + public boolean predictiveBackSystemOverrideCallback() { + return true; } @Override - - public boolean doNotCheckIntersectionWhenNonMagnifiableWindowTransitions() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return doNotCheckIntersectionWhenNonMagnifiableWindowTransitions; + + public boolean predictiveBackTimestampApi() { + return true; } @Override - - public boolean drawSnapshotAspectRatioMatch() { - return false; + + public boolean preserveRecentsTaskConfigurationOnRelaunch() { + return true; } @Override - - public boolean edgeToEdgeByDefault() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_frontend_is_cached) { - load_overrides_windowing_frontend(); - } - } - return edgeToEdgeByDefault; + + public boolean rearDisplayDisableForceDesktopSystemDecorations() { + return true; } @Override - - public boolean embeddedActivityBackNavFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return embeddedActivityBackNavFlag; + + public boolean reduceChangedExclusionRectsMsgs() { + return true; } @Override - - public boolean enableAdditionalWindowsAboveStatusBar() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableAdditionalWindowsAboveStatusBar; + + public boolean reduceTaskSnapshotMemoryUsage() { + return true; } @Override - - public boolean enableAppHeaderWithTaskDensity() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableAppHeaderWithTaskDensity; - } - @Override - - public boolean enableBufferTransformHintFromDisplay() { + public boolean reenableAppHandleAnimations() { return true; - } @Override - - public boolean enableCameraCompatForDesktopWindowing() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableCameraCompatForDesktopWindowing; + + public boolean reenableAppHandleColorAnimations() { + return false; } @Override - - public boolean enableCompatuiSysuiLauncher() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!large_screen_experiences_app_compat_is_cached) { - load_overrides_large_screen_experiences_app_compat(); - } - } - return enableCompatuiSysuiLauncher; + + public boolean refactorMatchParentBounds() { + return false; } @Override - - public boolean enableDesktopWindowingImmersiveHandleHiding() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingImmersiveHandleHiding; + + public boolean relativeInsets() { + return true; } @Override - - public boolean enableDesktopWindowingModalsPolicy() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingModalsPolicy; + + public boolean releaseAllTransitionSurfaces() { + return false; } @Override - - public boolean enableDesktopWindowingMode() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingMode; + + public boolean removeDeskOnLastTaskRemoval() { + return true; } @Override - - public boolean enableDesktopWindowingQuickSwitch() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingQuickSwitch; + + public boolean removeGetDimmer() { + return false; } @Override - - public boolean enableDesktopWindowingScvhCache() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingScvhCache; + + public boolean reparentWindowTokenApi() { + return true; } @Override - - public boolean enableDesktopWindowingSizeConstraints() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingSizeConstraints; + + public boolean repositoryBasedPersistence() { + return true; } @Override - - public boolean enableDesktopWindowingTaskLimit() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingTaskLimit; + + public boolean repositoryBasedPersistenceBgThread() { + return false; } @Override - - public boolean enableDesktopWindowingTaskbarRunningApps() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingTaskbarRunningApps; + + public boolean respectFullscreenActivityOptionInDesktopLaunchParams() { + return true; } @Override - - public boolean enableDesktopWindowingWallpaperActivity() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableDesktopWindowingWallpaperActivity; + + public boolean respectOrientationChangeForUnresizeable() { + return true; } @Override - - public boolean enableScaledResizing() { - return false; + + public boolean respectRequestedTaskSnapshotResolution() { + return false; } @Override - - public boolean enableTaskStackObserverInShell() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableTaskStackObserverInShell; + + public boolean restoreUserAspectRatioSettingsUsingService() { + return true; } @Override - - public boolean enableThemedAppHeaders() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableThemedAppHeaders; + + public boolean restrictFreeformHiddenSystemBarsToFillingTasks() { + return true; } @Override - - public boolean enableWindowingDynamicInitialBounds() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableWindowingDynamicInitialBounds; + + public boolean returnAllVisibleActivitiesForVis() { + return true; } @Override - - public boolean enableWindowingEdgeDragResize() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!lse_desktop_experience_is_cached) { - load_overrides_lse_desktop_experience(); - } - } - return enableWindowingEdgeDragResize; + + public boolean rootTaskForBubble() { + return false; } @Override - - public boolean enableWmExtensionsForAllFlag() { - return true; - } - @Override - - public boolean enforceEdgeToEdge() { + public boolean safeRegionLetterboxingV1() { return true; - } @Override - - public boolean ensureWallpaperInTransitions() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_frontend_is_cached) { - load_overrides_windowing_frontend(); - } - } - return ensureWallpaperInTransitions; - } - @Override - - public boolean explicitRefreshRateHints() { + public boolean screenRecordingCallbacks() { return true; - } @Override - - public boolean fifoPriorityForMajorUiProcesses() { - return false; - } - @Override - - public boolean fixNoContainerUpdateWithoutResize() { + public boolean scrollingFromLetterbox() { return false; - } @Override - - public boolean fixPipRestoreToOverlay() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return fixPipRestoreToOverlay; + + public boolean scvhSetFocusable() { + return false; } @Override - - public boolean fullscreenDimFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return fullscreenDimFlag; - } - @Override - - public boolean getDimmerOnClosing() { + public boolean scvhSurfaceControlLifetimeFix() { return true; - } @Override - - public boolean immersiveAppRepositioning() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!large_screen_experiences_app_compat_is_cached) { - load_overrides_large_screen_experiences_app_compat(); - } - } - return immersiveAppRepositioning; + + public boolean sdkDesiredPresentTime() { + return true; } @Override - - public boolean insetsControlChangedItem() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return insetsControlChangedItem; + + public boolean setScPropertiesInClient() { + return true; } @Override - - public boolean insetsControlSeq() { - return false; + + public boolean showAppHandleLargeScreens() { + return false; } @Override - - public boolean insetsDecoupledConfiguration() { - return true; - } - @Override - - public boolean introduceSmootherDimmer() { + public boolean showBiometricPromptSecondaryDisplayMessage() { return true; - } @Override - - public boolean keyguardAppearTransition() { - return true; + + public boolean showDesktopExperienceDevOption() { + return true; } @Override - - public boolean letterboxBackgroundWallpaper() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!large_screen_experiences_app_compat_is_cached) { - load_overrides_large_screen_experiences_app_compat(); - } - } - return letterboxBackgroundWallpaper; - } - @Override - - public boolean movableCutoutConfiguration() { + public boolean showDesktopWindowingDevOption() { return true; - } @Override - - public boolean moveAnimationOptionsToChange() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return moveAnimationOptionsToChange; + + public boolean showHomeBehindDesktop() { + return false; } @Override - - public boolean multiCrop() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return multiCrop; + + public boolean skipCompatUiEducationInDesktopMode() { + return true; } @Override - - public boolean navBarTransparentByDefault() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_frontend_is_cached) { - load_overrides_windowing_frontend(); - } - } - return navBarTransparentByDefault; + + public boolean skipDeactivationOfDeskWithNothingInFront() { + return true; } @Override - - public boolean noConsecutiveVisibilityEvents() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return noConsecutiveVisibilityEvents; + + public boolean skipDecorViewRelayoutWhenClosingBugfix() { + return true; } @Override - - public boolean noVisibilityEventOnDisplayStateChange() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!wear_frameworks_is_cached) { - load_overrides_wear_frameworks(); - } - } - return noVisibilityEventOnDisplayStateChange; + + public boolean supportGeminiOnMultiDisplay() { + return true; } @Override - - public boolean offloadColorExtraction() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return offloadColorExtraction; + + public boolean systemContentPriority() { + return false; } @Override - - public boolean predictiveBackSystemAnims() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!systemui_is_cached) { - load_overrides_systemui(); - } - } - return predictiveBackSystemAnims; - } - @Override - - public boolean rearDisplayDisableForceDesktopSystemDecorations() { + public boolean systemUiPostAnimationEnd() { return true; - } @Override - - public boolean releaseSnapshotAggressively() { - return false; - } - @Override - - public boolean removePrepareSurfaceInPlacement() { + public boolean taskFragmentCompanionActivity() { return true; - } @Override - - public boolean screenRecordingCallbacks() { - return true; - } - @Override - - public boolean sdkDesiredPresentTime() { + public boolean taskbarRunningTasksInSplitscreenSelect() { return true; - } @Override - - public boolean secureWindowState() { - return true; + + public boolean toggleFullscreenStateViaFullscreenKey() { + return true; } @Override - - public boolean setScPropertiesInClient() { - return false; - } - @Override - - public boolean skipSleepingWhenSwitchingDisplay() { + public boolean touchPassThroughOptIn() { return true; - } @Override - - public boolean supportsMultiInstanceSystemUi() { - return true; + + public boolean transferStartingWindowToNextWhenInvisible() { + return false; } @Override - - public boolean surfaceControlInputReceiver() { - return true; + + public boolean transitReadyTracking() { + return false; } @Override - - public boolean surfaceTrustedOverlay() { - return true; + + public boolean transitTrackerPlumbing() { + return false; } @Override - - public boolean syncScreenCapture() { - return true; + + public boolean transitionHandlerCujTags() { + return false; } @Override - - public boolean taskFragmentSystemOrganizerFlag() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return taskFragmentSystemOrganizerFlag; + + public boolean unifyShellBinders() { + return false; } @Override - - public boolean transitReadyTracking() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_frontend_is_cached) { - load_overrides_windowing_frontend(); - } - } - return transitReadyTracking; - } - @Override - - public boolean trustedPresentationListenerForWindow() { + public boolean universalResizableByDefault() { return true; - } @Override - - public boolean untrustedEmbeddingAnyAppPermission() { - return true; + + public boolean untrustedEmbeddingAnyAppPermission() { + return false; } @Override - + + public boolean untrustedEmbeddingStateSharing() { return true; - } @Override - - public boolean useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!accessibility_is_cached) { - load_overrides_accessibility(); - } - } - return useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds; + + public boolean updateDimsWhenWindowShown() { + return false; } @Override - - public boolean userMinAspectRatioAppDefault() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!large_screen_experiences_app_compat_is_cached) { - load_overrides_large_screen_experiences_app_compat(); - } - } - return userMinAspectRatioAppDefault; + + public boolean updateTaskCropInSync() { + return true; } @Override - - public boolean waitForTransitionOnDisplaySwitch() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_frontend_is_cached) { - load_overrides_windowing_frontend(); - } - } - return waitForTransitionOnDisplaySwitch; + + public boolean useInputReportedFocusForAccessibility() { + return false; } @Override - - public boolean wallpaperOffsetAsync() { - return true; - } - @Override - - public boolean windowSessionRelayoutInfo() { + public boolean vdmForceAppUniversalResizableApi() { return true; - } @Override - - public boolean windowTokenConfigThreadSafe() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!windowing_sdk_is_cached) { - load_overrides_windowing_sdk(); - } - } - return windowTokenConfigThreadSafe; + + public boolean waitForPresentFenceOnDisplaySwitch() { + return false; } } - - - diff --git a/flags/src/com/android/window/flags2/Flags.java b/flags/src/com/android/window/flags2/Flags.java index 8888b48ce72..33f3240ea75 100644 --- a/flags/src/com/android/window/flags2/Flags.java +++ b/flags/src/com/android/window/flags2/Flags.java @@ -1,93 +1,266 @@ package com.android.window.flags2; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + + /** @hide */ public final class Flags { /** @hide */ - public static final String FLAG_ACTIVITY_EMBEDDING_ANIMATION_CUSTOMIZATION_FLAG = "com.android.window.flags.activity_embedding_animation_customization_flag"; - /** @hide */ - public static final String FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG = "com.android.window.flags.activity_embedding_interactive_divider_flag"; + public static final String FLAG_ACTIVITY_EMBEDDING_ABORT_CROSS_UID_LAUNCH_IN_FINISHING_TASK_FRAGMENT = "com.android.window.flags.activity_embedding_abort_cross_uid_launch_in_finishing_task_fragment"; /** @hide */ - public static final String FLAG_ACTIVITY_EMBEDDING_OVERLAY_PRESENTATION_FLAG = "com.android.window.flags.activity_embedding_overlay_presentation_flag"; + public static final String FLAG_ACTIVITY_EMBEDDING_DELAY_TASK_FRAGMENT_FINISH_FOR_ACTIVITY_LAUNCH = "com.android.window.flags.activity_embedding_delay_task_fragment_finish_for_activity_launch"; /** @hide */ - public static final String FLAG_ACTIVITY_SNAPSHOT_BY_DEFAULT = "com.android.window.flags.activity_snapshot_by_default"; + public static final String FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG = "com.android.window.flags.activity_embedding_interactive_divider_flag"; /** @hide */ - public static final String FLAG_ACTIVITY_WINDOW_INFO_FLAG = "com.android.window.flags.activity_window_info_flag"; + public static final String FLAG_ACTIVITY_EMBEDDING_METRICS = "com.android.window.flags.activity_embedding_metrics"; /** @hide */ public static final String FLAG_ALLOW_DISABLE_ACTIVITY_RECORD_INPUT_SINK = "com.android.window.flags.allow_disable_activity_record_input_sink"; /** @hide */ - public static final String FLAG_ALLOW_HIDE_SCM_BUTTON = "com.android.window.flags.allow_hide_scm_button"; - /** @hide */ - public static final String FLAG_ALLOWS_SCREEN_SIZE_DECOUPLED_FROM_STATUS_BAR_AND_CUTOUT = "com.android.window.flags.allows_screen_size_decoupled_from_status_bar_and_cutout"; + public static final String FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER = "com.android.window.flags.always_draw_magnification_fullscreen_border"; /** @hide */ - public static final String FLAG_ALWAYS_DEFER_TRANSITION_WHEN_APPLY_WCT = "com.android.window.flags.always_defer_transition_when_apply_wct"; + public static final String FLAG_ALWAYS_SEQ_ID_LAYOUT = "com.android.window.flags.always_seq_id_layout"; /** @hide */ - public static final String FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER = "com.android.window.flags.always_draw_magnification_fullscreen_border"; + public static final String FLAG_ALWAYS_SEQ_ID_LAYOUT_WEAR = "com.android.window.flags.always_seq_id_layout_wear"; /** @hide */ public static final String FLAG_ALWAYS_UPDATE_WALLPAPER_PERMISSION = "com.android.window.flags.always_update_wallpaper_permission"; /** @hide */ + public static final String FLAG_AOD_TRANSITION = "com.android.window.flags.aod_transition"; + /** @hide */ public static final String FLAG_APP_COMPAT_PROPERTIES_API = "com.android.window.flags.app_compat_properties_api"; /** @hide */ public static final String FLAG_APP_COMPAT_REFACTORING = "com.android.window.flags.app_compat_refactoring"; /** @hide */ - public static final String FLAG_BAL_DONT_BRING_EXISTING_BACKGROUND_TASK_STACK_TO_FG = "com.android.window.flags.bal_dont_bring_existing_background_task_stack_to_fg"; + public static final String FLAG_APP_COMPAT_REFACTORING_FIX_MULTIWINDOW_TASK_HIERARCHY = "com.android.window.flags.app_compat_refactoring_fix_multiwindow_task_hierarchy"; + /** @hide */ + public static final String FLAG_APP_COMPAT_REFACTORING_FORCE_CHANGE_FOR_LETTERBOX_TRANSITIONS = "com.android.window.flags.app_compat_refactoring_force_change_for_letterbox_transitions"; + /** @hide */ + public static final String FLAG_APP_COMPAT_REFACTORING_ROUNDED_CORNERS = "com.android.window.flags.app_compat_refactoring_rounded_corners"; + /** @hide */ + public static final String FLAG_APP_COMPAT_REFACTORING_ROUNDED_CORNERS_ANIMATION = "com.android.window.flags.app_compat_refactoring_rounded_corners_animation"; + /** @hide */ + public static final String FLAG_APP_COMPAT_REFACTORING_SET_APPBOUNDS_TO_NULL_WHEN_EMPTY = "com.android.window.flags.app_compat_refactoring_set_appbounds_to_null_when_empty"; + /** @hide */ + public static final String FLAG_APP_COMPAT_REFACTORING_SKIP_STARTING_WINDOW_LETTERBOX = "com.android.window.flags.app_compat_refactoring_skip_starting_window_letterbox"; + /** @hide */ + public static final String FLAG_APP_COMPAT_REFACTORING_USE_ACTIVITY_LEASH_FOR_LETTERBOXING = "com.android.window.flags.app_compat_refactoring_use_activity_leash_for_letterboxing"; /** @hide */ - public static final String FLAG_BAL_IMPROVE_REAL_CALLER_VISIBILITY_CHECK = "com.android.window.flags.bal_improve_real_caller_visibility_check"; + public static final String FLAG_APP_COMPAT_UI_FRAMEWORK = "com.android.window.flags.app_compat_ui_framework"; /** @hide */ - public static final String FLAG_BAL_IMPROVED_METRICS = "com.android.window.flags.bal_improved_metrics"; + public static final String FLAG_APP_HANDLE_NO_RELAYOUT_ON_EXCLUSION_CHANGE = "com.android.window.flags.app_handle_no_relayout_on_exclusion_change"; /** @hide */ - public static final String FLAG_BAL_REQUIRE_OPT_IN_BY_PENDING_INTENT_CREATOR = "com.android.window.flags.bal_require_opt_in_by_pending_intent_creator"; + public static final String FLAG_APPLY_DESK_ACTIVATION_ON_USER_SWITCH = "com.android.window.flags.apply_desk_activation_on_user_switch"; /** @hide */ - public static final String FLAG_BAL_REQUIRE_OPT_IN_SAME_UID = "com.android.window.flags.bal_require_opt_in_same_uid"; + public static final String FLAG_APPLY_LIFECYCLE_ON_PIP_CHANGE = "com.android.window.flags.apply_lifecycle_on_pip_change"; + /** @hide */ + public static final String FLAG_AVOID_REBINDING_INTENTIONALLY_DISCONNECTED_WALLPAPER = "com.android.window.flags.avoid_rebinding_intentionally_disconnected_wallpaper"; + /** @hide */ + public static final String FLAG_BACKUP_AND_RESTORE_FOR_USER_ASPECT_RATIO_SETTINGS = "com.android.window.flags.backup_and_restore_for_user_aspect_ratio_settings"; + /** @hide */ + public static final String FLAG_BAL_ADDITIONAL_START_MODES = "com.android.window.flags.bal_additional_start_modes"; + /** @hide */ + public static final String FLAG_BAL_CHECK_BROADCAST_WHEN_DISPATCHED = "com.android.window.flags.bal_check_broadcast_when_dispatched"; + /** @hide */ + public static final String FLAG_BAL_COVER_INTENT_SENDER = "com.android.window.flags.bal_cover_intent_sender"; + /** @hide */ + public static final String FLAG_BAL_DONT_BRING_EXISTING_BACKGROUND_TASK_STACK_TO_FG = "com.android.window.flags.bal_dont_bring_existing_background_task_stack_to_fg"; + /** @hide */ + public static final String FLAG_BAL_REDUCE_GRACE_PERIOD = "com.android.window.flags.bal_reduce_grace_period"; + /** @hide */ + public static final String FLAG_BAL_REPORT_ABORTED_ACTIVITY_STARTS = "com.android.window.flags.bal_report_aborted_activity_starts"; /** @hide */ public static final String FLAG_BAL_RESPECT_APP_SWITCH_STATE_WHEN_CHECK_BOUND_BY_FOREGROUND_UID = "com.android.window.flags.bal_respect_app_switch_state_when_check_bound_by_foreground_uid"; /** @hide */ - public static final String FLAG_BAL_SHOW_TOASTS = "com.android.window.flags.bal_show_toasts"; + public static final String FLAG_BAL_SEND_INTENT_WITH_OPTIONS = "com.android.window.flags.bal_send_intent_with_options"; /** @hide */ - public static final String FLAG_BAL_SHOW_TOASTS_BLOCKED = "com.android.window.flags.bal_show_toasts_blocked"; + public static final String FLAG_BAL_STRICT_MODE_RO = "com.android.window.flags.bal_strict_mode_ro"; /** @hide */ - public static final String FLAG_BLAST_SYNC_NOTIFICATION_SHADE_ON_DISPLAY_SWITCH = "com.android.window.flags.blast_sync_notification_shade_on_display_switch"; + public static final String FLAG_CAMERA_COMPAT_FULLSCREEN_PICK_SAME_TASK_ACTIVITY = "com.android.window.flags.camera_compat_fullscreen_pick_same_task_activity"; /** @hide */ - public static final String FLAG_BUNDLE_CLIENT_TRANSACTION_FLAG = "com.android.window.flags.bundle_client_transaction_flag"; + public static final String FLAG_CAMERA_COMPAT_LANDSCAPE_CAMERA_SUPPORT = "com.android.window.flags.camera_compat_landscape_camera_support"; /** @hide */ - public static final String FLAG_CAMERA_COMPAT_FOR_FREEFORM = "com.android.window.flags.camera_compat_for_freeform"; + public static final String FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES = "com.android.window.flags.camera_compat_unify_camera_policies"; /** @hide */ - public static final String FLAG_CLOSE_TO_SQUARE_CONFIG_INCLUDES_STATUS_BAR = "com.android.window.flags.close_to_square_config_includes_status_bar"; + public static final String FLAG_CLEAR_REUSABLE_SCVH_ON_RELEASE = "com.android.window.flags.clear_reusable_scvh_on_release"; /** @hide */ - public static final String FLAG_CONFIGURABLE_FONT_SCALE_DEFAULT = "com.android.window.flags.configurable_font_scale_default"; + public static final String FLAG_CLOSE_FULLSCREEN_AND_SPLITSCREEN_KEYBOARD_SHORTCUT = "com.android.window.flags.close_fullscreen_and_splitscreen_keyboard_shortcut"; /** @hide */ - public static final String FLAG_COVER_DISPLAY_OPT_IN = "com.android.window.flags.cover_display_opt_in"; + public static final String FLAG_CLOSE_TASK_KEYBOARD_SHORTCUT = "com.android.window.flags.close_task_keyboard_shortcut"; + /** @hide */ + public static final String FLAG_CLOSE_TO_SQUARE_CONFIG_INCLUDES_STATUS_BAR = "com.android.window.flags.close_to_square_config_includes_status_bar"; /** @hide */ - public static final String FLAG_DEFER_DISPLAY_UPDATES = "com.android.window.flags.defer_display_updates"; + public static final String FLAG_COVER_DISPLAY_OPT_IN = "com.android.window.flags.cover_display_opt_in"; /** @hide */ - public static final String FLAG_DELAY_NOTIFICATION_TO_MAGNIFICATION_WHEN_RECENTS_WINDOW_TO_FRONT_TRANSITION = "com.android.window.flags.delay_notification_to_magnification_when_recents_window_to_front_transition"; + public static final String FLAG_CURRENT_ANIMATOR_SCALE_USES_SHARED_MEMORY = "com.android.window.flags.current_animator_scale_uses_shared_memory"; /** @hide */ - public static final String FLAG_DELEGATE_UNHANDLED_DRAGS = "com.android.window.flags.delegate_unhandled_drags"; + public static final String FLAG_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION = "com.android.window.flags.default_desk_without_warmup_migration"; /** @hide */ - public static final String FLAG_DELETE_CAPTURE_DISPLAY = "com.android.window.flags.delete_capture_display"; + public static final String FLAG_DEFER_RESUME_FOCUS_IN_NON_FOCUSED_WINDOW = "com.android.window.flags.defer_resume_focus_in_non_focused_window"; /** @hide */ public static final String FLAG_DENSITY_390_API = "com.android.window.flags.density_390_api"; /** @hide */ - public static final String FLAG_DISABLE_OBJECT_POOL = "com.android.window.flags.disable_object_pool"; + public static final String FLAG_DEPRECATE_SURFACE_ANIMATION_FRAME_CALLBACK = "com.android.window.flags.deprecate_surface_animation_frame_callback"; + /** @hide */ + public static final String FLAG_DEPRECATE_WINDOW_ANIMATOR_FRAME_CALLBACK = "com.android.window.flags.deprecate_window_animator_frame_callback"; + /** @hide */ + public static final String FLAG_DIMMING_WALLPAPER_FOR_MAXIMIZED_AND_TILED = "com.android.window.flags.dimming_wallpaper_for_maximized_and_tiled"; /** @hide */ - public static final String FLAG_DISABLE_THIN_LETTERBOXING_POLICY = "com.android.window.flags.disable_thin_letterboxing_policy"; + public static final String FLAG_DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX = "com.android.window.flags.disable_desktop_launch_params_outside_desktop_bug_fix"; /** @hide */ - public static final String FLAG_DO_NOT_CHECK_INTERSECTION_WHEN_NON_MAGNIFIABLE_WINDOW_TRANSITIONS = "com.android.window.flags.do_not_check_intersection_when_non_magnifiable_window_transitions"; + public static final String FLAG_DISABLE_NON_RESIZABLE_APP_SNAP_RESIZING = "com.android.window.flags.disable_non_resizable_app_snap_resizing"; /** @hide */ - public static final String FLAG_DRAW_SNAPSHOT_ASPECT_RATIO_MATCH = "com.android.window.flags.draw_snapshot_aspect_ratio_match"; + public static final String FLAG_DISABLE_RESTORE_NON_FULLSCREEN_BOUNDS_ON_CONFIGURATION_CHANGE = "com.android.window.flags.disable_restore_non_fullscreen_bounds_on_configuration_change"; /** @hide */ - public static final String FLAG_EDGE_TO_EDGE_BY_DEFAULT = "com.android.window.flags.edge_to_edge_by_default"; + public static final String FLAG_DO_NOT_FORCE_WALLPAPER_FOR_FREEFORM_TASK = "com.android.window.flags.do_not_force_wallpaper_for_freeform_task"; /** @hide */ - public static final String FLAG_EMBEDDED_ACTIVITY_BACK_NAV_FLAG = "com.android.window.flags.embedded_activity_back_nav_flag"; + public static final String FLAG_ENABLE_ACCESSIBLE_CUSTOM_HEADERS = "com.android.window.flags.enable_accessible_custom_headers"; /** @hide */ - public static final String FLAG_ENABLE_ADDITIONAL_WINDOWS_ABOVE_STATUS_BAR = "com.android.window.flags.enable_additional_windows_above_status_bar"; + public static final String FLAG_ENABLE_ACTIVITY_EMBEDDING_SUPPORT_FOR_CONNECTED_DISPLAYS = "com.android.window.flags.enable_activity_embedding_support_for_connected_displays"; + /** @hide */ + public static final String FLAG_ENABLE_APP_HANDLE_POSITION_REPORTING = "com.android.window.flags.enable_app_handle_position_reporting"; /** @hide */ public static final String FLAG_ENABLE_APP_HEADER_WITH_TASK_DENSITY = "com.android.window.flags.enable_app_header_with_task_density"; /** @hide */ - public static final String FLAG_ENABLE_BUFFER_TRANSFORM_HINT_FROM_DISPLAY = "com.android.window.flags.enable_buffer_transform_hint_from_display"; + public static final String FLAG_ENABLE_APP_TO_WEB_EDUCATION_ANIMATION = "com.android.window.flags.enable_app_to_web_education_animation"; + /** @hide */ + public static final String FLAG_ENABLE_AUTO_RESTART_ON_DISPLAY_MOVE = "com.android.window.flags.enable_auto_restart_on_display_move"; + /** @hide */ + public static final String FLAG_ENABLE_BACKUP_AND_RESTORE_DISPLAY_WINDOW_SETTINGS = "com.android.window.flags.enable_backup_and_restore_display_window_settings"; + /** @hide */ + public static final String FLAG_ENABLE_BLOCK_NON_DESKTOP_DISPLAY_WINDOW_DRAG_BUGFIX = "com.android.window.flags.enable_block_non_desktop_display_window_drag_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_BORDER_SETTINGS = "com.android.window.flags.enable_border_settings"; + /** @hide */ + public static final String FLAG_ENABLE_BOUNDS_RESTORING_ON_TILING_EXIT = "com.android.window.flags.enable_bounds_restoring_on_tiling_exit"; + /** @hide */ + public static final String FLAG_ENABLE_BOX_SHADOW_SETTINGS = "com.android.window.flags.enable_box_shadow_settings"; + /** @hide */ + public static final String FLAG_ENABLE_BUG_FIXES_FOR_SECONDARY_DISPLAY = "com.android.window.flags.enable_bug_fixes_for_secondary_display"; + /** @hide */ + public static final String FLAG_ENABLE_CAMERA_COMPAT_COMPATIBILITY_INFO_ROTATE_AND_CROP_BUGFIX = "com.android.window.flags.enable_camera_compat_compatibility_info_rotate_and_crop_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_CAMERA_COMPAT_EXTERNAL_DISPLAY_ROTATION_BUGFIX = "com.android.window.flags.enable_camera_compat_external_display_rotation_bugfix"; /** @hide */ public static final String FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING = "com.android.window.flags.enable_camera_compat_for_desktop_windowing"; /** @hide */ - public static final String FLAG_ENABLE_COMPATUI_SYSUI_LAUNCHER = "com.android.window.flags.enable_compatui_sysui_launcher"; + public static final String FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT = "com.android.window.flags.enable_camera_compat_for_desktop_windowing_opt_out"; + /** @hide */ + public static final String FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT_API = "com.android.window.flags.enable_camera_compat_for_desktop_windowing_opt_out_api"; + /** @hide */ + public static final String FLAG_ENABLE_CAMERA_COMPAT_SANDBOX_DISPLAY_ROTATION_ON_EXTERNAL_DISPLAYS_BUGFIX = "com.android.window.flags.enable_camera_compat_sandbox_display_rotation_on_external_displays_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_CAMERA_COMPAT_TRACK_TASK_AND_APP_BUGFIX = "com.android.window.flags.enable_camera_compat_track_task_and_app_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_CAPTION_COMPAT_INSET_CONVERSION = "com.android.window.flags.enable_caption_compat_inset_conversion"; + /** @hide */ + public static final String FLAG_ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION = "com.android.window.flags.enable_caption_compat_inset_force_consumption"; + /** @hide */ + public static final String FLAG_ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS = "com.android.window.flags.enable_caption_compat_inset_force_consumption_always"; + /** @hide */ + public static final String FLAG_ENABLE_CASCADING_WINDOWS = "com.android.window.flags.enable_cascading_windows"; + /** @hide */ + public static final String FLAG_ENABLE_CLOSE_LID_INTERACTION = "com.android.window.flags.enable_close_lid_interaction"; + /** @hide */ + public static final String FLAG_ENABLE_COMPAT_UI_DESKTOP_MODE_SYNCHRONIZATION_BUGFIX = "com.android.window.flags.enable_compat_ui_desktop_mode_synchronization_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_COMPAT_UI_VISIBILITY_STATUS = "com.android.window.flags.enable_compat_ui_visibility_status"; + /** @hide */ + public static final String FLAG_ENABLE_COMPATUI_SYSUI_LAUNCHER_FIX = "com.android.window.flags.enable_compatui_sysui_launcher_fix"; + /** @hide */ + public static final String FLAG_ENABLE_CONNECTED_DISPLAYS_DND = "com.android.window.flags.enable_connected_displays_dnd"; + /** @hide */ + public static final String FLAG_ENABLE_CONNECTED_DISPLAYS_PIP = "com.android.window.flags.enable_connected_displays_pip"; + /** @hide */ + public static final String FLAG_ENABLE_CONNECTED_DISPLAYS_WALLPAPER_PRESENTATIONS = "com.android.window.flags.enable_connected_displays_wallpaper_presentations"; + /** @hide */ + public static final String FLAG_ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG = "com.android.window.flags.enable_connected_displays_window_drag"; + /** @hide */ + public static final String FLAG_ENABLE_CRASH_LOGGING_FOR_DESKTOP = "com.android.window.flags.enable_crash_logging_for_desktop"; + /** @hide */ + public static final String FLAG_ENABLE_CROSS_DISPLAYS_APP_LAUNCH_TRANSITION = "com.android.window.flags.enable_cross_displays_app_launch_transition"; + /** @hide */ + public static final String FLAG_ENABLE_CROSS_DISPLAYS_PIP_TASK_LAUNCH = "com.android.window.flags.enable_cross_displays_pip_task_launch"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_APP_HANDLE_ANIMATION = "com.android.window.flags.enable_desktop_app_handle_animation"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_APP_HEADER_STATE_CHANGE_ANNOUNCEMENTS = "com.android.window.flags.enable_desktop_app_header_state_change_announcements"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS = "com.android.window.flags.enable_desktop_app_launch_alttab_transitions"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX = "com.android.window.flags.enable_desktop_app_launch_alttab_transitions_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX = "com.android.window.flags.enable_desktop_app_launch_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS = "com.android.window.flags.enable_desktop_app_launch_transitions"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX = "com.android.window.flags.enable_desktop_app_launch_transitions_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_CLOSE_SHORTCUT_BUGFIX = "com.android.window.flags.enable_desktop_close_shortcut_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_CLOSE_TASK_ANIMATION_IN_DTC_BUGFIX = "com.android.window.flags.enable_desktop_close_task_animation_in_dtc_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX = "com.android.window.flags.enable_desktop_first_based_default_to_desktop_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_FIRST_BASED_DRAG_TO_MAXIMIZE = "com.android.window.flags.enable_desktop_first_based_drag_to_maximize"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_FIRST_FULLSCREEN_REFOCUS_BUGFIX = "com.android.window.flags.enable_desktop_first_fullscreen_refocus_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_FIRST_LISTENER = "com.android.window.flags.enable_desktop_first_listener"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_FIRST_POLICY_IN_LPM = "com.android.window.flags.enable_desktop_first_policy_in_lpm"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_FIRST_TOP_FULLSCREEN_BUGFIX = "com.android.window.flags.enable_desktop_first_top_fullscreen_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_IME_BUGFIX = "com.android.window.flags.enable_desktop_ime_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_IMMERSIVE_DRAG_BUGFIX = "com.android.window.flags.enable_desktop_immersive_drag_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_INDICATOR_IN_SEPARATE_THREAD_BUGFIX = "com.android.window.flags.enable_desktop_indicator_in_separate_thread_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_INVISIBLE_TASK_REMOVAL_CLEANUP_BUGFIX = "com.android.window.flags.enable_desktop_invisible_task_removal_cleanup_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION = "com.android.window.flags.enable_desktop_mode_through_dev_option"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_OPENING_DEEPLINK_MINIMIZE_ANIMATION_BUGFIX = "com.android.window.flags.enable_desktop_opening_deeplink_minimize_animation_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX = "com.android.window.flags.enable_desktop_recents_transitions_corners_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_SPLITSCREEN_TRANSITION_BUGFIX = "com.android.window.flags.enable_desktop_splitscreen_transition_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS = "com.android.window.flags.enable_desktop_system_dialogs_transitions"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_TAB_TEARING_LAUNCH_ANIMATION = "com.android.window.flags.enable_desktop_tab_tearing_launch_animation"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_TAB_TEARING_MINIMIZE_ANIMATION_BUGFIX = "com.android.window.flags.enable_desktop_tab_tearing_minimize_animation_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_TASK_LIMIT_SEPARATE_TRANSITION = "com.android.window.flags.enable_desktop_task_limit_separate_transition"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_TASKBAR_ON_FREEFORM_DISPLAYS = "com.android.window.flags.enable_desktop_taskbar_on_freeform_displays"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX = "com.android.window.flags.enable_desktop_trampoline_close_animation_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER = "com.android.window.flags.enable_desktop_wallpaper_activity_for_system_user"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_APP_HANDLE_EDUCATION = "com.android.window.flags.enable_desktop_windowing_app_handle_education"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB = "com.android.window.flags.enable_desktop_windowing_app_to_web"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION = "com.android.window.flags.enable_desktop_windowing_app_to_web_education"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION_INTEGRATION = "com.android.window.flags.enable_desktop_windowing_app_to_web_education_integration"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION = "com.android.window.flags.enable_desktop_windowing_back_navigation"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITION_BUGFIX = "com.android.window.flags.enable_desktop_windowing_enter_transition_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS = "com.android.window.flags.enable_desktop_windowing_enter_transitions"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_ENTERPRISE_BUGFIX = "com.android.window.flags.enable_desktop_windowing_enterprise_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_BY_MINIMIZE_TRANSITION_BUGFIX = "com.android.window.flags.enable_desktop_windowing_exit_by_minimize_transition_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS = "com.android.window.flags.enable_desktop_windowing_exit_transitions"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX = "com.android.window.flags.enable_desktop_windowing_exit_transitions_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_HSUM = "com.android.window.flags.enable_desktop_windowing_hsum"; /** @hide */ public static final String FLAG_ENABLE_DESKTOP_WINDOWING_IMMERSIVE_HANDLE_HIDING = "com.android.window.flags.enable_desktop_windowing_immersive_handle_hiding"; /** @hide */ @@ -95,9 +268,17 @@ public final class Flags { /** @hide */ public static final String FLAG_ENABLE_DESKTOP_WINDOWING_MODE = "com.android.window.flags.enable_desktop_windowing_mode"; /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES = "com.android.window.flags.enable_desktop_windowing_multi_instance_features"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE = "com.android.window.flags.enable_desktop_windowing_persistence"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_PIP = "com.android.window.flags.enable_desktop_windowing_pip"; + /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_PIP_IN_OVERVIEW_BUGFIX = "com.android.window.flags.enable_desktop_windowing_pip_in_overview_bugfix"; + /** @hide */ public static final String FLAG_ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH = "com.android.window.flags.enable_desktop_windowing_quick_switch"; /** @hide */ - public static final String FLAG_ENABLE_DESKTOP_WINDOWING_SCVH_CACHE = "com.android.window.flags.enable_desktop_windowing_scvh_cache"; + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_SCVH_CACHE_BUG_FIX = "com.android.window.flags.enable_desktop_windowing_scvh_cache_bug_fix"; /** @hide */ public static final String FLAG_ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS = "com.android.window.flags.enable_desktop_windowing_size_constraints"; /** @hide */ @@ -105,526 +286,2490 @@ public final class Flags { /** @hide */ public static final String FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS = "com.android.window.flags.enable_desktop_windowing_taskbar_running_apps"; /** @hide */ + public static final String FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS = "com.android.window.flags.enable_desktop_windowing_transitions"; + /** @hide */ public static final String FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY = "com.android.window.flags.enable_desktop_windowing_wallpaper_activity"; /** @hide */ - public static final String FLAG_ENABLE_SCALED_RESIZING = "com.android.window.flags.enable_scaled_resizing"; + public static final String FLAG_ENABLE_DEVICE_STATE_AUTO_ROTATE_SETTING_LOGGING = "com.android.window.flags.enable_device_state_auto_rotate_setting_logging"; + /** @hide */ + public static final String FLAG_ENABLE_DEVICE_STATE_AUTO_ROTATE_SETTING_REFACTOR = "com.android.window.flags.enable_device_state_auto_rotate_setting_refactor"; + /** @hide */ + public static final String FLAG_ENABLE_DIALOG_DISPLAY_FIXES = "com.android.window.flags.enable_dialog_display_fixes"; + /** @hide */ + public static final String FLAG_ENABLE_DISPLAY_COMPAT_MODE = "com.android.window.flags.enable_display_compat_mode"; + /** @hide */ + public static final String FLAG_ENABLE_DISPLAY_DISCONNECT_INTERACTION = "com.android.window.flags.enable_display_disconnect_interaction"; + /** @hide */ + public static final String FLAG_ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS = "com.android.window.flags.enable_display_focus_in_shell_transitions"; + /** @hide */ + public static final String FLAG_ENABLE_DISPLAY_RECONNECT_INTERACTION = "com.android.window.flags.enable_display_reconnect_interaction"; + /** @hide */ + public static final String FLAG_ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING = "com.android.window.flags.enable_display_windowing_mode_switching"; + /** @hide */ + public static final String FLAG_ENABLE_DRAG_END_STABLE_BOUNDS_RESET = "com.android.window.flags.enable_drag_end_stable_bounds_reset"; + /** @hide */ + public static final String FLAG_ENABLE_DRAG_RESIZE_SET_UP_IN_BG_THREAD = "com.android.window.flags.enable_drag_resize_set_up_in_bg_thread"; + /** @hide */ + public static final String FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX = "com.android.window.flags.enable_drag_to_desktop_incoming_transitions_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_DRAG_TO_MAXIMIZE = "com.android.window.flags.enable_drag_to_maximize"; + /** @hide */ + public static final String FLAG_ENABLE_DRAGGING_PIP_ACROSS_DISPLAYS = "com.android.window.flags.enable_dragging_pip_across_displays"; + /** @hide */ + public static final String FLAG_ENABLE_DRAWING_APP_HANDLE = "com.android.window.flags.enable_drawing_app_handle"; + /** @hide */ + public static final String FLAG_ENABLE_DREAM_ACTIVITY_WINDOWING_EXCLUSION = "com.android.window.flags.enable_dream_activity_windowing_exclusion"; + /** @hide */ + public static final String FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX = "com.android.window.flags.enable_dynamic_radius_computation_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_EMPTY_DESK_ON_MINIMIZE = "com.android.window.flags.enable_empty_desk_on_minimize"; + /** @hide */ + public static final String FLAG_ENABLE_EXPERIMENTAL_BUBBLES_CONTROLLER = "com.android.window.flags.enable_experimental_bubbles_controller"; + /** @hide */ + public static final String FLAG_ENABLE_EXTERNAL_DISPLAY_PERSISTENCE_BUGFIX = "com.android.window.flags.enable_external_display_persistence_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_FREEFORM_BOX_SHADOWS = "com.android.window.flags.enable_freeform_box_shadows"; + /** @hide */ + public static final String FLAG_ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS = "com.android.window.flags.enable_freeform_display_launch_params"; + /** @hide */ + public static final String FLAG_ENABLE_FULL_SCREEN_WINDOW_ON_REMOVING_SPLIT_SCREEN_STAGE_BUGFIX = "com.android.window.flags.enable_full_screen_window_on_removing_split_screen_stage_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_FULLSCREEN_WINDOW_CONTROLS = "com.android.window.flags.enable_fullscreen_window_controls"; + /** @hide */ + public static final String FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP = "com.android.window.flags.enable_fully_immersive_in_desktop"; + /** @hide */ + public static final String FLAG_ENABLE_HANDLE_INPUT_FIX = "com.android.window.flags.enable_handle_input_fix"; + /** @hide */ + public static final String FLAG_ENABLE_HANDLERS_DEBUGGING_MODE = "com.android.window.flags.enable_handlers_debugging_mode"; + /** @hide */ + public static final String FLAG_ENABLE_HOLD_TO_DRAG_APP_HANDLE = "com.android.window.flags.enable_hold_to_drag_app_handle"; + /** @hide */ + public static final String FLAG_ENABLE_INDEPENDENT_BACK_IN_PROJECTED = "com.android.window.flags.enable_independent_back_in_projected"; + /** @hide */ + public static final String FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP = "com.android.window.flags.enable_inorder_transition_callbacks_for_desktop"; + /** @hide */ + public static final String FLAG_ENABLE_INPUT_LAYER_TRANSITION_FIX = "com.android.window.flags.enable_input_layer_transition_fix"; + /** @hide */ + public static final String FLAG_ENABLE_INTERACTION_DEPENDENT_TAB_TEARING_BOUNDS = "com.android.window.flags.enable_interaction_dependent_tab_tearing_bounds"; + /** @hide */ + public static final String FLAG_ENABLE_INTERACTIVE_PICTURE_IN_PICTURE = "com.android.window.flags.enable_interactive_picture_in_picture"; + /** @hide */ + public static final String FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_SYSUI = "com.android.window.flags.enable_key_gesture_handler_for_sysui"; + /** @hide */ + public static final String FLAG_ENABLE_LAUNCHER_HANDLE_GO_HOME_KEYBOARD_SHORTCUT = "com.android.window.flags.enable_launcher_handle_go_home_keyboard_shortcut"; + /** @hide */ + public static final String FLAG_ENABLE_MINIMIZE_BUTTON = "com.android.window.flags.enable_minimize_button"; + /** @hide */ + public static final String FLAG_ENABLE_MIRROR_DISPLAY_NO_ACTIVITY = "com.android.window.flags.enable_mirror_display_no_activity"; + /** @hide */ + public static final String FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PERMISSION = "com.android.window.flags.enable_modals_fullscreen_with_permission"; + /** @hide */ + public static final String FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PLATFORM_SIGNATURE = "com.android.window.flags.enable_modals_fullscreen_with_platform_signature"; + /** @hide */ + public static final String FLAG_ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT = "com.android.window.flags.enable_move_to_next_display_shortcut"; + /** @hide */ + public static final String FLAG_ENABLE_MULTI_DISPLAY_HOME_FOCUS_BUG_FIX = "com.android.window.flags.enable_multi_display_home_focus_bug_fix"; + /** @hide */ + public static final String FLAG_ENABLE_MULTI_DISPLAY_SPLIT = "com.android.window.flags.enable_multi_display_split"; + /** @hide */ + public static final String FLAG_ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE = "com.android.window.flags.enable_multidisplay_trackpad_back_gesture"; + /** @hide */ + public static final String FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND = "com.android.window.flags.enable_multiple_desktops_backend"; + /** @hide */ + public static final String FLAG_ENABLE_MULTIPLE_DESKTOPS_DEFAULT_ACTIVATION_IN_DESKTOP_FIRST_DISPLAYS = "com.android.window.flags.enable_multiple_desktops_default_activation_in_desktop_first_displays"; + /** @hide */ + public static final String FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND = "com.android.window.flags.enable_multiple_desktops_frontend"; + /** @hide */ + public static final String FLAG_ENABLE_NO_WINDOW_DECORATION_FOR_DESKS = "com.android.window.flags.enable_no_window_decoration_for_desks"; + /** @hide */ + public static final String FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT = "com.android.window.flags.enable_non_default_display_split"; + /** @hide */ + public static final String FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX = "com.android.window.flags.enable_non_default_display_split_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_OPAQUE_BACKGROUND_FOR_TRANSPARENT_WINDOWS = "com.android.window.flags.enable_opaque_background_for_transparent_windows"; + /** @hide */ + public static final String FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS = "com.android.window.flags.enable_overflow_button_for_taskbar_pinned_items"; + /** @hide */ + public static final String FLAG_ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY = "com.android.window.flags.enable_per_display_desktop_wallpaper_activity"; + /** @hide */ + public static final String FLAG_ENABLE_PER_DISPLAY_PACKAGE_CONTEXT_CACHE_IN_STATUSBAR_NOTIF = "com.android.window.flags.enable_per_display_package_context_cache_in_statusbar_notif"; + /** @hide */ + public static final String FLAG_ENABLE_PER_DISPLAY_WINDOW_DECOR_VIEW_HOST_POOL = "com.android.window.flags.enable_per_display_window_decor_view_host_pool"; + /** @hide */ + public static final String FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS = "com.android.window.flags.enable_persisting_display_size_for_connected_displays"; + /** @hide */ + public static final String FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU = "com.android.window.flags.enable_pinning_app_with_context_menu"; + /** @hide */ + public static final String FLAG_ENABLE_PIP_PARAMS_UPDATE_NOTIFICATION_BUGFIX = "com.android.window.flags.enable_pip_params_update_notification_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_PRESENTATION_DISALLOWED_ON_UNFOCUSED_HOST_TASK = "com.android.window.flags.enable_presentation_disallowed_on_unfocused_host_task"; + /** @hide */ + public static final String FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS = "com.android.window.flags.enable_presentation_for_connected_displays"; + /** @hide */ + public static final String FLAG_ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE = "com.android.window.flags.enable_projected_display_desktop_mode"; + /** @hide */ + public static final String FLAG_ENABLE_QUICKSWITCH_DESKTOP_SPLIT_BUGFIX = "com.android.window.flags.enable_quickswitch_desktop_split_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_REJECT_HOME_TRANSITION = "com.android.window.flags.enable_reject_home_transition"; + /** @hide */ + public static final String FLAG_ENABLE_REMOVE_STATUS_BAR_INPUT_LAYER = "com.android.window.flags.enable_remove_status_bar_input_layer"; + /** @hide */ + public static final String FLAG_ENABLE_REQUEST_FULLSCREEN_BUGFIX = "com.android.window.flags.enable_request_fullscreen_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_REQUEST_FULLSCREEN_REFACTOR = "com.android.window.flags.enable_request_fullscreen_refactor"; + /** @hide */ + public static final String FLAG_ENABLE_REQUEST_FULLSCREEN_RESTORE_FREEFORM_BUGFIX = "com.android.window.flags.enable_request_fullscreen_restore_freeform_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_RESIZING_METRICS = "com.android.window.flags.enable_resizing_metrics"; + /** @hide */ + public static final String FLAG_ENABLE_RESTART_MENU_FOR_CONNECTED_DISPLAYS = "com.android.window.flags.enable_restart_menu_for_connected_displays"; + /** @hide */ + public static final String FLAG_ENABLE_RESTORE_TO_PREVIOUS_SIZE_FROM_DESKTOP_IMMERSIVE = "com.android.window.flags.enable_restore_to_previous_size_from_desktop_immersive"; + /** @hide */ + public static final String FLAG_ENABLE_SEE_THROUGH_TASK_FRAGMENTS = "com.android.window.flags.enable_see_through_task_fragments"; + /** @hide */ + public static final String FLAG_ENABLE_SHELL_INITIAL_BOUNDS_REGRESSION_BUG_FIX = "com.android.window.flags.enable_shell_initial_bounds_regression_bug_fix"; + /** @hide */ + public static final String FLAG_ENABLE_SHRINK_WINDOW_BOUNDS_AFTER_DRAG = "com.android.window.flags.enable_shrink_window_bounds_after_drag"; + /** @hide */ + public static final String FLAG_ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS = "com.android.window.flags.enable_size_compat_mode_improvements_for_connected_displays"; + /** @hide */ + public static final String FLAG_ENABLE_START_LAUNCH_TRANSITION_FROM_TASKBAR_BUGFIX = "com.android.window.flags.enable_start_launch_transition_from_taskbar_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_SYS_DECORS_CALLBACKS_VIA_WM = "com.android.window.flags.enable_sys_decors_callbacks_via_wm"; + /** @hide */ + public static final String FLAG_ENABLE_TALL_APP_HEADERS = "com.android.window.flags.enable_tall_app_headers"; + /** @hide */ + public static final String FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS = "com.android.window.flags.enable_task_resizing_keyboard_shortcuts"; /** @hide */ public static final String FLAG_ENABLE_TASK_STACK_OBSERVER_IN_SHELL = "com.android.window.flags.enable_task_stack_observer_in_shell"; /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_CONNECTED_DISPLAYS = "com.android.window.flags.enable_taskbar_connected_displays"; + /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_OVERFLOW = "com.android.window.flags.enable_taskbar_overflow"; + /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX = "com.android.window.flags.enable_taskbar_recent_tasks_throttle_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_RECENTS_LAYOUT_TRANSITION = "com.android.window.flags.enable_taskbar_recents_layout_transition"; + /** @hide */ public static final String FLAG_ENABLE_THEMED_APP_HEADERS = "com.android.window.flags.enable_themed_app_headers"; /** @hide */ + public static final String FLAG_ENABLE_TILE_RESIZING = "com.android.window.flags.enable_tile_resizing"; + /** @hide */ + public static final String FLAG_ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING = "com.android.window.flags.enable_top_visible_root_task_per_user_tracking"; + /** @hide */ + public static final String FLAG_ENABLE_TRANSITION_ON_ACTIVITY_SET_REQUESTED_ORIENTATION = "com.android.window.flags.enable_transition_on_activity_set_requested_orientation"; + /** @hide */ + public static final String FLAG_ENABLE_UPDATED_DISPLAY_CONNECTION_DIALOG = "com.android.window.flags.enable_updated_display_connection_dialog"; + /** @hide */ + public static final String FLAG_ENABLE_UPSCALING_SIZE_COMPAT_ON_EXITING_DESKTOP_BUGFIX = "com.android.window.flags.enable_upscaling_size_compat_on_exiting_desktop_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_VISUAL_INDICATOR_IN_TRANSITION_BUGFIX = "com.android.window.flags.enable_visual_indicator_in_transition_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_WINDOW_CONTEXT_RESOURCES_UPDATE_ON_CONFIG_CHANGE = "com.android.window.flags.enable_window_context_resources_update_on_config_change"; + /** @hide */ + public static final String FLAG_ENABLE_WINDOW_DECORATION_REFACTOR = "com.android.window.flags.enable_window_decoration_refactor"; + /** @hide */ + public static final String FLAG_ENABLE_WINDOW_DROP_SMOOTH_TRANSITION = "com.android.window.flags.enable_window_drop_smooth_transition"; + /** @hide */ + public static final String FLAG_ENABLE_WINDOW_REPOSITIONING_API = "com.android.window.flags.enable_window_repositioning_api"; + /** @hide */ public static final String FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS = "com.android.window.flags.enable_windowing_dynamic_initial_bounds"; /** @hide */ public static final String FLAG_ENABLE_WINDOWING_EDGE_DRAG_RESIZE = "com.android.window.flags.enable_windowing_edge_drag_resize"; /** @hide */ - public static final String FLAG_ENABLE_WM_EXTENSIONS_FOR_ALL_FLAG = "com.android.window.flags.enable_wm_extensions_for_all_flag"; + public static final String FLAG_ENABLE_WINDOWING_SCALED_RESIZING = "com.android.window.flags.enable_windowing_scaled_resizing"; + /** @hide */ + public static final String FLAG_ENABLE_WINDOWING_TASK_STACK_ORDER_BUGFIX = "com.android.window.flags.enable_windowing_task_stack_order_bugfix"; + /** @hide */ + public static final String FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS = "com.android.window.flags.enable_windowing_transition_handlers_observers"; /** @hide */ public static final String FLAG_ENFORCE_EDGE_TO_EDGE = "com.android.window.flags.enforce_edge_to_edge"; /** @hide */ - public static final String FLAG_ENSURE_WALLPAPER_IN_TRANSITIONS = "com.android.window.flags.ensure_wallpaper_in_transitions"; + public static final String FLAG_ENSURE_KEYGUARD_DOES_TRANSITION_STARTING_BUG_FIX = "com.android.window.flags.ensure_keyguard_does_transition_starting_bug_fix"; + /** @hide */ + public static final String FLAG_ENSURE_WALLPAPER_DRAWN_ON_DISPLAY_SWITCH = "com.android.window.flags.ensure_wallpaper_drawn_on_display_switch"; + /** @hide */ + public static final String FLAG_ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS = "com.android.window.flags.enter_desktop_by_default_on_freeform_displays"; /** @hide */ - public static final String FLAG_EXPLICIT_REFRESH_RATE_HINTS = "com.android.window.flags.explicit_refresh_rate_hints"; + public static final String FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS = "com.android.window.flags.exclude_caption_from_app_bounds"; + /** @hide */ + public static final String FLAG_EXCLUDE_DESK_ROOTS_FROM_DESKTOP_TASKS = "com.android.window.flags.exclude_desk_roots_from_desktop_tasks"; + /** @hide */ + public static final String FLAG_EXCLUDING_LAYER_FROM_TASK_SNAPSHOT = "com.android.window.flags.excluding_layer_from_task_snapshot"; + /** @hide */ + public static final String FLAG_FALLBACK_TO_FOCUSED_DISPLAY = "com.android.window.flags.fallback_to_focused_display"; + /** @hide */ + public static final String FLAG_FALLBACK_TRANSITION_PLAYER = "com.android.window.flags.fallback_transition_player"; /** @hide */ public static final String FLAG_FIFO_PRIORITY_FOR_MAJOR_UI_PROCESSES = "com.android.window.flags.fifo_priority_for_major_ui_processes"; /** @hide */ - public static final String FLAG_FIX_NO_CONTAINER_UPDATE_WITHOUT_RESIZE = "com.android.window.flags.fix_no_container_update_without_resize"; + public static final String FLAG_FIX_BAL_REPARENT_EXISTING_TASK = "com.android.window.flags.fix_bal_reparent_existing_task"; + /** @hide */ + public static final String FLAG_FIX_BUBBLE_TRAMPOLINE_ANIMATION = "com.android.window.flags.fix_bubble_trampoline_animation"; + /** @hide */ + public static final String FLAG_FIX_HIDE_OVERLAY_API = "com.android.window.flags.fix_hide_overlay_api"; + /** @hide */ + public static final String FLAG_FIX_LEAKING_VISUAL_INDICATOR = "com.android.window.flags.fix_leaking_visual_indicator"; + /** @hide */ + public static final String FLAG_FIX_RAPID_TOP_RESUMED_SWITCH = "com.android.window.flags.fix_rapid_top_resumed_switch"; /** @hide */ - public static final String FLAG_FIX_PIP_RESTORE_TO_OVERLAY = "com.android.window.flags.fix_pip_restore_to_overlay"; + public static final String FLAG_FORCE_CLOSE_TOP_TRANSPARENT_FULLSCREEN_TASK = "com.android.window.flags.force_close_top_transparent_fullscreen_task"; /** @hide */ - public static final String FLAG_FULLSCREEN_DIM_FLAG = "com.android.window.flags.fullscreen_dim_flag"; + public static final String FLAG_FORM_FACTOR_BASED_DESKTOP_FIRST_SWITCH = "com.android.window.flags.form_factor_based_desktop_first_switch"; /** @hide */ - public static final String FLAG_GET_DIMMER_ON_CLOSING = "com.android.window.flags.get_dimmer_on_closing"; + public static final String FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS = "com.android.window.flags.grant_manage_key_gestures_to_recents"; /** @hide */ - public static final String FLAG_IMMERSIVE_APP_REPOSITIONING = "com.android.window.flags.immersive_app_repositioning"; + public static final String FLAG_HANDLE_INCOMPATIBLE_TASKS_IN_DESKTOP_LAUNCH_PARAMS = "com.android.window.flags.handle_incompatible_tasks_in_desktop_launch_params"; /** @hide */ - public static final String FLAG_INSETS_CONTROL_CHANGED_ITEM = "com.android.window.flags.insets_control_changed_item"; + public static final String FLAG_IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES = "com.android.window.flags.ignore_aspect_ratio_restrictions_for_resizeable_freeform_activities"; /** @hide */ - public static final String FLAG_INSETS_CONTROL_SEQ = "com.android.window.flags.insets_control_seq"; + public static final String FLAG_IGNORE_CORNER_RADIUS_AND_SHADOWS = "com.android.window.flags.ignore_corner_radius_and_shadows"; /** @hide */ - public static final String FLAG_INSETS_DECOUPLED_CONFIGURATION = "com.android.window.flags.insets_decoupled_configuration"; + public static final String FLAG_IGNORE_CURRENT_PARAMS_IN_DESKTOP_LAUNCH_PARAMS = "com.android.window.flags.ignore_current_params_in_desktop_launch_params"; /** @hide */ - public static final String FLAG_INTRODUCE_SMOOTHER_DIMMER = "com.android.window.flags.introduce_smoother_dimmer"; + public static final String FLAG_IGNORE_OVERRIDE_TASK_BOUNDS_IF_INCOMPATIBLE_WITH_DISPLAY = "com.android.window.flags.ignore_override_task_bounds_if_incompatible_with_display"; /** @hide */ - public static final String FLAG_KEYGUARD_APPEAR_TRANSITION = "com.android.window.flags.keyguard_appear_transition"; + public static final String FLAG_IME_BACK_CALLBACK_LEAK_PREVENTION = "com.android.window.flags.ime_back_callback_leak_prevention"; + /** @hide */ + public static final String FLAG_INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC = "com.android.window.flags.include_top_transparent_fullscreen_task_in_desktop_heuristic"; + /** @hide */ + public static final String FLAG_INHERIT_TASK_BOUNDS_FOR_TRAMPOLINE_TASK_LAUNCHES = "com.android.window.flags.inherit_task_bounds_for_trampoline_task_launches"; + /** @hide */ + public static final String FLAG_JANK_API = "com.android.window.flags.jank_api"; + /** @hide */ + public static final String FLAG_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS = "com.android.window.flags.keyboard_shortcuts_to_switch_desks"; + /** @hide */ + public static final String FLAG_KEYGUARD_REMOVE_DEFAULT_DISPLAY_USAGE = "com.android.window.flags.keyguard_remove_default_display_usage"; /** @hide */ public static final String FLAG_LETTERBOX_BACKGROUND_WALLPAPER = "com.android.window.flags.letterbox_background_wallpaper"; /** @hide */ - public static final String FLAG_MOVABLE_CUTOUT_CONFIGURATION = "com.android.window.flags.movable_cutout_configuration"; + public static final String FLAG_LIMIT_SYSTEM_FULLSCREEN_OVERRIDE_TO_DEFAULT_DISPLAY = "com.android.window.flags.limit_system_fullscreen_override_to_default_display"; + /** @hide */ + public static final String FLAG_MIGRATE_BASIC_LEGACY_READY = "com.android.window.flags.migrate_basic_legacy_ready"; /** @hide */ - public static final String FLAG_MOVE_ANIMATION_OPTIONS_TO_CHANGE = "com.android.window.flags.move_animation_options_to_change"; + public static final String FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT = "com.android.window.flags.move_to_external_display_shortcut"; + /** @hide */ + public static final String FLAG_MOVE_TO_NEXT_DISPLAY_SHORTCUT_WITH_PROJECTED_MODE = "com.android.window.flags.move_to_next_display_shortcut_with_projected_mode"; /** @hide */ public static final String FLAG_MULTI_CROP = "com.android.window.flags.multi_crop"; /** @hide */ - public static final String FLAG_NAV_BAR_TRANSPARENT_BY_DEFAULT = "com.android.window.flags.nav_bar_transparent_by_default"; + public static final String FLAG_MULTIPLE_SYSTEM_NAVIGATION_OBSERVER_CALLBACKS = "com.android.window.flags.multiple_system_navigation_observer_callbacks"; + /** @hide */ + public static final String FLAG_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX = "com.android.window.flags.nested_tasks_with_independent_bounds_bugfix"; + /** @hide */ + public static final String FLAG_NO_ALPHA_ROTATION_ENTER_ANIMATION = "com.android.window.flags.no_alpha_rotation_enter_animation"; + /** @hide */ + public static final String FLAG_OPT_OUT_OVERRIDE_ORIENTATION_TO_USER = "com.android.window.flags.opt_out_override_orientation_to_user"; + /** @hide */ + public static final String FLAG_PARALLEL_CD_TRANSITIONS_DURING_RECENTS = "com.android.window.flags.parallel_cd_transitions_during_recents"; + /** @hide */ + public static final String FLAG_POLISH_CLOSE_WALLPAPER_INCLUDES_OPEN_CHANGE = "com.android.window.flags.polish_close_wallpaper_includes_open_change"; + /** @hide */ + public static final String FLAG_PORT_WINDOW_SIZE_ANIMATION = "com.android.window.flags.port_window_size_animation"; + /** @hide */ + public static final String FLAG_PREDICTIVE_BACK_CALLBACK_CANCELLATION_FIX = "com.android.window.flags.predictive_back_callback_cancellation_fix"; + /** @hide */ + public static final String FLAG_PREDICTIVE_BACK_DELAY_WM_TRANSITION = "com.android.window.flags.predictive_back_delay_wm_transition"; + /** @hide */ + public static final String FLAG_PREDICTIVE_BACK_INTERCEPT_TRANSITION = "com.android.window.flags.predictive_back_intercept_transition"; /** @hide */ - public static final String FLAG_NO_CONSECUTIVE_VISIBILITY_EVENTS = "com.android.window.flags.no_consecutive_visibility_events"; + public static final String FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER = "com.android.window.flags.predictive_back_priority_system_navigation_observer"; /** @hide */ - public static final String FLAG_NO_VISIBILITY_EVENT_ON_DISPLAY_STATE_CHANGE = "com.android.window.flags.no_visibility_event_on_display_state_change"; + public static final String FLAG_PREDICTIVE_BACK_STOP_KEYCODE_BACK_FORWARDING = "com.android.window.flags.predictive_back_stop_keycode_back_forwarding"; /** @hide */ - public static final String FLAG_OFFLOAD_COLOR_EXTRACTION = "com.android.window.flags.offload_color_extraction"; + public static final String FLAG_PREDICTIVE_BACK_SWIPE_EDGE_NONE_API = "com.android.window.flags.predictive_back_swipe_edge_none_api"; /** @hide */ - public static final String FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS = "com.android.window.flags.predictive_back_system_anims"; + public static final String FLAG_PREDICTIVE_BACK_SYSTEM_OVERRIDE_CALLBACK = "com.android.window.flags.predictive_back_system_override_callback"; + /** @hide */ + public static final String FLAG_PREDICTIVE_BACK_TIMESTAMP_API = "com.android.window.flags.predictive_back_timestamp_api"; + /** @hide */ + public static final String FLAG_PRESERVE_RECENTS_TASK_CONFIGURATION_ON_RELAUNCH = "com.android.window.flags.preserve_recents_task_configuration_on_relaunch"; /** @hide */ public static final String FLAG_REAR_DISPLAY_DISABLE_FORCE_DESKTOP_SYSTEM_DECORATIONS = "com.android.window.flags.rear_display_disable_force_desktop_system_decorations"; /** @hide */ - public static final String FLAG_RELEASE_SNAPSHOT_AGGRESSIVELY = "com.android.window.flags.release_snapshot_aggressively"; + public static final String FLAG_REDUCE_CHANGED_EXCLUSION_RECTS_MSGS = "com.android.window.flags.reduce_changed_exclusion_rects_msgs"; + /** @hide */ + public static final String FLAG_REDUCE_TASK_SNAPSHOT_MEMORY_USAGE = "com.android.window.flags.reduce_task_snapshot_memory_usage"; + /** @hide */ + public static final String FLAG_REENABLE_APP_HANDLE_ANIMATIONS = "com.android.window.flags.reenable_app_handle_animations"; + /** @hide */ + public static final String FLAG_REENABLE_APP_HANDLE_COLOR_ANIMATIONS = "com.android.window.flags.reenable_app_handle_color_animations"; + /** @hide */ + public static final String FLAG_REFACTOR_MATCH_PARENT_BOUNDS = "com.android.window.flags.refactor_match_parent_bounds"; + /** @hide */ + public static final String FLAG_RELATIVE_INSETS = "com.android.window.flags.relative_insets"; + /** @hide */ + public static final String FLAG_RELEASE_ALL_TRANSITION_SURFACES = "com.android.window.flags.release_all_transition_surfaces"; + /** @hide */ + public static final String FLAG_REMOVE_DESK_ON_LAST_TASK_REMOVAL = "com.android.window.flags.remove_desk_on_last_task_removal"; + /** @hide */ + public static final String FLAG_REMOVE_GET_DIMMER = "com.android.window.flags.remove_get_dimmer"; + /** @hide */ + public static final String FLAG_REPARENT_WINDOW_TOKEN_API = "com.android.window.flags.reparent_window_token_api"; + /** @hide */ + public static final String FLAG_REPOSITORY_BASED_PERSISTENCE = "com.android.window.flags.repository_based_persistence"; + /** @hide */ + public static final String FLAG_REPOSITORY_BASED_PERSISTENCE_BG_THREAD = "com.android.window.flags.repository_based_persistence_bg_thread"; + /** @hide */ + public static final String FLAG_RESPECT_FULLSCREEN_ACTIVITY_OPTION_IN_DESKTOP_LAUNCH_PARAMS = "com.android.window.flags.respect_fullscreen_activity_option_in_desktop_launch_params"; + /** @hide */ + public static final String FLAG_RESPECT_ORIENTATION_CHANGE_FOR_UNRESIZEABLE = "com.android.window.flags.respect_orientation_change_for_unresizeable"; + /** @hide */ + public static final String FLAG_RESPECT_REQUESTED_TASK_SNAPSHOT_RESOLUTION = "com.android.window.flags.respect_requested_task_snapshot_resolution"; /** @hide */ - public static final String FLAG_REMOVE_PREPARE_SURFACE_IN_PLACEMENT = "com.android.window.flags.remove_prepare_surface_in_placement"; + public static final String FLAG_RESTORE_USER_ASPECT_RATIO_SETTINGS_USING_SERVICE = "com.android.window.flags.restore_user_aspect_ratio_settings_using_service"; + /** @hide */ + public static final String FLAG_RESTRICT_FREEFORM_HIDDEN_SYSTEM_BARS_TO_FILLING_TASKS = "com.android.window.flags.restrict_freeform_hidden_system_bars_to_filling_tasks"; + /** @hide */ + public static final String FLAG_RETURN_ALL_VISIBLE_ACTIVITIES_FOR_VIS = "com.android.window.flags.return_all_visible_activities_for_vis"; + /** @hide */ + public static final String FLAG_ROOT_TASK_FOR_BUBBLE = "com.android.window.flags.root_task_for_bubble"; + /** @hide */ + public static final String FLAG_SAFE_REGION_LETTERBOXING_V1 = "com.android.window.flags.safe_region_letterboxing_v1"; /** @hide */ public static final String FLAG_SCREEN_RECORDING_CALLBACKS = "com.android.window.flags.screen_recording_callbacks"; /** @hide */ - public static final String FLAG_SDK_DESIRED_PRESENT_TIME = "com.android.window.flags.sdk_desired_present_time"; + public static final String FLAG_SCROLLING_FROM_LETTERBOX = "com.android.window.flags.scrolling_from_letterbox"; + /** @hide */ + public static final String FLAG_SCVH_SET_FOCUSABLE = "com.android.window.flags.scvh_set_focusable"; /** @hide */ - public static final String FLAG_SECURE_WINDOW_STATE = "com.android.window.flags.secure_window_state"; + public static final String FLAG_SCVH_SURFACE_CONTROL_LIFETIME_FIX = "com.android.window.flags.scvh_surface_control_lifetime_fix"; + /** @hide */ + public static final String FLAG_SDK_DESIRED_PRESENT_TIME = "com.android.window.flags.sdk_desired_present_time"; /** @hide */ public static final String FLAG_SET_SC_PROPERTIES_IN_CLIENT = "com.android.window.flags.set_sc_properties_in_client"; /** @hide */ - public static final String FLAG_SKIP_SLEEPING_WHEN_SWITCHING_DISPLAY = "com.android.window.flags.skip_sleeping_when_switching_display"; + public static final String FLAG_SHOW_APP_HANDLE_LARGE_SCREENS = "com.android.window.flags.show_app_handle_large_screens"; /** @hide */ - public static final String FLAG_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI = "com.android.window.flags.supports_multi_instance_system_ui"; + public static final String FLAG_SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_MESSAGE = "com.android.window.flags.show_biometric_prompt_secondary_display_message"; /** @hide */ - public static final String FLAG_SURFACE_CONTROL_INPUT_RECEIVER = "com.android.window.flags.surface_control_input_receiver"; + public static final String FLAG_SHOW_DESKTOP_EXPERIENCE_DEV_OPTION = "com.android.window.flags.show_desktop_experience_dev_option"; /** @hide */ - public static final String FLAG_SURFACE_TRUSTED_OVERLAY = "com.android.window.flags.surface_trusted_overlay"; + public static final String FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION = "com.android.window.flags.show_desktop_windowing_dev_option"; /** @hide */ - public static final String FLAG_SYNC_SCREEN_CAPTURE = "com.android.window.flags.sync_screen_capture"; + public static final String FLAG_SHOW_HOME_BEHIND_DESKTOP = "com.android.window.flags.show_home_behind_desktop"; /** @hide */ - public static final String FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG = "com.android.window.flags.task_fragment_system_organizer_flag"; + public static final String FLAG_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE = "com.android.window.flags.skip_compat_ui_education_in_desktop_mode"; /** @hide */ - public static final String FLAG_TRANSIT_READY_TRACKING = "com.android.window.flags.transit_ready_tracking"; + public static final String FLAG_SKIP_DEACTIVATION_OF_DESK_WITH_NOTHING_IN_FRONT = "com.android.window.flags.skip_deactivation_of_desk_with_nothing_in_front"; /** @hide */ - public static final String FLAG_TRUSTED_PRESENTATION_LISTENER_FOR_WINDOW = "com.android.window.flags.trusted_presentation_listener_for_window"; + public static final String FLAG_SKIP_DECOR_VIEW_RELAYOUT_WHEN_CLOSING_BUGFIX = "com.android.window.flags.skip_decor_view_relayout_when_closing_bugfix"; /** @hide */ - public static final String FLAG_UNTRUSTED_EMBEDDING_ANY_APP_PERMISSION = "com.android.window.flags.untrusted_embedding_any_app_permission"; + public static final String FLAG_SUPPORT_GEMINI_ON_MULTI_DISPLAY = "com.android.window.flags.support_gemini_on_multi_display"; /** @hide */ - public static final String FLAG_UNTRUSTED_EMBEDDING_STATE_SHARING = "com.android.window.flags.untrusted_embedding_state_sharing"; + public static final String FLAG_SYSTEM_CONTENT_PRIORITY = "com.android.window.flags.system_content_priority"; /** @hide */ - public static final String FLAG_USE_WINDOW_ORIGINAL_TOUCHABLE_REGION_WHEN_MAGNIFICATION_RECOMPUTE_BOUNDS = "com.android.window.flags.use_window_original_touchable_region_when_magnification_recompute_bounds"; + public static final String FLAG_SYSTEM_UI_POST_ANIMATION_END = "com.android.window.flags.system_ui_post_animation_end"; /** @hide */ - public static final String FLAG_USER_MIN_ASPECT_RATIO_APP_DEFAULT = "com.android.window.flags.user_min_aspect_ratio_app_default"; + public static final String FLAG_TASK_FRAGMENT_COMPANION_ACTIVITY = "com.android.window.flags.task_fragment_companion_activity"; /** @hide */ - public static final String FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH = "com.android.window.flags.wait_for_transition_on_display_switch"; + public static final String FLAG_TASKBAR_RUNNING_TASKS_IN_SPLITSCREEN_SELECT = "com.android.window.flags.taskbar_running_tasks_in_splitscreen_select"; /** @hide */ - public static final String FLAG_WALLPAPER_OFFSET_ASYNC = "com.android.window.flags.wallpaper_offset_async"; + public static final String FLAG_TOGGLE_FULLSCREEN_STATE_VIA_FULLSCREEN_KEY = "com.android.window.flags.toggle_fullscreen_state_via_fullscreen_key"; /** @hide */ - public static final String FLAG_WINDOW_SESSION_RELAYOUT_INFO = "com.android.window.flags.window_session_relayout_info"; + public static final String FLAG_TOUCH_PASS_THROUGH_OPT_IN = "com.android.window.flags.touch_pass_through_opt_in"; /** @hide */ - public static final String FLAG_WINDOW_TOKEN_CONFIG_THREAD_SAFE = "com.android.window.flags.window_token_config_thread_safe"; - - public static boolean activityEmbeddingAnimationCustomizationFlag() { - return FEATURE_FLAGS.activityEmbeddingAnimationCustomizationFlag(); - } - - public static boolean activityEmbeddingInteractiveDividerFlag() { - return FEATURE_FLAGS.activityEmbeddingInteractiveDividerFlag(); - } - - public static boolean activityEmbeddingOverlayPresentationFlag() { - return FEATURE_FLAGS.activityEmbeddingOverlayPresentationFlag(); - } - - public static boolean activitySnapshotByDefault() { - return FEATURE_FLAGS.activitySnapshotByDefault(); - } - - public static boolean activityWindowInfoFlag() { - return FEATURE_FLAGS.activityWindowInfoFlag(); + public static final String FLAG_TRANSFER_STARTING_WINDOW_TO_NEXT_WHEN_INVISIBLE = "com.android.window.flags.transfer_starting_window_to_next_when_invisible"; + /** @hide */ + public static final String FLAG_TRANSIT_READY_TRACKING = "com.android.window.flags.transit_ready_tracking"; + /** @hide */ + public static final String FLAG_TRANSIT_TRACKER_PLUMBING = "com.android.window.flags.transit_tracker_plumbing"; + /** @hide */ + public static final String FLAG_TRANSITION_HANDLER_CUJ_TAGS = "com.android.window.flags.transition_handler_cuj_tags"; + /** @hide */ + public static final String FLAG_UNIFY_SHELL_BINDERS = "com.android.window.flags.unify_shell_binders"; + /** @hide */ + public static final String FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT = "com.android.window.flags.universal_resizable_by_default"; + /** @hide */ + public static final String FLAG_UNTRUSTED_EMBEDDING_ANY_APP_PERMISSION = "com.android.window.flags.untrusted_embedding_any_app_permission"; + /** @hide */ + public static final String FLAG_UNTRUSTED_EMBEDDING_STATE_SHARING = "com.android.window.flags.untrusted_embedding_state_sharing"; + /** @hide */ + public static final String FLAG_UPDATE_DIMS_WHEN_WINDOW_SHOWN = "com.android.window.flags.update_dims_when_window_shown"; + /** @hide */ + public static final String FLAG_UPDATE_TASK_CROP_IN_SYNC = "com.android.window.flags.update_task_crop_in_sync"; + /** @hide */ + public static final String FLAG_USE_INPUT_REPORTED_FOCUS_FOR_ACCESSIBILITY = "com.android.window.flags.use_input_reported_focus_for_accessibility"; + /** @hide */ + public static final String FLAG_VDM_FORCE_APP_UNIVERSAL_RESIZABLE_API = "com.android.window.flags.vdm_force_app_universal_resizable_api"; + /** @hide */ + public static final String FLAG_WAIT_FOR_PRESENT_FENCE_ON_DISPLAY_SWITCH = "com.android.window.flags.wait_for_present_fence_on_display_switch"; + + + public static boolean activityEmbeddingAbortCrossUidLaunchInFinishingTaskFragment() { + + return FEATURE_FLAGS.activityEmbeddingAbortCrossUidLaunchInFinishingTaskFragment(); } - - public static boolean allowDisableActivityRecordInputSink() { - return FEATURE_FLAGS.allowDisableActivityRecordInputSink(); + + + public static boolean activityEmbeddingDelayTaskFragmentFinishForActivityLaunch() { + + return FEATURE_FLAGS.activityEmbeddingDelayTaskFragmentFinishForActivityLaunch(); } - - public static boolean allowHideScmButton() { - return FEATURE_FLAGS.allowHideScmButton(); + + + public static boolean activityEmbeddingInteractiveDividerFlag() { + + return FEATURE_FLAGS.activityEmbeddingInteractiveDividerFlag(); } - - public static boolean allowsScreenSizeDecoupledFromStatusBarAndCutout() { - return FEATURE_FLAGS.allowsScreenSizeDecoupledFromStatusBarAndCutout(); + + + public static boolean activityEmbeddingMetrics() { + + return FEATURE_FLAGS.activityEmbeddingMetrics(); } - - public static boolean alwaysDeferTransitionWhenApplyWct() { - return FEATURE_FLAGS.alwaysDeferTransitionWhenApplyWct(); + + + public static boolean allowDisableActivityRecordInputSink() { + + return FEATURE_FLAGS.allowDisableActivityRecordInputSink(); } - + + public static boolean alwaysDrawMagnificationFullscreenBorder() { + return FEATURE_FLAGS.alwaysDrawMagnificationFullscreenBorder(); } - + + + public static boolean alwaysSeqIdLayout() { + + return FEATURE_FLAGS.alwaysSeqIdLayout(); + } + + + public static boolean alwaysSeqIdLayoutWear() { + + return FEATURE_FLAGS.alwaysSeqIdLayoutWear(); + } + + public static boolean alwaysUpdateWallpaperPermission() { + return FEATURE_FLAGS.alwaysUpdateWallpaperPermission(); } - + + + public static boolean aodTransition() { + + return FEATURE_FLAGS.aodTransition(); + } + + public static boolean appCompatPropertiesApi() { + return FEATURE_FLAGS.appCompatPropertiesApi(); } - + + public static boolean appCompatRefactoring() { + return FEATURE_FLAGS.appCompatRefactoring(); } - - public static boolean balDontBringExistingBackgroundTaskStackToFg() { - return FEATURE_FLAGS.balDontBringExistingBackgroundTaskStackToFg(); + + + public static boolean appCompatRefactoringFixMultiwindowTaskHierarchy() { + + return FEATURE_FLAGS.appCompatRefactoringFixMultiwindowTaskHierarchy(); + } + + + public static boolean appCompatRefactoringForceChangeForLetterboxTransitions() { + + return FEATURE_FLAGS.appCompatRefactoringForceChangeForLetterboxTransitions(); + } + + + public static boolean appCompatRefactoringRoundedCorners() { + + return FEATURE_FLAGS.appCompatRefactoringRoundedCorners(); + } + + + public static boolean appCompatRefactoringRoundedCornersAnimation() { + + return FEATURE_FLAGS.appCompatRefactoringRoundedCornersAnimation(); + } + + + public static boolean appCompatRefactoringSetAppboundsToNullWhenEmpty() { + + return FEATURE_FLAGS.appCompatRefactoringSetAppboundsToNullWhenEmpty(); + } + + + public static boolean appCompatRefactoringSkipStartingWindowLetterbox() { + + return FEATURE_FLAGS.appCompatRefactoringSkipStartingWindowLetterbox(); + } + + + public static boolean appCompatRefactoringUseActivityLeashForLetterboxing() { + + return FEATURE_FLAGS.appCompatRefactoringUseActivityLeashForLetterboxing(); + } + + + public static boolean appCompatUiFramework() { + + return FEATURE_FLAGS.appCompatUiFramework(); + } + + + public static boolean appHandleNoRelayoutOnExclusionChange() { + + return FEATURE_FLAGS.appHandleNoRelayoutOnExclusionChange(); + } + + + public static boolean applyDeskActivationOnUserSwitch() { + + return FEATURE_FLAGS.applyDeskActivationOnUserSwitch(); + } + + + public static boolean applyLifecycleOnPipChange() { + + return FEATURE_FLAGS.applyLifecycleOnPipChange(); + } + + + public static boolean avoidRebindingIntentionallyDisconnectedWallpaper() { + + return FEATURE_FLAGS.avoidRebindingIntentionallyDisconnectedWallpaper(); + } + + + public static boolean backupAndRestoreForUserAspectRatioSettings() { + + return FEATURE_FLAGS.backupAndRestoreForUserAspectRatioSettings(); + } + + + public static boolean balAdditionalStartModes() { + + return FEATURE_FLAGS.balAdditionalStartModes(); + } + + + public static boolean balCheckBroadcastWhenDispatched() { + + return FEATURE_FLAGS.balCheckBroadcastWhenDispatched(); + } + + + public static boolean balCoverIntentSender() { + + return FEATURE_FLAGS.balCoverIntentSender(); + } + + + public static boolean balDontBringExistingBackgroundTaskStackToFg() { + + return FEATURE_FLAGS.balDontBringExistingBackgroundTaskStackToFg(); + } + + + public static boolean balReduceGracePeriod() { + + return FEATURE_FLAGS.balReduceGracePeriod(); + } + + + public static boolean balReportAbortedActivityStarts() { + + return FEATURE_FLAGS.balReportAbortedActivityStarts(); + } + + + public static boolean balRespectAppSwitchStateWhenCheckBoundByForegroundUid() { + + return FEATURE_FLAGS.balRespectAppSwitchStateWhenCheckBoundByForegroundUid(); + } + + + public static boolean balSendIntentWithOptions() { + + return FEATURE_FLAGS.balSendIntentWithOptions(); + } + + + public static boolean balStrictModeRo() { + + return FEATURE_FLAGS.balStrictModeRo(); + } + + + public static boolean cameraCompatFullscreenPickSameTaskActivity() { + + return FEATURE_FLAGS.cameraCompatFullscreenPickSameTaskActivity(); + } + + + public static boolean cameraCompatLandscapeCameraSupport() { + + return FEATURE_FLAGS.cameraCompatLandscapeCameraSupport(); + } + + + public static boolean cameraCompatUnifyCameraPolicies() { + + return FEATURE_FLAGS.cameraCompatUnifyCameraPolicies(); + } + + + public static boolean clearReusableScvhOnRelease() { + + return FEATURE_FLAGS.clearReusableScvhOnRelease(); + } + + + public static boolean closeFullscreenAndSplitscreenKeyboardShortcut() { + + return FEATURE_FLAGS.closeFullscreenAndSplitscreenKeyboardShortcut(); + } + + + public static boolean closeTaskKeyboardShortcut() { + + return FEATURE_FLAGS.closeTaskKeyboardShortcut(); + } + + + public static boolean closeToSquareConfigIncludesStatusBar() { + + return FEATURE_FLAGS.closeToSquareConfigIncludesStatusBar(); + } + + + public static boolean coverDisplayOptIn() { + + return FEATURE_FLAGS.coverDisplayOptIn(); + } + + + public static boolean currentAnimatorScaleUsesSharedMemory() { + + return FEATURE_FLAGS.currentAnimatorScaleUsesSharedMemory(); + } + + + public static boolean defaultDeskWithoutWarmupMigration() { + + return FEATURE_FLAGS.defaultDeskWithoutWarmupMigration(); + } + + + public static boolean deferResumeFocusInNonFocusedWindow() { + + return FEATURE_FLAGS.deferResumeFocusInNonFocusedWindow(); + } + + + public static boolean density390Api() { + + return FEATURE_FLAGS.density390Api(); + } + + + public static boolean deprecateSurfaceAnimationFrameCallback() { + + return FEATURE_FLAGS.deprecateSurfaceAnimationFrameCallback(); + } + + + public static boolean deprecateWindowAnimatorFrameCallback() { + + return FEATURE_FLAGS.deprecateWindowAnimatorFrameCallback(); + } + + + public static boolean dimmingWallpaperForMaximizedAndTiled() { + + return FEATURE_FLAGS.dimmingWallpaperForMaximizedAndTiled(); + } + + + public static boolean disableDesktopLaunchParamsOutsideDesktopBugFix() { + + return FEATURE_FLAGS.disableDesktopLaunchParamsOutsideDesktopBugFix(); + } + + + public static boolean disableNonResizableAppSnapResizing() { + + return FEATURE_FLAGS.disableNonResizableAppSnapResizing(); + } + + + public static boolean disableRestoreNonFullscreenBoundsOnConfigurationChange() { + + return FEATURE_FLAGS.disableRestoreNonFullscreenBoundsOnConfigurationChange(); + } + + + public static boolean doNotForceWallpaperForFreeformTask() { + + return FEATURE_FLAGS.doNotForceWallpaperForFreeformTask(); + } + + + public static boolean enableAccessibleCustomHeaders() { + + return FEATURE_FLAGS.enableAccessibleCustomHeaders(); + } + + + public static boolean enableActivityEmbeddingSupportForConnectedDisplays() { + + return FEATURE_FLAGS.enableActivityEmbeddingSupportForConnectedDisplays(); + } + + + public static boolean enableAppHandlePositionReporting() { + + return FEATURE_FLAGS.enableAppHandlePositionReporting(); + } + + + public static boolean enableAppHeaderWithTaskDensity() { + + return FEATURE_FLAGS.enableAppHeaderWithTaskDensity(); + } + + + public static boolean enableAppToWebEducationAnimation() { + + return FEATURE_FLAGS.enableAppToWebEducationAnimation(); + } + + + public static boolean enableAutoRestartOnDisplayMove() { + + return FEATURE_FLAGS.enableAutoRestartOnDisplayMove(); + } + + + public static boolean enableBackupAndRestoreDisplayWindowSettings() { + + return FEATURE_FLAGS.enableBackupAndRestoreDisplayWindowSettings(); + } + + + public static boolean enableBlockNonDesktopDisplayWindowDragBugfix() { + + return FEATURE_FLAGS.enableBlockNonDesktopDisplayWindowDragBugfix(); + } + + + public static boolean enableBorderSettings() { + + return FEATURE_FLAGS.enableBorderSettings(); + } + + + public static boolean enableBoundsRestoringOnTilingExit() { + + return FEATURE_FLAGS.enableBoundsRestoringOnTilingExit(); + } + + + public static boolean enableBoxShadowSettings() { + + return FEATURE_FLAGS.enableBoxShadowSettings(); + } + + + public static boolean enableBugFixesForSecondaryDisplay() { + + return FEATURE_FLAGS.enableBugFixesForSecondaryDisplay(); + } + + + public static boolean enableCameraCompatCompatibilityInfoRotateAndCropBugfix() { + + return FEATURE_FLAGS.enableCameraCompatCompatibilityInfoRotateAndCropBugfix(); + } + + + public static boolean enableCameraCompatExternalDisplayRotationBugfix() { + + return FEATURE_FLAGS.enableCameraCompatExternalDisplayRotationBugfix(); + } + + + public static boolean enableCameraCompatForDesktopWindowing() { + + return FEATURE_FLAGS.enableCameraCompatForDesktopWindowing(); + } + + + public static boolean enableCameraCompatForDesktopWindowingOptOut() { + + return FEATURE_FLAGS.enableCameraCompatForDesktopWindowingOptOut(); + } + + + public static boolean enableCameraCompatForDesktopWindowingOptOutApi() { + + return FEATURE_FLAGS.enableCameraCompatForDesktopWindowingOptOutApi(); + } + + + public static boolean enableCameraCompatSandboxDisplayRotationOnExternalDisplaysBugfix() { + + return FEATURE_FLAGS.enableCameraCompatSandboxDisplayRotationOnExternalDisplaysBugfix(); + } + + + public static boolean enableCameraCompatTrackTaskAndAppBugfix() { + + return FEATURE_FLAGS.enableCameraCompatTrackTaskAndAppBugfix(); + } + + + public static boolean enableCaptionCompatInsetConversion() { + + return FEATURE_FLAGS.enableCaptionCompatInsetConversion(); + } + + + public static boolean enableCaptionCompatInsetForceConsumption() { + + return FEATURE_FLAGS.enableCaptionCompatInsetForceConsumption(); + } + + + public static boolean enableCaptionCompatInsetForceConsumptionAlways() { + + return FEATURE_FLAGS.enableCaptionCompatInsetForceConsumptionAlways(); + } + + + public static boolean enableCascadingWindows() { + + return FEATURE_FLAGS.enableCascadingWindows(); + } + + + public static boolean enableCloseLidInteraction() { + + return FEATURE_FLAGS.enableCloseLidInteraction(); + } + + + public static boolean enableCompatUiDesktopModeSynchronizationBugfix() { + + return FEATURE_FLAGS.enableCompatUiDesktopModeSynchronizationBugfix(); + } + + + public static boolean enableCompatUiVisibilityStatus() { + + return FEATURE_FLAGS.enableCompatUiVisibilityStatus(); + } + + + public static boolean enableCompatuiSysuiLauncherFix() { + + return FEATURE_FLAGS.enableCompatuiSysuiLauncherFix(); + } + + + public static boolean enableConnectedDisplaysDnd() { + + return FEATURE_FLAGS.enableConnectedDisplaysDnd(); + } + + + public static boolean enableConnectedDisplaysPip() { + + return FEATURE_FLAGS.enableConnectedDisplaysPip(); + } + + + public static boolean enableConnectedDisplaysWallpaperPresentations() { + + return FEATURE_FLAGS.enableConnectedDisplaysWallpaperPresentations(); + } + + + public static boolean enableConnectedDisplaysWindowDrag() { + + return FEATURE_FLAGS.enableConnectedDisplaysWindowDrag(); + } + + + public static boolean enableCrashLoggingForDesktop() { + + return FEATURE_FLAGS.enableCrashLoggingForDesktop(); + } + + + public static boolean enableCrossDisplaysAppLaunchTransition() { + + return FEATURE_FLAGS.enableCrossDisplaysAppLaunchTransition(); + } + + + public static boolean enableCrossDisplaysPipTaskLaunch() { + + return FEATURE_FLAGS.enableCrossDisplaysPipTaskLaunch(); + } + + + public static boolean enableDesktopAppHandleAnimation() { + + return FEATURE_FLAGS.enableDesktopAppHandleAnimation(); + } + + + public static boolean enableDesktopAppHeaderStateChangeAnnouncements() { + + return FEATURE_FLAGS.enableDesktopAppHeaderStateChangeAnnouncements(); + } + + + public static boolean enableDesktopAppLaunchAlttabTransitions() { + + return FEATURE_FLAGS.enableDesktopAppLaunchAlttabTransitions(); + } + + + public static boolean enableDesktopAppLaunchAlttabTransitionsBugfix() { + + return FEATURE_FLAGS.enableDesktopAppLaunchAlttabTransitionsBugfix(); + } + + + public static boolean enableDesktopAppLaunchBugfix() { + + return FEATURE_FLAGS.enableDesktopAppLaunchBugfix(); + } + + + public static boolean enableDesktopAppLaunchTransitions() { + + return FEATURE_FLAGS.enableDesktopAppLaunchTransitions(); + } + + + public static boolean enableDesktopAppLaunchTransitionsBugfix() { + + return FEATURE_FLAGS.enableDesktopAppLaunchTransitionsBugfix(); + } + + + public static boolean enableDesktopCloseShortcutBugfix() { + + return FEATURE_FLAGS.enableDesktopCloseShortcutBugfix(); + } + + + public static boolean enableDesktopCloseTaskAnimationInDtcBugfix() { + + return FEATURE_FLAGS.enableDesktopCloseTaskAnimationInDtcBugfix(); + } + + + public static boolean enableDesktopFirstBasedDefaultToDesktopBugfix() { + + return FEATURE_FLAGS.enableDesktopFirstBasedDefaultToDesktopBugfix(); + } + + + public static boolean enableDesktopFirstBasedDragToMaximize() { + + return FEATURE_FLAGS.enableDesktopFirstBasedDragToMaximize(); + } + + + public static boolean enableDesktopFirstFullscreenRefocusBugfix() { + + return FEATURE_FLAGS.enableDesktopFirstFullscreenRefocusBugfix(); + } + + + public static boolean enableDesktopFirstListener() { + + return FEATURE_FLAGS.enableDesktopFirstListener(); + } + + + public static boolean enableDesktopFirstPolicyInLpm() { + + return FEATURE_FLAGS.enableDesktopFirstPolicyInLpm(); + } + + + public static boolean enableDesktopFirstTopFullscreenBugfix() { + + return FEATURE_FLAGS.enableDesktopFirstTopFullscreenBugfix(); + } + + + public static boolean enableDesktopImeBugfix() { + + return FEATURE_FLAGS.enableDesktopImeBugfix(); + } + + + public static boolean enableDesktopImmersiveDragBugfix() { + + return FEATURE_FLAGS.enableDesktopImmersiveDragBugfix(); + } + + + public static boolean enableDesktopIndicatorInSeparateThreadBugfix() { + + return FEATURE_FLAGS.enableDesktopIndicatorInSeparateThreadBugfix(); + } + + + public static boolean enableDesktopInvisibleTaskRemovalCleanupBugfix() { + + return FEATURE_FLAGS.enableDesktopInvisibleTaskRemovalCleanupBugfix(); + } + + + public static boolean enableDesktopModeThroughDevOption() { + + return FEATURE_FLAGS.enableDesktopModeThroughDevOption(); + } + + + public static boolean enableDesktopOpeningDeeplinkMinimizeAnimationBugfix() { + + return FEATURE_FLAGS.enableDesktopOpeningDeeplinkMinimizeAnimationBugfix(); + } + + + public static boolean enableDesktopRecentsTransitionsCornersBugfix() { + + return FEATURE_FLAGS.enableDesktopRecentsTransitionsCornersBugfix(); + } + + + public static boolean enableDesktopSplitscreenTransitionBugfix() { + + return FEATURE_FLAGS.enableDesktopSplitscreenTransitionBugfix(); + } + + + public static boolean enableDesktopSystemDialogsTransitions() { + + return FEATURE_FLAGS.enableDesktopSystemDialogsTransitions(); + } + + + public static boolean enableDesktopTabTearingLaunchAnimation() { + + return FEATURE_FLAGS.enableDesktopTabTearingLaunchAnimation(); + } + + + public static boolean enableDesktopTabTearingMinimizeAnimationBugfix() { + + return FEATURE_FLAGS.enableDesktopTabTearingMinimizeAnimationBugfix(); + } + + + public static boolean enableDesktopTaskLimitSeparateTransition() { + + return FEATURE_FLAGS.enableDesktopTaskLimitSeparateTransition(); + } + + + public static boolean enableDesktopTaskbarOnFreeformDisplays() { + + return FEATURE_FLAGS.enableDesktopTaskbarOnFreeformDisplays(); + } + + + public static boolean enableDesktopTrampolineCloseAnimationBugfix() { + + return FEATURE_FLAGS.enableDesktopTrampolineCloseAnimationBugfix(); + } + + + public static boolean enableDesktopWallpaperActivityForSystemUser() { + + return FEATURE_FLAGS.enableDesktopWallpaperActivityForSystemUser(); + } + + + public static boolean enableDesktopWindowingAppHandleEducation() { + + return FEATURE_FLAGS.enableDesktopWindowingAppHandleEducation(); + } + + + public static boolean enableDesktopWindowingAppToWeb() { + + return FEATURE_FLAGS.enableDesktopWindowingAppToWeb(); + } + + + public static boolean enableDesktopWindowingAppToWebEducation() { + + return FEATURE_FLAGS.enableDesktopWindowingAppToWebEducation(); + } + + + public static boolean enableDesktopWindowingAppToWebEducationIntegration() { + + return FEATURE_FLAGS.enableDesktopWindowingAppToWebEducationIntegration(); + } + + + public static boolean enableDesktopWindowingBackNavigation() { + + return FEATURE_FLAGS.enableDesktopWindowingBackNavigation(); + } + + + public static boolean enableDesktopWindowingEnterTransitionBugfix() { + + return FEATURE_FLAGS.enableDesktopWindowingEnterTransitionBugfix(); + } + + + public static boolean enableDesktopWindowingEnterTransitions() { + + return FEATURE_FLAGS.enableDesktopWindowingEnterTransitions(); + } + + + public static boolean enableDesktopWindowingEnterpriseBugfix() { + + return FEATURE_FLAGS.enableDesktopWindowingEnterpriseBugfix(); + } + + + public static boolean enableDesktopWindowingExitByMinimizeTransitionBugfix() { + + return FEATURE_FLAGS.enableDesktopWindowingExitByMinimizeTransitionBugfix(); + } + + + public static boolean enableDesktopWindowingExitTransitions() { + + return FEATURE_FLAGS.enableDesktopWindowingExitTransitions(); + } + + + public static boolean enableDesktopWindowingExitTransitionsBugfix() { + + return FEATURE_FLAGS.enableDesktopWindowingExitTransitionsBugfix(); + } + + + public static boolean enableDesktopWindowingHsum() { + + return FEATURE_FLAGS.enableDesktopWindowingHsum(); + } + + + public static boolean enableDesktopWindowingImmersiveHandleHiding() { + + return FEATURE_FLAGS.enableDesktopWindowingImmersiveHandleHiding(); + } + + + public static boolean enableDesktopWindowingModalsPolicy() { + + return FEATURE_FLAGS.enableDesktopWindowingModalsPolicy(); + } + + + public static boolean enableDesktopWindowingMode() { + + return FEATURE_FLAGS.enableDesktopWindowingMode(); + } + + + public static boolean enableDesktopWindowingMultiInstanceFeatures() { + + return FEATURE_FLAGS.enableDesktopWindowingMultiInstanceFeatures(); + } + + + public static boolean enableDesktopWindowingPersistence() { + + return FEATURE_FLAGS.enableDesktopWindowingPersistence(); + } + + + public static boolean enableDesktopWindowingPip() { + + return FEATURE_FLAGS.enableDesktopWindowingPip(); + } + + + public static boolean enableDesktopWindowingPipInOverviewBugfix() { + + return FEATURE_FLAGS.enableDesktopWindowingPipInOverviewBugfix(); + } + + + public static boolean enableDesktopWindowingQuickSwitch() { + + return FEATURE_FLAGS.enableDesktopWindowingQuickSwitch(); + } + + + public static boolean enableDesktopWindowingScvhCacheBugFix() { + + return FEATURE_FLAGS.enableDesktopWindowingScvhCacheBugFix(); + } + + + public static boolean enableDesktopWindowingSizeConstraints() { + + return FEATURE_FLAGS.enableDesktopWindowingSizeConstraints(); + } + + + public static boolean enableDesktopWindowingTaskLimit() { + + return FEATURE_FLAGS.enableDesktopWindowingTaskLimit(); + } + + + public static boolean enableDesktopWindowingTaskbarRunningApps() { + + return FEATURE_FLAGS.enableDesktopWindowingTaskbarRunningApps(); + } + + + public static boolean enableDesktopWindowingTransitions() { + + return FEATURE_FLAGS.enableDesktopWindowingTransitions(); + } + + + public static boolean enableDesktopWindowingWallpaperActivity() { + + return FEATURE_FLAGS.enableDesktopWindowingWallpaperActivity(); + } + + + public static boolean enableDeviceStateAutoRotateSettingLogging() { + + return FEATURE_FLAGS.enableDeviceStateAutoRotateSettingLogging(); + } + + + public static boolean enableDeviceStateAutoRotateSettingRefactor() { + + return FEATURE_FLAGS.enableDeviceStateAutoRotateSettingRefactor(); + } + + + public static boolean enableDialogDisplayFixes() { + + return FEATURE_FLAGS.enableDialogDisplayFixes(); + } + + + public static boolean enableDisplayCompatMode() { + + return FEATURE_FLAGS.enableDisplayCompatMode(); + } + + + public static boolean enableDisplayDisconnectInteraction() { + + return FEATURE_FLAGS.enableDisplayDisconnectInteraction(); + } + + + public static boolean enableDisplayFocusInShellTransitions() { + + return FEATURE_FLAGS.enableDisplayFocusInShellTransitions(); + } + + + public static boolean enableDisplayReconnectInteraction() { + + return FEATURE_FLAGS.enableDisplayReconnectInteraction(); + } + + + public static boolean enableDisplayWindowingModeSwitching() { + + return FEATURE_FLAGS.enableDisplayWindowingModeSwitching(); + } + + + public static boolean enableDragEndStableBoundsReset() { + + return FEATURE_FLAGS.enableDragEndStableBoundsReset(); + } + + + public static boolean enableDragResizeSetUpInBgThread() { + + return FEATURE_FLAGS.enableDragResizeSetUpInBgThread(); + } + + + public static boolean enableDragToDesktopIncomingTransitionsBugfix() { + + return FEATURE_FLAGS.enableDragToDesktopIncomingTransitionsBugfix(); + } + + + public static boolean enableDragToMaximize() { + + return FEATURE_FLAGS.enableDragToMaximize(); + } + + + public static boolean enableDraggingPipAcrossDisplays() { + + return FEATURE_FLAGS.enableDraggingPipAcrossDisplays(); + } + + + public static boolean enableDrawingAppHandle() { + + return FEATURE_FLAGS.enableDrawingAppHandle(); + } + + + public static boolean enableDreamActivityWindowingExclusion() { + + return FEATURE_FLAGS.enableDreamActivityWindowingExclusion(); + } + + + public static boolean enableDynamicRadiusComputationBugfix() { + + return FEATURE_FLAGS.enableDynamicRadiusComputationBugfix(); + } + + + public static boolean enableEmptyDeskOnMinimize() { + + return FEATURE_FLAGS.enableEmptyDeskOnMinimize(); + } + + + public static boolean enableExperimentalBubblesController() { + + return FEATURE_FLAGS.enableExperimentalBubblesController(); + } + + + public static boolean enableExternalDisplayPersistenceBugfix() { + + return FEATURE_FLAGS.enableExternalDisplayPersistenceBugfix(); + } + + + public static boolean enableFreeformBoxShadows() { + + return FEATURE_FLAGS.enableFreeformBoxShadows(); + } + + + public static boolean enableFreeformDisplayLaunchParams() { + + return FEATURE_FLAGS.enableFreeformDisplayLaunchParams(); + } + + + public static boolean enableFullScreenWindowOnRemovingSplitScreenStageBugfix() { + + return FEATURE_FLAGS.enableFullScreenWindowOnRemovingSplitScreenStageBugfix(); + } + + + public static boolean enableFullscreenWindowControls() { + + return FEATURE_FLAGS.enableFullscreenWindowControls(); + } + + + public static boolean enableFullyImmersiveInDesktop() { + + return FEATURE_FLAGS.enableFullyImmersiveInDesktop(); + } + + + public static boolean enableHandleInputFix() { + + return FEATURE_FLAGS.enableHandleInputFix(); + } + + + public static boolean enableHandlersDebuggingMode() { + + return FEATURE_FLAGS.enableHandlersDebuggingMode(); + } + + + public static boolean enableHoldToDragAppHandle() { + + return FEATURE_FLAGS.enableHoldToDragAppHandle(); + } + + + public static boolean enableIndependentBackInProjected() { + + return FEATURE_FLAGS.enableIndependentBackInProjected(); + } + + + public static boolean enableInorderTransitionCallbacksForDesktop() { + + return FEATURE_FLAGS.enableInorderTransitionCallbacksForDesktop(); + } + + + public static boolean enableInputLayerTransitionFix() { + + return FEATURE_FLAGS.enableInputLayerTransitionFix(); + } + + + public static boolean enableInteractionDependentTabTearingBounds() { + + return FEATURE_FLAGS.enableInteractionDependentTabTearingBounds(); + } + + + public static boolean enableInteractivePictureInPicture() { + + return FEATURE_FLAGS.enableInteractivePictureInPicture(); + } + + + public static boolean enableKeyGestureHandlerForSysui() { + + return FEATURE_FLAGS.enableKeyGestureHandlerForSysui(); + } + + + public static boolean enableLauncherHandleGoHomeKeyboardShortcut() { + + return FEATURE_FLAGS.enableLauncherHandleGoHomeKeyboardShortcut(); + } + + + public static boolean enableMinimizeButton() { + + return FEATURE_FLAGS.enableMinimizeButton(); + } + + + public static boolean enableMirrorDisplayNoActivity() { + + return FEATURE_FLAGS.enableMirrorDisplayNoActivity(); + } + + + public static boolean enableModalsFullscreenWithPermission() { + + return FEATURE_FLAGS.enableModalsFullscreenWithPermission(); + } + + + public static boolean enableModalsFullscreenWithPlatformSignature() { + + return FEATURE_FLAGS.enableModalsFullscreenWithPlatformSignature(); + } + + + public static boolean enableMoveToNextDisplayShortcut() { + + return FEATURE_FLAGS.enableMoveToNextDisplayShortcut(); + } + + + public static boolean enableMultiDisplayHomeFocusBugFix() { + + return FEATURE_FLAGS.enableMultiDisplayHomeFocusBugFix(); + } + + + public static boolean enableMultiDisplaySplit() { + + return FEATURE_FLAGS.enableMultiDisplaySplit(); + } + + + public static boolean enableMultidisplayTrackpadBackGesture() { + + return FEATURE_FLAGS.enableMultidisplayTrackpadBackGesture(); + } + + + public static boolean enableMultipleDesktopsBackend() { + + return FEATURE_FLAGS.enableMultipleDesktopsBackend(); + } + + + public static boolean enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays() { + + return FEATURE_FLAGS.enableMultipleDesktopsDefaultActivationInDesktopFirstDisplays(); + } + + + public static boolean enableMultipleDesktopsFrontend() { + + return FEATURE_FLAGS.enableMultipleDesktopsFrontend(); + } + + + public static boolean enableNoWindowDecorationForDesks() { + + return FEATURE_FLAGS.enableNoWindowDecorationForDesks(); + } + + + public static boolean enableNonDefaultDisplaySplit() { + + return FEATURE_FLAGS.enableNonDefaultDisplaySplit(); + } + + + public static boolean enableNonDefaultDisplaySplitBugfix() { + + return FEATURE_FLAGS.enableNonDefaultDisplaySplitBugfix(); + } + + + public static boolean enableOpaqueBackgroundForTransparentWindows() { + + return FEATURE_FLAGS.enableOpaqueBackgroundForTransparentWindows(); + } + + + public static boolean enableOverflowButtonForTaskbarPinnedItems() { + + return FEATURE_FLAGS.enableOverflowButtonForTaskbarPinnedItems(); + } + + + public static boolean enablePerDisplayDesktopWallpaperActivity() { + + return FEATURE_FLAGS.enablePerDisplayDesktopWallpaperActivity(); + } + + + public static boolean enablePerDisplayPackageContextCacheInStatusbarNotif() { + + return FEATURE_FLAGS.enablePerDisplayPackageContextCacheInStatusbarNotif(); + } + + + public static boolean enablePerDisplayWindowDecorViewHostPool() { + + return FEATURE_FLAGS.enablePerDisplayWindowDecorViewHostPool(); + } + + + public static boolean enablePersistingDisplaySizeForConnectedDisplays() { + + return FEATURE_FLAGS.enablePersistingDisplaySizeForConnectedDisplays(); + } + + + public static boolean enablePinningAppWithContextMenu() { + + return FEATURE_FLAGS.enablePinningAppWithContextMenu(); + } + + + public static boolean enablePipParamsUpdateNotificationBugfix() { + + return FEATURE_FLAGS.enablePipParamsUpdateNotificationBugfix(); + } + + + public static boolean enablePresentationDisallowedOnUnfocusedHostTask() { + + return FEATURE_FLAGS.enablePresentationDisallowedOnUnfocusedHostTask(); + } + + + public static boolean enablePresentationForConnectedDisplays() { + + return FEATURE_FLAGS.enablePresentationForConnectedDisplays(); + } + + + public static boolean enableProjectedDisplayDesktopMode() { + + return FEATURE_FLAGS.enableProjectedDisplayDesktopMode(); + } + + + public static boolean enableQuickswitchDesktopSplitBugfix() { + + return FEATURE_FLAGS.enableQuickswitchDesktopSplitBugfix(); + } + + + public static boolean enableRejectHomeTransition() { + + return FEATURE_FLAGS.enableRejectHomeTransition(); + } + + + public static boolean enableRemoveStatusBarInputLayer() { + + return FEATURE_FLAGS.enableRemoveStatusBarInputLayer(); + } + + + public static boolean enableRequestFullscreenBugfix() { + + return FEATURE_FLAGS.enableRequestFullscreenBugfix(); + } + + + public static boolean enableRequestFullscreenRefactor() { + + return FEATURE_FLAGS.enableRequestFullscreenRefactor(); + } + + + public static boolean enableRequestFullscreenRestoreFreeformBugfix() { + + return FEATURE_FLAGS.enableRequestFullscreenRestoreFreeformBugfix(); + } + + + public static boolean enableResizingMetrics() { + + return FEATURE_FLAGS.enableResizingMetrics(); + } + + + public static boolean enableRestartMenuForConnectedDisplays() { + + return FEATURE_FLAGS.enableRestartMenuForConnectedDisplays(); + } + + + public static boolean enableRestoreToPreviousSizeFromDesktopImmersive() { + + return FEATURE_FLAGS.enableRestoreToPreviousSizeFromDesktopImmersive(); + } + + + public static boolean enableSeeThroughTaskFragments() { + + return FEATURE_FLAGS.enableSeeThroughTaskFragments(); + } + + + public static boolean enableShellInitialBoundsRegressionBugFix() { + + return FEATURE_FLAGS.enableShellInitialBoundsRegressionBugFix(); + } + + + public static boolean enableShrinkWindowBoundsAfterDrag() { + + return FEATURE_FLAGS.enableShrinkWindowBoundsAfterDrag(); + } + + + public static boolean enableSizeCompatModeImprovementsForConnectedDisplays() { + + return FEATURE_FLAGS.enableSizeCompatModeImprovementsForConnectedDisplays(); + } + + + public static boolean enableStartLaunchTransitionFromTaskbarBugfix() { + + return FEATURE_FLAGS.enableStartLaunchTransitionFromTaskbarBugfix(); + } + + + public static boolean enableSysDecorsCallbacksViaWm() { + + return FEATURE_FLAGS.enableSysDecorsCallbacksViaWm(); + } + + + public static boolean enableTallAppHeaders() { + + return FEATURE_FLAGS.enableTallAppHeaders(); + } + + + public static boolean enableTaskResizingKeyboardShortcuts() { + + return FEATURE_FLAGS.enableTaskResizingKeyboardShortcuts(); + } + + + public static boolean enableTaskStackObserverInShell() { + + return FEATURE_FLAGS.enableTaskStackObserverInShell(); + } + + + public static boolean enableTaskbarConnectedDisplays() { + + return FEATURE_FLAGS.enableTaskbarConnectedDisplays(); + } + + + public static boolean enableTaskbarOverflow() { + + return FEATURE_FLAGS.enableTaskbarOverflow(); + } + + + public static boolean enableTaskbarRecentTasksThrottleBugfix() { + + return FEATURE_FLAGS.enableTaskbarRecentTasksThrottleBugfix(); + } + + + public static boolean enableTaskbarRecentsLayoutTransition() { + + return FEATURE_FLAGS.enableTaskbarRecentsLayoutTransition(); + } + + + public static boolean enableThemedAppHeaders() { + + return FEATURE_FLAGS.enableThemedAppHeaders(); + } + + + public static boolean enableTileResizing() { + + return FEATURE_FLAGS.enableTileResizing(); + } + + + public static boolean enableTopVisibleRootTaskPerUserTracking() { + + return FEATURE_FLAGS.enableTopVisibleRootTaskPerUserTracking(); + } + + + public static boolean enableTransitionOnActivitySetRequestedOrientation() { + + return FEATURE_FLAGS.enableTransitionOnActivitySetRequestedOrientation(); + } + + + public static boolean enableUpdatedDisplayConnectionDialog() { + + return FEATURE_FLAGS.enableUpdatedDisplayConnectionDialog(); + } + + + public static boolean enableUpscalingSizeCompatOnExitingDesktopBugfix() { + + return FEATURE_FLAGS.enableUpscalingSizeCompatOnExitingDesktopBugfix(); + } + + + public static boolean enableVisualIndicatorInTransitionBugfix() { + + return FEATURE_FLAGS.enableVisualIndicatorInTransitionBugfix(); + } + + + public static boolean enableWindowContextResourcesUpdateOnConfigChange() { + + return FEATURE_FLAGS.enableWindowContextResourcesUpdateOnConfigChange(); + } + + + public static boolean enableWindowDecorationRefactor() { + + return FEATURE_FLAGS.enableWindowDecorationRefactor(); + } + + + public static boolean enableWindowDropSmoothTransition() { + + return FEATURE_FLAGS.enableWindowDropSmoothTransition(); + } + + + public static boolean enableWindowRepositioningApi() { + + return FEATURE_FLAGS.enableWindowRepositioningApi(); + } + + + public static boolean enableWindowingDynamicInitialBounds() { + + return FEATURE_FLAGS.enableWindowingDynamicInitialBounds(); + } + + + public static boolean enableWindowingEdgeDragResize() { + + return FEATURE_FLAGS.enableWindowingEdgeDragResize(); + } + + + public static boolean enableWindowingScaledResizing() { + + return FEATURE_FLAGS.enableWindowingScaledResizing(); + } + + + public static boolean enableWindowingTaskStackOrderBugfix() { + + return FEATURE_FLAGS.enableWindowingTaskStackOrderBugfix(); + } + + + public static boolean enableWindowingTransitionHandlersObservers() { + + return FEATURE_FLAGS.enableWindowingTransitionHandlersObservers(); + } + + + public static boolean enforceEdgeToEdge() { + + return FEATURE_FLAGS.enforceEdgeToEdge(); + } + + + public static boolean ensureKeyguardDoesTransitionStartingBugFix() { + + return FEATURE_FLAGS.ensureKeyguardDoesTransitionStartingBugFix(); + } + + + public static boolean ensureWallpaperDrawnOnDisplaySwitch() { + + return FEATURE_FLAGS.ensureWallpaperDrawnOnDisplaySwitch(); + } + + + public static boolean enterDesktopByDefaultOnFreeformDisplays() { + + return FEATURE_FLAGS.enterDesktopByDefaultOnFreeformDisplays(); + } + + + public static boolean excludeCaptionFromAppBounds() { + + return FEATURE_FLAGS.excludeCaptionFromAppBounds(); + } + + + public static boolean excludeDeskRootsFromDesktopTasks() { + + return FEATURE_FLAGS.excludeDeskRootsFromDesktopTasks(); + } + + + public static boolean excludingLayerFromTaskSnapshot() { + + return FEATURE_FLAGS.excludingLayerFromTaskSnapshot(); + } + + + public static boolean fallbackToFocusedDisplay() { + + return FEATURE_FLAGS.fallbackToFocusedDisplay(); + } + + + public static boolean fallbackTransitionPlayer() { + + return FEATURE_FLAGS.fallbackTransitionPlayer(); + } + + + public static boolean fifoPriorityForMajorUiProcesses() { + + return FEATURE_FLAGS.fifoPriorityForMajorUiProcesses(); + } + + + public static boolean fixBalReparentExistingTask() { + + return FEATURE_FLAGS.fixBalReparentExistingTask(); + } + + + public static boolean fixBubbleTrampolineAnimation() { + + return FEATURE_FLAGS.fixBubbleTrampolineAnimation(); + } + + + public static boolean fixHideOverlayApi() { + + return FEATURE_FLAGS.fixHideOverlayApi(); + } + + + public static boolean fixLeakingVisualIndicator() { + + return FEATURE_FLAGS.fixLeakingVisualIndicator(); } - - public static boolean balImproveRealCallerVisibilityCheck() { - return FEATURE_FLAGS.balImproveRealCallerVisibilityCheck(); + + + public static boolean fixRapidTopResumedSwitch() { + + return FEATURE_FLAGS.fixRapidTopResumedSwitch(); } - - public static boolean balImprovedMetrics() { - return FEATURE_FLAGS.balImprovedMetrics(); + + + public static boolean forceCloseTopTransparentFullscreenTask() { + + return FEATURE_FLAGS.forceCloseTopTransparentFullscreenTask(); } - - public static boolean balRequireOptInByPendingIntentCreator() { - return FEATURE_FLAGS.balRequireOptInByPendingIntentCreator(); + + + public static boolean formFactorBasedDesktopFirstSwitch() { + + return FEATURE_FLAGS.formFactorBasedDesktopFirstSwitch(); } - - public static boolean balRequireOptInSameUid() { - return FEATURE_FLAGS.balRequireOptInSameUid(); + + + public static boolean grantManageKeyGesturesToRecents() { + + return FEATURE_FLAGS.grantManageKeyGesturesToRecents(); } - - public static boolean balRespectAppSwitchStateWhenCheckBoundByForegroundUid() { - return FEATURE_FLAGS.balRespectAppSwitchStateWhenCheckBoundByForegroundUid(); + + + public static boolean handleIncompatibleTasksInDesktopLaunchParams() { + + return FEATURE_FLAGS.handleIncompatibleTasksInDesktopLaunchParams(); } - - public static boolean balShowToasts() { - return FEATURE_FLAGS.balShowToasts(); + + + public static boolean ignoreAspectRatioRestrictionsForResizeableFreeformActivities() { + + return FEATURE_FLAGS.ignoreAspectRatioRestrictionsForResizeableFreeformActivities(); } - - public static boolean balShowToastsBlocked() { - return FEATURE_FLAGS.balShowToastsBlocked(); + + + public static boolean ignoreCornerRadiusAndShadows() { + + return FEATURE_FLAGS.ignoreCornerRadiusAndShadows(); } - - public static boolean blastSyncNotificationShadeOnDisplaySwitch() { - return FEATURE_FLAGS.blastSyncNotificationShadeOnDisplaySwitch(); + + + public static boolean ignoreCurrentParamsInDesktopLaunchParams() { + + return FEATURE_FLAGS.ignoreCurrentParamsInDesktopLaunchParams(); } - - public static boolean bundleClientTransactionFlag() { - return FEATURE_FLAGS.bundleClientTransactionFlag(); + + + public static boolean ignoreOverrideTaskBoundsIfIncompatibleWithDisplay() { + + return FEATURE_FLAGS.ignoreOverrideTaskBoundsIfIncompatibleWithDisplay(); } - - public static boolean cameraCompatForFreeform() { - return FEATURE_FLAGS.cameraCompatForFreeform(); + + + public static boolean imeBackCallbackLeakPrevention() { + + return FEATURE_FLAGS.imeBackCallbackLeakPrevention(); } - - public static boolean closeToSquareConfigIncludesStatusBar() { - return FEATURE_FLAGS.closeToSquareConfigIncludesStatusBar(); + + + public static boolean includeTopTransparentFullscreenTaskInDesktopHeuristic() { + + return FEATURE_FLAGS.includeTopTransparentFullscreenTaskInDesktopHeuristic(); } - - public static boolean configurableFontScaleDefault() { - return FEATURE_FLAGS.configurableFontScaleDefault(); + + + public static boolean inheritTaskBoundsForTrampolineTaskLaunches() { + + return FEATURE_FLAGS.inheritTaskBoundsForTrampolineTaskLaunches(); } - - public static boolean coverDisplayOptIn() { - return FEATURE_FLAGS.coverDisplayOptIn(); + + + public static boolean jankApi() { + + return FEATURE_FLAGS.jankApi(); } - - public static boolean deferDisplayUpdates() { - return FEATURE_FLAGS.deferDisplayUpdates(); + + + public static boolean keyboardShortcutsToSwitchDesks() { + + return FEATURE_FLAGS.keyboardShortcutsToSwitchDesks(); } - - public static boolean delayNotificationToMagnificationWhenRecentsWindowToFrontTransition() { - return FEATURE_FLAGS.delayNotificationToMagnificationWhenRecentsWindowToFrontTransition(); + + + public static boolean keyguardRemoveDefaultDisplayUsage() { + + return FEATURE_FLAGS.keyguardRemoveDefaultDisplayUsage(); } - - public static boolean delegateUnhandledDrags() { - return FEATURE_FLAGS.delegateUnhandledDrags(); + + + public static boolean letterboxBackgroundWallpaper() { + + return FEATURE_FLAGS.letterboxBackgroundWallpaper(); } - - public static boolean deleteCaptureDisplay() { - return FEATURE_FLAGS.deleteCaptureDisplay(); + + + public static boolean limitSystemFullscreenOverrideToDefaultDisplay() { + + return FEATURE_FLAGS.limitSystemFullscreenOverrideToDefaultDisplay(); } - - public static boolean density390Api() { - return FEATURE_FLAGS.density390Api(); + + + public static boolean migrateBasicLegacyReady() { + + return FEATURE_FLAGS.migrateBasicLegacyReady(); } - - public static boolean disableObjectPool() { - return FEATURE_FLAGS.disableObjectPool(); + + + public static boolean moveToExternalDisplayShortcut() { + + return FEATURE_FLAGS.moveToExternalDisplayShortcut(); } - - public static boolean disableThinLetterboxingPolicy() { - return FEATURE_FLAGS.disableThinLetterboxingPolicy(); + + + public static boolean moveToNextDisplayShortcutWithProjectedMode() { + + return FEATURE_FLAGS.moveToNextDisplayShortcutWithProjectedMode(); } - - public static boolean doNotCheckIntersectionWhenNonMagnifiableWindowTransitions() { - return FEATURE_FLAGS.doNotCheckIntersectionWhenNonMagnifiableWindowTransitions(); + + + public static boolean multiCrop() { + + return FEATURE_FLAGS.multiCrop(); } - - public static boolean drawSnapshotAspectRatioMatch() { - return FEATURE_FLAGS.drawSnapshotAspectRatioMatch(); + + + public static boolean multipleSystemNavigationObserverCallbacks() { + + return FEATURE_FLAGS.multipleSystemNavigationObserverCallbacks(); } - - public static boolean edgeToEdgeByDefault() { - return FEATURE_FLAGS.edgeToEdgeByDefault(); + + + public static boolean nestedTasksWithIndependentBoundsBugfix() { + + return FEATURE_FLAGS.nestedTasksWithIndependentBoundsBugfix(); } - - public static boolean embeddedActivityBackNavFlag() { - return FEATURE_FLAGS.embeddedActivityBackNavFlag(); + + + public static boolean noAlphaRotationEnterAnimation() { + + return FEATURE_FLAGS.noAlphaRotationEnterAnimation(); } - - public static boolean enableAdditionalWindowsAboveStatusBar() { - return FEATURE_FLAGS.enableAdditionalWindowsAboveStatusBar(); + + + public static boolean optOutOverrideOrientationToUser() { + + return FEATURE_FLAGS.optOutOverrideOrientationToUser(); } - - public static boolean enableAppHeaderWithTaskDensity() { - return FEATURE_FLAGS.enableAppHeaderWithTaskDensity(); + + + public static boolean parallelCdTransitionsDuringRecents() { + + return FEATURE_FLAGS.parallelCdTransitionsDuringRecents(); } - - public static boolean enableBufferTransformHintFromDisplay() { - return FEATURE_FLAGS.enableBufferTransformHintFromDisplay(); + + + public static boolean polishCloseWallpaperIncludesOpenChange() { + + return FEATURE_FLAGS.polishCloseWallpaperIncludesOpenChange(); } - - public static boolean enableCameraCompatForDesktopWindowing() { - return FEATURE_FLAGS.enableCameraCompatForDesktopWindowing(); + + + public static boolean portWindowSizeAnimation() { + + return FEATURE_FLAGS.portWindowSizeAnimation(); } - - public static boolean enableCompatuiSysuiLauncher() { - return FEATURE_FLAGS.enableCompatuiSysuiLauncher(); + + + public static boolean predictiveBackCallbackCancellationFix() { + + return FEATURE_FLAGS.predictiveBackCallbackCancellationFix(); } - - public static boolean enableDesktopWindowingImmersiveHandleHiding() { - return FEATURE_FLAGS.enableDesktopWindowingImmersiveHandleHiding(); + + + public static boolean predictiveBackDelayWmTransition() { + + return FEATURE_FLAGS.predictiveBackDelayWmTransition(); } - - public static boolean enableDesktopWindowingModalsPolicy() { - return FEATURE_FLAGS.enableDesktopWindowingModalsPolicy(); + + + public static boolean predictiveBackInterceptTransition() { + + return FEATURE_FLAGS.predictiveBackInterceptTransition(); } - - public static boolean enableDesktopWindowingMode() { - return FEATURE_FLAGS.enableDesktopWindowingMode(); + + + public static boolean predictiveBackPrioritySystemNavigationObserver() { + + return FEATURE_FLAGS.predictiveBackPrioritySystemNavigationObserver(); } - - public static boolean enableDesktopWindowingQuickSwitch() { - return FEATURE_FLAGS.enableDesktopWindowingQuickSwitch(); + + + public static boolean predictiveBackStopKeycodeBackForwarding() { + + return FEATURE_FLAGS.predictiveBackStopKeycodeBackForwarding(); } - - public static boolean enableDesktopWindowingScvhCache() { - return FEATURE_FLAGS.enableDesktopWindowingScvhCache(); + + + public static boolean predictiveBackSwipeEdgeNoneApi() { + + return FEATURE_FLAGS.predictiveBackSwipeEdgeNoneApi(); } - - public static boolean enableDesktopWindowingSizeConstraints() { - return FEATURE_FLAGS.enableDesktopWindowingSizeConstraints(); + + + public static boolean predictiveBackSystemOverrideCallback() { + + return FEATURE_FLAGS.predictiveBackSystemOverrideCallback(); } - - public static boolean enableDesktopWindowingTaskLimit() { - return FEATURE_FLAGS.enableDesktopWindowingTaskLimit(); + + + public static boolean predictiveBackTimestampApi() { + + return FEATURE_FLAGS.predictiveBackTimestampApi(); } - - public static boolean enableDesktopWindowingTaskbarRunningApps() { - return FEATURE_FLAGS.enableDesktopWindowingTaskbarRunningApps(); + + + public static boolean preserveRecentsTaskConfigurationOnRelaunch() { + + return FEATURE_FLAGS.preserveRecentsTaskConfigurationOnRelaunch(); } - - public static boolean enableDesktopWindowingWallpaperActivity() { - return FEATURE_FLAGS.enableDesktopWindowingWallpaperActivity(); + + + public static boolean rearDisplayDisableForceDesktopSystemDecorations() { + + return FEATURE_FLAGS.rearDisplayDisableForceDesktopSystemDecorations(); } - - public static boolean enableScaledResizing() { - return FEATURE_FLAGS.enableScaledResizing(); + + + public static boolean reduceChangedExclusionRectsMsgs() { + + return FEATURE_FLAGS.reduceChangedExclusionRectsMsgs(); } - - public static boolean enableTaskStackObserverInShell() { - return FEATURE_FLAGS.enableTaskStackObserverInShell(); + + + public static boolean reduceTaskSnapshotMemoryUsage() { + + return FEATURE_FLAGS.reduceTaskSnapshotMemoryUsage(); } - - public static boolean enableThemedAppHeaders() { - return FEATURE_FLAGS.enableThemedAppHeaders(); + + + public static boolean reenableAppHandleAnimations() { + + return FEATURE_FLAGS.reenableAppHandleAnimations(); } - - public static boolean enableWindowingDynamicInitialBounds() { - return FEATURE_FLAGS.enableWindowingDynamicInitialBounds(); + + + public static boolean reenableAppHandleColorAnimations() { + + return FEATURE_FLAGS.reenableAppHandleColorAnimations(); } - - public static boolean enableWindowingEdgeDragResize() { - return FEATURE_FLAGS.enableWindowingEdgeDragResize(); + + + public static boolean refactorMatchParentBounds() { + + return FEATURE_FLAGS.refactorMatchParentBounds(); } - - public static boolean enableWmExtensionsForAllFlag() { - return FEATURE_FLAGS.enableWmExtensionsForAllFlag(); + + + public static boolean relativeInsets() { + + return FEATURE_FLAGS.relativeInsets(); } - - public static boolean enforceEdgeToEdge() { - return FEATURE_FLAGS.enforceEdgeToEdge(); + + + public static boolean releaseAllTransitionSurfaces() { + + return FEATURE_FLAGS.releaseAllTransitionSurfaces(); } - - public static boolean ensureWallpaperInTransitions() { - return FEATURE_FLAGS.ensureWallpaperInTransitions(); + + + public static boolean removeDeskOnLastTaskRemoval() { + + return FEATURE_FLAGS.removeDeskOnLastTaskRemoval(); } - - public static boolean explicitRefreshRateHints() { - return FEATURE_FLAGS.explicitRefreshRateHints(); + + + public static boolean removeGetDimmer() { + + return FEATURE_FLAGS.removeGetDimmer(); } - - public static boolean fifoPriorityForMajorUiProcesses() { - return FEATURE_FLAGS.fifoPriorityForMajorUiProcesses(); + + + public static boolean reparentWindowTokenApi() { + + return FEATURE_FLAGS.reparentWindowTokenApi(); } - - public static boolean fixNoContainerUpdateWithoutResize() { - return FEATURE_FLAGS.fixNoContainerUpdateWithoutResize(); + + + public static boolean repositoryBasedPersistence() { + + return FEATURE_FLAGS.repositoryBasedPersistence(); } - - public static boolean fixPipRestoreToOverlay() { - return FEATURE_FLAGS.fixPipRestoreToOverlay(); + + + public static boolean repositoryBasedPersistenceBgThread() { + + return FEATURE_FLAGS.repositoryBasedPersistenceBgThread(); } - - public static boolean fullscreenDimFlag() { - return FEATURE_FLAGS.fullscreenDimFlag(); + + + public static boolean respectFullscreenActivityOptionInDesktopLaunchParams() { + + return FEATURE_FLAGS.respectFullscreenActivityOptionInDesktopLaunchParams(); } - - public static boolean getDimmerOnClosing() { - return FEATURE_FLAGS.getDimmerOnClosing(); + + + public static boolean respectOrientationChangeForUnresizeable() { + + return FEATURE_FLAGS.respectOrientationChangeForUnresizeable(); } - - public static boolean immersiveAppRepositioning() { - return FEATURE_FLAGS.immersiveAppRepositioning(); + + + public static boolean respectRequestedTaskSnapshotResolution() { + + return FEATURE_FLAGS.respectRequestedTaskSnapshotResolution(); } - - public static boolean insetsControlChangedItem() { - return FEATURE_FLAGS.insetsControlChangedItem(); + + + public static boolean restoreUserAspectRatioSettingsUsingService() { + + return FEATURE_FLAGS.restoreUserAspectRatioSettingsUsingService(); } - - public static boolean insetsControlSeq() { - return FEATURE_FLAGS.insetsControlSeq(); + + + public static boolean restrictFreeformHiddenSystemBarsToFillingTasks() { + + return FEATURE_FLAGS.restrictFreeformHiddenSystemBarsToFillingTasks(); } - - public static boolean insetsDecoupledConfiguration() { - return FEATURE_FLAGS.insetsDecoupledConfiguration(); + + + public static boolean returnAllVisibleActivitiesForVis() { + + return FEATURE_FLAGS.returnAllVisibleActivitiesForVis(); } - - public static boolean introduceSmootherDimmer() { - return FEATURE_FLAGS.introduceSmootherDimmer(); + + + public static boolean rootTaskForBubble() { + + return FEATURE_FLAGS.rootTaskForBubble(); } - - public static boolean keyguardAppearTransition() { - return FEATURE_FLAGS.keyguardAppearTransition(); + + + public static boolean safeRegionLetterboxingV1() { + + return FEATURE_FLAGS.safeRegionLetterboxingV1(); } - - public static boolean letterboxBackgroundWallpaper() { - return FEATURE_FLAGS.letterboxBackgroundWallpaper(); + + + public static boolean screenRecordingCallbacks() { + + return FEATURE_FLAGS.screenRecordingCallbacks(); } - - public static boolean movableCutoutConfiguration() { - return FEATURE_FLAGS.movableCutoutConfiguration(); + + + public static boolean scrollingFromLetterbox() { + + return FEATURE_FLAGS.scrollingFromLetterbox(); } - - public static boolean moveAnimationOptionsToChange() { - return FEATURE_FLAGS.moveAnimationOptionsToChange(); + + + public static boolean scvhSetFocusable() { + + return FEATURE_FLAGS.scvhSetFocusable(); } - - public static boolean multiCrop() { - return FEATURE_FLAGS.multiCrop(); + + + public static boolean scvhSurfaceControlLifetimeFix() { + + return FEATURE_FLAGS.scvhSurfaceControlLifetimeFix(); } - - public static boolean navBarTransparentByDefault() { - return FEATURE_FLAGS.navBarTransparentByDefault(); + + + public static boolean sdkDesiredPresentTime() { + + return FEATURE_FLAGS.sdkDesiredPresentTime(); } - - public static boolean noConsecutiveVisibilityEvents() { - return FEATURE_FLAGS.noConsecutiveVisibilityEvents(); + + + public static boolean setScPropertiesInClient() { + + return FEATURE_FLAGS.setScPropertiesInClient(); } - - public static boolean noVisibilityEventOnDisplayStateChange() { - return FEATURE_FLAGS.noVisibilityEventOnDisplayStateChange(); + + + public static boolean showAppHandleLargeScreens() { + + return FEATURE_FLAGS.showAppHandleLargeScreens(); } - - public static boolean offloadColorExtraction() { - return FEATURE_FLAGS.offloadColorExtraction(); + + + public static boolean showBiometricPromptSecondaryDisplayMessage() { + + return FEATURE_FLAGS.showBiometricPromptSecondaryDisplayMessage(); } - - public static boolean predictiveBackSystemAnims() { - return FEATURE_FLAGS.predictiveBackSystemAnims(); + + + public static boolean showDesktopExperienceDevOption() { + + return FEATURE_FLAGS.showDesktopExperienceDevOption(); } - - public static boolean rearDisplayDisableForceDesktopSystemDecorations() { - return FEATURE_FLAGS.rearDisplayDisableForceDesktopSystemDecorations(); + + + public static boolean showDesktopWindowingDevOption() { + + return FEATURE_FLAGS.showDesktopWindowingDevOption(); } - - public static boolean releaseSnapshotAggressively() { - return FEATURE_FLAGS.releaseSnapshotAggressively(); + + + public static boolean showHomeBehindDesktop() { + + return FEATURE_FLAGS.showHomeBehindDesktop(); } - - public static boolean removePrepareSurfaceInPlacement() { - return FEATURE_FLAGS.removePrepareSurfaceInPlacement(); + + + public static boolean skipCompatUiEducationInDesktopMode() { + + return FEATURE_FLAGS.skipCompatUiEducationInDesktopMode(); } - - public static boolean screenRecordingCallbacks() { - return FEATURE_FLAGS.screenRecordingCallbacks(); + + + public static boolean skipDeactivationOfDeskWithNothingInFront() { + + return FEATURE_FLAGS.skipDeactivationOfDeskWithNothingInFront(); } - - public static boolean sdkDesiredPresentTime() { - return FEATURE_FLAGS.sdkDesiredPresentTime(); + + + public static boolean skipDecorViewRelayoutWhenClosingBugfix() { + + return FEATURE_FLAGS.skipDecorViewRelayoutWhenClosingBugfix(); } - - public static boolean secureWindowState() { - return FEATURE_FLAGS.secureWindowState(); + + + public static boolean supportGeminiOnMultiDisplay() { + + return FEATURE_FLAGS.supportGeminiOnMultiDisplay(); } - - public static boolean setScPropertiesInClient() { - return FEATURE_FLAGS.setScPropertiesInClient(); + + + public static boolean systemContentPriority() { + + return FEATURE_FLAGS.systemContentPriority(); } - - public static boolean skipSleepingWhenSwitchingDisplay() { - return FEATURE_FLAGS.skipSleepingWhenSwitchingDisplay(); + + + public static boolean systemUiPostAnimationEnd() { + + return FEATURE_FLAGS.systemUiPostAnimationEnd(); } - - public static boolean supportsMultiInstanceSystemUi() { - return FEATURE_FLAGS.supportsMultiInstanceSystemUi(); + + + public static boolean taskFragmentCompanionActivity() { + + return FEATURE_FLAGS.taskFragmentCompanionActivity(); } - - public static boolean surfaceControlInputReceiver() { - return FEATURE_FLAGS.surfaceControlInputReceiver(); + + + public static boolean taskbarRunningTasksInSplitscreenSelect() { + + return FEATURE_FLAGS.taskbarRunningTasksInSplitscreenSelect(); } - - public static boolean surfaceTrustedOverlay() { - return FEATURE_FLAGS.surfaceTrustedOverlay(); + + + public static boolean toggleFullscreenStateViaFullscreenKey() { + + return FEATURE_FLAGS.toggleFullscreenStateViaFullscreenKey(); } - - public static boolean syncScreenCapture() { - return FEATURE_FLAGS.syncScreenCapture(); + + + public static boolean touchPassThroughOptIn() { + + return FEATURE_FLAGS.touchPassThroughOptIn(); } - - public static boolean taskFragmentSystemOrganizerFlag() { - return FEATURE_FLAGS.taskFragmentSystemOrganizerFlag(); + + + public static boolean transferStartingWindowToNextWhenInvisible() { + + return FEATURE_FLAGS.transferStartingWindowToNextWhenInvisible(); } - + + public static boolean transitReadyTracking() { + return FEATURE_FLAGS.transitReadyTracking(); } - - public static boolean trustedPresentationListenerForWindow() { - return FEATURE_FLAGS.trustedPresentationListenerForWindow(); + + + public static boolean transitTrackerPlumbing() { + + return FEATURE_FLAGS.transitTrackerPlumbing(); + } + + + public static boolean transitionHandlerCujTags() { + + return FEATURE_FLAGS.transitionHandlerCujTags(); + } + + + public static boolean unifyShellBinders() { + + return FEATURE_FLAGS.unifyShellBinders(); + } + + + public static boolean universalResizableByDefault() { + + return FEATURE_FLAGS.universalResizableByDefault(); } - + + public static boolean untrustedEmbeddingAnyAppPermission() { + return FEATURE_FLAGS.untrustedEmbeddingAnyAppPermission(); } - + + public static boolean untrustedEmbeddingStateSharing() { + return FEATURE_FLAGS.untrustedEmbeddingStateSharing(); } - - public static boolean useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds() { - return FEATURE_FLAGS.useWindowOriginalTouchableRegionWhenMagnificationRecomputeBounds(); - } - - public static boolean userMinAspectRatioAppDefault() { - return FEATURE_FLAGS.userMinAspectRatioAppDefault(); + + + public static boolean updateDimsWhenWindowShown() { + + return FEATURE_FLAGS.updateDimsWhenWindowShown(); } - - public static boolean waitForTransitionOnDisplaySwitch() { - return FEATURE_FLAGS.waitForTransitionOnDisplaySwitch(); + + + public static boolean updateTaskCropInSync() { + + return FEATURE_FLAGS.updateTaskCropInSync(); } - - public static boolean wallpaperOffsetAsync() { - return FEATURE_FLAGS.wallpaperOffsetAsync(); + + + public static boolean useInputReportedFocusForAccessibility() { + + return FEATURE_FLAGS.useInputReportedFocusForAccessibility(); } - - public static boolean windowSessionRelayoutInfo() { - return FEATURE_FLAGS.windowSessionRelayoutInfo(); + + + public static boolean vdmForceAppUniversalResizableApi() { + + return FEATURE_FLAGS.vdmForceAppUniversalResizableApi(); } - - public static boolean windowTokenConfigThreadSafe() { - return FEATURE_FLAGS.windowTokenConfigThreadSafe(); + + + public static boolean waitForPresentFenceOnDisplaySwitch() { + + return FEATURE_FLAGS.waitForPresentFenceOnDisplaySwitch(); } private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl(); diff --git a/flags/src/com/android/wm/shell/CustomFeatureFlags.java b/flags/src/com/android/wm/shell/CustomFeatureFlags.java index e8a55c45914..577fd03b534 100644 --- a/flags/src/com/android/wm/shell/CustomFeatureFlags.java +++ b/flags/src/com/android/wm/shell/CustomFeatureFlags.java @@ -1,13 +1,12 @@ package com.android.wm.shell; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.BiPredicate; import java.util.function.Predicate; - /** @hide */ public class CustomFeatureFlags implements FeatureFlags { @@ -18,124 +17,300 @@ public CustomFeatureFlags(BiPredicate> getValueI } @Override - public boolean animateBubbleSizeChange() { - return getValue(Flags.FLAG_ANIMATE_BUBBLE_SIZE_CHANGE, - FeatureFlags::animateBubbleSizeChange); + public boolean bugRotationButtonCoverBubble() { + return getValue(Flags.FLAG_BUG_ROTATION_BUTTON_COVER_BUBBLE, + FeatureFlags::bugRotationButtonCoverBubble); + } + + @Override + + public boolean dismissPipFromLockscreen() { + return getValue(Flags.FLAG_DISMISS_PIP_FROM_LOCKSCREEN, + FeatureFlags::dismissPipFromLockscreen); } @Override - - public boolean enableAppPairs() { - return getValue(Flags.FLAG_ENABLE_APP_PAIRS, - FeatureFlags::enableAppPairs); + + public boolean enable2x1Split() { + return getValue(Flags.FLAG_ENABLE_2X1_SPLIT, + FeatureFlags::enable2x1Split); } @Override - + + public boolean enableAutoTaskStackController() { + return getValue(Flags.FLAG_ENABLE_AUTO_TASK_STACK_CONTROLLER, + FeatureFlags::enableAutoTaskStackController); + } + + @Override + public boolean enableBubbleAnything() { return getValue(Flags.FLAG_ENABLE_BUBBLE_ANYTHING, - FeatureFlags::enableBubbleAnything); + FeatureFlags::enableBubbleAnything); } @Override - + public boolean enableBubbleBar() { return getValue(Flags.FLAG_ENABLE_BUBBLE_BAR, - FeatureFlags::enableBubbleBar); + FeatureFlags::enableBubbleBar); + } + + @Override + + public boolean enableBubbleBarOnPhones() { + return getValue(Flags.FLAG_ENABLE_BUBBLE_BAR_ON_PHONES, + FeatureFlags::enableBubbleBarOnPhones); + } + + @Override + + public boolean enableBubbleBarToFloatingTransition() { + return getValue(Flags.FLAG_ENABLE_BUBBLE_BAR_TO_FLOATING_TRANSITION, + FeatureFlags::enableBubbleBarToFloatingTransition); } @Override - + + public boolean enableBubbleEventHistoryLogs() { + return getValue(Flags.FLAG_ENABLE_BUBBLE_EVENT_HISTORY_LOGS, + FeatureFlags::enableBubbleEventHistoryLogs); + } + + @Override + public boolean enableBubbleStashing() { return getValue(Flags.FLAG_ENABLE_BUBBLE_STASHING, - FeatureFlags::enableBubbleStashing); + FeatureFlags::enableBubbleStashing); + } + + @Override + + public boolean enableBubbleToFullscreen() { + return getValue(Flags.FLAG_ENABLE_BUBBLE_TO_FULLSCREEN, + FeatureFlags::enableBubbleToFullscreen); } @Override - + public boolean enableBubblesLongPressNavHandle() { return getValue(Flags.FLAG_ENABLE_BUBBLES_LONG_PRESS_NAV_HANDLE, - FeatureFlags::enableBubblesLongPressNavHandle); + FeatureFlags::enableBubblesLongPressNavHandle); + } + + @Override + + public boolean enableCreateAnyBubble() { + return getValue(Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE, + FeatureFlags::enableCreateAnyBubble); } @Override - - public boolean enableLeftRightSplitInPortrait() { - return getValue(Flags.FLAG_ENABLE_LEFT_RIGHT_SPLIT_IN_PORTRAIT, - FeatureFlags::enableLeftRightSplitInPortrait); + + public boolean enableDynamicInsetsForAppLaunch() { + return getValue(Flags.FLAG_ENABLE_DYNAMIC_INSETS_FOR_APP_LAUNCH, + FeatureFlags::enableDynamicInsetsForAppLaunch); } @Override - + + public boolean enableFlexibleSplit() { + return getValue(Flags.FLAG_ENABLE_FLEXIBLE_SPLIT, + FeatureFlags::enableFlexibleSplit); + } + + @Override + + public boolean enableFlexibleTwoAppSplit() { + return getValue(Flags.FLAG_ENABLE_FLEXIBLE_TWO_APP_SPLIT, + FeatureFlags::enableFlexibleTwoAppSplit); + } + + @Override + + public boolean enableGsf() { + return getValue(Flags.FLAG_ENABLE_GSF, + FeatureFlags::enableGsf); + } + + @Override + + public boolean enableMagneticSplitDivider() { + return getValue(Flags.FLAG_ENABLE_MAGNETIC_SPLIT_DIVIDER, + FeatureFlags::enableMagneticSplitDivider); + } + + @Override + public boolean enableNewBubbleAnimations() { return getValue(Flags.FLAG_ENABLE_NEW_BUBBLE_ANIMATIONS, - FeatureFlags::enableNewBubbleAnimations); + FeatureFlags::enableNewBubbleAnimations); } @Override - + public boolean enableOptionalBubbleOverflow() { return getValue(Flags.FLAG_ENABLE_OPTIONAL_BUBBLE_OVERFLOW, - FeatureFlags::enableOptionalBubbleOverflow); + FeatureFlags::enableOptionalBubbleOverflow); + } + + @Override + + public boolean enablePip2() { + return getValue(Flags.FLAG_ENABLE_PIP2, + FeatureFlags::enablePip2); + } + + @Override + + public boolean enablePip2OnTv() { + return getValue(Flags.FLAG_ENABLE_PIP2_ON_TV, + FeatureFlags::enablePip2OnTv); } @Override - - public boolean enablePip2Implementation() { - return getValue(Flags.FLAG_ENABLE_PIP2_IMPLEMENTATION, - FeatureFlags::enablePip2Implementation); + + public boolean enablePipBoxShadows() { + return getValue(Flags.FLAG_ENABLE_PIP_BOX_SHADOWS, + FeatureFlags::enablePipBoxShadows); } @Override - + public boolean enablePipUmoExperience() { return getValue(Flags.FLAG_ENABLE_PIP_UMO_EXPERIENCE, - FeatureFlags::enablePipUmoExperience); + FeatureFlags::enablePipUmoExperience); } @Override - + public boolean enableRetrievableBubbles() { return getValue(Flags.FLAG_ENABLE_RETRIEVABLE_BUBBLES, - FeatureFlags::enableRetrievableBubbles); + FeatureFlags::enableRetrievableBubbles); } @Override - - public boolean enableSplitContextual() { - return getValue(Flags.FLAG_ENABLE_SPLIT_CONTEXTUAL, - FeatureFlags::enableSplitContextual); + + public boolean enableShellRestartBubbleCleanup() { + return getValue(Flags.FLAG_ENABLE_SHELL_RESTART_BUBBLE_CLEANUP, + FeatureFlags::enableShellRestartBubbleCleanup); } @Override - + + public boolean enableShellTopTaskTracking() { + return getValue(Flags.FLAG_ENABLE_SHELL_TOP_TASK_TRACKING, + FeatureFlags::enableShellTopTaskTracking); + } + + @Override + public boolean enableTaskbarNavbarUnification() { return getValue(Flags.FLAG_ENABLE_TASKBAR_NAVBAR_UNIFICATION, - FeatureFlags::enableTaskbarNavbarUnification); + FeatureFlags::enableTaskbarNavbarUnification); + } + + @Override + + public boolean enableTaskbarOnPhones() { + return getValue(Flags.FLAG_ENABLE_TASKBAR_ON_PHONES, + FeatureFlags::enableTaskbarOnPhones); } @Override - + public boolean enableTinyTaskbar() { return getValue(Flags.FLAG_ENABLE_TINY_TASKBAR, - FeatureFlags::enableTinyTaskbar); + FeatureFlags::enableTinyTaskbar); + } + + @Override + + public boolean fixBubbleStackViewExpandedWhenAdded() { + return getValue(Flags.FLAG_FIX_BUBBLE_STACK_VIEW_EXPANDED_WHEN_ADDED, + FeatureFlags::fixBubbleStackViewExpandedWhenAdded); } @Override - - public boolean onlyReuseBubbledTaskWhenLaunchedFromBubble() { - return getValue(Flags.FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE, - FeatureFlags::onlyReuseBubbledTaskWhenLaunchedFromBubble); + + public boolean fixBubblesAddSameBubbleBeingRemoved() { + return getValue(Flags.FLAG_FIX_BUBBLES_ADD_SAME_BUBBLE_BEING_REMOVED, + FeatureFlags::fixBubblesAddSameBubbleBeingRemoved); + } + + @Override + + public boolean fixBubblesCancelAnimation() { + return getValue(Flags.FLAG_FIX_BUBBLES_CANCEL_ANIMATION, + FeatureFlags::fixBubblesCancelAnimation); + } + + @Override + + public boolean fixBubblesExpandedSysuiFlag() { + return getValue(Flags.FLAG_FIX_BUBBLES_EXPANDED_SYSUI_FLAG, + FeatureFlags::fixBubblesExpandedSysuiFlag); + } + + @Override + + public boolean fixBubblesImeFocusFlicker() { + return getValue(Flags.FLAG_FIX_BUBBLES_IME_FOCUS_FLICKER, + FeatureFlags::fixBubblesImeFocusFlicker); + } + + @Override + + public boolean fixExitSplitOnEnterBubble() { + return getValue(Flags.FLAG_FIX_EXIT_SPLIT_ON_ENTER_BUBBLE, + FeatureFlags::fixExitSplitOnEnterBubble); + } + + @Override + + public boolean fixMissingUserChangeCallbacks() { + return getValue(Flags.FLAG_FIX_MISSING_USER_CHANGE_CALLBACKS, + FeatureFlags::fixMissingUserChangeCallbacks); + } + + @Override + + public boolean fixTaskViewRotationAnimation() { + return getValue(Flags.FLAG_FIX_TASK_VIEW_ROTATION_ANIMATION, + FeatureFlags::fixTaskViewRotationAnimation); + } + + @Override + + public boolean splitDisableChildTaskBounds() { + return getValue(Flags.FLAG_SPLIT_DISABLE_CHILD_TASK_BOUNDS, + FeatureFlags::splitDisableChildTaskBounds); + } + + @Override + + public boolean splitToFullSetWindowMode() { + return getValue(Flags.FLAG_SPLIT_TO_FULL_SET_WINDOW_MODE, + FeatureFlags::splitToFullSetWindowMode); + } + + @Override + + public boolean taskViewTransitionsRefactor() { + return getValue(Flags.FLAG_TASK_VIEW_TRANSITIONS_REFACTOR, + FeatureFlags::taskViewTransitionsRefactor); } public boolean isFlagReadOnlyOptimized(String flagName) { if (mReadOnlyFlagsSet.contains(flagName) && - isOptimizationEnabled()) { - return true; + isOptimizationEnabled()) { + return true; } return false; } + private boolean isOptimizationEnabled() { return false; } @@ -146,29 +321,94 @@ protected boolean getValue(String flagName, Predicate getter) { public List getFlagNames() { return Arrays.asList( - Flags.FLAG_ANIMATE_BUBBLE_SIZE_CHANGE, - Flags.FLAG_ENABLE_APP_PAIRS, - Flags.FLAG_ENABLE_BUBBLE_ANYTHING, - Flags.FLAG_ENABLE_BUBBLE_BAR, - Flags.FLAG_ENABLE_BUBBLE_STASHING, - Flags.FLAG_ENABLE_BUBBLES_LONG_PRESS_NAV_HANDLE, - Flags.FLAG_ENABLE_LEFT_RIGHT_SPLIT_IN_PORTRAIT, - Flags.FLAG_ENABLE_NEW_BUBBLE_ANIMATIONS, - Flags.FLAG_ENABLE_OPTIONAL_BUBBLE_OVERFLOW, - Flags.FLAG_ENABLE_PIP2_IMPLEMENTATION, - Flags.FLAG_ENABLE_PIP_UMO_EXPERIENCE, - Flags.FLAG_ENABLE_RETRIEVABLE_BUBBLES, - Flags.FLAG_ENABLE_SPLIT_CONTEXTUAL, - Flags.FLAG_ENABLE_TASKBAR_NAVBAR_UNIFICATION, - Flags.FLAG_ENABLE_TINY_TASKBAR, - Flags.FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE + Flags.FLAG_BUG_ROTATION_BUTTON_COVER_BUBBLE, + Flags.FLAG_DISMISS_PIP_FROM_LOCKSCREEN, + Flags.FLAG_ENABLE_2X1_SPLIT, + Flags.FLAG_ENABLE_AUTO_TASK_STACK_CONTROLLER, + Flags.FLAG_ENABLE_BUBBLE_ANYTHING, + Flags.FLAG_ENABLE_BUBBLE_BAR, + Flags.FLAG_ENABLE_BUBBLE_BAR_ON_PHONES, + Flags.FLAG_ENABLE_BUBBLE_BAR_TO_FLOATING_TRANSITION, + Flags.FLAG_ENABLE_BUBBLE_EVENT_HISTORY_LOGS, + Flags.FLAG_ENABLE_BUBBLE_STASHING, + Flags.FLAG_ENABLE_BUBBLE_TO_FULLSCREEN, + Flags.FLAG_ENABLE_BUBBLES_LONG_PRESS_NAV_HANDLE, + Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE, + Flags.FLAG_ENABLE_DYNAMIC_INSETS_FOR_APP_LAUNCH, + Flags.FLAG_ENABLE_FLEXIBLE_SPLIT, + Flags.FLAG_ENABLE_FLEXIBLE_TWO_APP_SPLIT, + Flags.FLAG_ENABLE_GSF, + Flags.FLAG_ENABLE_MAGNETIC_SPLIT_DIVIDER, + Flags.FLAG_ENABLE_NEW_BUBBLE_ANIMATIONS, + Flags.FLAG_ENABLE_OPTIONAL_BUBBLE_OVERFLOW, + Flags.FLAG_ENABLE_PIP2, + Flags.FLAG_ENABLE_PIP2_ON_TV, + Flags.FLAG_ENABLE_PIP_BOX_SHADOWS, + Flags.FLAG_ENABLE_PIP_UMO_EXPERIENCE, + Flags.FLAG_ENABLE_RETRIEVABLE_BUBBLES, + Flags.FLAG_ENABLE_SHELL_RESTART_BUBBLE_CLEANUP, + Flags.FLAG_ENABLE_SHELL_TOP_TASK_TRACKING, + Flags.FLAG_ENABLE_TASKBAR_NAVBAR_UNIFICATION, + Flags.FLAG_ENABLE_TASKBAR_ON_PHONES, + Flags.FLAG_ENABLE_TINY_TASKBAR, + Flags.FLAG_FIX_BUBBLE_STACK_VIEW_EXPANDED_WHEN_ADDED, + Flags.FLAG_FIX_BUBBLES_ADD_SAME_BUBBLE_BEING_REMOVED, + Flags.FLAG_FIX_BUBBLES_CANCEL_ANIMATION, + Flags.FLAG_FIX_BUBBLES_EXPANDED_SYSUI_FLAG, + Flags.FLAG_FIX_BUBBLES_IME_FOCUS_FLICKER, + Flags.FLAG_FIX_EXIT_SPLIT_ON_ENTER_BUBBLE, + Flags.FLAG_FIX_MISSING_USER_CHANGE_CALLBACKS, + Flags.FLAG_FIX_TASK_VIEW_ROTATION_ANIMATION, + Flags.FLAG_SPLIT_DISABLE_CHILD_TASK_BOUNDS, + Flags.FLAG_SPLIT_TO_FULL_SET_WINDOW_MODE, + Flags.FLAG_TASK_VIEW_TRANSITIONS_REFACTOR ); } private Set mReadOnlyFlagsSet = new HashSet<>( - Arrays.asList( - Flags.FLAG_ENABLE_PIP2_IMPLEMENTATION, - "" - ) + Arrays.asList( + Flags.FLAG_BUG_ROTATION_BUTTON_COVER_BUBBLE, + Flags.FLAG_DISMISS_PIP_FROM_LOCKSCREEN, + Flags.FLAG_ENABLE_2X1_SPLIT, + Flags.FLAG_ENABLE_AUTO_TASK_STACK_CONTROLLER, + Flags.FLAG_ENABLE_BUBBLE_ANYTHING, + Flags.FLAG_ENABLE_BUBBLE_BAR, + Flags.FLAG_ENABLE_BUBBLE_BAR_ON_PHONES, + Flags.FLAG_ENABLE_BUBBLE_BAR_TO_FLOATING_TRANSITION, + Flags.FLAG_ENABLE_BUBBLE_EVENT_HISTORY_LOGS, + Flags.FLAG_ENABLE_BUBBLE_STASHING, + Flags.FLAG_ENABLE_BUBBLE_TO_FULLSCREEN, + Flags.FLAG_ENABLE_BUBBLES_LONG_PRESS_NAV_HANDLE, + Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE, + Flags.FLAG_ENABLE_DYNAMIC_INSETS_FOR_APP_LAUNCH, + Flags.FLAG_ENABLE_FLEXIBLE_SPLIT, + Flags.FLAG_ENABLE_FLEXIBLE_TWO_APP_SPLIT, + Flags.FLAG_ENABLE_GSF, + Flags.FLAG_ENABLE_MAGNETIC_SPLIT_DIVIDER, + Flags.FLAG_ENABLE_NEW_BUBBLE_ANIMATIONS, + Flags.FLAG_ENABLE_OPTIONAL_BUBBLE_OVERFLOW, + Flags.FLAG_ENABLE_PIP2, + Flags.FLAG_ENABLE_PIP2_ON_TV, + Flags.FLAG_ENABLE_PIP_BOX_SHADOWS, + Flags.FLAG_ENABLE_PIP_UMO_EXPERIENCE, + Flags.FLAG_ENABLE_RETRIEVABLE_BUBBLES, + Flags.FLAG_ENABLE_SHELL_RESTART_BUBBLE_CLEANUP, + Flags.FLAG_ENABLE_SHELL_TOP_TASK_TRACKING, + Flags.FLAG_ENABLE_TASKBAR_NAVBAR_UNIFICATION, + Flags.FLAG_ENABLE_TASKBAR_ON_PHONES, + Flags.FLAG_ENABLE_TINY_TASKBAR, + Flags.FLAG_FIX_BUBBLE_STACK_VIEW_EXPANDED_WHEN_ADDED, + Flags.FLAG_FIX_BUBBLES_ADD_SAME_BUBBLE_BEING_REMOVED, + Flags.FLAG_FIX_BUBBLES_CANCEL_ANIMATION, + Flags.FLAG_FIX_BUBBLES_EXPANDED_SYSUI_FLAG, + Flags.FLAG_FIX_BUBBLES_IME_FOCUS_FLICKER, + Flags.FLAG_FIX_EXIT_SPLIT_ON_ENTER_BUBBLE, + Flags.FLAG_FIX_MISSING_USER_CHANGE_CALLBACKS, + Flags.FLAG_FIX_TASK_VIEW_ROTATION_ANIMATION, + Flags.FLAG_SPLIT_DISABLE_CHILD_TASK_BOUNDS, + Flags.FLAG_SPLIT_TO_FULL_SET_WINDOW_MODE, + Flags.FLAG_TASK_VIEW_TRANSITIONS_REFACTOR, + "" + ) ); } diff --git a/flags/src/com/android/wm/shell/FakeFeatureFlagsImpl.java b/flags/src/com/android/wm/shell/FakeFeatureFlagsImpl.java index c4594f283fb..9a6e0de697d 100644 --- a/flags/src/com/android/wm/shell/FakeFeatureFlagsImpl.java +++ b/flags/src/com/android/wm/shell/FakeFeatureFlagsImpl.java @@ -3,11 +3,11 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Predicate; - /** @hide */ public class FakeFeatureFlagsImpl extends CustomFeatureFlags { private final Map mFlagMap = new HashMap<>(); private final FeatureFlags mDefaults; + private final boolean IS_EXPORTED = false; public FakeFeatureFlagsImpl() { this(null); @@ -35,7 +35,7 @@ protected boolean getValue(String flagName, Predicate getter) { } public void setFlag(String flagName, boolean value) { - if (!this.mFlagMap.containsKey(flagName)) { + if (!this.mFlagMap.containsKey(flagName) && !IS_EXPORTED) { throw new IllegalArgumentException("no such flag " + flagName); } this.mFlagMap.put(flagName, value); diff --git a/flags/src/com/android/wm/shell/FeatureFlags.java b/flags/src/com/android/wm/shell/FeatureFlags.java index 5c5ba5bcc03..213ca12d82e 100644 --- a/flags/src/com/android/wm/shell/FeatureFlags.java +++ b/flags/src/com/android/wm/shell/FeatureFlags.java @@ -1,53 +1,170 @@ package com.android.wm.shell; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + /** @hide */ public interface FeatureFlags { - - boolean animateBubbleSizeChange(); - - - boolean enableAppPairs(); - - + + + boolean bugRotationButtonCoverBubble(); + + + + boolean dismissPipFromLockscreen(); + + + + boolean enable2x1Split(); + + + + boolean enableAutoTaskStackController(); + + + boolean enableBubbleAnything(); - - + + + boolean enableBubbleBar(); - - + + + + boolean enableBubbleBarOnPhones(); + + + + boolean enableBubbleBarToFloatingTransition(); + + + + boolean enableBubbleEventHistoryLogs(); + + + boolean enableBubbleStashing(); - - + + + + boolean enableBubbleToFullscreen(); + + + boolean enableBubblesLongPressNavHandle(); - - - boolean enableLeftRightSplitInPortrait(); - - + + + + boolean enableCreateAnyBubble(); + + + + boolean enableDynamicInsetsForAppLaunch(); + + + + boolean enableFlexibleSplit(); + + + + boolean enableFlexibleTwoAppSplit(); + + + + boolean enableGsf(); + + + + boolean enableMagneticSplitDivider(); + + + boolean enableNewBubbleAnimations(); - - + + + boolean enableOptionalBubbleOverflow(); - - boolean enablePip2Implementation(); - - + + + + boolean enablePip2(); + + + + boolean enablePip2OnTv(); + + + + boolean enablePipBoxShadows(); + + + boolean enablePipUmoExperience(); - - + + + boolean enableRetrievableBubbles(); - - - boolean enableSplitContextual(); - - + + + + boolean enableShellRestartBubbleCleanup(); + + + + boolean enableShellTopTaskTracking(); + + + boolean enableTaskbarNavbarUnification(); - - + + + + boolean enableTaskbarOnPhones(); + + + boolean enableTinyTaskbar(); - - - boolean onlyReuseBubbledTaskWhenLaunchedFromBubble(); + + + + boolean fixBubbleStackViewExpandedWhenAdded(); + + + + boolean fixBubblesAddSameBubbleBeingRemoved(); + + + + boolean fixBubblesCancelAnimation(); + + + + boolean fixBubblesExpandedSysuiFlag(); + + + + boolean fixBubblesImeFocusFlicker(); + + + + boolean fixExitSplitOnEnterBubble(); + + + + boolean fixMissingUserChangeCallbacks(); + + + + boolean fixTaskViewRotationAnimation(); + + + + boolean splitDisableChildTaskBounds(); + + + + boolean splitToFullSetWindowMode(); + + + + boolean taskViewTransitionsRefactor(); } diff --git a/flags/src/com/android/wm/shell/FeatureFlagsImpl.java b/flags/src/com/android/wm/shell/FeatureFlagsImpl.java index a5bba4b5ee8..e367fa3e472 100644 --- a/flags/src/com/android/wm/shell/FeatureFlagsImpl.java +++ b/flags/src/com/android/wm/shell/FeatureFlagsImpl.java @@ -1,394 +1,292 @@ package com.android.wm.shell; -// TODO(b/303773055): Remove the annotation after access issue is resolved. -import com.android.quickstep.util.DeviceConfigHelper; - -import java.nio.file.Files; -import java.nio.file.Paths; /** @hide */ public final class FeatureFlagsImpl implements FeatureFlags { - private static final boolean isReadFromNew = Files.exists(Paths.get("/metadata/aconfig/boot/enable_only_new_storage")); - private static volatile boolean isCached = false; - private static volatile boolean multitasking_is_cached = false; - private static boolean animateBubbleSizeChange = false; - private static boolean enableAppPairs = true; - private static boolean enableBubbleAnything = false; - private static boolean enableBubbleBar = false; - private static boolean enableBubbleStashing = false; - private static boolean enableBubblesLongPressNavHandle = false; - private static boolean enableLeftRightSplitInPortrait = true; - private static boolean enableNewBubbleAnimations = false; - private static boolean enableOptionalBubbleOverflow = true; - private static boolean enablePipUmoExperience = false; - private static boolean enableRetrievableBubbles = false; - private static boolean enableSplitContextual = true; - private static boolean enableTaskbarNavbarUnification = true; - private static boolean enableTinyTaskbar = false; - private static boolean onlyReuseBubbledTaskWhenLaunchedFromBubble = false; - + @Override - private void init() { - boolean foundPackage = true; - animateBubbleSizeChange = foundPackage; + public boolean bugRotationButtonCoverBubble() { + return false; + } + @Override - enableAppPairs = foundPackage; + public boolean dismissPipFromLockscreen() { + return false; + } - enableBubbleAnything = foundPackage; + @Override - enableBubbleBar = foundPackage; + public boolean enable2x1Split() { + return false; + } + @Override - enableBubbleStashing = foundPackage; + public boolean enableAutoTaskStackController() { + return true; + } - enableBubblesLongPressNavHandle = foundPackage ; + @Override - enableLeftRightSplitInPortrait = foundPackage; + public boolean enableBubbleAnything() { + return false; + } + @Override - enableNewBubbleAnimations = foundPackage; + public boolean enableBubbleBar() { + return false; + } - enableOptionalBubbleOverflow = foundPackage; + @Override + public boolean enableBubbleBarOnPhones() { + return false; + } - enablePipUmoExperience = foundPackage; + @Override - enableRetrievableBubbles = foundPackage; + public boolean enableBubbleBarToFloatingTransition() { + return true; + } + @Override - enableSplitContextual = foundPackage; + public boolean enableBubbleEventHistoryLogs() { + return false; + } - enableTaskbarNavbarUnification = foundPackage; + @Override - enableTinyTaskbar = foundPackage; + public boolean enableBubbleStashing() { + return false; + } + @Override - onlyReuseBubbledTaskWhenLaunchedFromBubble = foundPackage ; - isCached = true; + public boolean enableBubbleToFullscreen() { + return false; } + @Override - - private void load_overrides_multitasking() { - try { - var properties = DeviceConfigHelper.Companion.getPrefs(); - animateBubbleSizeChange = - properties.getBoolean(Flags.FLAG_ANIMATE_BUBBLE_SIZE_CHANGE, false); - enableAppPairs = - properties.getBoolean(Flags.FLAG_ENABLE_APP_PAIRS, true); - enableBubbleAnything = - properties.getBoolean(Flags.FLAG_ENABLE_BUBBLE_ANYTHING, false); - enableBubbleBar = - properties.getBoolean(Flags.FLAG_ENABLE_BUBBLE_BAR, false); - enableBubbleStashing = - properties.getBoolean(Flags.FLAG_ENABLE_BUBBLE_STASHING, false); - enableBubblesLongPressNavHandle = - properties.getBoolean(Flags.FLAG_ENABLE_BUBBLES_LONG_PRESS_NAV_HANDLE, false); - enableLeftRightSplitInPortrait = - properties.getBoolean(Flags.FLAG_ENABLE_LEFT_RIGHT_SPLIT_IN_PORTRAIT, true); - enableNewBubbleAnimations = - properties.getBoolean(Flags.FLAG_ENABLE_NEW_BUBBLE_ANIMATIONS, false); - enableOptionalBubbleOverflow = - properties.getBoolean(Flags.FLAG_ENABLE_OPTIONAL_BUBBLE_OVERFLOW, true); - enablePipUmoExperience = - properties.getBoolean(Flags.FLAG_ENABLE_PIP_UMO_EXPERIENCE, false); - enableRetrievableBubbles = - properties.getBoolean(Flags.FLAG_ENABLE_RETRIEVABLE_BUBBLES, false); - enableSplitContextual = - properties.getBoolean(Flags.FLAG_ENABLE_SPLIT_CONTEXTUAL, true); - enableTaskbarNavbarUnification = - properties.getBoolean(Flags.FLAG_ENABLE_TASKBAR_NAVBAR_UNIFICATION, true); - enableTinyTaskbar = - properties.getBoolean(Flags.FLAG_ENABLE_TINY_TASKBAR, false); - onlyReuseBubbledTaskWhenLaunchedFromBubble = - properties.getBoolean(Flags.FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE, false); - } catch (NullPointerException e) { - throw new RuntimeException( - "Cannot read value from namespace multitasking " - + "from DeviceConfig. It could be that the code using flag " - + "executed before SettingsProvider initialization. Please use " - + "fixed read-only flag by adding is_fixed_read_only: true in " - + "flag declaration.", - e - ); - } - multitasking_is_cached = true; + public boolean enableBubblesLongPressNavHandle() { + return false; } @Override - - - public boolean animateBubbleSizeChange() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return animateBubbleSizeChange; + + public boolean enableCreateAnyBubble() { + return false; } @Override - - - public boolean enableAppPairs() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableAppPairs; + + public boolean enableDynamicInsetsForAppLaunch() { + return true; } @Override - - - public boolean enableBubbleAnything() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableBubbleAnything; + + public boolean enableFlexibleSplit() { + return false; } @Override - - - public boolean enableBubbleBar() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableBubbleBar; + + public boolean enableFlexibleTwoAppSplit() { + return true; } @Override - - - public boolean enableBubbleStashing() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableBubbleStashing; + + public boolean enableGsf() { + return true; } @Override - - - public boolean enableBubblesLongPressNavHandle() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableBubblesLongPressNavHandle; + + public boolean enableMagneticSplitDivider() { + return false; } @Override - - - public boolean enableLeftRightSplitInPortrait() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableLeftRightSplitInPortrait; + + public boolean enableNewBubbleAnimations() { + return false; } @Override - - - public boolean enableNewBubbleAnimations() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableNewBubbleAnimations; + + public boolean enableOptionalBubbleOverflow() { + return false; } @Override - - - public boolean enableOptionalBubbleOverflow() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableOptionalBubbleOverflow; + + public boolean enablePip2() { + return true; } @Override - - - public boolean enablePip2Implementation() { + + + public boolean enablePip2OnTv() { return false; + } + + @Override + + public boolean enablePipBoxShadows() { + return false; } @Override - - - public boolean enablePipUmoExperience() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enablePipUmoExperience; + + public boolean enablePipUmoExperience() { + return false; } @Override - - + + public boolean enableRetrievableBubbles() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableRetrievableBubbles; + return false; + } + + @Override + + public boolean enableShellRestartBubbleCleanup() { + return false; } @Override - - - public boolean enableSplitContextual() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableSplitContextual; + + public boolean enableShellTopTaskTracking() { + return false; } @Override - - + + public boolean enableTaskbarNavbarUnification() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableTaskbarNavbarUnification; + return true; + } + @Override + + + public boolean enableTaskbarOnPhones() { + return true; } @Override - - + + public boolean enableTinyTaskbar() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return enableTinyTaskbar; + return false; + } + + @Override + + public boolean fixBubbleStackViewExpandedWhenAdded() { + return false; } @Override - - - public boolean onlyReuseBubbledTaskWhenLaunchedFromBubble() { - if (isReadFromNew) { - if (!isCached) { - init(); - } - } else { - if (!multitasking_is_cached) { - load_overrides_multitasking(); - } - } - return onlyReuseBubbledTaskWhenLaunchedFromBubble; + + public boolean fixBubblesAddSameBubbleBeingRemoved() { + return false; } -} + @Override + + public boolean fixBubblesCancelAnimation() { + return true; + } + + @Override + + + public boolean fixBubblesExpandedSysuiFlag() { + return false; + } + + @Override + + + public boolean fixBubblesImeFocusFlicker() { + return false; + } + + @Override + + + public boolean fixExitSplitOnEnterBubble() { + return false; + } + + @Override + + + public boolean fixMissingUserChangeCallbacks() { + return true; + } + + @Override + + + public boolean fixTaskViewRotationAnimation() { + return false; + } + + @Override + + + public boolean splitDisableChildTaskBounds() { + return true; + } + + @Override + + + public boolean splitToFullSetWindowMode() { + return false; + } + + @Override + + + public boolean taskViewTransitionsRefactor() { + return false; + } + +} diff --git a/flags/src/com/android/wm/shell/Flags.java b/flags/src/com/android/wm/shell/Flags.java index 5dd4ab74708..3be2603dd6e 100644 --- a/flags/src/com/android/wm/shell/Flags.java +++ b/flags/src/com/android/wm/shell/Flags.java @@ -1,117 +1,335 @@ package com.android.wm.shell; -// TODO(b/303773055): Remove the annotation after access issue is resolved. + + /** @hide */ public final class Flags { /** @hide */ - public static final String FLAG_ANIMATE_BUBBLE_SIZE_CHANGE = "com.android.wm.shell.animate_bubble_size_change"; + public static final String FLAG_BUG_ROTATION_BUTTON_COVER_BUBBLE = "com.android.wm.shell.bug_rotation_button_cover_bubble"; + /** @hide */ + public static final String FLAG_DISMISS_PIP_FROM_LOCKSCREEN = "com.android.wm.shell.dismiss_pip_from_lockscreen"; /** @hide */ - public static final String FLAG_ENABLE_APP_PAIRS = "com.android.wm.shell.enable_app_pairs"; + public static final String FLAG_ENABLE_2X1_SPLIT = "com.android.wm.shell.enable_2x1_split"; + /** @hide */ + public static final String FLAG_ENABLE_AUTO_TASK_STACK_CONTROLLER = "com.android.wm.shell.enable_auto_task_stack_controller"; /** @hide */ public static final String FLAG_ENABLE_BUBBLE_ANYTHING = "com.android.wm.shell.enable_bubble_anything"; /** @hide */ public static final String FLAG_ENABLE_BUBBLE_BAR = "com.android.wm.shell.enable_bubble_bar"; /** @hide */ + public static final String FLAG_ENABLE_BUBBLE_BAR_ON_PHONES = "com.android.wm.shell.enable_bubble_bar_on_phones"; + /** @hide */ + public static final String FLAG_ENABLE_BUBBLE_BAR_TO_FLOATING_TRANSITION = "com.android.wm.shell.enable_bubble_bar_to_floating_transition"; + /** @hide */ + public static final String FLAG_ENABLE_BUBBLE_EVENT_HISTORY_LOGS = "com.android.wm.shell.enable_bubble_event_history_logs"; + /** @hide */ public static final String FLAG_ENABLE_BUBBLE_STASHING = "com.android.wm.shell.enable_bubble_stashing"; /** @hide */ + public static final String FLAG_ENABLE_BUBBLE_TO_FULLSCREEN = "com.android.wm.shell.enable_bubble_to_fullscreen"; + /** @hide */ public static final String FLAG_ENABLE_BUBBLES_LONG_PRESS_NAV_HANDLE = "com.android.wm.shell.enable_bubbles_long_press_nav_handle"; /** @hide */ - public static final String FLAG_ENABLE_LEFT_RIGHT_SPLIT_IN_PORTRAIT = "com.android.wm.shell.enable_left_right_split_in_portrait"; + public static final String FLAG_ENABLE_CREATE_ANY_BUBBLE = "com.android.wm.shell.enable_create_any_bubble"; + /** @hide */ + public static final String FLAG_ENABLE_DYNAMIC_INSETS_FOR_APP_LAUNCH = "com.android.wm.shell.enable_dynamic_insets_for_app_launch"; + /** @hide */ + public static final String FLAG_ENABLE_FLEXIBLE_SPLIT = "com.android.wm.shell.enable_flexible_split"; + /** @hide */ + public static final String FLAG_ENABLE_FLEXIBLE_TWO_APP_SPLIT = "com.android.wm.shell.enable_flexible_two_app_split"; + /** @hide */ + public static final String FLAG_ENABLE_GSF = "com.android.wm.shell.enable_gsf"; + /** @hide */ + public static final String FLAG_ENABLE_MAGNETIC_SPLIT_DIVIDER = "com.android.wm.shell.enable_magnetic_split_divider"; /** @hide */ public static final String FLAG_ENABLE_NEW_BUBBLE_ANIMATIONS = "com.android.wm.shell.enable_new_bubble_animations"; /** @hide */ public static final String FLAG_ENABLE_OPTIONAL_BUBBLE_OVERFLOW = "com.android.wm.shell.enable_optional_bubble_overflow"; /** @hide */ - public static final String FLAG_ENABLE_PIP2_IMPLEMENTATION = "com.android.wm.shell.enable_pip2_implementation"; + public static final String FLAG_ENABLE_PIP2 = "com.android.wm.shell.enable_pip2"; + /** @hide */ + public static final String FLAG_ENABLE_PIP2_ON_TV = "com.android.wm.shell.enable_pip2_on_tv"; + /** @hide */ + public static final String FLAG_ENABLE_PIP_BOX_SHADOWS = "com.android.wm.shell.enable_pip_box_shadows"; /** @hide */ public static final String FLAG_ENABLE_PIP_UMO_EXPERIENCE = "com.android.wm.shell.enable_pip_umo_experience"; /** @hide */ public static final String FLAG_ENABLE_RETRIEVABLE_BUBBLES = "com.android.wm.shell.enable_retrievable_bubbles"; /** @hide */ - public static final String FLAG_ENABLE_SPLIT_CONTEXTUAL = "com.android.wm.shell.enable_split_contextual"; + public static final String FLAG_ENABLE_SHELL_RESTART_BUBBLE_CLEANUP = "com.android.wm.shell.enable_shell_restart_bubble_cleanup"; + /** @hide */ + public static final String FLAG_ENABLE_SHELL_TOP_TASK_TRACKING = "com.android.wm.shell.enable_shell_top_task_tracking"; /** @hide */ public static final String FLAG_ENABLE_TASKBAR_NAVBAR_UNIFICATION = "com.android.wm.shell.enable_taskbar_navbar_unification"; /** @hide */ + public static final String FLAG_ENABLE_TASKBAR_ON_PHONES = "com.android.wm.shell.enable_taskbar_on_phones"; + /** @hide */ public static final String FLAG_ENABLE_TINY_TASKBAR = "com.android.wm.shell.enable_tiny_taskbar"; /** @hide */ - public static final String FLAG_ONLY_REUSE_BUBBLED_TASK_WHEN_LAUNCHED_FROM_BUBBLE = "com.android.wm.shell.only_reuse_bubbled_task_when_launched_from_bubble"; - - - public static boolean animateBubbleSizeChange() { - return FEATURE_FLAGS.animateBubbleSizeChange(); + public static final String FLAG_FIX_BUBBLE_STACK_VIEW_EXPANDED_WHEN_ADDED = "com.android.wm.shell.fix_bubble_stack_view_expanded_when_added"; + /** @hide */ + public static final String FLAG_FIX_BUBBLES_ADD_SAME_BUBBLE_BEING_REMOVED = "com.android.wm.shell.fix_bubbles_add_same_bubble_being_removed"; + /** @hide */ + public static final String FLAG_FIX_BUBBLES_CANCEL_ANIMATION = "com.android.wm.shell.fix_bubbles_cancel_animation"; + /** @hide */ + public static final String FLAG_FIX_BUBBLES_EXPANDED_SYSUI_FLAG = "com.android.wm.shell.fix_bubbles_expanded_sysui_flag"; + /** @hide */ + public static final String FLAG_FIX_BUBBLES_IME_FOCUS_FLICKER = "com.android.wm.shell.fix_bubbles_ime_focus_flicker"; + /** @hide */ + public static final String FLAG_FIX_EXIT_SPLIT_ON_ENTER_BUBBLE = "com.android.wm.shell.fix_exit_split_on_enter_bubble"; + /** @hide */ + public static final String FLAG_FIX_MISSING_USER_CHANGE_CALLBACKS = "com.android.wm.shell.fix_missing_user_change_callbacks"; + /** @hide */ + public static final String FLAG_FIX_TASK_VIEW_ROTATION_ANIMATION = "com.android.wm.shell.fix_task_view_rotation_animation"; + /** @hide */ + public static final String FLAG_SPLIT_DISABLE_CHILD_TASK_BOUNDS = "com.android.wm.shell.split_disable_child_task_bounds"; + /** @hide */ + public static final String FLAG_SPLIT_TO_FULL_SET_WINDOW_MODE = "com.android.wm.shell.split_to_full_set_window_mode"; + /** @hide */ + public static final String FLAG_TASK_VIEW_TRANSITIONS_REFACTOR = "com.android.wm.shell.task_view_transitions_refactor"; + + + public static boolean bugRotationButtonCoverBubble() { + + return FEATURE_FLAGS.bugRotationButtonCoverBubble(); + } + + + public static boolean dismissPipFromLockscreen() { + + return FEATURE_FLAGS.dismissPipFromLockscreen(); } - - - public static boolean enableAppPairs() { - return FEATURE_FLAGS.enableAppPairs(); + + + public static boolean enable2x1Split() { + + return FEATURE_FLAGS.enable2x1Split(); } - - + + + public static boolean enableAutoTaskStackController() { + + return FEATURE_FLAGS.enableAutoTaskStackController(); + } + + public static boolean enableBubbleAnything() { + return FEATURE_FLAGS.enableBubbleAnything(); } - - + + public static boolean enableBubbleBar() { + return FEATURE_FLAGS.enableBubbleBar(); } - - + + + public static boolean enableBubbleBarOnPhones() { + + return FEATURE_FLAGS.enableBubbleBarOnPhones(); + } + + + public static boolean enableBubbleBarToFloatingTransition() { + + return FEATURE_FLAGS.enableBubbleBarToFloatingTransition(); + } + + + public static boolean enableBubbleEventHistoryLogs() { + + return FEATURE_FLAGS.enableBubbleEventHistoryLogs(); + } + + public static boolean enableBubbleStashing() { + return FEATURE_FLAGS.enableBubbleStashing(); } - - + + + public static boolean enableBubbleToFullscreen() { + + return FEATURE_FLAGS.enableBubbleToFullscreen(); + } + + public static boolean enableBubblesLongPressNavHandle() { + return FEATURE_FLAGS.enableBubblesLongPressNavHandle(); } - - - public static boolean enableLeftRightSplitInPortrait() { - return FEATURE_FLAGS.enableLeftRightSplitInPortrait(); + + + public static boolean enableCreateAnyBubble() { + + return FEATURE_FLAGS.enableCreateAnyBubble(); + } + + + public static boolean enableDynamicInsetsForAppLaunch() { + + return FEATURE_FLAGS.enableDynamicInsetsForAppLaunch(); + } + + + public static boolean enableFlexibleSplit() { + + return FEATURE_FLAGS.enableFlexibleSplit(); + } + + + public static boolean enableFlexibleTwoAppSplit() { + + return FEATURE_FLAGS.enableFlexibleTwoAppSplit(); + } + + + public static boolean enableGsf() { + + return FEATURE_FLAGS.enableGsf(); } - - + + + public static boolean enableMagneticSplitDivider() { + + return FEATURE_FLAGS.enableMagneticSplitDivider(); + } + + public static boolean enableNewBubbleAnimations() { + return FEATURE_FLAGS.enableNewBubbleAnimations(); } - - + + public static boolean enableOptionalBubbleOverflow() { + return FEATURE_FLAGS.enableOptionalBubbleOverflow(); } - - public static boolean enablePip2Implementation() { - return FEATURE_FLAGS.enablePip2Implementation(); + + + public static boolean enablePip2() { + + return FEATURE_FLAGS.enablePip2(); + } + + + public static boolean enablePip2OnTv() { + + return FEATURE_FLAGS.enablePip2OnTv(); + } + + + public static boolean enablePipBoxShadows() { + + return FEATURE_FLAGS.enablePipBoxShadows(); } - - + + public static boolean enablePipUmoExperience() { + return FEATURE_FLAGS.enablePipUmoExperience(); } - - + + public static boolean enableRetrievableBubbles() { + return FEATURE_FLAGS.enableRetrievableBubbles(); } - - - public static boolean enableSplitContextual() { - return FEATURE_FLAGS.enableSplitContextual(); + + + public static boolean enableShellRestartBubbleCleanup() { + + return FEATURE_FLAGS.enableShellRestartBubbleCleanup(); } - - + + + public static boolean enableShellTopTaskTracking() { + + return FEATURE_FLAGS.enableShellTopTaskTracking(); + } + + public static boolean enableTaskbarNavbarUnification() { + return FEATURE_FLAGS.enableTaskbarNavbarUnification(); } - - + + + public static boolean enableTaskbarOnPhones() { + + return FEATURE_FLAGS.enableTaskbarOnPhones(); + } + + public static boolean enableTinyTaskbar() { + return FEATURE_FLAGS.enableTinyTaskbar(); } - - - public static boolean onlyReuseBubbledTaskWhenLaunchedFromBubble() { - return FEATURE_FLAGS.onlyReuseBubbledTaskWhenLaunchedFromBubble(); + + + public static boolean fixBubbleStackViewExpandedWhenAdded() { + + return FEATURE_FLAGS.fixBubbleStackViewExpandedWhenAdded(); + } + + + public static boolean fixBubblesAddSameBubbleBeingRemoved() { + + return FEATURE_FLAGS.fixBubblesAddSameBubbleBeingRemoved(); + } + + + public static boolean fixBubblesCancelAnimation() { + + return FEATURE_FLAGS.fixBubblesCancelAnimation(); + } + + + public static boolean fixBubblesExpandedSysuiFlag() { + + return FEATURE_FLAGS.fixBubblesExpandedSysuiFlag(); + } + + + public static boolean fixBubblesImeFocusFlicker() { + + return FEATURE_FLAGS.fixBubblesImeFocusFlicker(); + } + + + public static boolean fixExitSplitOnEnterBubble() { + + return FEATURE_FLAGS.fixExitSplitOnEnterBubble(); + } + + + public static boolean fixMissingUserChangeCallbacks() { + + return FEATURE_FLAGS.fixMissingUserChangeCallbacks(); + } + + + public static boolean fixTaskViewRotationAnimation() { + + return FEATURE_FLAGS.fixTaskViewRotationAnimation(); + } + + + public static boolean splitDisableChildTaskBounds() { + + return FEATURE_FLAGS.splitDisableChildTaskBounds(); + } + + + public static boolean splitToFullSetWindowMode() { + + return FEATURE_FLAGS.splitToFullSetWindowMode(); + } + + + public static boolean taskViewTransitionsRefactor() { + + return FEATURE_FLAGS.taskViewTransitionsRefactor(); } private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl(); diff --git a/go/AndroidManifest-launcher.xml b/go/AndroidManifest-launcher.xml index 8e427d4c31f..cc4072e2624 100644 --- a/go/AndroidManifest-launcher.xml +++ b/go/AndroidManifest-launcher.xml @@ -56,6 +56,7 @@ android:enabled="true"> + diff --git a/go/quickstep/res/values-af/strings.xml b/go/quickstep/res/values-af/strings.xml index 501d297a8d8..f4ce476582e 100644 --- a/go/quickstep/res/values-af/strings.xml +++ b/go/quickstep/res/values-af/strings.xml @@ -1,7 +1,7 @@ - "Deel program" + "Deel app" "Luister" "Vertaal" "Lens" @@ -9,12 +9,12 @@ "KANSELLEER" "INSTELLINGS" "Vertaal of luister na teks op skerm" - "Inligting soos teks op jou skerm, webadresse en skermskote kan met Google gedeel word.\n\nGaan na ""Instellings > Programme > Verstekprogramme > Digitale Assistent-program"" om te verander watter inligting jy deel." + "Inligting soos teks op jou skerm, webadresse en skermskote kan met Google gedeel word.\n\nGaan na ""Instellings > Apps > Verstekapps > Digitale Assistent-app"" om te verander watter inligting jy deel." "Kies \'n assistent om hierdie kenmerk te gebruik" "Kies \'n digitalebystandprogram in Instellings om na teks op jou skerm te luister of dit te vertaal" "Verander jou assistent om hierdie kenmerk te gebruik" "Verander jou digitalebystandprogram in Instellings om na teks op jou skerm te luister of dit te vertaal" "Tik hier om na teks op hierdie skerm te luister" "Tik hier om teks op hierdie skerm te vertaal" - "Hierdie program kan nie gedeel word nie" + "Hierdie app kan nie gedeel word nie" diff --git a/go/quickstep/res/values-be/strings.xml b/go/quickstep/res/values-be/strings.xml index 83374bb397e..de8766f7088 100644 --- a/go/quickstep/res/values-be/strings.xml +++ b/go/quickstep/res/values-be/strings.xml @@ -4,7 +4,7 @@ "Абагуліць праграму" "Праслухаць" "Перакласці" - "Аб\'ектыў" + "Аб’ектыў" "ЗРАЗУМЕЛА" "СКАСАВАЦЬ" "НАЛАДЫ" diff --git a/go/quickstep/res/values-ca/strings.xml b/go/quickstep/res/values-ca/strings.xml index 889f50eec08..134f22459fd 100644 --- a/go/quickstep/res/values-ca/strings.xml +++ b/go/quickstep/res/values-ca/strings.xml @@ -9,7 +9,7 @@ "CANCEL·LA" "CONFIGURACIÓ" "Tradueix o escolta el text en pantalla" - "És possible que determinada informació es comparteixi amb Google, com ara el text en pantalla, les adreces web i les captures de pantalla.\n\nPer canviar quina informació comparteixes, ves a ""Configuració > Aplicacions > Aplicacions predeterminades > Aplicació de l\'assistent digital""." + "És possible que determinada informació es comparteixi amb Google, com ara el text en pantalla, les adreces web i les captures de pantalla.\n\nPer canviar quina informació comparteixes, ves a ""Configuració > Aplicacions > Aplicacions predeterminades > Aplicació d\'assistent digital""." "Tria un assistent per utilitzar aquesta funció" "Per escoltar o traduir text en pantalla, tria una aplicació d\'assistent digital a Configuració" "Canvia l\'assistent per utilitzar aquesta funció" diff --git a/go/quickstep/res/values-fa/strings.xml b/go/quickstep/res/values-fa/strings.xml index 8453d4e3e2d..f0e4a57712d 100644 --- a/go/quickstep/res/values-fa/strings.xml +++ b/go/quickstep/res/values-fa/strings.xml @@ -5,7 +5,7 @@ "گوش دادن" "ترجمه" "لنز" - "متوجه‌ام" + "متوجهم" "لغو" "تنظیمات" "ترجمه نوشتار روی صفحه‌نمایش یا گوش دادن به آن" diff --git a/go/quickstep/res/values-iw/strings.xml b/go/quickstep/res/values-iw/strings.xml index ddb8ddd9a9f..db661066e0d 100644 --- a/go/quickstep/res/values-iw/strings.xml +++ b/go/quickstep/res/values-iw/strings.xml @@ -14,7 +14,7 @@ "כדי להאזין לטקסט שבמסך או לתרגם אותו, צריך לבחור אפליקציית עוזר דיגיטלי ב\'הגדרות\'" "צריך לשנות את העוזר הדיגיטלי כדי להשתמש בתכונה הזו" "כדי להאזין לטקסט שבמסך או לתרגם אותו, צריך לשנות את אפליקציית העוזר הדיגיטלי ב\'הגדרות\'" - "צריך להקיש כאן כדי להאזין לטקסט שבמסך הזה" - "צריך להקיש כאן כדי לתרגם את הטקסט שבמסך הזה" + "צריך ללחוץ כאן כדי להאזין לטקסט שבמסך הזה" + "צריך ללחוץ כאן כדי לתרגם את הטקסט שבמסך הזה" "אי אפשר לשתף את האפליקציה הזו" diff --git a/go/quickstep/res/values-ne/strings.xml b/go/quickstep/res/values-ne/strings.xml index e66f06373d5..4f771c3ec40 100644 --- a/go/quickstep/res/values-ne/strings.xml +++ b/go/quickstep/res/values-ne/strings.xml @@ -9,11 +9,11 @@ "रद्द गर्नुहोस्" "सेटिङ" "स्क्रिनमा देखिने पाठ अनुवाद गर्नुहोस् वा पढेर सुनाउनुहोस्" - "तपाईंको स्क्रिनमा देखिने पाठ, वेब ठेगाना र स्क्रिनसटलगायतका जानकारी Google सँग सेयर गर्न सकिन्छ।\n\nकुन कुन जानकारी सेयर गर्न दिने भन्ने सेटिङ बदल्न ""सेटिङ > एप > डिफल्ट एप > डिजिटल सहायक एप"" मा जानुहोस्।" + "तपाईंको स्क्रिनमा देखिने पाठ, वेब ठेगाना र स्क्रिनसटलगायतका जानकारी Google सँग सेयर गर्न सकिन्छ।\n\nकुन कुन जानकारी सेयर गर्न दिने भन्ने सेटिङ बदल्न ""सेटिङ > एप > डिफल्ट एप > डिजिटल एसिस्टेन्ट एप"" मा जानुहोस्।" "तपाईं यो सुविधा चलाउन चाहनुहुन्छ भने कुनै सहायक छनौट गर्नुहोस्" - "तपाईं आफ्नो स्क्रिनमा देखिने पाठ सुन्न वा अनुवाद गर्न चाहनुहुन्छ भने सेटिङमा गई कुनै डिजिटल सहायक एप छनौट गर्नुहोस्" + "तपाईं आफ्नो स्क्रिनमा देखिने पाठ सुन्न वा अनुवाद गर्न चाहनुहुन्छ भने सेटिङमा गई कुनै डिजिटल एसिस्टेन्ट एप छनौट गर्नुहोस्" "तपाईं यो सुविधा चलाउन चाहनुहुन्छ भने आफ्नो सहायक परिवर्तन गर्नुहोस्" - "तपाईं आफ्नो स्क्रिनमा देखिने पाठ सुन्न वा अनुवाद गर्न चाहनुहुन्छ भने सेटिङमा गई कुनै डिजिटल सहायक एप परिर्वर्तन गर्नुहोस्" + "तपाईं आफ्नो स्क्रिनमा देखिने पाठ सुन्न वा अनुवाद गर्न चाहनुहुन्छ भने सेटिङमा गई कुनै डिजिटल एसिस्टेन्ट एप परिर्वर्तन गर्नुहोस्" "तपाईं यो स्क्रिनमा देखिने पाठ सुन्न चाहनुहुन्छ यहाँ ट्याप गर्नुहोस्" "तपाईं यो स्क्रिनमा देखिने पाठ अनुवाद गर्न चाहनुहुन्छ यहाँ ट्याप गर्नुहोस्" "यो एप अरूलाई चलाउन दिन मिल्दैन" diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml index c659331bde3..2524c760f40 100644 --- a/go/quickstep/res/values/styles.xml +++ b/go/quickstep/res/values/styles.xml @@ -16,7 +16,7 @@ --> - - - - - + - - - - - - - - - \ No newline at end of file diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml index ca44a6914c2..dd38e03cbdb 100644 --- a/quickstep/res/values-nl/strings.xml +++ b/quickstep/res/values-nl/strings.xml @@ -22,11 +22,14 @@ "Vastzetten" "Vrije vorm" "Desktop" + "Verplaatsen naar extern scherm" + "Wissen" + "Desktop" "Geen recente items" "Instellingen voor app-gebruik" "Alles wissen" + "Nieuw bureau toevoegen" "Recente apps" - "Taak gesloten" "%1$s, %2$s" "< 1 minuut" "Nog %1$s vandaag" @@ -44,7 +47,7 @@ "App-suggesties toegevoegd aan lege ruimte" "App-suggesties staan aan" "App-suggesties staan uit" - "Voorspelde app: %1$s" + "Tutorial voor navigatie met gebaren" "Het apparaat draaien" "Draai het apparaat om de tutorial voor navigatie met gebaren af te ronden" "Swipe vanaf de rechter- of linkerrand" @@ -56,17 +59,15 @@ "Open Instellingen om de gevoeligheid van Terug te wijzigen" "Swipe om terug te gaan" "Swipe vanaf de linker- of rechterrand naar het midden om terug te gaan naar het vorige scherm." - "Als je wilt teruggaan naar het laatste scherm, swipe je met 2 vingers vanaf de linker- of rechterrand naar het midden van het scherm." "Terug" "Swipe vanaf de linker- of rechterrand naar het midden van het scherm" "Swipe vanaf de onderrand van het scherm omhoog" "Pauzeer niet voordat je loslaat" "Swipe recht omhoog" "Je weet nu hoe je het gebaar Naar startscherm maakt. Ontdek als volgende hoe je kunt teruggaan." - "Je weet nu hoe je teruggaat naar het startscherm" + "Je weet nu hoe je het gebaar Naar het startscherm maakt" "Swipe om naar het startscherm te gaan" "Swipe omhoog vanaf de onderkant van het scherm. Met dit gebaar ga je altijd naar het startscherm." - "Swipe met 2 vingers omhoog vanaf de onderkant van het scherm. Met dit gebaar ga je altijd naar het startscherm." "Naar het startscherm" "Swipe omhoog vanaf de onderkant van het scherm" "Goed gedaan" @@ -77,8 +78,7 @@ "Je weet nu hoe je het gebaar Schakelen tussen apps maakt" "Swipe om tussen apps te schakelen" "Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat los om tussen apps te schakelen." - "Swipe met 2 vingers omhoog vanaf de onderkant van het scherm, houd vast en laat los om tussen apps te schakelen." - "Schakelen tussen apps" + "Wisselen van app" "Swipe omhoog vanaf de onderkant van het scherm, houd je vinger op het scherm en laat dan los" "Goed bezig" "Klaar" @@ -91,24 +91,36 @@ "Swipe omhoog om naar het startscherm te gaan" "Tik op de startknop om naar je startscherm te gaan" "Je bent klaar om je %1$s te gebruiken" - "apparaat" + "Je bent klaar om je apparaat te gebruiken" "Navigatie-instellingen van systeem" + "Je %1$s is \ngereed." + "Het apparaat is \ngereed." + "Je bent er klaar voor." + "Veel plezier met je nieuwe %1$s." + "Swipe omhoog om aan de slag te gaan met je %1$s" + "Tik om aan de slag te gaan met je %1$s" + "Kiezen hoe je wilt navigeren" + "Omhoog swipen" + "Tik op de startknop" + "tablet" + "telefoon" "Delen" "Screenshot" "Splitsen" "App-paar opslaan" "Tik op nog een app om je scherm te splitsen" "Kies een andere app om gesplitst scherm te gebruiken" - "Annuleren" + "Annuleren" "Sluit de selectie voor gesplitst scherm" "Kies andere app om gesplitst scherm te gebruiken" "Deze actie wordt niet toegestaan door de app of je organisatie" "Widgets worden op dit moment niet ondersteund, selecteer een andere app" - "Navigatietutorial overslaan?" - "Je vindt dit later terug in de app %1$s" - "Annuleren" - "Overslaan" "Scherm draaien" + "Animatie die toont hoe de taakbalk onderaan het scherm verschijnt en automatisch wordt verborgen als deze niet wordt gebruikt" + "Animatie die toont hoe je de taakbalk vastzet met een schakelaar, zodat de taakbalk altijd zichtbaar blijft onderaan het scherm" + "Animatie die toont hoe je een gesplitst scherm maakt door een app van de taakbalk naar een geopende app te slepen" + "Animatie die toont hoe je toegang krijgt tot voorgestelde apps op je apparaat" + "Animatie die toont hoe je een item op het scherm kunt zoeken door de actietoets ingedrukt te houden en het gebied te selecteren waarin het item zich bevindt" "Taakbalk Onderwijs" "Sleep een app naar de zijkant om 2 apps tegelijk te gebruiken" "Swipe langzaam omhoog om de taakbalk te tonen" @@ -129,19 +141,38 @@ "Meldingen" "Snelle instellingen" "Taakbalk" - "Taakbalk wordt getoond" - "Taakbalk is verborgen" "Navigatiebalk" "Taakbalk altijd tonen" "Navigatiemodus wijzigen" "Scheiding voor Taakbalk" + "Andere recente apps" + "App toegevoegd aan taakbalk" + "App verwijderd van taakbalk" "Naar boven/links verplaatsen" "Naar beneden/rechts verplaatsen" - "{count,plural, =1{Nog # app tonen.}other{Nog # apps tonen.}}" - "{count,plural, =1{# desktop-app tonen.}other{# desktop-apps tonen.}}" + "App openen als ballon" + "Recente apps" + "Lijst met recente apps" + "{count,plural, =1{extra app}other{extra apps}}" + "Desktop" "%1$s en %2$s" + "%1$s, item %2$d van %3$d" + "Naar links scrollen" + "Naar rechts scrollen" "Bubbel" "Overloop" "%1$s van %2$s" "%1$s en nog %2$d" + "Naar links verplaatsen" + "Naar rechts verplaatsen" + "Alles sluiten" + "%1$s uitvouwen" + "%1$s samenvouwen" + "Circle to Search" + "Icoon van app" + "Titel van app" + "Knop Sluiten" + "Verschuiven" + "Sluiten" + "Afbeelding verschuiven" diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml index bf0bdc83236..2e409a7a512 100644 --- a/quickstep/res/values-or/strings.xml +++ b/quickstep/res/values-or/strings.xml @@ -22,11 +22,14 @@ "ପିନ୍‍" "ଫ୍ରିଫର୍ମ" "ଡେସ୍କଟପ" + "ଏକ୍ସଟର୍ନଲ ଡିସପ୍ଲେକୁ ମୁଭ କରନ୍ତୁ" + "ଖାଲି କରନ୍ତୁ" + "ଡେସ୍କଟପ" "ବର୍ତ୍ତମାନର କୌଣସି ଆଇଟମ ନାହିଁ" "ଆପ ବ୍ୟବହାର ସେଟିଂସ" "ସବୁ ଖାଲି କରନ୍ତୁ" + "ନୂଆ ଡେସ୍କ ଯୋଗ କରନ୍ତୁ" "ବର୍ତ୍ତମାନର ଆପ୍‌" - "ଟାସ୍କ ବନ୍ଦ ହୋଇଯାଇଛି" "%1$s %2$s" "< 1 ମିନିଟ୍" "ଆଜି %1$s ବାକି ଅଛି" @@ -44,42 +47,39 @@ "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ଖାଲି ସ୍ଥାନରେ ଯୋଗ କରାଯାଇଛି" "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ସକ୍ଷମ କରାଯାଇଛି" "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ଅକ୍ଷମ କରାଯାଇଛି" - "ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: %1$s" + "ଜେଶ୍ଚର ନାଭିଗେସନ ଟ୍ୟୁଟୋରିଆଲ" "ଆପଣଙ୍କ ଡିଭାଇସକୁ ରୋଟେଟ କରନ୍ତୁ" "ଜେଶ୍ଚର ନାଭିଗେସନ ଟ୍ୟୁଟୋରିଆଲ ସମ୍ପୂର୍ଣ୍ଣ କରିବାକୁ ଦୟାକରି ଆପଣଙ୍କ ଡିଭାଇସ ରୋଟେଟ କରନ୍ତୁ" - "ଆପଣ ସ୍କ୍ରିନର ଏକଦମ୍-ଡାହାଣ ବା ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" + "ଆପଣ ସ୍କ୍ରିନର ଏକଦମ-ଡାହାଣ ବା ବାମ ଧାରରୁ ସ୍ୱାଇପ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ବା ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ" "ଆପଣ ଡାହାଣରୁ ସ୍ୱାଇପ୍ କରି ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣିଲେ। ତା\'ପରେ, ଆପକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।" "ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।" - "ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି" + "ଆପଣ ପଛକୁ ଫେରନ୍ତୁ ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି" "ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ" "ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ" "ପଛକୁ ଫେରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" "ପୂର୍ବ ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ କିମ୍ବା ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ କରନ୍ତୁ।" - "ପୂର୍ବ ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ କିମ୍ବା ଡାହାଣ ଧାରରୁ ମଝିକୁ 2ଟି ଆଙ୍ଗୁଠିରେ ସ୍ୱାଇପ କରନ୍ତୁ।" "ପଛକୁ ଫେରନ୍ତୁ" "ସ୍କ୍ରିନର ବାମ କିମ୍ବା ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ କରନ୍ତୁ" "ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ" "ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ" "ଆପଣ \'ହୋମକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣନ୍ତୁ।" - "ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" + "ଆପଣ \'ହୋମକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି" "ହୋମକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ କରନ୍ତୁ" "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ହୋମ ସ୍କ୍ରିନକୁ ନେଇଥାଏ।" - "2ଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ହୋମ ସ୍କ୍ରିନକୁ ନେଇଥାଏ।" "ହୋମକୁ ଯାଆନ୍ତୁ" "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ" "ବଢ଼ିଆ କାମ!" "ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ" "ୱିଣ୍ଡୋକୁ ରିଲିଜ୍ କରିବା ପୂର୍ବରୁ ଅଧିକ ସମୟ ଧରି ରଖିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।" - "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରି ତା\'ପରେ ବିରତ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" + "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ କରି ତା\'ପରେ ବିରତ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଜେଶ୍ଚରଗୁଡ଼ିକୁ କିପରି ବ୍ୟବହାର କରାଯିବ ଆପଣ ତାହା ଶିଖିଛନ୍ତି। ଜେଶ୍ଚରଗୁଡ଼ିକୁ ବନ୍ଦ କରିବାକୁ, ସେଟିଂସକୁ ଯାଆନ୍ତୁ।" - "ଆପଣ \'ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" + "ଆପଣ ଆପ୍ସ ସୁଇଚ କରନ୍ତୁ ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" "ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" "ଆପ୍ସ ମଧ୍ୟରେ ସୁଇଚ କରିବାକୁ, ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ, ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ କରନ୍ତୁ।" - "ଆପ୍ସ ମଧ୍ୟରେ ସ୍ୱିଚ କରିବାକୁ, 2ଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରି ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ କର।" "ଆପ୍ସ ସୁଇଚ କରନ୍ତୁ" - "ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‌ର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରି ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ୍ କରନ୍ତୁ" + "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରି ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ କରନ୍ତୁ" "ବହୁତ ବଢ଼ିଆ!" "ସବୁ ପ୍ରସ୍ତୁତ" "ହୋଇଗଲା" @@ -91,24 +91,36 @@ "ହୋମକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ" "ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନକୁ ଯିବା ପାଇଁ ହୋମ ବଟନରେ ଟାପ କରନ୍ତୁ" "ଆପଣ ଆପଣଙ୍କ %1$s ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" - "ଡିଭାଇସ" + "ଆପଣ ଆପଣଙ୍କ ଡିଭାଇସ ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ସିଷ୍ଟମ ନାଭିଗେସନ ସେଟିଂସ" + "ଆପଣଙ୍କ %1$s \nପ୍ରସ୍ତୁତ ଅଛି!" + "ଆପଣଙ୍କ ଡିଭାଇସ \nପ୍ରସ୍ତୁତ ଅଛି!" + "ଆପଣ ବ୍ୟବହାର କରିବାକୁ ପ୍ରସ୍ତୁତ!" + "ଆପଣଙ୍କ ନୂଆ %1$sର ମଜା ନିଅନ୍ତୁ!" + "ଆପଣଙ୍କ %1$s ସହ ଆରମ୍ଭ କରିବାକୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ" + "ଆପଣଙ୍କ %1$sରେ ଆରମ୍ଭ କରିବାକୁ ଟାପ କରନ୍ତୁ" + "କିପରି ନାଭିଗେଟ କରିବେ ତାହା ବାଛନ୍ତୁ" + "ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ" + "ହୋମ ବଟନରେ ଟାପ କରନ୍ତୁ" + "ଟାବଲେଟ" + "ଫୋନ" "ସେୟାର୍ କରନ୍ତୁ" "ସ୍କ୍ରିନସଟ୍" "ସ୍ପ୍ଲିଟ୍" "ଆପ ପେୟାର ସେଭ କରନ୍ତୁ" "ସ୍ପ୍ଲିଟସ୍କ୍ରିନ ବ୍ୟବହାର କରିବାକୁ ଅନ୍ୟ ଏକ ଆପରେ ଟାପ କର" "ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ବ୍ୟବହାର କରିବାକୁ ଅନ୍ୟ ଏକ ଆପ ବାଛନ୍ତୁ" - "ବାତିଲ କରନ୍ତୁ" + "ବାତିଲ କରନ୍ତୁ" "ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ଚୟନରୁ ବାହାରି ଯାଆନ୍ତୁ" "ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ବ୍ୟବହାର କରିବାକୁ ଅନ୍ୟ ଏକ ଆପ ବାଛନ୍ତୁ" "ଆପ୍ କିମ୍ବା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଏହି କାର୍ଯ୍ୟକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ" "ୱିଜେଟଗୁଡ଼ିକ ବର୍ତ୍ତମାନ ସମର୍ଥିତ ନୁହେଁ, ଦୟାକରି ଅନ୍ୟ ଏକ ଆପ ଚୟନ କରନ୍ତୁ" - "ନାଭିଗେସନ୍ ଟ୍ୟୁଟୋରିଆଲକୁ ବାଦ୍ ଦେବେ?" - "ଆପଣ ପରେ ଏହାକୁ %1$s ଆପରେ ପାଇପାରିବେ" - "ବାତିଲ କରନ୍ତୁ" - "ବାଦ୍ ଦିଅନ୍ତୁ" "ସ୍କ୍ରିନ ଘୂରାନ୍ତୁ" + "ସ୍କ୍ରିନର ନିମ୍ନରୁ ଟାସ୍କବାର କିପରି ଦେଖାଯାଏ ଏବଂ ବ୍ୟବହାରରେ ନଥିବା ସମୟରେ ସ୍ୱତଃ ଲୁଚିଯାଏ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ" + "ଏକ ଟୋଗଲ ବ୍ୟବହାର କରି ଆପଣଙ୍କର ଟାସ୍କବାରକୁ କିପରି ପିନ କରିବେ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ, ଫଳରେ ଟାସ୍କବାର ସ୍କ୍ରିନର ନିମ୍ନରେ ସ୍ଥାୟୀ ଭାବରେ ଦେଖାଯିବ" + "ଏକ ଖୋଲା ଥିବା ଆପ ଉପରେ ଟାସ୍କବାରରୁ ଏକ ଆପ ଡ୍ରାଗ ଏବଂ ଡ୍ରପ କରି ଏକ ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ କିପରି ତିଆରି କରିବେ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ" + "ଆପଣଙ୍କ ଡିଭାଇସରେ ପ୍ରସ୍ତାବିତ ଆପ୍ସକୁ କିପରି ଆକ୍ସେସ କରିବେ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ" + "ଆକ୍ସନ କୀ\'କୁ ସ୍ପର୍ଶ କରି ଧରି ରଖି ଏବଂ ଆଇଟମ କେଉଁ ଏରିଆରେ ଅଛି ତାହା ଚୟନ କରି ସ୍କ୍ରିନରେ ଏକ ଆଇଟମ କିପରି ସର୍ଚ୍ଚ କରିବେ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ" "ଟାସ୍କବାର ଶିକ୍ଷା" "ଥରକେ 2ଟି ଆପ୍ସ ବ୍ୟବହାର କରିବା ପାଇଁ ଏକ ଆପକୁ ପାର୍ଶ୍ୱକୁ ଡ୍ରାଗ କର" "ଟାସ୍କବାର ଦେଖାଇବା ପାଇଁ ଉପରକୁ ଧୀରେ-ସ୍ୱାଇପ କରନ୍ତୁ" @@ -129,19 +141,38 @@ "ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ" "କୁଇକ ସେଟିଂସ" "ଟାସ୍କବାର" - "ଟାସ୍କବାର ଦେଖାଯାଇଛି" - "ଟାସ୍କବାର ଲୁଚାଯାଇଛି" "ନାଭିଗେସନ ବାର" "ସର୍ବଦା ଟାସ୍କବାର ଦେଖାନ୍ତୁ" "ନାଭିଗେସନ ମୋଡ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" "ଟାସ୍କବାର ଡିଭାଇଡର" + "ଅନ୍ୟ ବର୍ତ୍ତମାନର ଆପ୍ସ" + "ଟାସ୍କବାରରେ ଆପକୁ ଯୋଗ କରାଯାଇଛି" + "ଟାସ୍କବାରରୁ ଆପକୁ କାଢ଼ି ଦିଆଯାଇଛି" "ଶୀର୍ଷ/ବାମକୁ ମୁଭ କରନ୍ତୁ" "ନିମ୍ନ/ଡାହାଣକୁ ମୁଭ କରନ୍ତୁ" - "{count,plural, =1{ଅଧିକ #ଟି ଆପ ଦେଖାନ୍ତୁ।}other{ଅଧିକ #ଟି ଆପ୍ସ ଦେଖାନ୍ତୁ।}}" - "{count,plural, =1{# ଡେସ୍କଟପ ଆପ ଦେଖାନ୍ତୁ।}other{# ଡେସ୍କଟପ ଆପ୍ସ ଦେଖାନ୍ତୁ।}}" + "ଏକ ବବଲ ଭାବେ ଆପ ଖୋଲନ୍ତୁ" + "ବର୍ତ୍ତମାନର ଆପ" + "ବର୍ତ୍ତମାନର ଆପ ତାଲିକା" + "{count,plural, =1{ଅଧିକ ଆପ}other{ଅଧିକ ଆପ୍ସ}}" + "ଡେସ୍କଟପ" "%1$s ଏବଂ %2$s" + "%1$s, %3$dର %2$d ଆଇଟମ" + "ବାମକୁ ସ୍କ୍ରୋଲ କରନ୍ତୁ" + "ଡାହାଣକୁ ସ୍କ୍ରୋଲ କରନ୍ତୁ" "ବବଲ" "ଓଭରଫ୍ଲୋ" "%2$sରୁ %1$s" "%1$s ଏବଂ ଅଧିକ %2$d" + "ବାମକୁ ମୁଭ କରନ୍ତୁ" + "ଡାହାଣକୁ ମୁଭ କରନ୍ତୁ" + "ସବୁ ଖାରଜ କରନ୍ତୁ" + "%1$s ବିସ୍ତାର କରନ୍ତୁ" + "%1$s ସଙ୍କୁଚିତ କରନ୍ତୁ" + "ସର୍ଚ୍ଚ କରିବାକୁ ସର୍କଲ କରନ୍ତୁ" + "ଆପ ଆଇକନ" + "ଆପ ଟାଇଟେଲ" + "\"ବନ୍ଦ କରନ୍ତୁ\" ବଟନ" + "ନଜ" + "ବନ୍ଦ କରନ୍ତୁ" + "ନଜ ଇମେଜ" diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml index fc603969a77..b4d4a37c07f 100644 --- a/quickstep/res/values-pa/strings.xml +++ b/quickstep/res/values-pa/strings.xml @@ -22,11 +22,14 @@ "ਪਿੰਨ ਕਰੋ" "ਫ੍ਰੀਫਾਰਮ" "ਡੈਸਕਟਾਪ" + "ਬਾਹਰੀ ਡਿਸਪਲੇ \'ਤੇ ਜਾਓ" + "ਕਲੀਅਰ ਕਰੋ" + "ਡੈਸਕਟਾਪ" "ਕੋਈ ਹਾਲੀਆ ਆਈਟਮ ਨਹੀਂ" "ਐਪ ਵਰਤੋਂ ਦੀਆਂ ਸੈਟਿੰਗਾਂ" "ਸਭ ਕਲੀਅਰ ਕਰੋ" + "ਨਵਾਂ ਡੈਸਕ ਸ਼ਾਮਲ ਕਰੋ" "ਹਾਲੀਆ ਐਪਾਂ" - "ਕਾਰਜ ਬੰਦ" "%1$s, %2$s" "< 1 ਮਿੰਟ" "ਅੱਜ %1$s ਬਾਕੀ" @@ -44,7 +47,7 @@ "ਐਪ ਸੁਝਾਅ ਖਾਲੀ ਜਗ੍ਹਾ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ" "ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ" "ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ" - "ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: %1$s" + "ਇਸ਼ਾਰਾ ਨੈਵੀਗੇਸ਼ਨ ਸੰਬੰਧੀ ਟਿਊਟੋਰੀਅਲ" "ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਘੁੰਮਾਓ" "ਕਿਰਪਾ ਕਰਕੇ ਇਸ਼ਾਰਾ ਨੈਵੀਗੇਸ਼ਨ ਟਿਊਟੋਰੀਅਲ ਨੂੰ ਪੂਰਾ ਕਰਨ ਲਈ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਘੁੰਮਾਓ" "ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਜਾਂ ਖੱਬੇ ਪਾਸੇ ਦੇ ਬਿਲਕੁਲ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ" @@ -56,7 +59,6 @@ "ਪਿੱਛੇ ਜਾਣ ਦੇ ਸੰਕੇਤ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ" "ਪਿੱਛੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ" "ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।" - "ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ 2 ਉਂਗਲਾਂ ਨਾਲ ਸਵਾਈਪ ਕਰੋ।" "ਵਾਪਸ ਜਾਓ" "ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ" "ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ" @@ -66,7 +68,6 @@ "ਤੁਸੀਂ \'ਹੋਮ \'ਤੇ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ" "ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ" "ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਇਹ ਇਸ਼ਾਰਾ ਹਮੇਸ਼ਾਂ ਤੁਹਾਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਲੈ ਜਾਂਦਾ ਹੈ।" - "ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ 2 ਉਂਗਲਾਂ ਨਾਲ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਇਹ ਇਸ਼ਾਰਾ ਹਮੇਸ਼ਾਂ ਤੁਹਾਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਲੈ ਜਾਂਦਾ ਹੈ।" "ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਓ" "ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ" "ਬਹੁਤ ਵਧੀਆ!" @@ -74,10 +75,9 @@ "ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਵਿੰਡੋ ਨੂੰ ਕੁਝ ਸਮੇਂ ਲਈ ਦਬਾ ਕੇ ਰੱਖੋ" "ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧਾ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ, ਫਿਰ ਰੋਕੋ" "ਤੁਸੀਂ ਇਸ਼ਾਰੇ ਵਰਤਣ ਬਾਰੇ ਜਾਣਿਆ। ਇਸ਼ਾਰੇ ਬੰਦ ਕਰਨ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।" - "ਤੁਸੀਂ \'ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰੋ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ" + "ਤੁਸੀਂ \'ਐਪਾਂ ਵਿਚਾਲੇ ਸਵਿੱਚ ਕਰੋ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ" "ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਸਵਾਈਪ ਕਰੋ" "ਐਪਾਂ ਵਿਚਾਲੇ ਸਵਿੱਚ ਕਰਨ ਲਈ, ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਤੇ ਸਵਾਈਪ ਕਰ ਕੇ ਦਬਾਈ ਰੱਖੋ ਅਤੇ ਫਿਰ ਛੱਡੋ।" - "ਐਪਾਂ ਵਿਚਾਲੇ ਸਵਿੱਚ ਕਰਨ ਲਈ, ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ 2 ਉਂਗਲਾਂ ਨਾਲ ਉੱਤੇ ਸਵਾਈਪ ਕਰ ਕੇ ਦਬਾਈ ਰੱਖੋ ਅਤੇ ਫਿਰ ਛੱਡੋ।" "ਐਪਾਂ ਸਵਿੱਚ ਕਰੋ" "ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰ ਕੇ ਦਬਾਈ ਰੱਖੋ, ਅਤੇ ਫਿਰ ਛੱਡੋ" "ਬਹੁਤ ਵਧੀਆ!" @@ -90,25 +90,37 @@ "ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ!" "ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ" "ਆਪਣੀ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਣ ਲਈ ਹੋਮ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ" - "ਤੁਸੀਂ ਆਪਣਾ %1$s ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੋ" - "ਡੀਵਾਈਸ" + "ਹੁਣ ਤੁਹਾਡਾ %1$s ਵਰਤੋਂ ਲਈ ਤਿਆਰ ਹੈ" + "ਤੁਸੀਂ ਆਪਣਾ ਡੀਵਾਈਸ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੋ" "ਸਿਸਟਮ ਨੈਵੀਗੇਸ਼ਨ ਸੈਟਿੰਗਾਂ" + "ਤੁਹਾਡਾ %1$s \nਤਿਆਰ ਹੈ!" + "ਤੁਹਾਡਾ ਡੀਵਾਈਸ \nਤਿਆਰ ਹੈ!" + "ਤੁਸੀਂ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਤਿਆਰ ਹੋ!" + "ਆਪਣੇ ਨਵੇਂ %1$s ਦਾ ਅਨੰਦ ਮਾਣੋ!" + "ਆਪਣੇ %1$s ਨਾਲ ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ" + "ਆਪਣੇ %1$s ਨਾਲ ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ" + "ਨੈਵੀਗੇਟ ਕਰਨ ਦਾ ਤਰੀਕਾ ਚੁਣੋ" + "ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ" + "ਹੋਮ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ" + "ਟੈਬਲੈੱਟ" + "ਫ਼ੋਨ" "ਸਾਂਝਾ ਕਰੋ" "ਸਕ੍ਰੀਨਸ਼ਾਟ" "ਸਪਲਿਟ" "ਐਪ ਜੋੜਾਬੱਧ ਰੱਖਿਅਤ ਕਰੋ" "ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਨੂੰ ਵਰਤਣ ਲਈ ਕਿਸੇ ਹੋਰ ਐਪ \'ਤੇ ਟੈਪ ਕਰੋ" "ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਵਰਤਣ ਲਈ ਕਿਸੇ ਹੋਰ ਐਪ ਨੂੰ ਚੁਣੋ" - "ਰੱਦ ਕਰੋ" + "ਰੱਦ ਕਰੋ" "ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਚੋਣ ਤੋਂ ਬਾਹਰ ਜਾਓ" "ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਵਰਤਣ ਲਈ ਕਿਸੇ ਹੋਰ ਐਪ ਨੂੰ ਚੁਣੋ" "ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ" "ਫ਼ਿਲਹਾਲ ਵਿਜੇਟ ਸਮਰਥਿਤ ਨਹੀਂ ਹਨ, ਕਿਰਪਾ ਕਰਕੇ ਕੋਈ ਹੋਰ ਐਪ ਚੁਣੋ" - "ਕੀ ਨੈਵੀਗੇਸ਼ਨ ਟਿਊਟੋਰੀਅਲ ਨੂੰ ਛੱਡਣਾ ਹੈ?" - "ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ %1$s ਐਪ ਵਿੱਚ ਲੱਭ ਸਕਦੇ ਹੋ" - "ਰੱਦ ਕਰੋ" - "ਛੱਡੋ" "ਸਕ੍ਰੀਨ ਘੁਮਾਓ" + "ਟਾਸਕਬਾਰ ਦੇ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਆਉਣ ਅਤੇ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਆਪਣੇ ਆਪ ਲੁਕ ਜਾਣ ਦਾ ਤਰੀਕਾ ਦਿਖਾਉਣ ਵਾਲਾ ਐਨੀਮੇਸ਼ਨ" + "ਟੌਗਲ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਤੁਹਾਡੇ ਟਾਸਕਬਾਰ ਨੂੰ ਪਿੰਨ ਕਰਨ ਦਾ ਤਰੀਕਾ ਦਿਖਾਉਣ ਵਾਲਾ ਐਨੀਮੇਸ਼ਨ, ਤਾਂ ਜੋ ਟਾਸਕਬਾਰ ਪੱਕੇ ਤੌਰ \'ਤੇ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਦਿਖਣਯੋਗ ਰਹੇ" + "ਕਿਸੇ ਖੁੱਲ੍ਹੀ ਐਪ ਉੱਪਰ ਟਾਸਕਬਾਰ ਤੋਂ ਘਸੀਟ ਅਤੇ ਛੱਡ ਕੇ, ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਬਣਾਉਣ ਦਾ ਤਰੀਕਾ ਦਿਖਾਉਣ ਵਾਲਾ ਐਨੀਮੇਸ਼ਨ" + "ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸੁਝਾਈਆਂ ਗਈਆਂ ਐਪਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦਾ ਤਰੀਕਾ ਦਿਖਾਉਣ ਵਾਲਾ ਐਨੀਮੇਸ਼ਨ" + "ਕਾਰਵਾਈ ਕੁੰਜੀ ਨੂੰ ਸਪਰਸ਼ ਕਰ ਕੇ ਰੱਖਦੇ ਹੋਏ ਅਤੇ ਆਈਟਮ ਜਿਸ ਖੇਤਰ ਵਿੱਚ ਹੈ ਉਸਨੂੰ ਚੁਣਦੇ ਹੋਏ, ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਆਈਟਮ ਨੂੰ ਖੋਜਣ ਦਾ ਤਰੀਕਾ ਦਿਖਾਉਣ ਵਾਲਾ ਐਨੀਮੇਸ਼ਨ" "ਟਾਸਕਬਾਰ ਸਿੱਖਿਆ" "ਇੱਕੋ ਵੇਲੇ 2 ਐਪਾਂ ਵਰਤਣ ਲਈ, ਕਿਸੇ ਐਪ ਨੂੰ ਸਾਈਡ \'ਤੇ ਘਸੀਟੋ" "ਟਾਸਕਬਾਰ ਦਿਖਾਉਣ ਲਈ ਹੌਲੀ ਜਿਹੀ ਉੱਤੇ ਵੱਲ ਸਵਾਈਪ ਕਰੋ" @@ -129,19 +141,38 @@ "ਸੂਚਨਾਵਾਂ" "ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ" "ਟਾਸਕਬਾਰ" - "ਟਾਸਕਬਾਰ ਨੂੰ ਦਿਖਾਇਆ ਗਿਆ" - "ਟਾਸਕਬਾਰ ਨੂੰ ਲੁਕਾਇਆ ਗਿਆ" "ਨੈਵੀਗੇਸ਼ਨ ਵਾਲੀ ਪੱਟੀ" "ਹਮੇਸ਼ਾਂ ਟਾਸਕਬਾਰ ਦਿਖਾਓ" "ਨੈਵੀਗੇਸ਼ਨ ਮੋਡ ਬਦਲੋ" "ਟਾਸਕਬਾਰ ਵਿਭਾਜਕ" + "ਹੋਰ ਹਾਲੀਆ ਐਪਾਂ" + "ਐਪ ਨੂੰ ਟਾਸਕਬਾਰ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ" + "ਐਪ ਨੂੰ ਟਾਸਕਬਾਰ ਵਿੱਚੋਂ ਹਟਾਇਆ ਗਿਆ" "ਸਿਖਰਲੇ/ਖੱਬੇ ਪਾਸੇ ਲੈ ਕੇ ਜਾਓ" "ਹੇਠਾਂ/ਸੱਜੇ ਪਾਸੇ ਲੈ ਕੇ ਜਾਓ" - "{count,plural, =1{# ਹੋਰ ਐਪ ਦਿਖਾਓ।}one{# ਹੋਰ ਐਪ ਦਿਖਾਓ।}other{# ਹੋਰ ਐਪਾਂ ਦਿਖਾਓ।}}" - "{count,plural, =1{# ਡੈਸਕਟਾਪ ਐਪ ਦਿਖਾਓ।}one{# ਡੈਸਕਟਾਪ ਐਪ ਦਿਖਾਓ।}other{# ਡੈਸਕਟਾਪ ਐਪਾਂ ਦਿਖਾਓ।}}" + "ਐਪ ਨੂੰ ਬਬਲ ਵਜੋਂ ਖੋਲ੍ਹੋ" + "ਹਾਲੀਆ ਐਪਾਂ" + "ਹਾਲੀਆ ਐਪ ਸੂਚੀ" + "{count,plural, =1{ਹੋਰ ਐਪ}one{ਹੋਰ ਐਪ}other{ਹੋਰ ਐਪਾਂ}}" + "ਡੈਸਕਟਾਪ" "%1$s ਅਤੇ %2$s" + "%1$s, %3$d ਵਿੱਚੋਂ %2$d ਆਈਟਮ" + "ਖੱਬੇ ਪਾਸੇ ਵੱਲ ਸਕ੍ਰੋਲ ਕਰੋ" + "ਸੱਜੇ ਪਾਸੇ ਵੱਲ ਸਕ੍ਰੋਲ ਕਰੋ" "ਬਬਲ" "ਓਵਰਫ਼ਲੋ" "%2$s ਤੋਂ %1$s" "%1$s ਅਤੇ %2$d ਹੋਰ" + "ਖੱਬੇ ਲਿਜਾਓ" + "ਸੱਜੇ ਲਿਜਾਓ" + "ਸਭ ਖਾਰਜ ਕਰੋ" + "%1$s ਦਾ ਵਿਸਤਾਰ ਕਰੋ" + "%1$s ਨੂੰ ਸਮੇਟੋ" + "ਖੋਜਣ ਲਈ ਚੱਕਰ ਬਣਾਓ" + "ਐਪ ਪ੍ਰਤੀਕ" + "ਐਪ ਸਿਰਲੇਖ" + "\'ਬੰਦ ਕਰੋ\' ਬਟਨ" + "ਰਿਮਾਈਂਡਰ" + "ਬੰਦ ਕਰੋ" + "ਰਿਮਾਈਂਡਰ ਦਾ ਚਿੱਤਰ" diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml index 13c8c1c48ba..ab06e9937b2 100644 --- a/quickstep/res/values-pl/strings.xml +++ b/quickstep/res/values-pl/strings.xml @@ -22,11 +22,14 @@ "Przypnij" "Tryb dowolny" "Pulpit" + "Przenieś na wyświetlacz zewnętrzny" + "Wyczyść" + "Pulpit" "Brak ostatnich elementów" "Ustawienia użycia aplikacji" "Wyczyść wszystko" + "Dodaj nowe biurko" "Ostatnie aplikacje" - "Zadanie zamknięte" "%1$s, %2$s" "> 1 min" "Na dziś zostało %1$s" @@ -44,7 +47,7 @@ "Sugestie aplikacji dodane w pustym obszarze" "Włączono sugestie aplikacji" "Sugestie aplikacji są wyłączone" - "Przewidywana aplikacja: %1$s" + "Samouczek dotyczący nawigacji przy użyciu gestów" "Obróć urządzenie" "Obróć urządzenie, aby ukończyć samouczek nawigacji przy użyciu gestów" "Pamiętaj, aby przesuwać palcem od samej krawędzi (prawej lub lewej)" @@ -56,7 +59,6 @@ "Czułość gestu cofania możesz zmienić w Ustawieniach" "Przesuń palcem, aby przejść wstecz" "Aby wrócić do poprzedniego ekranu, przesuń palcem od lewej lub prawej krawędzi do środka ekranu." - "Aby wrócić do poprzedniego ekranu, przesuń 2 palcami od lewej lub prawej krawędzi do środka ekranu." "Przejście wstecz" "Przesuń palcem od lewej lub prawej krawędzi do środka ekranu" "Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu" @@ -66,7 +68,6 @@ "Gest przechodzenia na ekran główny został opanowany" "Przesuń palcem, aby przejść na ekran główny" "Przesuń palcem od dołu ekranu. Ten gest zawsze powoduje przejście na ekran główny." - "Przesuń 2 palcami od dołu ekranu. Ten gest zawsze powoduje przejście do ekranu głównego." "Przejście na ekran główny" "Przesuń palcem z dołu ekranu w górę" "Brawo!" @@ -77,8 +78,7 @@ "Gest przełączania aplikacji został opanowany" "Przesuń palcem, aby przełączać aplikacje" "Aby przełączać się między aplikacjami, przesuń palcem od dołu do góry ekranu, przytrzymaj i puść." - "Aby przełączać się między aplikacjami, przesuń 2 palcami od dołu ekranu, przytrzymaj i puść." - "Przełącz aplikację" + "Przełączanie aplikacji" "Przesuń palcem z dołu ekranu w górę, przytrzymaj i puść" "Brawo!" "Wszystko gotowe" @@ -88,30 +88,42 @@ "Super!" "Samouczek %1$d/%2$d" "Wszystko gotowe" - "Aby przejść na stronę główną, przesuń w górę" + "Aby przejść na ekran główny, przesuń w górę" "Kliknij przycisk ekranu głównego, aby otworzyć ekran główny" "%1$s jest gotowe – możesz zacząć z niego korzystać" - "Urządzenie" + "Wszystko gotowe – możesz zacząć korzystać z urządzenia" "Ustawienia nawigacji w systemie" + "Twój %1$s jest \ngotowy." + "Urządzenie jest \ngotowe." + "Wszystko jest gotowe." + "Nowy %1$s jest już gotowy do użycia." + "Przesuń palcem w górę, aby zacząć korzystać z urządzenia %1$s" + "Kliknij, aby zacząć poznawać %1$s" + "Wybierz sposób poruszania się po urządzeniu" + "Przesuń palcem w górę" + "Kliknij przycisk ekranu głównego" + "tablet" + "telefon" "Udostępnij" "Zrzut ekranu" "Podziel" "Zapisz parę" "Aby podzielić ekran, kliknij drugą aplikację" "Aby podzielić ekran, wybierz drugą aplikację" - "Anuluj" + "Anuluj" "Wyjdź z wyboru podzielonego ekranu" "Wybierz drugą aplikację, aby podzielić ekran" "Nie możesz wykonać tego działania, bo nie zezwala na to aplikacja lub Twoja organizacja" "Widżety nie są obecnie obsługiwane, wybierz inną aplikację" - "Pominąć samouczek nawigacji?" - "Znajdziesz to później w aplikacji %1$s" - "Anuluj" - "Pomiń" "Obróć ekran" + "Animacja pokazująca, jak pasek aplikacji pojawia się u dołu ekranu i automatycznie znika, gdy nie jest używany" + "Animacja pokazująca, jak za pomocą przełącznika przypiąć pasek aplikacji, aby był on stale widoczny u dołu ekranu" + "Animacja pokazująca, jak utworzyć podzielony ekran, przeciągając i upuszczając aplikację z paska aplikacji nad aktualnie otwartą" + "Animacja pokazująca, jak uzyskać dostęp do sugerowanych aplikacji na urządzeniu" + "Animacja pokazująca, jak wyszukać element na ekranie, naciskając i przytrzymując klawisz działania oraz wybierając obszar, w którym jest dany element" "Informacje o pasku aplikacji" "Przeciągnij aplikację na bok, aby używać 2 aplikacji naraz" - "Aby wyświetlić pasek aplikacji, powoli przesuń palcem w górę" + "Aby wyświetlić pasek aplikacji, wolno przesuń palcem w górę" "Otrzymuj sugestie aplikacji na podstawie typowych działań" "Przytrzymaj separator, aby przypiąć pasek aplikacji" "Wykorzystaj potencjał paska aplikacji" @@ -129,19 +141,38 @@ "Powiadomienia" "Szybkie ustawienia" "Pasek aplikacji" - "Pasek aplikacji widoczny" - "Pasek aplikacji ukryty" "Pasek nawigacyjny" "Zawsze pokazuj pasek aplikacji" "Zmień tryb nawigacji" "Linia dzielenia paska aplikacji" + "Inne ostatnio używane aplikacje" + "Aplikacja została dodana do paska aplikacji" + "Aplikacja została usunięta z paska aplikacji" "Przesuń w górny lewy róg" "Przesuń w dolny prawy róg" - "{count,plural, =1{Pokaż jeszcze # aplikację.}few{Pokaż jeszcze # aplikacje.}many{Pokaż jeszcze # aplikacji.}other{Pokaż jeszcze # aplikacji.}}" - "{count,plural, =1{Pokaż # aplikację komputerową.}few{Pokaż # aplikacje komputerowe.}many{Pokaż # aplikacji komputerowych.}other{Pokaż # aplikacji komputerowej.}}" + "Otwórz aplikację jako dymek" + "Ostatnie aplikacje" + "Lista ostatnich aplikacji" + "{count,plural, =1{inna aplikacja}few{inne aplikacje}many{innych aplikacji}other{innej aplikacji}}" + "Pulpit" "%1$s i %2$s" + "%1$s, element %2$d z %3$d" + "Przewiń w lewo" + "Przewiń w prawo" "Dymek" "Rozwijany" "%1$s z aplikacji %2$s" "%1$s i jeszcze %2$d" + "Przenieś w lewo" + "Przenieś w prawo" + "Zamknij wszystkie" + "rozwiń dymek: %1$s" + "zwiń dymek: %1$s" + "Zaznacz, aby wyszukać" + "Ikona aplikacji" + "Tytuł aplikacji" + "Przycisk Zamknij" + "Ponaglenie" + "Zamknij" + "Obraz ponaglenia" diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml index e4d07bd97a2..79a2aa2f0b8 100644 --- a/quickstep/res/values-pt-rPT/strings.xml +++ b/quickstep/res/values-pt-rPT/strings.xml @@ -22,11 +22,14 @@ "Fixar" "Forma livre" "Computador" + "Mover para o ecrã externo" + "Limpar" + "Computador" "Nenhum item recente" "Definições de utilização de aplicações" "Limpar tudo" + "Adicionar novo espaço de trabalho" "Apps recentes" - "Tarefa fechada" "%1$s, %2$s" "< 1 minuto" "Resta(m) %1$s hoje." @@ -44,10 +47,10 @@ "Sugestões de apps adicionadas a um espaço vazio." "Sugestões de apps ativadas" "As sugestões de apps estão desativadas" - "App prevista: %1$s" + "Tutorial da navegação por gestos" "Rode o dispositivo" "Rode o seu dispositivo para concluir o tutorial de navegação por gestos" - "Deslize rapidamente a partir da extremidade mais à direita ou mais à esquerda" + "Deslize a partir da extremidade mais à direita ou mais à esquerda" "Deslize rapidamente a partir da extremidade esquerda ou direita até ao centro do ecrã e solte" "Aprendeu a deslizar a partir da direita para retroceder. A seguir, saiba como alternar entre apps." "Concluiu o gesto para retroceder. A seguir, saiba como alternar entre apps." @@ -56,30 +59,27 @@ "Altere a sensibilidade do gesto para voltar nas Definições." "Deslize rapidamente com o dedo para retroceder" "Para voltar ao último ecrã, deslize rapidamente do limite esquerdo ou direito até ao centro do ecrã." - "Para voltar ao último ecrã, deslize rapidamente com 2 dedos a partir da extremidade esquerda ou direita até ao centro do ecrã." "Retroceder" - "Deslize rapidamente a partir da extremidade esquerda ou direita para o meio do ecrã" - "Deslize rapidamente com o dedo a partir do limite inferior do ecrã" + "Deslize a partir da extremidade esquerda ou direita até ao centro do ecrã" + "Deslize a partir do limite inferior do ecrã" "Não faça uma pausa antes de soltar" "Deslize rapidamente com o dedo para cima" "Concluiu o gesto para aceder ao ecrã principal. A seguir, saiba como retroceder." "Concluiu o gesto para aceder ao ecrã principal" "Deslize rapidamente com o dedo para aceder ao ecrã principal" "Deslize rapidamente para cima a partir da parte inferior. Este gesto abre sempre o ecrã principal." - "Deslize rapidamente para cima com 2 dedos no fundo do ecrã. Este gesto abre sempre o ecrã principal." "Aceda ao ecrã principal" - "Deslize rapidamente para cima a partir da parte inferior do ecrã" + "Deslize para cima a partir da parte inferior do ecrã" "Muito bem!" - "Deslize rapidamente com o dedo a partir do limite inferior do ecrã" + "Deslize a partir do limite inferior do ecrã" "Experimente premir a janela durante mais tempo antes de soltar" - "Garanta que desliza rapidamente com o dedo para cima e, em seguida, faz uma pausa" + "Deslize para cima e pause" "Aprendeu a utilizar gestos. Para desativar os gestos, aceda às Definições." "Concluiu o gesto para alternar entre apps" "Deslize rapidamente com o dedo para alternar entre apps" "Para alternar entre apps, deslize para cima sem soltar a partir da parte inferior do ecrã e solte." - "Para mudar de app, deslize rapidamente para cima com 2 dedos sem soltar no fundo do ecrã e solte." "Mude de app" - "Deslize rapidamente para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte" + "Deslize para cima a partir da parte inferior do ecrã, detenha o gesto e solte" "Muito bem!" "Está tudo pronto" "Concluído" @@ -91,24 +91,36 @@ "Deslize rapidamente para cima para aceder ao ecrã principal" "Toque no botão do ecrã principal para aceder ao ecrã principal" "Já pode começar a usar o seu %1$s" - "dispositivo" + "Já pode começar a usar o seu dispositivo" "Definições de navegação do sistema" + "O seu %1$s está \npronto!" + "O seu dispositivo está \npronto!" + "Tudo pronto para começar!" + "Desfrute do seu novo %1$s!" + "Deslize rapidamente para cima para começar a usar o %1$s" + "Toque para começar a usar o %1$s" + "Escolha como navegar" + "Deslize rapidamente para cima" + "Toque no botão do ecrã principal" + "tablet" + "telemóvel" "Partilhar" - "Fazer captura de ecrã" + "Captura de ecrã" "Dividir" "Guardar par de apps" "Toque noutra app para usar o ecrã dividido" "Escolha outra app para usar o ecrã dividido" - "Cancelar" + "Cancelar" "Saia da seleção de ecrã dividido" "Escolher outra app para usar o ecrã dividido" "Esta ação não é permitida pela app ou a sua entidade." "Os widgets não são atualmente suportados. Selecione outra app" - "Ignorar o tutorial de navegação?" - "Pode encontrar isto mais tarde na app %1$s" - "Cancelar" - "Ignorar" "Rodar ecrã" + "Animação que mostra como a Barra de tarefas aparece na parte inferior do ecrã e é ocultada automaticamente quando não está em utilização" + "Animação que mostra como afixar a Barra de tarefas através de um botão, para que a Barra de tarefas fique permanentemente visível na parte inferior do ecrã" + "Animação que mostra como criar um ecrã dividido arrastando e largando uma app da Barra de tarefas sobre uma app aberta" + "Animação que mostra como aceder às apps sugeridas no seu dispositivo" + "Animação que mostra como pesquisar um item no ecrã tocando sem soltar na tecla de ação e selecionando a área onde o item se encontra" "Educação da Barra de tarefas" "Arraste uma app para o lado para usar 2 apps em simultâneo" "Deslize lentamente para cima para ver a Barra de tarefas" @@ -124,24 +136,43 @@ "Início" "Acessibilidade" "Voltar" - "Comutador IME" + "Switcher IME" "Recentes" "Notificações" "Definiç. rápidas" "Barra de tarefas" - "Barra de tarefas apresentada" - "Barra de tarefas ocultada" "Barra de navegação" "Ver sempre Barra de tarefas" "Alterar modo de navegação" "Divisor da Barra de tarefas" + "Outras apps recentes" + "App adicionada à Barra de tarefas" + "App removida da Barra de tarefas" "Mover para a parte superior esquerda" "Mover para a part superior direita" - "{count,plural, =1{Mostrar mais # app.}other{Mostrar mais # apps.}}" - "{count,plural, =1{Mostrar # app para computador.}other{Mostrar # apps para computador.}}" + "Abrir app como um balão" + "Apps recentes" + "Lista de apps recentes" + "{count,plural, =1{outra app}other{outras apps}}" + "Computador" "%1$s e %2$s" + "%1$s, item %2$d de %3$d" + "Deslocar para a esquerda" + "Deslocar para a direita" "Balão" "Menu adicional" "%1$s da app %2$s" "%1$s e mais %2$d pessoas" + "Mover para a esquerda" + "Mover para a direita" + "Ignorar tudo" + "expandir %1$s" + "reduzir %1$s" + "Circundar para Pesquisar" + "Ícone da app" + "Título da app" + "Botão Fechar" + "Chamada de atenção" + "Fechar" + "Imagem de chamada de atenção" diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml index 4fec4f8511c..7f821aad027 100644 --- a/quickstep/res/values-pt/strings.xml +++ b/quickstep/res/values-pt/strings.xml @@ -21,12 +21,15 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Fixar" "Forma livre" - "Computador" + "Modo área de trabalho" + "Mover para a tela externa" + "Limpar" + "Computador" "Nenhum item recente" "Configurações de uso do app" "Remover tudo" + "Adicionar novo espaço de trabalho" "Apps recentes" - "Tarefa encerrada" "%1$s, %2$s" "< 1 min" "%1$s restante(s) hoje" @@ -44,7 +47,7 @@ "Sugestões de apps adicionadas a um espaço vazio" "O recurso \"sugestões de apps\" está ativado" "O recurso \"sugestões de apps\" está desativado" - "App previsto: %1$s" + "Tutorial da navegação por gestos" "Gire o dispositivo" "Gire o dispositivo para concluir o tutorial da navegação por gestos" "Deslize da borda direita ou esquerda" @@ -56,7 +59,6 @@ "Mude a sensibilidade do gesto de voltar nas configurações" "Deslize para voltar" "Para voltar à tela anterior, deslize da borda esquerda ou direita até o meio da tela." - "Para voltar à tela anterior, deslize da borda esquerda ou direita até o meio da tela com dois dedos." "Volte" "Deslize da borda esquerda ou direita até o meio da tela" "Deslize da borda inferior da tela para cima" @@ -66,18 +68,16 @@ "Você concluiu o gesto para acessar a tela inicial" "Deslizar para voltar à tela inicial" "Deslize de baixo para cima na tela. Esse gesto sempre leva você para a tela inicial." - "Deslize de baixo para cima na tela com dois dedos. Esse gesto sempre leva você para a tela inicial." "Vá para a página inicial" "Deslize de baixo para cima na tela" "Muito bem!" "Deslize da borda inferior da tela para cima" "Mantenha a janela pressionada por mais tempo antes de soltar" - "Deslize para cima e pare" + "Deslize para cima em linha reta e pare" "Você aprendeu. Para desativar os gestos, acesse as Configurações." "Você concluiu o gesto para mudar de app" "Deslizar para trocar de app" "Para mudar de app, deslize de baixo para cima, mantenha a tela pressionada por um tempo e solte." - "Para mudar de app, deslize de baixo para cima na tela com dois dedos, segure por um tempo e solte." "Mude de app" "Deslize de baixo para cima na tela, segure e depois solte" "Muito bem!" @@ -89,26 +89,38 @@ "Tutorial %1$d/%2$d" "Tudo pronto!" "Deslize para cima para acessar a tela inicial" - "Toque no botão home para ir para a tela inicial" - "Você já pode começar a usar seu %1$s" - "dispositivo" + "Toque no botão home para acessar a tela inicial" + "O %1$s já pode ser usado" + "Você já pode começar a usar o dispositivo" "Configurações de navegação do sistema" + "O %1$s está \npronto." + "O dispositivo está \npronto." + "Tudo pronto!" + "Aproveite seu novo dispositivo %1$s." + "Deslize para cima e comece a usar o %1$s" + "Toque para começar a usar o %1$s" + "Escolha como navegar" + "Deslize para cima" + "Toque no botão home" + "tablet" + "smartphone" "Compartilhar" "Capturar tela" "Dividir" "Salvar par de apps" "Toque em outro app para usar a tela dividida" "Escolha outro app para usar na tela dividida" - "Cancelar" + "Cancelar" "Sair da seleção de tela dividida" "Escolha outro app para usar na tela dividida" "Essa ação não é permitida pelo app ou pela organização" "Atualmente, não há suporte para widgets. Selecione outro app" - "Pular o tutorial de navegação?" - "Veja o tutorial mais tarde no app %1$s" - "Cancelar" - "Pular" "Girar a tela" + "Animação mostrando como a barra de tarefas aparece na parte de baixo da tela e é ocultada automaticamente quando não está em uso" + "Animação mostrando como fixar a barra de tarefas usando um botão de ativar/desativar para que ela fique sempre visível na parte de baixo da tela" + "Animação mostrando como criar uma tela dividida arrastando e soltando um app da barra de tarefas sobre outro aberto" + "Animação mostrando como acessar os apps sugeridos no dispositivo" + "Animação mostrando como pesquisar um item na tela tocando na tecla de ação, pressionando e selecionando a área em que o item está" "Informações sobre a barra de tarefas" "Arraste um app para o lado e use dois apps ao mesmo tempo" "Deslize para cima devagar para mostrar a Barra de tarefas" @@ -118,7 +130,7 @@ "Sempre mostrar a Barra de tarefas" "Toque e pressione o divisor para sempre mostrar a Barra de tarefas na parte de baixo da tela" "Toque na tecla de ação e pressione para pesquisar o que está na tela" - "O produto usa a parte selecionada da tela para pesquisar. O uso desses dados está sujeito à <a href="%1$s">Política de Privacidade</a> e aos <a href="%2$s">Termos de Serviço</a> do Google." + "Este produto usa a parte selecionada da tela para pesquisar. O uso desses dados está sujeito à <a href="%1$s">Política de Privacidade</a> e aos <a href="%2$s">Termos de Serviço</a> do Google." "Fechar" "Concluído" "Início" @@ -129,19 +141,38 @@ "Notificações" "Config. rápidas" "Barra de tarefas" - "Barra de tarefas visível" - "Barra de tarefas oculta" "Barra de navegação" "Sempre mostrar a Barra de tarefas" "Mudar o modo de navegação" "Separador da Barra de tarefas" + "Outros apps recentes" + "App adicionado à Barra de Tarefas" + "App removido da Barra de Tarefas" "Mover para cima/para a esquerda" "Mover para baixo/para a direita" - "{count,plural, =1{Mostrar mais # app.}one{Mostrar mais # app.}other{Mostrar mais # apps.}}" - "{count,plural, =1{Mostrar # app para computador.}one{Mostrar # app para computador.}other{Mostrar # apps para computador.}}" + "Abrir o app como um balão" + "Apps recentes" + "Lista de apps recentes" + "{count,plural, =1{outro app}one{outro app}other{outros apps}}" + "Computador" "%1$s e %2$s" + "%1$s, item %2$d de %3$d" + "Rolar para a esquerda" + "Rolar para a direita" "Balão" "Balão flutuante" "%1$s do app %2$s" "%1$s e mais %2$d" + "Mover para esquerda" + "Mover para direita" + "Dispensar todos" + "abrir %1$s" + "fechar %1$s" + "Circule para Pesquisar" + "Ícone do app" + "Título do app" + "Botão \"Fechar\"" + "Alerta" + "Fechar" + "Imagem de alerta" diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml index c839602e897..3750ccee089 100644 --- a/quickstep/res/values-ro/strings.xml +++ b/quickstep/res/values-ro/strings.xml @@ -21,12 +21,15 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Fixează" "Formă liberă" - "Computer" + "Desktop" + "Mută pe ecranul extern" + "Șterge" + "Computer" "Niciun element recent" "Setări de utilizare a aplicației" "Șterge tot" + "Adaugă un nou desktop" "Aplicații recente" - "Activitatea s-a încheiat" "%1$s, %2$s" "< 1 minut" "Au mai rămas %1$s astăzi" @@ -44,7 +47,7 @@ "Sugestiile de aplicații sunt adăugate în spațiile goale" "Sugestiile de aplicații au fost activate" "Sugestiile de aplicații au fost dezactivate" - "Aplicația estimată: %1$s" + "Tutorial de navigare prin gesturi" "Rotește dispozitivul" "Rotește dispozitivul pentru a încheia tutorialul de navigare prin gesturi" "Glisează dinspre marginea dreaptă îndepărtată sau dinspre marginea stângă îndepărtată" @@ -56,7 +59,6 @@ "Schimbă sensibilitatea gestului „Înapoi” accesând Setările" "Glisează pentru a reveni" "Pentru a reveni la ultimul ecran, glisează de la marginea stângă sau dreaptă spre mijlocul ecranului." - "Pentru a reveni la ultimul ecran, glisează cu două degete dinspre marginea stângă sau dreaptă spre mijlocul ecranului." "Înapoi" "Glisează dinspre marginea stângă sau dreaptă până la jumătatea ecranului" "Glisează în sus dinspre marginea de jos a ecranului" @@ -66,7 +68,6 @@ "Ai finalizat gestul „accesează ecranul de pornire”" "Glisează pentru a accesa ecranul de pornire" "Glisează în sus din partea de jos a ecranului. Cu acest gest accesezi mereu ecranul de pornire." - "Glisează în sus cu două degete din partea de jos. Cu acest gest accesezi mereu ecranul de pornire." "Înapoi la ecranul de pornire" "Glisează în sus din partea de jos a ecranului" "Excelent!" @@ -77,7 +78,6 @@ "Ai finalizat gestul „comută între aplicații”" "Glisează pentru a comuta între aplicații" "Ca să comuți între aplicații, glisează de jos în sus, ține degetul pe ecran, apoi ridică-l." - "Ca să comuți între aplicații, glisează cu 2 degete de jos în sus, ține-le pe ecran, apoi ridică-le." "Comută între aplicații" "Glisează în sus din partea de jos a ecranului, ține apăsat, apoi eliberează" "Felicitări!" @@ -91,24 +91,36 @@ "Glisează în sus pentru a accesa ecranul principal" "Atinge butonul ecran de pornire ca să accesezi ecranul de pornire" "Ești gata să folosești %1$s" - "dispozitivul" + "Ești gata să folosești dispozitivul" "Setările de navigare ale sistemului" + "%1$s este \ngata!" + "Dispozitivul este \ngata!" + "Ai terminat!" + "Bucură-te de noul %1$s!" + "Glisează în sus pentru a începe să folosești %1$s" + "Atinge pentru a începe să folosești %1$s" + "Alege cum să navighezi" + "Glisează în sus" + "Atinge butonul ecran de pornire" + "tabletă" + "telefon" "Distribuie" "Captură de ecran" "Împărțit" "Salvează perechea de aplicații" "Atinge altă aplicație pentru ecranul împărțit" "Alege altă aplicație pentru a folosi ecranul împărțit" - "Anulează" + "Anulează" "Ieși din selecția cu ecran împărțit" "Alege altă aplicație pentru ecranul împărțit" "Această acțiune nu este permisă de aplicație sau de organizația ta" "Nu se acceptă widgeturile. Selectează altă aplicație." - "Omiți tutorialul de navigare?" - "Îl poți găsi mai târziu în aplicația %1$s" - "Anulează" - "Omite" "Rotește ecranul" + "Animație care arată cum bara de activități apare din partea de jos a ecranului și se ascunde automat când nu este folosită" + "Animație care arată cum să fixezi bara de activități folosind un comutator, astfel încât bara de activități să rămână permanent vizibilă în partea de jos a ecranului" + "Animație care arată cum să creezi un ecran împărțit, trăgând și plasând o aplicație din bara de activități deasupra unei aplicații deschise" + "Animație care arată cum să accesezi aplicațiile sugerate pe dispozitiv" + "Animație care arată cum să cauți un element pe ecran, atingând lung tasta de acțiuni și selectând zona în care se află elementul" "Informații despre bara de activități" "Trage în lateral o aplicație ca să folosești 2 aplicații deodată" "Glisează lent în sus pentru a afișa bara de activități" @@ -129,19 +141,38 @@ "Notificări" "Setări rapide" "Bară de activități" - "Bara de activități este afișată" - "Bara de activități este ascunsă" "Bară de navigare" "Afișează mereu bara" "Schimbă modul de navigare" "Separator pentru bara de activități" + "Alte aplicații recente" + "Aplicația a fost adăugată în Bara de activități" + "Aplicația a fost eliminată din Bara de activități" "Mută în stânga sus" "Mută în dreapta jos" - "{count,plural, =1{Afișează încă # aplicație}few{Afișează încă # aplicații}other{Afișează încă # de aplicații}}" - "{count,plural, =1{Afișează # aplicație pentru computer.}few{Afișează # aplicații pentru computer.}other{Afișează # de aplicații pentru computer.}}" + "Deschide aplicația ca balon" + "Aplicații recente" + "Lista de aplicații recente" + "{count,plural, =1{aplicație suplimentară}few{mai multe aplicații}other{mai multe aplicații}}" + "Computer" "%1$s și %2$s" + "%1$s, articolul %2$d din %3$d" + "Derulează la stânga" + "Derulează la dreapta" "Balon" "Suplimentar" "%1$s de la %2$s" "%1$s și încă %2$d" + "Deplasează spre stânga" + "Deplasează spre dreapta" + "Închide-le pe toate" + "extinde %1$s" + "restrânge %1$s" + "Încercuiește și caută" + "Pictograma aplicației" + "Titlul aplicației" + "Buton de închidere" + "Reafișează" + "Închide" + "Reafișează imaginea" diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml index da49ad32b87..88c55f8560a 100644 --- a/quickstep/res/values-ru/strings.xml +++ b/quickstep/res/values-ru/strings.xml @@ -21,12 +21,15 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Закрепить" "Произвольная форма" - "Включить режим для ПК" + "Мультиоконный режим" + "Перенести на внешний дисплей" + "Очистить" + "Мультиоконный режим" "Здесь пока ничего нет." "Настройки использования приложения" "Очистить все" + "Добавить рабочий стол" "Недавние приложения" - "Задача закрыта" "%1$s: %2$s" "< 1 мин." "Осталось сегодня: %1$s" @@ -44,10 +47,10 @@ "Рекомендуемые приложения будут появляться на свободных местах." "Функция \"Рекомендуемые приложения\" включена." "Функция \"Рекомендуемые приложения\" отключена." - "Рекомендуемое приложение: %1$s" + "Руководство: навигация с помощью жестов" "Поверните устройство" "Чтобы перейти к руководству по жестам, нужно повернуть устройство." - "Проведите справа налево или слева направо от самого края экрана." + "Проведите к центру прямо от правого или левого края экрана." "Проведите от правого или левого края экрана к центру и отпустите палец." "Теперь вы знаете, как вернуться, проведя справа налево. Далее мы расскажем, как переключаться между приложениями." "Вы выполнили жест для перехода назад. Теперь мы расскажем, как переключаться между приложениями." @@ -56,59 +59,68 @@ "Уровень чувствительности можно изменить в настройках." "Возврат к предыдущему экрану" "Чтобы вернуться к предыдущему экрану, проведите от левого или правого края дисплея к центру." - "Чтобы вернуться на предыдущий экран, проведите двумя пальцами от левого или правого края экрана к центру." "Как вернуться к предыдущему экрану" "Проведите от левого или правого края экрана к центру." - "Проведите снизу вверх от самого края экрана." + "Проведите вверх прямо от нижнего края экрана." "Прежде чем отпустить палец, не задерживайте его в одной точке." "Проведите по экрану ровно вверх." "Вы выполнили жест для перехода на главный экран. Далее мы расскажем, как возвращаться назад." "Вы выполнили жест для перехода на главный экран." "Переход на главный экран" "Проведите вверх от нижнего края дисплея. Этот жест открывает главный экран." - "Проведите двумя пальцами вверх от нижнего края экрана. Этот жест открывает главный экран." "Как перейти на главный экран" "Проведите вверх от нижнего края экрана." "У вас получилось!" - "Проведите снизу вверх от самого края экрана." + "Проведите вверх прямо от нижнего края экрана." "Прежде чем отпустить палец, задержите его на экране немного дольше." - "Проведите по экрану ровно вверх и задержите палец в конце." + "Проведите по экрану вверх и задержите палец." "Теперь вы знаете, как использовать жесты. Чтобы отключить их, перейдите в настройки." "Вы выполнили жест для переключения между приложениями." "Переключение между приложениями" "Чтобы переключиться между приложениями‚ проведите по экрану снизу вверх, задержите палец, а затем отпустите." - "Чтобы сменить приложение, проведите двумя пальцами снизу вверх, задержите пальцы, а затем отпустите." - "Как переключаться между приложениями" + "Как вернуться к другому приложению" "Проведите вверх от нижнего края экрана, задержите палец в одной точке и отпустите." "Отлично!" "Готово" "Готово" "Настройки" - "Повторите попытку" + "Попробуйте ещё раз" "Отлично!" "Руководство (шаг %1$d из %2$d)" "Готово!" "Чтобы перейти на главный экран, проведите вверх." "Нажмите кнопку главного экрана, чтобы открыть его." "Теперь вы можете использовать %1$s." - "устройство" - "Системные настройки навигации" + "Теперь устройство можно использовать." + "Настройки навигации в системе" + "Устройство (%1$s)\nготово!" + "Устройство\nготово!" + "Всё готово к работе!" + "Начните использовать %1$s." + "Проведите по экрану вверх, чтобы начать работу с устройством \"%1$s\"" + "Нажмите, чтобы начать использовать %1$s." + "Выбрать способ навигации" + "Проведите по экрану вверх" + "Нажмите кнопку главного экрана" + "планшет" + "телефон" "Поделиться" "Скриншот" "Разделить" - "Сохранить приложения" + "Сохранить пару" "Для разделения экрана выберите другое приложение." "Чтобы использовать разделенный экран, выберите другое приложение." - "Отмена" + "Отмена" "Выйдите из режима разделения экрана." "Выберите другое приложение для разделения экрана." "Это действие заблокировано приложением или организацией." "Виджеты не поддерживаются. Выберите другое приложение." - "Пропустить руководство по жестам?" - "Его можно найти в приложении \"%1$s\"." - "Отмена" - "Пропустить" "Повернуть экран" + "Анимация: панель задач появляется в нижней части экрана и автоматически скрывается, если не используется" + "Анимация: как с помощью переключателя закрепить панель задач в нижней части экрана" + "Анимация: как разделить экран, перетащив приложение с панели задач на открытое приложение" + "Анимация: как перейти к рекомендуемым приложениям на устройстве" + "Анимация: как найти информацию об объекте на экране. Удерживая клавишу действия, нужно выбрать область, в которой находится объект." "Обучение по работе с панелью задач" "Используйте два приложения сразу, перетащив одно в сторону." "Чтобы открыть панель задач, медленно проведите снизу вверх." @@ -122,26 +134,45 @@ "Закрыть" "Готово" "Главный экран" - "Спец. возмож." + "Специальные возможности" "Назад" "Переключат. IME" "Недавние" "Уведомления" "Быстрые настройки" "Панель задач" - "Панель задач показана" - "Панель задач скрыта" "Панель навигации" "Всегда показывать панель задач" "Изменить режим навигации" "Разделитель панели задач" + "Другие недавние приложения" + "Приложение добавлено на панель задач" + "Приложение удалено с панели задач" "Переместить вверх или влево" "Переместить вниз или вправо" - "{count,plural, =1{Показать ещё # приложение}one{Показать ещё # приложение}few{Показать ещё # приложения}many{Показать ещё # приложений}other{Показать ещё # приложения}}" - "{count,plural, =1{Показать # компьютерное приложение.}one{Показать # компьютерное приложение.}few{Показать # компьютерных приложения.}many{Показать # компьютерных приложений.}other{Показать # компьютерного приложения.}}" + "Открыть приложение во всплывающем окне" + "Недавние приложения" + "Список недавних приложений" + "{count,plural, =1{дополнительное приложение}one{дополнительное приложение}few{дополнительных приложения}many{дополнительных приложений}other{дополнительного приложения}}" + "Режим компьютера" "%1$s и %2$s" + "%1$s, элемент %2$d из %3$d" + "Прокрутить влево" + "Прокрутить вправо" "Всплывающая подсказка" "Дополнительное меню" "\"%1$s\" из приложения \"%2$s\"" "%1$s и ещё %2$d" + "Переместить влево" + "Переместить вправо" + "Закрыть все" + "Развернуто: %1$s" + "Свернуто: %1$s" + "Обвести и найти" + "Значок приложения" + "Название приложения" + "Кнопка \"Закрыть\"" + "Напоминание" + "Закрыть" + "Изображение напоминания" diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml index 9cbe837f940..5433957f660 100644 --- a/quickstep/res/values-si/strings.xml +++ b/quickstep/res/values-si/strings.xml @@ -22,11 +22,14 @@ "අමුණන්න" "Freeform" "ඩෙස්ක්ටොපය" + "බාහිර සංදර්ශකය වෙත ගෙන යන්න" + "පැහැදිලි" + "ඩෙස්ක්ටොපය" "මෑත අයිතම නැත" "යෙදුම් භාවිත සැකසීම්" "සියල්ල හිස් කරන්න" + "නව මේසයක් එක් කරන්න" "මෑත යෙදුම්" - "කාර්යය අවසන් කරන ලදි" "%1$s, %2$s" "< 1 විනාඩියක්" "අද %1$sක් ඉතුරුයි" @@ -44,7 +47,7 @@ "යෙදුම් යෝජනා හිස් අවකාශයට එක් කර ඇත" "යෙදුම් යෝජනා සබලිතයි" "යෙදුම් යෝජනා අබල කර ඇත" - "පුරෝකථනය කළ යෙදුම: %1$s" + "අභින සංචාලන නිබන්ධනය" "ඔබේ උපාංගය කරකවන්න" "අභින සංචාලන නිබන්ධනය සම්පූර්ණ කිරීම සඳහා ඔබේ උපාංගය කරකවන්න" "ඔබ ඈත දකුණු හෝ ඈත වම් දාරයේ සිට ස්වයිප් කරන බව සහතික කර ගන්න" @@ -56,7 +59,6 @@ "ආපසු ඉංගිතයෙහි සංවේදීතාව වෙනස් කිරීමට, සැකසීම් වෙත යන්න" "ආපසු යාමට ස්වයිප් කරන්න" "අවසාන තිරයට ආපසු යාමට, වම් හෝ දකුණු දාරයෙන් තිරයේ මැදට ස්වයිප් කරන්න." - "අවසාන තිරයට ආපසු යාමට, වම් හෝ දකුණු දාරයෙන් තිරයේ මැදට ඇඟිලි 2කින් ස්වයිප් කරන්න." "ආපසු යන්න" "වම් හෝ දකුණු කෙළවරේ සිට තිරයේ මැදට ස්වයිප් කරන්න" "ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න" @@ -66,7 +68,6 @@ "ඔබ මුල් පිටුවට යාමේ ඉංගිතය සම්පූර්ණ කළා" "මුල් පිටුවට යාමට ස්වයිප් කරන්න" "ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කරන්න.මෙම ඉංගිතය සැම විටම ඔබව මුල් තිරයට ගෙන යයි." - "තිරයේ පහළම සිට ඇඟිලි 2කින් ඉහළට ස්වයිප් කරන්න. මෙම ඉංගිතය සැම විටම ඔබව මුල් තිරයට ගෙන යයි." "මුල් පිටුවට යන්න" "ඔබේ තිරයේ පහළ සිට උඩට ස්වයිප් කරන්න" "අනර්ඝ වැඩක්!" @@ -77,7 +78,6 @@ "ඔබ යෙදුම් මාරු කිරීමේ ඉංගිතය සම්පූර්ණ කළා" "යෙදුම් මාරු කිරීමට ස්වයිප් කරන්න" "යෙදුම් අතර මාරු වීමට, ඔබගේ තිරයේ පහළම සිට උඩට ස්වයිප් කර, අල්ලාගෙන සිට, අනතුරුව මුදා හරින්න." - "යෙදුම් අතර මාරු වීමට, ඔබගේ තිරයේ පහළම සිට උඩට ඇඟිලි 2කින් ස්වයිප් කර, අල්ලාගෙන සිට, අනතුරුව මුදා හරින්න." "යෙදුම් මාරු කරන්න" "ඔබේ තිරයේ පහළ සිට ඉහළට ස්වයිප් කරන්න, රඳවා ගෙන සිට, පසුව මුදා හරින්න" "හොඳින් කළා!" @@ -91,24 +91,36 @@ "මුල් පිටුවට යාමට ඉහළට ස්වයිප් කරන්න" "ඔබේ මුල් තිරය වෙත යාමට මුල් පිටුව බොත්තම තට්ටු කරන්න" "ඔබ ඔබේ %1$s භාවිත කිරීම පටන් ගැනීමට සූදානම්" - "උපාංගය" + "ඔබ ඔබේ උපාංගය භාවිත කිරීම පටන් ගැනීමට සූදානම්" "පද්ධති සංචාලන සැකසීම්" + "ඔබේ %1$s \nසූදානම්!" + "ඔබේ \n සූදානම්!" + "ඔබ යාමට සූදානම්!" + "ඔබේ අලුත් %1$s රසවිඳින්න!" + "ඔබේ %1$s සමග පටන් ගැනීමට ඉහළට ස්වයිප් කරන්න" + "ඔබේ %1$s සමග පටන් ගැනීමට තට්ටු කරන්න" + "සංචාලනය කරන ආකාරය තෝරන්න" + "ඉහළට ස්වයිප් කරන්න" + "මුල් බොත්තම තට්ටු කරන්න" + "ටැබ්ලටය" + "දුරකථනය" "බෙදා ගන්න" "තිර රුව" "බෙදන්න" "යෙදුම් යුගල සුරකින්න" "බෙදුම් තිරය භාවිතා කිරීමට තවත් යෙදුමක් තට්ටු කරන්න" "බෙදුම් තිරය භාවිත කිරීමට වෙනත් යෙදුමක් තෝරා ගන්න" - "අවලංගු කරන්න" + "අවලංගු කරන්න" "බෙදීම් තිර තේරීමෙන් පිටවන්න" "බෙදීම් තිරය භාවිතා කිරීමට වෙනත් යෙදුමක් තෝරා ගන්න" "මෙම ක්‍රියාව යෙදුම හෝ ඔබේ සංවිධානය මගින් ඉඩ නොදේ" "විජට් දැනට සහාය නොදක්වයි, වෙනත් යෙදුමක් තෝරන්න" - "නිබන්ධනය සංචාලනය මඟ හරින්නද?" - "ඔබට මෙය පසුව %1$s යෙදුම තුළ සොයා ගත හැකිය" - "අවලංගු කරන්න" - "මඟ හරින්න" "තිරය කරකවන්න" + "තිරයේ පහළ සිට කාර්ය තීරුව දර්ශනය වන ආකාරය සහ භාවිතයේ නොමැති විට ස්වයංක්‍රීයව සැඟවෙන ආකාරය පෙන්වන සජීවීකරණය" + "තිරයේ පහළින් කාර්ය තීරුව ස්ථිරවම දෘශ්‍යමානව පවතින පරිදි, ටොගලයක් භාවිතයෙන් ඔබේ කාර්ය තීරුව ඇමිණෙන ආකාරය පෙන්වන සජීවීකරණය" + "විවෘත යෙදුමකට ඉහළින් ඇති කාර්ය තීරුවෙන් යෙදුමක් ඇදගෙන යාමෙන්, බෙදීම් තිරයක් නිර්මාණය කරන ආකාරය පෙන්වන සජීවීකරණය" + "ඔබේ උපාංගයේ යෝජිත යෙදුම් වෙත ප්‍රවේශ වන ආකාරය පෙන්වන සජීවීකරණය" + "ක්‍රියා යතුර ස්පර්ශ කරගෙන අයිතමය ඇති ප්‍රදේශය තේරීමෙන් තිරය මත අයිතමයක් සොයන ආකාරය පෙන්වන සජීවීකරණය" "කාර්ය තීරු අධ්‍යාපනය" "එකවර යෙදුම් 2ක් භාවිතා කිරීමට යෙදුමක් පැත්තට අදින්න" "කාර්ය තීරුව පෙන්වීමට ඉහළට සෙමින් ස්වයිප් කරන්න" @@ -129,19 +141,38 @@ "දැනුම්දීම්" "ඉක්මන් සැකසීම්" "කාර්ය තීරුව" - "කාර්ය තීරුව පෙන්වා ඇත" - "කාර්ය තීරුව සඟවා ඇත" "සංචලන තීරුව" "සෑම විටම කාර්ය තීරුව පෙන්වන්න" "සංචාලන ප්‍රකාරය වෙනස් කරන්න" "කාර්ය තීරු බෙදනය" + "අනෙකුත් මෑත යෙදුම්" + "යෙදුම කාර්ය තීරුවට එක් කරන ලදී" + "කාර්ය තීරුවෙන් යෙදුම ඉවත් කරන ලදී" "ඉහළ/වම වෙත ගෙන යන්න" "පහළ/දකුණ වෙත ගෙන යන්න" - "{count,plural, =1{තවත් # යෙදුමක් පෙන්වන්න.}one{තවත් යෙදුම් #ක් පෙන්වන්න.}other{තවත් යෙදුම් #ක් පෙන්වන්න.}}" - "{count,plural, =1{# ඩෙස්ක්ටොප් යෙදුමක් පෙන්වන්න.}one{ඩෙස්ක්ටොප් යෙදුම් # ක් පෙන්වන්න.}other{ඩෙස්ක්ටොප් යෙදුම් # ක් පෙන්වන්න.}}" + "යෙදුම බුබුලක් ලෙස විවෘත කරන්න" + "මෑත යෙදුම්" + "මෑත යෙදුම් ලැයිස්තුව" + "{count,plural, =1{තව යෙදුම}one{තවත් යෙදුම්}other{තවත් යෙදුම්}}" + "ඩෙස්ක්ටොපය" "%1$s සහ %2$s" + "%1$s, අයිතම %3$dන් %2$d" + "වමට අනුචලනය කරන්න" + "දකුණට අනුචලනය කරන්න" "බුබුළු" "පිටාර යාම" "%2$s සිට %1$s" "%1$s හා තව %2$dක්" + "වමට ගෙන යන්න" + "දකුණට ගෙන යන්න" + "සියල්ල ඉවතලන්න" + "%1$s දිග හරින්න" + "%1$s හකුළන්න" + "සෙවීමට කවයසෙවීමට කවය අදින්න" + "යෙදුම් නිරූපකය" + "යෙදුම් මාතෘකාව" + "වැසීමේ බොත්තම" + "සෙමින් පෙළඹවීම" + "වසන්න" + "රූපය සෙමින් පෙළඹවීම" diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml index 3eca787fedd..1c06cff0b2b 100644 --- a/quickstep/res/values-sk/strings.xml +++ b/quickstep/res/values-sk/strings.xml @@ -22,11 +22,14 @@ "Pripnúť" "Voľný režim" "Počítač" + "Presunúť na externú obrazovku" + "Vymazať" + "Počítač" "Žiadne nedávne položky" "Nastavenia využívania aplikácie" "Vymazať všetko" + "Pridať novú plochu" "Nedávne aplikácie" - "Úloha bola zavretá" "%1$s, %2$s" "Menej ako 1 minúta" "Dnes ešte zostáva: %1$s" @@ -44,10 +47,10 @@ "Na prázdne miesto pridané návrhy aplikácií" "Návrhy aplikácií zapnuté" "Návrhy aplikácií vypnuté" - "Predpovedaná aplikácia: %1$s" + "Návod na navigáciu gestami" "Otočte zariadenie" "Otočte zariadenie a dokončite tak návod, ako navigovať gestami" - "Musíte potiahnuť úplne z pravého alebo ľavého okraja" + "Musíte potiahnuť úplne z pravého alebo ľavého okraja." "Musíte potiahnuť z pravého alebo ľavého okraja do stredu obrazovky a potom uvoľniť" "Naučili ste sa prejsť späť potiahnutím sprava. V ďalšom kroku sa naučíte prepínať aplikácie." "Dokončili ste gesto na prechod späť. V ďalšom kroku sa naučíte, ako prepínať aplikácie." @@ -56,28 +59,25 @@ "Ak chcete zmeniť citlivosť gesta Späť, prejdite do Nastavení" "Prechod späť potiahnutím" "Na poslednú obrazovku prejdete potiahnutím z ľavého alebo pravého okraja do stredu obrazovky." - "Na poslednú obrazovku sa vrátite potiahnutím dvoma prstami z ľavého alebo pravého okraja do stredu obrazovky." "Prechod späť" "Potiahnite z ľavého alebo pravého okraja do stredu obrazovky" - "Musíte potiahnuť nahor z dolného okraja obrazovky" + "Musíte potiahnuť nahor z dolného okraja obrazovky." "Pred uvoľnením nesmiete zastať" "Musíte potiahnuť priamo nahor" "Dokončili ste gesto prechodu na plochu. Teraz sa naučíte, ako sa vrátiť späť." "Dokončili ste gesto prechodu na plochu" "Prechod na plochu potiahnutím" "Potiahnite nahor zdola obrazovky. Týmto gestom sa vždy vrátite na plochu." - "Postiahnite dvoma prstami z dolnej časti obrazovky. Týmto gestom sa vždy vrátite na plochu." "Prechod na plochu" "Potiahnite z dolnej časti obrazovky nahor" "Skvelé!" "Musíte potiahnuť nahor z dolného okraja obrazovky" "Skúste okno pred uvoľnením podržať dlhšie" - "Musite potiahnuť priamo nahor a potom zastať" - "Naučili ste sa používať gestá. Gestá môžete vypnúť v nastaveniach." + "Musite potiahnuť priamo nahor a potom zastať." + "Naučili ste sa používať gestá. Gestá môžete vypnúť v Nastaveniach." "Dokončili ste gesto na prepnutie aplikácií" "Prepínanie aplikácií potiahnutím" "Aplikácie môžete prepínať potiahnutím obrazovky zdola nahor, pridržaním a následným uvoľnením." - "Aplikácie prepnete potiahnutím dvoma prstami z dolnej časti obrazovky, ich pridržaním a uvoľnením." "Prepnutie aplikácií" "Potiahnite nahor z dolného okraja obrazovky, pridržte a uvoľnite" "Výborne" @@ -90,34 +90,46 @@ "Hotovo" "Potiahnutím nahor prejdete na plochu" "Na plochu prejdete klepnutím na tlačidlo plochy" - "%1$s môžete začať používať" - "zariadenie" + "Môžete %1$s začať používať" + "Zariadenie môžete začať používať" "Nastavenia navigácie systémom" + "Vaše zariadenie %1$s je \npripravené." + "Vaše zariadenie je \npripravené." + "Všetko máte pripravené" + "Užite si svoj nový %1$s!" + "Ak chcete začať so zariadením %1$s, potiahnite nahor" + "V zariadení %1$s začnite klepnutím" + "Vybrať spôsob navigácie" + "Potiahnite nahor" + "Klepnite na tlačidlo plochy" + "tablet" + "telefón" "Zdieľať" "Snímka obrazovky" "Rozdeliť" "Uložiť pár aplikácií" "Obrazovku rozdelíte klepnutím na inú aplikáciu" "Na použitie rozdelenej obrazovky vyberte ďalšiu aplikáciu" - "Zrušiť" + "Zrušiť" "Ukončite výber rozdelenej obrazovky" "Na použitie rozd. obrazovky vyberte inú aplikáciu" "Aplikácia alebo vaša organizácia túto akciu nepovoľuje" "Miniaplikácie nie sú momentálne podporované, vyberte inú aplikáciu" - "Chcete preskočiť návod na navigáciu?" - "Tento návod nájdete v aplikácii %1$s" - "Zrušiť" - "Preskočiť" "Otočiť obrazovku" + "Animácia zobrazujúca, ako sa panel aplikácií zobrazí z dolnej časti obrazovky a automaticky skryje, keď ho nepoužívate" + "Animácia znázorňujúca, ako pripnúť panel aplikácií pomocou prepínača, aby bol stále viditeľný v dolnej časti obrazovky" + "Animácia znázorňujúca, ako vytvoriť rozdelenú obrazovku presunutím aplikácie z panela aplikácií nad otvorenú aplikáciu" + "Animácia znázorňujúca, ako získať prístup k navrhovaným aplikáciám v zariadení" + "Animácia znázorňujúca, ako vyhľadať určitú položku na obrazovke pridržaním akčného klávesa a výberom oblasti, v ktorej sa daná položka nachádza" "Panel vzdelávacích aplikácií" - "Ak chcete použiť dve aplikácie naraz, presuňte aplikáciu nabok" + "Ak chcete používať dve aplikácie naraz, presuňte aplikáciu nabok" "Panel aplikácií zobrazíte pomalým potiahnutím nahor" "Získavajte návrhy aplikácií na základe svojich zvykov" - "Dlhým stlačením rozdeľovača pripnete panel aplikácií" + "Dlhým stlačením rozdeľovača panel aplikácií pripnete" "Panel aplikácií vám ponúka ďalšie možnosti" "Vždy zobrazovať panel aplikácií" "Ak chcete, aby sa panel aplikácií vždy zobrazoval v dolnej časti obrazovky, pridržte rozdeľovač" - "Ak chcete vyhľadávať, čo je na obrazovke, pridržte akčný kláves" + "Pridržaním akčného klávesu môžete vyhľadávať, čo je na obrazovke" "Táto služba používa na účely vyhľadávania vybranú časť obrazovky. Uplatňujú sa <a href="%1$s">pravidlá ochrany súkromia</a> a <a href="%2$s">zmluvné podmienky</a> spoločnosti Google." "Zavrieť" "Hotovo" @@ -129,19 +141,38 @@ "Upozornenia" "Rýchle nastavenia" "Panel aplikácií" - "Panel aplikácií je zobrazený" - "Panel aplikácií je skrytý" "Navigačný panel" "Zobrazovať panel aplikácií" "Zmeniť režim navigácie" "Rozdeľovač panela aplikácií" + "Iné nedávne aplikácie" + "Aplikácia bola pridaná na panel aplikácií" + "Aplikácia bola odstránená z panela aplikácií" "Presunúť hore alebo doľava" "Presunúť dole alebo doprava" - "{count,plural, =1{Zobraziť # ďalšiu aplikáciu.}few{Zobraziť # ďalšie aplikácie.}many{Show # more apps.}other{Zobraziť # ďalších aplikácií.}}" - "{count,plural, =1{Zobraziť # aplikáciu pre počítač.}few{Zobraziť # aplikácie pre počítač.}many{Show # desktop apps.}other{Zobraziť # aplikácií pre počítač.}}" + "Otvoriť aplikáciu ako bublinu" + "Nedávne aplikácie" + "Zoznam nedávnych aplikácií" + "{count,plural, =1{ďalšia aplikácia}few{ďalšie aplikácie}many{ďalšie aplikácie}other{ďalšie aplikácie}}" + "Počítač" "%1$s a %2$s" + "%1$s, %2$d. položka z %3$d" + "Posunúť doľava" + "Posunúť doprava" "Bublina" "Rozbaľovacia ponuka" "%1$s z aplikácie %2$s" "%1$s a ešte %2$d" + "Posunúť doľava" + "Posunúť doprava" + "Zavrieť všetko" + "rozbaliť %1$s" + "zbaliť %1$s" + "Hľadanie krúžkovaním" + "Ikona aplikácie" + "Názov aplikácie" + "Tlačidlo Zavrieť" + "Posunúť" + "Zavrieť" + "Posunúť obrázok" diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml index 52faeb7a9e8..590fba017f6 100644 --- a/quickstep/res/values-sl/strings.xml +++ b/quickstep/res/values-sl/strings.xml @@ -22,11 +22,14 @@ "Pripni" "Prosta oblika" "Namizni računalnik" + "Premik v zunanji zaslon" + "Počisti" + "Namizni način" "Ni nedavnih elementov" "Nastavitve uporabe aplikacij" "Počisti vse" + "Dodajanje novega namizja" "Nedavne aplikacije" - "Opravilo je zaprto" "%1$s, %2$s" "< 1 min" "Danes je ostalo še %1$s" @@ -44,7 +47,7 @@ "Predlagane aplikacije so bile dodane v prazni prostor" "Predlogi aplikacij so omogočeni." "Predlogi aplikacij so onemogočeni." - "Predvidena aplikacija: %1$s" + "Vadnica za krmarjenje s potezami" "Zasukajte napravo" "Zasukajte napravo, če si želite ogledati vadnico za krmarjenje s potezami" "Pazite, da povlečete s skrajno desnega ali skrajno levega roba." @@ -56,7 +59,6 @@ "Občutljivost poteze za nazaj lahko spremenite v nastavitvah." "Povlecite za vrnitev" "Če se želite vrniti na prejšnji zaslon, povlecite z levega ali desnega roba do sredine zaslona." - "Če se želite vrniti na zadnji prikazani zaslon, z dvema prstoma povlecite z levega ali desnega roba do sredine zaslona." "Pomik nazaj" "Povlecite z levega ali desnega roba do sredine zaslona." "Pazite, da povlečete s spodnjega roba zaslona navzgor." @@ -66,7 +68,6 @@ "Izvedli ste potezo za pomik na začetni zaslon." "Povlecite za pomik na začetni zaslon" "Z dna zaslona s prstom povlecite navzgor. S to potezo lahko vedno odprete začetni zaslon." - "Z dvema prstoma povlecite navzgor z dna zaslona. S to potezo lahko vedno odprete začetni zaslon." "Pomik na začetni zaslon" "Z dna zaslona s prstom povlecite navzgor." "Odlično!" @@ -77,7 +78,6 @@ "Izvedli ste potezo za preklapljanje med aplikacijami." "Povlecite za preklapljanje med aplikacijami" "Za preklapljanje med aplikacijami povlecite navzgor z dna zaslona, pridržite in nato izpustite." - "Za preklop med aplikacijami z dvema prstoma povlecite navzgor z dna zaslona, pridržite in spustite." "Preklop aplikacij" "Povlecite navzgor z dna zaslona, pridržite, nato izpustite." "Odlično!" @@ -91,24 +91,36 @@ "Povlecite navzgor za začetni zaslon" "Za pomik na začetni zaslon se dotaknite gumba za začetni zaslon." "Pripravljeni ste, da začnete uporabljati %1$s" - "napravo" + "Pripravljeni ste, da začnete uporabljati napravo" "Nastavitve krmarjenja po sistemu" + "Naprava %1$s je \npripravljena" + "Naprava je \npripravljena" + "Pripravljeni ste!" + "Uživajte v novi napravi %1$s" + "Povlecite navzgor, če želite začeti uporabljati napravo: %1$s" + "Dotaknite se, če želite začeti uporabljati napravo: %1$s" + "Izbira načina pomikanja" + "Povlecite navzgor" + "Dotaknite se gumba za začetni zaslon" + "tablični računalnik" + "telefon" "Deli" "Posnetek zaslona" "Razdeli" "Shrani par aplikacij" "Za razdeljeni zaslon se dotaknite še 1 aplikacije" "Izberite drugo aplikacijo za uporabo razdeljenega zaslona." - "Prekliči" + "Prekliči" "Zapri izbiro razdeljenega zaslona" "Izberite drugo aplikacijo za uporabo razdeljenega zaslona." "Aplikacija ali vaša organizacija ne dovoljuje tega dejanja" "Pripomočki trenutno niso podprti, izberite drugo aplikacijo" - "Želite preskočiti vadnico za krmarjenje?" - "To lahko pozneje najdete v aplikaciji %1$s." - "Prekliči" - "Preskoči" "Sukanje zaslona" + "Animacija, ki prikazuje, kako se opravilna vrstica prikaže na dnu zaslona in se samodejno skrije, ko je ne uporabljate" + "Animacija, ki prikazuje, kako s preklopnikom pripnete opravilno vrstico, da bo vedno vidna na dnu zaslona" + "Animacija, ki prikazuje, kako ustvarite razdeljen zaslon tako, da aplikacijo iz opravilne vrstice povlečete in spustite na odprto aplikacijo" + "Animacija, ki prikazuje, kako dostopate do predlaganih aplikacij v napravi" + "Animacija, ki prikazuje, kako na zaslonu poiščete element tako, da se dotaknete in pridržite tipko za dejanja ter izberete območje, kjer je element" "Poučni nasveti o opravilni vrstici" "Povlecite aplikacijo na stran za uporabo 2 aplikacij hkrati." "Počasi povlecite navzgor za prikaz opravilne vrstice" @@ -117,7 +129,7 @@ "Naredite več z opravilno vrstico" "Stalni prikaz opravilne vrstice" "Če želite, da je opravilna vrstica vedno prikazana na dnu zaslona, pridržite razdelilno črto." - "Za iskanje po zaslonu se dotaknite in pridržite tipko za dejanja" + "Za iskanje vsebine zaslona pridržite tipko za dejanja" "Ta izdelek za iskanje uporablja izbrani del zaslona. Veljajo Googlov <a href="%1$s">pravilnik o zasebnosti</a> in <a href="%2$s">pogoji storitve</a>." "Zapri" "Končano" @@ -129,19 +141,38 @@ "Obvestila" "Hitre nastavitve" "Opravilna vrstica" - "Opravilna vrstica je prikazana" - "Opravilna vrstica je skrita" "Vrstica za krmarjenje" "Stalen prikaz oprav. vrstice" "Spreminjanje načina navigacije" "Razdelilnik opravilne vrstice" + "Druge nedavne aplikacije" + "Aplikacija je dodana v opravilno vrstico" + "Aplikacija je odstranjena iz opravilne vrstice" "Premakni na vrh/levo" "Premakni na dno/desno" - "{count,plural, =1{Pokaži še # aplikacijo.}one{Pokaži še # aplikacijo.}two{Pokaži še # aplikaciji.}few{Pokaži še # aplikacije.}other{Pokaži še # aplikacij.}}" - "{count,plural, =1{Prikaz # aplikacije za namizni računalnik.}one{Prikaz # aplikacije za namizni računalnik.}two{Prikaz # aplikacij za namizni računalnik.}few{Prikaz # aplikacij za namizni računalnik.}other{Prikaz # aplikacij za namizni računalnik.}}" + "Odpri aplikacijo kot oblaček" + "Nedavne aplikacije" + "Seznam nedavnih aplikacij" + "{count,plural, =1{dodatna aplikacija}one{dodatna aplikacija}two{dodatni aplikaciji}few{dodatne aplikacije}other{dodatnih aplikacij}}" + "Namizni računalnik" "%1$s in %2$s" + "%1$s, element %2$d od %3$d" + "Pomik levo" + "Pomik desno" "Oblaček" "Oblaček z dodatnimi elementi" "%1$s iz aplikacije %2$s" "%1$s in še %2$d" + "Premik v levo" + "Premik v desno" + "Opusti vse" + "razširitev oblačka %1$s" + "strnitev oblačka %1$s" + "Iskanje z obkroževanjem" + "Ikona aplikacije" + "Ime aplikacije" + "Gumb za zapiranje" + "Dreganje" + "Zapri" + "Dregni sliko" diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml index cdb9cf9a7ce..1b0ee2828c8 100644 --- a/quickstep/res/values-sq/strings.xml +++ b/quickstep/res/values-sq/strings.xml @@ -22,11 +22,14 @@ "Gozhdo" "Formë e lirë" "Desktopi" + "Zhvendose tek ekrani i jashtëm" + "Pastro" + "Desktopi" "Nuk ka asnjë artikull të fundit" "Cilësimet e përdorimit të aplikacionit" "Pastroji të gjitha" + "Shto një tavolinë të re pune" "Aplikacionet e fundit" - "Detyra u mbyll" "%1$s, %2$s" "< 1 minutë" "%1$s të mbetura sot" @@ -44,7 +47,7 @@ "Aplikacionet e sugjeruara u shtuan në hapësirën bosh" "Aplikacionet e sugjeruara janë aktivizuar" "Sugjerimet e aplikacioneve janë çaktivizuar" - "Aplikacioni i parashikuar: %1$s" + "Udhëzuesi për navigimin me gjeste" "Rrotullo pajisjen" "Rrotullo pajisjen për të përfunduar udhëzuesin e navigimit me gjeste" "Sigurohu që të rrëshqasësh shpejt nga skaji më i djathtë ose më i majtë" @@ -56,7 +59,6 @@ "Për të ndryshuar ndjeshmërinë e gjestit të kthimit prapa, shko te \"Cilësimet\"" "Rrëshqit shpejt për t\'u kthyer prapa" "Për t\'u kthyer prapa tek ekrani i fundit, rrëshqit shpejt nga skaji i majtë ose i djathtë drejt mesit të ekranit" - "Për t\'u kthyer prapa tek ekrani i fundit, rrëshqit shpejt me 2 gishta nga skaji i majtë ose i djathtë drejt mesit të ekranit." "Kthehu prapa" "Rrëshqit shpejt nga skaji i majtë ose i djathtë drejt mesit të ekranit" "Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit" @@ -66,7 +68,6 @@ "E ke përfunduar gjestin e kalimit tek ekrani bazë" "Rrëshqit shpejt për të kaluar tek ekrani bazë" "Rrëshqit shpejt lart nga fundi i ekranit tënd. Ky gjest të dërgon gjithmonë tek ekrani bazë." - "Rrëshqit shpejt lart me 2 gishta nga fundi i ekranit. Ky gjest të dërgon gjithmonë tek ekrani bazë." "Shko tek ekrani bazë" "Rrëshqit shpejt lart nga pjesa e poshtme e ekranit" "Punë e shkëlqyer!" @@ -77,7 +78,6 @@ "E ke përfunduar gjestin e ndërrimit të aplikacioneve" "Rrëshqit shpejt për të ndërruar aplikacionet" "Për të ndërruar mes aplikacioneve, rrëshqit shpejt lart nga fundi i ekranit tënd, mbaj dhe pastaj lësho." - "Për të ndërruar mes aplikacioneve, rrëshqit lart me 2 gishta nga fundi i ekranit, mbaje dhe lëshoje." "Ndërro aplikacionet" "Rrëshqit shpejt lart nga fundi i ekranit, mbaje të shtypur dhe më pas lëshoje" "Shumë mirë!" @@ -91,24 +91,36 @@ "Rrëshqit shpejt lart për të shkuar në ekranin bazë" "Trokit te butoni \"kreu\" për të shkuar tek ekrani bazë" "Je gati që të fillosh ta përdorësh këtë %1$s" - "pajisje" + "Je gati që të fillosh të përdorësh pajisjen tënde" "Cilësimet e navigimit të sistemit" + "Pajisja jote %1$s është \ngati!" + "Pajisja jote është \ngati!" + "Je plotësisht gati!" + "Shijoje %1$s tënd të ri!" + "Rrëshqit shpejt lart për të filluar me %1$s" + "Trokit për të filluar me %1$s tënd" + "Zgjidh se si do të navigosh" + "Rrëshqit shpejt lart" + "Trokit te butoni \"kreu\"" + "tabletin" + "telefonin" "Ndaj" "Pamja e ekranit" "Ndaj" "Ruaj çiftin e aplikacioneve" "Trokit një apl. tjetër; përdor ekranin e ndarë" "Zgjidh një aplikacion tjetër për të përdorur ekranin e ndarë" - "Anulo" + "Anulo" "Dil nga zgjedhja e ekranit të ndarë" "Zgjidh një aplikacion tjetër për të përdorur ekranin e ndarë" "Ky veprim nuk lejohet nga aplikacioni ose organizata jote" "Miniaplikacionet nuk mbështeten për momentin. Zgjidh një aplikacion tjetër" - "Të kapërcehet udhëzuesi i navigimit?" - "Këtë mund ta gjesh më vonë tek aplikacioni \"%1$s\"" - "Anulo" - "Kapërce" "Rrotullo ekranin" + "Animacioni që tregon se si shfaqet shiriti i detyrave nga fundi i ekranit dhe si fshihet automatikisht kur nuk është në përdorim" + "Animacioni që tregon se si të gozhdosh shiritin e detyrave duke përdorur një çelës, në mënyrë që shiriti i detyrave të qëndrojë përgjithmonë i dukshëm në fund të ekranit" + "Animacioni që tregon si të krijosh një ekran të ndarë duke zvarritur dhe lëshuar një aplikacion nga shiriti i detyrave mbi një aplikacion të hapur" + "Animacioni që tregon se si të qasesh në aplikacionet e sugjeruara në pajisjen tënde" + "Animacioni që tregon se si të kërkosh për një artikull në ekran, duke prekur dhe mbajtur shtypur tastin e veprimit dhe duke zgjedhur zonën ku është artikulli" "Edukimi për shiritin e detyrave" "Zvarrit një aplikacion në anë për të përdorur 2 aplikacione njëherësh" "Rrëshqit lart ngadalë për të shfaqur \"Shiritin e detyrave\"" @@ -121,7 +133,7 @@ "Ky produkt përdor pjesën e zgjedhur të ekranit tënd për të kërkuar. Zbatohen <a href="%1$s">Politika e privatësisë</a> dhe <a href="%2$s">Kushtet e shërbimit</a> të Google." "Mbyll" "U krye" - "Faqja kryesore" + "Ekrani bazë" "Qasshmëria" "Pas" "Çelësi IME" @@ -129,19 +141,38 @@ "Njoftimet" "Cilësimet shpejt" "Shiriti i detyrave" - "Shiriti i detyrave i shfaqur" - "Shiriti i detyrave i fshehur" "Shiriti i navigimit" "Shfaq gjithmonë shiritin e detyrave" "Ndrysho modalitetin e navigimit" "Ndarësi i shiritit të detyrave" + "Aplikacionet e tjera së fundi" + "Aplikacioni u shtua te \"Shiriti i detyrave\"" + "Aplikacioni u hoq nga \"Shiriti i detyrave\"" "Lëviz në krye/majtas" "Lëviz në fund/djathtas" - "{count,plural, =1{Shfaq # aplikacion tjetër.}other{Shfaq # aplikacione të tjera.}}" - "{count,plural, =1{Shfaq # aplikacion për desktop.}other{Shfaq # aplikacione për desktop.}}" + "Hap aplikacionin si një flluskë" + "Aplikacionet e fundit" + "Lista e aplikacioneve të fundit" + "{count,plural, =1{aplikacion tjetër}other{aplikacione të tjera}}" + "Desktop" "%1$s dhe %2$s" + "%1$s, artikulli %2$d nga %3$d" + "Lëviz majtas" + "Lëviz djathtas" "Flluska" "Tejkalimi" "\"%1$s\" nga %2$s" "\"%1$s\" dhe %2$d të tjera" + "Lëviz majtas" + "Lëviz djathtas" + "Hiqi të gjitha" + "zgjero %1$s" + "palos %1$s" + "Qarko për të kërkuar" + "Ikona e aplikacionit" + "Titulli i aplikacionit" + "Butoni i mbylljes" + "Shtytje" + "Mbyll" + "Shtyj imazhin" diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml index 7456a36b7ef..e20b9863c49 100644 --- a/quickstep/res/values-sr/strings.xml +++ b/quickstep/res/values-sr/strings.xml @@ -22,11 +22,14 @@ "Закачи" "Слободни облик" "Рачунар" + "Преместите на спољни екран" + "Обриши" + "Рачунари" "Нема недавних ставки" "Подешавања коришћења апликације" "Обриши све" + "Додај нову радну површину" "Недавне апликације" - "Задатак је затворен" "%1$s, %2$s" "< 1 мин" "Још %1$s данас" @@ -44,19 +47,18 @@ "Предлози апликација се додају на празно место" "Предлози апликација су омогућени" "Предлози апликација су онемогућени" - "Предвиђамо апликацију: %1$s" + "Водич за навигацију помоћу покрета" "Ротирајте уређај" "Ротирајте уређај да бисте довршили водич за навигацију помоћу покрета" "Обавезно превуците од саме десне или леве ивице" "Обавезно превуците од десне или леве ивице до средине екрана и отпустите" "Научили сте како да превлачите здесна да бисте се вратили уназад. Сада научите да замените апликације." "Довршили сте покрет за повратак. Сада сазнајте како да промените апликације." - "Довршили сте покрет за повратак" + "Довршили сте покрет за назад" "Никако не превлачите превише близу дна екрана" "Осетљивост пок. за назад можете да промените у Подешавањима" "Превуците да бисте се вратили уназад" "Да бисте се вратили на последњи екран, превуците од леве или десне ивице до средине екрана." - "Да бисте се вратили на последњи екран, превуците помоћу два прста од леве или десне ивице до средине екрана." "Назад" "Превуците од леве или десне ивице до средине екрана" "Обавезно превуците нагоре од доње ивице екрана" @@ -66,8 +68,7 @@ "Довршили сте покрет за повратак на почетну страницу." "Превуците да бисте отишли на почетну страницу" "Превуците нагоре од дна екрана. Овај покрет вас увек води на почетни екран." - "Превуците помоћу два прста нагоре од дна екрана. Овим покретом увек отварате почетни екран." - "Идите на почетни екран" + "На почетни екран" "Превуците нагоре са доњег дела екрана" "Одлично!" "Обавезно превуците нагоре од доње ивице екрана" @@ -77,10 +78,9 @@ "Довршили сте покрет за промену апликација" "Превуците да бисте заменили апликације" "За прелазак са једне апликације на другу превуците нагоре од дна екрана, задржите, па пустите." - "За прелазак између апликација превуците помоћу два прста нагоре од дна екрана, задржите, па пустите." - "Пређите на другу апликацију" + "На другу апликацију" "Превуците нагоре од дна екрана, задржите, па пустите" - "Одлично!" + "Супер!" "То је то" "Готово" "Подешавања" @@ -89,26 +89,38 @@ "Водич %1$d/%2$d" "Готово!" "Превуците нагоре да бисте отворили почетни екран" - "Додирните дугме Почетак да бисти ишли на почетни екран" + "Додирните дугме Почетак да бисте отишли на почетни екран" "Спремни сте да почнете да користите %1$s" - "уређај" + "Спремни сте да почнете да користите уређај" "Подешавања кретања кроз систем" + "%1$s је \nспреман!" + "Уређај је \nспреман!" + "Спремни сте!" + "Уживајте уз нови %1$s!" + "Превуците нагоре да бисте почели да користите %1$s" + "Додирните да бисте почели да користите %1$s" + "Изаберите подешавања навигације" + "Превуците нагоре" + "Додирните дугме Почетак" + "таблет" + "телефон" "Дели" "Снимак екрана" "Подели" "Сачувај пар апликација" "Додирните другу апликацију за подељени екран" "Одаберите другу апликацију да бисте користили подељени екран" - "Откажи" + "Откажи" "Излазак из бирања подељеног екрана" "Одаберите другу апликацију за подељени екран" "Апликација или организација не дозвољавају ову радњу" "Виџети тренутно нису подржани. Изаберите другу апликацију" - "Желите да прескочите водич за кретање?" - "Можете да пронађете ово касније у апликацији %1$s" - "Откажи" - "Прескочи" "Ротирајте екран" + "Анимација која показује како се трака задатака приказује при дну екрана и аутоматски скрива када се не користи" + "Анимација која показује како да помоћу прекидача закачите траку задатака тако да увек буде видљива у дну екрана" + "Анимација која показује како да направите подељени екран превлачењем и отпуштањем апликације са траке задатака изнад отворене апликације" + "Анимација која показује како да приступате предложеним апликацијама на уређају" + "Анимација која показује како да потражите ставку на екрану тако што ћете додирнути и задржати тастер радњи и изабрати област у којој се налази ова ставка" "Упутства на траци задатака" "Превуците на страну да бисте користили 2 апликације одједном" "Споро превуците нагоре да бисте видели траку задатака" @@ -129,19 +141,38 @@ "Обавештења" "Брза подешавања" "Трака задатака" - "Трака задатака је приказана" - "Трака задатака је скривена" "Трака за навигацију" "Увек приказуј траку задатака" "Промени режим навигације" "Разделник траке задатака" + "Друге недавне апликације" + "Апликација је додата на траку задатака" + "Апликација је уклоњена са траке задатака" "Премести горе лево" "Премести доле десно" - "{count,plural, =1{Прикажи још # апликацију.}one{Прикажи још # апликацију.}few{Прикажи још # апликације.}other{Прикажи још # апликација.}}" - "{count,plural, =1{Прикажи # апликацију за рачунаре.}one{Прикажи # апликацију за рачунаре.}few{Прикажи # апликације за рачунаре.}other{Прикажи # апликација за рачунаре.}}" + "Отвори апликацију као облачић" + "Недавне апликације" + "Листа недавних апликација" + "{count,plural, =1{додатна апликација}one{додатна апликација}few{додатне апликације}other{додатних апликација}}" + "Рачунар" "%1$s и %2$s" + "%1$s, ставка %2$d од %3$d" + "Скролујте улево" + "Скролујте удесно" "Облачић" "Преклопни" "%1$s – %2$s" "%1$s и још %2$d" + "Помери налево" + "Помери надесно" + "Одбаци све" + "проширите облачић %1$s" + "скупите облачић %1$s" + "Претрага заокруживањем" + "Икона апликације" + "Назив апликације" + "Дугме Затвори" + "Аутоматски подсетник" + "Затворите" + "Слика аутоматског подсетника" diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml index f369daeb339..be0cae177a7 100644 --- a/quickstep/res/values-sv/strings.xml +++ b/quickstep/res/values-sv/strings.xml @@ -21,12 +21,15 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Fäst" "Fritt format" - "Dator" + "Skrivbordsläge" + "Flytta till extern skärm" + "Rensa" + "Skrivbordsläge" "Listan är tom" "Inställningar för appanvändning" "Rensa alla" + "Lägg till nytt skrivbord" "Senaste apparna" - "Uppgiften har stängts" "%1$s, %2$s" "< 1 min" "%1$s kvar i dag" @@ -44,7 +47,7 @@ "Appförslag har lagts till på tom yta" "Appförslag har aktiverats" "Appförslag har inaktiverats" - "Appförslag: %1$s" + "Guide för navigering med rörelser" "Rotera enheten" "Rotera enheten för att slutföra guiden för navigering med rörelser" "Se till att du sveper ända från högerkanten eller vänsterkanten" @@ -56,7 +59,6 @@ "Öppna inställningarna om du vill ändra rörelsens känslighet" "Svep för att återgå" "Återgå till den senaste skärmen genom att svepa från skärmens vänster- eller högerkant till mitten." - "Gå tillbaka till den senaste skärmen genom att med två fingrar svepa mot mitten av skärmen från vänster eller höger kant." "Tillbaka" "Svep från den högra eller vänstra kanten till mitten av skärmen" "Se till att du sveper uppåt från nederkanten av skärmen" @@ -66,7 +68,6 @@ "Du är klar med rörelsen för att öppna startskärmen" "Svep för att öppna startskärmen" "Svep uppåt från skärmens nederkant. Du kan alltid återgå till startskärmen med den här rörelsen." - "Svep uppåt med två fingrar från skärmens nederkant. Så kommer du alltid tillbaka till startskärmen." "Öppna startskärmen" "Svep uppåt från skärmens nederkant" "Bra jobbat!" @@ -77,9 +78,8 @@ "Du är klar med rörelsen för att byta mellan appar" "Svep för att byta mellan appar" "Byt mellan appar genom att svepa uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp." - "Byta mellan appar: Svep uppåt med två fingrar från skärmens nederkant, håll kvar och släpp sedan." "Byt app" - "Svep uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp sedan" + "Svep uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp sedan." "Bra gjort!" "Klart" "Klar" @@ -91,24 +91,36 @@ "Svep uppåt för att öppna startskärmen" "Tryck på hemknappen för att öppna startskärmen" "Nu kan du börja använda din %1$s" - "enhet" + "Nu kan du börja använda din enhet" "Systemnavigeringsinställningar" + "Din %1$s är \nklar!" + "Din enhet är \nklar!" + "Nu kan du börja!" + "Ha kul med din nya %1$s!" + "Svep uppåt för att komma igång med din %1$s" + "Tryck för att komma igång med din %1$s" + "Välj hur du vill navigera" + "Svep uppåt" + "Tryck på hemknappen" + "surfplatta" + "telefon" "Dela" "Skärmbild" "Delad skärm" "Spara app-par" "Tryck på en annan app för att använda delad skärm" "Välj en annan app för att använda delad skärm" - "Avbryt" + "Avbryt" "Avsluta val av delad skärm" "Välj en annan app för att använda delad skärm" "Appen eller organisationen tillåter inte den här åtgärden" "Widgetar stöds för närvarande inte. Välj en annan app" - "Vill du hoppa över självstudierna?" - "Du hittar det här igen i %1$s-appen" - "Avbryt" - "Hoppa över" "Rotera skärmen" + "Animation som visar hur aktivitetsfältet dyker upp längst ned på skärmen och automatiskt döljs när det inte används" + "Animation som visar hur du fäster aktivitetsfältet med ett reglage så att det alltid är synligt längst ned på skärmen" + "Animation som visar hur du skapar en delad skärm genom att dra och släppa en app från aktivitetsfältet ovanför en öppen app" + "Animation som visar hur du kommer åt föreslagna appar på enheten" + "Animation som visar hur du söker efter ett objekt på skärmen genom att trycka länge på åtgärdstangenten och välja området där objektet finns" "Aktivitetsfältsutbildning" "Dra en app till sidan om du vill använda två appar samtidigt" "Svep långsamt uppåt för att visa aktivitetsfältet" @@ -129,19 +141,38 @@ "Aviseringar" "Snabbinställn." "Aktivitetsfält" - "Aktivitetsfältet visas" - "Aktivitetsfältet är dolt" "Navigeringsfält" "Visa alltid aktivitetsfältet" "Ändra navigeringsläge" "Avdelare för aktivitetsfältet" + "Andra appar som använts nyligen" + "Appen har lagts till i aktivitetsfältet" + "Appen har tagits bort från aktivitetsfältet" "Flytta högst upp/till vänster" "Flytta längst ned/till höger" - "{count,plural, =1{Visa # app till.}other{Visa # appar till.}}" - "{count,plural, =1{Visa # datorapp.}other{Visa # datorappar.}}" + "Öppna appen som en bubbla" + "Senaste apparna" + "Lista över senaste appar" + "{count,plural, =1{app till}other{appar till}}" + "Skrivbordsläge" "%1$s och %2$s" + "%1$s, objekt %2$d av %3$d" + "Scrolla åt vänster" + "Scrolla åt höger" "Bubbla" "Fler alternativ" "%1$s från %2$s" "%1$s och %2$d till" + "Flytta åt vänster" + "Flytta åt höger" + "Stäng alla" + "utöka %1$s" + "komprimera %1$s" + "Circle to Search" + "Appikon" + "Apptitel" + "Knappen Stäng" + "Hint" + "Stäng" + "Bild i hint" diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml index 3d8277b4489..59ef4f16be0 100644 --- a/quickstep/res/values-sw/strings.xml +++ b/quickstep/res/values-sw/strings.xml @@ -22,11 +22,14 @@ "Bandika" "Muundo huru" "Kompyuta ya mezani" + "Hamishia programu kwenye skrini ya nje" + "Futa" + "Kompyuta ya Mezani" "Hakuna vipengee vya hivi karibuni" "Mipangilio ya matumizi ya programu" "Ondoa zote" + "Weka eneokazi jipya" "Programu za hivi karibuni" - "Jukumu Limefungwa" "%1$s, %2$s" "< dak 1" "Umebakisha %1$s leo" @@ -44,29 +47,27 @@ "Mapendekezo ya programu yamewekwa kwenye nafasi isiyo na kitu" "Mapendekezo ya programu yamewashwa" "Umezima mapendekezo ya programu" - "Programu iliyotabiriwa: %1$s" + "Mafunzo ya Usogezaji kwa Miguso" "Zungusha kifaa chako" - "Tafadhali zungusha kifaa chako ili ukamilishe mafunzo ya usogezaji kwa kutumia ishara" + "Tafadhali zungusha kifaa chako ili ukamilishe mafunzo ya usogezaji kwa miguso" "Hakikisha unatelezesha kidole kutoka ukingo wa kulia au kushoto kabisa" "Hakikisha unatelezesha kidole kutoka ukingo wa kulia au kushoto hadi katikati ya skrini na uachilie" "Umejifunza jinsi ya kutelezesha kidole kuanzia kulia ili kurudi nyuma. Sasa jifunze jinsi ya kubadilisha programu." - "Umekamilisha ishara ya kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu." - "Umeweka ishara ya kurudi nyuma" + "Umekamilisha mafunzo ya miguso ya kurudi nyuma. Hatua inayofuata, fahamu jinsi ya kubadilisha programu." + "Umekamilisha mafunzo ya miguso ya kurudi nyuma" "Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini" "Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio" "Telezesha kidole ili urudi nyuma" "Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto au wa kulia kuelekea katikati ya skrini." - "Ili urudi kwenye skrini iliyopita, telezesha vidole viwili kuanzia ukingo wa kushoto au wa kulia kuelekea katikati ya skrini." "Rudi nyuma" "Telezesha kidole kutoka ukingo wa kushoto au kulia hadi katikati ya skrini" "Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini" "Hakikisha husitishi kabla ya kuachilia" "Hakikisha unatelezesha kidole juu" - "Umeweka ishara ya kwenda kwenye Skrini ya kwanza. Inayofuata, jifunze jinsi ya kurudi nyuma." - "Umeweka ishara ya kwenda kwenye skrini ya kwanza" + "Umekamilisha mguso wa kwenda kwenye skrini ya kwanza. Inayofuata, fahamu jinsi ya kurudi nyuma." + "Umekamilisha mguso wa kwenda kwenye skrini ya kwanza" "Telezesha kidole ili uende kwenye skrini ya kwanza" "Telezesha kidole juu kuanzia chini ya skrini yako. Ishara hii kila wakati hukupeleka kwenye Skrini ya kwanza." - "Telezesha vidole viwili kuelekea juu kuanzia sehemu ya chini ya skrini. Ishara hii kila wakati hukupeleka kwenye Skrini ya kwanza." "Nenda kwenye ukurasa wa mwanzo" "Telezesha kidole juu kutoka sehemu ya chini ya skrini yako" "Kazi nzuri!" @@ -74,10 +75,9 @@ "Jaribu kushikilia dirisha kwa muda mrefu kabla ya kuachilia" "Hakikisha unatelezesha kidole juu, kisha usitishe" "Umejifunza jinsi ya kutumia ishara. Ili uzime ishara, nenda kwenye Mipangilio." - "Umeweka ishara ya kubadilisha programu" + "Umekamilisha mguso wa kubadilisha programu" "Telezesha kidole ili ubadilishe programu" "Ili ubadili kati ya programu, telezesha kidole juu kuanzia sehemu ya chini ya skrini yako, ushikilie, kisha uachilie." - "Ili ubadilishe kati ya programu, telezesha vidole viwili kuelekea juu kuanzia sehemu ya chini ya skrini yako, ushikilie, kisha uachilie." "Badilisha programu" "Telezesha kidole juu kutoka sehemu ya chini ya skrini yako, shikilia kisha uachilie" "Hongera!" @@ -91,24 +91,36 @@ "Telezesha kidole juu ili uende kwenye skrini ya kwanza" "Gusa kitufe cha ukurasa wa mwanzo ili uende kwenye skrini ya kwanza" "Uko tayari kuanza kutumia %1$s" - "kifaa" + "Uko tayari kuanza kutumia kifaa chako" "Mipangilio ya usogezaji kwenye mfumo" + "%1$s yako iko \ntayari!" + "Kifaa chako kiko \ntayari!" + "Uko tayari kuanza!" + "Furahia %1$s yako mpya!" + "Telezesha kidole juu ili uanze kutumia %1$s" + "Gusa ili uanze kutumia %1$s yako" + "Chagua jinsi ya kusogeza" + "Telezesha kidole juu" + "Gusa kitufe cha ukurasa wa mwanzo" + "kishikwambi" + "simu" "Shiriki" "Picha ya skrini" "Iliyogawanywa" "Hifadhi jozi ya programu" "Gusa programu nyingine ili utumie kipengele cha kugawa skrini" "Chagua programu nyingine ili utumie hali ya kugawa skrini" - "Ghairi" + "Acha" "Ondoka kwenye hali ya skrini iliyogawanywa" "Chagua programu nyingine ili utumie hali ya kugawa skrini" "Kitendo hiki hakiruhusiwi na programu au shirika lako" "Wijeti hazitumiwi kwa sasa, tafadhali chagua programu nyingine" - "Ungependa kuruka mafunzo ya usogezaji?" - "Utapata mafunzo haya baadaye katika programu ya %1$s" - "Ghairi" - "Ruka" "Zungusha skrini" + "Uhuishaji unaoonyesha jinsi upauzana huonekana kutokea sehemu ya chini ya skrini na kufichwa kiotomatiki wakati hautumiki" + "Uhuishaji unaoonyesha jinsi ya kubandika upauzana wako kwa kutumia kipengele cha kuwasha/kuzima, ili upauzana uendelee kuonekana sehemu ya chini kabisa ya skrini" + "Uhuishaji unaoonyesha jinsi ya kuweka skrini iliyogawanywa, kwa kuburuta na kudondosha programu kutoka kwenye upauzana ulio juu ya programu iliyofunguliwa" + "Uhuishaji unaoonyesha jinsi ya kufikia programu zinazopendekezwa kwenye kifaa chako" + "Uhuishaji unaoonyesha jinsi ya kutafuta bidhaa kwenye skrini, kwa kugusa na kushikilia kitufe cha vitendo kisha kuchagua eneo liliko bidhaa" "Elimu ya Upauzana" "Buruta programu pembeni ili utumie programu 2 kwa wakati mmoja" "Telezesha kidole juu taratibu ili ufungue Upauzana" @@ -129,19 +141,38 @@ "Arifa" "Mipangilio ya Haraka" "Upauzana" - "Upauzana umeonyeshwa" - "Upauzana umefichwa" "Sehemu ya viungo muhimu" "Onyesha Zana kila wakati" "Badilisha hali ya usogezaji" "Kitenganishi cha Upauzana" + "Programu nyingine za hivi majuzi" + "Programu imewekwa kwenye Upauzana" + "Programu imeondolewa kwenye Upauzana" "Sogeza juu/kushoto" "Sogeza chini/kulia" - "{count,plural, =1{Onyesha programu # zaidi.}other{Onyesha programu # zaidi.}}" - "{count,plural, =1{Onyesha programu # ya kompyuta ya mezani.}other{Onyesha programu # za kompyuta ya mezani.}}" + "Fungua programu kama kiputo" + "Programu ulizofungua hivi majuzi" + "Orodha ya programu ulizofungua hivi majuzi" + "{count,plural, =1{programu nyingine}other{programu zingine}}" + "Kompyuta ya Mezani" "%1$s na %2$s" + "%1$s, kipengee cha %2$d kati ya %3$d" + "Sogeza kushoto" + "Sogeza kulia" "Kiputo" "Kiputo cha vipengee vya ziada" "%1$s kutoka %2$s" "%1$s na vingine %2$d" + "Sogeza kushoto" + "Sogeza kulia" + "Ondoa vyote" + "panua %1$s" + "kunja %1$s" + "Chora Mviringo ili Kutafuta" + "Aikoni ya programu" + "Kichwa cha programu" + "Kitufe cha kufunga" + "Dokezo" + "Funga" + "Picha ya dokezo" diff --git a/quickstep/res/values-sw600dp-land/dimens.xml b/quickstep/res/values-sw600dp-land/dimens.xml index 5e9a177b8bc..cf7ba0094b2 100644 --- a/quickstep/res/values-sw600dp-land/dimens.xml +++ b/quickstep/res/values-sw600dp-land/dimens.xml @@ -16,7 +16,7 @@ --> - 48dp + 48dp 48dp @@ -27,10 +27,6 @@ 40dp 49dp - - - 24dp - - 40dp + 24dp diff --git a/quickstep/res/values-sw600dp/config.xml b/quickstep/res/values-sw600dp/config.xml index b22cfc51185..34d16955dcc 100644 --- a/quickstep/res/values-sw600dp/config.xml +++ b/quickstep/res/values-sw600dp/config.xml @@ -17,4 +17,8 @@ 8 + + + 0.775 + 2400 diff --git a/quickstep/res/values-sw600dp/dimens.xml b/quickstep/res/values-sw600dp/dimens.xml index e24d8fea79e..fc25f55ed73 100644 --- a/quickstep/res/values-sw600dp/dimens.xml +++ b/quickstep/res/values-sw600dp/dimens.xml @@ -33,20 +33,13 @@ 36dp 64dp - - 80dp - - 80dp 24dp - 120dp + 120dp + 48dp 38sp 15sp - - - - 300dp - + 16sp diff --git a/quickstep/res/values-sw720dp/dimens.xml b/quickstep/res/values-sw720dp/dimens.xml index 1caffb8a722..dbe82f277b9 100644 --- a/quickstep/res/values-sw720dp/dimens.xml +++ b/quickstep/res/values-sw720dp/dimens.xml @@ -37,6 +37,7 @@ 42sp 16sp + 16sp 30dp diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml index 47d8055e16b..dd6982e2d23 100644 --- a/quickstep/res/values-ta/strings.xml +++ b/quickstep/res/values-ta/strings.xml @@ -19,14 +19,17 @@ - "பின் செய்தல்" + "பின் செய்" "குறிப்பிட்ட வடிவமில்லாத பயன்முறை" "டெஸ்க்டாப்" + "வெளிப்புற டிஸ்ப்ளேவிற்கு நகர்த்துதல்" + "அழி" + "டெஸ்க்டாப்" "சமீபத்தியவை எதுவுமில்லை" "ஆப்ஸ் உபயோக அமைப்புகள்" "எல்லாம் அழி" + "புதிய டெஸ்க்கைச் சேர்க்கும்" "சமீபத்திய ஆப்ஸ்" - "பணி முடிந்தது" "%1$s, %2$s" "< 1 நி" "இன்று %1$s மீதமுள்ளது" @@ -44,7 +47,7 @@ "ஆப்ஸ் பரிந்துரைகள் காலி இடத்தில் சேர்க்கப்பட்டன" "ஆப்ஸ் பரிந்துரைகள் இயக்கப்பட்டுள்ளன" "ஆப்ஸ் பரிந்துரைகள் முடக்கப்பட்டுள்ளன" - "கணித்த ஆப்ஸ்: %1$s" + "சைகை வழிசெலுத்தலுக்கான பயிற்சி" "உங்கள் சாதனத்தைச் சுழற்றுங்கள்" "சைகை வழிசெலுத்தல் பயிற்சியை நிறைவுசெய்ய உங்கள் சாதனத்தைச் சுழற்றுங்கள்" "வலது அல்லது இடது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்" @@ -56,28 +59,25 @@ "பின்செல் சைகையின் உணர்திறனை மாற்ற அமைப்புகளுக்குச் செல்க" "பின்செல்ல ஸ்வைப் செய்யுங்கள்" "முந்தைய திரைக்கு மீண்டும் செல்ல, இடது/வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்க." - "முந்தைய திரைக்கு மீண்டும் செல்ல, 2 விரல்களால் இடது அல்லது வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்யுங்கள்." "பின்செல்லுதல்" "வலது அல்லது இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்யுங்கள்" "திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்" "விடுவிப்பதற்கு முன்பாக இடைநிறுத்தவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்" "மேல்நோக்கி நேராக ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்" "முகப்புக்குச் செல் சைகைப் பயிற்சியை நிறைவுசெய்துவிட்டீர்கள். அடுத்து பின்செல்வது எப்படி என்பதை அறிக." - "முகப்புக்குச் செல் சைகைப் பயிற்சியை நிறைவுசெய்துவிட்டீர்கள்" + "முகப்புக்குச் செல்வதற்கான சைகைப் பயிற்சியை நிறைவுசெய்துவிட்டீர்கள்" "முகப்புக்குச் செல்ல ஸ்வைப் செய்யுங்கள்" "திரையின் கீழிருந்து மேலாக ஸ்வைப் செய்க. இந்தச் சைகை எப்போதும் முகப்புத் திரைக்கு அழைத்துச் செல்லும்." - "2 விரலால் திரையின் கீழிருந்து மேலாக ஸ்வைப் செய்க. இந்தச் சைகை முகப்புத் திரைக்கு அழைத்துச் செல்லும்." "முகப்புக்குச் செல்லுதல்" "திரையின் கீழிருந்து மேல்நோக்கி ஸ்வைப் செய்யுங்கள்" "அருமை!" "திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்" "விடுவிப்பதற்கு முன்பாக நீண்டநேரம் சாளரத்தை அழுத்திப் பிடித்திருங்கள்" - "மேல்நோக்கி நேராக ஸ்வைப் செய்தபிறகு இடைநிறுத்துவதை உறுதிசெய்துகொள்ளுங்கள்" + "மேல்நோக்கி நேராக ஸ்வைப் செய்தபிறகு சற்றுநேரம் அழுத்திபடியே வைத்திருங்கள்" "சைகைகளை எப்படி உபயோகிப்பது என்று கற்றுக்கொண்டீர்கள். சைகைகளை முடக்க அமைப்புகளுக்குச் செல்லுங்கள்." "ஆப்ஸுக்கிடையே மாறும் சைகைப் பயிற்சியை நிறைவுசெய்துவிட்டீர்கள்" "ஆப்ஸுக்கிடையே மாற ஸ்வைப் செய்யுங்கள்" "ஆப்ஸுக்கு இடையே மாற, திரையின் கீழிலிருந்து மேலாக ஸ்வைப் செய்து, பிடித்திருந்து, பிறகு விடுவிக்கவும்." - "ஆப்ஸுக்கிடையே மாற, திரையின் கீழிருந்து மேலாக 2 விரலால் ஸ்வைப் செய்து, பிடித்து, பிறகு விடுவிக்கவும்." "ஆப்ஸுக்கிடையே மாறுதல்" "உங்கள் திரையின் கீழ்ப்பகுதியில் இருந்து மேலே ஸ்வைப் செய்து, பிடித்து, பிறகு விடுவியுங்கள்" "அருமை!" @@ -87,28 +87,40 @@ "மீண்டும் முயல்க" "அருமை!" "பயிற்சி %1$d/%2$d" - "அனைத்தையும் அமைத்துவிட்டீர்கள்!" + "எல்லாம் தயார்!" "முகப்புக்குச் செல்ல மேல்நோக்கி ஸ்வைப் செய்யுங்கள்" "முகப்புத் திரைக்குச் செல்வதற்கு முகப்பு பட்டனைத் தட்டவும்" - "உங்கள் %1$s சாதனத்தைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்" - "சாதனம்" + "உங்கள் %1$s உங்களுக்காகத் தயாராக இருக்கிறது" + "உங்கள் சாதனத்தைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்" "சிஸ்டம் வழிசெலுத்தல் அமைப்புகள்" + "உங்கள் %1$s \nதயார்!" + "உங்கள் சாதனம் \nதயார்!" + "சாதனத்தை இப்போது பயன்படுத்தலாம்!" + "உங்கள் புதிய %1$s சாதனத்தைப் பயன்படுத்தி மகிழுங்கள்!" + "உங்கள் %1$s சாதனத்தைப் பயன்படுத்தத் தொடங்க மேலே ஸ்வைப் செய்யுங்கள்" + "உங்கள் %1$s சாதனத்தைப் பயன்படுத்தத் தொடங்க தட்டுங்கள்" + "வழிசெலுத்துவதற்கான வழிமுறையைத் தேர்வுசெய்யுங்கள்" + "மேல்நோக்கி ஸ்வைப் செய்யுங்கள்" + "முகப்பு பட்டனைத் தட்டுங்கள்" + "டேப்லெட்" + "மொபைல்" "பகிர்" "ஸ்கிரீன்ஷாட்" "பிரி" "ஆப்ஸ் ஜோடியைச் சேமி" "திரைப் பிரிப்பைப் பயன்படுத்த வேறு ஆப்ஸைத் தட்டவும்" "திரைப் பிரிப்பைப் பயன்படுத்த வேறு ஆப்ஸைத் தேர்வுசெய்யுங்கள்" - "ரத்துசெய்" + "ரத்துசெய்" "திரைப் பிரிப்பு தேர்வில் இருந்து வெளியேறும்" "திரைப் பிரிப்பை பயன்படுத்த வேறு ஆப்ஸை தேர்வுசெய்க" "ஆப்ஸோ உங்கள் நிறுவனமோ இந்த செயலை அனுமதிப்பதில்லை" "விட்ஜெட்கள் தற்போது ஆதரிக்கப்படவில்லை, வேறு ஆப்ஸைத் தேர்ந்தெடுக்கவும்" - "வழிகாட்டுதல் பயிற்சியைத் தவிர்க்கவா?" - "%1$s ஆப்ஸில் பிறகு இதைக் கண்டறியலாம்" - "ரத்துசெய்" - "தவிர்" "திரையைச் சுழற்றும்" + "திரையின் அடிப்பகுதியில் இருந்து செயல் பட்டி எப்படிக் காட்டப்படுகிறது, பயன்பாட்டில் இல்லாதபோது தானாகவே மறைகிறது என்பதைக் காட்டும் அனிமேஷன்" + "நிலைமாற்றியைப் பயன்படுத்தி உங்கள் செயல் பட்டியை எப்படி பின் செய்வது என்பதைக் காட்டும் அனிமேஷன், இதனால் திரையின் அடிப்பகுதியில் செயல் பட்டி நிரந்தரமாகக் காட்டப்படும்" + "திறந்திருக்கும் ஆப்ஸின் மேலேயுள்ள செயல் பட்டியிலிருந்து ஒரு ஆப்ஸை இழுத்து விடுவதன் மூலம், திரைப் பிரிப்பை எப்படி உருவாக்குவது என்பதைக் காட்டும் அனிமேஷன்" + "உங்கள் சாதனத்தில் பரிந்துரைக்கப்பட்ட ஆப்ஸை அணுகுவது எப்படி என்பதைக் காட்டும் அனிமேஷன்" + "ஆக்‌ஷன் பட்டனைத் தொட்டுப் பிடித்து, ஆவணம் இருக்கும் பகுதியைத் தேர்ந்தெடுப்பதன் மூலம் திரையில் ஒன்றைத் தேடுவது எப்படி என்பதைக் காட்டும் அனிமேஷன்" "செயல் பட்டியைப் பயன்படுத்தும் விதம்" "ஆப்ஸை பக்கவாட்டில் இழுத்து ஒரே நேரத்தில் 2 ஆப்ஸைப் பயன்படுத்தலாம்" "செயல் பட்டியைக் காட்ட மேல்நோக்கி மெதுவாக ஸ்வைப் செய்யவும்" @@ -129,19 +141,38 @@ "அறிவிப்புகள்" "விரைவு அமைப்புகள்" "செயல் பட்டி" - "செயல் பட்டி காட்டப்படுகிறது" - "செயல் பட்டி மறைக்கப்பட்டுள்ளது" "வழிசெலுத்தல் பட்டி" "செயல் பட்டியை எப்போதும் காட்டு" "வழிசெலுத்தல் பயன்முறையை மாற்று" "செயல் பட்டிப் பிரிப்பான்" + "பிற சமீபத்திய ஆப்ஸ்" + "செயல் பட்டியில் ஆப்ஸ் சேர்க்கப்பட்டது" + "செயல் பட்டியில் இருந்து ஆப்ஸ் அகற்றப்பட்டது" "மேலே/இடதுபுறம் நகர்த்தும்" "கீழே/வலதுபுறம் நகர்த்தும்" - "{count,plural, =1{மேலும் # ஆப்ஸைக் காட்டு.}other{மேலும் # ஆப்ஸைக் காட்டு.}}" - "{count,plural, =1{# டெஸ்க்டாப் ஆப்ஸைக் காட்டு.}other{# டெஸ்க்டாப் ஆப்ஸைக் காட்டு.}}" + "ஆப்ஸைக் குமிழாகத் திற" + "சமீபத்திய ஆப்ஸ்" + "சமீபத்திய ஆப்ஸ் பட்டியல்" + "{count,plural, =1{கூடுதல் ஆப்ஸ்}other{கூடுதல் ஆப்ஸ்}}" + "டெஸ்க்டாப்" "%1$s மற்றும் %2$s" + "%1$s, %3$d இல் %2$d கட்டம்" + "இடதுபுறம் நகர்த்தும்" + "வலதுபுறம் நகர்த்தும்" "குமிழ்" "கூடுதல் விருப்பங்களைக் காட்டும்" "%2$s வழங்கும் %1$s" "%1$s மற்றும் %2$d" + "இடதுபுறம் நகர்த்தும்" + "வலதுபுறம் நகர்த்தும்" + "அனைத்தையும் மூடும்" + "%1$s ஐ விரிவாக்கும்" + "%1$s ஐச் சுருக்கும்" + "வட்டமிட்டுத் தேடல்" + "ஆப்ஸ் ஐகான்" + "ஆப்ஸ் தலைப்பு" + "மூடுவதற்கான பட்டன்" + "நினைவூட்டல்" + "மூடும்" + "படம் குறித்து நினைவூட்டும்" diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml index a4e1cbf09c8..342f3987f82 100644 --- a/quickstep/res/values-te/strings.xml +++ b/quickstep/res/values-te/strings.xml @@ -22,11 +22,14 @@ "పిన్ చేయండి" "సంప్రదాయేతర" "డెస్క్‌టాప్" + "ఎక్స్‌టర్నల్ డిస్‌ప్లేకు తరలించండి" + "క్లియర్ చేయండి" + "డెస్క్‌టాప్" "ఇటీవలి ఐటెమ్‌లు ఏవీ లేవు" "యాప్ వినియోగ సెట్టింగ్‌లు" - "అన్నీ తీసివేయండి" + "అన్నీ క్లియర్ చేయండి" + "కొత్త డెస్క్‌ను జోడించండి" "ఇటీవలి యాప్‌లు" - "టాస్క్ మూసివేయబడింది" "%1$s, %2$s" "< 1 నిమిషం" "నేటికి %1$s మిగిలి ఉంది" @@ -44,7 +47,7 @@ "యాప్ సూచ‌న‌లు ఖాళీ స్పేస్‌కు జోడించబడ్డాయి" "యాప్ సలహాలు ఎనేబుల్ చేయబడ్డాయి" "యాప్ సూచ‌న‌లు డిజేబుల్‌ చేయబడ్డాయి" - "సూచించబడిన యాప్: %1$s" + "సంజ్ఞ నావిగేషన్ ట్యుటోరియల్" "మీ పరికరాన్ని రొటేట్ చేయండి" "సంజ్ఞ నావిగేషన్ ట్యుటోరియల్‌ను పూర్తి చేయడానికి దయచేసి మీ పరికరాన్ని రొటేట్ చేయండి" "కుడి వైపు చిట్ట చివరి లేదా ఎడమ వైపు చిట్ట చివరి అంచు నుండి స్వైప్ చేస్తున్నారని నిర్ధారించుకోండి" @@ -56,7 +59,6 @@ "వెనుక సంజ్ఞ సున్నితత్వం మార్చడానికి, సెట్టింగ్‌లకు వెళ్లండి" "వెనుకకు వెళ్ళడం కోసం స్వైప్ చేయండి" "మునుపటి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ లేదా కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వయిప్ చేయండి." - "గత స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ లేదా కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి 2 వేళ్లతో స్వైప్ చేయండి." "వెనుకకు వెళ్లండి" "ఎడమ లేదా కుడి అంచు నుండి స్క్రీన్ మధ్యకు స్వైప్ చేయండి" "మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి" @@ -66,18 +68,16 @@ "మీరు మొదటి స్క్రీన్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు" "మొదటి స్క్రీన్‌కు వెళ్లడానికి స్వైప్ చేయండి" "స్క్రీన్ కింది నుండి పైకి స్వైప్ చేయండి. ఈ సంజ్ఞ ఎప్పుడూ మిమ్మల్ని మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది." - "స్క్రీన్ కింది నుండి 2 వేళ్లతో పైకి స్వైప్ చేయండి. సంజ్ఞ ఎల్లప్పుడూ మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది." - "మొదటి ట్యాబ్‌కు వెళ్లండి" + "హోం స్క్రీన్‌కు వెళ్లండి" "స్క్రీన్ కింది భాగం నుండి పైకి స్వైప్ చేయండి" "బాగా చేశారు!" "మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి" "వేలిని రిలీజ్ చేయడానికి ముందు విండోను ఎక్కువసేపు నొక్కి, పట్టుకోవడానికి ట్రై చేయండి" "స్క్రీన్‌పై నేరుగా పైకి స్వైప్ చేసి, ఆపై పాజ్ చేయండి" "మీరు సంజ్ఞలను ఎలా ఉపయోగించాలో నేర్చుకున్నారు. సంజ్ఞలను ఆఫ్ చేయడానికి, సెట్టింగ్‌లకు వెళ్లండి." - "మీరు \'యాప్‌ల మధ్య మార్పు\' సంజ్ఞను పూర్తి చేశారు" + "మీరు \'యాప్‌ల మధ్య మారేందుకు సంజ్ఞ\' ట్యుటోరియల్‌ను పూర్తి చేశారు" "యాప్‌ల మధ్య మార్చడం కోసం స్వైప్ చేయండి" "యాప్‌ల మధ్య మారడానికి, మీ స్క్రీన్ కింది వైపు నుండి పైకి స్వైప్ చేసి, పట్టుకుని, తర్వాత వదలండి." - "యాప్‌ల మధ్య మారడానికి, మీ స్క్రీన్ కింది నుండి 2 వేళ్లతో పైకి స్వైప్ చేసి, నొక్కి పట్టి, వదలండి." "యాప్‌ల మధ్య స్విచ్ అవ్వండి" "మీ స్క్రీన్ కింది వైపు నుండి పైకి స్వైప్ చేసి, పట్టుకుని, తర్వాత వదలండి" "చాలా బాగా చేశారు!" @@ -91,24 +91,36 @@ "వర్చువల్ హోమ్‌కు వెళ్లడానికి పైకి స్వైప్ చేయండి" "మీ మొదటి స్క్రీన్‌కు వెళ్లడానికి హోమ్ బటన్‌ను ట్యాప్ చేయండి" "మీరు ఇప్పుడు మీ %1$s‌ను ఉపయోగించడం ప్రారంభించవచ్చు" - "పరికరం" + "మీరు ఇప్పుడు మీ డివైజ్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు" "సిస్టమ్ నావిగేషన్ సెట్టింగ్‌లు" + "మీ %1$s సిద్ధంగా \nఉంది!" + "మీ డివైజ్ సిద్ధంగా \nఉంది!" + "మీరు ఉపయోగించడానికి సిద్ధమైపోయారు!" + "మీ కొత్త %1$s‌ను ఉపయోగిస్తూ ఎంజాయ్ చేయండి!" + "మీ %1$sతో ప్రారంభించడానికి పైకి స్వైప్ చేయండి" + "మీ %1$sను ప్రారంభించడానికి ట్యాప్ చేయండి" + "ఎలా నావిగేట్ చేయాలో ఎంచుకోండి" + "పైకి స్వైప్ చేయండి" + "హోమ్ బటన్‌ను ట్యాప్ చేయండి" + "టాబ్లెట్" + "ఫోన్" "షేర్ చేయండి" "స్క్రీన్‌షాట్" "స్ప్లిట్ చేయండి" "యాప్ పెయిర్‌ను సేవ్ చేయండి" "స్ప్లిట్ స్క్రీన్ కోసం మరొక యాప్‌ను ట్యాప్ చేయండి" "స్ప్లిట్ స్క్రీన్‌ను ఉపయోగించడానికి మరొక యాప్ ఎంచుకోండి" - "రద్దు చేయండి" + "రద్దు చేయండి" "స్ప్లిట్ స్క్రీన్ ఎంపిక నుండి ఎగ్జిట్ అవ్వండి" "స్ప్లిట్ స్క్రీన్ ఉపయోగానికి మరొక యాప్ ఎంచుకోండి" "ఈ చర్యను యాప్ గానీ, మీ సంస్థ గానీ అనుమతించవు" "విడ్జెట్‌లకు ప్రస్తుతం సపోర్ట్ లేదు, దయచేసి మరొక యాప్‌ను ఎంచుకోండి" - "నావిగేషన్ ట్యుటోరియల్‌ను స్కిప్ చేయాలా?" - "%1$s యాప్‌లో మీరు తర్వాత కనుగొనవచ్చు" - "రద్దు చేయండి" - "స్కిప్ చేయండి" "స్క్రీన్‌ను తిప్పండి" + "టాస్క్‌బార్ స్క్రీన్ దిగువ నుండి ఎలా కనిపిస్తుందో, ఉపయోగంలో లేనప్పుడు ఆటోమేటిక్‌గా ఎలా దాచబడుతుందో చూపించే యానిమేషన్" + "టోగుల్ ఉపయోగించి మీ టాస్క్‌బార్‌ను ఎలా పిన్ చేయాలో చూపించే యానిమేషన్, తద్వారా టాస్క్‌బార్ స్క్రీన్ దిగువున శాశ్వతంగా కనిపిస్తుంది" + "తెరిచి ఉన్న యాప్ పైన టాస్క్‌బార్ నుండి యాప్‌ను లాగి, వదలడం ద్వారా స్ప్లిట్ స్క్రీన్‌ను ఎలా క్రియేట్ చేయాలో చూపించే యానిమేషన్" + "మీ పరికరంలో సూచించబడిన యాప్‌లను ఎలా యాక్సెస్ చేయాలో చూపించే యానిమేషన్" + "యాక్షన్ కీని నొక్కి పట్టుకుని, ఆ ఐటెమ్ ఉన్న ప్రాంతాన్ని ఎంచుకోవడం ద్వారా స్క్రీన్‌పై ఐటెమ్ కోసం ఎలా సెర్చ్ చేయాలో చూపించే యానిమేషన్" "టాస్క్‌బార్ ఎడ్యుకేషన్" "ఒకేసారి 2 యాప్‌లను ఉపయోగించడానికి యాప్‌ను పక్కకు లాగండి" "టాస్క్‌బార్‌ను చూపడానికి నెమ్మదిగా పైకి స్వైప్ చేయండి" @@ -127,21 +139,40 @@ "IME స్విచ్చర్" "ఇటీవలివి" "నోటిఫికేషన్‌లు" - "క్విక్ సెట్టింగ్‌లు" + "క్విక్ సెట్టింగ్స్" "టాస్క్‌బార్" - "టాస్క్‌బార్ చూపబడింది" - "టాస్క్‌బార్ దాచబడింది" "నావిగేషన్ బార్" "టాస్క్‌బార్‌ను నిరంతరం చూపండి" "నావిగేషన్ మోడ్‌ను మార్చండి" "టాస్క్‌బార్ డివైడర్" + "ఇతర ఇటీవలి యాప్‌లు" + "టాస్క్‌బార్‌కు యాప్ జోడించబడింది" + "టాస్క్‌బార్ నుండి యాప్ తీసివేయబడింది" "ఎగువ/ఎడమ వైపునకు తరలించండి" "దిగువ/కుడి వైపునకు తరలించండి" - "{count,plural, =1{మరో # యాప్‌ను చూడండి.}other{మరో # యాప్‌లను చూడండి.}}" - "{count,plural, =1{# డెస్క్‌టాప్ యాప్‌ను చూపండి.}other{# డెస్క్‌టాప్ యాప్‌లను చూపండి.}}" + "యాప్‌ను బబుల్‌లాగా తెరవండి" + "ఇటీవలి యాప్‌లు" + "ఇటీవలి యాప్ లిస్ట్" + "{count,plural, =1{మరో యాప్‌}other{మరిన్ని యాప్‌లు}}" + "డెస్క్‌టాప్" "%1$s, %2$s" + "%1$s, %3$d‌లో %2$d‌వ ఐటెమ్" + "ఎడమవైపునకు స్క్రోల్ చేయండి" + "కుడివైపునకు స్క్రోల్ చేయండి" "బబుల్" "ఓవర్‌ఫ్లో" "%2$s నుండి %1$s" "%1$s, మరో %2$d" + "ఎడమ వైపుగా జరపండి" + "కుడి వైపుగా జరపండి" + "అన్నింటినీ విస్మరించండి" + "%1$sను విస్తరించండి" + "%1$sను కుదించండి" + "సెర్చ్ చేయడానికి సర్కిల్ గీయండి" + "యాప్ చిహ్నం" + "యాప్ టైటిల్" + "\'మూసివేయండి\' బటన్" + "ఆటోమేటిక్ రిమైండర్" + "మూసివేయండి" + "ఆటోమేటిక్ రిమైండర్ ఇమేజ్" diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml index 1bbb137a1b9..e880dc42cd3 100644 --- a/quickstep/res/values-th/strings.xml +++ b/quickstep/res/values-th/strings.xml @@ -22,11 +22,14 @@ "ปักหมุด" "รูปแบบอิสระ" "เดสก์ท็อป" + "ย้ายไปยังจอแสดงผลภายนอก" + "ล้าง" + "เดสก์ท็อป" "ไม่มีรายการล่าสุด" "การตั้งค่าการใช้แอป" "ล้างทั้งหมด" + "เพิ่มเดสก์ใหม่" "แอปล่าสุด" - "ปิดงานแล้ว" "%1$s %2$s" "<1 นาที" "วันนี้เหลืออีก %1$s" @@ -44,40 +47,37 @@ "เพิ่มคำแนะนำเกี่ยวกับแอปในพื้นที่ว่างแล้ว" "เปิดใช้แอปแนะนำแล้ว" "ปิดใช้คำแนะนำเกี่ยวกับแอปอยู่" - "แอปที่คาดว่าจะใช้: %1$s" + "บทแนะนำการไปยังส่วนต่างๆ ด้วยท่าทางสัมผัส" "หมุนอุปกรณ์ของคุณ" - "โปรดหมุนอุปกรณ์เพื่อทำตามบทแนะนำการนำทางด้วยท่าทางสัมผัสให้เสร็จสมบูรณ์" - "ตรวจสอบว่าปัดจากขอบด้านขวาสุดหรือซ้ายสุด" + "โปรดหมุนอุปกรณ์เพื่อทำตามบทแนะนำการไปยังส่วนต่างๆ ด้วยท่าทางสัมผัสให้เสร็จสมบูรณ์" + "ปัดจากขอบด้านขวาสุดหรือซ้ายสุด" "ตรวจสอบว่าปัดจากขอบด้านขวาหรือซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น" "คุณรู้วิธีปัดจากด้านขวาเพื่อย้อนกลับแล้ว ต่อไปดูวิธีสลับแอป" - "คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว ต่อไปดูวิธีสลับแอป" - "คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว" + "คุณทำท่าทางสัมผัสเพื่อย้อนกลับสำเร็จแล้ว ต่อไปดูวิธีสลับแอป" + "คุณทำท่าทางสัมผัสเพื่อย้อนกลับสำเร็จแล้ว" "ไม่ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป" "เปลี่ยนความไวของท่าทางสัมผัสเพื่อย้อนกลับได้ที่การตั้งค่า" "ปัดเพื่อย้อนกลับ" "หากต้องการย้อนกลับไปที่หน้าจอล่าสุด ให้ปัดจากขอบด้านซ้ายหรือขวาไปตรงกลางหน้าจอ" - "หากต้องการย้อนกลับไปที่หน้าจอล่าสุด ให้ใช้ 2 นิ้วปัดจากขอบด้านซ้ายหรือขวาไปตรงกลางหน้าจอ" "ย้อนกลับ" "ปัดจากขอบด้านซ้ายหรือขวาไปตรงกลางหน้าจอ" "ปัดขึ้นจากขอบด้านล่างของหน้าจอ" "ไม่ต้องหยุดชั่วคราวก่อนยกนิ้วขึ้น" "ปัดขึ้นในแนวตรง" - "คุณทำท่าทางสัมผัสเพื่อไปที่หน้าแรกเสร็จแล้ว ต่อไปดูวิธีย้อนกลับ" - "คุณทำท่าทางสัมผัสเพื่อไปที่หน้าแรกเสร็จแล้ว" + "คุณทำท่าทางสัมผัสเพื่อไปที่หน้าจอหลักสำเร็จแล้ว ต่อไปดูวิธีย้อนกลับ" + "คุณทำท่าทางสัมผัสเพื่อไปที่หน้าจอหลักสำเร็จแล้ว" "ปัดเพื่อไปที่หน้าแรก" "ปัดขึ้นจากด้านล่างของหน้าจอ ท่าทางสัมผัสนี้จะนำคุณไปที่หน้าจอหลักเสมอ" - "ใช้ 2 นิ้วปัดขึ้นจากด้านล่างของหน้าจอ ท่าทางสัมผัสนี้จะนำคุณไปที่หน้าจอหลักเสมอ" "ไปที่หน้าจอหลัก" "ปัดขึ้นจากด้านล่างของหน้าจอ" "เก่งมาก" "ปัดขึ้นจากขอบด้านล่างของหน้าจอ" "ลองแตะหน้าต่างค้างไว้นานขึ้นก่อนปล่อยนิ้ว" - "ตรวจสอบว่าปัดขึ้นในแนวตรง แล้วหยุดชั่วคราว" + "ปัดขึ้นในแนวตรง แล้วหยุดชั่วคราว" "คุณรู้วิธีใช้ท่าทางสัมผัสแล้ว หากต้องการปิดท่าทางสัมผัส ให้ไปที่การตั้งค่า" - "คุณทำท่าทางสัมผัสเพื่อสลับแอปเสร็จแล้ว" + "คุณทำท่าทางสัมผัสเพื่อเปลี่ยนแอปสำเร็จแล้ว" "ปัดเพื่อสลับแอป" "หากต้องการสลับระหว่างแอปต่างๆ ให้ปัดขึ้นจากด้านล่างของหน้าจอ ค้างไว้ แล้วปล่อย" - "หากต้องการสลับระหว่างแอป ให้ใช้ 2 นิ้วปัดขึ้นจากด้านล่างของหน้าจอค้างไว้แล้วปล่อย" "เปลี่ยนแอป" "ปัดขึ้นจากด้านล่างของหน้าจอ ค้างไว้ แล้วปล่อย" "เยี่ยมมาก" @@ -91,24 +91,36 @@ "ปัดขึ้นเพื่อไปที่หน้าแรก" "แตะปุ่มหน้าแรกเพื่อไปที่หน้าจอหลัก" "คุณเริ่มใช้%1$sได้แล้ว" - "อุปกรณ์" + "คุณเริ่มใช้อุปกรณ์ได้แล้ว" "การตั้งค่าการไปยังส่วนต่างๆ ของระบบ" + "%1$s ของคุณ\nพร้อมแล้ว" + "อุปกรณ์ของคุณ\nพร้อมแล้ว" + "คุณพร้อมที่จะใช้งานแล้ว" + "สนุกกับ %1$s ใหม่ของคุณ" + "ปัดขึ้นเพื่อเริ่มต้นใช้งาน %1$s" + "แตะเพื่อเริ่มต้นใช้งาน %1$s" + "เลือกวิธีไปยังส่วนต่างๆ" + "ปัดขึ้น" + "แตะปุ่มหน้าแรก" + "แท็บเล็ต" + "โทรศัพท์" "แชร์" "ภาพหน้าจอ" "แยก" "บันทึกคู่แอป" "แตะแอปอื่นเพื่อใช้การแยกหน้าจอ" "เลือกแอปอื่นเพื่อใช้การแยกหน้าจอ" - "ยกเลิก" + "ยกเลิก" "ออกจากการเลือกโหมดแยกหน้าจอ" "เลือกแอปอื่นเพื่อใช้การแยกหน้าจอ" "แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้" "ยังไม่รองรับวิดเจ็ตในขณะนี้ โปรดเลือกแอปอื่น" - "ข้ามบทแนะนำการนำทางไหม" - "คุณดูบทแนะนำนี้ได้ภายหลังในแอป \"%1$s\"" - "ยกเลิก" - "ข้าม" "หมุนหน้าจอ" + "ภาพเคลื่อนไหวแสดงวิธีทำให้แถบงานปรากฏจากด้านล่างของหน้าจอและซ่อนโดยอัตโนมัติเมื่อไม่ได้ใช้งาน" + "ภาพเคลื่อนไหวแสดงวิธีปักหมุดแถบงานโดยใช้ปุ่มเปิด/ปิด เพื่อให้แถบงานยังคงปรากฏอยู่ด้านล่างของหน้าจอตลอดเวลา" + "ภาพเคลื่อนไหวแสดงวิธีสร้างโหมดแยกหน้าจอด้วยการลากและวางแอปจากแถบงานไว้เหนือแอปที่เปิดอยู่" + "ภาพเคลื่อนไหวแสดงวิธีเข้าถึงแอปที่แนะนำในอุปกรณ์" + "ภาพเคลื่อนไหวแสดงวิธีค้นหารายการบนหน้าจอโดยการแตะปุ่มดำเนินการค้างไว้และเลือกพื้นที่ที่รายการนั้นอยู่" "แถบงาน Education" "ลากแอปไปด้านข้างเพื่อใช้ 2 แอปพร้อมกัน" "ปัดขึ้นช้าๆ เพื่อแสดงแถบงาน" @@ -129,19 +141,38 @@ "การแจ้งเตือน" "การตั้งค่าด่วน" "แถบงาน" - "แถบงานแสดงอยู่" - "แถบงานซ่อนอยู่" "แถบนำทาง" "แสดงแถบงานเสมอ" "เปลี่ยนโหมดการนําทาง" "ตัวแบ่งแถบงาน" + "แอปล่าสุดอื่นๆ" + "เพิ่มแอปไปยังแถบงานแล้ว" + "นำแอปออกจากแถบงานแล้ว" "ย้ายไปที่ด้านบนหรือด้านซ้าย" "ย้ายไปที่ด้านล่างหรือด้านขวา" - "{count,plural, =1{แสดงเพิ่มเติมอีก # แอป}other{แสดงเพิ่มเติมอีก # แอป}}" - "{count,plural, =1{แสดงแอปบนเดสก์ท็อป # รายการ}other{แสดงแอปบนเดสก์ท็อป # รายการ}}" + "เปิดแอปเป็นบับเบิล" + "แอปล่าสุด" + "รายการแอปล่าสุด" + "{count,plural, =1{แอปเพิ่มเติม}other{แอปเพิ่มเติม}}" + "เดสก์ท็อป" "%1$s และ %2$s" + "%1$s, รายการที่ %2$d จาก %3$d" + "เลื่อนไปทางซ้าย" + "เลื่อนไปทางขวา" "บับเบิล" "การดำเนินการเพิ่มเติม" "%1$s จาก %2$s" "%1$s และอีก %2$d รายการ" + "ย้ายไปทางซ้าย" + "ย้ายไปทางขวา" + "ปิดทั้งหมด" + "ขยาย %1$s" + "ยุบ %1$s" + "วงเพื่อค้นหา" + "ไอคอนแอป" + "ชื่อแอป" + "ปุ่มปิด" + "กระตุ้นเตือน" + "ปิด" + "กระตุ้นเตือนเกี่ยวกับรูปภาพ" diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml index 978a5a37f87..b4c0b0ece81 100644 --- a/quickstep/res/values-tl/strings.xml +++ b/quickstep/res/values-tl/strings.xml @@ -22,11 +22,14 @@ "I-pin" "Freeform" "Desktop" + "Ilipat sa external na display" + "I-clear" + "Desktop" "Walang kamakailang item" "Mga setting ng paggamit ng app" "I-clear lahat" + "Magdagdag ng bagong desk" "Mga kamakailang app" - "Isinara ang Gawain" "%1$s, %2$s" "< 1 min" "%1$s na lang ngayon" @@ -44,7 +47,7 @@ "Idinagdag sa bakanteng espasyo ang mga iminumungkahing app" "Naka-enable ang mga iminumungkahing app" "Naka-disable ang mga iminumungkahing app" - "Hinulaang app: %1$s" + "Tutorial sa Navigation gamit ang Galaw" "I-rotate ang iyong device" "Paki-rotate ang iyong device para tapusin ang tutorial sa navigation gamit ang galaw" "Tiyaking magsa-swipe ka mula sa dulong kanan o dulong kaliwang gilid" @@ -56,7 +59,6 @@ "Pumunta sa Settings para baguhin ang sensitivity ng pagbalik" "Mag-swipe para bumalik" "Para bumalik sa nakaraang screen, mag-swipe mula sa kaliwa o kanang gilid patungo sa gitna ng screen." - "Para bumalik sa huling screen, mag-swipe gamit ang 2 daliri mula sa kaliwa o kanang gilid hanggang sa gitna ng screen." "Bumalik" "Mag-swipe mula sa kaliwa o kanang gilid papunta sa gitna ng screen" "Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen" @@ -66,7 +68,6 @@ "Nakumpleto mo na ang galaw para pumunta sa home" "Mag-swipe para pumunta sa home" "Mag-swipe pataas mula sa ibaba ng iyong screen. Dadalhin ka palagi ng galaw na ito sa Home screen." - "Mag-swipe pataas gamit ang 2 daliri mula sa ibaba ng screen. Dadalhin ka palagi nito sa Home screen." "Pumunta sa home" "Mag-swipe pataas mula sa ibabang bahagi ng iyong screen" "Magaling!" @@ -77,7 +78,6 @@ "Nakumpleto mo na ang galaw para magpalipat-lipat sa mga app" "Mag-swipe para lumipat ng app" "Para lumipat ng app, mag-swipe pataas mula sa ibaba ng iyong screen, mag-hold, at iangat ang daliri." - "Para lumipat ng app, mag-swipe pataas gamit ang 2 daliri mula sa ibaba, mag-hold, at bumitaw." "Lumipat ng app" "Mag-swipe pataas mula sa ibaba ng iyong screen, i-hold ito saka bitawan" "Magaling!" @@ -91,24 +91,36 @@ "Mag-swipe pataas para pumunta sa home" "I-tap ang button ng home para pumunta sa iyong home screen" "Handa mo nang simulan ang paggamit sa iyong %1$s" - "device" + "Handa ka nang simulang gamitin ang iyong device" "Mga setting ng navigation ng system" + "Handa na \nang iyong %1$s!" + "Handa na \nang iyong device!" + "Handa ka nang magsimula!" + "I-enjoy ang iyong bagong %1$s!" + "Mag-swipe pataas para makapagsimula sa iyong %1$s" + "Mag-tap para magsimula sa iyong %1$s" + "Piliin kung paano mag-navigate" + "Mag-swipe pataas" + "I-tap ang button ng home" + "tablet" + "telepono" "Ibahagi" "Screenshot" "Split" "I-save ang app pair" "Mag-tap ng ibang app para gamitin ang split screen" "Pumili ng ibang app para gamitin ang split screen" - "Kanselahin" + "Kanselahin" "Lumabas sa pagpili ng split screen" "Pumili ng ibang app para gamitin ang split screen" "Hindi pinapayagan ng app o ng iyong organisasyon ang pagkilos na ito" "Kasalukuyang hindi sinusuportahan ang mga widget, pumili ng ibang app" - "Laktawan ang tutorial sa pag-navigate?" - "Makikita mo ito sa %1$s app sa ibang pagkakataon" - "Kanselahin" - "Laktawan" "I-rotate ang screen" + "Animation na nagpapakita kung paano nakikita ang taskbar mula sa ibaba ng screen, at awtomatikong nakatago kapag hindi ginagamit" + "Animation na nagpapakita kung paano i-pin ang iyong taskbar gamit ang isang toggle, para mananatiling permanenteng nakikita sa ibaba ng screen ang taskbar" + "Animation na nagpapakita kung paano gumawa ng split screen, sa pamamagitan ng pag-drag at pag-drop ng app mula sa taskbar sa itaas ng nakabukas na app" + "Animation na nagpapakita kung paano i-access ang mga iminumungkahing app sa iyong device" + "Animation na nagpapakita kung paano maghanap ng isang item sa screen, sa pamamagitan ng pagpindot nang matagal sa action key at pagpili sa lugar kung saan naroroon ang item." "Impormasyon sa taskbar" "Mag-drag ng app sa gilid para makagamit ng 2 app nang sabay" "Mag-swipe nang mabagal pataas para ipakita ang Taskbar" @@ -129,19 +141,38 @@ "Mga Notification" "Quick Settings" "Taskbar" - "Ipinapakita ang taskbar" - "Nakatago ang taskbar" "Navigation bar" "Ipakita lagi ang Taskbar" "Magpalit ng navigation mode" "Divider ng Taskbar" + "Iba pang kamakailang app" + "Idinagdag ang app sa Taskbar" + "Inalis ang app mula sa Taskbar" "Ilipat sa itaas/kaliwa" "Ilipat sa ibaba/kanan" - "{count,plural, =1{Magpakita ng # pang app.}one{Magpakita ng # pang app.}other{Magpakita ng # pang app.}}" - "{count,plural, =1{Ipakita ang # desktop app.}one{Ipakita ang # desktop app.}other{Ipakita ang # na desktop app.}}" + "Buksan ang app bilang bubble" + "Mga kamakailang app" + "Kamakailang listahan ng app" + "{count,plural, =1{pang app}one{pang app}other{pang app}}" + "Desktop" "%1$s at %2$s" + "%1$s, item %2$d ng %3$d" + "Mag-scroll pakaliwa" + "Mag-scroll pakanan" "Bubble" "Overflow" "%1$s mula sa %2$s" "%1$s at %2$d pa" + "Ilipat pakaliwa" + "Ilipat pakanan" + "I-dismiss lahat" + "i-expand ang %1$s" + "i-collapse ang %1$s" + "Circle to Search" + "Icon ng app" + "Pamagat ng app" + "Button na isara" + "Pag-nudge" + "Isara" + "I-nudge ang larawan" diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml index 0cc5d7f8561..59e05084ce4 100644 --- a/quickstep/res/values-tr/strings.xml +++ b/quickstep/res/values-tr/strings.xml @@ -22,11 +22,14 @@ "Sabitle" "Serbest çalışma" "Masaüstü" + "Harici ekrana taşı" + "Temizle" + "Masaüstü" "Yeni öğe yok" "Uygulama kullanım ayarları" "Tümünü temizle" + "Yeni masa ekle" "Son uygulamalar" - "Görev Kapatıldı" "%1$s, %2$s" "< 1 dk." "Bugün %1$s kaldı" @@ -44,7 +47,7 @@ "Önerilen uygulamalar boş alana eklendi" "Uygulama önerileri etkinleştirildi" "Uygulama önerileri devre dışı bırakıldı" - "Tahmin edilen uygulama: %1$s" + "Hareketle Gezinme Eğitimi" "Cihazınızı döndürün" "Hareketle gezinme eğitimini tamamlamak için lütfen cihazınızı döndürün" "En sağ veya en sol kenardan kaydırdığınızdan emin olun" @@ -56,7 +59,6 @@ "Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin" "Geri dönmek için kaydırma" "Son ekrana geri gitmek için sol veya sağ kenardan ekranın ortasına doğru kaydırın." - "Son ekrana geri gitmek için sol veya sağ kenardan ekranın ortasına doğru 2 parmağınızla kaydırın." "Geri dönme" "Sol veya sağ kenardan ekranın ortasına doğru kaydırın" "Ekranın alt kenarından yukarı kaydırdığınızdan emin olun" @@ -66,7 +68,6 @@ "Ana ekrana git hareketini tamamladınız" "Ana ekrana gitmek için kaydırma" "Ekranın alt kısmından yukarıya doğru kaydırın. Bu hareket sizi her zaman Ana ekrana götürür." - "Ekranın alt kısmından 2 parmağınızla yukarı kaydırın. Bu hareket sizi her zaman Ana ekrana götürür." "Ana sayfaya gitme" "Parmağınızı ekranın alt kısmından yukarıya doğru kaydırın" "Tebrikler!" @@ -77,7 +78,6 @@ "Uygulamalar arasında geçiş yapma hareketini tamamladınız" "Uygulamalar arasında geçiş yapmak için kaydırma" "Uygulamalar arasında geçiş yapmak için ekranınızın altından yukarı kaydırıp basılı tutun ve sonra bırakın." - "Uygulamalara geçiş yapmak için ekranın altından 2 parmakla yukarı kaydırıp basılı tutun ve bırakın." "Uygulamalar arasında geçiş yapma" "Ekranınızın alt tarafından yukarı doğru kaydırın, tutun ve sonra bırakın" "Tebrikler!" @@ -87,28 +87,40 @@ "Tekrar deneyin" "Güzel!" "Eğitim %1$d/%2$d" - "İşlem tamam!" + "Kurulum tamamlandı" "Ana ekrana gitmek için yukarı kaydırın" "Ana ekranınıza gitmek için ana sayfa düğmesine dokunun" - "%1$s cihazınızı kullanmaya hazırsınız" - "cihaz" + "Artık %1$s kullanılmak için hazır" + "Cihazınız kullanıma hazır" "Sistem gezinme ayarları" + "%1$s cihazınız \nhazır." + "Cihazınız \nhazır." + "Artık hazırsınız." + "Yeni %1$s cihazınızın tadını çıkarın." + "Yukarı kaydırarak %1$s cihazınızı kullanmaya başlayın" + "%1$s cihazınızı kullanmaya başlamak için dokunun" + "Nasıl gezineceğinizi seçin" + "Yukarı kaydırın" + "Ana sayfa düğmesine dokunun" + "tablet" + "telefon" "Paylaş" "Ekran görüntüsü" "Böl" "Uygulama çiftini kaydet" "Bölünmüş ekran için başka bir uygulamaya dokunun" "Bölünmüş ekran kullanmak için başka bir uygulama seçin" - "İptal" + "İptal" "Bölünmüş ekran seçiminden çıkın" "Bölünmüş ekran kullanmak için başka bir uygulama seçin" "Uygulamanız veya kuruluşunuz bu işleme izin vermiyor" "Widget\'lar şu anda desteklenmiyor. Lütfen başka bir uygulama seçin" - "Gezinme eğitimi atlansın mı?" - "Bunu daha sonra %1$s uygulamasında bulabilirsiniz" - "İptal" - "Atla" "Ekranı döndür" + "Görev çubuğunun ekranın altından nasıl göründüğünü ve kullanılmadığında otomatik olarak nasıl gizlendiğini gösteren animasyon" + "Görev çubuğunun, ekranın alt kısmında sürekli görünür olması için açma/kapatma düğmesini kullanarak görev çubuğunuzu nasıl sabitleyeceğinizi gösteren animasyon" + "Görev çubuğundaki bir uygulamayı, açık bir uygulamanın üzerine sürükleyip bırakarak nasıl bölünmüş ekran oluşturacağınızı gösteren animasyon" + "Cihazınızda önerilen uygulamalara nasıl erişeceğinizi gösteren animasyon" + "Eylem tuşuna dokunup basılı tutarak ve öğenin bulunduğu alanı seçerek ekranda nasıl öğe aranacağını gösteren animasyon" "Görev çubuğu eğitimi" "Aynı anda iki uygulama kullanmak için birini yana sürükleyin" "Görev çubuğunun görünmesi için yukarı doğru yavaşça kaydırın" @@ -129,19 +141,38 @@ "Bildirimler" "Hızlı Ayarlar" "Görev çubuğu." - "Görev çubuğu gösteriliyor" - "Görev çubuğu gizlendi" "Gezinme çubuğu" "Görev çubuğunu daima göster" "Gezinme modunu değiştir" "Görev Çubuğu Ayırıcısı" + "Diğer son uygulamalar" + "Uygulama, görev çubuğuna eklendi" + "Uygulama, görev çubuğundan kaldırıldı" "Sol üste taşı" "Sağ alta taşı" - "{count,plural, =1{# uygulama daha göster.}other{# uygulama daha göster}}" - "{count,plural, =1{# masaüstü uygulamasını göster.}other{# masaüstü uygulamasını göster.}}" + "Uygulamayı balon olarak aç" + "Son uygulamalar" + "Son uygulama listesi" + "{count,plural, =1{uygulama daha}other{uygulama daha}}" + "Masaüstü" "%1$s ve %2$s" + "%1$s, %2$d/%3$d öğe" + "Sola kaydır" + "Sağa kaydır" "Balon" "Taşma" "%2$s uygulamasından %1$s" "%1$s ve %2$d tane daha" + "Sola taşı" + "Sağa taşı" + "Tümünü kapat" + "genişlet: %1$s" + "daralt: %1$s" + "Seçerek Arat" + "Uygulama simgesi" + "Uygulama başlığı" + "Kapat düğmesi" + "Otomatik hatırlatma" + "Kapat" + "Resmi otomatik hatırlat" diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml index 9c706a84033..43c1d9f976d 100644 --- a/quickstep/res/values-uk/strings.xml +++ b/quickstep/res/values-uk/strings.xml @@ -21,12 +21,15 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Закріпити" "Довільна форма" - "Комп’ютер" + "Робочий стіл" + "Перемістити на зовнішній екран" + "Очистити" + "Комп’ютер" "Немає нещодавніх додатків" "Налаштування використання додатка" "Очистити все" + "Додати новий робочий стіл" "Нещодавні додатки" - "Завдання закрито" "%1$s, %2$s" "< 1 хв" "Сьогодні залишилося %1$s" @@ -44,7 +47,7 @@ "Рекомендовані додатки додано у вільну область" "Рекомендовані додатки ввімкнено" "Рекомендовані додатки вимкнено" - "Передбачений додаток: %1$s" + "Посібник із навігації за допомогою жестів" "Оберніть пристрій" "Обертайте пристрій, щоб ознайомитися з посібником із навігації за допомогою жестів" "Проведіть пальцем від самого краю екрана (правого або лівого)" @@ -56,7 +59,6 @@ "Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування" "Щоб повернутися, проведіть пальцем по екрану" "Щоб перейти на попередній екран, проведіть пальцем від лівого чи правого краю до середини екрана." - "Щоб перейти на попередній екран, проведіть двома пальцями від лівого чи правого краю до середини екрана." "Повернення на попередній екран" "Проведіть пальцем від лівого чи правого краю до середини екрана" "Проведіть пальцем угору від нижнього краю екрана" @@ -66,7 +68,6 @@ "Ви виконали жест переходу на головний екран" "Проведіть пальцем, щоб перейти на головний екран" "Проведіть пальцем по екрану знизу вгору. Цей жест завжди повертатиме вас на головний екран." - "Проведіть двома пальцями вгору від низу екрана. Цей жест завжди спрямовує вас на головний екран." "Перехід на головний екран" "Проведіть пальцем угору від низу екрана" "Чудово!" @@ -77,9 +78,8 @@ "Ви виконали жест переходу в інший додаток" "Проведіть пальцем, щоб перейти в інший додаток" "Щоб переключатися між додатками, проведіть знизу вгору по екрану, утримуйте палець, а потім відпустіть." - "Щоб перейти в інший додаток, проведіть 2 пальцями від низу екрана, потримайте й відпустіть палець." "Перемикання між додатками" - "Проведіть пальцем знизу вгору, утримуйте палець на екрані, а потім відпустіть" + "Проведіть пальцем угору від нижнього краю екрана, утримуйте, а потім відпустіть" "Чудово!" "Усе готово!" "Готово" @@ -91,24 +91,36 @@ "Щоб перейти на головний екран, проведіть пальцем угору" "Натисніть кнопку головного екрана, щоб відкрити його" "Тепер ви можете використовувати %1$s" - "пристрій" - "Системні налаштування навігації" + "Тепер ви можете користуватися пристроєм" + "Налаштування навігації в системі" + "Ваш %1$s \nготовий до використання!" + "Ваш пристрій \nготовий до використання!" + "Усе готово!" + "Насолоджуйтеся своїм новим %1$sом!" + "Проведіть пальцем угору, щоб почати роботу з пристроєм \"%1$s\"" + "Натисніть, щоб почати користуватися пристроєм (%1$s)" + "Виберіть спосіб навігації" + "Проведіть пальцем угору" + "Натисніть кнопку головного екрана" + "планшет" + "телефон" "Поділитися" "Знімок екрана" "Розділити" "Зберегти пару" "Щоб розділити екран, виберіть ще один додаток." "Щоб розділити екран, виберіть ще один додаток." - "Скасувати" + "Скасувати" "Вийти з режиму розділення екрана" "Щоб розділити екран, виберіть ще один додаток." "Ця дія заборонена додатком або адміністратором організації" "Віджети наразі не підтримуються. Виберіть інший додаток." - "Пропустити посібник із навігації?" - "Ви знайдете його пізніше в додатку %1$s" - "Скасувати" - "Пропустити" "Обернути екран" + "Анімація, що показує, як панель завдань з’являється внизу екрана й автоматично приховується, якщо ви її не використовуєте" + "Анімація, що показує, як за допомогою перемикача закріпити панель завдань, щоб вона завжди відображалася внизу екрана" + "Анімація, що показує, як розділити екран, перетягнувши додаток із панелі завдань на відкритий додаток" + "Анімація, що показує, як отримати доступ до рекомендованих додатків на пристрої" + "Анімація, що показує, як шукати об’єкт на екрані, натиснувши й утримуючи клавішу дії, а потім вибравши область, де він розташований" "Панель завдань Education" "Перетягніть убік, щоб використовувати 2 додатки одночасно" "Щоб відкрити панель завдань, повільно проведіть угору" @@ -129,19 +141,38 @@ "Сповіщення" "Швидкі налаштув." "Панель завдань" - "Панель завдань показано" - "Панель завдань приховано" "Панель навігації" "Завжди показув. панель завдань" "Змінити режим навігації" "Розділювач панелі завдань" + "Інші нещодавні додатки" + "Додаток закріплено на панелі завдань" + "Додаток вилучено з панелі завдань" "Перемістити вгору або вліво" "Перемістити вниз або вправо" - "{count,plural, =1{Показати ще # додаток.}one{Показати ще # додаток.}few{Показати ще # додатки.}many{Показати ще # додатків.}other{Показати ще # додатка.}}" - "{count,plural, =1{Показати # комп’ютерну програму.}one{Показати # комп’ютерну програму.}few{Показати # комп’ютерні програми.}many{Показати # комп’ютерних програм.}other{Показати # комп’ютерної програми.}}" + "Відкрити додаток у спливаючому вікні" + "Нещодавні додатки" + "Список нещодавніх додатків" + "{count,plural, =1{інший додаток}one{інший додаток}few{інші додатки}many{інших додатків}other{іншого додатка}}" + "Комп’ютер" "%1$s та %2$s" + "%1$s, об’єкт %2$d з %3$d" + "Прокрутити вліво" + "Прокрутити вправо" "Повідомлення" "Додаткове повідомлення" "%1$s з додатка %2$s" "%1$s і ще %2$d" + "Перемістити вліво" + "Перемістити вправо" + "Закрити все" + "розгорнути \"%1$s\"" + "згорнути \"%1$s\"" + "Обвести й знайти" + "Значок додатка" + "Назва додатка" + "Кнопка \"Закрити\"" + "Змістити" + "Закрити" + "Змістити зображення" diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml index e12524868f5..4250675079f 100644 --- a/quickstep/res/values-ur/strings.xml +++ b/quickstep/res/values-ur/strings.xml @@ -22,11 +22,14 @@ "پن کریں" "فری فارم" "ڈیسک ٹاپ" + "بیرونی ڈسپلے پر متقل کریں" + "صاف کریں" + "ڈیسک ٹاپ" "کوئی حالیہ آئٹم نہیں" "ایپ کے استعمال کی ترتیبات" "سبھی کو صاف کریں" + "نیا ڈیسک شامل کریں" "حالیہ ایپس" - "ٹاسک بند ہے" "%1$s،%2$s" "‏< 1 منٹ" "آج %1$s بچا ہے" @@ -44,7 +47,7 @@ "ایپس کی تجاویز کو خالی اسپیس میں شامل کر دیا گیا" "ایپ کی تجاویز فعال ہیں" "ایپ کی تجاویز غیر فعال ہیں" - "پیشن گوئی کردہ ایپ: %1$s" + "اشاروں والی نیویگیشن ٹیوٹوریل" "اپنا آلہ گھمائیں" "براہ کرم اشاروں والی نیویگیشن کا ٹیوٹوریل مکمل کرنے کے لیے اپنا آلہ گھمائیں" "یقینی بنائیں کہ آپ دائیں یا بائیں کنارے سے دور سے سوائپ کریں" @@ -56,7 +59,6 @@ "پچھلے اشارے کی حساسیت تبدیل کرنے کے لیے ترتیبات پر جائیں" "واپس جانے کے لیے سوائپ کریں" "پچھلی اسکرین پر واپس جانے کے لیے بائیں یا دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔" - "آخری اسکرین پر واپس جانے کے لیے، 2 انگلیوں سے بائیں یا دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔" "واپس جائیں" "دائیں یا بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں" "اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں" @@ -66,7 +68,6 @@ "آپ نے ہوم پر جانے کا اشارہ مکمل کر لیا" "ہوم پر جانے کے لیے سوائپ کریں" "اپنی اسکرین کے نیچے سے اوپر کی طرف سوائپ کریں۔ یہ اشارہ آپ کو ہمیشہ ہوم اسکرین پر لے جاتا ہے۔" - "اسکرین کے نیچے سے 2 انگلیوں سے اوپر سوائپ کریں۔ یہ اشارہ آپ کو ہمیشہ ہوم اسکرین پر لے جاتا ہے۔" "ہوم پر جائیں" "اپنی اسکرین کے نچلے حصے سے اوپر کی طرف سوائپ کریں" "بہترین!" @@ -77,7 +78,6 @@ "آپ نے ایپس کو سوئچ کرنے کا اشارہ مکمل کر لیا" "ایپس سوئچ کرنے کے لیے سوائپ کریں" "ایپس کے مابین سوئچ کرنے کے لیے، اپنی اسکرین کے نچلے حصے سے اوپر کی جانب سوائپ کریں، پکڑے رکھیں، پھر چھوڑ دیں۔" - "ایپس کے مابین سوئچ کرنے کیلئے، اپنی اسکرین کے نیچے سے 2 انگلیوں سے اوپر سوائپ کریں، دبائے رکھیں پھر چھوڑ دیں۔" "ایپس سوئچ کریں" "اپنی اسکرین کے نچلے حصے سے اوپر کی جانب سوائپ کریں، دبائے رکھیں، پھر چھوڑ دیں" "بہت خوب!" @@ -91,24 +91,36 @@ "ہوم پر جانے کے لیے اوپر سوائپ کریں" "اپنی ہوم اسکرین پر جانے کے لیے ہوم بٹن پر تھپتھپائیں" "آپ اپنے %1$s کا استعمال شروع کرنے کے لیے تیار ہیں" - "آلہ" + "آپ اپنے آلے کا استعمال شروع کرنے کے لیے تیار ہیں" "سسٹم نیویگیشن کی ترتیبات" + "آپ کا %1$s \nتیار ہے!" + "آپ کا آلہ \nتیار ہے!" + "آپ رول کرنے کے لئے تیار ہیں!" + "اپنے نئے %1$s کا لطف اٹھائیں!" + "اپنے %1$s کے ساتھ شروع کرنے کے لیے سوائپ کریں" + "اپنے %1$s کے ساتھ شروع کرنے کے لیے تھپتھپائیں" + "‫""نیویگیٹ کرنے کا طریقہ منتخب کریں" + "اوپر کی طرف سوائپ کریں" + "ہوم بٹن پر تھپتھپائیں" + "ٹیبلیٹ" + "فون" "اشتراک کریں" "اسکرین شاٹ" "اسپلٹ" "ایپس کے جوڑے کو محفوظ کریں" "اسپلٹ اسکرین کا استعمال کرنے کیلئے دوسری ایپ پر تھپتھپائیں" "اسپلٹ اسکرین کے استعمال کیلئے دوسری ایپ منتخب کریں" - "منسوخ کریں" + "منسوخ کریں" "اسپلٹ اسکرین کے انتخاب سے باہر نکلیں" "اسپلٹ اسکرین کے استعمال کیلئے دوسری ایپ منتخب کریں" "ایپ یا آپ کی تنظیم کی جانب سے اس کارروائی کی اجازت نہیں ہے" "وجیٹس فی الحال تعاون یافتہ نہیں ہیں، براہ کرم کوئی اور ایپ منتخب کریں" - "نیویگیشن کا ٹیوٹوریل نظر انداز کریں؟" - "آپ اسے بعد میں %1$s ایپ میں تلاش کر سکتے ہیں" - "منسوخ کریں" - "نظر انداز کریں" "اسکرین کو گھمائیں" + "اینیمیشن دکھاتی ہے کہ کس طرح ٹاسک بار اسکرین کے نیچے سے نظر آتا ہے اور استعمال میں نہ ہونے پر خود بخود چھپ جاتا ہے" + "اینیمیشن یہ دکھاتی ہے کہ ٹوگل کا استعمال کرتے ہوئے آپ کے ٹاسک بار کو کیسے پن کرنا ہے، تاکہ ٹاسک بار اسکرین کے نیچے مستقل طور پر نظر آئے" + "ایک کھلی ایپ کے اوپر ٹاسک بار سے کسی ایپ کو کھینچ کر ڈال کر، ایک اسپلٹ اسکرین بنانے کا طریقہ دکھانے والی اینیمیشن" + "اینیمیشن دکھاتی ہے کہ آپ کے آلے پر تجویز کردہ ایپس تک کیسے رسائی حاصل کی جائے" + "اینیمیشن دکھاتی ہے کہ ایکشن کلید کو ٹچ کر کے اور دبائے رکھ کر اور آئٹم جس ایریا میں ہے اسے منتخب کر کے اسکرین پر کسی آئٹم کو کس طرح تلاش کرنا ہے" "ٹاسک بار کی تعلیم" "ایک وقت میں 2 ایپس استعمال کرنے کیلئے ایپ سائیڈ پر گھسیٹیں" "ٹاسک بار دکھانے کے لیے آہستہ سے اوپر سوائپ کریں" @@ -129,19 +141,38 @@ "اطلاعات" "فوری ترتیبات" "ٹاسک بار" - "ٹاشک بار دکھایا گیا" - "ٹاسک بار چھپایا گیا" "نیویگیشن بار" "ہمیشہ ٹاسک بار دکھائیں" "نیویگیشن موڈ تبدیل کریں" "ٹاسک بار ڈیوائیڈر" + "دیگر حالیہ ایپس" + "ایپ کو ٹاسک بار میں شامل کیا گیا" + "ایپ کو ٹاسک بار سے نکالا گیا" "اوپر/بائیں طرف منتقل کریں" "نیچے/دائیں طرف منتقل کریں" - "{count,plural, =1{# مزید ایپ دکھائیں۔}other{# مزید ایپس دکھائیں۔}}" - "{count,plural, =1{# ڈیسک ٹاپ ایپ دکھائیں۔}other{# ڈیسک ٹاپ ایپس دکھائیں۔}}" + "ایپ کو بطور ببل کھولیں" + "حالیہ ایپس" + "حالیہ ایپ کی فہرست" + "{count,plural, =1{مزید ایپ}other{مزید ایپس}}" + "ڈیسک ٹاپ" "%1$s اور %2$s" + "‫%1$s، آئٹم %2$d از %3$d" + "بائیں طرف اسکرول کریں" + "دائیں طرف اسکرول کریں" "ببل" "اوورفلو" "%2$s سے %1$s" "%1$s اور %2$d مزید" + "بائیں منتقل کریں" + "دائیں منتقل کریں" + "سبھی کو برخاست کریں" + "%1$s کو پھیلائیں" + "%1$s کو سکیڑیں" + "تلاش کرنے کیلئے دائرہ بنائیں" + "ایپ آئیکن" + "ایپ کا عنوان" + "\'بند کریں\' بٹن" + "کھسکائیں" + "بند کریں" + "تصویر کو کھسکائیں" diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml index 3f4f9810959..2d2bae3c878 100644 --- a/quickstep/res/values-uz/strings.xml +++ b/quickstep/res/values-uz/strings.xml @@ -22,11 +22,14 @@ "Qadash" "Erkin shakl" "Desktop" + "Tashqi displeyga olish" + "Tozalash" + "Desktop" "Yaqinda ishlatilgan ilovalar yo‘q" "Ilovadan foydalanish sozlamalari" "Hammasini tozalash" + "Yangi ish stoli qoʻshish" "Oxirgi ilovalar" - "Vazifalar yopildi" "%1$s, %2$s" "< 1 daqiqa" "Bugun %1$s qoldi" @@ -44,7 +47,7 @@ "Tavsiya etilgan ilovalarni ochiq joylarga kiriting" "Ilova tavsiyalari yoqildi" "Endi ilova takliflari chiqmaydi" - "Taklif etilgan ilova: %1$s" + "Ishorali navigatsiya darsligi" "Qurilmangizni buring" "Ishorali navigatsiya darsligini tugatish uchun qurilmani buring" "Ekran chetidan boshlab oʻngdan yoki chapdan suring" @@ -56,7 +59,6 @@ "Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi" "Orqaga qaytish" "Ortga qaytish uchun barmoqni ekranning yon chekkalaridan oʻrtasigacha suring." - "Oxirgi ekranga qaytish uchun 2 barmoq bilan ekranning chap yoki oʻng chekkasidan oʻrtasigacha suring." "Orqaga" "Chap yoki oʻng chetidan ekranning oʻrtasiga suring" "Barmoqni ekranning pastki chetidan yuqoriga suring." @@ -66,7 +68,6 @@ "Bosh ekranni ochish ishorasi darsini tamomladingiz" "Svayp bilan bosh ekranni ochish" "Ekranning pastidan tepaga qarab suring. Bu ishora doim Bosh ekranni ochadi." - "2 barmoq bilan ekranning quyidan tepasiga suring. Bu ishora har doim Bosh ekranni ochadi." "Boshiga" "Ekranning quyi qismidan tepaga torting" "Barakalla!" @@ -77,7 +78,6 @@ "Ilovalarni almashtirish darsini tamomladingiz" "Ilovalar orasida almashish" "Ilovalarni ochish uchun ekranning pastidan tepaga qarab suring, biroz ushlab turing va qoʻyib yuboring" - "Ilovalarni almashtirish uchun 2 barmoq bilan ekranning quyidan tepasiga surib turib, qoʻyib yuboring" "Ilovalarni almashtirish" "Ekranning pastidan tepaga qarab suring, biroz ushlab turing va qoʻyib yuboring" "Juda soz!" @@ -90,25 +90,37 @@ "Hammasi tayyor!" "Boshiga qaytish uchun tepaga suring" "Bosh ekranga oʻtish uchun bosh ekran tugmasini bosing" - "%1$s xizmatga tayyor" - "qurilma" + "Sizning %1$s xizmatga tayyor" + "Qurilmangiz xizmatga tayyor" "Tizim navigatsiya sozlamalari" + "%1$s qurilmangiz \ntayyor!" + "Qurilmangiz \ntayyor!" + "Qurilmadan foydalanishingiz mumkin!" + "Yangi %1$s qurilmangizdan bahra oling!" + "%1$s qurilmasi bilan ishni boshlash uchun tepaga suring" + "%1$s qurilmasi bilan ishni boshlash uchun tegining" + "Qanday navigatsiya qilishni tanlang" + "Tepaga suring" + "Asosiy tugmani bosing" + "planshet" + "telefon" "Ulashish" "Skrinshot" "Ajratish" "Ilova juftini saqlash" "Ekranni ikkiga ajratish uchun boshqa ilovani bosing" "Ekranni ikkiga ajratish uchun boshqa ilovani tanlang" - "Bekor qilish" + "Bekor qilish" "Ekranni ikkiga ajratish tanlovidan chiqish" "Ekranni ikkiga ajratish uchun boshqa ilovani tanlang" "Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan" "Vidjetlar ishlamaydi. Boshqa ilovani tanlang" - "Navigatsiya darsi yopilsinmi?" - "Bu darslar %1$s ilovasida chiqadi" - "Bekor qilish" - "Tashlab ketish" "Ekranni burish" + "Vazifalar paneli ekranning pastki qismidan qanday koʻrinishini va ishlatilmayotganda avtomatik berkitilishi aks etgan animatsiya" + "Vazifalar panelini almashinuv tugmasi yordamida qanday qadashni koʻrsatuvchi animatsiya, shu bois vazifalar paneli ekranning pastki qismida doimiy chiqib turadi" + "Ochiq ilova tepasidagi vazifalar panelidan ilovani tortib tashlash orqali qanday ajratilgan ekran yaratish mumkinligi aks etgan animatsiya" + "Qurilmangizda tavsiya etilgan ilovalarga qanday kirishni aks ettiruvchi animatsiya" + "Amal tugmasini bosib turish va obyekt turgan sohani tanlash orqali ekranda obyektni qanday qidirish aks etgan animatsiya" "Vazifalar paneli qoʻllanmasi" "Bitta ilovani yon tomonga sudrab, bir vaqtda 2 ta ilovadan foydalaning." "Vazifalar panelini ochish uchun tepaga asta suring" @@ -129,19 +141,38 @@ "Bildirishnomalar" "Tezkor sozlamalar" "Vazifalar paneli" - "Vazifalar paneli ochiq" - "Vazifalar paneli yopiq" "Navigatsiya paneli" "Vazifalar paneli doim chiqarilsin" "Navigatsiya rejimini oʻzgartirish" "Vazifalar panelini ajratkich" + "Boshqa oxirgi ilovalar" + "Ilova vazifalar paneliga mahkamlandi" + "Ilova vazifalar panelidan olib tashlandi" "Yuqoriga yoki chapga oʻtkazish" "Pastga yoki oʻngga oʻtkazish" - "{count,plural, =1{Yana # ta ilovani chiqarish}other{Yana # ta ilovani chiqarish}}" - "{count,plural, =1{# ta desktop ilovani chiqarish.}other{# ta desktop ilovani chiqarish.}}" + "Ilovani qalqib chiquvchi oynada ochish" + "Oxirgi ilovalar" + "Oxirgi ilovalar roʻyxati" + "{count,plural, =1{boshqa ilova}other{boshqa ilovalar}}" + "Kompyuter" "%1$s va %2$s" + "%1$s, %2$d-element, jami: %3$d ta" + "Chapga varaqlash" + "Oʻngga varaqlash" "Pufak" "Kengaytirish" "%1$s (%2$s)" "%1$s va yana %2$d kishi" + "Chapga siljitish" + "Oʻngga siljitish" + "Hammasini yopish" + "%1$sni yoyish" + "%1$sni yigʻish" + "Chizib qidirish" + "Ilova belgisi" + "Ilova nomi" + "Yopish tugmasi" + "Eslatma" + "Yopish" + "Eslatma rasmi" diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml index 9bc526faace..6841d7e496d 100644 --- a/quickstep/res/values-vi/strings.xml +++ b/quickstep/res/values-vi/strings.xml @@ -22,11 +22,14 @@ "Ghim" "Dạng tự do" "Máy tính" + "Chuyển sang màn hình ngoài" + "Xoá" + "Máy tính" "Không có mục gần đây nào" "Cài đặt mức sử dụng ứng dụng" "Xóa tất cả" + "Thêm không gian làm việc mới" "Ứng dụng gần đây" - "Đã đóng tác vụ" "%1$s, %2$s" "< 1 phút" "Hôm nay còn %1$s" @@ -44,21 +47,20 @@ "Thêm ứng dụng đề xuất vào không gian trống" "Đã bật tính năng Ứng dụng đề xuất" "Tính năng Ứng dụng đề xuất bị tắt" - "Ứng dụng dự đoán: %1$s" + "Hướng dẫn thực hiện điều hướng bằng cử chỉ" "Xoay thiết bị của bạn" - "Vui lòng xoay thiết bị của bạn để hoàn tất hướng dẫn thao tác bằng cử chỉ" + "Vui lòng xoay thiết bị của bạn để hoàn tất hướng dẫn điều hướng bằng cử chỉ" "Hãy vuốt từ mép ngoài cùng bên phải hoặc ngoài cùng bên trái" "Hãy vuốt từ mép phải hoặc mép trái tới giữa màn hình rồi nhấc ngón tay ra" "Bạn đã học được cách vuốt từ mép phải để quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng." "Bạn đã thực hiện xong cử chỉ quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng." - "Bạn đã thực hiện xong cử chỉ quay lại" + "Bạn đã hoàn tất cử chỉ quay lại" "Hãy nhớ không được vuốt quá gần phần dưới cùng của màn hình" "Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt" "Vuốt để quay lại" "Để quay lại màn hình gần đây nhất, hãy vuốt từ mép trái hoặc mép phải tới chính giữa màn hình." - "Để quay lại màn hình trước đó, hãy vuốt 2 ngón tay từ cạnh trái hoặc phải vào giữa màn hình." "Quay lại" - "Hãy vuốt từ mép trái hoặc mép phải tới giữa màn hình" + "Vuốt từ mép trái hoặc mép phải tới giữa màn hình" "Hãy vuốt lên từ mép dưới cùng của màn hình" "Hãy nhớ không được dừng trước khi nhấc ngón tay" "Hãy vuốt thẳng lên" @@ -66,7 +68,6 @@ "Bạn đã thực hiện xong cử chỉ chuyển đến Màn hình chính" "Vuốt để chuyển đến Màn hình chính" "Vuốt lên từ cuối màn hình. Cử chỉ này luôn đưa bạn đến Màn hình chính." - "Vuốt 2 ngón tay lên từ cuối màn hình. Cử chỉ này luôn đưa bạn về Màn hình chính." "Chuyển đến màn hình chính" "Vuốt lên từ mép dưới cùng của màn hình" "Tuyệt vời!" @@ -77,7 +78,6 @@ "Bạn đã thực hiện xong cử chỉ chuyển đổi ứng dụng" "Vuốt để chuyển đổi ứng dụng" "Để chuyển đổi ứng dụng, hãy vuốt lên từ cuối màn hình, giữ rồi thả ra." - "Để chuyển đổi giữa các ứng dụng, hãy vuốt 2 ngón tay lên từ cuối màn hình, giữ rồi thả ra." "Chuyển đổi ứng dụng" "Vuốt lên từ mép dưới cùng của màn hình, giữ rồi nhấc ngón tay ra" "Rất tốt!" @@ -91,30 +91,42 @@ "Vuốt lên để chuyển đến màn hình chính" "Nhấn vào nút màn hình chính để chuyển đến màn hình chính" "Bạn có thể bắt đầu sử dụng %1$s" - "thiết bị" - "Cài đặt cách thao tác trên hệ thống" + "Bạn có thể bắt đầu sử dụng thiết bị của mình" + "Cài đặt cách điều hướng trên hệ thống" + "%1$s của bạn đã \nsẵn sàng!" + "Thiết bị của bạn đã \nsẵn sàng!" + "Bạn đã sẵn sàng bắt đầu!" + "Hãy trải nghiệm %1$s mới của bạn!" + "Vuốt lên để bắt đầu sử dụng %1$s" + "Nhấn để bắt đầu sử dụng %1$s" + "Chọn cách thao tác" + "Vuốt lên" + "Nhấn vào nút màn hình chính" + "máy tính bảng" + "điện thoại" "Chia sẻ" "Chụp ảnh màn hình" "Chia đôi màn hình" "Lưu cặp ứng dụng" "Nhấn vào ứng dụng khác để chia đôi màn hình" "Chọn một ứng dụng khác để dùng chế độ chia đôi màn hình" - "Huỷ" + "Huỷ" "Thoát khỏi lựa chọn chia đôi màn hình" "Chọn một ứng dụng khác để dùng chế độ chia đôi màn hình" "Ứng dụng hoặc tổ chức của bạn không cho phép thực hiện hành động này" "Các tiện ích hiện không được hỗ trợ, vui lòng chọn một ứng dụng khác" - "Bỏ qua phần hướng dẫn thao tác?" - "Bạn có thể tìm lại phần hướng dẫn này trong ứng dụng %1$s" - "Hủy" - "Bỏ qua" "Xoay màn hình" + "Ảnh động minh hoạ cách thanh tác vụ xuất hiện từ cuối màn hình và tự động ẩn khi người dùng không sử dụng" + "Ảnh động minh hoạ cách ghim thanh tác vụ bằng nút bật/tắt để thanh tác vụ luôn hiển thị ở cuối màn hình" + "Ảnh động minh hoạ cách tạo chế độ chia đôi màn hình bằng cách kéo và thả một ứng dụng từ thanh tác vụ lên trên một ứng dụng đang mở" + "Ảnh động minh hoạ cách truy cập vào các ứng dụng được đề xuất trên thiết bị của bạn" + "Ảnh động minh hoạ cách tìm một mục trên màn hình bằng cách chạm và giữ phím hành động rồi chọn khu vực có mục đó" "Cách sử dụng thanh tác vụ" "Kéo một ứng dụng sang bên để dùng 2 ứng dụng cùng lúc" "Từ từ vuốt lên để Thanh tác vụ xuất hiện" "Nhận ứng dụng đề xuất dựa trên thói quen của bạn" "Nhấn và giữ trên đường phân chia để ghim Thanh tác vụ" - "Làm nhiều việc hơn qua Thanh tác vụ" + "Tăng năng suất qua Thanh tác vụ" "Luôn hiện Taskbar" "Để luôn hiện Taskbar ở cuối màn hình, hãy nhấn và giữ đường phân chia" "Chạm và giữ phím hành động để tìm nội dung trên màn hình của bạn" @@ -129,19 +141,38 @@ "Thông báo" "Cài đặt nhanh" "Thanh tác vụ" - "Đã hiện thanh thao tác" - "Đã ẩn thanh thao tác" "Thanh điều hướng" "Luôn hiện Thanh tác vụ" "Thay đổi chế độ điều hướng" "Đường phân chia Taskbar" + "Các ứng dụng khác gần đây" + "Đã thêm ứng dụng vào Thanh tác vụ" + "Đã xoá ứng dụng khỏi Thanh tác vụ" "Chuyển lên trên cùng/sang bên trái" "Chuyển xuống dưới cùng/sang bên phải" - "{count,plural, =1{Hiện thêm # ứng dụng.}other{Hiện thêm # ứng dụng.}}" - "{count,plural, =1{Hiện # ứng dụng dành cho máy tính.}other{Hiện # ứng dụng dành cho máy tính.}}" + "Mở ứng dụng dưới dạng bong bóng" + "Các ứng dụng gần đây" + "Danh sách ứng dụng gần đây" + "{count,plural, =1{ứng dụng khác}other{ứng dụng khác}}" + "Máy tính" "%1$s và %2$s" + "%1$s, mục %2$d trong số %3$d" + "Cuộn sang trái" + "Cuộn sang phải" "Bong bóng" "Bong bóng bổ sung" "%1$s từ %2$s" "%1$s và %2$d bong bóng khác" + "Di chuyển sang trái" + "Di chuyển sang phải" + "Đóng tất cả" + "mở rộng %1$s" + "thu gọn %1$s" + "Khoanh tròn để tìm kiếm" + "Biểu tượng ứng dụng" + "Tên ứng dụng" + "Nút đóng" + "Dịch chuyển" + "Đóng" + "Dịch chuyển hình ảnh" diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml index f6e446e803e..8139c51b729 100644 --- a/quickstep/res/values-zh-rCN/strings.xml +++ b/quickstep/res/values-zh-rCN/strings.xml @@ -22,11 +22,14 @@ "固定" "自由窗口" "桌面" + "移至外接显示屏" + "清除" + "桌面设备" "近期没有任何内容" "应用使用设置" "全部清除" + "添加新桌面" "最近用过的应用" - "任务已关闭" "%1$s（%2$s）" "不到 1 分钟" "今天还可使用 %1$s" @@ -44,29 +47,27 @@ "应用建议已添加到空白区域" "已启用应用建议" "已停用应用建议" - "预测的应用：%1$s" + "手势导航教程" "请旋转设备" "请旋转设备，完成手势导航教程" "确保从最右侧或最左侧边缘开始滑动" "确保从右侧或左侧边缘滑动到屏幕中间位置后再松开手指" "您已了解如何使用“从右侧向左滑动”手势返回。接下来学习切换应用吧！" "您完成了“返回”手势教程。接下来了解如何切换应用。" - "您完成了“返回”手势" + "您已完成“返回”手势教程" "确保滑动时手的位置不要太靠近屏幕底部" "如要调节“返回”手势的灵敏度，请转到“设置”" "滑动即可返回" "如要返回上一个屏幕，请从屏幕左侧或右侧边缘往屏幕中间滑动。" - "若要返回上一个屏幕，请用两根手指从屏幕左侧或右侧边缘向中间滑动。" "返回" "从屏幕左侧或右侧边缘滑动到中间" "确保从屏幕底部边缘向上滑动" "松开手指前，请勿中途停顿" "确保笔直向上滑动" - "您完成了“转到主屏幕”手势。接下来了解如何返回。" - "您完成了“转到主屏幕”手势" + "您已完成“前往主屏幕”手势教程。接下来学习如何返回。" + "您已完成“前往主屏幕”手势教程" "上滑可转到主屏幕" "从屏幕底部向上滑动，即可随时回到主屏幕。" - "用两根手指从屏幕底部向上滑动，这个手势会一律使您回到主屏幕。" "前往主屏幕" "从屏幕底部向上滑动" "太棒了！" @@ -74,12 +75,11 @@ "尝试按住窗口较长时间，然后再松开手指" "确保笔直向上滑动，然后停住" "您已了解如何使用手势了。如要关闭手势，请前往“设置”。" - "您完成了应用切换手势" + "您已完成“切换应用”手势教程" "滑动即可切换应用" - "如需在应用之间切换，请从屏幕底部向上滑动，按住，然后松开。" - "如需在应用之间切换，请从屏幕底部向上滑动，按住，然后松开。" + "如需在应用之间切换，请从屏幕底部向上滑动并按住，然后松开。" "切换应用" - "从屏幕底部向上滑动后按住，然后松开" + "从屏幕底部向上滑动并按住，然后松开" "恭喜！" "大功告成" "完成" @@ -91,24 +91,36 @@ "向上滑动可前往主屏幕" "点按主屏幕按钮即可前往主屏幕" "您可以开始使用%1$s了" - "设备" + "您可以开始使用自己的设备了" "系统导航设置" + "您的 %1$s\n已设置完毕！" + "您的设备\n已设置完毕！" + "设置完毕，开始使用吧！" + "尽情享用新的%1$s吧！" + "向上滑动即可开始使用您的%1$s" + "点按即可开始使用%1$s" + "选择导航方式" + "向上滑动" + "点按主屏幕按钮" + "平板电脑" + "手机" "分享" "屏幕截图" "分屏" - "保存应用组合" + "保存应用对" "点按另一个应用即可使用分屏" "另外选择一个应用才可使用分屏模式" - "取消" + "取消" "退出分屏选择模式" "另外选择一个应用才可使用分屏模式" "该应用或您所在的单位不允许执行此操作" "目前不支持微件，请选择其他应用" - "要跳过导航教程吗？" - "您之后可以在“%1$s”应用中找到此教程" - "取消" - "跳过" "旋转屏幕" + "该动画展示了任务栏如何显示在屏幕底部，以及如何在不使用时自动隐藏" + "该动画展示了如何使用切换开关固定任务栏，让任务栏始终显示在屏幕底部" + "该动画展示了如何通过将应用从任务栏拖放到打开的应用的上方，来创建分屏" + "该动画展示了如何在设备上访问推荐的应用" + "该动画展示了如何通过轻触并按住快捷操作按键并选择相应内容所在的区域，在界面中搜索相应内容" "任务栏教程" "将一个应用拖到一侧，即可同时使用两个应用" "缓慢上滑即可显示任务栏" @@ -129,19 +141,38 @@ "通知" "快捷设置" "任务栏" - "任务栏已显示" - "任务栏已隐藏" "导航栏" "始终显示任务栏" "更改导航模式" "任务栏分隔线" + "最近用过的其他应用" + "应用已添加到任务栏" + "应用已从任务栏中移除" "移到顶部/左侧" "移到底部/右侧" - "{count,plural, =1{显示另外 # 个应用。}other{显示另外 # 个应用。}}" - "{count,plural, =1{显示 # 款桌面应用。}other{显示 # 款桌面应用。}}" + "以气泡的形式打开应用" + "最近打开过的应用" + "“最近打开过的应用”列表" + "{count,plural, =1{多个应用}other{多个应用}}" + "桌面模式" "%1$s和%2$s" + "%1$s，第 %2$d 项（共 %3$d 项）" + "向左滚动" + "向右滚动" "气泡框" "溢出式气泡框" "来自“%2$s”的%1$s" "%1$s以及另外 %2$d 个" + "左移" + "右移" + "全部关闭" + "展开“%1$s”" + "收起“%1$s”" + "圈定即搜" + "应用图标" + "应用名称" + "“关闭”按钮" + "智能推送" + "关闭" + "智能推送图片" diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml index b9d8eb765ab..c1d500bbfc0 100644 --- a/quickstep/res/values-zh-rHK/strings.xml +++ b/quickstep/res/values-zh-rHK/strings.xml @@ -22,11 +22,14 @@ "固定" "自由形式" "桌面" + "移至外部顯示屏" + "清除" + "桌面" "最近沒有任何項目" "應用程式使用情況設定" "全部清除" + "新增桌面" "最近使用的應用程式" - "閂咗工作" "%1$s，%2$s" "少於 1 分鐘" "今天剩餘時間：%1$s" @@ -44,7 +47,7 @@ "系統會將應用程式建議新增至空白位置" "已啟用應用程式建議" "已停用應用程式建議" - "預測應用程式：%1$s" + "手勢導覽教學課程" "旋轉裝置方向" "請旋轉裝置方向以完成手勢導覽教學課程" "請確保從螢幕最右側或最左側邊緣滑動" @@ -56,7 +59,6 @@ "如要變更「返回」手勢的敏感度，請前往「設定」" "滑動即可返回" "如要返回上一個畫面，請從螢幕左側或右側邊緣往中央滑動。" - "如要返回上一個畫面，請用兩指從螢幕左側或右側邊緣往中央滑動。" "返回" "從螢幕左側或右側邊緣往中央滑動" "請確保從螢幕底部邊緣向上滑動" @@ -66,7 +68,6 @@ "你已完成「返回主畫面」手勢的教學課程" "向上滑動即可返回主畫面" "從螢幕底部向上滑動。這個手勢在所有畫面下都可讓你返回主畫面。" - "請用兩指從螢幕底部向上滑動。這個手勢在所有畫面下都可讓你返回主畫面。" "返回主畫面" "從螢幕底部向上滑動" "太好了！" @@ -77,7 +78,6 @@ "你已完成「切換應用程式」手勢的教學課程" "滑動即可切換應用程式" "如要切換應用程式，請從螢幕底部向上滑動並按住，然後放開。" - "如要切換應用程式，請用兩指從螢幕底部向上滑動並按住，然後放開手指。" "切換應用程式" "從螢幕底部向上滑動並按住，然後放開" "做得好！" @@ -91,24 +91,36 @@ "向上滑動即可前往主畫面" "輕按主按鈕即可前往主畫面" "你可以開始使用%1$s了" - "裝置" + "你現在可以開始使用裝置" "系統導覽設定" + "你的%1$s\n已準備就緒！" + "你的裝置\n已準備就緒！" + "可以開始使用！" + "盡情享用新%1$s！" + "向上滑動以開始使用%1$s" + "輕按即可開始使用%1$s" + "選擇導覽方式" + "向上滑動" + "輕按主按鈕" + "平板電腦" + "手機" "分享" "螢幕截圖" "分割" "儲存應用程式組合" "輕按其他應用程式以使用分割螢幕" "選擇其他應用程式才能使用分割螢幕" - "取消" + "取消" "退出分割螢幕選取頁面" "選擇其他應用程式才能使用分割螢幕" "應用程式或你的機構不允許此操作" "目前不支援小工具，請選取其他應用程式" - "要略過手勢操作教學課程嗎？" - "你之後可以在「%1$s」應用程式找到這些說明" - "取消" - "略過" "旋轉螢幕" + "動畫顯示如何讓螢幕底部顯示工作列，並在閒置時自動隱藏" + "動畫顯示如何使用切換按鈕固定工作列，讓工作列在螢幕底部永久顯示" + "動畫顯示如何建立分割畫面，方法是從工作列拖曳應用程式，並放在已開啟應用程式的上方" + "動畫顯示如何在裝置上存取建議的應用程式" + "動畫顯示如何在畫面上搜尋項目，方法是按住快捷操作鍵，並選取項目所在區域" "工作列教學" "將應用程式拖曳到一邊，同時使用兩個應用程式" "慢慢向上掃即可顯示工作列" @@ -129,19 +141,38 @@ "通知" "快速設定" "工作列" - "顯示咗工作列" - "隱藏咗工作列" "導覽列" "一律顯示工作列" "變更導覽模式" "工作列分隔線" + "其他最近使用的應用程式" + "應用程式已新增至工作列" + "應用程式已新增至工作列" "移至上方/左側" "移至底部/右側" - "{count,plural, =1{顯示另外 # 個應用程式。}other{顯示另外 # 個應用程式。}}" - "{count,plural, =1{顯示 # 個桌面應用程式。}other{顯示 # 個桌面應用程式。}}" + "在小視窗開啟應用程式" + "最近開啟的應用程式" + "「最近開啟的應用程式」清單" + "{count,plural, =1{個其他應用程式}other{個其他應用程式}}" + "桌面" "「%1$s」和「%2$s」" + "%1$s，第 %2$d 個項目，總共有 %3$d 項" + "向左捲動" + "向右捲動" "對話氣泡" "展開式" "%2$s 的「%1$s」通知" "%1$s和其他 %2$d 則通知" + "向左移" + "向右移" + "全部關閉" + "打開%1$s" + "收埋%1$s" + "一圈即搜" + "應用程式圖示" + "應用程式名稱" + "關閉按鈕" + "提醒" + "閂" + "提醒圖片" diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml index 90140cb5879..919c435f701 100644 --- a/quickstep/res/values-zh-rTW/strings.xml +++ b/quickstep/res/values-zh-rTW/strings.xml @@ -21,12 +21,15 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "固定" "自由形式" - "電腦" + "電腦模式" + "移至外接螢幕" + "清除" + "電腦模式" "最近沒有任何項目" "應用程式使用情況設定" "全部清除" + "新增桌面" "最近使用的應用程式" - "工作已關閉" "%1$s (%2$s)" "< 1 分鐘" "今天還能使用 %1$s" @@ -44,7 +47,7 @@ "應用程式建議已新增到空白位置" "應用程式建議功能已啟用" "應用程式建議功能已停用" - "預測的應用程式：%1$s" + "手勢操作教學課程" "旋轉裝置螢幕方向" "如要完成手勢操作教學課程，請旋轉裝置螢幕方向" "請務必從螢幕最右側或最左側滑動" @@ -56,7 +59,6 @@ "如要變更「返回」手勢的敏感度，請前往「設定」" "滑動即可返回" "如要返回上一個畫面，請從螢幕左側或右側邊緣往中央滑動。" - "如要返回上一個畫面，請用 2 指從螢幕左側或右側邊緣往中央滑動。" "返回" "從螢幕右側或左側往中央滑動" "請務必從螢幕底部向上滑動" @@ -66,7 +68,6 @@ "你已完成「返回主畫面」手勢的教學課程" "使用滑動手勢返回主畫面" "從螢幕底部向上滑動，即可返回主畫面。" - "用 2 指從螢幕底部向上滑動，即可回到主畫面。" "返回主畫面" "從螢幕底部向上滑動" "太棒了！" @@ -77,7 +78,6 @@ "你已完成「切換應用程式」手勢的教學課程" "使用滑動手勢切換應用程式" "如要切換不同的應用程式，請從螢幕底部向上滑動並按住，然後放開手指。" - "如要切換應用程式，請用 2 指從螢幕底部向上滑動並按住，然後放開手指。" "切換應用程式" "從螢幕底部向上滑動並按住，然後放開手指" "非常好！" @@ -91,28 +91,40 @@ "向上滑動即可前往主畫面" "輕觸主畫面按鈕即可前往主畫面" "你可以開始使用「%1$s」了" - "裝置" + "你可以開始使用裝置了" "系統操作機制設定" + "你的 %1$s\n已準備就緒！" + "你的裝置\n已準備就緒！" + "可以開始使用了！" + "盡情享受全新%1$s！" + "向上滑動即可開始使用%1$s" + "輕觸即可開始使用%1$s" + "選擇瀏覽方式" + "向上滑動" + "輕觸主畫面按鈕" + "平板電腦" + "手機" "分享" "螢幕截圖" "分割" "儲存應用程式配對" "輕觸另一個應用程式即可使用分割畫面" "選擇要在分割畫面中使用的另一個應用程式" - "取消" + "取消" "退出分割畫面選擇器" "必須選擇另一個應用程式才能使用分割畫面" "這個應用程式或貴機構不允許執行這個動作" "目前不支援小工具，請選取其他應用程式" - "要略過手勢操作教學課程嗎？" - "你之後可以在「%1$s」應用程式找到這些說明" - "取消" - "略過" "旋轉螢幕" + "這個動畫說明如何讓螢幕底部顯示工作列，並在閒置時自動隱藏" + "這個動畫說明如何使用切換鈕固定工作列，讓工作列永久顯示在螢幕底部" + "這個動畫說明如何建立分割畫面，方法是從工作列拖曳應用程式，並放在已開啟應用程式的上方" + "這個動畫說明如何在裝置上存取建議的應用程式" + "這個動畫說明如何在畫面上搜尋項目，方法是按住快捷操作鍵，並選取項目所在區域" "工作列教學課程" "將應用程式拖曳到一邊即可同時使用 2 個應用程式" "緩慢向上滑動讓工作列顯示在畫面上" - "根據你的日常安排建議應用程式" + "系統會根據你的日常安排，提供建議的應用程式。" "長按分隔線即可固定工作列" "充分發揮工作列的功用" "一律顯示工作列" @@ -129,19 +141,38 @@ "通知" "快速設定" "工作列" - "已顯示工作列" - "已隱藏工作列" "導覽列" "一律顯示工作列" "變更操作模式" "工作列分隔線" + "最近曾使用的其他應用程式" + "已將應用程式新增到工作列" + "已將應用程式從工作列中移除" "移到上方/左側" "移到底部/右側" - "{count,plural, =1{再多顯示 # 個應用程式。}other{再多顯示 # 個應用程式。}}" - "{count,plural, =1{顯示 # 個電腦版應用程式。}other{顯示 # 個電腦版應用程式。}}" + "以泡泡形式開啟應用程式" + "最近開啟的應用程式" + "「最近開啟的應用程式」清單" + "{count,plural, =1{個其他應用程式}other{個其他應用程式}}" + "電腦模式" "「%1$s」和「%2$s」" + "%1$s，第 %2$d 個項目，共 %3$d 項" + "向左捲動" + "向右捲動" "泡泡" "溢位" "「%2$s」的「%1$s」通知" "%1$s和另外 %2$d 則通知" + "向左移" + "向右移" + "全部關閉" + "展開「%1$s」" + "收合「%1$s」" + "畫圈搜尋" + "應用程式圖示" + "應用程式標題" + "關閉按鈕" + "提醒" + "關閉" + "提醒圖片" diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml index 73be445a550..51428492cff 100644 --- a/quickstep/res/values-zu/strings.xml +++ b/quickstep/res/values-zu/strings.xml @@ -22,11 +22,14 @@ "Phina" "I-Freeform" "Ideskithophu" + "Hambisa esibonisini sangaphandle" + "Sula" + "Ideskithophu" "Azikho izinto zakamuva" "Izilungiselelo zokusetshenziswa kohlelo lokusebenza" "Sula konke" + "Faka ideski elisha" "Izinhlelo zokusebenza zakamuva" - "Umsebenzi Uvaliwe" "%1$s, %2$s" "< 1 iminithi" "%1$s esele namhlanje" @@ -44,7 +47,7 @@ "Iziphakamiso zohlelo lokusebenza ezengezwe esikhaleni esingenalutho" "Iziphakamiso zohlelo lokusebenza zinikwe amandla" "Iziphakamiso zohlelo lokusebenza zikhutshaziwe" - "Uhlelo lokusebenza olubikezelwe: %1$s" + "Okokufundisa Kokuzulazula Kokuthinta" "Zungezisa idivayisi yakho" "Sicela uzungezise idivayisi yakho ukuze uqedele okokufundisa kokufuna ngokuthinta" "Qinisekisa ukuthi uswayipha ukusuka onqenqemeni olukude ngakwesokudla noma olukude ngakwesokunxele" @@ -56,7 +59,6 @@ "Ukuze ushintshe ukuzwela kokuthinta emuva, iya Kumasethingi" "Swayipha ukuze uye emuva" "Ukuze ubuyele emuva esikrinini sokugcina, swapha kusuka emngceleni wesobunxele noma wesokudla kuya phakathi kwesikrini." - "Ukuze ubuyele esikrinini sokugcina, swayipha ngeminwe emi-2 ukusuka kwesokunxele noma kwesokudla emphethweni uye phakathi kwesikrini." "Iya emuva" "Swayipha ukusuka kwesokunxele noma kwesokudla ukuya phakathi kwesikrini" "Qiniseka ukuthi uswayiphela phezulu ukusuka emngceleni ophansi wesikrini" @@ -66,7 +68,6 @@ "Ukuqedile ukuthinta kokuya ekhaya" "Swayipha ukuze uye ekhaya" "Swayiphela phezulu kusuka phansi kwesikrini sakho.Lokhu kuthinta kuhlala kukusa esikrinini sasekhaya." - "Swayiphela phezulu ngeminwe emi-2 kusukela phansi esikrinini. Lesi senzo sihlala sikuyisa esikrinini Sasekhaya." "Iya ekhasini lokuqala" "Swayiphela phezulu ukusuka phansi esikrinini sakho" "Umsebenzi omuhle!" @@ -77,7 +78,6 @@ "Ukuqedile ukuthinta kokushintsha ama-app" "Swayipha ukuze ushintshe ama-app" "Ukuze ushintshe phakathi kwama-app, swayiphela phezulu kusuka ngezansi kwesikrini sakho, bese uyadedela." - "Ukuze ushintshe phakathi kwama-app, swayiphela phezulu ngeminwe emi-2 kusukela phansi esikrinini sakho, ubambe, bese uyakhulula." "Shintsha ama-app" "Swayiphela phezulu ukusuka phansi esikrinini sakho, ubambe, bese uyadedela" "Wenze kahle!" @@ -91,24 +91,36 @@ "Swayiphela phezulu ukuze uye ekhaya" "Thepha inkinobho yasekhaya ukuze uye kusikrini sasekhaya" "Usulungele ukuqala ukusebenzisa i-%1$s yakho" - "idivayisi" + "Usulungele ukuqala ukusebenzisa idivayisi yakho" "Amasethingi wokuzulazula isistimu" + "I-%1$s yakho \nisilungile!" + "Idivayisi yakho \nisilungile!" + "Usukulungele ukuqala!" + "Jabulela i-%1$s yakho entsha!" + "Swayiphela phezulu ukuze uqale nge-%1$s yakho" + "Thepha ukuze uqale nge-%1$s yakho" + "Khetha ukuthi uzofuna kanjani" + "Swayiphela phezulu" + "Thepha inkinobho yasekhaya" + "ithebhulethi" + "ifoni" "Yabelana" "Isithombe-skrini" "Hlukanisa" "Londoloza ukubhangqa i-app" "Thepha enye i-app ukuze usebenzise isikrini sokuhlukanisa" "Khetha enye i-app ukuze usebenzise ukuhlukanisa isikrini" - "Khansela" + "Khansela" "Phuma ekukhetheni ukuhlukaniswa kwesikrini" "Khetha enye i-app ukuze usebenzise ukuhlukanisa isikrini" "Lesi senzo asivunyelwanga uhlelo lokusebenza noma inhlangano yakho" "Amawijethi awasekelwe okwamanje, sicela ukhethe enye i-app" - "Yeqa isifundo sokuzulazula?" - "Lokhu ungakuthola kamuva ku-app ye-%1$s" - "Khansela" - "Yeqa" "Zungezisa isikrini" + "Upopayi obonisa ukuthi i-taskbar ivela kanjani phansi esikrinini, iphinde izifihle ngokuzenzakalelayo lapho ingasetshenziswa" + "Upopayi obonisa indlela yokuphina i-taskbar yakho usebenzisa ukuguqula, ukuze i-taskbar ihlale ibonakala unomphela phansi esikrinini." + "Upopayi obonisa ukuthi ungasakha kanjani isikrini esihlukanisayo, ngokuhudula nokudedela i-app ku-taskbar phezu kwe-app evuliwe." + "Upopayi obonisa indlela yokufinyelela ama-app aphakanyisiwe kudivayisi yakho" + "Upopayi obonisa indlela yokusesha into esikrinini, ngokuthinta uphinde ubambe inkinobho yokufinyelela nokukhetha indawo into ekuyo." "Imfundo ye-taskbar" "Hudula i-app ukusebenzisa ama-app ama-2 ngesikhathi esisodwa" "Swayiphela phezulu kancane ukuze ubonise i-Taskbar" @@ -129,19 +141,38 @@ "Izaziso" "Amasethingi Asheshayo" "I-Taskbar" - "Ibha yomsebenzi ibonisiwe" - "Ibha yomsebenzi ifihliwe" "Ibha yokufuna" "Bonisa i-Taskbar njalo." "Shintsha imodi yokufuna" "Isihlukanisi se-Taskbar" + "Amanye ama-app akamuva" + "I-app ifakiwe kuTaskbar" + "I-app isusiwe kuTaskbar" "Hamba phezulu/kwesokunxele" "Hamba phansi/kwesokudla" - "{count,plural, =1{Bonisa i-app e-# ngaphezulu.}one{Bonisa ama-app angu-# ngaphezulu.}other{Bonisa ama-app angu-# ngaphezulu.}}" - "{count,plural, =1{Bonisa i-app engu-# yedeskithophu.}one{Bonisa ama-app angu-# wedeskithophu.}other{Bonisa ama-app angu-# wedeskithophu.}}" + "Vula i-app njengebhamuza" + "Ama-app wakamuva" + "Uhlu lwe-app lwakamuva" + "{count,plural, =1{i-app eyengeziwe}one{ama-app engeziwe}other{ama-app engeziwe}}" + "Ideskithophu" "I-%1$s ne-%2$s" + "I-%1$s, into engu-%2$d kwezingu-%3$d" + "Skrolela ngakwesokunxele" + "Skrolela ngakwesokudla" "Ibhamuza" "Ukugcwala kakhulu" "%1$s kusuka ku-%2$s" "%1$s nokunye okungu-%2$d" + "Iya kwesokunxele" + "Iya kwesokudla" + "Chitha konke" + "nweba %1$s" + "goqa %1$s" + "Khethela Ukusesha" + "Isithonjana se-app" + "Isihloko se-app" + "Inkinobho yokuvala" + "Isikhumbuzo" + "Vala" + "Gudluza isithombe" diff --git a/quickstep/res/values/attrs.xml b/quickstep/res/values/attrs.xml index ccc7f180dde..1e66f0cd2fe 100644 --- a/quickstep/res/values/attrs.xml +++ b/quickstep/res/values/attrs.xml @@ -28,6 +28,16 @@ + + + + + + + @@ -35,21 +45,27 @@ + + + + + + + + + + - - - - - - - - - - + + + + + + diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml index 24c2d72131a..91d585acbc4 100644 --- a/quickstep/res/values/colors.xml +++ b/quickstep/res/values/colors.xml @@ -31,7 +31,6 @@ #99000000 #EBffffff #99000000 - #646464 #ffffff @@ -76,7 +75,7 @@ #80868b #bdc1c6 - #FFFFFFFF + @android:color/system_neutral1_50 #333333 @@ -94,7 +93,10 @@ #f9ab00 - ?attr/colorAccentPrimary - ?attr/materialColorPrimaryFixedDim - @color/material_color_on_primary_fixed + @color/materialColorPrimary + + #4285F4 + #7430E2 + #2A7EC8 + #2DB8BD diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml index fd122103e13..e12efc33133 100644 --- a/quickstep/res/values/config.xml +++ b/quickstep/res/values/config.xml @@ -14,33 +14,10 @@ limitations under the License. --> - - - com.android.launcher3/com.android.quickstep.interaction.GestureSandboxActivity - com.android.quickstep.logging.StatsLogCompatManager - com.android.quickstep.QuickstepTestInformationHandler - com.android.quickstep.util.SystemWindowManagerProxy - com.android.launcher3.uioverrides.QuickstepWidgetHolder$QuickstepHolderFactory - com.android.quickstep.InstantAppResolverImpl - com.android.launcher3.appprediction.PredictionAppTracker - com.android.quickstep.QuickstepProcessInitializer - com.android.launcher3.model.QuickstepModelDelegate - com.android.launcher3.secondarydisplay.SecondaryDisplayPredictionsImpl - com.android.launcher3.taskbar.TaskbarModelCallbacksFactory - com.android.launcher3.taskbar.TaskbarViewCallbacksFactory - com.android.quickstep.LauncherRestoreEventLoggerImpl - com.android.launcher3.uioverrides.plugins.PluginManagerWrapperImpl - com.android.launcher3.taskbar.TaskbarEduTooltipController - - - - - com.android.launcher3.uioverrides.SystemApiWrapper - 3 @@ -54,10 +31,17 @@ 23 + 30dp + + + 6 + @@ -68,4 +52,15 @@ 44 + + + 0.65 + 850 + 0.8 + 2800 + 1 + 1600 + + + M61.554,32.22C58.4,27.364 55.245,22.502 52.091,17.646C50.045,14.494 47.963,11.299 45.196,8.796C42.43,6.287 38.846,4.514 35.171,4.745C31.945,4.951 28.954,6.686 26.593,8.952C24.232,11.218 22.398,14.008 20.594,16.773C15.715,24.237 10.829,31.702 5.95,39.173C3.632,42.718 1.252,46.419 0.611,50.645C-0.164,55.75 1.924,60.95 5.629,64.345C9.504,67.896 15.781,67.609 20.497,66.635C25.667,65.568 30.722,63.558 35.995,63.565C40.511,63.565 44.875,65.05 49.271,66.13C53.659,67.203 58.375,67.865 62.613,66.267C67.873,64.289 71.651,58.665 71.548,52.892C71.451,47.624 68.503,42.918 65.664,38.536C64.296,36.433 62.928,34.324 61.56,32.22H61.554Z diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 5c82c991c75..1b0a6ed6951 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -21,7 +21,7 @@ -1dp - 22dp + 26dp 4dp 2dp 216dp @@ -31,16 +31,19 @@ 50dp + + + 8dp + 0.7 - - 0.46 48dp 44dp + + 52dp 4dp @@ -67,6 +70,8 @@ 8dp 8dp + + 12dp 2dp @@ -82,14 +87,51 @@ 44dp 4dp + 28dp + + 20dp + + 6dp + 12dp + 8dp + 18dp + 20dp + 48dp + 16dp + + 24dp + 24dp + 72dp + 72dp + 72dp + 24dp + 24dp + 72dp + 5 + + 28dp + + + 25dp + + 72dp + + 120dp 72dp 1.1 + 24dp + 4dp + 4dp + 24dp 48dp - 36dp + 16dp + 28dp + 10dp + 16dp 2.25dp @@ -101,6 +143,13 @@ 24dp 2dp + + 56dp + 2dp + + + 3dp + 600dp @@ -109,16 +158,18 @@ 0.0285dp 0.15dp 0.285dp + 0.7dp 1.4dp 36dp 0.5dp 115dp + 36dp 100dp - 16sp + 14sp 16dp 0dp @@ -177,8 +228,8 @@ 0dp 0dp 72dp - 40dp - 24dp + 142dp + 16dp 44dp @@ -263,15 +314,19 @@ 24dp - 40dp + 40dp + 40dp 36sp 14sp + 16sp 24dp 32dp 24dp 348dp 10dp + 24dp + 57dp 8dp @@ -279,6 +334,13 @@ 80dp 184dp + + + 1.2 + + 0.8 + 1dp 20dp 20dp @@ -319,13 +381,14 @@ @*android:dimen/taskbar_frame_height - 48dp 48dp 12dp 54dp 16dp 16dp + 88dp + 32dp 8dp 44dp 48dp @@ -334,11 +397,14 @@ 96dp 24dp 35dp - 24dp + @*android:dimen/taskbar_stashed_size 220dp 108dp 316dp 4dp + 24dp + 108dp + 200% 10dp 1dp 112dp @@ -348,19 +414,19 @@ 48dp 48dp 32dp - 6dp 6dp + 0dp 64dp 64dp 48dp 1dp 72dp - 4dp - 14dp - 2dp - 2dp - 12dp - 2dp + 2dp + 12dp + 4dp + 6dp + 20dp + 4dp 12dp @@ -372,8 +438,10 @@ 32dp 8dp 400dp + 48dp 8dp 16dp + 4dp 16dp @@ -422,9 +490,13 @@ 300dp 16dp + 16dp + + + 8dp - - 60dp + + 80dp 30dp @@ -434,6 +506,7 @@ 55dp @dimen/transient_taskbar_stashed_height @dimen/taskbar_stashed_handle_height + @dimen/transient_taskbar_stash_spring_velocity_dp_per_s 9dp @@ -443,24 +516,28 @@ 80dp 1dp - 2dp + + 3dp 90dp + 20dp 32dp 36dp + 28dp 24dp 12dp - 16dp 6dp 8dp + @dimen/bubblebar_icon_spacing 12dp 1dp + 12dp - 96dp + @dimen/floating_dismiss_background_size 60dp - 24dp - 50dp + @dimen/floating_dismiss_icon_size + 60dp 548dp 192dp 242dp @@ -473,31 +550,82 @@ 24dp 16dp + + 16dp + 4dp + 14dp + 238dp + 276dp + 12dp + 10dp + 1dp + 2dp + 20dp - 4dp + 5dp + 3dp + 2dp 104dp - 134dp + 136dp 52dp 20dp + 32dp 56dp + 24dp 16dp 16dp - 2dp + 4dp 28dp 16dp 24dp 8dp + 104dp + 360dp + 16dp + 20dp + 36dp + 56dp + 6dp + 16dp + 18dp 48dp - - - 220dp + + 14dp + 32dp + 24dp + + 428dp + 16dp + 8dp + 36dp + 8dp + 6dp + 12dp + 20dp + -10dp + + 16dp + + + 50 + 33 + 40dp + 0.8 + 380 + + + 16dp diff --git a/quickstep/res/values/ids.xml b/quickstep/res/values/ids.xml new file mode 100644 index 00000000000..95bd0fecbc8 --- /dev/null +++ b/quickstep/res/values/ids.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index f3066389d5c..4753f362fbe 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -23,8 +23,15 @@ Pin Freeform - + Desktop + + Move to external display + + Clear + + + Desktop No recent items @@ -38,12 +45,12 @@ Back + + Add new desk + Recent apps - - Task Closed - %1$s, %2$s @@ -90,8 +97,8 @@ App suggestions are disabled - - Predicted app: %1$s + + Gesture Navigation Tutorial Rotate your device @@ -117,8 +124,6 @@ Swipe to go back To go back to the last screen, swipe from the left or right edge to the middle of the screen. - - To go back to the last screen, swipe with 2 fingers from the left or right edge to the middle of the screen. Go back @@ -137,8 +142,6 @@ Swipe to go home Swipe up from the bottom of your screen. This gesture always takes you to the Home screen. - - Swipe up with 2 fingers from the bottom of the screen. This gesture always takes you to the Home screen. Go home @@ -160,8 +163,6 @@ Swipe to switch apps To switch between apps, swipe up from the bottom of your screen, hold, then release. - - To switch between apps, swipe up with 2 fingers from the bottom of your screen, hold, then release. Switch apps @@ -215,12 +216,34 @@ Swipe up to go home Tap the home button to go to your home screen - + You\u2019re ready to start using your %1$s - - device + + You\u2019re ready to start using your device System navigation settings + + Your %1$s is \nready! + + Your device is \nready! + + You\'re ready to roll! + + Enjoy your new %1$s! + + Swipe up to get started with your %1$s + + Tap to get started with your %1$s + + Choose how to navigate + + Swipe up + + Tap the home button + + tablet + + phone @@ -234,7 +257,7 @@ Tap another app to use split screen Choose another app to use split screen - Cancel + Cancel Exit split screen selection Choose another app to use split screen @@ -242,20 +265,21 @@ This action isn\'t allowed by the app or your organization Widgets not currently supported, please select another app - - - Skip navigation tutorial? - - You can find this later in the %1$s app - - Cancel - - Skip Rotate screen + + Animation showing how the taskbar comes into view from the bottom of the screen, and automatically hides when not in use + + Animation showing how to pin your taskbar using a toggle, so the taskbar remains permanently visible at the bottom of the screen + + Animation showing how to create a split screen, by dragging and dropping an app from the taskbar above an open app + + Animation showing how to access suggested apps on your device + + Animation showing how to search for an item on screen, by touching and holding the action key and selecting the area the item is in Taskbar education @@ -296,10 +320,6 @@ Quick Settings Taskbar - - Taskbar shown - - Taskbar hidden Navigation bar @@ -308,27 +328,44 @@ Change navigation mode Taskbar Divider - + + Other recent apps + + App added to Taskbar + + App removed from Taskbar Move to top/left Move to bottom/right + + Open app as a bubble + + + Recent apps + + + Recent app list - + {count, plural, - =1{Show # more app.} - other{Show # more apps.} + =1{more app} + other{more apps} } - - {count, plural, - =1{Show # desktop app.} - other{Show # desktop apps.} - } + + Desktop %1$s and %2$s + + %1$s, item %2$d of %3$d + + + Scroll left + + Scroll right @@ -339,4 +376,33 @@ %1$s from %2$s %1$s and %2$d more + + Move left + + Move right + + Dismiss all + + expand %1$s + + collapse %1$s + + + Circle to Search + + + + App icon + + App title + + Close button + + + + Nudge + + Close + Nudge image diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index 1da11666313..ebf576779b5 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -23,19 +23,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + @@ -268,53 +301,123 @@ + + + + + - + + + + + + + + + + + + + + diff --git a/quickstep/res/xml/indexable_launcher_prefs.xml b/quickstep/res/xml/indexable_launcher_prefs.xml index b4740e5b51e..cb31494b2ec 100644 --- a/quickstep/res/xml/indexable_launcher_prefs.xml +++ b/quickstep/res/xml/indexable_launcher_prefs.xml @@ -29,4 +29,11 @@ android:defaultValue="false" android:persistent="true" /> + + diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java index f30cebc8f8d..36b573f7604 100644 --- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java +++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java @@ -27,7 +27,7 @@ import android.content.Context; import android.os.Build; import android.os.Handler; -import android.os.RemoteException; +import android.util.Log; import android.view.IRemoteAnimationFinishedCallback; import android.view.RemoteAnimationTarget; import android.view.SurfaceControl; @@ -223,6 +223,7 @@ public void onAnimationEnd(Animator animation) { if (skipFirstFrame) { // Because t=0 has the app icon in its original spot, we can skip the // first frame and have the same movement one frame earlier. + Log.d("b/311077782", "LauncherAnimationRunner.setAnimation"); mAnimator.setCurrentPlayTime( Math.min(getSingleFrameMs(context), mAnimator.getTotalDuration())); } @@ -237,7 +238,7 @@ public void onAnimationEnd(Animator animation) { * animation finished runnable. */ @Override - public void onAnimationFinished() throws RemoteException { + public void onAnimationFinished() { mASyncFinishRunnable.run(); } } diff --git a/quickstep/src/com/android/launcher3/LauncherInitListener.java b/quickstep/src/com/android/launcher3/LauncherInitListener.java index 523923df6a4..4e4ffe77997 100644 --- a/quickstep/src/com/android/launcher3/LauncherInitListener.java +++ b/quickstep/src/com/android/launcher3/LauncherInitListener.java @@ -15,11 +15,11 @@ */ package com.android.launcher3; -import com.android.quickstep.util.ActivityInitListener; +import com.android.quickstep.util.ContextInitListener; import java.util.function.BiPredicate; -public class LauncherInitListener extends ActivityInitListener { +public class LauncherInitListener extends ContextInitListener { /** * @param onInitListener a callback made when the activity is initialized. The callback should @@ -31,8 +31,8 @@ public LauncherInitListener(BiPredicate onInitListener) { } @Override - public boolean handleInit(Launcher launcher, boolean alreadyOnHome) { + public boolean handleInit(Launcher launcher, boolean isHomeStarted) { launcher.deferOverlayCallbacksUntilNextResumeOrStop(); - return super.handleInit(launcher, alreadyOnHome); + return super.handleInit(launcher, isHomeStarted); } } diff --git a/quickstep/src/com/android/launcher3/LauncherInteractor.kt b/quickstep/src/com/android/launcher3/LauncherInteractor.kt new file mode 100644 index 00000000000..6a1f412876e --- /dev/null +++ b/quickstep/src/com/android/launcher3/LauncherInteractor.kt @@ -0,0 +1,254 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3 + +import android.animation.AnimatorSet +import android.view.View +import android.window.RemoteTransition +import androidx.annotation.AnyThread +import androidx.annotation.MainThread +import com.android.app.animation.Interpolators +import com.android.launcher3.Hotseat.ALPHA_CHANNEL_TASKBAR_ALIGNMENT +import com.android.launcher3.logging.InstanceId +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.statemanager.StateManager.StateListener +import com.android.launcher3.taskbar.TaskbarInteractor +import com.android.launcher3.taskbar.bubbles.BubbleBarView +import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.util.SafeCloseable +import com.android.quickstep.util.ScalingWorkspaceRevealAnim +import com.android.quickstep.util.SplitTask +import com.android.quickstep.views.RecentsViewContainer +import com.android.systemui.animation.ViewRootSync.synchronizeNextDraw +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import java.util.concurrent.Executor +import javax.annotation.concurrent.ThreadSafe + +/** Expose [QuickstepLauncher] APIs to taskbar rendered on per-window UI thread. */ +@ThreadSafe +class LauncherInteractor(private val launcher: QuickstepLauncher, val executor: Executor) { + + private var hotseatTranslationXAnimation: AnimatorSet? = null + + @AnyThread fun getLauncherAsRecentViewContainer(): RecentsViewContainer = launcher + + @AnyThread + fun startScalingWorkspaceRevealAnim(playAlphaReveal: Boolean = true, playBlur: Boolean = true) { + executor.execute { + ScalingWorkspaceRevealAnim(launcher, null, null, playAlphaReveal, playBlur).start() + } + } + + @AnyThread + fun updateHotseatAndQsbTranslationX( + targetValue: Float, + animate: Boolean, + isQsbInline: Boolean, + ) { + executor.execute { + updateHotseatAndQsbTranslationXInternal(targetValue, animate, isQsbInline) + } + } + + /** Used to translate hotseat and QSB to make room for bubbles. */ + @MainThread + private fun updateHotseatAndQsbTranslationXInternal( + targetValue: Float, + animate: Boolean, + isQsbInline: Boolean, + ) { + // cancel existing animation + hotseatTranslationXAnimation?.cancel() + hotseatTranslationXAnimation = null + val hotseat = launcher.hotseat + val translationXAnimation = AnimatorSet() + val iconsTranslationX = + launcher.hotseat.getIconsTranslationX(Hotseat.ICONS_TRANSLATION_X_NAV_BAR_ALIGNMENT) + if (animate) { + translationXAnimation.playTogether(iconsTranslationX.animateToValue(targetValue)) + } else { + iconsTranslationX.setValue(targetValue) + } + val qsbTargetX = if (isQsbInline) targetValue else 0f + val qsbTranslationX = hotseat.qsbTranslationX + if (qsbTranslationX != null) { + if (animate) { + translationXAnimation.playTogether(qsbTranslationX.animateToValue(qsbTargetX)) + } else { + qsbTranslationX.setValue(qsbTargetX) + } + } + if (!animate) { + return + } + hotseatTranslationXAnimation = translationXAnimation + translationXAnimation.startDelay = BubbleBarView.FADE_OUT_ANIM_POSITION_DURATION_MS + translationXAnimation.setDuration(BubbleBarView.FADE_IN_ANIM_ALPHA_DURATION_MS) + translationXAnimation.interpolator = Interpolators.EMPHASIZED + translationXAnimation.start() + } + + @AnyThread + fun synchronizeNextDraw(view: View) { + executor.execute { synchronizeNextDraw(launcher.hotseat, view, Runnable {}) } + } + + @AnyThread + fun setHotseatIconsAlpha(alpha: Float, @Hotseat.HotseatQsbAlphaId channelId: Int) { + executor.execute { + if (channelId == ALPHA_CHANNEL_TASKBAR_ALIGNMENT) { + launcher.getLauncherUiState().setTaskbarAlignmentChannelAlpha(alpha) + } + launcher.hotseat.setIconsAlpha(alpha, channelId) + } + } + + @AnyThread + fun setHotseatQsbAlpha(alpha: Float, @Hotseat.HotseatQsbAlphaId channelId: Int) { + executor.execute { launcher.hotseat.setQsbAlpha(alpha, channelId) } + } + + @AnyThread + fun addStateListener(listener: StateListener): SafeCloseable { + val wrapperListener = + object : StateListener, SafeCloseable { + override fun onStateTransitionStart(toState: LauncherState?) { + executor.execute { listener.onStateTransitionStart(toState) } + } + + override fun onStateTransitionComplete(finalState: LauncherState?) { + executor.execute { listener.onStateTransitionComplete(finalState) } + } + + override fun close() { + executor.execute { launcher.stateManager.removeStateListener(this) } + } + } + executor.execute { launcher.stateManager.addStateListener(wrapperListener) } + return wrapperListener + } + + @AnyThread + fun setTaskbarInteractor(taskbarInteractor: TaskbarInteractor?) { + launcher.taskbarInteractor = taskbarInteractor + } + + @AnyThread + fun adjustHotseatForBubbleBar(isBubbleBarVisible: Boolean) { + executor.execute { launcher.hotseat?.adjustForBubbleBar(isBubbleBarVisible) } + } + + @AnyThread + fun postAdjustHotseatForBubbleBar( + isBubbleBarVisible: Boolean, + isTaskbarUiControllersSet: Boolean, + ) { + executor.execute { + launcher.hotseat.let { + if (isBubbleBarVisible && isTaskbarUiControllersSet) { + it.post { it.adjustForBubbleBar(true) } + } + } + } + } + + @AnyThread + fun logAppLaunch(statsLogManager: StatsLogManager, info: ItemInfo, instanceId: InstanceId) { + executor.execute { launcher.logAppLaunch(statsLogManager, info, instanceId) } + } + + @AnyThread + fun toggleAllApps(focusSearch: Boolean) { + executor.execute { launcher.toggleAllApps(focusSearch) } + } + + @AnyThread + fun launchSplitTasks(splitTask: SplitTask, remoteTransition: RemoteTransition?) { + executor.execute { launcher.launchSplitTasks(splitTask, remoteTransition) } + } + + @AnyThread + fun setBubbleBarLocation(location: BubbleBarLocation?) { + executor.execute { launcher.setBubbleBarLocation(location) } + } + + @AnyThread + fun resetOverlayScroll() { + executor.execute { + if (launcher.workspace.isOverlayShown) { + launcher.workspace.onOverlayScrollChanged(0f) + } + } + } + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("LauncherUiState.isResumed()"), + ) + @MainThread + fun isResumed() = launcher.isResumed + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("LauncherUiState.isResumed()"), + ) + @MainThread + fun hasBeenResumed() = launcher.hasBeenResumed() + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("LauncherUiState.isTopResumedActivityRef.value()"), + ) + @MainThread + fun isTopResumedActivity() = launcher.isTopResumedActivity + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("LauncherUiState.deviceProfileRef.value()"), + ) + @MainThread + fun getDeviceProfile(): DeviceProfile = launcher.deviceProfile + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("LauncherUiState.isSplitSelectionActiveRef.value()"), + ) + @MainThread + fun isSplitSelectActive() = launcher.isSplitSelectionActive + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("LauncherUiState.isOverlayShownRef.value()"), + ) + @MainThread + fun isOverlayShown() = launcher.workspace.isOverlayShown + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("LauncherUiState.launcherStateRef.value()"), + ) + @MainThread + fun getState(): LauncherState = launcher.stateManager.state + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("LauncherUiState.taskbarAlignmentChannelAlphaRef.value()"), + ) + fun getTaskbarAlignmentChannelAlpha() = + launcher.hotseat.getIconsAlpha(ALPHA_CHANNEL_TASKBAR_ALIGNMENT).value +} diff --git a/quickstep/src/com/android/launcher3/LauncherUiStateUtil.kt b/quickstep/src/com/android/launcher3/LauncherUiStateUtil.kt new file mode 100644 index 00000000000..25e2d942e9b --- /dev/null +++ b/quickstep/src/com/android/launcher3/LauncherUiStateUtil.kt @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3 + +import com.android.launcher3.Flags.refactorTaskbarUiState + +/** Temporary util class to get [LauncherUiState] properties. */ +object LauncherUiStateUtil { + + @JvmStatic + fun getDeviceProfile( + launcher: LauncherInteractor, + launcherUiState: LauncherUiState, + ): DeviceProfile = + if (refactorTaskbarUiState()) { + val ret: DeviceProfile = launcherUiState.deviceProfileRef.value!! + check(!(BuildConfigs.IS_STUDIO_BUILD && ret !== launcher.getDeviceProfile())) { + "getDeviceProfile() doesn't match" + } + ret + } else { + launcher.getDeviceProfile() + } + + @JvmStatic + fun isSplitSelectActive( + launcher: LauncherInteractor, + launcherUiState: LauncherUiState, + ): Boolean = + if (refactorTaskbarUiState()) { + val ret: Boolean = launcherUiState.isSplitSelectActiveRef.value + if (BuildConfigs.IS_STUDIO_BUILD && ret != launcher.isSplitSelectActive()) { + throw IllegalStateException("isSplitSelectionActive() doesn't match") + } + ret + } else { + launcher.isSplitSelectActive() + } + + @JvmStatic + fun getLauncherState( + launcher: LauncherInteractor, + launcherUiState: LauncherUiState, + ): LauncherState = + if (refactorTaskbarUiState()) { + val ret: LauncherState = launcherUiState.launcherStateRef.value + if (BuildConfigs.IS_STUDIO_BUILD && ret !== launcher.getState()) { + throw IllegalStateException("launcher state doesn't match") + } + ret + } else { + launcher.getState() + } + + @JvmStatic + fun getTaskbarAlignmentChannelAlpha( + launcher: LauncherInteractor, + launcherUiState: LauncherUiState, + ): Float = + if (refactorTaskbarUiState()) { + val ret: Float = launcherUiState.taskbarAlignmentChannelAlpha.value + if (BuildConfigs.IS_STUDIO_BUILD && ret != launcher.getTaskbarAlignmentChannelAlpha()) { + throw IllegalStateException("taskbarAlignmentChannelAlpha doesn't match") + } + ret + } else { + launcher.getTaskbarAlignmentChannelAlpha() + } +} diff --git a/quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java b/quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java index 962fd91c2ee..a681dc402dc 100644 --- a/quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java +++ b/quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java @@ -15,24 +15,86 @@ */ package com.android.launcher3; +import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED; + +import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; + import android.view.KeyEvent; import android.view.View; +import android.view.accessibility.AccessibilityEvent; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearSmoothScroller; +import androidx.recyclerview.widget.RecyclerView; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; +import com.android.launcher3.allapps.AllAppsRecyclerView; +import com.android.launcher3.allapps.SearchRecyclerView; import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.uioverrides.PredictedAppIcon; import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.views.PredictedAppIcon; import java.util.List; public class QuickstepAccessibilityDelegate extends LauncherAccessibilityDelegate { + private QuickstepLauncher mLauncher; public QuickstepAccessibilityDelegate(QuickstepLauncher launcher) { super(launcher); + mLauncher = launcher; mActions.put(PIN_PREDICTION, new LauncherAction( PIN_PREDICTION, R.string.pin_prediction, KeyEvent.KEYCODE_P)); } + @Override + public void onPopulateAccessibilityEvent(View view, AccessibilityEvent event) { + super.onPopulateAccessibilityEvent(view, event); + // Scroll to the position if focused view in main allapps list and not completely visible. + // Gate based on TYPE_VIEW_ACCESSIBILITY_FOCUSED for unintended scrolling with external + // mouse. + if (event.getEventType() == TYPE_VIEW_ACCESSIBILITY_FOCUSED) { + scrollToPositionIfNeeded(view); + } + } + + private void scrollToPositionIfNeeded(View view) { + if (!Flags.accessibilityScrollOnAllapps()) { + return; + } + AllAppsRecyclerView contentView = mLauncher.getAppsView().getActiveRecyclerView(); + if (contentView instanceof SearchRecyclerView) { + return; + } + LinearLayoutManager layoutManager = (LinearLayoutManager) contentView.getLayoutManager(); + if (layoutManager == null) { + return; + } + RecyclerView.ViewHolder vh = contentView.findContainingViewHolder(view); + if (vh == null) { + return; + } + int itemPosition = vh.getBindingAdapterPosition(); + if (itemPosition == NO_POSITION) { + return; + } + int firstCompletelyVisible = layoutManager.findFirstCompletelyVisibleItemPosition(); + int lastCompletelyVisible = layoutManager.findLastCompletelyVisibleItemPosition(); + boolean itemCompletelyVisible = firstCompletelyVisible <= itemPosition + && lastCompletelyVisible >= itemPosition; + if (itemCompletelyVisible) { + return; + } + RecyclerView.SmoothScroller smoothScroller = + new LinearSmoothScroller(mLauncher.asContext()) { + @Override + protected int getVerticalSnapPreference() { + return LinearSmoothScroller.SNAP_TO_ANY; + } + }; + smoothScroller.setTargetPosition(itemPosition); + layoutManager.startSmoothScroll(smoothScroller); + } + @Override protected void getSupportedActions(View host, ItemInfo item, List out) { if (host instanceof PredictedAppIcon && !((PredictedAppIcon) host).isPinned()) { diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 104e5e0e33e..347ad6dcd9c 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -16,15 +16,19 @@ package com.android.launcher3; +import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static android.app.role.RoleManager.ROLE_HOME; import static android.provider.Settings.Secure.LAUNCHER_TASKBAR_EDUCATION_SHOWING; import static android.view.RemoteAnimationTarget.MODE_CLOSING; import static android.view.RemoteAnimationTarget.MODE_OPENING; import static android.view.Surface.ROTATION_0; import static android.view.Surface.ROTATION_180; +import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.TRANSIT_CLOSE; +import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY; import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_TO_BACK; @@ -39,36 +43,33 @@ import static com.android.app.animation.Interpolators.DECELERATE_1_7; import static com.android.app.animation.Interpolators.EXAGGERATED_EASE; import static com.android.app.animation.Interpolators.LINEAR; +import static com.android.internal.util.LatencyTracker.ACTION_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE; +import static com.android.launcher3.BaseActivity.EVENT_DESTROYED; import static com.android.launcher3.BaseActivity.INVISIBLE_ALL; import static com.android.launcher3.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS; import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS; import static com.android.launcher3.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; +import static com.android.launcher3.Flags.refactorTaskbarUiState; +import static com.android.launcher3.Flags.syncAppLaunchWithTaskbarStash; import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.BACKGROUND_APP; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.Utilities.mapBoundToRange; -import static com.android.launcher3.config.FeatureFlags.ENABLE_BACK_SWIPE_HOME_ANIMATION; -import static com.android.launcher3.config.FeatureFlags.ENABLE_SCRIM_FOR_APP_LAUNCH; -import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION; import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY; import static com.android.launcher3.testing.shared.TestProtocol.WALLPAPER_OPEN_ANIMATION_FINISHED_MESSAGE; -import static com.android.launcher3.util.DisplayController.isTransientTaskbar; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.ORDERED_BG_EXECUTOR; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs; import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION; -import static com.android.launcher3.views.FloatingIconView.getFloatingIconView; -import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS; import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch; import static com.android.quickstep.util.AnimUtils.clampToDuration; import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback; +import static com.android.quickstep.util.FloatingIconViewHelper.getFloatingIconView; import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius; import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows; +import static com.android.wm.shell.Flags.enableDynamicInsetsForAppLaunch; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -77,29 +78,30 @@ import android.animation.ValueAnimator; import android.app.ActivityOptions; import android.app.WindowConfiguration; +import android.app.role.RoleManager; import android.content.ComponentName; -import android.content.Context; import android.content.res.Resources; -import android.database.ContentObserver; import android.graphics.Color; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.graphics.RectF; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.IBinder; import android.os.IRemoteCallback; import android.os.Looper; +import android.os.RemoteException; +import android.view.IRemoteAnimationRunner; +import android.window.IRemoteTransitionFinishedCallback; +import android.window.TransitionInfo; import android.os.SystemProperties; import android.os.UserHandle; import android.provider.Settings; -import android.provider.Settings.Global; +import android.util.Log; import android.util.Pair; import android.util.Size; -import android.view.CrossWindowBlurListeners; import android.view.IRemoteAnimationFinishedCallback; import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationDefinition; @@ -112,14 +114,21 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; +import android.window.DesktopModeFlags; +import android.window.IRemoteTransition; +import android.window.RemoteTransitionStub; import android.window.RemoteTransition; import android.window.TransitionFilter; +import android.window.WindowAnimationState; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.graphics.ColorUtils; +import com.android.app.animation.Animations; +import com.android.app.animation.Interpolators; import com.android.internal.jank.Cuj; +import com.android.internal.util.LatencyTracker; import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory; import com.android.launcher3.anim.AnimationSuccessListener; @@ -129,30 +138,30 @@ import com.android.launcher3.icons.FastBitmapDrawable; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.shortcuts.DeepShortcutView; -import com.android.launcher3.statehandlers.DepthController; -import com.android.launcher3.taskbar.LauncherTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator; import com.android.launcher3.testing.shared.ResourceUtils; import com.android.launcher3.touch.PagedOrientationHandler; import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.ActivityOptionsWrapper; -import com.android.launcher3.util.DynamicResource; -import com.android.launcher3.util.ObjectWrapper; import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.StableViewInfo; import com.android.launcher3.util.Themes; import com.android.launcher3.views.FloatingIconView; -import com.android.launcher3.views.ScrimView; import com.android.launcher3.widget.LauncherAppWidgetHostView; import com.android.quickstep.LauncherBackAnimationController; import com.android.quickstep.RemoteAnimationTargets; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TaskViewUtils; +import com.android.quickstep.util.AlreadyStartedBackAnimState; +import com.android.quickstep.util.AnimatorBackState; +import com.android.quickstep.util.BackAnimState; +import com.android.quickstep.util.CrossDisplayMoveTransition; import com.android.quickstep.util.MultiValueUpdateListener; import com.android.quickstep.util.RectFSpringAnim; import com.android.quickstep.util.RectFSpringAnim.DefaultSpringConfig; import com.android.quickstep.util.RectFSpringAnim.TaskbarHotseatSpringConfig; import com.android.quickstep.util.ScalingWorkspaceRevealAnim; -import com.android.quickstep.util.StaggeredWorkspaceAnim; import com.android.quickstep.util.SurfaceTransaction; import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; import com.android.quickstep.util.SurfaceTransactionApplier; @@ -165,16 +174,21 @@ import com.android.systemui.animation.LaunchableView; import com.android.systemui.animation.RemoteAnimationDelegate; import com.android.systemui.animation.RemoteAnimationRunnerCompat; +import com.android.systemui.animation.RemoteTransitionDelegate; import com.android.systemui.shared.system.BlurUtils; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import com.android.systemui.shared.system.QuickStepContract; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.startingsurface.IStartingWindowListener; import java.io.PrintWriter; import java.lang.ref.WeakReference; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; +import java.util.function.Function; import app.lawnchair.compat.LawnchairQuickstepCompat; @@ -182,9 +196,10 @@ * Manages the opening and closing app transitions from Launcher */ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener { + private static final String TAG = "QuickstepTransitionManager"; private static final boolean ENABLE_SHELL_STARTING_SURFACE = - SystemProperties.getBoolean("persist.debug.shell_starting_surface", false); + SystemProperties.getBoolean("persist.debug.shell_starting_surface", true); /** Duration of status bar animations. */ public static final int STATUS_BAR_TRANSITION_DURATION = 120; @@ -217,17 +232,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener public static final int CONTENT_ALPHA_DURATION = 217; public static final int TRANSIENT_TASKBAR_TRANSITION_DURATION = 417; + public static final int PINNED_TASKBAR_TRANSITION_DURATION = 600; public static final int TASKBAR_TO_APP_DURATION = 600; // TODO(b/236145847): Tune TASKBAR_TO_HOME_DURATION to 383 after conflict with unlock animation // is solved. private static final int TASKBAR_TO_HOME_DURATION_FAST = 300; private static final int TASKBAR_TO_HOME_DURATION_SLOW = 1000; public static final int CONTENT_SCALE_DURATION = 350; - public static final int CONTENT_SCRIM_DURATION = 350; private static final int MAX_NUM_TASKS = 5; - // Cross-fade duration between App Widget and App + // Cross-fade duration between App Widget and App when launching from widget. private static final int WIDGET_CROSSFADE_DURATION_MILLIS = 125; protected final QuickstepLauncher mLauncher; @@ -236,32 +251,30 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener protected final Handler mHandler; private final float mClosingWindowTransY; + private final float mClosingFreeformWindowTransY; private final float mMaxShadowRadius; private final StartingWindowListener mStartingWindowListener = new StartingWindowListener(this); - private ContentObserver mAnimationRemovalObserver = new ContentObserver( - ORDERED_BG_EXECUTOR.getHandler()) { - @Override - public void onChange(boolean selfChange) { - mAreAnimationsEnabled = Global.getFloat(mLauncher.getContentResolver(), - Global.ANIMATOR_DURATION_SCALE, 1f) > 0 - || Global.getFloat(mLauncher.getContentResolver(), - Global.TRANSITION_ANIMATION_SCALE, 1f) > 0; - } - }; + + // TODO(b/397690719): Investigate the memory leak from TaskStackChangeListeners#mImpl + // This is a temporary fix of memory leak b/397690719. We track registered + // {@link TaskRestartedDuringLaunchListener}, and remove them on activity destroy. + private final List mRegisteredTaskStackChangeListener = + new ArrayList<>(); private DeviceProfile mDeviceProfile; // Strong refs to runners which are cleared when the launcher activity is destroyed private RemoteAnimationFactory mWallpaperOpenRunner; private RemoteAnimationFactory mAppLaunchRunner; - private RemoteAnimationFactory mKeyguardGoingAwayRunner; private RemoteAnimationFactory mWallpaperOpenTransitionRunner; private RemoteTransition mLauncherOpenTransition; + private RemoteTransition mMoveDisplayTransition; private final RemoteAnimationCoordinateTransfer mCoordinateTransfer; + private final LatencyTracker mLatencyTracker; private LauncherBackAnimationController mBackAnimationController; private final AnimatorListenerAdapter mForceInvisibleListener = new AnimatorListenerAdapter() { @@ -279,24 +292,27 @@ public void onAnimationEnd(Animator animation) { // Pairs of window starting type and starting window background color for starting tasks // Will never be larger than MAX_NUM_TASKS private LinkedHashMap> mTaskStartParams; - private boolean mAreAnimationsEnabled = true; private final Interpolator mOpeningXInterpolator; private final Interpolator mOpeningInterpolator; - public QuickstepTransitionManager(Context context) { - mLauncher = Launcher.cast(Launcher.getLauncher(context)); + private final SystemUiProxy mSystemUiProxy; + + public QuickstepTransitionManager(QuickstepLauncher launcher) { + mLauncher = launcher; mDragLayer = mLauncher.getDragLayer(); mHandler = new Handler(Looper.getMainLooper()); mDeviceProfile = mLauncher.getDeviceProfile(); mBackAnimationController = new LauncherBackAnimationController(mLauncher, this); - checkAndMonitorIfAnimationsAreEnabled(); Resources res = mLauncher.getResources(); mClosingWindowTransY = res.getDimensionPixelSize(R.dimen.closing_window_trans_y); + mClosingFreeformWindowTransY = + res.getDimensionPixelSize(R.dimen.closing_freeform_window_trans_y); mMaxShadowRadius = res.getDimensionPixelSize(R.dimen.max_shadow_radius); mLauncher.addOnDeviceProfileChangeListener(this); + mSystemUiProxy = SystemUiProxy.INSTANCE.get(mLauncher); if (ENABLE_SHELL_STARTING_SURFACE) { mTaskStartParams = new LinkedHashMap<>(MAX_NUM_TASKS) { @@ -306,14 +322,15 @@ protected boolean removeEldestEntry(Entry> entry } }; - SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener( - mStartingWindowListener); + mSystemUiProxy.setStartingWindowListener(mStartingWindowListener); } - mOpeningXInterpolator = AnimationUtils.loadInterpolator(context, R.interpolator.app_open_x); - mOpeningInterpolator = AnimationUtils.loadInterpolator(context, - R.interpolator.emphasized_interpolator); + mOpeningXInterpolator = AnimationUtils.loadInterpolator( + launcher, R.interpolator.app_open_x); + mOpeningInterpolator = AnimationUtils.loadInterpolator( + launcher, R.interpolator.emphasized_interpolator); mCoordinateTransfer = new RemoteAnimationCoordinateTransfer(mLauncher); + mLatencyTracker = LatencyTracker.getInstance(launcher); } @Override @@ -322,11 +339,31 @@ public void onDeviceProfileChanged(DeviceProfile dp) { var item = new RemoteAnimationTarget[0]; } + private void startCrossDisplayMoveAnimation(TransitionInfo info, SurfaceControl.Transaction t, + IRemoteTransitionFinishedCallback finishCallback) { + mHandler.post(() -> { + new CrossDisplayMoveTransition(mLauncher, APP_LAUNCH_DURATION, + CLOSING_TRANSITION_DURATION_MS) + .startCrossDisplayMoveAnimation(info, t, finishCallback); + }); + } + + /** + * A {@link RemoteTransitionStub} that handles cross display move animations. + */ + private class MoveDisplayChangeRunner extends RemoteTransitionStub { + @Override + public void startAnimation(IBinder token, TransitionInfo info, SurfaceControl.Transaction t, + IRemoteTransitionFinishedCallback finishCallback) throws RemoteException { + startCrossDisplayMoveAnimation(info, t, finishCallback); + } + } + /** * @return ActivityOptions with remote animations that controls how the window of the opening * targets are displayed. */ - public ActivityOptionsWrapper getActivityLaunchOptions(View v) { + public ActivityOptionsWrapper getActivityLaunchOptions(View v, ItemInfo itemInfo) { boolean fromRecents = isLaunchingFromRecents(v, null /* targets */); RunnableList onEndCallback = new RunnableList(); @@ -334,19 +371,19 @@ public ActivityOptionsWrapper getActivityLaunchOptions(View v) { TaskRestartedDuringLaunchListener restartedListener = new TaskRestartedDuringLaunchListener(); restartedListener.register(onEndCallback::executeAllAndDestroy); - onEndCallback.add(restartedListener::unregister); - - mAppLaunchRunner = new AppLaunchAnimationRunner(v, onEndCallback); - ItemInfo tag = (ItemInfo) v.getTag(); - if (tag != null && tag.shouldUseBackgroundAnimation()) { - ContainerAnimationRunner containerAnimationRunner = ContainerAnimationRunner.from( - v, mLauncher, mStartingWindowListener, onEndCallback); - if (containerAnimationRunner != null) { - mAppLaunchRunner = containerAnimationRunner; + mRegisteredTaskStackChangeListener.add(restartedListener); + onEndCallback.add(new Runnable() { + @Override + public void run() { + restartedListener.unregister(); + mRegisteredTaskStackChangeListener.remove(restartedListener); } - } - RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner( - mHandler, mAppLaunchRunner, true /* startAtFrontOfQueue */); + }); + + RemoteAnimationRunnerCompat appLaunchRunner = createAppLaunchRunner( + v, onEndCallback); + IRemoteTransition appLaunchRemoteTransition = createAppLaunchRemoteTransition( + appLaunchRunner); // Note that this duration is a guess as we do not know if the animation will be a // recents launch or not for sure until we know the opening app targets. @@ -356,17 +393,87 @@ public ActivityOptionsWrapper getActivityLaunchOptions(View v) { long statusBarTransitionDelay = duration - STATUS_BAR_TRANSITION_DURATION - STATUS_BAR_TRANSITION_PRE_DELAY; - ActivityOptions options = LawnchairQuickstepCompat.getActivityOptionsCompat().makeRemoteAnimation( - new RemoteAnimationAdapter(runner, duration, statusBarTransitionDelay), - LawnchairQuickstepCompat.getRemoteTransitionCompat().getRemoteTransition(runner.toRemoteTransition(), - mLauncher.getIApplicationThread(), "QuickstepLaunch"), + ActivityOptions options = LawnchairQuickstepCompat.getActivityOptionsCompat().makeRemoteAnimation( + new RemoteAnimationAdapter(appLaunchRunner, duration, statusBarTransitionDelay), + LawnchairQuickstepCompat.getRemoteTransitionCompat().getRemoteTransition(appLaunchRemoteTransition, mLauncher.getIApplicationThread(), + "QuickstepLaunch"), "Lawnchair"); - IRemoteCallback endCallback = completeRunnableListCallback(onEndCallback); + IRemoteCallback endCallback = completeRunnableListCallback(onEndCallback, mLauncher); options.setOnAnimationAbortListener(endCallback); options.setOnAnimationFinishedListener(endCallback); + options.setLaunchCookie(StableViewInfo.toLaunchCookie(itemInfo)); + + // Prepare taskbar for animation synchronization. This needs to happen here before any + // app transition is created. + TaskbarInteractor taskbarInteractor = mLauncher.getTaskbarInteractor(); + if (syncAppLaunchWithTaskbarStash() + && mLauncher.getStateManager().getState() == NORMAL + && taskbarInteractor != null) { + taskbarInteractor.setIgnoreInAppFlagForSync(true); + mLauncher.addEventCallback(EVENT_DESTROYED, onEndCallback::executeAllAndDestroy); + onEndCallback.add(() -> { + taskbarInteractor.setIgnoreInAppFlagForSync(false); + }); + } + return new ActivityOptionsWrapper(options, onEndCallback); } + /** + * Selects the appropriate type of launch runner for the given view, builds it, and returns it. + * {@link QuickstepTransitionManager#mAppLaunchRunner} is updated as a by-product of this + * method. + */ + private RemoteAnimationRunnerCompat createAppLaunchRunner(View v, RunnableList onEndCallback) { + ItemInfo tag = (ItemInfo) v.getTag(); + ContainerAnimationRunner containerRunner = null; + if (tag != null && tag.shouldUseBackgroundAnimation()) { + containerRunner = ContainerAnimationRunner.fromView( + v, true /* forLaunch */, mLauncher, mStartingWindowListener, onEndCallback, + null /* windowState */); + } + + mAppLaunchRunner = containerRunner != null + ? containerRunner : new AppLaunchAnimationRunner(v, onEndCallback); + return new LauncherAnimationRunner( + mHandler, mAppLaunchRunner, true /* startAtFrontOfQueue */); + } + + /** + * Creates a remote transition for app launches. + * + * The app launch runner picks an animation based on the view type (e.g. icon, widget). + * + * However, for cross-display moves, we need to pick a different animation based on the + * (dynamic) TransitionInfo content. This is controlled by the + * enableCrossDisplaysAppLaunchTransition flag. + * + * If the flag is enabled, the returned transition will: + * 1. Check if the transition is a cross-display move, and if so, use the cross-display + * animation. + * 2. Otherwise, use the default app launch animation from the runner. + * + * If the flag is disabled, this will always return the default app launch animation. + */ + private IRemoteTransition createAppLaunchRemoteTransition( + RemoteAnimationRunnerCompat appLaunchRunner) { + IRemoteTransition defaultAppLaunchTransition = appLaunchRunner.toRemoteTransition(); + if (!com.android.window.flags.Flags.enableCrossDisplaysAppLaunchTransition()) { + return defaultAppLaunchTransition; + } + + IRemoteTransition crossDisplayMoveTransition = new MoveDisplayChangeRunner(); + return new RemoteTransitionDelegate( + (info) -> { + if (CrossDisplayMoveTransition.isCrossDisplayMove(info)) { + Log.d(TAG, "Handling launch as a cross display move transition"); + return crossDisplayMoveTransition; + } else { + return defaultAppLaunchTransition; + } + }); + } + /** * Whether the launch is a recents app transition and we should do a launch animation * from the recents view. Note that if the remote animation targets are not provided, this @@ -378,7 +485,7 @@ public ActivityOptionsWrapper getActivityLaunchOptions(View v) { * @return true if the app is launching from recents, false if it most likely is not */ protected boolean isLaunchingFromRecents(@NonNull View v, - @Nullable RemoteAnimationTarget[] targets) { + @Nullable RemoteAnimationTarget[] targets) { return mLauncher.getStateManager().getState().isRecentsViewVisible && findTaskViewToLaunch(mLauncher.getOverviewPanel(), v, targets) != null; } @@ -392,12 +499,13 @@ protected boolean isLaunchingFromRecents(@NonNull View v, * @param launcherClosing true if the launcher app is closing */ protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v, - @NonNull RemoteAnimationTarget[] appTargets, - @NonNull RemoteAnimationTarget[] wallpaperTargets, - @NonNull RemoteAnimationTarget[] nonAppTargets, boolean launcherClosing) { + @NonNull RemoteAnimationTarget[] appTargets, + @NonNull RemoteAnimationTarget[] wallpaperTargets, + @NonNull RemoteAnimationTarget[] nonAppTargets, boolean launcherClosing) { TaskViewUtils.composeRecentsLaunchAnimator(anim, v, appTargets, wallpaperTargets, nonAppTargets, launcherClosing, mLauncher.getStateManager(), - mLauncher.getOverviewPanel(), mLauncher.getDepthController()); + mLauncher.getOverviewPanel(), mLauncher.getDepthController(), + /* transitionInfo= */ null, /* appearedTaskId= */ INVALID_TASK_ID); } private boolean areAllTargetsTranslucent(@NonNull RemoteAnimationTarget[] targets) { @@ -421,10 +529,10 @@ private boolean areAllTargetsTranslucent(@NonNull RemoteAnimationTarget[] target * @param launcherClosing true if launcher is closing */ private void composeIconLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v, - @NonNull RemoteAnimationTarget[] appTargets, - @NonNull RemoteAnimationTarget[] wallpaperTargets, - @NonNull RemoteAnimationTarget[] nonAppTargets, - boolean launcherClosing) { + @NonNull RemoteAnimationTarget[] appTargets, + @NonNull RemoteAnimationTarget[] wallpaperTargets, + @NonNull RemoteAnimationTarget[] nonAppTargets, + boolean launcherClosing) { // Set the state animation first so that any state listeners are called // before our internal listeners. mLauncher.getStateManager().setCurrentAnimation(anim); @@ -467,14 +575,16 @@ private void composeWidgetLaunchAnimator( * figure out where the floating view should animate to. */ private Rect getWindowTargetBounds(@NonNull RemoteAnimationTarget[] appTargets, - int rotationChange) { + int rotationChange) { RemoteAnimationTarget target = null; for (RemoteAnimationTarget t : appTargets) { if (t.mode != MODE_OPENING) continue; target = t; break; } - if (target == null) return new Rect(0, 0, mDeviceProfile.widthPx, mDeviceProfile.heightPx); + final int widthPx = mDeviceProfile.getDeviceProperties().getWidthPx(); + final int heightPx = mDeviceProfile.getDeviceProperties().getHeightPx(); + if (target == null) return new Rect(0, 0, widthPx, heightPx); final Rect bounds = new Rect(target.screenSpaceBounds); if (target.localBounds != null) { bounds.set(target.localBounds); @@ -484,19 +594,13 @@ private Rect getWindowTargetBounds(@NonNull RemoteAnimationTarget[] appTargets, if (rotationChange != 0) { if ((rotationChange % 2) == 1) { // undoing rotation, so our "original" parent size is actually flipped - Utilities.rotateBounds(bounds, mDeviceProfile.heightPx, mDeviceProfile.widthPx, + Utilities.rotateBounds(bounds, heightPx, widthPx, 4 - rotationChange); } else { - Utilities.rotateBounds(bounds, mDeviceProfile.widthPx, mDeviceProfile.heightPx, + Utilities.rotateBounds(bounds, widthPx, heightPx, 4 - rotationChange); } } - if (mDeviceProfile.isTaskbarPresentInApps - && !target.willShowImeOnTarget - && !isTransientTaskbar(mLauncher)) { - // Animate to above the taskbar. - bounds.bottom -= target.contentInsets.bottom; - } return bounds; } @@ -512,7 +616,7 @@ public void dump(@NonNull String prefix, @NonNull PrintWriter printWriter) {} * @param skipAllAppsScale True if we want to avoid scaling All Apps */ private Pair getLauncherContentAnimator(boolean isAppOpening, - int startDelay, boolean skipAllAppsScale) { + int startDelay, boolean skipAllAppsScale) { AnimatorSet launcherAnimator = new AnimatorSet(); Runnable endListener; @@ -521,8 +625,8 @@ private Pair getLauncherContentAnimator(boolean isAppOpen : new float[]{0, 1}; float[] scales = isAppOpening - ? new float[]{1, mDeviceProfile.workspaceContentScale} - : new float[]{mDeviceProfile.workspaceContentScale, 1}; + ? new float[]{1, mDeviceProfile.mWorkspaceProfile.getWorkspaceContentScale()} + : new float[]{mDeviceProfile.mWorkspaceProfile.getWorkspaceContentScale(), 1}; // Pause expensive view updates as they can lead to layer thrashing and skipped frames. mLauncher.pauseExpensiveViewUpdates(); @@ -532,7 +636,8 @@ private Pair getLauncherContentAnimator(boolean isAppOpen final View appsView = mLauncher.getAppsView(); final float startAlpha = appsView.getAlpha(); final float startScale = SCALE_PROPERTY.get(appsView); - if (mDeviceProfile.isTablet) { + if (mDeviceProfile.getDeviceProperties().isTablet()) { + // AllApps should not fade at all in tablets. alphas = new float[]{1, 1}; } @@ -569,57 +674,50 @@ public void onAnimationEnd(Animator animation) { endListener = composeViewContentAnimator(launcherAnimator, alphas, scales); } else { List viewsToAnimate = new ArrayList<>(); - Workspace workspace = mLauncher.getWorkspace(); - workspace.forEachVisiblePage( - view -> viewsToAnimate.add(((CellLayout) view).getShortcutsAndWidgets())); + viewsToAnimate.add(mLauncher.getWorkspace()); + Hotseat hotseat = mLauncher.getHotseat(); // Do not scale hotseat as a whole when taskbar is present, and scale QSB only if it's // not inline. if (mDeviceProfile.isTaskbarPresent) { if (!mDeviceProfile.isQsbInline) { - viewsToAnimate.add(mLauncher.getHotseat().getQsb()); + viewsToAnimate.add(hotseat.getQsb()); } } else { - viewsToAnimate.add(mLauncher.getHotseat()); + viewsToAnimate.add(hotseat); } viewsToAnimate.forEach(view -> { view.setLayerType(View.LAYER_TYPE_HARDWARE, null); - ObjectAnimator scaleAnim = ObjectAnimator.ofFloat(view, SCALE_PROPERTY, scales) + // Start the animation from the current value, instead of assuming the views are + // in their resting state, so interrupted animations merge seamlessly. + // TODO(b/367591368): ideally these animations would be refactored to be + // controlled centrally so each instances doesn't need to care about this + // coordination. + float[] scale = new float[]{view.getScaleX(), scales[1]}; + + // Cancel any ongoing animations. This is necessary to avoid a conflict between + // e.g. the unfinished animation triggered when closing an app back to Home and + // this animation caused by a launch. + Animations.Companion.cancelOngoingAnimation(view); + // Make sure to cache the current animation, so it can be properly interrupted. + Animations.Companion.setOngoingAnimation(view, launcherAnimator); + + ObjectAnimator scaleAnim = ObjectAnimator.ofFloat(view, SCALE_PROPERTY, scale) .setDuration(CONTENT_SCALE_DURATION); scaleAnim.setInterpolator(DECELERATE_1_5); launcherAnimator.play(scaleAnim); }); - final boolean scrimEnabled = ENABLE_SCRIM_FOR_APP_LAUNCH.get(); - if (scrimEnabled) { - int scrimColor = Themes.getAttrColor(mLauncher, R.attr.overviewScrimColor); - int scrimColorTrans = ColorUtils.setAlphaComponent(scrimColor, 0); - int[] colors = isAppOpening - ? new int[]{scrimColorTrans, scrimColor} - : new int[]{scrimColor, scrimColorTrans}; - ScrimView scrimView = mLauncher.getScrimView(); - if (scrimView.getBackground() instanceof ColorDrawable) { - scrimView.setBackgroundColor(colors[0]); - - ObjectAnimator scrim = ObjectAnimator.ofArgb(scrimView, VIEW_BACKGROUND_COLOR, - colors); - scrim.setDuration(CONTENT_SCRIM_DURATION); - scrim.setInterpolator(DECELERATE_1_5); - - launcherAnimator.play(scrim); - } - } - endListener = () -> { viewsToAnimate.forEach(view -> { SCALE_PROPERTY.set(view, 1f); view.setLayerType(View.LAYER_TYPE_NONE, null); + + // Reset the cached animation. + Animations.Companion.setOngoingAnimation(view, null /* animation */); }); - if (scrimEnabled) { - mLauncher.getScrimView().setBackgroundColor(Color.TRANSPARENT); - } mLauncher.resumeExpensiveViewUpdates(); }; } @@ -637,7 +735,7 @@ public void onAnimationEnd(Animator animation) { * @return listener to run when the animation ends */ protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim, - float[] alphas, float[] scales) { + float[] alphas, float[] scales) { RecentsView overview = mLauncher.getOverviewPanel(); ObjectAnimator alpha = ObjectAnimator.ofFloat(overview, RecentsView.CONTENT_ALPHA, alphas); @@ -659,30 +757,47 @@ protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim, }; } + private boolean shouldCropToInset(RemoteAnimationTarget target) { + return enableDynamicInsetsForAppLaunch() + && mDeviceProfile.isTaskbarPresent + && mDeviceProfile.isTaskbarPresentInApps + && target != null && !target.willShowImeOnTarget + && !isTransientTaskbar(); + } + /** * @return Animator that controls the window of the opening targets from app icons. */ private Animator getOpeningWindowAnimators(View v, - RemoteAnimationTarget[] appTargets, - RemoteAnimationTarget[] wallpaperTargets, - RemoteAnimationTarget[] nonAppTargets, - boolean launcherClosing) { + RemoteAnimationTarget[] appTargets, + RemoteAnimationTarget[] wallpaperTargets, + RemoteAnimationTarget[] nonAppTargets, + boolean launcherClosing) { + RemoteAnimationTargets openingTargets = new RemoteAnimationTargets(appTargets, + wallpaperTargets, nonAppTargets, MODE_OPENING); int rotationChange = getRotationChange(appTargets); Rect windowTargetBounds = getWindowTargetBounds(appTargets, rotationChange); + final int[] bottomInsetPos = new int[]{ + mSystemUiProxy.getHomeVisibilityState().getNavbarInsetPosition()}; + final RemoteAnimationTarget target = openingTargets.getFirstAppTarget(); + final boolean cropToInset = shouldCropToInset(target); + if (cropToInset) { + // Animate to above the taskbar. + windowTargetBounds.bottom = Math.min(bottomInsetPos[0], + windowTargetBounds.bottom); + } boolean appTargetsAreTranslucent = areAllTargetsTranslucent(appTargets); RectF launcherIconBounds = new RectF(); FloatingIconView floatingView = getFloatingIconView(mLauncher, v, - (mLauncher.getTaskbarUIController() == null || !isTransientTaskbar(mLauncher)) + (mLauncher.getTaskbarInteractor() == null || !isTransientTaskbar()) ? null - : mLauncher.getTaskbarUIController().findMatchingView(v), + : mLauncher.getTaskbarInteractor().findMatchingAsyncView(v), null /* fadeOutView */, !appTargetsAreTranslucent, launcherIconBounds, true /* isOpening */); Rect crop = new Rect(); Matrix matrix = new Matrix(); - RemoteAnimationTargets openingTargets = new RemoteAnimationTargets(appTargets, - wallpaperTargets, nonAppTargets, MODE_OPENING); SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(floatingView); openingTargets.addReleaseCheck(surfaceApplier); @@ -725,8 +840,7 @@ private Animator getOpeningWindowAnimators(View v, appAnimator.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { - LauncherTaskbarUIController taskbarController = mLauncher.getTaskbarUIController(); - if (taskbarController != null && taskbarController.shouldShowEduOnAppLaunch()) { + if (shouldShowEduOnAppLaunch()) { // LAUNCHER_TASKBAR_EDUCATION_SHOWING is set to true here, when the education // flow is about to start, to avoid a race condition with other components // that would show something else to the user as soon as the app is opened. @@ -740,19 +854,38 @@ public void onAnimationEnd(Animator animation) { if (v instanceof BubbleTextView) { ((BubbleTextView) v).setStayPressed(false); } - LauncherTaskbarUIController taskbarController = mLauncher.getTaskbarUIController(); - if (taskbarController != null) { - taskbarController.showEduOnAppLaunch(); + TaskbarInteractor taskbarInteractor = mLauncher.getTaskbarInteractor(); + if (taskbarInteractor != null) { + taskbarInteractor.showEduOnAppLaunch(); } openingTargets.release(); } + + private boolean shouldShowEduOnAppLaunch() { + if (refactorTaskbarUiState()) { + final boolean ret = newShouldShowEduOnAppLaunch(); + if (BuildConfigs.IS_STUDIO_BUILD && ret != legacyShouldShowEduOnAppLaunch()) { + throw new IllegalStateException("shouldShowEduOnAppLaunch() doesn't match"); + } + return ret; + } else { + return legacyShouldShowEduOnAppLaunch(); + } + } + + private boolean legacyShouldShowEduOnAppLaunch() { + return mLauncher.getTaskbarInteractor() != null + && mLauncher.getTaskbarInteractor().shouldShowEduOnAppLaunch(); + } + + private boolean newShouldShowEduOnAppLaunch() { + return mLauncher.getTaskbarUiState().getShouldShowEduOnAppLaunchRef().getValue(); + } }); final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources()) ? Math.max(crop.width(), crop.height()) / 2f : 0f; - final float finalWindowRadius = mDeviceProfile.isMultiWindowMode - ? 0 : getWindowCornerRadius(mLauncher); final float finalShadowRadius = appTargetsAreTranslucent ? 0 : mMaxShadowRadius; MultiValueUpdateListener listener = new MultiValueUpdateListener() { @@ -765,8 +898,8 @@ public void onAnimationEnd(Animator animation) { clampToDuration(LINEAR, APP_LAUNCH_ALPHA_START_DELAY, APP_LAUNCH_ALPHA_DURATION, APP_LAUNCH_DURATION)); - FloatProp mWindowRadius = new FloatProp(initialWindowRadius, finalWindowRadius, - mOpeningInterpolator); + FloatProp mWindowRadius = new FloatProp(initialWindowRadius, + getWindowCornerRadius(mLauncher), mOpeningInterpolator); FloatProp mShadowRadius = new FloatProp(0, finalShadowRadius, mOpeningInterpolator); @@ -788,6 +921,39 @@ public void onAnimationEnd(Animator animation) { @Override public void onUpdate(float percent, boolean initOnly) { + if (cropToInset && bottomInsetPos[0] != mSystemUiProxy.getHomeVisibilityState() + .getNavbarInsetPosition()) { + final RemoteAnimationTarget target = openingTargets.getFirstAppTarget(); + bottomInsetPos[0] = mSystemUiProxy.getHomeVisibilityState() + .getNavbarInsetPosition(); + final Rect bounds = target != null + ? target.screenSpaceBounds : windowTargetBounds; + // Animate to above the taskbar. + int bottomLevel = Math.min(bottomInsetPos[0], bounds.bottom); + windowTargetBounds.bottom = bottomLevel; + final int endHeight = bottomLevel - bounds.top; + + AnimOpenProperties prop = new AnimOpenProperties(mLauncher.getResources(), + mDeviceProfile, windowTargetBounds, launcherIconBounds, v, + dragLayerBounds[0], dragLayerBounds[1], hasSplashScreen, + floatingView.isDifferentFromAppIcon()); + mCropRectCenterY = new FloatProp(prop.cropCenterYStart, prop.cropCenterYEnd, + mOpeningInterpolator); + mCropRectHeight = new FloatProp(prop.cropHeightStart, prop.cropHeightEnd, + mOpeningInterpolator); + mDy = new FloatProp(0, prop.dY, mOpeningInterpolator); + mIconScaleToFitScreen = new FloatProp(prop.initialAppIconScale, + prop.finalAppIconScale, mOpeningInterpolator); + float interpolatedPercent = mOpeningInterpolator.getInterpolation(percent); + mCropRectHeight.value = Utilities.mapRange(interpolatedPercent, + prop.cropHeightStart, prop.cropHeightEnd); + mCropRectCenterY.value = Utilities.mapRange(interpolatedPercent, + prop.cropCenterYStart, prop.cropCenterYEnd); + mDy.value = Utilities.mapRange(interpolatedPercent, 0, prop.dY); + mIconScaleToFitScreen.value = Utilities.mapRange(interpolatedPercent, + prop.initialAppIconScale, prop.finalAppIconScale); + } + // Calculate the size of the scaled icon. float iconWidth = launcherIconBounds.width() * mIconScaleToFitScreen.value; float iconHeight = launcherIconBounds.height() * mIconScaleToFitScreen.value; @@ -801,8 +967,8 @@ public void onUpdate(float percent, boolean initOnly) { final int windowCropWidth = crop.width(); final int windowCropHeight = crop.height(); if (rotationChange != 0) { - Utilities.rotateBounds(crop, mDeviceProfile.widthPx, - mDeviceProfile.heightPx, rotationChange); + Utilities.rotateBounds(crop, mDeviceProfile.getDeviceProperties().getWidthPx(), + mDeviceProfile.getDeviceProperties().getHeightPx(), rotationChange); } // Scale the size of the icon to match the size of the window crop. @@ -849,14 +1015,14 @@ public void onUpdate(float percent, boolean initOnly) { matrix.setScale(scale, scale); if (rotationChange == 1) { matrix.postTranslate(windowTransY0, - mDeviceProfile.widthPx - (windowTransX0 + scaledCropWidth)); + mDeviceProfile.getDeviceProperties().getWidthPx() - (windowTransX0 + scaledCropWidth)); } else if (rotationChange == 2) { matrix.postTranslate( - mDeviceProfile.widthPx - (windowTransX0 + scaledCropWidth), - mDeviceProfile.heightPx - (windowTransY0 + scaledCropHeight)); + mDeviceProfile.getDeviceProperties().getWidthPx() - (windowTransX0 + scaledCropWidth), + mDeviceProfile.getDeviceProperties().getHeightPx() - (windowTransY0 + scaledCropHeight)); } else if (rotationChange == 3) { matrix.postTranslate( - mDeviceProfile.heightPx - (windowTransY0 + scaledCropHeight), + mDeviceProfile.getDeviceProperties().getHeightPx() - (windowTransY0 + scaledCropHeight), windowTransX0); } else { matrix.postTranslate(windowTransX0, windowTransY0); @@ -923,10 +1089,14 @@ public void onUpdate(float percent, boolean initOnly) { return animatorSet; } + private boolean isTransientTaskbar() { + return TaskbarFeatureEvaluator.INSTANCE.get(mLauncher).isTransient(); + } + private Animator getOpeningWindowAnimatorsForWidget(LauncherAppWidgetHostView v, - RemoteAnimationTarget[] appTargets, - RemoteAnimationTarget[] wallpaperTargets, - RemoteAnimationTarget[] nonAppTargets, boolean launcherClosing) { + RemoteAnimationTarget[] appTargets, + RemoteAnimationTarget[] wallpaperTargets, + RemoteAnimationTarget[] nonAppTargets, boolean launcherClosing) { Rect windowTargetBounds = getWindowTargetBounds(appTargets, getRotationChange(appTargets)); boolean appTargetsAreTranslucent = areAllTargetsTranslucent(appTargets); @@ -948,8 +1118,7 @@ private Animator getOpeningWindowAnimatorsForWidget(LauncherAppWidgetHostView v, FloatingWidgetView.getDefaultBackgroundColor(mLauncher, openingTarget); } - final float finalWindowRadius = mDeviceProfile.isMultiWindowMode - ? 0 : getWindowCornerRadius(mLauncher); + final float finalWindowRadius = getWindowCornerRadius(mLauncher); final FloatingWidgetView floatingView = FloatingWidgetView.getFloatingWidgetView(mLauncher, v, widgetBackgroundBounds, new Size(windowTargetBounds.width(), windowTargetBounds.height()), @@ -1063,18 +1232,23 @@ public void onUpdate(float percent, boolean initOnly) { return animatorSet; } - /** - * Returns animator that controls depth/blur of the background. - */ - private ObjectAnimator getBackgroundAnimator() { + /** Returns animator that controls depth/blur of the background during app/widget opening. */ + private Animator getBackgroundAnimator() { + if (Flags.allAppsBlur()) { + // Don't animate/blur the background for this launch, regardless of the launcher state. + // We have too many performance issues with the blur. + return new AnimatorSet(); + } + // When launching an app from overview that doesn't map to a task, we still want to just // blur the wallpaper instead of the launcher surface as well - boolean allowBlurringLauncher = mLauncher.getStateManager().getState() != OVERVIEW - && BlurUtils.supportsBlursOnWindows(); + LauncherState launcherState = mLauncher.getStateManager().getState(); + boolean allowBlurringLauncher = + launcherState != OVERVIEW && BlurUtils.supportsBlursOnWindows(mLauncher.getApplicationContext()); - LaunchDepthController depthController = new LaunchDepthController(mLauncher); - ObjectAnimator backgroundRadiusAnim = ObjectAnimator.ofFloat(depthController.stateDepth, - MULTI_PROPERTY_VALUE, BACKGROUND_APP.getDepth(mLauncher)) + ObjectAnimator backgroundRadiusAnim = ObjectAnimator.ofFloat( + mLauncher.getDepthController().stateDepth, MULTI_PROPERTY_VALUE, + BACKGROUND_APP.getDepth(mLauncher)) .setDuration(APP_LAUNCH_DURATION); if (allowBlurringLauncher) { @@ -1096,18 +1270,14 @@ private ObjectAnimator getBackgroundAnimator() { .setEffectLayer() .build(); - backgroundRadiusAnim.addListener(AnimatorListeners.forEndCallback(() -> - new SurfaceControl.Transaction().remove(dimLayer).apply())); + backgroundRadiusAnim.addListener(AnimatorListeners.forEndCallback(() -> { + // Use try-with-resources to ensure the transaction gets closed. + try (SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()) { + transaction.remove(dimLayer).apply(); + } + })); } - backgroundRadiusAnim.addListener( - AnimatorListeners.forEndCallback(() -> { - // reset the depth to match the main depth controller's depth - depthController.stateDepth - .setValue(mLauncher.getDepthController().stateDepth.getValue()); - depthController.dispose(); - })); - return backgroundRadiusAnim; } @@ -1123,7 +1293,7 @@ public void registerRemoteAnimations() { try { mLauncher.registerRemoteAnimations(definition); } catch (Throwable t) { - // Ignore + // LC-Ignored } } @@ -1132,39 +1302,25 @@ public void registerRemoteAnimations() { * additional animations. */ private void addRemoteAnimations(RemoteAnimationDefinition definition) { - mWallpaperOpenRunner = createWallpaperOpenRunner(false /* fromUnlock */); + mWallpaperOpenRunner = new WallpaperOpenLauncherAnimationRunner(); definition.addRemoteAnimation(WindowManager.TRANSIT_OLD_WALLPAPER_OPEN, WindowConfiguration.ACTIVITY_TYPE_STANDARD, new RemoteAnimationAdapter( new LauncherAnimationRunner(mHandler, mWallpaperOpenRunner, false /* startAtFrontOfQueue */), CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */)); - - if (KEYGUARD_ANIMATION.get()) { - mKeyguardGoingAwayRunner = createWallpaperOpenRunner(true /* fromUnlock */); - definition.addRemoteAnimation( - WindowManager.TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER, - new RemoteAnimationAdapter( - new LauncherAnimationRunner( - mHandler, mKeyguardGoingAwayRunner, - true /* startAtFrontOfQueue */), - CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */)); - } } /** * Registers remote animations used when closing apps to home screen. */ public void registerRemoteTransitions() { - if (SEPARATE_RECENTS_ACTIVITY.get() && !Utilities.ATLEAST_T) { + SystemUiProxy.INSTANCE.get(mLauncher).shareTransactionQueue(); + if (SEPARATE_RECENTS_ACTIVITY.get()) { return; } - if (ENABLE_SHELL_TRANSITIONS) { - SystemUiProxy.INSTANCE.get(mLauncher).shareTransactionQueue(); - } - - mWallpaperOpenTransitionRunner = createWallpaperOpenRunner(false /* fromUnlock */); + mWallpaperOpenTransitionRunner = new WallpaperOpenLauncherAnimationRunner(); mLauncherOpenTransition = LawnchairQuickstepCompat.getRemoteTransitionCompat().getRemoteTransition( new LauncherAnimationRunner(mHandler, mWallpaperOpenTransitionRunner, false /* startAtFrontOfQueue */).toRemoteTransition(), @@ -1173,20 +1329,56 @@ public void registerRemoteTransitions() { TransitionFilter homeCheck = new TransitionFilter(); // No need to handle the transition that also dismisses keyguard. homeCheck.mNotFlags = TRANSIT_FLAG_KEYGUARD_GOING_AWAY; + homeCheck.mRequirements = new TransitionFilter.Requirement[]{new TransitionFilter.Requirement(), + new TransitionFilter.Requirement(), new TransitionFilter.Requirement()}; + homeCheck.mRequirements[0].mActivityType = ACTIVITY_TYPE_HOME; homeCheck.mRequirements[0].mTopActivity = mLauncher.getComponentName(); homeCheck.mRequirements[0].mModes = new int[]{TRANSIT_OPEN, TRANSIT_TO_FRONT}; - homeCheck.mRequirements[0].mOrder = CONTAINER_ORDER_TOP; + if (!com.android.window.flags.Flags.polishCloseWallpaperIncludesOpenChange()) { + homeCheck.mRequirements[0].mOrder = CONTAINER_ORDER_TOP; + } + homeCheck.mRequirements[1].mActivityType = ACTIVITY_TYPE_STANDARD; homeCheck.mRequirements[1].mModes = new int[]{TRANSIT_CLOSE, TRANSIT_TO_BACK}; + + homeCheck.mRequirements[2].mNot = true; + homeCheck.mRequirements[2].mCustomAnimation = true; + homeCheck.mRequirements[2].mMustBeTask = true; + homeCheck.mRequirements[2].mMustBeIndependent = true; + SystemUiProxy.INSTANCE.get(mLauncher) .registerRemoteTransition(mLauncherOpenTransition, homeCheck); if (mBackAnimationController != null) { mBackAnimationController.registerComponentCallbacks(); - mBackAnimationController.registerBackCallbacks(mHandler); + if (isHomeRoleHeld()) { + mBackAnimationController.registerBackCallbacks(mHandler); + } + } + + /* + * For cross-display moves, moving to the default display is handled by the LaunchOptions + * transition setup, which forwards to AppLaunchRemoteAnimationRunner. However, if the + * launch happens via a different means (e.g. desktop mode), we also need to handle the + * cross-display move via a remote transition. + */ + if (com.android.window.flags.Flags.enableCrossDisplaysAppLaunchTransition()) { + mMoveDisplayTransition = new RemoteTransition(new MoveDisplayChangeRunner(), + mLauncher.getIApplicationThread(), "QuickstepDisplayMove"); + TransitionFilter changeCheck = new TransitionFilter(); + changeCheck.mRequirements = new TransitionFilter.Requirement[]{ + new TransitionFilter.Requirement()}; + changeCheck.mRequirements[0].mModes = new int[]{TRANSIT_CHANGE}; + changeCheck.mRequirements[0].mMustBeTask = true; + // (TRANSIT_CHANGE is never independent.) + changeCheck.mRequirements[0].mMustBeIndependent = false; + changeCheck.mRequirements[0].mActivityType = ACTIVITY_TYPE_STANDARD; + changeCheck.mRequirements[0].mIsCrossDisplayMove = true; + SystemUiProxy.INSTANCE.get(mLauncher) + .registerRemoteTransition(mMoveDisplayTransition, changeCheck); } } @@ -1195,8 +1387,28 @@ public void onActivityDestroyed() { unregisterRemoteTransitions(); mLauncher.removeOnDeviceProfileChangeListener(this); SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener(null); - ORDERED_BG_EXECUTOR.execute(() -> mLauncher.getContentResolver() - .unregisterContentObserver(mAnimationRemovalObserver)); + if (BuildConfigs.IS_STUDIO_BUILD && !mRegisteredTaskStackChangeListener.isEmpty()) { + Log.e(TAG, "IllegalState: Failed to run onEndCallback created from" + + " getActivityLaunchOptions()"); + } + mRegisteredTaskStackChangeListener.forEach(TaskRestartedDuringLaunchListener::unregister); + mRegisteredTaskStackChangeListener.clear(); + } + + /** + * Called when the overview-target changes. Updates the back callback registration state. + */ + public void onOverviewTargetChange() { + if (isHomeRoleHeld()) { + mBackAnimationController.registerBackCallbacks(mHandler); + } else { + mBackAnimationController.unregisterBackCallbacks(); + } + } + + private boolean isHomeRoleHeld() { + RoleManager roleManager = mLauncher.getSystemService(RoleManager.class); + return roleManager == null || roleManager.isRoleHeld(ROLE_HOME); } private void unregisterRemoteAnimations() { @@ -1209,13 +1421,10 @@ private void unregisterRemoteAnimations() { // definition so we don't have to wait for the system gc mWallpaperOpenRunner = null; mAppLaunchRunner = null; - mKeyguardGoingAwayRunner = null; } protected void unregisterRemoteTransitions() { - if (ENABLE_SHELL_TRANSITIONS) { - SystemUiProxy.INSTANCE.get(mLauncher).unshareTransactionQueue(); - } + SystemUiProxy.INSTANCE.get(mLauncher).unshareTransactionQueue(); if (SEPARATE_RECENTS_ACTIVITY.get()) { return; } @@ -1224,6 +1433,11 @@ protected void unregisterRemoteTransitions() { mLauncherOpenTransition); mLauncherOpenTransition = null; mWallpaperOpenTransitionRunner = null; + if (mMoveDisplayTransition != null) { + SystemUiProxy.INSTANCE.get(mLauncher) + .unregisterRemoteTransition(mMoveDisplayTransition); + mMoveDisplayTransition = null; + } if (mBackAnimationController != null) { mBackAnimationController.unregisterBackCallbacks(); mBackAnimationController.unregisterComponentCallbacks(); @@ -1231,17 +1445,6 @@ protected void unregisterRemoteTransitions() { } } - private void checkAndMonitorIfAnimationsAreEnabled() { - ORDERED_BG_EXECUTOR.execute(() -> { - mAnimationRemovalObserver.onChange(true); - mLauncher.getContentResolver().registerContentObserver(Global.getUriFor( - Global.ANIMATOR_DURATION_SCALE), false, mAnimationRemovalObserver); - mLauncher.getContentResolver().registerContentObserver(Global.getUriFor( - Global.TRANSITION_ANIMATION_SCALE), false, mAnimationRemovalObserver); - - }); - } - private boolean launcherIsATargetWithMode(RemoteAnimationTarget[] targets, int mode) { for (RemoteAnimationTarget target : targets) { if (target.mode == mode && target.taskInfo != null @@ -1269,42 +1472,7 @@ private boolean shouldPlayFallbackClosingAnimation(RemoteAnimationTarget[] targe return false; } - /** - * @return Runner that plays when user goes to Launcher - * ie. pressing home, swiping up from nav bar. - */ - RemoteAnimationFactory createWallpaperOpenRunner(boolean fromUnlock) { - return new WallpaperOpenLauncherAnimationRunner(fromUnlock); - } - - /** - * Animator that controls the transformations of the windows when unlocking the device. - */ - private Animator getUnlockWindowAnimator(RemoteAnimationTarget[] appTargets, - RemoteAnimationTarget[] wallpaperTargets) { - SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(mDragLayer); - ValueAnimator unlockAnimator = ValueAnimator.ofFloat(0, 1); - unlockAnimator.setDuration(CLOSING_TRANSITION_DURATION_MS); - float cornerRadius = mDeviceProfile.isMultiWindowMode ? 0 : - QuickStepContract.getWindowCornerRadius(mLauncher); - unlockAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - SurfaceTransaction transaction = new SurfaceTransaction(); - for (int i = appTargets.length - 1; i >= 0; i--) { - RemoteAnimationTarget target = appTargets[i]; - transaction.forSurface(target.leash) - .setAlpha(1f) - .setWindowCrop(target.screenSpaceBounds) - .setCornerRadius(cornerRadius); - } - surfaceApplier.scheduleApply(transaction); - } - }); - return unlockAnimator; - } - - public static int getRotationChange(RemoteAnimationTarget[] appTargets) { + private static int getRotationChange(RemoteAnimationTarget[] appTargets) { int rotationChange = 0; for (RemoteAnimationTarget target : appTargets) { // LC: https://github.com/LawnchairLauncher/lawnchair/pull/3776 @@ -1361,24 +1529,24 @@ public static int getRotationChange(RemoteAnimationTarget[] appTargets) { // Find the associated item info for the launch cookie (if available), note that predicted // apps actually have an id of -1, so use another default id here - final ArrayList launchCookies = runningTaskTarget.taskInfo.launchCookies == null - ? new ArrayList<>() + final List launchCookies = runningTaskTarget.taskInfo.launchCookies == null + ? Collections.EMPTY_LIST : runningTaskTarget.taskInfo.launchCookies; - return mLauncher.getFirstMatchForAppClose( + return mLauncher.getFirstVisibleElementForAppClose( StableViewInfo.fromLaunchCookies(launchCookies), packageName, - UserHandle.of(runningTaskTarget.taskInfo.userId), true /* supportsAllAppsState */); + UserHandle.of(runningTaskTarget.taskInfo.userId)); } private @NonNull RectF getDefaultWindowTargetRect() { RecentsView recentsView = mLauncher.getOverviewPanel(); PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); DeviceProfile dp = mLauncher.getDeviceProfile(); - final int halfIconSize = dp.iconSizePx / 2; + final int halfIconSize = dp.getWorkspaceIconProfile().getIconSizePx() / 2; float primaryDimension = orientationHandler - .getPrimaryValue(dp.availableWidthPx, dp.availableHeightPx); + .getPrimaryValue(dp.getDeviceProperties().getAvailableWidthPx(), dp.getDeviceProperties().getAvailableHeightPx()); float secondaryDimension = orientationHandler - .getSecondaryValue(dp.availableWidthPx, dp.availableHeightPx); + .getSecondaryValue(dp.getDeviceProperties().getAvailableWidthPx(), dp.getDeviceProperties().getAvailableHeightPx()); final float targetX = primaryDimension / 2f; final float targetY = secondaryDimension - dp.hotseatBarSizePx; return new RectF(targetX - halfIconSize, targetY - halfIconSize, @@ -1389,8 +1557,8 @@ public static int getRotationChange(RemoteAnimationTarget[] appTargets) { * Closing animator that animates the window into its final location on the workspace. */ protected RectFSpringAnim getClosingWindowAnimators(AnimatorSet animation, - RemoteAnimationTarget[] targets, View launcherView, PointF velocityPxPerS, - RectF closingWindowStartRectF, float startWindowCornerRadius) { + RemoteAnimationTarget[] targets, View launcherView, PointF velocityPxPerS, + RectF closingWindowStartRectF, float startWindowCornerRadius) { FloatingIconView floatingIconView = null; FloatingWidgetView floatingWidget = null; RectF targetRect = new RectF(); @@ -1408,22 +1576,20 @@ protected RectFSpringAnim getClosingWindowAnimators(AnimatorSet animation, // Get floating view and target rect. boolean isInHotseat = false; if (launcherView instanceof LauncherAppWidgetHostView) { - Size windowSize = new Size(mDeviceProfile.availableWidthPx, - mDeviceProfile.availableHeightPx); + Size windowSize = new Size(mDeviceProfile.getDeviceProperties().getWidthPx(), + mDeviceProfile.getDeviceProperties().getHeightPx()); int fallbackBackgroundColor = FloatingWidgetView.getDefaultBackgroundColor(mLauncher, runningTaskTarget); floatingWidget = FloatingWidgetView.getFloatingWidgetView(mLauncher, (LauncherAppWidgetHostView) launcherView, targetRect, windowSize, - mDeviceProfile.isMultiWindowMode ? 0 : getWindowCornerRadius(mLauncher), - isTransluscent, fallbackBackgroundColor); - } else if (launcherView != null && mAreAnimationsEnabled) { + getWindowCornerRadius(mLauncher), isTransluscent, fallbackBackgroundColor); + } else if (launcherView != null && !RemoveAnimationSettingsTracker.INSTANCE.get( + mLauncher).isRemoveAnimationEnabled()) { floatingIconView = getFloatingIconView(mLauncher, launcherView, null, - mLauncher.getTaskbarUIController() == null + mLauncher.getTaskbarInteractor() == null ? null - : mLauncher.getTaskbarUIController().findMatchingView(launcherView), + : mLauncher.getTaskbarInteractor().findMatchingAsyncView(launcherView), true /* hideOriginal */, targetRect, false /* isOpening */); - isInHotseat = launcherView.getTag() instanceof ItemInfo - && ((ItemInfo) launcherView.getTag()).isInHotseat(); } else { targetRect.set(getDefaultWindowTargetRect()); } @@ -1432,14 +1598,14 @@ protected RectFSpringAnim getClosingWindowAnimators(AnimatorSet animation, RectFSpringAnim anim = new RectFSpringAnim(useTaskbarHotseatParams ? new TaskbarHotseatSpringConfig(mLauncher, closingWindowStartRectF, targetRect) : new DefaultSpringConfig(mLauncher, mDeviceProfile, closingWindowStartRectF, - targetRect)); + targetRect)); // Hook up floating views to the closing window animators. // note the coordinate of closingWindowStartRect is based on launcher Rect closingWindowStartRect = new Rect(); closingWindowStartRectF.round(closingWindowStartRect); Rect closingWindowOriginalRect = - new Rect(0, 0, mDeviceProfile.widthPx, mDeviceProfile.heightPx); + new Rect(0, 0, mDeviceProfile.getDeviceProperties().getWidthPx(), mDeviceProfile.getDeviceProperties().getHeightPx()); if (floatingIconView != null) { anim.addAnimatorListener(floatingIconView); floatingIconView.setOnTargetChangeListener(anim::onTargetPositionChanged); @@ -1447,15 +1613,20 @@ protected RectFSpringAnim getClosingWindowAnimators(AnimatorSet animation, FloatingIconView finalFloatingIconView = floatingIconView; // We want the window alpha to be 0 once this threshold is met, so that the - // FolderIconView can be seen morphing into the icon shape. + // FloatingIconView can be seen morphing into the icon shape. final float windowAlphaThreshold = 1f - SHAPE_PROGRESS_DURATION; RectFSpringAnim.OnUpdateListener runner = new SpringAnimRunner(targets, targetRect, closingWindowStartRect, closingWindowOriginalRect, startWindowCornerRadius) { @Override public void onUpdate(RectF currentRectF, float progress) { - finalFloatingIconView.update(1f, currentRectF, progress, windowAlphaThreshold, - getCornerRadius(progress), false); + // We want the icon alpha to be 1 once this threshold is met, so that it can be + // seen morphing into the icon shape. But before the threshold, we want to limit + // the alpha to reduce the blur effect behind the window. + float iconAlpha = + Interpolators.clampToProgress(progress, 0f, windowAlphaThreshold); + finalFloatingIconView.update(iconAlpha, currentRectF, progress, + windowAlphaThreshold, getCornerRadius(progress), false); super.onUpdate(currentRectF, progress); } @@ -1512,14 +1683,19 @@ private Animator getFallbackClosingWindowAnimators(RemoteAnimationTarget[] appTa Rect tmpRect = new Rect(); ValueAnimator closingAnimator = ValueAnimator.ofFloat(0, 1); int duration = CLOSING_TRANSITION_DURATION_MS; - float windowCornerRadius = mDeviceProfile.isMultiWindowMode - ? 0 : getWindowCornerRadius(mLauncher); + float windowCornerRadius = getWindowCornerRadius(mLauncher); float startShadowRadius = areAllTargetsTranslucent(appTargets) ? 0 : mMaxShadowRadius; closingAnimator.setDuration(duration); + boolean isFreeform = isFreeformAnimation(appTargets); + float translateY = isFreeform ? mClosingFreeformWindowTransY : mClosingWindowTransY; + float endScale = isFreeform ? 0.95f : 1f; + Interpolator alphaInterpolator = isFreeform + ? clampToDuration(LINEAR, 0, 100, duration) + : clampToDuration(LINEAR, 25, 125, duration); closingAnimator.addUpdateListener(new MultiValueUpdateListener() { - FloatProp mDy = new FloatProp(0, mClosingWindowTransY, DECELERATE_1_7); - FloatProp mScale = new FloatProp(1f, 1f, DECELERATE_1_7); - FloatProp mAlpha = new FloatProp(1f, 0f, clampToDuration(LINEAR, 25, 125, duration)); + FloatProp mDy = new FloatProp(0, translateY, DECELERATE_1_7); + FloatProp mScale = new FloatProp(1f, endScale, DECELERATE_1_7); + FloatProp mAlpha = new FloatProp(1f, 0f, alphaInterpolator); FloatProp mShadowRadius = new FloatProp(startShadowRadius, 0, DECELERATE_1_7); @Override @@ -1568,8 +1744,29 @@ public void onUpdate(float percent, boolean initOnly) { return closingAnimator; } + private boolean isFreeformAnimation(RemoteAnimationTarget[] appTargets) { + return DesktopModeStatus.canEnterDesktopMode(mLauncher.getApplicationContext()) + && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX.isTrue() + && Arrays.stream(appTargets) + .anyMatch(app -> app.taskInfo != null && app.taskInfo.isFreeform()); + } + private void addCujInstrumentation(Animator anim, int cuj) { - anim.addListener(new AnimationSuccessListener() { + anim.addListener(getCujAnimationSuccessListener(cuj, /* cujPreStartCallback= */null)); + } + + private void addCujInstrumentation(Animator anim, int cuj, Runnable cujPreStartCallback) { + anim.addListener(getCujAnimationSuccessListener(cuj, cujPreStartCallback)); + } + + private void addCujInstrumentation(RectFSpringAnim anim, int cuj) { + anim.addAnimatorListener( + getCujAnimationSuccessListener(cuj, /* cujPreStartCallback= */null)); + } + + private AnimationSuccessListener getCujAnimationSuccessListener( + int cuj, Runnable cujPreStartCallback) { + return new AnimationSuccessListener() { @Override public void onAnimationStart(Animator animation) { mDragLayer.getViewTreeObserver().addOnDrawListener( @@ -1582,7 +1779,9 @@ public void onDraw() { return; } mHandled = true; - + if (cujPreStartCallback != null) { + cujPreStartCallback.run(); + } InteractionJankMonitorWrapper.begin(mDragLayer, cuj); mDragLayer.post(() -> @@ -1603,70 +1802,75 @@ public void onAnimationCancel(Animator animation) { public void onAnimationSuccess(Animator animator) { InteractionJankMonitorWrapper.end(cuj); } - }); + }; } /** * Creates the {@link RectFSpringAnim} and {@link AnimatorSet} required to animate * the transition. */ - public Pair createWallpaperOpenAnimations( + @NonNull + public BackAnimState createWallpaperOpenAnimations( RemoteAnimationTarget[] appTargets, - RemoteAnimationTarget[] wallpaperTargets, - boolean fromUnlock, + RemoteAnimationTarget[] wallpapers, + RemoteAnimationTarget[] nonAppTargets, RectF startRect, float startWindowCornerRadius, boolean fromPredictiveBack) { + View launcherView = findLauncherView(appTargets); + if (launcherView != null + && launcherView.getTag() instanceof ItemInfo info + && info.shouldUseBackgroundAnimation()) { + // Try to create a return animation + RunnableList onEndCallback = new RunnableList(); + WindowAnimationState windowState = new WindowAnimationState(); + windowState.bounds = startRect; + windowState.bottomLeftRadius = windowState.bottomRightRadius = + windowState.topLeftRadius = windowState.topRightRadius = + startWindowCornerRadius; + ContainerAnimationRunner runner = ContainerAnimationRunner.fromView( + launcherView, false /* forLaunch */, mLauncher, mStartingWindowListener, + onEndCallback, windowState); + if (runner != null) { + runner.startAnimation(TRANSIT_CLOSE, + appTargets, wallpapers, nonAppTargets, + new IRemoteAnimationFinishedCallback.Stub() { + @Override + public void onAnimationFinished() { + onEndCallback.executeAllAndDestroy(); + } + }); + return new AlreadyStartedBackAnimState(onEndCallback); + } + } + AnimatorSet anim = new AnimatorSet(); RectFSpringAnim rectFSpringAnim = null; final boolean launcherIsForceInvisibleOrOpening = mLauncher.isForceInvisible() || launcherIsATargetWithMode(appTargets, MODE_OPENING); - View launcherView = findLauncherView(appTargets); boolean playFallBackAnimation = (launcherView == null && launcherIsForceInvisibleOrOpening) || mLauncher.getWorkspace().isOverlayShown() || shouldPlayFallbackClosingAnimation(appTargets); - boolean playWorkspaceReveal = !fromPredictiveBack; + boolean playWorkspaceReveal = true; boolean skipAllAppsScale = false; - if (fromUnlock) { - anim.play(getUnlockWindowAnimator(appTargets, wallpaperTargets)); - } else if (ENABLE_BACK_SWIPE_HOME_ANIMATION.get() - && !playFallBackAnimation) { - PointF velocity; - if (enableScalingRevealHomeAnimation()) { - velocity = new PointF(); - } else { - // Use a fixed velocity to start the animation. - float velocityPxPerS = DynamicResource.provider(mLauncher) - .getDimension(R.dimen.unlock_staggered_velocity_dp_per_s); - velocity = new PointF(0, -velocityPxPerS); - } + if (!playFallBackAnimation) { rectFSpringAnim = getClosingWindowAnimators( - anim, appTargets, launcherView, velocity, startRect, + anim, appTargets, launcherView, new PointF(), startRect, startWindowCornerRadius); if (mLauncher.isInState(LauncherState.ALL_APPS)) { // Skip scaling all apps, otherwise FloatingIconView will get wrong // layout bounds. skipAllAppsScale = true; - } else if (!fromPredictiveBack) { - if (enableScalingRevealHomeAnimation()) { - anim.play( - new ScalingWorkspaceRevealAnim( - mLauncher, rectFSpringAnim, - rectFSpringAnim.getTargetRect()).getAnimators()); - } else { - anim.play(new StaggeredWorkspaceAnim(mLauncher, velocity.y, - true /* animateOverviewScrim */, launcherView).getAnimators()); - } - - if (!areAllTargetsTranslucent(appTargets)) { - anim.play(ObjectAnimator.ofFloat(mLauncher.getDepthController().stateDepth, - MULTI_PROPERTY_VALUE, - BACKGROUND_APP.getDepth(mLauncher), NORMAL.getDepth(mLauncher))); - } + } else { + anim.play( + new ScalingWorkspaceRevealAnim(mLauncher, rectFSpringAnim, + rectFSpringAnim.getTargetRect(), + !fromPredictiveBack /* playAlphaReveal */, + true /* playBlur */).getAnimators()); // We play StaggeredWorkspaceAnim as a part of the closing window animation. playWorkspaceReveal = false; @@ -1675,6 +1879,20 @@ public Pair createWallpaperOpenAnimations( anim.play(getFallbackClosingWindowAnimators(appTargets)); } + AnimatorListenerAdapter endListener = new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + AccessibilityManagerCompat.sendTestProtocolEventToTest( + mLauncher, WALLPAPER_OPEN_ANIMATION_FINISHED_MESSAGE); + } + }; + if (rectFSpringAnim != null) { + rectFSpringAnim.addAnimatorListener(endListener); + } else { + anim.addListener(endListener); + } + // Normally, we run the launcher content animation when we are transitioning // home, but if home is already visible, then we don't want to animate the // contents of launcher unless we know that we are animating home as a result @@ -1683,30 +1901,28 @@ public Pair createWallpaperOpenAnimations( // targets list because it is already visible). In that case, we force // invisibility on touch down, and only reset it after the animation to home // is initialized. - if (launcherIsForceInvisibleOrOpening || fromPredictiveBack) { - addCujInstrumentation(anim, playFallBackAnimation - ? Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK - : Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); - - AnimatorListenerAdapter endListener = new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); - AccessibilityManagerCompat.sendTestProtocolEventToTest( - mLauncher, WALLPAPER_OPEN_ANIMATION_FINISHED_MESSAGE); - } - }; - - if (fromPredictiveBack && rectFSpringAnim != null) { - rectFSpringAnim.addAnimatorListener(endListener); + if (launcherIsForceInvisibleOrOpening) { + if (rectFSpringAnim != null && anim.getChildAnimations().isEmpty()) { + addCujInstrumentation(rectFSpringAnim, Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); } else { - anim.addListener(endListener); + if (isFreeformAnimation(appTargets)) { + addCujInstrumentation( + anim, + Cuj.CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE, + /* cujPreStartCallback= */ () -> { + mLatencyTracker.onActionEnd( + ACTION_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE); + }); + } + addCujInstrumentation(anim, playFallBackAnimation + ? Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK + : Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); } // Only register the content animation for cancellation when state changes mLauncher.getStateManager().setCurrentAnimation(anim); - if (mLauncher.isInState(LauncherState.ALL_APPS) && !fromPredictiveBack) { + if (mLauncher.isInState(LauncherState.ALL_APPS)) { Pair contentAnimator = getLauncherContentAnimator(false, LAUNCHER_RESUME_START_DELAY, skipAllAppsScale); @@ -1722,11 +1938,25 @@ public void onAnimationEnd(Animator animation) { } } - return new Pair(rectFSpringAnim, anim); + return new AnimatorBackState(rectFSpringAnim, anim); + } + + /** Get animation duration for taskbar for going to home. */ + public static int getTaskbarToHomeDuration( + boolean isPersistentTaskbarAndNotInDesktopMode) { + return getTaskbarToHomeDuration(false, isPersistentTaskbarAndNotInDesktopMode); } - public static int getTaskbarToHomeDuration() { - if (enableScalingRevealHomeAnimation()) { + /** + * Get animation duration for taskbar for going to home. + * + * @param shouldOverrideToFastAnimation should overwrite scaling reveal home animation duration + */ + public static int getTaskbarToHomeDuration(boolean shouldOverrideToFastAnimation, + boolean isPersistentTaskbarAndNotInDesktopMode) { + if (isPersistentTaskbarAndNotInDesktopMode) { + return PINNED_TASKBAR_TRANSITION_DURATION; + } else if (!shouldOverrideToFastAnimation) { return TASKBAR_TO_HOME_DURATION_SLOW; } else { return TASKBAR_TO_HOME_DURATION_FAST; @@ -1738,18 +1968,12 @@ public static int getTaskbarToHomeDuration() { */ protected class WallpaperOpenLauncherAnimationRunner implements RemoteAnimationFactory { - private final boolean mFromUnlock; - - public WallpaperOpenLauncherAnimationRunner(boolean fromUnlock) { - mFromUnlock = fromUnlock; - } - @Override public void onAnimationStart(int transit, - RemoteAnimationTarget[] appTargets, - RemoteAnimationTarget[] wallpaperTargets, - RemoteAnimationTarget[] nonAppTargets, - LauncherAnimationRunner.AnimationResult result) { + RemoteAnimationTarget[] appTargets, + RemoteAnimationTarget[] wallpaperTargets, + RemoteAnimationTarget[] nonAppTargets, + LauncherAnimationRunner.AnimationResult result) { if (mLauncher.isDestroyed()) { AnimatorSet anim = new AnimatorSet(); anim.play(getFallbackClosingWindowAnimators(appTargets)); @@ -1774,14 +1998,14 @@ public void onAnimationStart(int transit, } } - Pair pair = createWallpaperOpenAnimations( - appTargets, wallpaperTargets, mFromUnlock, resolveRectF, + BackAnimState bankAnimState = createWallpaperOpenAnimations( + appTargets, wallpaperTargets, nonAppTargets, resolveRectF, QuickStepContract.getWindowCornerRadius(mLauncher), false /* fromPredictiveBack */); TaskViewUtils.createSplitAuxiliarySurfacesAnimator(nonAppTargets, false, null); mLauncher.clearForceInvisibleFlag(INVISIBLE_ALL); - result.setAnimation(pair.second, mLauncher); + bankAnimState.applyToAnimationResult(result, mLauncher); } } @@ -1800,10 +2024,10 @@ private class AppLaunchAnimationRunner implements RemoteAnimationFactory { @Override public void onAnimationStart(int transit, - RemoteAnimationTarget[] appTargets, - RemoteAnimationTarget[] wallpaperTargets, - RemoteAnimationTarget[] nonAppTargets, - LauncherAnimationRunner.AnimationResult result) { + RemoteAnimationTarget[] appTargets, + RemoteAnimationTarget[] wallpaperTargets, + RemoteAnimationTarget[] nonAppTargets, + LauncherAnimationRunner.AnimationResult result) { AnimatorSet anim = new AnimatorSet(); boolean launcherClosing = launcherIsATargetWithMode(appTargets, MODE_CLOSING); @@ -1833,6 +2057,18 @@ public void onAnimationStart(int transit, anim.addListener(mForceInvisibleListener); } + // Syncs the app launch animation and taskbar stash animation (if exists). + if (syncAppLaunchWithTaskbarStash()) { + TaskbarInteractor taskbarInteractor = mLauncher.getTaskbarInteractor(); + if (taskbarInteractor != null) { + taskbarInteractor.setIgnoreInAppFlagForSync(false); + + if (launcherClosing) { + taskbarInteractor.createAnimToAppAndPlay(anim); + } + } + } + result.setAnimation(anim, mLauncher, mOnEndCallback::executeAllAndDestroy, skipFirstFrame); } @@ -1855,32 +2091,23 @@ private ContainerAnimationRunner( } @Nullable - private static ContainerAnimationRunner from(View v, Launcher launcher, - StartingWindowListener startingWindowListener, RunnableList onEndCallback) { - View viewToUse = findLaunchableViewWithBackground(v); - if (viewToUse == null) { - return null; - } - - // The CUJ is logged by the click handler, so we don't log it inside the animation - // library. - ActivityTransitionAnimator.Controller controllerDelegate = - ActivityTransitionAnimator.Controller.fromView(viewToUse, null /* cujType */); - - if (controllerDelegate == null) { + static ContainerAnimationRunner fromView( + View v, + boolean forLaunch, + Launcher launcher, + StartingWindowListener startingWindowListener, + RunnableList onEndCallback, + @Nullable WindowAnimationState windowState) { + // First the controller is created. This is used by the runner to animate the + // origin/target view. + ActivityTransitionAnimator.Controller controller = + buildController(v, forLaunch, windowState); + if (controller == null) { return null; } - // This wrapper allows us to override the default value, telling the controller that the - // current window is below the animating window. - ActivityTransitionAnimator.Controller controller = - new DelegateTransitionAnimatorController(controllerDelegate) { - @Override - public boolean isBelowAnimatingWindow() { - return true; - } - }; - + // The callback is used to make sure that we use the right color to fade between view + // and the window. ActivityTransitionAnimator.Callback callback = task -> { final int backgroundColor = startingWindowListener.mBackgroundColor == Color.TRANSPARENT @@ -1898,10 +2125,54 @@ public void onTransitionAnimationEnd() { }; return new ContainerAnimationRunner( - new ActivityTransitionAnimator.AnimationDelegate( + new ActivityTransitionAnimator.LegacyAnimationDelegate( MAIN_EXECUTOR, controller, callback, listener)); } + /** + * Constructs a {@link ActivityTransitionAnimator.Controller} that can be used by a + * {@link ContainerAnimationRunner} to animate a view into an opening window or from a + * closing one. + */ + @Nullable + private static ActivityTransitionAnimator.Controller buildController( + View v, boolean isLaunching, @Nullable WindowAnimationState windowState) { + View viewToUse = findLaunchableViewWithBackground(v); + if (viewToUse == null) { + return null; + } + + // The CUJ is logged by the click handler, so we don't log it inside the animation + // library. TODO: figure out return CUJ. + ActivityTransitionAnimator.Controller controllerDelegate = + ActivityTransitionAnimator.Controller.fromView(viewToUse, null /* cujType */); + + if (controllerDelegate == null) { + return null; + } + + // This wrapper allows us to override the default value, telling the controller that the + // current window is below the animating window as well as information about the return + // animation. + return new DelegateTransitionAnimatorController(controllerDelegate) { + @Override + public boolean isLaunching() { + return isLaunching; + } + + @Override + public boolean isBelowAnimatingWindow() { + return true; + } + + @Nullable + @Override + public WindowAnimationState getWindowAnimatorState() { + return windowState; + } + }; + } + /** * Finds the closest parent of [view] (inclusive) that implements {@link LaunchableView} and * has a background drawable. @@ -1911,20 +2182,26 @@ private static T findLaunchableViewWithBackgro View view) { View current = view; while (current.getBackground() == null || !(current instanceof LaunchableView)) { - if (!(current.getParent() instanceof View)) { + if (current.getParent() instanceof View v) { + current = v; + } else { return null; } - - current = (View) current.getParent(); } - return (T) current; } @Override public void onAnimationStart(int transit, RemoteAnimationTarget[] appTargets, - RemoteAnimationTarget[] wallpaperTargets, RemoteAnimationTarget[] nonAppTargets, - LauncherAnimationRunner.AnimationResult result) { + RemoteAnimationTarget[] wallpaperTargets, RemoteAnimationTarget[] nonAppTargets, + LauncherAnimationRunner.AnimationResult result) { + startAnimation( + transit, appTargets, wallpaperTargets, nonAppTargets, result); + } + + public void startAnimation(int transit, RemoteAnimationTarget[] appTargets, + RemoteAnimationTarget[] wallpaperTargets, RemoteAnimationTarget[] nonAppTargets, + IRemoteAnimationFinishedCallback result) { mDelegate.onAnimationStart( transit, appTargets, wallpaperTargets, nonAppTargets, result); } @@ -1959,8 +2236,8 @@ static class AnimOpenProperties { public final float iconAlphaStart; AnimOpenProperties(Resources r, DeviceProfile dp, Rect windowTargetBounds, - RectF launcherIconBounds, View view, int dragLayerLeft, int dragLayerTop, - boolean hasSplashScreen, boolean hasDifferentAppIcon) { + RectF launcherIconBounds, View view, int dragLayerLeft, int dragLayerTop, + boolean hasSplashScreen, boolean hasDifferentAppIcon) { // Scale the app icon to take up the entire screen. This simplifies the math when // animating the app window position / scale. float smallestSize = Math.min(windowTargetBounds.height(), windowTargetBounds.width()); @@ -2029,7 +2306,7 @@ public void onTaskLaunching(int taskId, int supportedType, int color) { * target. */ public void transferRectToTargetCoordinate(RemoteAnimationTarget target, RectF currentRect, - boolean toLauncher, RectF resultRect) { + boolean toLauncher, RectF resultRect) { mCoordinateTransfer.transferRectToTargetCoordinate( target, currentRect, toLauncher, resultRect); } @@ -2044,20 +2321,23 @@ public RemoteAnimationCoordinateTransfer(QuickstepLauncher launcher) { } public void transferRectToTargetCoordinate(RemoteAnimationTarget target, RectF currentRect, - boolean toLauncher, RectF resultRect) { + boolean toLauncher, RectF resultRect) { final int taskRotation = target.windowConfiguration.getRotation(); final DeviceProfile profile = mLauncher.getDeviceProfile(); + final int rotation = profile.getDeviceProperties().getRotationHint(); + final int widthPx = profile.getDeviceProperties().getWidthPx(); + final int heightPx = profile.getDeviceProperties().getWidthPx(); final int rotationDelta = toLauncher - ? android.util.RotationUtils.deltaRotation(taskRotation, profile.rotationHint) - : android.util.RotationUtils.deltaRotation(profile.rotationHint, taskRotation); + ? android.util.RotationUtils.deltaRotation(taskRotation, rotation) + : android.util.RotationUtils.deltaRotation(rotation, taskRotation); if (rotationDelta != ROTATION_0) { // Get original display size when task is on top but with different rotation - if (rotationDelta % 2 != 0 && toLauncher && (profile.rotationHint == ROTATION_0 - || profile.rotationHint == ROTATION_180)) { - mDisplayRect.set(0, 0, profile.heightPx, profile.widthPx); + if (rotationDelta % 2 != 0 && toLauncher && (rotation == ROTATION_0 + || rotation == ROTATION_180)) { + mDisplayRect.set(0, 0, heightPx, widthPx); } else { - mDisplayRect.set(0, 0, profile.widthPx, profile.heightPx); + mDisplayRect.set(0, 0, widthPx, heightPx); } currentRect.round(mTmpResult); android.util.RotationUtils.rotateBounds(mTmpResult, mDisplayRect, rotationDelta); @@ -2097,8 +2377,8 @@ public class SpringAnimRunner implements RectFSpringAnim.OnUpdateListener { * @param startWindowCornerRadius corner radius of window at the start position */ public SpringAnimRunner(RemoteAnimationTarget[] appTargets, RectF targetRect, - Rect closingWindowStartRect, Rect closingWindowOriginalRect, - float startWindowCornerRadius) { + Rect closingWindowStartRect, Rect closingWindowOriginalRect, + float startWindowCornerRadius) { mAppTargets = appTargets; mStartRadius = startWindowCornerRadius; mEndRadius = Math.max(1, targetRect.width()) / 2f; @@ -2196,19 +2476,4 @@ protected float getWindowAlpha(float progress) { return Utilities.mapToRange(progress, start, end, 1, 0, ACCELERATE_1_5); } } - - public static class LaunchDepthController extends DepthController { - public LaunchDepthController(QuickstepLauncher launcher) { - super(launcher); - try { - setCrossWindowBlursEnabled( - CrossWindowBlurListeners.getInstance().isCrossWindowBlurEnabled()); - } catch (Throwable t) { - // ignore - } - // Make sure that the starting value matches the current depth set by the main - // controller. - stateDepth.setValue(launcher.getDepthController().stateDepth.getValue()); - } - } } diff --git a/quickstep/src/com/android/launcher3/QuickstepWidgetPickerActivity.java b/quickstep/src/com/android/launcher3/QuickstepWidgetPickerActivity.java new file mode 100644 index 00000000000..19d5e9f1e43 --- /dev/null +++ b/quickstep/src/com/android/launcher3/QuickstepWidgetPickerActivity.java @@ -0,0 +1,592 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3; + +import static android.content.ClipDescription.MIMETYPE_TEXT_INTENT; +import static android.view.WindowInsets.Type.navigationBars; +import static android.view.WindowInsets.Type.statusBars; + +import static com.android.launcher3.Utilities.shouldEnableMouseInteractionChanges; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; + +import static java.lang.Math.max; +import static java.lang.Math.min; + +import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProviderInfo; +import android.content.ClipData; +import android.content.ClipDescription; +import android.content.Intent; +import android.os.Bundle; +import android.os.UserHandle; +import android.util.Log; +import android.view.View; +import android.window.BackEvent; +import android.window.OnBackAnimationCallback; +import android.window.OnBackInvokedDispatcher; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.launcher3.compose.ComposeFacade; +import com.android.launcher3.dagger.LauncherAppComponent; +import com.android.launcher3.dagger.LauncherComponentProvider; +import com.android.launcher3.model.StringCache; +import com.android.launcher3.model.WidgetItem; +import com.android.launcher3.model.WidgetPredictionsRequester; +import com.android.launcher3.model.WidgetsModel; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.PackageItemInfo; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.widget.WidgetCell; +import com.android.launcher3.widget.model.WidgetsListBaseEntriesBuilder; +import com.android.launcher3.widget.model.WidgetsListBaseEntry; +import com.android.launcher3.widget.picker.WidgetCategoryFilter; +import com.android.launcher3.widget.picker.WidgetsFullSheet; +import com.android.launcher3.widget.picker.model.WidgetPickerDataProvider; +import com.android.launcher3.widgetpicker.WidgetPickerConfig; +import com.android.quickstep.TouchInteractionService; +import com.android.quickstep.util.TISBindHelper; +import com.android.systemui.animation.back.FlingOnBackAnimationCallback; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.function.Predicate; +import java.util.regex.Pattern; + +/** An Activity that can host Launcher's widget picker for additional surfaces. */ +public class QuickstepWidgetPickerActivity extends + com.android.launcher3.widgetpicker.WidgetPickerActivity implements + WidgetPredictionsRequester.WidgetPredictionsListener { + private static final String TAG = "WidgetPickerActivity"; + /** + * Name of the extra that indicates that a widget being dragged. + * + *

When set to "true" in the result of startActivityForResult, the client that launched the + * picker knows that activity was closed due to pending drag. + */ + private static final String EXTRA_IS_PENDING_WIDGET_DRAG = "is_pending_widget_drag"; + + // Intent extras that specify the desired widget width and height. If these are not specified in + // the intent, then widgets will not be filtered for size. + private static final String EXTRA_DESIRED_WIDGET_WIDTH = "desired_widget_width"; + private static final String EXTRA_DESIRED_WIDGET_HEIGHT = "desired_widget_height"; + // Unlike the AppWidgetManager.EXTRA_CATEGORY_FILTER, this filter removes certain categories. + // Filter is ignore if it is not a negative value. + // Example usage: WIDGET_CATEGORY_HOME_SCREEN.inv() and WIDGET_CATEGORY_NOT_KEYGUARD.inv() + private static final String EXTRA_CATEGORY_EXCLUSION_FILTER = "category_exclusion_filter"; + /** + * Widgets currently added by the user in the UI surface. + *

This allows widget picker to exclude existing widgets from suggestions.

+ */ + private static final String EXTRA_ADDED_APP_WIDGETS = "added_app_widgets"; + /** + * Intent extra for the string representing the title displayed within the picker header. + */ + private static final String EXTRA_PICKER_TITLE = "picker_title"; + /** + * Intent extra for the string representing the description displayed within the picker header. + */ + private static final String EXTRA_PICKER_DESCRIPTION = "picker_description"; + + /** + * A unique identifier of the surface hosting the widgets; + *

"widgets" is reserved for home screen surface.

+ *

"widgets_hub" is reserved for lockscreen hub surface.

+ */ + private static final String EXTRA_UI_SURFACE = "ui_surface"; + private static final String LOCKSCREEN_WIDGETS_HUB_UI_SURFACE = "widgets_hub"; + private static final Pattern UI_SURFACE_PATTERN = + Pattern.compile("^(widgets|widgets_hub)$"); + /** + * User ids that should be filtered out of the widget lists created by this activity. + */ + private static final String EXTRA_USER_ID_FILTER = "filtered_user_ids"; + + private TISBindHelper mTISBindHelper; + private WidgetsModel mModel; + private StringCache mStringCache; + private WidgetPredictionsRequester mWidgetPredictionsRequester; + private WidgetPickerDataProvider mWidgetPickerDataProvider; + private int mDesiredWidgetWidth; + private int mDesiredWidgetHeight; + private WidgetCategoryFilter mWidgetCategoryInclusionFilter; + private WidgetCategoryFilter mWidgetCategoryExclusionFilter; + // Widgets existing on the host surface. + @NonNull + private List mAddedWidgets = new ArrayList<>(); + @Nullable + private WidgetsFullSheet mWidgetSheet; + + private final Predicate mNoShortcutsFilter = widget -> { + final WidgetAcceptabilityVerdict verdict = + isWidgetAcceptable(widget, /* applySizeFilter=*/ false); + verdict.maybeLogVerdict(); + return verdict.isAcceptable; + }; + private final Predicate mHostSizeAndNoShortcutsFilter = widget -> { + final WidgetAcceptabilityVerdict verdict = + isWidgetAcceptable(widget, /* applySizeFilter=*/ true); + verdict.maybeLogVerdict(); + return verdict.isAcceptable; + }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + mTISBindHelper = new TISBindHelper(this, this::onTISConnected); + + setWidgetPickerConfig(parseIntentExtras()); + super.onCreate(savedInstanceState); + + if (getWidgetPickerConfig().getUiSurface().equals(LOCKSCREEN_WIDGETS_HUB_UI_SURFACE)) { + getWindow().getDecorView().getWindowInsetsController().hide( + navigationBars() + statusBars()); + } + + if (!Flags.enableWidgetPickerRefactor() || !ComposeFacade.INSTANCE.isComposeAvailable()) { + LauncherAppComponent component = LauncherComponentProvider.get(this); + InvariantDeviceProfile idp = component.getIDP(); + mDeviceProfile = idp.getDeviceProfile(this); + mModel = new WidgetsModel(getApplicationContext()); + mWidgetPickerDataProvider = new WidgetPickerDataProvider(); + + refreshAndBindWidgets(); + } + } + + @Override + protected void registerBackDispatcher() { + if (Utilities.ATLEAST_T) { + getOnBackInvokedDispatcher().registerOnBackInvokedCallback( + OnBackInvokedDispatcher.PRIORITY_DEFAULT, + new BackAnimationCallback()); + } + } + + @NonNull + protected WidgetPickerConfig parseIntentExtras() { + String title = getIntent().getStringExtra(EXTRA_PICKER_TITLE); + String description = getIntent().getStringExtra(EXTRA_PICKER_DESCRIPTION); + + // A value of 0 for either size means that no filtering will occur in that dimension. If + // both values are 0, then no size filtering will occur. + mDesiredWidgetWidth = + getIntent().getIntExtra(EXTRA_DESIRED_WIDGET_WIDTH, 0); + mDesiredWidgetHeight = + getIntent().getIntExtra(EXTRA_DESIRED_WIDGET_HEIGHT, 0); + + // Defaults to '0' to indicate that there isn't a category filter. + // Negative value indicates it's an exclusion filter (e.g. NOT_KEYGUARD_CATEGORY.inv()) + // Positive value indicates it's inclusion filter (e.g. HOME_SCREEN or KEYGUARD) + // Note: A filter can either be inclusion or exclusion filter; not both. + int inclusionFilter = getIntent().getIntExtra(AppWidgetManager.EXTRA_CATEGORY_FILTER, 0); + if (inclusionFilter < 0) { + Log.w(TAG, "Invalid EXTRA_CATEGORY_FILTER: " + inclusionFilter); + } + mWidgetCategoryInclusionFilter = new WidgetCategoryFilter(max(0, inclusionFilter)); + int exclusionFilter = getIntent().getIntExtra(EXTRA_CATEGORY_EXCLUSION_FILTER, 0); + if (exclusionFilter > 0) { + Log.w(TAG, "Invalid EXTRA_CATEGORY_EXCLUSION_FILTER: " + exclusionFilter); + } + mWidgetCategoryExclusionFilter = new WidgetCategoryFilter(min(0, exclusionFilter)); + + String uiSurfaceParam = getIntent().getStringExtra(EXTRA_UI_SURFACE); + String uiSurface = WidgetPickerConfig.HOMESCREEN_WIDGETS_UI_SURFACE; + if (uiSurfaceParam != null && UI_SURFACE_PATTERN.matcher(uiSurfaceParam).matches()) { + uiSurface = uiSurfaceParam; + } + if (Utilities.ATLEAST_T) { + ArrayList addedWidgets = getIntent().getParcelableArrayListExtra( + EXTRA_ADDED_APP_WIDGETS, AppWidgetProviderInfo.class); + if (addedWidgets != null) { + mAddedWidgets = addedWidgets; + } + } + + List filteredUsers = List.of(); + ArrayList filteredUserIds = getIntent().getIntegerArrayListExtra( + EXTRA_USER_ID_FILTER); + if (filteredUserIds != null) { + filteredUsers = filteredUserIds.stream().map(UserHandle::of).toList(); + } + + DeviceProfile deviceProfile = LauncherComponentProvider.get(this) + .getIDP() + .getDeviceProfile(this); + + return new WidgetPickerConfig( + /*uiSurface=*/ uiSurface, + /*title=*/ title, + /*description=*/ description, + /*categoryInclusionFilter=*/ inclusionFilter, + /*categoryExclusionFilter=*/ exclusionFilter, + /*filteredUsers=*/ filteredUsers, + /*handleSwipeUpGesture=*/ deviceProfile.getDeviceProperties().isGestureMode(), + /*isDesktopFormFactor=*/ shouldEnableMouseInteractionChanges( + getApplicationContext())); + } + + @NonNull + @Override + public WidgetPickerDataProvider getWidgetPickerDataProvider() { + return mWidgetPickerDataProvider; + } + + @Override + public View.OnClickListener getItemOnClickListener() { + return v -> { + final AppWidgetProviderInfo info = + (v instanceof WidgetCell) ? ((WidgetCell) v).getWidgetItem().widgetInfo : null; + if (info == null || info.provider == null) { + return; + } + + setResult(RESULT_OK, new Intent() + .putExtra(Intent.EXTRA_COMPONENT_NAME, info.provider) + .putExtra(Intent.EXTRA_USER, info.getProfile())); + + finish(); + }; + } + + @Override + public View.OnLongClickListener getAllAppsItemLongClickListener() { + return view -> { + if (!(view instanceof WidgetCell widgetCell)) return false; + + if (widgetCell.getWidgetView().getDrawable() == null + && widgetCell.getAppWidgetHostViewPreview() == null) { + // The widget preview hasn't been loaded; so, we abort the drag. + return false; + } + + final AppWidgetProviderInfo info = widgetCell.getWidgetItem().widgetInfo; + if (info == null || info.provider == null) { + return false; + } + + View dragView = widgetCell.getDragAndDropView(); + if (dragView == null) { + return false; + } + + ClipData clipData = new ClipData( + new ClipDescription( + /* label= */ "", // not displayed anywhere; so, set to empty. + new String[]{MIMETYPE_TEXT_INTENT} + ), + new ClipData.Item(new Intent() + .putExtra(Intent.EXTRA_USER, info.getProfile()) + .putExtra(Intent.EXTRA_COMPONENT_NAME, info.provider)) + ); + + // Set result indicating activity was closed due a widget being dragged. + setResult(RESULT_OK, new Intent() + .putExtra(EXTRA_IS_PENDING_WIDGET_DRAG, true)); + + // DRAG_FLAG_GLOBAL permits dragging data beyond app window. + return dragView.startDragAndDrop( + clipData, + new View.DragShadowBuilder(dragView), + /* myLocalState= */ null, + View.DRAG_FLAG_GLOBAL + ); + }; + } + + /** + * Updates the model with widgets, applies filters and launches the widgets sheet once + * widgets are available + */ + private void refreshAndBindWidgets() { + MODEL_EXECUTOR.execute(() -> { + WidgetPickerConfig config = getWidgetPickerConfig(); + mModel.update(null); + + StringCache stringCache = StringCache.fromContext(this); + + bindStringCache(stringCache); + bindWidgets(mModel.getWidgetsByPackageItemForPicker()); + // Open sheet once widgets are available, so that it doesn't interrupt the open + // animation. + openWidgetsSheet(); + config.getUiSurface(); + mWidgetPredictionsRequester = new WidgetPredictionsRequester( + getApplicationContext(), config.getUiSurface(), + mModel.getWidgetsByComponentKeyForPicker()); + mWidgetPredictionsRequester.request(mAddedWidgets, this); + }); + } + + private void bindStringCache(final StringCache stringCache) { + MAIN_EXECUTOR.execute(() -> mStringCache = stringCache); + } + + private void bindWidgets(Map> widgets) { + WidgetsListBaseEntriesBuilder builder = new WidgetsListBaseEntriesBuilder( + getApplicationContext()); + final List allWidgets = builder.build(widgets, mNoShortcutsFilter); + + // Default list is shown if host has additionally enforced size filtering. + @Nullable Predicate defaultListFilter = + hasHostSizeFilters() ? mHostSizeAndNoShortcutsFilter : null; + + MAIN_EXECUTOR.execute(() -> { + mWidgetPickerDataProvider.setHostSpecifiedDefaultWidgetsFilter(defaultListFilter); + mWidgetPickerDataProvider.setWidgets(allWidgets); + }); + } + + private void openWidgetsSheet() { + MAIN_EXECUTOR.execute(() -> { + WidgetPickerConfig config = getWidgetPickerConfig(); + mWidgetSheet = WidgetsFullSheet.show(this, true); + mWidgetSheet.mayUpdateTitleAndDescription(config.getTitle(), + config.getDescription()); + mWidgetSheet.disableNavBarScrim(true); + mWidgetSheet.addOnCloseListener(this::finish); + }); + } + + @Override + public void onPredictionsAvailable(List recommendedWidgets) { + // Bind recommendations once picker has finished open animation. + MAIN_EXECUTOR.getHandler().postDelayed( + () -> mWidgetPickerDataProvider.setWidgetRecommendations(recommendedWidgets), + mDeviceProfile.getBottomSheetProfile().getBottomSheetOpenDuration()); + } + + @Override + protected void onResume() { + super.onResume(); + updateServiceState(true); + } + + private void onTISConnected(TouchInteractionService.TISBinder binder) { + updateServiceState(isResumed()); + } + + @Override + protected void onPause() { + super.onPause(); + updateServiceState(false); + } + + private void updateServiceState(boolean isEnabled) { + if (DisplayController.showDesktopTaskbarForFreeformDisplay(this)) { + // Avoid blocking gestures when taskbar is always shown. Gestures should still allow + // user to return home in this case. + return; + } + TouchInteractionService.TISBinder binder = mTISBindHelper.getBinder(); + if (binder != null) { + binder.setGestureBlockedTaskId(isEnabled ? getTaskId() : -1); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mTISBindHelper.onDestroy(); + updateServiceState(false); + + if (!Flags.enableWidgetPickerRefactor() || !ComposeFacade.INSTANCE.isComposeAvailable()) { + mWidgetPickerDataProvider.destroy(); + if (mWidgetPredictionsRequester != null) { + mWidgetPredictionsRequester.clear(); + } + } + } + + @Nullable + @Override + public StringCache getStringCache() { + return mStringCache; + } + + /** + * Animation callback for different predictive back animation states for the widget picker. + */ + private class BackAnimationCallback extends FlingOnBackAnimationCallback { + @Nullable + OnBackAnimationCallback mActiveOnBackAnimationCallback; + + @Override + public void onBackStartedCompat(@NonNull BackEvent backEvent) { + if (mActiveOnBackAnimationCallback != null) { + mActiveOnBackAnimationCallback.onBackCancelled(); + } + if (mWidgetSheet != null) { + mActiveOnBackAnimationCallback = mWidgetSheet; + mActiveOnBackAnimationCallback.onBackStarted(backEvent); + } + } + + @Override + public void onBackInvokedCompat() { + if (mActiveOnBackAnimationCallback == null) { + return; + } + mActiveOnBackAnimationCallback.onBackInvoked(); + mActiveOnBackAnimationCallback = null; + } + + @Override + public void onBackProgressedCompat(@NonNull BackEvent backEvent) { + if (mActiveOnBackAnimationCallback == null) { + return; + } + mActiveOnBackAnimationCallback.onBackProgressed(backEvent); + } + + @Override + public void onBackCancelledCompat() { + if (mActiveOnBackAnimationCallback == null) { + return; + } + mActiveOnBackAnimationCallback.onBackCancelled(); + mActiveOnBackAnimationCallback = null; + } + } + + private boolean hasHostSizeFilters() { + // If optional filters such as size filter are present, we display them as default widgets. + return mDesiredWidgetWidth != 0 || + mDesiredWidgetHeight != 0; + } + + private WidgetAcceptabilityVerdict isWidgetAcceptable(WidgetItem widget, + boolean applySizeFilter) { + final AppWidgetProviderInfo info = widget.widgetInfo; + if (info == null) { + return rejectWidget(widget, "shortcut"); + } + + WidgetPickerConfig config = getWidgetPickerConfig(); + if (config.getFilteredUsers().contains(widget.user)) { + return rejectWidget( + widget, + "widget user: %d is being filtered", + widget.user.getIdentifier()); + } + + if (!mWidgetCategoryInclusionFilter.matches(info.widgetCategory) + || !mWidgetCategoryExclusionFilter.matches(info.widgetCategory)) { + return rejectWidget( + widget, + "doesn't match category filter [inclusion=%d, exclusion=%d, widget=%d]", + mWidgetCategoryInclusionFilter.getCategoryMask(), + mWidgetCategoryExclusionFilter.getCategoryMask(), + info.widgetCategory); + } + + + if (applySizeFilter) { + if (mDesiredWidgetWidth == 0 && mDesiredWidgetHeight == 0) { + // Accept the widget if the desired dimensions are unspecified. + return acceptWidget(widget); + } + + final boolean isHorizontallyResizable = + (info.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0; + if (mDesiredWidgetWidth > 0 && isHorizontallyResizable) { + if (info.maxResizeWidth > 0 + && info.maxResizeWidth >= info.minWidth + && info.maxResizeWidth < mDesiredWidgetWidth) { + return rejectWidget( + widget, + "maxResizeWidth[%d] < mDesiredWidgetWidth[%d]", + info.maxResizeWidth, + mDesiredWidgetWidth); + } + + final int minWidth = min(info.minResizeWidth, info.minWidth); + if (minWidth > mDesiredWidgetWidth) { + return rejectWidget( + widget, + "min(minWidth[%d], minResizeWidth[%d]) > mDesiredWidgetWidth[%d]", + info.minWidth, + info.minResizeWidth, + mDesiredWidgetWidth); + } + } + + final boolean isVerticallyResizable = + (info.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0; + if (mDesiredWidgetHeight > 0 && isVerticallyResizable) { + if (info.maxResizeHeight > 0 + && info.maxResizeHeight >= info.minHeight + && info.maxResizeHeight < mDesiredWidgetHeight) { + return rejectWidget( + widget, + "maxResizeHeight[%d] < mDesiredWidgetHeight[%d]", + info.maxResizeHeight, + mDesiredWidgetHeight); + } + + final int minHeight = min(info.minResizeHeight, info.minHeight); + if (minHeight > mDesiredWidgetHeight) { + return rejectWidget( + widget, + "min(minHeight[%d], minResizeHeight[%d]) > mDesiredWidgetHeight[%d]", + info.minHeight, + info.minResizeHeight, + mDesiredWidgetHeight); + } + } + + if (!isHorizontallyResizable || !isVerticallyResizable) { + return rejectWidget(widget, "not resizeable"); + } + } + + return acceptWidget(widget); + } + + private static WidgetAcceptabilityVerdict rejectWidget( + WidgetItem widget, String rejectionReason, Object... args) { + return new WidgetAcceptabilityVerdict( + false, + widget.widgetInfo != null + ? widget.widgetInfo.provider.flattenToShortString() + : widget.label, + String.format(Locale.ENGLISH, rejectionReason, args)); + } + + private static WidgetAcceptabilityVerdict acceptWidget(WidgetItem widget) { + return new WidgetAcceptabilityVerdict( + true, widget.widgetInfo.provider.flattenToShortString(), ""); + } + + private record WidgetAcceptabilityVerdict( + boolean isAcceptable, String widgetLabel, String reason) { + void maybeLogVerdict() { + // Only log a verdict if a reason is specified. + if (Log.isLoggable(TAG, Log.DEBUG) && !reason.isEmpty()) { + Log.i(TAG, String.format( + Locale.ENGLISH, + "%s: %s because %s", + widgetLabel, + isAcceptable ? "accepted" : "rejected", + reason)); + } + } + } +} diff --git a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java deleted file mode 100644 index a9f7c2a4410..00000000000 --- a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java +++ /dev/null @@ -1,377 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.launcher3; - -import static android.content.ClipDescription.MIMETYPE_TEXT_INTENT; -import static android.view.WindowInsets.Type.navigationBars; -import static android.view.WindowInsets.Type.statusBars; - -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; - -import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProviderInfo; -import android.content.ClipData; -import android.content.ClipDescription; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; -import android.view.View; -import android.view.WindowInsetsController; -import android.view.WindowManager; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.launcher3.dragndrop.SimpleDragLayer; -import com.android.launcher3.model.WidgetItem; -import com.android.launcher3.model.WidgetPredictionsRequester; -import com.android.launcher3.model.WidgetsModel; -import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.popup.PopupDataProvider; -import com.android.launcher3.util.PackageUserKey; -import com.android.launcher3.widget.BaseWidgetSheet; -import com.android.launcher3.widget.WidgetCell; -import com.android.launcher3.widget.model.WidgetsListBaseEntry; -import com.android.launcher3.widget.model.WidgetsListHeaderEntry; -import com.android.launcher3.widget.picker.WidgetsFullSheet; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -/** An Activity that can host Launcher's widget picker. */ -public class WidgetPickerActivity extends BaseActivity { - private static final String TAG = "WidgetPickerActivity"; - /** - * Name of the extra that indicates that a widget being dragged. - * - *

When set to "true" in the result of startActivityForResult, the client that launched the - * picker knows that activity was closed due to pending drag. - */ - private static final String EXTRA_IS_PENDING_WIDGET_DRAG = "is_pending_widget_drag"; - - // Intent extras that specify the desired widget width and height. If these are not specified in - // the intent, then widgets will not be filtered for size. - private static final String EXTRA_DESIRED_WIDGET_WIDTH = "desired_widget_width"; - private static final String EXTRA_DESIRED_WIDGET_HEIGHT = "desired_widget_height"; - /** - * Widgets currently added by the user in the UI surface. - *

This allows widget picker to exclude existing widgets from suggestions.

- */ - private static final String EXTRA_ADDED_APP_WIDGETS = "added_app_widgets"; - /** - * A unique identifier of the surface hosting the widgets; - *

"widgets" is reserved for home screen surface.

- *

"widgets_hub" is reserved for glanceable hub surface.

- */ - private static final String EXTRA_UI_SURFACE = "ui_surface"; - private static final Pattern UI_SURFACE_PATTERN = - Pattern.compile("^(widgets|widgets_hub)$"); - private SimpleDragLayer mDragLayer; - private WidgetsModel mModel; - private LauncherAppState mApp; - private WidgetPredictionsRequester mWidgetPredictionsRequester; - private final PopupDataProvider mPopupDataProvider = new PopupDataProvider(i -> {}); - - private int mDesiredWidgetWidth; - private int mDesiredWidgetHeight; - private int mWidgetCategoryFilter; - @Nullable - private String mUiSurface; - // Widgets existing on the host surface. - @NonNull - private List mAddedWidgets = new ArrayList<>(); - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER); - - mApp = LauncherAppState.getInstance(this); - InvariantDeviceProfile idp = mApp.getInvariantDeviceProfile(); - mDeviceProfile = idp.getDeviceProfile(this); - mModel = new WidgetsModel(); - - setContentView(R.layout.widget_picker_activity); - mDragLayer = findViewById(R.id.drag_layer); - mDragLayer.recreateControllers(); - - WindowInsetsController wc = mDragLayer.getWindowInsetsController(); - wc.hide(navigationBars() + statusBars()); - - BaseWidgetSheet widgetSheet = WidgetsFullSheet.show(this, true); - widgetSheet.disableNavBarScrim(true); - widgetSheet.addOnCloseListener(this::finish); - - parseIntentExtras(); - refreshAndBindWidgets(); - } - - private void parseIntentExtras() { - // A value of 0 for either size means that no filtering will occur in that dimension. If - // both values are 0, then no size filtering will occur. - mDesiredWidgetWidth = - getIntent().getIntExtra(EXTRA_DESIRED_WIDGET_WIDTH, 0); - mDesiredWidgetHeight = - getIntent().getIntExtra(EXTRA_DESIRED_WIDGET_HEIGHT, 0); - - // Defaults to '0' to indicate that there isn't a category filter. - mWidgetCategoryFilter = - getIntent().getIntExtra(AppWidgetManager.EXTRA_CATEGORY_FILTER, 0); - - String uiSurfaceParam = getIntent().getStringExtra(EXTRA_UI_SURFACE); - if (uiSurfaceParam != null && UI_SURFACE_PATTERN.matcher(uiSurfaceParam).matches()) { - mUiSurface = uiSurfaceParam; - } - if (Utilities.ATLEAST_T) { - ArrayList addedWidgets = getIntent().getParcelableArrayListExtra( - EXTRA_ADDED_APP_WIDGETS, AppWidgetProviderInfo.class); - if (addedWidgets != null) { - mAddedWidgets = addedWidgets; - } - } - } - - @NonNull - @Override - public PopupDataProvider getPopupDataProvider() { - return mPopupDataProvider; - } - - @Override - public SimpleDragLayer getDragLayer() { - return mDragLayer; - } - - @Override - public View.OnClickListener getItemOnClickListener() { - return v -> { - final AppWidgetProviderInfo info = - (v instanceof WidgetCell) ? ((WidgetCell) v).getWidgetItem().widgetInfo : null; - if (info == null || info.provider == null) { - return; - } - - setResult(RESULT_OK, new Intent() - .putExtra(Intent.EXTRA_COMPONENT_NAME, info.provider) - .putExtra(Intent.EXTRA_USER, info.getProfile())); - - finish(); - }; - } - - @Override - public View.OnLongClickListener getAllAppsItemLongClickListener() { - return view -> { - if (!(view instanceof WidgetCell widgetCell)) return false; - - if (widgetCell.getWidgetView().getDrawable() == null - && widgetCell.getAppWidgetHostViewPreview() == null) { - // The widget preview hasn't been loaded; so, we abort the drag. - return false; - } - - final AppWidgetProviderInfo info = widgetCell.getWidgetItem().widgetInfo; - if (info == null || info.provider == null) { - return false; - } - - View dragView = widgetCell.getDragAndDropView(); - if (dragView == null) { - return false; - } - - ClipData clipData = new ClipData( - new ClipDescription( - /* label= */ "", // not displayed anywhere; so, set to empty. - new String[]{MIMETYPE_TEXT_INTENT} - ), - new ClipData.Item(new Intent() - .putExtra(Intent.EXTRA_USER, info.getProfile()) - .putExtra(Intent.EXTRA_COMPONENT_NAME, info.provider)) - ); - - // Set result indicating activity was closed due a widget being dragged. - setResult(RESULT_OK, new Intent() - .putExtra(EXTRA_IS_PENDING_WIDGET_DRAG, true)); - - // DRAG_FLAG_GLOBAL permits dragging data beyond app window. - return dragView.startDragAndDrop( - clipData, - new View.DragShadowBuilder(dragView), - /* myLocalState= */ null, - View.DRAG_FLAG_GLOBAL - ); - }; - } - - /** Updates the model with widgets and provides them after applying the provided filter. */ - private void refreshAndBindWidgets() { - MODEL_EXECUTOR.execute(() -> { - LauncherAppState app = LauncherAppState.getInstance(this); - mModel.update(app, null); - final List allWidgets = - mModel.getFilteredWidgetsListForPicker( - app.getContext(), - /*widgetItemFilter=*/ widget -> { - final WidgetAcceptabilityVerdict verdict = - isWidgetAcceptable(widget); - verdict.maybeLogVerdict(); - return verdict.isAcceptable; - } - ); - bindWidgets(allWidgets); - if (mUiSurface != null) { - Map> allWidgetsMap = allWidgets.stream() - .filter(WidgetsListHeaderEntry.class::isInstance) - .collect(Collectors.toMap( - entry -> PackageUserKey.fromPackageItemInfo(entry.mPkgItem), - entry -> entry.mWidgets) - ); - mWidgetPredictionsRequester = new WidgetPredictionsRequester(app.getContext(), - mUiSurface, allWidgetsMap); - mWidgetPredictionsRequester.request(mAddedWidgets, this::bindRecommendedWidgets); - } - }); - } - - private void bindWidgets(List widgets) { - MAIN_EXECUTOR.execute(() -> mPopupDataProvider.setAllWidgets(widgets)); - } - - private void bindRecommendedWidgets(List recommendedWidgets) { - MAIN_EXECUTOR.execute(() -> mPopupDataProvider.setRecommendedWidgets(recommendedWidgets)); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - if (mWidgetPredictionsRequester != null) { - mWidgetPredictionsRequester.clear(); - } - } - - private WidgetAcceptabilityVerdict isWidgetAcceptable(WidgetItem widget) { - final AppWidgetProviderInfo info = widget.widgetInfo; - if (info == null) { - return rejectWidget(widget, "shortcut"); - } - - if (mWidgetCategoryFilter > 0 && (info.widgetCategory & mWidgetCategoryFilter) == 0) { - return rejectWidget( - widget, - "doesn't match category filter [filter=%d, widget=%d]", - mWidgetCategoryFilter, - info.widgetCategory); - } - - if (mDesiredWidgetWidth == 0 && mDesiredWidgetHeight == 0) { - // Accept the widget if the desired dimensions are unspecified. - return acceptWidget(widget); - } - - final boolean isHorizontallyResizable = - (info.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0; - if (mDesiredWidgetWidth > 0 && isHorizontallyResizable) { - if (info.maxResizeWidth > 0 - && info.maxResizeWidth >= info.minWidth - && info.maxResizeWidth < mDesiredWidgetWidth) { - return rejectWidget( - widget, - "maxResizeWidth[%d] < mDesiredWidgetWidth[%d]", - info.maxResizeWidth, - mDesiredWidgetWidth); - } - - final int minWidth = Math.min(info.minResizeWidth, info.minWidth); - if (minWidth > mDesiredWidgetWidth) { - return rejectWidget( - widget, - "min(minWidth[%d], minResizeWidth[%d]) > mDesiredWidgetWidth[%d]", - info.minWidth, - info.minResizeWidth, - mDesiredWidgetWidth); - } - } - - final boolean isVerticallyResizable = - (info.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0; - if (mDesiredWidgetHeight > 0 && isVerticallyResizable) { - if (info.maxResizeHeight > 0 - && info.maxResizeHeight >= info.minHeight - && info.maxResizeHeight < mDesiredWidgetHeight) { - return rejectWidget( - widget, - "maxResizeHeight[%d] < mDesiredWidgetHeight[%d]", - info.maxResizeHeight, - mDesiredWidgetHeight); - } - - final int minHeight = Math.min(info.minResizeHeight, info.minHeight); - if (minHeight > mDesiredWidgetHeight) { - return rejectWidget( - widget, - "min(minHeight[%d], minResizeHeight[%d]) > mDesiredWidgetHeight[%d]", - info.minHeight, - info.minResizeHeight, - mDesiredWidgetHeight); - } - } - - if (!isHorizontallyResizable || !isVerticallyResizable) { - return rejectWidget(widget, "not resizeable"); - } - - return acceptWidget(widget); - } - - private static WidgetAcceptabilityVerdict rejectWidget( - WidgetItem widget, String rejectionReason, Object... args) { - return new WidgetAcceptabilityVerdict( - false, - widget.widgetInfo != null - ? widget.widgetInfo.provider.flattenToShortString() - : widget.label, - String.format(Locale.ENGLISH, rejectionReason, args)); - } - - private static WidgetAcceptabilityVerdict acceptWidget(WidgetItem widget) { - return new WidgetAcceptabilityVerdict( - true, widget.widgetInfo.provider.flattenToShortString(), ""); - } - - private record WidgetAcceptabilityVerdict( - boolean isAcceptable, String widgetLabel, String reason) { - void maybeLogVerdict() { - // Only log a verdict if a reason is specified. - if (Log.isLoggable(TAG, Log.DEBUG) && !reason.isEmpty()) { - Log.i(TAG, String.format( - Locale.ENGLISH, - "%s: %s because %s", - widgetLabel, - isAcceptable ? "accepted" : "rejected", - reason)); - } - } - } -} diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java index 84c2ed252bf..b8cfdc1d5aa 100644 --- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java +++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java @@ -31,12 +31,14 @@ import android.view.accessibility.AccessibilityManager; import androidx.annotation.ColorInt; -import androidx.core.content.ContextCompat; +import androidx.annotation.VisibleForTesting; +import com.android.launcher3.Flags; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.allapps.FloatingHeaderRow; import com.android.launcher3.allapps.FloatingHeaderView; +import com.android.launcher3.util.Themes; /** * A view which shows a horizontal divider @@ -84,10 +86,10 @@ public AppsDividerView(Context context, AttributeSet attrs, int defStyleAttr) { getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height) }; - mStrokeColor = ContextCompat.getColor(context, R.color.material_color_outline_variant); - - mAllAppsLabelTextColor = ContextCompat.getColor(context, - R.color.material_color_on_surface_variant); + mStrokeColor = Flags.allAppsBlur() + ? Themes.getAttrColor(context, R.attr.bottomSheetDragHandleColor) + : context.getColor(R.color.materialColorOutlineVariant); + mAllAppsLabelTextColor = context.getColor(R.color.materialColorOnSurface); mAccessibilityManager = AccessibilityManager.getInstance(context); setShowAllAppsLabel(!ALL_APPS_VISITED_COUNT.hasReachedMax(context)); @@ -212,7 +214,7 @@ protected void onDraw(Canvas canvas) { private Layout getAllAppsLabelLayout() { if (mAllAppsLabelLayout == null) { mPaint.setAntiAlias(true); - mPaint.setTypeface(Typeface.create("google-sans", Typeface.NORMAL)); + mPaint.setTypeface(Typeface.create("variable-title-small", Typeface.NORMAL)); mPaint.setTextSize( getResources().getDimensionPixelSize(R.dimen.all_apps_label_text_size)); @@ -254,4 +256,9 @@ public Class getTypeClass() { public View getFocusedChild() { return null; } + + @VisibleForTesting + public DividerType getDividerType() { + return mDividerType; + } } diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java index a16031d804f..05e1bf4d307 100644 --- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java +++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java @@ -16,12 +16,16 @@ package com.android.launcher3.appprediction; +import static android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE; + import android.content.Context; import android.graphics.Canvas; +import android.os.Build; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.LinearLayout; import androidx.annotation.NonNull; @@ -31,7 +35,6 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; import com.android.launcher3.Flags; -import com.android.launcher3.LauncherPrefs; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.allapps.FloatingHeaderRow; @@ -57,7 +60,7 @@ public class PredictionRowView // Vertical padding of the icon that contributes to the expected cell height. private final int mVerticalPadding; // Extra padding that is used in the top app rows (prediction and search) that is not used in - // the regular A-Z list. This only applies to single line label. + // the regular A-Z list. private final int mTopRowExtraHeight; // Helper to drawing the focus indicator. @@ -90,6 +93,14 @@ public PredictionRowView(@NonNull Context context, @Nullable AttributeSet attrs) updateVisibility(); } + @Override + public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfo(info); + if (Build.VERSION.SDK_INT >= UPSIDE_DOWN_CAKE) { + info.setContainerTitle(mActivityContext.getString(R.string.title_app_suggestions)); + } + } + @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); @@ -108,12 +119,10 @@ public void setup(FloatingHeaderView parent, FloatingHeaderRow[] rows, boolean t private void updateVisibility() { setVisibility(mPredictionsEnabled ? VISIBLE : GONE); - if (mActivityContext.getAppsView() != null) { - if (mPredictionsEnabled) { - mActivityContext.getAppsView().getAppsStore().registerIconContainer(this); - } else { - mActivityContext.getAppsView().getAppsStore().unregisterIconContainer(this); - } + if (mPredictionsEnabled) { + mActivityContext.getActivityComponent().getAppsStore().registerIconContainer(this); + } else { + mActivityContext.getActivityComponent().getAppsStore().unregisterIconContainer(this); } } @@ -132,15 +141,15 @@ protected void dispatchDraw(Canvas canvas) { @Override public int getExpectedHeight() { DeviceProfile deviceProfile = mActivityContext.getDeviceProfile(); - int iconHeight = deviceProfile.allAppsIconSizePx; - int iconPadding = deviceProfile.allAppsIconDrawablePaddingPx; - int textHeight = Utilities.calculateTextHeight(deviceProfile.allAppsIconTextSizePx); + int iconHeight = deviceProfile.getAllAppsProfile().getIconSizePx(); + int iconPadding = deviceProfile.getAllAppsProfile().getIconDrawablePaddingPx(); + int textHeight = Utilities.calculateTextHeight( + deviceProfile.getAllAppsProfile().getIconTextSizePx()); int totalHeight = iconHeight + iconPadding + textHeight + mVerticalPadding * 2; // Prediction row height will be 4dp bigger than the regular apps in A-Z list when two line // is not enabled. Otherwise, the extra height will increase by just the textHeight. - int extraHeight = (Flags.enableTwolineToggle() && - LauncherPrefs.ENABLE_TWOLINE_ALLAPPS_TOGGLE.get(getContext())) - ? textHeight : mTopRowExtraHeight; + int extraHeight = deviceProfile.inv.enableTwoLinesInAllApps + ? (textHeight + mTopRowExtraHeight) : mTopRowExtraHeight; totalHeight += extraHeight; return getVisibility() == GONE ? 0 : totalHeight + getPaddingTop() + getPaddingBottom(); } @@ -225,7 +234,11 @@ private void applyPredictionApps() { lp.height = ViewGroup.LayoutParams.MATCH_PARENT; } else { // Ensure the all apps icon height matches the workspace icons in portrait mode. - lp.height = mActivityContext.getDeviceProfile().allAppsCellHeightPx; + lp.height = + mActivityContext + .getDeviceProfile() + .getAllAppsProfile() + .getCellHeightPx(); } lp.width = 0; lp.weight = 1; @@ -290,6 +303,9 @@ public void dump(String prefix, PrintWriter writer) { writer.println(prefix + "\tmPredictionsEnabled: " + mPredictionsEnabled); writer.println(prefix + "\tmPredictionUiUpdatePaused: " + mPredictionUiUpdatePaused); writer.println(prefix + "\tmNumPredictedAppsPerRow: " + mNumPredictedAppsPerRow); - writer.println(prefix + "\tmPredictedApps: " + mPredictedApps); + writer.println(prefix + "\tmPredictedApps: " + mPredictedApps.size()); + for (WorkspaceItemInfo info : mPredictedApps) { + writer.println(prefix + "\t\t" + info); + } } } diff --git a/quickstep/src/com/android/launcher3/dagger/LauncherConcurrencyModule.kt b/quickstep/src/com/android/launcher3/dagger/LauncherConcurrencyModule.kt new file mode 100644 index 00000000000..bf15e4deb06 --- /dev/null +++ b/quickstep/src/com/android/launcher3/dagger/LauncherConcurrencyModule.kt @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.dagger + +import android.os.Handler +import android.os.HandlerThread +import android.os.Looper +import android.os.Process +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.launcher3.util.coroutines.ProductionDispatchers +import com.android.systemui.dagger.qualifiers.Background +import dagger.Module +import dagger.Provides +import kotlinx.coroutines.CoroutineName +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob + +/** Dagger Module for per-display thread handling. */ +// TODO(b/407594919) - Adapt this to use new concurrency module. +@Module +object LauncherConcurrencyModule { + // Slow BG executor can potentially affect UI if UI is waiting for an updated state from this + // thread + private const val BG_SLOW_DISPATCH_THRESHOLD = 1000L + private const val BG_SLOW_DELIVERY_THRESHOLD = 1000L + + private val bgLooper: Looper by lazy { + val thread = HandlerThread("LauncherBg", Process.THREAD_PRIORITY_BACKGROUND) + thread.start() + thread.looper.setSlowLogThresholdMs(BG_SLOW_DISPATCH_THRESHOLD, BG_SLOW_DELIVERY_THRESHOLD) + thread.looper + } + + /** Background Looper */ + @Provides @LauncherAppSingleton @Background fun provideBgLooper(): Looper = bgLooper + + /** + * Background Handler. + * + * Prefer the Background Executor when possible. + */ + @Provides + @LauncherAppSingleton + @Background + fun provideBgHandler(@Background bgLooper: Looper): Handler = Handler(bgLooper) + + /** CoroutineDispatcher provider. */ + @Provides fun provideCoroutineDispatcherProvider(): DispatcherProvider = ProductionDispatchers + + /** Background CoroutineScope provider. */ + @Provides + @LauncherAppSingleton + @Background + fun provideBgCoroutineScope(dispatcherProvider: DispatcherProvider) = + CoroutineScope( + SupervisorJob() + dispatcherProvider.ioBackground + CoroutineName("LauncherBg") + ) +} diff --git a/quickstep/src/com/android/launcher3/dagger/Modules.kt b/quickstep/src/com/android/launcher3/dagger/Modules.kt new file mode 100644 index 00000000000..c846ba38970 --- /dev/null +++ b/quickstep/src/com/android/launcher3/dagger/Modules.kt @@ -0,0 +1,194 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.dagger + +import android.annotation.ElapsedRealtimeLong +import android.content.Context +import android.net.Uri +import android.os.SystemClock +import com.android.internal.R +import com.android.launcher3.Flags.enableSystemDrag +import com.android.launcher3.backuprestore.LauncherRestoreEventLogger +import com.android.launcher3.concurrent.annotations.ThreadPool +import com.android.launcher3.dragndrop.SystemDragController +import com.android.launcher3.dragndrop.SystemDragControllerImpl +import com.android.launcher3.dragndrop.SystemDragControllerStub +import com.android.launcher3.dragndrop.SystemDragListener +import com.android.launcher3.dragndrop.SystemDragListenerFactory +import com.android.launcher3.homescreenfiles.HomeScreenFilesMediaStoreProvider +import com.android.launcher3.homescreenfiles.HomeScreenFilesNoOpProvider +import com.android.launcher3.homescreenfiles.HomeScreenFilesProvider +import com.android.launcher3.homescreenfiles.HomeScreenFilesUtils +import com.android.launcher3.icons.IconCache +import com.android.launcher3.icons.LauncherIconProvider +import com.android.launcher3.icons.LauncherIconProviderImpl +import com.android.launcher3.logging.StatsLogManager.StatsLogManagerFactory +import com.android.launcher3.secondarydisplay.SecondaryDisplayDelegate +import com.android.launcher3.secondarydisplay.SecondaryDisplayQuickstepDelegateImpl +import com.android.launcher3.uioverrides.QuickstepWidgetHolder.QuickstepWidgetHolderFactory +import com.android.launcher3.uioverrides.SystemApiWrapper +import com.android.launcher3.uioverrides.plugins.PluginManagerWrapperImpl +import com.android.launcher3.util.ApiWrapper +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.launcher3.util.InstantAppResolver +import com.android.launcher3.util.PluginManagerWrapper +import com.android.launcher3.util.window.RefreshRateTracker +import com.android.launcher3.util.window.WindowManagerProxy +import com.android.launcher3.widget.LauncherWidgetHolder.WidgetHolderFactory +import com.android.quickstep.InstantAppResolverImpl +import com.android.quickstep.LauncherRestoreEventLoggerImpl +import com.android.quickstep.logging.StatsLogCompatManager.StatsLogCompatManagerFactory +import com.android.quickstep.util.ChoreographerFrameRateTracker +import com.android.quickstep.util.ContextualSearchStateManager +import com.android.quickstep.util.GestureExclusionManager +import com.android.systemui.shared.system.ActivityManagerWrapper +import com.android.wm.shell.shared.desktopmode.DesktopState +import dagger.Binds +import dagger.BindsOptionalOf +import dagger.Lazy +import dagger.Module +import dagger.Provides +import dagger.multibindings.ElementsIntoSet +import java.util.Optional +import java.util.concurrent.ExecutorService +import javax.inject.Named + +import app.lawnchair.factory.LawnchairWidgetHolder +import app.lawnchair.util.LawnchairWindowManagerProxy + +private object Modules {} + +@Module +abstract class WindowManagerProxyModule { + @Binds abstract fun bindWindowManagerProxy(proxy: LawnchairWindowManagerProxy): WindowManagerProxy +} + +@Module +abstract class ActivityContextModule { + @Binds + abstract fun bindSecondaryDisplayDelegate( + impl: SecondaryDisplayQuickstepDelegateImpl + ): SecondaryDisplayDelegate +} + +@Module +abstract class ApiWrapperModule { + @Binds + abstract fun bindStatsLogManagerFactory( + impl: StatsLogCompatManagerFactory + ): StatsLogManagerFactory + + @Binds abstract fun bindApiWrapper(systemApiWrapper: SystemApiWrapper): ApiWrapper + + @Binds + abstract fun bindIconProvider(iconProviderImpl: LauncherIconProviderImpl): LauncherIconProvider + + @Binds abstract fun bindInstantAppResolver(impl: InstantAppResolverImpl): InstantAppResolver + + @Binds + abstract fun bindRestoreEventLogger( + impl: LauncherRestoreEventLoggerImpl + ): LauncherRestoreEventLogger +} + +@Module +abstract class WidgetModule { + + @Binds + abstract fun bindWidgetHolderFactory(factor: LawnchairWidgetHolder.Factory): WidgetHolderFactory +} + +@Module +abstract class PluginManagerWrapperModule { + @Binds + abstract fun bindPluginManagerWrapper(impl: PluginManagerWrapperImpl): PluginManagerWrapper +} + +@Module +object StaticObjectModule { + + @Provides + @JvmStatic + fun provideGestureExclusionManager(): GestureExclusionManager = GestureExclusionManager.INSTANCE + + @Provides + @JvmStatic + fun provideRefreshRateTracker(): RefreshRateTracker = ChoreographerFrameRateTracker + + @Provides + @JvmStatic + fun provideActivityManagerWrapper(): ActivityManagerWrapper = + ActivityManagerWrapper.getInstance() + + @Provides + @JvmStatic + @ElapsedRealtimeLong + fun provideElapsedRealTime(): () -> Long = SystemClock::elapsedRealtime + + @Provides + @ElementsIntoSet + @Named("SETTINGS_ENABLED_BY_DEFAULT") + fun provideSearchEntryPointsDefault(@ApplicationContext ctx: Context): Set = + if (ctx.resources.getBoolean(R.bool.config_searchAllEntrypointsEnabledDefault)) { + setOf(ContextualSearchStateManager.SEARCH_ALL_ENTRYPOINTS_ENABLED_URI) + } else emptySet() + + @Provides + @JvmStatic + fun provideDesktopState(@ApplicationContext context: Context): DesktopState = + DesktopState.getInstance(context) +} + +@Module +interface SystemDragOptionalDependenciesModule { + @BindsOptionalOf fun bindSystemDragListenerFactory(): SystemDragListenerFactory +} + +@Module(includes = [SystemDragOptionalDependenciesModule::class]) +object SystemDragModule { + @Provides + @LauncherAppSingleton + fun provideSystemDragController( + iconCache: Lazy, + systemDragListenerFactory: Optional, + ): SystemDragController = + if (enableSystemDrag()) + SystemDragControllerImpl( + systemDragListenerFactory.orElse { launcher -> + SystemDragListener(launcher, iconCache) + } + ) + else SystemDragControllerStub() +} + +/** A dagger module responsible for managing files on the home screen. */ +@Module +object HomeScreenFilesModule { + @Provides + @LauncherAppSingleton + fun provideHomeScreenFilesProvider( + @ApplicationContext context: Context, + @ThreadPool executorService: ExecutorService, + tracker: DaggerSingletonTracker, + ): HomeScreenFilesProvider { + return if (HomeScreenFilesUtils.isFeatureEnabled) { + HomeScreenFilesMediaStoreProvider(context, executorService, tracker) + } else { + HomeScreenFilesNoOpProvider() + } + } +} diff --git a/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt b/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt new file mode 100644 index 00000000000..115c657f732 --- /dev/null +++ b/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt @@ -0,0 +1,288 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.dagger + +import android.content.Context +import android.hardware.display.DisplayManager +import android.os.Handler +import android.util.Log +import android.view.Display.DEFAULT_DISPLAY +import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY +import android.view.WindowManagerGlobal +import com.android.app.displaylib.DefaultDisplayOnlyInstanceRepositoryImpl +import com.android.app.displaylib.DisplayLibBackground +import com.android.app.displaylib.DisplayLibComponent +import com.android.app.displaylib.DisplayRepository +import com.android.app.displaylib.DisplaysWithDecorationsRepository +import com.android.app.displaylib.DisplaysWithDecorationsRepositoryCompat +import com.android.app.displaylib.PerDisplayInstanceRepositoryImpl +import com.android.app.displaylib.PerDisplayRepository +import com.android.app.displaylib.SingleInstanceRepositoryImpl +import com.android.app.displaylib.createDisplayLibComponent +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.FallbackWindowInterface +import com.android.quickstep.RecentsAnimationDeviceState +import com.android.quickstep.RotationTouchHelper +import com.android.quickstep.TaskAnimationManager +import com.android.quickstep.window.RecentsWindowFlags.enableOverviewOnConnectedDisplays +import com.android.quickstep.window.RecentsWindowManager +import com.android.quickstep.window.RecentsWindowManagerInstanceProvider +import com.android.quickstep.window.RecentsWindowTracker +import com.android.systemui.dagger.qualifiers.Background +import dagger.Binds +import dagger.Module +import dagger.Provides +import kotlinx.coroutines.CoroutineScope + +@Module(includes = [BasePerDisplayModule::class, PerDisplayRepositoriesModule::class]) +interface PerDisplayModule + +@Module(includes = [DisplayLibModule::class]) +interface BasePerDisplayModule { + @Binds + @DisplayLibBackground + abstract fun bindDisplayLibBackground(@Background bgScope: CoroutineScope): CoroutineScope +} + +@Module +object PerDisplayRepositoriesModule { + @Provides + @LauncherAppSingleton + fun provideRecentsAnimationDeviceStateRepo( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, + instanceFactory: RecentsAnimationDeviceState.Factory, + rotationTouchHelperRepository: PerDisplayRepository, + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create( + "RecentsAnimationDeviceStateRepo", + { displayId -> + rotationTouchHelperRepository[displayId]?.let { + instanceFactory.create(displayId, it) + } + }, + ) + } else { + SingleInstanceRepositoryImpl( + "RecentsAnimationDeviceStateRepo", + rotationTouchHelperRepository[DEFAULT_DISPLAY]?.let { + instanceFactory.create(DEFAULT_DISPLAY, it) + }!!, // Assert the default display is always available. + ) + } + } + + @Provides + @LauncherAppSingleton + fun provideTaskAnimationManagerRepo( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, + instanceFactory: TaskAnimationManager.Factory, + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create("TaskAnimationManagerRepo", instanceFactory::create) + } else { + DefaultDisplayOnlyInstanceRepositoryImpl( + "TaskAnimationManager", + instanceFactory::create, + ) + } + } + + @Provides + @LauncherAppSingleton + fun provideRotationTouchHandlerRepo( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, + instanceFactory: RotationTouchHelper.Factory, + @WindowContext windowContextRepository: PerDisplayRepository, + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create( + "RotationTouchHelperRepo", + { displayId -> + windowContextRepository[displayId]?.let { instanceFactory.create(it) } + }, + ) + } else { + SingleInstanceRepositoryImpl( + "RotationTouchHelperRepo", + instanceFactory.create(windowContextRepository[DEFAULT_DISPLAY]), + ) + } + } + + @Provides + @LauncherAppSingleton + fun provideFallbackWindowInterfaceRepo( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, + recentsWindowTrackerRepository: PerDisplayRepository, + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create( + "FallbackWindowInterfaceRepo", + { displayId -> + recentsWindowTrackerRepository[displayId]?.let { FallbackWindowInterface(it) } + }, + ) + } else { + SingleInstanceRepositoryImpl( + "FallbackWindowInterfaceRepo", + FallbackWindowInterface(recentsWindowTrackerRepository[DEFAULT_DISPLAY]!!), + ) + } + } + + @Provides + @LauncherAppSingleton + fun provideRecentsWindowManagerRepo( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, + instanceProvider: RecentsWindowManagerInstanceProvider, + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create("RecentsWindowManagerRepo", instanceProvider) + } else { + DefaultDisplayOnlyInstanceRepositoryImpl("RecentsWindowManagerRepo", instanceProvider) + } + } + + @Provides + @LauncherAppSingleton + fun provideRecentsWindowTrackerRepo( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create("RecentsWindowTrackerRepo", { _ -> RecentsWindowTracker() }) + } else { + DefaultDisplayOnlyInstanceRepositoryImpl( + "RecentsWindowTrackerRepo", + { _ -> RecentsWindowTracker() }, + ) + } + } + + @Provides + @LauncherAppSingleton + @DisplayContext + fun provideDisplayContext( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, + displayRepository: DisplayRepository, + @ApplicationContext context: Context, + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create( + "DisplayContextRepo", + { displayId -> + displayRepository.getDisplay(displayId)?.let { + context.createDisplayContext(it) + } + }, + ) + } else { + SingleInstanceRepositoryImpl( + "DisplayContextRepo", + context.createDisplayContext(displayRepository.getDisplay(DEFAULT_DISPLAY)!!), + ) + } + } + + @Provides + @LauncherAppSingleton + @WindowContext + fun provideWindowContext( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, + displayRepository: DisplayRepository, + @ApplicationContext context: Context, + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create( + "DisplayContextRepo", + { displayId -> + displayRepository.getDisplay(displayId)?.let { + context.createWindowContext( + it, + TYPE_APPLICATION_OVERLAY, + /* options=*/ null, + ) + } + }, + ) + } else { + SingleInstanceRepositoryImpl( + "DisplayContextRepo", + context.createWindowContext( + displayRepository.getDisplay(DEFAULT_DISPLAY)!!, + TYPE_APPLICATION_OVERLAY, + /* options=*/ null, + ), + ) + } + } +} + +/** + * Module to bind the DisplayRepository from displaylib to the LauncherAppSingleton dagger graph. + */ +@Module +object DisplayLibModule { + @Provides + @LauncherAppSingleton + fun displayLibComponent( + @ApplicationContext context: Context, + @Background bgHandler: Handler, + @Background bgApplicationScope: CoroutineScope, + coroutineDispatcherProvider: DispatcherProvider, + ): DisplayLibComponent { + val displayManager = context.getSystemService(DisplayManager::class.java) + val windowManager = checkNotNull(WindowManagerGlobal.getWindowManagerService()) + return createDisplayLibComponent( + displayManager, + windowManager, + bgHandler, + bgApplicationScope, + coroutineDispatcherProvider.ioBackground, + ) + } + + @Provides + @LauncherAppSingleton + fun providesDisplayRepositoryFromLib( + displayLibComponent: DisplayLibComponent + ): DisplayRepository { + return displayLibComponent.displayRepository + } + + @Provides + @LauncherAppSingleton + fun providesDisplaysWithDecorationsRepository( + displayLibComponent: DisplayLibComponent + ): DisplaysWithDecorationsRepository { + return displayLibComponent.displaysWithDecorationsRepository + } + + @Provides + @LauncherAppSingleton + fun providesDisplaysWithDecorationsRepositoryCompat( + displayLibComponent: DisplayLibComponent + ): DisplaysWithDecorationsRepositoryCompat { + return displayLibComponent.displaysWithDecorationsRepositoryCompat + } + + @Provides + fun dumpRegistrationLambda(): PerDisplayRepository.InitCallback = + PerDisplayRepository.InitCallback { debugName, _ -> + Log.d("PerDisplayInitCallback", debugName) + } +} diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchAnimatorHelper.kt b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchAnimatorHelper.kt new file mode 100644 index 00000000000..62534f033b0 --- /dev/null +++ b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchAnimatorHelper.kt @@ -0,0 +1,222 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.desktop + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Rect +import android.util.Log +import android.view.Choreographer +import android.view.SurfaceControl.Transaction +import android.view.WindowManager.TRANSIT_CLOSE +import android.view.WindowManager.TRANSIT_OPEN +import android.view.WindowManager.TRANSIT_TO_BACK +import android.window.DesktopModeFlags +import android.window.TransitionInfo +import android.window.TransitionInfo.Change +import androidx.core.animation.addListener +import androidx.core.util.Supplier +import com.android.app.animation.Interpolators +import com.android.internal.jank.Cuj +import com.android.internal.jank.InteractionJankMonitor +import com.android.launcher3.R +import com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType +import com.android.launcher3.desktop.DesktopAppLaunchTransition.Companion.LAUNCH_CHANGE_MODES +import com.android.launcher3.util.DisplayController +import com.android.wm.shell.shared.animation.MinimizeAnimator +import com.android.wm.shell.shared.animation.WindowAnimator + +/** + * Helper class responsible for creating and managing animators for desktop app launch and related + * transitions. + * + *

This class handles the complex logic of creating various animators, including launch, + * minimize, and trampoline close animations, based on the provided transition information and + * launch type. It also utilizes {@link InteractionJankMonitor} to monitor animation jank. + * + * @param context The application context. + * @param launchType The type of app launch, containing animation parameters. + * @param cujType The CUJ (Critical User Journey) type for jank monitoring. + */ +class DesktopAppLaunchAnimatorHelper( + private val context: Context, + private val displayController: DisplayController, + private val launchType: AppLaunchType, + @Cuj.CujType private val cujType: Int, + private val transactionSupplier: Supplier, +) { + + private val interactionJankMonitor = InteractionJankMonitor.getInstance() + + fun createAnimators(info: TransitionInfo, finishCallback: (Animator) -> Unit): List { + val launchChange = getLaunchChange(info) + if (launchChange == null) { + val tasksInfo = + info.changes.joinToString(", ") { change -> + "${change.taskInfo?.taskId}:${change.taskInfo?.isFreeform}" + } + Log.e(TAG, "No launch change found: Transition info=$info, tasks state=$tasksInfo") + return emptyList() + } + + val transaction = transactionSupplier.get() + + val minimizeChange = getMinimizeChange(info) + val trampolineCloseChange = getTrampolineCloseChange(info) + + val launchAnimator = + createLaunchAnimator( + launchChange, + transaction, + finishCallback, + isTrampoline = trampolineCloseChange != null, + ) + val animatorsList = mutableListOf(launchAnimator) + if (minimizeChange != null) { + val minimizeAnimator = + createMinimizeAnimator(minimizeChange, transaction, finishCallback) + animatorsList.add(minimizeAnimator) + } + if (trampolineCloseChange != null) { + val trampolineCloseAnimator = + createTrampolineCloseAnimator(trampolineCloseChange, transaction, finishCallback) + animatorsList.add(trampolineCloseAnimator) + } + return animatorsList + } + + private fun getLaunchChange(info: TransitionInfo): Change? = + info.changes.firstOrNull { change -> + change.mode in LAUNCH_CHANGE_MODES && change.taskInfo?.isFreeform == true + } + + private fun getMinimizeChange(info: TransitionInfo): Change? = + info.changes.firstOrNull { change -> + change.mode == TRANSIT_TO_BACK && change.taskInfo?.isFreeform == true + } + + private fun getTrampolineCloseChange(info: TransitionInfo): Change? { + if ( + info.changes.size < 2 || + !DesktopModeFlags.ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX.isTrue + ) { + return null + } + val openChange = + info.changes.firstOrNull { change -> + change.mode == TRANSIT_OPEN && change.taskInfo?.isFreeform == true + } + val closeChange = + info.changes.firstOrNull { change -> + change.mode == TRANSIT_CLOSE && change.taskInfo?.isFreeform == true + } + val openPackage = openChange?.taskInfo?.baseIntent?.component?.packageName + val closePackage = closeChange?.taskInfo?.baseIntent?.component?.packageName + return if (openPackage != null && closePackage != null && openPackage == closePackage) { + closeChange + } else { + null + } + } + + private fun createLaunchAnimator( + change: Change, + transaction: Transaction, + onAnimFinish: (Animator) -> Unit, + isTrampoline: Boolean, + ): Animator { + val boundsAnimator = + WindowAnimator.createBoundsAnimator( + context.resources.displayMetrics, + launchType.boundsAnimationParams, + change, + transaction, + ) + val alphaAnimator = + ValueAnimator.ofFloat(0f, 1f).apply { + duration = launchType.alphaDurationMs + interpolator = Interpolators.LINEAR + addUpdateListener { animation -> + transaction + .setAlpha(change.leash, animation.animatedValue as Float) + .setFrameTimeline(Choreographer.getInstance().vsyncId) + .apply() + } + } + val clipRect = Rect(change.endAbsBounds).apply { offsetTo(0, 0) } + transaction.setCrop(change.leash, clipRect) + val displayContext = displayController.getInfoForDisplay(change.endDisplayId)?.getContext() + val animatorContext = displayContext ?: context + val taskCornerRadiusInPx = + animatorContext.resources + .getDimensionPixelSize( + R.dimen.desktop_windowing_freeform_task_rounded_corner_radius + ) + .toFloat() + transaction.setCornerRadius(change.leash, taskCornerRadiusInPx) + return AnimatorSet().apply { + interactionJankMonitor.begin(change.leash, context, context.mainThreadHandler, cujType) + if (isTrampoline) { + play(alphaAnimator) + } else { + playTogether(boundsAnimator, alphaAnimator) + } + addListener( + onEnd = { animation -> + onAnimFinish(animation) + interactionJankMonitor.end(cujType) + } + ) + } + } + + private fun createMinimizeAnimator( + change: Change, + transaction: Transaction, + onAnimFinish: (Animator) -> Unit, + ): Animator { + return MinimizeAnimator.create( + context, + change, + transaction, + onAnimFinish, + interactionJankMonitor, + context.mainThreadHandler, + ) + } + + private fun createTrampolineCloseAnimator( + change: Change, + transaction: Transaction, + onAnimFinish: (Animator) -> Unit, + ): Animator { + return ValueAnimator.ofFloat(1f, 0f).apply { + duration = 100L + interpolator = Interpolators.LINEAR + addUpdateListener { animation -> + transaction.setAlpha(change.leash, animation.animatedValue as Float).apply() + } + addListener(onEnd = { animation -> onAnimFinish(animation) }) + } + } + + private companion object { + const val TAG = "DesktopAppLaunchAnimatorHelper" + } +} diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransition.kt b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransition.kt new file mode 100644 index 00000000000..98465fe2a99 --- /dev/null +++ b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransition.kt @@ -0,0 +1,135 @@ +/* + * 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.launcher3.desktop + +import android.animation.Animator +import android.content.Context +import android.os.IBinder +import android.util.Log +import android.view.SurfaceControl.Transaction +import android.view.WindowManager.TRANSIT_OPEN +import android.view.WindowManager.TRANSIT_TO_FRONT +import android.window.IRemoteTransitionFinishedCallback +import android.window.RemoteTransitionStub +import android.window.TransitionInfo +import androidx.core.util.Supplier +import com.android.app.animation.Interpolators +import com.android.internal.jank.Cuj +import com.android.launcher3.util.DisplayController +import com.android.quickstep.RemoteRunnable +import com.android.wm.shell.shared.animation.WindowAnimator +import java.util.concurrent.Executor + +/** + * [android.window.RemoteTransition] for Desktop app launches. + * + * This transition supports minimize-changes, i.e. in a launch-transition, if a window is moved back + * ([android.view.WindowManager.TRANSIT_TO_BACK]) this transition will apply a minimize animation to + * that window. + */ +class DesktopAppLaunchTransition +@JvmOverloads +constructor( + // If context needs to become a property, it has to be application context to avoid memory leak. + context: Context, + displayController: DisplayController, + private val launchType: AppLaunchType, + @Cuj.CujType private val cujType: Int, + private val mainExecutor: Executor, + transactionSupplier: Supplier = Supplier { Transaction() }, +) : RemoteTransitionStub() { + + private val animatorHelper: DesktopAppLaunchAnimatorHelper = + DesktopAppLaunchAnimatorHelper( + // We need to pass application to avoid leak of activity. + context.applicationContext, + displayController, + launchType, + cujType, + transactionSupplier, + ) + + enum class AppLaunchType( + val boundsAnimationParams: WindowAnimator.BoundsAnimationParams, + val alphaDurationMs: Long, + ) { + LAUNCH(launchBoundsAnimationDef, /* alphaDurationMs= */ 200L), + UNMINIMIZE(unminimizeBoundsAnimationDef, /* alphaDurationMs= */ 100L), + } + + override fun startAnimation( + token: IBinder, + info: TransitionInfo, + transaction: Transaction, + transitionFinishedCallback: IRemoteTransitionFinishedCallback, + ) { + Log.v(TAG, "startAnimation: launchType=$launchType, cujType=$cujType") + val safeTransitionFinishedCallback = RemoteRunnable { + transitionFinishedCallback.onTransitionFinished(/* wct= */ null, /* sct= */ null) + } + mainExecutor.execute { + getLaunchChange(info)?.let { launchChange -> + transaction.reparent(launchChange.leash, info.rootLeash) + } + transaction.apply() + runAnimators(info, safeTransitionFinishedCallback) + } + } + + private fun runAnimators(info: TransitionInfo, finishedCallback: RemoteRunnable) { + val animators = mutableListOf() + val animatorFinishedCallback: (Animator) -> Unit = { animator -> + animators -= animator + if (animators.isEmpty()) { + RemoteRunnable.executeSafely(finishedCallback) + } + } + animators += animatorHelper.createAnimators(info, animatorFinishedCallback) + if (animators.isEmpty()) { + RemoteRunnable.executeSafely(finishedCallback) + return + } + animators.forEach { it.start() } + } + + private fun getLaunchChange(info: TransitionInfo): TransitionInfo.Change? = + info.changes.firstOrNull { change -> + change.mode in LAUNCH_CHANGE_MODES && change.taskInfo?.isFreeform == true + } + + companion object { + const val TAG = "DesktopAppLaunchTransition" + /** Change modes that represent a task becoming visible / launching in Desktop mode. */ + val LAUNCH_CHANGE_MODES = intArrayOf(TRANSIT_OPEN, TRANSIT_TO_FRONT) + + private val launchBoundsAnimationDef = + WindowAnimator.BoundsAnimationParams( + durationMs = 600, + startOffsetYDp = 36f, + startScale = 0.95f, + interpolator = Interpolators.STANDARD_DECELERATE, + ) + + private val unminimizeBoundsAnimationDef = + WindowAnimator.BoundsAnimationParams( + durationMs = 300, + startOffsetYDp = 12f, + startScale = 0.97f, + interpolator = Interpolators.STANDARD_DECELERATE, + ) + } +} diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt new file mode 100644 index 00000000000..8332ff9b6b1 --- /dev/null +++ b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.desktop + +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD +import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM +import android.content.Context +import android.window.DesktopExperienceFlags +import android.window.DesktopModeFlags +import android.window.RemoteTransition +import android.window.TransitionFilter +import android.window.TransitionFilter.CONTAINER_ORDER_TOP +import com.android.internal.jank.Cuj +import com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.quickstep.SystemUiProxy +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus + +/** Manages transitions related to app launches in Desktop Mode. */ +class DesktopAppLaunchTransitionManager( + private val context: Context, + private val systemUiProxy: SystemUiProxy, + private val displayController: DisplayController, +) { + private var remoteWindowLimitUnminimizeTransition: RemoteTransition? = null + + /** + * Register a [RemoteTransition] supporting Desktop app launches, and window limit + * minimizations. + */ + fun registerTransitions() { + if (!shouldRegisterTransitions()) { + return + } + remoteWindowLimitUnminimizeTransition = + RemoteTransition( + DesktopAppLaunchTransition( + context, + displayController, + AppLaunchType.UNMINIMIZE, + Cuj.CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_INTENT, + MAIN_EXECUTOR, + ), + "DesktopWindowLimitUnminimize", + ) + systemUiProxy.registerRemoteTransition( + remoteWindowLimitUnminimizeTransition, + buildAppLaunchFilter(), + ) + } + + /** + * Unregister the [RemoteTransition] supporting Desktop app launches and window limit + * minimizations. + */ + fun unregisterTransitions() { + if (!shouldRegisterTransitions()) { + return + } + systemUiProxy.unregisterRemoteTransition(remoteWindowLimitUnminimizeTransition) + remoteWindowLimitUnminimizeTransition = null + } + + private fun shouldRegisterTransitions(): Boolean = + DesktopModeStatus.canEnterDesktopMode(context) && + DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue + + companion object { + private fun buildAppLaunchFilter(): TransitionFilter { + val openRequirement = + TransitionFilter.Requirement().apply { + mActivityType = ACTIVITY_TYPE_STANDARD + mWindowingMode = WINDOWING_MODE_FREEFORM + mModes = DesktopAppLaunchTransition.LAUNCH_CHANGE_MODES + mMustBeTask = true + if (!DesktopExperienceFlags.ENABLE_DESKTOP_APP_LAUNCH_BUGFIX.isTrue) { + mOrder = CONTAINER_ORDER_TOP + } + } + return TransitionFilter().apply { + mTypeSet = DesktopAppLaunchTransition.LAUNCH_CHANGE_MODES + mRequirements = arrayOf(openRequirement) + } + } + } +} diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt b/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt index 9178062c2df..0c0271909c2 100644 --- a/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt +++ b/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt @@ -20,6 +20,7 @@ import android.os.IBinder import android.os.RemoteException import android.util.Log import android.view.SurfaceControl +import android.view.WindowManager.TRANSIT_TO_FRONT import android.window.IRemoteTransitionFinishedCallback import android.window.RemoteTransition import android.window.RemoteTransitionStub @@ -29,8 +30,13 @@ import com.android.launcher3.statemanager.StateManager import com.android.launcher3.util.Executors.MAIN_EXECUTOR import com.android.quickstep.SystemUiProxy import com.android.quickstep.TaskViewUtils +import com.android.quickstep.util.DesksUtils.Companion.areMultiDesksFlagsEnabled import com.android.quickstep.views.DesktopTaskView -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource +import com.android.quickstep.views.TaskContainer +import com.android.quickstep.views.TaskView +import com.android.window.flags2.Flags +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource +import com.android.wm.shell.shared.desktopmode.DesktopState import java.util.function.Consumer /** Manage recents related operations with desktop tasks */ @@ -38,42 +44,92 @@ class DesktopRecentsTransitionController( private val stateManager: StateManager<*, *>, private val systemUiProxy: SystemUiProxy, private val appThread: IApplicationThread, - private val depthController: DepthController? + private val depthController: DepthController?, + private val desktopState: DesktopState, ) { - /** Launch desktop tasks from recents view */ + /** + * Launch desktop tasks from recents view and activate the new freeform task with id + * [taskIdToReorderToFront] if it's provided and already on the given desk. + */ fun launchDesktopFromRecents( desktopTaskView: DesktopTaskView, - callback: Consumer? = null + animated: Boolean, + taskIdToReorderToFront: Int? = null, + callback: Consumer? = null, ) { val animRunner = RemoteDesktopLaunchTransitionRunner( desktopTaskView, + animated, stateManager, + desktopState.shouldShowHomeBehindDesktop, depthController, - callback + callback, ) val transition = RemoteTransition(animRunner, appThread, "RecentsToDesktop") - systemUiProxy.showDesktopApps(desktopTaskView.display.displayId, transition) + if (areMultiDesksFlagsEnabled()) { + systemUiProxy.activateDesk( + desktopTaskView.deskId, + transition, + taskIdToReorderToFront, + DesktopModeTransitionSource.RECENTS, + ) + } else { + systemUiProxy.showDesktopApps( + desktopTaskView.displayId, + transition, + taskIdToReorderToFront, + DesktopModeTransitionSource.RECENTS, + ) + } } /** Launch desktop tasks from recents view */ - fun moveToDesktop(taskId: Int, transitionSource: DesktopModeTransitionSource) { - systemUiProxy.moveToDesktop(taskId, transitionSource) + fun moveToDesktop( + taskContainer: TaskContainer, + transitionSource: DesktopModeTransitionSource, + successCallback: Runnable, + ) { + systemUiProxy.moveToDesktop( + taskContainer.task.key.id, + transitionSource, + /* transition = */ null, + successCallback, + ) + } + + /** Move task to external display from recents view */ + fun moveToExternalDisplay(taskId: Int, transitionSource: DesktopModeTransitionSource) { + systemUiProxy.moveToExternalDisplay(taskId, transitionSource) } private class RemoteDesktopLaunchTransitionRunner( - private val desktopTaskView: DesktopTaskView, + private val taskView: TaskView, + private val animated: Boolean, private val stateManager: StateManager<*, *>, + private val shouldShowHomeBehindDesktop: Boolean, private val depthController: DepthController?, - private val successCallback: Consumer? + private val successCallback: Consumer?, ) : RemoteTransitionStub() { + override fun onTransitionConsumed(transition: IBinder?, aborted: Boolean) { + if (shouldShowHomeBehindDesktop) { + // This transition can be consumed in the empty desk case when there are no windows + // to animate, which means the launcher won't animate to a NORMAL state. However in + // this case we still want to animate launcher back from OVERVIEW to NORMAL state. + MAIN_EXECUTOR.execute { + stateManager.moveToRestState() + successCallback?.accept(true) + } + } + } + override fun startAnimation( token: IBinder, info: TransitionInfo, t: SurfaceControl.Transaction, - finishCallback: IRemoteTransitionFinishedCallback + finishCallback: IRemoteTransitionFinishedCallback, ) { val errorHandlingFinishCallback = Runnable { try { @@ -83,16 +139,44 @@ class DesktopRecentsTransitionController( } } + if (Flags.enableDesktopWindowingPersistence()) { + handleAnimationAfterReboot(info) + } MAIN_EXECUTOR.execute { - TaskViewUtils.composeRecentsDesktopLaunchAnimator( - desktopTaskView, - stateManager, - depthController, - info, - t + val animator = + TaskViewUtils.composeRecentsDesktopLaunchAnimator( + taskView, + stateManager, + depthController, + info, + t, + ) { + errorHandlingFinishCallback.run() + successCallback?.accept(true) + } + if (!animated) { + animator.setDuration(0) + } + animator.start() + } + } + + /** + * Upon reboot the start bounds of a task is set to fullscreen with the recents transition. + * Check this case and set the start bounds to the end bounds so that the window doesn't + * jump from start bounds to end bounds during the animation. Tasks in desktop cannot + * normally have top bound as 0 due to status bar so this is a good indicator to identify + * reboot case. + */ + private fun handleAnimationAfterReboot(info: TransitionInfo) { + info.changes.forEach { change -> + if ( + change.mode == TRANSIT_TO_FRONT && + change.taskInfo?.isFreeform == true && + change.startAbsBounds.top == 0 && + change.startAbsBounds.left == 0 ) { - errorHandlingFinishCallback.run() - successCallback?.accept(true) + change.setStartAbsBounds(change.endAbsBounds) } } } diff --git a/quickstep/src/com/android/launcher3/homescreenfiles/HomeScreenFilesMediaStoreProvider.kt b/quickstep/src/com/android/launcher3/homescreenfiles/HomeScreenFilesMediaStoreProvider.kt new file mode 100644 index 00000000000..d3fa1948c6a --- /dev/null +++ b/quickstep/src/com/android/launcher3/homescreenfiles/HomeScreenFilesMediaStoreProvider.kt @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.homescreenfiles + +import android.content.ContentResolver +import android.content.ContentUris +import android.content.ContentValues +import android.content.Context +import android.database.ContentObserver +import android.net.Uri +import android.os.Process +import android.provider.DocumentsContract +import android.provider.MediaStore +import android.provider.MediaStore.Files.FileColumns.RELATIVE_PATH +import android.util.Log +import androidx.annotation.WorkerThread +import androidx.core.database.getStringOrNull +import com.android.launcher3.homescreenfiles.HomeScreenFilesProvider.Companion.HOME_SCREEN_FOLDER_RELATIVE_PATH +import com.android.launcher3.homescreenfiles.HomeScreenFilesProvider.FileChange +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.launcher3.util.MutableListenableStream +import java.io.File +import java.util.concurrent.Callable +import java.util.concurrent.CompletableFuture +import java.util.concurrent.CompletableFuture.supplyAsync +import java.util.concurrent.ExecutorService +import java.util.concurrent.Future + +/** MediaStore-based implementation of [HomeScreenFilesProvider]. */ +class HomeScreenFilesMediaStoreProvider( + private val context: Context, + private val executorService: ExecutorService, + lifecycle: DaggerSingletonTracker, +) : HomeScreenFilesProvider { + override val fileChanges = MutableListenableStream() + + init { + val uri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL) + val observer = + object : ContentObserver(null) { + override fun onChange(selfChange: Boolean, uri: Uri?, flags: Int) { + if (!selfChange && uri != null && uri.hasIdSegment()) { + fileChanges.dispatchValue( + FileChange(uri, flags, query(uri), Process.myUserHandle()) + ) + } + } + } + context.contentResolver.registerContentObserver(uri, true, observer) + + lifecycle.addCloseable { context.contentResolver.unregisterContentObserver(observer) } + } + + override fun canMoveToHomeScreen(uriList: List?): Boolean = + uriList?.run { isNotEmpty() && all { uri -> canMoveToHomeScreen(uri) } } == true + + /** NOTE: Currently only URIs which can be resolved by the media store are supported. */ + private fun canMoveToHomeScreen(uri: Uri): Boolean = + isExternalStorageProviderUri(uri) || isMediaStoreUri(uri) + + override fun moveToHomeScreen(uriList: List): List> = + uriList.map { uri: Uri -> supplyAsync({ moveToHomeScreen(uri) }, executorService) } + + @WorkerThread + private fun moveToHomeScreen(uri: Uri): Boolean { + try { + // NOTE: The selection criteria below prevents moving a URI to a path it already + // occupies. The media provider has additional protections to prevent recursive moves. + return context.contentResolver.update( + if (isMediaStoreUri(uri)) uri else MediaStore.getMediaUri(context, uri)!!, + ContentValues().apply { put(RELATIVE_PATH, HOME_SCREEN_FOLDER_RELATIVE_PATH) }, + /*where=*/ "$RELATIVE_PATH != ?", + /*selectionArgs=*/ arrayOf(HOME_SCREEN_FOLDER_RELATIVE_PATH), + ) == 1 + } catch (e: RuntimeException) { + Log.e(TAG, "Unable to move URI to '$HOME_SCREEN_FOLDER_RELATIVE_PATH'", e) + return false + } + } + + /** Returns all file items presented in [HOME_SCREEN_FOLDER_RELATIVE_PATH]. */ + override fun query(): Lazy> { + val query: Callable> = Callable { + val result = mutableMapOf() + context.contentResolver + .query( + MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL), + arrayOf(MediaStore.Files.FileColumns._ID).plus(QUERY_DEFAULT_PROJECTION), + QUERY_DEFAULT_SELECTION, + QUERY_DEFAULT_SELECTION_ARGS, + null, + null, + ) + ?.use { + val idColumnIndex = it.getColumnIndex(MediaStore.Files.FileColumns._ID) + val displayNameColumnIndex = + it.getColumnIndex(MediaStore.Files.FileColumns.DISPLAY_NAME) + val mimeTypeColumnIndex = + it.getColumnIndex(MediaStore.Files.FileColumns.MIME_TYPE) + val dataColumnIndex = it.getColumnIndex(MediaStore.Files.FileColumns.DATA) + + while (it.moveToNext()) { + val id = it.getLong(idColumnIndex) + val uri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL, id) + val displayName = it.getString(displayNameColumnIndex) + val mimeType = it.getStringOrNull(mimeTypeColumnIndex) + val isDirectory = File(it.getString(dataColumnIndex)).isDirectory + result[uri] = HomeScreenFile(displayName, mimeType, isDirectory) + } + } + return@Callable result + } + val future = executorService.submit(query) + return lazy { future.get() } + } + + /** Queries a single file from MediaStore by its URI. */ + private fun query(uri: Uri): Future { + if (!isMediaStoreUri(uri)) { + return CompletableFuture.completedFuture(null) + } + val query: Callable = Callable { + context.contentResolver + .query( + uri, + QUERY_DEFAULT_PROJECTION, + QUERY_DEFAULT_SELECTION, + QUERY_DEFAULT_SELECTION_ARGS, + null, + null, + ) + ?.use { + if (it.count == 1) { + it.moveToFirst() + val displayNameColumnIndex = + it.getColumnIndex(MediaStore.Files.FileColumns.DISPLAY_NAME) + val mimeTypeColumnIndex = + it.getColumnIndex(MediaStore.Files.FileColumns.MIME_TYPE) + val dataColumnIndex = it.getColumnIndex(MediaStore.Files.FileColumns.DATA) + HomeScreenFile( + it.getString(displayNameColumnIndex), + it.getStringOrNull(mimeTypeColumnIndex), + File(it.getString(dataColumnIndex)).isDirectory, + ) + } else { + null + } + } + } + return executorService.submit(query) + } + + companion object { + private val QUERY_DEFAULT_PROJECTION = + arrayOf( + MediaStore.Files.FileColumns.DISPLAY_NAME, + MediaStore.Files.FileColumns.MIME_TYPE, + MediaStore.Files.FileColumns.DATA, + ) + private const val QUERY_DEFAULT_SELECTION = + "${MediaStore.Files.FileColumns.RELATIVE_PATH} = ?" + private val QUERY_DEFAULT_SELECTION_ARGS = arrayOf(HOME_SCREEN_FOLDER_RELATIVE_PATH) + private const val TAG = "HomeScreenFilesMediaStoreProvider" + + private fun isExternalStorageProviderUri(uri: Uri?) = + uri?.scheme == ContentResolver.SCHEME_CONTENT && + uri.authority == DocumentsContract.EXTERNAL_STORAGE_PROVIDER_AUTHORITY + + private fun isMediaStoreUri(uri: Uri) = + uri.scheme == ContentResolver.SCHEME_CONTENT && uri.authority == MediaStore.AUTHORITY + + private fun Uri.hasIdSegment(): Boolean = + kotlin.runCatching { ContentUris.parseId(this) != -1L }.getOrDefault(false) + } +} diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java index b77c43fc2f5..7c53360ea46 100644 --- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java +++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java @@ -33,7 +33,6 @@ import com.android.launcher3.Workspace; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.util.IntArray; import com.android.launcher3.views.ArrowTipView; import com.android.launcher3.views.Snackbar; @@ -57,7 +56,6 @@ public class HotseatEduController { private HotseatEduDialog mActiveDialog; private ArrayList mNewItems = new ArrayList<>(); - private IntArray mNewScreens = null; HotseatEduController(Launcher launcher) { mLauncher = launcher; @@ -96,7 +94,6 @@ private int migrateHotseatWhole() { } if (pageId == -1) { pageId = mLauncher.getModel().getModelDbController().getNewScreenId(); - mNewScreens = IntArray.wrap(pageId); } boolean isPortrait = !mLauncher.getDeviceProfile().isVerticalBarLayout(); int hotseatItemsNum = mLauncher.getDeviceProfile().numShownHotseatIcons; @@ -117,18 +114,7 @@ private int migrateHotseatWhole() { void moveHotseatItems() { mHotseat.removeAllViewsInLayout(); if (!mNewItems.isEmpty()) { - int lastPage = mNewItems.get(mNewItems.size() - 1).screenId; - ArrayList animated = new ArrayList<>(); - ArrayList nonAnimated = new ArrayList<>(); - - for (ItemInfo info : mNewItems) { - if (info.screenId == lastPage) { - animated.add(info); - } else { - nonAnimated.add(info); - } - } - mLauncher.bindAppsAdded(mNewScreens, nonAnimated, animated); + mLauncher.bindItemsAdded(mNewItems); } } diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java index db225be4a90..e9e30575122 100644 --- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java +++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java @@ -38,7 +38,6 @@ import com.android.launcher3.R; import com.android.launcher3.celllayout.CellLayoutLayoutParams; import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.uioverrides.PredictedAppIcon; import com.android.launcher3.views.AbstractSlideInView; import java.util.List; @@ -89,11 +88,11 @@ protected void onFinishInflate() { mSampleHotseat = findViewById(R.id.sample_prediction); Context context = getContext(); - DeviceProfile grid = mActivityContext.getDeviceProfile(); - Rect padding = grid.getHotseatLayoutPadding(context); + DeviceProfile dp = mActivityContext.getDeviceProfile(); + Rect padding = dp.getHotseatLayoutPadding(context); - mSampleHotseat.getLayoutParams().height = grid.cellHeightPx; - mSampleHotseat.setGridSize(grid.numShownHotseatIcons, 1); + mSampleHotseat.getLayoutParams().height = dp.getWorkspaceIconProfile().getCellHeightPx(); + mSampleHotseat.setGridSize(dp.numShownHotseatIcons, 1); mSampleHotseat.setPadding(padding.left, 0, padding.right, 0); Button turnOnBtn = findViewById(R.id.turn_predictions_on); @@ -103,7 +102,8 @@ protected void onFinishInflate() { mDismissBtn.setOnClickListener(this::onDismiss); LinearLayout buttonContainer = findViewById(R.id.button_container); - int adjustedMarginEnd = grid.hotseatBarEndOffset - buttonContainer.getPaddingEnd(); + int adjustedMarginEnd = + dp.getHotseatProfile().getBarEndOffset() - buttonContainer.getPaddingEnd(); if (InvariantDeviceProfile.INSTANCE.get(context) .getDeviceProfile(context).isTaskbarPresent && adjustedMarginEnd > 0) { ((LinearLayout.LayoutParams) buttonContainer.getLayoutParams()).setMarginEnd( @@ -184,10 +184,9 @@ protected int getScrimColor(Context context) { private void populatePreview(List predictions) { for (int i = 0; i < mActivityContext.getDeviceProfile().numShownHotseatIcons; i++) { WorkspaceItemInfo info = predictions.get(i); - PredictedAppIcon icon = PredictedAppIcon.createIcon(mSampleHotseat, info); + View icon = mActivityContext.getItemInflater().inflateItem(info, mSampleHotseat); icon.setEnabled(false); icon.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); - icon.verifyHighRes(); CellLayoutLayoutParams lp = new CellLayoutLayoutParams(i, 0, 1, 1); mSampleHotseat.addViewToCellLayout(icon, i, info.getViewId(), lp, true); } diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java index de974ecae1c..36090886dac 100644 --- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java +++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java @@ -21,55 +21,41 @@ import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.FlagDebugUtils.appendFlag; import static com.android.launcher3.util.OnboardingPrefs.HOTSEAT_LONGPRESS_TIP_SEEN; -import android.animation.Animator; -import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.content.ComponentName; -import android.util.Log; import android.view.HapticFeedbackConstants; import android.view.View; -import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.DragSource; -import com.android.launcher3.DropTarget; import com.android.launcher3.Flags; import com.android.launcher3.Hotseat; +import com.android.launcher3.Launcher; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.LauncherSettings; import com.android.launcher3.R; -import com.android.launcher3.anim.AnimationSuccessListener; -import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragOptions; -import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.logger.LauncherAtom.ContainerInfo; import com.android.launcher3.logger.LauncherAtom.PredictedHotseatContainer; import com.android.launcher3.logging.InstanceId; -import com.android.launcher3.model.BgDataModel.FixedContainerItems; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.PredictedContainerInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.pm.UserCache; import com.android.launcher3.popup.SystemShortcut; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.touch.ItemLongClickListener; -import com.android.launcher3.uioverrides.PredictedAppIcon; import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.HybridHotseatOrganizer; +import com.android.launcher3.views.PredictedAppIcon; import com.android.launcher3.views.Snackbar; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.StringJoiner; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -77,32 +63,28 @@ * Provides prediction ability for the hotseat. Fills gaps in hotseat with predicted items, allows * pinning of predicted apps and manages replacement of predicted apps with user drag. */ -public class HotseatPredictionController implements DragController.DragListener, - SystemShortcut.Factory, DeviceProfile.OnDeviceProfileChangeListener, - DragSource, ViewGroup.OnHierarchyChangeListener { +public class HotseatPredictionController implements + SystemShortcut.Factory { - private static final String TAG = "HotseatPredictionController"; - private static final int FLAG_UPDATE_PAUSED = 1 << 0; - private static final int FLAG_DRAG_IN_PROGRESS = 1 << 1; - private static final int FLAG_FILL_IN_PROGRESS = 1 << 2; - private static final int FLAG_REMOVING_PREDICTED_ICON = 1 << 3; - - private int mHotSeatItemsCount; - - private QuickstepLauncher mLauncher; + private final Launcher mLauncher; + private final HybridHotseatOrganizer mHotseatOrganizer; private final Hotseat mHotseat; - private final Runnable mUpdateFillIfNotLoading = this::updateFillIfNotLoading; - - private List mPredictedItems = Collections.emptyList(); - - private AnimatorSet mIconRemoveAnimators; - private int mPauseFlags = 0; - - private List mOutlineDrawings = new ArrayList<>(); private boolean mEnableHotseatLongPressTipForTesting = true; - private final View.OnLongClickListener mPredictionLongClickListener = v -> { + public HotseatPredictionController(QuickstepLauncher launcher) { + mLauncher = launcher; + mHotseatOrganizer = new HybridHotseatOrganizer( + launcher, + launcher.getWorkspace(), + launcher.getItemInflater(), + this::onPredictedItemLongClicked, + mLauncher::isWorkspaceLoading); + mHotseat = launcher.getHotseat(); + mLauncher.getDragController().addDragListener(mHotseatOrganizer); + } + + private boolean onPredictedItemLongClicked(View v) { if (!ItemLongClickListener.canStartDrag(mLauncher)) return false; if (mLauncher.getWorkspace().isSwitchingState()) return false; @@ -117,33 +99,11 @@ public class HotseatPredictionController implements DragController.DragListener, } // Start the drag - // Use a new itemInfo so that the original predicted item is stable - WorkspaceItemInfo dragItem = new WorkspaceItemInfo((WorkspaceItemInfo) v.getTag()); v.setVisibility(View.INVISIBLE); - mLauncher.getWorkspace().beginDragShared( - v, null, this, dragItem, new DragPreviewProvider(v), new DragOptions()); + mLauncher.getWorkspace().beginDragShared(v, mHotseatOrganizer, new DragOptions()); return true; - }; - - public HotseatPredictionController(QuickstepLauncher launcher) { - mLauncher = launcher; - mHotseat = launcher.getHotseat(); - mHotSeatItemsCount = mLauncher.getDeviceProfile().numShownHotseatIcons; - mLauncher.getDragController().addDragListener(this); - - launcher.addOnDeviceProfileChangeListener(this); - mHotseat.getShortcutsAndWidgets().setOnHierarchyChangeListener(this); } - @Override - public void onChildViewAdded(View parent, View child) { - onHotseatHierarchyChanged(); - } - - @Override - public void onChildViewRemoved(View parent, View child) { - onHotseatHierarchyChanged(); - } /** Enables/disabled the hotseat prediction icon long press edu for testing. */ @VisibleForTesting @@ -151,27 +111,13 @@ public void enableHotseatEdu(boolean enable) { mEnableHotseatLongPressTipForTesting = enable; } - private void onHotseatHierarchyChanged() { - if (mPauseFlags == 0 && !mLauncher.isWorkspaceLoading()) { - // Post update after a single frame to avoid layout within layout - MAIN_EXECUTOR.getHandler().removeCallbacks(mUpdateFillIfNotLoading); - MAIN_EXECUTOR.getHandler().post(mUpdateFillIfNotLoading); - } - } - - private void updateFillIfNotLoading() { - if (mPauseFlags == 0 && !mLauncher.isWorkspaceLoading()) { - fillGapsWithPrediction(true); - } - } - /** * Shows appropriate hotseat education based on prediction enabled and migration states. */ public void showEdu() { mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> { HotseatEduController eduController = new HotseatEduController(mLauncher); - eduController.setPredictedApps(mPredictedItems.stream() + eduController.setPredictedApps(mHotseatOrganizer.getPredictedItems().stream() .map(i -> (WorkspaceItemInfo) i) .collect(Collectors.toList())); eduController.showEdu(); @@ -182,136 +128,17 @@ public void showEdu() { * Returns if hotseat client has predictions */ public boolean hasPredictions() { - return !mPredictedItems.isEmpty(); - } - - private void fillGapsWithPrediction() { - fillGapsWithPrediction(false); - } - - private void fillGapsWithPrediction(boolean animate) { - if (mPauseFlags != 0) { - return; - } - - int predictionIndex = 0; - int numViewsAnimated = 0; - ArrayList newItems = new ArrayList<>(); - // make sure predicted icon removal and filling predictions don't step on each other - if (mIconRemoveAnimators != null && mIconRemoveAnimators.isRunning()) { - mIconRemoveAnimators.addListener(new AnimationSuccessListener() { - @Override - public void onAnimationSuccess(Animator animator) { - fillGapsWithPrediction(animate); - mIconRemoveAnimators.removeListener(this); - } - }); - return; - } - - mPauseFlags |= FLAG_FILL_IN_PROGRESS; - for (int rank = 0; rank < mHotSeatItemsCount; rank++) { - View child = mHotseat.getChildAt( - mHotseat.getCellXFromOrder(rank), - mHotseat.getCellYFromOrder(rank)); - - if (child != null && !isPredictedIcon(child)) { - continue; - } - if (mPredictedItems.size() <= predictionIndex) { - // Remove predicted apps from the past - if (isPredictedIcon(child)) { - mHotseat.removeView(child); - } - continue; - } - WorkspaceItemInfo predictedItem = - (WorkspaceItemInfo) mPredictedItems.get(predictionIndex++); - if (isPredictedIcon(child) && child.isEnabled()) { - PredictedAppIcon icon = (PredictedAppIcon) child; - boolean animateIconChange = icon.shouldAnimateIconChange(predictedItem); - icon.applyFromWorkspaceItem(predictedItem, animateIconChange, numViewsAnimated); - if (animateIconChange) { - numViewsAnimated++; - } - icon.finishBinding(mPredictionLongClickListener); - } else { - newItems.add(predictedItem); - } - preparePredictionInfo(predictedItem, rank); - } - bindItems(newItems, animate); - - mPauseFlags &= ~FLAG_FILL_IN_PROGRESS; - } - - private void bindItems(List itemsToAdd, boolean animate) { - AnimatorSet animationSet = new AnimatorSet(); - for (WorkspaceItemInfo item : itemsToAdd) { - PredictedAppIcon icon = PredictedAppIcon.createIcon(mHotseat, item); - mLauncher.getWorkspace().addInScreenFromBind(icon, item); - icon.finishBinding(mPredictionLongClickListener); - if (animate) { - animationSet.play(ObjectAnimator.ofFloat(icon, SCALE_PROPERTY, 0.2f, 1)); - } - } - if (animate) { - animationSet.addListener( - forSuccessCallback(this::removeOutlineDrawings)); - animationSet.start(); - } else { - removeOutlineDrawings(); - } - } - - private void removeOutlineDrawings() { - if (mOutlineDrawings.isEmpty()) return; - for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) { - mHotseat.removeDelegatedCellDrawing(outlineDrawing); - } - mHotseat.invalidate(); - mOutlineDrawings.clear(); - } - - - /** - * Unregisters callbacks and frees resources - */ - public void destroy() { - mLauncher.removeOnDeviceProfileChangeListener(this); - } - - /** - * start and pauses predicted apps update on the hotseat - */ - public void setPauseUIUpdate(boolean paused) { - mPauseFlags = paused - ? (mPauseFlags | FLAG_UPDATE_PAUSED) - : (mPauseFlags & ~FLAG_UPDATE_PAUSED); - if (!paused) { - fillGapsWithPrediction(); - } - } - - /** - * Ensures that if the flag FLAG_UPDATE_PAUSED is active we set it to false. - */ - public void verifyUIUpdateNotPaused() { - if ((mPauseFlags & FLAG_UPDATE_PAUSED) != 0) { - setPauseUIUpdate(false); - Log.e(TAG, "FLAG_UPDATE_PAUSED should not be set to true (see b/339700174)"); - } + return !mHotseatOrganizer.getPredictedItems().isEmpty(); } /** * Sets or updates the predicted items */ - public void setPredictedItems(FixedContainerItems items) { - mPredictedItems = new ArrayList(items.items); - if (mPredictedItems.isEmpty()) { + public void setPredictedItems(PredictedContainerInfo items) { + mHotseatOrganizer.setPredictedItems(items.getContents()); + if (items.getContents().isEmpty()) { HotseatRestoreHelper.restoreBackup(mLauncher); } - fillGapsWithPrediction(); } /** @@ -335,77 +162,16 @@ public void pinPrediction(ItemInfo info) { .log(LAUNCHER_HOTSEAT_PREDICTION_PINNED); } - private List getPredictedIcons() { - List icons = new ArrayList<>(); - ViewGroup vg = mHotseat.getShortcutsAndWidgets(); - for (int i = 0; i < vg.getChildCount(); i++) { - View child = vg.getChildAt(i); - if (isPredictedIcon(child)) { - icons.add((PredictedAppIcon) child); - } - } - return icons; - } - - private void removePredictedApps(List outlines, - DropTarget.DragObject dragObject) { - if (mIconRemoveAnimators != null) { - mIconRemoveAnimators.end(); - } - mIconRemoveAnimators = new AnimatorSet(); - removeOutlineDrawings(); - for (PredictedAppIcon icon : getPredictedIcons()) { - if (!icon.isEnabled()) { - continue; - } - if (dragObject.dragSource == this && icon.equals(dragObject.originalView)) { - removeIconWithoutNotify(icon); - continue; - } - int rank = ((WorkspaceItemInfo) icon.getTag()).rank; - outlines.add(new PredictedAppIcon.PredictedIconOutlineDrawing( - mHotseat.getCellXFromOrder(rank), mHotseat.getCellYFromOrder(rank), icon)); - icon.setEnabled(false); - ObjectAnimator animator = ObjectAnimator.ofFloat(icon, SCALE_PROPERTY, 0); - animator.addListener(new AnimationSuccessListener() { - @Override - public void onAnimationSuccess(Animator animator) { - if (icon.getParent() != null) { - removeIconWithoutNotify(icon); - } - } - }); - mIconRemoveAnimators.play(animator); - } - mIconRemoveAnimators.start(); - } - /** - * Removes icon while suppressing any extra tasks performed on view-hierarchy changes. - * This avoids recursive/redundant updates as the control updates the UI anyway after - * it's animation. + * Called when an item is pinned using the context menu. + * This action directly refreshes all predicted apps without animations to ensure the + * predictions are updated with the newly pinned item. */ - private void removeIconWithoutNotify(PredictedAppIcon icon) { - mPauseFlags |= FLAG_REMOVING_PREDICTED_ICON; - mHotseat.removeView(icon); - mPauseFlags &= ~FLAG_REMOVING_PREDICTED_ICON; - } - - @Override - public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) { - removePredictedApps(mOutlineDrawings, dragObject); - if (mOutlineDrawings.isEmpty()) return; - for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) { - mHotseat.addDelegatedCellDrawing(outlineDrawing); + public void onItemPinnedFromContextMenu() { + for (PredictedAppIcon icon : mHotseatOrganizer.getPredictedIcons()) { + mHotseatOrganizer.removeIconWithoutNotify(icon); } - mPauseFlags |= FLAG_DRAG_IN_PROGRESS; - mHotseat.invalidate(); - } - - @Override - public void onDragEnd() { - mPauseFlags &= ~FLAG_DRAG_IN_PROGRESS; - fillGapsWithPrediction(true); + mHotseatOrganizer.fillGapsWithPrediction(); } @Nullable @@ -422,24 +188,6 @@ public SystemShortcut getShortcut(QuickstepLauncher activity, return new PinPrediction(activity, itemInfo, originalView); } - private void preparePredictionInfo(WorkspaceItemInfo itemInfo, int rank) { - itemInfo.container = LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; - itemInfo.rank = rank; - itemInfo.cellX = mHotseat.getCellXFromOrder(rank); - itemInfo.cellY = mHotseat.getCellYFromOrder(rank); - itemInfo.screenId = rank; - } - - @Override - public void onDeviceProfileChanged(DeviceProfile profile) { - this.mHotSeatItemsCount = profile.numShownHotseatIcons; - } - - @Override - public void onDropCompleted(View target, DropTarget.DragObject d, boolean success) { - //Does nothing - } - /** * Logs rank info based on current list of predicted items */ @@ -448,20 +196,13 @@ public void logLaunchedAppRankingInfo(@NonNull ItemInfo itemInfo, InstanceId ins if (targetCN == null) { return; } - int rank = -1; - for (int i = mPredictedItems.size() - 1; i >= 0; i--) { - ItemInfo info = mPredictedItems.get(i); - if (targetCN.equals(info.getTargetComponent()) && itemInfo.user.equals(info.user)) { - rank = i; - break; - } - } + int rank = mHotseatOrganizer.getPredictedRank(targetCN, itemInfo.user); if (rank < 0) { return; } int cardinality = 0; - for (PredictedAppIcon icon : getPredictedIcons()) { + for (PredictedAppIcon icon : mHotseatOrganizer.getPredictedIcons()) { ItemInfo info = (ItemInfo) icon.getTag(); cardinality |= 1 << info.screenId; } @@ -487,9 +228,7 @@ public void logLaunchedAppRankingInfo(@NonNull ItemInfo itemInfo, InstanceId ins * @param matcher filter matching items that have been removed */ public void onModelItemsRemoved(Predicate matcher) { - if (mPredictedItems.removeIf(matcher)) { - fillGapsWithPrediction(true); - } + mHotseatOrganizer.onModelItemsRemoved(matcher); } /** @@ -497,18 +236,26 @@ public void onModelItemsRemoved(Predicate matcher) { */ public void onDeferredDrop(int cellX, int cellY) { View child = mHotseat.getChildAt(cellX, cellY); - if (child instanceof PredictedAppIcon) { - removeIconWithoutNotify((PredictedAppIcon) child); + if (child instanceof PredictedAppIcon predictedAppIcon) { + mHotseatOrganizer.removeIconWithoutNotify(predictedAppIcon); } } private class PinPrediction extends SystemShortcut { private PinPrediction(QuickstepLauncher target, ItemInfo itemInfo, View originalView) { - super(R.drawable.ic_pin, R.string.pin_prediction, target, + super(getDrawableId(), R.string.pin_prediction, target, itemInfo, originalView); } + public static int getDrawableId() { + if (Flags.enableLauncherVisualRefresh()) { + return R.drawable.keep_24px; + } else { + return R.drawable.ic_pin; + } + } + @Override public void onClick(View view) { dismissTaskMenuView(); @@ -516,26 +263,7 @@ public void onClick(View view) { } } - private static boolean isPredictedIcon(View view) { - return view instanceof PredictedAppIcon && view.getTag() instanceof WorkspaceItemInfo - && ((WorkspaceItemInfo) view.getTag()).container - == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; - } - - private static String getStateString(int flags) { - StringJoiner str = new StringJoiner("|"); - appendFlag(str, flags, FLAG_UPDATE_PAUSED, "FLAG_UPDATE_PAUSED"); - appendFlag(str, flags, FLAG_DRAG_IN_PROGRESS, "FLAG_DRAG_IN_PROGRESS"); - appendFlag(str, flags, FLAG_FILL_IN_PROGRESS, "FLAG_FILL_IN_PROGRESS"); - appendFlag(str, flags, FLAG_REMOVING_PREDICTED_ICON, - "FLAG_REMOVING_PREDICTED_ICON"); - return str.toString(); - } - public void dump(String prefix, PrintWriter writer) { - writer.println(prefix + "HotseatPredictionController"); - writer.println(prefix + "\tFlags: " + getStateString(mPauseFlags)); - writer.println(prefix + "\tmHotSeatItemsCount: " + mHotSeatItemsCount); - writer.println(prefix + "\tmPredictedItems: " + mPredictedItems); + mHotseatOrganizer.dump(prefix, writer); } } diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java deleted file mode 100644 index 56945ba0a65..00000000000 --- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.hybridhotseat; - -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; -import static com.android.launcher3.model.PredictionHelper.getAppTargetFromItemInfo; -import static com.android.launcher3.model.PredictionHelper.isTrackedForHotseatPrediction; -import static com.android.launcher3.model.PredictionHelper.wrapAppTargetWithItemLocation; - -import android.app.prediction.AppTarget; -import android.app.prediction.AppTargetEvent; -import android.content.Context; -import android.os.Bundle; - -import com.android.launcher3.model.BgDataModel; -import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.data.ItemInfo; - -import java.util.ArrayList; - -/** - * Model helper for app predictions in workspace - */ -public class HotseatPredictionModel { - private static final String BUNDLE_KEY_PIN_EVENTS = "pin_events"; - private static final String BUNDLE_KEY_CURRENT_ITEMS = "current_items"; - - /** - * Creates and returns bundle using workspace items - */ - public static Bundle convertDataModelToAppTargetBundle(Context context, BgDataModel dataModel) { - Bundle bundle = new Bundle(); - ArrayList events = new ArrayList<>(); - ArrayList workspaceItems = dataModel.getAllWorkspaceItems(); - for (ItemInfo item : workspaceItems) { - AppTarget target = getAppTargetFromItemInfo(context, item); - if (target != null && !isTrackedForHotseatPrediction(item)) continue; - events.add(wrapAppTargetWithItemLocation(target, AppTargetEvent.ACTION_PIN, item)); - } - ArrayList currentTargets = new ArrayList<>(); - FixedContainerItems hotseatItems = dataModel.extraItems.get(CONTAINER_HOTSEAT_PREDICTION); - if (hotseatItems != null) { - for (ItemInfo itemInfo : hotseatItems.items) { - AppTarget target = getAppTargetFromItemInfo(context, itemInfo); - if (target != null) currentTargets.add(target); - } - } - bundle.putParcelableArrayList(BUNDLE_KEY_PIN_EVENTS, events); - bundle.putParcelableArrayList(BUNDLE_KEY_CURRENT_ITEMS, currentTargets); - return bundle; - } -} diff --git a/quickstep/src/com/android/launcher3/icons/LauncherIconProviderImpl.kt b/quickstep/src/com/android/launcher3/icons/LauncherIconProviderImpl.kt new file mode 100644 index 00000000000..ca449d225ee --- /dev/null +++ b/quickstep/src/com/android/launcher3/icons/LauncherIconProviderImpl.kt @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.icons + +import android.content.Context +import android.content.pm.ApplicationInfo +import android.content.pm.PackageItemInfo +import android.content.res.Resources.NotFoundException +import android.graphics.drawable.AdaptiveIconDrawable +import android.graphics.drawable.Drawable +import android.util.Log +import com.android.launcher3.LauncherModel +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.graphics.ShapeDelegate.Circle +import com.android.launcher3.graphics.ThemeManager +import com.android.launcher3.icons.cache.CachingLogic +import com.android.launcher3.icons.cache.LauncherActivityCachingLogic +import com.android.launcher3.util.ComponentKey +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.launcher3.util.Executors.MODEL_EXECUTOR +import com.android.launcher3.util.PluginManagerWrapper +import com.android.systemui.plugins.IconProcessorPlugin +import com.android.systemui.plugins.PluginLifecycleManager +import com.android.systemui.plugins.PluginListener +import javax.inject.Inject +import javax.inject.Provider + +/** Extension of LauncherIconProvider with system APIs and plugin support */ +private const val TAG = "LauncherIconProviderImpl" + +@LauncherAppSingleton +class LauncherIconProviderImpl +@Inject +constructor( + @ApplicationContext ctx: Context, + themeManager: ThemeManager, + private val modelProvider: Provider, + private val iconChangeTracker: IconChangeTracker, + private val iconCacheProvider: Provider, + pluginManagerWrapper: PluginManagerWrapper, + lifecycle: DaggerSingletonTracker, +) : LauncherIconProvider(ctx, themeManager), PluginListener { + + init { + pluginManagerWrapper.addPluginListener(this, IconProcessorPlugin::class.java) + lifecycle.addCloseable { pluginManagerWrapper.removePluginListener(this) } + } + + private var processor: IconProcessorPlugin? = null + + override fun getApplicationInfoHash(appInfo: ApplicationInfo): String = + (appInfo.sourceDir?.hashCode() ?: 0).toString() + " " + appInfo.longVersionCode + + override fun loadPackageIcon( + info: PackageItemInfo, + appInfo: ApplicationInfo, + density: Int, + ): Drawable? { + fun Drawable.preprocess(resId: Int) = + processor?.preprocessDrawable(this, resId, appInfo) ?: this + + try { + val resources = mContext.packageManager.getResourcesForApplication(appInfo) + // Try to load the package item icon first + if (info !== appInfo && info.icon != 0) { + try { + val icon = resources.getDrawableForDensity(info.icon, density, null) + if (icon != null) return icon.preprocess(info.icon) + } catch (_: NotFoundException) {} + } + // Load the fallback app icon + if (appInfo.icon != 0) { + // Tries to load the round icon res, if the app defines it as an adaptive icon + if (mThemeManager.iconShape is Circle) { + if (appInfo.roundIconRes != 0 && appInfo.roundIconRes != appInfo.icon) { + try { + val d = + resources.getDrawableForDensity(appInfo.roundIconRes, density, null) + if (d is AdaptiveIconDrawable) return d.preprocess(appInfo.roundIconRes) + } catch (_: NotFoundException) {} + } + } + + try { + return resources + .getDrawableForDensity(appInfo.icon, density, null) + ?.preprocess(appInfo.icon) + } catch (_: NotFoundException) {} + } + } catch (_: Exception) {} + return null + } + + override fun onPluginLoaded( + plugin: IconProcessorPlugin?, + pluginContext: Context?, + manager: PluginLifecycleManager?, + ) { + plugin?.setIconChangeNotifier { pkg, userHandle -> + iconChangeTracker.notifyIconChanged(pkg, userHandle) + } + processor = plugin + Log.d(TAG, "Plugin connected $plugin") + MODEL_EXECUTOR.execute { + iconCacheProvider.get().clearMemoryCache() + modelProvider.get().reloadIfActive() + } + } + + override fun onPluginUnloaded( + plugin: IconProcessorPlugin?, + manager: PluginLifecycleManager?, + ) { + processor = null + Log.d(TAG, "Plugin disconnected") + } + + override fun notifyIconLoaded(icon: BitmapInfo, key: ComponentKey, logic: CachingLogic<*>) { + if (logic == LauncherActivityCachingLogic) + processor?.notifyAppIconLoaded(key.componentName, key.user, icon.flags) + } +} diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java index 8ca1cd9e3de..880f1fd9692 100644 --- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java +++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java @@ -22,9 +22,8 @@ import static android.app.prediction.AppTargetEvent.ACTION_UNPIN; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; -import static com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_DRAGDROP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DISMISS_PREDICTION_UNDO; @@ -42,6 +41,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_ADD_BUTTON_TAP; +import static com.android.launcher3.model.PredictionHelper.getLocationString; import static com.android.launcher3.model.PredictionHelper.isTrackedForHotseatPrediction; import static com.android.launcher3.model.PredictionHelper.isTrackedForWidgetPrediction; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; @@ -65,10 +65,6 @@ import com.android.launcher3.Utilities; import com.android.launcher3.logger.LauncherAtom; -import com.android.launcher3.logger.LauncherAtom.ContainerInfo; -import com.android.launcher3.logger.LauncherAtom.FolderContainer; -import com.android.launcher3.logger.LauncherAtom.HotseatContainer; -import com.android.launcher3.logger.LauncherAtom.WorkspaceContainer; import com.android.launcher3.logging.StatsLogManager.EventEnum; import com.android.launcher3.pm.UserCache; import com.android.launcher3.shortcuts.ShortcutRequest; @@ -76,7 +72,6 @@ import com.android.quickstep.logging.StatsLogCompatManager.StatsLogConsumer; import com.android.systemui.shared.system.SysUiStatsLog; -import java.util.Locale; import java.util.Optional; import java.util.function.ObjIntConsumer; @@ -121,7 +116,10 @@ private void sendEvent(AppTarget target, LauncherAtom.ItemInfo locationInfo, int // TODO: remove the running test check when b/231648228 is fixed. if (target != null && !Utilities.isRunningInTestHarness()) { AppTargetEvent event = new AppTargetEvent.Builder(target, eventId) - .setLaunchLocation(getContainer(locationInfo)) + .setLaunchLocation(getLocationString( + locationInfo.getContainerInfo(), + locationInfo.getWidget().getSpanX(), + locationInfo.getWidget().getSpanY())) .build(); mMessageHandler.obtainMessage(MSG_LAUNCH, targetPredictor, 0, event).sendToTarget(); } @@ -135,10 +133,10 @@ public void consume(EventEnum event, LauncherAtom.ItemInfo atomInfo) { || event == LAUNCHER_QUICKSWITCH_RIGHT || event == LAUNCHER_QUICKSWITCH_LEFT || event == LAUNCHER_APP_LAUNCH_DRAGDROP) { - sendEvent(atomInfo, ACTION_LAUNCH, CONTAINER_PREDICTION); + sendEvent(atomInfo, ACTION_LAUNCH, CONTAINER_ALL_APPS_PREDICTION); } else if (event == LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST || event == LAUNCHER_SYSTEM_SHORTCUT_DONT_SUGGEST_APP_TAP) { - sendEvent(atomInfo, ACTION_DISMISS, CONTAINER_PREDICTION); + sendEvent(atomInfo, ACTION_DISMISS, CONTAINER_ALL_APPS_PREDICTION); } else if (event == LAUNCHER_ITEM_DRAG_STARTED) { mLastDragItem = atomInfo; } else if (event == LAUNCHER_ITEM_DROP_COMPLETED) { @@ -183,9 +181,9 @@ public void consume(EventEnum event, LauncherAtom.ItemInfo atomInfo) { AppTarget target = new AppTarget.Builder(new AppTargetId("launcher:launcher"), mContext.getPackageName(), Process.myUserHandle()) .build(); - sendEvent(target, atomInfo, ACTION_LAUNCH, CONTAINER_PREDICTION); + sendEvent(target, atomInfo, ACTION_LAUNCH, CONTAINER_ALL_APPS_PREDICTION); } else { - sendEvent(atomInfo, ACTION_LAUNCH, CONTAINER_PREDICTION); + sendEvent(atomInfo, ACTION_LAUNCH, CONTAINER_ALL_APPS_PREDICTION); } } else if (event == LAUNCHER_DISMISS_PREDICTION_UNDO) { sendEvent(atomInfo, ACTION_UNDISMISS, CONTAINER_HOTSEAT_PREDICTION); @@ -277,68 +275,6 @@ private AppTarget createTempFolderTarget() { } } - private String getContainer(LauncherAtom.ItemInfo info) { - ContainerInfo ci = info.getContainerInfo(); - switch (ci.getContainerCase()) { - case WORKSPACE: { - // In case the item type is not widgets, the spaceX and spanY default to 1. - int spanX = info.getWidget().getSpanX(); - int spanY = info.getWidget().getSpanY(); - return getWorkspaceContainerString(ci.getWorkspace(), spanX, spanY); - } - case HOTSEAT: { - return getHotseatContainerString(ci.getHotseat()); - } - case TASK_SWITCHER_CONTAINER: { - return "task-switcher"; - } - case ALL_APPS_CONTAINER: { - return "all-apps"; - } - case PREDICTED_HOTSEAT_CONTAINER: { - return "predictions/hotseat"; - } - case PREDICTION_CONTAINER: { - return "predictions"; - } - case SHORTCUTS_CONTAINER: { - return "deep-shortcuts"; - } - case TASK_BAR_CONTAINER: { - return "taskbar"; - } - case FOLDER: { - FolderContainer fc = ci.getFolder(); - switch (fc.getParentContainerCase()) { - case WORKSPACE: - return "folder/" + getWorkspaceContainerString(fc.getWorkspace(), 1, 1); - case HOTSEAT: - return "folder/" + getHotseatContainerString(fc.getHotseat()); - } - return "folder"; - } - case SEARCH_RESULT_CONTAINER: - return "search-results"; - case EXTENDED_CONTAINERS: { - if (ci.getExtendedContainers().getContainerCase() - == DEVICE_SEARCH_RESULT_CONTAINER) { - return "search-results"; - } - } - default: // fall out - } - return ""; - } - - private static String getWorkspaceContainerString(WorkspaceContainer wc, int spanX, int spanY) { - return String.format(Locale.ENGLISH, "workspace/%d/[%d,%d]/[%d,%d]", - wc.getPageIndex(), wc.getGridX(), wc.getGridY(), spanX, spanY); - } - - private static String getHotseatContainerString(HotseatContainer hc) { - return String.format(Locale.ENGLISH, "hotseat/%1$d/[%1$d,0]/[1,1]", hc.getIndex()); - } - private static ComponentName parseNullable(String componentNameString) { return TextUtils.isEmpty(componentNameString) ? null : ComponentName.unflattenFromString(componentNameString); diff --git a/quickstep/src/com/android/launcher3/model/PredictedItemFactory.kt b/quickstep/src/com/android/launcher3/model/PredictedItemFactory.kt new file mode 100644 index 00000000000..19b8235abfa --- /dev/null +++ b/quickstep/src/com/android/launcher3/model/PredictedItemFactory.kt @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.model + +import android.app.prediction.AppPredictionContext +import android.app.prediction.AppPredictionManager +import android.app.prediction.AppPredictor +import android.app.prediction.AppTarget +import android.app.prediction.AppTargetEvent +import android.content.Context +import android.content.Intent +import android.content.pm.LauncherApps +import android.content.pm.ShortcutInfo +import android.os.UserHandle +import androidx.annotation.VisibleForTesting +import com.android.launcher3.LauncherModel +import com.android.launcher3.LauncherModel.ModelUpdateTask +import com.android.launcher3.LauncherSettings.Favorites +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.icons.IconCache +import com.android.launcher3.icons.cache.CacheLookupFlag +import com.android.launcher3.model.data.AppInfo +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.PredictedItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.pm.UserCache +import com.android.launcher3.shortcuts.ShortcutKey +import com.android.launcher3.shortcuts.ShortcutRequest +import com.android.launcher3.util.ApiWrapper +import com.android.launcher3.util.Executors.MODEL_EXECUTOR +import com.android.launcher3.util.PackageManagerHelper +import com.android.launcher3.util.PersistedItemArray +import com.android.launcher3.util.PersistedItemArray.ItemFactory +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject + +/** [PersistedItemArray.ItemFactory] to parse predicted items */ +class PredictedItemFactory +@AssistedInject +constructor( + @ApplicationContext private val context: Context, + private val pmHelper: PackageManagerHelper, + private val userCache: UserCache, + private val apiWrapper: ApiWrapper, + private val iconCache: IconCache, + @Assisted private val maxItemCount: Int, + @Assisted private val predictorState: PredictorState, +) : ItemFactory { + + // Number of items persisted can be different than what is needed if the grid changed between + // the two operations + private var readCount = 0 + + override fun createInfo(itemType: Int, user: UserHandle, intent: Intent): PredictedItemInfo? { + if (readCount >= maxItemCount) { + return null + } + return when (itemType) { + Favorites.ITEM_TYPE_APPLICATION -> { + val lai = + context + .getSystemService(LauncherApps::class.java) + ?.resolveActivity(intent, user) ?: return null + val info = + AppInfo( + lai, + userCache.userManagerState.getCachedInfo(user), + apiWrapper, + pmHelper, + ) + info.container = predictorState.containerId + iconCache.getTitleAndIcon(info, lai, predictorState.lookupFlag) + readCount++ + return PredictedItemInfo(info.makeWorkspaceItem(context)) + } + + Favorites.ITEM_TYPE_DEEP_SHORTCUT -> { + val key = ShortcutKey.fromIntent(intent, user) ?: return null + val si: ShortcutInfo = + key.buildRequest(context).query(ShortcutRequest.PINNED).getOrNull(0) + ?: return null + val wii = WorkspaceItemInfo(si, context) + wii.container = predictorState.containerId + iconCache.getShortcutIcon(wii, si) + readCount++ + return PredictedItemInfo(wii) + } + + else -> null + } + } + + @AssistedFactory + interface Factory { + fun newParser(maxItemCount: Int, predictorState: PredictorState): PredictedItemFactory + } +} + +/** Class to manage predicted items for a particular prediction type */ +class PredictorState( + @JvmField val containerId: Int, + storageName: String, + @JvmField val lookupFlag: CacheLookupFlag, +) { + + @JvmField val storage: PersistedItemArray = PersistedItemArray(storageName) + + @VisibleForTesting var predictor: AppPredictor? = null + + private var lastTargets: List = emptyList() + + /** Creates and registers a predictor, and destroys any previously created predictor */ + fun registerPredictor( + ctx: Context, + predictionContext: AppPredictionContext, + model: LauncherModel, + taskFactory: (PredictorState, List) -> ModelUpdateTask, + ) { + destroyPredictor() + + val apm = ctx.getSystemService(AppPredictionManager::class.java) ?: return + lastTargets = emptyList() + + predictor = + apm.createAppPredictionSession(predictionContext).apply { + registerPredictionUpdates(MODEL_EXECUTOR) { + val oldTargets = lastTargets + lastTargets = it + + // If no diff, skip + if ( + oldTargets.size != lastTargets.size || + oldTargets.zip(lastTargets).any { (a1, a2) -> + !areAppTargetsSame(a1, a2) + } + ) { + model.enqueueModelUpdateTask(taskFactory.invoke(this@PredictorState, it)) + } + } + requestPredictionUpdate() + } + } + + /** Destroys a previously created predictor */ + fun destroyPredictor() { + predictor?.destroy() + predictor = null + } + + /** see [AppPredictor.requestPredictionUpdate] */ + fun requestPredictionUpdate() = predictor?.requestPredictionUpdate() + + /** see [AppPredictor.notifyAppTargetEvent] */ + fun notifyAppTargetEvent(event: AppTargetEvent) = predictor?.notifyAppTargetEvent(event) + + /** Compares two targets for the properties which we care about */ + private fun areAppTargetsSame(t1: AppTarget, t2: AppTarget): Boolean { + if ( + (t1.packageName != t2.packageName) || + (t1.user != t2.user) || + (t1.className != t2.className) + ) { + return false + } + return t1.shortcutInfo?.id == t2.shortcutInfo?.id + } +} diff --git a/quickstep/src/com/android/launcher3/model/PredictionHelper.java b/quickstep/src/com/android/launcher3/model/PredictionHelper.java deleted file mode 100644 index dbd99e1eab2..00000000000 --- a/quickstep/src/com/android/launcher3/model/PredictionHelper.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.model; - -import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.WORKSPACE; - -import android.app.prediction.AppTarget; -import android.app.prediction.AppTargetEvent; -import android.app.prediction.AppTargetId; -import android.content.ComponentName; -import android.content.Context; - -import androidx.annotation.Nullable; - -import com.android.launcher3.LauncherSettings; -import com.android.launcher3.Workspace; -import com.android.launcher3.logger.LauncherAtom; -import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.model.data.LauncherAppWidgetInfo; -import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.shortcuts.ShortcutKey; - -import java.util.Locale; - -/** Helper class with methods for converting launcher items to form usable by predictors */ -public final class PredictionHelper { - private static final String APP_LOCATION_HOTSEAT = "hotseat"; - private static final String APP_LOCATION_WORKSPACE = "workspace"; - - /** - * Creates and returns an {@link AppTarget} object for an {@link ItemInfo}. Returns null - * if item type is not supported in predictions - */ - @Nullable - public static AppTarget getAppTargetFromItemInfo(Context context, ItemInfo info) { - if (info == null) return null; - if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET - && info instanceof LauncherAppWidgetInfo - && ((LauncherAppWidgetInfo) info).providerName != null) { - ComponentName cn = ((LauncherAppWidgetInfo) info).providerName; - return new AppTarget.Builder(new AppTargetId("widget:" + cn.getPackageName()), - cn.getPackageName(), info.user).setClassName(cn.getClassName()).build(); - } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION - && info.getTargetComponent() != null) { - ComponentName cn = info.getTargetComponent(); - return new AppTarget.Builder(new AppTargetId("app:" + cn.getPackageName()), - cn.getPackageName(), info.user).setClassName(cn.getClassName()).build(); - } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT - && info instanceof WorkspaceItemInfo) { - ShortcutKey shortcutKey = ShortcutKey.fromItemInfo(info); - //TODO: switch to using full shortcut info - return new AppTarget.Builder(new AppTargetId("shortcut:" + shortcutKey.getId()), - shortcutKey.componentName.getPackageName(), shortcutKey.user).build(); - } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) { - return new AppTarget.Builder(new AppTargetId("folder:" + info.id), - context.getPackageName(), info.user).build(); - } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APP_PAIR) { - return new AppTarget.Builder(new AppTargetId("app_pair:" + info.id), - context.getPackageName(), info.user).build(); - } - return null; - } - - /** - * Creates and returns {@link AppTargetEvent} from an {@link AppTarget}, action, and item - * location using {@link ItemInfo} - */ - public static AppTargetEvent wrapAppTargetWithItemLocation( - AppTarget target, int action, ItemInfo info) { - String location = String.format(Locale.ENGLISH, "%s/%d/[%d,%d]/[%d,%d]", - info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT - ? APP_LOCATION_HOTSEAT : APP_LOCATION_WORKSPACE, - info.screenId, info.cellX, info.cellY, info.spanX, info.spanY); - return new AppTargetEvent.Builder(target, action).setLaunchLocation(location).build(); - } - - /** - * Helper method to determine if {@link ItemInfo} should be tracked and reported to hotseat - * predictors - */ - public static boolean isTrackedForHotseatPrediction(ItemInfo info) { - return info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT || ( - info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP - && info.screenId == Workspace.FIRST_SCREEN_ID); - } - - /** - * Helper method to determine if {@link LauncherAtom.ItemInfo} should be tracked and reported to - * hotseat predictors - */ - public static boolean isTrackedForHotseatPrediction(LauncherAtom.ItemInfo info) { - LauncherAtom.ContainerInfo ci = info.getContainerInfo(); - switch (ci.getContainerCase()) { - case HOTSEAT: - return true; - case WORKSPACE: - return ci.getWorkspace().getPageIndex() == 0; - default: - return false; - } - } - - /** - * Helper method to determine if {@link ItemInfo} should be tracked and reported to widget - * predictors - */ - public static boolean isTrackedForWidgetPrediction(ItemInfo info) { - return info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET - && info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP; - } - - /** - * Helper method to determine if {@link LauncherAtom.ItemInfo} should be tracked and reported - * to widget predictors - */ - public static boolean isTrackedForWidgetPrediction(LauncherAtom.ItemInfo info) { - return info.getItemCase() == LauncherAtom.ItemInfo.ItemCase.WIDGET - && info.getContainerInfo().getContainerCase() == WORKSPACE; - } -} diff --git a/quickstep/src/com/android/launcher3/model/PredictionHelper.kt b/quickstep/src/com/android/launcher3/model/PredictionHelper.kt new file mode 100644 index 00000000000..122cbd1d60a --- /dev/null +++ b/quickstep/src/com/android/launcher3/model/PredictionHelper.kt @@ -0,0 +1,221 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.model + +import android.app.prediction.AppTarget +import android.app.prediction.AppTargetEvent +import android.app.prediction.AppTargetId +import android.content.Context +import android.os.Bundle +import com.android.launcher3.LauncherSettings.Favorites +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION +import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET +import com.android.launcher3.WorkspaceLayoutManager.FIRST_SCREEN_ID +import com.android.launcher3.logger.LauncherAtom +import com.android.launcher3.logger.LauncherAtom.ContainerInfo +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.ALL_APPS_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.FOLDER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.HOTSEAT +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.PREDICTED_HOTSEAT_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.PREDICTION_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SEARCH_RESULT_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SHORTCUTS_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.TASK_BAR_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.TASK_SWITCHER_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.WORKSPACE +import com.android.launcher3.logger.LauncherAtom.FolderContainer.ParentContainerCase +import com.android.launcher3.logger.LauncherAtom.HotseatContainer +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.WIDGET +import com.android.launcher3.logger.LauncherAtom.WorkspaceContainer +import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.LauncherAppWidgetInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.shortcuts.ShortcutKey + +/** Helper class with methods for converting launcher items to form usable by predictors */ +object PredictionHelper { + const val BUNDLE_KEY_PIN_EVENTS = "pin_events" + const val BUNDLE_KEY_CURRENT_ITEMS = "current_items" + const val BUNDLE_KEY_ADDED_APP_WIDGETS = "added_app_widgets" + + /** + * Helper method to determine if [ItemInfo] should be tracked and reported to hotseat predictors + */ + @JvmStatic + fun ItemInfo.isTrackedForHotseatPrediction(): Boolean = + container == CONTAINER_HOTSEAT || + (container == CONTAINER_DESKTOP && screenId == FIRST_SCREEN_ID) + + /** + * Helper method to determine if [LauncherAtom.ItemInfo] should be tracked and reported to + * hotseat predictors + */ + @JvmStatic + fun LauncherAtom.ItemInfo.isTrackedForHotseatPrediction(): Boolean = + containerInfo.run { + when (containerCase) { + HOTSEAT -> true + WORKSPACE -> workspace.pageIndex == 0 + else -> false + } + } + + /** + * Helper method to determine if [ItemInfo] should be tracked and reported to widget predictors + */ + @JvmStatic + fun ItemInfo.isTrackedForWidgetPrediction(): Boolean = + itemType == ITEM_TYPE_APPWIDGET && container == CONTAINER_DESKTOP + + /** + * Helper method to determine if [LauncherAtom.ItemInfo] should be tracked and reported to + * widget predictors + */ + @JvmStatic + fun LauncherAtom.ItemInfo.isTrackedForWidgetPrediction(): Boolean = + itemCase == WIDGET && containerInfo.containerCase == WORKSPACE + + /** Creates and returns bundle using workspace items for hotseat predictions */ + @JvmStatic + fun getBundleForHotseatPredictions(context: Context, dataModel: BgDataModel): Bundle { + return Bundle().apply { + putParcelableArrayList( + BUNDLE_KEY_PIN_EVENTS, + dataModel.getPinItemEvents(context) { it.isTrackedForHotseatPrediction() }, + ) + putParcelableArrayList( + BUNDLE_KEY_CURRENT_ITEMS, + dataModel.itemsIdMap + .getPredictedContents(CONTAINER_HOTSEAT_PREDICTION) + .mapNotNullTo(ArrayList()) { getAppTargetFromItemInfo(context, it) }, + ) + } + } + + /** Creates and returns bundle using workspace items for widget predictions */ + @JvmStatic + fun getBundleForWidgetPredictions(context: Context, dataModel: BgDataModel) = + Bundle().apply { + putParcelableArrayList( + BUNDLE_KEY_ADDED_APP_WIDGETS, + dataModel.getPinItemEvents(context) { it.isTrackedForWidgetPrediction() }, + ) + } + + /** Returns a location string to be used with [AppTargetEvent] for the [ContainerInfo] */ + @JvmStatic + fun ContainerInfo.getLocationString(spanX: Int, spanY: Int): String = + when (containerCase) { + // In case the item type is not widgets, the spaceX and spanY default to 1. + WORKSPACE -> workspace.getLocationString(spanX, spanY) + HOTSEAT -> hotseat.getLocationString() + FOLDER -> + folder.let { + when (it.parentContainerCase) { + ParentContainerCase.WORKSPACE -> + "folder/" + it.workspace.getLocationString(1, 1) + ParentContainerCase.HOTSEAT -> "folder/" + it.hotseat.getLocationString() + else -> "folder" + } + } + TASK_SWITCHER_CONTAINER -> "task-switcher" + ALL_APPS_CONTAINER -> "all-apps" + PREDICTED_HOTSEAT_CONTAINER -> "predictions/hotseat" + PREDICTION_CONTAINER -> "predictions" + SHORTCUTS_CONTAINER -> "deep-shortcuts" + TASK_BAR_CONTAINER -> "taskbar" + SEARCH_RESULT_CONTAINER -> "search-results" + EXTENDED_CONTAINERS -> + if (extendedContainers.containerCase == DEVICE_SEARCH_RESULT_CONTAINER) + "search-results" + else "" + else -> "" + } + + private fun WorkspaceContainer.getLocationString(spanX: Int, spanY: Int) = + "workspace/$pageIndex/[$gridX,$gridY]/[$spanX,$spanY]" + + private fun HotseatContainer.getLocationString() = "hotseat/$index/[$index,0]/[1,1]" + + /** + * Creates [AppTargetEvent] for every item in [BgDataModel] with [AppTargetEvent.ACTION_PIN] and + * item location using [ItemInfo] + */ + private fun BgDataModel.getPinItemEvents(context: Context, filter: (ItemInfo) -> Boolean) = + itemsIdMap.filter(filter).mapNotNullTo(ArrayList()) { info -> + getAppTargetFromItemInfo(context, info)?.let { target -> + AppTargetEvent.Builder(target, AppTargetEvent.ACTION_PIN) + .setLaunchLocation(info.containerInfo.getLocationString(info.spanX, info.spanY)) + .build() + } + } + + /** + * Creates and returns an [AppTarget] object for an [ItemInfo]. Returns null if item type is not + * supported in predictions + */ + private fun getAppTargetFromItemInfo(context: Context, info: ItemInfo?): AppTarget? { + if (info == null) return null + return when { + info.itemType == ITEM_TYPE_APPWIDGET && info is LauncherAppWidgetInfo -> + info.providerName?.let { cn -> + AppTarget.Builder( + AppTargetId("widget:" + cn.packageName), + cn.packageName, + info.user, + ) + .setClassName(cn.className) + .build() + } + info.itemType == Favorites.ITEM_TYPE_APPLICATION -> + info.targetComponent?.let { cn -> + AppTarget.Builder( + AppTargetId("app:" + cn.packageName), + cn.packageName, + info.user, + ) + .setClassName(cn.className) + .build() + } + + info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT && info is WorkspaceItemInfo -> + // TODO: switch to using full shortcut info + ShortcutKey.fromItemInfo(info).let { shortcutKey -> + AppTarget.Builder( + AppTargetId("shortcut:" + shortcutKey.id), + shortcutKey.componentName.packageName, + shortcutKey.user, + ) + .build() + } + info.itemType == Favorites.ITEM_TYPE_FOLDER -> + AppTarget.Builder(AppTargetId("folder:" + info.id), context.packageName, info.user) + .build() + info.itemType == Favorites.ITEM_TYPE_APP_PAIR -> + AppTarget.Builder( + AppTargetId("app_pair:" + info.id), + context.packageName, + info.user, + ) + .build() + else -> null + } + } +} diff --git a/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java index d6047429795..6322f163d69 100644 --- a/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java +++ b/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java @@ -31,16 +31,17 @@ import androidx.annotation.NonNull; import com.android.launcher3.ConstantItem; -import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.LauncherPrefs; -import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.QuickstepModelDelegate.PredictorState; +import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.model.data.PredictedItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -56,7 +57,10 @@ public class PredictionUpdateTask implements ModelUpdateTask { private final List mTargets; private final PredictorState mPredictorState; - PredictionUpdateTask(PredictorState predictorState, List targets) { + PredictionUpdateTask( + PredictorState predictorState, + List targets + ) { mPredictorState = predictorState; mTargets = targets; } @@ -64,15 +68,16 @@ public class PredictionUpdateTask implements ModelUpdateTask { @Override public void execute(@NonNull ModelTaskController taskController, @NonNull BgDataModel dataModel, @NonNull AllAppsList apps) { - LauncherAppState app = taskController.getApp(); - Context context = app.getContext(); + IconCache iconCache = taskController.getIconCache(); + Context context = taskController.getContext(); // TODO: remove this LauncherPrefs.get(context).put(LAST_PREDICTION_ENABLED, !mTargets.isEmpty()); Set usersForChangedShortcuts = - dataModel.extraItems.get(mPredictorState.containerId).items.stream() - .filter(info -> info.itemType == ITEM_TYPE_DEEP_SHORTCUT) + dataModel.itemsIdMap.getPredictedContents(mPredictorState.containerId).stream() + .filter(info -> info != null && + info.itemType == ITEM_TYPE_DEEP_SHORTCUT) .map(info -> info.user) .collect(Collectors.toSet()); @@ -83,7 +88,7 @@ public void execute(@NonNull ModelTaskController taskController, @NonNull BgData if (si != null) { usersForChangedShortcuts.add(si.getUserHandle()); itemInfo = new WorkspaceItemInfo(si, context); - app.getIconCache().getShortcutIcon(itemInfo, si); + iconCache.getShortcutIcon(itemInfo, si); } else { String className = target.getClassName(); if (COMPONENT_CLASS_MARKER.equals(className)) { @@ -95,7 +100,7 @@ public void execute(@NonNull ModelTaskController taskController, @NonNull BgData itemInfo = apps.data.stream() .filter(info -> user.equals(info.user) && cn.equals(info.componentName)) .map(ai -> { - app.getIconCache().getTitleAndIcon(ai, false); + iconCache.getTitleAndIcon(ai, mPredictorState.lookupFlag); return ai.makeWorkspaceItem(context); }) .findAny() @@ -106,7 +111,7 @@ public void execute(@NonNull ModelTaskController taskController, @NonNull BgData return null; } AppInfo ai = new AppInfo(context, lai, user); - app.getIconCache().getTitleAndIcon(ai, lai, false); + iconCache.getTitleAndIcon(ai, lai, mPredictorState.lookupFlag); return ai.makeWorkspaceItem(context); }); @@ -116,16 +121,15 @@ public void execute(@NonNull ModelTaskController taskController, @NonNull BgData } itemInfo.container = mPredictorState.containerId; - items.add(itemInfo); + items.add(new PredictedItemInfo(itemInfo)); } - FixedContainerItems fci = new FixedContainerItems(mPredictorState.containerId, items); - dataModel.extraItems.put(fci.containerId, fci); - taskController.bindExtraContainerItems(fci); - usersForChangedShortcuts.forEach( - u -> dataModel.updateShortcutPinnedState(app.getContext(), u)); + PredictedContainerInfo pci = new PredictedContainerInfo(mPredictorState.containerId, items); + dataModel.updateAndDispatchItem(pci /* item */, null /* owner */); + taskController.bindUpdatedWorkspaceItems(Collections.singleton(pci)); + usersForChangedShortcuts.forEach(u -> dataModel.updateShortcutPinnedState(context, u)); // Save to disk - mPredictorState.storage.write(context, fci.items); + mPredictorState.storage.write(context, pci.getContents()); } } diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index 51af4debc22..bb6a496f11d 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -15,19 +15,19 @@ */ package com.android.launcher3.model; +import static android.Manifest.permission.PACKAGE_USAGE_STATS; import static android.text.format.DateUtils.DAY_IN_MILLIS; import static android.text.format.DateUtils.formatElapsedTime; import static com.android.launcher3.EncryptionType.ENCRYPTED; import static com.android.launcher3.LauncherPrefs.nonRestorableItem; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; -import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION; -import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; -import static com.android.launcher3.hybridhotseat.HotseatPredictionModel.convertDataModelToAppTargetBundle; -import static com.android.launcher3.model.PredictionHelper.getAppTargetFromItemInfo; -import static com.android.launcher3.model.PredictionHelper.wrapAppTargetWithItemLocation; +import static com.android.launcher3.LauncherSettings.Favorites.DESKTOP_ICON_FLAG; +import static com.android.launcher3.icons.cache.CacheLookupFlag.DEFAULT_LOOKUP_FLAG; +import static com.android.launcher3.model.PredictionHelper.getBundleForHotseatPredictions; +import static com.android.launcher3.model.PredictionHelper.getBundleForWidgetPredictions; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import android.Manifest; @@ -36,8 +36,6 @@ import android.app.StatsManager; import android.app.prediction.AppPredictionContext; import android.app.prediction.AppPredictionManager; -import android.app.prediction.AppPredictor; -import android.app.prediction.AppTarget; import android.app.prediction.AppTargetEvent; import android.content.Context; import android.content.Intent; @@ -47,48 +45,40 @@ import android.content.pm.ShortcutInfo; import android.os.Bundle; import android.os.UserHandle; +import android.text.TextUtils; import android.util.Log; import android.util.StatsEvent; -import androidx.annotation.AnyThread; -import androidx.annotation.CallSuper; -import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; import com.android.launcher3.ConstantItem; +import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; import com.android.launcher3.Utilities; import com.android.launcher3.LauncherPrefs; -import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.dagger.ApplicationContext; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.InstanceIdSequence; -import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.CollectionInfo; import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.model.data.WorkspaceItemInfo; +import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.model.data.WorkspaceData; import com.android.launcher3.pm.UserCache; -import com.android.launcher3.shortcuts.ShortcutKey; -import com.android.launcher3.util.ApiWrapper; -import com.android.launcher3.util.Executors; import com.android.launcher3.util.IntSparseArrayMap; -import com.android.launcher3.util.PackageManagerHelper; -import com.android.launcher3.util.PersistedItemArray; import com.android.quickstep.logging.SettingsChangeLogger; import com.android.quickstep.logging.StatsLogCompatManager; +import com.android.quickstep.util.ContextualSearchStateManager; import com.android.systemui.shared.system.SysUiStatsLog; import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.IntStream; + +import javax.inject.Inject; +import javax.inject.Named; import app.lawnchair.LawnchairApp; import app.lawnchair.compat.LawnchairQuickstepCompat; @@ -98,7 +88,6 @@ */ public class QuickstepModelDelegate extends ModelDelegate { - private static final String BUNDLE_KEY_ADDED_APP_WIDGETS = "added_app_widgets"; private static final int NUM_OF_RECOMMENDED_WIDGETS_PREDICATION = 20; private static final boolean IS_DEBUG = false; @@ -108,107 +97,67 @@ public class QuickstepModelDelegate extends ModelDelegate { nonRestorableItem("LAST_SNAPSHOT_TIME_MILLIS", 0L, ENCRYPTED); @VisibleForTesting - final PredictorState mAllAppsState = new PredictorState(CONTAINER_PREDICTION, "all_apps_predictions"); + final PredictorState mAllPredictionAppsState = new PredictorState( + CONTAINER_ALL_APPS_PREDICTION, "all_apps_predictions", DEFAULT_LOOKUP_FLAG); @VisibleForTesting - final PredictorState mHotseatState = new PredictorState(CONTAINER_HOTSEAT_PREDICTION, "hotseat_predictions"); + final PredictorState mHotseatPredictionState = new PredictorState( + CONTAINER_HOTSEAT_PREDICTION, "hotseat_predictions", DESKTOP_ICON_FLAG); @VisibleForTesting - final PredictorState mWidgetsRecommendationState = new PredictorState(CONTAINER_WIDGETS_PREDICTION, - "widgets_prediction"); + @Deprecated // unused with the Flag.enableWidgetPickerRefactor enabled + final PredictorState mWidgetsRecommendationState = new PredictorState( + CONTAINER_WIDGETS_PREDICTION, "widgets_prediction", DESKTOP_ICON_FLAG); private final InvariantDeviceProfile mIDP; + private final UserCache mUserCache; + private final PredictedItemFactory.Factory mItemParserFactory; private final AppEventProducer mAppEventProducer; - private StatsManager mStatsManager; + + private final StatsManager mStatsManager; protected boolean mActive = false; - public QuickstepModelDelegate(Context context) { + @Inject + public QuickstepModelDelegate(@ApplicationContext Context context, + InvariantDeviceProfile idp, + UserCache userCache, + PredictedItemFactory.Factory itemParserFactory, + @Nullable @Named("ICONS_DB") String dbFileName) { super(context); - mAppEventProducer = new AppEventProducer(context, this::onAppTargetEvent); - mIDP = InvariantDeviceProfile.INSTANCE.get(context); - StatsLogCompatManager.LOGS_CONSUMER.add(mAppEventProducer); - try { - mStatsManager = context.getSystemService(StatsManager.class); - } catch (Throwable e) { - Log.e(TAG, "Failed to get StatsManager", e); - } - } - @CallSuper - @Override - public void loadAndBindWorkspaceItems(@NonNull UserManagerState ums, - @NonNull BgDataModel.Callbacks[] callbacks, - @NonNull Map pinnedShortcuts) { - loadAndBindItems(ums, pinnedShortcuts, callbacks, mIDP.numDatabaseHotseatIcons, - mHotseatState); - } + mIDP = idp; + mUserCache = userCache; + mItemParserFactory = itemParserFactory; - @CallSuper - @Override - public void loadAndBindAllAppsItems(@NonNull UserManagerState ums, - @NonNull BgDataModel.Callbacks[] callbacks, - @NonNull Map pinnedShortcuts) { - loadAndBindItems(ums, pinnedShortcuts, callbacks, mIDP.numDatabaseAllAppsColumns, - mAllAppsState); - } + mAppEventProducer = new AppEventProducer(context, this::onAppTargetEvent); + StatsLogCompatManager.LOGS_CONSUMER.add(mAppEventProducer); - @WorkerThread - private void loadAndBindItems(@NonNull UserManagerState ums, - @NonNull Map pinnedShortcuts, - @NonNull BgDataModel.Callbacks[] callbacks, - int numColumns, @NonNull PredictorState state) { - // TODO: Implement caching and preloading - - WorkspaceItemFactory factory = - new WorkspaceItemFactory(mApp, ums, mPmHelper, pinnedShortcuts, numColumns, - state.containerId); - FixedContainerItems fci = new FixedContainerItems(state.containerId, - state.storage.read(mApp.getContext(), factory, ums.allUsers::get)); - if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) { - bindPredictionItems(callbacks, fci); - } - mDataModel.extraItems.put(state.containerId, fci); + // Only register for launcher snapshot logging if this is the primary ModelDelegate + // instance, as there will be additional instances that may be destroyed at any time. + mStatsManager = TextUtils.isEmpty(dbFileName) + ? null : context.getSystemService(StatsManager.class); } - @CallSuper @Override - public void loadAndBindOtherItems(@NonNull BgDataModel.Callbacks[] callbacks) { - FixedContainerItems widgetPredictionFCI = new FixedContainerItems( + public void loadAndAddExtraModelItems(@NonNull IntSparseArrayMap outLoadedItems) { + loadAndBindPredictedItems( + mIDP.numDatabaseHotseatIcons, mHotseatPredictionState, outLoadedItems); + loadAndBindPredictedItems(mIDP.numDatabaseAllAppsColumns, mAllPredictionAppsState, + outLoadedItems); + + // Widgets prediction isn't used frequently. And thus, it is not persisted on disk. + PredictedContainerInfo widgetPredictionFCI = new PredictedContainerInfo( mWidgetsRecommendationState.containerId, new ArrayList<>()); - - // Widgets prediction isn't used frequently. And thus, it is not persisted on - // disk. - mDataModel.extraItems.put(mWidgetsRecommendationState.containerId, widgetPredictionFCI); - - bindPredictionItems(callbacks, widgetPredictionFCI); - loadStringCache(mDataModel.stringCache); - } - - @AnyThread - private void bindPredictionItems(@NonNull BgDataModel.Callbacks[] callbacks, - @NonNull FixedContainerItems fci) { - Executors.MAIN_EXECUTOR.execute(() -> { - for (BgDataModel.Callbacks c : callbacks) { - c.bindExtraContainerItems(fci); - } - }); + outLoadedItems.put(mWidgetsRecommendationState.containerId, widgetPredictionFCI); } - @CallSuper - @Override @WorkerThread - public void bindAllModelExtras(@NonNull BgDataModel.Callbacks[] callbacks) { - Iterable containerItems; - synchronized (mDataModel.extraItems) { - containerItems = mDataModel.extraItems.clone(); - } - Executors.MAIN_EXECUTOR.execute(() -> { - for (BgDataModel.Callbacks c : callbacks) { - for (FixedContainerItems fci : containerItems) { - c.bindExtraContainerItems(fci); - } - } - }); + private void loadAndBindPredictedItems(int numColumns, + @NonNull PredictorState state, @NonNull IntSparseArrayMap outLoadedItems) { + PredictedItemFactory parser = mItemParserFactory.newParser(numColumns, state); + PredictedContainerInfo fci = new PredictedContainerInfo(state.containerId, + state.storage.read(mContext, parser, mUserCache::getUserForSerialNumber)); + outLoadedItems.put(state.containerId, fci); } public void markActive() { @@ -216,9 +165,12 @@ public void markActive() { mActive = true; } + @WorkerThread @Override public void workspaceLoadComplete() { super.workspaceLoadComplete(); + // Initialize ContextualSearchStateManager. + ContextualSearchStateManager.INSTANCE.get(mContext); recreatePredictors(); } @@ -228,7 +180,7 @@ public void modelLoadComplete() { super.modelLoadComplete(); // Log snapshot of the model - LauncherPrefs prefs = LauncherPrefs.get(mApp.getContext()); + LauncherPrefs prefs = LauncherPrefs.get(mContext); long lastSnapshotTimeMillis = prefs.get(LAST_SNAPSHOT_TIME_MILLIS); // Log snapshot only if previous snapshot was older than a day long now = System.currentTimeMillis(); @@ -240,39 +192,30 @@ public void modelLoadComplete() { elapsedTime)); } } else { - IntSparseArrayMap itemsIdMap; + WorkspaceData itemsIdMap; synchronized (mDataModel) { - itemsIdMap = mDataModel.itemsIdMap.clone(); + itemsIdMap = mDataModel.itemsIdMap.copy(); } InstanceId instanceId = new InstanceIdSequence().newInstanceId(); for (ItemInfo info : itemsIdMap) { CollectionInfo parent = getContainer(info, itemsIdMap); - StatsLogCompatManager.writeSnapshot(info.buildProto(parent), instanceId); + StatsLogCompatManager.writeSnapshot(info.buildProto(parent, mContext), instanceId); } additionalSnapshotEvents(instanceId); prefs.put(LAST_SNAPSHOT_TIME_MILLIS, now); } - // Only register for launcher snapshot logging if this is the primary - // ModelDelegate - // instance, as there will be additional instances that may be destroyed at any - // time. - if (mIsPrimaryInstance && LawnchairApp.isRecentsEnabled()) { - registerSnapshotLoggingCallback(); - } + registerSnapshotLoggingCallback(); } - protected void additionalSnapshotEvents(InstanceId snapshotInstanceId) { - } + protected void additionalSnapshotEvents(InstanceId snapshotInstanceId){} /** - * Registers a callback to log launcher workspace layout using Statsd pulled - * atom. + * Registers a callback to log launcher workspace layout using Statsd pulled atom. */ - protected void registerSnapshotLoggingCallback() { + private void registerSnapshotLoggingCallback() { if (mStatsManager == null || !LawnchairQuickstepCompat.ATLEAST_R) { - Log.d(TAG, "Failed to get StatsManager"); - return; + Log.d(TAG, "Skipping snapshot logging"); } try { @@ -282,14 +225,14 @@ protected void registerSnapshotLoggingCallback() { MODEL_EXECUTOR, (i, eventList) -> { InstanceId instanceId = new InstanceIdSequence().newInstanceId(); - IntSparseArrayMap itemsIdMap; + WorkspaceData itemsIdMap; synchronized (mDataModel) { - itemsIdMap = mDataModel.itemsIdMap.clone(); + itemsIdMap = mDataModel.itemsIdMap.copy(); } for (ItemInfo info : itemsIdMap) { CollectionInfo parent = getContainer(info, itemsIdMap); - LauncherAtom.ItemInfo itemInfo = info.buildProto(parent); + LauncherAtom.ItemInfo itemInfo = info.buildProto(parent, mContext); Log.d(TAG, itemInfo.toString()); StatsEvent statsEvent = StatsLogCompatManager.buildStatsEvent(itemInfo, instanceId); @@ -298,11 +241,12 @@ protected void registerSnapshotLoggingCallback() { Log.d(TAG, String.format( "Successfully logged %d workspace items with instanceId=%d", - itemsIdMap.size(), instanceId.getId())); + eventList.size(), instanceId.getId())); additionalSnapshotEvents(instanceId); SettingsChangeLogger.INSTANCE.get(mContext).logSnapshot(instanceId); return StatsManager.PULL_SUCCESS; - }); + } + ); Log.d(TAG, "Successfully registered for launcher snapshot logging!"); } catch (Throwable e) { Log.e(TAG, "Failed to register launcher snapshot logging callback with StatsManager", @@ -311,7 +255,7 @@ protected void registerSnapshotLoggingCallback() { } private static CollectionInfo getContainer( - ItemInfo info, IntSparseArrayMap itemsIdMap) { + ItemInfo info, WorkspaceData itemsIdMap) { if (info.container > 0) { ItemInfo containerInfo = itemsIdMap.get(info.container); @@ -330,20 +274,19 @@ private static CollectionInfo getContainer( @Override public void validateData() { super.validateData(); - if (mAllAppsState.predictor != null) { - mAllAppsState.predictor.requestPredictionUpdate(); - } - if (mWidgetsRecommendationState.predictor != null) { - mWidgetsRecommendationState.predictor.requestPredictionUpdate(); + mAllPredictionAppsState.requestPredictionUpdate(); + if (!Flags.enableWidgetPickerRefactor()) { + mWidgetsRecommendationState.requestPredictionUpdate(); } } + @WorkerThread @Override public void destroy() { super.destroy(); mActive = false; StatsLogCompatManager.LOGS_CONSUMER.remove(mAppEventProducer); - if (mIsPrimaryInstance && mStatsManager != null && LawnchairQuickstepCompat.ATLEAST_R) { + if (mStatsManager != null && LawnchairQuickstepCompat.ATLEAST_R) { try { mStatsManager.clearPullAtomCallback(SysUiStatsLog.LAUNCHER_LAYOUT_SNAPSHOT); } catch (Throwable e) { @@ -354,9 +297,11 @@ public void destroy() { } private void destroyPredictors() { - mAllAppsState.destroyPredictor(); - mHotseatState.destroyPredictor(); - mWidgetsRecommendationState.destroyPredictor(); + mAllPredictionAppsState.destroyPredictor(); + mHotseatPredictionState.destroyPredictor(); + if (!Flags.enableWidgetPickerRefactor()) { + mWidgetsRecommendationState.destroyPredictor(); + } } @WorkerThread @@ -365,262 +310,89 @@ private void recreatePredictors() { if (!Utilities.ATLEAST_Q || !mActive) { return; } - Context context = mApp.getContext(); - AppPredictionManager apm = context.getSystemService(AppPredictionManager.class); + AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); if (apm == null) { return; } - int usagePerm = mApp.getContext().checkCallingOrSelfPermission(Manifest.permission.PACKAGE_USAGE_STATS); + int usagePerm = mContext.checkCallingOrSelfPermission(PACKAGE_USAGE_STATS); if (usagePerm != PackageManager.PERMISSION_GRANTED) return; - registerPredictor(mAllAppsState, apm.createAppPredictionSession( - new AppPredictionContext.Builder(context) - .setUiSurface("home") - .setPredictedTargetCount(mIDP.numDatabaseAllAppsColumns) - .build())); + mAllPredictionAppsState.registerPredictor(mContext, + new AppPredictionContext.Builder(mContext) + .setUiSurface("home") + .setPredictedTargetCount(mIDP.numDatabaseAllAppsColumns) + .build(), + mModel, + PredictionUpdateTask::new); - // TODO: get bundle - registerHotseatPredictor(apm, context); - registerWidgetsPredictor(apm.createAppPredictionSession( - new AppPredictionContext.Builder(context) - .setUiSurface("widgets") - .setExtras(getBundleForWidgetsOnWorkspace(context, mDataModel)) - .setPredictedTargetCount(NUM_OF_RECOMMENDED_WIDGETS_PREDICATION) - .build())); + // TODO: get bundle + registerHotseatPredictor(mContext); + + if (!Flags.enableWidgetPickerRefactor()) { + mWidgetsRecommendationState.registerPredictor(mContext, + new AppPredictionContext.Builder(mContext) + .setUiSurface("widgets") + .setExtras(getBundleForWidgetPredictions(mContext, mDataModel)) + .setPredictedTargetCount(NUM_OF_RECOMMENDED_WIDGETS_PREDICATION) + .build(), + mModel, + WidgetsPredictionUpdateTask::new); + } } @WorkerThread private void recreateHotseatPredictor() { - mHotseatState.destroyPredictor(); - if (!mActive) { - return; + mHotseatPredictionState.destroyPredictor(); + + AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); + if (apm == null) return; + + int usagePerm = mContext.checkCallingOrSelfPermission(PACKAGE_USAGE_STATS); + if (usagePerm != PackageManager.PERMISSION_GRANTED) return; + + if (mActive) { + registerHotseatPredictor(mContext); } - Context context = mApp.getContext(); - AppPredictionManager apm = context.getSystemService(AppPredictionManager.class); - if (apm == null) { - return; - } - registerHotseatPredictor(apm, context); } - private void registerHotseatPredictor(AppPredictionManager apm, Context context) { - registerPredictor(mHotseatState, apm.createAppPredictionSession( + private void registerHotseatPredictor(Context context) { + mHotseatPredictionState.registerPredictor(context, new AppPredictionContext.Builder(context) - .setUiSurface("hotseat") - .setPredictedTargetCount(mIDP.numDatabaseHotseatIcons) - .setExtras(convertDataModelToAppTargetBundle(context, mDataModel)) - .build())); - } - - private void registerPredictor(PredictorState state, AppPredictor predictor) { - state.setTargets(Collections.emptyList()); - state.predictor = predictor; - state.predictor.registerPredictionUpdates( - MODEL_EXECUTOR, new AppPredictor.Callback() { - @Keep - @Override - public void onTargetsAvailable(@NonNull List targets) { - handleUpdate(state, targets); - } - }); - state.predictor.requestPredictionUpdate(); - } - - private void handleUpdate(PredictorState state, List targets) { - if (state.setTargets(targets)) { - // No diff, skip - return; - } - mApp.getModel().enqueueModelUpdateTask(new PredictionUpdateTask(state, targets)); - } - - private void registerWidgetsPredictor(AppPredictor predictor) { - mWidgetsRecommendationState.predictor = predictor; - mWidgetsRecommendationState.predictor.registerPredictionUpdates( - MODEL_EXECUTOR, new AppPredictor.Callback() { - @Keep - @Override - public void onTargetsAvailable(@NonNull List targets) { - if (mWidgetsRecommendationState.setTargets(targets)) { - // No diff, skip - return; - } - mApp.getModel().enqueueModelUpdateTask( - new WidgetsPredictionUpdateTask(mWidgetsRecommendationState, targets)); - } - }); - mWidgetsRecommendationState.predictor.requestPredictionUpdate(); + .setUiSurface("hotseat") + .setPredictedTargetCount(mIDP.numDatabaseHotseatIcons) + .setExtras(getBundleForHotseatPredictions(context, mDataModel)) + .build(), + mModel, PredictionUpdateTask::new); } @VisibleForTesting void onAppTargetEvent(AppTargetEvent event, int client) { PredictorState state; - switch (client) { - case CONTAINER_PREDICTION: - state = mAllAppsState; + switch(client) { + case CONTAINER_ALL_APPS_PREDICTION: + state = mAllPredictionAppsState; break; case CONTAINER_WIDGETS_PREDICTION: state = mWidgetsRecommendationState; break; case CONTAINER_HOTSEAT_PREDICTION: default: - state = mHotseatState; + state = mHotseatPredictionState; break; } - if (state.predictor != null) { - state.predictor.notifyAppTargetEvent(event); - Log.d(TAG, "notifyAppTargetEvent action=" + event.getAction() - + " launchLocation=" + event.getLaunchLocation()); - if (state == mHotseatState - && (event.getAction() == AppTargetEvent.ACTION_PIN - || event.getAction() == AppTargetEvent.ACTION_UNPIN)) { - // Recreate hot seat predictor when we need to query for hot seat due to pin or - // unpin app icons. - recreateHotseatPredictor(); - } - } - } - - private Bundle getBundleForWidgetsOnWorkspace(Context context, BgDataModel dataModel) { - Bundle bundle = new Bundle(); - ArrayList widgetEvents = dataModel.getAllWorkspaceItems().stream() - .filter(PredictionHelper::isTrackedForWidgetPrediction) - .map(item -> { - AppTarget target = getAppTargetFromItemInfo(context, item); - if (target == null) - return null; - return wrapAppTargetWithItemLocation( - target, AppTargetEvent.ACTION_PIN, item); - }) - .filter(Objects::nonNull) - .collect(toCollection(ArrayList::new)); - bundle.putParcelableArrayList(BUNDLE_KEY_ADDED_APP_WIDGETS, widgetEvents); - return bundle; - } - - static class PredictorState { - - public final int containerId; - public final PersistedItemArray storage; - public AppPredictor predictor; - - private List mLastTargets; - - PredictorState(int containerId, String storageName) { - this.containerId = containerId; - storage = new PersistedItemArray<>(storageName); - mLastTargets = Collections.emptyList(); - } - - public void destroyPredictor() { - if (predictor != null) { - predictor.destroy(); - predictor = null; - } - } - - /** - * Sets the new targets and returns true if it was the same as before. - */ - boolean setTargets(List newTargets) { - List oldTargets = mLastTargets; - mLastTargets = newTargets; - - int size = oldTargets.size(); - return size == newTargets.size() && IntStream.range(0, size) - .allMatch(i -> areAppTargetsSame(oldTargets.get(i), newTargets.get(i))); - } - } - /** - * Compares two targets for the properties which we care about - */ - private static boolean areAppTargetsSame(AppTarget t1, AppTarget t2) { - if (!Objects.equals(t1.getPackageName(), t2.getPackageName()) - || !Objects.equals(t1.getUser(), t2.getUser()) - || !Objects.equals(t1.getClassName(), t2.getClassName())) { - return false; - } - - ShortcutInfo s1 = t1.getShortcutInfo(); - ShortcutInfo s2 = t2.getShortcutInfo(); - if (s1 != null) { - if (s2 == null || !Objects.equals(s1.getId(), s2.getId())) { - return false; - } - } else if (s2 != null) { - return false; - } - return true; - } - - private static class WorkspaceItemFactory implements PersistedItemArray.ItemFactory { - - private final LauncherAppState mAppState; - private final UserManagerState mUMS; - private final PackageManagerHelper mPmHelper; - private final Map mPinnedShortcuts; - private final int mMaxCount; - private final int mContainer; - - private int mReadCount = 0; - - protected WorkspaceItemFactory(LauncherAppState appState, UserManagerState ums, - PackageManagerHelper pmHelper, Map pinnedShortcuts, - int maxCount, int container) { - mAppState = appState; - mUMS = ums; - mPmHelper = pmHelper; - mPinnedShortcuts = pinnedShortcuts; - mMaxCount = maxCount; - mContainer = container; - } - - @Nullable - @Override - public ItemInfo createInfo(int itemType, UserHandle user, Intent intent) { - if (mReadCount >= mMaxCount) { - return null; - } - switch (itemType) { - case ITEM_TYPE_APPLICATION: { - LauncherActivityInfo lai = mAppState.getContext() - .getSystemService(LauncherApps.class) - .resolveActivity(intent, user); - if (lai == null) { - return null; - } - AppInfo info = new AppInfo( - lai, - UserCache.INSTANCE.get(mAppState.getContext()).getUserInfo(user), - ApiWrapper.INSTANCE.get(mAppState.getContext()), - mPmHelper, - mUMS.isUserQuiet(user)); - info.container = mContainer; - mAppState.getIconCache().getTitleAndIcon(info, lai, false); - mReadCount++; - return info.makeWorkspaceItem(mAppState.getContext()); - } - case ITEM_TYPE_DEEP_SHORTCUT: { - ShortcutKey key = ShortcutKey.fromIntent(intent, user); - if (key == null) { - return null; - } - ShortcutInfo si = mPinnedShortcuts.get(key); - if (si == null) { - return null; - } - WorkspaceItemInfo wii = new WorkspaceItemInfo(si, mAppState.getContext()); - wii.container = mContainer; - mAppState.getIconCache().getShortcutIcon(wii, si); - mReadCount++; - return wii; - } - } - return null; + state.notifyAppTargetEvent(event); + Log.d(TAG, "notifyAppTargetEvent action=" + event.getAction() + + " launchLocation=" + event.getLaunchLocation()); + if (state == mHotseatPredictionState + && (event.getAction() == AppTargetEvent.ACTION_PIN + || event.getAction() == AppTargetEvent.ACTION_UNPIN)) { + // Recreate hot seat predictor when we need to query for hot seat due to pin or + // unpin app icons. + recreateHotseatPredictor(); } } } diff --git a/quickstep/src/com/android/launcher3/model/WellbeingModel.java b/quickstep/src/com/android/launcher3/model/WellbeingModel.java index a7c965218d6..4591abae294 100644 --- a/quickstep/src/com/android/launcher3/model/WellbeingModel.java +++ b/quickstep/src/com/android/launcher3/model/WellbeingModel.java @@ -18,20 +18,18 @@ import static android.content.ContentResolver.SCHEME_CONTENT; -import static com.android.launcher3.util.SimpleBroadcastReceiver.getPackageFilter; +import static com.android.launcher3.util.SimpleBroadcastReceiver.packageFilter; import android.app.RemoteAction; import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.pm.LauncherApps; import android.database.ContentObserver; import android.net.Uri; import android.os.Bundle; import android.os.DeadObjectException; -import android.os.Handler; import android.os.Process; import android.os.UserHandle; import android.text.TextUtils; @@ -44,27 +42,35 @@ import androidx.annotation.WorkerThread; import com.android.launcher3.R; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.popup.RemoteActionShortcut; import com.android.launcher3.popup.SystemShortcut; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.Executors; -import com.android.launcher3.util.MainThreadInitializedObject; +import com.android.launcher3.util.LooperExecutor; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.SafeCloseable; import com.android.launcher3.util.SimpleBroadcastReceiver; import com.android.launcher3.views.ActivityContext; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; + /** * Data model for digital wellbeing status of apps. */ +@LauncherAppSingleton public final class WellbeingModel implements SafeCloseable { private static final String TAG = "WellbeingModel"; private static final int[] RETRY_TIMES_MS = {5000, 15000, 30000}; - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; // Welbeing contract private static final String PATH_ACTIONS = "actions"; @@ -75,18 +81,16 @@ public final class WellbeingModel implements SafeCloseable { private static final String EXTRA_PACKAGES = "packages"; private static final String EXTRA_SUCCESS = "success"; - public static final MainThreadInitializedObject INSTANCE = - new MainThreadInitializedObject<>(WellbeingModel::new); + public static final DaggerSingletonObject INSTANCE = + new DaggerSingletonObject<>(QuickstepBaseAppComponent::getWellbeingModel); private final Context mContext; private final String mWellbeingProviderPkg; - private final Handler mWorkerHandler; + private final LooperExecutor mWorkerExecutor; private final ContentObserver mContentObserver; - private final SimpleBroadcastReceiver mWellbeingAppChangeReceiver = - new SimpleBroadcastReceiver(t -> restartObserver()); - private final SimpleBroadcastReceiver mAppAddRemoveReceiver = - new SimpleBroadcastReceiver(this::onAppPackageChanged); + private final SimpleBroadcastReceiver mWellbeingAppChangeReceiver; + private final SimpleBroadcastReceiver mAppAddRemoveReceiver; private final Object mModelLock = new Object(); // Maps the action Id to the corresponding RemoteAction @@ -95,36 +99,42 @@ public final class WellbeingModel implements SafeCloseable { private boolean mIsInTest; - private WellbeingModel(final Context context) { + @Inject + WellbeingModel(@ApplicationContext final Context context, + DaggerSingletonTracker tracker) { mContext = context; mWellbeingProviderPkg = mContext.getString(R.string.wellbeing_provider_pkg); - mWorkerHandler = new Handler(TextUtils.isEmpty(mWellbeingProviderPkg) - ? Executors.UI_HELPER_EXECUTOR.getLooper() - : Executors.getPackageExecutor(mWellbeingProviderPkg).getLooper()); + mWorkerExecutor = TextUtils.isEmpty(mWellbeingProviderPkg) + ? Executors.UI_HELPER_EXECUTOR + : Executors.getPackageExecutor(mWellbeingProviderPkg); + mWellbeingAppChangeReceiver = + new SimpleBroadcastReceiver(context, mWorkerExecutor, t -> restartObserver()); + mAppAddRemoveReceiver = + new SimpleBroadcastReceiver(context, mWorkerExecutor, this::onAppPackageChanged); + - mContentObserver = new ContentObserver(mWorkerHandler) { + mContentObserver = new ContentObserver(mWorkerExecutor.getHandler()) { @Override public void onChange(boolean selfChange, Uri uri) { updateAllPackages(); } }; - mWorkerHandler.post(this::initializeInBackground); + mWorkerExecutor.execute(this::initializeInBackground); + tracker.addCloseable(this); } + @WorkerThread private void initializeInBackground() { if (!TextUtils.isEmpty(mWellbeingProviderPkg)) { - mContext.registerReceiver( - mWellbeingAppChangeReceiver, - getPackageFilter(mWellbeingProviderPkg, - Intent.ACTION_PACKAGE_ADDED, Intent.ACTION_PACKAGE_CHANGED, - Intent.ACTION_PACKAGE_REMOVED, Intent.ACTION_PACKAGE_DATA_CLEARED, - Intent.ACTION_PACKAGE_RESTARTED), - null, mWorkerHandler); - - IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED); - filter.addAction(Intent.ACTION_PACKAGE_REMOVED); - filter.addDataScheme("package"); - mContext.registerReceiver(mAppAddRemoveReceiver, filter, null, mWorkerHandler); + mWellbeingAppChangeReceiver.register(packageFilter(mWellbeingProviderPkg, + Intent.ACTION_PACKAGE_ADDED, + Intent.ACTION_PACKAGE_CHANGED, + Intent.ACTION_PACKAGE_REMOVED, + Intent.ACTION_PACKAGE_DATA_CLEARED, + Intent.ACTION_PACKAGE_RESTARTED)); + + mAppAddRemoveReceiver.register(packageFilter(null, + Intent.ACTION_PACKAGE_ADDED, Intent.ACTION_PACKAGE_REMOVED)); restartObserver(); } @@ -133,11 +143,10 @@ private void initializeInBackground() { @Override public void close() { if (!TextUtils.isEmpty(mWellbeingProviderPkg)) { - mWorkerHandler.post(() -> { - mWellbeingAppChangeReceiver.unregisterReceiverSafely(mContext); - mAppAddRemoveReceiver.unregisterReceiverSafely(mContext); - mContext.getContentResolver().unregisterContentObserver(mContentObserver); - }); + mWellbeingAppChangeReceiver.close(); + mAppAddRemoveReceiver.close(); + mWorkerExecutor.execute(() -> + mContext.getContentResolver().unregisterContentObserver(mContentObserver)); } } @@ -167,7 +176,7 @@ private SystemShortcut getShortcutForApp(String packageName, int userId, // Work profile apps are not recognized by digital wellbeing. if (userId != UserHandle.myUserId()) { if (DEBUG || mIsInTest) { - Log.d(TAG, "getShortcutForApp [" + packageName + "]: not current user"); + Log.w(TAG, "getShortcutForApp [" + packageName + "]: not current user"); } return null; } @@ -177,12 +186,12 @@ private SystemShortcut getShortcutForApp(String packageName, int userId, final RemoteAction action = actionId != null ? mActionIdMap.get(actionId) : null; if (action == null) { if (DEBUG || mIsInTest) { - Log.d(TAG, "getShortcutForApp [" + packageName + "]: no action"); + Log.w(TAG, "getShortcutForApp [" + packageName + "]: no action"); } return null; } if (DEBUG || mIsInTest) { - Log.d(TAG, + Log.w(TAG, "getShortcutForApp [" + packageName + "]: action: '" + action.getTitle() + "'"); } @@ -274,7 +283,7 @@ private void updateActionsWithRetry(int retryCount, @Nullable String packageName .toArray(String[]::new) : new String[]{packageName}; - mWorkerHandler.removeCallbacksAndMessages(packageName); + mWorkerExecutor.getHandler().removeCallbacksAndMessages(packageName); if (updateActions(packageNames)) { return; } @@ -282,7 +291,7 @@ private void updateActionsWithRetry(int retryCount, @Nullable String packageName // To many retries, skip return; } - mWorkerHandler.postDelayed( + mWorkerExecutor.getHandler().postDelayed( () -> { if (DEBUG || mIsInTest) Log.i(TAG, "Retrying; attempt " + (retryCount + 1)); updateActionsWithRetry(retryCount + 1, packageName); @@ -308,7 +317,7 @@ private void onAppPackageChanged(Intent intent) { } final String action = intent.getAction(); if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) { - mWorkerHandler.removeCallbacksAndMessages(packageName); + mWorkerExecutor.getHandler().removeCallbacksAndMessages(packageName); synchronized (mModelLock) { mPackageToActionId.remove(packageName); } @@ -321,10 +330,12 @@ private void onAppPackageChanged(Intent intent) { * Shortcut factory for generating wellbeing action */ public static final SystemShortcut.Factory SHORTCUT_FACTORY = - (context, info, originalView) -> - (info.getTargetComponent() == null) ? null - : INSTANCE.get(originalView.getContext()).getShortcutForApp( - info.getTargetComponent().getPackageName(), info.user.getIdentifier(), - ActivityContext.lookupContext(originalView.getContext()), - info, originalView); + (context, info, originalView) -> (info.getTargetComponent() == null) + ? null + : INSTANCE.get(originalView.getContext()).getShortcutForApp( + info.getTargetComponent().getPackageName(), + info.user.getIdentifier(), + ActivityContext.lookupContext(originalView.getContext()), + info, + originalView); } diff --git a/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java b/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java index 84313965e6d..ada7301b42e 100644 --- a/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java +++ b/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java @@ -16,7 +16,6 @@ package com.android.launcher3.model; -import static com.android.launcher3.Flags.enableCategorizedWidgetSuggestions; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; @@ -40,7 +39,6 @@ import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.picker.WidgetRecommendationCategoryProvider; @@ -49,7 +47,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -57,72 +54,91 @@ * Works with app predictor to fetch and process widget predictions displayed in a standalone * widget picker activity for a UI surface. */ -public class WidgetPredictionsRequester { +public class WidgetPredictionsRequester implements AppPredictor.Callback { private static final int NUM_OF_RECOMMENDED_WIDGETS_PREDICATION = 20; private static final String BUNDLE_KEY_ADDED_APP_WIDGETS = "added_app_widgets"; + // container/screenid/[positionx,positiony]/[spanx,spany] + // Matches the format passed used by PredictionHelper; But, position and size values aren't + // used, so, we pass default values. + @VisibleForTesting + static final String LAUNCH_LOCATION = "workspace/1/[0,0]/[2,2]"; @Nullable private AppPredictor mAppPredictor; private final Context mContext; @NonNull private final String mUiSurface; + private boolean mPredictionsAvailable; + @Nullable + private WidgetPredictionsListener mPredictionsListener = null; + @Nullable Predicate mFilter = null; @NonNull - private final Map> mAllWidgets; + private final Map mAllWidgets; public WidgetPredictionsRequester(Context context, @NonNull String uiSurface, - @NonNull Map> allWidgets) { + @NonNull Map allWidgets) { mContext = context; mUiSurface = uiSurface; mAllWidgets = Collections.unmodifiableMap(allWidgets); } + // AppPredictor.Callback -> onTargetsAvailable + @Override + @WorkerThread + public void onTargetsAvailable(List targets) { + List filteredPredictions = filterPredictions(targets, mAllWidgets, mFilter); + List mappedPredictions = mapWidgetItemsToItemInfo(filteredPredictions); + + if (!mPredictionsAvailable && mPredictionsListener != null) { + mPredictionsAvailable = true; + MAIN_EXECUTOR.execute( + () -> mPredictionsListener.onPredictionsAvailable(mappedPredictions)); + } + } + /** - * Requests predictions from the app predictions manager and registers the provided callback to - * receive updates when predictions are available. + * Requests one time predictions from the app predictions manager and invokes provided callback + * once predictions are available. Any previous requests may be cancelled. * * @param existingWidgets widgets that are currently added to the surface; - * @param callback consumer of prediction results to be called when predictions are - * available + * @param listener consumer of prediction results to be called when predictions are + * available; any previous listener will no longer receive updates. */ + @WorkerThread // e.g. MODEL_EXECUTOR public void request(List existingWidgets, - Consumer> callback) { - Bundle bundle = buildBundleForPredictionSession(existingWidgets, mUiSurface); - Predicate filter = notOnUiSurfaceFilter(existingWidgets); - - MODEL_EXECUTOR.execute(() -> { - clear(); - AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); - if (apm == null) { - return; - } + WidgetPredictionsListener listener) { + clear(); + mPredictionsListener = listener; + mFilter = notOnUiSurfaceFilter(existingWidgets); + + AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); + if (apm == null) { + return; + } - mAppPredictor = apm.createAppPredictionSession( - new AppPredictionContext.Builder(mContext) - .setUiSurface(mUiSurface) - .setExtras(bundle) - .setPredictedTargetCount(NUM_OF_RECOMMENDED_WIDGETS_PREDICATION) - .build()); - mAppPredictor.registerPredictionUpdates(MODEL_EXECUTOR, - targets -> bindPredictions(targets, filter, callback)); - mAppPredictor.requestPredictionUpdate(); - }); + Bundle bundle = buildBundleForPredictionSession(existingWidgets); + mAppPredictor = apm.createAppPredictionSession( + new AppPredictionContext.Builder(mContext) + .setUiSurface(mUiSurface) + .setExtras(bundle) + .setPredictedTargetCount(NUM_OF_RECOMMENDED_WIDGETS_PREDICATION) + .build()); + mAppPredictor.registerPredictionUpdates(MODEL_EXECUTOR, /*callback=*/ this); + mAppPredictor.requestPredictionUpdate(); } /** * Returns a bundle that can be passed in a prediction session * * @param addedWidgets widgets that are already added by the user in the ui surface - * @param uiSurface a unique identifier of the surface hosting widgets; format - * "widgets_xx"; note - "widgets" is reserved for home screen surface. */ @VisibleForTesting - static Bundle buildBundleForPredictionSession(List addedWidgets, - String uiSurface) { + static Bundle buildBundleForPredictionSession(List addedWidgets) { Bundle bundle = new Bundle(); ArrayList addedAppTargetEvents = new ArrayList<>(); for (AppWidgetProviderInfo info : addedWidgets) { ComponentName componentName = info.provider; - AppTargetEvent appTargetEvent = buildAppTargetEvent(uiSurface, info, componentName); + AppTargetEvent appTargetEvent = buildAppTargetEvent(info, componentName); addedAppTargetEvents.add(appTargetEvent); } bundle.putParcelableArrayList(BUNDLE_KEY_ADDED_APP_WIDGETS, addedAppTargetEvents); @@ -134,13 +150,13 @@ static Bundle buildBundleForPredictionSession(List addedW * predictor. * Also see {@link PredictionHelper} */ - private static AppTargetEvent buildAppTargetEvent(String uiSurface, AppWidgetProviderInfo info, + private static AppTargetEvent buildAppTargetEvent(AppWidgetProviderInfo info, ComponentName componentName) { AppTargetId appTargetId = new AppTargetId("widget:" + componentName.getPackageName()); AppTarget appTarget = new AppTarget.Builder(appTargetId, componentName.getPackageName(), /*user=*/ info.getProfile()).setClassName(componentName.getClassName()).build(); - return new AppTargetEvent.Builder(appTarget, AppTargetEvent.ACTION_PIN) - .setLaunchLocation(uiSurface).build(); + return new AppTargetEvent.Builder(appTarget, AppTargetEvent.ACTION_PIN).setLaunchLocation( + LAUNCH_LOCATION).build(); } /** @@ -156,49 +172,26 @@ static Predicate notOnUiSurfaceFilter( return widgetItem -> !existingComponentKeys.contains(widgetItem); } - /** Provides the predictions returned by the predictor to the registered callback. */ - @WorkerThread - private void bindPredictions(List targets, Predicate filter, - Consumer> callback) { - List filteredPredictions = filterPredictions(targets, mAllWidgets, filter); - List mappedPredictions = mapWidgetItemsToItemInfo(filteredPredictions); - - MAIN_EXECUTOR.execute(() -> callback.accept(mappedPredictions)); - } - /** * Applies the provided filter (e.g. widgets not on workspace) on the predictions returned by * the predictor. */ @VisibleForTesting static List filterPredictions(List predictions, - Map> allWidgets, Predicate filter) { + @NonNull Map allWidgets, + @Nullable Predicate filter) { List servicePredictedItems = new ArrayList<>(); - List localFilteredWidgets = new ArrayList<>(); for (AppTarget prediction : predictions) { - List widgetsInPackage = allWidgets.get( - new PackageUserKey(prediction.getPackageName(), prediction.getUser())); - if (widgetsInPackage == null || widgetsInPackage.isEmpty()) { - continue; - } String className = prediction.getClassName(); if (!TextUtils.isEmpty(className)) { - WidgetItem item = widgetsInPackage.stream() - .filter(w -> className.equals(w.componentName.getClassName())) - .filter(filter) - .findFirst().orElse(null); - if (item != null) { - servicePredictedItems.add(item); - continue; + WidgetItem widgetItem = allWidgets.get( + new ComponentKey(new ComponentName(prediction.getPackageName(), className), + prediction.getUser())); + if (widgetItem != null && (filter == null || filter.test(widgetItem))) { + servicePredictedItems.add(widgetItem); } } - // No widget was added by the service, try local filtering - widgetsInPackage.stream().filter(filter).findFirst() - .ifPresent(localFilteredWidgets::add); - } - if (servicePredictedItems.isEmpty()) { - servicePredictedItems.addAll(localFilteredWidgets); } return servicePredictedItems; @@ -208,26 +201,34 @@ static List filterPredictions(List predictions, * Converts the list of {@link WidgetItem}s to the list of {@link ItemInfo}s. */ private List mapWidgetItemsToItemInfo(List widgetItems) { - List items; - if (enableCategorizedWidgetSuggestions()) { - WidgetRecommendationCategoryProvider categoryProvider = - WidgetRecommendationCategoryProvider.newInstance(mContext); - items = widgetItems.stream() - .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, - categoryProvider.getWidgetRecommendationCategory(mContext, it))) - .collect(Collectors.toList()); - } else { - items = widgetItems.stream().map(it -> new PendingAddWidgetInfo(it.widgetInfo, - CONTAINER_WIDGETS_PREDICTION)).collect(Collectors.toList()); - } - return items; + WidgetRecommendationCategoryProvider categoryProvider = + new WidgetRecommendationCategoryProvider(); + return widgetItems.stream() + .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, + categoryProvider.getWidgetRecommendationCategory(mContext, it))) + .collect(Collectors.toList()); } /** Cleans up any open prediction sessions. */ public void clear() { if (mAppPredictor != null) { + mAppPredictor.unregisterPredictionUpdates(this); mAppPredictor.destroy(); mAppPredictor = null; } + mPredictionsListener = null; + mPredictionsAvailable = false; + mFilter = null; + } + + /** + * Listener class to listen to updates from the {@link WidgetPredictionsRequester} + */ + public interface WidgetPredictionsListener { + /** + * Callback method that is called when the predicted widgets are available. + * @param predictions list of predicted widgets {@link PendingAddWidgetInfo} + */ + void onPredictionsAvailable(List predictions); } } diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java index 64bb05e1ab7..e234a1cb60e 100644 --- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java +++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java @@ -15,8 +15,12 @@ */ package com.android.launcher3.model; -import static com.android.launcher3.Flags.enableCategorizedWidgetSuggestions; +import static com.android.launcher3.Flags.enableTieredWidgetsByDefaultInPicker; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; +import static com.android.launcher3.model.ModelUtils.WIDGET_FILTER; + +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.toMap; import android.app.prediction.AppTarget; import android.content.ComponentName; @@ -26,18 +30,19 @@ import androidx.annotation.NonNull; import com.android.launcher3.LauncherModel.ModelUpdateTask; -import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.QuickstepModelDelegate.PredictorState; +import com.android.launcher3.R; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.PredictedContainerInfo; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.picker.WidgetRecommendationCategoryProvider; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Random; import java.util.Set; -import java.util.function.Predicate; import java.util.stream.Collectors; /** Task to update model as a result of predicted widgets update */ @@ -60,50 +65,79 @@ public final class WidgetsPredictionUpdateTask implements ModelUpdateTask { @Override public void execute(@NonNull ModelTaskController taskController, @NonNull BgDataModel dataModel, @NonNull AllAppsList apps) { - Set widgetsInWorkspace = dataModel.appWidgets.stream().map( - widget -> new ComponentKey(widget.providerName, widget.user)).collect( - Collectors.toSet()); - Predicate notOnWorkspace = w -> !widgetsInWorkspace.contains(w); - Map allWidgets = - dataModel.widgetsModel.getAllWidgetComponentsWithoutShortcuts(); + Set widgetsInWorkspace = dataModel.itemsIdMap + .stream() + .filter(WIDGET_FILTER) + .map(item -> new ComponentKey(item.getTargetComponent(), item.user)) + .collect(Collectors.toSet()); + + // Widgets (excluding shortcuts & already added widgets) that belong to apps eligible for + // being in predictions. + Map allEligibleWidgets = + dataModel.widgetsModel.getWidgetsByComponentKeyForPicker() + .entrySet() + .stream() + .filter(entry -> entry.getValue().widgetInfo != null + && !widgetsInWorkspace.contains(entry.getValue()) + ).collect(toMap(Map.Entry::getKey, Map.Entry::getValue)); + + Context context = taskController.getContext(); List servicePredictedItems = new ArrayList<>(); + List addedWidgetApps = new ArrayList<>(); for (AppTarget app : mTargets) { ComponentKey componentKey = new ComponentKey( new ComponentName(app.getPackageName(), app.getClassName()), app.getUser()); - WidgetItem widget = allWidgets.get(componentKey); - if (widget == null) { + WidgetItem widget = allEligibleWidgets.get(componentKey); + if (widget == null) { // widget not eligible. continue; } String className = app.getClassName(); if (!TextUtils.isEmpty(className)) { - if (notOnWorkspace.test(widget)) { - servicePredictedItems.add(widget); - } + servicePredictedItems.add(widget); + addedWidgetApps.add(componentKey.componentName.getPackageName()); } } - List items; - if (enableCategorizedWidgetSuggestions()) { - Context context = taskController.getApp().getContext(); - WidgetRecommendationCategoryProvider categoryProvider = - WidgetRecommendationCategoryProvider.newInstance(context); - items = servicePredictedItems.stream() - .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, - categoryProvider.getWidgetRecommendationCategory(context, it))) - .collect(Collectors.toList()); - } else { - items = servicePredictedItems.stream() - .map(it -> new PendingAddWidgetInfo(it.widgetInfo, - CONTAINER_WIDGETS_PREDICTION)).collect( - Collectors.toList()); + int minPredictionCount = context.getResources().getInteger( + R.integer.widget_predictions_min_count); + if (enableTieredWidgetsByDefaultInPicker() + && servicePredictedItems.size() < minPredictionCount) { + // Eligible apps that aren't already part of predictions. + Map> eligibleWidgetsByApp = + allEligibleWidgets.values().stream() + .filter(w -> !addedWidgetApps.contains( + w.componentName.getPackageName())) + .collect(groupingBy(w -> w.componentName.getPackageName())); + + // Randomize available apps list + List appPackages = new ArrayList<>(eligibleWidgetsByApp.keySet()); + Collections.shuffle(appPackages); + + int widgetsToAdd = minPredictionCount - servicePredictedItems.size(); + for (String appPackage : appPackages) { + if (widgetsToAdd <= 0) break; + + List widgetsForApp = eligibleWidgetsByApp.get(appPackage); + int index = new Random().nextInt(widgetsForApp.size()); + // Add a random widget from the app. + servicePredictedItems.add(widgetsForApp.get(index)); + widgetsToAdd--; + } } - FixedContainerItems fixedContainerItems = - new FixedContainerItems(mPredictorState.containerId, items); - dataModel.extraItems.put(mPredictorState.containerId, fixedContainerItems); - taskController.bindExtraContainerItems(fixedContainerItems); + WidgetRecommendationCategoryProvider categoryProvider = + new WidgetRecommendationCategoryProvider(); + List items = servicePredictedItems.stream() + .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, + categoryProvider.getWidgetRecommendationCategory(context, it))) + .collect(Collectors.toList()); + PredictedContainerInfo pci = + new PredictedContainerInfo(mPredictorState.containerId, items); + + dataModel.updateAndDispatchItem(pci /* item */, null /* owner */); + taskController.bindUpdatedWorkspaceItems(Collections.singleton(pci)); // Don't store widgets prediction to disk because it is not used frequently. } diff --git a/quickstep/src/com/android/launcher3/model/data/TaskViewItemInfo.kt b/quickstep/src/com/android/launcher3/model/data/TaskViewItemInfo.kt new file mode 100644 index 00000000000..c201ab12b63 --- /dev/null +++ b/quickstep/src/com/android/launcher3/model/data/TaskViewItemInfo.kt @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.model.data + +import android.content.Context +import android.content.Intent +import android.os.Process +import androidx.annotation.VisibleForTesting +import androidx.annotation.VisibleForTesting.Companion.PRIVATE +import com.android.launcher3.Flags.privateSpaceRestrictAccessibilityDrag +import com.android.launcher3.LauncherSettings +import com.android.launcher3.logger.LauncherAtom +import com.android.launcher3.pm.UserCache +import com.android.quickstep.TaskUtils +import com.android.quickstep.views.TaskContainer +import com.android.quickstep.views.TaskView + +class TaskViewItemInfo(taskView: TaskView, taskContainer: TaskContainer?) : WorkspaceItemInfo() { + @VisibleForTesting(otherwise = PRIVATE) val taskViewAtom: LauncherAtom.TaskView + + init { + itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK + container = LauncherSettings.Favorites.CONTAINER_TASKSWITCHER + val componentName: String + if (taskContainer != null) { + val componentKey = TaskUtils.getLaunchComponentKeyForTask(taskContainer.task.key) + user = componentKey.user + intent = Intent().setComponent(componentKey.componentName) + title = taskContainer.task.title + if (privateSpaceRestrictAccessibilityDrag()) { + if ( + UserCache.getInstance(taskView.context).getUserInfo(componentKey.user).isPrivate + ) { + runtimeStatusFlags = runtimeStatusFlags or ItemInfoWithIcon.FLAG_NOT_PINNABLE + } + } + componentName = componentKey.componentName.flattenToShortString() + } else { + user = Process.myUserHandle() + intent = Intent() + componentName = "" + } + + taskViewAtom = + createTaskViewAtom( + type = taskView.type.ordinal, + index = taskView.recentsView?.indexOfChild(taskView) ?: -1, + componentName, + cardinality = taskView.taskContainers.size, + ) + } + + override fun buildProto(cInfo: CollectionInfo?, context: Context): LauncherAtom.ItemInfo = + super.buildProto(cInfo, context).toBuilder().setTaskView(taskViewAtom).build() + + companion object { + @VisibleForTesting(otherwise = PRIVATE) + fun createTaskViewAtom( + type: Int, + index: Int, + componentName: String, + cardinality: Int, + ): LauncherAtom.TaskView = + LauncherAtom.TaskView.newBuilder() + .apply { + this.type = type + this.index = index + this.componentName = componentName + this.cardinality = cardinality + } + .build() + } +} diff --git a/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java b/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java index 212a5ff0507..4293ccddc60 100644 --- a/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java +++ b/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java @@ -61,6 +61,7 @@ protected void onCreate(Bundle savedInstanceState) { } } catch (NullPointerException | ActivityNotFoundException | SecurityException | SendIntentException e) { + Log.w(TAG, "Proxy activity starter could not start activity: ", e); mParams.deliverResult(this, RESULT_CANCELED, null); } finishAndRemoveTask(); diff --git a/quickstep/src/com/android/launcher3/secondarydisplay/SecondaryDisplayPredictionsImpl.java b/quickstep/src/com/android/launcher3/secondarydisplay/SecondaryDisplayPredictionsImpl.java deleted file mode 100644 index 8b71f013964..00000000000 --- a/quickstep/src/com/android/launcher3/secondarydisplay/SecondaryDisplayPredictionsImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.secondarydisplay; - -import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT; - -import android.content.Context; - -import com.android.launcher3.appprediction.AppsDividerView; -import com.android.launcher3.appprediction.PredictionRowView; -import com.android.launcher3.model.BgDataModel; -import com.android.launcher3.views.ActivityContext; - -/** - * Implementation of SecondaryDisplayPredictions. - */ -@SuppressWarnings("unused") -public final class SecondaryDisplayPredictionsImpl extends SecondaryDisplayPredictions { - - private final ActivityContext mActivityContext; - private final Context mContext; - - public SecondaryDisplayPredictionsImpl(Context context) { - mContext = context; - mActivityContext = ActivityContext.lookupContext(context); - } - - @Override - void updateAppDivider() { - mActivityContext.getAppsView().getFloatingHeaderView() - .findFixedRowByType(AppsDividerView.class) - .setShowAllAppsLabel(!ALL_APPS_VISITED_COUNT.hasReachedMax(mContext)); - ALL_APPS_VISITED_COUNT.increment(mContext); - } - - @Override - public void setPredictedApps(BgDataModel.FixedContainerItems item) { - mActivityContext.getAppsView().getFloatingHeaderView() - .findFixedRowByType(PredictionRowView.class) - .setPredictedApps(item.items); - } -} diff --git a/quickstep/src/com/android/launcher3/secondarydisplay/SecondaryDisplayQuickstepDelegateImpl.java b/quickstep/src/com/android/launcher3/secondarydisplay/SecondaryDisplayQuickstepDelegateImpl.java new file mode 100644 index 00000000000..9cb848af74b --- /dev/null +++ b/quickstep/src/com/android/launcher3/secondarydisplay/SecondaryDisplayQuickstepDelegateImpl.java @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.secondarydisplay; + +import static androidx.lifecycle.Lifecycle.State.RESUMED; + +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAutoStashConnectedDisplayTaskbar; +import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT; +import static com.android.window.flags.Flags.useInputReportedFocusForAccessibility; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.app.Activity; +import android.content.Context; +import android.util.Log; +import android.view.Display; +import android.view.KeyEvent; +import android.window.BackEvent; +import android.window.DesktopExperienceFlags; +import android.window.OnBackAnimationCallback; +import android.window.OnBackInvokedDispatcher; + +import com.android.launcher3.appprediction.AppsDividerView; +import com.android.launcher3.appprediction.PredictionRowView; +import com.android.launcher3.dagger.ActivityContextSingleton; +import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.taskbar.TaskbarActivityContext; +import com.android.launcher3.taskbar.TaskbarManager; +import com.android.launcher3.views.ActivityContext; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.OverviewComponentObserver; +import com.android.quickstep.TouchInteractionService.TISBinder; +import com.android.quickstep.util.TISBindHelper; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.window.RecentsWindowManager; + +import javax.inject.Inject; + +/** + * Implementation of {@link SecondaryDisplayDelegate}. + */ +@ActivityContextSingleton +public final class SecondaryDisplayQuickstepDelegateImpl extends SecondaryDisplayDelegate { + + private static final String TAG = "SecondaryDisplayQuickstepDelegateImpl"; + + private final ActivityContext mActivityContext; + private final Context mContext; + private final TISBindHelper mTISBindHelper; + private final OverviewComponentObserver mOverviewComponentObserver; + private final OnBackAnimationCallback mOnBackInvokedCallback = new OnBackAnimationCallback() { + @Override + public void onBackInvoked() { + Log.d(TAG, "onBackInvoked, displayId=" + mContext.getDisplayId()); + RecentsWindowManager recentsWindowManager = getVisibleRecentsWindowManager(); + if (recentsWindowManager != null) { + recentsWindowManager.getOnBackInvokedCallback().onBackInvoked(); + } + } + + @Override + public void onBackStarted(@NonNull BackEvent event) { + Log.d(TAG, "onBackStarted, displayId=" + mContext.getDisplayId()); + RecentsWindowManager recentsWindowManager = getVisibleRecentsWindowManager(); + if (recentsWindowManager != null) { + if (recentsWindowManager.getOnBackInvokedCallback() + instanceof OnBackAnimationCallback onBackAnimationCallback) { + onBackAnimationCallback.onBackStarted(event); + } + } + } + + @Override + public void onBackProgressed(@NonNull BackEvent event) { + Log.d(TAG, "onBackProgressed, displayId=" + mContext.getDisplayId()); + RecentsWindowManager recentsWindowManager = getVisibleRecentsWindowManager(); + if (recentsWindowManager != null) { + if (recentsWindowManager.getOnBackInvokedCallback() + instanceof OnBackAnimationCallback onBackAnimationCallback) { + onBackAnimationCallback.onBackProgressed(event); + } + } + } + @Override + public void onBackCancelled() { + Log.d(TAG, "onBackCancelled, displayId=" + mContext.getDisplayId()); + RecentsWindowManager recentsWindowManager = getVisibleRecentsWindowManager(); + if (recentsWindowManager != null) { + if (recentsWindowManager.getOnBackInvokedCallback() + instanceof OnBackAnimationCallback onBackAnimationCallback) { + onBackAnimationCallback.onBackCancelled(); + } + } + } + }; + + + @Inject + public SecondaryDisplayQuickstepDelegateImpl(ActivityContext activityContext, + OverviewComponentObserver overviewComponentObserver) { + mContext = activityContext.asContext(); + mActivityContext = activityContext; + mTISBindHelper = new TISBindHelper(mContext, this::onTISConnected); + mOverviewComponentObserver = overviewComponentObserver; + } + + void onDestroy() { + mTISBindHelper.onDestroy(); + if (mActivityContext instanceof Activity activity) { + activity.getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback( + mOnBackInvokedCallback); + } + } + + @Override + void updateAppDivider() { + mActivityContext.getAppsView().getFloatingHeaderView() + .findFixedRowByType(AppsDividerView.class) + .setShowAllAppsLabel(!ALL_APPS_VISITED_COUNT.hasReachedMax(mContext)); + ALL_APPS_VISITED_COUNT.increment(mContext); + } + + @Override + public void setPredictedApps(PredictedContainerInfo info) { + mActivityContext.getAppsView().getFloatingHeaderView() + .findFixedRowByType(PredictionRowView.class) + .setPredictedApps(info.getContents()); + } + + @Override + boolean enableTaskbarConnectedDisplays() { + return DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue(); + } + + @Override + void openAllAppsForDisplay(int displayId) { + TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); + if (taskbarManager == null) { + return; + } + TaskbarActivityContext currentDisplayTaskbarContext = + taskbarManager.getTaskbarForDisplay(displayId); + if (currentDisplayTaskbarContext != null) { + currentDisplayTaskbarContext.openTaskbarAllApps(); + } + } + + @Override + void updateStashControllerStateFlags(int displayId, boolean isVisible) { + if (displayId == Display.DEFAULT_DISPLAY + || !enableAutoStashConnectedDisplayTaskbar.isTrue()) { + return; + } + + TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); + if (taskbarManager == null) { + return; + } + TaskbarActivityContext tac = + taskbarManager.getTaskbarForDisplay(displayId); + if (tac == null) { + return; + } + tac.updateStashControllerLauncherStateFlag(isVisible); + } + + @Override + boolean dispatchKeyEvent(KeyEvent event) { + if (useInputReportedFocusForAccessibility()) { + return false; + } + RecentsWindowManager recentsWindowManager = getVisibleRecentsWindowManager(); + if (recentsWindowManager != null) { + return recentsWindowManager.dispatchKeyEvent(event); + } + return false; + } + + @Nullable + RecentsWindowManager getVisibleRecentsWindowManager() { + BaseContainerInterface baseContainerInterface = + mOverviewComponentObserver.getContainerInterface(mContext.getDisplayId()); + if (baseContainerInterface != null) { + RecentsViewContainer container = baseContainerInterface.getCreatedContainer(); + if (container instanceof RecentsWindowManager recentsWindowManager + && recentsWindowManager.isRecentsViewVisible()) { + return recentsWindowManager; + } + } + return null; + } + + @Override + void onCreate() { + if (mActivityContext instanceof Activity activity) { + activity.getOnBackInvokedDispatcher().registerOnBackInvokedCallback( + OnBackInvokedDispatcher.PRIORITY_DEFAULT, + mOnBackInvokedCallback); + } + } + + private void onTISConnected(TISBinder binder) { + boolean isVisible = mActivityContext.getLifecycle().getCurrentState().isAtLeast(RESUMED); + int displayId = mActivityContext.asContext().getDisplay().getDisplayId(); + updateStashControllerStateFlags(displayId, isVisible); + } +} diff --git a/quickstep/src/com/android/launcher3/splitscreen/SplitShortcut.kt b/quickstep/src/com/android/launcher3/splitscreen/SplitShortcut.kt index c94edceb43a..1feaa3d71be 100644 --- a/quickstep/src/com/android/launcher3/splitscreen/SplitShortcut.kt +++ b/quickstep/src/com/android/launcher3/splitscreen/SplitShortcut.kt @@ -18,8 +18,7 @@ package com.android.launcher3.splitscreen import android.content.Context import android.content.Intent -import android.graphics.Bitmap -import android.graphics.drawable.BitmapDrawable +import android.graphics.drawable.Drawable import android.util.Log import android.view.View import com.android.launcher3.model.data.ItemInfo @@ -41,7 +40,7 @@ abstract class SplitShortcut( target: T, itemInfo: ItemInfo?, originalView: View?, - protected val position: SplitPositionOption + protected val position: SplitPositionOption, ) : SystemShortcut(iconResId, labelResId, target, itemInfo, originalView) where T : Context?, T : ActivityContext? { @@ -51,17 +50,17 @@ T : ActivityContext? { protected val splitSelectSource: SplitSelectSource? get() { // Initiate splitscreen from the Home screen or Home All Apps - val bitmap: Bitmap val intent: Intent + val drawable: Drawable when (mItemInfo) { is WorkspaceItemInfo -> { val workspaceItemInfo = mItemInfo - bitmap = workspaceItemInfo.bitmap.icon + drawable = workspaceItemInfo.newIcon(mOriginalView.context) intent = workspaceItemInfo.intent } is com.android.launcher3.model.data.AppInfo -> { val appInfo = mItemInfo - bitmap = appInfo.bitmap.icon + drawable = appInfo.newIcon(mOriginalView.context) intent = appInfo.intent } else -> { @@ -73,11 +72,11 @@ T : ActivityContext? { SplitConfigurationOptions.getLogEventForPosition(position.stagePosition) return SplitSelectSource( mOriginalView, - BitmapDrawable(bitmap), + drawable, intent, position, mItemInfo, - splitEvent + splitEvent, ) } diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java index 2da9c3e89fb..da3c151e1db 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java +++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java @@ -19,6 +19,7 @@ import static com.android.app.animation.Interpolators.LINEAR; import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH; import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; import android.animation.Animator; @@ -29,44 +30,47 @@ import android.view.ViewRootImpl; import android.view.ViewTreeObserver; +import androidx.annotation.VisibleForTesting; + import com.android.launcher3.BaseActivity; -import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.Utilities; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.statemanager.StateManager.StateHandler; import com.android.launcher3.states.StateAnimationConfig; +import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.quickstep.util.BaseDepthController; -import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.io.PrintWriter; import java.util.function.Consumer; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.compat.LawnchairQuickstepCompat; import app.lawnchair.preferences2.PreferenceManager2; /** * Controls blur and wallpaper zoom, for the Launcher surface only. */ -public class DepthController extends BaseDepthController implements StateHandler, - BaseActivity.MultiWindowModeChangedListener { - - private final ViewTreeObserver.OnDrawListener mOnDrawListener = this::onLauncherDraw; +public class DepthController extends BaseDepthController implements StateHandler { + @VisibleForTesting + final ViewTreeObserver.OnDrawListener mOnDrawListener = this::onLauncherDraw; private final Consumer mCrossWindowBlurListener = this::setCrossWindowBlursEnabled; private final Runnable mOpaquenessListener = this::applyDepthAndBlur; - // Workaround for animating the depth when multiwindow mode changes. - private boolean mIgnoreStateChangesDuringMultiWindowAnimation = false; - private View.OnAttachStateChangeListener mOnAttachListener; + // Ensure {@link mOnDrawListener} is added only once to avoid spamming DragLayer's mRunQueue + // via {@link View#post(Runnable)} + private boolean mIsOnDrawListenerAdded = false; + private boolean mRemoveOnDrawListenerCancelled = false; + private final boolean mEnableDepth; - public DepthController(Launcher l) { - super(l); - var pref = PreferenceManager2.getInstance(l).getWallpaperDepthEffect(); + public DepthController(QuickstepLauncher launcher) { + super(launcher); + var pref = PreferenceManager2.getInstance(launcher).getWallpaperDepthEffect(); mEnableDepth = PreferenceExtensionsKt.firstBlocking(pref); } @@ -75,41 +79,51 @@ private void onLauncherDraw() { ViewRootImpl viewRootImpl = view.getViewRootImpl(); try { if (Utilities.ATLEAST_Q) { - setSurface(viewRootImpl != null ? viewRootImpl.getSurfaceControl() : null); + setBaseSurface(viewRootImpl != null ? viewRootImpl.getSurfaceControl() : null); } } catch (Throwable t) { - // Ignore any exceptions + // LC-Ignored } - view.post(() -> view.getViewTreeObserver().removeOnDrawListener(mOnDrawListener)); + mRemoveOnDrawListenerCancelled = false; + view.post(() -> { + if (!mRemoveOnDrawListenerCancelled) { + removeOnDrawListener(); + } + }); } private void ensureDependencies() { - if (mLauncher.getRootView() != null && mOnAttachListener == null) { - View rootView = mLauncher.getRootView(); - mOnAttachListener = new View.OnAttachStateChangeListener() { - @Override - public void onViewAttachedToWindow(View view) { - try { - CrossWindowBlurListeners.getInstance().addListener(mLauncher.getMainExecutor(), - mCrossWindowBlurListener); - } catch (Throwable t) { - // Ignore - } - mLauncher.getScrimView().addOpaquenessListener(mOpaquenessListener); - - // To handle the case where window token is invalid during last setDepth call. - applyDepthAndBlur(); + View rootView = mLauncher.getRootView(); + if (rootView == null) { + return; + } + if (mOnAttachListener != null) { + return; + } + mOnAttachListener = new View.OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View view) { + try { + UI_HELPER_EXECUTOR.execute(() -> + CrossWindowBlurListeners.getInstance().addListener( + mLauncher.getMainExecutor(), mCrossWindowBlurListener)); + } catch (Throwable t) { + // LC-Ignored } + mLauncher.getScrimView().addOpaquenessListener(mOpaquenessListener); - @Override - public void onViewDetachedFromWindow(View view) { - removeSecondaryListeners(); - } - }; - rootView.addOnAttachStateChangeListener(mOnAttachListener); - if (rootView.isAttachedToWindow()) { - mOnAttachListener.onViewAttachedToWindow(rootView); + // To handle the case where window token is invalid during last setDepth call. + applyDepthAndBlur(); + } + + @Override + public void onViewDetachedFromWindow(View view) { + removeSecondaryListeners(); } + }; + rootView.addOnAttachStateChangeListener(mOnAttachListener); + if (rootView.isAttachedToWindow()) { + mOnAttachListener.onViewAttachedToWindow(rootView); } } @@ -126,12 +140,12 @@ public void dispose() { } private void removeSecondaryListeners() { - if (mCrossWindowBlurListener != null) { - try { - CrossWindowBlurListeners.getInstance().removeListener(mCrossWindowBlurListener); - } catch (Throwable t) { - // Ignore - } + try { + UI_HELPER_EXECUTOR.execute(() -> + CrossWindowBlurListeners.getInstance() + .removeListener(mCrossWindowBlurListener)); + } catch (Throwable t) { + // LC-Ignored } if (mOpaquenessListener != null) { mLauncher.getScrimView().removeOpaquenessListener(mOpaquenessListener); @@ -143,30 +157,26 @@ private void removeSecondaryListeners() { */ public void setActivityStarted(boolean isStarted) { if (isStarted) { - mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener); + addOnDrawListener(); } else { - mLauncher.getDragLayer().getViewTreeObserver().removeOnDrawListener(mOnDrawListener); - setSurface(null); + removeOnDrawListener(); + setBaseSurface(null); + setEarlyWakeup(false); } } @Override public void setState(LauncherState toState) { - if (mIgnoreStateChangesDuringMultiWindowAnimation) { - return; - } - stateDepth.setValue(toState.getDepth(mLauncher)); if (toState == LauncherState.BACKGROUND_APP) { - mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener); + addOnDrawListener(); } } @Override public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config, - PendingAnimation animation) { - if (config.hasAnimationFlag(SKIP_DEPTH_CONTROLLER) - || mIgnoreStateChangesDuringMultiWindowAnimation) { + PendingAnimation animation) { + if (config.hasAnimationFlag(SKIP_DEPTH_CONTROLLER)) { return; } @@ -183,45 +193,45 @@ protected void applyDepthAndBlur() { super.applyDepthAndBlur(); } } catch (Throwable t) { - // Ignore + // LC-Ignored } } @Override protected void onInvalidSurface() { // Lets wait for surface to become valid again - mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener); + addOnDrawListener(); } - @Override - public void onMultiWindowModeChanged(boolean isInMultiWindowMode) { - mIgnoreStateChangesDuringMultiWindowAnimation = true; + private void addOnDrawListener() { + mRemoveOnDrawListenerCancelled = true; + if (mIsOnDrawListenerAdded) { + return; + } + mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener); + mIsOnDrawListenerAdded = true; + } - ObjectAnimator mwAnimation = ObjectAnimator.ofFloat(stateDepth, MULTI_PROPERTY_VALUE, - mLauncher.getStateManager().getState().getDepth(mLauncher, isInMultiWindowMode)) - .setDuration(300); - mwAnimation.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mIgnoreStateChangesDuringMultiWindowAnimation = false; - } - }); - mwAnimation.setAutoCancel(true); - mwAnimation.start(); + private void removeOnDrawListener() { + mRemoveOnDrawListenerCancelled = true; + if (!mIsOnDrawListenerAdded) { + return; + } + mLauncher.getDragLayer().getViewTreeObserver().removeOnDrawListener(mOnDrawListener); + mIsOnDrawListenerAdded = false; } public void dump(String prefix, PrintWriter writer) { writer.println(prefix + "DepthController"); writer.println(prefix + "\tmMaxBlurRadius=" + mMaxBlurRadius); writer.println(prefix + "\tmCrossWindowBlursEnabled=" + mCrossWindowBlursEnabled); - writer.println(prefix + "\tmSurface=" + mSurface); + writer.println(prefix + "\tmBaseSurface=" + mBaseSurface); + writer.println(prefix + "\tmBaseSurfaceOverride=" + mBaseSurfaceOverride); writer.println(prefix + "\tmStateDepth=" + stateDepth.getValue()); writer.println(prefix + "\tmWidgetDepth=" + widgetDepth.getValue()); writer.println(prefix + "\tmCurrentBlur=" + mCurrentBlur); writer.println(prefix + "\tmInEarlyWakeUp=" + mInEarlyWakeUp); - writer.println(prefix + "\tmIgnoreStateChangesDuringMultiWindowAnimation=" - + mIgnoreStateChangesDuringMultiWindowAnimation); writer.println(prefix + "\tmPauseBlurs=" + mPauseBlurs); writer.println(prefix + "\tmWaitingOnSurfaceValidity=" + mWaitingOnSurfaceValidity); } -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java deleted file mode 100644 index 4a8672fb6df..00000000000 --- a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java +++ /dev/null @@ -1,358 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.statehandlers; - -import static android.view.View.VISIBLE; - -import static com.android.launcher3.LauncherState.BACKGROUND_APP; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.window.flags2.Flags.enableDesktopWindowingWallpaperActivity; - -import android.os.Debug; -import android.util.Log; -import android.view.View; - -import androidx.annotation.Nullable; - -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherState; -import com.android.launcher3.statemanager.StatefulActivity; -import com.android.launcher3.uioverrides.QuickstepLauncher; -import com.android.launcher3.util.DisplayController; -import com.android.quickstep.GestureState; -import com.android.quickstep.SystemUiProxy; -import com.android.wm.shell.desktopmode.IDesktopTaskListener; - -import java.util.HashSet; -import java.util.Set; - -/** - * Controls the visibility of the workspace and the resumed / paused state when desktop mode - * is enabled. - */ -public class DesktopVisibilityController { - - private static final String TAG = "DesktopVisController"; - private static final boolean DEBUG = false; - private final Launcher mLauncher; - private final Set mDesktopVisibilityListeners = new HashSet<>(); - - private int mVisibleDesktopTasksCount; - private boolean mInOverviewState; - private boolean mBackgroundStateEnabled; - private boolean mGestureInProgress; - - @Nullable - private IDesktopTaskListener mDesktopTaskListener; - - public DesktopVisibilityController(Launcher launcher) { - mLauncher = launcher; - } - - /** - * Register a listener with System UI to receive updates about desktop tasks state - */ - public void registerSystemUiListener() { - mDesktopTaskListener = new IDesktopTaskListener.Stub() { - @Override - public void onTasksVisibilityChanged(int displayId, int visibleTasksCount) { - MAIN_EXECUTOR.execute(() -> { - if (displayId == mLauncher.getDisplayId()) { - if (DEBUG) { - Log.d(TAG, "desktop visible tasks count changed=" + visibleTasksCount); - } - setVisibleDesktopTasksCount(visibleTasksCount); - } - }); - } - - @Override - public void onStashedChanged(int displayId, boolean stashed) { - Log.w(TAG, "IDesktopTaskListener: onStashedChanged is deprecated"); - } - }; - SystemUiProxy.INSTANCE.get(mLauncher).setDesktopTaskListener(mDesktopTaskListener); - } - - /** - * Clear listener from System UI that was set with {@link #registerSystemUiListener()} - */ - public void unregisterSystemUiListener() { - SystemUiProxy.INSTANCE.get(mLauncher).setDesktopTaskListener(null); - mDesktopTaskListener = null; - } - - /** - * Whether desktop tasks are visible in desktop mode. - */ - public boolean areDesktopTasksVisible() { - boolean desktopTasksVisible = mVisibleDesktopTasksCount > 0; - if (DEBUG) { - Log.d(TAG, "areDesktopTasksVisible: desktopVisible=" + desktopTasksVisible - + " overview=" + mInOverviewState); - } - return desktopTasksVisible && !mInOverviewState; - } - - /** - * Number of visible desktop windows in desktop mode. - */ - public int getVisibleDesktopTasksCount() { - return mVisibleDesktopTasksCount; - } - - /** Registers a listener for Desktop Mode visibility updates. */ - public void registerDesktopVisibilityListener(DesktopVisibilityListener listener) { - mDesktopVisibilityListeners.add(listener); - } - - /** Removes a previously registered Desktop Mode visibility listener. */ - public void unregisterDesktopVisibilityListener(DesktopVisibilityListener listener) { - mDesktopVisibilityListeners.remove(listener); - } - - /** - * Sets the number of desktop windows that are visible and updates launcher visibility based on - * it. - */ - public void setVisibleDesktopTasksCount(int visibleTasksCount) { - if (DEBUG) { - Log.d(TAG, "setVisibleDesktopTasksCount: visibleTasksCount=" + visibleTasksCount - + " currentValue=" + mVisibleDesktopTasksCount); - } - - if (visibleTasksCount != mVisibleDesktopTasksCount) { - final boolean wasVisible = mVisibleDesktopTasksCount > 0; - final boolean isVisible = visibleTasksCount > 0; - final boolean wereDesktopTasksVisibleBefore = areDesktopTasksVisible(); - mVisibleDesktopTasksCount = visibleTasksCount; - final boolean areDesktopTasksVisibleNow = areDesktopTasksVisible(); - if (wereDesktopTasksVisibleBefore != areDesktopTasksVisibleNow) { - notifyDesktopVisibilityListeners(areDesktopTasksVisibleNow); - } - - if (!enableDesktopWindowingWallpaperActivity() && wasVisible != isVisible) { - // TODO: b/333533253 - Remove after flag rollout - if (mVisibleDesktopTasksCount > 0) { - setLauncherViewsVisibility(View.INVISIBLE); - if (!mInOverviewState) { - // When desktop tasks are visible & we're not in overview, we want launcher - // to appear paused, this ensures that taskbar displays. - markLauncherPaused(); - } - } else { - setLauncherViewsVisibility(View.VISIBLE); - // If desktop tasks aren't visible, ensure that launcher appears resumed to - // behave normally. - markLauncherResumed(); - } - } - } - } - - /** - * Process launcher state change and update launcher view visibility based on desktop state - */ - public void onLauncherStateChanged(LauncherState state) { - if (DEBUG) { - Log.d(TAG, "onLauncherStateChanged: newState=" + state); - } - setBackgroundStateEnabled(state == BACKGROUND_APP); - // Desktop visibility tracks overview and background state separately - setOverviewStateEnabled(state != BACKGROUND_APP && state.isRecentsViewVisible); - } - - private void setOverviewStateEnabled(boolean overviewStateEnabled) { - if (DEBUG) { - Log.d(TAG, "setOverviewStateEnabled: enabled=" + overviewStateEnabled - + " currentValue=" + mInOverviewState); - } - if (overviewStateEnabled != mInOverviewState) { - final boolean wereDesktopTasksVisibleBefore = areDesktopTasksVisible(); - mInOverviewState = overviewStateEnabled; - final boolean areDesktopTasksVisibleNow = areDesktopTasksVisible(); - if (wereDesktopTasksVisibleBefore != areDesktopTasksVisibleNow) { - notifyDesktopVisibilityListeners(areDesktopTasksVisibleNow); - } - - if (enableDesktopWindowingWallpaperActivity()) { - return; - } - // TODO: b/333533253 - Clean up after flag rollout - - if (mInOverviewState) { - setLauncherViewsVisibility(View.VISIBLE); - markLauncherResumed(); - } else if (areDesktopTasksVisibleNow && !mGestureInProgress) { - // Switching out of overview state and gesture finished. - // If desktop tasks are still visible, hide launcher again. - setLauncherViewsVisibility(View.INVISIBLE); - markLauncherPaused(); - } - } - } - - private void notifyDesktopVisibilityListeners(boolean areDesktopTasksVisible) { - if (DEBUG) { - Log.d(TAG, "notifyDesktopVisibilityListeners: visible=" + areDesktopTasksVisible); - } - for (DesktopVisibilityListener listener : mDesktopVisibilityListeners) { - listener.onDesktopVisibilityChanged(areDesktopTasksVisible); - } - DisplayController.handleInfoChangeForDesktopMode(mLauncher); - } - - /** - * TODO: b/333533253 - Remove after flag rollout - */ - private void setBackgroundStateEnabled(boolean backgroundStateEnabled) { - if (DEBUG) { - Log.d(TAG, "setBackgroundStateEnabled: enabled=" + backgroundStateEnabled - + " currentValue=" + mBackgroundStateEnabled); - } - if (backgroundStateEnabled != mBackgroundStateEnabled) { - mBackgroundStateEnabled = backgroundStateEnabled; - if (mBackgroundStateEnabled) { - setLauncherViewsVisibility(View.VISIBLE); - markLauncherResumed(); - } else if (areDesktopTasksVisible() && !mGestureInProgress) { - // Switching out of background state. If desktop tasks are visible, pause launcher. - setLauncherViewsVisibility(View.INVISIBLE); - markLauncherPaused(); - } - } - } - - /** - * Whether recents gesture is currently in progress. - * - * TODO: b/333533253 - Remove after flag rollout - */ - public boolean isRecentsGestureInProgress() { - return mGestureInProgress; - } - - /** - * Notify controller that recents gesture has started. - * - * TODO: b/333533253 - Remove after flag rollout - */ - public void setRecentsGestureStart() { - if (DEBUG) { - Log.d(TAG, "setRecentsGestureStart"); - } - setRecentsGestureInProgress(true); - } - - /** - * Notify controller that recents gesture finished with the given - * {@link com.android.quickstep.GestureState.GestureEndTarget} - * - * TODO: b/333533253 - Remove after flag rollout - */ - public void setRecentsGestureEnd(@Nullable GestureState.GestureEndTarget endTarget) { - if (DEBUG) { - Log.d(TAG, "setRecentsGestureEnd: endTarget=" + endTarget); - } - setRecentsGestureInProgress(false); - - if (endTarget == null) { - // Gesture did not result in a new end target. Ensure launchers gets paused again. - markLauncherPaused(); - } - } - - /** - * TODO: b/333533253 - Remove after flag rollout - */ - private void setRecentsGestureInProgress(boolean gestureInProgress) { - if (gestureInProgress != mGestureInProgress) { - mGestureInProgress = gestureInProgress; - } - } - - /** - * TODO: b/333533253 - Remove after flag rollout - */ - private void setLauncherViewsVisibility(int visibility) { - if (enableDesktopWindowingWallpaperActivity()) { - return; - } - if (DEBUG) { - Log.d(TAG, "setLauncherViewsVisibility: visibility=" + visibility + " " - + Debug.getCaller()); - } - View workspaceView = mLauncher.getWorkspace(); - if (workspaceView != null) { - workspaceView.setVisibility(visibility); - } - View dragLayer = mLauncher.getDragLayer(); - if (dragLayer != null) { - dragLayer.setVisibility(visibility); - } - if (mLauncher instanceof QuickstepLauncher ql && ql.getTaskbarUIController() != null - && mVisibleDesktopTasksCount != 0) { - ql.getTaskbarUIController().onLauncherVisibilityChanged(visibility == VISIBLE); - } - } - - /** - * TODO: b/333533253 - Remove after flag rollout - */ - private void markLauncherPaused() { - if (enableDesktopWindowingWallpaperActivity()) { - return; - } - if (DEBUG) { - Log.d(TAG, "markLauncherPaused " + Debug.getCaller()); - } - StatefulActivity activity = - QuickstepLauncher.ACTIVITY_TRACKER.getCreatedActivity(); - if (activity != null) { - activity.setPaused(); - } - } - - /** - * TODO: b/333533253 - Remove after flag rollout - */ - private void markLauncherResumed() { - if (enableDesktopWindowingWallpaperActivity()) { - return; - } - if (DEBUG) { - Log.d(TAG, "markLauncherResumed " + Debug.getCaller()); - } - StatefulActivity activity = - QuickstepLauncher.ACTIVITY_TRACKER.getCreatedActivity(); - // Check activity state before calling setResumed(). Launcher may have been actually - // paused (eg fullscreen task moved to front). - // In this case we should not mark the activity as resumed. - if (activity != null && activity.isResumed()) { - activity.setResumed(); - } - } - - /** A listener for when the user enters/exits Desktop Mode. */ - public interface DesktopVisibilityListener { - /** - * Callback for when the user enters or exits Desktop Mode - * - * @param visible whether Desktop Mode is now visible - */ - void onDesktopVisibilityChanged(boolean visible); - } -} diff --git a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.kt b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.kt new file mode 100644 index 00000000000..15cf8b4221f --- /dev/null +++ b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.kt @@ -0,0 +1,619 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.statehandlers + +import android.content.Context +import android.util.Log +import android.util.SparseArray +import android.util.SparseBooleanArray +import android.view.Display.DEFAULT_DISPLAY +import androidx.core.util.set +import com.android.internal.util.LatencyTracker +import com.android.launcher3.LauncherState +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.statemanager.BaseState +import com.android.launcher3.util.DaggerSingletonObject +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.window.WindowManagerProxy.DesktopVisibilityListener +import com.android.quickstep.SystemUiProxy +import com.android.quickstep.fallback.RecentsState +import com.android.wm.shell.desktopmode.DisplayDeskState +import com.android.wm.shell.desktopmode.IDesktopTaskListener.Stub +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus.enableMultipleDesktops +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus.useRoundedCorners +import java.io.PrintWriter +import java.lang.ref.WeakReference +import javax.inject.Inject + +/** + * Controls the visibility of the workspace and the resumed / paused state when desktop mode is + * enabled. + */ +@LauncherAppSingleton +class DesktopVisibilityController +@Inject +constructor( + @ApplicationContext private val context: Context, + systemUiProxy: SystemUiProxy, + lifecycleTracker: DaggerSingletonTracker, +) { + /** + * Tracks the desks configurations on each display. + * + * (Used only when multiple desks are enabled). + * + * @property displayId The ID of the display this object represents. + * @property activeDeskId The ID of the active desk on the associated display (if any). It has a + * value of `INACTIVE_DESK_ID` (-1) if there are no active desks. Note that there can only be + * at most one active desk on each display. + * @property deskIds a set containing the IDs of the desks on the associated display. + */ + private data class DisplayDeskConfig( + val displayId: Int, + var activeDeskId: Int = INACTIVE_DESK_ID, + val deskIds: MutableSet, + ) + + /** True if it is possible to create new desks on current setup. */ + var canCreateDesks: Boolean = false + private set(value) { + if (field == value) return + field = value + desktopVisibilityListeners.forEach { it.onCanCreateDesksChanged(field) } + } + + /** Maps each display by its ID to its desks configuration. */ + private val displaysDesksConfigsMap = SparseArray() + + private val desktopVisibilityListeners: MutableSet = HashSet() + private val taskbarDesktopModeListeners: MutableSet = HashSet() + + // This simply indicates that user is currently in desktop mode or not. + @Deprecated("Does not work with multi-desks") private var isInDesktopModeDeprecated = false + + // to let launcher hold off on notifying desktop visibility listeners. + var launcherAnimationRunning = false + + // TODO: b/394387739 - Deprecate this and replace it with something that tracks the count per + // desk. + /** + * Number of visible desktop windows in desktop mode. This can be > 0 when user goes to overview + * from desktop window mode. + */ + @Deprecated("Does not work with multi-desks") + var visibleDesktopTasksCountDeprecated: Int = 0 + /** + * Sets the number of desktop windows that are visible and updates launcher visibility based + * on it. + */ + set(visibleTasksCount) { + if (enableMultipleDesktops(context)) { + return + } + if (DEBUG) { + Log.d( + TAG, + ("setVisibleDesktopTasksCount: visibleTasksCount=" + + visibleTasksCount + + " currentValue=" + + field), + ) + } + + if (visibleTasksCount != field) { + if (visibleDesktopTasksCountDeprecated == 0 && visibleTasksCount == 1) { + isInDesktopModeDeprecated = true + } + if (visibleDesktopTasksCountDeprecated == 1 && visibleTasksCount == 0) { + isInDesktopModeDeprecated = false + } + } + } + + private var inOverviewStateMap = SparseBooleanArray() + + private var desktopTaskListener: DesktopTaskListenerImpl? + + init { + desktopTaskListener = DesktopTaskListenerImpl(this, context) + systemUiProxy.setDesktopTaskListener(desktopTaskListener) + + lifecycleTracker.addCloseable { + desktopTaskListener = null + systemUiProxy.setDesktopTaskListener(null) + } + } + + /** + * Returns the ID of the active desk (if any) on the display whose ID is [displayId], or + * [INACTIVE_DESK_ID] if no desk is currently active or the multiple desks feature is disabled. + */ + fun getActiveDeskId(displayId: Int): Int { + if (!enableMultipleDesktops(context)) { + // When the multiple desks feature is disabled, callers should not rely on the concept + // of a desk ID. + return INACTIVE_DESK_ID + } + + return getDisplayDeskConfig(displayId)?.activeDeskId ?: INACTIVE_DESK_ID + } + + /** Returns whether a desk is currently active on the display with the given [displayId]. */ + fun isInDesktopMode(displayId: Int): Boolean { + if (!enableMultipleDesktops(context)) { + return isInDesktopModeDeprecated + } + + val activeDeskId = getDisplayDeskConfig(displayId)?.activeDeskId ?: INACTIVE_DESK_ID + val isInDesktopMode = activeDeskId != INACTIVE_DESK_ID + if (DEBUG) { + Log.d(TAG, "isInDesktopMode ($displayId): $isInDesktopMode") + } + return isInDesktopMode + } + + /** + * Returns whether a desk is currently active on the display with the given [displayId] and + * Overview is not active. + */ + fun isInDesktopModeAndNotInOverview(displayId: Int): Boolean { + if (!enableMultipleDesktops(context)) { + return areDesktopTasksVisibleAndNotInOverview(displayId) + } + val inOverviewState = inOverviewStateMap[displayId] + if (DEBUG) { + Log.d( + TAG, + "isInDesktopModeAndNotInOverview: displayId=$displayId overview=$inOverviewState", + ) + } + return isInDesktopMode(displayId) && !inOverviewState + } + + /** Whether desktop tasks are visible in desktop mode. */ + private fun areDesktopTasksVisibleAndNotInOverview(displayId: Int): Boolean { + val desktopTasksVisible: Boolean = visibleDesktopTasksCountDeprecated > 0 + val inOverviewState = inOverviewStateMap[displayId] + if (DEBUG) { + Log.d( + TAG, + ("areDesktopTasksVisible: displayId=$displayId desktopVisible=$desktopTasksVisible" + + " overview=$inOverviewState"), + ) + } + return desktopTasksVisible && !inOverviewState + } + + /** Registers a listener for Taskbar changes in Desktop Mode. */ + fun registerTaskbarDesktopModeListener(listener: TaskbarDesktopModeListener) { + taskbarDesktopModeListeners.add(listener) + } + + /** Removes a previously registered listener for Taskbar changes in Desktop Mode. */ + fun unregisterTaskbarDesktopModeListener(listener: TaskbarDesktopModeListener) { + taskbarDesktopModeListeners.remove(listener) + } + + fun onLauncherStateChanged(displayId: Int, state: LauncherState) { + onLauncherStateChanged( + state, + state === LauncherState.BACKGROUND_APP, + state.isRecentsViewVisible, + displayId, + ) + } + + /** + * Launcher Driven Desktop Mode changes. For example, swipe to home and quick switch from + * Desktop Windowing Mode. if there is any pending notification please notify desktop visibility + * listeners. + */ + fun onLauncherAnimationFromDesktopEnd(displayId: Int) { + launcherAnimationRunning = false + } + + fun onLauncherStateChanged(displayId: Int, state: RecentsState) { + onLauncherStateChanged( + state, + state === RecentsState.BACKGROUND_APP, + state.isRecentsViewVisible(), + displayId, + ) + } + + /** Process launcher state change and update launcher view visibility based on desktop state */ + fun onLauncherStateChanged( + state: BaseState<*>, + isBackgroundAppState: Boolean, + isRecentsViewVisible: Boolean, + displayId: Int, + ) { + if (DEBUG) { + Log.d(TAG, "onLauncherStateChanged: newState=$state") + } + // Desktop visibility tracks overview and background state separately + setOverviewStateEnabled(displayId, !isBackgroundAppState && isRecentsViewVisible) + } + + private fun setOverviewStateEnabled(displayId: Int, overviewStateEnabled: Boolean) { + val inOverviewState = inOverviewStateMap[displayId] + if (DEBUG) { + Log.d( + TAG, + ("setOverviewStateEnabled: enabled=" + + overviewStateEnabled + + " currentValue=" + + inOverviewState), + ) + } + if (overviewStateEnabled != inOverviewState) { + inOverviewStateMap[displayId] = overviewStateEnabled + } + } + + /** Registers a listener for Taskbar changes in Desktop Mode. */ + fun registerDesktopVisibilityListener(listener: DesktopVisibilityListener) { + desktopVisibilityListeners.add(listener) + } + + /** Removes a previously registered listener for Taskbar changes in Desktop Mode. */ + fun unregisterDesktopVisibilityListener(listener: DesktopVisibilityListener) { + desktopVisibilityListeners.remove(listener) + } + + private fun notifyTaskbarDesktopModeListeners(doesAnyTaskRequireTaskbarRounding: Boolean) { + if (DEBUG) { + Log.d( + TAG, + "notifyTaskbarDesktopModeListeners: doesAnyTaskRequireTaskbarRounding=" + + doesAnyTaskRequireTaskbarRounding, + ) + } + for (listener in taskbarDesktopModeListeners) { + listener.onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding) + } + } + + private fun notifyTaskbarDesktopModeListenersForEntry(displayId: Int, duration: Int) { + if (DEBUG) { + Log.d(TAG, "notifyTaskbarDesktopModeListenersForEntry: duration=" + duration) + } + for (listener in taskbarDesktopModeListeners) { + listener.onEnterDesktopMode(duration) + } + } + + private fun notifyTaskbarDesktopModeListenersForExit(displayId: Int, duration: Int) { + if (DEBUG) { + Log.d(TAG, "notifyTaskbarDesktopModeListenersForExit: duration=" + duration) + } + for (listener in taskbarDesktopModeListeners) { + listener.onExitDesktopMode(duration) + } + } + + private fun notifyOnDeskAdded(displayId: Int, deskId: Int) { + if (DEBUG) { + Log.d(TAG, "notifyOnDeskAdded: displayId=$displayId, deskId=$deskId") + } + + for (listener in desktopVisibilityListeners) { + listener.onDeskAdded(displayId, deskId) + } + } + + private fun notifyOnDeskRemoved(displayId: Int, deskId: Int) { + if (DEBUG) { + Log.d(TAG, "notifyOnDeskRemoved: displayId=$displayId, deskId=$deskId") + } + + for (listener in desktopVisibilityListeners) { + listener.onDeskRemoved(displayId, deskId) + } + } + + private fun notifyOnActiveDeskChanged(displayId: Int, newActiveDesk: Int, oldActiveDesk: Int) { + if (DEBUG) { + Log.d( + TAG, + "notifyOnActiveDeskChanged: displayId=$displayId, newActiveDesk=$newActiveDesk, oldActiveDesk=$oldActiveDesk", + ) + } + + for (listener in desktopVisibilityListeners) { + listener.onActiveDeskChanged(displayId, newActiveDesk, oldActiveDesk) + } + } + + // Called when the DesktopTaskListener is first connected to WM. + private fun onListenerConnected( + displayDeskStates: Array, + canCreateDesks: Boolean, + ) { + if (!enableMultipleDesktops(context)) { + return + } + + displaysDesksConfigsMap.clear() + + displayDeskStates.forEach { displayDeskState -> + if (DEBUG) { + Log.d(TAG, "onListenerConnected displayId=${displayDeskState.displayId}") + } + displaysDesksConfigsMap[displayDeskState.displayId] = + DisplayDeskConfig( + displayId = displayDeskState.displayId, + activeDeskId = displayDeskState.activeDeskId, + deskIds = displayDeskState.deskIds.toMutableSet(), + ) + } + + this.canCreateDesks = canCreateDesks + + notifyOnListenerInitializedFromShell() + } + + private fun notifyOnListenerInitializedFromShell() { + if (DEBUG) { + Log.d(TAG, "notifyOnListenerInitializedFromShell") + } + + for (listener in desktopVisibilityListeners) { + listener.onListenerInitializedFromShell() + } + } + + private fun getDisplayDeskConfig(displayId: Int) = displaysDesksConfigsMap[displayId] + + private fun onCanCreateDesksChanged(canCreateDesks: Boolean) { + if (!enableMultipleDesktops(context)) { + return + } + + this.canCreateDesks = canCreateDesks + } + + private fun onDeskAdded(displayId: Int, deskId: Int) { + if (!enableMultipleDesktops(context)) { + return + } + + // Add the config for the desk if there is nothing yet, as the display can start without any + // desks. + if (getDisplayDeskConfig(displayId) == null) { + displaysDesksConfigsMap[displayId] = + DisplayDeskConfig(displayId, INACTIVE_DESK_ID, mutableSetOf(deskId)) + } else { + getDisplayDeskConfig(displayId)!!.also { + check(it.deskIds.add(deskId)) { + "Found a duplicate desk Id: $deskId on display: $displayId" + } + } + } + + notifyOnDeskAdded(displayId, deskId) + } + + private fun onDeskRemoved(displayId: Int, deskId: Int) { + if (!enableMultipleDesktops(context)) { + return + } + + getDisplayDeskConfig(displayId)?.also { + check(it.deskIds.remove(deskId)) { + "Removing non-existing desk Id: $deskId on display: $displayId" + } + if (it.activeDeskId == deskId) { + it.activeDeskId = INACTIVE_DESK_ID + } + } + + notifyOnDeskRemoved(displayId, deskId) + } + + private fun onActiveDeskChanged(displayId: Int, newActiveDesk: Int, oldActiveDesk: Int) { + if (!enableMultipleDesktops(context)) { + return + } + + getDisplayDeskConfig(displayId)?.also { + check(oldActiveDesk == it.activeDeskId) { + "Mismatch between the Shell's oldActiveDesk: $oldActiveDesk, and Launcher's: ${it.activeDeskId}" + } + check(newActiveDesk == INACTIVE_DESK_ID || it.deskIds.contains(newActiveDesk)) { + "newActiveDesk: $newActiveDesk was never added to display: $displayId" + } + it.activeDeskId = newActiveDesk + } + + if (newActiveDesk != oldActiveDesk) { + notifyOnActiveDeskChanged(displayId, newActiveDesk, oldActiveDesk) + } + } + + fun dumpLogs(prefix: String, pw: PrintWriter) { + pw.println(prefix + "DesktopVisibilityController:") + + pw.println("$prefix\tdesktopVisibilityListeners=$desktopVisibilityListeners") + pw.println("$prefix\tvisibleDesktopTasksCount=$visibleDesktopTasksCountDeprecated") + pw.println("$prefix\tinOverviewState=$inOverviewStateMap") + pw.println("$prefix\tdesktopTaskListener=$desktopTaskListener") + pw.println("$prefix\tcontext=$context") + } + + /** + * Wrapper for the IDesktopTaskListener stub to prevent lingering references to the launcher + * activity via the controller. + */ + private class DesktopTaskListenerImpl( + controller: DesktopVisibilityController, + @ApplicationContext private val context: Context, + ) : Stub() { + private val controller = WeakReference(controller) + private val displayId = DEFAULT_DISPLAY // pE-TODO(QPR2): context.displayId + + override fun onListenerConnected( + displayDeskStates: Array, + canCreateDesks: Boolean, + ) { + MAIN_EXECUTOR.execute { + controller.get()?.onListenerConnected(displayDeskStates, canCreateDesks) + } + } + + @Deprecated("Not needed by multi-desks") + override fun onTasksVisibilityChanged(displayId: Int, visibleTasksCount: Int) { + if (enableMultipleDesktops(context)) return + if (displayId != this.displayId) return + MAIN_EXECUTOR.execute { + controller.get()?.apply { + if (DEBUG) { + Log.d(TAG, "desktop visible tasks count changed=$visibleTasksCount") + } + visibleDesktopTasksCountDeprecated = visibleTasksCount + } + } + } + + override fun onStashedChanged(displayId: Int, stashed: Boolean) { + Log.w(TAG, "DesktopTaskListenerImpl: onStashedChanged is deprecated") + } + + override fun onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding: Boolean) { + if (!useRoundedCorners()) return + MAIN_EXECUTOR.execute { + controller.get()?.apply { + Log.d( + TAG, + "DesktopTaskListenerImpl: doesAnyTaskRequireTaskbarRounding= " + + doesAnyTaskRequireTaskbarRounding, + ) + notifyTaskbarDesktopModeListeners(doesAnyTaskRequireTaskbarRounding) + } + } + } + + @Deprecated("Not needed by multi-desks") + override fun onEnterDesktopModeTransitionStarted(transitionDuration: Int) { + if (enableMultipleDesktops(context)) return + val controller = controller.get() ?: return + MAIN_EXECUTOR.execute { + Log.d( + TAG, + ("DesktopTaskListenerImpl: onEnterDesktopModeTransitionStarted with " + + "duration= " + + transitionDuration), + ) + if (!controller.isInDesktopModeDeprecated) { + controller.isInDesktopModeDeprecated = true + controller.notifyTaskbarDesktopModeListenersForEntry( + DEFAULT_DISPLAY, + transitionDuration, + ) + } + } + } + + @Deprecated("Not needed by multi-desks") + override fun onExitDesktopModeTransitionStarted( + transitionDuration: Int, + shouldEndUpAtHome: Boolean, + ) { + if (enableMultipleDesktops(context)) return + val controller = controller.get() ?: return + MAIN_EXECUTOR.execute { + Log.d( + TAG, + ("DesktopTaskListenerImpl: onExitDesktopModeTransitionStarted with " + + "duration= " + + transitionDuration), + ) + // If shouldEndUpAtHome is true, desktop mode is ending from the user + // closing/minimizing the last open window. If it's false, the display is + // probably transitioning to an app's full screen mode instead so this metric + // should not be logged. + if (shouldEndUpAtHome) { + LatencyTracker.getInstance(context) + .onActionStart( + LatencyTracker.ACTION_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE + ) + } + if (controller.isInDesktopModeDeprecated) { + controller.isInDesktopModeDeprecated = false + controller.notifyTaskbarDesktopModeListenersForExit( + DEFAULT_DISPLAY, + transitionDuration, + ) + } + } + } + + override fun onCanCreateDesksChanged(canCreateDesks: Boolean) { + MAIN_EXECUTOR.execute { controller.get()?.onCanCreateDesksChanged(canCreateDesks) } + } + + override fun onDeskAdded(displayId: Int, deskId: Int) { + MAIN_EXECUTOR.execute { controller.get()?.onDeskAdded(displayId, deskId) } + } + + override fun onDeskRemoved(displayId: Int, deskId: Int) { + MAIN_EXECUTOR.execute { controller.get()?.onDeskRemoved(displayId, deskId) } + } + + override fun onActiveDeskChanged(displayId: Int, newActiveDesk: Int, oldActiveDesk: Int) { + MAIN_EXECUTOR.execute { + controller.get()?.onActiveDeskChanged(displayId, newActiveDesk, oldActiveDesk) + } + } + } + + /** A listener for Taskbar in Desktop Mode. */ + interface TaskbarDesktopModeListener { + /** + * Callback for when task is resized in desktop mode. + * + * @param doesAnyTaskRequireTaskbarRounding whether task requires taskbar corner roundness. + */ + fun onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding: Boolean) {} + + /** + * Callback for when user is exiting desktop mode. + * + * @param duration for exit transition + */ + fun onExitDesktopMode(duration: Int) {} + + /** + * Callback for when user is entering desktop mode. + * + * @param duration for enter transition + */ + fun onEnterDesktopMode(duration: Int) {} + } + + companion object { + @JvmField + val INSTANCE = DaggerSingletonObject(LauncherAppComponent::getDesktopVisibilityController) + + private const val TAG = "DesktopVisController" + private const val DEBUG = false + + const val INACTIVE_DESK_ID = -1 + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/BarsLocationAnimatorHelper.kt b/quickstep/src/com/android/launcher3/taskbar/BarsLocationAnimatorHelper.kt new file mode 100644 index 00000000000..ad847b47ee6 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/BarsLocationAnimatorHelper.kt @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.animation.ValueAnimator +import android.content.Context +import android.view.View +import androidx.dynamicanimation.animation.SpringForce +import com.android.app.animation.Interpolators +import com.android.launcher3.LauncherAnimUtils +import com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X +import com.android.launcher3.anim.SpringAnimationBuilder +import com.android.wm.shell.shared.bubbles.BubbleBarLocation + +/** Animator helper that creates bars animators. */ +object BarsLocationAnimatorHelper { + const val FADE_OUT_ANIM_ALPHA_DURATION_MS: Long = 50L + const val FADE_OUT_ANIM_ALPHA_DELAY_MS: Long = 50L + const val FADE_OUT_ANIM_POSITION_DURATION_MS: Long = 100L + const val FADE_IN_ANIM_ALPHA_DURATION_MS: Long = 100L + + // Use STIFFNESS_MEDIUMLOW which is not defined in the API constants + private const val FADE_IN_ANIM_POSITION_SPRING_STIFFNESS: Float = 400f + + // During fade out animation we shift the bubble bar 1/80th of the screen width + private const val FADE_OUT_ANIM_POSITION_SHIFT: Float = 1 / 80f + + // During fade in animation we shift the bubble bar 1/60th of the screen width + private const val FADE_IN_ANIM_POSITION_SHIFT: Float = 1 / 60f + + private val Context.screenWidth: Int + get() = resources.displayMetrics.widthPixels + + val Context.outShift: Float + get() = screenWidth * FADE_OUT_ANIM_POSITION_SHIFT + + val Context.inShiftX: Float + get() = screenWidth * FADE_IN_ANIM_POSITION_SHIFT + + /** + * Creates out animation for targetView that animates it finalTx and plays targetViewAlphaAnim + * to its final value. + */ + private fun createLocationOutAnimator( + finalTx: Float, + targetViewAlphaAnim: ObjectAnimator, + targetView: View, + ): Animator { + val positionAnim = + ObjectAnimator.ofFloat(targetView, VIEW_TRANSLATE_X, finalTx) + .setDuration(FADE_OUT_ANIM_POSITION_DURATION_MS) + positionAnim.interpolator = Interpolators.EMPHASIZED_ACCELERATE + + targetViewAlphaAnim.setDuration(FADE_OUT_ANIM_ALPHA_DURATION_MS) + targetViewAlphaAnim.startDelay = FADE_OUT_ANIM_ALPHA_DELAY_MS + + val animatorSet = AnimatorSet() + animatorSet.playTogether(positionAnim, targetViewAlphaAnim) + return animatorSet + } + + /** + * Creates in animation for targetView that animates it from startTx to finalTx and plays + * targetViewAlphaAnim to its final value. + */ + private fun createLocationInAnimator( + startTx: Float, + finalTx: Float, + targetViewAlphaAnim: ObjectAnimator, + targetView: View, + ): Animator { + targetViewAlphaAnim.setDuration(FADE_IN_ANIM_ALPHA_DURATION_MS) + val positionAnim: ValueAnimator = + SpringAnimationBuilder(targetView.context) + .setStartValue(startTx) + .setEndValue(finalTx) + .setDampingRatio(SpringForce.DAMPING_RATIO_LOW_BOUNCY) + .setStiffness(FADE_IN_ANIM_POSITION_SPRING_STIFFNESS) + .build(targetView, VIEW_TRANSLATE_X) + val animatorSet = AnimatorSet() + animatorSet.playTogether(positionAnim, targetViewAlphaAnim) + return animatorSet + } + + /** Creates an animator for the bubble bar view in part. */ + @JvmStatic + fun getBubbleBarLocationInAnimator( + newLocation: BubbleBarLocation, + currentLocation: BubbleBarLocation, + distanceFromOtherSide: Float, + targetViewAlphaAnim: ObjectAnimator, + bubbleBarView: View, + ): Animator { + val shift: Float = bubbleBarView.context.outShift + + val onLeft = newLocation.isOnLeft(bubbleBarView.isLayoutRtl) + val startTx: Float + val finalTx = + if (newLocation == currentLocation) { + // Animated location matches layout location. + 0f + } else { + // We are animating in to a transient location, need to move the bar + // accordingly. + distanceFromOtherSide * (if (onLeft) -1 else 1) + } + startTx = + if (onLeft) { + // Bar will be shown on the left side. Start point is shifted right. + finalTx + shift + } else { + // Bar will be shown on the right side. Start point is shifted left. + finalTx - shift + } + return createLocationInAnimator(startTx, finalTx, targetViewAlphaAnim, bubbleBarView) + } + + /** + * Creates an animator for the bubble bar view out part. + * + * @param targetLocation the location bubble bar should animate to. + */ + @JvmStatic + fun getBubbleBarLocationOutAnimator( + bubbleBarView: View, + targetLocation: BubbleBarLocation, + targetViewAlphaAnim: ObjectAnimator, + ): Animator { + val onLeft = targetLocation.isOnLeft(bubbleBarView.isLayoutRtl) + val shift = bubbleBarView.context.outShift + val finalTx = bubbleBarView.translationX + (if (onLeft) -shift else shift) + return this.createLocationOutAnimator(finalTx, targetViewAlphaAnim, bubbleBarView) + } + + /** Creates a teleport animator for the navigation buttons view. */ + @JvmStatic + fun getTeleportAnimatorForNavButtons( + location: BubbleBarLocation, + navButtonsView: View, + navBarTargetTranslationX: Float, + ): Animator { + val outShift: Float = navButtonsView.context.outShift + val isNavBarOnRight: Boolean = location.isOnLeft(navButtonsView.isLayoutRtl) + val finalOutTx = + navButtonsView.translationX + (if (isNavBarOnRight) outShift else -outShift) + val fadeout: Animator = + createLocationOutAnimator( + finalOutTx, + ObjectAnimator.ofFloat(navButtonsView, LauncherAnimUtils.VIEW_ALPHA, 0f), + navButtonsView, + ) + val inShift: Float = navButtonsView.context.inShiftX + val inStartX = navBarTargetTranslationX + (if (isNavBarOnRight) -inShift else inShift) + val fadeIn: Animator = + createLocationInAnimator( + inStartX, + navBarTargetTranslationX, + ObjectAnimator.ofFloat(navButtonsView, LauncherAnimUtils.VIEW_ALPHA, 1f), + navButtonsView, + ) + val teleportAnimator = AnimatorSet() + teleportAnimator.play(fadeout).before(fadeIn) + return teleportAnimator + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java b/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java index c201236586e..48ffafe786b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java @@ -16,36 +16,129 @@ package com.android.launcher3.taskbar; import android.content.Context; -import android.view.ContextThemeWrapper; +import android.content.Intent; +import android.content.pm.ShortcutInfo; +import android.graphics.Point; +import android.os.UserHandle; import android.view.LayoutInflater; -import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; +import com.android.launcher3.LifecycleTracker; +import com.android.launcher3.dagger.LauncherComponentProvider; +import com.android.launcher3.popup.SystemShortcut; +import com.android.launcher3.taskbar.bubbles.BubbleActivityStarter; +import com.android.launcher3.util.BaseContext; +import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.Themes; -import com.android.launcher3.views.ActivityContext; - -import java.util.ArrayList; -import java.util.List; +import com.android.wm.shell.shared.bubbles.logging.EntryPoint; // TODO(b/218912746): Share more behavior to avoid all apps context depending directly on taskbar. /** Base for common behavior between taskbar window contexts. */ -public abstract class BaseTaskbarContext extends ContextThemeWrapper implements ActivityContext { +public abstract class BaseTaskbarContext extends BaseContext + implements SystemShortcut.TaskbarBubbleActivityStarter { + private final int mDisplayId; + private final boolean mIsPrimaryDisplay; protected final LayoutInflater mLayoutInflater; - private final List mDPChangeListeners = new ArrayList<>(); - public BaseTaskbarContext(Context windowContext) { + public BaseTaskbarContext(Context windowContext, int displayId, boolean isPrimaryDisplay) { super(windowContext, Themes.getActivityThemeRes(windowContext)); + mDisplayId = displayId; + mIsPrimaryDisplay = isPrimaryDisplay; mLayoutInflater = LayoutInflater.from(this).cloneInContext(this); } + @Override + public int getDisplayId() { + return mDisplayId; + } + + /** + * Returns whether the taskbar is displayed on primary or external display. + */ + public final boolean isPrimaryDisplay() { + return mIsPrimaryDisplay; + } + + /** + * Returns whether taskbar is transient or persistent. External displays will be persistent. + * + * @return {@code true} if transient, {@code false} if persistent. + */ + public abstract boolean isTransientTaskbar(); + + /** + * Returns whether the taskbar is pinned in gesture navigation mode. + */ + public abstract boolean isPinnedTaskbar(); + + /** + * Returns the current navigation mode. External displays will be in THREE_BUTTONS mode. + */ + public abstract NavigationMode getNavigationMode(); + + /** + * Returns whether the taskbar is in desktop mode. Implies that some desktop tasks are currently + * visible. + */ + public abstract boolean isInDesktopMode(); + + /** + * Returns whether the taskbar is showing desktop tasks, which may happen even outside desktop + * mode on freeform displays. + */ + public abstract boolean isTaskbarShowingDesktopTasks(); + + /** + * Returns whether the taskbar is forced to be pinned when home is visible. + */ + public abstract boolean showLockedTaskbarOnHome(); + + /** + * Returns whether desktop taskbar (pinned taskbar that shows desktop tasks) is to be used on + * the display because the display is a freeform display. + */ + public abstract boolean showDesktopTaskbarForFreeformDisplay(); + + /** + * Returns screen size. + */ + public abstract Point getScreenSize(); + + /** + * Returns display height. + */ + public abstract int getDisplayHeight(); + + /** + * Notifies the context that the configuration has changed. + */ + public abstract void notifyConfigChanged(); + + @Override public final LayoutInflater getLayoutInflater() { return mLayoutInflater; } + public void onDestroy() { + // Since TaskbarDragLayer is removed from view hierarchy AFTER onDestroy() and it holds ref + // to TaskbarActivityContext, we add 1s delay to check leaks in order to avoid false + // positive leak alarms. + for (LifecycleTracker tracker: LauncherComponentProvider.get(this).getLifecycleTrackers()) { + tracker.trackLifecycleOnDestroy(this, 1000L); + } + } + + @Override + public void showShortcutBubble(ShortcutInfo info, EntryPoint entryPoint) { + if (info == null) return; + BubbleActivityStarter.INSTANCE.get(this).showShortcutBubble(info, entryPoint); + } + @Override - public final List getOnDeviceProfileChangeListeners() { - return mDPChangeListeners; + public void showAppBubble(Intent intent, UserHandle user, EntryPoint entryPoint) { + if (intent == null || intent.getPackage() == null) return; + BubbleActivityStarter.INSTANCE.get(this).showAppBubble(intent, user, entryPoint); } /** Callback invoked when a drag is initiated within this context. */ diff --git a/quickstep/src/com/android/launcher3/taskbar/CloseAppTaskbarShortcut.kt b/quickstep/src/com/android/launcher3/taskbar/CloseAppTaskbarShortcut.kt new file mode 100644 index 00000000000..27fddc7e198 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/CloseAppTaskbarShortcut.kt @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.content.Context +import android.view.View +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.R +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.popup.SystemShortcut +import com.android.launcher3.views.ActivityContext +import com.android.quickstep.RecentsModel +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.system.ActivityManagerWrapper + +/** A single menu item shortcut to close a task in Desktop Mode. */ +class CloseAppTaskbarShortcut( + target: T, + private val itemInfo: ItemInfo?, + originalView: View?, + controllers: TaskbarControllers, +) : + SystemShortcut( + R.drawable.ic_gm_close_24, + R.string.close_app_taskbar, + target, + itemInfo, + originalView, + ) where T : Context?, T : ActivityContext? { + private val recentsModel = RecentsModel.INSTANCE[controllers.taskbarActivityContext] + private val activityManagerWrapper = ActivityManagerWrapper.getInstance() + + override fun onClick(v: View?) { + findAndCloseAppInstances(itemInfo) + AbstractFloatingView.closeAllOpenViews(mTarget) + } + + /** + * Finds and closes all instances of the application specified by [itemInfo] by matching package + * and user ID to recent tasks. + */ + private fun findAndCloseAppInstances(itemInfo: ItemInfo?) { + itemInfo ?: return + val targetPackage = itemInfo.targetPackage + val targetUserId = itemInfo.user.identifier + val isTargetPackageTask: (Task) -> Boolean = { task -> + task.key?.packageName == targetPackage && task.key?.userId == targetUserId + } + recentsModel.getTasks { tasks -> + val allUniqueTasks = tasks.flatMap { it.tasks }.distinctBy { it.key.id } + val taskIdsToClose = + allUniqueTasks.filter(isTargetPackageTask).mapNotNull { it.key?.id } + + // Close all instances of this app (applicable to multi instance scenarios) + for (taskId in taskIdsToClose) { + activityManagerWrapper.removeTask(taskId) + } + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java index 06d9ee6c96d..21854791856 100644 --- a/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java @@ -25,20 +25,27 @@ import com.android.launcher3.popup.SystemShortcut; import com.android.launcher3.statemanager.StateManager; -import com.android.quickstep.RecentsActivity; +import com.android.launcher3.statemanager.StatefulContainer; +import com.android.quickstep.FallbackActivityInterface; +import com.android.quickstep.GestureState; +import com.android.quickstep.RecentsAnimationCallbacks; import com.android.quickstep.TopTaskTracker; import com.android.quickstep.fallback.RecentsState; -import com.android.quickstep.util.TISBindHelper; import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; +import java.io.PrintWriter; import java.util.stream.Stream; /** * A data source which integrates with the fallback RecentsActivity instance (for 3P launchers). + * @param The type of the RecentsViewContainer that will handle Recents state changes. */ -public class FallbackTaskbarUIController extends TaskbarUIController { +public class FallbackTaskbarUIController + > + extends TaskbarUIController { - private final RecentsActivity mRecentsActivity; + private final T mRecentsContainer; private final StateManager.StateListener mStateListener = new StateManager.StateListener() { @@ -46,8 +53,12 @@ public class FallbackTaskbarUIController extends TaskbarUIController { public void onStateTransitionStart(RecentsState toState) { animateToRecentsState(toState); + RecentsView recentsView = getRecentsView(); + if (recentsView == null) { + return; + } // Handle tapping on live tile. - getRecentsView().setTaskLaunchListener(toState == RecentsState.DEFAULT + recentsView.setTaskLaunchListener(toState == RecentsState.DEFAULT ? (() -> animateToRecentsState(RecentsState.BACKGROUND_APP)) : null); } @@ -63,34 +74,44 @@ public void onStateTransitionComplete(RecentsState finalState) { } }; - public FallbackTaskbarUIController(RecentsActivity recentsActivity) { - mRecentsActivity = recentsActivity; + public FallbackTaskbarUIController(T recentsContainer) { + mRecentsContainer = recentsContainer; } @Override protected void init(TaskbarControllers taskbarControllers) { super.init(taskbarControllers); - - mRecentsActivity.setTaskbarUIController(this); - mRecentsActivity.getStateManager().addStateListener(mStateListener); + mRecentsContainer.setTaskbarInteractor(new TaskbarInteractor(this)); + mRecentsContainer.getStateManager().addStateListener(mStateListener); } @Override protected void onDestroy() { super.onDestroy(); - mRecentsActivity.setTaskbarUIController(null); - mRecentsActivity.getStateManager().removeStateListener(mStateListener); + mRecentsContainer.setTaskbarInteractor(null); + mRecentsContainer.getStateManager().removeStateListener(mStateListener); + } + + @Nullable + @Override + public Animator getParallelAnimationToGestureEndTarget(GestureState.GestureEndTarget endTarget, + long duration, RecentsAnimationCallbacks callbacks) { + return createAnimToRecentsState( + FallbackActivityInterface.INSTANCE.stateFromGestureEndTarget(endTarget), duration); } /** * Creates an animation to animate the taskbar for the given state (but does not start it). * Currently this animation just force stashes the taskbar in Overview. */ - public Animator createAnimToRecentsState(RecentsState toState, long duration) { + private Animator createAnimToRecentsState(RecentsState toState, long duration) { // Force stash taskbar (disallow unstashing) when: + // - only if we are on primary display. // - in a 3P launcher or overview task. // - not running in a test harness (unstash is needed for tests) - boolean forceStash = isIn3pHomeOrRecents() && !isRunningInTestHarness(); + boolean forceStash = mControllers.taskbarActivityContext.isPrimaryDisplay() + && isIn3pHomeOrRecents() + && !isRunningInTestHarness(); TaskbarStashController stashController = mControllers.taskbarStashController; // Set both FLAG_IN_STASHED_LAUNCHER_STATE and FLAG_IN_APP to ensure the state is respected. // For all other states, just use the current stashed-in-app setting (e.g. if long clicked). @@ -108,8 +129,8 @@ private void animateToRecentsState(RecentsState toState) { } @Override - public RecentsView getRecentsView() { - return mRecentsActivity.getOverviewPanel(); + public @Nullable RecentsView getRecentsView() { + return mRecentsContainer.getOverviewPanel(); } @Override @@ -124,18 +145,25 @@ Stream> getSplitMenuOptions() { private boolean isIn3pHomeOrRecents() { TopTaskTracker.CachedTaskInfo topTask = TopTaskTracker.INSTANCE - .get(mControllers.taskbarActivityContext).getCachedTopTask(true); + .get(mControllers.taskbarActivityContext).getCachedTopTask(true, + mRecentsContainer.asContext().getDisplayId()); return topTask.isHomeTask() || topTask.isRecentsTask(); } - @Nullable - @Override - protected TISBindHelper getTISBindHelper() { - return mRecentsActivity.getTISBindHelper(); + protected boolean isInOverviewUi() { + return mRecentsContainer.getStateManager().getState().isRecentsViewVisible(); } @Override protected String getTaskbarUIControllerName() { - return "FallbackTaskbarUIController"; + return "FallbackTaskbarUIController<" + mRecentsContainer.getClass().getSimpleName() + ">"; + } + + @Override + protected void dumpLogs(String prefix, PrintWriter pw) { + super.dumpLogs(prefix, pw); + + pw.println(String.format("%s\tRecentsState=%s", prefix, + mRecentsContainer.getStateManager().getState())); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java index 358d703b75a..490a453810d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java @@ -15,61 +15,88 @@ */ package com.android.launcher3.taskbar; +import static android.window.DesktopModeFlags.ENABLE_TASKBAR_OVERFLOW; + +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsFlatenning; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsOnConnectedDisplays; + +import android.app.ActivityManager; import android.content.ComponentName; import android.content.pm.ActivityInfo; +import android.view.MotionEvent; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.launcher3.R; -import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext; -import com.android.quickstep.LauncherActivityInterface; +import com.android.launcher3.taskbar.overlay.TaskbarOverlayDragLayer; +import com.android.launcher3.util.TouchController; +import com.android.quickstep.RecentsFilterState; import com.android.quickstep.RecentsModel; import com.android.quickstep.util.DesktopTask; import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.LayoutUtils; +import com.android.quickstep.util.SingleTask; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.ActivityManagerWrapper; +import com.android.wm.shell.shared.desktopmode.DesktopState; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; +import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Handles initialization of the {@link KeyboardQuickSwitchViewController}. */ public final class KeyboardQuickSwitchController implements - TaskbarControllers.LoggableTaskbarController { + TaskbarControllers.LoggableTaskbarController, TouchController { @VisibleForTesting public static final int MAX_TASKS = 6; @NonNull private final ControllerCallbacks mControllerCallbacks = new ControllerCallbacks(); - - // Initialized on init - @Nullable private RecentsModel mModel; + // Callback used to notify when the KQS view is closed. + @Nullable private Runnable mOnClosed; // Used to keep track of the last requested task list id, so that we do not request to load the // tasks again if we have already requested it and the task list has not changed private int mTaskListChangeId = -1; // Only empty before the recent tasks list has been loaded the first time @NonNull private List mTasks = new ArrayList<>(); + @Nullable private Set mFirstHiddenTaskIds; + // Set of task IDs filtered out of tasks in recents model to generate list of tasks to show in + // the Keyboard Quick Switch view. Non empty only if the view has been shown in response to + // toggling taskbar overflow button. + @NonNull private Set mExcludedTaskIds = Collections.emptySet(); + private int mNumHiddenTasks = 0; // Initialized in init private TaskbarControllers mControllers; + @Nullable private RecentsModel mModel; + private boolean mIsProjectedMode; @Nullable private KeyboardQuickSwitchViewController mQuickSwitchViewController; + @Nullable private TaskbarOverlayContext mOverlayContext; + + private boolean mHasDesktopTask = false; + private boolean mWasDesktopTaskFilteredOut = false; /** Initialize the controller. */ public void init(@NonNull TaskbarControllers controllers) { mControllers = controllers; mModel = RecentsModel.INSTANCE.get(controllers.taskbarActivityContext); + mIsProjectedMode = DesktopState.getInstance( + mControllers.taskbarActivityContext).isProjectedMode(); } void onConfigurationChanged(@ActivityInfo.Config int configChanges) { @@ -82,10 +109,12 @@ void onConfigurationChanged(@ActivityInfo.Config int configChanges) { return; } int currentFocusedIndex = mQuickSwitchViewController.getCurrentFocusedIndex(); + boolean wasOpenedFromTaskbar = mQuickSwitchViewController.wasOpenedFromTaskbar(); onDestroy(); if (currentFocusedIndex != -1) { mControllers.taskbarActivityContext.getMainThreadHandler().post( - () -> openQuickSwitchView(currentFocusedIndex)); + () -> openQuickSwitchView(currentFocusedIndex, mExcludedTaskIds, + wasOpenedFromTaskbar)); } } @@ -93,93 +122,279 @@ void openQuickSwitchView() { openQuickSwitchView(-1); } + /** + * Opens or closes the view in response to taskbar action. The view shows a filtered list of + * tasks. + * @param taskIdsToExclude A list of tasks to exclude in the opened view. + * @param onClosed A callback used to notify when the KQS view is closed. + */ + void toggleQuickSwitchViewForTaskbar(@NonNull Set taskIdsToExclude, + @NonNull Runnable onClosed) { + mOnClosed = onClosed; + + // Close the view if its shown, and was opened from the taskbar. + if (mQuickSwitchViewController != null + && !mQuickSwitchViewController.isCloseAnimationRunning() + && mQuickSwitchViewController.wasOpenedFromTaskbar()) { + closeQuickSwitchView(true); + return; + } + + openQuickSwitchView(-1, taskIdsToExclude, true); + } + private void openQuickSwitchView(int currentFocusedIndex) { + openQuickSwitchView(currentFocusedIndex, Collections.emptySet(), false); + } + + private void openQuickSwitchView(int currentFocusedIndex, + @NonNull Set taskIdsToExclude, + boolean wasOpenedFromTaskbar) { + final boolean shouldShowDesktopTasks = + mControllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar(); if (mQuickSwitchViewController != null) { if (!mQuickSwitchViewController.isCloseAnimationRunning()) { + if (mQuickSwitchViewController.wasOpenedFromTaskbar() == wasOpenedFromTaskbar) { + return; + } + + // Relayout the KQS view instead of recreating a new one if it is the current + // trigger surface is different than the previous one. + final int currentFocusIndexOverride = + currentFocusedIndex == -1 && !mControllerCallbacks.isFirstTaskRunning() + ? 0 : currentFocusedIndex; + + // Skip the task reload if the list is not changed. + if (!mModel.isTaskListValid(mTaskListChangeId) || !taskIdsToExclude.equals( + mExcludedTaskIds)) { + mExcludedTaskIds = taskIdsToExclude; + mTaskListChangeId = mModel.getTasks( + shouldShowDesktopTasks ? RecentsFilterState.EMPTY_FILTER + : RecentsFilterState.getDesktopTaskFilter(), + (tasks) -> { + processLoadedTasks( + wasOpenedFromTaskbar, + shouldShowDesktopTasks, + tasks, + taskIdsToExclude); + mQuickSwitchViewController.updateQuickSwitchView( + mTasks, + wasOpenedFromTaskbar ? 0 : mNumHiddenTasks, + currentFocusIndexOverride, + mHasDesktopTask, + mWasDesktopTaskFilteredOut, + /* useAnimationStartDelay= */ !wasOpenedFromTaskbar); + }); + } + + mQuickSwitchViewController.updateLayoutForSurface( + wasOpenedFromTaskbar, currentFocusIndexOverride); return; + } else { + // Allow the KQS to be reopened during the close animation to make it more + // responsive. + closeQuickSwitchView(false); } - // Allow the KQS to be reopened during the close animation to make it more responsive - closeQuickSwitchView(false); } - TaskbarOverlayContext overlayContext = - mControllers.taskbarOverlayController.requestWindow(); + + mOverlayContext = mControllers.taskbarOverlayController.requestWindow(); + if (ENABLE_TASKBAR_OVERFLOW.isTrue()) { + mOverlayContext.getDragLayer().addTouchController(this); + } KeyboardQuickSwitchView keyboardQuickSwitchView = - (KeyboardQuickSwitchView) overlayContext.getLayoutInflater() + (KeyboardQuickSwitchView) mOverlayContext.getLayoutInflater() .inflate( R.layout.keyboard_quick_switch_view, - overlayContext.getDragLayer(), + mOverlayContext.getDragLayer(), /* attachToRoot= */ false); mQuickSwitchViewController = new KeyboardQuickSwitchViewController( - mControllers, overlayContext, keyboardQuickSwitchView, mControllerCallbacks); - - DesktopVisibilityController desktopController = - LauncherActivityInterface.INSTANCE.getDesktopVisibilityController(); - final boolean onDesktop = - desktopController != null && desktopController.areDesktopTasksVisible(); + mControllers, mOverlayContext, keyboardQuickSwitchView, mControllerCallbacks); - if (mModel.isTaskListValid(mTaskListChangeId)) { + if (mModel.isTaskListValid(mTaskListChangeId) + && taskIdsToExclude.equals(mExcludedTaskIds)) { // When we are opening the KQS with no focus override, check if the first task is // running. If not, focus that first task. mQuickSwitchViewController.openQuickSwitchView( mTasks, - mNumHiddenTasks, + wasOpenedFromTaskbar ? 0 : mNumHiddenTasks, /* updateTasks= */ false, currentFocusedIndex == -1 && !mControllerCallbacks.isFirstTaskRunning() ? 0 : currentFocusedIndex, - onDesktop); + shouldShowDesktopTasks, + mHasDesktopTask, + mWasDesktopTaskFilteredOut, + wasOpenedFromTaskbar); return; } - mTaskListChangeId = mModel.getTasks((tasks) -> { - if (onDesktop) { - processLoadedTasksOnDesktop(tasks); - } else { - processLoadedTasks(tasks); - } - // Check if the first task is running after the recents model has updated so that we use - // the correct index. - mQuickSwitchViewController.openQuickSwitchView( - mTasks, - mNumHiddenTasks, - /* updateTasks= */ true, - currentFocusedIndex == -1 && !mControllerCallbacks.isFirstTaskRunning() - ? 0 : currentFocusedIndex, - onDesktop); - }); + mExcludedTaskIds = taskIdsToExclude; + mTaskListChangeId = mModel.getTasks( + shouldShowDesktopTasks ? RecentsFilterState.EMPTY_FILTER + : RecentsFilterState.getDesktopTaskFilter(), + (tasks) -> { + processLoadedTasks( + wasOpenedFromTaskbar, shouldShowDesktopTasks, tasks, taskIdsToExclude); + // Check if the first task is running after the recents model has updated so + // that we use the correct index. + mQuickSwitchViewController.openQuickSwitchView( + mTasks, + wasOpenedFromTaskbar ? 0 : mNumHiddenTasks, + /* updateTasks= */ true, + currentFocusedIndex == -1 && !mControllerCallbacks.isFirstTaskRunning() + ? 0 : currentFocusedIndex, + shouldShowDesktopTasks, + mHasDesktopTask, + mWasDesktopTaskFilteredOut, + wasOpenedFromTaskbar); + }); + } + + private boolean shouldIncludeTask(GroupTask task, Set taskIdsToExclude) { + return !ENABLE_TASKBAR_OVERFLOW.isTrue() + || task.getTasks().stream().noneMatch(t -> taskIdsToExclude.contains(t.key.id)); + } + + private void processLoadedTasks( + boolean openedFromTaskbar, + boolean shouldShowDesktopTasks, + List tasks, + Set taskIdsToExclude) { + mHasDesktopTask = false; + mWasDesktopTaskFilteredOut = false; + + if (enableAltTabKqsFlatenning.isTrue()) { + processLoadedTasksCombined(tasks, taskIdsToExclude, openedFromTaskbar); + } else if (shouldShowDesktopTasks) { + processLoadedTasksOnDesktop(tasks, taskIdsToExclude); + } else { + processLoadedTasksOutsideDesktop(tasks, taskIdsToExclude); + } + + // With flattened KQS structure, there is no max app limit and so there is no overview. + if (enableAltTabKqsFlatenning.isTrue() && !openedFromTaskbar) { + mFirstHiddenTaskIds = null; + mNumHiddenTasks = 0; + return; + } + + // Find the non-desktop tasks that were excluded from mTasks when opened from taskbar. + // These are the tasks we want to refer to in the overview button. + List hiddenTasks = tasks.stream() + .filter(task -> !mTasks.contains(task) && !(task instanceof DesktopTask)) + .sorted(combinedTasksComparator()) + .toList(); + + mFirstHiddenTaskIds = hiddenTasks.isEmpty() ? null : hiddenTasks.get(0) + .getTasks() + .stream() + .map(task -> task.key.id) + .collect(Collectors.toSet()); + mNumHiddenTasks = hiddenTasks.size(); } - private void processLoadedTasks(List tasks) { + private void processLoadedTasksCombined(List tasks, Set taskIdsToExclude, + boolean openedFromTaskbar) { + Stream allTasks = tasks.stream() + .flatMap(task -> { + // In case of DesktopTasks, convert each contained task into a new DesktopTask + // this way the view controller will be able to show a thumbnail in KQS view. + if (task instanceof DesktopTask desktopTask) { + return desktopTask.getTasks().stream() + .map(singleTask -> new DesktopTask(desktopTask.getDeskId(), + desktopTask.getDisplayId(), List.of(singleTask))); + } + + return Stream.of(task); + }) + .filter(task -> !openedFromTaskbar || task instanceof DesktopTask) + .filter(task -> shouldIncludeTask(task, taskIdsToExclude)) + .filter(this::shouldIncludeTaskBasedOnProjectedMode) + .sorted(combinedTasksComparator()); + + if (!enableAltTabKqsFlatenning.isTrue() && !openedFromTaskbar) { + allTasks = allTasks.limit(MAX_TASKS); + } + + mTasks = allTasks.toList(); + } + + private boolean shouldIncludeTaskBasedOnProjectedMode(GroupTask task) { + // When not in projected mode, include tasks from all displays + if (!mIsProjectedMode) { + return true; + } + + int primaryDisplayId = mControllers.taskbarActivityContext.getPrimaryDisplayId(); + + // When on primary device in projected mode, only show tasks from the primary device. + if (mControllers.taskbarActivityContext.isPrimaryDisplay()) { + return task.getDisplayId() == primaryDisplayId; + } + + // When on connected display with primary device in projected mode, only include tasks that + // are not on primary device. + return task.getDisplayId() != primaryDisplayId; + } + + private static Comparator combinedTasksComparator() { + return Comparator.comparingLong((GroupTask groupTask) -> + groupTask.getTasks().stream() + .map(task -> task.key.lastActiveTime) + .max(Comparator.naturalOrder()) + // Empty tasks list shouldn't be possible so return -1 in that case. + .orElse(-1L)) + .reversed(); + } + + private void processLoadedTasksOutsideDesktop(List tasks, + Set taskIdsToExclude) { // Only store MAX_TASK tasks, from most to least recent Collections.reverse(tasks); mTasks = tasks.stream() + .filter(task -> !(task instanceof DesktopTask) + && shouldIncludeTask(task, taskIdsToExclude)) .limit(MAX_TASKS) .collect(Collectors.toList()); - mNumHiddenTasks = Math.max(0, tasks.size() - MAX_TASKS); - } - private void processLoadedTasksOnDesktop(List tasks) { - // Find the single desktop task that contains a grouping of desktop tasks - DesktopTask desktopTask = findDesktopTask(tasks); + for (int i = 0; i < tasks.size(); i++) { + if (tasks.get(i) instanceof DesktopTask) { + mHasDesktopTask = true; + if (i < mTasks.size()) { + mWasDesktopTaskFilteredOut = true; + } + break; + } + } + } - if (desktopTask != null) { - mTasks = desktopTask.tasks.stream().map(GroupTask::new).collect(Collectors.toList()); - // All other tasks, apart from the grouped desktop task, are hidden - mNumHiddenTasks = Math.max(0, tasks.size() - 1); + private void processLoadedTasksOnDesktop(List tasks, Set taskIdsToExclude) { + // Find all desktop tasks. + List desktopTasks = tasks.stream() + .filter(t -> t instanceof DesktopTask) + .map(t -> (DesktopTask) t) + .toList(); + + // Apps on the connected displays seem to be in different Desktop tasks even with the + // multiple desktops flag disabled. So, until multiple desktops is implemented the following + // should help with team-fooding Alt+tab on connected displays. Post multiple desktop, + // further changes maybe required to support launching selected desktops. + if (enableAltTabKqsOnConnectedDisplays.isTrue()) { + mTasks = desktopTasks.stream() + .flatMap(t -> t.getTasks().stream()) + .map(SingleTask::new) + .filter(task -> shouldIncludeTask(task, taskIdsToExclude)) + .collect(Collectors.toList()); + } else if (!desktopTasks.isEmpty()) { + mTasks = desktopTasks.get(0).getTasks().stream() + .map(SingleTask::new) + .filter(task -> shouldIncludeTask(task, taskIdsToExclude)) + .collect(Collectors.toList()); } else { // Desktop tasks were visible, but the recents entry is missing. Fall back to empty list mTasks = Collections.emptyList(); - mNumHiddenTasks = tasks.size(); } } - @Nullable - private DesktopTask findDesktopTask(List tasks) { - return (DesktopTask) tasks.stream() - .filter(t -> t instanceof DesktopTask) - .findFirst() - .orElse(null); - } - void closeQuickSwitchView() { closeQuickSwitchView(true); } @@ -194,11 +409,33 @@ void closeQuickSwitchView(boolean animate) { /** * See {@link TaskbarUIController#launchFocusedTask()} */ - int launchFocusedTask() { - // Return -1 so that the RecentsView is not incorrectly opened when the user closes the + @Nullable + Set launchFocusedTask() { + // Return null so that the RecentsView is not incorrectly opened when the user closes the // quick switch view by tapping the screen or when there are no recent tasks. return mQuickSwitchViewController == null || mTasks.isEmpty() - ? -1 : mQuickSwitchViewController.launchFocusedTask(); + ? null : mQuickSwitchViewController.launchFocusedTask(); + } + + @Override + public boolean onControllerTouchEvent(MotionEvent ev) { + return false; + } + + @Override + public boolean onControllerInterceptTouchEvent(MotionEvent ev) { + if (mQuickSwitchViewController == null + || mOverlayContext == null + || !ENABLE_TASKBAR_OVERFLOW.isTrue()) { + return false; + } + + TaskbarOverlayDragLayer dragLayer = mOverlayContext.getDragLayer(); + if (ev.getAction() == MotionEvent.ACTION_DOWN + && !mQuickSwitchViewController.isEventOverKeyboardQuickSwitch(dragLayer, ev)) { + closeQuickSwitchView(true); + } + return false; } void onDestroy() { @@ -207,6 +444,27 @@ void onDestroy() { } } + @VisibleForTesting + boolean isShownFromTaskbar() { + return isShown() && mQuickSwitchViewController.wasOpenedFromTaskbar(); + } + + @VisibleForTesting + boolean isShown() { + return mQuickSwitchViewController != null + && !mQuickSwitchViewController.isCloseAnimationRunning(); + } + + @VisibleForTesting + List shownTaskIds() { + if (!isShown()) { + return Collections.emptyList(); + } + + return mTasks.stream().flatMap( + groupTask -> groupTask.getTasks().stream().map(task -> task.key.id)).toList(); + } + @Override public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "KeyboardQuickSwitchController:"); @@ -214,17 +472,16 @@ public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "\tisOpen=" + (mQuickSwitchViewController != null)); pw.println(prefix + "\tmNumHiddenTasks=" + mNumHiddenTasks); pw.println(prefix + "\tmTaskListChangeId=" + mTaskListChangeId); + pw.println(prefix + "\tmHasDesktopTask=" + mHasDesktopTask); + pw.println(prefix + "\tmWasDesktopTaskFilteredOut=" + mWasDesktopTaskFilteredOut); pw.println(prefix + "\tmTasks=["); for (GroupTask task : mTasks) { - Task task1 = task.task1; - Task task2 = task.task2; - ComponentName cn1 = task1.getTopComponent(); - ComponentName cn2 = task2 != null ? task2.getTopComponent() : null; - pw.println(prefix + "\t\tt1: (id=" + task1.key.id - + "; package=" + (cn1 != null ? cn1.getPackageName() + ")" : "no package)") - + " t2: (id=" + (task2 != null ? task2.key.id : "-1") - + "; package=" + (cn2 != null ? cn2.getPackageName() + ")" - : "no package)")); + int count = 0; + for (Task t : task.getTasks()) { + ComponentName cn = t.getTopComponent(); + pw.println(prefix + "\t\tt" + (++count) + ": (id=" + t.key.id + + "; package=" + (cn != null ? cn.getPackageName() + ")" : "no package)")); + } } pw.println(prefix + "\t]"); @@ -235,24 +492,41 @@ public void dumpLogs(String prefix, PrintWriter pw) { class ControllerCallbacks { - int getTaskCount() { - return mTasks.size() + (mNumHiddenTasks == 0 ? 0 : 1); - } - @Nullable GroupTask getTaskAt(int index) { return index < 0 || index >= mTasks.size() ? null : mTasks.get(index); } void updateThumbnailInBackground(Task task, Consumer callback) { - mModel.getThumbnailCache().updateThumbnailInBackground(task, callback); + mModel.getThumbnailCache().getThumbnailInBackground(task, + thumbnailData -> { + task.thumbnail = thumbnailData; + callback.accept(thumbnailData); + }); } void updateIconInBackground(Task task, Consumer callback) { - mModel.getIconCache().updateIconInBackground(task, callback); + mModel.getIconCache().getIconInBackground(task, (icon, contentDescription, title) -> { + task.icon = icon; + task.titleDescription = contentDescription; + task.title = title; + callback.accept(task); + }); + } + + void onCloseStarted() { + if (mOnClosed != null) { + mOnClosed.run(); + mOnClosed = null; + } } void onCloseComplete() { + if (ENABLE_TASKBAR_OVERFLOW.isTrue() && mOverlayContext != null) { + mOverlayContext.getDragLayer() + .removeTouchController(KeyboardQuickSwitchController.this); + } + mOverlayContext = null; mQuickSwitchViewController = null; } @@ -260,15 +534,34 @@ boolean isTaskRunning(@Nullable GroupTask task) { if (task == null) { return false; } - int runningTaskId = ActivityManagerWrapper.getInstance().getRunningTask().taskId; - Task task2 = task.task2; + ActivityManager.RunningTaskInfo runningTaskInfo = + ActivityManagerWrapper.getInstance().getRunningTask(); + if (runningTaskInfo == null) { + return false; + } - return runningTaskId == task.task1.key.id - || (task2 != null && runningTaskId == task2.key.id); + int runningTaskId = runningTaskInfo.taskId; + return task.containsTask(runningTaskId); } boolean isFirstTaskRunning() { return isTaskRunning(getTaskAt(0)); } + + boolean isAspectRatioSquare() { + return mControllers != null && LayoutUtils.isAspectRatioSquare( + mControllers.taskbarActivityContext.getDeviceProfile().getDeviceProperties().getAspectRatio()); + } + + boolean isLandscape() { + return mControllers != null + && mControllers.taskbarActivityContext + .getDeviceProfile().getDeviceProperties().isLandscape(); + } + + @Nullable + Set getFirstHiddenTaskIds() { + return mFirstHiddenTaskIds; + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java index c564baab50e..5d296a4a553 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java @@ -17,7 +17,7 @@ import static com.android.quickstep.util.BorderAnimator.DEFAULT_BORDER_COLOR; -import android.animation.Animator; +import android.animation.AnimatorSet; import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -26,6 +26,7 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.util.AttributeSet; +import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; @@ -39,34 +40,41 @@ import com.android.quickstep.util.BorderAnimator; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.ThumbnailData; - -import java.util.function.Consumer; +import com.android.wm.shell.shared.TypefaceUtils; +import com.android.wm.shell.shared.TypefaceUtils.FontFamily; +import com.android.wm.shell.shared.split.SplitBounds; import kotlin.Unit; +import java.util.function.Consumer; + /** * A view that displays a recent task during a keyboard quick switch. */ public class KeyboardQuickSwitchTaskView extends ConstraintLayout { private static final float THUMBNAIL_BLUR_RADIUS = 1f; + private static final int INVALID_BORDER_RADIUS = -1; + + @ColorInt private final int mFocusBorderColor; + @ColorInt private int mHoverBorderColor; + private final int mBorderRadius; + + @Nullable private BorderAnimator mBorderAnimator; - @ColorInt - private final int mBorderColor; + @Nullable private ImageView mThumbnailView1; + @Nullable private ImageView mThumbnailView2; + @Nullable private ImageView mIcon1; + @Nullable private ImageView mIcon2; + @Nullable private View mContent; - @Nullable - private BorderAnimator mBorderAnimator; + private boolean mIsFocused = false; + private boolean mIsHovered = false; - @Nullable - private ImageView mThumbnailView1; - @Nullable - private ImageView mThumbnailView2; - @Nullable - private ImageView mIcon1; - @Nullable - private ImageView mIcon2; - @Nullable - private View mContent; + // Describe the task position in the parent container. Used to add information about the task's + // position in a task list to the task view's content description. + private int mIndexInParent = -1; + private int mTotalTasksInParent = -1; public KeyboardQuickSwitchTaskView(@NonNull Context context) { this(context, null); @@ -92,8 +100,12 @@ public KeyboardQuickSwitchTaskView( setWillNotDraw(false); - mBorderColor = ta.getColor( + mFocusBorderColor = ta.getColor( R.styleable.TaskView_focusBorderColor, DEFAULT_BORDER_COLOR); + mHoverBorderColor = ta.getColor(R.styleable.TaskView_hoverBorderColor, + DEFAULT_BORDER_COLOR); + mBorderRadius = ta.getDimensionPixelSize( + R.styleable.TaskView_focusBorderRadius, INVALID_BORDER_RADIUS); ta.recycle(); } @@ -106,26 +118,46 @@ protected void onFinishInflate() { mIcon2 = findViewById(R.id.icon_2); mContent = findViewById(R.id.content); - Resources resources = mContext.getResources(); - Preconditions.assertNotNull(mContent); + + TypefaceUtils.setTypeface( + mContent.findViewById(R.id.large_text), + FontFamily.GSF_HEADLINE_LARGE_EMPHASIZED + ); + TypefaceUtils.setTypeface( + mContent.findViewById(R.id.small_text), + FontFamily.GSF_LABEL_LARGE + ); + + Resources resources = mContext.getResources(); mBorderAnimator = BorderAnimator.createScalingBorderAnimator( - /* borderRadiusPx= */ resources.getDimensionPixelSize( - R.dimen.keyboard_quick_switch_task_view_radius), + /* borderRadiusPx= */ mBorderRadius != INVALID_BORDER_RADIUS + ? mBorderRadius + : resources.getDimensionPixelSize( + R.dimen.keyboard_quick_switch_task_view_radius), /* borderWidthPx= */ resources.getDimensionPixelSize( R.dimen.keyboard_quick_switch_border_width), + /* borderStrokePx= */ resources.getDimensionPixelSize( + R.dimen.keyboard_quick_switch_border_stroke), /* boundsBuilder= */ bounds -> { bounds.set(0, 0, getWidth(), getHeight()); return Unit.INSTANCE; }, /* targetView= */ this, /* contentView= */ mContent, - /* borderColor= */ mBorderColor); + /* borderColor= */ mFocusBorderColor); } - @Nullable - protected Animator getFocusAnimator(boolean focused) { - return mBorderAnimator == null ? null : mBorderAnimator.buildAnimator(focused); + protected void addFocusAnimation(boolean focused, AnimatorSet animation) { + mIsFocused = focused; + + if (mBorderAnimator == null) { + return; + } + + mBorderAnimator.setBorderColor((mIsFocused || !mIsHovered) + ? mFocusBorderColor : mHoverBorderColor); + animation.play(mBorderAnimator.buildAnimator(mIsFocused || mIsHovered)); } @Override @@ -136,6 +168,24 @@ public void draw(Canvas canvas) { } } + @Override + public boolean onHoverEvent(MotionEvent event) { + if (mBorderAnimator == null) { + return super.onHoverEvent(event); + } + + if (event.getAction() != MotionEvent.ACTION_HOVER_ENTER + && event.getAction() != MotionEvent.ACTION_HOVER_EXIT) { + return super.onHoverEvent(event); + } + + mIsHovered = event.getAction() == MotionEvent.ACTION_HOVER_ENTER; + mBorderAnimator.setBorderColor((mIsHovered || !mIsFocused) + ? mHoverBorderColor : mFocusBorderColor); + mBorderAnimator.setBorderVisibility(mIsHovered || mIsFocused, true); + return super.onHoverEvent(event); + } + protected void setThumbnails( @NonNull Task task1, @Nullable Task task2, @@ -144,36 +194,105 @@ protected void setThumbnails( applyThumbnail(mThumbnailView1, task1, thumbnailUpdateFunction); applyThumbnail(mThumbnailView2, task2, thumbnailUpdateFunction); + // Update content description, even in cases task icons, and content descriptions need to be + // loaded asynchronously to ensure that the task has non empty description (assuming task + // position information was set), as KeyboardQuickSwitch view may request accessibility + // focus to be moved to the task when the quick switch UI gets shown. The description will + // be updated once the task metadata has been loaded - the delay should be very short, and + // the content description when task titles are not available still gives some useful + // information to the user (the task's position in the list). + updateContentDesctiptionForTasks(task1, task2); + if (iconUpdateFunction == null) { applyIcon(mIcon1, task1); applyIcon(mIcon2, task2); - setContentDescription(task2 == null - ? task1.titleDescription - : getContext().getString( - R.string.quick_switch_split_task, - task1.titleDescription, - task2.titleDescription)); return; } + iconUpdateFunction.updateIconInBackground(task1, t -> { applyIcon(mIcon1, task1); if (task2 != null) { return; } - setContentDescription(task1.titleDescription); + updateContentDesctiptionForTasks(task1, null); }); + if (task2 == null) { return; } iconUpdateFunction.updateIconInBackground(task2, t -> { applyIcon(mIcon2, task2); - setContentDescription(getContext().getString( - R.string.quick_switch_split_task, - task1.titleDescription, - task2.titleDescription)); + updateContentDesctiptionForTasks(task1, task2); }); } + /** + * Initializes information about the task's position within the parent container context - used + * to add position information to the view's content description. + * Should be called before associating the view with tasks. + * + * @param index The view's 0-based index within the parent task container. + * @param totalTasks The total number of tasks in the parent task container. + */ + protected void setPositionInformation(int index, int totalTasks) { + mIndexInParent = index; + mTotalTasksInParent = totalTasks; + } + + protected void setThumbnailsForSplitTasks( + @NonNull Task task1, + @Nullable Task task2, + @Nullable ThumbnailUpdateFunction thumbnailUpdateFunction, + @Nullable IconUpdateFunction iconUpdateFunction, + @Nullable SplitBounds splitBounds) { + setThumbnails(task1, task2, thumbnailUpdateFunction, iconUpdateFunction); + + if (splitBounds == null) { + return; + } + + + final boolean isLeftRightSplit = !splitBounds.appsStackedVertically; + final float leftOrTopTaskPercent = splitBounds.getLeftTopTaskPercent(); + + ConstraintLayout.LayoutParams leftTopParams = (ConstraintLayout.LayoutParams) + mThumbnailView1.getLayoutParams(); + ConstraintLayout.LayoutParams rightBottomParams = (ConstraintLayout.LayoutParams) + mThumbnailView2.getLayoutParams(); + + if (isLeftRightSplit) { + // Set thumbnail view ratio in left right split mode. + leftTopParams.width = 0; // Set width to 0dp, so it uses the constraint dimension ratio. + leftTopParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT; + leftTopParams.matchConstraintPercentWidth = leftOrTopTaskPercent; + leftTopParams.leftToLeft = ConstraintLayout.LayoutParams.PARENT_ID; + leftTopParams.rightToLeft = R.id.thumbnail_2; + mThumbnailView1.setLayoutParams(leftTopParams); + + rightBottomParams.width = 0; + rightBottomParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT; + rightBottomParams.matchConstraintPercentWidth = 1 - leftOrTopTaskPercent; + rightBottomParams.leftToRight = R.id.thumbnail_1; + rightBottomParams.rightToRight = ConstraintLayout.LayoutParams.PARENT_ID; + mThumbnailView2.setLayoutParams(rightBottomParams); + } else { + // Set thumbnail view ratio in top bottom split mode. + leftTopParams.height = 0; + leftTopParams.width = ConstraintLayout.LayoutParams.MATCH_PARENT; + leftTopParams.matchConstraintPercentHeight = leftOrTopTaskPercent; + leftTopParams.topToTop = ConstraintLayout.LayoutParams.PARENT_ID; + leftTopParams.bottomToTop = R.id.thumbnail_2; + mThumbnailView1.setLayoutParams(leftTopParams); + + rightBottomParams.height = 0; + rightBottomParams.width = ConstraintLayout.LayoutParams.MATCH_PARENT; + rightBottomParams.matchConstraintPercentHeight = 1 - leftOrTopTaskPercent; + rightBottomParams.topToBottom = R.id.thumbnail_1; + rightBottomParams.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID; + mThumbnailView2.setLayoutParams(rightBottomParams); + } + } + private void applyThumbnail( @Nullable ImageView thumbnailView, @Nullable Task task, @@ -185,8 +304,8 @@ private void applyThumbnail( applyThumbnail(thumbnailView, task.colorBackground, task.thumbnail); return; } - updateFunction.updateThumbnailInBackground(task, - thumbnailData -> applyThumbnail(thumbnailView, task.colorBackground, thumbnailData)); + updateFunction.updateThumbnailInBackground(task, thumbnailData -> + applyThumbnail(thumbnailView, task.colorBackground, thumbnailData)); } private void applyThumbnail( @@ -218,6 +337,28 @@ private void applyIcon(@Nullable ImageView iconView, @Nullable Task task) { constantState.newDrawable(getResources(), getContext().getTheme())); } + /** + * Updates the task view's content description to reflect tasks represented by the view. + */ + private void updateContentDesctiptionForTasks(@NonNull Task task1, @Nullable Task task2) { + String tasksDescription = task1.titleDescription == null || task2 == null + ? task1.titleDescription + : getContext().getString( + R.string.quick_switch_split_task, + task1.titleDescription, + task2.titleDescription); + if (mIndexInParent < 0) { + setContentDescription(tasksDescription); + return; + } + + setContentDescription( + getContext().getString(R.string.quick_switch_task_with_position_in_parent, + tasksDescription != null ? tasksDescription : "", + mIndexInParent + 1, + mTotalTasksInParent)); + } + protected interface ThumbnailUpdateFunction { void updateThumbnailInBackground(Task task, Consumer callback); diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java index 5b7512a4cc4..71aee170a02 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java @@ -17,7 +17,8 @@ import static androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.PARENT_ID; -import static com.android.launcher3.taskbar.KeyboardQuickSwitchController.MAX_TASKS; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsFlatenning; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsOnConnectedDisplays; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -25,51 +26,73 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Resources; +import android.graphics.Canvas; +import android.graphics.Color; import android.graphics.Outline; +import android.graphics.Paint; import android.graphics.Rect; +import android.graphics.RectF; import android.icu.text.MessageFormat; import android.util.AttributeSet; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; +import android.view.ViewConfiguration; +import android.view.ViewGroup; import android.view.ViewOutlineProvider; import android.view.ViewTreeObserver; import android.view.animation.Interpolator; import android.widget.HorizontalScrollView; -import android.widget.ImageView; +import android.widget.ImageButton; import android.widget.TextView; +import android.window.OnBackInvokedDispatcher; +import android.window.WindowOnBackInvokedDispatcher; import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.core.content.res.ResourcesCompat; import com.android.app.animation.Interpolators; +import com.android.internal.jank.Cuj; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatedFloat; +import com.android.launcher3.icons.GraphicsUtils; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; +import com.android.quickstep.SystemUiProxy; import com.android.quickstep.util.DesktopTask; import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.LayoutUtils; +import com.android.quickstep.util.SingleTask; +import com.android.quickstep.util.SplitTask; +import com.android.systemui.shared.recents.model.Task; +import com.android.systemui.shared.system.InteractionJankMonitorWrapper; +import com.android.wm.shell.shared.TypefaceUtils; +import com.android.wm.shell.shared.TypefaceUtils.FontFamily; import java.util.HashMap; import java.util.List; import java.util.Locale; /** - * View that allows quick switching between recent tasks through keyboard - * alt-tab and alt-shift-tab - * commands. + * View that allows quick switching between recent tasks. + * + * Can be access via: + * - keyboard alt-tab + * - alt-shift-tab + * - taskbar overflow button */ public class KeyboardQuickSwitchView extends ConstraintLayout { private static final long OUTLINE_ANIMATION_DURATION_MS = 333; private static final float OUTLINE_START_HEIGHT_FACTOR = 0.45f; private static final float OUTLINE_START_RADIUS_FACTOR = 0.25f; - private static final Interpolator OPEN_OUTLINE_INTERPOLATOR = Interpolators.EMPHASIZED_DECELERATE; - private static final Interpolator CLOSE_OUTLINE_INTERPOLATOR = Interpolators.EMPHASIZED_ACCELERATE; + private static final Interpolator OPEN_OUTLINE_INTERPOLATOR = + Interpolators.EMPHASIZED_DECELERATE; + private static final Interpolator CLOSE_OUTLINE_INTERPOLATOR = + Interpolators.EMPHASIZED_ACCELERATE; private static final long ALPHA_ANIMATION_DURATION_MS = 83; private static final long ALPHA_ANIMATION_START_DELAY_MS = 67; @@ -79,12 +102,18 @@ public class KeyboardQuickSwitchView extends ConstraintLayout { private static final float CONTENT_START_TRANSLATION_X_DP = 32; private static final float CONTENT_START_TRANSLATION_Y_DP = 40; private static final Interpolator OPEN_TRANSLATION_X_INTERPOLATOR = Interpolators.EMPHASIZED; - private static final Interpolator OPEN_TRANSLATION_Y_INTERPOLATOR = Interpolators.EMPHASIZED_DECELERATE; - private static final Interpolator CLOSE_TRANSLATION_Y_INTERPOLATOR = Interpolators.EMPHASIZED_ACCELERATE; + private static final Interpolator OPEN_TRANSLATION_Y_INTERPOLATOR = + Interpolators.EMPHASIZED_DECELERATE; + private static final Interpolator CLOSE_TRANSLATION_Y_INTERPOLATOR = + Interpolators.EMPHASIZED_ACCELERATE; private static final long CONTENT_ALPHA_ANIMATION_DURATION_MS = 83; private static final long CONTENT_ALPHA_ANIMATION_START_DELAY_MS = 83; + private static final int STROKE_ALPHA = 51; + private static final int DARK_THEME_SHADOW_ALPHA = 51; + private static final int LIGHT_THEME_SHADOW_ALPHA = 25; + private final AnimatedFloat mOutlineAnimationProgress = new AnimatedFloat( this::invalidateOutline); @@ -93,15 +122,33 @@ public class KeyboardQuickSwitchView extends ConstraintLayout { private HorizontalScrollView mScrollView; private ConstraintLayout mContent; - private int mTaskViewWidth; - private int mTaskViewHeight; + private boolean mSupportsScrollArrows = false; + private ImageButton mStartScrollArrow; + private ImageButton mEndScrollArrow; + + private int mTaskViewBorderWidth; + private int mTaskViewRadius; private int mSpacing; + private int mSmallSpacing; private int mOutlineRadius; private boolean mIsRtl; + // Used to paint a background with a shadow. + private final Paint mBackgroundPaint = new Paint(); + private float mBackgroundShadowBlur; + private float mBackgroundShadowDistance; + private final Paint mStrokePaint = new Paint(); + private final RectF mLastBackgroundRect = new RectF(); + + + private int mOverviewTaskIndex = -1; + private int mDesktopTaskIndex = -1; + @Nullable private AnimatorSet mOpenAnimation; + private boolean mIsBackCallbackRegistered = false; + @Nullable private KeyboardQuickSwitchViewController.ViewCallbacks mViewCallbacks; @@ -124,26 +171,111 @@ public KeyboardQuickSwitchView(@NonNull Context context, @Nullable AttributeSet super(context, attrs, defStyleAttr, defStyleRes); } + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + + if (mViewCallbacks != null) { + mViewCallbacks.onViewDetchedFromWindow(); + } + } + @Override protected void onFinishInflate() { super.onFinishInflate(); mNoRecentItemsPane = findViewById(R.id.no_recent_items_pane); mScrollView = findViewById(R.id.scroll_view); mContent = findViewById(R.id.content); + mStartScrollArrow = findViewById(R.id.scroll_button_start); + mEndScrollArrow = findViewById(R.id.scroll_button_end); + + setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS); Resources resources = getResources(); - mTaskViewWidth = resources.getDimensionPixelSize( - R.dimen.keyboard_quick_switch_taskview_width); - mTaskViewHeight = resources.getDimensionPixelSize( - R.dimen.keyboard_quick_switch_taskview_height); mSpacing = resources.getDimensionPixelSize(R.dimen.keyboard_quick_switch_view_spacing); + mSmallSpacing = resources.getDimensionPixelSize( + R.dimen.keyboard_quick_switch_view_small_spacing); mOutlineRadius = resources.getDimensionPixelSize(R.dimen.keyboard_quick_switch_view_radius); + mTaskViewBorderWidth = resources.getDimensionPixelSize( + R.dimen.keyboard_quick_switch_border_width); + mTaskViewRadius = resources.getDimensionPixelSize( + R.dimen.keyboard_quick_switch_task_view_radius); + mIsRtl = Utilities.isRtl(resources); + + mBackgroundPaint.setFlags(Paint.ANTI_ALIAS_FLAG); + mBackgroundPaint.setStyle(Paint.Style.FILL); + mBackgroundPaint.setColor(resources.getColor( + R.color.materialColorSurfaceBright, getContext().getTheme())); + mBackgroundShadowBlur = resources.getDimension(R.dimen.transient_taskbar_shadow_blur); + mBackgroundShadowDistance = resources.getDimension( + R.dimen.transient_taskbar_key_shadow_distance); + + + mStrokePaint.setFlags(Paint.ANTI_ALIAS_FLAG); + mStrokePaint.setStyle(Paint.Style.STROKE); + mStrokePaint.setStrokeWidth( + getResources().getDimension(R.dimen.transient_taskbar_stroke_width)); + mStrokePaint.setColor( + getResources().getColor(R.color.taskbar_stroke, getContext().getTheme())); + + TypefaceUtils.setTypeface( + mNoRecentItemsPane.findViewById(R.id.no_recent_items_text), + FontFamily.GSF_LABEL_LARGE); + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + + boolean isDarkTheme = Utilities.isDarkTheme(getContext()); + mStrokePaint.setAlpha(STROKE_ALPHA); + + // Draw shadow. + mBackgroundPaint.setShadowLayer( + mBackgroundShadowBlur, + 0, + mBackgroundShadowDistance, + GraphicsUtils.setColorAlphaBound(Color.BLACK, + isDarkTheme ? DARK_THEME_SHADOW_ALPHA : LIGHT_THEME_SHADOW_ALPHA)); + mLastBackgroundRect.set(0, 0, getWidth(), getHeight()); + + canvas.drawRoundRect(mLastBackgroundRect, mOutlineRadius, mOutlineRadius, mBackgroundPaint); + canvas.drawRoundRect(mLastBackgroundRect, mOutlineRadius, mOutlineRadius, mStrokePaint); + } + + private void registerOnBackInvokedCallback() { + OnBackInvokedDispatcher dispatcher = findOnBackInvokedDispatcher(); + + if (isOnBackInvokedCallbackEnabled(dispatcher) + && !mIsBackCallbackRegistered) { + dispatcher.registerOnBackInvokedCallback( + OnBackInvokedDispatcher.PRIORITY_OVERLAY, mViewCallbacks.onBackInvokedCallback); + mIsBackCallbackRegistered = true; + } + } + + private void unregisterOnBackInvokedCallback() { + OnBackInvokedDispatcher dispatcher = findOnBackInvokedDispatcher(); + + if (isOnBackInvokedCallbackEnabled(dispatcher) + && mIsBackCallbackRegistered) { + dispatcher.unregisterOnBackInvokedCallback( + mViewCallbacks.onBackInvokedCallback); + mIsBackCallbackRegistered = false; + } + } + + private boolean isOnBackInvokedCallbackEnabled(OnBackInvokedDispatcher dispatcher) { + return dispatcher instanceof WindowOnBackInvokedDispatcher + && ((WindowOnBackInvokedDispatcher) dispatcher).isOnBackInvokedCallbackEnabled() + && mViewCallbacks != null; } private KeyboardQuickSwitchTaskView createAndAddTaskView( int index, boolean isFinalView, + boolean useSmallStartSpacing, @LayoutRes int resId, @NonNull LayoutInflater layoutInflater, @Nullable View previousView) { @@ -152,7 +284,7 @@ private KeyboardQuickSwitchTaskView createAndAddTaskView( taskView.setId(View.generateViewId()); taskView.setOnClickListener(v -> mViewCallbacks.launchTaskAt(index)); - LayoutParams lp = new LayoutParams(mTaskViewWidth, mTaskViewHeight); + LayoutParams lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); // Create a left-to-right ordering of views (or right-to-left in RTL locales) if (previousView != null) { lp.startToEnd = previousView.getId(); @@ -162,10 +294,9 @@ private KeyboardQuickSwitchTaskView createAndAddTaskView( lp.topToTop = PARENT_ID; lp.bottomToBottom = PARENT_ID; // Add spacing between views - lp.setMarginStart(mSpacing); + lp.setMarginStart(useSmallStartSpacing ? mSmallSpacing : mSpacing); if (isFinalView) { - // Add spacing to the end of the final view so that scrolling ends with some - // padding. + // Add spacing to the end of the final view so that scrolling ends with some padding. lp.endToEnd = PARENT_ID; lp.setMarginEnd(mSpacing); lp.horizontalBias = 1f; @@ -182,99 +313,274 @@ protected void applyLoadPlan( int numHiddenTasks, boolean updateTasks, int currentFocusIndexOverride, - @NonNull KeyboardQuickSwitchViewController.ViewCallbacks viewCallbacks) { + @NonNull KeyboardQuickSwitchViewController.ViewCallbacks viewCallbacks, + boolean useDesktopTaskView, + boolean useAnimationStartDelay) { + mContent.removeAllViews(); + mViewCallbacks = viewCallbacks; Resources resources = context.getResources(); - Resources.Theme theme = context.getTheme(); View previousTaskView = null; LayoutInflater layoutInflater = LayoutInflater.from(context); - int tasksToDisplay = Math.min(MAX_TASKS, groupTasks.size()); + int tasksToDisplay = groupTasks.size(); for (int i = 0; i < tasksToDisplay; i++) { GroupTask groupTask = groupTasks.get(i); KeyboardQuickSwitchTaskView currentTaskView = createAndAddTaskView( i, - /* isFinalView= */ i == tasksToDisplay - 1 && numHiddenTasks == 0, - groupTask instanceof DesktopTask - ? R.layout.keyboard_quick_switch_textonly_taskview - : R.layout.keyboard_quick_switch_taskview, + /* isFinalView= */ i == tasksToDisplay - 1 + && numHiddenTasks == 0 && !useDesktopTaskView, + /* useSmallStartSpacing= */ false, + getDesktopTaskLayoutRes(groupTask), layoutInflater, previousTaskView); - if (groupTask instanceof DesktopTask desktopTask) { - HashMap args = new HashMap<>(); - args.put("count", desktopTask.tasks.size()); - - currentTaskView.findViewById(R.id.icon).setImageDrawable( - ResourcesCompat.getDrawable(resources, R.drawable.ic_desktop, theme)); - currentTaskView.findViewById(R.id.text).setText(new MessageFormat( - resources.getString(R.string.quick_switch_desktop), - Locale.getDefault()).format(args)); + Task task1; + Task task2; + if (groupTask instanceof SplitTask splitTask) { + task1 = splitTask.getTopLeftTask(); + task2 = splitTask.getBottomRightTask(); + } else if (groupTask instanceof SingleTask singleTask) { + task1 = singleTask.getTask(); + task2 = null; + } else if (enableAltTabKqsFlatenning.isTrue() + && groupTask instanceof DesktopTask desktopTask) { + task1 = desktopTask.getTasks().get(0); + task2 = null; } else { - currentTaskView.setThumbnails( - groupTask.task1, - groupTask.task2, - updateTasks ? mViewCallbacks::updateThumbnailInBackground : null, - updateTasks ? mViewCallbacks::updateIconInBackground : null); + continue; } + + currentTaskView.setPositionInformation(i, tasksToDisplay); + currentTaskView.setThumbnailsForSplitTasks( + task1, + task2, + updateTasks ? mViewCallbacks::updateThumbnailInBackground : null, + updateTasks ? mViewCallbacks::updateIconInBackground : null, + groupTask instanceof SplitTask splitTask ? splitTask.getSplitBounds() : null); + previousTaskView = currentTaskView; } - if (numHiddenTasks > 0) { HashMap args = new HashMap<>(); args.put("count", numHiddenTasks); + mOverviewTaskIndex = getTaskCount(); View overviewButton = createAndAddTaskView( - MAX_TASKS, - /* isFinalView= */ true, - R.layout.keyboard_quick_switch_textonly_taskview, + mOverviewTaskIndex, + /* isFinalView= */ !useDesktopTaskView, + /* useSmallStartSpacing= */ false, + R.layout.keyboard_quick_switch_overview_taskview, layoutInflater, previousTaskView); - overviewButton.findViewById(R.id.icon).setImageDrawable( - ResourcesCompat.getDrawable(resources, R.drawable.view_carousel, theme)); - overviewButton.findViewById(R.id.text).setText(new MessageFormat( + overviewButton.findViewById(R.id.large_text).setText( + String.format(Locale.getDefault(), "%d", numHiddenTasks)); + overviewButton.findViewById(R.id.small_text).setText(new MessageFormat( resources.getString(R.string.quick_switch_overflow), Locale.getDefault()).format(args)); + + previousTaskView = overviewButton; + } + if (useDesktopTaskView) { + mDesktopTaskIndex = getTaskCount(); + View desktopButton = createAndAddTaskView( + mDesktopTaskIndex, + /* isFinalView= */ true, + /* useSmallStartSpacing= */ numHiddenTasks > 0, + R.layout.keyboard_quick_switch_desktop_taskview, + layoutInflater, + previousTaskView); + + desktopButton.findViewById(R.id.small_text).setText( + resources.getString(R.string.quick_switch_desktop)); } - mDisplayingRecentTasks = !groupTasks.isEmpty(); + mDisplayingRecentTasks = !groupTasks.isEmpty() || useDesktopTaskView; + + + // Update scroll view outline to clip its contents with rounded corners. If the KQS view + // does not support scroll arrows, use the KQS view corner radii for outline so scroll + // view content is clipped to those rounded corners (clipping the parent KQS view to outline + // would prevent it from displaying shadow). + mScrollView.setClipToOutline(true); + mScrollView.setOutlineProvider(new ViewOutlineProvider() { + @Override + public void getOutline(View view, Outline outline) { + int spacingWithoutBorder = mSupportsScrollArrows + ? mSpacing - mTaskViewBorderWidth : 0; + outline.setRoundRect(spacingWithoutBorder, + spacingWithoutBorder, view.getWidth() - spacingWithoutBorder, + view.getHeight() - spacingWithoutBorder, + mSupportsScrollArrows ? mTaskViewRadius : mOutlineRadius); + } + }); getViewTreeObserver().addOnGlobalLayoutListener( new ViewTreeObserver.OnGlobalLayoutListener() { @Override public void onGlobalLayout() { - animateOpen(currentFocusIndexOverride); + registerOnBackInvokedCallback(); + animateOpen(currentFocusIndexOverride, useAnimationStartDelay); getViewTreeObserver().removeOnGlobalLayoutListener(this); } }); } - protected Animator getCloseAnimation() { - AnimatorSet closeAnimation = new AnimatorSet(); + @LayoutRes + private int getDesktopTaskLayoutRes(GroupTask groupTask) { + // Before KQS flattening, res ID was decided based on device aspect ratio. This will also + // be followed for non-desktop tasks. + if (!enableAltTabKqsFlatenning.isTrue() || !(groupTask instanceof DesktopTask)) { + return getDefaultLayoutRes(); + } - Animator outlineAnimation = mOutlineAnimationProgress.animateToValue(0f); - outlineAnimation.setDuration(OUTLINE_ANIMATION_DURATION_MS); - outlineAnimation.setInterpolator(CLOSE_OUTLINE_INTERPOLATOR); - closeAnimation.play(outlineAnimation); + // Check if a task is available to evaluate its aspect ratio. This is a safe guard against + // edge case. + if (groupTask.getTasks().isEmpty() || groupTask.getTasks().getFirst().appBounds == null) { + return getDefaultLayoutRes(); + } - Animator alphaAnimation = ObjectAnimator.ofFloat(this, ALPHA, 1f, 0f); - alphaAnimation.setStartDelay(ALPHA_ANIMATION_START_DELAY_MS); - alphaAnimation.setDuration(ALPHA_ANIMATION_DURATION_MS); - closeAnimation.play(alphaAnimation); + // Always use square view if the task bounds are within the square aspect ratio limit. + Rect taskBounds = groupTask.getTasks().getFirst().appBounds; + if (LayoutUtils.isAspectRatioSquare((float) taskBounds.width() / taskBounds.height())) { + return R.layout.keyboard_quick_switch_taskview_square; + } - View displayedContent = mDisplayingRecentTasks ? mScrollView : mNoRecentItemsPane; + // Determine if a task is in landscape orientation based on task bounds. + boolean isTaskBoundsInLandscape = taskBounds.width() > taskBounds.height(); + + // If both device and task's bounds match, that is either both are landscape or both are + // portrait, then use the default view otherwise use the square version to differentiate. + return (mViewCallbacks.isLandscape() == isTaskBoundsInLandscape) + ? R.layout.keyboard_quick_switch_taskview + : R.layout.keyboard_quick_switch_taskview_square; + } + + @LayoutRes + private int getDefaultLayoutRes() { + return mViewCallbacks.isAspectRatioSquare() + ? R.layout.keyboard_quick_switch_taskview_square + : R.layout.keyboard_quick_switch_taskview; + } + + void enableScrollArrowSupport() { + if (mSupportsScrollArrows) { + return; + } + mSupportsScrollArrows = true; + + if (mIsRtl) { + mStartScrollArrow.setContentDescription( + getResources().getString(R.string.quick_switch_scroll_arrow_right)); + mEndScrollArrow.setContentDescription( + getResources().getString(R.string.quick_switch_scroll_arrow_left)); + } + + + mStartScrollArrow.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (mIsRtl) { + runScrollCommand(false, () -> { + mScrollView.smoothScrollBy(mScrollView.getWidth(), 0); + }); + } else { + runScrollCommand(false, () -> { + mScrollView.smoothScrollBy(-mScrollView.getWidth(), 0); + }); + } + } + }); + + mEndScrollArrow.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (mIsRtl) { + runScrollCommand(false, () -> { + mScrollView.smoothScrollBy(-mScrollView.getWidth(), 0); + }); + } else { + runScrollCommand(false, () -> { + mScrollView.smoothScrollBy(mScrollView.getWidth(), 0); + }); + } + } + }); + + // Add listeners to disable arrow buttons when the scroll view cannot be further scrolled in + // the associated direction. + mScrollView.setOnScrollChangeListener(new OnScrollChangeListener() { + @Override + public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, + int oldScrollY) { + updateArrowButtonsEnabledState(); + } + }); + } + + private void updateArrowButtonsEnabledState() { + if (!mDisplayingRecentTasks) { + return; + } + + int scrollX = mScrollView.getScrollX(); + if (mIsRtl) { + mEndScrollArrow.setEnabled(scrollX > 0); + mStartScrollArrow.setEnabled(scrollX < mContent.getWidth() - mScrollView.getWidth()); + } else { + mStartScrollArrow.setEnabled(scrollX > 0); + mEndScrollArrow.setEnabled(scrollX < mContent.getWidth() - mScrollView.getWidth()); + } + } + + int getOverviewTaskIndex() { + return mOverviewTaskIndex; + } + + int getDesktopTaskIndex() { + return mDesktopTaskIndex; + } + + void resetViewCallbacks() { + // Unregister the back invoked callback after the view is closed and before the + // mViewCallbacks is reset. + unregisterOnBackInvokedCallback(); + if (enableAltTabKqsOnConnectedDisplays.isTrue()) { + SystemUiProxy.INSTANCE.get(getContext()).getFocusState().removeListener(mViewCallbacks); + } + mViewCallbacks = null; + } + + private void animateDisplayedContentForClose(View view, AnimatorSet animator) { Animator translationYAnimation = ObjectAnimator.ofFloat( - displayedContent, + view, TRANSLATION_Y, 0, -Utilities.dpToPx(CONTENT_START_TRANSLATION_Y_DP)); translationYAnimation.setDuration(CONTENT_TRANSLATION_Y_ANIMATION_DURATION_MS); translationYAnimation.setInterpolator(CLOSE_TRANSLATION_Y_INTERPOLATOR); - closeAnimation.play(translationYAnimation); + animator.play(translationYAnimation); - Animator contentAlphaAnimation = ObjectAnimator.ofFloat(displayedContent, ALPHA, 1f, 0f); + Animator contentAlphaAnimation = ObjectAnimator.ofFloat(view, ALPHA, 1f, 0f); contentAlphaAnimation.setDuration(CONTENT_ALPHA_ANIMATION_DURATION_MS); - closeAnimation.play(contentAlphaAnimation); + animator.play(contentAlphaAnimation); + + } + + protected Animator getCloseAnimation() { + AnimatorSet closeAnimation = new AnimatorSet(); + + Animator alphaAnimation = ObjectAnimator.ofFloat(this, ALPHA, 1f, 0f); + alphaAnimation.setStartDelay(ALPHA_ANIMATION_START_DELAY_MS); + alphaAnimation.setDuration(ALPHA_ANIMATION_DURATION_MS); + closeAnimation.play(alphaAnimation); + + View displayedContent = mDisplayingRecentTasks ? mScrollView : mNoRecentItemsPane; + animateDisplayedContentForClose(displayedContent, closeAnimation); + if (mSupportsScrollArrows) { + animateDisplayedContentForClose(mStartScrollArrow, closeAnimation); + animateDisplayedContentForClose(mEndScrollArrow, closeAnimation); + } closeAnimation.addListener(new AnimatorListenerAdapter() { @Override @@ -289,14 +595,49 @@ public void onAnimationStart(Animator animation) { return closeAnimation; } - private void animateOpen(int currentFocusIndexOverride) { + private void animateDisplayedContentForOpen(View view, AnimatorSet animator) { + Animator translationXAnimation = ObjectAnimator.ofFloat( + view, + TRANSLATION_X, + -Utilities.dpToPx(CONTENT_START_TRANSLATION_X_DP), 0); + translationXAnimation.setDuration(CONTENT_TRANSLATION_X_ANIMATION_DURATION_MS); + translationXAnimation.setInterpolator(OPEN_TRANSLATION_X_INTERPOLATOR); + animator.play(translationXAnimation); + + Animator translationYAnimation = ObjectAnimator.ofFloat( + view, + TRANSLATION_Y, + -Utilities.dpToPx(CONTENT_START_TRANSLATION_Y_DP), 0); + translationYAnimation.setDuration(CONTENT_TRANSLATION_Y_ANIMATION_DURATION_MS); + translationYAnimation.setInterpolator(OPEN_TRANSLATION_Y_INTERPOLATOR); + animator.play(translationYAnimation); + + view.setAlpha(0.0f); + Animator contentAlphaAnimation = ObjectAnimator.ofFloat(view, ALPHA, 0f, + 1f); + contentAlphaAnimation.setStartDelay(CONTENT_ALPHA_ANIMATION_START_DELAY_MS); + contentAlphaAnimation.setDuration(CONTENT_ALPHA_ANIMATION_DURATION_MS); + animator.play(contentAlphaAnimation); + } + + protected void animateOpen(int currentFocusIndexOverride, boolean useStartDelay) { if (mOpenAnimation != null) { - // Restart animation since currentFocusIndexOverride can change the initial - // scroll. + // Restart animation since currentFocusIndexOverride can change the initial scroll. mOpenAnimation.cancel(); } + + // Reset the alpha for the case where the KQS view is opened before. + setAlpha(0); + mScrollView.setAlpha(0); + mNoRecentItemsPane.setAlpha(0); + mOpenAnimation = new AnimatorSet(); + if (useStartDelay) { + // Use a start delay to make the quick alt-tab case smoother + mOpenAnimation.setStartDelay(ViewConfiguration.getLongPressTimeout()); + } + Animator outlineAnimation = mOutlineAnimationProgress.animateToValue(1f); outlineAnimation.setDuration(OUTLINE_ANIMATION_DURATION_MS); mOpenAnimation.play(outlineAnimation); @@ -306,33 +647,25 @@ private void animateOpen(int currentFocusIndexOverride) { mOpenAnimation.play(alphaAnimation); View displayedContent = mDisplayingRecentTasks ? mScrollView : mNoRecentItemsPane; - Animator translationXAnimation = ObjectAnimator.ofFloat( - displayedContent, - TRANSLATION_X, - -Utilities.dpToPx(CONTENT_START_TRANSLATION_X_DP), 0); - translationXAnimation.setDuration(CONTENT_TRANSLATION_X_ANIMATION_DURATION_MS); - translationXAnimation.setInterpolator(OPEN_TRANSLATION_X_INTERPOLATOR); - mOpenAnimation.play(translationXAnimation); - - Animator translationYAnimation = ObjectAnimator.ofFloat( - displayedContent, - TRANSLATION_Y, - -Utilities.dpToPx(CONTENT_START_TRANSLATION_Y_DP), 0); - translationYAnimation.setDuration(CONTENT_TRANSLATION_Y_ANIMATION_DURATION_MS); - translationYAnimation.setInterpolator(OPEN_TRANSLATION_Y_INTERPOLATOR); - mOpenAnimation.play(translationYAnimation); + animateDisplayedContentForOpen(displayedContent, mOpenAnimation); + if (mSupportsScrollArrows) { + animateDisplayedContentForOpen(mStartScrollArrow, mOpenAnimation); + animateDisplayedContentForOpen(mEndScrollArrow, mOpenAnimation); + } - Animator contentAlphaAnimation = ObjectAnimator.ofFloat(displayedContent, ALPHA, 0f, 1f); - contentAlphaAnimation.setStartDelay(CONTENT_ALPHA_ANIMATION_START_DELAY_MS); - contentAlphaAnimation.setDuration(CONTENT_ALPHA_ANIMATION_DURATION_MS); - mOpenAnimation.play(contentAlphaAnimation); ViewOutlineProvider outlineProvider = getOutlineProvider(); + int defaultFocusedTaskIndex = Math.min( + getTaskCount() - 1, + currentFocusIndexOverride == -1 ? 1 : currentFocusIndexOverride); mOpenAnimation.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { super.onAnimationStart(animation); + InteractionJankMonitorWrapper.begin( + KeyboardQuickSwitchView.this, Cuj.CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN); setClipToPadding(false); + setClipToOutline(true); setOutlineProvider(new ViewOutlineProvider() { @Override public void getOutline(View view, Outline outline) { @@ -358,21 +691,57 @@ public void getOutline(View view, Outline outline) { OPEN_OUTLINE_INTERPOLATOR)); } }); - animateFocusMove(-1, Math.min( - mContent.getChildCount() - 1, - currentFocusIndexOverride == -1 ? 1 : currentFocusIndexOverride)); + + if (mSupportsScrollArrows) { + mScrollView.getViewTreeObserver().addOnGlobalLayoutListener( + new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + if (mScrollView.getWidth() == 0) { + return; + } + + if (mContent.getWidth() > mScrollView.getWidth()) { + mStartScrollArrow.setVisibility(VISIBLE); + mEndScrollArrow.setVisibility(VISIBLE); + updateArrowButtonsEnabledState(); + } + mScrollView.getViewTreeObserver().removeOnGlobalLayoutListener( + this); + } + }); + } + + animateFocusMove(-1, defaultFocusedTaskIndex); displayedContent.setVisibility(VISIBLE); setVisibility(VISIBLE); requestFocus(); + if (enableAltTabKqsOnConnectedDisplays.isTrue()) { + SystemUiProxy.INSTANCE.get(getContext()).getFocusState().addListener( + mViewCallbacks); + } + } + + @Override + public void onAnimationCancel(Animator animation) { + super.onAnimationCancel(animation); + InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN); } @Override public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); setClipToPadding(true); + setClipToOutline(false); setOutlineProvider(outlineProvider); invalidateOutline(); mOpenAnimation = null; + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN); + + View focusedTask = getTaskAt(defaultFocusedTaskIndex); + if (focusedTask != null) { + focusedTask.requestAccessibilityFocus(); + } } }); @@ -383,16 +752,20 @@ protected void animateFocusMove(int fromIndex, int toIndex) { if (!mDisplayingRecentTasks) { return; } + if (mOpenAnimation != null && fromIndex != -1) { + // Skip open animation on first tab after starting the animation + mOpenAnimation.end(); + } KeyboardQuickSwitchTaskView focusedTask = getTaskAt(toIndex); if (focusedTask == null) { return; } AnimatorSet focusAnimation = new AnimatorSet(); - focusAnimation.play(focusedTask.getFocusAnimator(true)); + focusedTask.addFocusAnimation(true, focusAnimation); KeyboardQuickSwitchTaskView previouslyFocusedTask = getTaskAt(fromIndex); if (previouslyFocusedTask != null) { - focusAnimation.play(previouslyFocusedTask.getFocusAnimator(false)); + previouslyFocusedTask.addFocusAnimation(false, focusAnimation); } focusAnimation.addListener(new AnimatorListenerAdapter() { @@ -404,8 +777,7 @@ public void onAnimationStart(Animator animation) { int firstVisibleTaskIndex = toIndex == 0 ? toIndex : getTaskAt(toIndex - 1) == null - ? toIndex - : toIndex - 1; + ? toIndex : toIndex - 1; // Scroll so that the previous task view is truncated as a visual hint that // there are more tasks initializeScroll( @@ -536,8 +908,9 @@ private void scrollLeftTo( } private boolean shouldScroll(@NonNull View targetTask, boolean shouldTruncateTarget) { - boolean isTargetTruncated = targetTask.getRight() + mSpacing > mScrollView.getScrollX() + mScrollView.getWidth() - || Math.max(0, targetTask.getLeft() - mSpacing) < mScrollView.getScrollX(); + boolean isTargetTruncated = + targetTask.getRight() + mSpacing > mScrollView.getScrollX() + mScrollView.getWidth() + || Math.max(0, targetTask.getLeft() - mSpacing) < mScrollView.getScrollX(); return isTargetTruncated && !shouldTruncateTarget; } @@ -559,8 +932,11 @@ public void onGlobalLayout() { @Nullable protected KeyboardQuickSwitchTaskView getTaskAt(int index) { - return !mDisplayingRecentTasks || index < 0 || index >= mContent.getChildCount() - ? null - : (KeyboardQuickSwitchTaskView) mContent.getChildAt(index); + return !mDisplayingRecentTasks || index < 0 || index >= getTaskCount() + ? null : (KeyboardQuickSwitchTaskView) mContent.getChildAt(index); + } + + public int getTaskCount() { + return mContent.getChildCount(); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java index d6ee92f195e..ccd081d0775 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java @@ -15,33 +15,52 @@ */ package com.android.launcher3.taskbar; -import static android.window.SplashScreen.SPLASH_SCREEN_STYLE_UNDEFINED; +import static android.window.DesktopModeFlags.ENABLE_TASKBAR_OVERFLOW; +import static com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType.UNMINIMIZE; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsFlatenning; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import android.animation.Animator; -import android.app.ActivityOptions; +import android.animation.AnimatorListenerAdapter; +import android.content.res.Resources; +import android.view.Gravity; import android.view.KeyEvent; +import android.view.MotionEvent; import android.view.animation.AnimationUtils; +import android.window.OnBackInvokedCallback; import android.window.RemoteTransition; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.internal.jank.Cuj; +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorListeners; +import com.android.launcher3.desktop.DesktopAppLaunchTransition; import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext; +import com.android.launcher3.taskbar.overlay.TaskbarOverlayDragLayer; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.views.BaseDragLayer; +import com.android.quickstep.FocusState; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.util.DesktopTask; import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.SingleTask; import com.android.quickstep.util.SlideInRemoteTransition; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.ActivityManagerWrapper; +import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import com.android.systemui.shared.system.QuickStepContract; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; +import com.android.wm.shell.shared.desktopmode.DesktopTaskToFrontReason; import java.io.PrintWriter; import java.util.List; +import java.util.Set; import java.util.function.Consumer; /** @@ -61,6 +80,10 @@ public class KeyboardQuickSwitchViewController { private int mCurrentFocusIndex = -1; private boolean mOnDesktop; + private boolean mWasDesktopTaskFilteredOut; + private boolean mWasOpenedFromTaskbar; + + private boolean mDetachingFromWindow = false; protected KeyboardQuickSwitchViewController( @NonNull TaskbarControllers controllers, @@ -77,14 +100,36 @@ protected int getCurrentFocusedIndex() { return mCurrentFocusIndex; } + protected boolean wasOpenedFromTaskbar() { + return mWasOpenedFromTaskbar; + } + protected void openQuickSwitchView( @NonNull List tasks, int numHiddenTasks, boolean updateTasks, int currentFocusIndexOverride, - boolean onDesktop) { + boolean onDesktop, + boolean hasDesktopTask, + boolean wasDesktopTaskFilteredOut, + boolean wasOpenedFromTaskbar) { + final boolean isTransientTaskBar = mControllers.taskbarActivityContext.isTransientTaskbar(); + positionView(wasOpenedFromTaskbar, isTransientTaskBar); + + // Keep the taskbar unstashed if the KQS is opened. + if (wasOpenedFromTaskbar && isTransientTaskBar) { + mControllers.taskbarStashController.updateTaskbarTimeout(/* isAutohideSuspended= */ + true); + } + mOverlayContext.getDragLayer().addView(mKeyboardQuickSwitchView); mOnDesktop = onDesktop; + mWasDesktopTaskFilteredOut = wasDesktopTaskFilteredOut; + mWasOpenedFromTaskbar = wasOpenedFromTaskbar; + + if (ENABLE_TASKBAR_OVERFLOW.isTrue() && wasOpenedFromTaskbar) { + mKeyboardQuickSwitchView.enableScrollArrowSupport(); + } mKeyboardQuickSwitchView.applyLoadPlan( mOverlayContext, @@ -92,7 +137,65 @@ protected void openQuickSwitchView( numHiddenTasks, updateTasks, currentFocusIndexOverride, - mViewCallbacks); + mViewCallbacks, + /* useDesktopTaskView= */ !onDesktop && hasDesktopTask, + /* useAnimationStartDelay= */ !wasOpenedFromTaskbar); + } + + protected void updateQuickSwitchView( + @NonNull List tasks, + int numHiddenTasks, + int currentFocusIndexOverride, + boolean hasDesktopTask, + boolean wasDesktopTaskFilteredOut, + boolean useAnimationStartDelay) { + mWasDesktopTaskFilteredOut = wasDesktopTaskFilteredOut; + mKeyboardQuickSwitchView.applyLoadPlan( + mOverlayContext, + tasks, + numHiddenTasks, + /* updateTasks= */ true, + currentFocusIndexOverride, + mViewCallbacks, + /* useDesktopTaskView= */ !mOnDesktop && hasDesktopTask, + useAnimationStartDelay); + } + + protected void positionView(boolean wasOpenedFromTaskbar, boolean isTransientTaskbar) { + if (!wasOpenedFromTaskbar) { + // Keep the default positioning. + return; + } + + BaseDragLayer.LayoutParams lp = new BaseDragLayer.LayoutParams( + mKeyboardQuickSwitchView.getLayoutParams()); + final Resources resources = mKeyboardQuickSwitchView.getResources(); + final int marginHorizontal = resources.getDimensionPixelSize( + R.dimen.keyboard_quick_switch_margin_ends); + + final DeviceProfile dp = mControllers.taskbarActivityContext.getDeviceProfile(); + // Calculate the additional margin space that the KQS should move up for the transient + // taskbar. The value of spaceForTaskbar is the distance between the bottom of the KQS + // view with 0 bottom margin to the top of the transient taskbar view. + final int spaceForTaskbar = isTransientTaskbar ? dp.getTaskbarProfile().getHeight() + + dp.getTaskbarProfile().getBottomMargin() + - dp.getTaskbarProfile().getStashedTaskbarHeight() : 0; + final int marginBottom = spaceForTaskbar + resources.getDimensionPixelSize( + R.dimen.keyboard_quick_switch_margin_bottom); + + lp.setMargins(marginHorizontal, 0, marginHorizontal, marginBottom); + lp.width = BaseDragLayer.LayoutParams.WRAP_CONTENT; + lp.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL; + mKeyboardQuickSwitchView.setLayoutParams(lp); + } + + protected void updateLayoutForSurface( + boolean updateLayoutFromTaskbar, int currentFocusIndexOverride) { + mKeyboardQuickSwitchView.getLayoutParams().width = updateLayoutFromTaskbar + ? BaseDragLayer.LayoutParams.WRAP_CONTENT + : BaseDragLayer.LayoutParams.MATCH_PARENT; + + mKeyboardQuickSwitchView.animateOpen(currentFocusIndexOverride, !updateLayoutFromTaskbar); } boolean isCloseAnimationRunning() { @@ -101,18 +204,29 @@ boolean isCloseAnimationRunning() { protected void closeQuickSwitchView(boolean animate) { if (isCloseAnimationRunning()) { - // Let currently-running animation finish. if (!animate) { mCloseAnimation.end(); } + // Let currently-running animation finish. return; } + mControllerCallbacks.onCloseStarted(); if (!animate) { + InteractionJankMonitorWrapper.begin( + mKeyboardQuickSwitchView, Cuj.CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE); onCloseComplete(); return; } mCloseAnimation = mKeyboardQuickSwitchView.getCloseAnimation(); + mCloseAnimation.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + super.onAnimationStart(animation); + InteractionJankMonitorWrapper.begin( + mKeyboardQuickSwitchView, Cuj.CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE); + } + }); mCloseAnimation.addListener(AnimatorListeners.forEndCallback(this::onCloseComplete)); mCloseAnimation.start(); } @@ -125,68 +239,127 @@ protected void closeQuickSwitchView(boolean animate) { * If the index is not -1, then the {@link com.android.quickstep.views.TaskView} at the returned * index will be focused. */ - protected int launchFocusedTask() { + @Nullable + protected Set launchFocusedTask() { if (mCurrentFocusIndex != -1) { return launchTaskAt(mCurrentFocusIndex); } // If the user quick switches too quickly, updateCurrentFocusIndex might not have run. return launchTaskAt(mControllerCallbacks.isFirstTaskRunning() - && mControllerCallbacks.getTaskCount() > 1 ? 1 : 0); + && mKeyboardQuickSwitchView.getTaskCount() > 1 ? 1 : 0); } - private int launchTaskAt(int index) { + @Nullable + private Set launchTaskAt(int index) { if (isCloseAnimationRunning()) { // Ignore taps on task views and alt key unpresses while the close animation is running. - return -1; + return null; } - // Even with a valid index, this can be null if the user tries to quick switch before the - // views have been added in the KeyboardQuickSwitchView. - GroupTask task = mControllerCallbacks.getTaskAt(index); - if (task == null) { - return mOnDesktop ? 1 : Math.max(0, index); + if (index == mKeyboardQuickSwitchView.getOverviewTaskIndex()) { + return mControllerCallbacks.getFirstHiddenTaskIds(); } - if (mControllerCallbacks.isTaskRunning(task)) { - // Ignore attempts to run the selected task if it is already running. - return -1; - } - TaskbarActivityContext context = mControllers.taskbarActivityContext; - RemoteTransition remoteTransition = new RemoteTransition(new SlideInRemoteTransition( + final RemoteTransition slideInTransition = new RemoteTransition(new SlideInRemoteTransition( Utilities.isRtl(mControllers.taskbarActivityContext.getResources()), - context.getDeviceProfile().overviewPageSpacing, + context.getDeviceProfile().getOverviewProfile().getPageSpacing(), QuickStepContract.getWindowCornerRadius(context), AnimationUtils.loadInterpolator( context, android.R.interpolator.fast_out_extra_slow_in)), "SlideInTransition"); - if (task instanceof DesktopTask) { + SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get( + mKeyboardQuickSwitchView.getContext()); + if (index == mKeyboardQuickSwitchView.getDesktopTaskIndex()) { UI_HELPER_EXECUTOR.execute(() -> - SystemUiProxy.INSTANCE.get(mKeyboardQuickSwitchView.getContext()) + systemUiProxy .showDesktopApps( mKeyboardQuickSwitchView.getDisplay().getDisplayId(), - remoteTransition)); - } else if (mOnDesktop) { - UI_HELPER_EXECUTOR.execute(() -> - SystemUiProxy.INSTANCE.get(mKeyboardQuickSwitchView.getContext()) - .showDesktopApp(task.task1.key.id)); - } else if (task.task2 == null) { - UI_HELPER_EXECUTOR.execute(() -> { - ActivityOptions activityOptions = mControllers.taskbarActivityContext - .makeDefaultActivityOptions(SPLASH_SCREEN_STYLE_UNDEFINED).options; - activityOptions.setRemoteTransition(remoteTransition); - - ActivityManagerWrapper.getInstance().startActivityFromRecents( - task.task1.key, activityOptions); - }); - } else { - mControllers.uiController.launchSplitTasks(task, remoteTransition); + slideInTransition, + /* taskIdReorderToFront */ null, + DesktopModeTransitionSource.KEYBOARD_SHORTCUT)); + return null; + } + // Even with a valid index, this can be null if the user tries to quick switch before the + // views have been added in the KeyboardQuickSwitchView. + GroupTask task = mControllerCallbacks.getTaskAt(index); + if (task == null) { + return mControllerCallbacks.getFirstHiddenTaskIds(); + } + + if (enableAltTabKqsFlatenning.isTrue() + && tryLaunchingCombinedTask(task, slideInTransition, systemUiProxy)) { + return null; + } + + // TODO b/414410702: move this check to before tryLaunchingCombinedTask() call. + if (mControllerCallbacks.isTaskRunning(task)) { + // Ignore attempts to run the selected task if it is already running. + return null; + } + + RemoteTransition remoteTransition = slideInTransition; + boolean canUnminimizeDesktopTask = task instanceof SingleTask singleTask + && mControllers.taskbarActivityContext.canUnminimizeDesktopTask( + singleTask.getTask().key.id); + if (mOnDesktop && canUnminimizeDesktopTask) { + // This app is being unminimized - use our own transition runner. + remoteTransition = getUnminimizeTransition(); + } + mControllers.taskbarActivityContext.handleGroupTaskLaunch( + task, + remoteTransition, + mOnDesktop, + DesktopTaskToFrontReason.ALT_TAB, + mKeyboardQuickSwitchView.getTaskAt(index), + DesktopModeTransitionSource.KEYBOARD_SHORTCUT); + return null; + } + + private boolean tryLaunchingCombinedTask(GroupTask task, RemoteTransition slideInTransition, + SystemUiProxy systemUiProxy) { + int taskId = task.getTasks().getFirst().key.id; + + // All DesktopTasks, irrespective of whether desktop mode is active, are launched here as + // the class DesktopTask is used in a special way by KQS view for showing thumbnails of + // freeform tasks. + if (task instanceof DesktopTask desktopTask) { + UI_HELPER_EXECUTOR.execute( + () -> systemUiProxy.activateDesk(desktopTask.getDeskId(), slideInTransition, + taskId, DesktopModeTransitionSource.KEYBOARD_SHORTCUT)); + return true; + } else if (mOnDesktop && task instanceof SingleTask) { + // Use the special API if user wants to switch to a fullscreen app while in desktop. + UI_HELPER_EXECUTOR.execute( + () -> systemUiProxy.moveToFullscreen(taskId, + DesktopModeTransitionSource.KEYBOARD_SHORTCUT, slideInTransition)); + return true; } - return -1; + + // For all other cases, let TaskbarActivityContext handle launching the task. + return false; + } + + private RemoteTransition getUnminimizeTransition() { + return new RemoteTransition( + new DesktopAppLaunchTransition( + mControllers.taskbarActivityContext, + DisplayController.INSTANCE.get(mControllers.taskbarActivityContext), + UNMINIMIZE, + Cuj.CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH, + MAIN_EXECUTOR + ), + "DesktopKeyboardQuickSwitchUnminimize"); } private void onCloseComplete() { mCloseAnimation = null; - mOverlayContext.getDragLayer().removeView(mKeyboardQuickSwitchView); + // Reset the view callbacks to prevent `onDetachedFromWindow` getting called in response to + // the `removeView(mKeyboardQuickSwitchView)` call. + mKeyboardQuickSwitchView.resetViewCallbacks(); + if (!mDetachingFromWindow) { + mOverlayContext.getDragLayer().removeView(mKeyboardQuickSwitchView); + } mControllerCallbacks.onCloseComplete(); + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE); } protected void onDestroy() { @@ -199,9 +372,20 @@ public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "\thasFocus=" + mKeyboardQuickSwitchView.hasFocus()); pw.println(prefix + "\tisCloseAnimationRunning=" + isCloseAnimationRunning()); pw.println(prefix + "\tmCurrentFocusIndex=" + mCurrentFocusIndex); + pw.println(prefix + "\tmOnDesktop=" + mOnDesktop); + pw.println(prefix + "\tmWasDesktopTaskFilteredOut=" + mWasDesktopTaskFilteredOut); + pw.println(prefix + "\tmWasOpenedFromTaskbar=" + mWasOpenedFromTaskbar); + } + + /** + * @return True if the MotionEvent is over the {@link KeyboardQuickSwitchView}. + */ + protected boolean isEventOverKeyboardQuickSwitch(TaskbarOverlayDragLayer dl, MotionEvent ev) { + return dl.isEventOverView(mKeyboardQuickSwitchView, ev); } - class ViewCallbacks { + class ViewCallbacks implements FocusState.FocusChangeListener { + public final OnBackInvokedCallback onBackInvokedCallback = () -> closeQuickSwitchView(true); boolean onKeyUp(int keyCode, KeyEvent event, boolean isRTL, boolean allowTraversal) { if (keyCode != KeyEvent.KEYCODE_TAB @@ -226,7 +410,7 @@ boolean onKeyUp(int keyCode, KeyEvent event, boolean isRTL, boolean allowTravers boolean traverseBackwards = (keyCode == KeyEvent.KEYCODE_TAB && event.isShiftPressed()) || (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT && isRTL) || (keyCode == KeyEvent.KEYCODE_DPAD_LEFT && !isRTL); - int taskCount = mControllerCallbacks.getTaskCount(); + int taskCount = mKeyboardQuickSwitchView.getTaskCount(); int toIndex = mCurrentFocusIndex == -1 // Focus the second-most recent app if possible ? (taskCount > 1 ? 1 : 0) @@ -261,5 +445,26 @@ void updateThumbnailInBackground(Task task, Consumer callback) { void updateIconInBackground(Task task, Consumer callback) { mControllerCallbacks.updateIconInBackground(task, callback); } + + boolean isAspectRatioSquare() { + return mControllerCallbacks.isAspectRatioSquare(); + } + + boolean isLandscape() { + return mControllerCallbacks.isLandscape(); + } + + void onViewDetchedFromWindow() { + mDetachingFromWindow = true; + closeQuickSwitchView(false); + mDetachingFromWindow = false; + } + + @Override + public void onFocusedDisplayChanged(int displayId) { + if (mControllers.taskbarActivityContext.getDisplayId() != displayId) { + closeQuickSwitchView(/* animate= */ true); + } + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 0270481571d..643c0a97593 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -15,46 +15,69 @@ */ package com.android.launcher3.taskbar; +import static com.android.launcher3.Flags.enableTaskbarUiThread; +import static com.android.launcher3.Flags.refactorTaskbarUiState; +import static com.android.launcher3.Flags.syncAppLaunchWithTaskbarStash; +import static com.android.launcher3.QuickstepTransitionManager.TASKBAR_TO_APP_DURATION; import static com.android.launcher3.QuickstepTransitionManager.TRANSIENT_TASKBAR_TRANSITION_DURATION; +import static com.android.launcher3.QuickstepTransitionManager.getTaskbarToHomeDuration; import static com.android.launcher3.statemanager.BaseState.FLAG_NON_INTERACTIVE; import static com.android.launcher3.taskbar.TaskbarEduTooltipControllerKt.TOOLTIP_STEP_FEATURES; import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_VISIBLE; -import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS; -import static com.android.window.flags2.Flags.enableDesktopWindowingWallpaperActivity; +import static com.android.launcher3.taskbar.TaskbarManagerImpl.TASKBAR_UI_THREAD; +import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IGNORE_IN_APP; +import static com.android.launcher3.taskbar.navbutton.SetupNavLayoutterKt.GLIF_EXPRESSIVE_LIGHT_THEME; +import static com.android.launcher3.taskbar.navbutton.SetupNavLayoutterKt.GLIF_EXPRESSIVE_THEME; +import static com.android.launcher3.taskbar.navbutton.SetupNavLayoutterKt.SUW_THEME_SYSTEM_PROPERTY; +import static com.android.quickstep.interaction.AllSetActivity.ALL_SET_SWIPE_THRESHOLD_FOR_WORKSPACE_ANIM; import android.animation.Animator; import android.animation.AnimatorSet; +import android.animation.ValueAnimator; +import android.os.SystemProperties; import android.window.RemoteTransition; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.app.animation.Interpolators; +import com.android.launcher3.BuildConfig; +import com.android.launcher3.BuildConfigs; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Flags; +import com.android.launcher3.LauncherInteractor; import com.android.launcher3.LauncherState; -import com.android.launcher3.QuickstepTransitionManager; +import com.android.launcher3.LauncherUiState; +import com.android.launcher3.LauncherUiStateUtil; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.InstanceIdSequence; import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.taskbar.bubbles.BubbleBarController; -import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.taskbar.bubbles.BubbleControllers; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.OnboardingPrefs; +import com.android.launcher3.util.SafeCloseable; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.GestureState; import com.android.quickstep.HomeVisibilityState; import com.android.quickstep.LauncherActivityInterface; +import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RecentsAnimationCallbacks; -import com.android.quickstep.SystemUiProxy; -import com.android.quickstep.util.GroupTask; -import com.android.quickstep.util.TISBindHelper; +import com.android.quickstep.util.SplitTask; import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; + +import kotlin.Unit; import java.io.PrintWriter; import java.util.Arrays; +import java.util.concurrent.Executor; /** * A data source which integrates with a Launcher instance @@ -67,58 +90,88 @@ public class LauncherTaskbarUIController extends TaskbarUIController { public static final int ALL_APPS_PAGE_PROGRESS_INDEX = 1; public static final int WIDGETS_PAGE_PROGRESS_INDEX = 2; public static final int SYSUI_SURFACE_PROGRESS_INDEX = 3; + public static final int LAUNCHER_PAUSE_PROGRESS_INDEX = 4; - public static final int DISPLAY_PROGRESS_COUNT = 4; + public static final int DISPLAY_PROGRESS_COUNT = 5; private final AnimatedFloat mTaskbarInAppDisplayProgress = new AnimatedFloat( this::onInAppDisplayProgressChanged); - private final MultiPropertyFactory mTaskbarInAppDisplayProgressMultiProp = new MultiPropertyFactory<>( - mTaskbarInAppDisplayProgress, - AnimatedFloat.VALUE, DISPLAY_PROGRESS_COUNT, Float::max); - - private final QuickstepLauncher mLauncher; + private final MultiPropertyFactory mTaskbarInAppDisplayProgressMultiProp = + new MultiPropertyFactory<>(mTaskbarInAppDisplayProgress, + AnimatedFloat.VALUE, DISPLAY_PROGRESS_COUNT, Float::max); + private final AnimatedFloat mLauncherPauseProgress = new AnimatedFloat( + this::onLauncherPauseProgressUpdate); + + private final LauncherInteractor mLauncher; + private final LauncherUiState mLauncherUiState; + private final Executor mTaskbarExecutor; private final HomeVisibilityState mHomeState; - private final DeviceProfile.OnDeviceProfileChangeListener mOnDeviceProfileChangeListener = dp -> { - onStashedInAppChanged(dp); - if (mControllers != null && mControllers.taskbarViewController != null) { - mControllers.taskbarViewController.onRotationChanged(dp); - } - }; - private final HomeVisibilityState.VisibilityChangeListener mVisibilityChangeListener = this::onLauncherVisibilityChanged; + private final DeviceProfile.OnDeviceProfileChangeListener mOnDeviceProfileChangeListener = + dp -> { + onStashedInAppChanged(dp); + postAdjustHotseatForBubbleBar(); + if (mControllers != null && mControllers.taskbarViewController != null) { + mControllers.taskbarViewController.onRotationChanged(dp); + } + }; + private SafeCloseable mOnDeviceProfileChangeListenerClosable; + private final HomeVisibilityState.VisibilityChangeListener mVisibilityChangeListener = + this::onLauncherVisibilityChanged; // Initialized in init. - private final TaskbarLauncherStateController mTaskbarLauncherStateController = new TaskbarLauncherStateController(); - - public LauncherTaskbarUIController(QuickstepLauncher launcher) { + private final TaskbarLauncherStateController + mTaskbarLauncherStateController = new TaskbarLauncherStateController(); + // When overview-in-a-window is enabled, that window is the container, else it is mLauncher. + private RecentsViewContainer mRecentsViewContainer; + + public LauncherTaskbarUIController( + LauncherInteractor launcher, + LauncherUiState launcherUiState, + HomeVisibilityState homeState) { mLauncher = launcher; - mHomeState = SystemUiProxy.INSTANCE.get(mLauncher).getHomeVisibilityState(); + mLauncherUiState = launcherUiState; + mHomeState = homeState; + mTaskbarExecutor = enableTaskbarUiThread() ? TASKBAR_UI_THREAD : Runnable::run; } @Override protected void init(TaskbarControllers taskbarControllers) { super.init(taskbarControllers); - mTaskbarLauncherStateController.init(mControllers, mLauncher, - mControllers.getSharedState().sysuiStateFlags); + mTaskbarLauncherStateController.init(mControllers, mLauncher, mLauncherUiState, + mControllers.getSharedState().sysuiStateFlags, mTaskbarExecutor); + final TaskbarActivityContext taskbarContext = mControllers.taskbarActivityContext; + int displayId = taskbarContext.getDisplayId(); + BaseContainerInterface containerInterface = OverviewComponentObserver.INSTANCE.get( + taskbarContext).getContainerInterface(displayId); + if (containerInterface != null + && containerInterface.getCreatedContainer() + instanceof RecentsWindowManager recentsWindowManager) { + mRecentsViewContainer = recentsWindowManager; + mRecentsViewContainer.setTaskbarInteractor(new TaskbarInteractor(this)); + } else { + // TODO(b/404636836) Refactor API calls on mRecentsViewContainer + mRecentsViewContainer = mLauncher.getLauncherAsRecentViewContainer(); + } + mLauncher.setTaskbarInteractor(new TaskbarInteractor(this)); - mLauncher.setTaskbarUIController(this); mHomeState.addListener(mVisibilityChangeListener); - onLauncherVisibilityChanged( - Flags.useActivityOverlay() - ? mHomeState.isHomeVisible() - : mLauncher.hasBeenResumed(), - true /* fromInit */); + onLauncherVisibilityChanged(mHomeState.isHomeVisible(), true /* fromInit */); - onStashedInAppChanged(mLauncher.getDeviceProfile()); - mLauncher.addOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener); + onStashedInAppChanged(getDeviceProfile()); + mOnDeviceProfileChangeListenerClosable = + mLauncherUiState.getDeviceProfileRef().forEach(mTaskbarExecutor, dp -> { + if (mLauncherUiState.isDeviceProfileInitialized()) { + mOnDeviceProfileChangeListener.onDeviceProfileChanged(dp); + } + return Unit.INSTANCE; + }); // Restore the in-app display progress from before Taskbar was recreated. float[] prevProgresses = mControllers.getSharedState().inAppDisplayProgressMultiPropValues; - // Make a copy of the previous progress to set since updating the multiprop will - // update - // the property which also calls onInAppDisplayProgressChanged() which writes - // the current + // Make a copy of the previous progress to set since updating the multiprop will update + // the property which also calls onInAppDisplayProgressChanged() which writes the current // values into the shared state prevProgresses = Arrays.copyOf(prevProgresses, prevProgresses.length); for (int i = 0; i < prevProgresses.length; i++) { @@ -126,14 +179,21 @@ protected void init(TaskbarControllers taskbarControllers) { } } + private DeviceProfile getDeviceProfile() { + return LauncherUiStateUtil.getDeviceProfile(mLauncher, mLauncherUiState); + } + @Override protected void onDestroy() { + onLauncherVisibilityChanged(false /* isVisible */, true /* fromInitOrDestroy */); + if (mOnDeviceProfileChangeListenerClosable != null) { + mOnDeviceProfileChangeListenerClosable.close(); + } super.onDestroy(); - onLauncherVisibilityChanged(false); mTaskbarLauncherStateController.onDestroy(); - mLauncher.setTaskbarUIController(null); - mLauncher.removeOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener); + mLauncher.setTaskbarInteractor(null); + mRecentsViewContainer.setTaskbarInteractor(null); mHomeState.removeListener(mVisibilityChangeListener); } @@ -141,9 +201,8 @@ private void onInAppDisplayProgressChanged() { if (mControllers != null) { // Update our shared state so we can restore it if taskbar gets recreated. for (int i = 0; i < DISPLAY_PROGRESS_COUNT; i++) { - mControllers - .getSharedState().inAppDisplayProgressMultiPropValues[i] = mTaskbarInAppDisplayProgressMultiProp - .get(i).getValue(); + mControllers.getSharedState().inAppDisplayProgressMultiPropValues[i] = + mTaskbarInAppDisplayProgressMultiProp.get(i).getValue(); } // Ensure nav buttons react to our latest state if necessary. mControllers.navbarButtonsViewController.updateNavButtonTranslationY(); @@ -152,8 +211,9 @@ private void onInAppDisplayProgressChanged() { @Override protected boolean isTaskbarTouchable() { - return !(mTaskbarLauncherStateController.isAnimatingToLauncher() - && mTaskbarLauncherStateController.isTaskbarAlignedWithHotseat()); + // Touching down during animation to Hotseat will end the transition and allow the touch to + // go through to the Hotseat directly. + return !isAnimatingToHotseat(); } public void setShouldDelayLauncherStateAnim(boolean shouldDelayLauncherStateAnim) { @@ -161,19 +221,25 @@ public void setShouldDelayLauncherStateAnim(boolean shouldDelayLauncherStateAnim shouldDelayLauncherStateAnim); } + @Override + public void stashHotseat(boolean stash) { + mTaskbarLauncherStateController.stashHotseat(stash); + } + + @Override + public void unStashHotseatInstantly() { + mTaskbarLauncherStateController.unStashHotseatInstantly(); + } + /** * Adds the Launcher resume animator to the given animator set. * - * This should be used to run a Launcher resume animation whose progress matches - * a + * This should be used to run a Launcher resume animation whose progress matches a * swipe progress. * - * @param placeholderDuration a placeholder duration to be used to ensure all - * full-length - * sub-animations are properly coordinated. This - * duration should not - * actually be used since this animation tracks a - * swipe progress. + * @param placeholderDuration a placeholder duration to be used to ensure all full-length + * sub-animations are properly coordinated. This duration should not + * actually be used since this animation tracks a swipe progress. */ protected void addLauncherVisibilityChangedAnimation(AnimatorSet animation, int placeholderDuration) { @@ -184,52 +250,87 @@ protected void addLauncherVisibilityChangedAnimation(AnimatorSet animation, placeholderDuration)); } + protected void addWorkspaceRevealAnim(AnimatorSet as, int duration) { + String SUWTheme = SystemProperties.get(SUW_THEME_SYSTEM_PROPERTY, ""); + boolean isExpressiveTheme = SUWTheme.equals(GLIF_EXPRESSIVE_THEME) + || SUWTheme.equals(GLIF_EXPRESSIVE_LIGHT_THEME); + if (!isExpressiveTheme || !Flags.enableNewAllSetAnimation()) { + return; + } + ValueAnimator autoPlayAnimator = ValueAnimator.ofFloat(0f, 1f); + autoPlayAnimator.setDuration(duration); + autoPlayAnimator.setInterpolator(Interpolators.LINEAR); + autoPlayAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + private boolean mCanAutoPlay = true; + @Override + public void onAnimationUpdate(ValueAnimator valueAnimator) { + if (mCanAutoPlay && valueAnimator.getAnimatedFraction() + > ALL_SET_SWIPE_THRESHOLD_FOR_WORKSPACE_ANIM) { + mLauncher.startScalingWorkspaceRevealAnim(true, false); + mCanAutoPlay = false; + } + } + }); + as.play(autoPlayAnimator); + } /** - * Should be called from onResume() and onPause(), and animates the Taskbar - * accordingly. + * Should be called from onResume() and onPause(), and animates the Taskbar accordingly. */ @Override public void onLauncherVisibilityChanged(boolean isVisible) { + final TaskbarActivityContext taskbarContext = mControllers.taskbarActivityContext; + if (taskbarContext.showLockedTaskbarOnHome() + && !taskbarContext.showDesktopTaskbarForFreeformDisplay() + && taskbarContext.isPrimaryDisplay()) { + DisplayController.INSTANCE.get(taskbarContext).notifyConfigChange(); + } + + if (android.view.accessibility.Flags.launcherAppDisplayProgressUpdateOnVisibilityChange()) { + onInAppDisplayProgressChanged(); + } + onLauncherVisibilityChanged(isVisible, false /* fromInit */); } - private void onLauncherVisibilityChanged(boolean isVisible, boolean fromInit) { + private void onLauncherVisibilityChanged(boolean isVisible, boolean fromInitOrDestroy) { + if (mControllers == null) { + return; + } onLauncherVisibilityChanged( isVisible, - fromInit, + fromInitOrDestroy, /* startAnimation= */ true, - DisplayController.isTransientTaskbar(mLauncher) - ? TRANSIENT_TASKBAR_TRANSITION_DURATION - : (!isVisible - ? QuickstepTransitionManager.TASKBAR_TO_APP_DURATION - : QuickstepTransitionManager.getTaskbarToHomeDuration())); + getTaskbarAnimationDuration(isVisible)); + } + + private int getTaskbarAnimationDuration(boolean isVisible) { + // fast animation duration since we will not be playing workspace reveal animation. + boolean shouldOverrideToFastAnimation = !isHotseatIconOnTopWhenAligned(); + boolean isPersistent = + mControllers.taskbarActivityContext.getTaskbarFeatureEvaluator().isPersistent(); + if (isVisible || isPersistent) { + return getTaskbarToHomeDuration(shouldOverrideToFastAnimation, isPersistent); + } else { + return (mControllers.taskbarActivityContext.isTransientTaskbar()) + ? TRANSIENT_TASKBAR_TRANSITION_DURATION : TASKBAR_TO_APP_DURATION; + } } @Nullable private Animator onLauncherVisibilityChanged( - boolean isVisible, boolean fromInit, boolean startAnimation, int duration) { - // Launcher is resumed during the swipe-to-overview gesture under - // shell-transitions, so - // avoid updating taskbar state in that situation (when it's non-interactive -- - // or + boolean isVisible, boolean fromInitOrDestroy, boolean startAnimation, int duration) { + // Launcher is resumed during the swipe-to-overview gesture under shell-transitions, so + // avoid updating taskbar state in that situation (when it's non-interactive -- or // "background") to avoid premature animations. - if (ENABLE_SHELL_TRANSITIONS && isVisible - && mLauncher.getStateManager().getState().hasFlag(FLAG_NON_INTERACTIVE) - && !mLauncher.getStateManager().getState().isTaskbarAlignedWithHotseat(mLauncher)) { + LauncherState state = mTaskbarLauncherStateController.getLauncherState(); + boolean nonInteractiveState = state.hasFlag(FLAG_NON_INTERACTIVE) + && !state.isTaskbarAlignedWithHotseat(); + if (isVisible && (nonInteractiveState || mSkipLauncherVisibilityChange)) { return null; } - DesktopVisibilityController desktopController = LauncherActivityInterface.INSTANCE - .getDesktopVisibilityController(); - if (!enableDesktopWindowingWallpaperActivity() - && desktopController != null - && desktopController.areDesktopTasksVisible()) { - // TODO: b/333533253 - Remove after flag rollout - isVisible = false; - } - mTaskbarLauncherStateController.updateStateForFlag(FLAG_VISIBLE, isVisible); - if (fromInit) { + if (fromInitOrDestroy) { duration = 0; } return mTaskbarLauncherStateController.applyState(duration, startAnimation); @@ -242,31 +343,61 @@ public void onStateTransitionCompletedAfterSwipeToHome(LauncherState state) { @Override public void refreshResumedState() { - onLauncherVisibilityChanged(Flags.useActivityOverlay() - ? mHomeState.isHomeVisible() - : mLauncher.hasBeenResumed()); + onLauncherVisibilityChanged(mHomeState.isHomeVisible()); } @Override public void adjustHotseatForBubbleBar(boolean isBubbleBarVisible) { - if (mLauncher.getHotseat() != null) { - mLauncher.getHotseat().adjustForBubbleBar(isBubbleBarVisible); + mLauncher.adjustHotseatForBubbleBar(isBubbleBarVisible); + } + + private void postAdjustHotseatForBubbleBar() { + mLauncher.postAdjustHotseatForBubbleBar(isBubbleBarVisible(), mControllers != null); + } + + private boolean isBubbleBarVisible() { + BubbleControllers bubbleControllers = mControllers.bubbleControllers.orElse(null); + return bubbleControllers != null + && bubbleControllers.bubbleBarViewController.isBubbleBarVisible(); + } + + /** + * Create Taskbar animation when going from an app to Launcher as part of recents transition. + * {@inheritDoc} + */ + @Override + public Animator getParallelAnimationToGestureEndTarget( + GestureState.GestureEndTarget gestureEndTarget, long duration, + RecentsAnimationCallbacks callbacks) { + return mTaskbarLauncherStateController.createAnimToLauncher( + LauncherActivityInterface.INSTANCE.stateFromGestureEndTarget(gestureEndTarget), + callbacks, + duration); + } + + /** + * Create Taskbar animation to be played alongside the Launcher app launch animation. + */ + public @Nullable Animator createAnimToApp() { + if (!syncAppLaunchWithTaskbarStash()) { + return null; } + TaskbarStashController stashController = mControllers.taskbarStashController; + stashController.updateStateForFlag(TaskbarStashController.FLAG_IN_APP, true); + return stashController.createApplyStateAnimator(stashController.getStashDuration()); } /** - * Create Taskbar animation when going from an app to Launcher as part of - * recents transition. - * - * @param toState If known, the state we will end up in when reaching - * Launcher. - * @param callbacks callbacks to track the recents animation lifecycle. The - * state change is - * automatically reset once the recents animation finishes + * Temporarily ignore FLAG_IN_APP for app launches to prevent premature taskbar stashing. + * This is needed because taskbar gets a signal to stash before we actually start the + * app launch animation. */ - public Animator createAnimToLauncher(@NonNull LauncherState toState, - @NonNull RecentsAnimationCallbacks callbacks, long duration) { - return mTaskbarLauncherStateController.createAnimToLauncher(toState, callbacks, duration); + public void setIgnoreInAppFlagForSync(boolean enabled) { + if (syncAppLaunchWithTaskbarStash() + && mControllers != null + && mControllers.taskbarStashController != null) { + mControllers.taskbarStashController.updateStateForFlag(FLAG_IGNORE_IN_APP, enabled); + } } public void updateTaskbarLauncherStateGoingHome() { @@ -274,13 +405,9 @@ public void updateTaskbarLauncherStateGoingHome() { mTaskbarLauncherStateController.applyState(); } - public boolean isDraggingItem() { - return mControllers.taskbarDragController.isDragging(); - } - @Override protected void onStashedInAppChanged() { - onStashedInAppChanged(mLauncher.getDeviceProfile()); + onStashedInAppChanged(getDeviceProfile()); } private void onStashedInAppChanged(DeviceProfile deviceProfile) { @@ -289,8 +416,7 @@ private void onStashedInAppChanged(DeviceProfile deviceProfile) { } /** - * Starts a Taskbar EDU flow, if the user should see one upon launching an - * application. + * Starts a Taskbar EDU flow, if the user should see one upon launching an application. */ public void showEduOnAppLaunch() { if (!shouldShowEduOnAppLaunch()) { @@ -300,7 +426,7 @@ public void showEduOnAppLaunch() { } // Persistent features EDU tooltip. - if (!DisplayController.isTransientTaskbar(mLauncher)) { + if (!mControllers.taskbarActivityContext.isTransientTaskbar()) { mControllers.taskbarEduTooltipController.maybeShowFeaturesEdu(); return; } @@ -315,8 +441,7 @@ public void setSkipNextRecentsAnimEnd() { } /** - * Returns {@code true} if a Taskbar education should be shown on application - * launch. + * Returns {@code true} if a Taskbar education should be shown on application launch. */ public boolean shouldShowEduOnAppLaunch() { if (Utilities.isRunningInTestHarness()) { @@ -324,8 +449,9 @@ public boolean shouldShowEduOnAppLaunch() { } // Persistent features EDU tooltip. - if (!DisplayController.isTransientTaskbar(mLauncher)) { - return !OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP.hasReachedMax(mLauncher); + if (!mControllers.taskbarActivityContext.isTransientTaskbar()) { + return !OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP.hasReachedMax( + mControllers.taskbarActivityContext); } // Transient swipe EDU tooltip. @@ -341,8 +467,7 @@ public void onTaskbarIconLaunched(ItemInfo item) { } /** - * Animates Taskbar elements during a transition to a Launcher state that should - * use in-app + * Animates Taskbar elements during a transition to a Launcher state that should use in-app * layouts. * * @param progress [0, 1] @@ -355,16 +480,22 @@ public void onTaskbarInAppDisplayProgressUpdate(float progress, int progressInde // This method can be called before init() is called. return; } - if (mControllers.uiController.isIconAlignedWithHotseat() - && !mTaskbarLauncherStateController.isAnimatingToLauncher()) { - // Only animate the nav buttons while home and not animating home, otherwise let - // the TaskbarViewController handle it. - mControllers.navbarButtonsViewController - .getTaskbarNavButtonTranslationYForInAppDisplay() - .updateValue(mLauncher.getDeviceProfile().getTaskbarOffsetY() - * mTaskbarInAppDisplayProgress.value); - mControllers.navbarButtonsViewController - .getOnTaskbarBackgroundNavButtonColorOverride().updateValue(progress); + if (mControllers.uiController.isIconAlignedWithHotseat()) { + if (!mTaskbarLauncherStateController.isAnimatingToLauncher()) { + // Only animate the nav buttons while home and not animating home, otherwise let + // the TaskbarViewController handle it. + mControllers.navbarButtonsViewController + .getTaskbarNavButtonTranslationYForInAppDisplay() + .updateValue(getDeviceProfile().getTaskbarOffsetY() + * mTaskbarInAppDisplayProgress.value); + mControllers.navbarButtonsViewController + .getOnTaskbarBackgroundNavButtonColorOverride().updateValue(progress); + } + if (isBubbleBarEnabled()) { + mControllers.bubbleControllers.ifPresent( + c -> c.bubbleStashController.setInAppDisplayOverrideProgress( + mTaskbarInAppDisplayProgress.value)); + } } } @@ -409,7 +540,18 @@ public boolean isIconAlignedWithHotseat() { public boolean isHotseatIconOnTopWhenAligned() { return mTaskbarLauncherStateController.isInHotseatOnTopStates() && mTaskbarInAppDisplayProgressMultiProp.get(MINUS_ONE_PAGE_PROGRESS_INDEX) - .getValue() == 0; + .getValue() == 0; + } + + @Override + public boolean isAnimatingToHotseat() { + return mTaskbarLauncherStateController.isAnimatingToLauncher() + && isIconAlignedWithHotseat(); + } + + @Override + public void endAnimationToHotseat() { + mTaskbarLauncherStateController.resetIconAlignment(); } @Override @@ -418,21 +560,50 @@ protected boolean isInOverviewUi() { } @Override - protected boolean canToggleHomeAllApps() { - return mLauncher.isResumed() + protected void toggleAllApps(boolean focusSearch) { + final boolean canToggleHomeAllApps = isLauncherResumed() && !mTaskbarLauncherStateController.isInOverviewUi() - && !mLauncher.areDesktopTasksVisible(); + && isLauncherTopResumedActivity(); + if (canToggleHomeAllApps) { + mLauncher.toggleAllApps(focusSearch); + return; + } + super.toggleAllApps(focusSearch); + } + + private boolean isLauncherResumed() { + if (refactorTaskbarUiState()) { + final boolean ret = mLauncherUiState.isResumed(); + if (BuildConfigs.IS_STUDIO_BUILD && ret != mLauncher.isResumed()) { + throw new IllegalStateException("hasBeenResumed doesn't match"); + } + return ret; + } else { + return mLauncher.isResumed(); + } + } + + private boolean isLauncherTopResumedActivity() { + if (refactorTaskbarUiState()) { + final boolean ret = mLauncherUiState.isTopResumedActivityRef().getValue(); + if (BuildConfigs.IS_STUDIO_BUILD && ret != mLauncher.isTopResumedActivity()) { + throw new IllegalStateException("isTopResumedActivity doesn't match"); + } + return ret; + } else { + return mLauncher.isTopResumedActivity(); + } } @Override public RecentsView getRecentsView() { - return mLauncher.getOverviewPanel(); + return mRecentsViewContainer.getOverviewPanel(); } @Override public void launchSplitTasks( - @NonNull GroupTask groupTask, @Nullable RemoteTransition remoteTransition) { - mLauncher.launchSplitTasks(groupTask, remoteTransition); + @NonNull SplitTask splitTask, @Nullable RemoteTransition remoteTransition) { + mLauncher.launchSplitTasks(splitTask, remoteTransition); } @Override @@ -440,12 +611,6 @@ protected void onIconLayoutBoundsChanged() { mTaskbarLauncherStateController.resetIconAlignment(); } - @Nullable - @Override - protected TISBindHelper getTISBindHelper() { - return mLauncher.getTISBindHelper(); - } - @Override public void dumpLogs(String prefix, PrintWriter pw) { super.dumpLogs(prefix, pw); @@ -459,7 +624,9 @@ public void dumpLogs(String prefix, PrintWriter pw) { "MINUS_ONE_PAGE_PROGRESS_INDEX", "ALL_APPS_PAGE_PROGRESS_INDEX", "WIDGETS_PAGE_PROGRESS_INDEX", - "SYSUI_SURFACE_PROGRESS_INDEX"); + "SYSUI_SURFACE_PROGRESS_INDEX", + "LAUNCHER_PAUSE_PROGRESS_INDEX"); + pw.println(String.format("%s\tmRecentsWindowContainer=%s", prefix, mRecentsViewContainer)); mTaskbarLauncherStateController.dumpLogs(prefix + "\t", pw); } @@ -468,4 +635,56 @@ public void dumpLogs(String prefix, PrintWriter pw) { protected String getTaskbarUIControllerName() { return "LauncherTaskbarUIController"; } + + @Override + public void onBubbleBarLocationAnimated(BubbleBarLocation location) { + mTaskbarLauncherStateController.onBubbleBarLocationChanged(location, /* animate = */ true); + mLauncher.setBubbleBarLocation(location); + } + + @Override + public void onBubbleBarLocationUpdated(BubbleBarLocation location) { + mTaskbarLauncherStateController.onBubbleBarLocationChanged(location, /* animate = */ false); + mLauncher.setBubbleBarLocation(location); + } + + @Override + public void onSwipeToUnstashTaskbar() { + // Once taskbar is unstashed, the user cannot return back to the overlay. We can + // clear it here to set the expected state once the user goes home. + mLauncher.resetOverlayScroll(); + } + + /** + * Called when Launcher Activity resumed while staying at home. + *

+ * Shift nav buttons up to at-home position. + */ + public void onLauncherResume() { + mLauncherPauseProgress.animateToValue(0.0f).start(); + } + + /** + * Called when Launcher Activity paused while staying at home. + *

+ * To avoid UI clash between taskbar & bottom sheet, shift nav buttons down to in-app position. + */ + public void onLauncherPause() { + mLauncherPauseProgress.animateToValue(1.0f).start(); + } + + /** + * On launcher stop, avoid animating taskbar & overriding pre-existing animations. + */ + public void onLauncherStop() { + mLauncherPauseProgress.cancelAnimation(); + mLauncherPauseProgress.updateValue(0.0f); + } + + private void onLauncherPauseProgressUpdate() { + // If we are not aligned with hotseat, setting this will clobber the 3 button nav position. + // So in that case, treat the progress as 0 instead. + float pauseProgress = isIconAlignedWithHotseat() ? mLauncherPauseProgress.value : 0; + onTaskbarInAppDisplayProgressUpdate(pauseProgress, LAUNCHER_PAUSE_PROGRESS_INDEX); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/ManageWindowsTaskbarShortcut.kt b/quickstep/src/com/android/launcher3/taskbar/ManageWindowsTaskbarShortcut.kt new file mode 100644 index 00000000000..09c15a619c1 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/ManageWindowsTaskbarShortcut.kt @@ -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. + */ + +package com.android.launcher3.taskbar + +import android.content.Context +import android.graphics.Bitmap +import android.view.MotionEvent +import android.view.View +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.popup.SystemShortcut +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_MULTI_INSTANCE_MENU_OPEN +import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext +import com.android.launcher3.util.TouchController +import com.android.launcher3.views.ActivityContext +import com.android.quickstep.RecentsModel +import com.android.quickstep.SystemUiProxy +import com.android.quickstep.util.DesktopTask +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.wm.shell.shared.desktopmode.DesktopTaskToFrontReason +import com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer + +/** + * A single menu item shortcut to execute displaying open instances of an app. Default interaction + * for [onClick] is to open the menu in a floating window. Touching one of the displayed tasks + * launches it. + */ +class ManageWindowsTaskbarShortcut( + private val target: T, + private val itemInfo: ItemInfo?, + private val originalView: View, + private val controllers: TaskbarControllers, +) : + SystemShortcut( + R.drawable.desktop_mode_ic_taskbar_menu_manage_windows, + R.string.manage_windows_option_taskbar, + target, + itemInfo, + originalView, + ) where T : Context?, T : ActivityContext? { + private lateinit var taskbarShortcutAllWindowsView: TaskbarShortcutManageWindowsView + private val recentsModel = RecentsModel.INSTANCE[controllers.taskbarActivityContext] + + override fun onClick(v: View?) { + val targetPackage = itemInfo?.getTargetPackage() + val targetUserId = itemInfo?.user?.identifier + val isTargetPackageTask: (Task) -> Boolean = { task -> + task.key?.packageName == targetPackage && task.key.userId == targetUserId + } + + recentsModel.getTasks { tasks -> + val desktopTask = tasks.filterIsInstance().firstOrNull() + val packageDesktopTasks = + (desktopTask?.tasks ?: emptyList()).filter(isTargetPackageTask) + val nonDesktopPackageTasks = + tasks.flatMap { it.tasks }.filter { isTargetPackageTask(it) } + + // Add tasks from the fetched tasks, deduplicating by task ID + val packageTasks = + (packageDesktopTasks + nonDesktopPackageTasks).distinctBy { it.key.id } + + // Since fetching thumbnails is asynchronous, use `awaitedTaskIds` to gate until the + // tasks are ready to display + val awaitedTaskIds = packageTasks.map { it.key.id }.toMutableSet() + + createAndShowTaskShortcutView(packageTasks, awaitedTaskIds) + } + } + + /** + * Processes a list of tasks to generate thumbnails and create a taskbar shortcut view. + * + * Iterates through the tasks, retrieves thumbnails, and adds them to a list. When all + * thumbnails are processed, it creates a [TaskbarShortcutManageWindowsView] with the collected + * thumbnails and positions it appropriately. + */ + private fun createAndShowTaskShortcutView(tasks: List, pendingTaskIds: MutableSet) { + val taskList = arrayListOf>() + + tasks.forEach { task -> + recentsModel.thumbnailCache.getThumbnailInBackground(task) { + thumbnailData: ThumbnailData -> + pendingTaskIds.remove(task.key.id) + // Add the current pair of task id and ThumbnailData to the list of all tasks + if (thumbnailData.thumbnail != null) { + taskList.add(task.key.id to thumbnailData.thumbnail) + } + // If the set is empty, all thumbnails have been fetched + if (pendingTaskIds.isEmpty() && taskList.isNotEmpty()) { + createAndPositionTaskbarShortcut(taskList) + } + } + } + } + + /** + * Creates and positions the [TaskbarShortcutManageWindowsView] with the provided thumbnails. + */ + private fun createAndPositionTaskbarShortcut(taskList: ArrayList>) { + val onIconClickListener = + ({ taskId: Int? -> + taskbarShortcutAllWindowsView.animateClose() + if (taskId != null) { + SystemUiProxy.INSTANCE.get(target) + .showDesktopApp( + taskId, + /* transition= */ null, + DesktopTaskToFrontReason.TASKBAR_MANAGE_WINDOW, + ) + } + }) + + val onOutsideClickListener = { taskbarShortcutAllWindowsView.animateClose() } + + taskbarShortcutAllWindowsView = + TaskbarShortcutManageWindowsView( + originalView, + controllers.taskbarOverlayController.requestWindow(), + taskList, + onIconClickListener, + onOutsideClickListener, + controllers, + ) + + // If the view is removed from elsewhere, reset the state to allow the taskbar to auto-stash + taskbarShortcutAllWindowsView.menuView.scrollableMenuView.addOnAttachStateChangeListener( + object : View.OnAttachStateChangeListener { + override fun onViewAttachedToWindow(v: View) { + return + } + + override fun onViewDetachedFromWindow(v: View) { + controllers.taskbarAutohideSuspendController.updateFlag( + FLAG_AUTOHIDE_SUSPEND_MULTI_INSTANCE_MENU_OPEN, + false, + ) + controllers.taskbarPopupController.cleanUpMultiInstanceMenuReference() + } + } + ) + } + + /** Closes the multi-instance menu if it has been initialized. */ + fun closeMultiInstanceMenu() { + if (::taskbarShortcutAllWindowsView.isInitialized) { + taskbarShortcutAllWindowsView.animateClose() + } + } + + /** + * A view container for displaying the window of open instances of an app + * + * Handles showing the window snapshots, adding the carousel to the overlay, and closing it. + * Also acts as a touch controller to intercept touch events outside the carousel to close it. + */ + class TaskbarShortcutManageWindowsView( + private val originalView: View, + private val taskbarOverlayContext: TaskbarOverlayContext, + snapshotList: ArrayList>, + onIconClickListener: (Int) -> Unit, + onOutsideClickListener: () -> Unit, + private val controllers: TaskbarControllers, + ) : + ManageWindowsViewContainer( + originalView.context, + originalView.context.getColor(R.color.materialColorSurfaceBright), + ), + TouchController { + private val taskbarActivityContext = controllers.taskbarActivityContext + + init { + createAndShowMenuView(snapshotList, onIconClickListener, onOutsideClickListener) + taskbarOverlayContext.dragLayer.addTouchController(this) + animateOpen() + } + + /** Adds the carousel menu to the taskbar overlay drag layer */ + override fun addToContainer(menuView: ManageWindowsView) { + positionCarouselMenu() + + controllers.taskbarAutohideSuspendController.updateFlag( + FLAG_AUTOHIDE_SUSPEND_MULTI_INSTANCE_MENU_OPEN, + true, + ) + AbstractFloatingView.closeAllOpenViewsExcept( + taskbarActivityContext, + AbstractFloatingView.TYPE_TASKBAR_OVERLAY_PROXY, + ) + menuView.scrollableMenuView.minimumHeight = menuView.scrollableMenuHeight + menuView.scrollableMenuView.minimumWidth = menuView.menuWidth + + taskbarOverlayContext.dragLayer?.addView(menuView.scrollableMenuView) + menuView.scrollableMenuView.requestFocus() + } + + /** + * Positions the carousel menu relative to the taskbar and the calling app's icon. + * + * Calculates the Y position to place the carousel above the taskbar, and the X position to + * align with the calling app while ensuring it doesn't go beyond the screen edge. + */ + private fun positionCarouselMenu() { + val deviceProfile = taskbarActivityContext.deviceProfile + val margin = + context.resources.getDimension( + R.dimen.taskbar_multi_instance_menu_min_padding_from_screen_edge + ) + + // Calculate the Y position to place the carousel above the taskbar + menuView.scrollableMenuView.y = + deviceProfile.deviceProperties.availableHeightPx - + menuView.scrollableMenuHeight - + controllers.taskbarStashController.touchableHeight - + margin + + // Calculate the X position to align with the calling app, + // but avoid clashing with the screen edge + menuView.scrollableMenuView.translationX = + if (Utilities.isRtl(context.resources)) { + -(deviceProfile.deviceProperties.availableWidthPx - menuView.menuWidth) / 2f + } else { + val maxX = + deviceProfile.deviceProperties.availableWidthPx - + menuView.menuWidth - + margin + minOf(originalView.x, maxX) + } + } + + /** Closes the carousel menu and removes it from the taskbar overlay drag layer */ + override fun removeFromContainer() { + controllers.taskbarAutohideSuspendController.updateFlag( + FLAG_AUTOHIDE_SUSPEND_MULTI_INSTANCE_MENU_OPEN, + false, + ) + taskbarOverlayContext.dragLayer?.removeView(menuView.scrollableMenuView) + taskbarOverlayContext.dragLayer.removeTouchController(this) + controllers.taskbarPopupController.cleanUpMultiInstanceMenuReference() + } + + /** TouchController implementations for closing the carousel when touched outside */ + override fun onControllerTouchEvent(ev: MotionEvent?): Boolean { + return false + } + + override fun onControllerInterceptTouchEvent(ev: MotionEvent?): Boolean { + ev?.let { + if ( + it.action == MotionEvent.ACTION_DOWN && + !taskbarOverlayContext.dragLayer.isEventOverView( + menuView.scrollableMenuView, + it, + ) + ) { + animateClose() + } + } + return false + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 293c2b2a65c..d70f858ca62 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -16,15 +16,16 @@ package com.android.launcher3.taskbar; import static android.view.View.AccessibilityDelegate; -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; +import static com.android.launcher3.Flags.refactorTaskbarUiState; import static com.android.launcher3.LauncherAnimUtils.ROTATION_DRAWABLE_PERCENT; import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor; -import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION; +import static com.android.launcher3.anim.AnimatorListeners.forEndCallback; import static com.android.launcher3.taskbar.LauncherTaskbarUIController.SYSUI_SURFACE_PROGRESS_INDEX; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAutoStashConnectedDisplayTaskbar; import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_A11Y; import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK; import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME; @@ -38,9 +39,12 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISABLED; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISMISS_IME; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_BUTTON_VISIBLE; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_VISIBLE; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; @@ -48,36 +52,39 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SHORTCUT_HELPER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; +import android.animation.Animator; import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; import android.annotation.DrawableRes; import android.annotation.IdRes; import android.annotation.LayoutRes; +import android.annotation.SuppressLint; import android.content.Context; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; -import android.graphics.Color; import android.graphics.Point; import android.graphics.Rect; +import android.graphics.RectF; import android.graphics.Region; import android.graphics.Region.Op; -import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.Drawable; -import android.graphics.drawable.PaintDrawable; -import android.graphics.drawable.RotateDrawable; -import android.inputmethodservice.InputMethodService; +import android.net.Uri; +import android.os.Bundle; import android.os.Handler; +import android.os.SystemProperties; +import android.provider.Settings; import android.util.Property; import android.view.Gravity; +import android.view.HapticFeedbackConstants; +import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; import android.view.View.OnAttachStateChangeListener; -import android.view.View.OnClickListener; -import android.view.View.OnHoverListener; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.WindowManager; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; @@ -92,38 +99,52 @@ import com.android.launcher3.anim.AlphaUpdateListener; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton; +import com.android.launcher3.taskbar.bubbles.BubbleBarController; import com.android.launcher3.taskbar.navbutton.NavButtonLayoutFactory; import com.android.launcher3.taskbar.navbutton.NavButtonLayoutFactory.NavButtonLayoutter; import com.android.launcher3.taskbar.navbutton.NearestTouchFrame; import com.android.launcher3.util.DimensionUtils; -import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.LockedUserState; import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; import com.android.launcher3.util.MultiValueAlpha; +import com.android.launcher3.util.SettingsCache; import com.android.launcher3.util.TouchController; import com.android.launcher3.util.window.WindowManagerProxy; import com.android.launcher3.views.BaseDragLayer; import com.android.systemui.shared.navigationbar.KeyButtonRipple; import com.android.systemui.shared.rotation.FloatingRotationButton; import com.android.systemui.shared.rotation.RotationButton; -import com.android.systemui.shared.rotation.RotationButtonController; +import com.android.systemui.shared.statusbar.phone.BarTransitions; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; import java.io.PrintWriter; import java.util.ArrayList; import java.util.StringJoiner; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.IntPredicate; /** * Controller for managing nav bar buttons in taskbar */ -public class NavbarButtonsViewController implements TaskbarControllers.LoggableTaskbarController { +public class NavbarButtonsViewController implements TaskbarControllers.LoggableTaskbarController, + BubbleBarController.BubbleBarLocationListener { private final Rect mTempRect = new Rect(); - private static final int FLAG_SWITCHER_SHOWING = 1 << 0; + /** Whether the IME Switcher button is visible. */ + private static final int FLAG_IME_SWITCHER_BUTTON_VISIBLE = 1 << 0; + /** Whether the IME is visible. */ private static final int FLAG_IME_VISIBLE = 1 << 1; - private static final int FLAG_ROTATION_BUTTON_VISIBLE = 1 << 2; + /** + * The back button is visually adjusted to indicate that it will dismiss the IME when pressed. + * This only takes effect while the IME is visible. By default, it is set while the IME is + * visible, but may be overridden by the + * {@link android.inputmethodservice.InputMethodService.BackDispositionMode backDispositionMode} + * set by the IME. + */ + private static final int FLAG_BACK_DISMISS_IME = 1 << 2; private static final int FLAG_A11Y_VISIBLE = 1 << 3; private static final int FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE = 1 << 4; private static final int FLAG_KEYGUARD_VISIBLE = 1 << 5; @@ -137,15 +158,18 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT private static final int FLAG_SMALL_SCREEN = 1 << 13; private static final int FLAG_SLIDE_IN_VIEW_VISIBLE = 1 << 14; private static final int FLAG_KEYBOARD_SHORTCUT_HELPER_SHOWING = 1 << 15; + private static final int FLAG_TASKBAR_STASHED_ON_CD = 1 << 16; /** - * Flags where a UI could be over Taskbar surfaces, so the color override should - * be disabled. + * Flags where a UI could be over Taskbar surfaces, so the color override should be disabled. */ - private static final int FLAGS_ON_BACKGROUND_COLOR_OVERRIDE_DISABLED = FLAG_NOTIFICATION_SHADE_EXPANDED - | FLAG_VOICE_INTERACTION_WINDOW_SHOWING; + private static final int FLAGS_ON_BACKGROUND_COLOR_OVERRIDE_DISABLED = + FLAG_NOTIFICATION_SHADE_EXPANDED | FLAG_VOICE_INTERACTION_WINDOW_SHOWING; private static final String NAV_BUTTONS_SEPARATE_WINDOW_TITLE = "Taskbar Nav Buttons"; + private static final String SUW_THEME_SYSTEM_PROPERTY = "setupwizard.theme"; + private static final String GLIF_EXPRESSIVE_THEME = "glif_expressive"; + private static final String GLIF_EXPRESSIVE_LIGHT_THEME = "glif_expressive_light"; private static final double SQUARE_ASPECT_RATIO_BOTTOM_BOUND = 0.95; private static final double SQUARE_ASPECT_RATIO_UPPER_BOUND = 1.05; @@ -155,6 +179,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT public static final int ALPHA_INDEX_SUW = 2; private static final int NUM_ALPHA_CHANNELS = 3; + private static final long AUTODIM_TIMEOUT_MS = 2250; + private static final long PREDICTIVE_BACK_TIMEOUT_MS = 200; + private final ArrayList mPropertyHolders = new ArrayList<>(); private final ArrayList mAllButtons = new ArrayList<>(); private int mState; @@ -163,17 +190,20 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT private final @Nullable Context mNavigationBarPanelContext; private final WindowManagerProxy mWindowManagerProxy; private final NearestTouchFrame mNavButtonsView; + private final Handler mHandler; + private final TaskbarUiState mTaskbarUiState; private final LinearLayout mNavButtonContainer; // Used for IME+A11Y buttons private final ViewGroup mEndContextualContainer; private final ViewGroup mStartContextualContainer; - private final int mLightIconColorOnHome; - private final int mDarkIconColorOnHome; - /** - * Color to use for navigation bar buttons, if they are on on a Taskbar surface - * background. - */ + private final int mLightIconColorOnWorkspace; + private final int mDarkIconColorOnWorkspace; + /** Color to use for navbar buttons, if they are on on a Taskbar surface background. */ private final int mOnBackgroundIconColor; + private final boolean mIsExpressiveThemeEnabled; + + private @Nullable Animator mNavBarLocationAnimator; + private @Nullable BubbleBarLocation mBubbleBarTargetLocation; private final AnimatedFloat mTaskbarNavButtonTranslationY = new AnimatedFloat( this::updateNavButtonTranslationY); @@ -182,13 +212,15 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT private final AnimatedFloat mTaskbarNavButtonTranslationYForIme = new AnimatedFloat( this::updateNavButtonTranslationY); private float mLastSetNavButtonTranslationY; - // Used for System UI state updates that should translate the nav button for - // in-app display. + // Used for System UI state updates that should translate the nav button for in-app display. private final AnimatedFloat mNavButtonInAppDisplayProgressForSysui = new AnimatedFloat( this::updateNavButtonInAppDisplayProgressForSysui); - /** Expected nav button dark intensity communicated via the framework. */ + /** + * Expected nav button dark intensity piped down from {@code LightBarController} in framework + * via {@code TaskbarDelegate}. + */ private final AnimatedFloat mTaskbarNavButtonDarkIntensity = new AnimatedFloat( - this::updateNavButtonColor); + this::onDarkIntensityChanged); /** {@code 1} if the Taskbar background color is fully opaque. */ private final AnimatedFloat mOnTaskbarBackgroundNavButtonColorOverride = new AnimatedFloat( this::updateNavButtonColor); @@ -202,6 +234,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT private final Rect mFloatingRotationButtonBounds = new Rect(); + private final Uri mButtonOrderChangedUri = Settings.Secure.getUriFor( + Settings.Secure.NAVIGATIONBAR_KEY_ORDER); + // Initialized in init. private TaskbarControllers mControllers; private boolean mIsImeRenderingNavButtons; @@ -218,26 +253,51 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT // Variables for moving nav buttons to a separate window above IME private boolean mAreNavButtonsInSeparateWindow = false; private BaseDragLayer mSeparateWindowParent; // Initialized in init. - private final ViewTreeObserver.OnComputeInternalInsetsListener mSeparateWindowInsetsComputer = this::onComputeInsetsForSeparateWindow; + private final ViewTreeObserver.OnComputeInternalInsetsListener mSeparateWindowInsetsComputer = + this::onComputeInsetsForSeparateWindow; private final RecentsHitboxExtender mHitboxExtender = new RecentsHitboxExtender(); private ImageView mRecentsButton; private Space mSpace; + private TaskbarTransitions mTaskbarTransitions; + private @BarTransitions.TransitionMode int mTransitionMode; + + private final Runnable mAutoDim = () -> mTaskbarTransitions.setAutoDim(true); + + private final SettingsCache.OnChangeListener mButtonOrderListener; + + private final boolean mIsUserUnlocked; + public NavbarButtonsViewController(TaskbarActivityContext context, - @Nullable Context navigationBarPanelContext, NearestTouchFrame navButtonsView) { + @Nullable Context navigationBarPanelContext, NearestTouchFrame navButtonsView, + Handler handler, TaskbarUiState taskbarUiState) { mContext = context; mNavigationBarPanelContext = navigationBarPanelContext; mWindowManagerProxy = WindowManagerProxy.INSTANCE.get(mContext); mNavButtonsView = navButtonsView; + mHandler = handler; + mTaskbarUiState = taskbarUiState; mNavButtonContainer = mNavButtonsView.findViewById(R.id.end_nav_buttons); mEndContextualContainer = mNavButtonsView.findViewById(R.id.end_contextual_buttons); mStartContextualContainer = mNavButtonsView.findViewById(R.id.start_contextual_buttons); - mLightIconColorOnHome = context.getColor(R.color.taskbar_nav_icon_light_color_on_home); - mDarkIconColorOnHome = context.getColor(R.color.taskbar_nav_icon_dark_color_on_home); + mLightIconColorOnWorkspace = context.getColor(R.color.taskbar_nav_icon_light_color_on_home); + mDarkIconColorOnWorkspace = context.getColor(R.color.taskbar_nav_icon_dark_color_on_home); mOnBackgroundIconColor = Utilities.isDarkTheme(context) ? context.getColor(R.color.taskbar_nav_icon_light_color) : context.getColor(R.color.taskbar_nav_icon_dark_color); + + if (mContext.isPhoneMode()) { + mTaskbarTransitions = new TaskbarTransitions(mContext, mNavButtonsView); + } + String SUWTheme = SystemProperties.get(SUW_THEME_SYSTEM_PROPERTY, ""); + mIsExpressiveThemeEnabled = SUWTheme.equals(GLIF_EXPRESSIVE_THEME) + || SUWTheme.equals(GLIF_EXPRESSIVE_LIGHT_THEME); + + mIsUserUnlocked = LockedUserState.get(context).isUserUnlocked(); + + mButtonOrderListener = isEnabled -> getLayoutterForCurrentState().layoutButtons( + mContext, isA11yButtonPersistent()); } /** @@ -249,26 +309,35 @@ public void init(TaskbarControllers controllers) { } protected void setupController() { - boolean isThreeButtonNav = mContext.isThreeButtonNav(); + final boolean isThreeButtonNav = mContext.isThreeButtonNav(); + final boolean isPhoneMode = mContext.isPhoneMode(); DeviceProfile deviceProfile = mContext.getDeviceProfile(); Resources resources = mContext.getResources(); - Point p = !mContext.isUserSetupComplete() - ? new Point(0, mControllers.taskbarActivityContext.getSetupWindowSize()) - : DimensionUtils.getTaskbarPhoneDimensions(deviceProfile, resources, - mContext.isPhoneMode()); - mNavButtonsView.getLayoutParams().height = p.y; - mIsImeRenderingNavButtons = mContext.imeDrawsImeNavBar(); -// mDisplayController = DisplayController.INSTANCE.get(mContext); + int setupSize = mControllers.taskbarActivityContext.getSetupWindowSize(); + Point p = DimensionUtils.getTaskbarPhoneDimensions(deviceProfile, resources, isPhoneMode, + mContext.isGestureNav()); + ViewGroup.LayoutParams navButtonsViewLayoutParams = mNavButtonsView.getLayoutParams(); + navButtonsViewLayoutParams.width = p.x; + if (!mContext.isUserSetupComplete()) { + // Setup mode in phone mode uses gesture nav. + navButtonsViewLayoutParams.height = setupSize; + } else { + navButtonsViewLayoutParams.height = p.y; + } + mNavButtonsView.setLayoutParams(navButtonsViewLayoutParams); + mIsImeRenderingNavButtons = mContext.imeDrawsImeNavBar(); if (!mIsImeRenderingNavButtons) { // IME switcher - mImeSwitcherButton = addButton(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH, + mImeSwitcherButton = addButton(com.android.internal.R.drawable.ic_ime_switcher, + BUTTON_IME_SWITCH, isThreeButtonNav ? mStartContextualContainer : mEndContextualContainer, mControllers.navButtonController, R.id.ime_switcher); + // A11y and IME Switcher buttons overlap on phone mode, show only a11y if both visible. mPropertyHolders.add(new StatePropertyHolder(mImeSwitcherButton, - flags -> ((flags & FLAG_SWITCHER_SHOWING) != 0) - && ((flags & FLAG_ROTATION_BUTTON_VISIBLE) == 0))); + flags -> (flags & FLAG_IME_SWITCHER_BUTTON_VISIBLE) != 0 + && !(isPhoneMode && (flags & FLAG_A11Y_VISIBLE) != 0))); } mPropertyHolders.add(new StatePropertyHolder( @@ -282,65 +351,55 @@ protected void setupController() { .get(ALPHA_INDEX_SMALL_SCREEN), flags -> (flags & FLAG_SMALL_SCREEN) == 0)); - mPropertyHolders.add(new StatePropertyHolder(mControllers.taskbarDragLayerController - .getKeyguardBgTaskbar(), flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0)); + if (!isPhoneMode) { + mPropertyHolders.add(new StatePropertyHolder(mControllers.taskbarDragLayerController + .getKeyguardBgTaskbar(), flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0)); + } + + // Start at 1 because relevant flags are unset at init. + mOnBackgroundNavButtonColorOverrideMultiplier.value = 1; - // Force nav buttons (specifically back button) to be visible during setup - // wizard. - boolean isInSetup = !mContext.isUserSetupComplete(); - boolean isInKidsMode = mContext.isNavBarKidsModeActive(); - boolean alwaysShowButtons = isThreeButtonNav || isInSetup; + // Potentially force the back button to be visible during setup wizard. The back button + // won't show up if the expressive theme is enabled and simple view is disabled + final boolean shouldShowInSetup = !mContext.isUserSetupComplete() + && (!mIsExpressiveThemeEnabled || mContext.isSimpleViewEnabled()); + final boolean alwaysShowButtons = isThreeButtonNav || shouldShowInSetup; - // Make sure to remove nav bar buttons translation when any of the following - // occur: + // Make sure to remove nav bar buttons translation when any of the following occur: // - Notification shade is expanded - // - IME is showing (add separate translation for IME) + // - IME is visible (e.g. when editing a Folder name) // - VoiceInteractionWindow (assistant) is showing // - Keyboard shortcuts helper is showing - int flagsToRemoveTranslation = FLAG_NOTIFICATION_SHADE_EXPANDED | FLAG_IME_VISIBLE - | FLAG_VOICE_INTERACTION_WINDOW_SHOWING | FLAG_KEYBOARD_SHORTCUT_HELPER_SHOWING; - mPropertyHolders.add(new StatePropertyHolder(mNavButtonInAppDisplayProgressForSysui, - flags -> (flags & flagsToRemoveTranslation) != 0, AnimatedFloat.VALUE, - 1, 0)); - // Center nav buttons in new height for IME. - float transForIme = (mContext.getDeviceProfile().taskbarHeight - - mControllers.taskbarInsetsController.getTaskbarHeightForIme()) / 2f; - // For gesture nav, nav buttons only show for IME anyway so keep them translated - // down. - float defaultButtonTransY = alwaysShowButtons ? 0 : transForIme; - mPropertyHolders.add(new StatePropertyHolder(mTaskbarNavButtonTranslationYForIme, - flags -> (flags & FLAG_IME_VISIBLE) != 0 && !isInKidsMode, AnimatedFloat.VALUE, - transForIme, defaultButtonTransY)); + if (!isPhoneMode) { + int flagsToRemoveTranslation = FLAG_NOTIFICATION_SHADE_EXPANDED | FLAG_IME_VISIBLE + | FLAG_VOICE_INTERACTION_WINDOW_SHOWING | FLAG_KEYBOARD_SHORTCUT_HELPER_SHOWING; + mPropertyHolders.add(new StatePropertyHolder(mNavButtonInAppDisplayProgressForSysui, + flags -> (flags & flagsToRemoveTranslation) != 0, AnimatedFloat.VALUE, + 1, 0)); - // Start at 1 because relevant flags are unset at init. - mOnBackgroundNavButtonColorOverrideMultiplier.value = 1; - mPropertyHolders.add(new StatePropertyHolder( - mOnBackgroundNavButtonColorOverrideMultiplier, - flags -> (flags & FLAGS_ON_BACKGROUND_COLOR_OVERRIDE_DISABLED) == 0)); + mPropertyHolders.add(new StatePropertyHolder( + mOnBackgroundNavButtonColorOverrideMultiplier, + flags -> (flags & FLAGS_ON_BACKGROUND_COLOR_OVERRIDE_DISABLED) == 0)); - mPropertyHolders.add(new StatePropertyHolder( - mSlideInViewVisibleNavButtonColorOverride, - flags -> (flags & FLAG_SLIDE_IN_VIEW_VISIBLE) != 0)); + mPropertyHolders.add(new StatePropertyHolder( + mSlideInViewVisibleNavButtonColorOverride, + flags -> (flags & FLAG_SLIDE_IN_VIEW_VISIBLE) != 0)); + } if (alwaysShowButtons) { initButtons(mNavButtonContainer, mEndContextualContainer, mControllers.navButtonController); updateButtonLayoutSpacing(); - updateStateForFlag(FLAG_SMALL_SCREEN, mContext.isPhoneButtonNavMode()); + updateStateForFlag(FLAG_SMALL_SCREEN, isPhoneMode); - mPropertyHolders.add(new StatePropertyHolder( - mControllers.taskbarDragLayerController.getNavbarBackgroundAlpha(), - flags -> (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0)); - } else if (!mIsImeRenderingNavButtons) { - View imeDownButton = addButton(R.drawable.ic_sysbar_back, BUTTON_BACK, - mStartContextualContainer, mControllers.navButtonController, R.id.back); - imeDownButton.setRotation(Utilities.isRtl(resources) ? 90 : -90); - // Only show when IME is visible. - mPropertyHolders.add(new StatePropertyHolder(imeDownButton, - flags -> (flags & FLAG_IME_VISIBLE) != 0)); + if (!isPhoneMode) { + mPropertyHolders.add(new StatePropertyHolder( + mControllers.taskbarDragLayerController.getNavbarBackgroundAlpha(), + flags -> (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0)); + } } mFloatingRotationButton = new FloatingRotationButton( - ENABLE_TASKBAR_NAVBAR_UNIFICATION ? mNavigationBarPanelContext : mContext, + mNavigationBarPanelContext, R.string.accessibility_rotate_button, R.layout.rotate_suggestion, R.id.rotate_suggestion, @@ -353,14 +412,18 @@ protected void setupController() { R.bool.floating_rotation_button_position_left); mControllers.rotationButtonController.setRotationButton(mFloatingRotationButton, mRotationButtonListener); + if (isPhoneMode) { + mTaskbarTransitions.init(); + } applyState(); mPropertyHolders.forEach(StatePropertyHolder::endAnimation); // Initialize things needed to move nav buttons to separate window. - mSeparateWindowParent = new BaseDragLayer(mContext, null, 0) { + mSeparateWindowParent = new BaseDragLayer<>(mContext, null, 0) { @Override public void recreateControllers() { + super.recreateControllers(); mControllers = new TouchController[0]; } @@ -372,6 +435,12 @@ protected boolean canFindActiveController() { } }; mSeparateWindowParent.recreateControllers(); + if (BubbleBarController.isBubbleBarEnabled()) { + mNavButtonsView.addOnLayoutChangeListener( + (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> + onLayoutsUpdated() + ); + } } private void initButtons(ViewGroup navContainer, ViewGroup endContainer, @@ -390,6 +459,7 @@ private void initButtons(ViewGroup navContainer, ViewGroup endContainer, (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0 || (flags & FLAG_KEYGUARD_OCCLUDED) != 0; return (flags & FLAG_DISABLE_BACK) == 0 + && (flags & FLAG_TASKBAR_STASHED_ON_CD) == 0 && (!mContext.isGestureNav() || !mContext.isUserSetupComplete()) && ((flags & FLAG_KEYGUARD_VISIBLE) == 0 || showingOnKeyguard); })); @@ -400,16 +470,19 @@ private void initButtons(ViewGroup navContainer, ViewGroup endContainer, flags -> (flags & FLAG_IME_VISIBLE) == 0)); } mPropertyHolders.add(new StatePropertyHolder(mBackButton, - flags -> (flags & FLAG_IME_VISIBLE) != 0, + flags -> (flags & FLAG_BACK_DISMISS_IME) != 0, ROTATION_DRAWABLE_PERCENT, 1f, 0f)); - // Translate back button to be at end/start of other buttons for keyguard + // Translate back button to be at end/start of other buttons for keyguard (only after SUW + // since it is laid to align with SUW actions while in that state) int navButtonSize = mContext.getResources().getDimensionPixelSize( R.dimen.taskbar_nav_buttons_size); boolean isRtl = Utilities.isRtl(mContext.getResources()); if (!mContext.isPhoneMode()) { mPropertyHolders.add(new StatePropertyHolder( - mBackButton, flags -> (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0 - || (flags & FLAG_KEYGUARD_VISIBLE) != 0, + mBackButton, flags -> mContext.isUserSetupComplete() + && ((flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0 + || (flags & FLAG_KEYGUARD_VISIBLE) != 0) + && (!shouldShowHomeButtonInLockscreen(flags)), VIEW_TRANSLATE_X, navButtonSize * (isRtl ? -2 : 2), 0)); } @@ -419,10 +492,9 @@ private void initButtons(ViewGroup navContainer, ViewGroup endContainer, mHomeButtonAlpha = new MultiValueAlpha(mHomeButton, NUM_ALPHA_CHANNELS); mHomeButtonAlpha.setUpdateVisibility(true); mPropertyHolders.add( - new StatePropertyHolder(mHomeButtonAlpha.get( - ALPHA_INDEX_KEYGUARD_OR_DISABLE), - flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 - && (flags & FLAG_DISABLE_HOME) == 0 && !mContext.isGestureNav())); + new StatePropertyHolder(mHomeButtonAlpha.get(ALPHA_INDEX_KEYGUARD_OR_DISABLE), + flags -> shouldShowHomeButtonInLockscreen(flags) + && (flags & FLAG_TASKBAR_STASHED_ON_CD) == 0)); // Recents button mRecentsButton = addButton(R.drawable.ic_sysbar_recent, BUTTON_RECENTS, @@ -438,27 +510,83 @@ private void initButtons(ViewGroup navContainer, ViewGroup endContainer, navButtonController.onButtonClick(BUTTON_RECENTS, v); mHitboxExtender.onRecentsButtonClicked(); }); + mRecentsButton.addOnLayoutChangeListener( + (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { + notifyRecentsButtonPosition(); + }); mPropertyHolders.add(new StatePropertyHolder(mRecentsButton, flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 && (flags & FLAG_DISABLE_RECENTS) == 0 - && !mContext.isNavBarKidsModeActive() && !mContext.isGestureNav())); + && !mContext.isNavBarKidsModeActive() && !mContext.isGestureNav() + && (flags & FLAG_TASKBAR_STASHED_ON_CD) == 0)); // A11y button mA11yButton = addButton(R.drawable.ic_sysbar_accessibility_button, BUTTON_A11Y, endContainer, navButtonController, R.id.accessibility_button, R.layout.taskbar_contextual_button); mPropertyHolders.add(new StatePropertyHolder(mA11yButton, - flags -> (flags & FLAG_A11Y_VISIBLE) != 0 - && (flags & FLAG_ROTATION_BUTTON_VISIBLE) == 0)); + flags -> (flags & FLAG_A11Y_VISIBLE) != 0)); mSpace = new Space(mNavButtonsView.getContext()); mSpace.setOnClickListener(view -> navButtonController.onButtonClick(BUTTON_SPACE, view)); - mSpace.setOnLongClickListener(view -> navButtonController.onButtonLongClick(BUTTON_SPACE, view)); + mSpace.setOnLongClickListener(view -> + navButtonController.onButtonLongClick(BUTTON_SPACE, view)); + + if (android.view.accessibility.Flags.navbarFlipOrderOption()) { + SettingsCache.INSTANCE.get(mContext).register( + mButtonOrderChangedUri, mButtonOrderListener); + } + } + + private void notifyRecentsButtonPosition() { + if (mRecentsButton != null && mControllers != null + && mControllers.navButtonController != null) { + int[] location = mRecentsButton.getLocationOnScreen(); + Rect bounds = new Rect( + location[0], + location[1], + location[0] + mRecentsButton.getWidth(), + location[1] + mRecentsButton.getHeight() + ); + mControllers.navButtonController.onRecentsButtonLayoutChanged(bounds); + } + } + + /** + * Method to determine whether the Navigation Bar is viewable in Setup Wizard + * + * @return {@code true} if the device is in Setup Wizard, the expressive theme is enabled, + * and Simple View is NOT enabled + */ + boolean isNavbarHiddenInSUW() { + if (mContext == null) { + return false; + } + return !mContext.isUserSetupComplete() && mIsExpressiveThemeEnabled + && !mContext.isSimpleViewEnabled(); + } + + /** + * Method to determine whether to show the home button in lockscreen + * + * When the keyguard is visible hide home button. Anytime we are + * occluded we want to show the home button for apps over keyguard. + * however we don't want to show when not occluded/visible. + * (visible false || occluded true) && disable false && not gnav + */ + private boolean shouldShowHomeButtonInLockscreen(int flags) { + return ((flags & FLAG_KEYGUARD_VISIBLE) == 0 + || (flags & FLAG_KEYGUARD_OCCLUDED) != 0) + && (flags & FLAG_DISABLE_HOME) == 0 + && !mContext.isGestureNav() + && mIsUserUnlocked; } private void parseSystemUiFlags(@SystemUiStateFlags long sysUiStateFlags) { mSysuiStateFlags = sysUiStateFlags; - boolean isImeVisible = (sysUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0; - boolean isImeSwitcherShowing = (sysUiStateFlags & SYSUI_STATE_IME_SWITCHER_SHOWING) != 0; + boolean isImeSwitcherButtonVisible = + (sysUiStateFlags & SYSUI_STATE_IME_SWITCHER_BUTTON_VISIBLE) != 0; + boolean isImeVisible = (sysUiStateFlags & SYSUI_STATE_IME_VISIBLE) != 0; + boolean isBackDismissIme = (sysUiStateFlags & SYSUI_STATE_BACK_DISMISS_IME) != 0; boolean a11yVisible = (sysUiStateFlags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0; boolean isHomeDisabled = (sysUiStateFlags & SYSUI_STATE_HOME_DISABLED) != 0; boolean isRecentsDisabled = (sysUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) != 0; @@ -467,12 +595,15 @@ private void parseSystemUiFlags(@SystemUiStateFlags long sysUiStateFlags) { | SYSUI_STATE_QUICK_SETTINGS_EXPANDED; boolean isNotificationShadeExpanded = (sysUiStateFlags & shadeExpandedFlags) != 0; boolean isScreenPinningActive = (sysUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0; - boolean isVoiceInteractionWindowShowing = (sysUiStateFlags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0; - boolean isKeyboardShortcutHelperShowing = (sysUiStateFlags & SYSUI_STATE_SHORTCUT_HELPER_SHOWING) != 0; - - // TODO(b/202218289) we're getting IME as not visible on lockscreen from system + boolean isVoiceInteractionWindowShowing = + (sysUiStateFlags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0; + boolean isKeyboardShortcutHelperShowing = + (sysUiStateFlags & SYSUI_STATE_SHORTCUT_HELPER_SHOWING) != 0; + boolean splitAnimationRunning = + (sysUiStateFlags & SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION) != 0; + updateStateForFlag(FLAG_IME_SWITCHER_BUTTON_VISIBLE, isImeSwitcherButtonVisible); updateStateForFlag(FLAG_IME_VISIBLE, isImeVisible); - updateStateForFlag(FLAG_SWITCHER_SHOWING, isImeSwitcherShowing); + updateStateForFlag(FLAG_BACK_DISMISS_IME, isBackDismissIme); updateStateForFlag(FLAG_A11Y_VISIBLE, a11yVisible); updateStateForFlag(FLAG_DISABLE_HOME, isHomeDisabled); updateStateForFlag(FLAG_DISABLE_RECENTS, isRecentsDisabled); @@ -484,10 +615,17 @@ private void parseSystemUiFlags(@SystemUiStateFlags long sysUiStateFlags) { if (mA11yButton != null) { // Only used in 3 button - boolean a11yLongClickable = (sysUiStateFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0; + boolean a11yLongClickable = + (sysUiStateFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0; mA11yButton.setLongClickable(a11yLongClickable); updateButtonLayoutSpacing(); } + + if (mNavButtonContainer.getChildCount() > 0) { + for (int i = 0; i < mNavButtonContainer.getChildCount(); i++) { + mNavButtonContainer.getChildAt(i).setEnabled(!splitAnimationRunning); + } + } } public void updateStateForSysuiFlags(@SystemUiStateFlags long systemUiStateFlags, @@ -519,8 +657,7 @@ public void setBackForBouncer(boolean isBouncerVisible) { /** * Slightly misnamed, but should be called when keyguard OR AOD is showing. - * We consider keyguardVisible when it's showing bouncer OR is occlucded by - * another app + * We consider keyguardVisible when it's showing bouncer OR is occlucded by another app */ public void setKeyguardVisible(boolean isKeyguardVisible, boolean isKeyguardOccluded) { updateStateForFlag(FLAG_KEYGUARD_VISIBLE, isKeyguardVisible || isKeyguardOccluded); @@ -534,6 +671,17 @@ public void setSlideInViewVisible(boolean isSlideInViewVisible) { applyState(); } + /** Should be called when the taskbar is stashed on CD to stash nav buttons. */ + public void setTaskbarStashedIfConnectedDisplay(boolean isTaskbarStashed) { + if (!enableAutoStashConnectedDisplayTaskbar.isTrue() + || mControllers.taskbarActivityContext.isPrimaryDisplay()) { + return; + } + + updateStateForFlag(FLAG_TASKBAR_STASHED_ON_CD, isTaskbarStashed); + applyState(); + } + /** * Returns true if IME bar is visible */ @@ -556,7 +704,8 @@ public boolean isHomeDisabled() { * Returns true if the recents (overview) button is disabled */ public boolean isRecentsDisabled() { - return (mState & FLAG_DISABLE_RECENTS) != 0; + // TODO: b/409075366 - ensure this signal is correctly set for external displays. + return (mState & FLAG_DISABLE_RECENTS) != 0 && mContext.isPrimaryDisplay(); } /** @@ -602,12 +751,58 @@ public void setHomeButtonAccessibilityDelegate(AccessibilityDelegate accessibili /** * Sets the AccessibilityDelegate for the back button. + * + * When setting a back button accessibility delegate, make sure to not dispatch any duplicate + * click events. Click events get injected in the internal accessibility delegate in + * {@link #setupBackButtonAccessibility(View, AccessibilityDelegate)}. */ public void setBackButtonAccessibilityDelegate(AccessibilityDelegate accessibilityDelegate) { if (mBackButton == null) { return; } - mBackButton.setAccessibilityDelegate(accessibilityDelegate); + setupBackButtonAccessibility(mBackButton, accessibilityDelegate); + } + + public void setWallpaperVisible(boolean isVisible) { + if (mContext.isPhoneMode()) { + mTaskbarTransitions.setWallpaperVisibility(isVisible); + } + } + + public void onTransitionModeUpdated(int barMode, boolean checkBarModes) { + mTransitionMode = barMode; + if (checkBarModes) { + checkNavBarModes(); + } + } + + public void checkNavBarModes() { + if (mContext.isPhoneMode()) { + boolean isBarHidden = (mSysuiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) != 0; + mTaskbarTransitions.transitionTo(mTransitionMode, !isBarHidden); + } + } + + public void finishBarAnimations() { + if (mContext.isPhoneMode()) { + mTaskbarTransitions.finishAnimations(); + } + } + + public void touchAutoDim(boolean reset) { + if (mContext.isPhoneMode()) { + mTaskbarTransitions.setAutoDim(false); + mHandler.removeCallbacks(mAutoDim); + if (reset) { + mHandler.postDelayed(mAutoDim, AUTODIM_TIMEOUT_MS); + } + } + } + + public void transitionTo(@BarTransitions.TransitionMode int barMode, boolean animate) { + if (mContext.isPhoneMode()) { + mTaskbarTransitions.transitionTo(barMode, animate); + } } /** Use to set the translationY for the all nav+contextual buttons */ @@ -615,10 +810,7 @@ public AnimatedFloat getTaskbarNavButtonTranslationY() { return mTaskbarNavButtonTranslationY; } - /** - * Use to set the translationY for the all nav+contextual buttons when in - * Launcher - */ + /** Use to set the translationY for the all nav+contextual buttons when in Launcher */ public AnimatedFloat getTaskbarNavButtonTranslationYForInAppDisplay() { return mTaskbarNavButtonTranslationYForInAppDisplay; } @@ -628,9 +820,7 @@ public AnimatedFloat getTaskbarNavButtonDarkIntensity() { return mTaskbarNavButtonDarkIntensity; } - /** - * Use to override the nav button color with {@link #mOnBackgroundIconColor}. - */ + /** Use to override the nav button color with {@link #mOnBackgroundIconColor}. */ public AnimatedFloat getOnTaskbarBackgroundNavButtonColorOverride() { return mOnTaskbarBackgroundNavButtonColorOverride; } @@ -649,7 +839,7 @@ private void updateStateForFlag(int flag, boolean enabled) { private void applyState() { int count = mPropertyHolders.size(); for (int i = 0; i < count; i++) { - mPropertyHolders.get(i).setState(mState); + mPropertyHolders.get(i).setState(mState, mContext.isGestureNav()); } } @@ -671,50 +861,90 @@ public void updateNavButtonTranslationY() { final float normalTranslationY = mTaskbarNavButtonTranslationY.value; final float imeAdjustmentTranslationY = mTaskbarNavButtonTranslationYForIme.value; TaskbarUIController uiController = mControllers.uiController; - final float inAppDisplayAdjustmentTranslationY = (uiController instanceof LauncherTaskbarUIController - && ((LauncherTaskbarUIController) uiController).shouldUseInAppLayout()) - ? mTaskbarNavButtonTranslationYForInAppDisplay.value - : 0; + final float inAppDisplayAdjustmentTranslationY = + (uiController instanceof LauncherTaskbarUIController + && ((LauncherTaskbarUIController) uiController).shouldUseInAppLayout()) + ? mTaskbarNavButtonTranslationYForInAppDisplay.value : 0; mLastSetNavButtonTranslationY = normalTranslationY + imeAdjustmentTranslationY + inAppDisplayAdjustmentTranslationY; mNavButtonsView.setTranslationY(mLastSetNavButtonTranslationY); + notifyRecentsButtonPosition(); } + /** + * Sets Taskbar 3-button mode icon colors based on the + * {@link #mTaskbarNavButtonDarkIntensity} value piped in from Framework. For certain cases + * in large screen taskbar where there may be opaque surfaces, the selected SystemUI button + * colors are intentionally overridden. + *

+ * This method is also called when any of the AnimatedFloat instances change. + */ private void updateNavButtonColor() { final ArgbEvaluator argbEvaluator = ArgbEvaluator.getInstance(); - final int sysUiNavButtonIconColorOnHome = (int) argbEvaluator.evaluate( - mTaskbarNavButtonDarkIntensity.value, - mLightIconColorOnHome, - mDarkIconColorOnHome); - - // Override the color from framework if nav buttons are over an opaque Taskbar - // surface. - final int iconColor = (int) argbEvaluator.evaluate( - mOnBackgroundNavButtonColorOverrideMultiplier.value - * Math.max( - mOnTaskbarBackgroundNavButtonColorOverride.value, - mSlideInViewVisibleNavButtonColorOverride.value), - sysUiNavButtonIconColorOnHome, + int taskbarNavButtonColor = getSysUiIconColorOnHome(argbEvaluator); + // Only phone mode foldable button colors should be identical to SysUI navbar colors. + if (!mContext.isPhoneMode()) { + taskbarNavButtonColor = getTaskbarButtonColor(argbEvaluator, taskbarNavButtonColor); + } + applyButtonColors(taskbarNavButtonColor); + } + + /** + * Taskbar 3-button mode icon colors based on the + * {@link #mTaskbarNavButtonDarkIntensity} value piped in from Framework. + */ + private int getSysUiIconColorOnHome(ArgbEvaluator argbEvaluator) { + return (int) argbEvaluator.evaluate(getTaskbarNavButtonDarkIntensity().value, + mLightIconColorOnWorkspace, mDarkIconColorOnWorkspace); + } + + /** + * If Taskbar background is opaque or slide in overlay is visible, the selected SystemUI button + * colors are intentionally overridden. The override can be disabled when + * {@link #mOnBackgroundNavButtonColorOverrideMultiplier} is {@code 0}. + */ + private int getTaskbarButtonColor(ArgbEvaluator argbEvaluator, int sysUiIconColorOnHome) { + final float sysUIColorOverride = + mOnBackgroundNavButtonColorOverrideMultiplier.value * Math.max( + mOnTaskbarBackgroundNavButtonColorOverride.value, + mSlideInViewVisibleNavButtonColorOverride.value); + return (int) argbEvaluator.evaluate(sysUIColorOverride, sysUiIconColorOnHome, mOnBackgroundIconColor); + } + /** + * Iteratively sets button colors for each button in {@link #mAllButtons}. + */ + private void applyButtonColors(int iconColor) { for (ImageView button : mAllButtons) { button.setImageTintList(ColorStateList.valueOf(iconColor)); Drawable background = button.getBackground(); if (background instanceof KeyButtonRipple) { ((KeyButtonRipple) background).setDarkIntensity( - mTaskbarNavButtonDarkIntensity.value); + getTaskbarNavButtonDarkIntensity().value); } } } + /** + * Updates Taskbar 3-Button icon colors as {@link #mTaskbarNavButtonDarkIntensity} changes. + */ + private void onDarkIntensityChanged() { + updateNavButtonColor(); + if (mContext.isPhoneMode()) { + mTaskbarTransitions.onDarkIntensityChanged(getTaskbarNavButtonDarkIntensity().value); + } + } + protected ImageView addButton(@DrawableRes int drawableId, @TaskbarButton int buttonType, ViewGroup parent, TaskbarNavButtonController navButtonController, @IdRes int id) { return addButton(drawableId, buttonType, parent, navButtonController, id, R.layout.taskbar_nav_button); } + @SuppressLint("ClickableViewAccessibility") private ImageView addButton(@DrawableRes int drawableId, @TaskbarButton int buttonType, ViewGroup parent, TaskbarNavButtonController navButtonController, @IdRes int id, @LayoutRes int layoutId) { @@ -722,11 +952,97 @@ private ImageView addButton(@DrawableRes int drawableId, @TaskbarButton int butt buttonView.setImageResource(drawableId); buttonView.setContentDescription(parent.getContext().getString( navButtonController.getButtonContentDescription(buttonType))); - buttonView.setOnClickListener(view -> navButtonController.onButtonClick(buttonType, view)); - buttonView.setOnLongClickListener(view -> navButtonController.onButtonLongClick(buttonType, view)); + if (buttonType == BUTTON_BACK) { + // set up special touch listener for back button to support predictive back + setupBackButtonAccessibility(buttonView, null); + setBackButtonTouchListener(buttonView, navButtonController); + // Set this View clickable, so that NearestTouchFrame.java forwards closeby touches to + // this View + buttonView.setClickable(true); + } else { + buttonView.setOnClickListener(view -> + navButtonController.onButtonClick(buttonType, view)); + buttonView.setOnLongClickListener(view -> + navButtonController.onButtonLongClick(buttonType, view)); + buttonView.setOnTouchListener((v, event) -> { + if (event.getAction() == MotionEvent.ACTION_DOWN) { + buttonView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); + } + return false; + }); + } return buttonView; } + private void setupBackButtonAccessibility(View backButton, + AccessibilityDelegate accessibilityDelegate) { + View.AccessibilityDelegate backButtonAccessibilityDelegate = + new View.AccessibilityDelegate() { + @Override + public boolean performAccessibilityAction(View host, int action, Bundle args) { + if (accessibilityDelegate != null) { + accessibilityDelegate.performAccessibilityAction(host, action, args); + } + if (action == AccessibilityNodeInfo.ACTION_CLICK) { + mControllers.navButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, + /*cancelled*/ false); + mControllers.navButtonController.sendBackKeyEvent(KeyEvent.ACTION_UP, + /*cancelled*/ false); + return true; + } + return super.performAccessibilityAction(host, action, args); + } + }; + backButton.setAccessibilityDelegate(backButtonAccessibilityDelegate); + } + + private void setBackButtonTouchListener(View buttonView, + TaskbarNavButtonController navButtonController) { + final RectF rect = new RectF(); + final AtomicBoolean hasSentDownEvent = new AtomicBoolean(false); + final Runnable longPressTimeout = () -> { + navButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, /*cancelled*/ false); + hasSentDownEvent.set(true); + }; + buttonView.setOnTouchListener((v, event) -> { + int motionEventAction = event.getAction(); + if (motionEventAction == MotionEvent.ACTION_DOWN) { + hasSentDownEvent.set(false); + mHandler.postDelayed(longPressTimeout, PREDICTIVE_BACK_TIMEOUT_MS); + rect.set(0, 0, v.getWidth(), v.getHeight()); + buttonView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); + } + boolean isCancelled = motionEventAction == MotionEvent.ACTION_CANCEL + || (!rect.contains(event.getX(), event.getY()) + && (motionEventAction == MotionEvent.ACTION_MOVE + || motionEventAction == MotionEvent.ACTION_UP)); + if (motionEventAction != MotionEvent.ACTION_UP && !isCancelled) { + // return early. we don't care about any other cases than UP or CANCEL from here on + return false; + } + mHandler.removeCallbacks(longPressTimeout); + if (!hasSentDownEvent.get()) { + if (isCancelled) { + // if it is cancelled and ACTION_DOWN has not been sent yet, return early and + // don't send anything to sysui. + return false; + } + navButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, isCancelled); + } + navButtonController.sendBackKeyEvent(KeyEvent.ACTION_UP, isCancelled); + if (motionEventAction == MotionEvent.ACTION_UP && !isCancelled) { + buttonView.performClick(); + } + return false; + }); + buttonView.setOnLongClickListener((view) -> { + navButtonController.onButtonLongClick(BUTTON_BACK, view); + return false; + }); + } + private ImageView addButton(ViewGroup parent, @IdRes int id, @LayoutRes int layoutId) { ImageView buttonView = (ImageView) mContext.getLayoutInflater() .inflate(layoutId, parent, false); @@ -744,19 +1060,20 @@ public void onConfigurationChanged(@Config int configChanges) { if (mFloatingRotationButton != null) { mFloatingRotationButton.onConfigurationChanged(configChanges); } - if (!mContext.isUserSetupComplete()) { - handleSetupUi(); - } updateButtonLayoutSpacing(); } private void handleSetupUi() { + // Setup wizard handles the UI when the expressive theme is enabled and Simple View isn't. + if (mIsExpressiveThemeEnabled && !mContext.isSimpleViewEnabled()) { + return; + } // Since setup wizard only has back button enabled, it looks strange to be // end-aligned, so start-align instead. - FrameLayout.LayoutParams navButtonsLayoutParams = (FrameLayout.LayoutParams) mNavButtonContainer - .getLayoutParams(); - FrameLayout.LayoutParams navButtonsViewLayoutParams = (FrameLayout.LayoutParams) mNavButtonsView - .getLayoutParams(); + FrameLayout.LayoutParams navButtonsLayoutParams = (FrameLayout.LayoutParams) + mNavButtonContainer.getLayoutParams(); + FrameLayout.LayoutParams navButtonsViewLayoutParams = (FrameLayout.LayoutParams) + mNavButtonsView.getLayoutParams(); Resources resources = mContext.getResources(); DeviceProfile deviceProfile = mContext.getDeviceProfile(); @@ -767,9 +1084,9 @@ private void handleSetupUi() { // If SUW is on a large screen device that is landscape (or has a square aspect // ratio) the back button has to be placed accordingly - if ((deviceProfile.isTablet && deviceProfile.isLandscape) - || (deviceProfile.aspectRatio > SQUARE_ASPECT_RATIO_BOTTOM_BOUND - && deviceProfile.aspectRatio < SQUARE_ASPECT_RATIO_UPPER_BOUND)) { + if ((deviceProfile.getDeviceProperties().isTablet() && deviceProfile.getDeviceProperties().isLandscape()) + || (deviceProfile.getDeviceProperties().getAspectRatio() > SQUARE_ASPECT_RATIO_BOTTOM_BOUND + && deviceProfile.getDeviceProperties().getAspectRatio() < SQUARE_ASPECT_RATIO_UPPER_BOUND)) { navButtonsLayoutParams.setMarginStart( resources.getDimensionPixelSize(R.dimen.taskbar_back_button_suw_start_margin)); navButtonsViewLayoutParams.bottomMargin = resources.getDimensionPixelSize( @@ -780,7 +1097,7 @@ private void handleSetupUi() { int phoneOrPortraitSetupMargin = resources.getDimensionPixelSize( R.dimen.taskbar_contextual_button_suw_margin); navButtonsLayoutParams.setMarginStart(phoneOrPortraitSetupMargin); - navButtonsLayoutParams.bottomMargin = !deviceProfile.isLandscape + navButtonsLayoutParams.bottomMargin = !deviceProfile.getDeviceProperties().isLandscape() ? 0 : phoneOrPortraitSetupMargin - (resources.getDimensionPixelSize( R.dimen.taskbar_nav_buttons_size) / 2); @@ -792,137 +1109,23 @@ private void handleSetupUi() { } /** - * Adds the correct spacing to 3 button nav container depending on if device is - * in kids mode, + * Adds the correct spacing to 3 button nav container depending on if device is in kids mode, * setup wizard, or normal 3 button nav. */ private void updateButtonLayoutSpacing() { - boolean isThreeButtonNav = mContext.isThreeButtonNav(); - - DeviceProfile dp = mContext.getDeviceProfile(); - Resources res = mContext.getResources(); - boolean isInSetup = !mContext.isUserSetupComplete(); - // TODO(b/244231596) we're getting the incorrect kidsMode value in small-screen - boolean isInKidsMode = mContext.isNavBarKidsModeActive(); - - if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) { - NavButtonLayoutter navButtonLayoutter = NavButtonLayoutFactory.Companion.getUiLayoutter( - dp, mNavButtonsView, mImeSwitcherButton, - mA11yButton, mSpace, res, isInKidsMode, isInSetup, isThreeButtonNav, - mContext.isPhoneMode(), mWindowManagerProxy.getRotation(mContext)); - navButtonLayoutter.layoutButtons(mContext, isA11yButtonPersistent()); - updateButtonsBackground(); - updateNavButtonColor(); - return; - } - - if (isInSetup) { - handleSetupUi(); - } else if (isInKidsMode) { - int iconSize = res.getDimensionPixelSize( - R.dimen.taskbar_icon_size_kids); - int buttonWidth = res.getDimensionPixelSize( - R.dimen.taskbar_nav_buttons_width_kids); - int buttonHeight = res.getDimensionPixelSize( - R.dimen.taskbar_nav_buttons_height_kids); - int buttonRadius = res.getDimensionPixelSize( - R.dimen.taskbar_nav_buttons_corner_radius_kids); - int paddingleft = (buttonWidth - iconSize) / 2; - int paddingRight = paddingleft; - int paddingTop = (buttonHeight - iconSize) / 2; - int paddingBottom = paddingTop; - - // Update icons - final RotateDrawable rotateDrawable = new RotateDrawable(); - rotateDrawable.setDrawable(mContext.getDrawable(R.drawable.ic_sysbar_back_kids)); - rotateDrawable.setFromDegrees(0f); - rotateDrawable.setToDegrees(-90f); - mBackButton.setImageDrawable(rotateDrawable); - mBackButton.setScaleType(ImageView.ScaleType.FIT_CENTER); - mBackButton.setPadding(paddingleft, paddingTop, paddingRight, paddingBottom); - - mHomeButton.setImageDrawable( - mHomeButton.getContext().getDrawable(R.drawable.ic_sysbar_home_kids)); - mHomeButton.setScaleType(ImageView.ScaleType.FIT_CENTER); - mHomeButton.setPadding(paddingleft, paddingTop, paddingRight, paddingBottom); - - // Home button layout - LinearLayout.LayoutParams homeLayoutparams = new LinearLayout.LayoutParams( - buttonWidth, - buttonHeight); - int homeButtonLeftMargin = res.getDimensionPixelSize( - R.dimen.taskbar_home_button_left_margin_kids); - homeLayoutparams.setMargins(homeButtonLeftMargin, 0, 0, 0); - mHomeButton.setLayoutParams(homeLayoutparams); - - // Back button layout - LinearLayout.LayoutParams backLayoutParams = new LinearLayout.LayoutParams( - buttonWidth, - buttonHeight); - int backButtonLeftMargin = res.getDimensionPixelSize( - R.dimen.taskbar_back_button_left_margin_kids); - backLayoutParams.setMargins(backButtonLeftMargin, 0, 0, 0); - mBackButton.setLayoutParams(backLayoutParams); - - // Button backgrounds - int whiteWith10PctAlpha = Color.argb(0.1f, 1, 1, 1); - PaintDrawable buttonBackground = new PaintDrawable(whiteWith10PctAlpha); - buttonBackground.setCornerRadius(buttonRadius); - mHomeButton.setBackground(buttonBackground); - mBackButton.setBackground(buttonBackground); - - // Update alignment within taskbar - FrameLayout.LayoutParams navButtonsLayoutParams = (FrameLayout.LayoutParams) mNavButtonContainer - .getLayoutParams(); - navButtonsLayoutParams.setMarginStart( - navButtonsLayoutParams.getMarginEnd() / 2); - navButtonsLayoutParams.setMarginEnd(navButtonsLayoutParams.getMarginStart()); - navButtonsLayoutParams.gravity = Gravity.CENTER; - mNavButtonContainer.requestLayout(); - - mHomeButton.setOnLongClickListener(null); - } else if (isThreeButtonNav) { - final RotateDrawable rotateDrawable = new RotateDrawable(); - rotateDrawable.setDrawable(mContext.getDrawable(R.drawable.ic_sysbar_back)); - rotateDrawable.setFromDegrees(0f); - rotateDrawable.setToDegrees(Utilities.isRtl(mContext.getResources()) ? 90f : -90f); - mBackButton.setImageDrawable(rotateDrawable); - - // Setup normal 3 button - // Add spacing after the end of the last nav button - FrameLayout.LayoutParams navButtonParams = (FrameLayout.LayoutParams) mNavButtonContainer.getLayoutParams(); - navButtonParams.gravity = Gravity.END; - navButtonParams.width = FrameLayout.LayoutParams.WRAP_CONTENT; - navButtonParams.height = MATCH_PARENT; - - int navMarginEnd = (int) res.getDimension(dp.inv.inlineNavButtonsEndSpacing); - int contextualWidth = mEndContextualContainer.getWidth(); - // If contextual buttons are showing, we check if the end margin is enough for - // the - // contextual button to be showing - if not, move the nav buttons over a smidge - if (isA11yButtonPersistent() && navMarginEnd < contextualWidth) { - // Additional spacing, eat up half of space between last icon and nav button - navMarginEnd += res.getDimensionPixelSize(R.dimen.taskbar_hotseat_nav_spacing) / 2; - } - navButtonParams.setMarginEnd(navMarginEnd); - mNavButtonContainer.setLayoutParams(navButtonParams); + NavButtonLayoutter navButtonLayoutter = getLayoutterForCurrentState(); + navButtonLayoutter.layoutButtons(mContext, isA11yButtonPersistent()); + updateButtonsBackground(); + updateNavButtonColor(); + } - // Add the spaces in between the nav buttons - int spaceInBetween = res.getDimensionPixelSize(R.dimen.taskbar_button_space_inbetween); - for (int i = 0; i < mNavButtonContainer.getChildCount(); i++) { - View navButton = mNavButtonContainer.getChildAt(i); - LinearLayout.LayoutParams buttonLayoutParams = (LinearLayout.LayoutParams) navButton.getLayoutParams(); - buttonLayoutParams.weight = 0; - if (i == 0) { - buttonLayoutParams.setMarginEnd(spaceInBetween / 2); - } else if (i == mNavButtonContainer.getChildCount() - 1) { - buttonLayoutParams.setMarginStart(spaceInBetween / 2); - } else { - buttonLayoutParams.setMarginStart(spaceInBetween / 2); - buttonLayoutParams.setMarginEnd(spaceInBetween / 2); - } - } - } + private NavButtonLayoutter getLayoutterForCurrentState() { + return NavButtonLayoutFactory.Companion.getUiLayoutter( + mContext.getDeviceProfile(), mNavButtonsView, mImeSwitcherButton, + mA11yButton, mSpace, mContext.getResources(), + mContext.isNavBarKidsModeActive(), + !mContext.isUserSetupComplete(), mContext.isThreeButtonNav(), + mContext.isPhoneMode(), mWindowManagerProxy.getRotation(mContext)); } private void updateButtonsBackground() { @@ -948,10 +1151,12 @@ private static void updateButtonBackground(View view, boolean isPhoneButtonNavMo public void onDestroy() { mPropertyHolders.clear(); - mControllers.rotationButtonController.unregisterListeners(); if (mFloatingRotationButton != null) { mFloatingRotationButton.hide(); + mFloatingRotationButton = null; } + SettingsCache.INSTANCE.get(mContext).unregister( + mButtonOrderChangedUri, mButtonOrderListener); moveNavButtonsBackToTaskbarWindow(); mNavButtonContainer.removeAllViews(); @@ -961,17 +1166,16 @@ public void onDestroy() { } /** - * Moves mNavButtonsView from TaskbarDragLayer to a placeholder BaseDragLayer on - * a new window. + * Moves mNavButtonsView from TaskbarDragLayer to a placeholder BaseDragLayer on a new window. */ public void moveNavButtonsToNewWindow() { if (mAreNavButtonsInSeparateWindow) { return; } - if (mIsImeRenderingNavButtons) { - // IME is rendering the nav buttons, so we don't need to create a new layer for - // them. + if (mIsImeRenderingNavButtons || !mContext.isPrimaryDisplay()) { + // When either IME or the Taskbar on CD is rendering the nav buttons, we don't need to + // create a new layer for them. return; } @@ -1000,8 +1204,7 @@ public void onViewDetachedFromWindow(View view) { } /** - * Moves mNavButtonsView from its temporary window and reattaches it to - * TaskbarDragLayer. + * Moves mNavButtonsView from its temporary window and reattaches it to TaskbarDragLayer. */ public void moveNavButtonsBackToTaskbarWindow() { if (!mAreNavButtonsInSeparateWindow) { @@ -1020,8 +1223,7 @@ private void onComputeInsetsForSeparateWindow(ViewTreeObserver.InternalInsetsInf } /** - * Called whenever a new ui controller is set, and should update anything that - * depends on the + * Called whenever a new ui controller is set, and should update anything that depends on the * ui controller. */ public void onUiControllerChanged() { @@ -1054,13 +1256,17 @@ public void dumpLogs(String prefix, PrintWriter pw) { + mOnBackgroundNavButtonColorOverrideMultiplier.value); mNavButtonsView.dumpLogs(prefix + "\t", pw); + if (mContext.isPhoneMode()) { + mTaskbarTransitions.dumpLogs(prefix + "\t", pw); + } } private static String getStateString(int flags) { StringJoiner str = new StringJoiner("|"); - appendFlag(str, flags, FLAG_SWITCHER_SHOWING, "FLAG_SWITCHER_SHOWING"); + appendFlag(str, flags, FLAG_IME_SWITCHER_BUTTON_VISIBLE, + "FLAG_IME_SWITCHER_BUTTON_VISIBLE"); appendFlag(str, flags, FLAG_IME_VISIBLE, "FLAG_IME_VISIBLE"); - appendFlag(str, flags, FLAG_ROTATION_BUTTON_VISIBLE, "FLAG_ROTATION_BUTTON_VISIBLE"); + appendFlag(str, flags, FLAG_BACK_DISMISS_IME, "FLAG_BACK_DISMISS_IME"); appendFlag(str, flags, FLAG_A11Y_VISIBLE, "FLAG_A11Y_VISIBLE"); appendFlag(str, flags, FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE, "FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE"); @@ -1090,92 +1296,119 @@ public void updateTaskbarAlignment(float alignment) { mHitboxExtender.onAnimationProgressToOverview(alignment); } - private class RotationButtonListener implements RotationButton.RotationButtonUpdatesCallback { - @Override - public void onVisibilityChanged(boolean isVisible) { - if (isVisible) { - mFloatingRotationButton.getCurrentView() - .getBoundsOnScreen(mFloatingRotationButtonBounds); - } else { - mFloatingRotationButtonBounds.setEmpty(); - } + /** Adjusts navigation buttons layout accordingly to the bubble bar position. */ + @Override + public void onBubbleBarLocationUpdated(BubbleBarLocation location) { + boolean locationUpdated = location != mBubbleBarTargetLocation; + if (locationUpdated) { + cancelExistingNavBarAnimation(); + } else { + endExistingAnimation(); } + mNavButtonContainer.setTranslationX(getNavBarTranslationX(location)); + mBubbleBarTargetLocation = location; + notifyRecentsButtonPosition(); } - private class RotationButtonImpl implements RotationButton { - - private final ImageView mButton; - private AnimatedVectorDrawable mImageDrawable; - - RotationButtonImpl(ImageView button) { - mButton = button; - } - - @Override - public void setRotationButtonController(RotationButtonController rotationButtonController) { - // TODO(b/187754252) UI polish, different icons based on light/dark context, etc - mImageDrawable = (AnimatedVectorDrawable) mButton.getContext() - .getDrawable(rotationButtonController.getIconResId()); - mButton.setImageDrawable(mImageDrawable); - mButton.setContentDescription(mButton.getResources() - .getString(R.string.accessibility_rotate_button)); - mImageDrawable.setCallback(mButton); - } - - @Override - public View getCurrentView() { - return mButton; - } - - @Override - public boolean show() { - mButton.setVisibility(View.VISIBLE); - mState |= FLAG_ROTATION_BUTTON_VISIBLE; - applyState(); - return true; - } - - @Override - public boolean hide() { - mButton.setVisibility(View.GONE); - mState &= ~FLAG_ROTATION_BUTTON_VISIBLE; - applyState(); - return true; - } + /** Animates navigation buttons accordingly to the bubble bar position. */ + @Override + public void onBubbleBarLocationAnimated(BubbleBarLocation location) { + if (location == mBubbleBarTargetLocation) return; + cancelExistingNavBarAnimation(); + mBubbleBarTargetLocation = location; + int finalX = getNavBarTranslationX(location); + Animator teleportAnimator = BarsLocationAnimatorHelper + .getTeleportAnimatorForNavButtons(location, mNavButtonContainer, finalX); + teleportAnimator.addListener(forEndCallback(() -> mNavBarLocationAnimator = null)); + mNavBarLocationAnimator = teleportAnimator; + mNavBarLocationAnimator.start(); + } - @Override - public boolean isVisible() { - return mButton.getVisibility() == View.VISIBLE; - } - - @Override - public void updateIcon(int lightIconColor, int darkIconColor) { - // TODO(b/187754252): UI Polish + private void endExistingAnimation() { + if (mNavBarLocationAnimator != null) { + mNavBarLocationAnimator.end(); + mNavBarLocationAnimator = null; } + } - @Override - public void setOnClickListener(OnClickListener onClickListener) { - mButton.setOnClickListener(onClickListener); + private void cancelExistingNavBarAnimation() { + if (mNavBarLocationAnimator != null) { + mNavBarLocationAnimator.cancel(); + mNavBarLocationAnimator = null; } + } - @Override - public void setOnHoverListener(OnHoverListener onHoverListener) { - mButton.setOnHoverListener(onHoverListener); + private int getNavBarTranslationX(BubbleBarLocation location) { + boolean isNavbarOnRight = location.isOnLeft(mNavButtonsView.isLayoutRtl()); + DeviceProfile dp = mContext.getDeviceProfile(); + float navBarTargetStartX; + if (!mContext.isUserSetupComplete()) { + // Skip additional translations on the nav bar container while in SUW layout + return 0; + } else if (mContext.shouldStartAlignTaskbar()) { + int navBarSpacing = dp.getHotseatProfile().getInlineNavButtonsEndSpacingPx(); + // If the taskbar is start aligned the navigation bar is aligned to the start or end of + // the container, depending on the bubble bar location + if (isNavbarOnRight) { + navBarTargetStartX = dp.getDeviceProperties().getWidthPx() - navBarSpacing - mNavButtonContainer.getWidth(); + } else { + navBarTargetStartX = navBarSpacing; + } + } else { + // If the task bar is not start aligned, the navigation bar is located in the center + // between the taskbar and screen edges, depending on the bubble bar location. + float navbarWidth = mNavButtonContainer.getWidth(); + Rect taskbarBounds = mControllers.taskbarViewController + .getTransientTaskbarIconLayoutBoundsInParent(); + if (isNavbarOnRight) { + if (mNavButtonsView.isLayoutRtl()) { + float taskBarEnd = taskbarBounds.right; + navBarTargetStartX = (dp.getDeviceProperties().getWidthPx() + taskBarEnd - navbarWidth) / 2; + } else { + navBarTargetStartX = mNavButtonContainer.getLeft(); + } + } else { + float taskBarStart = taskbarBounds.left; + navBarTargetStartX = (taskBarStart - navbarWidth) / 2; + } } + return (int) navBarTargetStartX - mNavButtonContainer.getLeft(); + } - @Override - public AnimatedVectorDrawable getImageDrawable() { - return mImageDrawable; + /** Adjusts the navigation buttons layout position according to the bubble bar location. */ + public void onLayoutsUpdated() { + // no need to do anything if on phone, or if taskbar or navbar views were not placed on + // screen. + Rect transientTaskbarIconLayoutBoundsInParent = mControllers.taskbarViewController + .getTransientTaskbarIconLayoutBoundsInParent(); + if (mContext.getDeviceProfile().getDeviceProperties().isPhone() + || transientTaskbarIconLayoutBoundsInParent.isEmpty() + || mNavButtonsView.getWidth() == 0) { + return; } - - @Override - public void setDarkIntensity(float darkIntensity) { - // TODO(b/187754252) UI polish + if (mControllers.bubbleControllers.isPresent()) { + if (mBubbleBarTargetLocation == null) { + // only set bubble bar location if it was not set before + mBubbleBarTargetLocation = mControllers.bubbleControllers.get() + .bubbleBarViewController.getBubbleBarLocation(); + } + onBubbleBarLocationUpdated(mBubbleBarTargetLocation); } + } + private class RotationButtonListener implements RotationButton.RotationButtonUpdatesCallback { @Override - public boolean acceptRotationProposal() { - return mButton.isAttachedToWindow(); + public void onVisibilityChanged(boolean isVisible) { + if (isVisible) { + mFloatingRotationButton.getCurrentView() + .getBoundsOnScreen(mFloatingRotationButtonBounds); + } else { + mFloatingRotationButtonBounds.setEmpty(); + } + if (refactorTaskbarUiState()) { + mTaskbarUiState.setNavbarFloatingRotationButtonsBounds( + mFloatingRotationButtonBounds); + } } } @@ -1209,13 +1442,16 @@ StatePropertyHolder(T target, IntPredicate enabledCondition, mAnimator = ObjectAnimator.ofFloat(target, property, enabledValue, disabledValue); } - public void setState(int flags) { + public void setState(int flags, boolean skipAnimation) { boolean isEnabled = mEnableCondition.test(flags); if (mIsEnabled != isEnabled) { mIsEnabled = isEnabled; mAnimator.cancel(); mAnimator.setFloatValues(mIsEnabled ? mEnabledValue : mDisabledValue); mAnimator.start(); + if (skipAnimation) { + mAnimator.end(); + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/NewWindowTaskbarShortcut.kt b/quickstep/src/com/android/launcher3/taskbar/NewWindowTaskbarShortcut.kt new file mode 100644 index 00000000000..49ba624b609 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/NewWindowTaskbarShortcut.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar + +import android.content.Context +import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK +import android.view.View +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.R +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.popup.SystemShortcut +import com.android.launcher3.views.ActivityContext + +/** + * A single menu item shortcut to execute creating a new instance of an app. Default interaction for + * [onClick] is to launch the app in full screen or as a floating window in Desktop Mode. + */ +class NewWindowTaskbarShortcut(target: T, itemInfo: ItemInfo?, originalView: View?) : + SystemShortcut( + R.drawable.desktop_mode_ic_taskbar_menu_new_window, + R.string.new_window_option_taskbar, + target, + itemInfo, + originalView + ) where T : Context?, T : ActivityContext? { + + override fun onClick(v: View?) { + if (mItemInfo.intent == null) { + return; + } + val intent = Intent(mItemInfo.intent) + intent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK) + mTarget?.startActivitySafely(v, intent, mItemInfo) + AbstractFloatingView.closeAllOpenViews(mTarget) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/NudgeView.java b/quickstep/src/com/android/launcher3/taskbar/NudgeView.java new file mode 100644 index 00000000000..543475935ea --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/NudgeView.java @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar; + +import static com.android.launcher3.anim.AnimatedFloat.VALUE; +import static com.android.launcher3.anim.AnimatorListeners.forEndCallback; +import static com.android.launcher3.taskbar.StashedHandleViewController.ALPHA_INDEX_NUDGED; +import static com.android.launcher3.taskbar.StashedHandleViewController.ALPHA_INDEX_STASHED; + +import android.animation.AnimatorSet; +import android.animation.ValueAnimator; +import android.content.Context; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; +import android.view.ViewGroup; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.android.launcher3.Flags; +import com.android.launcher3.R; +import com.android.launcher3.anim.AnimatedFloat; +import com.android.launcher3.anim.SpringAnimationBuilder; +import com.android.launcher3.util.MultiValueAlpha; + +public class NudgeView extends ImageView { + + private static final float DAMPING_RATIO = 0.6f; + private static final float STIFFNESS = 380f; + + private AnimatorSet mAnimatorSet; + private boolean mNudgeShown; + private int mNudgePillWidth; + private int mNudgePillHeight; + private int mStashedHandleWidth; + private int mStashedHandleHeight; + private ImageView mNudgeIcon; + private MultiValueAlpha mStashedHandleViewAlpha; + + private final AnimatedFloat mAlphaForHandleView = new AnimatedFloat( + this::updateAlphaForHandleView); + private final AnimatedFloat mAlphaForNudgeIcon = new AnimatedFloat( + this::updateAlphaForNudgeIcon); + private final AnimatedFloat mWidthForNudgePill = new AnimatedFloat( + this::updateWidthForNudge); + private final AnimatedFloat mHeightForNudgePill = new AnimatedFloat( + this::updateHeightForNudge); + + public NudgeView(Context context) { + this(context, null); + } + + public NudgeView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public NudgeView(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } + + public NudgeView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + if (Flags.nudgePill()) { + mNudgePillWidth = context.getResources().getDimensionPixelSize( + R.dimen.taskbar_nudge_pill_width); + mNudgePillHeight = context.getResources().getDimensionPixelSize( + R.dimen.taskbar_nudge_pill_height); + mStashedHandleWidth = context.getResources().getDimensionPixelSize( + R.dimen.taskbar_nudge_pill_width); + mStashedHandleHeight = context.getResources().getDimensionPixelSize( + R.dimen.taskbar_stashed_handle_height); + } + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mNudgeIcon = findViewById(R.id.nudge_icon); + } + + void updateNudgeIcon(boolean showNudge, @Nullable Drawable icon, + @Nullable MultiValueAlpha stashedHandleViewAlpha) { + if (!Flags.nudgePill() || stashedHandleViewAlpha == null) { + return; + } + mStashedHandleViewAlpha = stashedHandleViewAlpha; + // Set update visibility to false when showing the nudge otherwise + // StashHandleView will be INVISIBLE at low alpha resulting in being unable to invoke CtS. + mStashedHandleViewAlpha.setUpdateVisibility(false); + mNudgeIcon.setImageDrawable(null); + if (icon != null) { + mNudgeIcon.setImageDrawable(icon); + } + mNudgeIcon.setVisibility(VISIBLE); + if (showNudge && !mNudgeShown) { + post(() -> animationBarToPill(true /* showNudge */)); + } else if (!showNudge){ + post(() -> animationBarToPill(false /* showNudge */)); + } + } + + private void animationBarToPill(boolean showNudge) { + if (!Flags.nudgePill()) { + return; + } + if (mAnimatorSet != null && mAnimatorSet.isRunning()) { + mAnimatorSet.cancel(); + } + mNudgeShown = showNudge; + // Alpha + float targetIconAlpha = showNudge ? 1.0f : 0; + float targetHandleViewAlpha = showNudge ? 0 : 1.0f; + // Animate from navBar -> nudgePill if showNudge is true. + float startWidth = showNudge ? mStashedHandleWidth : mNudgePillWidth; + float startHeight = showNudge ? mStashedHandleHeight : mNudgePillHeight; + float endWidth = showNudge ? mNudgePillWidth : mStashedHandleWidth; + float endHeight = showNudge ? mNudgePillHeight : mStashedHandleHeight; + + ValueAnimator alphaNudgeIcon = new SpringAnimationBuilder(mContext) + .setStartValue(mNudgeIcon.getAlpha()) + .setEndValue(targetIconAlpha) + .setDampingRatio(DAMPING_RATIO) + .setStiffness(STIFFNESS) + .build(mAlphaForNudgeIcon, VALUE); + if (!showNudge) { + alphaNudgeIcon.addListener(forEndCallback(() -> { + mNudgeIcon.setVisibility(GONE); + mStashedHandleViewAlpha.setUpdateVisibility(true); + })); + } + ValueAnimator alphaHandleView = new SpringAnimationBuilder(mContext) + .setStartValue(mStashedHandleViewAlpha.get(ALPHA_INDEX_STASHED).getValue()) + .setEndValue(targetHandleViewAlpha) + .setDampingRatio(DAMPING_RATIO) + .setStiffness(STIFFNESS) + .build(mAlphaForHandleView, VALUE); + ValueAnimator widthAnimation = new SpringAnimationBuilder(mContext) + .setStartValue(startWidth) + .setEndValue(endWidth) + .setDampingRatio(DAMPING_RATIO) + .setStiffness(STIFFNESS) + .build(mWidthForNudgePill, VALUE); + ValueAnimator heightAnimation = new SpringAnimationBuilder(mContext) + .setStartValue(startHeight) + .setEndValue(endHeight) + .setDampingRatio(DAMPING_RATIO) + .setStiffness(STIFFNESS) + .build(mHeightForNudgePill, VALUE); + mAnimatorSet = new AnimatorSet(); + mAnimatorSet.playTogether( + alphaNudgeIcon, alphaHandleView, + widthAnimation, heightAnimation + ); + mAnimatorSet.start(); + } + + private void updateAlphaForHandleView() { + if (!Flags.nudgePill()) { + return; + } + float alpha = mAlphaForHandleView.value; + mStashedHandleViewAlpha.get(ALPHA_INDEX_NUDGED).setValue(alpha); + } + + private void updateAlphaForNudgeIcon() { + if (!Flags.nudgePill()) { + return; + } + float alpha = mAlphaForNudgeIcon.value; + mNudgeIcon.setAlpha(alpha); + } + + private void updateWidthForNudge() { + if (!Flags.nudgePill()) { + return; + } + float width = mWidthForNudgePill.value; + ViewGroup.MarginLayoutParams nudgePillLayoutParams = + (ViewGroup.MarginLayoutParams) mNudgeIcon.getLayoutParams(); + nudgePillLayoutParams.width = (int) width; + mNudgeIcon.setLayoutParams(nudgePillLayoutParams); + } + + private void updateHeightForNudge() { + if (!Flags.nudgePill()) { + return; + } + float height = mHeightForNudgePill.value; + ViewGroup.MarginLayoutParams nudgePillLayoutParams = + (ViewGroup.MarginLayoutParams) mNudgeIcon.getLayoutParams(); + nudgePillLayoutParams.height = (int) height; + mNudgeIcon.setLayoutParams(nudgePillLayoutParams); + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/NudgeViewController.java b/quickstep/src/com/android/launcher3/taskbar/NudgeViewController.java new file mode 100644 index 00000000000..94aa30772dc --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/NudgeViewController.java @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar; + +import static android.content.Context.RECEIVER_EXPORTED; + +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; +import static com.android.launcher3.util.SimpleBroadcastReceiver.actionsFilter; + +import android.content.Intent; +import android.content.res.Resources; +import android.graphics.drawable.Drawable; +import android.os.Bundle; + +import androidx.annotation.Nullable; + +import com.android.launcher3.Flags; +import com.android.launcher3.R; +import com.android.launcher3.util.SimpleBroadcastReceiver; + +import java.io.PrintWriter; + +/** + * NudgeViewController handles the broadcasts sent to launcher which will then update the view. + */ +public class NudgeViewController implements TaskbarControllers.LoggableTaskbarController{ + + private static final String NAV_UPDATE_ACTION = "android.app.action.UPDATE_NAVBAR"; + private static final String GAME = "game"; + private static final String TRANSLATE = "translate"; + private static final String SHOW_NUDGE = "showNudge"; + private static final String NUDGE_ICON = "nudgeIcon"; + private final TaskbarActivityContext mActivity; + @Nullable + private final NudgeView mNudgeView; + private final Drawable mTranslateIcon; + private final Drawable mGameIcon; + + @Nullable + private SimpleBroadcastReceiver mNudgeReceiver; + + public NudgeViewController(TaskbarActivityContext activity, + @Nullable NudgeView nudgeView) { + mActivity = activity; + mNudgeView = nudgeView; + final Resources resources = mActivity.getResources(); + if (Flags.nudgePill() && mNudgeView != null) { + mNudgeReceiver = new SimpleBroadcastReceiver( + mActivity, UI_HELPER_EXECUTOR, MAIN_EXECUTOR, this::shouldChangeNavBar); + mNudgeReceiver.register(actionsFilter(NAV_UPDATE_ACTION), RECEIVER_EXPORTED); + } + mTranslateIcon = resources.getDrawable(R.drawable.ic_translate, activity.getTheme()); + mGameIcon = resources.getDrawable(R.drawable.ic_game, activity.getTheme()); + } + + private void shouldChangeNavBar(Intent i) { + if (!mActivity.isPhoneGestureNavMode() || !Flags.nudgePill()) { + return; + } + Bundle bundle = i.getExtras(); + boolean showNudge = bundle.getBoolean(SHOW_NUDGE, false); + String iconToUse = bundle.getString(NUDGE_ICON, ""); + Drawable icon = null; + if (GAME.equals(iconToUse)) { + icon = mGameIcon; + } else if (TRANSLATE.equals(iconToUse)) { + icon = mTranslateIcon; + } + // Nudge icon will only show if there is a valid icon to show. + mNudgeView.updateNudgeIcon(icon != null && showNudge /* showNudge */, icon, + mActivity.getControllers().stashedHandleViewController.getStashedHandleAlpha()); + } + + public void onDestroy() { + if (mNudgeReceiver != null) { + mNudgeReceiver.close(); + } + mNudgeReceiver = null; + } + + @Override + public void dumpLogs(String prefix, PrintWriter pw) { + pw.println(prefix + "NudgeViewController:"); + pw.println(prefix + "\tmNudgeView=" + mNudgeView); + pw.println(prefix + "\tmNudgeReceiver=" + mNudgeReceiver); + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/OverflownAppsContainerController.kt b/quickstep/src/com/android/launcher3/taskbar/OverflownAppsContainerController.kt new file mode 100644 index 00000000000..52f2a6a04a6 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/OverflownAppsContainerController.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import com.android.launcher3.model.data.ItemInfo + +/** + * Controller of the container that contains the overflown pinned apps which don't fit in the main + * taskbar. This is activated by toggling the overflow icon on the taskbar. + */ +class OverflownAppsContainerController(private val activityContext: TaskbarActivityContext) { + private var overflownAppsViewController: OverflownAppsViewController? = null + private lateinit var viewCallbacks: TaskbarViewCallbacks + + fun init(callbacks: TaskbarViewCallbacks) { + viewCallbacks = callbacks + } + + fun toggleOverflownAppsView( + overflowIcon: TaskbarOverflowView, + overflownApps: List, + onClosed: Runnable, + ) { + overflownAppsViewController?.let { + return it.close(true) + } + + overflownAppsViewController = + OverflownAppsViewController(activityContext, viewCallbacks, overflowIcon) { + overflownAppsViewController = null + onClosed.run() + } + overflownAppsViewController?.show(overflownApps) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/OverflownAppsContainerView.kt b/quickstep/src/com/android/launcher3/taskbar/OverflownAppsContainerView.kt new file mode 100644 index 00000000000..93c8870a6ef --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/OverflownAppsContainerView.kt @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.content.Context +import android.graphics.Rect +import android.util.AttributeSet +import android.view.MotionEvent +import android.view.View +import android.widget.LinearLayout +import androidx.core.view.updatePadding +import com.android.launcher3.BubbleTextView +import com.android.launcher3.R +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.popup.ArrowPopup + +/** A container view for overflown apps in the taskbar. */ +class OverflownAppsContainerView +@JvmOverloads +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + ArrowPopup(context, attrs, defStyleAttr) { + private lateinit var overflowIcon: TaskbarOverflowView + private lateinit var viewCallbacks: TaskbarViewCallbacks + private lateinit var content: LinearLayout + private var overflownApps = emptyList() + private val spacing: Int = + resources.getDimensionPixelSize(R.dimen.overflown_apps_container_spacing) + + fun init(icon: TaskbarOverflowView, callbacks: TaskbarViewCallbacks) { + overflowIcon = icon + viewCallbacks = callbacks + content = findViewById(R.id.overflown_content) + // Set the horizontal padding to the half of the expected spacing for the children to + // complement the other half + content.updatePadding( + left = spacing / 2, + top = spacing, + right = spacing / 2, + bottom = spacing, + ) + } + + fun setOverflownApps(list: List) { + overflownApps = list + inflateApps() + } + + private fun inflateApps() { + val iconSize = mActivityContext.deviceProfile.taskbarProfile.iconSize + val iconSpacing = spacing / 2 + for (item in overflownApps) { + val icon = + mActivityContext.viewCache.getView( + R.layout.taskbar_app_icon, + mActivityContext, + content, + ) + + if (icon is BubbleTextView && item is WorkspaceItemInfo) { + icon.applyFromWorkspaceItem(item) + icon.setOnClickListener(viewCallbacks.iconOnClickListener) + icon.setOnLongClickListener(viewCallbacks.iconOnLongClickListener) + + val lp = + LayoutParams(iconSize, iconSize).apply { + marginStart = iconSpacing + marginEnd = iconSpacing + } + content.addView(icon, lp) + } + } + } + + override fun isOfType(type: Int): Boolean = type and TYPE_TASKBAR_OVERFLOW != 0 + + override fun onControllerInterceptTouchEvent(ev: MotionEvent?): Boolean { + when (ev?.action) { + MotionEvent.ACTION_DOWN -> { + if (!mActivityContext.dragLayer.isEventOverView(this, ev)) { + close(true) + } + } + } + return false + } + + override fun getTargetObjectLocation(outPos: Rect?) { + popupContainer.getDescendantRectRelativeToSelf(overflowIcon, outPos) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/OverflownAppsViewController.kt b/quickstep/src/com/android/launcher3/taskbar/OverflownAppsViewController.kt new file mode 100644 index 00000000000..d9fa6825c70 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/OverflownAppsViewController.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import com.android.launcher3.R +import com.android.launcher3.model.data.ItemInfo + +/** + * Handles initialization of the [OverflownAppsContainerView] and supplies it with the list of apps. + */ +class OverflownAppsViewController( + private val activityContext: TaskbarActivityContext, + viewCallbacks: TaskbarViewCallbacks, + overflowIcon: TaskbarOverflowView, + onClose: Runnable, +) { + private val overflownAppsContainerView = + activityContext.layoutInflater.inflate( + R.layout.overflown_apps_container_view, + activityContext.dragLayer, + /* attachToRoot= */ false, + ) as OverflownAppsContainerView<*> + + init { + overflownAppsContainerView.init(overflowIcon, viewCallbacks) + overflownAppsContainerView.addOnCloseCallback(onClose) + } + + fun show(overflownApps: List) { + activityContext.isTaskbarWindowFullscreen = true + activityContext.dragLayer.post { + overflownAppsContainerView.setOverflownApps(overflownApps) + overflownAppsContainerView.show() + } + } + + fun close(animate: Boolean) = overflownAppsContainerView.close(animate) +} diff --git a/quickstep/src/com/android/launcher3/taskbar/PinToTaskbarShortcut.kt b/quickstep/src/com/android/launcher3/taskbar/PinToTaskbarShortcut.kt new file mode 100644 index 00000000000..628a7c79fac --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/PinToTaskbarShortcut.kt @@ -0,0 +1,273 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.content.Context +import android.util.SparseArray +import android.view.View +import android.view.accessibility.AccessibilityEvent +import android.view.accessibility.AccessibilityManager +import androidx.annotation.VisibleForTesting +import androidx.core.util.isNotEmpty +import androidx.core.util.size +import com.android.launcher3.DeviceProfile +import com.android.launcher3.LauncherAppState +import com.android.launcher3.LauncherSettings.Favorites +import com.android.launcher3.R +import com.android.launcher3.model.BgDataModel +import com.android.launcher3.model.ModelWriter +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.popup.SystemShortcut +import com.android.launcher3.popup.SystemShortcut.Factory +import com.android.launcher3.taskbar.customization.TaskbarSpecsEvaluator +import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext +import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.views.ActivityContext + +/** + * A single menu item shortcut to allow users to pin an item to the taskbar and unpin an item from + * the taskbar. + */ +class PinToTaskbarShortcut +@JvmOverloads +constructor( + target: T, + itemInfo: ItemInfo?, + originalView: View, + @get:VisibleForTesting val isPin: Boolean, + private val pinnedInfoList: SparseArray, + private val onClickCallback: Runnable? = null, +) : + SystemShortcut( + if (isPin) R.drawable.ic_pin else R.drawable.ic_unpin, + if (isPin) R.string.pin_to_taskbar else R.string.unpin_from_taskbar, + target, + itemInfo, + originalView, + ) where T : Context?, T : ActivityContext? { + + override fun onClick(v: View?) { + // Create a placeholder callbacks for the writer to notify other launcher model callbacks + // after update. + val callbacks: BgDataModel.Callbacks = object : BgDataModel.Callbacks {} + + val writer = + LauncherAppState.getInstance(mOriginalView.context) + .model + .getWriter(true, mTarget!!.cellPosMapper, callbacks) + + if (!isPin) { + var infoToUnpin = mItemInfo + // If the shortcut is triggered from the all apps, find the info in the taskbar to + // unpin. Otherwise, directly unpin the info on the taskbar. + if (mItemInfo.isInAllApps) { + for (i in 0 until pinnedInfoList.size) { + if (pinnedInfoList[i]?.getComponentKey() == mItemInfo.getComponentKey()) { + infoToUnpin = pinnedInfoList.valueAt(i) + break + } + } + } + unpinItem(writer, infoToUnpin) + onClickCleanUp(v) + return + } + + val newInfo = + when (mItemInfo) { + is com.android.launcher3.model.data.AppInfo -> + mItemInfo.makeWorkspaceItem(mOriginalView.context) + + is WorkspaceItemInfo -> mItemInfo.clone() + else -> return + } + + var targetIdx = -1 + val maxIcons = getMaxPinnableCount(mTarget) + if (maxIcons < 0) return + + // Reorder the taskbar only if we can't find a space that is to the right of all other + // items. + if (pinnedInfoList[maxIcons - 1] != null) { + compactTaskbarItems(writer) + } + + // Find the first available space that has larger index than all other items. + for (i in maxIcons - 1 downTo 0) { + if (pinnedInfoList[i] == null) { + targetIdx = i + } else { + break + } + } + + val (cellX, cellY) = getCellCoordinates(targetIdx) + + pinItem(writer, newInfo, mItemInfo.screenId, cellX, cellY) + onClickCleanUp(v) + } + + @VisibleForTesting + fun pinItem( + writer: ModelWriter, + info: WorkspaceItemInfo, + screenId: Int, + cellX: Int, + cellY: Int, + ) { + writer.addOrMoveItemInDatabase(info, Favorites.CONTAINER_HOTSEAT, screenId, cellX, cellY) + } + + @VisibleForTesting + fun unpinItem(writer: ModelWriter, info: ItemInfo) { + writer.deleteItemFromDatabase(info, "item unpinned through long-press menu") + } + + /** + * Called in [onClick] after the item is pinned/unpinned and right before [onClick] returns to + * reset the UI. + */ + private fun onClickCleanUp(shortcutView: View?) { + sendAccessibilityAnnouncement(shortcutView) + dismissTaskMenuView() + onClickCallback?.run() + } + + private fun sendAccessibilityAnnouncement(shortcutView: View?) { + if ( + shortcutView == null || + mTarget == null || + !AccessibilityManager.getInstance(mTarget).isEnabled + ) { + return + } + val announcementText = + if (isPin) mTarget.getString(R.string.app_added_to_taskbar) + else mTarget.getString(R.string.app_removed_from_taskbar) + + shortcutView.setContentDescription(announcementText) + shortcutView.sendAccessibilityEventUnchecked( + AccessibilityEvent().apply { + eventType = AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED + contentChangeTypes = AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION + } + ) + } + + /** + * Moves all the taskbar items to the front so that spaces that don't have a pinned item will be + * at the end of the taskbar. This can ensure that the newly pinned app will be appended to the + * end of the taskbar. + */ + private fun compactTaskbarItems(writer: ModelWriter) { + if (isPin && pinnedInfoList.isNotEmpty()) { + // Collect existing non-null items in their current order (based on SparseArray keys) + val nonNullItems = + List(getMaxPinnableCount(requireNotNull(mTarget))) { i -> pinnedInfoList[i] } + .filterNotNull() + + // Update database for moved items + for ((newScreenId, itemToUpdate) in nonNullItems.withIndex()) { + // Calculate new cellX, cellY based on newScreenId + val (newCellX, newCellY) = getCellCoordinates(newScreenId) + if ( + itemToUpdate.screenId != newScreenId || + itemToUpdate.cellX != newCellX || + itemToUpdate.cellY != newCellY + ) { + itemToUpdate.screenId = newScreenId + itemToUpdate.cellX = newCellX + itemToUpdate.cellY = newCellY + // container remains CONTAINER_HOTSEAT + writer.updateItemInDatabase(itemToUpdate) + } + } + + // Update the mPinnedInfoList in memory to reflect the new state + pinnedInfoList.clear() + for ((i, nonNullItem) in nonNullItems.withIndex()) { + pinnedInfoList[i] = nonNullItem + } + } + } + + /** This should be the same as how Hotseat calculates cellX and cellY from a rank. */ + private fun getCellCoordinates(targetIdx: Int): Pair { + val dp: DeviceProfile = requireNotNull(mTarget).deviceProfile + val cellX = if (dp.isVerticalBarLayout) 0 else targetIdx + val cellY = if (dp.isVerticalBarLayout) (dp.numShownHotseatIcons - (targetIdx + 1)) else 0 + + return Pair(cellX, cellY) + } + + companion object { + @JvmField + val PIN_ITEM_FROM_LAUNCHER: Factory = + Factory { context, itemInfo, originalView -> + val taskbarInfoList = + context.taskbarInteractor + ?.getControllers() + ?.taskbarPopupController + ?.taskbarInfoList ?: return@Factory null + + var isPinnedInTaskbar = false + for (i in 0 until taskbarInfoList.size) { + if (taskbarInfoList.valueAt(i)?.componentKey == itemInfo?.componentKey) { + isPinnedInTaskbar = true + break + } + } + + if (isPinnedInTaskbar) { + // As the item is already pinned, return a shortcut to UNPIN it. + return@Factory PinToTaskbarShortcut( + context, + itemInfo, + originalView, + false, + taskbarInfoList, + ) + } + + if (taskbarInfoList.size < getMaxPinnableCount(context)) { + return@Factory PinToTaskbarShortcut( + context, + itemInfo, + originalView, + true, + taskbarInfoList, + context::onItemPinnedFromContextMenu, + ) + } + + return@Factory null + } + + /** + * Returns the maximum number of items that can be pinned to the taskbar, or -1 if the + * context is not supported or the [TaskbarSpecsEvaluator] is not available. + */ + private fun getMaxPinnableCount(context: ActivityContext) = + when (context) { + is TaskbarActivityContext -> context.taskbarSpecsEvaluator?.maxPinnableCount ?: -1 + is TaskbarOverlayContext -> context.specsEvaluator?.maxPinnableCount ?: -1 + is QuickstepLauncher -> context.taskbarInteractor?.getMaxPinnableCount() ?: -1 + else -> -1 + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/StashedHandleView.java b/quickstep/src/com/android/launcher3/taskbar/StashedHandleView.java index 94e22441725..caf3320ea6b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/StashedHandleView.java +++ b/quickstep/src/com/android/launcher3/taskbar/StashedHandleView.java @@ -47,6 +47,7 @@ public class StashedHandleView extends View { private final int[] mTmpArr = new int[2]; private @Nullable ObjectAnimator mColorChangeAnim; + private Boolean mIsRegionDark; public StashedHandleView(Context context) { this(context, null); @@ -95,7 +96,11 @@ public Rect getSampledRegion() { * @param animate Whether to animate the change, or apply it immediately. */ public void updateHandleColor(boolean isRegionDark, boolean animate) { + if (mIsRegionDark != null && mIsRegionDark == isRegionDark) { + return; + } int newColor = isRegionDark ? mStashedHandleLightColor : mStashedHandleDarkColor; + mIsRegionDark = isRegionDark; if (mColorChangeAnim != null) { mColorChangeAnim.cancel(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java index 252f2a81f0a..caa23ac9a67 100644 --- a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java @@ -16,33 +16,43 @@ package com.android.launcher3.taskbar; import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS; +import static com.android.launcher3.EncryptionType.ENCRYPTED; +import static com.android.launcher3.LauncherPrefs.nonRestorableItem; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAutoStashConnectedDisplayTaskbar; +import static com.android.launcher3.taskbar.Utilities.getShapedTaskbarRadius; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; +import android.app.TaskInfo; import android.content.Context; -import android.content.SharedPreferences; import android.content.res.Resources; import android.graphics.Outline; import android.graphics.Rect; import android.view.View; import android.view.ViewOutlineProvider; +import androidx.annotation.Nullable; + +import com.android.launcher3.ConstantItem; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.R; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.RevealOutlineAnimation; import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; -import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.Executors; -import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.MultiValueAlpha; import com.android.quickstep.NavHandle; -import com.android.systemui.shared.navigationbar.RegionSamplingHelper; +import com.android.quickstep.TopTaskTracker; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.systemui.shared.system.TaskStackChangeListener; +import com.android.systemui.shared.system.TaskStackChangeListeners; +import com.android.wm.shell.shared.handles.RegionSamplingHelper; import java.io.PrintWriter; @@ -56,7 +66,9 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT public static final int ALPHA_INDEX_HOME_DISABLED = 1; public static final int ALPHA_INDEX_ASSISTANT_INVOKED = 2; public static final int ALPHA_INDEX_HIDDEN_WHILE_DREAMING = 3; - private static final int NUM_ALPHA_CHANNELS = 4; + public static final int ALPHA_INDEX_NUDGED = 4; + public static final int ALPHA_INDEX_ALL_SET_TRANSITION = 5; + private static final int NUM_ALPHA_CHANNELS = 6; // Values for long press animations, picked to most closely match navbar spec. private static final float SCALE_TOUCH_ANIMATION_SHRINK = 0.85f; @@ -68,11 +80,15 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT private static final String SHARED_PREFS_STASHED_HANDLE_REGION_DARK_KEY = "stashed_handle_region_is_dark"; + private static final ConstantItem STASHED_HANDLE_REGION_IS_DARK = + nonRestorableItem(SHARED_PREFS_STASHED_HANDLE_REGION_DARK_KEY, false, ENCRYPTED); + private final TaskbarActivityContext mActivity; - private final SharedPreferences mPrefs; + private final LauncherPrefs mPrefs; private final StashedHandleView mStashedHandleView; private int mStashedHandleWidth; private final int mStashedHandleHeight; + @Nullable private RegionSamplingHelper mRegionSamplingHelper; private final MultiValueAlpha mTaskbarStashedHandleAlpha; private final AnimatedFloat mTaskbarStashedHandleHintScale = new AnimatedFloat( @@ -94,21 +110,22 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT // States that affect whether region sampling is enabled or not private boolean mIsStashed; private boolean mIsLumaSamplingEnabled; + private boolean mIsAppTransitionPending; private boolean mTaskbarHidden; private float mTranslationYForSwipe; private float mTranslationYForStash; + private TaskStackChangeListener mTaskStackChangeListener; public StashedHandleViewController(TaskbarActivityContext activity, StashedHandleView stashedHandleView) { mActivity = activity; - mPrefs = LauncherPrefs.getPrefs(mActivity); + mPrefs = LauncherPrefs.get(mActivity); mStashedHandleView = stashedHandleView; mTaskbarStashedHandleAlpha = new MultiValueAlpha(mStashedHandleView, NUM_ALPHA_CHANNELS); mTaskbarStashedHandleAlpha.setUpdateVisibility(true); mStashedHandleView.updateHandleColor( - mPrefs.getBoolean(SHARED_PREFS_STASHED_HANDLE_REGION_DARK_KEY, false), - false /* animate */); + mPrefs.get(STASHED_HANDLE_REGION_IS_DARK), false /* animate */); final Resources resources = mActivity.getResources(); mStashedHandleHeight = resources.getDimensionPixelSize( R.dimen.taskbar_stashed_handle_height); @@ -118,16 +135,17 @@ public void init(TaskbarControllers controllers) { mControllers = controllers; DeviceProfile deviceProfile = mActivity.getDeviceProfile(); Resources resources = mActivity.getResources(); - if (mActivity.isPhoneGestureNavMode() || mActivity.isTinyTaskbar()) { + if (mActivity.isPhoneGestureNavMode() || mActivity.isTinyTaskbar() + || mActivity.isBubbleBarOnPhone()) { mTaskbarSize = resources.getDimensionPixelSize(R.dimen.taskbar_phone_size); mStashedHandleWidth = resources.getDimensionPixelSize(R.dimen.taskbar_stashed_small_screen); } else { - mTaskbarSize = deviceProfile.taskbarHeight; + mTaskbarSize = deviceProfile.getTaskbarProfile().getHeight(); mStashedHandleWidth = resources .getDimensionPixelSize(R.dimen.taskbar_stashed_handle_width); } - int taskbarBottomMargin = deviceProfile.taskbarBottomMargin; + int taskbarBottomMargin = deviceProfile.getTaskbarProfile().getBottomMargin(); mStashedHandleView.getLayoutParams().height = mTaskbarSize + taskbarBottomMargin; mTaskbarStashedHandleAlpha.get(ALPHA_INDEX_STASHED).setValue( @@ -146,7 +164,9 @@ public void getOutline(View view, Outline outline) { stashedCenterX + mStashedHandleWidth / 2, stashedCenterY + mStashedHandleHeight / 2); mStashedHandleView.updateSampledRegion(mStashedHandleBounds); - mStashedHandleRadius = view.getHeight() / 2f; + mStashedHandleRadius = Flags.enableLauncherIconShapes() + ? getShapedTaskbarRadius(mActivity) + : view.getHeight() / 2f; outline.setRoundRect(mStashedHandleBounds, mStashedHandleRadius); } }); @@ -158,14 +178,27 @@ public void getOutline(View view, Outline outline) { view.setPivotX(stashedCenterX); view.setPivotY(stashedCenterY); }); - initRegionSampler(); + if (mActivity.isPrimaryDisplay()) { + initRegionSampler(); + } if (mActivity.isPhoneGestureNavMode()) { onIsStashedChanged(true); } + if (!mActivity.isPrimaryDisplay() && enableAutoStashConnectedDisplayTaskbar.isTrue()) { + mTaskStackChangeListener = new TaskStackChangeListener() { + @Override + public void onTaskStackChanged() { + updateHandleColorOnConnectedDisplay(); + } + }; + TaskStackChangeListeners.getInstance().registerTaskStackListener( + mTaskStackChangeListener); + } } /** * Returns the stashed handle bounds. + * * @param out The destination rect. */ public void getStashedHandleBounds(Rect out) { @@ -178,8 +211,7 @@ private void initRegionSampler() { @Override public void onRegionDarknessChanged(boolean isRegionDark) { mStashedHandleView.updateHandleColor(isRegionDark, true /* animate */); - mPrefs.edit().putBoolean(SHARED_PREFS_STASHED_HANDLE_REGION_DARK_KEY, - isRegionDark).apply(); + mPrefs.put(STASHED_HANDLE_REGION_IS_DARK, isRegionDark); } @Override @@ -191,11 +223,17 @@ public Rect getSampledRegion(View sampledView) { public void onDestroy() { - mRegionSamplingHelper.stopAndDestroy(); + if (mRegionSamplingHelper != null) { + mRegionSamplingHelper.stopAndDestroy(); + } mRegionSamplingHelper = null; + if (mTaskStackChangeListener != null) { + TaskStackChangeListeners.getInstance().unregisterTaskStackListener( + mTaskStackChangeListener); + } } - public MultiPropertyFactory getStashedHandleAlpha() { + public MultiValueAlpha getStashedHandleAlpha() { return mTaskbarStashedHandleAlpha; } @@ -209,16 +247,18 @@ public AnimatedFloat getStashedHandleHintScale() { * morphs into the size of where the taskbar icons will be. */ public Animator createRevealAnimToIsStashed(boolean isStashed) { - Rect visualBounds = new Rect(mControllers.taskbarViewController.getIconLayoutBounds()); + Rect visualBounds = mControllers.taskbarViewController + .getTransientTaskbarIconLayoutBounds(); float startRadius = mStashedHandleRadius; - if (DisplayController.isTransientTaskbar(mActivity)) { + if (mActivity.isTransientTaskbar()) { // Account for the full visual height of the transient taskbar. int heightDiff = (mTaskbarSize - visualBounds.height()) / 2; visualBounds.top -= heightDiff; visualBounds.bottom += heightDiff; - - startRadius = visualBounds.height() / 2f; + startRadius = Flags.enableLauncherIconShapes() + ? getShapedTaskbarRadius(mActivity) + : visualBounds.height() / 2f; } final RevealOutlineAnimation handleRevealProvider = new RoundedRectRevealOutlineProvider( @@ -257,7 +297,16 @@ public void onNavigationBarLumaSamplingEnabled(int displayId, boolean enable) { updateSamplingState(); } + public void setIsAppTransitionPending(boolean pending) { + mIsAppTransitionPending = pending; + updateSamplingState(); + } + private void updateSamplingState() { + if (mRegionSamplingHelper == null) { + return; + } + updateRegionSamplingWindowVisibility(); if (shouldSample()) { mStashedHandleView.updateSampledRegion(mStashedHandleBounds); @@ -268,7 +317,7 @@ private void updateSamplingState() { } private boolean shouldSample() { - return mIsStashed && mIsLumaSamplingEnabled; + return mIsStashed && mIsLumaSamplingEnabled && !mIsAppTransitionPending; } protected void updateStashedHandleHintScale() { @@ -279,7 +328,7 @@ protected void updateStashedHandleHintScale() { /** * Sets the translation of the stashed handle during the swipe up gesture. */ - protected void setTranslationYForSwipe(float transY) { + public void setTranslationYForSwipe(float transY) { mTranslationYForSwipe = transY; updateTranslationY(); } @@ -310,13 +359,38 @@ public void updateStateForSysuiFlags(@SystemUiStateFlags long systemUiStateFlags } private void updateRegionSamplingWindowVisibility() { - mRegionSamplingHelper.setWindowVisible(shouldSample() && !mTaskbarHidden); + if (mRegionSamplingHelper != null) { + mRegionSamplingHelper.setWindowVisible(shouldSample() && !mTaskbarHidden); + } } public boolean isStashedHandleVisible() { return mStashedHandleView.getVisibility() == View.VISIBLE; } + /** + * Updates stash handle's color for connected displays. + * TODO: b/441128583 - Remove this when framework limitation of luma sampling is fixed. + **/ + void updateHandleColorOnConnectedDisplay() { + if (mActivity.isPrimaryDisplay() || !enableAutoStashConnectedDisplayTaskbar.isTrue()) { + return; + } + + boolean isRegionDark = mPrefs.get(STASHED_HANDLE_REGION_IS_DARK); + TopTaskTracker.CachedTaskInfo cachedTopTaskInfo = + TopTaskTracker.INSTANCE.get(mActivity).getCachedTopTask( + /* filterOnlyVisibleRecents= */ true, mActivity.getDisplayId()); + TaskInfo topTaskInfo = cachedTopTaskInfo.getLegacyBaseTask(); + if (topTaskInfo != null && topTaskInfo.taskDescription != null) { + int appearance = topTaskInfo.taskDescription.getSystemBarsAppearance(); + isRegionDark = (appearance & APPEARANCE_LIGHT_NAVIGATION_BARS) + != APPEARANCE_LIGHT_NAVIGATION_BARS; + } + + mStashedHandleView.updateHandleColor(isRegionDark, /* animate= */ false); + } + @Override public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "StashedHandleViewController:"); @@ -324,7 +398,9 @@ public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "\tisStashedHandleVisible=" + isStashedHandleVisible()); pw.println(prefix + "\tmStashedHandleWidth=" + mStashedHandleWidth); pw.println(prefix + "\tmStashedHandleHeight=" + mStashedHandleHeight); - mRegionSamplingHelper.dump(prefix, pw); + if (mRegionSamplingHelper != null) { + mRegionSamplingHelper.dump(prefix, pw); + } } @Override @@ -352,4 +428,9 @@ public boolean canNavHandleBeLongPressed() { public int getNavHandleWidth(Context context) { return mStashedHandleWidth; } + + @Override + public Rect getBoundsOnScreen() { + return mStashedHandleView.getSampledRegion(); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 4e8034da631..6d4a5122a7a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -15,35 +15,45 @@ */ package com.android.launcher3.taskbar; +import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.os.Trace.TRACE_TAG_APP; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; +import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static android.window.SplashScreen.SPLASH_SCREEN_STYLE_UNDEFINED; +import static androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE; + +import static com.android.app.animation.Interpolators.LINEAR; import static com.android.launcher3.AbstractFloatingView.TYPE_ALL; +import static com.android.launcher3.AbstractFloatingView.TYPE_ON_BOARD_POPUP; import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE; import static com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_OVERLAY_PROXY; -import static com.android.launcher3.Flags.enableCursorHoverStates; +import static com.android.launcher3.Flags.refactorTaskbarUiState; import static com.android.launcher3.Utilities.calculateTextHeight; import static com.android.launcher3.Utilities.isRunningInTestHarness; -import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION; -import static com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate; import static com.android.launcher3.config.FeatureFlags.enableTaskbarPinning; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN; import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING; import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_FULLSCREEN; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAutoStashConnectedDisplayTaskbar; +import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_SECONDARY_LAUNCHER_ON_CD; +import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_IN_APP_AUTO; +import static com.android.launcher3.taskbar.TaskbarStashController.SHOULD_BUBBLES_FOLLOW_DEFAULT_VALUE; import static com.android.launcher3.testing.shared.ResourceUtils.getBoolByName; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback; +import static com.android.quickstep.util.ExternalDisplaysKt.isExternalDisplay; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; +import static com.android.wm.shell.Flags.enableBubbleBar; +import static com.android.wm.shell.Flags.enableBubbleBarOnPhones; import static com.android.wm.shell.Flags.enableTinyTaskbar; -import static java.util.stream.Collectors.toList; +import static java.lang.invoke.MethodHandles.Lookup.PROTECTED; import android.animation.AnimatorSet; import android.animation.ValueAnimator; @@ -55,63 +65,92 @@ import android.content.pm.LauncherApps; import android.content.res.Resources; import android.graphics.PixelFormat; +import android.graphics.Point; import android.graphics.Rect; +import android.graphics.drawable.Drawable; import android.hardware.display.DisplayManager; import android.os.IRemoteCallback; import android.os.Process; import android.os.Trace; import android.provider.Settings; +import android.provider.Settings.Secure; import android.util.Log; -import android.view.Display; import android.view.Gravity; import android.view.Surface; import android.view.View; import android.view.WindowInsets; import android.view.WindowManager; +import android.view.animation.AnimationUtils; +import android.widget.FrameLayout; import android.widget.Toast; +import android.window.DesktopExperienceFlags; +import android.window.DesktopModeFlags; +import android.window.DesktopModeFlags.DesktopModeFlag; +import android.window.RemoteTransition; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import androidx.core.graphics.Insets; -import androidx.core.view.WindowInsetsCompat; +import com.android.internal.jank.Cuj; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BubbleTextView; +import com.android.launcher3.BubbleTextView.RunningAppState; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.allapps.ActivityAllAppsContainerView; +import com.android.launcher3.anim.AnimatorListeners; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.apppairs.AppPairIcon; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.dot.DotInfo; +import com.android.launcher3.desktop.DesktopAppLaunchTransition; +import com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType; +import com.android.launcher3.deviceprofile.TaskbarProfile; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; +import com.android.launcher3.graphics.ThemeManager; +import com.android.launcher3.icons.BitmapRenderer; +import com.android.launcher3.icons.FastBitmapDrawable; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logging.StatsLogManager; +import com.android.launcher3.model.ModelWriter; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.AppPairInfo; import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.ResolvedTargetInfo; +import com.android.launcher3.model.data.TaskItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.popup.PopupContainerWithArrow; -import com.android.launcher3.popup.PopupDataProvider; +import com.android.launcher3.popup.PopupContainer; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.AutohideSuspendFlag; import com.android.launcher3.taskbar.TaskbarTranslationController.TransitionCallback; import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController; import com.android.launcher3.taskbar.bubbles.BubbleBarController; -import com.android.launcher3.taskbar.bubbles.BubbleBarPinController; +import com.android.launcher3.taskbar.bubbles.BubbleBarSwipeController; import com.android.launcher3.taskbar.bubbles.BubbleBarView; import com.android.launcher3.taskbar.bubbles.BubbleBarViewController; import com.android.launcher3.taskbar.bubbles.BubbleControllers; +import com.android.launcher3.taskbar.bubbles.BubbleCreator; import com.android.launcher3.taskbar.bubbles.BubbleDismissController; import com.android.launcher3.taskbar.bubbles.BubbleDragController; -import com.android.launcher3.taskbar.bubbles.BubblePinController; -import com.android.launcher3.taskbar.bubbles.BubbleStashController; import com.android.launcher3.taskbar.bubbles.BubbleStashedHandleViewController; +import com.android.launcher3.taskbar.bubbles.DragToBubbleController; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.TaskbarHotseatDimensionsProvider; +import com.android.launcher3.taskbar.bubbles.stashing.DeviceProfileDimensionsProviderAdapter; +import com.android.launcher3.taskbar.bubbles.stashing.PersistentBubbleStashController; +import com.android.launcher3.taskbar.bubbles.stashing.TransientBubbleStashController; +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator; +import com.android.launcher3.taskbar.customization.TaskbarSpecsEvaluator; +import com.android.launcher3.taskbar.growth.NudgeController; +import com.android.launcher3.taskbar.handoff.TaskbarHandoffController; import com.android.launcher3.taskbar.navbutton.NearestTouchFrame; +import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext; import com.android.launcher3.taskbar.overlay.TaskbarOverlayController; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; @@ -119,29 +158,43 @@ import com.android.launcher3.touch.ItemClickHandler.ItemClickProxy; import com.android.launcher3.util.ActivityOptionsWrapper; import com.android.launcher3.util.ApiWrapper; -import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.util.ApplicationInfoWrapper; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.Executors; +import com.android.launcher3.util.LauncherBindableItemsContainer; +import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.NavigationMode; -import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.SettingsCache; import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource; import com.android.launcher3.util.TraceHelper; import com.android.launcher3.util.VibratorWrapper; -import com.android.launcher3.util.ViewCache; import com.android.launcher3.views.ActivityContext; -import com.android.quickstep.LauncherActivityInterface; +import com.android.launcher3.views.BaseDragLayer; import com.android.quickstep.NavHandle; import com.android.quickstep.RecentsModel; +import com.android.quickstep.SystemUiProxy; +import com.android.quickstep.util.DesktopTask; +import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.SingleTask; +import com.android.quickstep.util.SlideInRemoteTransition; +import com.android.quickstep.util.SplitTask; +import com.android.quickstep.views.DesktopTaskView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; +import com.android.systemui.animation.ViewRootSync; +import com.android.systemui.rotation.impl.RotationPolicyWrapperImpl; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.rotation.RotationButtonController; +import com.android.systemui.shared.statusbar.phone.BarTransitions; import com.android.systemui.shared.system.ActivityManagerWrapper; +import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; import com.android.systemui.unfold.updates.RotationChangeProvider; import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; +import com.android.wm.shell.shared.desktopmode.DesktopState; +import com.android.wm.shell.shared.desktopmode.DesktopTaskToFrontReason; import java.io.PrintWriter; import java.util.Collections; @@ -150,12 +203,9 @@ import java.util.function.Consumer; /** - * The {@link ActivityContext} with which we inflate Taskbar-related Views. This - * allows UI elements - * that are used by both Launcher and Taskbar (such as Folder) to reference a - * generic - * ActivityContext and BaseDragLayer instead of the Launcher activity and its - * DragLayer. + * The {@link ActivityContext} with which we inflate Taskbar-related Views. This allows UI elements + * that are used by both Launcher and Taskbar (such as Folder) to reference a generic + * ActivityContext and BaseDragLayer instead of the Launcher activity and its DragLayer. */ public class TaskbarActivityContext extends BaseTaskbarContext { @@ -165,32 +215,49 @@ public class TaskbarActivityContext extends BaseTaskbarContext { private static final String WINDOW_TITLE = "Taskbar"; + public static final String SIMPLE_VIEW_SETTINGS_KEY = "matcha_enable"; + + protected static final DesktopModeFlag ENABLE_TASKBAR_BEHIND_SHADE = new DesktopModeFlag( + Flags::enableTaskbarBehindShade, false); + private final @Nullable Context mNavigationBarPanelContext; + private final TaskbarUiState mTaskbarUiState; + private final TaskbarDragLayer mDragLayer; private final TaskbarControllers mControllers; private final WindowManager mWindowManager; private DeviceProfile mDeviceProfile; private WindowManager.LayoutParams mWindowLayoutParams; + private WindowManager.LayoutParams mLastUpdatedLayoutParams; private boolean mIsFullscreen; + private boolean mIsNotificationShadeExpanded = false; // The size we should return to when we call setTaskbarWindowFullscreen(false) private int mLastRequestedNonFullscreenSize; + /** + * When this is true, the taskbar window size is not updated. Requests to update the window + * size are stored in {@link #mLastRequestedNonFullscreenSize} and will take effect after + * bubbles no longer animate and {@link #setTaskbarWindowForAnimatingBubble()} is called. + */ + private boolean mIsTaskbarSizeFrozenForAnimatingBubble; private NavigationMode mNavMode; private boolean mImeDrawsImeNavBar; - private final ViewCache mViewCache = new ViewCache(); + + /** + * Static return value of {@link #isImeDocked}, used for testing only. A {@code null} value will + * revert back to the actual return value of {@link #isImeDocked}. + */ + @Nullable + private Boolean mImeDockedOverrideForTest; private final boolean mIsSafeModeEnabled; - private final boolean mIsUserSetupComplete; - private final boolean mIsNavBarForceVisible; - private final boolean mIsNavBarKidsMode; + private boolean mIsUserSetupComplete; + private boolean mIsNavBarForceVisible; + private boolean mIsNavBarKidsMode; private boolean mIsDestroyed = false; - // The flag to know if the window is excluded from magnification region - // computation. - private boolean mIsExcludeFromMagnificationRegion = false; - private boolean mBindingItems = false; private boolean mAddedWindow = false; // The bounds of the taskbar items relative to TaskbarDragLayer @@ -198,51 +265,70 @@ public class TaskbarActivityContext extends BaseTaskbarContext { private final TaskbarShortcutMenuAccessibilityDelegate mAccessibilityDelegate; - private DeviceProfile mTransientTaskbarDeviceProfile; + private TaskbarProfile mTransientTaskbarProfile; - private DeviceProfile mPersistentTaskbarDeviceProfile; + private TaskbarProfile mPersistentTaskbarProfile; private final LauncherPrefs mLauncherPrefs; + private final int mPrimaryDisplayId; + private final SystemUiProxy mSysUiProxy; + private final Context mWindowContext; + + private final TaskbarFeatureEvaluator mTaskbarFeatureEvaluator; + + private final TaskbarSpecsEvaluator mTaskbarSpecsEvaluator; - public TaskbarActivityContext(Context windowContext, + // Snapshot is used to temporarily draw taskbar behind the shade. + private @Nullable View mTaskbarSnapshotView; + private @Nullable TaskbarOverlayContext mTaskbarSnapshotOverlay; + + private @Nullable UIControllerChangeListener mUIControllerChangeListener; + + private final boolean mIsTransient; + private final boolean mIsPinned; + + public TaskbarActivityContext(int displayId, Context windowContext, @Nullable Context navigationBarPanelContext, DeviceProfile launcherDp, TaskbarNavButtonController buttonController, - ScopedUnfoldTransitionProgressProvider unfoldTransitionProgressProvider) { - super(windowContext); - + ScopedUnfoldTransitionProgressProvider unfoldTransitionProgressProvider, + boolean isPrimaryDisplay, int primaryDisplayId, SystemUiProxy sysUiProxy) { + super(windowContext, displayId, isPrimaryDisplay); + mTaskbarFeatureEvaluator = TaskbarFeatureEvaluator.INSTANCE.get(this); + mIsTransient = mTaskbarFeatureEvaluator.isTransient(); + mIsPinned = mTaskbarFeatureEvaluator.isPinned(); + mTaskbarUiState = TaskbarUiStateMonitor.INSTANCE.get(this).getTaskbarUiState(displayId); + mTaskbarUiState.setIsPrimaryDisplay(isPrimaryDisplay); mNavigationBarPanelContext = navigationBarPanelContext; + mSysUiProxy = sysUiProxy; + mPrimaryDisplayId = primaryDisplayId; + mWindowContext = windowContext; applyDeviceProfile(launcherDp); - final Resources resources = getResources(); - - mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, resources, false); + mTaskbarSpecsEvaluator = new TaskbarSpecsEvaluator( + this, + mTaskbarFeatureEvaluator, + mDeviceProfile.inv.numRows, + mDeviceProfile.inv.numColumns); + + mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, getResources(), false) + && isPrimaryDisplay(); mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode", () -> getPackageManager().isSafeMode()); - // TODO(b/244231596) For shared Taskbar window, update this value in - // applyDeviceProfile() - // instead so to get correct value when recreating the taskbar - SettingsCache settingsCache = SettingsCache.INSTANCE.get(this); - mIsUserSetupComplete = settingsCache.getValue( - Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE), 0); - mIsNavBarKidsMode = settingsCache.getValue( - Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_KIDS_MODE), 0); - mIsNavBarForceVisible = mIsNavBarKidsMode; - // Get display and corners first, as views might use them in constructor. - Display display = windowContext.getDisplay(); Context c = getApplicationContext(); mWindowManager = c.getSystemService(WindowManager.class); // Inflate views. - int taskbarLayout = DisplayController.isTransientTaskbar(this) && !isPhoneMode() - ? R.layout.transient_taskbar - : R.layout.taskbar; + boolean isTransientTaskbar = isTransientTaskbar(); + int taskbarLayout = isTransientTaskbar ? R.layout.transient_taskbar : R.layout.taskbar; mDragLayer = (TaskbarDragLayer) mLayoutInflater.inflate(taskbarLayout, null, false); TaskbarView taskbarView = mDragLayer.findViewById(R.id.taskbar_view); TaskbarScrimView taskbarScrimView = mDragLayer.findViewById(R.id.taskbar_scrim); NearestTouchFrame navButtonsView = mDragLayer.findViewById(R.id.navbuttons_view); StashedHandleView stashedHandleView = mDragLayer.findViewById(R.id.stashed_handle); + NudgeView nudgeView = mDragLayer.findViewById(R.id.nudge_icon); BubbleBarView bubbleBarView = mDragLayer.findViewById(R.id.taskbar_bubbles); + FrameLayout bubbleBarContainer = mDragLayer.findViewById(R.id.taskbar_bubbles_container); StashedHandleView bubbleHandleView = mDragLayer.findViewById(R.id.stashed_bubble_handle); mAccessibilityDelegate = new TaskbarShortcutMenuAccessibilityDelegate(this); @@ -250,22 +336,44 @@ public TaskbarActivityContext(Context windowContext, // If Bubble bar is present, TaskbarControllers depends on it so build it first. Optional bubbleControllersOptional = Optional.empty(); BubbleBarController.onTaskbarRecreated(); - if (BubbleBarController.isBubbleBarEnabled() && bubbleBarView != null) { + mTaskbarUiState.setHasBubble(false); + final boolean deviceBubbleBarEnabled = enableBubbleBarOnPhones() + || (!mDeviceProfile.getDeviceProperties().isPhone() && !mDeviceProfile.isVerticalBarLayout()); + if (BubbleBarController.isBubbleBarEnabled() && deviceBubbleBarEnabled + && bubbleBarView != null && isPrimaryDisplay) { + Optional bubbleHandleController = Optional.empty(); + Optional bubbleBarSwipeController = Optional.empty(); + if (isTransientTaskbar) { + bubbleHandleController = Optional.of( + new BubbleStashedHandleViewController( + this, bubbleHandleView, mTaskbarUiState)); + bubbleBarSwipeController = Optional.of(new BubbleBarSwipeController(this)); + } + TaskbarHotseatDimensionsProvider dimensionsProvider = + new DeviceProfileDimensionsProviderAdapter(this); + BubbleStashController bubbleStashController = isTransientTaskbar + ? new TransientBubbleStashController(dimensionsProvider, this) + : new PersistentBubbleStashController(dimensionsProvider); + bubbleStashController.setBubbleBarVerticalCenterForHome( + launcherDp.getBubbleBarVerticalCenterForHome()); bubbleControllersOptional = Optional.of(new BubbleControllers( new BubbleBarController(this, bubbleBarView), - new BubbleBarViewController(this, bubbleBarView), - new BubbleStashController(this), - new BubbleStashedHandleViewController(this, bubbleHandleView), - new BubbleDragController(this), + new BubbleBarViewController( + this, mTaskbarUiState, bubbleBarView, bubbleBarContainer), + bubbleStashController, + bubbleHandleController, + new BubbleDragController(this, mWindowContext, mDragLayer, mTaskbarUiState), new BubbleDismissController(this, mDragLayer), - new BubbleBarPinController(this, mDragLayer, - () -> DisplayController.INSTANCE.get(this).getInfo().currentSize), - new BubblePinController(this, mDragLayer, - () -> DisplayController.INSTANCE.get(this).getInfo().currentSize))); + bubbleBarSwipeController, + new DragToBubbleController(mWindowContext, bubbleBarContainer), + new BubbleCreator(this) + )); } // Construct controllers. - RotationButtonController rotationButtonController = new RotationButtonController(this, + RotationButtonController rotationButtonController = new RotationButtonController( + new RotationPolicyWrapperImpl(c), + this, c.getColor(R.color.floating_rotation_button_light_color), c.getColor(R.color.floating_rotation_button_dark_color), R.drawable.ic_sysbar_rotate_button_ccw_start_0, @@ -278,10 +386,11 @@ public TaskbarActivityContext(Context windowContext, mControllers = new TaskbarControllers(this, new TaskbarDragController(this), buttonController, - new NavbarButtonsViewController(this, mNavigationBarPanelContext, navButtonsView), + new NavbarButtonsViewController(this, mNavigationBarPanelContext, navButtonsView, + getMainThreadHandler(), mTaskbarUiState), rotationButtonController, new TaskbarDragLayerController(this, mDragLayer), - new TaskbarViewController(this, taskbarView), + new TaskbarViewController(this, taskbarView, mTaskbarUiState), new TaskbarScrimViewController(this, taskbarScrimView), new TaskbarUnfoldAnimationController(this, unfoldTransitionProgressProvider, mWindowManager, @@ -289,7 +398,7 @@ public TaskbarActivityContext(Context windowContext, UI_HELPER_EXECUTOR.getHandler(), getMainThreadHandler())), new TaskbarKeyguardController(this), new StashedHandleViewController(this, stashedHandleView), - new TaskbarStashController(this), + new TaskbarStashController(this, mTaskbarUiState), new TaskbarAutohideSuspendController(this), new TaskbarPopupController(this), new TaskbarForceVisibleImmersiveController(this), @@ -299,23 +408,31 @@ public TaskbarActivityContext(Context windowContext, new VoiceInteractionWindowController(this), new TaskbarTranslationController(this), new TaskbarSpringOnStashController(this), - new TaskbarRecentAppsController( - RecentsModel.INSTANCE.get(this), - LauncherActivityInterface.INSTANCE::getDesktopVisibilityController), + new TaskbarRecentAppsController(this, RecentsModel.INSTANCE.get(this), + ThemeManager.INSTANCE.get(this)), TaskbarEduTooltipController.newInstance(this), new KeyboardQuickSwitchController(), - new TaskbarPinningController(this, - () -> DisplayController.INSTANCE.get(this).getInfo().isInDesktopMode()), - bubbleControllersOptional); + new TaskbarPinningController(this), + bubbleControllersOptional, + new TaskbarDesktopModeController(this, + DesktopVisibilityController.INSTANCE.get(this)), + new NudgeController(this), + new NudgeViewController(this, nudgeView), + new TaskbarHandoffController(this)); mLauncherPrefs = LauncherPrefs.get(this); + onViewCreated(); } /** Updates {@link DeviceProfile} instances for any Taskbar windows. */ public void updateDeviceProfile(DeviceProfile launcherDp) { applyDeviceProfile(launcherDp); - mControllers.taskbarOverlayController.updateLauncherDeviceProfile(launcherDp); + mControllers.bubbleControllers.ifPresent(bubbleControllers -> { + int bubbleBarVerticalCenter = launcherDp.getBubbleBarVerticalCenterForHome(); + bubbleControllers.bubbleStashController + .setBubbleBarVerticalCenterForHome(bubbleBarVerticalCenter); + }); AbstractFloatingView.closeAllOpenViewsExcept(this, false, TYPE_REBIND_SAFE); // Reapply fullscreen to take potential new screen size into account. setTaskbarWindowFullscreen(mIsFullscreen); @@ -323,58 +440,159 @@ public void updateDeviceProfile(DeviceProfile launcherDp) { dispatchDeviceProfileChanged(); } + public final int getPrimaryDisplayId() { + return mPrimaryDisplayId; + } + + public TaskbarUiState getTaskbarUiState() { + return mTaskbarUiState; + } + + @Override + public boolean isTransientTaskbar() { + return mIsTransient && isPrimaryDisplay() && !isPhoneMode(); + } + + @Override + public boolean isPinnedTaskbar() { + return mIsPinned; + } + + @Override + public NavigationMode getNavigationMode() { + return isPrimaryDisplay() ? DisplayController.getNavigationMode(this) + : NavigationMode.THREE_BUTTONS; + } + + @Override + public boolean isInDesktopMode() { + return mControllers != null + && mControllers.taskbarDesktopModeController.isInDesktopMode(getDisplayId()); + } + + @Override + public boolean isTaskbarShowingDesktopTasks() { + return mControllers != null + && mControllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar( + getDisplayId()); + } + + @Override + public boolean showLockedTaskbarOnHome() { + return DisplayController.showLockedTaskbarOnHome(this); + } + + @Override + public boolean showDesktopTaskbarForFreeformDisplay() { + return DisplayController.showDesktopTaskbarForFreeformDisplay(this); + } + + @Override + public Point getScreenSize() { + return DisplayController.INSTANCE.get(this).getInfo().currentSize; + } + + @Override + public int getDisplayHeight() { + return DisplayController.INSTANCE.get(this).getInfo().currentSize.y; + } + + @Override + public void notifyConfigChanged() { + DisplayController.INSTANCE.get(this).notifyConfigChange(); + } + + /** + * Used to confirm we are on AL device. + */ + public boolean shouldShowHomeBehindDesktop() { + return DesktopState.getInstance(this).getShouldShowHomeBehindDesktop(); + } + /** - * Copy the original DeviceProfile, match the number of hotseat icons and qsb - * width and update + * Copy the original DeviceProfile, match the number of hotseat icons and qsb width and update * the icon size */ private void applyDeviceProfile(DeviceProfile originDeviceProfile) { + //TODO(b/430382569) Keep DeviceProfile immutable. Consumer overrideProvider = deviceProfile -> { // Taskbar should match the number of icons of hotseat deviceProfile.numShownHotseatIcons = originDeviceProfile.numShownHotseatIcons; // Same QSB width to have a smooth animation deviceProfile.hotseatQsbWidth = originDeviceProfile.hotseatQsbWidth; + deviceProfile.mWorkspaceProfile = deviceProfile + .mWorkspaceProfile + .changeIconSize(deviceProfile.getTaskbarProfile().getIconSize()); + // Update icon size - deviceProfile.iconSizePx = deviceProfile.taskbarIconSize; deviceProfile.updateIconSize(1f, this); }; - mDeviceProfile = originDeviceProfile.toBuilder(this) + mDeviceProfile = originDeviceProfile.toBuilder() .withDimensionsOverride(overrideProvider).build(); + if (refactorTaskbarUiState()) { + mTaskbarUiState.setDeviceProfile(mDeviceProfile); + } - if (DisplayController.isTransientTaskbar(this)) { - mTransientTaskbarDeviceProfile = mDeviceProfile; - mPersistentTaskbarDeviceProfile = mDeviceProfile - .toBuilder(this) - .withDimensionsOverride(overrideProvider) - .setIsTransientTaskbar(false) - .build(); + if (isTransientTaskbar()) { + mTransientTaskbarProfile = mDeviceProfile.getTaskbarProfile(); + mPersistentTaskbarProfile = TaskbarProfile.Factory.createTaskbarProfile( + getResources(), + false, + mDeviceProfile.isTaskbarPresent, + getResources().getDisplayMetrics(), + mDeviceProfile.getDisplayOptionSpec(), + mDeviceProfile.getDisplayOptionSpec().typeIndex, + mDeviceProfile.inv); } else { - mPersistentTaskbarDeviceProfile = mDeviceProfile; - mTransientTaskbarDeviceProfile = mDeviceProfile - .toBuilder(this) - .withDimensionsOverride(overrideProvider) - .setIsTransientTaskbar(true) - .build(); + mPersistentTaskbarProfile = mDeviceProfile.getTaskbarProfile(); + mTransientTaskbarProfile = TaskbarProfile.Factory.createTaskbarProfile( + getResources(), + true, + mDeviceProfile.isTaskbarPresent, + getResources().getDisplayMetrics(), + mDeviceProfile.getDisplayOptionSpec(), + mDeviceProfile.getDisplayOptionSpec().typeIndex, + mDeviceProfile.inv); + } + mNavMode = getNavigationMode(); + + SettingsCache settingsCache = SettingsCache.INSTANCE.get(this); + mIsUserSetupComplete = settingsCache.getValue(Secure.getUriFor(Secure.USER_SETUP_COMPLETE)); + mIsNavBarKidsMode = settingsCache.getValue(Secure.getUriFor(Secure.NAV_BAR_KIDS_MODE)); + mIsNavBarForceVisible = mIsNavBarKidsMode; + if (mControllers != null) { + mControllers.taskbarEduTooltipController.updateShouldShowEduOnAppLaunch(); } - mNavMode = DisplayController.getNavigationMode(this); } /** Called when the visibility of the bubble bar changed. */ public void bubbleBarVisibilityChanged(boolean isVisible) { mControllers.uiController.adjustHotseatForBubbleBar(isVisible); - mControllers.taskbarViewController.resetIconAlignmentController(); + mControllers.taskbarViewController.adjustTaskbarForBubbleBar(); } - public void init(@NonNull TaskbarSharedState sharedState) { - mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, getResources(), false); + /** + * Init of taskbar activity context. + * @param duration If duration is greater than 0, it will be used to create an animation + * for the taskbar create/recreate process. + */ + public void init(@NonNull TaskbarSharedState sharedState, int duration) { + mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, getResources(), false) + && isPrimaryDisplay(); mLastRequestedNonFullscreenSize = getDefaultTaskbarWindowSize(); mWindowLayoutParams = createAllWindowParams(); + mLastUpdatedLayoutParams = new WindowManager.LayoutParams(); + + + AnimatorSet recreateAnim = null; + if (duration > 0) { + recreateAnim = onRecreateAnimation(duration); + } // Initialize controllers after all are constructed. - mControllers.init(sharedState); - // This may not be necessary and can be reverted once we move towards recreating - // all + mControllers.init(sharedState, recreateAnim, mTaskbarUiState); + // This may not be necessary and can be reverted once we move towards recreating all // controllers without re-creating the window mControllers.rotationButtonController.onNavigationModeChanged(mNavMode.resValue); updateSysuiStateFlags(sharedState.sysuiStateFlags, true /* fromInit */); @@ -385,93 +603,145 @@ public void init(@NonNull TaskbarSharedState sharedState) { onNavButtonsDarkIntensityChanged(sharedState.navButtonsDarkIntensity); onNavigationBarLumaSamplingEnabled(sharedState.mLumaSamplingDisplayId, sharedState.mIsLumaSamplingEnabled); + setWallpaperVisible(sharedState.wallpaperVisible); + onTransitionModeUpdated(sharedState.barMode, true /* checkBarModes */); - if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) { - // W/ the flag not set this entire class gets re-created, which resets the value - // of - // mIsDestroyed. We re-use the class for small-screen, so we explicitly have to - // mark - // this class as non-destroyed - mIsDestroyed = false; - } + // This entire class gets re-created, which resets the value of mIsDestroyed. We re-use the + // class for small-screen, so we explicitly have to mark this class as non-destroyed + mIsDestroyed = false; + notifyUpdateLayoutParams(); - if (!enableTaskbarNoRecreate() && !mAddedWindow) { - mWindowManager.addView(mDragLayer, mWindowLayoutParams); - mAddedWindow = true; - } else { - notifyUpdateLayoutParams(); + if (recreateAnim != null) { + recreateAnim.start(); } } /** - * @return {@code true} if the device profile isn't a large screen profile and - * we are using a - * single window for taskbar and navbar. + * Create AnimatorSet for taskbar create/recreate animation. Further used in init + */ + public AnimatorSet onRecreateAnimation(int duration) { + AnimatorSet animatorSet = new AnimatorSet(); + animatorSet.setDuration(duration); + return animatorSet; + } + + /** + * Called when we want destroy current taskbar with animation as part of recreate process. + */ + public AnimatorSet onDestroyAnimation(int duration) { + mIsDestroyed = true; + AnimatorSet animatorSet = new AnimatorSet(); + mControllers.taskbarViewController.onDestroyAnimation(animatorSet); + mControllers.taskbarDragLayerController.onDestroyAnimation(animatorSet); + animatorSet.setInterpolator(LINEAR); + animatorSet.setDuration(duration); + return animatorSet; + } + + /** + * @return {@code true} if the device profile isn't a large screen profile and we are using a + * single window for taskbar and navbar. */ public boolean isPhoneMode() { - return ENABLE_TASKBAR_NAVBAR_UNIFICATION - && mDeviceProfile.isPhone - && !mDeviceProfile.isTaskbarPresent; + return mDeviceProfile.getDeviceProperties().isPhone() && !mDeviceProfile.isTaskbarPresent; + } + + public boolean isTaskbarInMinimalState() { + return mControllers.taskbarViewController.isTaskbarInMinimalState(); } /** - * @return {@code true} if {@link #isPhoneMode()} is true and we're using 3 - * button-nav + * @return {@code true} if {@link #isPhoneMode()} is true and we're using 3 button-nav */ public boolean isPhoneButtonNavMode() { return isPhoneMode() && isThreeButtonNav(); } /** - * @return {@code true} if {@link #isPhoneMode()} is true and we're using - * gesture nav + * @return {@code true} if {@link #isPhoneMode()} is true and we're using gesture nav */ public boolean isPhoneGestureNavMode() { return isPhoneMode() && !isThreeButtonNav(); } + /** Returns whether Taskbar draws its own background, vs being translucent for apps to draw. */ + public boolean drawsTaskbarBackground() { + return !isPhoneMode(); + } + /** Returns {@code true} iff a tiny version of taskbar is shown on phone. */ public boolean isTinyTaskbar() { - return enableTinyTaskbar() && mDeviceProfile.isPhone && mDeviceProfile.isTaskbarPresent; + return enableTinyTaskbar() && mDeviceProfile.getDeviceProperties().isPhone() && mDeviceProfile.isTaskbarPresent; + } + + public boolean isBubbleBarOnPhone() { + return enableBubbleBarOnPhones() && enableBubbleBar() && mDeviceProfile.getDeviceProperties().isPhone(); } /** - * Returns if software keyboard is docked or input toolbar is placed at the - * taskbar area + * Returns {@code true} iff bubble bar is enabled (but not necessarily visible / + * containing bubbles). */ - public boolean isImeDocked() { - View dragLayer = getDragLayer(); - WindowInsets insets = dragLayer.getRootWindowInsets(); - if (insets == null) { - return false; - } - - WindowInsetsCompat insetsCompat = WindowInsetsCompat.toWindowInsetsCompat(insets, dragLayer.getRootView()); + @Override + public boolean isBubbleBarEnabled() { + return getBubbleControllers() != null && BubbleBarController.isBubbleBarEnabled(); + } - if (insetsCompat.isVisible(WindowInsetsCompat.Type.ime())) { - Insets imeInsets = insetsCompat.getInsets(WindowInsetsCompat.Type.ime()); - return imeInsets.bottom >= getResources().getDimensionPixelSize( - R.dimen.floating_ime_inset_height); - } else { - return false; - } + private boolean isBubbleBarAnimating() { + return mControllers + .bubbleControllers + .map(controllers -> controllers.bubbleBarViewController.isAnimatingNewBubble()) + .orElse(false); } /** - * Show Taskbar upon receiving broadcast + * Checks whether the IME is visible and docked (i.e. there are large enough IME insets). + * + *

This is {@code false} if the IME is not visible, floating, or small, for example (but not + * limited to) hiding the software keyboard keys when a hardware keyboard is connected. + * + *

Note, IME insets visibility is updated slightly faster than + * {@link com.android.systemui.shared.system.QuickStepContract#SYSUI_STATE_IME_VISIBLE}. */ - public void showTaskbarFromBroadcast() { - mControllers.taskbarStashController.showTaskbarFromBroadcast(); + public boolean isImeDocked() { + if (mImeDockedOverrideForTest != null) { + return mImeDockedOverrideForTest; + } + final var windowInsets = mWindowManager.getCurrentWindowMetrics().getWindowInsets(); + // IME insets implicitly include navigation bar and display cutout bottom insets. + final var systemBarDisplayCutoutInsets = windowInsets + .getInsets(WindowInsets.Type.systemBars() | WindowInsets.Type.displayCutout()); + // An approximation for the space below the IME InputView. + final int imeNavBarHeight = getResources().getDimensionPixelSize( + com.android.internal.R.dimen.input_method_navigation_bar_height); + // The space below the InputView plus the smallest InputView considered docked. + final int threshold = Math.max(systemBarDisplayCutoutInsets.bottom, imeNavBarHeight) + + getResources().getDimensionPixelSize(R.dimen.ime_docked_threshold); + final var imeInsets = windowInsets.getInsets(WindowInsets.Type.ime()); + return imeInsets.bottom >= threshold; } - /** Toggles Taskbar All Apps overlay. */ - public void toggleAllApps() { - mControllers.taskbarAllAppsController.toggle(); + /** + * Sets an override return value for {@link #isImeDocked}, to be used in testing. + * + * @param docked whether the IME should be considered docked or not. {@code null} reverts to the + * actual return value of {@link #isImeDocked}. + */ + @VisibleForTesting + public void setImeDockedOverrideForTest(@Nullable Boolean docked) { + mImeDockedOverrideForTest = docked; } - /** Toggles Taskbar All Apps overlay with keyboard ready for search. */ - public void toggleAllAppsSearch() { - mControllers.taskbarAllAppsController.toggleSearch(); + /** + * Show Taskbar upon receiving broadcast + */ + public void showTaskbarFromBroadcast() { + // If user is in middle of taskbar education handle go to next step of education + if (mControllers.taskbarEduTooltipController.isBeforeTooltipFeaturesStep()) { + mControllers.taskbarEduTooltipController.hide(); + mControllers.taskbarEduTooltipController.maybeShowFeaturesEdu(); + } + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(false); } @Override @@ -482,6 +752,8 @@ public DeviceProfile getDeviceProfile() { @Override public void dispatchDeviceProfileChanged() { super.dispatchDeviceProfileChanged(); + Trace.instantForTrack(TRACE_TAG_APP, "TaskbarActivityContext#DeviceProfileChanged", + getDeviceProfile().toSmallString()); } @NonNull @@ -507,19 +779,16 @@ public StatsLogManager getStatsLogManager() { } /** - * Creates LayoutParams for adding a view directly to WindowManager as a new - * window. + * Creates LayoutParams for adding a view directly to WindowManager as a new window. * - * @param type The window type to pass to the created - * WindowManager.LayoutParams. - * @param title The window title to pass to the created - * WindowManager.LayoutParams. + * @param type The window type to pass to the created WindowManager.LayoutParams. + * @param title The window title to pass to the created WindowManager.LayoutParams. */ public WindowManager.LayoutParams createDefaultWindowLayoutParams(int type, String title) { int windowFlags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE - | WindowManager.LayoutParams.FLAG_SLIPPERY - | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH; - if (DisplayController.isTransientTaskbar(this) && !isRunningInTestHarness()) { + | WindowManager.LayoutParams.FLAG_SLIPPERY; + boolean watchOutside = isTransientTaskbar() || isThreeButtonNav(); + if (watchOutside && !isRunningInTestHarness()) { windowFlags |= WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH; } @@ -536,7 +805,8 @@ public WindowManager.LayoutParams createDefaultWindowLayoutParams(int type, Stri windowLayoutParams.receiveInsetsIgnoringZOrder = true; windowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING; windowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; - windowLayoutParams.privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION; + windowLayoutParams.privateFlags = + WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION; windowLayoutParams.accessibilityTitle = getString( isPhoneMode() ? R.string.taskbar_phone_a11y_title : R.string.taskbar_a11y_title); @@ -544,19 +814,19 @@ public WindowManager.LayoutParams createDefaultWindowLayoutParams(int type, Stri } /** - * Creates {@link WindowManager.LayoutParams} for Taskbar, and also sets - * LP.paramsForRotation + * Creates {@link WindowManager.LayoutParams} for Taskbar, and also sets LP.paramsForRotation * for taskbar */ private WindowManager.LayoutParams createAllWindowParams() { - final int windowType = ENABLE_TASKBAR_NAVBAR_UNIFICATION ? TYPE_NAVIGATION_BAR : TYPE_NAVIGATION_BAR_PANEL; - WindowManager.LayoutParams windowLayoutParams = createDefaultWindowLayoutParams(windowType, - TaskbarActivityContext.WINDOW_TITLE); + final int windowType = isPrimaryDisplay() ? TYPE_NAVIGATION_BAR : TYPE_NAVIGATION_BAR_PANEL; + WindowManager.LayoutParams windowLayoutParams = + createDefaultWindowLayoutParams(windowType, TaskbarActivityContext.WINDOW_TITLE); windowLayoutParams.paramsForRotation = new WindowManager.LayoutParams[4]; for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) { - WindowManager.LayoutParams lp = createDefaultWindowLayoutParams(windowType, - TaskbarActivityContext.WINDOW_TITLE); + WindowManager.LayoutParams lp = + createDefaultWindowLayoutParams(windowType, + TaskbarActivityContext.WINDOW_TITLE); if (isPhoneButtonNavMode()) { populatePhoneButtonNavModeWindowLayoutParams(rot, lp); } @@ -564,7 +834,8 @@ private WindowManager.LayoutParams createAllWindowParams() { } // Override with current layout params - WindowManager.LayoutParams currentParams = windowLayoutParams.paramsForRotation[getDisplay().getRotation()]; + WindowManager.LayoutParams currentParams = + windowLayoutParams.paramsForRotation[getDisplay().getRotation()]; windowLayoutParams.width = currentParams.width; windowLayoutParams.height = currentParams.height; windowLayoutParams.gravity = currentParams.gravity; @@ -573,8 +844,7 @@ private WindowManager.LayoutParams createAllWindowParams() { } /** - * Update {@link WindowManager.LayoutParams} with values specific to phone and 3 - * button + * Update {@link WindowManager.LayoutParams} with values specific to phone and 3 button * navigation users */ private void populatePhoneButtonNavModeWindowLayoutParams(int rot, @@ -610,6 +880,11 @@ public boolean isThreeButtonNav() { return mNavMode == NavigationMode.THREE_BUTTONS; } + /** Returns whether taskbar should start align. */ + public boolean shouldStartAlignTaskbar() { + return isThreeButtonNav() && mDeviceProfile.getTaskbarProfile().isStartAlignTaskbar(); + } + public boolean isGestureNav() { return mNavMode == NavigationMode.NO_BUTTON; } @@ -619,9 +894,8 @@ public boolean imeDrawsImeNavBar() { } public int getCornerRadius() { - return isPhoneMode() ? 0 - : getResources().getDimensionPixelSize( - R.dimen.persistent_taskbar_corner_radius); + return isPhoneMode() ? 0 : getResources().getDimensionPixelSize( + R.dimen.persistent_taskbar_corner_radius); } public WindowManager.LayoutParams getWindowLayoutParams() { @@ -643,6 +917,15 @@ public TaskbarDragController getDragController() { return mControllers.taskbarDragController; } + @Override + public ModelWriter getModelWriter() { + return mControllers.taskbarViewController.getModelWriter(); + } + + public NavbarButtonsViewController getNavBarButtonsViewController() { + return mControllers.navbarButtonsViewController; + } + @Nullable public BubbleControllers getBubbleControllers() { return mControllers.bubbleControllers.orElse(null); @@ -653,11 +936,6 @@ public NavHandle getNavHandle() { return mControllers.stashedHandleViewController; } - @Override - public ViewCache getViewCache() { - return mViewCache; - } - @Override public View.OnClickListener getItemOnClickListener() { return this::onTaskbarIconClicked; @@ -673,14 +951,16 @@ public void applyOverwritesToLogItem(LauncherAtom.ItemInfo.Builder itemInfoBuild } LauncherAtom.ContainerInfo oldContainer = itemInfoBuilder.getContainerInfo(); - LauncherAtom.TaskBarContainer.Builder taskbarBuilder = LauncherAtom.TaskBarContainer.newBuilder(); + LauncherAtom.TaskBarContainer.Builder taskbarBuilder = + LauncherAtom.TaskBarContainer.newBuilder(); if (mControllers.uiController.isInOverviewUi()) { taskbarBuilder.setTaskSwitcherContainer( LauncherAtom.TaskSwitcherContainer.newBuilder()); } if (oldContainer.hasPredictedHotseatContainer()) { - LauncherAtom.PredictedHotseatContainer predictedHotseat = oldContainer.getPredictedHotseatContainer(); + LauncherAtom.PredictedHotseatContainer predictedHotseat = + oldContainer.getPredictedHotseatContainer(); if (predictedHotseat.hasIndex()) { taskbarBuilder.setIndex(predictedHotseat.getIndex()); @@ -724,15 +1004,15 @@ public void applyOverwritesToLogItem(LauncherAtom.ItemInfo.Builder itemInfoBuild } } + @NonNull @Override - public DotInfo getDotInfoForItem(ItemInfo info) { - return getPopupDataProvider().getDotInfoForItem(info); + public LauncherBindableItemsContainer getContent() { + return mControllers.taskbarViewController.getContent(); } - @NonNull @Override - public PopupDataProvider getPopupDataProvider() { - return mControllers.taskbarPopupController.getPopupDataProvider(); + public ActivityAllAppsContainerView getAppsView() { + return mControllers.taskbarAllAppsController.getAppsView(); } @Override @@ -740,15 +1020,6 @@ public View.AccessibilityDelegate getAccessibilityDelegate() { return mAccessibilityDelegate; } - @Override - public boolean isBindingItems() { - return mBindingItems; - } - - public void setBindingItems(boolean bindingItems) { - mBindingItems = bindingItems; - } - @Override public void onDragStart() { setTaskbarWindowFullscreen(true); @@ -761,12 +1032,12 @@ public void onDragEnd() { @Override public void onPopupVisibilityChanged(boolean isVisible) { - setTaskbarWindowFocusable(isVisible); + setTaskbarWindowFocusable(isVisible /* focusable */, false /* imeFocusable */); } @Override public void onSplitScreenMenuButtonClicked() { - PopupContainerWithArrow popup = PopupContainerWithArrow.getOpen(this); + PopupContainer popup = PopupContainer.getOpen(this); if (popup != null) { popup.addOnCloseCallback(() -> { mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true); @@ -778,11 +1049,10 @@ public void onSplitScreenMenuButtonClicked() { public ActivityOptionsWrapper makeDefaultActivityOptions(int splashScreenStyle) { RunnableList callbacks = new RunnableList(); ActivityOptions options = ActivityOptions.makeCustomAnimation(this, 0, 0); - if (Utilities.ATLEAST_T) { - options.setSplashScreenStyle(splashScreenStyle); - } - Utilities.allowBGLaunch(options); - IRemoteCallback endCallback = completeRunnableListCallback(callbacks); + options.setSplashScreenStyle(splashScreenStyle); + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED); + IRemoteCallback endCallback = completeRunnableListCallback(callbacks, this); options.setOnAnimationAbortListener(endCallback); options.setOnAnimationFinishedListener(endCallback); @@ -794,11 +1064,41 @@ public ActivityOptionsWrapper getActivityLaunchOptions(View v, @Nullable ItemInf return makeDefaultActivityOptions(SPLASH_SCREEN_STYLE_UNDEFINED); } + /** + * Returns activity options for launching a single activity from the taskbar on the display + * associated with the taskbar. + */ + private ActivityOptionsWrapper getSingleActivityLaunchOptions(@Nullable ItemInfo item) { + final ActivityOptionsWrapper opts = getActivityLaunchOptions(null, item); + opts.options.setLaunchDisplayId(getDisplayId()); + // Launch single non-desktop activities in fullscreen to match launches from the + // hotseat. This needs to be explicitly set to ensure that tasks in other windowing + // modes are moved to fullscreen as well (otherwise they are shown in their existing + // mode) + opts.options.setLaunchWindowingMode(WINDOWING_MODE_FULLSCREEN); + return opts; + } + + private ActivityOptionsWrapper getActivityLaunchDesktopOptions() { + ActivityOptions options = ActivityOptions.makeRemoteTransition( + createDesktopAppLaunchRemoteTransition( + AppLaunchType.LAUNCH, Cuj.CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_ICON)); + return new ActivityOptionsWrapper(options, new RunnableList()); + } + /** * Sets a new data-source for this taskbar instance */ public void setUIController(@NonNull TaskbarUIController uiController) { mControllers.setUiController(uiController); + if (mUIControllerChangeListener != null) { + mUIControllerChangeListener.onUIControllerChanged(uiController); + } + if (BubbleBarController.isBubbleBarEnabled() && mControllers.bubbleControllers.isEmpty()) { + // if the bubble bar was visible in a previous configuration of taskbar and is being + // recreated now without bubbles, clean up any bubble bar adjustments from hotseat + bubbleBarVisibilityChanged(/* isVisible= */ false); + } } /** @@ -808,17 +1108,42 @@ public void setSetupUIVisible(boolean isVisible) { mControllers.taskbarStashController.setSetupUIVisible(isVisible); } + public void setWallpaperVisible(boolean isVisible) { + mControllers.navbarButtonsViewController.setWallpaperVisible(isVisible); + } + + public void checkNavBarModes() { + mControllers.navbarButtonsViewController.checkNavBarModes(); + } + + public void finishBarAnimations() { + mControllers.navbarButtonsViewController.finishBarAnimations(); + } + + public void touchAutoDim(boolean reset) { + mControllers.navbarButtonsViewController.touchAutoDim(reset); + } + + public void transitionTo(@BarTransitions.TransitionMode int barMode, + boolean animate) { + mControllers.navbarButtonsViewController.transitionTo(barMode, animate); + } + + public void appTransitionPending(boolean pending) { + mControllers.stashedHandleViewController.setIsAppTransitionPending(pending); + } + /** * Called when this instance of taskbar is no longer needed */ + @Override public void onDestroy() { + super.onDestroy(); + onViewDestroyed(); + removeTaskbarSnapshot(); mIsDestroyed = true; setUIController(TaskbarUIController.DEFAULT); mControllers.onDestroy(); - if (!enableTaskbarNoRecreate() && !ENABLE_TASKBAR_NAVBAR_UNIFICATION) { - mWindowManager.removeViewImmediate(mDragLayer); - mAddedWindow = false; - } } public boolean isDestroyed() { @@ -830,7 +1155,7 @@ public void updateSysuiStateFlags(@SystemUiStateFlags long systemUiStateFlags, mControllers.navbarButtonsViewController.updateStateForSysuiFlags(systemUiStateFlags, fromInit); boolean isShadeVisible = (systemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE) != 0; - onNotificationShadeExpandChanged(isShadeVisible, fromInit); + onNotificationShadeExpandChanged(isShadeVisible, fromInit || isPhoneMode()); mControllers.taskbarViewController.setRecentsButtonDisabled( mControllers.navbarButtonsViewController.isRecentsDisabled() || isNavBarKidsModeActive()); @@ -849,25 +1174,124 @@ public void updateSysuiStateFlags(@SystemUiStateFlags long systemUiStateFlags, mControllers.uiController.updateStateForSysuiFlags(systemUiStateFlags); mControllers.bubbleControllers.ifPresent(controllers -> { controllers.bubbleBarController.updateStateForSysuiFlags(systemUiStateFlags); - controllers.bubbleStashedHandleViewController.setIsHomeButtonDisabled( - mControllers.navbarButtonsViewController.isHomeDisabled()); + controllers.bubbleStashedHandleViewController.ifPresent(controller -> + controller.setIsHomeButtonDisabled( + mControllers.navbarButtonsViewController.isHomeDisabled())); }); } /** - * Hides the taskbar icons and background when the notication shade is expanded. + * Hides the taskbar icons and background when the notification shade is expanded. */ private void onNotificationShadeExpandChanged(boolean isExpanded, boolean skipAnim) { + boolean isExpandedUpdated = isExpanded != mIsNotificationShadeExpanded; + mIsNotificationShadeExpanded = isExpanded; + // Close all floating views within the Taskbar window to make sure nothing is shown over + // the notification shade. + if (isExpanded) { + AbstractFloatingView.closeAllOpenViewsExcept(this, TYPE_TASKBAR_OVERLAY_PROXY); + } + float alpha = isExpanded ? 0 : 1; AnimatorSet anim = new AnimatorSet(); anim.play(mControllers.taskbarViewController.getTaskbarIconAlpha().get( TaskbarViewController.ALPHA_INDEX_NOTIFICATION_EXPANDED).animateToValue(alpha)); anim.play(mControllers.taskbarDragLayerController.getNotificationShadeBgTaskbar() .animateToValue(alpha)); + + if (isExpandedUpdated) { + mControllers.bubbleControllers.ifPresent(controllers -> { + BubbleBarViewController bubbleBarViewController = + controllers.bubbleBarViewController; + anim.play(bubbleBarViewController.getBubbleBarAlpha().get(0).animateToValue(alpha)); + MultiPropertyFactory.MultiProperty handleAlpha = + controllers.bubbleStashController.getHandleViewAlpha(); + if (handleAlpha != null) { + anim.play(handleAlpha.animateToValue(alpha)); + } + }); + } anim.start(); if (skipAnim) { anim.end(); } + + updateTaskbarSnapshot(anim, isExpanded); + } + + private void updateTaskbarSnapshot(AnimatorSet anim, boolean isExpanded) { + if (!ENABLE_TASKBAR_BEHIND_SHADE.isTrue() + || isPhoneMode()) { + return; + } + if (mTaskbarSnapshotView == null) { + mTaskbarSnapshotView = new View(this); + } + if (isExpanded) { + if (!mTaskbarSnapshotView.isAttachedToWindow() + && mDragLayer.isAttachedToWindow() + && mDragLayer.isLaidOut() + && mDragLayer.isVisibleToUser() + && mTaskbarSnapshotView.getParent() == null) { + NearestTouchFrame navButtonsView = mDragLayer.findViewById(R.id.navbuttons_view); + int oldNavButtonsVisibility = navButtonsView.getVisibility(); + navButtonsView.setVisibility(View.INVISIBLE); + + Drawable drawable = new FastBitmapDrawable(BitmapRenderer.createHardwareBitmap( + mDragLayer.getWidth(), + mDragLayer.getHeight(), + mDragLayer::draw)); + + navButtonsView.setVisibility(oldNavButtonsVisibility); + mTaskbarSnapshotView.setBackground(drawable); + mTaskbarSnapshotView.setAlpha(0f); + + mTaskbarSnapshotView.addOnAttachStateChangeListener( + new View.OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(@NonNull View v) { + mTaskbarSnapshotView.removeOnAttachStateChangeListener(this); + anim.end(); + mTaskbarSnapshotView.setAlpha(1f); + if (!Utilities.isRunningInTestHarness()) { + ViewRootSync.synchronizeNextDraw(mDragLayer, + mTaskbarSnapshotView, + () -> {}); + } + } + + @Override + public void onViewDetachedFromWindow(@NonNull View v) {} + }); + BaseDragLayer.LayoutParams layoutParams = new BaseDragLayer.LayoutParams( + mDragLayer.getWidth(), mDragLayer.getHeight()); + layoutParams.gravity = mWindowLayoutParams.gravity; + layoutParams.ignoreInsets = true; + mTaskbarSnapshotOverlay = mControllers.taskbarOverlayController.requestWindow(); + mTaskbarSnapshotOverlay.getDragLayer().addView(mTaskbarSnapshotView, layoutParams); + } + } else { + if (mTaskbarSnapshotView.isAttachedToWindow()) { + mTaskbarSnapshotView.setAlpha(0f); + anim.end(); + if (Utilities.isRunningInTestHarness()) { + removeTaskbarSnapshot(); + } else { + ViewRootSync.synchronizeNextDraw(mDragLayer, mTaskbarSnapshotView, + this::removeTaskbarSnapshot); + } + } else { + removeTaskbarSnapshot(); + } + } + } + + private void removeTaskbarSnapshot() { + if (mTaskbarSnapshotOverlay != null) { + mTaskbarSnapshotOverlay.getDragLayer().removeView(mTaskbarSnapshotView); + } + mTaskbarSnapshotView = null; + mTaskbarSnapshotOverlay = null; } public void onRotationProposal(int rotation, boolean isValid) { @@ -885,9 +1309,13 @@ public void onSystemBarAttributesChanged(int displayId, int behavior) { mControllers.rotationButtonController.onBehaviorChanged(displayId, behavior); } + public void onTransitionModeUpdated(int barMode, boolean checkBarModes) { + mControllers.navbarButtonsViewController.onTransitionModeUpdated(barMode, checkBarModes); + } + public void onNavButtonsDarkIntensityChanged(float darkIntensity) { - mControllers.navbarButtonsViewController.getTaskbarNavButtonDarkIntensity() - .updateValue(darkIntensity); + mControllers.navbarButtonsViewController.getTaskbarNavButtonDarkIntensity().updateValue( + darkIntensity); } public void onNavigationBarLumaSamplingEnabled(int displayId, boolean enable) { @@ -902,6 +1330,32 @@ public void setAutohideSuspendFlag(@AutohideSuspendFlag int flag, boolean newVal mControllers.taskbarAutohideSuspendController.updateFlag(flag, newValue); } + /** + * Updates and applies {@link TaskbarStashController#FLAG_IN_SECONDARY_LAUNCHER_ON_CD} to + * {@link TaskbarStashController} state flags. + */ + public void updateStashControllerLauncherStateFlag(boolean enabled) { + if (isPrimaryDisplay() || !enableAutoStashConnectedDisplayTaskbar.isTrue()) { + return; + } + + TaskbarStashController stashController = mControllers.taskbarStashController; + stashController.updateStateForFlag(FLAG_IN_SECONDARY_LAUNCHER_ON_CD, enabled); + if (!enabled) { + // When moving away from launcher, don't stash the taskbar right away, let it auto stash + // through timeout. + stashController.updateStateForFlag(FLAG_STASHED_IN_APP_AUTO, /* enabled= */ false); + } + + // Un-stash taskbar if required. + if (enabled && isTaskbarStashed()) { + stashController.updateAndAnimatePinnedTaskbar(/* stash= */ false); + } else { + stashController.applyState(); + stashController.updateTaskbarTimeout(/* isAutohideSuspended= */ false); + } + } + /** * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size. */ @@ -911,19 +1365,47 @@ public void setTaskbarWindowFullscreen(boolean fullscreen) { setTaskbarWindowSize(fullscreen ? MATCH_PARENT : mLastRequestedNonFullscreenSize); } + /** + * Updates the taskbar window size according to whether bubbles are animating. + * + *

This method should be called when bubbles start animating and again after the animation is + * complete. + */ + public void setTaskbarWindowForAnimatingBubble() { + if (isBubbleBarAnimating()) { + // the default window size accounts for the bubble flyout + setTaskbarWindowSize(getDefaultTaskbarWindowSize()); + mIsTaskbarSizeFrozenForAnimatingBubble = true; + } else { + mIsTaskbarSizeFrozenForAnimatingBubble = false; + setTaskbarWindowSize( + mLastRequestedNonFullscreenSize != 0 + ? mLastRequestedNonFullscreenSize : getDefaultTaskbarWindowSize()); + } + } + /** * Called when drag ends or when a view is removed from the DragLayer. */ void onDragEndOrViewRemoved() { boolean isDragInProgress = mControllers.taskbarDragController.isSystemDragInProgress(); - // Overlay AFVs are in a separate window and do not require Taskbar to be - // fullscreen. + // Overlay AFVs are in a separate window and do not require Taskbar to be fullscreen. if (!isDragInProgress && !AbstractFloatingView.hasOpenView( - this, TYPE_ALL & ~TYPE_TASKBAR_OVERLAY_PROXY)) { + this, TYPE_ALL & ~TYPE_TASKBAR_OVERLAY_PROXY)) { // Reverts Taskbar window to its original size - setTaskbarWindowFullscreen(false); + Runnable resetTaskbarFullscreen = () -> { + // If the app layout transition is running, the window reset will be handled + // after the transition is complete. See {@link TaskbarViewController + // .TransitionEndBoundsChangedNotifier}. + if (!mControllers.taskbarViewController.isTaskbarAppTransitionRunning()) { + setTaskbarWindowFullscreen(false); + } + }; + mControllers.bubbleControllers.ifPresentOrElse( + bc -> bc.dragToBubbleController.runAfterDropTargetsHidden( + resetTaskbarFullscreen), resetTaskbarFullscreen); } setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_DRAGGING, isDragInProgress); @@ -934,31 +1416,27 @@ public boolean isTaskbarWindowFullscreen() { } /** - * Updates the TaskbarContainer size (pass - * {@link #getDefaultTaskbarWindowSize()} to reset). + * Updates the TaskbarContainer size (pass {@link #getDefaultTaskbarWindowSize()} to reset). */ public void setTaskbarWindowSize(int size) { - // In landscape phone button nav mode, we should set the task bar width instead - // of height - // because this is the only case in which the nav bar is not on the display - // bottom. - boolean landscapePhoneButtonNav = isPhoneButtonNavMode() && mDeviceProfile.isLandscape; - if ((landscapePhoneButtonNav ? mWindowLayoutParams.width : mWindowLayoutParams.height) == size - || mIsDestroyed) { + // In landscape phone button nav mode, we should set the task bar width instead of height + // because this is the only case in which the nav bar is not on the display bottom. + boolean landscapePhoneButtonNav = isPhoneButtonNavMode() && mDeviceProfile.getDeviceProperties().isLandscape(); + if ((landscapePhoneButtonNav ? mWindowLayoutParams.width : mWindowLayoutParams.height) + == size || mIsDestroyed) { return; } if (size == MATCH_PARENT) { - size = mDeviceProfile.heightPx; + size = mDeviceProfile.getDeviceProperties().getHeightPx(); } else { mLastRequestedNonFullscreenSize = size; - if (mIsFullscreen) { - // We still need to be fullscreen, so defer any change to our height until we - // call - // setTaskbarWindowFullscreen(false). For example, this could happen when - // dragging - // from the gesture region, as the drag will cancel the gesture and reset - // launcher's - // state, which in turn normally would reset the taskbar window height as well. + if (mIsFullscreen || mIsTaskbarSizeFrozenForAnimatingBubble) { + // We either still need to be fullscreen or a bubble is still animating, so defer + // any change to our height until setTaskbarWindowFullscreen(false) is called or + // setTaskbarWindowForAnimatingBubble() is called after the bubble animation + // completed. For example, this could happen when dragging from the gesture region, + // as the drag will cancel the gesture and reset launcher's state, which in turn + // normally would reset the taskbar window height as well. return; } } @@ -974,97 +1452,153 @@ public void setTaskbarWindowSize(int size) { } } mControllers.runAfterInit( - mControllers.taskbarInsetsController::onTaskbarOrBubblebarWindowHeightOrInsetsChanged); + mControllers.taskbarInsetsController + ::onTaskbarOrBubblebarWindowHeightOrInsetsChanged); notifyUpdateLayoutParams(); } /** - * Returns the default size (in most cases height, but in 3-button phone mode, - * width) of the + * Returns the default size (in most cases height, but in 3-button phone mode, width) of the * window, including the static corner radii above taskbar. */ public int getDefaultTaskbarWindowSize() { Resources resources = getResources(); if (isPhoneMode()) { - return isThreeButtonNav() ? resources.getDimensionPixelSize(R.dimen.taskbar_phone_size) - : resources.getDimensionPixelSize(R.dimen.taskbar_stashed_size); + return isThreeButtonNav() ? + resources.getDimensionPixelSize(R.dimen.taskbar_phone_size) : + resources.getDimensionPixelSize(R.dimen.taskbar_stashed_size); } if (!isUserSetupComplete()) { return getSetupWindowSize(); } - boolean shouldTreatAsTransient = DisplayController.isTransientTaskbar(this) - || (enableTaskbarPinning() && !isThreeButtonNav()); - - int extraHeightForTaskbarTooltips = enableCursorHoverStates() - ? resources.getDimensionPixelSize(R.dimen.arrow_toast_arrow_height) - + (resources.getDimensionPixelSize(R.dimen.taskbar_tooltip_vertical_padding) * 2) - + calculateTextHeight( - resources.getDimensionPixelSize(R.dimen.arrow_toast_text_size)) - : 0; - - // Return transient taskbar window height when pinning feature is enabled, so - // taskbar view + int bubbleBarTop = mControllers.bubbleControllers.map(bubbleControllers -> + bubbleControllers.bubbleBarViewController.getBubbleBarWithFlyoutMaximumHeight() + ).orElse(0); + int taskbarWindowSize; + boolean shouldTreatAsTransient = + isTransientTaskbar() || (enableTaskbarPinning() + && mTaskbarFeatureEvaluator.getSupportsTransitionToTransientTaskbar()); + + int extraHeightForTaskbarTooltips = resources.getDimensionPixelSize( + R.dimen.arrow_toast_arrow_height) + + (resources.getDimensionPixelSize(R.dimen.taskbar_tooltip_vertical_padding) * 2) + + calculateTextHeight( + resources.getDimensionPixelSize(R.dimen.arrow_toast_text_size)); + + // Return transient taskbar window height when pinning feature is enabled, so taskbar view // does not get cut off during pinning animation. if (shouldTreatAsTransient) { - DeviceProfile transientTaskbarDp = mDeviceProfile.toBuilder(this) - .setIsTransientTaskbar(true).build(); - - return transientTaskbarDp.taskbarHeight - + (2 * transientTaskbarDp.taskbarBottomMargin) + TaskbarProfile transientTaskbarProfile = TaskbarProfile.Factory.createTaskbarProfile( + getResources(), + true, + mDeviceProfile.isTaskbarPresent, + getResources().getDisplayMetrics(), + mDeviceProfile.getDisplayOptionSpec(), + mDeviceProfile.getDisplayOptionSpec().typeIndex, + mDeviceProfile.inv); + + taskbarWindowSize = transientTaskbarProfile.getHeight() + + (2 * transientTaskbarProfile.getBottomMargin()) + Math.max(extraHeightForTaskbarTooltips, resources.getDimensionPixelSize( - R.dimen.transient_taskbar_shadow_blur)); + R.dimen.transient_taskbar_shadow_blur)); + return Math.max(taskbarWindowSize, bubbleBarTop); } - return mDeviceProfile.taskbarHeight + + taskbarWindowSize = mDeviceProfile.getTaskbarProfile().getHeight() + getCornerRadius() + extraHeightForTaskbarTooltips; + return Math.max(taskbarWindowSize, bubbleBarTop); } public int getSetupWindowSize() { return getResources().getDimensionPixelSize(R.dimen.taskbar_suw_frame); } - public DeviceProfile getTransientTaskbarDeviceProfile() { - return mTransientTaskbarDeviceProfile; + public TaskbarProfile getTransientTaskbarProfile() { + return mTransientTaskbarProfile; } - public DeviceProfile getPersistentTaskbarDeviceProfile() { - return mPersistentTaskbarDeviceProfile; + public TaskbarProfile getPersistentTaskbarProfile() { + return mPersistentTaskbarProfile; } /** - * Either adds or removes {@link WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE} - * on the taskbar - * window. + * Sets whether the taskbar window should be focusable and IME focusable. This won't be IME + * focusable unless it is also focusable. + * + * @param focusable whether it should be focusable. + * @param imeFocusable whether it should be IME focusable. + * + * @see WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE + * @see WindowManager.LayoutParams#FLAG_ALT_FOCUSABLE_IM */ - public void setTaskbarWindowFocusable(boolean focusable) { + public void setTaskbarWindowFocusable(boolean focusable, boolean imeFocusable) { + if (isPhoneMode()) { + return; + } if (focusable) { mWindowLayoutParams.flags &= ~FLAG_NOT_FOCUSABLE; + if (imeFocusable) { + mWindowLayoutParams.flags &= ~FLAG_ALT_FOCUSABLE_IM; + } else { + mWindowLayoutParams.flags |= FLAG_ALT_FOCUSABLE_IM; + } } else { mWindowLayoutParams.flags |= FLAG_NOT_FOCUSABLE; + mWindowLayoutParams.flags &= ~FLAG_ALT_FOCUSABLE_IM; } notifyUpdateLayoutParams(); } /** - * Applies forcibly show flag to taskbar window iff transient taskbar is - * unstashed. + * Applies forcibly show flag to taskbar window iff transient taskbar is unstashed. */ public void applyForciblyShownFlagWhileTransientTaskbarUnstashed(boolean shouldForceShow) { - if (!DisplayController.isTransientTaskbar(this)) { + if (!isTransientTaskbar() || isPhoneMode()) { + return; + } + if (shouldForceShow) { + mWindowLayoutParams.forciblyShownTypes |= WindowInsets.Type.navigationBars(); + } else { + mWindowLayoutParams.forciblyShownTypes &= ~WindowInsets.Type.navigationBars(); + } + notifyUpdateLayoutParams(); + } + + /** + * Applies forcibly show flag to taskbar window in persistent taskbar for bubbles. + * + *

This is called by Bubbles to ensure that the taskbar window is visible when a new or an + * updated bubble is animating, and when the bubble bar is expanded. When the bubble bar is + * collapsed and when bubbles no longer animate, this method is called again to remove the + * forcibly shown flag so that the taskbar window can hide if it needs to. + * + *

This method is a no-op for transient taskbar, where this flag is updated through + * {@link #applyForciblyShownFlagWhileTransientTaskbarUnstashed(boolean)} + */ + public void applyForciblyShownFlagForBubblesInPersistentTaskbar(boolean shouldForceShow) { + if (isTransientTaskbar()) { return; } + if (shouldForceShow) { + mWindowLayoutParams.forciblyShownTypes |= WindowInsets.Type.navigationBars(); + } else { + mWindowLayoutParams.forciblyShownTypes &= ~WindowInsets.Type.navigationBars(); + } notifyUpdateLayoutParams(); } /** - * Either adds or removes {@link WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE} - * on the taskbar - * window. If we're now focusable, also move nav buttons to a separate window - * above IME. + * Sets whether the taskbar window should be focusable, as well as IME focusable. If we're now + * focusable, also move nav buttons to a separate window above IME. + * + * @param focusable whether it should be focusable. + * + * @see WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE */ public void setTaskbarWindowFocusableForIme(boolean focusable) { if (focusable) { @@ -1072,13 +1606,10 @@ public void setTaskbarWindowFocusableForIme(boolean focusable) { } else { mControllers.navbarButtonsViewController.moveNavButtonsBackToTaskbarWindow(); } - setTaskbarWindowFocusable(focusable); + setTaskbarWindowFocusable(focusable, true /* imeFocusable */); } - /** - * Adds the given view to WindowManager with the provided LayoutParams (creates - * new window). - */ + /** Adds the given view to WindowManager with the provided LayoutParams (creates new window). */ public void addWindowView(View view, WindowManager.LayoutParams windowLayoutParams) { if (!view.isAttachedToWindow()) { mWindowManager.addView(view, windowLayoutParams); @@ -1097,15 +1628,65 @@ public void startSplitSelection(SplitSelectSource splitSelectSource) { mControllers.uiController.startSplitSelection(splitSelectSource); } + // If in overview, and a desktop task is available, launches the overview desktop task and + // schedules the provided runnable. + // Returns whether the runnable has been posted. + private boolean runAfterLaunchingDesktopTaskIfInOverview( + RecentsView recents, + Runnable runnableToRun) { + if (recents == null || !isTaskbarShowingDesktopTasks() + || !mControllers.uiController.isInOverviewUi() + || recents.isSplitSelectionActive()) { + return false; + } + + RunnableList runnableList = recents.launchDesktopTaskView(); + // Wrapping it in runnable so we post after DW is ready for the app + // launch. + if (runnableList == null) { + return false; + } + + runnableList.add(() -> UI_HELPER_EXECUTOR.execute(runnableToRun)); + return true; + } + protected void onTaskbarIconClicked(View view) { TaskbarUIController taskbarUIController = mControllers.uiController; RecentsView recents = taskbarUIController.getRecentsView(); boolean shouldCloseAllOpenViews = true; Object tag = view.getTag(); - if (tag instanceof Task) { - Task task = (Task) tag; - ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key, - ActivityOptions.makeBasic()); + + mControllers.keyboardQuickSwitchController.closeQuickSwitchView(false); + + if (tag instanceof SingleTask singleTask) { + RemoteTransition remoteTransition = + (isTaskbarShowingDesktopTasks() && canUnminimizeDesktopTask( + singleTask.getTask().key.id)) + ? createDesktopAppLaunchRemoteTransition(AppLaunchType.UNMINIMIZE, + Cuj.CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_ICON) + : null; + Runnable launchTask = () -> handleGroupTaskLaunch(singleTask, remoteTransition, + isTaskbarShowingDesktopTasks(), DesktopTaskToFrontReason.TASKBAR_TAP, view, + DesktopModeTransitionSource.TASKBAR); + if (!runAfterLaunchingDesktopTaskIfInOverview(recents, launchTask)) { + launchTask.run(); + } + + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true); + } else if (tag instanceof SplitTask st) { + // Tapping an icon for a split task on Taskbar + final RemoteTransition slideInTransition = new RemoteTransition( + new SlideInRemoteTransition( + !Utilities.isRtl(getResources()), + getDeviceProfile().getOverviewProfile().getPageSpacing(), + QuickStepContract.getWindowCornerRadius(this), + AnimationUtils.loadInterpolator( + this, android.R.interpolator.fast_out_extra_slow_in)), + "SlideInTransition"); + // SplitTask is only relevant outside of desktop. + handleGroupTaskLaunch(st, slideInTransition, isTaskbarShowingDesktopTasks(), + DesktopTaskToFrontReason.UNKNOWN, view, DesktopModeTransitionSource.TASKBAR); mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true); } else if (tag instanceof FolderInfo) { // Tapping an expandable folder icon on Taskbar @@ -1122,6 +1703,31 @@ protected void onTaskbarIconClicked(View view) { mControllers.uiController.onTaskbarIconLaunched(api); mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true); } + } else if (tag instanceof TaskItemInfo info) { + Task task = null; + if (DesktopExperienceFlags.ENABLE_TASKBAR_RUNNING_TASKS_IN_SPLITSCREEN_SELECT_BUGFIX + .isTrue() + && recents != null && recents.isSplitSelectionActive() + && (task = getControllers().taskbarRecentAppsController.getDesktopTaskWithId( + info.getTaskId())) != null) { + taskbarUIController.moveRunningTaskToSplitSelection(task, info, view); + } else { + RemoteTransition remoteTransition = canUnminimizeDesktopTask(info.getTaskId()) + ? createDesktopAppLaunchRemoteTransition( + AppLaunchType.UNMINIMIZE, Cuj.CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_ICON) + : null; + + Runnable launchTask = () -> + SystemUiProxy.INSTANCE.get(this).showDesktopApp( + info.getTaskId(), remoteTransition, + DesktopTaskToFrontReason.TASKBAR_TAP); + if (!runAfterLaunchingDesktopTaskIfInOverview(recents, launchTask)) { + UI_HELPER_EXECUTOR.execute(launchTask); + } + + } + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar( + /* stash= */ true); } else if (tag instanceof WorkspaceItemInfo) { // Tapping a launchable icon on Taskbar WorkspaceItemInfo info = (WorkspaceItemInfo) tag; @@ -1134,7 +1740,8 @@ protected void onTaskbarIconClicked(View view) { Intent intent = new Intent(info.getIntent()) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); try { - if (mIsSafeModeEnabled && !PackageManagerHelper.isSystemApp(this, intent)) { + if (mIsSafeModeEnabled + && !new ApplicationInfoWrapper(this, intent).isSystem()) { Toast.makeText(this, R.string.safemode_shortcut_error, Toast.LENGTH_SHORT).show(); } else if (info.isPromise()) { @@ -1142,22 +1749,23 @@ protected void onTaskbarIconClicked(View view) { TestProtocol.SEQUENCE_MAIN, "start: taskbarPromiseIcon"); intent = ApiWrapper.INSTANCE.get(this).getAppMarketActivityIntent( info.getTargetPackage(), Process.myUserHandle()); - startActivity(intent); - + startActivity(intent, getSingleActivityLaunchOptions(info).toBundle()); } else if (info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) { TestLogging.recordEvent( TestProtocol.SEQUENCE_MAIN, "start: taskbarDeepShortcut"); String id = info.getDeepShortcutId(); String packageName = intent.getPackage(); getSystemService(LauncherApps.class) - .startShortcut(packageName, id, null, null, info.user); + .startShortcut(packageName, id, null, + getSingleActivityLaunchOptions(info).toBundle(), + info.user); } else { launchFromTaskbar(recents, view, Collections.singletonList(info)); } } catch (NullPointerException - | ActivityNotFoundException - | SecurityException e) { + | ActivityNotFoundException + | SecurityException e) { Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT) .show(); Log.e(TAG, "Unable to launch. tag=" + info + " intent=" + intent, e); @@ -1185,8 +1793,7 @@ public void onFolderStateChanged(int newState) { } else if (tag instanceof AppInfo) { // Tapping an item in AllApps AppInfo info = (AppInfo) tag; - if (recents != null - && taskbarUIController.getRecentsView().isSplitSelectionActive()) { + if (recents != null && recents.isSplitSelectionActive()) { // If we are selecting a second app for split, launch the split tasks taskbarUIController.triggerSecondAppForSplit(info, info.intent, view); } else { @@ -1200,22 +1807,103 @@ public void onFolderStateChanged(int newState) { Log.e(TAG, "Unknown type clicked: " + tag); } + mControllers.taskbarPopupController.maybeCloseMultiInstanceMenu(); if (shouldCloseAllOpenViews) { AbstractFloatingView.closeAllOpenViews(this); } } /** - * Runs when the user taps a Taskbar icon in TaskbarActivityContext (Overview or - * inside an app), + * Launches the given GroupTask with the following behavior: + * - If the GroupTask is a DesktopTask, launch the tasks in that Desktop. + * - If {@code onDesktop}, bring the given GroupTask to the front. + * - If the GroupTask is a single task, launch it via startActivityFromRecents. + * - Otherwise, we assume the GroupTask is a Split pair and launch them together. + *

+ * Given start and/or finish callbacks, they will be run before an after the app launch + * respectively in cases where we can't use the remote transition, otherwise we will assume that + * these callbacks are included in the remote transition. + */ + public void handleGroupTaskLaunch( + GroupTask task, + @Nullable RemoteTransition remoteTransition, + boolean onDesktop, + DesktopTaskToFrontReason toFrontReason, + View startingView, + DesktopModeTransitionSource transitionSource) { + if (task instanceof DesktopTask) { + UI_HELPER_EXECUTOR.execute( + () -> SystemUiProxy.INSTANCE.get(this).showDesktopApps(getDisplayId(), + remoteTransition, /* taskIdReorderToFront */ null, transitionSource)); + return; + } + + if (task instanceof SingleTask singleTask) { + TaskbarUIController taskbarUIController = mControllers.uiController; + RecentsView recents = taskbarUIController.getRecentsView(); + + if (DesktopExperienceFlags.ENABLE_TASKBAR_RUNNING_TASKS_IN_SPLITSCREEN_SELECT_BUGFIX + .isTrue() && recents != null && recents.isSplitSelectionActive()) { + taskbarUIController.moveRunningTaskToSplitSelection(singleTask.getTask(), null, + startingView); + return; + } + + if (onDesktop) { + boolean useRemoteTransition = canUnminimizeDesktopTask(singleTask.getTask().key.id); + UI_HELPER_EXECUTOR.execute(() -> { + SystemUiProxy.INSTANCE.get(this).showDesktopApp(singleTask.getTask().key.id, + useRemoteTransition ? remoteTransition : null, toFrontReason); + }); + return; + } + UI_HELPER_EXECUTOR.execute(() -> { + ActivityOptions activityOptions = + makeDefaultActivityOptions(SPLASH_SCREEN_STYLE_UNDEFINED).options; + activityOptions.setRemoteTransition(remoteTransition); + + ActivityManagerWrapper.getInstance().startActivityFromRecents( + singleTask.getTask().key, activityOptions); + }); + return; + } + + assert task instanceof SplitTask; + mControllers.uiController.launchSplitTasks((SplitTask) task, remoteTransition); + } + + /** Returns whether the given task is minimized and can be unminimized. */ + public boolean canUnminimizeDesktopTask(int taskId) { + BubbleTextView.RunningAppState runningAppState = + mControllers.taskbarRecentAppsController.getRunningAppState(taskId); + Log.d(TAG, "Task id=" + taskId + ", Running app state=" + runningAppState); + return runningAppState == RunningAppState.MINIMIZED + && DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX.isTrue(); + } + + private RemoteTransition createDesktopAppLaunchRemoteTransition( + AppLaunchType appLaunchType, @Cuj.CujType int cujType) { + return new RemoteTransition( + new DesktopAppLaunchTransition( + this, + DisplayController.INSTANCE.get(this), + appLaunchType, + cujType, + getMainExecutor() + ), + "TaskbarDesktopAppLaunch"); + } + + /** + * Runs when the user taps a Taskbar icon in TaskbarActivityContext (Overview or inside an app), * and calls the appropriate method to animate and launch. */ private void launchFromTaskbar(@Nullable RecentsView recents, @Nullable View launchingIconView, List itemInfos) { - if (isInApp()) { - launchFromInAppTaskbar(recents, launchingIconView, itemInfos); - } else { + if (mControllers.uiController.isInOverviewUi()) { launchFromOverviewTaskbar(recents, launchingIconView, itemInfos); + } else { + launchFromInAppTaskbar(recents, launchingIconView, itemInfos); } } @@ -1224,7 +1912,10 @@ private void launchFromTaskbar(@Nullable RecentsView recents, @Nullable View lau */ private void launchFromInAppTaskbar(@Nullable RecentsView recents, @Nullable View launchingIconView, List itemInfos) { - if (recents == null) { + boolean launchedFromExternalDisplay = + DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() + && !isPrimaryDisplay(); + if (recents == null && !launchedFromExternalDisplay) { return; } @@ -1232,24 +1923,24 @@ private void launchFromInAppTaskbar(@Nullable RecentsView recents, if (tappedAppPair) { // If the icon is an app pair, the logic gets a bit complicated because we play - // different animations depending on which app (or app pair) is currently - // running on + // different animations depending on which app (or app pair) is currently running on // screen, so delegate logic to appPairsController. - recents.getSplitSelectController().getAppPairsController() - .handleAppPairLaunchInApp((AppPairIcon) launchingIconView, itemInfos); + if (recents != null && recents.getSplitSelectController() != null + && launchingIconView != null) { + // TODO: b/441341469 - Split screen should be handled correctly on CD. + recents.getSplitSelectController().getAppPairsController() + .handleAppPairLaunchInApp((AppPairIcon) launchingIconView, itemInfos); + } } else { // Tapped a single app, nothing complicated here. - startItemInfoActivity(itemInfos.get(0), null /* foundTask */); + startItemInfoActivity(itemInfos.get(0), null /*foundTask*/); } } /** - * Run when the user taps a Taskbar icon while in Overview. If the tapped app is - * currently - * visible to the user in Overview, or is part of a visible split pair, we - * expand the TaskView - * as if the user tapped on it (preserving the split pair). Otherwise, launch it - * normally + * Run when the user taps a Taskbar icon while in Overview. If the tapped app is currently + * visible to the user in Overview, or is part of a visible split pair, we expand the TaskView + * as if the user tapped on it (preserving the split pair). Otherwise, launch it normally * (potentially breaking a split pair). */ private void launchFromOverviewTaskbar(@Nullable RecentsView recents, @@ -1260,20 +1951,21 @@ private void launchFromOverviewTaskbar(@Nullable RecentsView recents, boolean isLaunchingAppPair = itemInfos.size() == 2; // Convert the list of ItemInfo instances to a list of ComponentKeys - List componentKeys = itemInfos.stream().map(ItemInfo::getComponentKey).collect(toList()); + List resolvedTargetInfo = + itemInfos.stream().map(ItemInfo::getResolvedTargetInfo).toList(); recents.getSplitSelectController().findLastActiveTasksAndRunCallback( - componentKeys, + resolvedTargetInfo, isLaunchingAppPair, foundTasks -> { - @Nullable - Task foundTask = foundTasks[0]; + @Nullable Task foundTask = foundTasks[0]; if (foundTask != null) { TaskView foundTaskView = recents.getTaskViewByTaskId(foundTask.key.id); if (foundTaskView != null - && foundTaskView.isVisibleToUser()) { + && foundTaskView.isVisibleToUser() + && !(foundTaskView instanceof DesktopTaskView)) { TestLogging.recordEvent( TestProtocol.SEQUENCE_MAIN, "start: taskbarAppIcon"); - foundTaskView.launchTasks(); + foundTaskView.launchWithAnimation(); return; } } @@ -1282,24 +1974,28 @@ private void launchFromOverviewTaskbar(@Nullable RecentsView recents, // Finish recents animation if it's running before launching to ensure // we get both leashes for the animation mControllers.uiController.setSkipNextRecentsAnimEnd(); - recents.switchToScreenshot(() -> recents.finishRecentsAnimation(true /* toRecents */, - false /* shouldPip */, - () -> recents - .getSplitSelectController() - .getAppPairsController() - .launchAppPair((AppPairIcon) launchingIconView, - -1 /* cuj */))); + recents.switchToScreenshot(() -> + recents.finishRecentsAnimation(true /*toHome*/, + false /*shouldPip*/, + () -> recents + .getSplitSelectController() + .getAppPairsController() + .launchAppPair((AppPairIcon) launchingIconView, + -1 /*cuj*/))); } else { - startItemInfoActivity(itemInfos.get(0), foundTask); + Runnable launchTask = + () -> startItemInfoActivity(itemInfos.get(0), foundTask); + if (!runAfterLaunchingDesktopTaskIfInOverview(recents, launchTask)) { + launchTask.run(); + } } - }); + } + ); } /** - * Starts an activity with the information provided by the "info" param. - * However, if - * taskInRecents is present, it will prioritize re-launching an existing - * instance via + * Starts an activity with the information provided by the "info" param. However, if + * taskInRecents is present, it will prioritize re-launching an existing instance via * {@link ActivityManagerWrapper#startActivityFromRecents(int, ActivityOptions)} */ private void startItemInfoActivity(ItemInfo info, @Nullable Task taskInRecents) { @@ -1307,26 +2003,30 @@ private void startItemInfoActivity(ItemInfo info, @Nullable Task taskInRecents) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); try { TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "start: taskbarAppIcon"); - if (info.user.equals(Process.myUserHandle())) { - // TODO(b/216683257): Use startActivityForResult for search results that require - // it. - if (taskInRecents != null) { - // Re launch instance from recents - ActivityOptionsWrapper opts = getActivityLaunchOptions(null, info); - opts.options.setLaunchDisplayId( - getDisplay() == null ? DEFAULT_DISPLAY : getDisplay().getDisplayId()); - if (ActivityManagerWrapper.getInstance() - .startActivityFromRecents(taskInRecents.key, opts.options)) { - mControllers.uiController.getRecentsView() - .addSideTaskLaunchCallback(opts.onEndCallback); - return; - } + final int displayId = getDisplayId(); + final ActivityOptionsWrapper opts = getActivityLaunchOptions(null, info); + opts.options.setLaunchDisplayId(displayId); + if (!info.user.equals(Process.myUserHandle())) { + // TODO b/376819104: support Desktop launch animations for apps in managed profiles + getSystemService(LauncherApps.class).startMainActivity( + intent.getComponent(), info.user, intent.getSourceBounds(), + opts.toBundle()); + return; + } + // TODO(b/216683257): Use startActivityForResult for search results that require it. + if (taskInRecents != null) { + // Re launch instance from recents + if (ActivityManagerWrapper.getInstance() + .startActivityFromRecents(taskInRecents.key, opts.options)) { + mControllers.uiController.getRecentsView() + .addSideTaskLaunchCallback(opts.onEndCallback); + return; } - - startActivity(intent); + } + if (shouldLaunchInDesktop(displayId, info)) { + launchDesktopApp(intent, info, displayId); } else { - getSystemService(LauncherApps.class).startMainActivity( - intent.getComponent(), info.user, intent.getSourceBounds(), null); + startActivity(intent, getSingleActivityLaunchOptions(info).toBundle()); } } catch (NullPointerException | ActivityNotFoundException | SecurityException e) { Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT) @@ -1335,6 +2035,55 @@ private void startItemInfoActivity(ItemInfo info, @Nullable Task taskInRecents) } } + private boolean shouldLaunchInDesktop(int displayId, ItemInfo info) { + if (!DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue()) { + return false; + } + final SingleTask singleTask = mControllers.taskbarRecentAppsController.getSingleTask(info); + if (DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_FULLSCREEN_REFOCUS_BUGFIX.isTrue() + && DisplayController.isInDesktopFirstMode(this) && singleTask != null) { + if (!DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_POLICY_IN_LPM.isTrue()) { + // Keep the fullscreen mode in desktop-first mode. + return false; + } + final DisplayController.Info currentDisplayInfo = DisplayController.INSTANCE.get(this) + .getInfoForDisplay(singleTask.getTask().getKey().displayId); + if (currentDisplayInfo != null && currentDisplayInfo.isInDesktopFirstMode()) { + // Keep the fullscreen mode if both current and target displays are in desktop-first + // mode. + return false; + } + } + // Always launch in freeform if in external display. + return (DesktopExperienceFlags.ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS.isTrue() + && isExternalDisplay(displayId)) || isTaskbarShowingDesktopTasks(); + } + + private void launchDesktopApp(Intent intent, ItemInfo info, int displayId) { + TaskbarRecentAppsController.TaskState taskState = + mControllers.taskbarRecentAppsController.getDesktopItemState(info); + RunningAppState appState = taskState.getRunningAppState(); + if (appState == RunningAppState.RUNNING || appState == RunningAppState.MINIMIZED) { + // We only need a custom animation (a RemoteTransition) if the task is minimized - if + // it's already visible it will just be brought forward. + RemoteTransition remoteTransition = (appState == RunningAppState.MINIMIZED) + ? createDesktopAppLaunchRemoteTransition( + AppLaunchType.UNMINIMIZE, Cuj.CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_ICON) + : null; + UI_HELPER_EXECUTOR.execute(() -> + SystemUiProxy.INSTANCE.get(this).showDesktopApp(taskState.getTaskId(), + remoteTransition, DesktopTaskToFrontReason.TASKBAR_TAP)); + return; + } + // There is no task associated with this launch - launch a new task through an intent + ActivityOptionsWrapper opts = getActivityLaunchDesktopOptions(); + if (DesktopModeFlags.ENABLE_START_LAUNCH_TRANSITION_FROM_TASKBAR_BUGFIX.isTrue()) { + mSysUiProxy.startLaunchIntentTransition(intent, opts.options.toBundle(), displayId); + } else { + startActivity(intent, opts.options.toBundle()); + } + } + /** Expands a folder icon when it is clicked */ private void expandFolder(FolderIcon folderIcon) { Folder folder = folderIcon.getFolder(); @@ -1360,13 +2109,19 @@ public void onFolderStateChanged(int newState) { folder.animateOpen(); getStatsLogManager().logger().withItemInfo(folder.mInfo).log(LAUNCHER_FOLDER_OPEN); - folder.iterateOverItems((itemInfo, itemView) -> { + folder.mapOverItems((itemInfo, itemView) -> { mControllers.taskbarViewController .setClickAndLongClickListenersForIcon(itemView); // To play haptic when dragging, like other Taskbar items do. itemView.setHapticFeedbackEnabled(true); return false; }); + + // Close any open taskbar tooltips. + if (AbstractFloatingView.hasOpenView(this, TYPE_ON_BOARD_POPUP)) { + AbstractFloatingView.getOpenView(this, TYPE_ON_BOARD_POPUP) + .close(/* animate= */ false); + } }); } @@ -1379,10 +2134,19 @@ public boolean isTaskbarStashed() { /** * Called when we want to unstash taskbar when user performs swipes up gesture. + * + * @param delayTaskbarBackground whether we will delay the taskbar background animation */ - public void onSwipeToUnstashTaskbar() { + public void onSwipeToUnstashTaskbar(boolean delayTaskbarBackground) { + mControllers.uiController.onSwipeToUnstashTaskbar(); + boolean wasStashed = mControllers.taskbarStashController.isStashed(); - mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(/* stash= */ false); + if (isTransientTaskbar()) { + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(/* stash= */ false, + SHOULD_BUBBLES_FOLLOW_DEFAULT_VALUE, delayTaskbarBackground); + } else if (shouldAllowTaskbarToAutoStash()) { + mControllers.taskbarStashController.updateAndAnimatePinnedTaskbar(false); + } boolean isStashed = mControllers.taskbarStashController.isStashed(); if (isStashed != wasStashed) { VibratorWrapper.INSTANCE.get(this).vibrateForTaskbarUnstash(); @@ -1390,13 +2154,8 @@ public void onSwipeToUnstashTaskbar() { mControllers.taskbarEduTooltipController.hide(); } - /** - * Called when we want to open bubblebar when user performs swipes up gesture. - */ - public void onSwipeToOpenBubblebar() { - mControllers.bubbleControllers.ifPresent(controllers -> { - controllers.bubbleStashController.showBubbleBar(/* expandBubbles= */ true); - }); + public void openTaskbarAllApps() { + mControllers.uiController.toggleAllApps(false); } /** Returns {@code true} if Taskbar All Apps is open. */ @@ -1417,8 +2176,7 @@ public void playTaskbarBackgroundAlphaAnimation() { } /** - * Called to start the taskbar translation spring to its settled translation - * (0). + * Called to start the taskbar translation spring to its settled translation (0). */ public void startTranslationSpring() { mControllers.taskbarTranslationController.startSpring(); @@ -1439,19 +2197,23 @@ public void onTransientAutohideSuspendFlagChanged(boolean isSuspended) { } /** - * Called when we detect a motion down or up/cancel in the nav region while - * stashed. + * Called when we detect a motion down or up/cancel in the nav region while stashed. * - * @param animateForward Whether to animate towards the unstashed hint state or - * back to stashed. + * @param animateForward Whether to animate towards the unstashed hint state or back to stashed. */ public void startTaskbarUnstashHint(boolean animateForward) { mControllers.taskbarStashController.startUnstashHint(animateForward); } /** - * Enables the auto timeout for taskbar stashing. This method should only be - * used for taskbar + * @return if we should allow taskbar to auto stash + */ + public boolean shouldAllowTaskbarToAutoStash() { + return mControllers.taskbarStashController.shouldAllowTaskbarToAutoStash(); + } + + /** + * Enables the auto timeout for taskbar stashing. This method should only be used for taskbar * testing. */ @VisibleForTesting @@ -1464,11 +2226,18 @@ public void enableBlockingTimeoutDuringTests(boolean enableBlockingTimeout) { */ @VisibleForTesting public void unstashTaskbarIfStashed() { - if (DisplayController.isTransientTaskbar(this)) { + if (isTransientTaskbar()) { mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(false); } } + /** Removes bubble bar if present on the screen */ + @VisibleForTesting + public void removeAllBubbles() { + mControllers.bubbleControllers.ifPresent( + controllers -> controllers.bubbleBarViewController.onDismissAllBubbles()); + } + /** Unstashes the Bubble Bar if it is stashed. */ @VisibleForTesting public void unstashBubbleBarIfStashed() { @@ -1483,32 +2252,40 @@ public boolean isUserSetupComplete() { return mIsUserSetupComplete; } + /** + * Checks if the simple view mode is enabled. + * + * Since Simple View puts the device in 3 button nav mode, we use that as a precursor to + * checking the actual value in Settings to avoid extra calls to Settings. + */ + public boolean isSimpleViewEnabled() { + return isThreeButtonNav() + && Settings.Secure.getInt(getContentResolver(), SIMPLE_VIEW_SETTINGS_KEY, 0) + > 0; + } + public boolean isNavBarKidsModeActive() { return mIsNavBarKidsMode && isThreeButtonNav(); } - protected boolean isNavBarForceVisible() { + @VisibleForTesting(otherwise = PROTECTED) + public boolean isNavBarForceVisible() { return mIsNavBarForceVisible; } /** * Displays a single frame of the Launcher start from SUW animation. * - * This animation is a combination of the Launcher resume animation, which - * animates the hotseat - * icons into position, the Taskbar unstash to hotseat animation, which animates - * the Taskbar - * stash bar into the hotseat icons, and an override to prevent showing the - * Taskbar all apps + * This animation is a combination of the Launcher resume animation, which animates the hotseat + * icons into position, the Taskbar unstash to hotseat animation, which animates the Taskbar + * stash bar into the hotseat icons, and an override to prevent showing the Taskbar all apps * button. * - * This should be used to run a Taskbar unstash to hotseat animation whose - * progress matches a + * This should be used to run a Taskbar unstash to hotseat animation whose progress matches a * swipe progress. * * @param duration a placeholder duration to be used to ensure all full-length - * sub-animations are properly coordinated. This duration should - * not actually + * sub-animations are properly coordinated. This duration should not actually * be used since this animation tracks a swipe progress. */ protected AnimatorPlaybackController createLauncherStartFromSuwAnim(int duration) { @@ -1516,21 +2293,23 @@ protected AnimatorPlaybackController createLauncherStartFromSuwAnim(int duration fullAnimation.setDuration(duration); TaskbarUIController uiController = mControllers.uiController; - if (uiController instanceof LauncherTaskbarUIController) { - ((LauncherTaskbarUIController) uiController).addLauncherVisibilityChangedAnimation( - fullAnimation, duration); + if (uiController instanceof LauncherTaskbarUIController taskbarUiController) { + taskbarUiController.addLauncherVisibilityChangedAnimation(fullAnimation, duration); + taskbarUiController.addWorkspaceRevealAnim(fullAnimation, duration); } mControllers.taskbarStashController.addUnstashToHotseatAnimationFromSuw(fullAnimation, duration); View allAppsButton = mControllers.taskbarViewController.getAllAppsButtonView(); - if (allAppsButton != null && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get()) { + if (!FeatureFlags.enableAllAppsButtonInHotseat()) { ValueAnimator alphaOverride = ValueAnimator.ofFloat(0, 1); alphaOverride.setDuration(duration); alphaOverride.addUpdateListener(a -> { // Override the alpha updates in the icon alignment animation. allAppsButton.setAlpha(0); }); + alphaOverride.addListener(AnimatorListeners.forSuccessCallback( + () -> allAppsButton.setAlpha(1f))); fullAnimation.play(alphaOverride); } @@ -1538,38 +2317,27 @@ protected AnimatorPlaybackController createLauncherStartFromSuwAnim(int duration } /** - * Called when we determine the touchable region. - * - * @param exclude {@code true} then the magnification region computation will - * omit the window. + * @return true if we should force the fallback animation for All Set page */ - public void excludeFromMagnificationRegion(boolean exclude) { - if (mIsExcludeFromMagnificationRegion == exclude) { - return; - } - - mIsExcludeFromMagnificationRegion = exclude; - if (exclude) { - mWindowLayoutParams.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION; - } else { - mWindowLayoutParams.privateFlags &= ~WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION; - } - notifyUpdateLayoutParams(); + public boolean shouldForceAllSetFallbackAnimation() { + return !(mControllers.uiController instanceof LauncherTaskbarUIController); } void notifyUpdateLayoutParams() { if (mDragLayer.isAttachedToWindow()) { - if (enableTaskbarNoRecreate()) { - mWindowManager.updateViewLayout(mDragLayer.getRootView(), mWindowLayoutParams); - } else { - mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams); + // Copy the current windowLayoutParams to mLastUpdatedLayoutParams and compare the diff. + // If there is no change, we will skip the call to updateViewLayout. + int changes = mLastUpdatedLayoutParams.copyFrom(mWindowLayoutParams); + if (changes == 0) { + return; } + mWindowManager.updateViewLayout(mDragLayer.getRootView(), mWindowLayoutParams); } } public void showPopupMenuForIcon(BubbleTextView btv) { setTaskbarWindowFullscreen(true); - btv.post(() -> mControllers.taskbarPopupController.showForIcon(btv)); + btv.post(() -> mControllers.taskbarPopupController.show(btv)); } public void launchKeyboardFocusedTask() { @@ -1580,10 +2348,22 @@ public boolean isInApp() { return mControllers.taskbarStashController.isInApp(); } + public boolean isInOverview() { + return mControllers.taskbarStashController.isInOverview(); + } + public boolean isInStashedLauncherState() { return mControllers.taskbarStashController.isInStashedLauncherState(); } + public TaskbarFeatureEvaluator getTaskbarFeatureEvaluator() { + return mTaskbarFeatureEvaluator; + } + + public TaskbarSpecsEvaluator getTaskbarSpecsEvaluator() { + return mTaskbarSpecsEvaluator; + } + protected void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "TaskbarActivityContext:"); @@ -1595,8 +2375,6 @@ protected void dumpLogs(String prefix, PrintWriter pw) { "%s\tmIsUserSetupComplete=%b", prefix, mIsUserSetupComplete)); pw.println(String.format( "%s\tmWindowLayoutParams.height=%dpx", prefix, mWindowLayoutParams.height)); - pw.println(String.format( - "%s\tmBindInProgress=%b", prefix, mBindingItems)); mControllers.dumpLogs(prefix + "\t", pw); mDeviceProfile.dump(this, prefix, pw); } @@ -1616,17 +2394,43 @@ public float getStashedTaskbarScale() { return mControllers.stashedHandleViewController.getStashedHandleHintScale().value; } + /** + * Sets the upper limit for max number of icons in the taskbar. + */ + @VisibleForTesting + public void limitMaxTaskbarIconsNum(int maxIconNumLimit) { + mControllers.taskbarViewController.limitMaxTaskbarIconsNum(maxIconNumLimit); + } + /** Closes the KeyboardQuickSwitchView without an animation if open. */ public void closeKeyboardQuickSwitchView() { mControllers.keyboardQuickSwitchController.closeQuickSwitchView(false); } - boolean canToggleHomeAllApps() { - return mControllers.uiController.canToggleHomeAllApps(); + boolean isIconAlignedWithHotseat() { + return mControllers.uiController.isIconAlignedWithHotseat(); } - @VisibleForTesting + // TODO(b/395061396): Remove `otherwise` when overview in widow is enabled. + @VisibleForTesting(otherwise = PACKAGE_PRIVATE) public TaskbarControllers getControllers() { return mControllers; } + + /** + * Sets a new UIControllerChangeListener + */ + public void setUIControllerChangeListener(UIControllerChangeListener listener) { + mUIControllerChangeListener = listener; + } + + /** + * Listens to when TaskbarUIController changes. + */ + public interface UIControllerChangeListener { + /** + * Called whenever the UIIController changes. + */ + void onUIControllerChanged(TaskbarUIController uiController); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java index b9136e9f0f6..3a23a23927f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java @@ -47,8 +47,16 @@ public class TaskbarAutohideSuspendController implements public static final int FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER = 1 << 4; // Transient Taskbar is temporarily unstashed (pending a timeout). public static final int FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR = 1 << 5; - // User has hovered the taskbar. + // User has hovered the Taskbar. public static final int FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS = 1 << 6; + // User has multi instance window open. + public static final int FLAG_AUTOHIDE_SUSPEND_MULTI_INSTANCE_MENU_OPEN = 1 << 7; + // User has Taskbar overflow open. + public static final int FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW = 1 << 8; + // Growth Framework nudge overlay is open above the Taskbar. + public static final int FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN = 1 << 9; + // Taskbar hiding is suspended due to expanded bubbles or animating bubbles. + public static final int FLAG_AUTOHIDE_SUSPEND_BUBBLES = 1 << 10; @IntDef(flag = true, value = { FLAG_AUTOHIDE_SUSPEND_FULLSCREEN, @@ -58,11 +66,19 @@ public class TaskbarAutohideSuspendController implements FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER, FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR, FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, + FLAG_AUTOHIDE_SUSPEND_MULTI_INSTANCE_MENU_OPEN, + FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW, + FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN, + FLAG_AUTOHIDE_SUSPEND_BUBBLES, }) @Retention(RetentionPolicy.SOURCE) public @interface AutohideSuspendFlag { } + /** Flags that require the taskbar window to be visible. */ + private static final int FLAGS_FORCE_VISIBLE = + FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR | FLAG_AUTOHIDE_SUSPEND_BUBBLES; + private final TaskbarActivityContext mActivity; private final SystemUiProxy mSystemUiProxy; @@ -101,7 +117,7 @@ public void updateFlag(@AutohideSuspendFlag int flag, boolean enabled) { /** * Returns true iff taskbar autohide is currently suspended. */ - private boolean isSuspended() { + public boolean isSuspended() { return mAutohideSuspendFlags != 0; } @@ -113,11 +129,18 @@ public boolean isSuspendedForTransientTaskbarInLauncher() { return (mAutohideSuspendFlags & FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER) != 0; } + /** Whether we're in a state that requires the taskbar window to be visible. */ + public boolean shouldForceVisible() { + return (mAutohideSuspendFlags & FLAGS_FORCE_VISIBLE) != 0; + } + /** * Returns whether Transient Taskbar should avoid auto-stashing. */ public boolean isTransientTaskbarStashingSuspended() { - return (mAutohideSuspendFlags & ~FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR) != 0; + return (mAutohideSuspendFlags + & ~FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR + & ~FLAG_AUTOHIDE_SUSPEND_BUBBLES) != 0; } @Override @@ -138,6 +161,16 @@ private static String getStateString(int flags) { "FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER"); appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR, "FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR"); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, + "FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS"); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_MULTI_INSTANCE_MENU_OPEN, + "FLAG_AUTOHIDE_SUSPEND_MULTI_INSTANCE_MENU_OPEN"); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW, + "FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW"); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN, + "FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN"); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_BUBBLES, + "FLAG_AUTOHIDE_SUSPEND_BUBBLES"); return str.toString(); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt index 2737cbd4672..dc14829d3ad 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt @@ -23,6 +23,7 @@ import android.graphics.Paint import android.graphics.Path import android.graphics.RectF import com.android.app.animation.Interpolators +import com.android.launcher3.Flags import com.android.launcher3.R import com.android.launcher3.Utilities import com.android.launcher3.Utilities.mapRange @@ -30,7 +31,7 @@ import com.android.launcher3.Utilities.mapToRange import com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound import com.android.launcher3.taskbar.TaskbarPinningController.Companion.PINNING_PERSISTENT import com.android.launcher3.taskbar.TaskbarPinningController.Companion.PINNING_TRANSIENT -import com.android.launcher3.util.DisplayController +import com.android.launcher3.taskbar.Utilities.getShapedTaskbarRadius import kotlin.math.min /** Helps draw the taskbar background, made up of a rectangle plus two inverted rounded corners. */ @@ -38,36 +39,36 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { private val isInSetup: Boolean = !context.isUserSetupComplete - private val maxTransientTaskbarHeight = - context.transientTaskbarDeviceProfile.taskbarHeight.toFloat() - private val maxPersistentTaskbarHeight = - context.persistentTaskbarDeviceProfile.taskbarHeight.toFloat() + private val maxTransientTaskbarHeight = context.transientTaskbarProfile.height.toFloat() + private val maxPersistentTaskbarHeight = context.persistentTaskbarProfile.height.toFloat() var backgroundProgress = - if (DisplayController.isTransientTaskbar(context)) { + if (context.isTransientTaskbar) { PINNING_TRANSIENT } else { PINNING_PERSISTENT } var isAnimatingPinning = false + var isAnimatingPersistentTaskbar = false + var isAnimatingTransientTaskbar = false val paint = Paint() private val strokePaint = Paint() val lastDrawnTransientRect = RectF() - var backgroundHeight = context.deviceProfile.taskbarHeight.toFloat() + var backgroundHeight = context.deviceProfile.taskbarProfile.height.toFloat() var translationYForSwipe = 0f var translationYForStash = 0f + var translationXForBubbleBar = 0f private val transientBackgroundBounds = context.transientTaskbarBounds private val shadowAlpha: Float - private val strokeAlpha: Int private var shadowBlur = 0f private var keyShadowDistance = 0f private var bottomMargin = 0 - private val fullCornerRadius = context.cornerRadius.toFloat() - private var cornerRadius = fullCornerRadius + private val fullCornerRadius: Float + private var cornerRadius = 0f private var widthInsetPercentage = 0f private val square = Path() private val circle = Path() @@ -90,20 +91,22 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { strokePaint.strokeWidth = context.resources.getDimension(R.dimen.transient_taskbar_stroke_width) if (Utilities.isDarkTheme(context)) { - strokeAlpha = DARK_THEME_STROKE_ALPHA shadowAlpha = DARK_THEME_SHADOW_ALPHA } else { - strokeAlpha = LIGHT_THEME_STROKE_ALPHA shadowAlpha = LIGHT_THEME_SHADOW_ALPHA } - setCornerRoundness(DEFAULT_ROUNDNESS) + fullCornerRadius = context.cornerRadius.toFloat() + cornerRadius = fullCornerRadius + if (!context.isInDesktopMode()) { + setCornerRoundness(MAX_ROUNDNESS) + } } fun updateStashedHandleWidth(context: TaskbarActivityContext, res: Resources) { stashedHandleWidth = res.getDimensionPixelSize( - if (context.isPhoneMode || context.isTinyTaskbar) { + if (context.isPhoneMode || context.isTinyTaskbar || context.isBubbleBarOnPhone) { R.dimen.taskbar_stashed_small_screen } else { R.dimen.taskbar_stashed_handle_width @@ -117,7 +120,7 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { * @param cornerRoundness 0 has no round corner, 1 has complete round corner. */ fun setCornerRoundness(cornerRoundness: Float) { - if (DisplayController.isTransientTaskbar(context) && !transientBackgroundBounds.isEmpty) { + if (context.isTransientTaskbar && !transientBackgroundBounds.isEmpty) { return } @@ -139,7 +142,7 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { /** Draws the background with the given paint and height, on the provided canvas. */ fun draw(canvas: Canvas) { if (isInSetup) return - val isTransientTaskbar = backgroundProgress == 0f + val isTransientTaskbar = context.isTransientTaskbar canvas.save() if (!isTransientTaskbar || transientBackgroundBounds.isEmpty || isAnimatingPinning) { drawPersistentBackground(canvas) @@ -153,7 +156,7 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { } private fun drawPersistentBackground(canvas: Canvas) { - if (isAnimatingPinning) { + if (isAnimatingPinning || isAnimatingPersistentTaskbar) { val persistentTaskbarHeight = maxPersistentTaskbarHeight * backgroundProgress canvas.translate(0f, canvas.height - persistentTaskbarHeight) // Draw the background behind taskbar content. @@ -176,19 +179,20 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { private fun drawTransientBackground(canvas: Canvas) { val res = context.resources val transientTaskbarHeight = maxTransientTaskbarHeight * (1f - backgroundProgress) + val isAnimating = isAnimatingPinning || isAnimatingTransientTaskbar val heightProgressWhileAnimating = - if (isAnimatingPinning) transientTaskbarHeight else backgroundHeight + if (isAnimating) transientTaskbarHeight else backgroundHeight var progress = heightProgressWhileAnimating / maxTransientTaskbarHeight progress = Math.round(progress * 100f) / 100f - if (isAnimatingPinning) { + if (isAnimating) { var scale = transientTaskbarHeight / maxTransientTaskbarHeight scale = Math.round(scale * 100f) / 100f bottomMargin = mapRange( scale, 0f, - res.getDimensionPixelSize(R.dimen.transient_taskbar_bottom_margin).toFloat() + res.getDimensionPixelSize(R.dimen.transient_taskbar_bottom_margin).toFloat(), ) .toInt() shadowBlur = @@ -215,7 +219,12 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { val newWidth = mapRange(progress, backgroundWidthWhileAnimating, fullWidth.toFloat()) val halfWidthDelta = (fullWidth - newWidth) / 2f - val radius = newBackgroundHeight / 2f + val radius = + if (Flags.enableLauncherIconShapes()) { + getShapedTaskbarRadius(context) + } else { + newBackgroundHeight / 2f + } val bottomMarginProgress = bottomMargin * ((1f - progress) / 2f) // Aligns the bottom with the bottom of the stashed handle. @@ -227,7 +236,7 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { -mapRange( 1f - progress, 0f, - if (isAnimatingPinning) 0f else stashedHandleHeight / 2f + if (isAnimatingPinning) 0f else stashedHandleHeight / 2f, ) // Draw shadow. @@ -237,15 +246,15 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { shadowBlur, 0f, keyShadowDistance, - setColorAlphaBound(Color.BLACK, Math.round(newShadowAlpha)) + setColorAlphaBound(Color.BLACK, Math.round(newShadowAlpha)), ) - strokePaint.alpha = (paint.alpha * strokeAlpha) / 255 - + strokePaint.alpha = (paint.alpha * STROKE_ALPHA) / 255 + val currentTranslationX = translationXForBubbleBar * progress lastDrawnTransientRect.set( - transientBackgroundBounds.left + halfWidthDelta, + transientBackgroundBounds.left + halfWidthDelta + currentTranslationX, bottom - newBackgroundHeight, - transientBackgroundBounds.right - halfWidthDelta, - bottom + transientBackgroundBounds.right - halfWidthDelta + currentTranslationX, + bottom, ) val horizontalInset = fullWidth * widthInsetPercentage lastDrawnTransientRect.inset(horizontalInset, 0f) @@ -263,9 +272,8 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { } companion object { - const val DEFAULT_ROUNDNESS = 1f - private const val DARK_THEME_STROKE_ALPHA = 51 - private const val LIGHT_THEME_STROKE_ALPHA = 41 + const val MAX_ROUNDNESS = 1f + private const val STROKE_ALPHA = 51 private const val DARK_THEME_SHADOW_ALPHA = 51f private const val LIGHT_THEME_SHADOW_ALPHA = 25f } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBootAppContext.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBootAppContext.kt new file mode 100644 index 00000000000..4582426fac2 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBootAppContext.kt @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.content.Context +import android.content.ContextWrapper +import com.android.launcher3.InMemoryLauncherPrefs +import com.android.launcher3.LauncherPrefs +import com.android.launcher3.compose.widgetpicker.LauncherWidgetPickerModule +import com.android.launcher3.concurrent.ExecutorsModule +import com.android.launcher3.dagger.ApiWrapperModule +import com.android.launcher3.dagger.AppModule +import com.android.launcher3.dagger.HomeScreenFilesModule +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.dagger.LauncherConcurrencyModule +import com.android.launcher3.dagger.LauncherModelModule +import com.android.launcher3.dagger.PerDisplayModule +import com.android.launcher3.dagger.SettingsModule +import com.android.launcher3.dagger.StaticObjectModule +import com.android.launcher3.dagger.SystemDragModule +import com.android.launcher3.dagger.WidgetModule +import com.android.launcher3.dagger.WindowManagerProxyModule +import com.android.launcher3.util.PluginManagerWrapper +import com.android.launcher3.util.SandboxContext +import com.android.launcher3.util.dagger.LauncherExecutorsModule +import dagger.BindsInstance +import dagger.Component + +/** + * Sandbox for enabling Taskbar in direct boot mode. + * + * Swaps out dependencies that depend on encrypted storage for alternatives that still allow for + * system navigation (e.g. back button) to show up on keyguard before the first unlock. + */ +class TaskbarBootAppContext(base: Context) : SandboxContext(base) { + + init { + initDaggerComponent( + DaggerTaskbarBootComponent.builder() + .bindPrefs(InMemoryLauncherPrefs(this)) + .bindPluginManagerWrapper(PluginManagerWrapper()) + ) + } + + /** + * Wrap a Taskbar window context for sandboxing it under this sandbox. + * + * This context should be a middle layer between [TaskbarActivityContext] and its window + * context. In other words, [TaskbarActivityContext] should wrap the returned context, which + * wraps [base]. + */ + fun wrapWindowContext(base: Context): Context = TaskbarBootContextWrapper(base) + + private inner class TaskbarBootContextWrapper(base: Context) : ContextWrapper(base) { + override fun getApplicationContext() = this@TaskbarBootAppContext + } +} + +@LauncherAppSingleton +@Component( + modules = + [ + WindowManagerProxyModule::class, + ApiWrapperModule::class, + StaticObjectModule::class, + WidgetModule::class, + AppModule::class, + PerDisplayModule::class, + LauncherConcurrencyModule::class, + ExecutorsModule::class, + LauncherExecutorsModule::class, + LauncherWidgetPickerModule::class, + LauncherModelModule::class, + HomeScreenFilesModule::class, + SettingsModule::class, + SystemDragModule::class, + ] +) +interface TaskbarBootComponent : LauncherAppComponent { + @Component.Builder + interface Builder : LauncherAppComponent.Builder { + @BindsInstance fun bindPrefs(prefs: LauncherPrefs): Builder + + @BindsInstance fun bindPluginManagerWrapper(wrapper: PluginManagerWrapper): Builder + + override fun build(): TaskbarBootComponent + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java index 58c5e835c96..a619bb84226 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java @@ -15,6 +15,7 @@ */ package com.android.launcher3.taskbar; +import android.animation.AnimatorSet; import android.content.pm.ActivityInfo.Config; import androidx.annotation.NonNull; @@ -24,8 +25,11 @@ import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController; import com.android.launcher3.taskbar.bubbles.BubbleControllers; +import com.android.launcher3.taskbar.growth.NudgeController; +import com.android.launcher3.taskbar.handoff.TaskbarHandoffController; import com.android.launcher3.taskbar.overlay.TaskbarOverlayController; import com.android.systemui.shared.rotation.RotationButtonController; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; import java.io.PrintWriter; import java.util.ArrayList; @@ -64,6 +68,10 @@ public class TaskbarControllers { public final KeyboardQuickSwitchController keyboardQuickSwitchController; public final TaskbarPinningController taskbarPinningController; public final Optional bubbleControllers; + public final TaskbarDesktopModeController taskbarDesktopModeController; + public final TaskbarHandoffController taskbarHandoffController; + public final NudgeController nudgeController; + public final NudgeViewController nudgeViewController; @Nullable private LoggableTaskbarController[] mControllersToLog = null; @Nullable private BackgroundRendererController[] mBackgroundRendererControllers = null; @@ -111,7 +119,11 @@ public TaskbarControllers(TaskbarActivityContext taskbarActivityContext, TaskbarEduTooltipController taskbarEduTooltipController, KeyboardQuickSwitchController keyboardQuickSwitchController, TaskbarPinningController taskbarPinningController, - Optional bubbleControllers) { + Optional bubbleControllers, + TaskbarDesktopModeController taskbarDesktopModeController, + NudgeController nudgeController, + NudgeViewController nudgeViewController, + TaskbarHandoffController taskbarHandoffController) { this.taskbarActivityContext = taskbarActivityContext; this.taskbarDragController = taskbarDragController; this.navButtonController = navButtonController; @@ -138,6 +150,10 @@ public TaskbarControllers(TaskbarActivityContext taskbarActivityContext, this.keyboardQuickSwitchController = keyboardQuickSwitchController; this.taskbarPinningController = taskbarPinningController; this.bubbleControllers = bubbleControllers; + this.taskbarDesktopModeController = taskbarDesktopModeController; + this.nudgeController = nudgeController; + this.nudgeViewController = nudgeViewController; + this.taskbarHandoffController = taskbarHandoffController; } /** @@ -145,15 +161,16 @@ public TaskbarControllers(TaskbarActivityContext taskbarActivityContext, * TaskbarControllers instance, but should be careful to only access things that were created * in constructors for now, as some controllers may still be waiting for init(). */ - public void init(@NonNull TaskbarSharedState sharedState) { + public void init(@NonNull TaskbarSharedState sharedState, AnimatorSet startAnimation, + TaskbarUiState taskbarUiState) { mAreAllControllersInitialized = false; mSharedState = sharedState; - taskbarDragController.init(this); + taskbarDragController.init(this, taskbarUiState); navbarButtonsViewController.init(this); rotationButtonController.init(); - taskbarDragLayerController.init(this); - taskbarViewController.init(this); + taskbarDragLayerController.init(this, startAnimation); + taskbarViewController.init(this, startAnimation); taskbarScrimViewController.init(this); taskbarUnfoldAnimationController.init(this); taskbarKeyguardController.init(navbarButtonsViewController); @@ -163,16 +180,20 @@ public void init(@NonNull TaskbarSharedState sharedState) { taskbarPopupController.init(this); taskbarForceVisibleImmersiveController.init(this); taskbarOverlayController.init(this); - taskbarAllAppsController.init(this, sharedState.allAppsVisible); + taskbarAllAppsController.init(this, taskbarUiState, sharedState.allAppsVisible); navButtonController.init(this); + bubbleControllers.ifPresentOrElse(controllers -> controllers.init(sharedState, this), + sharedState::clearBubbleData); taskbarInsetsController.init(this); voiceInteractionWindowController.init(this); - taskbarRecentAppsController.init(this); + taskbarRecentAppsController.init(this, sharedState.recentTasksBeforeTaskbarRecreate); taskbarTranslationController.init(this); - taskbarEduTooltipController.init(this); + taskbarEduTooltipController.init(this, taskbarUiState); keyboardQuickSwitchController.init(this); taskbarPinningController.init(this, mSharedState); - bubbleControllers.ifPresent(controllers -> controllers.init(this)); + taskbarDesktopModeController.init(this, mSharedState, taskbarUiState); + nudgeController.init(this); + taskbarHandoffController.init(); mControllersToLog = new LoggableTaskbarController[] { taskbarDragController, navButtonController, navbarButtonsViewController, @@ -183,13 +204,29 @@ public void init(@NonNull TaskbarSharedState sharedState) { voiceInteractionWindowController, taskbarRecentAppsController, taskbarTranslationController, taskbarEduTooltipController, keyboardQuickSwitchController, taskbarPinningController, + nudgeController }; mBackgroundRendererControllers = new BackgroundRendererController[] { taskbarDragLayerController, taskbarScrimViewController, voiceInteractionWindowController }; - mCornerRoundness.updateValue(TaskbarBackgroundRenderer.DEFAULT_ROUNDNESS); + // TODO(b/401061748): get primary status from + // TaskbarDesktopModeController/DesktopVisibilityController. + if (taskbarDesktopModeController.isInDesktopModeAndNotInOverview( + taskbarActivityContext.getDisplayId()) + || !taskbarActivityContext.isPrimaryDisplay()) { + mCornerRoundness.value = taskbarDesktopModeController.getTaskbarCornerRoundness( + mSharedState.showCornerRadiusInDesktopMode); + } else { + mCornerRoundness.value = TaskbarBackgroundRenderer.MAX_ROUNDNESS; + } + updateCornerRoundness(); + onPostInit(); + } + + @VisibleForTesting + public void onPostInit() { mAreAllControllersInitialized = true; for (Runnable postInitCallback : mPostInitCallbacks) { postInitCallback.run(); @@ -205,9 +242,21 @@ public void setUiController(@NonNull TaskbarUIController newUiController) { uiController = newUiController; uiController.init(this); uiController.updateStateForSysuiFlags(mSharedState.sysuiStateFlags); - + // if bubble controllers are present configure the UI controller + bubbleControllers.ifPresentOrElse(bubbleControllers -> { + BubbleBarLocation location = + bubbleControllers.bubbleBarViewController.getBubbleBarLocation(); + boolean hiddenForBubbles = + bubbleControllers.bubbleBarViewController.isHiddenForNoBubbles(); + if (!hiddenForBubbles) { + uiController.adjustHotseatForBubbleBar(/* isBubbleBarVisible= */ true); + } + uiController.onBubbleBarLocationUpdated(location); + }, () -> uiController.onBubbleBarLocationUpdated(null)); // Notify that the ui controller has changed navbarButtonsViewController.onUiControllerChanged(); + taskbarViewController.onUiControllerChanged(); + taskbarEduTooltipController.updateShouldShowEduOnAppLaunch(); } @Nullable @@ -227,8 +276,8 @@ public void onConfigurationChanged(@Config int configChanges) { */ public void onDestroy() { mAreAllControllersInitialized = false; - mSharedState = null; + taskbarDragController.onDestroy(); navbarButtonsViewController.onDestroy(); uiController.onDestroy(); rotationButtonController.onDestroy(); @@ -236,6 +285,7 @@ public void onDestroy() { taskbarUnfoldAnimationController.onDestroy(); taskbarViewController.onDestroy(); stashedHandleViewController.onDestroy(); + nudgeViewController.onDestroy(); taskbarAutohideSuspendController.onDestroy(); taskbarPopupController.onDestroy(); taskbarForceVisibleImmersiveController.onDestroy(); @@ -247,10 +297,12 @@ public void onDestroy() { taskbarRecentAppsController.onDestroy(); keyboardQuickSwitchController.onDestroy(); taskbarStashController.onDestroy(); + taskbarHandoffController.onDestroy(); bubbleControllers.ifPresent(controllers -> controllers.onDestroy()); - + taskbarDesktopModeController.onDestroy(); mControllersToLog = null; mBackgroundRendererControllers = null; + mSharedState = null; } /** @@ -282,6 +334,11 @@ protected void dumpLogs(String prefix, PrintWriter pw) { } uiController.dumpLogs(prefix + "\t", pw); rotationButtonController.dumpLogs(prefix + "\t", pw); + if (bubbleControllers.isPresent()) { + bubbleControllers.get().dump(pw); + } else { + pw.println(String.format("%s\t%s", prefix, "Bubble controllers are empty.")); + } } /** @@ -307,7 +364,7 @@ TaskbarActivityContext getTaskbarActivityContext() { return taskbarActivityContext; } - protected interface LoggableTaskbarController { + public interface LoggableTaskbarController { void dumpLogs(String prefix, PrintWriter pw); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopExperienceFlags.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopExperienceFlags.kt new file mode 100644 index 00000000000..139850a623e --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopExperienceFlags.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.window.DesktopExperienceFlags.DesktopExperienceFlag +import com.android.launcher3.Flags + +object TaskbarDesktopExperienceFlags { + @JvmField + val enableAltTabKqsOnConnectedDisplays: DesktopExperienceFlag = + DesktopExperienceFlag( + Flags::enableAltTabKqsOnConnectedDisplays, + /* shouldOverrideByDevOption= */ true, + Flags.FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS, + ) + + @JvmField + val enableAltTabKqsFlatenning: DesktopExperienceFlag = + DesktopExperienceFlag( + Flags::enableAltTabKqsFlatenning, + /* shouldOverrideByDevOption= */ true, + Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING, + ) + + @JvmField + val enableCustomHeightForAllAppsOnCd: DesktopExperienceFlag = + DesktopExperienceFlag( + Flags::enableCustomHeightForAllAppsOnCd, + /* shouldOverrideByDevOption= */ true, + Flags.FLAG_ENABLE_CUSTOM_HEIGHT_FOR_ALL_APPS_ON_CD, + ) + + @JvmField + val enableAutoStashConnectedDisplayTaskbar: DesktopExperienceFlag = + DesktopExperienceFlag( + Flags::enableAutoStashConnectedDisplayTaskbar, + /* shouldOverrideByDevOption= */ true, + Flags.FLAG_ENABLE_AUTO_STASH_CONNECTED_DISPLAY_TASKBAR, + ) +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeController.kt new file mode 100644 index 00000000000..a6561ce4425 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeController.kt @@ -0,0 +1,113 @@ +/* + * 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.launcher3.taskbar + +import com.android.launcher3.Flags.refactorTaskbarUiState +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.statehandlers.DesktopVisibilityController.TaskbarDesktopModeListener +import com.android.launcher3.taskbar.TaskbarBackgroundRenderer.Companion.MAX_ROUNDNESS +import com.android.launcher3.taskbar.TaskbarManagerImpl.TASKBAR_UI_THREAD +import com.android.launcher3.util.DisplayController + +/** Handles Taskbar in Desktop Windowing mode. */ +class TaskbarDesktopModeController( + private val taskbarActivityContext: TaskbarActivityContext, + private val desktopVisibilityController: DesktopVisibilityController, +) : TaskbarDesktopModeListener { + + private val displayInfoChangeListener = + DisplayController.DisplayInfoChangeListener { _, _, _ -> + // DisplayInfoChangeListener is called on main thread, we should switch to taskbar's UI + // thread to update UI state. + TASKBAR_UI_THREAD.execute { updateTaskbarUiState() } + } + + private lateinit var taskbarControllers: TaskbarControllers + private lateinit var taskbarSharedState: TaskbarSharedState + private lateinit var taskbarUiState: TaskbarUiState + + val isLauncherAnimationRunning: Boolean + get() = desktopVisibilityController.launcherAnimationRunning + + fun init( + controllers: TaskbarControllers, + sharedState: TaskbarSharedState, + uiState: TaskbarUiState, + ) { + taskbarControllers = controllers + taskbarSharedState = sharedState + taskbarUiState = uiState + desktopVisibilityController.registerTaskbarDesktopModeListener(this) + if (refactorTaskbarUiState()) { + DisplayController.INSTANCE.get(taskbarActivityContext) + .addChangeListener(displayInfoChangeListener) + updateTaskbarUiState() + } + } + + fun isInDesktopMode(displayId: Int) = desktopVisibilityController.isInDesktopMode(displayId) + + fun isInDesktopModeAndNotInOverview(displayId: Int) = + desktopVisibilityController.isInDesktopModeAndNotInOverview(displayId) + + override fun onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding: Boolean) { + if (taskbarControllers.taskbarActivityContext.isDestroyed) return + taskbarSharedState.showCornerRadiusInDesktopMode = doesAnyTaskRequireTaskbarRounding + val cornerRadius = getTaskbarCornerRoundness(doesAnyTaskRequireTaskbarRounding) + taskbarControllers.taskbarCornerRoundness.animateToValue(cornerRadius).start() + } + + fun shouldShowDesktopTasksInTaskbar(): Boolean { + return shouldShowDesktopTasksInTaskbar(taskbarActivityContext.displayId) + } + + fun shouldShowDesktopTasksInTaskbar(displayId: Int): Boolean { + return isInDesktopMode(displayId) || + taskbarActivityContext.showDesktopTaskbarForFreeformDisplay() || + (taskbarActivityContext.showLockedTaskbarOnHome() && + taskbarControllers.taskbarStashController.isOnHome) + } + + fun getTaskbarCornerRoundness(doesAnyTaskRequireTaskbarRounding: Boolean): Float { + return if (doesAnyTaskRequireTaskbarRounding) { + MAX_ROUNDNESS + } else { + 0f + } + } + + val getActiveDeskId: Int + get() = + desktopVisibilityController.getActiveDeskId(taskbarActivityContext.displayId) + + fun onDestroy() { + desktopVisibilityController.unregisterTaskbarDesktopModeListener(this) + if (refactorTaskbarUiState()) { + DisplayController.INSTANCE.get(taskbarActivityContext) + .removeChangeListener(displayInfoChangeListener) + } + } + + private fun updateTaskbarUiState() { + taskbarUiState.setShowDesktopTaskbarForFreeformDisplay( + DisplayController.showDesktopTaskbarForFreeformDisplay(taskbarActivityContext) + ) + taskbarUiState.setShowLockedTaskbarOnHome( + DisplayController.showLockedTaskbarOnHome(taskbarActivityContext) + ) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt index a6355379074..3ae06abea47 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt @@ -29,23 +29,25 @@ import android.view.MotionEvent import android.view.View import android.widget.LinearLayout import android.widget.Switch +import androidx.core.content.res.ResourcesCompat import androidx.core.view.postDelayed import com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE +import com.android.launcher3.Flags +import com.android.launcher3.LauncherPrefs import com.android.launcher3.R import com.android.launcher3.popup.ArrowPopup import com.android.launcher3.popup.RoundedArrowDrawable -import com.android.launcher3.util.DisplayController import com.android.launcher3.util.Themes import com.android.launcher3.views.ActivityContext +import com.android.wm.shell.Flags.enableGsf +import kotlin.math.max +import kotlin.math.min /** Popup view with arrow for taskbar pinning */ class TaskbarDividerPopupView @JvmOverloads -constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0, -) : ArrowPopup(context, attrs, defStyleAttr) { +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + ArrowPopup(context, attrs, defStyleAttr) { companion object { private const val TAG = "TaskbarDividerPopupView" private const val DIVIDER_POPUP_CLOSING_DELAY = 333L @@ -55,26 +57,38 @@ constructor( fun createAndPopulate( view: View, taskbarActivityContext: TaskbarActivityContext, + horizontalPosition: Float, ): TaskbarDividerPopupView<*> { val taskMenuViewWithArrow = taskbarActivityContext.layoutInflater.inflate( R.layout.taskbar_divider_popup_menu, taskbarActivityContext.dragLayer, - false + false, ) as TaskbarDividerPopupView<*> - return taskMenuViewWithArrow.populateForView(view) + return taskMenuViewWithArrow.populateForView(view, horizontalPosition) } } private lateinit var dividerView: View + private var horizontalPosition = 0.0f + private val taskbarActivityContext: TaskbarActivityContext = + ActivityContext.lookupContext(context) private val popupCornerRadius = Themes.getDialogCornerRadius(context) private val arrowWidth = resources.getDimension(R.dimen.popup_arrow_width) private val arrowHeight = resources.getDimension(R.dimen.popup_arrow_height) private val arrowPointRadius = resources.getDimension(R.dimen.popup_arrow_corner_radius) + private val minPaddingFromScreenEdge = + resources.getDimension(R.dimen.taskbar_pinning_popup_menu_min_padding_from_screen_edge) + + private var alwaysShowTaskbarOn = + if (taskbarActivityContext.isTaskbarShowingDesktopTasks) { + LauncherPrefs.TASKBAR_PINNING_IN_DESKTOP_MODE.get(context) + } else { + !taskbarActivityContext.isTransientTaskbar + } - private var alwaysShowTaskbarOn = !DisplayController.isTransientTaskbar(context) private var didPreferenceChange = false private var verticalOffsetForPopupView = resources.getDimensionPixelSize(R.dimen.taskbar_pinning_popup_menu_vertical_margin) @@ -103,13 +117,22 @@ constructor( val alwaysShowTaskbarSwitch = requireViewById(R.id.taskbar_pinning_switch) val taskbarVisibilityIcon = requireViewById(R.id.taskbar_pinning_visibility_icon) + if (enableGsf()) { + taskbarVisibilityIcon.background = + ResourcesCompat.getDrawable( + context.resources, + R.drawable.ic_visibility_filled, + context.theme, + ) + } + alwaysShowTaskbarSwitch.isChecked = alwaysShowTaskbarOn alwaysShowTaskbarSwitch.setOnTouchListener { view, event -> (view.parent as View).onTouchEvent(event) } alwaysShowTaskbarSwitch.setOnClickListener { view -> (view.parent as View).performClick() } - if (ActivityContext.lookupContext(context).isGestureNav) { + if (taskbarActivityContext.isGestureNav) { taskbarSwitchOption.setOnClickListener { alwaysShowTaskbarSwitch.isChecked = !alwaysShowTaskbarOn onClickAlwaysShowTaskbarSwitchOption() @@ -128,7 +151,36 @@ constructor( /** Orient object as usual and then center object horizontally. */ override fun orientAboutObject() { super.orientAboutObject() - x = mTempRect.centerX() - measuredWidth / 2f + x = + if (Flags.showTaskbarPinningPopupFromAnywhere()) { + val xForCenterAlignment = horizontalPosition - measuredWidth / 2f + val maxX = popupContainer.getWidth() - measuredWidth - minPaddingFromScreenEdge + when { + // Left-aligned popup and its arrow pointing to the event position if there is + // not enough space to center it. + xForCenterAlignment < minPaddingFromScreenEdge -> + max( + minPaddingFromScreenEdge, + horizontalPosition - mArrowOffsetHorizontal - mArrowWidth / 2, + ) + + // Right-aligned popup and its arrow pointing to the event position if there + // is not enough space to center it. + xForCenterAlignment > maxX -> + min( + horizontalPosition - measuredWidth + + mArrowOffsetHorizontal + + mArrowWidth / 2, + popupContainer.getWidth() - measuredWidth - minPaddingFromScreenEdge, + ) + + // Default alignment where the popup and its arrow are centered relative to the + // event position. + else -> xForCenterAlignment + } + } else { + mTempRect.centerX() - measuredWidth / 2f + } } override fun onControllerInterceptTouchEvent(ev: MotionEvent?): Boolean { @@ -142,8 +194,9 @@ constructor( return false } - private fun populateForView(view: View): TaskbarDividerPopupView<*> { + private fun populateForView(view: View, horizontalPosition: Float): TaskbarDividerPopupView<*> { dividerView = view + this@TaskbarDividerPopupView.horizontalPosition = horizontalPosition tryUpdateBackground() return this } @@ -169,12 +222,31 @@ constructor( override fun addArrow() { super.addArrow() - // Change arrow location to the middle of popup. - mArrow.x = (dividerView.x + dividerView.width / 2) - (mArrowWidth / 2) + if (Flags.showTaskbarPinningPopupFromAnywhere()) { + mArrow.x = + min( + max( + minPaddingFromScreenEdge + mArrowOffsetHorizontal, + horizontalPosition - mArrowWidth / 2, + ), + popupContainer.getWidth() - + minPaddingFromScreenEdge - + mArrowOffsetHorizontal - + mArrowWidth, + ) + } else { + val location = IntArray(2) + popupContainer.getLocationInDragLayer(dividerView, location) + val dividerViewX = location[0].toFloat() + // Change arrow location to the middle of popup. + mArrow.x = (dividerViewX + dividerView.width / 2) - (mArrowWidth / 2) + } } override fun updateArrowColor() { - if (!Gravity.isVertical(mGravity)) { + if (Flags.showTaskbarPinningPopupFromAnywhere()) { + super.updateArrowColor() + } else if (!Gravity.isVertical(mGravity)) { mArrow.background = RoundedArrowDrawable( arrowWidth, @@ -195,8 +267,8 @@ constructor( } override fun getExtraVerticalOffset(): Int { - return (mActivityContext.deviceProfile.taskbarHeight - - mActivityContext.deviceProfile.taskbarIconSize) / 2 + verticalOffsetForPopupView + return (mActivityContext.deviceProfile.taskbarProfile.height - + mActivityContext.deviceProfile.taskbarProfile.iconSize) / 2 + verticalOffsetForPopupView } override fun onCreateCloseAnimation(anim: AnimatorSet?) { @@ -210,7 +282,7 @@ constructor( /** Aligning the view pivot to center for animation. */ override fun setPivotForOpenCloseAnimation() { - pivotX = measuredWidth / 2f + pivotX = mArrow.x + mArrowWidth / 2 - x pivotY = measuredHeight.toFloat() } @@ -224,13 +296,13 @@ constructor( ObjectAnimator.ofFloat( this, TRANSLATION_Y, - *floatArrayOf(this.translationY, this.translationY + translateYValue) + *floatArrayOf(this.translationY, this.translationY + translateYValue), ) val arrowTranslateY = ObjectAnimator.ofFloat( mArrow, TRANSLATION_Y, - *floatArrayOf(mArrow.translationY, mArrow.translationY + translateYValue) + *floatArrayOf(mArrow.translationY, mArrow.translationY + translateYValue), ) val animatorSet = AnimatorSet() animatorSet.playTogether(alpha, arrowAlpha, translateY, arrowTranslateY) @@ -240,7 +312,7 @@ constructor( private fun getAnimatorOfFloat( view: View, property: Property, - vararg values: Float + vararg values: Float, ): Animator { val animator: Animator = ObjectAnimator.ofFloat(view, property, *values) animator.setDuration(DIVIDER_POPUP_CLOSING_ANIMATION_DURATION) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java index 536daecdbf0..d3e2b4c47fd 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java @@ -17,8 +17,10 @@ import static com.android.app.animation.Interpolators.FAST_OUT_SLOW_IN; import static com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_ALL_APPS; +import static com.android.launcher3.Flags.enableSystemDrag; +import static com.android.launcher3.Flags.refactorTaskbarUiState; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SEARCH_ACTION; import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS; @@ -34,6 +36,7 @@ import android.content.ClipDescription; import android.content.Intent; import android.content.pm.LauncherApps; +import android.content.pm.ShortcutInfo; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Point; @@ -51,6 +54,7 @@ import android.window.SurfaceSyncGroup; import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import com.android.app.animation.Interpolators; import com.android.internal.logging.InstanceId; @@ -66,6 +70,7 @@ import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.dragndrop.DraggableView; +import com.android.launcher3.folder.Folder; import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.logger.LauncherAtom.ContainerInfo; import com.android.launcher3.logging.StatsLogManager; @@ -74,18 +79,18 @@ import com.android.launcher3.popup.PopupContainerWithArrow; import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider; -import com.android.launcher3.statehandlers.DesktopVisibilityController; +import com.android.launcher3.taskbar.bubbles.DragToBubbleController; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; -import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.views.BubbleTextHolder; -import com.android.quickstep.LauncherActivityInterface; import com.android.quickstep.util.LogUtils; import com.android.quickstep.util.MultiValueUpdateListener; +import com.android.quickstep.util.SingleTask; import com.android.systemui.shared.recents.model.Task; -import com.android.wm.shell.draganddrop.DragAndDropConstants; +import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper; +import com.android.wm.shell.shared.draganddrop.DragAndDropConstants; import java.io.PrintWriter; import java.util.Arrays; @@ -93,8 +98,7 @@ import java.util.function.Predicate; /** - * Handles long click on Taskbar items to start a system drag and drop - * operation. + * Handles long click on Taskbar items to start a system drag and drop operation. */ public class TaskbarDragController extends DragController implements TaskbarControllers.LoggableTaskbarController { @@ -114,20 +118,43 @@ public class TaskbarDragController extends DragController im private int mRegistrationY; private boolean mIsSystemDragInProgress; + private boolean mIsDropHandledByDropTarget; // Animation for the drag shadow back into position after an unsuccessful drag private ValueAnimator mReturnAnimator; private boolean mDisallowGlobalDrag; private boolean mDisallowLongClick; + private @Nullable TaskbarUiState mTaskbarUiState; + + private boolean mIsTaskbarDragging; + private @Nullable DragToBubbleController mDragToBubbleController; + + private @Nullable DragController.SystemDragHandler mSystemDragHandler; + private @Nullable View.OnDragListener mSystemDragListener; + public TaskbarDragController(BaseTaskbarContext activity) { super(activity); Resources resources = mActivity.getResources(); mDragIconSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_drag_icon_size); } - public void init(TaskbarControllers controllers) { + public void init(TaskbarControllers controllers, @Nullable TaskbarUiState taskbarUiState) { mControllers = controllers; + mControllers.runAfterInit(() -> + mControllers.bubbleControllers + .map(bubbleControllers -> bubbleControllers.dragToBubbleController) + .ifPresent(dragToBubbleController -> { + mDragToBubbleController = dragToBubbleController; + mDragToBubbleController.addBubbleBarDropTargets(this); + })); + mTaskbarUiState = taskbarUiState; + } + + /** Called when the controller is destroyed. */ + public void onDestroy() { + mControllers.bubbleControllers.ifPresent( + c -> c.dragToBubbleController.removeBubbleBarDropTargets(this)); } public void setDisallowGlobalDrag(boolean disallowGlobalDrag) { @@ -139,10 +166,8 @@ public void setDisallowLongClick(boolean disallowLongClick) { } /** - * Attempts to start a system drag and drop operation for the given View, using - * its tag to + * Attempts to start a system drag and drop operation for the given View, using its tag to * generate the ClipDescription and Intent. - * * @return Whether {@link View#startDragAndDrop} started successfully. */ public boolean startDragOnLongClick(View view) { @@ -157,6 +182,14 @@ protected boolean startDragOnLongClick( iconShift); } + private void updateIsDragging() { + mIsTaskbarDragging = TaskbarDragController.super.isDragging() + || mIsSystemDragInProgress; + if (refactorTaskbarUiState() && mTaskbarUiState != null) { + mTaskbarUiState.setIsTaskbarDragging(mIsTaskbarDragging); + } + } + private boolean startDragOnLongClick( View view, @Nullable DragPreviewProvider dragPreviewProvider, @@ -178,13 +211,16 @@ private boolean startDragOnLongClick( btv.setIconDisabled(true); mControllers.taskbarAutohideSuspendController.updateFlag( TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, true); + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(false); }); return true; } private DragView startInternalDrag( BubbleTextView btv, @Nullable DragPreviewProvider dragPreviewProvider) { - float iconScale = btv.getIcon().getAnimatedScale(); + // TODO(b/344038728): null check is only necessary because Recents doesn't use + // FastBitmapDrawable + float iconScale = btv.getIcon() == null ? 1f : btv.getIcon().getAnimatedScale(); // Clear the pressed state if necessary btv.clearFocus(); @@ -192,8 +228,7 @@ private DragView startInternalDrag( btv.clearPressedBackground(); final DragPreviewProvider previewProvider = dragPreviewProvider == null - ? new DragPreviewProvider(btv) - : dragPreviewProvider; + ? new DragPreviewProvider(btv) : dragPreviewProvider; final Drawable drawable = previewProvider.createDrawable(); final float scale = previewProvider.getScaleAndPosition(drawable, mTempXY); int dragLayerX = mTempXY[0]; @@ -205,14 +240,16 @@ private DragView startInternalDrag( DragOptions dragOptions = new DragOptions(); // First, see if view is a search result that needs custom pre-drag conditions. - dragOptions.preDragCondition = mControllers.taskbarAllAppsController.createPreDragConditionForSearch(btv); + dragOptions.preDragCondition = + mControllers.taskbarAllAppsController.createPreDragConditionForSearch(btv); if (dragOptions.preDragCondition == null) { // See if view supports a popup container. - PopupContainerWithArrow popupContainer = mControllers.taskbarPopupController - .showForIcon(btv); + PopupContainerWithArrow popupContainer = + (PopupContainerWithArrow) + mControllers.taskbarPopupController.show(btv); if (popupContainer != null) { - dragOptions.preDragCondition = popupContainer.createPreDragCondition(false); + dragOptions.preDragCondition = popupContainer.createPreDragCondition(); } } @@ -250,9 +287,9 @@ public void onPreDragEnd(DropTarget.DragObject dragObject, boolean dragStarted) /* originalView = */ btv, dragLayerX + dragOffset.x, dragLayerY + dragOffset.y, - (View target, DropTarget.DragObject d, boolean success) -> { - } /* DragSource */, - (ItemInfo) btv.getTag(), + (View target, DropTarget.DragObject d, boolean success) -> + mIsDropHandledByDropTarget = success /* DragSource */, + btv.getTag() instanceof ItemInfo itemInfo ? itemInfo : null, dragRect, scale * iconScale, scale, @@ -292,21 +329,23 @@ protected DragView startDrag(@Nullable Drawable drawable, @Nullable View view, initialDragViewScale, dragViewScaleOnDrop, scalePx); - dragView.setItemInfo(dragInfo); + if (dragInfo != null) { + dragView.setItemInfo(dragInfo); + } mDragObject.dragComplete = false; mDragObject.xOffset = mMotionDown.x - (dragLayerX + dragRegionLeft); mDragObject.yOffset = mMotionDown.y - (dragLayerY + dragRegionTop); - mDragDriver = DragDriver.create(this, mOptions, /* secondaryEventConsumer = */ ev -> { - }); + mDragDriver = DragDriver.create(this, mOptions, /* secondaryEventConsumer = */ ev -> {}); if (!mOptions.isAccessibleDrag) { mDragObject.stateAnnouncer = DragViewStateAnnouncer.createFor(dragView); } mDragObject.dragSource = source; mDragObject.dragInfo = dragInfo; - mDragObject.originalDragInfo = mDragObject.dragInfo.makeShallowCopy(); + mDragObject.originalDragInfo = + mDragObject.dragInfo != null ? mDragObject.dragInfo.makeShallowCopy() : null; if (mOptions.preDragCondition != null) { dragView.setHasDragOffset(mOptions.preDragCondition.getDragOffset().x != 0 @@ -328,28 +367,35 @@ protected DragView startDrag(@Nullable Drawable drawable, @Nullable View view, handleMoveEvent(mLastTouch.x, mLastTouch.y); + updateIsDragging(); return dragView; } /** Invoked when an animation running as part of pre-drag finishes. */ public void onPreDragAnimationEnd() { - // Drag might be cancelled during the DragView animation, so check mIsPreDrag - // again. + // Drag might be cancelled during the DragView animation, so check mIsPreDrag again. if (mIsInPreDrag) { callOnDragStart(); } } + /** Returns `true` when taskbar is shown and the home is visible. */ + private boolean isTaskbarShownOnHome() { + return (mControllers.taskbarActivityContext.showDesktopTaskbarForFreeformDisplay() + || mControllers.taskbarActivityContext.showLockedTaskbarOnHome()) + && mControllers.taskbarStashController.isOnHome(); + } + @Override protected void callOnDragStart() { super.callOnDragStart(); + updateIsDragging(); // TODO(297921594) clean it up when taskbar to desktop drag is implemented. - DesktopVisibilityController desktopController = LauncherActivityInterface.INSTANCE - .getDesktopVisibilityController(); - // Pre-drag has ended, start the global system drag. - if (mDisallowGlobalDrag || (desktopController != null - && desktopController.areDesktopTasksVisible())) { + if (mDisallowGlobalDrag + || mControllers.taskbarDesktopModeController + .isInDesktopModeAndNotInOverview(mActivity.getDisplayId()) + || isTaskbarShownOnHome()) { AbstractFloatingView.closeAllOpenViewsExcept(mActivity, TYPE_TASKBAR_ALL_APPS); return; } @@ -420,9 +466,12 @@ public void onDrawShadow(Canvas canvas) { item.user)); intent.putExtra(Intent.EXTRA_PACKAGE_NAME, item.getIntent().getPackage()); intent.putExtra(Intent.EXTRA_SHORTCUT_ID, deepShortcutId); + ShortcutInfo shortcutInfo = ((WorkspaceItemInfo) item).getDeepShortcutInfo(); + if (BubbleAnythingFlagHelper.enableCreateAnyBubble() && shortcutInfo != null) { + intent.putExtra(DragAndDropConstants.EXTRA_SHORTCUT_INFO, shortcutInfo); + } } else if (item.itemType == ITEM_TYPE_SEARCH_ACTION) { - // TODO(b/289261756): Buggy behavior when split opposite to an existing search - // pane. + // TODO(b/289261756): Buggy behavior when split opposite to an existing search pane. intent.putExtra( ClipDescription.EXTRA_PENDING_INTENT, PendingIntent.getActivityAsUser( @@ -438,8 +487,8 @@ public void onDrawShadow(Canvas canvas) { null, item.user)); } intent.putExtra(Intent.EXTRA_USER, item.user); - } else if (tag instanceof Task) { - Task task = (Task) tag; + } else if (tag instanceof SingleTask singleTask) { + Task task = singleTask.getTask(); clipDescription = new ClipDescription(task.titleDescription, new String[] { ClipDescription.MIMETYPE_APPLICATION_TASK @@ -450,18 +499,19 @@ public void onDrawShadow(Canvas canvas) { } if (clipDescription != null && intent != null) { - Pair instanceIds = LogUtils - .getShellShareableInstanceId(); + Pair instanceIds = + LogUtils.getShellShareableInstanceId(); // Need to share the same InstanceId between launcher3 and WM Shell (internal). InstanceId internalInstanceId = instanceIds.first; com.android.launcher3.logging.InstanceId launcherInstanceId = instanceIds.second; intent.putExtra(ClipDescription.EXTRA_LOGGING_INSTANCE_ID, internalInstanceId); - if (DisplayController.isTransientTaskbar(mActivity)) { + if (mActivity.isTransientTaskbar()) { // Tell WM Shell to ignore drag events in the provided transient taskbar region. TaskbarDragLayer dragLayer = mControllers.taskbarActivityContext.getDragLayer(); int[] locationOnScreen = dragLayer.getLocationOnScreen(); - RectF disallowExternalDropRegion = new RectF(dragLayer.getLastDrawnTransientRect()); + RectF disallowExternalDropRegion = new RectF(mControllers.taskbarViewController + .getTransientTaskbarIconLayoutBoundsInParent()); disallowExternalDropRegion.offset(locationOnScreen[0], locationOnScreen[1]); intent.putExtra(DragAndDropConstants.EXTRA_DISALLOW_HIT_REGION, disallowExternalDropRegion); @@ -471,7 +521,8 @@ public void onDrawShadow(Canvas canvas) { if (btv.startDragAndDrop(clipData, shadowBuilder, null /* localState */, View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_OPAQUE | View.DRAG_FLAG_REQUEST_SURFACE_FOR_RETURN_ANIMATION)) { - onSystemDragStarted(btv); + notifyDragToBubbleController(/* dragInProgress = */ true); + onSystemDragStarted(); mActivity.getStatsLogManager().logger().withItemInfo(mDragObject.dragInfo) .withInstanceId(launcherInstanceId) @@ -483,32 +534,62 @@ public void onDrawShadow(Canvas canvas) { AbstractFloatingView.closeAllOpenViews(mActivity); } - private void onSystemDragStarted(BubbleTextView btv) { + private void onSystemDragStarted() { mIsSystemDragInProgress = true; - mActivity.getDragLayer().setOnDragListener((view, dragEvent) -> { - switch (dragEvent.getAction()) { - case DragEvent.ACTION_DRAG_STARTED: - // Return true to tell system we are interested in events, so we get DRAG_ENDED. - return true; - case DragEvent.ACTION_DRAG_ENDED: - mIsSystemDragInProgress = false; - if (dragEvent.getResult()) { - maybeOnDragEnd(); - } else { - // This will take care of calling maybeOnDragEnd() after the animation - animateGlobalDragViewToOriginalPosition(btv, dragEvent); - } + updateIsDragging(); + + if (enableSystemDrag()) { + if (mSystemDragHandler == null) { + mSystemDragHandler = this::onSystemDrag; + } + mActivity.getDragController().addSystemDragHandler(mSystemDragHandler); + } else { + if (mSystemDragListener == null) { + mSystemDragListener = (view, dragEvent) -> onSystemDrag(dragEvent); + } + mActivity.getDragLayer().setOnDragListener(mSystemDragListener); + } + } + + private boolean onSystemDrag(DragEvent dragEvent) { + final boolean enableSystemDrag = enableSystemDrag(); + return switch (dragEvent.getAction()) { + case DragEvent.ACTION_DRAG_STARTED -> { + // Return true to tell system we are interested in events, so we get DRAG_ENDED. + yield true; + } + case DragEvent.ACTION_DRAG_ENDED -> { + mIsSystemDragInProgress = false; + updateIsDragging(); + if (dragEvent.getResult()) { + maybeOnDragEnd(); + } else { + // This will take care of calling maybeOnDragEnd() after the animation + BubbleTextView btv = (BubbleTextView) mDragObject.originalView; + animateGlobalDragViewToOriginalPosition(btv, dragEvent); + } + notifyDragToBubbleController(/* dragInProgress = */ false); + + if (enableSystemDrag) { + mActivity.getDragController().removeSystemDragHandler(mSystemDragHandler); + } else { mActivity.getDragLayer().setOnDragListener(null); + } - return true; + yield true; } - return false; - }); + default -> enableSystemDrag; + }; } + /** + * {@link TaskbarDragController} will rely on {@link DragListener}'s callback to update + * {@link mIsTaskbarDragging} field. This ensures correctness during long press and + * drag settle animation. + */ @Override public boolean isDragging() { - return super.isDragging() || mIsSystemDragInProgress; + return mIsTaskbarDragging; } /** {@code true} if the system is currently handling the drag. */ @@ -516,39 +597,53 @@ public boolean isSystemDragInProgress() { return mIsSystemDragInProgress; } + @VisibleForTesting private void maybeOnDragEnd() { + // maybeOnDragEnd() is called after callOnDragEnd() and endDrag() where isDragging() can + // change, we should update mIsTaskbarDragging before checking the value. + updateIsDragging(); if (!isDragging()) { ((BubbleTextView) mDragObject.originalView).setIconDisabled(false); mControllers.taskbarAutohideSuspendController.updateFlag( TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, false); mActivity.onDragEnd(); + // If an item is dropped on the bubble bar, the bubble bar handles the drop, + // so it should not collapse along with the taskbar. + boolean droppedOnBubbleBar = isBubbleBarShowingDropTarget(); if (mReturnAnimator == null) { // Upon successful drag, immediately stash taskbar. // Note, this must be done last to ensure no AutohideSuspendFlags are active, as // that will prevent us from stashing until the timeout. - mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true); - + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar( + /* stash = */ true, + /* shouldBubblesFollow = */ !droppedOnBubbleBar + ); mActivity.getStatsLogManager().logger().withItemInfo(mDragObject.dragInfo) .log(LAUNCHER_APP_LAUNCH_DRAGDROP); } } } + /** + * Checks whether bubble bar is showing drop target. + * + * @return {@code true} if drop target mode was active. + */ + private boolean isBubbleBarShowingDropTarget() { + return mControllers.bubbleControllers.map( + bc -> bc.bubbleBarViewController.isShowingDropTarget()).orElse(false); + } + @Override protected void endDrag() { - if (mDisallowGlobalDrag) { - // We need to explicitly set deferDragViewCleanupPostAnimation to true here so - // the - // super call doesn't remove it from the drag layer before the animation - // completes. + if (mDisallowGlobalDrag && !mIsDropHandledByDropTarget) { + // We need to explicitly set deferDragViewCleanupPostAnimation to true here so the + // super call doesn't remove it from the drag layer before the animation completes. // This variable gets set in to false in super.dispatchDropComplete() because it - // (rightfully so, perhaps) thinks this drag operation has failed, and does its - // own + // (rightfully so, perhaps) thinks this drag operation has failed, and does its own // internal cleanup. - // Another way to approach this would be to make all of overview a drop target - // and - // accept the drop as successful and then run the setupReturnDragAnimator to - // simulate + // Another way to approach this would be to make all of overview a drop target and + // accept the drop as successful and then run the setupReturnDragAnimator to simulate // drop failure to the user mDragObject.deferDragViewCleanupPostAnimation = true; @@ -577,6 +672,7 @@ public void onAnimationEnd(Animator animation) { mReturnAnimator.start(); } super.endDrag(); + updateIsDragging(); } @Override @@ -585,6 +681,12 @@ protected void callOnDragEnd() { maybeOnDragEnd(); } + private void notifyDragToBubbleController(boolean dragInProgress) { + if (mDragToBubbleController != null) { + mDragToBubbleController.onShellDragStateChanged(dragInProgress); + } + } + private void animateGlobalDragViewToOriginalPosition(BubbleTextView btv, DragEvent dragEvent) { SurfaceControl dragSurface = dragEvent.getDragSurface(); @@ -633,8 +735,7 @@ private void cleanUpSurface() { syncGroup.add(viewRoot, null /* runnable */); syncGroup.addTransaction(transaction); syncGroup.markSyncReady(); - // Do this after maybeOnDragEnd(), because we use mReturnAnimator != null to - // imply + // Do this after maybeOnDragEnd(), because we use mReturnAnimator != null to imply // the drag was canceled rather than successful. mReturnAnimator = null; } @@ -649,14 +750,13 @@ private View findTaskbarTargetForIconView(@NonNull View iconView) { if (tag instanceof ItemInfo) { ItemInfo item = (ItemInfo) tag; if (item.container == CONTAINER_ALL_APPS - || item.container == CONTAINER_PREDICTION + || item.container == CONTAINER_ALL_APPS_PREDICTION || isInSearchResultContainer(item)) { if (mDisallowGlobalDrag) { // We're dragging in taskbarAllApps, we don't have folders or shortcuts return iconView; } - // Since all apps closes when the drag starts, target the all apps button - // instead. + // Since all apps closes when the drag starts, target the all apps button instead. return taskbarViewController.getAllAppsButtonView(); } else if (item.container >= 0) { // Since folders close when the drag starts, target the folder icon instead. @@ -676,7 +776,8 @@ private View findTaskbarTargetForIconView(@NonNull View iconView) { private static boolean isInSearchResultContainer(ItemInfo item) { ContainerInfo containerInfo = item.getContainerInfo(); return containerInfo.getContainerCase() == EXTENDED_CONTAINERS - && containerInfo.getExtendedContainers().getContainerCase() == DEVICE_SEARCH_RESULT_CONTAINER; + && containerInfo.getExtendedContainers().getContainerCase() + == DEVICE_SEARCH_RESULT_CONTAINER; } private void setupReturnDragAnimator(float fromX, float fromY, View originalView, @@ -705,7 +806,6 @@ private void setupReturnDragAnimator(float fromX, float fromY, View originalView final FloatProp mDy = new FloatProp(fromY, toPosition[1], FAST_OUT_SLOW_IN); final FloatProp mScale = new FloatProp(1f, toScale, FAST_OUT_SLOW_IN); final FloatProp mAlpha = new FloatProp(1f, toAlpha, Interpolators.ACCELERATE_2); - @Override public void onUpdate(float percent, boolean initOnly) { animListener.updateDragShadow(mDx.value, mDy.value, mScale.value, mAlpha.value); @@ -719,19 +819,15 @@ public void onUpdate(float percent, boolean initOnly) { @Override protected float getX(MotionEvent ev) { - // We will resize to fill the screen while dragging, so use screen coordinates. - // This ensures - // we start at the correct position even though touch down is on the smaller - // DragLayer size. + // We will resize to fill the screen while dragging, so use screen coordinates. This ensures + // we start at the correct position even though touch down is on the smaller DragLayer size. return ev.getRawX(); } @Override protected float getY(MotionEvent ev) { - // We will resize to fill the screen while dragging, so use screen coordinates. - // This ensures - // we start at the correct position even though touch down is on the smaller - // DragLayer size. + // We will resize to fill the screen while dragging, so use screen coordinates. This ensures + // we start at the correct position even though touch down is on the smaller DragLayer size. return ev.getRawY(); } @@ -751,8 +847,11 @@ protected void exitDrag() { @Override public void addDropTarget(DropTarget target) { - // No-op as Taskbar currently doesn't support any drop targets internally. - // Note: if we do add internal DropTargets, we'll still need to ignore Folder. + if (target instanceof Folder) { + // we need to ignore Folder. + return; + } + super.addDropTarget(target); } @Override diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java index 046bb54419b..8f9147c42c5 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java @@ -18,8 +18,6 @@ import static android.view.KeyEvent.ACTION_UP; import static android.view.KeyEvent.KEYCODE_BACK; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; -import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION; import android.content.Context; import android.graphics.Canvas; @@ -43,7 +41,6 @@ import com.android.launcher3.Utilities; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; -import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; import com.android.launcher3.views.BaseDragLayer; @@ -102,20 +99,16 @@ public TaskbarDragLayer(@NonNull Context context, @Nullable AttributeSet attrs, public TaskbarDragLayer(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, 1 /* alphaChannelCount */); - mBackgroundRenderer = new TaskbarBackgroundRenderer(mActivity); + mBackgroundRenderer = new TaskbarBackgroundRenderer(mContainer); mTaskbarBackgroundAlpha = new MultiPropertyFactory<>(this, BG_ALPHA, INDEX_COUNT, (a, b) -> a * b, 1f); mTaskbarBackgroundAlpha.get(INDEX_ALL_OTHER_STATES).setValue(0); - mTaskbarBackgroundAlpha.get(INDEX_STASH_ANIM).setValue( - enableScalingRevealHomeAnimation() && DisplayController.isTransientTaskbar(context) - ? 0 - : 1); } public void init(TaskbarDragLayerController.TaskbarDragLayerCallbacks callbacks) { mControllerCallbacks = callbacks; - mBackgroundRenderer.updateStashedHandleWidth(mActivity, getResources()); + mBackgroundRenderer.updateStashedHandleWidth(mContainer, getResources()); recreateControllers(); } @@ -133,6 +126,7 @@ public WindowInsets onApplyWindowInsets(WindowInsets insets) { @Override public void recreateControllers() { + super.recreateControllers(); mControllers = mControllerCallbacks.getTouchControllers(); } @@ -149,7 +143,7 @@ protected void onDestroy(boolean forceDestroy) { } protected void onDestroy() { - onDestroy(!ENABLE_TASKBAR_NAVBAR_UNIFICATION); + onDestroy(false /*forceDestroy*/); } @Override @@ -197,6 +191,7 @@ public void onViewRemoved(View child) { @Override protected void dispatchDraw(Canvas canvas) { + if (mContainer.isDestroyed()) return; float backgroundHeight = mControllerCallbacks.getTaskbarBackgroundHeight() * (1f - mTaskbarBackgroundOffset); mBackgroundRenderer.setBackgroundHeight(backgroundHeight); @@ -265,6 +260,11 @@ protected void setBackgroundTranslationYForStash(float translationY) { invalidate(); } + protected void setBackgroundTranslationXForBubbleBar(float translationX) { + mBackgroundRenderer.setTranslationXForBubbleBar(translationX); + invalidate(); + } + /** Returns the bounds in DragLayer coordinates of where the transient background was drawn. */ protected RectF getLastDrawnTransientRect() { return mBackgroundRenderer.getLastDrawnTransientRect(); @@ -273,6 +273,7 @@ protected RectF getLastDrawnTransientRect() { @Override public boolean dispatchTouchEvent(MotionEvent ev) { TestLogging.recordMotionEvent(TestProtocol.SEQUENCE_MAIN, "Touch event", ev); + mControllerCallbacks.onDispatchTouchEvent(ev); return super.dispatchTouchEvent(ev); } @@ -280,7 +281,7 @@ public boolean dispatchTouchEvent(MotionEvent ev) { @Override public boolean dispatchKeyEvent(KeyEvent event) { if (event.getAction() == ACTION_UP && event.getKeyCode() == KEYCODE_BACK) { - AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity); + AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mContainer); if (topView != null && topView.canHandleBack()) { topView.onBackInvoked(); // Handled by the floating view. @@ -290,6 +291,21 @@ public boolean dispatchKeyEvent(KeyEvent event) { return super.dispatchKeyEvent(event); } + /** + * Sets animation boolean when only animating persistent taskbar. + */ + public void setIsAnimatingPersistentTaskbarBackground(boolean animatingPersistentTaskbarBg) { + mBackgroundRenderer.setAnimatingPersistentTaskbar(animatingPersistentTaskbarBg); + } + + /** + * Sets animation boolean when only animating transient taskbar. + */ + public void setIsAnimatingTransientTaskbarBackground(boolean animatingTransientTaskbarBg) { + mBackgroundRenderer.setAnimatingTransientTaskbar(animatingTransientTaskbarBg); + } + + /** * Sets the width percentage to inset the transient taskbar's background from the left and from * the right. diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java index ff890fb18e0..8bd685b3d65 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java @@ -15,21 +15,25 @@ */ package com.android.launcher3.taskbar; +import static com.android.app.animation.Interpolators.EMPHASIZED; import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_PERSISTENT; import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_TRANSIENT; +import android.animation.AnimatorSet; +import android.animation.ObjectAnimator; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Point; import android.graphics.Rect; import android.os.SystemProperties; +import android.view.MotionEvent; import android.view.ViewTreeObserver; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.anim.AnimatedFloat; +import com.android.launcher3.anim.AnimatorListeners; import com.android.launcher3.util.DimensionUtils; -import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; import com.android.launcher3.util.TouchController; @@ -57,6 +61,8 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa private final AnimatedFloat mImeBgTaskbar = new AnimatedFloat(this::updateBackgroundAlpha); private final AnimatedFloat mAssistantBgTaskbar = new AnimatedFloat( this::updateBackgroundAlpha); + private final AnimatedFloat mBgTaskbarRecreate = new AnimatedFloat( + this::updateBackgroundAlpha); // Used to hide our background color when someone else (e.g. ScrimView) is handling it. private final AnimatedFloat mBgOverride = new AnimatedFloat(this::updateBackgroundAlpha); @@ -87,7 +93,10 @@ public TaskbarDragLayerController(TaskbarActivityContext activity, mFolderMargin = resources.getDimensionPixelSize(R.dimen.taskbar_folder_margin); } - public void init(TaskbarControllers controllers) { + /** + * Init of taskbar drag layer controller + */ + public void init(TaskbarControllers controllers, AnimatorSet startAnimation) { mControllers = controllers; mTaskbarStashViaTouchController = new TaskbarStashViaTouchController(mControllers); mTaskbarDragLayer.init(new TaskbarDragLayerCallbacks()); @@ -95,15 +104,43 @@ public void init(TaskbarControllers controllers) { mOnBackgroundNavButtonColorIntensity = mControllers.navbarButtonsViewController .getOnTaskbarBackgroundNavButtonColorOverride(); - mTaskbarBackgroundProgress.updateValue(DisplayController.isTransientTaskbar(mActivity) - ? PINNING_TRANSIENT - : PINNING_PERSISTENT); + + if (startAnimation != null) { + // set taskbar background render animation boolean + if (mActivity.isTransientTaskbar()) { + mTaskbarDragLayer.setIsAnimatingTransientTaskbarBackground(true); + } else { + mTaskbarDragLayer.setIsAnimatingPersistentTaskbarBackground(true); + } + + float desiredValue = mActivity.isTransientTaskbar() + ? PINNING_TRANSIENT + : PINNING_PERSISTENT; + + float nonDesiredvalue = + !mActivity.isTransientTaskbar() ? PINNING_TRANSIENT : PINNING_PERSISTENT; + + ObjectAnimator objectAnimator = mTaskbarBackgroundProgress.animateToValue( + nonDesiredvalue, desiredValue); + objectAnimator.setInterpolator(EMPHASIZED); + startAnimation.play(objectAnimator); + startAnimation.addListener(AnimatorListeners.forEndCallback(()-> { + // reset taskbar background render animation boolean + mTaskbarDragLayer.setIsAnimatingPersistentTaskbarBackground(false); + mTaskbarDragLayer.setIsAnimatingTransientTaskbarBackground(false); + })); + + } else { + mTaskbarBackgroundProgress.updateValue( + mActivity.isTransientTaskbar() ? PINNING_TRANSIENT : PINNING_PERSISTENT); + } mBgTaskbar.value = 1; mKeyguardBgTaskbar.value = 1; mNotificationShadeBgTaskbar.value = 1; mImeBgTaskbar.value = 1; mAssistantBgTaskbar.value = 1; + mBgTaskbarRecreate.value = 1; mBgOverride.value = 1; updateBackgroundAlpha(); @@ -111,6 +148,13 @@ public void init(TaskbarControllers controllers) { updateTaskbarAlpha(); } + /** + * Called when destroying Taskbar with animation. + */ + public void onDestroyAnimation(AnimatorSet animatorSet) { + animatorSet.play(mBgTaskbarRecreate.animateToValue(0f)); + } + public void onDestroy() { mTaskbarDragLayer.onDestroy(); } @@ -119,9 +163,14 @@ public void onDestroy() { * @return Bounds (in TaskbarDragLayer coordinates) where an opened Folder can display. */ public Rect getFolderBoundingBox() { - Rect boundingBox = new Rect(0, 0, mTaskbarDragLayer.getWidth(), - mTaskbarDragLayer.getHeight() - mActivity.getDeviceProfile().taskbarHeight - - mActivity.getDeviceProfile().taskbarBottomMargin); + Rect boundingBox = new Rect( + 0, + 0, + mTaskbarDragLayer.getWidth(), + mTaskbarDragLayer.getHeight() + - mActivity.getDeviceProfile().getTaskbarProfile().getHeight() + - mActivity.getDeviceProfile().getTaskbarProfile().getBottomMargin() + ); boundingBox.inset(mFolderMargin, mFolderMargin); return boundingBox; } @@ -171,10 +220,14 @@ public void onConfigurationChanged() { } private void updateBackgroundAlpha() { + if (!mActivity.drawsTaskbarBackground() || mActivity.isDestroyed()) { + return; + } + final float bgNavbar = mBgNavbar.value; final float bgTaskbar = mBgTaskbar.value * mKeyguardBgTaskbar.value * mNotificationShadeBgTaskbar.value * mImeBgTaskbar.value - * mAssistantBgTaskbar.value; + * mAssistantBgTaskbar.value * mBgTaskbarRecreate.value; mLastSetBackgroundAlpha = mBgOverride.value * Math.max(bgNavbar, bgTaskbar); mBackgroundRendererAlpha.setValue(mLastSetBackgroundAlpha); @@ -192,6 +245,13 @@ public void setTranslationYForSwipe(float transY) { mTaskbarDragLayer.setBackgroundTranslationYForSwipe(transY); } + /** + * Sets the translation of the background for the bubble bar. + */ + public void setTranslationXForBubbleBar(float transX) { + mTaskbarDragLayer.setBackgroundTranslationXForBubbleBar(transX); + } + /** * Sets the translation of the background during the spring on stash animation. */ @@ -254,6 +314,7 @@ public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "\t\tmNotificationShadeBgTaskbar=" + mNotificationShadeBgTaskbar.value); pw.println(prefix + "\t\tmImeBgTaskbar=" + mImeBgTaskbar.value); pw.println(prefix + "\t\tmAssistantBgTaskbar=" + mAssistantBgTaskbar.value); + pw.println(prefix + "\t\tmBgTaskbarRecreate=" + mBgTaskbarRecreate.value); } /** @@ -291,12 +352,12 @@ public int getTaskbarBackgroundHeight() { if (mActivity.isPhoneMode()) { Resources resources = mActivity.getResources(); Point taskbarDimensions = DimensionUtils.getTaskbarPhoneDimensions(deviceProfile, - resources, true /* isPhoneMode */); + resources, true /* isPhoneMode */, mActivity.isGestureNav()); return taskbarDimensions.y == -1 ? deviceProfile.getDisplayInfo().currentSize.y : taskbarDimensions.y; } else { - return deviceProfile.taskbarHeight; + return deviceProfile.getTaskbarProfile().getHeight(); } } @@ -321,5 +382,15 @@ public void drawDebugUi(Canvas canvas) { } mControllers.taskbarInsetsController.drawDebugTouchableRegionBounds(canvas); } + + /** Handles any touch event before it is dispatched to the rest of TaskbarDragLayer. */ + public void onDispatchTouchEvent(MotionEvent ev) { + if (mActivity.isThreeButtonNav() && ev.getAction() == MotionEvent.ACTION_OUTSIDE + && mControllers.uiController.isAnimatingToHotseat()) { + // When touching during animation to home, jump to the end so Hotseat can handle + // the touch. (Gesture Navigation handles this in AbsSwipeUpHandler.) + mControllers.uiController.endAnimationToHotseat(); + } + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt index 5adb25821d3..eb2d1d98d1a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt @@ -29,7 +29,6 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.view.animation.Interpolator import android.window.OnBackInvokedDispatcher import androidx.core.view.updateLayoutParams -import app.lawnchair.theme.color.tokens.ColorTokens import com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE import com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE import com.android.app.animation.Interpolators.STANDARD @@ -40,22 +39,20 @@ import com.android.launcher3.popup.RoundedArrowDrawable import com.android.launcher3.util.Themes import com.android.launcher3.views.ActivityContext +import app.lawnchair.theme.color.tokens.ColorTokens + private const val ENTER_DURATION_MS = 300L private const val EXIT_DURATION_MS = 150L /** Floating tooltip for Taskbar education. */ class TaskbarEduTooltip @JvmOverloads -constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0, -) : AbstractFloatingView(context, attrs, defStyleAttr) { +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + AbstractFloatingView(context, attrs, defStyleAttr) { private val activityContext: ActivityContext = ActivityContext.lookupContext(context) - private val backgroundColor = - ColorTokens.SurfaceBrightColor.resolveColor(getContext()) + private val backgroundColor = ColorTokens.SurfaceBrightColor.resolveColor(getContext()) private val tooltipCornerRadius = Themes.getDialogCornerRadius(context) private val arrowWidth = resources.getDimension(R.dimen.popup_arrow_width) @@ -90,8 +87,8 @@ constructor( // constraint to reduce the number of lines of text and hopefully free up some height. activityContext.dragLayer.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED) if ( - measuredHeight + activityContext.deviceProfile.taskbarHeight >= - activityContext.deviceProfile.availableHeightPx + measuredHeight + activityContext.deviceProfile.taskbarProfile.height >= + activityContext.deviceProfile.deviceProperties.availableHeightPx ) { updateLayoutParams { width = MATCH_PARENT } } @@ -102,8 +99,8 @@ constructor( override fun onFinishInflate() { super.onFinishInflate() - content = requireViewById(R.id.content) - arrow = requireViewById(R.id.arrow) + content = requireViewById(R.id.content) + arrow = requireViewById(R.id.arrow) arrow.background = RoundedArrowDrawable( arrowWidth, @@ -151,6 +148,7 @@ constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() + // Lawnchair-TODO-Merge: This was disabled but enabled in 16r2, this function likely disable the gesture system during edu // findOnBackInvokedDispatcher() // ?.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, this) } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt index d57c4838d7e..4e59b5fda4d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt @@ -15,7 +15,6 @@ */ package com.android.launcher3.taskbar -import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle @@ -33,23 +32,28 @@ import android.view.accessibility.AccessibilityNodeInfo import android.widget.TextView import androidx.annotation.IntDef import androidx.annotation.LayoutRes +import androidx.annotation.VisibleForTesting import androidx.core.text.HtmlCompat import androidx.core.view.updateLayoutParams import com.airbnb.lottie.LottieAnimationView +import com.android.launcher3.Flags.refactorTaskbarUiState import com.android.launcher3.LauncherPrefs import com.android.launcher3.R +import com.android.launcher3.RemoveAnimationSettingsTracker import com.android.launcher3.Utilities import com.android.launcher3.config.FeatureFlags.enableTaskbarPinning import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_EDU_OPEN import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController -import com.android.launcher3.util.DisplayController import com.android.launcher3.util.OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP import com.android.launcher3.util.OnboardingPrefs.TASKBAR_SEARCH_EDU_SEEN -import com.android.launcher3.util.ResourceBasedOverride import com.android.launcher3.views.ActivityContext import com.android.launcher3.views.BaseDragLayer +import com.android.quickstep.util.ContextualSearchInvoker import com.android.quickstep.util.LottieAnimationColorUtils +import com.android.wm.shell.shared.TypefaceUtils +import com.android.wm.shell.shared.TypefaceUtils.FontFamily import java.io.PrintWriter +import javax.inject.Inject /** First EDU step for swiping up to show transient Taskbar. */ const val TOOLTIP_STEP_SWIPE = 0 @@ -75,11 +79,19 @@ private const val TOS_BASE_URL = "https://policies.google.com/terms?hl=" annotation class TaskbarEduTooltipStep /** Controls stepping through the Taskbar tooltip EDU. */ -open class TaskbarEduTooltipController(context: Context) : - ResourceBasedOverride, LoggableTaskbarController { +open class TaskbarEduTooltipController +@Inject +constructor( + activityContext: ActivityContext, + private val removeAnimationSettingsTracker: RemoveAnimationSettingsTracker, +) : LoggableTaskbarController { + + protected val activityContext = activityContext as TaskbarActivityContext + open val shouldShowSearchEdu: Boolean + get() = + ContextualSearchInvoker(activityContext) + .runContextualSearchInvocationChecksAndLogFailures() - protected val activityContext: TaskbarActivityContext = ActivityContext.lookupContext(context) - open val shouldShowSearchEdu = false private val isTooltipEnabled: Boolean get() { return !Utilities.isRunningInTestHarness() && @@ -87,16 +99,18 @@ open class TaskbarEduTooltipController(context: Context) : !activityContext.isTinyTaskbar } - private val isOpen: Boolean + val isTooltipOpen: Boolean get() = tooltip?.isOpen ?: false val isBeforeTooltipFeaturesStep: Boolean get() = isTooltipEnabled && tooltipStep <= TOOLTIP_STEP_FEATURES private lateinit var controllers: TaskbarControllers + private lateinit var taskbarUIState: TaskbarUiState // Keep track of whether the user has seen the Search Edu - private var userHasSeenSearchEdu: Boolean + @VisibleForTesting + var userHasSeenSearchEdu: Boolean get() { return TASKBAR_SEARCH_EDU_SEEN.get(activityContext) } @@ -111,21 +125,55 @@ open class TaskbarEduTooltipController(context: Context) : } private set(step) { TASKBAR_EDU_TOOLTIP_STEP.set(step, activityContext) + updateShouldShowEduOnAppLaunch() } private var tooltip: TaskbarEduTooltip? = null - fun init(controllers: TaskbarControllers) { + fun init(controllers: TaskbarControllers, taskbarUiState: TaskbarUiState) { this.controllers = controllers + this.taskbarUIState = taskbarUiState + updateShouldShowEduOnAppLaunch() // We want to show the Search Edu right after pinning the taskbar, so we post it here activityContext.dragLayer.post { maybeShowSearchEdu() } } + /** + * Should be called whenever [TaskbarUIController], [DeviceProfile] or + * "taskbar_edu_tooltip_step" counter is changed. + */ + fun updateShouldShowEduOnAppLaunch() { + if (!refactorTaskbarUiState()) { + return + } + val uiController = controllers.uiController + if (uiController is LauncherTaskbarUIController) { + taskbarUIState.setShouldShowEduOnAppLaunch(uiController.shouldShowEduOnAppLaunch()) + } + } + + /** + * Turns off auto play of lottie animations if user has opted to remove animation else attaches + * click listener to allow user to play or pause animations. + */ + fun handleEduAnimations(animationViews: List) { + for (animationView in animationViews) { + if (removeAnimationSettingsTracker.isRemoveAnimationEnabled()) { + animationView.pauseAnimation() + } else { + animationView.setOnClickListener { + if (animationView.isAnimating) animationView.pauseAnimation() + else animationView.playAnimation() + } + } + } + } + /** Shows swipe EDU tooltip if it is the current [tooltipStep]. */ fun maybeShowSwipeEdu() { if ( !isTooltipEnabled || - !DisplayController.isTransientTaskbar(activityContext) || + !activityContext.isTransientTaskbar || tooltipStep > TOOLTIP_STEP_SWIPE ) { return @@ -134,7 +182,15 @@ open class TaskbarEduTooltipController(context: Context) : tooltipStep = TOOLTIP_STEP_FEATURES inflateTooltip(R.layout.taskbar_edu_swipe) tooltip?.run { - requireViewById(R.id.swipe_animation).supportLightTheme() + TypefaceUtils.setTypeface( + requireViewById(R.id.taskbar_edu_title), + FontFamily.GSF_HEADLINE_SMALL_EMPHASIZED, + ) + val swipeAnimation = requireViewById(R.id.swipe_animation) + swipeAnimation.contentDescription = + context.getString(R.string.taskbar_edu_swipe_animation_description) + swipeAnimation.supportLightTheme() + handleEduAnimations(listOf(swipeAnimation)) show() } } @@ -157,13 +213,20 @@ open class TaskbarEduTooltipController(context: Context) : tooltip?.run { allowTouchDismissal = false val splitscreenAnim = requireViewById(R.id.splitscreen_animation) + splitscreenAnim.contentDescription = + context.getString(R.string.taskbar_edu_split_screen_animation_description) val suggestionsAnim = requireViewById(R.id.suggestions_animation) + suggestionsAnim.contentDescription = + context.getString(R.string.taskbar_edu_suggested_app_animation_description) val pinningAnim = requireViewById(R.id.pinning_animation) + pinningAnim.contentDescription = + context.getString(R.string.taskbar_edu_pinning_animation_description) val pinningEdu = requireViewById(R.id.pinning_edu) splitscreenAnim.supportLightTheme() suggestionsAnim.supportLightTheme() pinningAnim.supportLightTheme() - if (DisplayController.isTransientTaskbar(activityContext)) { + handleEduAnimations(listOf(splitscreenAnim, suggestionsAnim, pinningAnim)) + if (activityContext.isTransientTaskbar) { splitscreenAnim.setAnimation(R.raw.taskbar_edu_splitscreen_transient) suggestionsAnim.setAnimation(R.raw.taskbar_edu_suggestions_transient) pinningEdu.visibility = if (enableTaskbarPinning()) VISIBLE else GONE @@ -173,10 +236,27 @@ open class TaskbarEduTooltipController(context: Context) : pinningEdu.visibility = GONE } + TypefaceUtils.setTypeface( + requireViewById(R.id.taskbar_edu_title), + FontFamily.GSF_HEADLINE_SMALL_EMPHASIZED, + ) + TypefaceUtils.setTypeface( + requireViewById(R.id.splitscreen_text), + FontFamily.GSF_BODY_MEDIUM, + ) + TypefaceUtils.setTypeface( + requireViewById(R.id.suggestions_text), + FontFamily.GSF_BODY_MEDIUM, + ) + TypefaceUtils.setTypeface( + requireViewById(R.id.pinning_text), + FontFamily.GSF_BODY_MEDIUM, + ) + // Set up layout parameters. content.updateLayoutParams { width = MATCH_PARENT } updateLayoutParams { - if (DisplayController.isTransientTaskbar(activityContext)) { + if (activityContext.isTransientTaskbar) { width = resources.getDimensionPixelSize( if (enableTaskbarPinning()) @@ -184,7 +264,7 @@ open class TaskbarEduTooltipController(context: Context) : else R.dimen.taskbar_edu_features_tooltip_width_with_two_features ) - bottomMargin += activityContext.deviceProfile.taskbarHeight + bottomMargin += activityContext.deviceProfile.taskbarProfile.height } else { width = resources.getDimensionPixelSize( @@ -209,7 +289,7 @@ open class TaskbarEduTooltipController(context: Context) : // for the original 2 edu steps) as a proxy to needing to show the separate pinning edu if ( !enableTaskbarPinning() || - !DisplayController.isTransientTaskbar(activityContext) || + !activityContext.isTransientTaskbar || !isTooltipEnabled || tooltipStep > TOOLTIP_STEP_PINNING || tooltipStep < TOOLTIP_STEP_FEATURES @@ -221,12 +301,24 @@ open class TaskbarEduTooltipController(context: Context) : tooltip?.run { allowTouchDismissal = true - requireViewById(R.id.standalone_pinning_animation) - .supportLightTheme() + TypefaceUtils.setTypeface( + requireViewById(R.id.taskbar_edu_title), + FontFamily.GSF_HEADLINE_SMALL_EMPHASIZED, + ) + TypefaceUtils.setTypeface( + requireViewById(R.id.pinning_text), + FontFamily.GSF_BODY_MEDIUM, + ) + val pinningAnim = + requireViewById(R.id.standalone_pinning_animation) + pinningAnim.contentDescription = + context.getString(R.string.taskbar_edu_pinning_animation_description) + pinningAnim.supportLightTheme() + handleEduAnimations(listOf(pinningAnim)) updateLayoutParams { - if (DisplayController.isTransientTaskbar(activityContext)) { - bottomMargin += activityContext.deviceProfile.taskbarHeight + if (activityContext.isTransientTaskbar) { + bottomMargin += activityContext.deviceProfile.taskbarProfile.height } // Unlike other tooltips, we want to align with taskbar divider rather than center. gravity = Gravity.BOTTOM @@ -255,10 +347,11 @@ open class TaskbarEduTooltipController(context: Context) : fun maybeShowSearchEdu() { if ( !enableTaskbarPinning() || - !DisplayController.isPinnedTaskbar(activityContext) || + !activityContext.isPinnedTaskbar || !isTooltipEnabled || !shouldShowSearchEdu || - userHasSeenSearchEdu + userHasSeenSearchEdu || + !controllers.taskbarStashController.isTaskbarVisibleAndNotStashing ) { return } @@ -266,12 +359,23 @@ open class TaskbarEduTooltipController(context: Context) : inflateTooltip(R.layout.taskbar_edu_search) tooltip?.run { allowTouchDismissal = true - requireViewById(R.id.search_edu_animation).supportLightTheme() + val searchEdu = requireViewById(R.id.search_edu_animation) + searchEdu.contentDescription = + context.getString(R.string.taskbar_edu_suggested_search_animation_description) + searchEdu.supportLightTheme() + handleEduAnimations(listOf(searchEdu)) val eduSubtitle: TextView = requireViewById(R.id.search_edu_text) + + TypefaceUtils.setTypeface( + requireViewById(R.id.taskbar_edu_title), + FontFamily.GSF_HEADLINE_SMALL_EMPHASIZED, + ) + TypefaceUtils.setTypeface(eduSubtitle, FontFamily.GSF_BODY_SMALL) + showDisclosureText(eduSubtitle) updateLayoutParams { - if (DisplayController.isTransientTaskbar(activityContext)) { - bottomMargin += activityContext.deviceProfile.taskbarHeight + if (activityContext.isTransientTaskbar) { + bottomMargin += activityContext.deviceProfile.taskbarProfile.height } // Unlike other tooltips, we want to align with the all apps button rather than // center. @@ -349,19 +453,19 @@ open class TaskbarEduTooltipController(context: Context) : overlayContext.layoutInflater.inflate( R.layout.taskbar_edu_tooltip, overlayContext.dragLayer, - false + false, ) as TaskbarEduTooltip controllers.taskbarAutohideSuspendController.updateFlag( FLAG_AUTOHIDE_SUSPEND_EDU_OPEN, - true + true, ) tooltip.onCloseCallback = { this.tooltip = null controllers.taskbarAutohideSuspendController.updateFlag( FLAG_AUTOHIDE_SUSPEND_EDU_OPEN, - false + false, ) controllers.taskbarStashController.updateAndAnimateTransientTaskbar(true) } @@ -376,7 +480,7 @@ open class TaskbarEduTooltipController(context: Context) : override fun performAccessibilityAction( host: View, action: Int, - args: Bundle? + args: Bundle?, ): Boolean { if (action == R.id.close) { hide() @@ -394,13 +498,13 @@ open class TaskbarEduTooltipController(context: Context) : override fun onInitializeAccessibilityNodeInfo( host: View, - info: AccessibilityNodeInfo + info: AccessibilityNodeInfo, ) { super.onInitializeAccessibilityNodeInfo(host, info) info.addAction( AccessibilityNodeInfo.AccessibilityAction( R.id.close, - host.context?.getText(R.string.taskbar_edu_close) + host.context?.getText(R.string.taskbar_edu_close), ) ) } @@ -409,19 +513,14 @@ open class TaskbarEduTooltipController(context: Context) : override fun dumpLogs(prefix: String?, pw: PrintWriter?) { pw?.println(prefix + "TaskbarEduTooltipController:") pw?.println("$prefix\tisTooltipEnabled=$isTooltipEnabled") - pw?.println("$prefix\tisOpen=$isOpen") + pw?.println("$prefix\tisOpen=$isTooltipOpen") pw?.println("$prefix\ttooltipStep=$tooltipStep") } companion object { @JvmStatic - fun newInstance(context: Context): TaskbarEduTooltipController { - return ResourceBasedOverride.Overrides.getObject( - TaskbarEduTooltipController::class.java, - context, - R.string.taskbar_edu_tooltip_controller_class - ) - } + fun newInstance(activityContext: ActivityContext): TaskbarEduTooltipController = + activityContext.activityComponent.createTaskbarEduTooltipController() } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarForceVisibleImmersiveController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarForceVisibleImmersiveController.java index 6ac862e9e04..b7f55756c12 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarForceVisibleImmersiveController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarForceVisibleImmersiveController.java @@ -85,6 +85,9 @@ public void init(TaskbarControllers controllers) { /** Update values tracked via sysui flags. */ public void updateSysuiFlags(@SystemUiStateFlags long sysuiFlags) { + if (mContext.isPhoneMode()) { + return; + } mIsImmersiveMode = (sysuiFlags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) == 0; if (mContext.isNavBarForceVisible()) { if (mIsImmersiveMode) { @@ -105,8 +108,10 @@ public void updateSysuiFlags(@SystemUiStateFlags long sysuiFlags) { /** Clean up animations. */ public void onDestroy() { startIconUndimming(); - mControllers.navbarButtonsViewController.setHomeButtonAccessibilityDelegate(null); - mControllers.navbarButtonsViewController.setBackButtonAccessibilityDelegate(null); + if (mControllers != null) { + mControllers.navbarButtonsViewController.setHomeButtonAccessibilityDelegate(null); + mControllers.navbarButtonsViewController.setBackButtonAccessibilityDelegate(null); + } } private void startIconUndimming() { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHoverToolTipController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHoverToolTipController.java index 044319796e1..42ad5b2aa12 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarHoverToolTipController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHoverToolTipController.java @@ -18,29 +18,24 @@ import static android.view.MotionEvent.ACTION_HOVER_ENTER; import static android.view.MotionEvent.ACTION_HOVER_EXIT; import static android.view.View.ALPHA; -import static android.view.View.SCALE_Y; -import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_TEXT; -import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_EXCEPT_ON_BOARD_POPUP; +import static com.android.launcher3.AbstractFloatingView.TYPE_ACTION_POPUP; +import static com.android.launcher3.AbstractFloatingView.TYPE_FOLDER; import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS; -import static com.android.launcher3.views.ArrowTipView.TEXT_ALPHA; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.graphics.Rect; -import android.os.Handler; -import android.os.Looper; +import android.text.TextUtils; import android.view.ContextThemeWrapper; import android.view.MotionEvent; import android.view.View; -import com.android.app.animation.Interpolators; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BubbleTextView; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.compat.AccessibilityManagerCompat; +import com.android.launcher3.apppairs.AppPairIcon; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.views.ArrowTipView; @@ -48,19 +43,15 @@ * Controls showing a tooltip in the taskbar above each icon when it is hovered. */ public class TaskbarHoverToolTipController implements View.OnHoverListener { - - private static final int HOVER_TOOL_TIP_REVEAL_DURATION = 250; - private static final int HOVER_TOOL_TIP_EXIT_DURATION = 150; - - private final Handler mHoverToolTipHandler = new Handler(Looper.getMainLooper()); - private final Runnable mRevealHoverToolTipRunnable = this::revealHoverToolTip; - private final Runnable mHideHoverToolTipRunnable = this::hideHoverToolTip; + // Short duration to reveal tooltip, as it is positioned in the x/y via a post() call in + // parallel with the open animation. An instant animation could show in the wrong location. + private static final int HOVER_TOOL_TIP_REVEAL_DURATION = 15; private final TaskbarActivityContext mActivity; private final TaskbarView mTaskbarView; private final View mHoverView; private final ArrowTipView mHoverToolTipView; - private final String mToolTipText; + private final int mYOffset; public TaskbarHoverToolTipController(TaskbarActivityContext activity, TaskbarView taskbarView, View hoverView) { @@ -68,15 +59,6 @@ public TaskbarHoverToolTipController(TaskbarActivityContext activity, TaskbarVie mTaskbarView = taskbarView; mHoverView = hoverView; - if (mHoverView instanceof BubbleTextView) { - mToolTipText = ((BubbleTextView) mHoverView).getText().toString(); - } else if (mHoverView instanceof FolderIcon - && ((FolderIcon) mHoverView).mInfo.title != null) { - mToolTipText = ((FolderIcon) mHoverView).mInfo.title.toString(); - } else { - mToolTipText = null; - } - ContextThemeWrapper arrowContextWrapper = new ContextThemeWrapper(mActivity, R.style.ArrowTipTaskbarStyle); mHoverToolTipView = new ArrowTipView(arrowContextWrapper, /* isPointingUp = */ false, @@ -87,90 +69,75 @@ public TaskbarHoverToolTipController(TaskbarActivityContext activity, TaskbarVie R.dimen.taskbar_tooltip_horizontal_padding); mHoverToolTipView.findViewById(R.id.text).setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding); - - AnimatorSet hoverCloseAnimator = new AnimatorSet(); - ObjectAnimator textCloseAnimator = ObjectAnimator.ofInt(mHoverToolTipView, TEXT_ALPHA, 0); - textCloseAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0, 0.33f)); - ObjectAnimator alphaCloseAnimator = ObjectAnimator.ofFloat(mHoverToolTipView, ALPHA, 0); - alphaCloseAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0.33f, 0.66f)); - ObjectAnimator scaleCloseAnimator = ObjectAnimator.ofFloat(mHoverToolTipView, SCALE_Y, 0); - scaleCloseAnimator.setInterpolator(Interpolators.STANDARD); - hoverCloseAnimator.playTogether( - textCloseAnimator, - alphaCloseAnimator, - scaleCloseAnimator); - hoverCloseAnimator.setStartDelay(0); - hoverCloseAnimator.setDuration(HOVER_TOOL_TIP_EXIT_DURATION); - mHoverToolTipView.setCustomCloseAnimation(hoverCloseAnimator); + mHoverToolTipView.setAlpha(0); + mYOffset = arrowContextWrapper.getResources().getDimensionPixelSize( + R.dimen.taskbar_tooltip_y_offset); AnimatorSet hoverOpenAnimator = new AnimatorSet(); - ObjectAnimator textOpenAnimator = - ObjectAnimator.ofInt(mHoverToolTipView, TEXT_ALPHA, 0, 255); - textOpenAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0.15f, 0.75f)); - ObjectAnimator scaleOpenAnimator = - ObjectAnimator.ofFloat(mHoverToolTipView, SCALE_Y, 0f, 1f); - scaleOpenAnimator.setInterpolator(Interpolators.EMPHASIZED); ObjectAnimator alphaOpenAnimator = ObjectAnimator.ofFloat(mHoverToolTipView, ALPHA, 0f, 1f); - alphaOpenAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0f, 0.33f)); - hoverOpenAnimator.playTogether( - scaleOpenAnimator, - textOpenAnimator, - alphaOpenAnimator); + hoverOpenAnimator.play(alphaOpenAnimator); hoverOpenAnimator.setDuration(HOVER_TOOL_TIP_REVEAL_DURATION); mHoverToolTipView.setCustomOpenAnimation(hoverOpenAnimator); mHoverToolTipView.addOnLayoutChangeListener( (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { mHoverToolTipView.setPivotY(bottom); - mHoverToolTipView.setY(mTaskbarView.getTop() - (bottom - top)); + mHoverToolTipView.setY(mTaskbarView.getTop() - mYOffset - (bottom - top)); }); } @Override public boolean onHover(View v, MotionEvent event) { - boolean isAnyOtherFloatingViewOpen = - AbstractFloatingView.hasOpenView(mActivity, TYPE_ALL_EXCEPT_ON_BOARD_POPUP); - if (isAnyOtherFloatingViewOpen) { - mHoverToolTipHandler.removeCallbacksAndMessages(null); - } // If hover leaves a taskbar icon animate the tooltip closed. if (event.getAction() == ACTION_HOVER_EXIT) { - startHideHoverToolTip(); + mHoverToolTipView.close(/* animate= */ false); mActivity.setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, false); - return true; - } else if (!isAnyOtherFloatingViewOpen && event.getAction() == ACTION_HOVER_ENTER) { - // If hovering above a taskbar icon starts, animate the tooltip open. Do not - // reveal if any floating views such as folders or edu pop-ups are open. - startRevealHoverToolTip(); + } else if (event.getAction() == ACTION_HOVER_ENTER) { + maybeRevealHoverToolTip(); mActivity.setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, true); - return true; } return false; } - private void startRevealHoverToolTip() { - mHoverToolTipHandler.post(mRevealHoverToolTipRunnable); - } + private void maybeRevealHoverToolTip() { + if (mHoverView == null) { + return; + } - private void revealHoverToolTip() { - if (mHoverView == null || mToolTipText == null) { + final String toolTipText = getToolTipText(); + if (TextUtils.isEmpty(toolTipText)) { + return; + } + + // Do not show tooltip if taskbar icons are transitioning to hotseat. + if (mActivity.isIconAlignedWithHotseat()) { return; } if (mHoverView instanceof FolderIcon && !((FolderIcon) mHoverView).getIconVisible()) { return; } - Rect iconViewBounds = Utilities.getViewBounds(mHoverView); - mHoverToolTipView.showAtLocation(mToolTipText, iconViewBounds.centerX(), - mTaskbarView.getTop(), /* shouldAutoClose= */ false); - } + // Do not reveal if floating views such as folders or app pop-ups are open, + // as these views will overlap and not look great. + if (AbstractFloatingView.hasOpenView(mActivity, TYPE_FOLDER | TYPE_ACTION_POPUP)) { + return; + } - private void startHideHoverToolTip() { - int accessibilityHideTimeout = AccessibilityManagerCompat.getRecommendedTimeoutMillis( - mActivity, /* originalTimeout= */ 0, FLAG_CONTENT_TEXT); - mHoverToolTipHandler.postDelayed(mHideHoverToolTipRunnable, accessibilityHideTimeout); + Rect iconViewBounds = Utilities.getViewBounds(mHoverView); + mHoverToolTipView.showAtLocation(toolTipText, iconViewBounds.centerX(), + mTaskbarView.getTop() - mYOffset, /* shouldAutoClose= */ false); } - private void hideHoverToolTip() { - mHoverToolTipView.close(/* animate = */ true); + private String getToolTipText() { + if (mHoverView instanceof BubbleTextView btv) { + return btv.getText().toString(); + } else if (mHoverView instanceof FolderIcon icon && icon.mInfo.title != null) { + return icon.mInfo.title.toString(); + } else if (mHoverView instanceof AppPairIcon icon) { + return icon.getTitleTextView().getText().toString(); + } else if (mHoverView instanceof TaskbarOverflowView icon) { + return icon.getTextForTooltipPopup(); + } else { + return null; + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt index 01eeb082d51..fc9e5e38a84 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt @@ -21,7 +21,6 @@ import android.graphics.Insets import android.graphics.Paint import android.graphics.Rect import android.graphics.Region -import android.inputmethodservice.InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR import android.os.Binder import android.os.IBinder import android.view.DisplayInfo @@ -33,30 +32,36 @@ import android.view.InsetsSource.FLAG_INSETS_ROUNDED_CORNER import android.view.InsetsSource.FLAG_SUPPRESS_SCRIM import android.view.Surface import android.view.ViewTreeObserver +import android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT import android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME import android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION +import android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_VISIBLE import android.view.WindowInsets import android.view.WindowInsets.Type.mandatorySystemGestures import android.view.WindowInsets.Type.navigationBars import android.view.WindowInsets.Type.systemGestures import android.view.WindowInsets.Type.tappableElement import android.view.WindowManager -import android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD import android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION +import androidx.annotation.VisibleForTesting import androidx.core.graphics.toRegion + import com.android.internal.policy.GestureNavigationSettingsObserver import com.android.launcher3.DeviceProfile -import com.android.launcher3.R import com.android.launcher3.anim.AlphaUpdateListener -import com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION -import com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.DEFAULT_TOUCH_REGION +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.DRAG_LAYER_INVISIBLE +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.FULLSCREEN_TASKBAR_WINDOW +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.ICONS_INVISIBLE +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.PHONE_MODE +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.SYSTEM_DRAG_IN_PROGRESS +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.TRANSIENT_IN_OVERVIEW +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.UI_CONTROLLER_UNTOUCHABLE import com.android.launcher3.testing.shared.ResourceUtils -import com.android.launcher3.util.DisplayController import com.android.launcher3.util.Executors import java.io.PrintWriter import kotlin.jvm.optionals.getOrNull -import kotlin.math.max /** Handles the insets that Taskbar provides to underlying apps and the IME. */ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTaskbarController { @@ -64,11 +69,13 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas companion object { private const val INDEX_LEFT = 0 private const val INDEX_RIGHT = 1 - const val FLAG_INSETS_ROUNDED_CORNER = 1 shl 1 + private const val TAG = "TaskbarInsetsController" + + private fun Region.addBoundsToRegion(bounds: Rect?) { + bounds?.let { op(it, Region.Op.UNION) } + } } - /** The bottom insets taskbar provides to the IME when IME is visible. */ - val taskbarHeightForIme: Int = context.resources.getDimensionPixelSize(R.dimen.taskbar_ime_size) // The touchableRegion we will set unless some other state takes precedence. private val defaultTouchableRegion: Region = Region() private val insetsOwner: IBinder = Binder() @@ -80,9 +87,9 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas context.mainThreadHandler, Executors.UI_HELPER_EXECUTOR.handler, context, - this::onTaskbarOrBubblebarWindowHeightOrInsetsChanged + this::onTaskbarOrBubblebarWindowHeightOrInsetsChanged, ) - private val debugTouchableRegion = DebugTouchableRegion() + @VisibleForTesting val debugTouchableRegion = DebugTouchableRegion() // Initialized in init. private lateinit var controllers: TaskbarControllers @@ -94,11 +101,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas onTaskbarOrBubblebarWindowHeightOrInsetsChanged() context.addOnDeviceProfileChangeListener(deviceProfileChangeListener) - try { - gestureNavSettingsObserver.registerForCallingUser() - } catch (t: Throwable) { - // Ignore - } + gestureNavSettingsObserver.registerForCallingUser() } fun onDestroy() { @@ -107,89 +110,80 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas } fun onTaskbarOrBubblebarWindowHeightOrInsetsChanged() { - val tappableHeight = controllers.taskbarStashController.tappableHeightToReportToApps - // We only report tappableElement height for unstashed, persistent taskbar, - // which is also when we draw the rounded corners above taskbar. - val insetsRoundedCornerFlag = - if (tappableHeight > 0) { - FLAG_INSETS_ROUNDED_CORNER - } else { - 0 - } + val taskbarStashController = controllers.taskbarStashController + val tappableHeight = taskbarStashController.tappableHeightToReportToApps + // We only report tappableElement height for unstashed, persistent taskbar, + // which is also when we draw the rounded corners above taskbar on tablets. + val insetsRoundedCornerFlag = + if (tappableHeight > 0 && context.drawsTaskbarBackground()) { + FLAG_INSETS_ROUNDED_CORNER + } else { + 0 + } - windowLayoutParams.providedInsets = - if (enableTaskbarNoRecreate() && controllers.sharedState != null) { - getProvidedInsets( - controllers.sharedState!!.insetsFrameProviders, - insetsRoundedCornerFlag - ) - } else { - getProvidedInsets(insetsRoundedCornerFlag) - } + windowLayoutParams.providedInsets = + if (controllers.sharedState != null) { + getProvidedInsets( + controllers.sharedState!!.insetsFrameProviders, + insetsRoundedCornerFlag, + ) + } else { + getProvidedInsets(insetsRoundedCornerFlag) + } - if (windowLayoutParams.paramsForRotation != null) { - for (layoutParams in windowLayoutParams.paramsForRotation) { - layoutParams.providedInsets = getProvidedInsets(insetsRoundedCornerFlag) + if (windowLayoutParams.paramsForRotation != null) { + for (layoutParams in windowLayoutParams.paramsForRotation) { + layoutParams.providedInsets = getProvidedInsets(insetsRoundedCornerFlag) + } } - } - val taskbarTouchableHeight = controllers.taskbarStashController.touchableHeight - val bubblesTouchableHeight = - if (controllers.bubbleControllers.isPresent) { - controllers.bubbleControllers.get().bubbleStashController.touchableHeight - } else { - 0 + val bubbleControllers = controllers.bubbleControllers.getOrNull() + val taskbarTouchableHeight = taskbarStashController.touchableHeight + val bubblesTouchableHeight = + bubbleControllers?.bubbleStashController?.getTouchableHeight() ?: 0 + // reset touch bounds + defaultTouchableRegion.setEmpty() + if (bubbleControllers != null) { + val bubbleBarViewController = bubbleControllers.bubbleBarViewController + val isBubbleBarVisible = + bubbleControllers.bubbleStashController.isBubbleBarVisible() + val isAnimatingNewBubble = bubbleBarViewController.isAnimatingNewBubble + // if bubble bar is visible or animating new bubble, add bar bounds to the touch + // region + if (isBubbleBarVisible || isAnimatingNewBubble) { + defaultTouchableRegion.addBoundsToRegion( + bubbleBarViewController.bubbleBarBounds + ) + defaultTouchableRegion.addBoundsToRegion(bubbleBarViewController.flyoutBounds) + } } - val touchableHeight = max(taskbarTouchableHeight, bubblesTouchableHeight) - - if ( - controllers.bubbleControllers.isPresent && - controllers.bubbleControllers.get().bubbleStashController.isBubblesShowingOnHome - ) { - val iconBounds = - controllers.bubbleControllers.get().bubbleBarViewController.bubbleBarBounds - defaultTouchableRegion.set( - iconBounds.left, - iconBounds.top, - iconBounds.right, - iconBounds.bottom - ) - } else { - defaultTouchableRegion.set( - 0, - windowLayoutParams.height - touchableHeight, - context.deviceProfile.widthPx, - windowLayoutParams.height - ) - - // if there's an animating bubble add it to the touch region so that it's clickable - val isAnimatingNewBubble = - controllers.bubbleControllers - .getOrNull() - ?.bubbleBarViewController - ?.isAnimatingNewBubble - ?: false - if (isAnimatingNewBubble) { - val iconBounds = - controllers.bubbleControllers.get().bubbleBarViewController.bubbleBarBounds - defaultTouchableRegion.op(iconBounds, Region.Op.UNION) + if ( + taskbarStashController.isInApp || + controllers.uiController.isInOverviewUi || + context.showLockedTaskbarOnHome() + ) { + // only add the taskbar touch region if not on home + val bottom = windowLayoutParams.height + val top = bottom - taskbarTouchableHeight + val right = context.deviceProfile.deviceProperties.widthPx + defaultTouchableRegion.addBoundsToRegion(Rect(/* left= */ 0, top, right, bottom)) } - } - // Pre-calculate insets for different providers across different rotations for this gravity - for (rotation in Surface.ROTATION_0..Surface.ROTATION_270) { - // Add insets for navbar rotated params - val layoutParams = windowLayoutParams.paramsForRotation[rotation] - for (provider in layoutParams.providedInsets) { - setProviderInsets(provider, layoutParams.gravity, rotation) + // Pre-calculate insets for different providers across different rotations for this + // gravity + for (rotation in Surface.ROTATION_0..Surface.ROTATION_270) { + // Add insets for navbar rotated params + val layoutParams = windowLayoutParams.paramsForRotation[rotation] + for (provider in layoutParams.providedInsets) { + setProviderInsets(provider, layoutParams.gravity, rotation) + } } + // Also set the parent providers (i.e. not in paramsForRotation). + for (provider in windowLayoutParams.providedInsets) { + setProviderInsets(provider, windowLayoutParams.gravity, context.display.rotation) + } + context.notifyUpdateLayoutParams() } - // Also set the parent providers (i.e. not in paramsForRotation). - for (provider in windowLayoutParams.providedInsets) { - setProviderInsets(provider, windowLayoutParams.gravity, context.display.rotation) - } - context.notifyUpdateLayoutParams() - } /** * This is for when ENABLE_TASKBAR_NO_RECREATION is enabled. We generate one instance of @@ -198,10 +192,11 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas */ private fun getProvidedInsets( providedInsets: Array, - insetsRoundedCornerFlag: Int + insetsRoundedCornerFlag: Int, ): Array { val navBarsFlag = - (if (context.isGestureNav) FLAG_SUPPRESS_SCRIM else 0) or insetsRoundedCornerFlag + (if (context.isGestureNav || !context.isPrimaryDisplay) FLAG_SUPPRESS_SCRIM else 0) or + insetsRoundedCornerFlag for (provider in providedInsets) { if (provider.type == navigationBars()) { provider.setFlags(navBarsFlag, FLAG_SUPPRESS_SCRIM or FLAG_INSETS_ROUNDED_CORNER) @@ -218,20 +213,21 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas */ private fun getProvidedInsets(insetsRoundedCornerFlag: Int): Array { val navBarsFlag = - (if (context.isGestureNav) FLAG_SUPPRESS_SCRIM or FLAG_ANIMATE_RESIZING else 0) or - insetsRoundedCornerFlag + (if (context.isGestureNav || !context.isPrimaryDisplay) + FLAG_SUPPRESS_SCRIM or FLAG_ANIMATE_RESIZING + else 0) or insetsRoundedCornerFlag return arrayOf( InsetsFrameProvider(insetsOwner, 0, navigationBars()) .setFlags( navBarsFlag, - FLAG_SUPPRESS_SCRIM or FLAG_ANIMATE_RESIZING or FLAG_INSETS_ROUNDED_CORNER + FLAG_SUPPRESS_SCRIM or FLAG_ANIMATE_RESIZING or FLAG_INSETS_ROUNDED_CORNER, ), InsetsFrameProvider(insetsOwner, 0, tappableElement()), InsetsFrameProvider(insetsOwner, 0, mandatorySystemGestures()), InsetsFrameProvider(insetsOwner, INDEX_LEFT, systemGestures()) .setSource(SOURCE_DISPLAY), InsetsFrameProvider(insetsOwner, INDEX_RIGHT, systemGestures()) - .setSource(SOURCE_DISPLAY) + .setSource(SOURCE_DISPLAY), ) } @@ -243,20 +239,19 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas provider.insetsSize = getInsetsForGravityWithCutout(contentHeight, gravity, endRotation) } else if (provider.type == mandatorySystemGestures()) { if (context.isThreeButtonNav) { - provider.insetsSize = getInsetsForGravityWithCutout(contentHeight, gravity, - endRotation) + provider.insetsSize = + getInsetsForGravityWithCutout(contentHeight, gravity, endRotation) } else { val gestureHeight = - ResourceUtils.getNavbarSize( + ResourceUtils.getNavbarSize( ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, - context.resources) - val isPinnedTaskbar = context.deviceProfile.isTaskbarPresent - && !context.deviceProfile.isTransientTaskbar - val mandatoryGestureHeight = - if (isPinnedTaskbar) contentHeight - else gestureHeight - provider.insetsSize = getInsetsForGravityWithCutout(mandatoryGestureHeight, gravity, - endRotation) + context.resources, + ) + val isPinnedTaskbar = + context.deviceProfile.isTaskbarPresent && !context.isTransientTaskbar + val mandatoryGestureHeight = if (isPinnedTaskbar) contentHeight else gestureHeight + provider.insetsSize = + getInsetsForGravityWithCutout(mandatoryGestureHeight, gravity, endRotation) } } else if (provider.type == tappableElement()) { provider.insetsSize = getInsetsForGravity(tappableHeight, gravity) @@ -272,46 +267,19 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas provider.insetsSize = Insets.of(0, 0, rightIndexInset, 0) } - // When in gesture nav, report the stashed height to the IME, to allow hiding the - // IME navigation bar. - val imeInsetsSize = - if (ENABLE_HIDE_IME_CAPTION_BAR && context.isGestureNav) { - getInsetsForGravity(controllers.taskbarStashController.stashedHeight, gravity) - } else { - getInsetsForGravity(taskbarHeightForIme, gravity) - } - val imeInsetsSizeOverride = - arrayOf( - InsetsFrameProvider.InsetsSizeOverride(TYPE_INPUT_METHOD, imeInsetsSize), - InsetsFrameProvider.InsetsSizeOverride( - TYPE_VOICE_INTERACTION, - // No-op override to keep the size and types in sync with the - // override below (insetsSizeOverrides must have the same length and - // types after the window is added according to - // WindowManagerService#relayoutWindow) - provider.insetsSize - ) - ) // Use 0 tappableElement insets for the VoiceInteractionWindow when gesture nav is enabled. val visInsetsSizeForTappableElement = if (context.isGestureNav) getInsetsForGravity(0, gravity) else getInsetsForGravity(tappableHeight, gravity) val insetsSizeOverrideForTappableElement = arrayOf( - InsetsFrameProvider.InsetsSizeOverride(TYPE_INPUT_METHOD, imeInsetsSize), InsetsFrameProvider.InsetsSizeOverride( TYPE_VOICE_INTERACTION, - visInsetsSizeForTappableElement - ), + visInsetsSizeForTappableElement, + ) ) - if ( - (context.isGestureNav || ENABLE_TASKBAR_NAVBAR_UNIFICATION) && - provider.type == tappableElement() - ) { + if (provider.type == tappableElement()) { provider.insetsSizeOverrides = insetsSizeOverrideForTappableElement - } else if (provider.type != systemGestures()) { - // We only override insets at the bottom of the screen - provider.insetsSizeOverrides = imeInsetsSizeOverride } } @@ -362,60 +330,52 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas * @see ViewTreeObserver.InternalInsetsInfo.setTouchableInsets */ fun updateInsetsTouchability(insetsInfo: ViewTreeObserver.InternalInsetsInfo) { + val isImeVisible = controllers.navbarButtonsViewController.isImeVisible + /** Whether bubble bar bounds should be included in the touchable region. */ + fun includeBubbleBarBounds(): Boolean { + if (isImeVisible) return false + val bubbleControllers = controllers.bubbleControllers.getOrNull() ?: return false + if (bubbleControllers.bubbleBarViewController.isAnimatingNewBubble) return true + val bubbleBarVisible = bubbleControllers.bubbleStashController.isBubbleBarVisible() + val dragging = bubbleControllers.dragToBubbleController.isDragInProgress + return bubbleBarVisible && !dragging + } + insetsInfo.touchableRegion.setEmpty() - // Always have nav buttons be touchable - controllers.navbarButtonsViewController.addVisibleButtonsRegion( - context.dragLayer, - insetsInfo.touchableRegion - ) - debugTouchableRegion.lastSetTouchableBounds.set(insetsInfo.touchableRegion.bounds) + val touchableInsets: Int - val bubbleBarVisible = - controllers.bubbleControllers.isPresent && - controllers.bubbleControllers.get().bubbleBarViewController.isBubbleBarVisible() - var insetsIsTouchableRegion = true + // Prevents the taskbar from taking touches and conflicting with setup wizard if ( context.isPhoneButtonNavMode && - (!controllers.navbarButtonsViewController.isImeVisible || - !controllers.navbarButtonsViewController.isImeRenderingNavButtons) + context.isUserSetupComplete && + (!isImeVisible || !controllers.navbarButtonsViewController.isImeRenderingNavButtons) ) { - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME) - insetsIsTouchableRegion = false + touchableInsets = TOUCHABLE_INSETS_FRAME + debugTouchableRegion.lastSetTouchableReason = PHONE_MODE } else if (context.dragLayer.alpha < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) { // Let touches pass through us. - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION) - debugTouchableRegion.lastSetTouchableReason = "Taskbar is invisible" - } else if ( - controllers.navbarButtonsViewController.isImeVisible && - controllers.taskbarStashController.isStashed - ) { - // Let touches pass through us. - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION) - debugTouchableRegion.lastSetTouchableReason = "Stashed over IME" + touchableInsets = TOUCHABLE_INSETS_REGION + debugTouchableRegion.lastSetTouchableReason = DRAG_LAYER_INVISIBLE } else if (!controllers.uiController.isTaskbarTouchable) { // Let touches pass through us. - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION) - debugTouchableRegion.lastSetTouchableReason = "Taskbar is not touchable" - } else if (controllers.taskbarDragController.isSystemDragInProgress) { + touchableInsets = TOUCHABLE_INSETS_REGION + debugTouchableRegion.lastSetTouchableReason = UI_CONTROLLER_UNTOUCHABLE + } else if (controllers.taskbarOverlayController.isAnySystemDragInProgress) { // Let touches pass through us. - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION) - debugTouchableRegion.lastSetTouchableReason = "System drag is in progress" + touchableInsets = TOUCHABLE_INSETS_REGION + debugTouchableRegion.lastSetTouchableReason = SYSTEM_DRAG_IN_PROGRESS } else if (context.isTaskbarWindowFullscreen) { // Intercept entire fullscreen window. - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME) - insetsIsTouchableRegion = false - debugTouchableRegion.lastSetTouchableReason = "Taskbar is fullscreen" + touchableInsets = TOUCHABLE_INSETS_FRAME + debugTouchableRegion.lastSetTouchableReason = FULLSCREEN_TASKBAR_WINDOW context.dragLayer.getBoundsInWindow(debugTouchableRegion.lastSetTouchableBounds, false) } else if ( controllers.taskbarViewController.areIconsVisible() || context.isNavBarKidsModeActive || - bubbleBarVisible + includeBubbleBarBounds() ) { // Taskbar has some touchable elements, take over the full taskbar area - if ( - controllers.uiController.isInOverviewUi && - DisplayController.isTransientTaskbar(context) - ) { + if (controllers.uiController.isInOverviewUi && context.isTransientTaskbar) { val region = controllers.taskbarActivityContext.dragLayer.lastDrawnTransientRect.toRegion() val bubbleBarBounds = @@ -431,24 +391,30 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas // Include the bounds of the bubble bar in the touchable region if they exist. if (bubbleBarBounds != null) { - region.op(bubbleBarBounds, Region.Op.UNION) + region.addBoundsToRegion(bubbleBarBounds) } insetsInfo.touchableRegion.set(region) - debugTouchableRegion.lastSetTouchableReason = "Transient Taskbar is in Overview" + debugTouchableRegion.lastSetTouchableReason = TRANSIENT_IN_OVERVIEW debugTouchableRegion.lastSetTouchableBounds.set(region.bounds) } else { insetsInfo.touchableRegion.set(defaultTouchableRegion) - debugTouchableRegion.lastSetTouchableReason = "Using default touchable region" + debugTouchableRegion.lastSetTouchableReason = DEFAULT_TOUCH_REGION debugTouchableRegion.lastSetTouchableBounds.set(defaultTouchableRegion.bounds) } - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION) - insetsIsTouchableRegion = false + touchableInsets = TOUCHABLE_INSETS_REGION } else { - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION) - debugTouchableRegion.lastSetTouchableReason = - "Icons are not visible, but other components such as 3 buttons might be" + touchableInsets = TOUCHABLE_INSETS_REGION + debugTouchableRegion.lastSetTouchableReason = ICONS_INVISIBLE } - context.excludeFromMagnificationRegion(insetsIsTouchableRegion) + // Always have nav buttons be touchable + controllers.navbarButtonsViewController.addVisibleButtonsRegion( + context.dragLayer, + insetsInfo.touchableRegion, + ) + + insetsInfo.setTouchableInsets(touchableInsets) + debugTouchableRegion.lastSetTouchableInsets = touchableInsets + debugTouchableRegion.lastSetTouchableBounds.set(insetsInfo.touchableRegion.bounds) } /** Draws the last set touchableRegion as a red rectangle onto the given Canvas. */ @@ -479,12 +445,42 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas } pw.println() } - pw.println("$prefix\tlastSetTouchableBounds=${debugTouchableRegion.lastSetTouchableBounds}") - pw.println("$prefix\tlastSetTouchableReason=${debugTouchableRegion.lastSetTouchableReason}") + pw.println("$prefix\tdebugTouchableRegion=$debugTouchableRegion") } class DebugTouchableRegion { + + companion object { + const val PHONE_MODE = + "Phone button nav mode: Fullscreen touchable, IME not affecting nav buttons" + const val DRAG_LAYER_INVISIBLE = "Taskbar is invisible" + const val UI_CONTROLLER_UNTOUCHABLE = "Taskbar is not touchable" + const val SYSTEM_DRAG_IN_PROGRESS = "System drag is in progress" + const val FULLSCREEN_TASKBAR_WINDOW = "Taskbar is fullscreen" + const val TRANSIENT_IN_OVERVIEW = "Transient Taskbar is in Overview" + const val DEFAULT_TOUCH_REGION = "Using default touchable region" + const val ICONS_INVISIBLE = + "Icons are not visible, but other components such as 3 buttons might be" + } + val lastSetTouchableBounds = Rect() var lastSetTouchableReason = "" + var lastSetTouchableInsets = TOUCHABLE_INSETS_FRAME + + override fun toString(): String { + return "{lastSetTouchableBounds=$lastSetTouchableBounds" + + ", lastSetTouchableReason=\"$lastSetTouchableReason\"" + + ", lastSetTouchableInsets=${touchableInsetsToString()}" + } + + private fun touchableInsetsToString(): String { + return when (lastSetTouchableInsets) { + TOUCHABLE_INSETS_FRAME -> "TOUCHABLE_INSETS_FRAME" + TOUCHABLE_INSETS_CONTENT -> "TOUCHABLE_INSETS_CONTENT" + TOUCHABLE_INSETS_VISIBLE -> "TOUCHABLE_INSETS_VISIBLE" + TOUCHABLE_INSETS_REGION -> "TOUCHABLE_INSETS_REGION" + else -> "Unknown" + } + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarInteractor.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarInteractor.kt new file mode 100644 index 00000000000..5ca5581a194 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarInteractor.kt @@ -0,0 +1,292 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.animation.Animator +import android.animation.AnimatorSet +import android.view.MotionEvent +import android.view.View +import android.view.ViewRootImpl +import androidx.annotation.AnyThread +import androidx.annotation.MainThread +import com.android.launcher3.Flags.enableTaskbarUiThread +import com.android.launcher3.LauncherState +import com.android.launcher3.taskbar.TaskbarManagerImpl.TASKBAR_UI_THREAD +import com.android.launcher3.taskbar.customization.TASKBAR_OVERFLOW_PIN_LIMIT +import com.android.launcher3.util.AsyncView +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.ImmediateExecutorService +import com.android.quickstep.GestureState +import com.android.quickstep.RecentsAnimationCallbacks +import com.android.quickstep.ViewUtils +import java.util.concurrent.AbstractExecutorService +import java.util.concurrent.Executor +import java.util.concurrent.Future +import javax.annotation.concurrent.ThreadSafe + +/** + * Expose [TaskbarUIController] APIs to launcher, gesture nav and recents to be called on taskbar's + * per-window UI thread. + */ +@ThreadSafe +class TaskbarInteractor(private val taskbarUIController: TaskbarUIController) { + + private val executor: AbstractExecutorService = + if (enableTaskbarUiThread()) TASKBAR_UI_THREAD else ImmediateExecutorService + + @AnyThread + fun setUserIsNotGoingHome(isNotGoingHome: Boolean) { + executor.execute { taskbarUIController.setUserIsNotGoingHome(isNotGoingHome) } + } + + @AnyThread + fun hideOverlayWindow() { + executor.execute { taskbarUIController.hideOverlayWindow() } + } + + @AnyThread + fun startTranslationSpring() { + executor.execute { taskbarUIController.startTranslationSpring() } + } + + @AnyThread + fun onExpandPip() { + executor.execute { taskbarUIController.onExpandPip() } + } + + @AnyThread + fun onLauncherVisibilityChanged(visible: Boolean) { + executor.execute { taskbarUIController.onLauncherVisibilityChanged(visible) } + } + + @AnyThread + fun onStateTransitionCompletedAfterSwipeToHome(finalState: LauncherState) { + executor.execute { + taskbarUIController.onStateTransitionCompletedAfterSwipeToHome(finalState) + } + } + + @AnyThread + fun notifyRenderer(reason: String) { + executor.execute { + val rootViewImpl: ViewRootImpl = taskbarUIController.rootView.viewRootImpl + rootViewImpl.notifyRendererOfExpensiveFrame() + rootViewImpl.notifyRendererForGpuLoadUp(reason) + } + } + + @AnyThread + fun onTaskbarInAppDisplayProgressUpdate(progress: Float, flag: Int) { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { + taskbarUIController.onTaskbarInAppDisplayProgressUpdate(progress, flag) + } + } + } + + @AnyThread + fun setShouldDelayLauncherStateAnim(shouldDelayLauncherStateAnim: Boolean) { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { + taskbarUIController.setShouldDelayLauncherStateAnim(shouldDelayLauncherStateAnim) + } + } + } + + @AnyThread + fun showEduOnAppLaunch() { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { taskbarUIController.showEduOnAppLaunch() } + } + } + + @AnyThread + fun openQuickSwitchView() { + executor.execute { taskbarUIController.openQuickSwitchView() } + } + + @AnyThread + fun refreshResumedState() { + executor.execute { taskbarUIController.refreshResumedState() } + } + + @AnyThread + fun setSkipLauncherVisibilityChange(skip: Boolean) { + executor.execute { taskbarUIController.setSkipLauncherVisibilityChange(skip) } + } + + @AnyThread + fun onLauncherResume() { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { taskbarUIController.onLauncherResume() } + } + } + + @AnyThread + fun onLauncherPause() { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { taskbarUIController.onLauncherPause() } + } + } + + @AnyThread + fun onLauncherStop() { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { taskbarUIController.onLauncherStop() } + } + } + + @AnyThread + fun setIgnoreInAppFlagForSync(enabled: Boolean) { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { taskbarUIController.setIgnoreInAppFlagForSync(enabled) } + } + } + + @AnyThread + fun createAnimToAppAndPlay(animatorSet: AnimatorSet) { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { taskbarUIController.createAnimToApp().let { animatorSet.play(it) } } + } + } + + @AnyThread + fun updateTaskbarLauncherStateGoingHome() { + if (taskbarUIController is LauncherTaskbarUIController) { + executor.execute { taskbarUIController.updateTaskbarLauncherStateGoingHome() } + } + } + + /** + * This API both launches focused tasks and returns focused task ids, so it cannot be converted + * to a one-way API where caller can just fire and forget. + * + * We decided to return a [Future] so that caller can call [Future.get] to wait for (and be + * blocked by) taskbar thread to finish the task due to 2 reasons: + * 1. caller is keyboard switch handling which is a low use cases + * 2. caller can be moved off main thread in the future, so blocking a bg thread is less a + * performance issue. + */ + @AnyThread + fun launchFocusedTask(): Future?> = + executor.submit?> { taskbarUIController.launchFocusedTask() } + + @AnyThread + fun postOnRootViewDraw(callback: Runnable, callbackExecutor: Executor): Boolean { + val rootView = taskbarUIController.rootView + return if (rootView != null) { + executor.execute { + ViewUtils.postFrameDrawn(rootView) { callbackExecutor.execute(callback) } + } + true + } else { + false + } + } + + // TODO(b/404636836): remove after revert ag/34711156 + @MainThread fun getControllers(): TaskbarControllers? = taskbarUIController.mControllers + + @AnyThread + fun getMaxPinnableCount() = + if (TaskbarPopupController.canPinAppsOverflow()) { + TASKBAR_OVERFLOW_PIN_LIMIT + } else { + taskbarUIController.mControllers + ?.taskbarActivityContext + ?.deviceProfile + ?.numShownHotseatIcons ?: -1 + } + + @AnyThread + fun findMatchingAsyncView(v: View): AsyncView { + return AsyncView(if (enableTaskbarUiThread()) TASKBAR_UI_THREAD else MAIN_EXECUTOR) { + taskbarUIController.findMatchingView(v) + } + } + + // TODO(b/404636836): start this animation within taskbar. + @MainThread + fun getParallelAnimationToGestureEndTarget( + endTarget: GestureState.GestureEndTarget, + duration: Long, + callbacks: RecentsAnimationCallbacks, + ): Animator? = + taskbarUIController.getParallelAnimationToGestureEndTarget(endTarget, duration, callbacks) + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.isEventOverBubbleBarViews()"), + ) + fun isEventOverBubbleBarViews(ev: MotionEvent) = + taskbarUIController.isEventOverBubbleBarViews(ev) + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.isEventOverAnyTaskbarView()"), + ) + fun isEventOverAnyTaskbarItem(ev: MotionEvent) = + taskbarUIController.isEventOverAnyTaskbarItem(ev) + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.getShowDesktopTaskbarForFreeformDisplayRef.value()"), + ) + fun canPinAppWithContextMenu() = taskbarUIController.canPinAppWithContextMenu() + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.getHasBubblesRef().value()"), + ) + fun hasBubbles() = + if (taskbarUIController is LauncherTaskbarUIController) { + taskbarUIController.hasBubbles() + } else null + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.getShouldShowEduOnAppLaunchRef().value()"), + ) + fun shouldShowEduOnAppLaunch() = + if (taskbarUIController is LauncherTaskbarUIController) { + taskbarUIController.shouldShowEduOnAppLaunch() + } else null + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.isDraggingItemRef().value()"), + ) + fun isDraggingItem() = taskbarUIController.isDraggingItem + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.isTaskbarStashedRef().value()"), + ) + fun isTaskbarStashed() = taskbarUIController.isTaskbarStashed + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.isTaskbarAllAppsOpenRef().value()"), + ) + fun isTaskbarAllAppsOpen() = taskbarUIController.isTaskbarAllAppsOpen + + @Deprecated( + "Should be removed once we turned on [refactorTaskbarUiState()] flag", + ReplaceWith("TaskbarUiState.getShowDesktopTaskbarForFreeformDisplayRef().value()"), + ) + fun shouldAllowTaskbarToAutoStash() = taskbarUIController.shouldAllowTaskbarToAutoStash() +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index cb9f24ae808..f3c28f4a045 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -16,16 +16,24 @@ package com.android.launcher3.taskbar; import static com.android.app.animation.Interpolators.EMPHASIZED; +import static com.android.app.animation.Interpolators.FINAL_FRAME; +import static com.android.app.animation.Interpolators.INSTANT; +import static com.android.launcher3.Flags.refactorTaskbarUiState; +import static com.android.launcher3.Hotseat.ALPHA_CHANNEL_TASKBAR_ALIGNMENT; +import static com.android.launcher3.Hotseat.ALPHA_CHANNEL_TASKBAR_STASH; +import static com.android.launcher3.LauncherState.HOTSEAT_ICONS; +import static com.android.launcher3.Utilities.isRtl; import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_APP; import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_OVERVIEW; import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_STASHED_LAUNCHER_STATE; +import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_FOR_BUBBLES; +import static com.android.launcher3.taskbar.TaskbarStashController.UNLOCK_TRANSITION_MEMOIZATION_MS; import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_HOME; import static com.android.launcher3.util.FlagDebugUtils.appendFlag; import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; +import static com.android.quickstep.fallback.RecentsStateUtilsKt.toLauncherState; +import static com.android.quickstep.util.SystemUiFlagUtils.isTaskbarHidden; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_AWAKE; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_MASK; -import static com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_AWAKE; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -33,32 +41,50 @@ import android.animation.ObjectAnimator; import android.os.SystemClock; import android.util.Log; +import android.view.animation.Interpolator; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.AbstractFloatingView; +import com.android.launcher3.BuildConfig; +import com.android.launcher3.BuildConfigs; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Hotseat.HotseatQsbAlphaId; +import com.android.launcher3.LauncherInteractor; import com.android.launcher3.LauncherState; +import com.android.launcher3.LauncherUiState; +import com.android.launcher3.LauncherUiStateUtil; import com.android.launcher3.QuickstepTransitionManager; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.AnimatorListeners; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.statemanager.StateManager; -import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.BubbleLauncherState; import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; +import com.android.launcher3.util.SafeCloseable; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RecentsAnimationCallbacks; import com.android.quickstep.RecentsAnimationController; +import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.util.ScalingWorkspaceRevealAnim; import com.android.quickstep.util.SystemUiFlagUtils; import com.android.quickstep.views.RecentsView; -import com.android.systemui.animation.ViewRootSync; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; import java.io.PrintWriter; import java.util.HashMap; import java.util.StringJoiner; +import java.util.concurrent.Executor; +import java.util.function.Consumer; +import java.util.function.Function; + +import kotlin.Unit; /** * Track LauncherState, RecentsAnimation, resumed state for task bar in one place here and animate @@ -143,16 +169,23 @@ public class TaskbarLauncherStateController { private AnimatedFloat mTaskbarBackgroundAlpha; private AnimatedFloat mTaskbarAlpha; private AnimatedFloat mTaskbarCornerRoundness; - private MultiProperty mIconAlphaForHome; - private QuickstepLauncher mLauncher; + private MultiProperty mTaskbarAlphaForHome; + private LauncherInteractor mLauncher; + private LauncherUiState mLauncherUiState; + private boolean mIsDestroyed = false; private Integer mPrevState; private int mState; private LauncherState mLauncherState = LauncherState.NORMAL; private boolean mSkipNextRecentsAnimEnd; // Time when FLAG_TASKBAR_HIDDEN was last cleared, SystemClock.elapsedRealtime (milliseconds). - private long mLastUnlockTimeMs = 0; + private long mLastRemoveTaskbarHiddenTimeMs = 0; + /** + * Time when FLAG_DEVICE_LOCKED was last cleared, plus + * {@link TaskbarStashController#UNLOCK_TRANSITION_MEMOIZATION_MS} + */ + private long mLastUnlockTransitionTimeout; private @Nullable TaskBarRecentsAnimationListener mTaskBarRecentsAnimationListener; @@ -160,11 +193,15 @@ public class TaskbarLauncherStateController { private boolean mShouldDelayLauncherStateAnim; + private @Nullable BubbleBarLocation mBubbleBarLocation; + // We skip any view synchronizations during init/destroy. private boolean mCanSyncViews; private boolean mIsQsbInline; + private RecentsAnimationCallbacks mRecentsAnimationCallbacks; + private final DeviceProfile.OnDeviceProfileChangeListener mOnDeviceProfileChangeListener = new DeviceProfile.OnDeviceProfileChangeListener() { @Override @@ -172,16 +209,19 @@ public void onDeviceProfileChanged(DeviceProfile dp) { if (mIsQsbInline && !dp.isQsbInline) { // We only modify QSB alpha if isQsbInline = true. If we switch to a DP // where isQsbInline = false, then we need to reset the alpha. - mLauncher.getHotseat().setQsbAlpha(1f); + mLauncher.setHotseatQsbAlpha(1f, ALPHA_CHANNEL_TASKBAR_ALIGNMENT); } mIsQsbInline = dp.isQsbInline; TaskbarLauncherStateController.this.updateIconAlphaForHome( - mIconAlphaForHome.getValue()); + mTaskbarAlphaForHome.getValue(), ALPHA_CHANNEL_TASKBAR_ALIGNMENT); + TaskbarLauncherStateController.this.onBubbleBarLocationChanged( + mBubbleBarLocation, /* animate = */ false); } }; + private @Nullable SafeCloseable mOnDeviceProfileChangeListenerCloseable; private final StateManager.StateListener mStateListener = - new StateManager.StateListener() { + new StateManager.StateListener<>() { @Override public void onStateTransitionStart(LauncherState toState) { @@ -195,7 +235,12 @@ public void onStateTransitionStart(LauncherState toState) { updateStateForFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION, true); if (!mShouldDelayLauncherStateAnim) { if (toState == LauncherState.NORMAL) { - applyState(QuickstepTransitionManager.getTaskbarToHomeDuration()); + TaskbarActivityContext activity = mControllers.taskbarActivityContext; + boolean isPersistentTaskbarAndNotInDesktopMode = + !activity.isInDesktopMode() + && activity.getTaskbarFeatureEvaluator().isPersistent(); + applyState(QuickstepTransitionManager.getTaskbarToHomeDuration( + isPersistentTaskbarAndNotInDesktopMode)); } else { applyState(); } @@ -210,6 +255,21 @@ public void onStateTransitionComplete(LauncherState finalState) { updateOverviewDragState(finalState); } }; + private @Nullable SafeCloseable mStateListenerClosable; + + private final StateManager.StateListener mRecentsStateListener = + new StateManager.StateListener<>() { + + @Override + public void onStateTransitionStart(RecentsState toState) { + mStateListener.onStateTransitionStart(toLauncherState(toState)); + } + + @Override + public void onStateTransitionComplete(RecentsState finalState) { + mStateListener.onStateTransitionComplete(toLauncherState(finalState)); + } + }; /** * Callback for when launcher state transition completes after user swipes to home. @@ -218,53 +278,88 @@ public void onStateTransitionComplete(LauncherState finalState) { public void onStateTransitionCompletedAfterSwipeToHome(LauncherState finalState) { // TODO(b/279514548) Cleans up bad state that can occur when user interacts with // taskbar on top of transparent activity. - if ((finalState == LauncherState.NORMAL) - && mLauncher.hasBeenResumed()) { + if ((finalState == LauncherState.NORMAL) && hasLauncherBeenResumed()) { updateStateForFlag(FLAG_VISIBLE, true); applyState(); } } + private boolean hasLauncherBeenResumed() { + if (refactorTaskbarUiState()) { + final boolean ret = mLauncherUiState.isResumed(); + if (BuildConfigs.IS_STUDIO_BUILD && ret != mLauncher.hasBeenResumed()) { + throw new IllegalStateException("hasBeenResumed doesn't match"); + } + return ret; + } else { + return mLauncher.hasBeenResumed(); + } + } + /** Initializes the controller instance, and applies the initial state immediately. */ - public void init(TaskbarControllers controllers, QuickstepLauncher launcher, - @SystemUiStateFlags long sysuiStateFlags) { + public void init(TaskbarControllers controllers, LauncherInteractor launcher, + LauncherUiState launcherUiState, @SystemUiStateFlags long sysuiStateFlags, + Executor taskbarExecutor) { mCanSyncViews = false; mControllers = controllers; mLauncher = launcher; + mLauncherUiState = launcherUiState; - mIsQsbInline = mLauncher.getDeviceProfile().isQsbInline; + mIsQsbInline = getDeviceProfile().isQsbInline; mTaskbarBackgroundAlpha = mControllers.taskbarDragLayerController .getTaskbarBackgroundAlpha(); mTaskbarAlpha = mControllers.taskbarDragLayerController.getTaskbarAlpha(); mTaskbarCornerRoundness = mControllers.getTaskbarCornerRoundness(); - mIconAlphaForHome = mControllers.taskbarViewController + mTaskbarAlphaForHome = mControllers.taskbarViewController .getTaskbarIconAlpha().get(ALPHA_INDEX_HOME); resetIconAlignment(); - mLauncher.getStateManager().addStateListener(mStateListener); - mLauncherState = launcher.getStateManager().getState(); + if (!mControllers.taskbarActivityContext.isPhoneMode()) { + mStateListenerClosable = mLauncher.addStateListener(mStateListener); + runForRecentsWindowManager(recentsWindowManager -> + recentsWindowManager.getStateManager().addStateListener(mRecentsStateListener)); + } + mLauncherState = LauncherUiStateUtil.getLauncherState(mLauncher, mLauncherUiState); updateStateForSysuiFlags(sysuiStateFlags, /*applyState*/ false); applyState(0); - mCanSyncViews = true; - mLauncher.addOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener); + mCanSyncViews = !mControllers.taskbarActivityContext.isPhoneMode(); + mOnDeviceProfileChangeListenerCloseable = + launcherUiState.getDeviceProfileRef().forEach(taskbarExecutor, dp -> { + if (launcherUiState.isDeviceProfileInitialized()) { + mOnDeviceProfileChangeListener.onDeviceProfileChanged(dp); + } + return Unit.INSTANCE; + }); updateOverviewDragState(mLauncherState); } public void onDestroy() { + mIsDestroyed = true; mCanSyncViews = false; + if (mRecentsAnimationCallbacks != null) { + mRecentsAnimationCallbacks.removeListener(mTaskBarRecentsAnimationListener); + mRecentsAnimationCallbacks = null; + } + mIconAlignment.finishAnimation(); - mLauncher.getHotseat().setIconsAlpha(1f); - mLauncher.getStateManager().removeStateListener(mStateListener); + mLauncher.setHotseatIconsAlpha(1f, ALPHA_CHANNEL_TASKBAR_ALIGNMENT); + if (mStateListenerClosable != null) { + mStateListenerClosable.close(); + } + runForRecentsWindowManager(recentsWindowManager -> + recentsWindowManager.getStateManager().removeStateListener(mRecentsStateListener)); - mCanSyncViews = true; - mLauncher.removeOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener); + mCanSyncViews = !mControllers.taskbarActivityContext.isPhoneMode(); + if (mOnDeviceProfileChangeListenerCloseable != null) { + mOnDeviceProfileChangeListenerCloseable.close(); + } } /** @@ -278,32 +373,37 @@ public Animator createAnimToLauncher(@NonNull LauncherState toState, // If going to overview, stash the task bar // If going home, align the icons to hotseat AnimatorSet animatorSet = new AnimatorSet(); + mRecentsAnimationCallbacks = callbacks; // Update stashed flags first to ensure goingToUnstashedLauncherState() returns correctly. TaskbarStashController stashController = mControllers.taskbarStashController; stashController.updateStateForFlag(FLAG_IN_STASHED_LAUNCHER_STATE, - toState.isTaskbarStashed(mLauncher)); + toState.isTaskbarStashed(getDeviceProfile())); if (DEBUG) { Log.d(TAG, "createAnimToLauncher - FLAG_IN_APP: " + false); } stashController.updateStateForFlag(FLAG_IN_APP, false); updateStateForFlag(FLAG_TRANSITION_TO_VISIBLE, true); + mLauncherState = toState; animatorSet.play(stashController.createApplyStateAnimator(duration)); animatorSet.play(applyState(duration, false)); if (mTaskBarRecentsAnimationListener != null) { mTaskBarRecentsAnimationListener.endGestureStateOverride( - !mLauncher.isInState(LauncherState.OVERVIEW), false /*canceled*/); + !isStateManagerInState(LauncherState.OVERVIEW), /* canceled= */ false); } mTaskBarRecentsAnimationListener = new TaskBarRecentsAnimationListener(callbacks); callbacks.addListener(mTaskBarRecentsAnimationListener); - ((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchListener(() -> - mTaskBarRecentsAnimationListener.endGestureStateOverride(true, false /*canceled*/)); + RecentsView recentsView = mControllers.uiController.getRecentsView(); + if (recentsView != null) { + recentsView.setTaskLaunchListener(() -> mTaskBarRecentsAnimationListener + .endGestureStateOverride(/* finishedToApp= */ true, /* canceled= */ false)); + recentsView.setTaskLaunchCancelledRunnable(() -> { + updateStateForUserFinishedToApp(/* finishedToApp= */ false); + }); + } - ((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchCancelledRunnable(() -> { - updateStateForUserFinishedToApp(false /* finishedToApp */); - }); return animatorSet; } @@ -345,14 +445,7 @@ private void updateStateForSysuiFlags(@SystemUiStateFlags long systemUiStateFlag updateStateForFlag(FLAG_DEVICE_LOCKED, SystemUiFlagUtils.isLocked(systemUiStateFlags)); - // Taskbar is hidden whenever the device is dreaming. The dreaming state includes the - // interactive dreams, AoD, screen off. Since the SYSUI_STATE_DEVICE_DREAMING only kicks in - // when the device is asleep, the second condition extends ensures that the transition from - // and to the WAKEFULNESS_ASLEEP state also hide the taskbar, and improves the taskbar - // hide/reveal animation timings. - boolean isTaskbarHidden = hasAnyFlag(systemUiStateFlags, SYSUI_STATE_DEVICE_DREAMING) - || (systemUiStateFlags & SYSUI_STATE_WAKEFULNESS_MASK) != WAKEFULNESS_AWAKE; - updateStateForFlag(FLAG_TASKBAR_HIDDEN, isTaskbarHidden); + updateStateForFlag(FLAG_TASKBAR_HIDDEN, isTaskbarHidden(systemUiStateFlags)); if (applyState) { applyState(); @@ -366,9 +459,8 @@ private void updateStateForSysuiFlags(@SystemUiStateFlags long systemUiStateFlag */ private void updateOverviewDragState(LauncherState launcherState) { boolean disallowLongClick = - FeatureFlags.enableSplitContextually() - ? mLauncher.isSplitSelectionActive() - : launcherState == LauncherState.OVERVIEW_SPLIT_SELECT; + LauncherUiStateUtil.isSplitSelectActive(mLauncher, mLauncherUiState) + || mIsAnimatingToLauncher; com.android.launcher3.taskbar.Utilities.setOverviewDragState( mControllers, launcherState.disallowTaskbarGlobalDrag(), disallowLongClick, launcherState.allowTaskbarInitialSplitSelection()); @@ -407,7 +499,7 @@ public void applyState(long duration) { } public Animator applyState(long duration, boolean start) { - if (mControllers.taskbarActivityContext.isDestroyed()) { + if (mIsDestroyed || mControllers.taskbarActivityContext.isPhoneMode()) { return null; } Animator animator = null; @@ -435,30 +527,58 @@ public Animator applyState(long duration, boolean start) { private Animator onStateChangeApplied(int changedFlags, long duration, boolean start) { final boolean isInLauncher = isInLauncher(); + final boolean isInOverview = mControllers.uiController.isInOverviewUi(); final boolean isIconAlignedWithHotseat = isIconAlignedWithHotseat(); final float toAlignment = isIconAlignedWithHotseat ? 1 : 0; boolean handleOpenFloatingViews = false; + boolean isThreeButtonNav = + mControllers.taskbarActivityContext.isThreeButtonNav(); + + boolean isPersistent = + mControllers.taskbarActivityContext.getTaskbarFeatureEvaluator().isPersistent(); + boolean isTransient = mControllers.taskbarActivityContext.isTransientTaskbar(); if (DEBUG) { Log.d(TAG, "onStateChangeApplied - isInLauncher: " + isInLauncher + ", mLauncherState: " + mLauncherState + ", toAlignment: " + toAlignment); } mControllers.bubbleControllers.ifPresent(controllers -> { - // Show the bubble bar when on launcher home or in overview. - boolean onHome = isInLauncher && mLauncherState == LauncherState.NORMAL; - boolean onOverview = mLauncherState == LauncherState.OVERVIEW; - controllers.bubbleStashController.setBubblesShowingOnHome(onHome); - controllers.bubbleStashController.setBubblesShowingOnOverview(onOverview); + // Ignore state changes when taskbar is destroyed + if (mControllers.taskbarActivityContext.isDestroyed()) { + return; + } + // Show the bubble bar when on launcher home (hotseat icons visible) or in overview + boolean onOverview = isInLauncher && mLauncherState == LauncherState.OVERVIEW; + boolean hotseatIconsVisible = isInLauncher && mLauncherState.areElementsVisible( + mLauncherUiState, HOTSEAT_ICONS); + BubbleLauncherState state = onOverview + ? BubbleLauncherState.OVERVIEW + : hotseatIconsVisible + ? BubbleLauncherState.HOME + : BubbleLauncherState.IN_APP; + controllers.bubbleStashController.setLauncherState(state); }); - mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_OVERVIEW, + TaskbarStashController stashController = mControllers.taskbarStashController; + stashController.updateStateForFlag(FLAG_IN_OVERVIEW, mLauncherState == LauncherState.OVERVIEW); + // Update taskbar stash flag here since we are skipping the playStateTransitionAnim below + if (isPersistent) { + stashController.updateStateForFlag(FLAG_IN_STASHED_LAUNCHER_STATE, + mLauncherState.isTaskbarStashed(getDeviceProfile())); + } + AnimatorSet animatorSet = new AnimatorSet(); if (hasAnyFlag(changedFlags, FLAG_LAUNCHER_IN_STATE_TRANSITION)) { boolean launcherTransitionCompleted = !hasAnyFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION); - playStateTransitionAnim(animatorSet, duration, launcherTransitionCompleted); + + // We are skipping the taskbar stash animation for pinned taskbar, as we handle that now + // in setupPersistentTaskbarAnimation. + if (isTransient) { + playStateTransitionAnim(animatorSet, duration, launcherTransitionCompleted); + } if (launcherTransitionCompleted && mLauncherState == LauncherState.QUICK_SWITCH_FROM_HOME) { @@ -470,7 +590,8 @@ private Animator onStateChangeApplied(int changedFlags, long duration, boolean s // We're changing state to home, should close open popups e.g. Taskbar AllApps handleOpenFloatingViews = true; } - if (mLauncherState == LauncherState.OVERVIEW) { + if (mLauncherState == LauncherState.OVERVIEW + && !mControllers.taskbarActivityContext.isPhoneMode()) { // Calling to update the insets in TaskbarInsetController#updateInsetsTouchability mControllers.taskbarActivityContext.notifyUpdateLayoutParams(); } @@ -481,9 +602,9 @@ private Animator onStateChangeApplied(int changedFlags, long duration, boolean s @Override public void onAnimationStart(Animator animation) { mIsAnimatingToLauncher = isInLauncher; + // updateOverviewDragState uses mIsAnimatingToLauncher as well, so poke it. + updateOverviewDragState(mLauncherState); - TaskbarStashController stashController = - mControllers.taskbarStashController; if (DEBUG) { Log.d(TAG, "onAnimationStart - FLAG_IN_APP: " + !isInLauncher); } @@ -494,11 +615,15 @@ public void onAnimationStart(Animator animation) { @Override public void onAnimationEnd(Animator animation) { mIsAnimatingToLauncher = false; + // updateOverviewDragState uses mIsAnimatingToLauncher as well, so poke it. + updateOverviewDragState(mLauncherState); } }); // Handle closing open popups when going home/overview handleOpenFloatingViews = true; + } else { + stashController.applyState(); } if (handleOpenFloatingViews && isInLauncher) { @@ -507,7 +632,7 @@ public void onAnimationEnd(Animator animation) { if (hasAnyFlag(changedFlags, FLAG_TASKBAR_HIDDEN) && !hasAnyFlag(FLAG_TASKBAR_HIDDEN)) { // Take note of the current time, as the taskbar is made visible again. - mLastUnlockTimeMs = SystemClock.elapsedRealtime(); + mLastRemoveTaskbarHiddenTimeMs = SystemClock.elapsedRealtime(); } boolean isHidden = hasAnyFlag(FLAG_TASKBAR_HIDDEN); @@ -517,11 +642,20 @@ public void onAnimationEnd(Animator animation) { taskbarVisibility.setDuration(duration); if (isHidden) { - // Stash the transient taskbar once the taskbar is not visible. This reduces + // Stash the transient taskbar once the hide animation completes. This reduces // visual noise when unlocking the device afterwards. animatorSet.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { + // If we're awake when the animation ends (e.g. quick power button double + // tap), then we should no longer stash the taskbar. + if (BubbleAnythingFlagHelper.enableCreateAnyBubble() + && hasAnyFlag(FLAG_AWAKE)) { + if (DEBUG) { + Log.d(TAG, "Skip stashing taskbar, it's visible again."); + } + return; + } TaskbarStashController stashController = mControllers.taskbarStashController; stashController.updateAndAnimateTransientTaskbar( @@ -533,7 +667,8 @@ public void onAnimationEnd(Animator animation) { // with a fingerprint reader. This should only be done when the device was woken // up via fingerprint reader, however since this information is currently not // available, opting to always delay the fade-in a bit. - long durationSinceLastUnlockMs = SystemClock.elapsedRealtime() - mLastUnlockTimeMs; + long durationSinceLastUnlockMs = SystemClock.elapsedRealtime() + - mLastRemoveTaskbarHiddenTimeMs; taskbarVisibility.setStartDelay( Math.max(0, TASKBAR_SHOW_DELAY_MS - durationSinceLastUnlockMs)); } @@ -541,10 +676,23 @@ public void onAnimationEnd(Animator animation) { } float backgroundAlpha = isInLauncher && isTaskbarAlignedWithHotseat() ? 0 : 1; + AnimatedFloat taskbarBgOffset = + mControllers.taskbarDragLayerController.getTaskbarBackgroundOffset(); + boolean showTaskbar = shouldShowTaskbar(mControllers.taskbarActivityContext, isInLauncher, + isInOverview); + + if (mControllers.taskbarActivityContext.shouldAllowTaskbarToAutoStash()) { + showTaskbar &= !mControllers.taskbarStashController.isStashed(); + } + + float taskbarBgOffsetEnd = showTaskbar ? 0f : 1f; + float taskbarBgOffsetStart = showTaskbar ? 1f : 0f; // Don't animate if background has reached desired value. if (mTaskbarBackgroundAlpha.isAnimating() - || mTaskbarBackgroundAlpha.value != backgroundAlpha) { + || mTaskbarBackgroundAlpha.value != backgroundAlpha + || taskbarBgOffset.isAnimatingToValue(taskbarBgOffsetStart) + || taskbarBgOffset.value != taskbarBgOffsetEnd) { mTaskbarBackgroundAlpha.cancelAnimation(); if (DEBUG) { Log.d(TAG, "onStateChangeApplied - taskbarBackgroundAlpha - " @@ -555,30 +703,49 @@ public void onAnimationEnd(Animator animation) { boolean isInLauncherIconNotAligned = isInLauncher && !isIconAlignedWithHotseat; boolean notInLauncherIconNotAligned = !isInLauncher && !isIconAlignedWithHotseat; boolean isInLauncherIconIsAligned = isInLauncher && isIconAlignedWithHotseat; + // When Hotseat icons are not on top don't change duration or add start delay. + // This will keep the duration in sync for icon alignment and background fade in/out. + // For example, launching app from launcher all apps. + boolean isHotseatIconOnTopWhenAligned = + mControllers.uiController.isHotseatIconOnTopWhenAligned(); float startDelay = 0; // We want to delay the background from fading in so that the icons have time to move // into the bounds of the background before it appears. if (isInLauncherIconNotAligned) { startDelay = duration * TASKBAR_BG_ALPHA_LAUNCHER_NOT_ALIGNED_DELAY_MULT; - } else if (notInLauncherIconNotAligned) { + } else if (notInLauncherIconNotAligned && isHotseatIconOnTopWhenAligned) { startDelay = duration * TASKBAR_BG_ALPHA_NOT_LAUNCHER_NOT_ALIGNED_DELAY_MULT; } float newDuration = duration - startDelay; - if (isInLauncherIconIsAligned) { + if (isInLauncherIconIsAligned && isHotseatIconOnTopWhenAligned) { // Make the background fade out faster so that it is gone by the time the // icons move outside of the bounds of the background. newDuration = duration * TASKBAR_BG_ALPHA_LAUNCHER_IS_ALIGNED_DURATION_MULT; } - Animator taskbarBackgroundAlpha = mTaskbarBackgroundAlpha - .animateToValue(backgroundAlpha) - .setDuration((long) newDuration); - taskbarBackgroundAlpha.setStartDelay((long) startDelay); + Animator taskbarBackgroundAlpha = mTaskbarBackgroundAlpha.animateToValue( + backgroundAlpha); + if (isPersistent) { + setupPersistentTaskbarAnimation(animatorSet, showTaskbar, isThreeButtonNav, + taskbarBgOffset, taskbarBgOffsetStart, taskbarBgOffsetEnd, duration, + taskbarBackgroundAlpha); + } else { + taskbarBackgroundAlpha.setDuration((long) newDuration); + taskbarBackgroundAlpha.setStartDelay((long) startDelay); + } animatorSet.play(taskbarBackgroundAlpha); } float cornerRoundness = isInLauncher ? 0 : 1; + if (mControllers.taskbarDesktopModeController.isInDesktopModeAndNotInOverview( + mControllers.taskbarActivityContext.getDisplayId()) + && mControllers.getSharedState() != null) { + cornerRoundness = + mControllers.taskbarDesktopModeController.getTaskbarCornerRoundness( + mControllers.getSharedState().showCornerRadiusInDesktopMode); + } + // Don't animate if corner roundness has reached desired value. if (mTaskbarCornerRoundness.isAnimating() || mTaskbarCornerRoundness.value != cornerRoundness) { @@ -596,6 +763,15 @@ public void onAnimationEnd(Animator animation) { boolean isUnlockTransition = hasAnyFlag(changedFlags, FLAG_DEVICE_LOCKED) && !hasAnyFlag(FLAG_DEVICE_LOCKED); if (isUnlockTransition) { + // the launcher might not be resumed at the time the device is considered + // unlocked (when the keyguard goes away), but possibly shortly afterwards. + // To play the unlock transition at the time the unstash animation actually happens, + // this memoizes the state transition for UNLOCK_TRANSITION_MEMOIZATION_MS. + mLastUnlockTransitionTimeout = + SystemClock.elapsedRealtime() + UNLOCK_TRANSITION_MEMOIZATION_MS; + } + boolean isInUnlockTimeout = SystemClock.elapsedRealtime() < mLastUnlockTransitionTimeout; + if (isUnlockTransition || isInUnlockTimeout) { // When transitioning to unlocked, ensure the hotseat is fully visible from the // beginning. The hotseat itself is animated by LauncherUnlockAnimationController. mIconAlignment.cancelAnimation(); @@ -611,8 +787,11 @@ public void onAnimationEnd(Animator animation) { } else if (mIconAlignment.isAnimatingToValue(toAlignment) || mIconAlignment.isSettledOnValue(toAlignment)) { // Already at desired value, but make sure we run the callback at the end. - animatorSet.addListener(AnimatorListeners.forEndCallback( - this::onIconAlignmentRatioChanged)); + animatorSet.addListener(AnimatorListeners.forEndCallback(() -> { + if (!mIconAlignment.isAnimating()) { + onIconAlignmentRatioChanged(); + } + })); } else { mIconAlignment.cancelAnimation(); ObjectAnimator iconAlignAnim = mIconAlignment @@ -623,10 +802,18 @@ public void onAnimationEnd(Animator animation) { + mIconAlignment.value + " -> " + toAlignment + ": " + duration); } - animatorSet.play(iconAlignAnim); + if (isTransient && hasAnyFlag(FLAG_TASKBAR_HIDDEN)) { + iconAlignAnim.setInterpolator(FINAL_FRAME); + } else { + animatorSet.play(iconAlignAnim); + } + } - animatorSet.setInterpolator(EMPHASIZED); + Interpolator interpolator = + isTransient ? ScalingWorkspaceRevealAnim.SCALE_INTERPOLATOR : EMPHASIZED; + + animatorSet.setInterpolator(interpolator); if (start) { animatorSet.start(); @@ -634,13 +821,109 @@ public void onAnimationEnd(Animator animation) { return animatorSet; } + private static boolean shouldShowTaskbar(TaskbarActivityContext activityContext, + boolean isInLauncher, boolean isInOverview) { + if (activityContext.showDesktopTaskbarForFreeformDisplay()) { + return true; + } + + if (activityContext.showLockedTaskbarOnHome() && isInLauncher) { + return true; + } + return !isInLauncher || isInOverview; + } + + // Used to stash/unstash pinned/persistent taskbar between home, overview, in app states. + private void setupPersistentTaskbarAnimation(AnimatorSet animatorSet, boolean showTaskbar, + boolean isThreeNavButton, AnimatedFloat taskbarBgOffset, float taskbarBgOffsetStart, + float taskbarBgOffsetEnd, long duration, Animator taskbarBackgroundAlpha) { + float targetAlpha = !showTaskbar ? 1 : 0; + mLauncher.setHotseatIconsAlpha(targetAlpha, ALPHA_CHANNEL_TASKBAR_ALIGNMENT); + if (mIsQsbInline) { + mLauncher.setHotseatQsbAlpha(targetAlpha, ALPHA_CHANNEL_TASKBAR_ALIGNMENT); + } + + if ((taskbarBgOffset.value != taskbarBgOffsetEnd && !taskbarBgOffset.isAnimating()) + || !taskbarBgOffset.isAnimatingToValue(taskbarBgOffsetEnd)) { + taskbarBgOffset.cancelAnimation(); + AnimatedFloat taskbarIconTranslationYForHome = + mControllers.taskbarViewController.mTaskbarIconTranslationYForHome; + ObjectAnimator taskbarBackgroundOffset = taskbarBgOffset.animateToValue( + taskbarBgOffsetStart, + taskbarBgOffsetEnd); + ObjectAnimator taskbarIconsYTranslation = null; + float taskbarHeight = mControllers + .taskbarActivityContext + .getDeviceProfile() + .getTaskbarProfile() + .getHeight(); + if (showTaskbar) { + taskbarIconsYTranslation = taskbarIconTranslationYForHome.animateToValue( + taskbarHeight, 0); + } else { + taskbarIconsYTranslation = taskbarIconTranslationYForHome.animateToValue(0, + taskbarHeight); + } + + taskbarIconsYTranslation.setDuration(duration); + taskbarBackgroundOffset.setDuration(duration); + + animatorSet.play(taskbarIconsYTranslation); + animatorSet.play(taskbarBackgroundOffset); + } + + if (isThreeNavButton) { + AnimatedFloat taskbarNavButtonTranslationY = + mControllers.navbarButtonsViewController.getTaskbarNavButtonTranslationY(); + AnimatedFloat taskbarNavButtonTranslationYForInAppDisplay = + mControllers.navbarButtonsViewController + .getTaskbarNavButtonTranslationYForInAppDisplay(); + + DeviceProfile taskbarDp = mControllers.taskbarActivityContext.getDeviceProfile(); + int offsetY = + mControllers.taskbarStashController.isDeviceLocked() + ? taskbarDp.getTaskbarOffsetY() + : getDeviceProfile().getTaskbarOffsetY(); + + int collapsedHeight = mControllers.taskbarActivityContext.getDefaultTaskbarWindowSize(); + int expandedHeight = Math.max(collapsedHeight, + taskbarDp.getTaskbarProfile().getHeight() + offsetY); + + mControllers.taskbarActivityContext.setTaskbarWindowSize( + showTaskbar ? collapsedHeight : expandedHeight); + + ObjectAnimator taskbarNavButtonTranslateY = + taskbarNavButtonTranslationY.animateToValue( + showTaskbar ? 0 : -offsetY); + ObjectAnimator taskbarNavButtonTranslateYForInAppDisplay = + taskbarNavButtonTranslationYForInAppDisplay.animateToValue( + showTaskbar ? 0 : offsetY); + + taskbarNavButtonTranslateY.setDuration(duration); + taskbarNavButtonTranslateYForInAppDisplay.setDuration(duration); + animatorSet.playTogether(taskbarNavButtonTranslateY, + taskbarNavButtonTranslateYForInAppDisplay); + } + + taskbarBackgroundAlpha.setInterpolator(showTaskbar ? INSTANT : FINAL_FRAME); + taskbarBackgroundAlpha.setDuration(duration); + } + /** * Whether the taskbar is aligned with the hotseat in the current/target launcher state. * * This refers to the intended state - a transition to this state might be in progress. */ public boolean isTaskbarAlignedWithHotseat() { - return mLauncherState.isTaskbarAlignedWithHotseat(mLauncher); + if (mControllers.taskbarActivityContext.showDesktopTaskbarForFreeformDisplay()) { + return false; + } + + if (mControllers.taskbarActivityContext.showLockedTaskbarOnHome() && isInLauncher()) { + return false; + } + + return mLauncherState.isTaskbarAlignedWithHotseat(); } /** @@ -648,11 +931,10 @@ public boolean isTaskbarAlignedWithHotseat() { */ public boolean isIconAlignedWithHotseat() { if (isInLauncher()) { - boolean isInStashedState = mLauncherState.isTaskbarStashed(mLauncher); + boolean isInStashedState = mLauncherState.isTaskbarStashed(getDeviceProfile()); boolean willStashVisually = isInStashedState && mControllers.taskbarStashController.supportsVisualStashing(); - boolean isTaskbarAlignedWithHotseat = - mLauncherState.isTaskbarAlignedWithHotseat(mLauncher); + boolean isTaskbarAlignedWithHotseat = isTaskbarAlignedWithHotseat(); return isTaskbarAlignedWithHotseat && !willStashVisually; } else { return false; @@ -663,17 +945,25 @@ public boolean isIconAlignedWithHotseat() { * Returns if the current Launcher state has hotseat on top of other elemnets. */ public boolean isInHotseatOnTopStates() { - return mLauncherState != LauncherState.ALL_APPS - && !mLauncher.getWorkspace().isOverlayShown(); + return mLauncherState != LauncherState.ALL_APPS && !isOverlayShown(); } boolean isInOverviewUi() { return mLauncherState.isRecentsViewVisible; } + /** + * Returns the current mLauncherState. Note that this could represent RecentsState as well, as + * we convert those to equivalent LauncherStates even if Launcher Activity is not actually in + * those states (for the case where the state is represented in a separate Window instead). + */ + public LauncherState getLauncherState() { + return mLauncherState; + } + private void playStateTransitionAnim(AnimatorSet animatorSet, long duration, boolean committed) { - boolean isInStashedState = mLauncherState.isTaskbarStashed(mLauncher); + boolean isInStashedState = mLauncherState.isTaskbarStashed(getDeviceProfile()); TaskbarStashController stashController = mControllers.taskbarStashController; stashController.updateStateForFlag(FLAG_IN_STASHED_LAUNCHER_STATE, isInStashedState); Animator stashAnimator = stashController.createApplyStateAnimator(duration); @@ -683,14 +973,17 @@ private void playStateTransitionAnim(AnimatorSet animatorSet, long duration, public void onAnimationEnd(Animator animation) { if (isInStashedState && committed) { // Reset hotseat alpha to default - mLauncher.getHotseat().setIconsAlpha(1); + mLauncher.setHotseatIconsAlpha(1, ALPHA_CHANNEL_TASKBAR_ALIGNMENT); } } @Override public void onAnimationStart(Animator animation) { - if (mLauncher.getHotseat().getIconsAlpha() > 0) { - updateIconAlphaForHome(mLauncher.getHotseat().getIconsAlpha()); + float hotseatIconsAlpha = + LauncherUiStateUtil.getTaskbarAlignmentChannelAlpha( + mLauncher, mLauncherUiState); + if (hotseatIconsAlpha > 0) { + updateIconAlphaForHome(hotseatIconsAlpha, ALPHA_CHANNEL_TASKBAR_ALIGNMENT); } } }); @@ -719,6 +1012,36 @@ private boolean isInLauncher() { } } + protected void stashHotseat(boolean stash) { + // align taskbar with the hotseat icons before performing any animation + mControllers.taskbarViewController.setLauncherIconAlignment(/* alignmentRatio = */ 1, + getDeviceProfile()); + TaskbarStashController stashController = mControllers.taskbarStashController; + stashController.updateStateForFlag(FLAG_STASHED_FOR_BUBBLES, stash); + Runnable swapHotseatWithTaskbar = new Runnable() { + @Override + public void run() { + updateIconAlphaForHome(stash ? 1 : 0, ALPHA_CHANNEL_TASKBAR_STASH); + } + }; + if (stash) { + stashController.applyState(); + // if we stashing the hotseat we need to immediately swap it with the animating taskbar + swapHotseatWithTaskbar.run(); + } else { + // if we revert stashing make swap after taskbar animation is complete + stashController.applyState(/* postApplyAction = */ swapHotseatWithTaskbar); + } + } + + protected void unStashHotseatInstantly() { + TaskbarStashController stashController = mControllers.taskbarStashController; + stashController.updateStateForFlag(FLAG_STASHED_FOR_BUBBLES, false); + stashController.applyState(/* duration = */ 0); + updateIconAlphaForHome(/* taskbarAlpha = */ 0, + ALPHA_CHANNEL_TASKBAR_STASH, /* updateTaskbarAlpha = */ false); + } + /** * Resets and updates the icon alignment. */ @@ -728,43 +1051,94 @@ protected void resetIconAlignment() { } private void onIconAlignmentRatioChanged() { - float currentValue = mIconAlphaForHome.getValue(); + float currentValue = mTaskbarAlphaForHome.getValue(); boolean taskbarWillBeVisible = mIconAlignment.value < 1; boolean firstFrameVisChanged = (taskbarWillBeVisible && Float.compare(currentValue, 1) != 0) || (!taskbarWillBeVisible && Float.compare(currentValue, 0) != 0); mControllers.taskbarViewController.setLauncherIconAlignment( - mIconAlignment.value, mLauncher.getDeviceProfile()); + mIconAlignment.value, getDeviceProfile()); mControllers.navbarButtonsViewController.updateTaskbarAlignment(mIconAlignment.value); - // Switch taskbar and hotseat in last frame - updateIconAlphaForHome(taskbarWillBeVisible ? 1 : 0); + // Switch taskbar and hotseat in last frame and if taskbar is not hidden for bubbles + boolean isHiddenForBubbles = mControllers.taskbarStashController.isHiddenForBubbles(); + updateIconAlphaForHome(taskbarWillBeVisible ? 1 : 0, ALPHA_CHANNEL_TASKBAR_ALIGNMENT, + /* updateTaskbarAlpha = */ !isHiddenForBubbles); // Sync the first frame where we swap taskbar and hotseat. - if (firstFrameVisChanged && mCanSyncViews && !Utilities.isRunningInTestHarness()) { - ViewRootSync.synchronizeNextDraw(mLauncher.getHotseat(), - mControllers.taskbarActivityContext.getDragLayer(), - () -> { - }); + if (firstFrameVisChanged + && mCanSyncViews + && mControllers.taskbarActivityContext.isTransientTaskbar() + && !Utilities.isRunningInTestHarness()) { + mLauncher.synchronizeNextDraw(mControllers.taskbarActivityContext.getDragLayer()); } } - private void updateIconAlphaForHome(float alpha) { - if (mControllers.taskbarActivityContext.isDestroyed()) { + private void updateIconAlphaForHome(float taskbarAlpha, @HotseatQsbAlphaId int alphaChannel) { + updateIconAlphaForHome(taskbarAlpha, alphaChannel, /* updateTaskbarAlpha = */ true); + } + + private void updateIconAlphaForHome(float taskbarAlpha, + @HotseatQsbAlphaId int alphaChannel, + boolean updateTaskbarAlpha) { + if (mIsDestroyed) { return; } - mIconAlphaForHome.setValue(alpha); - boolean hotseatVisible = alpha == 0 + if (updateTaskbarAlpha) { + mTaskbarAlphaForHome.setValue(taskbarAlpha); + } + boolean hotseatVisible = taskbarAlpha == 0 || mControllers.taskbarActivityContext.isPhoneMode() || (!mControllers.uiController.isHotseatIconOnTopWhenAligned() && mIconAlignment.value > 0); /* * Hide Launcher Hotseat icons when Taskbar icons have opacity. Both icon sets * should not be visible at the same time. + * + * Checking if isLauncherAnimationRunning running is crucial as user can now swipe to home + * from desktop mode. + * + * Taskbar recreation can be anytime now so we don't want to start transient taskbar + * animation while user was swiping home from pinned taskbar of desktop mode. */ - mLauncher.getHotseat().setIconsAlpha(hotseatVisible ? 1 : 0); - if (mIsQsbInline) { - mLauncher.getHotseat().setQsbAlpha(hotseatVisible ? 1 : 0); + float targetAlpha = hotseatVisible ? 1 : 0; + if ((mControllers.taskbarActivityContext.isTransientTaskbar() + && !mControllers.taskbarDesktopModeController.isLauncherAnimationRunning()) + || mControllers.taskbarActivityContext.showLockedTaskbarOnHome() + || mControllers.taskbarActivityContext.showDesktopTaskbarForFreeformDisplay()) { + mLauncher.setHotseatIconsAlpha(targetAlpha, alphaChannel); + if (mIsQsbInline) { + mLauncher.setHotseatQsbAlpha(targetAlpha, alphaChannel); + } + } + } + + /** Updates launcher home screen appearance accordingly to the bubble bar location. */ + public void onBubbleBarLocationChanged(@Nullable BubbleBarLocation location, boolean animate) { + mBubbleBarLocation = location; + if (location == null) { + // bubble bar is not present, hence no location, resetting the hotseat + mLauncher.updateHotseatAndQsbTranslationX(/* targetValue = */ 0, animate, mIsQsbInline); + mBubbleBarLocation = null; + return; + } + DeviceProfile deviceProfile = getDeviceProfile(); + if (!deviceProfile.shouldAdjustHotseatOnNavBarLocationUpdate( + mControllers.taskbarActivityContext)) { + return; } + boolean isBubblesOnLeft = location.isOnLeft(isRtl( + mControllers.taskbarActivityContext.getResources())); + int targetX = deviceProfile + .getHotseatTranslationXForNavBar( + mControllers.taskbarActivityContext, isBubblesOnLeft); + mLauncher.updateHotseatAndQsbTranslationX(targetX, animate, mIsQsbInline); + } + + private boolean isStateManagerInState(@NonNull LauncherState state) { + return LauncherUiStateUtil.getLauncherState(mLauncher, mLauncherUiState) == state + || state == getFromRecentsWindowManager( + recentsWindowManager -> + toLauncherState(recentsWindowManager.getStateManager().getState())); } private final class TaskBarRecentsAnimationListener implements @@ -777,13 +1151,12 @@ private final class TaskBarRecentsAnimationListener implements @Override public void onRecentsAnimationCanceled(HashMap thumbnailDatas) { - boolean isInOverview = mLauncher.isInState(LauncherState.OVERVIEW); - endGestureStateOverride(!isInOverview, true /*canceled*/); + endGestureStateOverride(!isInLauncher(), /* canceled= */ true); } @Override public void onRecentsAnimationFinished(RecentsAnimationController controller) { - endGestureStateOverride(!controller.getFinishTargetIsLauncher(), false /*canceled*/); + endGestureStateOverride(!controller.getFinishTargetIsLauncher(), /* canceled= */ false); } /** @@ -793,13 +1166,18 @@ public void onRecentsAnimationFinished(RecentsAnimationController controller) { * * @param finishedToApp {@code true} if the recents animation finished to showing an app and * not workspace or overview - * @param canceled {@code true} if the recents animation was canceled instead of finishing - * to completion + * @param canceled {@code true} if the recents animation was canceled instead of + * finishing + * to completion */ private void endGestureStateOverride(boolean finishedToApp, boolean canceled) { mCallbacks.removeListener(this); mTaskBarRecentsAnimationListener = null; - ((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchListener(null); + RecentsView recentsView = mControllers.uiController.getRecentsView(); + if (recentsView != null) { + recentsView.setTaskLaunchListener(null); + recentsView.setTaskLaunchCancelledRunnable(null); + } if (mSkipNextRecentsAnimEnd && !canceled) { mSkipNextRecentsAnimEnd = false; @@ -811,6 +1189,7 @@ private void endGestureStateOverride(boolean finishedToApp, boolean canceled) { /** * Updates the visible state immediately to ensure a seamless handoff. + * * @param finishedToApp True iff user is in an app. */ private void updateStateForUserFinishedToApp(boolean finishedToApp) { @@ -828,6 +1207,50 @@ private void updateStateForUserFinishedToApp(boolean finishedToApp) { controller.applyState(); } + /** + * Helper function to run a callback on the RecentsWindowManager (if it exists). + */ + private void runForRecentsWindowManager(Consumer callback) { + getFromRecentsWindowManager(recentsWindowManager -> { + callback.accept(recentsWindowManager); + return null; + }); + } + + private @Nullable T getFromRecentsWindowManager( + Function function) { + final TaskbarActivityContext taskbarContext = mControllers.taskbarActivityContext; + int displayId = taskbarContext.getDisplayId(); + BaseContainerInterface containerInterface = OverviewComponentObserver.INSTANCE.get( + taskbarContext).getContainerInterface(displayId); + if (containerInterface == null + || !(containerInterface.getCreatedContainer() instanceof RecentsWindowManager + recentsWindowManager)) { + return null; + } + return function.apply(recentsWindowManager); + } + + private DeviceProfile getDeviceProfile() { + return LauncherUiStateUtil.getDeviceProfile(mLauncher, mLauncherUiState); + } + + private boolean isOverlayShown() { + if (refactorTaskbarUiState()) { + final boolean ret = mLauncherUiState.isOverlayShownRef().getValue(); + if (BuildConfigs.IS_STUDIO_BUILD && ret != legacyIsOverlayShown()) { + throw new IllegalStateException("isOverlayShown doesn't match"); + } + return ret; + } else { + return legacyIsOverlayShown(); + } + } + + private boolean legacyIsOverlayShown() { + return mLauncher.isOverlayShown(); + } + private static String getStateString(int flags) { StringJoiner result = new StringJoiner("|"); appendFlag(result, flags, FLAG_VISIBLE, "flag_visible"); @@ -851,8 +1274,9 @@ protected void dumpLogs(String prefix, PrintWriter pw) { pw.println(String.format( "%s\tmTaskbarBackgroundAlpha=%.2f", prefix, mTaskbarBackgroundAlpha.value)); pw.println(String.format( - "%s\tmIconAlphaForHome=%.2f", prefix, mIconAlphaForHome.getValue())); - pw.println(String.format("%s\tmPrevState=%s", prefix, getStateString(mPrevState))); + "%s\tmTaskbarAlphaForHome=%.2f", prefix, mTaskbarAlphaForHome.getValue())); + pw.println(String.format("%s\tmPrevState=%s", prefix, + mPrevState == null ? null : getStateString(mPrevState))); pw.println(String.format("%s\tmState=%s", prefix, getStateString(mState))); pw.println(String.format("%s\tmLauncherState=%s", prefix, mLauncherState)); pw.println(String.format( diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java deleted file mode 100644 index 8e8ab938324..00000000000 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ /dev/null @@ -1,686 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.taskbar; - -import static android.content.Context.RECEIVER_NOT_EXPORTED; -import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; -import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; - -import static com.android.launcher3.BaseActivity.EVENT_DESTROYED; -import static com.android.launcher3.Flags.enableUnfoldStateAnimation; -import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION; -import static com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate; -import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY; -import static com.android.launcher3.util.DisplayController.CHANGE_DESKTOP_MODE; -import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE; -import static com.android.launcher3.util.DisplayController.CHANGE_TASKBAR_PINNING; -import static com.android.launcher3.util.DisplayController.TASKBAR_NOT_DESTROYED_TAG; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; -import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; -import static com.android.quickstep.util.SystemActionConstants.ACTION_SHOW_TASKBAR; -import static com.android.quickstep.util.SystemActionConstants.SYSTEM_ACTION_ID_TASKBAR; - -import android.annotation.SuppressLint; -import android.app.PendingIntent; -import android.content.ComponentCallbacks; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.pm.ActivityInfo; -import android.content.res.Configuration; -import android.hardware.display.DisplayManager; -import android.net.Uri; -import android.os.Handler; -import android.os.Trace; -import android.provider.Settings; -import android.util.Log; -import android.view.Display; -import android.view.MotionEvent; -import android.view.WindowManager; -import android.widget.FrameLayout; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppState; -import com.android.launcher3.anim.AnimatorPlaybackController; -import com.android.launcher3.statemanager.StatefulActivity; -import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks; -import com.android.launcher3.taskbar.unfold.NonDestroyableScopedUnfoldTransitionProgressProvider; -import com.android.launcher3.uioverrides.QuickstepLauncher; -import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.SettingsCache; -import com.android.launcher3.util.SimpleBroadcastReceiver; -import com.android.quickstep.AllAppsActionManager; -import com.android.quickstep.RecentsActivity; -import com.android.quickstep.SystemUiProxy; -import com.android.quickstep.util.AssistUtils; -import com.android.systemui.shared.system.QuickStepContract; -import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; -import com.android.systemui.unfold.UnfoldTransitionProgressProvider; -import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; - -import java.io.PrintWriter; -import java.util.StringJoiner; - -import app.lawnchair.LawnchairApp; - -/** - * Class to manage taskbar lifecycle - */ -public class TaskbarManager { - private static final String TAG = "TaskbarManager"; - private static final boolean DEBUG = false; - - /** - * All the configurations which do not initiate taskbar recreation. - * This includes all the configurations defined in Launcher's manifest entry and - * ActivityController#filterConfigChanges - */ - private static final int SKIP_RECREATE_CONFIG_CHANGES = ActivityInfo.CONFIG_WINDOW_CONFIGURATION - | ActivityInfo.CONFIG_KEYBOARD - | ActivityInfo.CONFIG_KEYBOARD_HIDDEN - | ActivityInfo.CONFIG_MCC - | ActivityInfo.CONFIG_MNC - | ActivityInfo.CONFIG_NAVIGATION - | ActivityInfo.CONFIG_ORIENTATION - | ActivityInfo.CONFIG_SCREEN_SIZE - | ActivityInfo.CONFIG_SCREEN_LAYOUT - | ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE; - - - private final Context mContext; - private final @Nullable Context mNavigationBarPanelContext; - private WindowManager mWindowManager; - private FrameLayout mTaskbarRootLayout; - private boolean mAddedWindow; - private final TaskbarNavButtonController mNavButtonController; - private final ComponentCallbacks mComponentCallbacks; - - private final SimpleBroadcastReceiver mShutdownReceiver = - new SimpleBroadcastReceiver(i -> destroyExistingTaskbar()); - - // The source for this provider is set when Launcher is available - // We use 'non-destroyable' version here so the original provider won't be destroyed - // as it is tied to the activity lifecycle, not the taskbar lifecycle. - // It's destruction/creation will be managed by the activity. - private final ScopedUnfoldTransitionProgressProvider mUnfoldProgressProvider = - new NonDestroyableScopedUnfoldTransitionProgressProvider(); - - private TaskbarActivityContext mTaskbarActivityContext; - private StatefulActivity mActivity; - /** - * Cache a copy here so we can initialize state whenever taskbar is recreated, since - * this class does not get re-initialized w/ new taskbars. - */ - private final TaskbarSharedState mSharedState = new TaskbarSharedState(); - - /** - * We use WindowManager's ComponentCallbacks() for internal UI changes (similar to an Activity) - * which comes via a different channel - */ - private final RecreationListener mRecreationListener = new RecreationListener(); - - private class RecreationListener implements DisplayController.DisplayInfoChangeListener { - @Override - public void onDisplayInfoChanged(Context context, DisplayController.Info info, int flags) { - if ((flags & (CHANGE_DENSITY | CHANGE_NAVIGATION_MODE | CHANGE_DESKTOP_MODE - | CHANGE_TASKBAR_PINNING)) != 0) { - recreateTaskbar(); - } - } - } - private final SettingsCache.OnChangeListener mOnSettingsChangeListener = c -> recreateTaskbar(); - - private boolean mUserUnlocked = false; - - private final SimpleBroadcastReceiver mTaskbarBroadcastReceiver = - new SimpleBroadcastReceiver(this::showTaskbarFromBroadcast); - - private final AllAppsActionManager mAllAppsActionManager; - - private final Runnable mActivityOnDestroyCallback = new Runnable() { - @Override - public void run() { - if (mActivity != null) { - mActivity.removeOnDeviceProfileChangeListener( - mDebugActivityDeviceProfileChanged); - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "unregistering activity lifecycle callbacks from " - + "onActivityDestroyed."); - mActivity.removeEventCallback(EVENT_DESTROYED, this); - } - mActivity = null; - debugWhyTaskbarNotDestroyed("clearActivity"); - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.setUIController(TaskbarUIController.DEFAULT); - } - mUnfoldProgressProvider.setSourceProvider(null); - } - }; - - UnfoldTransitionProgressProvider.TransitionProgressListener mUnfoldTransitionProgressListener = - new UnfoldTransitionProgressProvider.TransitionProgressListener() { - @Override - public void onTransitionStarted() { - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "fold/unfold transition started getting called."); - } - - @Override - public void onTransitionProgress(float progress) { - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "fold/unfold transition progress : " + progress); - } - - @Override - public void onTransitionFinishing() { - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "fold/unfold transition finishing getting called."); - - } - - @Override - public void onTransitionFinished() { - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "fold/unfold transition finished getting called."); - - } - }; - - @SuppressLint("WrongConstant") - public TaskbarManager( - Context context, - AllAppsActionManager allAppsActionManager, - TaskbarNavButtonCallbacks navCallbacks) { - - Display display = - context.getSystemService(DisplayManager.class).getDisplay(DEFAULT_DISPLAY); - mContext = context.createWindowContext(display, - ENABLE_TASKBAR_NAVBAR_UNIFICATION ? TYPE_NAVIGATION_BAR : TYPE_NAVIGATION_BAR_PANEL, - null); - mAllAppsActionManager = allAppsActionManager; - mNavigationBarPanelContext = ENABLE_TASKBAR_NAVBAR_UNIFICATION - ? context.createWindowContext(display, TYPE_NAVIGATION_BAR_PANEL, null) - : null; - if (enableTaskbarNoRecreate()) { - mWindowManager = mContext.getSystemService(WindowManager.class); - mTaskbarRootLayout = new FrameLayout(mContext) { - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - // The motion events can be outside the view bounds of task bar, and hence - // manually dispatching them to the drag layer here. - if (mTaskbarActivityContext != null - && mTaskbarActivityContext.getDragLayer().isAttachedToWindow()) { - return mTaskbarActivityContext.getDragLayer().dispatchTouchEvent(ev); - } - return super.dispatchTouchEvent(ev); - } - }; - } - mNavButtonController = new TaskbarNavButtonController( - context, - navCallbacks, - SystemUiProxy.INSTANCE.get(mContext), - new Handler(), - AssistUtils.newInstance(mContext)); - mComponentCallbacks = new ComponentCallbacks() { - private Configuration mOldConfig = mContext.getResources().getConfiguration(); - - @Override - public void onConfigurationChanged(Configuration newConfig) { - Trace.instantForTrack(Trace.TRACE_TAG_APP, "TaskbarManager", - "onConfigurationChanged: " + newConfig); - debugWhyTaskbarNotDestroyed( - "TaskbarManager#mComponentCallbacks.onConfigurationChanged: " + newConfig); - DeviceProfile dp = mUserUnlocked - ? LauncherAppState.getIDP(mContext).getDeviceProfile(mContext) - : null; - int configDiff = mOldConfig.diff(newConfig) & ~SKIP_RECREATE_CONFIG_CHANGES; - - if ((configDiff & ActivityInfo.CONFIG_UI_MODE) != 0) { - // Only recreate for theme changes, not other UI mode changes such as docking. - int oldUiNightMode = (mOldConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK); - int newUiNightMode = (newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK); - if (oldUiNightMode == newUiNightMode) { - configDiff &= ~ActivityInfo.CONFIG_UI_MODE; - } - } - - debugWhyTaskbarNotDestroyed("ComponentCallbacks#onConfigurationChanged() " - + "configDiff=" + Configuration.configurationDiffToString(configDiff)); - if (configDiff != 0 || mTaskbarActivityContext == null) { - recreateTaskbar(); - } else { - // Config change might be handled without re-creating the taskbar - if (dp != null && !isTaskbarEnabled(dp)) { - destroyExistingTaskbar(); - } else { - if (dp != null && isTaskbarEnabled(dp)) { - if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) { - // Re-initialize for screen size change? Should this be done - // by looking at screen-size change flag in configDiff in the - // block above? - recreateTaskbar(); - } else { - mTaskbarActivityContext.updateDeviceProfile(dp); - } - } - mTaskbarActivityContext.onConfigurationChanged(configDiff); - } - } - mOldConfig = new Configuration(newConfig); - // reset taskbar was pinned value, so we don't automatically unstash taskbar upon - // user unfolding the device. - mSharedState.setTaskbarWasPinned(false); - } - - @Override - public void onLowMemory() { } - }; - - if (LawnchairApp.isRecentsEnabled ()) { - final Uri USER_SETUP_COMPLETE_URI = Settings.Secure.getUriFor( - Settings.Secure.USER_SETUP_COMPLETE); - - final Uri NAV_BAR_KIDS_MODE = Settings.Secure.getUriFor( - Settings.Secure.NAV_BAR_KIDS_MODE); - SettingsCache.INSTANCE.get(mContext) - .register(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener); - SettingsCache.INSTANCE.get(mContext) - .register(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener); - } - - Log.d(TASKBAR_NOT_DESTROYED_TAG, "registering component callbacks from constructor."); - mContext.registerComponentCallbacks(mComponentCallbacks); - mShutdownReceiver.register(mContext, Intent.ACTION_SHUTDOWN); - UI_HELPER_EXECUTOR.execute(() -> { - mSharedState.taskbarSystemActionPendingIntent = PendingIntent.getBroadcast( - mContext, - SYSTEM_ACTION_ID_TASKBAR, - new Intent(ACTION_SHOW_TASKBAR).setPackage(mContext.getPackageName()), - PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); - mContext.registerReceiver( - mTaskbarBroadcastReceiver, - new IntentFilter(ACTION_SHOW_TASKBAR), - RECEIVER_NOT_EXPORTED); - }); - - debugWhyTaskbarNotDestroyed("TaskbarManager created"); - recreateTaskbar(); - } - - private void destroyExistingTaskbar() { - debugWhyTaskbarNotDestroyed("destroyExistingTaskbar: " + mTaskbarActivityContext); - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.onDestroy(); - if (!ENABLE_TASKBAR_NAVBAR_UNIFICATION || enableTaskbarNoRecreate()) { - mTaskbarActivityContext = null; - } - } - DeviceProfile dp = mUserUnlocked ? - LauncherAppState.getIDP(mContext).getDeviceProfile(mContext) : null; - if (dp == null || !isTaskbarEnabled(dp)) { - removeTaskbarRootViewFromWindow(); - } - } - - /** - * Show Taskbar upon receiving broadcast - */ - private void showTaskbarFromBroadcast(Intent intent) { - if (ACTION_SHOW_TASKBAR.equals(intent.getAction()) && mTaskbarActivityContext != null) { - mTaskbarActivityContext.showTaskbarFromBroadcast(); - } - } - - /** - * Toggles All Apps for Taskbar or Launcher depending on the current state. - */ - public void toggleAllApps() { - if (mTaskbarActivityContext == null || mTaskbarActivityContext.canToggleHomeAllApps()) { - // Home All Apps should be toggled from this class, because the controllers are not - // initialized when Taskbar is disabled (i.e. TaskbarActivityContext is null). - if (mActivity instanceof Launcher l) l.toggleAllAppsSearch(); - } else { - mTaskbarActivityContext.toggleAllAppsSearch(); - } - } - - /** - * Displays a frame of the first Launcher reveal animation. - * - * This should be used to run a first Launcher reveal animation whose progress matches a swipe - * progress. - */ - public AnimatorPlaybackController createLauncherStartFromSuwAnim(int duration) { - return mTaskbarActivityContext == null - ? null : mTaskbarActivityContext.createLauncherStartFromSuwAnim(duration); - } - - /** - * Called when the user is unlocked - */ - public void onUserUnlocked() { - mUserUnlocked = true; - DisplayController.INSTANCE.get(mContext).addChangeListener(mRecreationListener); - recreateTaskbar(); - addTaskbarRootViewToWindow(); - } - - /** - * Sets a {@link StatefulActivity} to act as taskbar callback - */ - public void setActivity(@NonNull StatefulActivity activity) { - if (mActivity == activity) { - return; - } - removeActivityCallbacksAndListeners(); - mActivity = activity; - debugWhyTaskbarNotDestroyed("Set mActivity=" + mActivity); - mActivity.addOnDeviceProfileChangeListener(mDebugActivityDeviceProfileChanged); - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "registering activity lifecycle callbacks from setActivity()."); - mActivity.addEventCallback(EVENT_DESTROYED, mActivityOnDestroyCallback); - UnfoldTransitionProgressProvider unfoldTransitionProgressProvider = - getUnfoldTransitionProgressProviderForActivity(activity); - if (unfoldTransitionProgressProvider != null) { - unfoldTransitionProgressProvider.addCallback(mUnfoldTransitionProgressListener); - } - mUnfoldProgressProvider.setSourceProvider(unfoldTransitionProgressProvider); - - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.setUIController( - createTaskbarUIControllerForActivity(mActivity)); - } - } - - /** - * Returns an {@link UnfoldTransitionProgressProvider} to use while the given StatefulActivity - * is active. - */ - private UnfoldTransitionProgressProvider getUnfoldTransitionProgressProviderForActivity( - StatefulActivity activity) { - if (!enableUnfoldStateAnimation()) { - if (activity instanceof QuickstepLauncher ql) { - return ql.getUnfoldTransitionProgressProvider(); - } - } else { - return SystemUiProxy.INSTANCE.get(mContext).getUnfoldTransitionProvider(); - } - return null; - } - - /** - * Creates a {@link TaskbarUIController} to use while the given StatefulActivity is active. - */ - private TaskbarUIController createTaskbarUIControllerForActivity(StatefulActivity activity) { - if (activity instanceof QuickstepLauncher) { - return new LauncherTaskbarUIController((QuickstepLauncher) activity); - } - if (activity instanceof RecentsActivity) { - return new FallbackTaskbarUIController((RecentsActivity) activity); - } - return TaskbarUIController.DEFAULT; - } - - /** - * This method is called multiple times (ex. initial init, then when user unlocks) in which case - * we fully want to destroy an existing taskbar and create a new one. - * In other case (folding/unfolding) we don't need to remove and add window. - */ - @VisibleForTesting - public synchronized void recreateTaskbar() { - Trace.beginSection("recreateTaskbar"); - try { - DeviceProfile dp = mUserUnlocked ? - LauncherAppState.getIDP(mContext).getDeviceProfile(mContext) : null; - - // All Apps action is unrelated to navbar unification, so we only need to check DP. - final boolean isLargeScreenTaskbar = dp != null && dp.isTaskbarPresent; - mAllAppsActionManager.setTaskbarPresent(isLargeScreenTaskbar); - - destroyExistingTaskbar(); - - boolean isTaskbarEnabled = dp != null && isTaskbarEnabled(dp); - debugWhyTaskbarNotDestroyed("recreateTaskbar: isTaskbarEnabled=" + isTaskbarEnabled - + " [dp != null (i.e. mUserUnlocked)]=" + (dp != null) - + " FLAG_HIDE_NAVBAR_WINDOW=" + ENABLE_TASKBAR_NAVBAR_UNIFICATION - + " dp.isTaskbarPresent=" + (dp == null ? "null" : dp.isTaskbarPresent)); - if (!isTaskbarEnabled) { - SystemUiProxy.INSTANCE.get(mContext) - .notifyTaskbarStatus(/* visible */ false, /* stashed */ false); - return; - } - - if (enableTaskbarNoRecreate() || mTaskbarActivityContext == null) { - mTaskbarActivityContext = new TaskbarActivityContext(mContext, - mNavigationBarPanelContext, dp, mNavButtonController, - mUnfoldProgressProvider); - } else { - mTaskbarActivityContext.updateDeviceProfile(dp); - } - mSharedState.startTaskbarVariantIsTransient = - DisplayController.isTransientTaskbar(mTaskbarActivityContext); - mSharedState.allAppsVisible = mSharedState.allAppsVisible && isLargeScreenTaskbar; - mTaskbarActivityContext.init(mSharedState); - - if (mActivity != null) { - mTaskbarActivityContext.setUIController( - createTaskbarUIControllerForActivity(mActivity)); - } - - if (enableTaskbarNoRecreate()) { - addTaskbarRootViewToWindow(); - mTaskbarRootLayout.removeAllViews(); - mTaskbarRootLayout.addView(mTaskbarActivityContext.getDragLayer()); - mTaskbarActivityContext.notifyUpdateLayoutParams(); - } - } finally { - Trace.endSection(); - } - } - - public void onSystemUiFlagsChanged(@SystemUiStateFlags long systemUiStateFlags) { - if (DEBUG) { - Log.d(TAG, "SysUI flags changed: " + formatFlagChange(systemUiStateFlags, - mSharedState.sysuiStateFlags, QuickStepContract::getSystemUiStateString)); - } - mSharedState.sysuiStateFlags = systemUiStateFlags; - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.updateSysuiStateFlags(systemUiStateFlags, false /* fromInit */); - } - } - - public void onLongPressHomeEnabled(boolean assistantLongPressEnabled) { - if (mNavButtonController != null) { - mNavButtonController.setAssistantLongPressEnabled(assistantLongPressEnabled); - } - } - - /** - * Sets the flag indicating setup UI is visible - */ - public void setSetupUIVisible(boolean isVisible) { - mSharedState.setupUIVisible = isVisible; - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.setSetupUIVisible(isVisible); - } - } - - private boolean isTaskbarEnabled(DeviceProfile deviceProfile) { - return ENABLE_TASKBAR_NAVBAR_UNIFICATION || deviceProfile.isTaskbarPresent; - } - - public void onRotationProposal(int rotation, boolean isValid) { - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.onRotationProposal(rotation, isValid); - } - } - - public void disableNavBarElements(int displayId, int state1, int state2, boolean animate) { - mSharedState.disableNavBarDisplayId = displayId; - mSharedState.disableNavBarState1 = state1; - mSharedState.disableNavBarState2 = state2; - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.disableNavBarElements(displayId, state1, state2, animate); - } - } - - public void onSystemBarAttributesChanged(int displayId, int behavior) { - mSharedState.systemBarAttrsDisplayId = displayId; - mSharedState.systemBarAttrsBehavior = behavior; - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.onSystemBarAttributesChanged(displayId, behavior); - } - } - - public void onNavButtonsDarkIntensityChanged(float darkIntensity) { - mSharedState.navButtonsDarkIntensity = darkIntensity; - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.onNavButtonsDarkIntensityChanged(darkIntensity); - } - } - - public void onNavigationBarLumaSamplingEnabled(int displayId, boolean enable) { - mSharedState.mLumaSamplingDisplayId = displayId; - mSharedState.mIsLumaSamplingEnabled = enable; - if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.onNavigationBarLumaSamplingEnabled(displayId, enable); - } - } - - private void removeActivityCallbacksAndListeners() { - if (mActivity != null) { - mActivity.removeOnDeviceProfileChangeListener(mDebugActivityDeviceProfileChanged); - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "unregistering activity lifecycle callbacks from " - + "removeActivityCallbackAndListeners()."); - mActivity.removeEventCallback(EVENT_DESTROYED, mActivityOnDestroyCallback); - UnfoldTransitionProgressProvider unfoldTransitionProgressProvider = - getUnfoldTransitionProgressProviderForActivity(mActivity); - if (unfoldTransitionProgressProvider != null) { - unfoldTransitionProgressProvider.removeCallback(mUnfoldTransitionProgressListener); - } - } - } - - /** - * Called when the manager is no longer needed - */ - public void destroy() { - debugWhyTaskbarNotDestroyed("TaskbarManager#destroy()"); - removeActivityCallbacksAndListeners(); - UI_HELPER_EXECUTOR.execute( - () -> mTaskbarBroadcastReceiver.unregisterReceiverSafely(mContext)); - destroyExistingTaskbar(); - removeTaskbarRootViewFromWindow(); - if (mUserUnlocked) { - DisplayController.INSTANCE.get(mContext).removeChangeListener(mRecreationListener); - } - if (LawnchairApp.isRecentsEnabled()) { - final Uri USER_SETUP_COMPLETE_URI = Settings.Secure.getUriFor( - Settings.Secure.USER_SETUP_COMPLETE); - final Uri NAV_BAR_KIDS_MODE = Settings.Secure.getUriFor( - Settings.Secure.NAV_BAR_KIDS_MODE); - - SettingsCache.INSTANCE.get(mContext) - .unregister(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener); - SettingsCache.INSTANCE.get(mContext) - .unregister(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener); - } - - Log.d(TASKBAR_NOT_DESTROYED_TAG, "unregistering component callbacks from destroy()."); - mContext.unregisterComponentCallbacks(mComponentCallbacks); - mContext.unregisterReceiver(mShutdownReceiver); - } - - public @Nullable TaskbarActivityContext getCurrentActivityContext() { - return mTaskbarActivityContext; - } - - public void dumpLogs(String prefix, PrintWriter pw) { - pw.println(prefix + "TaskbarManager:"); - if (mTaskbarActivityContext == null) { - pw.println(prefix + "\tTaskbarActivityContext: null"); - } else { - mTaskbarActivityContext.dumpLogs(prefix + "\t", pw); - } - } - - @VisibleForTesting - void addTaskbarRootViewToWindow() { - if (enableTaskbarNoRecreate() && !mAddedWindow && mTaskbarActivityContext != null) { - mWindowManager.addView(mTaskbarRootLayout, - mTaskbarActivityContext.getWindowLayoutParams()); - mAddedWindow = true; - } - } - - @VisibleForTesting - void removeTaskbarRootViewFromWindow() { - if (enableTaskbarNoRecreate() && mAddedWindow) { - mWindowManager.removeViewImmediate(mTaskbarRootLayout); - mAddedWindow = false; - } - } - - /** Temp logs for b/254119092. */ - public void debugWhyTaskbarNotDestroyed(String debugReason) { - StringJoiner log = new StringJoiner("\n"); - log.add(debugReason); - - boolean activityTaskbarPresent = mActivity != null - && mActivity.getDeviceProfile().isTaskbarPresent; - boolean contextTaskbarPresent = mUserUnlocked - && LauncherAppState.getIDP(mContext).getDeviceProfile(mContext).isTaskbarPresent; - if (activityTaskbarPresent == contextTaskbarPresent) { - log.add("mActivity and mContext agree taskbarIsPresent=" + contextTaskbarPresent); - Log.d(TASKBAR_NOT_DESTROYED_TAG, log.toString()); - return; - } - - log.add("mActivity and mContext device profiles have different values, add more logs."); - - log.add("\tmActivity logs:"); - log.add("\t\tmActivity=" + mActivity); - if (mActivity != null) { - log.add("\t\tmActivity.getResources().getConfiguration()=" - + mActivity.getResources().getConfiguration()); - log.add("\t\tmActivity.getDeviceProfile().isTaskbarPresent=" - + activityTaskbarPresent); - } - log.add("\tmContext logs:"); - log.add("\t\tmContext=" + mContext); - log.add("\t\tmContext.getResources().getConfiguration()=" - + mContext.getResources().getConfiguration()); - if (mUserUnlocked) { - log.add("\t\tLauncherAppState.getIDP().getDeviceProfile(mContext).isTaskbarPresent=" - + contextTaskbarPresent); - } else { - log.add("\t\tCouldn't get DeviceProfile because !mUserUnlocked"); - } - - Log.d(TASKBAR_NOT_DESTROYED_TAG, log.toString()); - } - - private final DeviceProfile.OnDeviceProfileChangeListener mDebugActivityDeviceProfileChanged = - dp -> debugWhyTaskbarNotDestroyed("mActivity onDeviceProfileChanged"); -} \ No newline at end of file diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.kt new file mode 100644 index 00000000000..fea3fca8216 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.kt @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.app.PendingIntent +import com.android.app.displaylib.DisplayDecorationListener +import com.android.launcher3.anim.AnimatorPlaybackController +import com.android.launcher3.statemanager.StatefulActivity +import com.android.quickstep.views.RecentsViewContainer +import com.android.systemui.shared.statusbar.phone.BarTransitions +import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags +import java.io.PrintWriter + +interface TaskbarManager : DisplayDecorationListener { + + fun createLauncherStartFromSuwAnim(duration: Int): AnimatorPlaybackController? + + fun shouldForceAllSetFallbackAnimation(): Boolean + + fun onUserUnlocked() + + fun setActivity(activity: StatefulActivity<*>) + + fun setRecentsViewContainer(recentsViewContainer: RecentsViewContainer) + + fun recreateTaskbars() + + fun onSystemUiFlagsChanged(@SystemUiStateFlags systemUiStateFlags: Long, displayId: Int) + + fun onLongPressHomeEnabled(assistantLongPressEnabled: Boolean) + + fun setSetupUIVisible(isVisible: Boolean) + + fun setWallpaperVisible(displayId: Int, isVisible: Boolean) + + fun checkNavBarModes(displayId: Int) + + fun finishBarAnimations(displayId: Int) + + fun touchAutoDim(displayId: Int, reset: Boolean) + + fun transitionTo(displayId: Int, @BarTransitions.TransitionMode barMode: Int, animate: Boolean) + + fun appTransitionPending(pending: Boolean) + + fun onRotationProposal(rotation: Int, isValid: Boolean) + + fun disableNavBarElements(displayId: Int, state1: Int, state2: Int, animate: Boolean) + + fun onSystemBarAttributesChanged(displayId: Int, behavior: Int) + + fun onTransitionModeUpdated(barMode: Int, checkBarModes: Boolean) + + fun onNavButtonsDarkIntensityChanged(darkIntensity: Float) + + fun onNavigationBarLumaSamplingEnabled(displayId: Int, enable: Boolean) + + fun destroy() + + fun getCurrentActivityContext(): TaskbarActivityContext? + + fun dumpLogs(prefix: String, pw: PrintWriter) + + fun getUIControllerForDisplay(displayId: Int): TaskbarUIController? + + fun getTaskbarForDisplay(displayId: Int): TaskbarActivityContext? + + fun createAllAppsPendingIntent(): PendingIntent + + fun getPrimaryDisplayId(): Int + + fun debugPrimaryTaskbar(debugReason: String, verbose: Boolean) +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java new file mode 100644 index 00000000000..9acc6a1f170 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java @@ -0,0 +1,1955 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.taskbar; + +import static android.content.Context.RECEIVER_EXPORTED; +import static android.content.Context.RECEIVER_NOT_EXPORTED; +import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT; +import static android.os.Process.THREAD_PRIORITY_FOREGROUND; +import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; +import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; + +import static com.android.launcher3.BaseActivity.EVENT_DESTROYED; +import static com.android.launcher3.Flags.enableGrowthNudge; +import static com.android.launcher3.Flags.enableTaskbarForDirectBoot; +import static com.android.launcher3.Flags.enableTaskbarUiThread; +import static com.android.launcher3.Flags.enableUnfoldStateAnimation; +import static com.android.launcher3.LauncherPrefs.TASKBAR_PINNING; +import static com.android.launcher3.LauncherPrefs.TASKBAR_PINNING_IN_DESKTOP_MODE; +import static com.android.launcher3.LauncherPrefs.TASKBAR_PINNING_KEY; +import static com.android.launcher3.statehandlers.DesktopVisibilityController.INACTIVE_DESK_ID; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAutoStashConnectedDisplayTaskbar; +import static com.android.launcher3.taskbar.growth.GrowthConstants.BROADCAST_SHOW_NUDGE; +import static com.android.launcher3.taskbar.growth.GrowthConstants.GROWTH_NUDGE_PERMISSION; +import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY; +import static com.android.launcher3.util.DisplayController.CHANGE_DESKTOP_MODE; +import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE; +import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION; +import static com.android.launcher3.util.DisplayController.CHANGE_SHOW_LOCKED_TASKBAR; +import static com.android.launcher3.util.DisplayController.CHANGE_TASKBAR_PINNING; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; +import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; +import static com.android.launcher3.util.SimpleBroadcastReceiver.actionsFilter; +import static com.android.quickstep.util.SystemActionConstants.ACTION_SHOW_TASKBAR; +import static com.android.quickstep.util.SystemActionConstants.SYSTEM_ACTION_ID_TASKBAR; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAVIGATION_BAR_DISABLED; +import static com.android.wm.shell.shared.desktopmode.DesktopModeStatus.enableMultipleDesktops; + +import android.animation.AnimatorSet; +import android.annotation.SuppressLint; +import android.app.PendingIntent; +import android.content.ComponentCallbacks; +import android.content.Context; +import android.content.IIntentReceiver; +import android.content.IIntentSender; +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.content.res.Configuration; +import android.hardware.display.DisplayManager; +import android.net.Uri; +import android.os.Bundle; +import android.os.Handler; +import android.os.IBinder; +import android.os.Trace; +import android.provider.Settings; +import android.util.ArraySet; +import android.util.Log; +import android.util.SparseArray; +import android.util.SparseBooleanArray; +import android.view.Display; +import android.view.MotionEvent; +import android.view.WindowManager; +import android.widget.FrameLayout; +import android.window.DesktopExperienceFlags; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + +import com.android.app.displaylib.DisplayDecorationListener; +import com.android.app.displaylib.DisplaysWithDecorationsRepositoryCompat; +import com.android.app.displaylib.PerDisplayRepository; +import com.android.internal.util.LatencyTracker; +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherAppState; +import com.android.launcher3.LauncherInteractor; +import com.android.launcher3.LauncherPrefChangeListener; +import com.android.launcher3.LauncherPrefs; +import com.android.wm.shell.shared.R; +import com.android.launcher3.anim.AnimatorListeners; +import com.android.launcher3.anim.AnimatorPlaybackController; +import com.android.launcher3.statehandlers.DesktopVisibilityController; +import com.android.launcher3.statemanager.StatefulActivity; +import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks; +import com.android.launcher3.taskbar.unfold.NonDestroyableScopedUnfoldTransitionProgressProvider; +import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.LockedUserState; +import com.android.launcher3.util.LooperExecutor; +import com.android.launcher3.util.SettingsCache; +import com.android.launcher3.util.SimpleBroadcastReceiver; +import com.android.launcher3.util.window.WindowManagerProxy; +import com.android.quickstep.AllAppsActionManager; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.OverviewComponentObserver; +import com.android.quickstep.RecentsActivity; +import com.android.quickstep.SystemDecorationChangeObserver; +import com.android.quickstep.SystemUiProxy; +import com.android.quickstep.util.ContextualSearchInvoker; +import com.android.quickstep.util.SystemUiFlagUtils; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.systemui.shared.statusbar.phone.BarTransitions; +import com.android.systemui.shared.system.QuickStepContract; +import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.systemui.unfold.UnfoldTransitionProgressProvider; +import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; + +import kotlinx.coroutines.CoroutineDispatcher; + +import java.io.PrintWriter; +import java.lang.ref.WeakReference; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.StringJoiner; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executor; +import java.util.function.IntConsumer; + +/** + * Class to manage taskbar lifecycle + */ +public class TaskbarManagerImpl implements DisplayDecorationListener { + private static final String TAG = "TaskbarManager"; + private static final boolean DEBUG = false; + private static final int TASKBAR_DESTROY_DURATION = 100; + + // TODO: b/397738606 - Remove all logs with this tag after the growth framework is integrated. + public static final String GROWTH_FRAMEWORK_TAG = "Growth Framework"; + + /** + * All the configurations which do not initiate taskbar recreation. + * This includes all the configurations defined in Launcher's manifest entry and + * ActivityController#filterConfigChanges + */ + private static final int SKIP_RECREATE_CONFIG_CHANGES = ActivityInfo.CONFIG_WINDOW_CONFIGURATION + | ActivityInfo.CONFIG_KEYBOARD + | ActivityInfo.CONFIG_KEYBOARD_HIDDEN + | ActivityInfo.CONFIG_MCC + | ActivityInfo.CONFIG_MNC + | ActivityInfo.CONFIG_NAVIGATION + | ActivityInfo.CONFIG_ORIENTATION + | ActivityInfo.CONFIG_SCREEN_SIZE + | ActivityInfo.CONFIG_SCREEN_LAYOUT + | ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE; + + private static final Uri USER_SETUP_COMPLETE_URI = Settings.Secure.getUriFor( + Settings.Secure.USER_SETUP_COMPLETE); + + private static final Uri NAV_BAR_KIDS_MODE = Settings.Secure.getUriFor( + Settings.Secure.NAV_BAR_KIDS_MODE); + + public static final LooperExecutor TASKBAR_UI_THREAD = + new LooperExecutor("TASKBAR_UI_THREAD", THREAD_PRIORITY_FOREGROUND); + + private final Context mBaseContext; + private final WindowManager mBaseWindowManager; + private final int mPrimaryDisplayId; + private final TaskbarNavButtonCallbacks mNavCallbacks; + // TODO: Remove this during the connected displays lifecycle refactor. + private final Context mPrimaryWindowContext; + private final WindowManager mPrimaryWindowManager; + private final DisplayManager mDisplayManager; + private TaskbarNavButtonController mPrimaryNavButtonController; + private ComponentCallbacks mPrimaryComponentCallbacks; + + private final SimpleBroadcastReceiver mShutdownReceiver; + private final DisplaysWithDecorationsRepositoryCompat mDisplaysWithDecorationsRepositoryCompat; + + // The source for this provider is set when Launcher is available + // We use 'non-destroyable' version here so the original provider won't be destroyed + // as it is tied to the activity lifecycle, not the taskbar lifecycle. + // It's destruction/creation will be managed by the activity. + private final ScopedUnfoldTransitionProgressProvider mUnfoldProgressProvider = + new NonDestroyableScopedUnfoldTransitionProgressProvider(); + /** DisplayId - {@link TaskbarActivityContext} map for Connected Display. */ + private final Map + mTaskbars = enableTaskbarUiThread() ? new ConcurrentHashMap<>() : new HashMap<>(); + /** DisplayId - {@link Context} map for Connected Display. */ + private final SparseArray mWindowContexts = new SparseArray<>(); + /** DisplayId - {@link FrameLayout} map for Connected Display. */ + private final SparseArray mRootLayouts = new SparseArray<>(); + /** DisplayId - {@link Boolean} map indicating if RootLayout was added to window. */ + private final SparseBooleanArray mAddedRootLayouts = new SparseBooleanArray(); + /** DisplayId - {@link TaskbarNavButtonController} map for Connected Display. */ + private final SparseArray mNavButtonControllers = + new SparseArray<>(); + /** DisplayId - {@link ComponentCallbacks} map for Connected Display. */ + private final SparseArray mComponentCallbacks = new SparseArray<>(); + /** DisplayId - {@link DeviceProfile} map for Connected Display. */ + private final SparseArray mExternalDeviceProfiles = new SparseArray<>(); + private StatefulActivity mActivity; + private RecentsViewContainer mRecentsViewContainer; + + /** + * Cache a copy here so we can initialize state whenever taskbar is recreated, since + * this class does not get re-initialized w/ new taskbars. + */ + private final Map mTaskbarSharedStates = new ConcurrentHashMap<>(); + + private final LauncherPrefChangeListener mTaskbarPinningPreferenceChangeListener = + new LauncherPrefChangeListener() { + @Override + public void onPrefChanged(String key) { + boolean isTaskbarPinningChanged = TASKBAR_PINNING_KEY.equals(key); + if (isTaskbarPinningChanged) { + recreateTaskbars(); + } + } + }; + + private final WindowManagerProxy.DesktopVisibilityListener mDesktopVisibilityListener = + new WindowManagerProxy.DesktopVisibilityListener() { + + @Override + public void onListenerInitializedFromShell() { + if (!enableAutoStashConnectedDisplayTaskbar.isTrue()) { + return; + } + + for (TaskbarActivityContext tac : mTaskbars.values()) { + TaskbarControllers controllers = tac.getControllers(); + controllers.taskbarStashController.updateFlagForDesktopModeOnCD( + /* fromInit= */ false); + } + } + + @Override + public void onActiveDeskChanged(int displayId, int newActiveDesk, + int oldActiveDesk) { + TaskbarActivityContext taskbarActivityContext = getTaskbarForDisplay(displayId); + if (taskbarActivityContext == null) { + return; + } + + if (newActiveDesk == INACTIVE_DESK_ID || oldActiveDesk == INACTIVE_DESK_ID) { + TaskbarControllers controllers = taskbarActivityContext.getControllers(); + controllers.taskbarStashController.updateFlagForDesktopModeOnCD( + /* fromInit= */ false); + + // Only Handles Special Exit Cases for Desktop Mode Taskbar Recreation. + if (!taskbarActivityContext.showLockedTaskbarOnHome() + && !taskbarActivityContext.showDesktopTaskbarForFreeformDisplay()) { + int recreateDuration = taskbarActivityContext.getResources().getInteger( + R.integer.to_desktop_animation_duration_ms); + AnimatorSet animatorSet = taskbarActivityContext.onDestroyAnimation( + TASKBAR_DESTROY_DURATION); + animatorSet.addListener(AnimatorListeners.forEndCallback( + () -> recreateTaskbarForDisplay(displayId, recreateDuration))); + animatorSet.start(); + } + } + } + }; + + /** + * We use WindowManager's ComponentCallbacks() for internal UI changes (similar to an Activity) + * which comes via a different channel + */ + private final RecreationListener mRecreationListener = new RecreationListener(); + + /** Not {@code null} if direct boot support is enabled and not {@link #mUserUnlocked} yet. */ + private @Nullable TaskbarBootAppContext mBootAppContext; + + private class RecreationListener implements DisplayController.DisplayInfoChangeListener { + @Override + public void onDisplayInfoChanged(Context context, DisplayController.Info info, int flags) { + int displayId = context.getDisplayId(); + if ((flags & CHANGE_DENSITY) != 0) { + debugTaskbarManager("onDisplayInfoChanged: Display density changed", displayId); + } + if ((flags & CHANGE_NAVIGATION_MODE) != 0) { + debugTaskbarManager("onDisplayInfoChanged: Navigation mode changed", displayId); + } + if ((flags & CHANGE_DESKTOP_MODE) != 0) { + debugTaskbarManager("onDisplayInfoChanged: Desktop mode changed", displayId); + } + if ((flags & CHANGE_TASKBAR_PINNING) != 0) { + debugTaskbarManager("onDisplayInfoChanged: Taskbar pinning changed", displayId); + } + if ((flags & CHANGE_ROTATION) != 0) { + debugTaskbarManager("onDisplayInfoChanged: Rotation changed", displayId); + } + + // Use a helper to update DP (only for secondary displays) and then recreate taskbar. + IntConsumer updateExternalDpAndRecreateTaskbar = displayIdToUpdate -> { + // Don't update DP for primary display as IDP already takes care of this. + createExternalDeviceProfile(displayIdToUpdate); + recreateTaskbarForDisplay(displayIdToUpdate, /* duration= */ 0); + }; + + if ((flags & (CHANGE_DENSITY | CHANGE_NAVIGATION_MODE + | CHANGE_SHOW_LOCKED_TASKBAR | CHANGE_ROTATION)) != 0) { + + if ((flags & CHANGE_SHOW_LOCKED_TASKBAR) != 0) { + debugTaskbarManager("onDisplayInfoChanged: show locked taskbar changed!", + displayId); + } + updateExternalDpAndRecreateTaskbar.accept(displayId); + } + } + } + + private final SettingsCache.OnChangeListener mOnSettingsChangeListener = c -> { + debugPrimaryTaskbar("Settings changed! Recreating Taskbar!"); + recreateTaskbars(); + }; + + private final DesktopVisibilityController.TaskbarDesktopModeListener + mTaskbarDesktopModeListener = + new DesktopVisibilityController.TaskbarDesktopModeListener() { + @Override + public void onExitDesktopMode(int duration) { + if (enableMultipleDesktops(mBaseContext)) { + LatencyTracker.getInstance(mBaseContext).onActionStart( + LatencyTracker.ACTION_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE); + } + + TaskbarActivityContext taskbarActivityContext = getCurrentActivityContext(); + if (taskbarActivityContext != null + && !taskbarActivityContext.isInOverview() + && !taskbarActivityContext.showDesktopTaskbarForFreeformDisplay()) { + AnimatorSet animatorSet = taskbarActivityContext.onDestroyAnimation( + TASKBAR_DESTROY_DURATION); + animatorSet.addListener(AnimatorListeners.forEndCallback( + () -> recreateTaskbarForDisplay(mPrimaryDisplayId, duration))); + animatorSet.start(); + } + } + + @Override + public void onEnterDesktopMode(int duration) { + TaskbarActivityContext taskbarActivityContext = getCurrentActivityContext(); + if (taskbarActivityContext != null + && !taskbarActivityContext.showDesktopTaskbarForFreeformDisplay()) { + AnimatorSet animatorSet = taskbarActivityContext.onDestroyAnimation( + TASKBAR_DESTROY_DURATION); + animatorSet.addListener(AnimatorListeners.forEndCallback( + () -> recreateTaskbarForDisplay(mPrimaryDisplayId, duration))); + animatorSet.start(); + } + } + + @Override + public void onTaskbarCornerRoundingUpdate( + boolean doesAnyTaskRequireTaskbarRounding) { + //NO-OP + } + }; + + private boolean mUserUnlocked; + private boolean mDeviceUnlocked; + + private final Map mTaskbarBroadcastReceivers = + new ConcurrentHashMap<>(); + + private final SimpleBroadcastReceiver mGrowthBroadcastReceiver; + + private final AllAppsActionManager mAllAppsActionManager; + + private final Runnable mActivityOnDestroyCallback = new Runnable() { + @Override + public void run() { + int displayId = mPrimaryDisplayId; + debugTaskbarManager("onActivityDestroyed:", displayId); + if (mActivity != null) { + displayId = mActivity.getDisplayId(); + mActivity.removeOnDeviceProfileChangeListener( + mDebugActivityDeviceProfileChanged); + debugTaskbarManager("onActivityDestroyed: unregistering callbacks", displayId); + mActivity.removeEventCallback(EVENT_DESTROYED, this); + } + if (mActivity == mRecentsViewContainer) { + mRecentsViewContainer = null; + } + mActivity = null; + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + debugTaskbarManager("onActivityDestroyed: setting taskbarUIController", displayId); + taskbar.setUIController(TaskbarUIController.DEFAULT); + } else { + debugTaskbarManager("onActivityDestroyed: taskbar is null!", displayId); + } + mUnfoldProgressProvider.setSourceProvider(null); + } + }; + + UnfoldTransitionProgressProvider.TransitionProgressListener mUnfoldTransitionProgressListener = + new UnfoldTransitionProgressProvider.TransitionProgressListener() { + @Override + public void onTransitionStarted() { + debugPrimaryTaskbar("fold/unfold transition started getting called."); + } + + @Override + public void onTransitionProgress(float progress) { + debugPrimaryTaskbar( + "fold/unfold transition progress getting called. | progress=" + + progress); + } + + @Override + public void onTransitionFinishing() { + debugPrimaryTaskbar( + "fold/unfold transition finishing getting called."); + + } + + @Override + public void onTransitionFinished() { + debugPrimaryTaskbar( + "fold/unfold transition finished getting called."); + } + }; + + @SuppressLint("WrongConstant") + public TaskbarManagerImpl( + Context context, + AllAppsActionManager allAppsActionManager, + TaskbarNavButtonCallbacks navCallbacks, + PerDisplayRepository recentsWindowManagerRepository, + DisplaysWithDecorationsRepositoryCompat displaysWithDecorationsRepositoryCompat, + CoroutineDispatcher dispatcher) { + mBaseContext = context; + mBaseWindowManager = mBaseContext.getSystemService(WindowManager.class); + mPrimaryDisplayId = mBaseContext.getDisplayId(); + attachPinningSharedPreferenceChangeListener(context); + DesktopVisibilityController.INSTANCE.get(mBaseContext).registerDesktopVisibilityListener( + mDesktopVisibilityListener); + mAllAppsActionManager = allAppsActionManager; + mNavCallbacks = navCallbacks; + mDisplaysWithDecorationsRepositoryCompat = displaysWithDecorationsRepositoryCompat; + + // Set up primary display. + debugPrimaryTaskbar("TaskbarManager constructor"); + mDisplayManager = mBaseContext.getSystemService(DisplayManager.class); + mPrimaryWindowContext = createWindowContext(mPrimaryDisplayId); + addWindowContextToMap(mPrimaryDisplayId, mPrimaryWindowContext); + mPrimaryWindowManager = mPrimaryWindowContext.getSystemService(WindowManager.class); + DesktopVisibilityController.INSTANCE.get( + mPrimaryWindowContext).registerTaskbarDesktopModeListener( + mTaskbarDesktopModeListener); + createTaskbarRootLayout(mPrimaryDisplayId); + createNavButtonController(mPrimaryDisplayId); + createAndRegisterComponentCallbacks(mPrimaryDisplayId); + + SettingsCache.INSTANCE.get(mPrimaryWindowContext) + .register(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener); + SettingsCache.INSTANCE.get(mPrimaryWindowContext) + .register(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener); + if (DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue() + && DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue()) { + displaysWithDecorationsRepositoryCompat + .registerDisplayDecorationListener(this, dispatcher); + } else { + SystemDecorationChangeObserver.getINSTANCE().get(mPrimaryWindowContext) + .registerDisplayDecorationListener(this); + addSystemDecorationForDisplaysAtBoot(); + } + mShutdownReceiver = new SimpleBroadcastReceiver( + mPrimaryWindowContext, + UI_HELPER_EXECUTOR, + MAIN_EXECUTOR, + i -> destroyAllTaskbars()); + + mShutdownReceiver.register(actionsFilter(Intent.ACTION_SHUTDOWN)); + if (enableGrowthNudge()) { + // TODO: b/397739323 - Add permission to limit access to Growth Framework. + mGrowthBroadcastReceiver = new SimpleBroadcastReceiver( + mPrimaryWindowContext, + UI_HELPER_EXECUTOR, + MAIN_EXECUTOR, + this::showGrowthNudge); + mGrowthBroadcastReceiver.register( + actionsFilter(BROADCAST_SHOW_NUDGE), + RECEIVER_EXPORTED, + GROWTH_NUDGE_PERMISSION); + } else { + mGrowthBroadcastReceiver = null; + } + + // Only initialize this context when the user is truly locked. Thus, check unlock state + // separately from mUserUnlocked, which starts at false until TIS calls onUserUnlocked(). + // TIS can recreate after the user is unlocked, where it notifies unlock immediately. Also, + // avoid initializing mUserUnlocked here and instead rely on TIS, because it initializes + // several Taskbar dependencies before notifying us. + if (enableTaskbarForDirectBoot() && !LockedUserState.get(mBaseContext).isUserUnlocked()) { + mBootAppContext = new TaskbarBootAppContext(mBaseContext); + } + recreateTaskbarForDisplay(mPrimaryDisplayId, /* duration= */ 0); + + debugPrimaryTaskbar("TaskbarManager created"); + } + + /** + * Calls {@link #onDisplayAddSystemDecorations(int)} for all displays + * TODO b/408503553: Remove when WM is used instead of CommandQueue for system decorations. + */ + private void addSystemDecorationForDisplaysAtBoot() { + if (mDisplayManager == null) { + return; + } + + for (Display display : mDisplayManager.getDisplays()) { + onDisplayAddSystemDecorations(display.getDisplayId()); + } + } + + public LooperExecutor getPerWindowUiExecutor() { + return TASKBAR_UI_THREAD; + } + + private boolean getFreeformWindowsManagementInfo() { + return getPrimaryWindowContext().getPackageManager().hasSystemFeature( + FEATURE_FREEFORM_WINDOW_MANAGEMENT); + } + + private void destroyAllTaskbars() { + debugPrimaryTaskbar("destroyAllTaskbars"); + for (Entry entry : new ArraySet<>(mTaskbars.entrySet())) { + int displayId = entry.getKey(); + debugTaskbarManager("destroyAllTaskbars: call destroyTaskbarForDisplay", displayId); + destroyTaskbarForDisplay(entry.getValue()); + + debugTaskbarManager("destroyAllTaskbars: call removeTaskbarRootViewFromWindow", + displayId); + removeTaskbarRootViewFromWindow(displayId); + } + } + + private void destroyTaskbarForDisplay(int displayId) { + TaskbarActivityContext taskbar = mTaskbars.get(displayId); + if (taskbar == null) { + debugTaskbarManager("destroyTaskbarForDisplay: taskbar is NULL!", displayId); + return; + } + destroyTaskbarForDisplay(taskbar); + } + + private void destroyTaskbarForDisplay(TaskbarActivityContext taskbar) { + final int displayId = taskbar.getDisplayId(); + debugTaskbarManager("destroyTaskbarForDisplay", displayId); + taskbar.onDestroy(); + // remove all defaults that we store + removeTaskbarFromMap(displayId); + + DeviceProfile dp = getDeviceProfile(displayId); + if (dp == null || !isTaskbarEnabled(displayId, dp)) { + removeTaskbarRootViewFromWindow(displayId); + } + } + + /** + * Show Taskbar upon receiving broadcast + */ + private void showTaskbarFromBroadcast(Intent intent, int displayId) { + debugTaskbarManager("destroyTaskbarForDisplay", displayId); + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (ACTION_SHOW_TASKBAR.equals(intent.getAction()) && taskbar != null) { + taskbar.showTaskbarFromBroadcast(); + } + } + + private void showGrowthNudge(Intent intent) { + if (!enableGrowthNudge()) { + return; + } + if (BROADCAST_SHOW_NUDGE.equals(intent.getAction())) { + // TODO: b/397738606 - extract the details and create a nudge payload. + Log.d(GROWTH_FRAMEWORK_TAG, "Intent received"); + } + } + + /** + * Shows or hides the All Apps view in the Taskbar or Launcher, based on its current + * visibility on the System UI tracked focused display. + */ + @VisibleForTesting + void toggleAllAppsSearch() { + if (!mDeviceUnlocked) return; + + TaskbarActivityContext taskbar = getTaskbarForDisplay(getFocusedDisplayId()); + if (taskbar == null) { + // Home All Apps should be toggled from this class, because the controllers are not + // initialized when Taskbar is disabled (i.e. TaskbarActivityContext is null). + if (mActivity instanceof Launcher l) l.toggleAllApps(true); + } else { + taskbar.getControllers().uiController.toggleAllApps(true); + } + } + + /** + * Displays a frame of the first Launcher reveal animation. + * + * This should be used to run a first Launcher reveal animation whose progress matches a swipe + * progress. + */ + public AnimatorPlaybackController createLauncherStartFromSuwAnim(int duration) { + TaskbarActivityContext taskbar = getTaskbarForDisplay(mPrimaryDisplayId); + return taskbar == null ? null : taskbar.createLauncherStartFromSuwAnim(duration); + } + + /** + * @return true if we should force the fallback animation for All Set page + */ + public boolean shouldForceAllSetFallbackAnimation() { + TaskbarActivityContext taskbar = getTaskbarForDisplay(mPrimaryDisplayId); + return taskbar == null ? true : taskbar.shouldForceAllSetFallbackAnimation(); + } + + /** Called when the user is unlocked */ + public void onUserUnlocked() { + debugPrimaryTaskbar("onUserUnlocked"); + mUserUnlocked = true; + addRecreationListener(mPrimaryDisplayId); + debugPrimaryTaskbar("onUserUnlocked: recreating all taskbars!"); + + if (mBootAppContext != null) { + mExternalDeviceProfiles.clear(); // Need to be regenerated with actual app context. + mBootAppContext.onDestroy(); + } + mBootAppContext = null; + + // Create DPs for all connected displays if required. + for (int i = 0; i < mWindowContexts.size(); i++) { + int displayId = mWindowContexts.keyAt(i); + if (displayId != mPrimaryDisplayId && !mExternalDeviceProfiles.contains(displayId)) { + createExternalDeviceProfile(displayId); + addRecreationListener(displayId); + } + } + + recreateTaskbars(); + for (Entry entry : mTaskbars.entrySet()) { + int displayId = entry.getKey(); + debugTaskbarManager("onUserUnlocked: addTaskbarRootViewToWindow()", displayId); + addTaskbarRootViewToWindow(entry.getValue()); + } + } + + /** + * Sets a {@link StatefulActivity} to act as taskbar callback + */ + public void setActivity(@NonNull StatefulActivity activity) { + debugPrimaryTaskbar("setActivity: mActivity=" + mActivity); + if (mActivity == activity) { + debugPrimaryTaskbar("setActivity: No need to set activity!"); + return; + } + removeActivityCallbacksAndListeners(); + mActivity = activity; + mActivity.addOnDeviceProfileChangeListener(mDebugActivityDeviceProfileChanged); + debugPrimaryTaskbar("setActivity: registering activity lifecycle callbacks."); + mActivity.addEventCallback(EVENT_DESTROYED, mActivityOnDestroyCallback); + UnfoldTransitionProgressProvider unfoldTransitionProgressProvider = + getUnfoldTransitionProgressProviderForActivity(activity); + if (unfoldTransitionProgressProvider != null) { + unfoldTransitionProgressProvider.addCallback(mUnfoldTransitionProgressListener); + } + mUnfoldProgressProvider.setSourceProvider(unfoldTransitionProgressProvider); + + if (activity instanceof RecentsViewContainer recentsViewContainer) { + setRecentsViewContainer(recentsViewContainer); + } + } + + /** + * Sets the current RecentsViewContainer, from which we create a TaskbarUIController. + */ + public void setRecentsViewContainer(@NonNull RecentsViewContainer recentsViewContainer) { + debugPrimaryTaskbar("setRecentsViewContainer"); + if (mRecentsViewContainer == recentsViewContainer) { + return; + } + if (mRecentsViewContainer == mActivity) { + // When switching to RecentsWindowManager (not an Activity), the old mActivity is not + // destroyed, nor is there a new Activity to replace it. Thus if we don't clear it here, + // it will not get re-set properly if we return to the Activity (e.g. NexusLauncher). + mActivityOnDestroyCallback.run(); + } + mRecentsViewContainer = recentsViewContainer; + TaskbarActivityContext taskbar = getCurrentActivityContext(); + if (taskbar != null) { + taskbar.setUIController( + createTaskbarUIControllerForRecentsViewContainer(mRecentsViewContainer, + mPrimaryDisplayId)); + } + } + + /** + * Returns an {@link UnfoldTransitionProgressProvider} to use while the given StatefulActivity + * is active. + */ + private UnfoldTransitionProgressProvider getUnfoldTransitionProgressProviderForActivity( + StatefulActivity activity) { + debugPrimaryTaskbar("getUnfoldTransitionProgressProviderForActivity"); + if (!enableUnfoldStateAnimation()) { + if (activity instanceof QuickstepLauncher ql) { + return ql.getUnfoldTransitionProgressProvider(); + } + } else { + return SystemUiProxy.INSTANCE.get(mBaseContext).getUnfoldTransitionProvider(); + } + return null; + } + + /** Creates a {@link TaskbarUIController} to use with non default displays. */ + private TaskbarUIController createTaskbarUIControllerForNonDefaultDisplay(int displayId) { + debugTaskbarManager("createTaskbarUIControllerForNonDefaultDisplay", displayId); + BaseContainerInterface containerInterface = OverviewComponentObserver.INSTANCE.get( + mBaseContext).getContainerInterface(displayId); + if (containerInterface != null) { + RecentsViewContainer container = containerInterface.getCreatedContainer(); + if (container instanceof RecentsWindowManager) { + return createTaskbarUIControllerForRecentsViewContainer(container, displayId); + } + } + return new TaskbarUIController(); + } + + /** + * Creates a {@link TaskbarUIController} to use while the given StatefulActivity is active. + */ + private TaskbarUIController createTaskbarUIControllerForRecentsViewContainer( + RecentsViewContainer container, int displayId) { + debugTaskbarManager("createTaskbarUIControllerForRecentsViewContainer", displayId); + if (!isExternalDisplay(displayId) + && mActivity instanceof QuickstepLauncher quickstepLauncher) { + // If 1P Launcher is default, always use LauncherTaskbarUIController, regardless of + // whether the recents container is NexusLauncherActivity or RecentsWindowManager. This + // is only applicable for primary displays. In case of foldables both displays have + // primary display ID and only one of them is primary at a given time, the other one is + // inactive or has limited functionality (has different display ID in that case). + return new LauncherTaskbarUIController( + new LauncherInteractor(quickstepLauncher, + enableTaskbarUiThread()? MAIN_EXECUTOR : Runnable::run), + quickstepLauncher.getLauncherUiState(), + SystemUiProxy.INSTANCE.get(quickstepLauncher).getHomeVisibilityState()); + } + // If a 3P Launcher is default, always use FallbackTaskbarUIController regardless of + // whether the recents container is RecentsActivity or RecentsWindowManager. + if (container instanceof RecentsActivity recentsActivity) { + return new FallbackTaskbarUIController<>(recentsActivity); + } + if (container instanceof RecentsWindowManager recentsWindowManager) { + return new FallbackTaskbarUIController<>(recentsWindowManager); + } + return new TaskbarUIController(); + } + + /** + * This method is called multiple times (ex. initial init, then when user unlocks) in which case + * we fully want to destroy existing taskbars and create all desired new ones. + * In other case (folding/unfolding) we don't need to remove and add window. + */ + public synchronized void recreateTaskbars() { + for (int i = 0; i < mWindowContexts.size(); i++) { + int displayId = mWindowContexts.keyAt(i); + debugTaskbarManager("recreateTaskbars", displayId); + recreateTaskbarForDisplay(displayId, 0); + } + } + + private void attachPinningSharedPreferenceChangeListener(Context context) { + LauncherPrefs.get(context).addListener( + mTaskbarPinningPreferenceChangeListener, + TASKBAR_PINNING, + TASKBAR_PINNING_IN_DESKTOP_MODE); + } + + + /** + * This method is called multiple times (ex. initial init, then when user unlocks) in which case + * we fully want to destroy an existing taskbar for a specified display and create a new one. + * In other case (folding/unfolding) we don't need to remove and add window. + */ + @VisibleForTesting + protected void recreateTaskbarForDisplay(int displayId, int duration) { + debugTaskbarManager("recreateTaskbarForDisplay: ", displayId); + Trace.beginSection("recreateTaskbarForDisplay"); + try { + debugTaskbarManager("recreateTaskbarForDisplay: getting device profile", displayId); + // TODO (b/381113004): make this display-specific via getWindowContext() + DeviceProfile dp = getDeviceProfile(displayId); + + // All Apps action is unrelated to navbar unification, so we only need to check DP. + final boolean isLargeScreenTaskbar = dp != null && dp.isTaskbarPresent; + mAllAppsActionManager.setTaskbarPresent(isLargeScreenTaskbar); + debugTaskbarManager("recreateTaskbarForDisplay: destroying taskbar", displayId); + destroyTaskbarForDisplay(displayId); + + boolean displayExists = getDisplay(displayId) != null; + boolean isTaskbarEnabled = dp != null && isTaskbarEnabled(displayId, dp); + debugTaskbarManager("recreateTaskbarForDisplay: isTaskbarEnabled=" + isTaskbarEnabled + + " [dp != null (i.e. mUserUnlocked)]=" + (dp != null) + + " dp.isTaskbarPresent=" + (dp == null ? "null" : dp.isTaskbarPresent) + + " isTaskbarEnabled=" + isTaskbarEnabled + + " displayExists=" + displayExists, displayId); + if (!isTaskbarEnabled || !isLargeScreenTaskbar || !displayExists) { + SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(mBaseContext); + systemUiProxy.notifyTaskbarStatus(/* visible */ false, /* stashed */ false); + systemUiProxy.setHasBubbleBar(false); + if (!isTaskbarEnabled || !displayExists) { + debugTaskbarManager( + "recreateTaskbarForDisplay: exiting bc (!isTaskbarEnabled || " + + "!displayExists)", + displayId); + return; + } + } + + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + debugTaskbarManager("recreateTaskbarForDisplay: creating taskbar", displayId); + taskbar = createTaskbarActivityContext(dp, displayId); + if (taskbar == null) { + debugTaskbarManager( + "recreateTaskbarForDisplay: new taskbar instance is null!", displayId); + return; + } + + TaskbarSharedState sharedState = getSharedStateForDisplay(displayId); + sharedState.startTaskbarVariantIsTransient = taskbar.isTransientTaskbar(); + sharedState.allAppsVisible = sharedState.allAppsVisible && isLargeScreenTaskbar; + taskbar.init(sharedState, duration); + + // Non default displays should not use LauncherTaskbarUIController as they shouldn't + // have access to the Launcher activity. + if (isExternalDisplay(displayId)) { + taskbar.setUIController(createTaskbarUIControllerForNonDefaultDisplay(displayId)); + } else if (mRecentsViewContainer != null) { + taskbar.setUIController( + createTaskbarUIControllerForRecentsViewContainer(mRecentsViewContainer, + mPrimaryDisplayId)); + } + + debugTaskbarManager("recreateTaskbarForDisplay: adding rootView", displayId); + addTaskbarRootViewToWindow(taskbar); + FrameLayout taskbarRootLayout = getTaskbarRootLayoutForDisplay(displayId); + if (taskbarRootLayout != null) { + debugTaskbarManager("recreateTaskbarForDisplay: adding root layout", displayId); + taskbarRootLayout.removeAllViews(); + taskbarRootLayout.addView(taskbar.getDragLayer()); + taskbar.notifyUpdateLayoutParams(); + } else { + debugTaskbarManager("recreateTaskbarForDisplay: taskbarRootLayout is null!", + displayId); + } + } finally { + Trace.endSection(); + } + } + + /** Called when the SysUI flags for a given display change. */ + public void onSystemUiFlagsChanged(@SystemUiStateFlags long systemUiStateFlags, int displayId) { + if (displayId == mPrimaryDisplayId) { + mDeviceUnlocked = !SystemUiFlagUtils.isLocked(systemUiStateFlags); + } + TaskbarSharedState sharedState = getSharedStateForDisplay(displayId); + if (DEBUG) { + Log.d(TAG, "SysUI flags changed: " + formatFlagChange(systemUiStateFlags, + sharedState.sysuiStateFlags, QuickStepContract::getSystemUiStateString)); + } + long changedFlags = systemUiStateFlags ^ sharedState.sysuiStateFlags; + sharedState.sysuiStateFlags = systemUiStateFlags; + if ((changedFlags & SYSUI_STATE_NAVIGATION_BAR_DISABLED) != 0) { + recreateTaskbarForDisplay(displayId, 0); + return; + } + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.updateSysuiStateFlags(systemUiStateFlags, false /* fromInit */); + } + } + + public void onLongPressHomeEnabled(boolean assistantLongPressEnabled) { + for (int i = 0; i < mWindowContexts.size(); i++) { + int displayId = mWindowContexts.keyAt(i); + getSharedStateForDisplay(displayId).assistantLongPressEnabled = + assistantLongPressEnabled; + } + } + + /** + * Sets the flag indicating setup UI is visible + */ + public void setSetupUIVisible(boolean isVisible) { + mAllAppsActionManager.setSetupUiVisible(isVisible); + for (int i = 0; i < mWindowContexts.size(); i++) { + int displayId = mWindowContexts.keyAt(i); + getSharedStateForDisplay(displayId).setupUIVisible = isVisible; + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.setSetupUIVisible(isVisible); + } + } + } + + /** + * Sets wallpaper visibility for specific display. + */ + public void setWallpaperVisible(int displayId, boolean isVisible) { + getSharedStateForDisplay(displayId).wallpaperVisible = isVisible; + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.setWallpaperVisible(isVisible); + } + } + + public void checkNavBarModes(int displayId) { + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.checkNavBarModes(); + } + } + + public void finishBarAnimations(int displayId) { + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.finishBarAnimations(); + } + } + + public void touchAutoDim(int displayId, boolean reset) { + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.touchAutoDim(reset); + } + } + + public void transitionTo(int displayId, @BarTransitions.TransitionMode int barMode, + boolean animate) { + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.transitionTo(barMode, animate); + } + } + + public void appTransitionPending(boolean pending) { + TaskbarActivityContext taskbar = getTaskbarForDisplay(mPrimaryDisplayId); + if (taskbar != null) { + taskbar.appTransitionPending(pending); + } + } + + private boolean isTaskbarEnabled(int displayId, DeviceProfile deviceProfile) { + boolean taskbarDisallowedByDisplayPolicy = (getSharedStateForDisplay(displayId) + .sysuiStateFlags & SYSUI_STATE_NAVIGATION_BAR_DISABLED) != 0; + if (taskbarDisallowedByDisplayPolicy) { + debugTaskbarManager("No taskbar due to SYSUI_STATE_NAVIGATION_BAR_DISABLED", displayId); + } + return !taskbarDisallowedByDisplayPolicy; + } + + public void onRotationProposal(int rotation, boolean isValid) { + TaskbarActivityContext taskbar = getTaskbarForDisplay(mPrimaryDisplayId); + if (taskbar != null) { + taskbar.onRotationProposal(rotation, isValid); + } + } + + public void disableNavBarElements(int displayId, int state1, int state2, boolean animate) { + TaskbarSharedState sharedState = getSharedStateForDisplay(displayId); + sharedState.disableNavBarDisplayId = displayId; + sharedState.disableNavBarState1 = state1; + sharedState.disableNavBarState2 = state2; + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.disableNavBarElements(displayId, state1, state2, animate); + } + } + + public void onSystemBarAttributesChanged(int displayId, int behavior) { + TaskbarSharedState sharedState = getSharedStateForDisplay(displayId); + sharedState.systemBarAttrsDisplayId = displayId; + sharedState.systemBarAttrsBehavior = behavior; + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.onSystemBarAttributesChanged(displayId, behavior); + } + } + + public void onTransitionModeUpdated(int barMode, boolean checkBarModes) { + for (int i = 0; i < mWindowContexts.size(); i++) { + int displayId = mWindowContexts.keyAt(i); + getSharedStateForDisplay(displayId).barMode = barMode; + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.onTransitionModeUpdated(barMode, checkBarModes); + } + } + } + + public void onNavButtonsDarkIntensityChanged(float darkIntensity) { + for (int i = 0; i < mWindowContexts.size(); i++) { + int displayId = mWindowContexts.keyAt(i); + getSharedStateForDisplay(displayId).navButtonsDarkIntensity = darkIntensity; + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.onNavButtonsDarkIntensityChanged(darkIntensity); + } + } + } + + public void onNavigationBarLumaSamplingEnabled(int displayId, boolean enable) { + TaskbarSharedState sharedState = getSharedStateForDisplay(displayId); + sharedState.mLumaSamplingDisplayId = displayId; + sharedState.mIsLumaSamplingEnabled = enable; + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null) { + taskbar.onNavigationBarLumaSamplingEnabled(displayId, enable); + } + } + + /** + * Signal from SysUI indicating that a non-mirroring display was just connected to the + * primary device or a previously mirroring display is switched to extended mode. + */ + @Override + public void onDisplayAddSystemDecorations(int displayId) { + debugTaskbarManager("onDisplayAddSystemDecorations: ", displayId); + Display display = getDisplay(displayId); + if (display == null) { + debugTaskbarManager("onDisplayAddSystemDecorations: can't find display!", displayId); + return; + } + + if (!isExternalDisplay(displayId)) { + debugTaskbarManager( + "onDisplayAddSystemDecorations: not an external display! | " + + "isExternalDisplay=" + isExternalDisplay(displayId), displayId); + return; + } + debugTaskbarManager("onDisplayAddSystemDecorations: creating new windowContext!", + displayId); + Context newWindowContext = createWindowContext(displayId); + if (newWindowContext != null) { + debugTaskbarManager("onDisplayAddSystemDecorations: add new windowContext to map!", + displayId); + WindowManager wm = mBaseWindowManager; + if ((wm == null || !wm.shouldShowSystemDecors(displayId)) + && !DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue()) { + String wmStatus = wm == null ? "WindowManager is null!" : "WindowManager exists"; + boolean showDecor = wm != null && wm.shouldShowSystemDecors(displayId); + debugTaskbarManager( + "onDisplayAddSystemDecorations:\n\t" + wmStatus + "\n\tshowSystemDecors=" + + showDecor, displayId); + return; + } + addWindowContextToMap(displayId, newWindowContext); + debugTaskbarManager("onDisplayAddSystemDecorations: creating RootLayout!", displayId); + + createExternalDeviceProfile(displayId); + + debugTaskbarManager("onDisplayAddSystemDecorations: creating RootLayout!", displayId); + createTaskbarRootLayout(displayId); + + debugTaskbarManager("onDisplayAddSystemDecorations: creating NavButtonController!", + displayId); + createNavButtonController(displayId); + + debugTaskbarManager( + "onDisplayAddSystemDecorations: createAndRegisterComponentCallbacks!", + displayId); + createAndRegisterComponentCallbacks(displayId); + + debugTaskbarManager( + "onDisplayAddSystemDecorations: addRecreationListener!", displayId); + addRecreationListener(displayId); + + debugTaskbarManager("onDisplayAddSystemDecorations: recreateTaskbarForDisplay!", + displayId); + recreateTaskbarForDisplay(displayId, 0); + } else { + debugTaskbarManager("onDisplayAddSystemDecorations: newWindowContext is NULL!", + displayId); + } + + debugTaskbarManager("onDisplayAddSystemDecorations: finished!", displayId); + } + + /** + * Signal from SysUI indicating that a previously connected non-mirroring display was just + * removed from the primary device. + */ + @Override + public void onDisplayRemoved(int displayId) { + debugTaskbarManager("onDisplayRemoved: ", displayId); + if (!isExternalDisplay(displayId)) { + debugTaskbarManager( + "onDisplayRemoved: not an external display! | " + + "isExternalDisplay=" + isExternalDisplay(displayId), displayId); + return; + } + + Context windowContext = getWindowContext(displayId); + if (windowContext != null) { + debugTaskbarManager("onDisplayRemoved: removing NavButtonController!", displayId); + removeNavButtonController(displayId); + + debugTaskbarManager("onDisplayRemoved: removeAndUnregisterComponentCallbacks!", + displayId); + removeAndUnregisterComponentCallbacks(displayId); + + debugTaskbarManager("onDisplayRemoved: removeRecreationListener!", displayId); + removeRecreationListener(displayId); + + debugTaskbarManager("onDisplayRemoved: removing DeviceProfile from map!", displayId); + removeDeviceProfileFromMap(displayId); + + debugTaskbarManager("onDisplayRemoved: destroying Taskbar!", displayId); + destroyTaskbarForDisplay(displayId); + + debugTaskbarManager("onDisplayRemoved: removing WindowContext from map!", displayId); + removeWindowContextFromMap(displayId); + + debugTaskbarManager("onDisplayRemoved: destroying SharedState from map!", displayId); + destroySharedStateForDisplay(displayId); + + debugTaskbarManager("onDisplayRemoved: finished!", displayId); + } else { + debugTaskbarManager("onDisplayRemoved: windowContext is null!", displayId); + } + } + + /** + * Signal from SysUI indicating that system decorations should be removed from the display. + */ + @Override + public void onDisplayRemoveSystemDecorations(int displayId) { + // The display mirroring starts. The handling logic is the same as when removing a + // display. + onDisplayRemoved(displayId); + } + + private void removeActivityCallbacksAndListeners() { + if (mActivity != null) { + mActivity.removeOnDeviceProfileChangeListener(mDebugActivityDeviceProfileChanged); + debugPrimaryTaskbar("unregistering activity lifecycle callbacks"); + mActivity.removeEventCallback(EVENT_DESTROYED, mActivityOnDestroyCallback); + UnfoldTransitionProgressProvider unfoldTransitionProgressProvider = + getUnfoldTransitionProgressProviderForActivity(mActivity); + if (unfoldTransitionProgressProvider != null) { + unfoldTransitionProgressProvider.removeCallback(mUnfoldTransitionProgressListener); + } + } + } + + /** + * Called when the manager is no longer needed + */ + public void destroy() { + debugPrimaryTaskbar("TaskbarManager#destroy()"); + mRecentsViewContainer = null; + + if (mBootAppContext != null) { + mBootAppContext.onDestroy(); + } + mBootAppContext = null; + + debugPrimaryTaskbar("destroy: removing activity callbacks"); + DesktopVisibilityController.INSTANCE.get( + mPrimaryWindowContext).unregisterTaskbarDesktopModeListener( + mTaskbarDesktopModeListener); + DesktopVisibilityController.INSTANCE.get( + mBaseContext).unregisterDesktopVisibilityListener(mDesktopVisibilityListener); + LauncherPrefs.get(mBaseContext).removeListener( + mTaskbarPinningPreferenceChangeListener, + TASKBAR_PINNING, + TASKBAR_PINNING_IN_DESKTOP_MODE); + + removeActivityCallbacksAndListeners(); + destroySharedStateForAllDisplays(); + if (mGrowthBroadcastReceiver != null) { + mGrowthBroadcastReceiver.close(); + } + + removeRecreationListener(mPrimaryDisplayId); + SettingsCache.INSTANCE.get(mPrimaryWindowContext) + .unregister(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener); + SettingsCache.INSTANCE.get(mPrimaryWindowContext) + .unregister(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener); + if (DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue() + && DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue()) { + mDisplaysWithDecorationsRepositoryCompat.unregisterDisplayDecorationListener(this); + } else { + SystemDecorationChangeObserver.getINSTANCE().get(mPrimaryWindowContext) + .unregisterDisplayDecorationListener(this); + } + debugPrimaryTaskbar("destroy: unregistering component callbacks"); + removeAndUnregisterComponentCallbacks(mPrimaryDisplayId); + mShutdownReceiver.close(); + + debugPrimaryTaskbar("destroy: destroying all taskbars!"); + removeWindowContextFromMap(mPrimaryDisplayId); + destroyAllTaskbars(); + debugPrimaryTaskbar("destroy: finished!"); + } + + public @Nullable TaskbarActivityContext getCurrentActivityContext() { + return getTaskbarForDisplay(mPrimaryDisplayId); + } + + public void dumpLogs(String prefix, PrintWriter pw) { + pw.println(prefix + "TaskbarManager:"); + pw.println(prefix + "\tmUserUnlocked=" + mUserUnlocked); + pw.println(prefix + "\tmDeviceUnlocked=" + mDeviceUnlocked); + pw.println(prefix + "\thasBootAppContext=" + (mBootAppContext != null)); + // iterate through taskbars and do the dump for each + for (Entry entry : mTaskbars.entrySet()) { + int displayId = entry.getKey(); + TaskbarActivityContext taskbar = entry.getValue(); + pw.println(prefix + "\tTaskbar at display " + displayId + ":"); + if (taskbar == null) { + pw.println(prefix + "\t\tTaskbarActivityContext: null"); + } else { + taskbar.dumpLogs(prefix + "\t\t", pw); + } + } + } + + private void addTaskbarRootViewToWindow(@NonNull TaskbarActivityContext taskbar) { + int displayId = taskbar.getDisplayId(); + debugTaskbarManager("addTaskbarRootViewToWindow:", displayId); + + if (getDisplay(displayId) == null) { + debugTaskbarManager("addTaskbarRootViewToWindow: display null", displayId); + return; + } + + if (!isTaskbarRootLayoutAddedForDisplay(displayId)) { + FrameLayout rootLayout = getTaskbarRootLayoutForDisplay(displayId); + WindowManager windowManager = getWindowManager(displayId); + if (rootLayout != null && windowManager != null) { + windowManager.addView(rootLayout, taskbar.getWindowLayoutParams()); + mAddedRootLayouts.put(displayId, true); + } else { + String rootLayoutStatus = + (rootLayout == null) ? "rootLayout is NULL!" : "rootLayout exists!"; + String wmStatus = (windowManager == null) ? "windowManager is NULL!" + : "windowManager exists!"; + debugTaskbarManager( + "addTaskbarRootViewToWindow: \n\t" + rootLayoutStatus + "\n\t" + wmStatus, + displayId); + } + } else { + debugTaskbarManager("addTaskbarRootViewToWindow: rootLayout already added!", displayId); + } + } + + private void removeTaskbarRootViewFromWindow(int displayId) { + debugTaskbarManager("removeTaskbarRootViewFromWindow", displayId); + FrameLayout rootLayout = getTaskbarRootLayoutForDisplay(displayId); + if (rootLayout == null) { + return; + } + + WindowManager windowManager = getWindowManager(displayId); + if (isTaskbarRootLayoutAddedForDisplay(displayId) && windowManager != null) { + windowManager.removeViewImmediate(rootLayout); + mAddedRootLayouts.put(displayId, false); + removeTaskbarRootLayoutFromMap(displayId); + } else { + debugTaskbarManager("removeTaskbarRootViewFromWindow: WindowManager is null", + displayId); + } + } + + /** + * Returns the {@link TaskbarUIController} associated with the given display ID. + * TODO(b/395061396): Remove this method when overview in widow is enabled. + * + * @param displayId The ID of the display to retrieve the taskbar for. + * @return The {@link TaskbarUIController} for the specified display, or + * {@code null} if no taskbar is associated with that display. + */ + @Nullable + public TaskbarUIController getUIControllerForDisplay(int displayId) { + TaskbarActivityContext taskbarActivityContext = getTaskbarForDisplay(displayId); + if (taskbarActivityContext == null) { + return null; + } + + return taskbarActivityContext.getControllers().uiController; + } + + /** + * Retrieves whether RootLayout was added to window for specific display, or false if no + * such mapping has been made. + * + * @param displayId The ID of the display for which to retrieve the taskbar root layout. + * @return if RootLayout was added to window {@link Boolean} for a display or {@code false}. + */ + private boolean isTaskbarRootLayoutAddedForDisplay(int displayId) { + return mAddedRootLayouts.get(displayId); + } + + /** + * Returns the {@link TaskbarActivityContext} associated with the given display ID. + * + * @param displayId The ID of the display to retrieve the taskbar for. + * @return The {@link TaskbarActivityContext} for the specified display, or + * {@code null} if no taskbar is associated with that display. + */ + @Nullable + public TaskbarActivityContext getTaskbarForDisplay(int displayId) { + return mTaskbars.get(displayId); + } + + private TaskbarSharedState getSharedStateForDisplay(int displayId) { + TaskbarSharedState sharedState = mTaskbarSharedStates.getOrDefault(displayId, + new TaskbarSharedState()); + mTaskbarSharedStates.put(displayId, sharedState); + + // Verify if shared state is properly initialised. Sometimes it can only be initialised with + // subsequent access. For example, onSystemUiFlagsChanged gets called before + // recreateTaskbarForDisplay when display is added resulting into windowContext being null. + if (sharedState.taskbarSystemActionPendingIntent == null && mWindowContexts.contains( + displayId)) { + debugTaskbarManager("getSharedStateForDisplay: initialising shared state", displayId); + + Context windowContext = mWindowContexts.get(displayId); + SimpleBroadcastReceiver broadcastReceiver = new SimpleBroadcastReceiver( + windowContext, + UI_HELPER_EXECUTOR, + MAIN_EXECUTOR, + (intent) -> showTaskbarFromBroadcast(intent, displayId)); + mTaskbarBroadcastReceivers.put(displayId, broadcastReceiver); + + sharedState.taskbarSystemActionPendingIntent = PendingIntent.getBroadcast(windowContext, + SYSTEM_ACTION_ID_TASKBAR, + new Intent(ACTION_SHOW_TASKBAR).setPackage(windowContext.getPackageName()), + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + + broadcastReceiver.register(actionsFilter(ACTION_SHOW_TASKBAR), RECEIVER_NOT_EXPORTED); + } + + return sharedState; + } + + /** Should only be called when the TaskbarManager class is being destroyed. */ + private void destroySharedStateForAllDisplays() { + debugPrimaryTaskbar("getSharedStateForDisplay: destroying all shared state", + /* verbose= */ false); + + for (SimpleBroadcastReceiver broadcastReceiver : mTaskbarBroadcastReceivers.values()) { + broadcastReceiver.close(); + } + + mTaskbarBroadcastReceivers.clear(); + mTaskbarSharedStates.clear(); + } + + /** Should be called when the taskbar is not going to be recreated, example display removed. */ + private void destroySharedStateForDisplay(int displayId) { + debugTaskbarManager("getSharedStateForDisplay: destroying shared state", displayId); + SimpleBroadcastReceiver broadcastReceiver = mTaskbarBroadcastReceivers.remove(displayId); + if (broadcastReceiver != null) { + broadcastReceiver.close(); + } + + mTaskbarSharedStates.remove(displayId); + } + + /** + * Creates a {@link TaskbarActivityContext} for the given display and adds it to the map. + * + * @param dp The {@link deviceprofile} for the display. + * @param displayId The ID of the display. + */ + private @Nullable TaskbarActivityContext createTaskbarActivityContext(DeviceProfile dp, + int displayId) { + Display display = getDisplay(displayId); + if (display == null) { + debugTaskbarManager("createTaskbarActivityContext: display null", displayId); + return null; + } + + Context navigationBarPanelContext = mBaseContext.createWindowContext(display, + TYPE_NAVIGATION_BAR_PANEL, null); + + Context windowContext = getWindowContext(displayId); + if (mBootAppContext != null) { + windowContext = mBootAppContext.wrapWindowContext(windowContext); + } + + TaskbarActivityContext newTaskbar = new TaskbarActivityContext(displayId, windowContext, + navigationBarPanelContext, dp, getNavButtonController(displayId), + mUnfoldProgressProvider, !isExternalDisplay(displayId), getPrimaryDisplayId(), + SystemUiProxy.INSTANCE.get(mBaseContext)); + + addTaskbarToMap(displayId, newTaskbar); + return newTaskbar; + } + + /** + * Creates a {@link deviceprofile} for the given display and adds it to the map. + * + * @param displayId The ID of the display. + */ + private void createExternalDeviceProfile(int displayId) { + if (!mUserUnlocked && mBootAppContext == null) { + return; + } + if (displayId == mPrimaryDisplayId) { + return; + } + + InvariantDeviceProfile idp = LauncherAppState.getIDP( + mBootAppContext != null ? mBootAppContext : mPrimaryWindowContext); + if (idp == null) { + return; + } + + Context displayContext = getWindowContext(displayId); + if (displayContext == null) { + return; + } + + DeviceProfile externalDeviceProfile = idp.createDeviceProfileForSecondaryDisplay( + displayContext); + mExternalDeviceProfiles.put(displayId, externalDeviceProfile); + } + + /** + * Gets a {@link deviceprofile} for the given displayId. + * + * @param displayId The ID of the display. + */ + private @Nullable DeviceProfile getDeviceProfile(int displayId) { + if (!mUserUnlocked && mBootAppContext == null) { + return null; + } + + InvariantDeviceProfile idp = LauncherAppState.getIDP( + mBootAppContext != null ? mBootAppContext : mPrimaryWindowContext); + if (idp == null) { + return null; + } + + if (!isExternalDisplay(displayId)) { + return idp.getDeviceProfile(mPrimaryWindowContext); + } + + return mExternalDeviceProfiles.get(displayId); + } + + /** + * Removes the {@link deviceprofile} associated with the given display ID from the map. + * + * @param displayId The ID of the display for which to remove the taskbar. + */ + private void removeDeviceProfileFromMap(int displayId) { + mExternalDeviceProfiles.delete(displayId); + } + + private void addRecreationListener(int displayId) { + if (!mUserUnlocked) { + return; + } + + DisplayController.INSTANCE.get(mPrimaryWindowContext).addChangeListenerForDisplay( + mRecreationListener, displayId); + } + + private void removeRecreationListener(int displayId) { + if (!mUserUnlocked) { + return; + } + + DisplayController.INSTANCE.get(mPrimaryWindowContext).removeChangeListenerForDisplay( + mRecreationListener, displayId); + } + + /** + * Create {@link ComponentCallbacks} for the given display and register it to the relevant + * WindowContext. For external displays, populate maps. + * + * @param displayId The ID of the display. + */ + private void createAndRegisterComponentCallbacks(int displayId) { + debugTaskbarManager("createAndRegisterComponentCallbacks", displayId); + ComponentCallbacks callbacks = new ComponentCallbacks() { + private Configuration mOldConfig = + getWindowContext(displayId).getResources().getConfiguration(); + + @Override + public void onConfigurationChanged(Configuration newConfig) { + Trace.instantForTrack(Trace.TRACE_TAG_APP, "TaskbarManager", + "onConfigurationChanged: " + newConfig); + debugTaskbarManager("onConfigurationChanged: " + newConfig, displayId); + + DeviceProfile dp = getDeviceProfile(displayId); + int configDiff = mOldConfig.diff(newConfig) & ~SKIP_RECREATE_CONFIG_CHANGES; + + if ((configDiff & ActivityInfo.CONFIG_UI_MODE) != 0) { + debugTaskbarManager("onConfigurationChanged: theme changed", displayId); + // Only recreate for theme changes, not other UI mode changes such as docking. + int oldUiNightMode = (mOldConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK); + int newUiNightMode = (newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK); + if (oldUiNightMode == newUiNightMode) { + configDiff &= ~ActivityInfo.CONFIG_UI_MODE; + } + } + + debugTaskbarManager("onConfigurationChanged: | configDiff=" + + Configuration.configurationDiffToString(configDiff), displayId); + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (configDiff != 0 || taskbar == null) { + debugTaskbarManager("onConfigurationChanged: call recreateTaskbars", displayId); + recreateTaskbarForDisplay(displayId, /* duration= */ 0); + } else if (dp != null) { + // Config change might be handled without re-creating the taskbar + if (!isTaskbarEnabled(displayId, dp)) { + debugPrimaryTaskbar( + "onConfigurationChanged: isTaskbarEnabled(dp)=False | " + + "destroyTaskbarForDisplay"); + destroyTaskbarForDisplay(displayId); + } else { + debugPrimaryTaskbar("onConfigurationChanged: isTaskbarEnabled(dp)=True"); + // Re-initialize for screen size change? Should this be done + // by looking at screen-size change flag in configDiff in the + // block above? + debugPrimaryTaskbar("onConfigurationChanged: call recreateTaskbars"); + recreateTaskbarForDisplay(displayId, /* duration= */ 0); + } + } else { + taskbar.onConfigurationChanged(configDiff); + } + mOldConfig = new Configuration(newConfig); + // reset taskbar was pinned value, so we don't automatically unstash taskbar upon + // user unfolding the device. + getSharedStateForDisplay(displayId).setTaskbarWasPinned(false); + } + + @Override + public void onLowMemory() { + } + }; + if (!isExternalDisplay(displayId)) { + mPrimaryComponentCallbacks = callbacks; + mPrimaryWindowContext.registerComponentCallbacks(callbacks); + } else { + mComponentCallbacks.put(displayId, callbacks); + getWindowContext(displayId).registerComponentCallbacks(callbacks); + } + } + + /** + * Unregister {@link ComponentCallbacks} for the given display from its WindowContext. For + * external displays, remove from the map. + * + * @param displayId The ID of the display. + */ + private void removeAndUnregisterComponentCallbacks(int displayId) { + if (!isExternalDisplay(displayId)) { + mPrimaryWindowContext.unregisterComponentCallbacks(mPrimaryComponentCallbacks); + } else { + ComponentCallbacks callbacks = mComponentCallbacks.get(displayId); + getWindowContext(displayId).unregisterComponentCallbacks(callbacks); + mComponentCallbacks.delete(displayId); + } + } + + /** + * Creates a {@link TaskbarNavButtonController} for the given display and adds it to the map + * if it doesn't already exist. + * + * @param displayId The ID of the display + */ + private void createNavButtonController(int displayId) { + if (!isExternalDisplay(displayId)) { + mPrimaryNavButtonController = new TaskbarNavButtonController( + displayId, + mNavCallbacks, + SystemUiProxy.INSTANCE.get(mBaseContext), + new Handler(), + new ContextualSearchInvoker(mBaseContext)); + } else { + TaskbarNavButtonController navButtonController = new TaskbarNavButtonController( + displayId, + mNavCallbacks, + SystemUiProxy.INSTANCE.get(mBaseContext), + new Handler(), + new ContextualSearchInvoker(mBaseContext)); + mNavButtonControllers.put(displayId, navButtonController); + } + } + + private TaskbarNavButtonController getNavButtonController(int displayId) { + return (!isExternalDisplay(displayId)) ? mPrimaryNavButtonController + : mNavButtonControllers.get(displayId); + } + + private void removeNavButtonController(int displayId) { + if (!isExternalDisplay(displayId)) { + mPrimaryNavButtonController = null; + } else { + mNavButtonControllers.delete(displayId); + } + } + + /** + * Adds the {@link TaskbarActivityContext} associated with the given display ID to taskbar + * map if there is not already a taskbar mapped to that displayId. + * + * @param displayId The ID of the display to retrieve the taskbar for. + * @param newTaskbar The new {@link TaskbarActivityContext} to add to the map. + */ + private void addTaskbarToMap(int displayId, TaskbarActivityContext newTaskbar) { + mTaskbars.putIfAbsent(displayId, newTaskbar); + } + + /** + * Removes the taskbar associated with the given display ID from the taskbar map. + * + * @param displayId The ID of the display for which to remove the taskbar. + */ + private void removeTaskbarFromMap(int displayId) { + mTaskbars.remove(displayId); + } + + /** + * Creates {@link FrameLayout} for the taskbar on the specified display and adds it to map. + * + * @param displayId The ID of the display for which to create the taskbar root layout. + */ + private void createTaskbarRootLayout(int displayId) { + debugTaskbarManager("createTaskbarRootLayout: ", displayId); + FrameLayout newTaskbarRootLayout = new FrameLayout(getWindowContext(displayId)) { + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + debugTaskbarManager("dispatchTouchEvent: ", displayId); + // The motion events can be outside the view bounds of task bar, and hence + // manually dispatching them to the drag layer here. + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + if (taskbar != null && taskbar.getDragLayer().isAttachedToWindow()) { + return taskbar.getDragLayer().dispatchTouchEvent(ev); + } + return super.dispatchTouchEvent(ev); + } + }; + + debugTaskbarManager("createTaskbarRootLayout: adding to map", displayId); + addTaskbarRootLayoutToMap(displayId, newTaskbarRootLayout); + } + + private boolean isDefaultDisplay(int displayId) { + return displayId == mPrimaryDisplayId; + } + + /** + * Retrieves the root layout of the taskbar for the specified display. + * + * @param displayId The ID of the display for which to retrieve the taskbar root layout. + * @return The taskbar root layout {@link FrameLayout} for a given display or {@code null}. + */ + private FrameLayout getTaskbarRootLayoutForDisplay(int displayId) { + debugTaskbarManager("getTaskbarRootLayoutForDisplay:", displayId); + FrameLayout frameLayout = mRootLayouts.get(displayId); + if (frameLayout != null) { + return frameLayout; + } else { + debugTaskbarManager("getTaskbarRootLayoutForDisplay: rootLayout is null!", displayId); + return null; + } + } + + /** + * Adds the taskbar root layout {@link FrameLayout} to taskbar map, mapped to display ID. + * + * @param displayId The ID of the display to associate with the taskbar root layout. + * @param rootLayout The taskbar root layout {@link FrameLayout} to add to the map. + */ + private void addTaskbarRootLayoutToMap(int displayId, FrameLayout rootLayout) { + debugTaskbarManager("addTaskbarRootLayoutToMap: ", displayId); + if (!mRootLayouts.contains(displayId) && rootLayout != null) { + mRootLayouts.put(displayId, rootLayout); + } + + debugTaskbarManager( + "addTaskbarRootLayoutToMap: finished! mRootLayouts.size()=" + mRootLayouts.size(), + displayId); + } + + /** + * Removes taskbar root layout {@link FrameLayout} for given display ID from the taskbar map. + * + * @param displayId The ID of the display for which to remove the taskbar root layout. + */ + private void removeTaskbarRootLayoutFromMap(int displayId) { + debugTaskbarManager("removeTaskbarRootLayoutFromMap:", displayId); + if (mRootLayouts.contains(displayId)) { + mAddedRootLayouts.delete(displayId); + mRootLayouts.delete(displayId); + } + + debugTaskbarManager("removeTaskbarRootLayoutFromMap: finished! mRootLayouts.size=" + + mRootLayouts.size(), displayId); + } + + /** + * Creates {@link Context} for the taskbar on the specified display. + * + * @param displayId The ID of the display for which to create the window context. + */ + private @Nullable Context createWindowContext(int displayId) { + debugTaskbarManager("createWindowContext: ", displayId); + Display display = getDisplay(displayId); + if (display == null) { + debugTaskbarManager("createWindowContext: display null!", displayId); + return null; + } + + int windowType = TYPE_NAVIGATION_BAR_PANEL; + if (!isExternalDisplay(displayId)) { + windowType = TYPE_NAVIGATION_BAR; + } + debugTaskbarManager( + "createWindowContext: windowType=" + ((windowType == TYPE_NAVIGATION_BAR) + ? "TYPE_NAVIGATION_BAR" : "TYPE_NAVIGATION_BAR_PANEL"), displayId); + + return mBaseContext.createWindowContext(display, windowType, null); + } + + private @Nullable Display getDisplay(int displayId) { + if (mDisplayManager == null) { + debugTaskbarManager("cannot get DisplayManager", displayId); + return null; + } + + Display display = mDisplayManager.getDisplay(displayId); + if (display == null) { + debugTaskbarManager("Cannot get display!", displayId); + return null; + } + + return mDisplayManager.getDisplay(displayId); + } + + /** + * Retrieves the window context of the taskbar for the specified display. + * + * @param displayId The ID of the display for which to retrieve the window context. + * @return The Window Context {@link Context} for a given display or {@code null}. + */ + private Context getWindowContext(int displayId) { + return (!isExternalDisplay(displayId)) + ? mPrimaryWindowContext : mWindowContexts.get(displayId); + } + + @VisibleForTesting + public Context getPrimaryWindowContext() { + return mPrimaryWindowContext; + } + + /** + * Retrieves the window manager {@link WindowManager} of the taskbar for the specified display. + * + * @param displayId The ID of the display for which to retrieve the window manager. + * @return The window manager {@link WindowManager} for a given display or {@code null}. + */ + private @Nullable WindowManager getWindowManager(int displayId) { + if (!isExternalDisplay(displayId)) { + debugTaskbarManager("cannot get mPrimaryWindowManager", displayId); + return mPrimaryWindowManager; + } + + Context externalDisplayContext = getWindowContext(displayId); + if (externalDisplayContext == null) { + debugTaskbarManager("cannot get externalDisplayContext", displayId); + return null; + } + + return externalDisplayContext.getSystemService(WindowManager.class); + } + + /** + * Adds the window context {@link Context} to taskbar map, mapped to display ID. + * + * @param displayId The ID of the display to associate with the taskbar root layout. + * @param windowContext The window context {@link Context} to add to the map. + */ + private void addWindowContextToMap(int displayId, @NonNull Context windowContext) { + if (!mWindowContexts.contains(displayId)) { + mWindowContexts.put(displayId, windowContext); + } + } + + /** + * Removes the window context {@link Context} for given display ID from the taskbar map. + * + * @param displayId The ID of the display for which to remove the taskbar root layout. + */ + private void removeWindowContextFromMap(int displayId) { + if (mWindowContexts.contains(displayId)) { + mWindowContexts.delete(displayId); + } + } + + private boolean isExternalDisplay(int displayId) { + return DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() && ( + mPrimaryDisplayId != displayId); + } + + private int getFocusedDisplayId() { + return SystemUiProxy.INSTANCE.get(mBaseContext).getFocusState().getFocusedDisplayId(); + } + + /** + * Returns the primary display id associated with this manager. + */ + public int getPrimaryDisplayId() { + return mPrimaryDisplayId; + } + + /** + * Logs debug information about the TaskbarManager for primary display. + * + * @param debugReason A string describing the reason for the debug log. + * @param displayId The ID of the display for which to log debug information. + */ + public void debugTaskbarManager(String debugReason, int displayId) { + StringJoiner log = new StringJoiner("\n"); + log.add(debugReason + " displayId=" + displayId + " isDefaultDisplay=" + isDefaultDisplay( + displayId)); + Log.d(TAG, log.toString()); + } + + /** + * Logs verbose debug information about the TaskbarManager for primary display. + * + * @param debugReason A string describing the reason for the debug log. + * @param displayId The ID of the display for which to log debug information. + * @param verbose Indicates whether or not to debug with detail. + */ + private void debugTaskbarManager(String debugReason, int displayId, boolean verbose) { + StringJoiner log = new StringJoiner("\n"); + log.add(debugReason + " displayId=" + displayId + " isDefaultDisplay=" + isDefaultDisplay( + displayId)); + if (verbose) { + generateVerboseLogs(log, displayId); + } + Log.d(TAG, log.toString()); + } + + /** + * Logs debug information about the TaskbarManager for primary display. + * + * @param debugReason A string describing the reason for the debug log. + */ + private void debugPrimaryTaskbar(String debugReason) { + debugTaskbarManager(debugReason, mPrimaryDisplayId, false); + } + + /** + * Logs debug information about the TaskbarManager for primary display. + * + * @param debugReason A string describing the reason for the debug log. + */ + public void debugPrimaryTaskbar(String debugReason, boolean verbose) { + debugTaskbarManager(debugReason, mPrimaryDisplayId, verbose); + } + + /** Creates a {@link PendingIntent} for showing / hiding the all apps UI. */ + public PendingIntent createAllAppsPendingIntent(Executor uiExecutor) { + return new PendingIntent(new AllAppsIntentSender(uiExecutor, this)); + } + + /** + * Logs verbose debug information about the TaskbarManager for a specific display. + */ + private void generateVerboseLogs(StringJoiner log, int displayId) { + boolean activityTaskbarPresent = mActivity != null + && mActivity.getDeviceProfile().isTaskbarPresent; + // TODO (b/381113004): make this display-specific via getWindowContext() + Context windowContext = mPrimaryWindowContext; + if (windowContext == null) { + log.add("windowContext is null!"); + return; + } + + boolean contextTaskbarPresent = false; + if (mUserUnlocked) { + DeviceProfile dp = getDeviceProfile(displayId); + contextTaskbarPresent = dp != null && dp.isTaskbarPresent; + } + if (activityTaskbarPresent == contextTaskbarPresent) { + log.add("mActivity and mWindowContext agree taskbarIsPresent=" + contextTaskbarPresent); + Log.d(TAG, log.toString()); + return; + } + + log.add("mActivity & mWindowContext device profiles have different values, add more logs."); + + log.add("\tmActivity logs:"); + log.add("\t\tmActivity=" + mActivity); + if (mActivity != null) { + log.add("\t\tmActivity.getResources().getConfiguration()=" + + mActivity.getResources().getConfiguration()); + log.add("\t\tmActivity.getDeviceProfile().isTaskbarPresent=" + + activityTaskbarPresent); + } + log.add("\tWindowContext logs:"); + log.add("\t\tWindowContext=" + windowContext); + log.add("\t\tWindowContext.getResources().getConfiguration()=" + + windowContext.getResources().getConfiguration()); + if (mUserUnlocked) { + log.add("\t\tgetDeviceProfile(mPrimaryWindowContext).isTaskbarPresent=" + + contextTaskbarPresent); + } else { + log.add("\t\tCouldn't get DeviceProfile because !mUserUnlocked"); + } + } + + private final DeviceProfile.OnDeviceProfileChangeListener mDebugActivityDeviceProfileChanged = + dp -> debugPrimaryTaskbar("mActivity onDeviceProfileChanged", true); + + /** Use weak reference to avoid leaking TIS via {@link TaskbarManagerImpl} */ + private static class AllAppsIntentSender extends IIntentSender.Stub { + + private final Executor mUiExecutor; + private final WeakReference mWeakTaskbarManager; + + AllAppsIntentSender(Executor uiExecutor, TaskbarManagerImpl taskbarManager) { + mUiExecutor = uiExecutor; + mWeakTaskbarManager = new WeakReference<>(taskbarManager); + } + + @Override + public void send(int i, Intent intent, String s, IBinder iBinder, + IIntentReceiver iIntentReceiver, String s1, Bundle bundle) { + TaskbarManagerImpl taskbarManager = mWeakTaskbarManager.get(); + if (taskbarManager == null) { + return; + } + mUiExecutor.execute(taskbarManager::toggleAllAppsSearch); + } + }; +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImplWrapper.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImplWrapper.kt new file mode 100644 index 00000000000..646ec98e03d --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImplWrapper.kt @@ -0,0 +1,289 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.app.PendingIntent +import android.os.Looper +import com.android.launcher3.Flags.enableTaskbarUiThread +import com.android.launcher3.anim.AnimatorPlaybackController +import com.android.launcher3.statemanager.StatefulActivity +import com.android.launcher3.util.Executors +import com.android.quickstep.views.RecentsViewContainer +import java.io.PrintWriter + +/** + * Wrapper of [TaskbarManagerImpl], this class controls which thread the invocation happens. The + * goal of this class is to minimize the changes to [TaskbarManagerImpl] during migration of + * rendering taskbar in per-window ui thread. + */ +class TaskbarManagerImplWrapper(private val impl: TaskbarManagerImpl) : TaskbarManager { + + override fun onUserUnlocked() { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute(impl::onUserUnlocked) + } else { + impl.onUserUnlocked() + } + } + + override fun setActivity(activity: StatefulActivity<*>) { + // TODO(b/404636836) internal invocation on activity should be posted back to main thread + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.setActivity(activity) } + } else { + impl.setActivity(activity) + } + } + + override fun setRecentsViewContainer(recentsViewContainer: RecentsViewContainer) { + // TODO(b/404636836) internal invocation on recentsViewContainer should be posted back to + // main thread + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.setRecentsViewContainer(recentsViewContainer) } + } else { + impl.setRecentsViewContainer(recentsViewContainer) + } + } + + override fun recreateTaskbars() { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute(impl::recreateTaskbars) + } else { + impl.recreateTaskbars() + } + } + + override fun onSystemUiFlagsChanged(systemUiStateFlags: Long, displayId: Int) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { + impl.onSystemUiFlagsChanged(systemUiStateFlags, displayId) + } + } else { + impl.onSystemUiFlagsChanged(systemUiStateFlags, displayId) + } + } + + override fun onLongPressHomeEnabled(assistantLongPressEnabled: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { + impl.onLongPressHomeEnabled(assistantLongPressEnabled) + } + } else { + impl.onLongPressHomeEnabled(assistantLongPressEnabled) + } + } + + override fun setSetupUIVisible(isVisible: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.setSetupUIVisible(isVisible) } + } else { + impl.setSetupUIVisible(isVisible) + } + } + + override fun setWallpaperVisible(displayId: Int, isVisible: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.setWallpaperVisible(displayId, isVisible) } + } else { + impl.setWallpaperVisible(displayId, isVisible) + } + } + + override fun checkNavBarModes(displayId: Int) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.checkNavBarModes(displayId) } + } else { + impl.checkNavBarModes(displayId) + } + } + + override fun finishBarAnimations(displayId: Int) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.finishBarAnimations(displayId) } + } else { + impl.finishBarAnimations(displayId) + } + } + + override fun touchAutoDim(displayId: Int, reset: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.touchAutoDim(displayId, reset) } + } else { + impl.touchAutoDim(displayId, reset) + } + } + + override fun transitionTo(displayId: Int, barMode: Int, animate: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.transitionTo(displayId, barMode, animate) } + } else { + impl.transitionTo(displayId, barMode, animate) + } + } + + override fun appTransitionPending(pending: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.appTransitionPending(pending) } + } else { + impl.appTransitionPending(pending) + } + } + + override fun onRotationProposal(rotation: Int, isValid: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.onRotationProposal(rotation, isValid) } + } else { + impl.onRotationProposal(rotation, isValid) + } + } + + override fun disableNavBarElements(displayId: Int, state1: Int, state2: Int, animate: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { + impl.disableNavBarElements(displayId, state1, state2, animate) + } + } else { + impl.disableNavBarElements(displayId, state1, state2, animate) + } + } + + override fun onSystemBarAttributesChanged(displayId: Int, behavior: Int) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { + impl.onSystemBarAttributesChanged(displayId, behavior) + } + } else { + impl.onSystemBarAttributesChanged(displayId, behavior) + } + } + + override fun onTransitionModeUpdated(barMode: Int, checkBarModes: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { + impl.onTransitionModeUpdated(barMode, checkBarModes) + } + } else { + impl.onTransitionModeUpdated(barMode, checkBarModes) + } + } + + override fun onNavButtonsDarkIntensityChanged(darkIntensity: Float) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { + impl.onNavButtonsDarkIntensityChanged(darkIntensity) + } + } else { + impl.onNavButtonsDarkIntensityChanged(darkIntensity) + } + } + + override fun onNavigationBarLumaSamplingEnabled(displayId: Int, enable: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { + impl.onNavigationBarLumaSamplingEnabled(displayId, enable) + } + } else { + impl.onNavigationBarLumaSamplingEnabled(displayId, enable) + } + } + + override fun onDisplayAddSystemDecorations(displayId: Int) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.onDisplayAddSystemDecorations(displayId) } + } else { + impl.onDisplayAddSystemDecorations(displayId) + } + } + + override fun onDisplayRemoved(displayId: Int) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.onDisplayRemoved(displayId) } + } else { + impl.onDisplayRemoved(displayId) + } + } + + override fun onDisplayRemoveSystemDecorations(displayId: Int) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.onDisplayRemoveSystemDecorations(displayId) } + } else { + impl.onDisplayRemoveSystemDecorations(displayId) + } + } + + override fun destroy() { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.destroy() } + } else { + impl.destroy() + } + } + + override fun createLauncherStartFromSuwAnim(duration: Int): AnimatorPlaybackController? { + // TODO(b/404636836): Evaluate if internal impl taskbar.createLauncherStartFromSuwAnim() is + // thread safe + return impl.createLauncherStartFromSuwAnim(duration) + } + + override fun shouldForceAllSetFallbackAnimation(): Boolean { + return impl.shouldForceAllSetFallbackAnimation() + } + + override fun getCurrentActivityContext(): TaskbarActivityContext? { + // Thread safe + return impl.currentActivityContext + } + + override fun getUIControllerForDisplay(displayId: Int): TaskbarUIController? { + // Thread safe + return impl.getUIControllerForDisplay(displayId) + } + + override fun getTaskbarForDisplay(displayId: Int): TaskbarActivityContext? { + // Thread safe + return impl.getTaskbarForDisplay(displayId) + } + + override fun createAllAppsPendingIntent(): PendingIntent { + // Thread safe + return impl.createAllAppsPendingIntent( + if (enableTaskbarUiThread()) impl.perWindowUiExecutor else Executors.MAIN_EXECUTOR + ) + } + + override fun getPrimaryDisplayId(): Int { + // Thread safe + return impl.getPrimaryDisplayId() + } + + override fun dumpLogs(prefix: String, pw: PrintWriter) { + // Stay on caller thread because PrinterWriter is not thread safe. + impl.dumpLogs(prefix, pw) + } + + override fun debugPrimaryTaskbar(debugReason: String, verbose: Boolean) { + if (shouldPostToTaskbarUiThread()) { + impl.perWindowUiExecutor.execute { impl.debugPrimaryTaskbar(debugReason, verbose) } + } else { + impl.debugPrimaryTaskbar(debugReason, verbose) + } + } + + private fun shouldPostToTaskbarUiThread(): Boolean { + return enableTaskbarUiThread() && Looper.getMainLooper() == Looper.myLooper() + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java index b065124c97e..17f56de8574 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java @@ -15,36 +15,35 @@ */ package com.android.launcher3.taskbar; -import static com.android.window.flags2.Flags.enableDesktopWindowingMode; -import static com.android.window.flags2.Flags.enableDesktopWindowingTaskbarRunningApps; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; import android.util.SparseArray; import android.view.View; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.UiThread; import com.android.launcher3.LauncherSettings.Favorites; +import com.android.launcher3.celllayout.CellInfo; import com.android.launcher3.model.BgDataModel; -import com.android.launcher3.model.BgDataModel.FixedContainerItems; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.statehandlers.DesktopVisibilityController; -import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.IntArray; -import com.android.launcher3.util.IntSet; +import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.model.data.WorkspaceData; +import com.android.launcher3.taskbar.handoff.HandoffSuggestion; +import com.android.launcher3.taskbar.TaskbarView.TaskbarLayoutParams; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Preconditions; -import com.android.quickstep.LauncherActivityInterface; -import com.android.quickstep.RecentsModel; +import com.android.quickstep.util.GroupTask; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -54,7 +53,7 @@ * Launcher model Callbacks for rendering taskbar. */ public class TaskbarModelCallbacks implements - BgDataModel.Callbacks, LauncherBindableItemsContainer, RecentsModel.RunningTasksListener { + BgDataModel.Callbacks, LauncherBindableItemsContainer { private final SparseArray mHotseatItems = new SparseArray<>(); private List mPredictedItems = Collections.emptyList(); @@ -68,8 +67,6 @@ public class TaskbarModelCallbacks implements // Used to defer any UI updates during the SUW unstash animation. private boolean mDeferUpdatesForSUW; private Runnable mDeferredUpdates; - private final DesktopVisibilityController.DesktopVisibilityListener mDesktopVisibilityListener = - visible -> updateRunningApps(); public TaskbarModelCallbacks( TaskbarActivityContext context, TaskbarView container) { @@ -79,72 +76,28 @@ public TaskbarModelCallbacks( public void init(TaskbarControllers controllers) { mControllers = controllers; - if (mControllers.taskbarRecentAppsController.getCanShowRunningApps()) { - RecentsModel.INSTANCE.get(mContext).registerRunningTasksListener(this); - - if (shouldShowRunningAppsInDesktopMode()) { - DesktopVisibilityController desktopVisibilityController = - LauncherActivityInterface.INSTANCE.getDesktopVisibilityController(); - if (desktopVisibilityController != null) { - desktopVisibilityController.registerDesktopVisibilityListener( - mDesktopVisibilityListener); - } - } - } - } - - /** - * Unregisters listeners in this class. - */ - public void unregisterListeners() { - RecentsModel.INSTANCE.get(mContext).unregisterRunningTasksListener(); - - if (shouldShowRunningAppsInDesktopMode()) { - DesktopVisibilityController desktopVisibilityController = - LauncherActivityInterface.INSTANCE.getDesktopVisibilityController(); - if (desktopVisibilityController != null) { - desktopVisibilityController.unregisterDesktopVisibilityListener( - mDesktopVisibilityListener); - } - } - } - - private boolean shouldShowRunningAppsInDesktopMode() { - // TODO(b/335401172): unify DesktopMode checks in Launcher - return enableDesktopWindowingMode() && enableDesktopWindowingTaskbarRunningApps(); } @Override - public void startBinding() { - mContext.setBindingItems(true); + public void bindCompleteModel(WorkspaceData itemIdMap, boolean isBindingSync) { mHotseatItems.clear(); - mPredictedItems = Collections.emptyList(); - } - - @Override - public void finishBindingItems(IntSet pagesBoundFirst) { - mContext.setBindingItems(false); - commitItemsToUI(); - } + mPredictedItems = itemIdMap.getPredictedContents(CONTAINER_HOTSEAT_PREDICTION); + handleItemsAdded(itemIdMap); - @Override - public void bindAppsAdded(IntArray newScreens, ArrayList addNotAnimated, - ArrayList addAnimated) { - boolean add1 = handleItemsAdded(addNotAnimated); - boolean add2 = handleItemsAdded(addAnimated); - if (add1 || add2) { - commitItemsToUI(); + if (itemIdMap.get(CONTAINER_ALL_APPS_PREDICTION) instanceof PredictedContainerInfo pci) { + mControllers.taskbarAllAppsController.setPredictedApps(pci.getContents()); } + commitItemsToUI(); } @Override - public void bindItems(List shortcuts, boolean forceAnimateIcons) { - if (handleItemsAdded(shortcuts)) { + public void bindItemsAdded(List items) { + if (handleItemsAdded(items)) { commitItemsToUI(); } } - private boolean handleItemsAdded(List items) { + private boolean handleItemsAdded(Iterable items) { boolean modified = false; for (ItemInfo item : items) { if (item.container == Favorites.CONTAINER_HOTSEAT) { @@ -155,26 +108,42 @@ private boolean handleItemsAdded(List items) { return modified; } + @Override + public void bindItemsUpdated(@NonNull Set updates) { + Set itemsToRebind = updateContainerItems(updates, mContext); + boolean removed = handleItemsRemoved(ItemInfoMatcher.ofItems(itemsToRebind)); + boolean added = handleItemsAdded(itemsToRebind); + + boolean predictionsUpdated = false; + for (ItemInfo update: updates) { + if (update instanceof PredictedContainerInfo pci) { + if (pci.id == Favorites.CONTAINER_HOTSEAT_PREDICTION) { + mPredictedItems = pci.getContents(); + predictionsUpdated = true; + } else if (pci.id == CONTAINER_ALL_APPS_PREDICTION) { + mControllers.taskbarAllAppsController.setPredictedApps(pci.getContents()); + } + } + } + if (removed || added || predictionsUpdated) { + commitItemsToUI(); + } + } + @Nullable @Override - public void bindWorkspaceItemsChanged(List updated) { - updateWorkspaceItems(updated, mContext); + public CellInfo getCellInfoForView(@NonNull View view) { + return view.getLayoutParams() instanceof TaskbarLayoutParams tlp ? tlp.bindInfo : null; } @Override - public void bindRestoreItemsChange(HashSet updates) { - updateRestoreItems(updates, mContext); + public boolean isContainerSupported(int container) { + return container == CONTAINER_HOTSEAT || container == CONTAINER_HOTSEAT_PREDICTION; } @Override - public void mapOverItems(ItemOperator op) { - final int itemCount = mContainer.getChildCount(); - for (int itemIdx = 0; itemIdx < itemCount; itemIdx++) { - View item = mContainer.getChildAt(itemIdx); - if (op.evaluate((ItemInfo) item.getTag(), item)) { - return; - } - } + public View mapOverItems(@NonNull ItemOperator op) { + return mContainer.mapOverItems(mContainer, op); } @Override @@ -195,32 +164,9 @@ private boolean handleItemsRemoved(Predicate matcher) { return modified; } - @Override - public void bindItemsModified(List items) { - boolean removed = handleItemsRemoved(ItemInfoMatcher.ofItems(items)); - boolean added = handleItemsAdded(items); - if (removed || added) { - commitItemsToUI(); - } - } - - @Override - public void bindExtraContainerItems(FixedContainerItems item) { - if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION) { - mPredictedItems = item.items; - commitItemsToUI(); - } else if (item.containerId == Favorites.CONTAINER_PREDICTION) { - mControllers.taskbarAllAppsController.setPredictedApps(item.items); - } - } - private void commitItemsToUI() { - if (mContext.isBindingItems()) { - return; - } - - ItemInfo[] hotseatItemInfos = - new ItemInfo[mContext.getDeviceProfile().numShownHotseatIcons]; + int taskbarSize = mContext.getTaskbarSpecsEvaluator().getMaxPinnableCount(); + ItemInfo[] hotseatItemInfos = new ItemInfo[taskbarSize]; int predictionSize = mPredictedItems.size(); int predictionNextIndex = 0; @@ -232,26 +178,38 @@ private void commitItemsToUI() { predictionNextIndex++; } } - hotseatItemInfos = mControllers.taskbarRecentAppsController - .updateHotseatItemInfos(hotseatItemInfos); - Set runningPackages = mControllers.taskbarRecentAppsController.getRunningApps(); - Set minimizedPackages = mControllers.taskbarRecentAppsController.getMinimizedApps(); + + final TaskbarRecentAppsController recentAppsController = + mControllers.taskbarRecentAppsController; + hotseatItemInfos = recentAppsController.updateHotseatItemInfos(hotseatItemInfos); + + final List handoffSuggestions + = android.companion.Flags.enableTaskContinuity() + ? mControllers.taskbarHandoffController.getSuggestions() + : Collections.emptyList(); if (mDeferUpdatesForSUW) { ItemInfo[] finalHotseatItemInfos = hotseatItemInfos; mDeferredUpdates = () -> - commitHotseatItemUpdates(finalHotseatItemInfos, runningPackages, - minimizedPackages); + commitHotseatItemUpdates(finalHotseatItemInfos, + recentAppsController.getShownTasks(), + handoffSuggestions); } else { - commitHotseatItemUpdates(hotseatItemInfos, runningPackages, minimizedPackages); + commitHotseatItemUpdates( + hotseatItemInfos, + recentAppsController.getShownTasks(), + handoffSuggestions); } } - private void commitHotseatItemUpdates(ItemInfo[] hotseatItemInfos, Set runningPackages, - Set minimizedPackages) { - mContainer.updateHotseatItems(hotseatItemInfos); - mControllers.taskbarViewController.updateIconViewsRunningStates(runningPackages, - minimizedPackages); + private void commitHotseatItemUpdates( + ItemInfo[] hotseatItemInfos, + List recentTasks, + List handoffSuggestions) { + + mContainer.updateItems(hotseatItemInfos, recentTasks, handoffSuggestions); + mControllers.taskbarViewController.updateIconViewsRunningStates(); + mControllers.taskbarPopupController.setTaskbarInfoList(mHotseatItems); } /** @@ -270,24 +228,18 @@ public void setDeferUpdatesForSUW(boolean defer) { } } - @Override - public void onRunningTasksChanged() { - updateRunningApps(); - } - /** Called when there's a change in running apps to update the UI. */ public void commitRunningAppsToUI() { commitItemsToUI(); } - /** Call TaskbarRecentAppsController to update running apps with mHotseatItems. */ - public void updateRunningApps() { - mControllers.taskbarRecentAppsController.updateRunningApps(); - } + /** Called when there's a change in handoff suggestions to update the UI. */ + public void commitHandoffSuggestionsToUI() { + if (!android.companion.Flags.enableTaskContinuity()) { + return; + } - @Override - public void bindDeepShortcutMap(HashMap deepShortcutMapCopy) { - mControllers.taskbarPopupController.setDeepShortcutMap(deepShortcutMapCopy); + commitItemsToUI(); } @UiThread @@ -296,7 +248,7 @@ public void bindAllApplications(AppInfo[] apps, int flags, Map packageUserKeytoUidMap) { Preconditions.assertUIThread(); mControllers.taskbarAllAppsController.setApps(apps, flags, packageUserKeytoUidMap); - mControllers.taskbarRecentAppsController.setApps(apps); + mControllers.taskbarPopupController.setApps(apps); } protected void dumpLogs(String prefix, PrintWriter pw) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacksFactory.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacksFactory.kt index eb03b4abc51..96a17050f07 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacksFactory.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacksFactory.kt @@ -17,12 +17,11 @@ package com.android.launcher3.taskbar import android.content.Context -import com.android.launcher3.R -import com.android.launcher3.util.ResourceBasedOverride -import com.android.launcher3.util.ResourceBasedOverride.Overrides +import com.android.launcher3.dagger.LauncherComponentProvider.appComponent +import javax.inject.Inject /** Creates [TaskbarModelCallbacks] instances. */ -open class TaskbarModelCallbacksFactory : ResourceBasedOverride { +open class TaskbarModelCallbacksFactory @Inject constructor() { open fun create( activityContext: TaskbarActivityContext, @@ -32,11 +31,7 @@ open class TaskbarModelCallbacksFactory : ResourceBasedOverride { companion object { @JvmStatic fun newInstance(context: Context): TaskbarModelCallbacksFactory { - return Overrides.getObject( - TaskbarModelCallbacksFactory::class.java, - context, - R.string.taskbar_model_callbacks_factory_class, - ) + return context.appComponent.getTaskbarModelCallbacksFactory() } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java index d26a36d175d..cad039bc4d5 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java @@ -16,6 +16,9 @@ package com.android.launcher3.taskbar; +import static android.view.KeyEvent.ACTION_DOWN; +import static android.view.KeyEvent.ACTION_UP; + import static com.android.internal.app.AssistUtils.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS; import static com.android.internal.app.AssistUtils.INVOCATION_TYPE_KEY; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_A11Y_BUTTON_LONGPRESS; @@ -24,6 +27,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_BACK_BUTTON_TAP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_HOME_BUTTON_LONGPRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_HOME_BUTTON_TAP; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_LONGPRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_TAP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_OVERVIEW_BUTTON_LONGPRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_OVERVIEW_BUTTON_TAP; @@ -31,11 +35,14 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; -import android.content.Context; +import android.app.contextualsearch.ContextualSearchConfig; +import android.graphics.Rect; import android.os.Bundle; import android.os.Handler; +import android.os.SystemClock; import android.util.Log; import android.view.HapticFeedbackConstants; +import android.view.KeyEvent; import android.view.View; import androidx.annotation.IntDef; @@ -48,7 +55,8 @@ import com.android.launcher3.testing.shared.TestProtocol; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TaskUtils; -import com.android.quickstep.util.AssistUtils; +import com.android.quickstep.util.ContextualSearchInvoker; +import com.android.systemui.contextualeducation.GestureType; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; import java.io.PrintWriter; @@ -67,9 +75,10 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa static final int SCREEN_PIN_LONG_PRESS_RESET = SCREEN_PIN_LONG_PRESS_THRESHOLD + 100; private static final String TAG = "TaskbarNavButtonController"; + private final Rect mTempRect = new Rect(); private long mLastScreenPinLongPress; private boolean mScreenPinned; - private boolean mAssistantLongPressEnabled; + private int mLastSentBackAction = ACTION_UP; @Override public void dumpLogs(String prefix, PrintWriter pw) { @@ -77,6 +86,8 @@ public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "\tmLastScreenPinLongPress=" + mLastScreenPinLongPress); pw.println(prefix + "\tmScreenPinned=" + mScreenPinned); + pw.println(prefix + "\tmLastSentBackAction=" + + KeyEvent.actionToString(mLastSentBackAction)); } @Retention(RetentionPolicy.SOURCE) @@ -104,50 +115,60 @@ public void dumpLogs(String prefix, PrintWriter pw) { private static final int SCREEN_UNPIN_COMBO = BUTTON_BACK | BUTTON_RECENTS; private int mLongPressedButtons = 0; - private final Context mContext; + private final int mDisplayId; private final TaskbarNavButtonCallbacks mCallbacks; private final SystemUiProxy mSystemUiProxy; private final Handler mHandler; - private final AssistUtils mAssistUtils; + private final ContextualSearchInvoker mContextualSearchInvoker; + private TaskbarControllers mControllers; @Nullable private StatsLogManager mStatsLogManager; private final Runnable mResetLongPress = this::resetScreenUnpin; public TaskbarNavButtonController( - Context context, + int displayId, TaskbarNavButtonCallbacks callbacks, SystemUiProxy systemUiProxy, Handler handler, - AssistUtils assistUtils) { - mContext = context; + ContextualSearchInvoker contextualSearchInvoker) { + mDisplayId = displayId; mCallbacks = callbacks; mSystemUiProxy = systemUiProxy; mHandler = handler; - mAssistUtils = assistUtils; + mContextualSearchInvoker = contextualSearchInvoker; } public void onButtonClick(@TaskbarButton int buttonType, View view) { if (buttonType == BUTTON_SPACE) { return; } + if (mLastSentBackAction == ACTION_DOWN) { + Log.i(TAG, "Button click ignored while back button is pressed"); + // prevent interactions with other buttons while back button is pressed + return; + } // Provide the same haptic feedback that the system offers for virtual keys. view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY); + // pE-TODO(QPR2): Check if haptic is required switch (buttonType) { case BUTTON_BACK: - logEvent(LAUNCHER_TASKBAR_BACK_BUTTON_TAP); - executeBack(); + executeBack(/* keyEvent */ null); break; case BUTTON_HOME: logEvent(LAUNCHER_TASKBAR_HOME_BUTTON_TAP); + mSystemUiProxy.updateContextualEduStats(/* isTrackpadGesture= */ false, + GestureType.HOME); navigateHome(); break; case BUTTON_RECENTS: logEvent(LAUNCHER_TASKBAR_OVERVIEW_BUTTON_TAP); + mSystemUiProxy.updateContextualEduStats(/* isTrackpadGesture= */ false, + GestureType.OVERVIEW); navigateToOverview(); break; case BUTTON_IME_SWITCH: logEvent(LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_TAP); - showIMESwitcher(); + onImeSwitcherPress(); break; case BUTTON_A11Y: logEvent(LAUNCHER_TASKBAR_A11Y_BUTTON_TAP); @@ -162,28 +183,54 @@ public void onButtonClick(@TaskbarButton int buttonType, View view) { } } + /** + * Handles long clicks and plays haptics for user visible actions. + */ public boolean onButtonLongClick(@TaskbarButton int buttonType, View view) { if (buttonType == BUTTON_SPACE) { return false; } - // Provide the same haptic feedback that the system offers for virtual keys. - view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY); + if (mLastSentBackAction == ACTION_DOWN && buttonType != BUTTON_BACK + && buttonType != BUTTON_RECENTS) { + // prevent interactions with other buttons while back button is pressed (except back + // and recents button for screen-unpin action). + Log.i(TAG, "Button long click ignored while back button is pressed"); + return false; + } + switch (buttonType) { case BUTTON_HOME: logEvent(LAUNCHER_TASKBAR_HOME_BUTTON_LONGPRESS); - onLongPressHome(); + onLongPressHome(view); + view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); return true; case BUTTON_A11Y: logEvent(LAUNCHER_TASKBAR_A11Y_BUTTON_LONGPRESS); notifyA11yClick(true /* longClick */); + view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); return true; case BUTTON_BACK: logEvent(LAUNCHER_TASKBAR_BACK_BUTTON_LONGPRESS); - return backRecentsLongpress(buttonType); + if (backRecentsLongpress(buttonType)) { + view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); + } + return true; case BUTTON_RECENTS: logEvent(LAUNCHER_TASKBAR_OVERVIEW_BUTTON_LONGPRESS); - return backRecentsLongpress(buttonType); + if (backRecentsLongpress(buttonType)) { + view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); + } + return true; case BUTTON_IME_SWITCH: + logEvent(LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_LONGPRESS); + onImeSwitcherLongPress(); + view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); + return true; default: return false; } @@ -210,6 +257,13 @@ public boolean onButtonLongClick(@TaskbarButton int buttonType, View view) { } } + /** + * Notifies SystemUI of the new bounds of the recents button in screen coordinates. + */ + public void onRecentsButtonLayoutChanged(Rect bounds) { + mSystemUiProxy.notifyRecentsButtonPositionChanged(bounds); + } + private boolean backRecentsLongpress(@TaskbarButton int buttonType) { mLongPressedButtons |= buttonType; return determineScreenUnpin(); @@ -253,6 +307,10 @@ private boolean determineScreenUnpin() { } private void resetScreenUnpin() { + // if only back button was long pressed, navigate back like a single click back behavior. + if (mLongPressedButtons == BUTTON_BACK) { + executeBack(null); + } mLongPressedButtons = 0; mLastScreenPinLongPress = 0; } @@ -262,17 +320,14 @@ public void updateSysuiFlags(@SystemUiStateFlags long sysuiFlags) { } public void init(TaskbarControllers taskbarControllers) { - mStatsLogManager = taskbarControllers.getTaskbarActivityContext().getStatsLogManager(); + mControllers = taskbarControllers; + mStatsLogManager = mControllers.getTaskbarActivityContext().getStatsLogManager(); } public void onDestroy() { mStatsLogManager = null; } - public void setAssistantLongPressEnabled(boolean assistantLongPressEnabled) { - mAssistantLongPressEnabled = assistantLongPressEnabled; - } - private void logEvent(StatsLogManager.LauncherEvent event) { if (mStatsLogManager == null) { Log.w(TAG, "No stats log manager to log taskbar button event"); @@ -283,7 +338,7 @@ private void logEvent(StatsLogManager.LauncherEvent event) { private void navigateHome() { TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY); - mCallbacks.onNavigateHome(); + mCallbacks.onNavigateHome(mDisplayId); } private void navigateToOverview() { @@ -292,31 +347,72 @@ private void navigateToOverview() { } TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onOverviewToggle"); TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS); - mCallbacks.onToggleOverview(); + mCallbacks.onToggleOverview(mDisplayId); + } + + public void hideOverview() { + mCallbacks.onHideOverview(mDisplayId); + } + + void sendBackKeyEvent(int action, boolean cancelled) { + if (action == mLastSentBackAction) { + // There must always be an alternating sequence of ACTION_DOWN and ACTION_UP events + return; + } + long time = SystemClock.uptimeMillis(); + KeyEvent keyEvent = new KeyEvent(time, time, action, KeyEvent.KEYCODE_BACK, 0); + keyEvent.setDisplayId(mDisplayId); + if (cancelled) { + keyEvent.cancel(); + } + executeBack(keyEvent); } - private void executeBack() { - mSystemUiProxy.onBackPressed(); + private void executeBack(@Nullable KeyEvent keyEvent) { + if (keyEvent == null || (keyEvent.getAction() == ACTION_UP && !keyEvent.isCanceled())) { + logEvent(LAUNCHER_TASKBAR_BACK_BUTTON_TAP); + mSystemUiProxy.updateContextualEduStats(/* isTrackpadGesture= */ false, + GestureType.BACK); + } + mSystemUiProxy.onBackEvent(keyEvent, mDisplayId); + mLastSentBackAction = keyEvent != null ? keyEvent.getAction() : ACTION_UP; } - private void showIMESwitcher() { + private void onImeSwitcherPress() { mSystemUiProxy.onImeSwitcherPressed(); } + private void onImeSwitcherLongPress() { + mSystemUiProxy.onImeSwitcherLongPress(); + } + private void notifyA11yClick(boolean longClick) { if (longClick) { mSystemUiProxy.notifyAccessibilityButtonLongClicked(); } else { - mSystemUiProxy.notifyAccessibilityButtonClicked(mContext.getDisplayId()); + mSystemUiProxy.notifyAccessibilityButtonClicked(mDisplayId); } } - private void onLongPressHome() { - if (mScreenPinned || !mAssistantLongPressEnabled) { + private void onLongPressHome(View view) { + if (mControllers == null) { + Log.w(TAG, "Contextual Search invocation failed: Controller not initialized"); return; } - // Attempt to start Assist with AssistUtils, otherwise fall back to SysUi's implementation. - if (!mAssistUtils.tryStartAssistOverride(INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS)) { + if (mScreenPinned) { + Log.w(TAG, "Contextual Search invocation failed: Screen pinned"); + return; + } + if (!mControllers.getSharedState().assistantLongPressEnabled) { + Log.w(TAG, "Contextual Search invocation failed: LPH disabled"); + return; + } + // Attempt to start Contextual Search, otherwise fall back to SysUi's implementation. + view.getBoundsOnScreen(mTempRect); + ContextualSearchConfig config = new ContextualSearchConfig.Builder() + .setSourceBounds(mTempRect).setDisplayId(mDisplayId).build(); + if (!mContextualSearchInvoker.tryStartAssistOverride( + INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS, config)) { Bundle args = new Bundle(); args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS); mSystemUiProxy.startAssistant(args); @@ -334,9 +430,12 @@ private void showNotifications() { /** Callbacks for navigation buttons on Taskbar. */ public interface TaskbarNavButtonCallbacks { /** Callback invoked when the home button is pressed. */ - default void onNavigateHome() {} + default void onNavigateHome(int displayId) {} /** Callback invoked when the overview button is pressed. */ - default void onToggleOverview() {} + default void onToggleOverview(int displayId) {} + + /** Callback invoken when a visible overview needs to be hidden. */ + default void onHideOverview(int displayId) { } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarOverflowItem.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarOverflowItem.kt new file mode 100644 index 00000000000..d6bc5c962f7 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarOverflowItem.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.app.ActivityTaskManager.INVALID_TASK_ID +import android.content.Context +import android.graphics.drawable.Drawable +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.ItemInfoWithIcon +import com.android.quickstep.util.SingleTask + +internal interface TaskbarOverflowItem { + /** The drawable icon for the item. */ + val drawableIcon: Drawable? + + /** The unique identifier for the item. */ + val itemId: Int +} + +// Wrapper for [Task] +internal class TaskWrapper(private val context: Context, private val singleTask: SingleTask?) : + TaskbarOverflowItem { + override val drawableIcon: Drawable? + get() = singleTask?.task?.icon ?: singleTask?.bitmapInfos?.firstOrNull()?.newIcon(context) + + override val itemId: Int + get() = singleTask?.task?.key?.id ?: INVALID_TASK_ID +} + +// Wrapper for [ItemInfo] +internal class ItemInfoWrapper(val itemInfo: ItemInfo?, private val context: Context) : + TaskbarOverflowItem { + override val drawableIcon: Drawable? + get() = (itemInfo as? ItemInfoWithIcon)?.bitmap?.newIcon(context) + + override val itemId: Int + get() = itemInfo?.id ?: ItemInfo.NO_ID +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarOverflowView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarOverflowView.java new file mode 100644 index 00000000000..1fb372951cf --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarOverflowView.java @@ -0,0 +1,514 @@ +/* + * 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.launcher3.taskbar; + +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.BlendMode; +import android.graphics.BlendModeColorFilter; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; +import android.util.FloatProperty; +import android.util.IntProperty; +import android.view.LayoutInflater; +import android.view.ViewGroup; +import android.widget.FrameLayout; + +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.core.graphics.ColorUtils; + +import com.android.app.animation.Interpolators; +import com.android.launcher3.R; +import com.android.launcher3.Reorderable; +import com.android.launcher3.Utilities; +import com.android.launcher3.icons.IconNormalizer; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.util.MultiTranslateDelegate; +import com.android.launcher3.util.Themes; +import com.android.quickstep.util.SingleTask; + +import java.util.ArrayList; +import java.util.List; + +/** + * View used as overflow icon within task bar, when the list of recent/running apps overflows the + * available display bounds - if display is not wide enough to show all running apps in the taskbar, + * this icon is added to the taskbar as an entry point to open UI that surfaces all running apps. + * The icon contains icon representations of up to 4 more recent tasks in overflow, stacked on top + * each other in counter clockwise manner (icons of tasks partially overlapping with each other). + */ +public class TaskbarOverflowView extends FrameLayout implements Reorderable { + private static final int ALPHA_TRANSPARENT = 0; + private static final int ALPHA_OPAQUE = 255; + private static final long ANIMATION_DURATION_APPS_TO_LEAVE_BEHIND = 300L; + private static final long ANIMATION_DURATION_LEAVE_BEHIND_TO_APPS = 500L; + private static final long ANIMATION_SET_DURATION = 1000L; + private static final long ITEM_ICON_CENTER_OFFSET_ANIMATION_DURATION = 500L; + private static final long ITEM_ICON_COLOR_FILTER_OPACITY_ANIMATION_DURATION = 600L; + private static final long ITEM_ICON_SIZE_ANIMATION_DURATION = 500L; + private static final long ITEM_ICON_STROKE_WIDTH_ANIMATION_DURATION = 500L; + private static final long LEAVE_BEHIND_ANIMATIONS_DELAY = 500L; + private static final long LEAVE_BEHIND_OPACITY_ANIMATION_DURATION = 100L; + private static final long LEAVE_BEHIND_SIZE_ANIMATION_DURATION = 500L; + private static final float LEAVE_BEHIND_SIZE_SCALE_DOWN_MULTIPLIER = 0.83f; + private static final int MAX_ITEMS_IN_PREVIEW = 4; + + // The height divided by the width of the horizontal box containing two overlapping app icons. + // According to the spec, this ratio is constant for different sizes of taskbar app icons. + // Assuming the width of this box = taskbar app icon size - 2 paddings - 2 stroke widths, and + // the height = width * 0.61, which is also equal to the height of a single item in the preview. + private static final float TWO_ITEM_ICONS_BOX_ASPECT_RATIO = 0.61f; + + private static final FloatProperty ITEM_ICON_CENTER_OFFSET = + new FloatProperty<>("itemIconCenterOffset") { + @Override + public Float get(TaskbarOverflowView view) { + return view.mItemIconCenterOffset; + } + + @Override + public void setValue(TaskbarOverflowView view, float value) { + view.mItemIconCenterOffset = value; + view.invalidate(); + } + }; + + private static final IntProperty ITEM_ICON_COLOR_FILTER_OPACITY = + new IntProperty<>("itemIconColorFilterOpacity") { + @Override + public Integer get(TaskbarOverflowView view) { + return view.mItemIconColorFilterOpacity; + } + + @Override + public void setValue(TaskbarOverflowView view, int value) { + view.mItemIconColorFilterOpacity = value; + view.invalidate(); + } + }; + + private static final FloatProperty ITEM_ICON_SIZE = + new FloatProperty<>("itemIconSize") { + @Override + public Float get(TaskbarOverflowView view) { + return view.mItemIconSize; + } + + @Override + public void setValue(TaskbarOverflowView view, float value) { + view.mItemIconSize = value; + view.invalidate(); + } + }; + + private static final FloatProperty ITEM_ICON_STROKE_WIDTH = + new FloatProperty<>("itemIconStrokeWidth") { + @Override + public Float get(TaskbarOverflowView view) { + return view.mItemIconStrokeWidth; + } + + @Override + public void setValue(TaskbarOverflowView view, float value) { + view.mItemIconStrokeWidth = value; + view.invalidate(); + } + }; + + private static final IntProperty LEAVE_BEHIND_OPACITY = + new IntProperty<>("leaveBehindOpacity") { + @Override + public Integer get(TaskbarOverflowView view) { + return view.mLeaveBehindOpacity; + } + + @Override + public void setValue(TaskbarOverflowView view, int value) { + view.mLeaveBehindOpacity = value; + view.invalidate(); + } + }; + + private static final FloatProperty LEAVE_BEHIND_SIZE = + new FloatProperty<>("leaveBehindSize") { + @Override + public Float get(TaskbarOverflowView view) { + return view.mLeaveBehindSize; + } + + @Override + public void setValue(TaskbarOverflowView view, float value) { + view.mLeaveBehindSize = value; + view.invalidate(); + } + }; + + private boolean mIsRtlLayout; + private final List mItems = new ArrayList(); + private int mIconSize; + private Paint mItemBackgroundPaint; + private final MultiTranslateDelegate mTranslateDelegate = new MultiTranslateDelegate(this); + private float mScaleForReorderBounce = 1f; + private int mItemBackgroundColor; + private int mLeaveBehindColor; + + // Active means the overflow icon has been pressed, which replaces the app icons with the + // leave-behind circle and shows the KQS UI. + private boolean mIsActive = false; + private ValueAnimator mStateTransitionAnimationWrapper; + + private float mItemIconCenterOffsetDefault; + private float mItemIconCenterOffset; // [0..mItemIconCenterOffsetDefault] + private int mItemIconColorFilterOpacity; // [ALPHA_TRANSPARENT..ALPHA_OPAQUE] + private float mItemIconSizeDefault; + private float mItemIconSizeScaledDown; + private float mItemIconSize; // [mItemIconSizeScaledDown..mItemIconSizeDefault] + private float mItemIconStrokeWidthDefault; + private float mItemIconStrokeWidth; // [0..mItemIconStrokeWidthDefault] + private int mLeaveBehindOpacity; // [ALPHA_TRANSPARENT..ALPHA_OPAQUE] + private float mLeaveBehindSizeScaledDown; + private float mLeaveBehindSizeDefault; + private float mLeaveBehindSize; // [mLeaveBehindSizeScaledDown..mLeaveBehindSizeDefault] + + public TaskbarOverflowView(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + } + + public TaskbarOverflowView(Context context) { + super(context); + init(); + } + + /** + * Inflates the taskbar overflow button view. + * @param resId The resource to inflate the view from. + * @param group The parent view. + * @param iconSize The size of the overflow button icon. + * @param padding The internal padding of the overflow view. + * @return A taskbar overflow button. + */ + public static TaskbarOverflowView inflateIcon(int resId, ViewGroup group, int iconSize, + int padding) { + LayoutInflater inflater = LayoutInflater.from(group.getContext()); + TaskbarOverflowView icon = (TaskbarOverflowView) inflater.inflate(resId, group, false); + + icon.mIconSize = iconSize; + + final float taskbarIconRadius = + (iconSize - padding * 2f) * IconNormalizer.ICON_VISIBLE_AREA_FACTOR / 2f; + + icon.mLeaveBehindSizeDefault = taskbarIconRadius; // 1/2 of taskbar app icon size + icon.mLeaveBehindSizeScaledDown = + icon.mLeaveBehindSizeDefault * LEAVE_BEHIND_SIZE_SCALE_DOWN_MULTIPLIER; + icon.mLeaveBehindSize = icon.mLeaveBehindSizeScaledDown; + + icon.mItemIconStrokeWidthDefault = + taskbarIconRadius / 10f; // 1/20 of taskbar app icon size + icon.mItemIconStrokeWidth = icon.mItemIconStrokeWidthDefault; + + icon.mItemIconSizeDefault = 2f * taskbarIconRadius * TWO_ITEM_ICONS_BOX_ASPECT_RATIO; + icon.mItemIconSizeScaledDown = icon.mLeaveBehindSizeScaledDown; + icon.mItemIconSize = icon.mItemIconSizeDefault; + + icon.mItemIconCenterOffsetDefault = taskbarIconRadius + - icon.mItemIconSizeDefault * IconNormalizer.ICON_VISIBLE_AREA_FACTOR / 2f + - icon.mItemIconStrokeWidthDefault; + icon.mItemIconCenterOffset = icon.mItemIconCenterOffsetDefault; + + return icon; + } + + private void init() { + mIsRtlLayout = Utilities.isRtl(getResources()); + mItemBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + mItemBackgroundColor = getContext().getColor( + com.android.internal.R.color.materialColorInverseOnSurface); + mLeaveBehindColor = Themes.getAttrColor(getContext(), android.R.attr.textColorTertiary); + + setWillNotDraw(false); + } + + @Override + protected void onDraw(@NonNull Canvas canvas) { + super.onDraw(canvas); + + drawAppIcons(canvas); + drawLeaveBehindCircle(canvas); + } + + private void drawAppIcons(@NonNull Canvas canvas) { + mItemBackgroundPaint.setColor(mItemBackgroundColor); + float canvasCenterXY = mIconSize / 2f; + int adjustedItemIconSize = Math.round(mItemIconSize); + float itemIconRadius = adjustedItemIconSize / 2f; + + int itemsToShow = Math.min(mItems.size(), MAX_ITEMS_IN_PREVIEW); + for (int i = itemsToShow - 1; i >= 0; --i) { + Drawable icon = mItems.get(mItems.size() - i - 1).getDrawableIcon(); + if (icon == null) { + continue; + } + + float itemCenterX = getItemXOffset(mItemIconCenterOffset, mIsRtlLayout, i, itemsToShow); + float itemCenterY = getItemYOffset(mItemIconCenterOffset, i, itemsToShow); + + Drawable iconCopy = icon.getConstantState().newDrawable().mutate(); + iconCopy.setBounds(0, 0, adjustedItemIconSize, adjustedItemIconSize); + iconCopy.setColorFilter(new BlendModeColorFilter( + ColorUtils.setAlphaComponent(mLeaveBehindColor, mItemIconColorFilterOpacity), + BlendMode.SRC_ATOP)); + + canvas.save(); + canvas.translate( + canvasCenterXY + itemCenterX - itemIconRadius, + canvasCenterXY + itemCenterY - itemIconRadius); + canvas.drawCircle(itemIconRadius, itemIconRadius, + itemIconRadius * IconNormalizer.ICON_VISIBLE_AREA_FACTOR + mItemIconStrokeWidth, + mItemBackgroundPaint); + iconCopy.draw(canvas); + canvas.restore(); + } + } + + private void drawLeaveBehindCircle(@NonNull Canvas canvas) { + mItemBackgroundPaint.setColor( + ColorUtils.setAlphaComponent(mLeaveBehindColor, mLeaveBehindOpacity)); + + final float xyCenter = mIconSize / 2f; + canvas.drawCircle(xyCenter, xyCenter, mLeaveBehindSize / 2f, mItemBackgroundPaint); + } + + /** + * Clears the list of tasks tracked by the view. + */ + public void clearItems() { + mItems.clear(); + invalidate(); + } + + /** + * Update the view to represent a new list of recent tasks. + * @param items Items to be shown in the view. + */ + public void setItems(List items) { + mItems.clear(); + mItems.addAll(items); + invalidate(); + } + + @VisibleForTesting + public List getItemIds() { + return mItems.stream().map(TaskbarOverflowItem::getItemId).toList(); + } + + List getOverflowInfoList() { + return mItems.stream().map(item -> ((ItemInfoWrapper) item).getItemInfo()).toList(); + } + + /** + * Called when a task is updated. If the task is contained within the view, it's cached value + * gets updated. If the task is shown within the icon, invalidates the view, so the task icon + * gets updated. + * @param singleTask The updated SingeTask. + */ + public void updateTaskIsShown(SingleTask singleTask) { + for (int i = 0; i < mItems.size(); ++i) { + if (mItems.get(i) instanceof TaskWrapper taskItem + && taskItem.getItemId() == singleTask.getTask().key.id) { + mItems.set(i, new TaskWrapper(getContext(), singleTask)); + if (i >= mItems.size() - MAX_ITEMS_IN_PREVIEW) { + invalidate(); + } + break; + } + } + } + + /** + * @return Tooltip to be used for the taskbar overflow view - returns null if the view should + * not have a tooltip. + */ + public String getTextForTooltipPopup() { + if (mIsActive) { + return null; + } + return getResources().getString(R.string.taskbar_overflow_a11y_title); + } + + /** + * Returns the view's state (whether it shows a set of app icons or a leave-behind circle). + */ + public boolean getIsActive() { + return mIsActive; + } + + /** + * Updates the view's state to draw either a set of app icons or a leave-behind circle. + * @param isActive The next state of the view. + */ + public void setIsActive(boolean isActive) { + if (mIsActive == isActive) { + return; + } + mIsActive = isActive; + + if (mStateTransitionAnimationWrapper != null + && mStateTransitionAnimationWrapper.isRunning()) { + mStateTransitionAnimationWrapper.reverse(); + return; + } + + final AnimatorSet stateTransitionAnimation = getStateTransitionAnimation(); + mStateTransitionAnimationWrapper = ValueAnimator.ofFloat(0, 1f); + mStateTransitionAnimationWrapper.setDuration(mIsActive + ? ANIMATION_DURATION_APPS_TO_LEAVE_BEHIND + : ANIMATION_DURATION_LEAVE_BEHIND_TO_APPS); + mStateTransitionAnimationWrapper.setInterpolator( + mIsActive ? Interpolators.STANDARD : Interpolators.EMPHASIZED); + mStateTransitionAnimationWrapper.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + mStateTransitionAnimationWrapper = null; + } + }); + mStateTransitionAnimationWrapper.addUpdateListener( + new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animator) { + stateTransitionAnimation.setCurrentPlayTime( + (long) (ANIMATION_SET_DURATION * animator.getAnimatedFraction())); + } + }); + mStateTransitionAnimationWrapper.start(); + } + + private AnimatorSet getStateTransitionAnimation() { + final AnimatorSet animation = new AnimatorSet(); + animation.setInterpolator(Interpolators.LINEAR); + animation.playTogether( + buildAnimator(ITEM_ICON_CENTER_OFFSET, 0f, mItemIconCenterOffsetDefault, + ITEM_ICON_CENTER_OFFSET_ANIMATION_DURATION, 0L, + ITEM_ICON_CENTER_OFFSET_ANIMATION_DURATION), + buildAnimator(ITEM_ICON_COLOR_FILTER_OPACITY, ALPHA_OPAQUE, ALPHA_TRANSPARENT, + ITEM_ICON_COLOR_FILTER_OPACITY_ANIMATION_DURATION, 0L, + ANIMATION_SET_DURATION - ITEM_ICON_COLOR_FILTER_OPACITY_ANIMATION_DURATION), + buildAnimator(ITEM_ICON_SIZE, mItemIconSizeScaledDown, mItemIconSizeDefault, + ITEM_ICON_SIZE_ANIMATION_DURATION, 0L, + ITEM_ICON_SIZE_ANIMATION_DURATION), + buildAnimator(ITEM_ICON_STROKE_WIDTH, 0f, mItemIconStrokeWidthDefault, + ITEM_ICON_STROKE_WIDTH_ANIMATION_DURATION, 0L, + ITEM_ICON_STROKE_WIDTH_ANIMATION_DURATION), + buildAnimator(LEAVE_BEHIND_OPACITY, ALPHA_OPAQUE, ALPHA_TRANSPARENT, + LEAVE_BEHIND_OPACITY_ANIMATION_DURATION, LEAVE_BEHIND_ANIMATIONS_DELAY, + ANIMATION_SET_DURATION - LEAVE_BEHIND_ANIMATIONS_DELAY + - LEAVE_BEHIND_OPACITY_ANIMATION_DURATION), + buildAnimator(LEAVE_BEHIND_SIZE, mLeaveBehindSizeDefault, + mLeaveBehindSizeScaledDown, LEAVE_BEHIND_SIZE_ANIMATION_DURATION, + LEAVE_BEHIND_ANIMATIONS_DELAY, 0L) + ); + return animation; + } + + private ObjectAnimator buildAnimator(IntProperty property, + int finalValueWhenAnimatingToLeaveBehind, int finalValueWhenAnimatingToAppIcons, + long duration, long delayWhenAnimatingToLeaveBehind, + long delayWhenAnimatingToAppIcons) { + final ObjectAnimator animator = ObjectAnimator.ofInt(this, property, + mIsActive ? finalValueWhenAnimatingToLeaveBehind + : finalValueWhenAnimatingToAppIcons); + applyTiming(animator, duration, delayWhenAnimatingToLeaveBehind, + delayWhenAnimatingToAppIcons); + return animator; + } + + private ObjectAnimator buildAnimator(FloatProperty property, + float finalValueWhenAnimatingToLeaveBehind, float finalValueWhenAnimatingToAppIcons, + long duration, long delayWhenAnimatingToLeaveBehind, + long delayWhenAnimatingToAppIcons) { + final ObjectAnimator animator = ObjectAnimator.ofFloat(this, property, + mIsActive ? finalValueWhenAnimatingToLeaveBehind + : finalValueWhenAnimatingToAppIcons); + applyTiming(animator, duration, delayWhenAnimatingToLeaveBehind, + delayWhenAnimatingToAppIcons); + return animator; + } + + private void applyTiming(ObjectAnimator animator, long duration, + long delayWhenAnimatingToLeaveBehind, + long delayWhenAnimatingToAppIcons) { + animator.setDuration(duration); + animator.setStartDelay( + mIsActive ? delayWhenAnimatingToLeaveBehind : delayWhenAnimatingToAppIcons); + } + + @Override + public MultiTranslateDelegate getTranslateDelegate() { + return mTranslateDelegate; + } + + @Override + public float getReorderBounceScale() { + return mScaleForReorderBounce; + } + + @Override + public void setReorderBounceScale(float scale) { + mScaleForReorderBounce = scale; + super.setScaleX(scale); + super.setScaleY(scale); + } + + private float getItemXOffset(float baseOffset, boolean isRtl, int itemIndex, int itemCount) { + // Item with index 1 is on the left in all cases. + if (itemIndex == 1) { + return (isRtl ? 1 : -1) * baseOffset; + } + + // First item is centered if total number of items shown is 3, on the right otherwise. + if (itemIndex == 0) { + if (itemCount == 3) { + return 0; + } + return (isRtl ? -1 : 1) * baseOffset; + } + + // Last item is on the right when there are more than 2 items (case which is already handled + // as `itemIndex == 1`). + if (itemIndex == itemCount - 1) { + return (isRtl ? -1 : 1) * baseOffset; + } + + return (isRtl ? 1 : -1) * baseOffset; + } + + private float getItemYOffset(float baseOffset, int itemIndex, int itemCount) { + // If icon contains two items, they are both centered vertically. + if (itemCount == 2) { + return 0; + } + // First half of items is on top, later half is on bottom. + return (itemIndex + 1 <= itemCount / 2 ? -1 : 1) * baseOffset; + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPinningController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarPinningController.kt index 6c9cc642beb..ca926991776 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPinningController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPinningController.kt @@ -24,18 +24,19 @@ import com.android.app.animation.Interpolators import com.android.launcher3.LauncherPrefs import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING_IN_DESKTOP_MODE +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DESKTOP_MODE_TASKBAR_PINNED +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DESKTOP_MODE_TASKBAR_UNPINNED import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_DIVIDER_MENU_CLOSE import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_DIVIDER_MENU_OPEN import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_PINNED import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_UNPINNED import com.android.launcher3.taskbar.TaskbarDividerPopupView.Companion.createAndPopulate import java.io.PrintWriter +import kotlin.jvm.optionals.getOrNull /** Controls taskbar pinning through a popup view. */ -class TaskbarPinningController( - private val context: TaskbarActivityContext, - private val isInDesktopModeProvider: () -> Boolean, -) : TaskbarControllers.LoggableTaskbarController { +class TaskbarPinningController(private val context: TaskbarActivityContext) : + TaskbarControllers.LoggableTaskbarController { private lateinit var controllers: TaskbarControllers private lateinit var taskbarSharedState: TaskbarSharedState @@ -57,12 +58,27 @@ class TaskbarPinningController( if (!didPreferenceChange) { return } - val shouldPinTaskbar = - if (isInDesktopModeProvider()) { + + if ( + controllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar( + context.displayId + ) + ) { + val shouldPinDesktopTaskbar = !launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE) - } else { - !launcherPrefs.get(TASKBAR_PINNING) - } + val logEvent = + if (shouldPinDesktopTaskbar) { + LAUNCHER_DESKTOP_MODE_TASKBAR_PINNED + } else { + LAUNCHER_DESKTOP_MODE_TASKBAR_UNPINNED + } + statsLogManager.logger().log(logEvent) + launcherPrefs.put(TASKBAR_PINNING_IN_DESKTOP_MODE, shouldPinDesktopTaskbar) + taskbarControllers.taskbarStashController.toggleTaskbarStash() + return + } + + val shouldPinTaskbar = !launcherPrefs.get(TASKBAR_PINNING) val animateToValue = if (shouldPinTaskbar) { @@ -78,10 +94,10 @@ class TaskbarPinningController( } } - fun showPinningView(view: View) { + fun showPinningView(view: View, horizontalPosition: Float = -1f) { context.isTaskbarWindowFullscreen = true view.post { - val popupView = getPopupView(view) + val popupView = getPopupView(view, horizontalPosition) popupView.requestFocus() popupView.onCloseCallback = onCloseCallback context.onPopupVisibilityChanged(true) @@ -91,8 +107,8 @@ class TaskbarPinningController( } @VisibleForTesting - fun getPopupView(view: View): TaskbarDividerPopupView<*> { - return createAndPopulate(view, context) + fun getPopupView(view: View, horizontalPosition: Float = -1f): TaskbarDividerPopupView<*> { + return createAndPopulate(view, context, horizontalPosition) } @VisibleForTesting @@ -119,9 +135,13 @@ class TaskbarPinningController( dragLayerController.taskbarBackgroundProgress.animateToValue(animateToValue), taskbarViewController.taskbarIconTranslationYForPinning.animateToValue(animateToValue), taskbarViewController.taskbarIconScaleForPinning.animateToValue(animateToValue), - taskbarViewController.taskbarIconTranslationXForPinning.animateToValue(animateToValue) + taskbarViewController.taskbarIconTranslationXForPinning.animateToValue(animateToValue), ) - + controllers.bubbleControllers.getOrNull()?.bubbleBarViewController?.let { + // if bubble bar is not visible no need to add it`s animations + if (!it.isBubbleBarVisible) return@let + animatorSet.playTogether(it.bubbleBarPinning.animateToValue(animateToValue)) + } animatorSet.interpolator = Interpolators.EMPHASIZED return animatorSet } @@ -134,10 +154,14 @@ class TaskbarPinningController( @VisibleForTesting fun recreateTaskbarAndUpdatePinningValue() { updateIsAnimatingTaskbarPinningAndNotifyTaskbarDragLayer(false) - if (isInDesktopModeProvider()) { + if ( + controllers.taskbarDesktopModeController.isInDesktopModeAndNotInOverview( + context.displayId + ) + ) { launcherPrefs.put( TASKBAR_PINNING_IN_DESKTOP_MODE, - !launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE) + !launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE), ) } else { launcherPrefs.put(TASKBAR_PINNING, !launcherPrefs.get(TASKBAR_PINNING)) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java index 2730be1b57e..9ba7f858500 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java @@ -15,48 +15,60 @@ */ package com.android.launcher3.taskbar; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; +import static com.android.launcher3.model.data.AppInfo.COMPONENT_KEY_COMPARATOR; +import static com.android.launcher3.model.data.AppInfo.PACKAGE_KEY_COMPARATOR; import static com.android.launcher3.util.SplitConfigurationOptions.getLogEventForPosition; +import static com.android.window.flags.Flags.enableOverflowButtonForTaskbarPinnedItems; import android.content.Intent; import android.content.pm.LauncherApps; import android.graphics.Point; +import android.os.UserHandle; import android.util.Pair; +import android.util.SparseArray; import android.view.MotionEvent; import android.view.View; +import android.window.DesktopExperienceFlags; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import com.android.internal.logging.InstanceId; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BubbleTextView; +import com.android.launcher3.Flags; import com.android.launcher3.LauncherSettings; -import com.android.launcher3.R; -import com.android.launcher3.dot.FolderDotInfo; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderIcon; -import com.android.launcher3.model.data.FolderInfo; +import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.notification.NotificationListener; +import com.android.launcher3.popup.Popup; +import com.android.launcher3.popup.PopupContainer; import com.android.launcher3.popup.PopupContainerWithArrow; -import com.android.launcher3.popup.PopupDataProvider; +import com.android.launcher3.popup.PopupController; +import com.android.launcher3.popup.PopupItemDragHandler; import com.android.launcher3.popup.SystemShortcut; import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.splitscreen.SplitShortcut; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.LauncherBindableItemsContainer; -import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.ShortcutUtil; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.views.ActivityContext; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.util.LogUtils; +import com.android.quickstep.util.SingleTask; +import com.android.systemui.shared.recents.model.Task; +import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import java.io.PrintWriter; -import java.util.HashMap; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -64,139 +76,203 @@ * Implements interfaces required to show and allow interacting with a PopupContainerWithArrow. * Controls the long-press menu on Taskbar and AllApps icons. */ -public class TaskbarPopupController implements TaskbarControllers.LoggableTaskbarController { +public class TaskbarPopupController implements TaskbarControllers.LoggableTaskbarController, + PopupController { private static final SystemShortcut.Factory APP_INFO = SystemShortcut.AppInfo::new; + private static final SystemShortcut.Factory + BUBBLE = SystemShortcut.BubbleShortcut::new; + private final TaskbarActivityContext mContext; - private final PopupDataProvider mPopupDataProvider; // Initialized in init. private TaskbarControllers mControllers; private boolean mAllowInitialSplitSelection; + private AppInfo[] mAppInfosList = AppInfo.EMPTY_ARRAY; + // Saves the ItemInfos in the hotseat without the predicted items. + private SparseArray mTaskbarInfoList; + private ManageWindowsTaskbarShortcut mManageWindowsTaskbarShortcut; + // Whether the popup is currently open. This is reset to false when the close animation is + // complete. + private boolean mIsPopupOpened = false; + public TaskbarPopupController(TaskbarActivityContext context) { mContext = context; - mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots); } public void init(TaskbarControllers controllers) { mControllers = controllers; - - NotificationListener.addNotificationsChangedListener(mPopupDataProvider); } public void onDestroy() { - NotificationListener.removeNotificationsChangedListener(mPopupDataProvider); + cleanUpMultiInstanceMenuReference(); } - @NonNull - public PopupDataProvider getPopupDataProvider() { - return mPopupDataProvider; + /** Closes the multi-instance menu if it is enabled and currently open. */ + public void maybeCloseMultiInstanceMenu() { + if (Flags.enableMultiInstanceMenuTaskbar() && mManageWindowsTaskbarShortcut != null) { + mManageWindowsTaskbarShortcut.closeMultiInstanceMenu(); + cleanUpMultiInstanceMenuReference(); + } } - public void setDeepShortcutMap(HashMap deepShortcutMapCopy) { - mPopupDataProvider.setDeepShortcutMap(deepShortcutMapCopy); + /** Releases the reference to the Taskbar multi-instance menu */ + public void cleanUpMultiInstanceMenuReference() { + mManageWindowsTaskbarShortcut = null; } public void setAllowInitialSplitSelection(boolean allowInitialSplitSelection) { mAllowInitialSplitSelection = allowInitialSplitSelection; } - private void updateNotificationDots(Predicate updatedDots) { - final PackageUserKey packageUserKey = new PackageUserKey(null, null); - Predicate matcher = info -> !packageUserKey.updateFromItemInfo(info) - || updatedDots.test(packageUserKey); + public boolean isPopupOpened() { + return mIsPopupOpened; + } + + // Create a Stream of all applicable system shortcuts + private Stream> getSystemShortcuts() { + // append split options to APP_INFO shortcut if not in Desktop Windowing mode, the order + // here will reflect in the popup + ArrayList> shortcuts = new ArrayList<>(); + shortcuts.add(APP_INFO); + if (!mControllers.taskbarDesktopModeController + .isInDesktopModeAndNotInOverview(mContext.getDisplayId())) { + shortcuts.addAll(mControllers.uiController.getSplitMenuOptions().toList()); + } + if (BubbleAnythingFlagHelper.enableCreateAnyBubble()) { + shortcuts.add(BUBBLE); + } - LauncherBindableItemsContainer.ItemOperator op = (info, v) -> { - if (info instanceof WorkspaceItemInfo && v instanceof BubbleTextView) { - if (matcher.test(info)) { - ((BubbleTextView) v).applyDotState(info, true /* animate */); - } - } else if (info instanceof FolderInfo && v instanceof FolderIcon) { - FolderInfo fi = (FolderInfo) info; - if (fi.anyMatch(matcher)) { - FolderDotInfo folderDotInfo = new FolderDotInfo(); - for (ItemInfo si : fi.getContents()) { - folderDotInfo.addDotInfo(mPopupDataProvider.getDotInfoForItem(si)); - } - ((FolderIcon) v).setDotInfo(folderDotInfo); + if (Flags.enableMultiInstanceMenuTaskbar() + && DesktopModeStatus.canEnterDesktopMode(mContext) + && !mControllers.taskbarStashController.isInOverview()) { + maybeCloseMultiInstanceMenu(); + shortcuts.addAll(getMultiInstanceMenuOptions().toList()); + } + + if (mControllers.taskbarDesktopModeController + .isInDesktopModeAndNotInOverview(mContext.getDisplayId())) { + shortcuts.add(createCloseAppTaskbarShortcutFactory()); + } + return shortcuts.stream(); + } + + @Nullable + @VisibleForTesting + SystemShortcut createPinShortcut(BaseTaskbarContext target, + ItemInfo itemInfo, BubbleTextView originalView) { + // Predicted items use {@code HotseatPredictionController.PinPrediction} shortcut to pin. + if (itemInfo.container == CONTAINER_HOTSEAT_PREDICTION) { + return null; + } + if (itemInfo.container == CONTAINER_HOTSEAT) { + return new PinToTaskbarShortcut<>(target, itemInfo, originalView, false, + mTaskbarInfoList); + } + + if (itemInfo.isInAllApps()) { + // If the target ItemInfo is already pinned on taskbar. Show the unpin option instead. + for (int i = 0; i < mTaskbarInfoList.size(); i++) { + if (Objects.equals(mTaskbarInfoList.valueAt(i).getComponentKey(), + itemInfo.getComponentKey())) { + return new PinToTaskbarShortcut<>(target, itemInfo, originalView, false, + mTaskbarInfoList); } } + } - // process all the shortcuts - return false; - }; - - mControllers.taskbarViewController.mapOverItems(op); - Folder folder = Folder.getOpen(mContext); - if (folder != null) { - folder.iterateOverItems(op); + if (mTaskbarInfoList.size() + < mContext.getTaskbarSpecsEvaluator().getMaxPinnableCount()) { + return new PinToTaskbarShortcut<>(target, itemInfo, originalView, true, + mTaskbarInfoList); } - mControllers.taskbarAllAppsController.updateNotificationDots(updatedDots); + + return null; } - /** - * Shows the notifications and deep shortcuts associated with a Taskbar {@param icon}. - * @return the container if shown or null. - */ - public PopupContainerWithArrow showForIcon(BubbleTextView icon) { + @Override + public void dumpLogs(String prefix, PrintWriter pw) { + pw.println(prefix + "TaskbarPopupController:"); + } + + @Nullable + @Override + public Popup show(@NonNull View view) { + BubbleTextView icon = (BubbleTextView) view; BaseTaskbarContext context = ActivityContext.lookupContext(icon.getContext()); - if (PopupContainerWithArrow.getOpen(context) != null) { + if (PopupContainer.getOpen(context) != null) { // There is already an items container open, so don't open this one. icon.clearFocus(); return null; } - ItemInfo item = (ItemInfo) icon.getTag(); - if (!ShortcutUtil.supportsShortcuts(item)) { + + ItemInfo itemInfo = null; + if (icon.getTag() instanceof ItemInfo item && ShortcutUtil.supportsShortcuts(item)) { + itemInfo = item; + } else if (canPinAppWithContextMenu(mContext) + && icon.getTag() instanceof SingleTask task) { + Task.TaskKey key = task.getTask().getKey(); + AppInfo appInfo = getApp( + new ComponentKey(key.getComponent(), UserHandle.of(key.userId))); + if (appInfo != null) { + WorkspaceItemInfo wif = appInfo.makeWorkspaceItem(icon.getContext()); + itemInfo = SingleTask.Companion.createTaskItemInfo(task, wif); + } + } + + if (itemInfo == null) { return null; } PopupContainerWithArrow container; - int deepShortcutCount = mPopupDataProvider.getShortcutCountForItem(item); + int deepShortcutCount = mContext.getActivityComponent() + .getPopupDataProvider().getShortcutCountForItem(itemInfo); // TODO(b/198438631): add support for INSTALL shortcut factory - List systemShortcuts = getSystemShortcuts() - .map(s -> s.getShortcut(context, item, icon)) + final ItemInfo finalInfo = itemInfo; + List> systemShortcuts = getSystemShortcuts() + .map(s -> s.getShortcut(context, finalInfo, icon)) .filter(Objects::nonNull) .collect(Collectors.toList()); - container = (PopupContainerWithArrow) context.getLayoutInflater().inflate( - R.layout.popup_container, context.getDragLayer(), false); - container.populateAndShowRows(icon, deepShortcutCount, systemShortcuts); + // TODO(b/375648361): Revisit to see if this can be implemented within getSystemShortcuts(). + if (canPinAppWithContextMenu(mContext)) { + SystemShortcut shortcut = + createPinShortcut(context, itemInfo, icon); + if (shortcut != null) { + systemShortcuts.add(0, shortcut); + } + } + container = PopupContainerWithArrow.create(context, /* originalView */ icon, + /*itemInfo */ itemInfo, + /* updateIconUi */ false); // TODO (b/198438631): configure for taskbar/context + container.populateAndShowRows(deepShortcutCount, systemShortcuts); container.setPopupItemDragHandler(new TaskbarPopupItemDragHandler()); - mControllers.taskbarDragController.addDragListener(container); + context.getDragController().addDragListener(container); container.requestFocus(); // Make focusable to receive back events context.onPopupVisibilityChanged(true); container.addOnCloseCallback(() -> { context.getDragLayer().post(() -> context.onPopupVisibilityChanged(false)); + mIsPopupOpened = false; }); + mIsPopupOpened = true; return container; } - // Create a Stream of all applicable system shortcuts - private Stream getSystemShortcuts() { - // append split options to APP_INFO shortcut, the order here will reflect in the popup - return Stream.concat( - Stream.of(APP_INFO), - mControllers.uiController.getSplitMenuOptions() - ); - } - @Override - public void dumpLogs(String prefix, PrintWriter pw) { - pw.println(prefix + "TaskbarPopupController:"); + public void dismiss() { - mPopupDataProvider.dump(prefix + "\t", pw); } private class TaskbarPopupItemDragHandler implements - PopupContainerWithArrow.PopupItemDragHandler { + PopupItemDragHandler { protected final Point mIconLastTouchPos = new Point(); @@ -226,7 +302,10 @@ public boolean onLongClick(View v) { // Move the icon to align with the center-top of the touch point Point iconShift = new Point(); iconShift.x = mIconLastTouchPos.x - sv.getIconCenter().x; - iconShift.y = mIconLastTouchPos.y - mContext.getDeviceProfile().taskbarIconSize; + iconShift.y = mIconLastTouchPos.y + - mContext.getDeviceProfile() + .getTaskbarProfile() + .getIconSize(); ((TaskbarDragController) ActivityContext.lookupContext( v.getContext()).getDragController()).startDragOnLongClick(sv, iconShift); @@ -248,7 +327,113 @@ SystemShortcut.Factory createSplitShortcutFactory( originalView, position, mAllowInitialSplitSelection); } - /** + /** + * Set the list of AppInfos to be able to pull from later + */ + public void setApps(AppInfo[] apps) { + mAppInfosList = apps; + } + + /** + * Finds and returns an AppInfo object from a list, using its ComponentKey for identification. + * Based off of {@link com.android.launcher3.allapps.AllAppsStore#getApp(ComponentKey)} + * since we cannot access AllAppsStore from here. + */ + public AppInfo getApp(ComponentKey key) { + if (key == null) { + return null; + } + AppInfo tempInfo = new AppInfo(); + tempInfo.componentName = key.componentName; + tempInfo.user = key.user; + int index = Arrays.binarySearch(mAppInfosList, tempInfo, COMPONENT_KEY_COMPARATOR); + if (index < 0) { + index = Arrays.binarySearch(mAppInfosList, tempInfo, PACKAGE_KEY_COMPARATOR); + } + return index < 0 ? null : mAppInfosList[index]; + } + + public void setTaskbarInfoList(SparseArray info) { + mTaskbarInfoList = info; + } + + public SparseArray getTaskbarInfoList() { + return mTaskbarInfoList.clone(); + } + + /** + * Returns a stream of Multi Instance menu options if an app supports it. + */ + Stream> getMultiInstanceMenuOptions() { + SystemShortcut.Factory f1 = createNewWindowShortcutFactory(); + SystemShortcut.Factory f2 = createManageWindowsShortcutFactory(); + return f1 != null ? Stream.of(f1, f2) : Stream.empty(); + } + + /** + * Creates a factory function representing a "New Window" menu item only if the calling app + * supports multi-instance. + * @return A factory function to be used in populating the long-press menu. + */ + SystemShortcut.Factory createNewWindowShortcutFactory() { + return (context, itemInfo, originalView) -> { + if (shouldShowMultiInstanceOptions(itemInfo)) { + return new NewWindowTaskbarShortcut<>(context, itemInfo, originalView); + } + return null; + }; + } + + /** + * Creates a factory function representing a "Manage Windows" menu item only if the calling app + * supports multi-instance. This menu item shows the open instances of the calling app. + * @return A factory function to be used in populating the long-press menu. + */ + public SystemShortcut.Factory createManageWindowsShortcutFactory() { + return (context, itemInfo, originalView) -> { + if (shouldShowMultiInstanceOptions(itemInfo)) { + mManageWindowsTaskbarShortcut = new ManageWindowsTaskbarShortcut<>( + context, itemInfo, originalView, mControllers); + return mManageWindowsTaskbarShortcut; + } + return null; + }; + } + + /** + * Creates a factory function representing a "Close" menu item only if the calling app + * is in Desktop Mode. + * @return A factory function to be used in populating the long-press menu. + */ + private SystemShortcut.Factory createCloseAppTaskbarShortcutFactory() { + return (context, itemInfo, originalView) -> new CloseAppTaskbarShortcut<>( + context, itemInfo, originalView, mControllers); + } + + /** + * Determines whether to show multi-instance options for a given item. + */ + private boolean shouldShowMultiInstanceOptions(ItemInfo itemInfo) { + ComponentKey key = itemInfo.getComponentKey(); + AppInfo app = getApp(key); + return app != null && app.supportsMultiInstance() + && itemInfo.container != CONTAINER_ALL_APPS; + } + + protected static boolean canPinAppWithContextMenu(TaskbarActivityContext context) { + return DesktopExperienceFlags.ENABLE_PINNING_APP_WITH_CONTEXT_MENU.isTrue() + && context.isTaskbarShowingDesktopTasks(); + } + + /** + * @return whether the taskbar can have the overflow icon to accommodate pinned apps that + * can't fit in taskbar. + */ + public static boolean canPinAppsOverflow() { + return enableOverflowButtonForTaskbarPinnedItems(); + } + + /** * A single menu item ("Split left," "Split right," or "Split top") that executes a split * from the taskbar, as if the user performed a drag and drop split. * Includes an onClick method that initiates the actual split. diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt index b31b7c742a1..6af4add147e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt @@ -15,18 +15,37 @@ */ package com.android.launcher3.taskbar -import android.app.ActivityManager.RunningTaskInfo -import android.app.WindowConfiguration +import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN +import android.app.ActivityTaskManager +import android.content.Context +import android.util.Log +import android.window.DesktopExperienceFlags +import android.window.DesktopModeFlags import androidx.annotation.VisibleForTesting +import com.android.launcher3.BubbleTextView.RunningAppState +import com.android.launcher3.Flags import com.android.launcher3.Flags.enableRecentsInTaskbar -import com.android.launcher3.model.data.AppInfo +import com.android.launcher3.Flags.enableTaskbarRecentsThemedIcons +import com.android.launcher3.graphics.ThemeManager +import com.android.launcher3.graphics.ThemeManager.ThemeChangeListener +import com.android.launcher3.model.data.AppPairInfo import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.TaskItemInfo import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.statehandlers.DesktopVisibilityController import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController +import com.android.launcher3.taskbar.TaskbarPopupController.canPinAppWithContextMenu +import com.android.launcher3.util.CancellableTask +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.SafeCloseable +import com.android.quickstep.RecentsFilterState import com.android.quickstep.RecentsModel -import com.android.window.flags2.Flags.enableDesktopWindowingMode -import com.android.window.flags2.Flags.enableDesktopWindowingTaskbarRunningApps +import com.android.quickstep.util.DesktopTask +import com.android.quickstep.util.GroupTask +import com.android.quickstep.util.SingleTask +import com.android.quickstep.util.SplitTask +import com.android.systemui.shared.recents.model.Task +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import java.io.PrintWriter /** @@ -35,152 +54,600 @@ import java.io.PrintWriter * - When in Desktop Mode: show the currently running (open) Tasks */ class TaskbarRecentAppsController( + private val context: Context, private val recentsModel: RecentsModel, - // Pass a provider here instead of the actual DesktopVisibilityController instance since that - // instance might not be available when this constructor is called. - private val desktopVisibilityControllerProvider: () -> DesktopVisibilityController?, + private val themeManager: ThemeManager, ) : LoggableTaskbarController { - // TODO(b/335401172): unify DesktopMode checks in Launcher. - val canShowRunningApps = - enableDesktopWindowingMode() && enableDesktopWindowingTaskbarRunningApps() + var canShowRunningApps = + DesktopModeStatus.canEnterDesktopMode(context) && + DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS.isTrue + @VisibleForTesting + set(isEnabledFromTest) { + field = isEnabledFromTest + if (!field && !canShowRecentApps) { + recentsModel.unregisterRecentTasksChangedListener(recentTasksChangedListener) + } + } + + val enableRecentTasksThrottle = + DesktopExperienceFlags.ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX.isTrue // TODO(b/343532825): Add a setting to disable Recents even when the flag is on. - var isEnabled: Boolean = enableRecentsInTaskbar() || canShowRunningApps + var canShowRecentApps = enableRecentsInTaskbar() @VisibleForTesting - set(isEnabledFromTest){ + set(isEnabledFromTest) { field = isEnabledFromTest + if (!field && !canShowRunningApps) { + recentsModel.unregisterRecentTasksChangedListener(recentTasksChangedListener) + } } // Initialized in init. private lateinit var controllers: TaskbarControllers - private var apps: Array? = null - private var allRunningDesktopAppInfos: List? = null - private var allMinimizedDesktopAppInfos: List? = null + var shownHotseatItems: List = emptyList() + private set + + private var mostRecentTaskId = ActivityTaskManager.INVALID_TASK_ID + private var previousDeskId = DesktopVisibilityController.INACTIVE_DESK_ID + + private var allRecentTasks: List = emptyList() + private var desktopTasks: List = emptyList() + // Keeps track of the order in which running tasks appear. + private var orderedRunningTaskIds = emptyList() + var shownTasks: List = emptyList() + private set + + val shownTaskIds: List + get() = shownTasks.flatMap { shownTask -> shownTask.tasks }.map { it.key.id } + + /** + * The task-state of an app, i.e. whether the app has a task and what state that task is in. + * + * @property taskId The ID of the task if one exists (i.e. if the state is RUNNING or + * MINIMIZED), null otherwise (NOT_RUNNING). + */ + data class TaskState(val runningAppState: RunningAppState, val taskId: Int? = null) + + /** + * Returns the state of the most active Desktop task represented by the given [ItemInfo]. + * + * If there are several tasks represented by the same [ItemInfo] we return the most active one, + * i.e. we return [DesktopAppState.RUNNING] over [DesktopAppState.MINIMIZED], and + * [DesktopAppState.MINIMIZED] over [DesktopAppState.NOT_RUNNING]. + */ + fun getDesktopItemState(itemInfo: ItemInfo?): TaskState { + val packageName = + itemInfo?.getTargetPackage() ?: return TaskState(RunningAppState.NOT_RUNNING) + return getDesktopTaskState(packageName, itemInfo.user.identifier) + } + + private fun getDesktopTaskState(packageName: String, userId: Int): TaskState { + if (desktopTasks.isEmpty()) { + return TaskState(RunningAppState.NOT_RUNNING) + } + val appTasks = + desktopTasks.filter { task -> + packageName == task.key.packageName && task.key.userId == userId + } + val runningTask = appTasks.find { getRunningAppState(it.key.id) == RunningAppState.RUNNING } + if (runningTask != null) { + return TaskState(RunningAppState.RUNNING, runningTask.key.id) + } + val minimizedTask = + appTasks.find { getRunningAppState(it.key.id) == RunningAppState.MINIMIZED } + if (minimizedTask != null) { + return TaskState(RunningAppState.MINIMIZED, taskId = minimizedTask.key.id) + } + return TaskState(RunningAppState.NOT_RUNNING) + } - private val desktopVisibilityController: DesktopVisibilityController? - get() = desktopVisibilityControllerProvider() + /** Get the [RunningAppState] for the given task. */ + fun getRunningAppState(taskId: Int): RunningAppState { + return when (taskId) { + in minimizedTaskIds -> RunningAppState.MINIMIZED + in runningTaskIds -> RunningAppState.RUNNING + else -> RunningAppState.NOT_RUNNING + } + } - private val isInDesktopMode: Boolean - get() = desktopVisibilityController?.areDesktopTasksVisible() ?: false + /** Returns the single task (i.e., fullscreen) represented by the given [itemInfo]. */ + fun getSingleTask(itemInfo: ItemInfo?): SingleTask? { + val packageName = itemInfo?.targetPackage ?: return null + return allRecentTasks.find { task -> + task is SingleTask && + packageName == task.task.key.packageName && + task.task.key.userId == itemInfo.user.identifier + } as? SingleTask + } - val runningApps: Set + @VisibleForTesting + val runningTaskIds: Set + /** + * Returns the task IDs of apps that should be indicated as "running" to the user. + * Specifically, we return all the open tasks if we are in Desktop mode, else emptySet(). + */ get() { - if (!isEnabled || !isInDesktopMode) { + if ( + !canShowRunningApps || + !controllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar() + ) { return emptySet() } - return allRunningDesktopAppInfos?.mapNotNull { it.targetPackage }?.toSet() ?: emptySet() + return desktopTasks.map { it.key.id }.toSet() } - val minimizedApps: Set + @VisibleForTesting + val minimizedTaskIds: Set + /** + * Returns the task IDs for the tasks that should be indicated as "minimized" to the user. + */ get() { - if (!isInDesktopMode) { + if ( + !canShowRunningApps || + !controllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar() + ) { return emptySet() } - return allMinimizedDesktopAppInfos?.mapNotNull { it.targetPackage }?.toSet() - ?: emptySet() + val multipleDesktopsEnabled = DesktopModeStatus.enableMultipleDesktops(context) + // When multi-desks is enabled, the indicator only indicates whether the window is + // minimized or not. This means an opened window inside an inactive desk will still + // have long app indicator inside the taskbar. + return desktopTasks + .filter { task -> + val shouldKeep = + if (multipleDesktopsEnabled) task.isMinimized else !task.isVisible + shouldKeep + } + .map { task -> task.key.id } + .toSet() } - fun init(taskbarControllers: TaskbarControllers) { + private val recentTasksChangedListener = + RecentsModel.RecentTasksChangedListener { reloadRecentTasksIfNeeded() } + + private val iconLoadRequests: MutableSet> = HashSet() + + // TODO(b/343291428): add TaskVisualsChangListener as well (for calendar/clock?) + + // Used to keep track of the last requested task list ID, so that we do not request to load the + // tasks again if we have already requested it and the task list has not changed + private var taskListChangeId = -1 + + // Whether we're currently loading recents tasks + private var loadingRecentsTasks = false + // Whether we need to reload recents tasks when the current loading operation is finished + private var needsRecentsTasksReload = false + // Whether we've loaded recents tasks at least once + private var recentTasksLoaded = false + + private var iconShapeDataCloseable: SafeCloseable? = null + private var themeChangeListener: ThemeChangeListener? = null + + fun init(taskbarControllers: TaskbarControllers, previousShownTasks: List) { controllers = taskbarControllers + if (!controllers.taskbarActivityContext.deviceProfile.isTaskbarPresent) return + + if (previousShownTasks.isNotEmpty()) { + shownTasks = previousShownTasks + fetchIcons() + } + orderedRunningTaskIds = + controllers.sharedState?.recentOrderedRunningTaskIds?.filterNotNull() ?: emptyList() + if (canShowRunningApps || canShowRecentApps) { + recentsModel.registerRecentTasksChangedListener(recentTasksChangedListener) + controllers.runAfterInit { reloadRecentTasksIfNeeded() } + if (enableTaskbarRecentsThemedIcons()) { + iconShapeDataCloseable = + themeManager.iconShapeData.forEach(MAIN_EXECUTOR) { fetchIcons() } + themeChangeListener = + ThemeChangeListener { fetchIcons() }.also { themeManager.addChangeListener(it) } + } + } } fun onDestroy() { - apps = null + controllers.sharedState?.recentTasksBeforeTaskbarRecreate?.clear() + if (shownTasks.isNotEmpty()) { + controllers.sharedState?.recentTasksBeforeTaskbarRecreate?.addAll(shownTasks) + } + controllers.sharedState?.recentOrderedRunningTaskIds?.clear() + if (orderedRunningTaskIds.isNotEmpty()) { + controllers.sharedState?.recentOrderedRunningTaskIds?.addAll(orderedRunningTaskIds) + } + recentsModel.unregisterRecentTasksChangedListener(recentTasksChangedListener) + cancelIconLoadRequests() + iconShapeDataCloseable?.close() + themeChangeListener?.let { themeManager.removeChangeListener(it) } } - /** Stores the current [AppInfo] instances, no-op except in desktop environment. */ - fun setApps(apps: Array?) { - this.apps = apps + private fun cancelIconLoadRequests() { + for (it in iconLoadRequests) it.cancel() + iconLoadRequests.clear() } /** Called to update hotseatItems, in order to de-dupe them from Recent/Running tasks later. */ - // TODO(next CL): add new section of Tasks instead of changing Hotseat items fun updateHotseatItemInfos(hotseatItems: Array): Array { - if (!isEnabled || !isInDesktopMode) { + // Ignore predicted apps - we show running or recent apps instead. + val showDesktopTasks = + controllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar() + val removePredictions = + (showDesktopTasks && canShowRunningApps) || (!showDesktopTasks && canShowRecentApps) + if (!removePredictions) { + shownHotseatItems = hotseatItems.filterNotNull() + onRecentsOrHotseatChanged() return hotseatItems } - val newHotseatItemInfos = + shownHotseatItems = hotseatItems .filterNotNull() - // Ignore predicted apps - we show running apps instead .filter { itemInfo -> !itemInfo.isPredictedItem } .toMutableList() - val runningDesktopAppInfos = - allRunningDesktopAppInfos?.let { - getRunningDesktopAppInfosExceptHotseatApps(it, newHotseatItemInfos.toList()) + + if (showDesktopTasks && canShowRunningApps) { + shownHotseatItems = updateHotseatItemsFromRunningTasks(shownHotseatItems) + } + + if (recentTasksLoaded) { + onRecentsOrHotseatChanged() + } + + return shownHotseatItems.toTypedArray() + } + + fun getDesktopTaskWithId(id: Int): Task? { + return desktopTasks.find { it.key.id == id } + } + + private fun getOrderedAndWrappedDesktopTasks(): List { + // We wrap each task in the Desktop as a `SingleTask`. + val orderFromId = orderedRunningTaskIds.withIndex().associate { (index, id) -> id to index } + val sortedTasks = desktopTasks.sortedWith(compareBy(nullsLast()) { orderFromId[it.key.id] }) + return sortedTasks.map { SingleTask(it) } + } + + /** + * Fetches the latest tasks from [RecentsModel] if the list is stale, throttling to prevent + * redundant calls. Triggers a UI commit if significant changes are detected. + */ + private fun reloadRecentTasksIfNeeded() { + if (recentsModel.isTaskListValid(taskListChangeId)) return + if (enableRecentTasksThrottle && loadingRecentsTasks) { + Log.v(TAG, "reloadRecentTasksIfNeeded: tried to reload while loading recents tasks") + needsRecentsTasksReload = true + return + } + Log.v(TAG, "reloadRecentTasksIfNeeded: load recents tasks") + // Only indicate that recents tasks are loading if the enableRecentTasksThrottle flag is on + loadingRecentsTasks = enableRecentTasksThrottle + taskListChangeId = + recentsModel.getTasks(RecentsFilterState.EMPTY_FILTER) { tasks -> + allRecentTasks = tasks + val oldRunningIds = runningTaskIds + val oldMinimizedIds = minimizedTaskIds + loadingRecentsTasks = false + recentTasksLoaded = true + + if ( + shouldCommitUiUpdate(oldRunningIds, oldMinimizedIds) && + !controllers.taskbarDesktopModeController.isLauncherAnimationRunning + ) { + controllers.taskbarViewController.commitRunningAppsToUI() + } + if (needsRecentsTasksReload) { + Log.v(TAG, "reloadRecentTasksIfNeeded: reload recents tasks") + needsRecentsTasksReload = false + reloadRecentTasksIfNeeded() + } + } + } + + /** Updates the internal task lists and returns whether the active desktop has changed. */ + private fun updateDesktopTasksAndCheckActiveDeskChange(): Boolean { + // Sort the full list of tasks by recency first. + val sortedDesktopTasks = allRecentTasks.filterIsInstance().toSortedTaskList() + + if (DesktopModeStatus.enableMultipleDesktops(context)) { + val activeDeskId = controllers.taskbarDesktopModeController.getActiveDeskId + val hasActiveDeskChanged = + activeDeskId != previousDeskId && + previousDeskId != DesktopVisibilityController.INACTIVE_DESK_ID + previousDeskId = activeDeskId + + if (hasActiveDeskChanged) { + // If the desk changed, re-order the already sorted list to prioritize the active + // desk. + val taskToDeskIdMap = + allRecentTasks + .filterIsInstance() + .flatMap { desktopTask -> + desktopTask.tasks.map { task -> task.key.id to desktopTask.deskId } + } + .toMap() + val (activeTasks, inactiveTasks) = + sortedDesktopTasks.partition { task -> + taskToDeskIdMap[task.key.id] == activeDeskId + } + desktopTasks = activeTasks + inactiveTasks + return true } - if (runningDesktopAppInfos != null) { - newHotseatItemInfos.addAll(runningDesktopAppInfos) } - return newHotseatItemInfos.toTypedArray() + desktopTasks = sortedDesktopTasks + return false + } + + /** + * Determines if a UI commit to update the hotseat is warranted based on various state changes. + */ + private fun shouldCommitUiUpdate(oldRunningIds: Set, oldMinimizedIds: Set): Boolean { + val activeDeskChanged = updateDesktopTasksAndCheckActiveDeskChange() + val recentsOrHotseatChanged = onRecentsOrHotseatChanged() + val runningTasksChanged = oldRunningIds != runningTaskIds + val minimizedTasksChanged = oldMinimizedIds != minimizedTaskIds + val multiInstanceFocusChanged = hasMultiInstanceFocusChanged() + + return recentsOrHotseatChanged || + runningTasksChanged || + minimizedTasksChanged || + activeDeskChanged || + multiInstanceFocusChanged + } + + /** + * Checks if the focused task has changed to a different instance of a multi-instance app that + * is currently pinned to the hotseat. + */ + private fun hasMultiInstanceFocusChanged(): Boolean { + val newMostRecentTask = desktopTasks.firstOrNull() ?: return false + val newMostRecentTaskId = newMostRecentTask.key.id + + val focusHasChanged = newMostRecentTaskId != mostRecentTaskId + mostRecentTaskId = newMostRecentTaskId + if (!focusHasChanged) { + return false + } + + val packageName = newMostRecentTask.key.packageName + val userId = newMostRecentTask.key.userId + + val instanceCount = + desktopTasks.count { it.key.packageName == packageName && it.key.userId == userId } + + return instanceCount > 1 && + shownHotseatItems.filterIsInstance().any { + it.targetPackage == packageName && it.user.identifier == userId + } } - private fun getRunningDesktopAppInfosExceptHotseatApps( - allRunningDesktopAppInfos: List, - hotseatItems: List - ): List { - val hotseatPackages = hotseatItems.map { it.targetPackage } - return allRunningDesktopAppInfos - .filter { appInfo -> !hotseatPackages.contains(appInfo.targetPackage) } - .map { WorkspaceItemInfo(it) } + /** Flattens, filters, and sorts [DesktopTask]s by last active time (descending) */ + private fun List.toSortedTaskList(): List { + return this.flatMap { it.tasks } + .filterNot { + it.key.isTopActivityTransparent && + it.key.isActivityStackTransparent && + it.key.windowingMode == WINDOWING_MODE_FULLSCREEN + } + .sortedByDescending { it.key.lastActiveTime } } - private fun getDesktopRunningTasks(): List = - recentsModel.runningTasks.filter { taskInfo: RunningTaskInfo -> - taskInfo.windowingMode == WindowConfiguration.WINDOWING_MODE_FREEFORM + /** + * Updates [shownTasks] when Recents or Hotseat changes. + * + * @return Whether [shownTasks] changed. + */ + private fun onRecentsOrHotseatChanged(): Boolean { + val oldShownTasks = shownTasks + orderedRunningTaskIds = updateOrderedRunningTaskIds() + shownTasks = + if (controllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar()) { + computeShownRunningTasks() + } else { + computeShownRecentTasks() + } + if (oldShownTasks == shownTasks) return false + fetchIcons() + return true + } + + private fun fetchIcons() { + if (enableRecentsInTaskbar()) { + cancelIconLoadRequests() // Cancel any previous requests. } - // TODO(b/335398876) fetch app icons from Tasks instead of AppInfos - private fun getAppInfosFromRunningTasks(tasks: List): List { - // Early return if apps is empty, since we then have no AppInfo to compare to - if (apps == null) { + for (groupTask in shownTasks) { + for ((i, task) in groupTask.tasks.withIndex()) { + val cancellableTask = + if (enableTaskbarRecentsThemedIcons()) { + recentsModel.iconCache.getBitmapInfoInBackground(task) { bi, d, t -> + groupTask.bitmapInfos[i] = bi + task.titleDescription = d + task.title = t + controllers.taskbarViewController.onTaskUpdated(task, groupTask) + } + } else { + recentsModel.iconCache.getIconInBackground(task) { ic, d, t -> + task.icon = ic + task.titleDescription = d + task.title = t + controllers.taskbarViewController.onTaskUpdated(task, groupTask) + } + } + if (cancellableTask != null) { + iconLoadRequests.add(cancellableTask) + } + } + } + } + + private fun updateOrderedRunningTaskIds(): MutableList { + val desktopTasksAsList = getOrderedAndWrappedDesktopTasks().map { it.task } + val desktopTaskIds = desktopTasksAsList.map { it.key.id } + var newOrder = + orderedRunningTaskIds + .filter { it in desktopTaskIds } // Only keep the tasks that are still running + .toMutableList() + // Add new tasks not already listed + newOrder.addAll(desktopTaskIds.filter { it !in newOrder }) + return newOrder + } + + /** + * Computes the list of running tasks to be shown in the recent apps section of the taskbar in + * desktop mode, taking into account deduplication against hotseat items and existing tasks. + */ + private fun computeShownRunningTasks(): List { + if (!canShowRunningApps) { return emptyList() } - val packageNames = tasks.map { it.realActivity?.packageName }.distinct().filterNotNull() - return packageNames - .map { packageName -> apps?.find { app -> packageName == app.targetPackage } } - .filterNotNull() - } - - /** Called to update the list of currently running apps, no-op except in desktop environment. */ - fun updateRunningApps() { - if (!isEnabled || !isInDesktopMode) { - return controllers.taskbarViewController.commitRunningAppsToUI() - } - val runningTasks = getDesktopRunningTasks() - val runningAppInfo = getAppInfosFromRunningTasks(runningTasks) - allRunningDesktopAppInfos = runningAppInfo - updateMinimizedApps(runningTasks, runningAppInfo) - controllers.taskbarViewController.commitRunningAppsToUI() - } - - private fun updateMinimizedApps( - runningTasks: List, - runningAppInfo: List, - ) { - val allRunningAppTasks = - runningAppInfo - .mapNotNull { appInfo -> appInfo.targetPackage?.let { appInfo to it } } - .associate { (appInfo, targetPackage) -> - appInfo to - runningTasks - .filter { it.realActivity?.packageName == targetPackage } - .map { it.taskId } + + val desktopTasks = desktopTasks.map { SingleTask(it) } + + val newShownTasks = + if (Flags.enableMultiInstanceMenuTaskbar()) { + val deduplicatedDesktopTasks = + desktopTasks.distinctBy { Pair(it.task.key.packageName, it.task.key.userId) } + val activityContext = controllers.taskbarActivityContext + + val deduplicatedTaskIds = deduplicatedDesktopTasks.map { it.task.key.id }.toSet() + shownTasks + .filter { + it is SingleTask && + it.task.key.id in deduplicatedTaskIds && + (!canPinAppWithContextMenu(activityContext) || + shownHotseatItems.none { hotseatItem -> + it.containsPackage( + hotseatItem.targetPackage, + hotseatItem.user.identifier, + ) + }) + } + .toMutableList() + .apply { + addAll( + deduplicatedDesktopTasks.filter { currentTask -> + val currentTaskKey = currentTask.task.key + currentTaskKey.id !in shownTaskIds && + shownHotseatItems.none { hotseatItem -> + currentTask.containsPackage( + hotseatItem.targetPackage, + hotseatItem.user.identifier, + ) + } + } + ) + } + } else { + val desktopTaskIds = desktopTasks.map { it.task.key.id } + val shownHotseatItemTaskIds = + shownHotseatItems.mapNotNull { it as? TaskItemInfo }.map { it.taskId } + + shownTasks + .filter { it is SingleTask && it.task.key.id in desktopTaskIds } + .toMutableList() + .apply { + addAll( + desktopTasks.filter { desktopTask -> + desktopTask.task.key.id !in shownTaskIds + } + ) + removeAll { it is SingleTask && it.task.key.id in shownHotseatItemTaskIds } + } + } + + return newShownTasks + } + + private fun computeShownRecentTasks(): List { + if (!canShowRecentApps || allRecentTasks.isEmpty()) { + return emptyList() + } + // Remove the current task. + val allRecentTasks = allRecentTasks.subList(0, allRecentTasks.size - 1) + var shownTasks = dedupeHotseatTasks(allRecentTasks, shownHotseatItems) + if (shownTasks.size > MAX_RECENT_TASKS) { + // Remove any tasks older than MAX_RECENT_TASKS. + shownTasks = shownTasks.subList(shownTasks.size - MAX_RECENT_TASKS, shownTasks.size) + } + return shownTasks + } + + private fun dedupeHotseatTasks( + groupTasks: List, + shownHotseatItems: List, + ): List { + // TODO: b/393476333 - Check the behavior of the Taskbar recents section when empty desks + // become supported. + return if (Flags.enableMultiInstanceMenuTaskbar()) { + groupTasks.filter { groupTask -> + // Keep tasks that are group tasks or unique package name/user combinations + when (groupTask) { + is SingleTask -> + shownHotseatItems.none { + groupTask.containsPackage(it.targetPackage, it.user.identifier) + } + is SplitTask -> + shownHotseatItems.filterIsInstance().none { + val firstPackage = it.getFirstApp().targetPackage + val secondPackage = it.getSecondApp().targetPackage + val userId = it.user.identifier + // Dedupe even if the app order is swapped. + groupTask.containsPackage(firstPackage, userId) && + groupTask.containsPackage(secondPackage, userId) + } + else -> true } - val minimizedTaskIds = runningTasks.associate { it.taskId to !it.isVisible } - allMinimizedDesktopAppInfos = - allRunningAppTasks - .filterValues { taskIds -> taskIds.all { minimizedTaskIds[it] ?: false } } - .keys - .toList() + } + } else { + val hotseatPackages = shownHotseatItems.map { it.targetPackage } + groupTasks.filter { groupTask -> + when (groupTask) { + is SingleTask -> hotseatPackages.none { groupTask.containsPackage(it) } + + else -> true + } + } + } } + /** + * Returns the hotseat items updated so that any item that points to a package+user with a + * running task also references that task. + */ + private fun updateHotseatItemsFromRunningTasks( + shownHotseatItems: List + ): List = + shownHotseatItems.map { itemInfo -> + if (!Flags.enableMultiInstanceMenuTaskbar() && itemInfo is TaskItemInfo) { + itemInfo + } else { + val foundTask = + desktopTasks.find { task -> + task.key.packageName == itemInfo.targetPackage && + task.key.userId == itemInfo.user.identifier + } ?: return@map itemInfo + TaskItemInfo(foundTask.key.id, itemInfo as WorkspaceItemInfo) + } + } + override fun dumpLogs(prefix: String, pw: PrintWriter) { pw.println("$prefix TaskbarRecentAppsController:") - pw.println("$prefix\tisEnabled=$isEnabled") pw.println("$prefix\tcanShowRunningApps=$canShowRunningApps") - // TODO(next CL): add more logs + pw.println("$prefix\tcanShowRecentApps=$canShowRecentApps") + pw.println("$prefix\tshownHotseatItems=${shownHotseatItems.map{item->item.targetPackage}}") + pw.println("$prefix\tallRecentTasks=${allRecentTasks.map { it.packageNames }}") + pw.println("$prefix\tdesktopTask=${desktopTasks.map { it.key.packageName }}") + pw.println("$prefix\tshownTasks=${shownTasks.map { it.packageNames }}") + pw.println("$prefix\trunningTaskIds=$runningTaskIds") + pw.println("$prefix\tminimizedTaskIds=$minimizedTaskIds") + } + + private val GroupTask.packageNames: List + get() = tasks.map { task -> task.key.packageName } + + private companion object { + private val TAG = "TaskbarRecentAppsController" + + const val MAX_RECENT_TASKS = 2 } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarRunningAppStateAnimationController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarRunningAppStateAnimationController.kt new file mode 100644 index 00000000000..4e690f192ba --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarRunningAppStateAnimationController.kt @@ -0,0 +1,276 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.animation.AnimatorSet +import android.animation.ArgbEvaluator +import android.animation.ObjectAnimator +import android.content.Context +import android.graphics.Color.TRANSPARENT +import android.util.FloatProperty +import android.util.IntProperty +import androidx.annotation.ColorInt +import androidx.annotation.Px +import androidx.annotation.UiThread +import androidx.core.animation.doOnEnd +import com.android.app.animation.Interpolators.EMPHASIZED +import com.android.app.animation.Interpolators.LINEAR +import com.android.internal.dynamicanimation.animation.FloatValueHolder +import com.android.internal.dynamicanimation.animation.SpringAnimation +import com.android.internal.dynamicanimation.animation.SpringForce +import com.android.internal.dynamicanimation.animation.SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY +import com.android.internal.dynamicanimation.animation.SpringForce.DAMPING_RATIO_NO_BOUNCY +import com.android.launcher3.BubbleTextView +import com.android.launcher3.BubbleTextView.RunningAppState +import com.android.launcher3.BubbleTextView.RunningAppState.MINIMIZED +import com.android.launcher3.BubbleTextView.RunningAppState.NOT_RUNNING +import com.android.launcher3.BubbleTextView.RunningAppState.RUNNING +import com.android.launcher3.R +import com.android.launcher3.Utilities as LauncherUtilities +import com.android.launcher3.model.data.TaskItemInfo +import com.android.launcher3.taskbar.TaskbarViewController.TRANSITION_DEFAULT_DURATION +import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.MultiTranslateDelegate.INDEX_TASKBAR_APP_RUNNING_STATE_ANIM + +private const val SPRING_START = 0f +private const val SPRING_END = 100f + +private val SPRING_NO_BOUNCY = + SpringForce(SPRING_END).apply { + dampingRatio = DAMPING_RATIO_NO_BOUNCY + stiffness = 3800f + } +private val SPRING_MEDIUM_BOUNCY = + SpringForce(SPRING_END).apply { + dampingRatio = DAMPING_RATIO_MEDIUM_BOUNCY + stiffness = 400f + } + +private val TRANSLATE_Y_PROPERTY = + object : FloatProperty("runningStateTranslateY") { + private val BubbleTextView.runningStateTranslateYProp: MultiPropertyFactory<*>.MultiProperty + get() = translateDelegate.getTranslationY(INDEX_TASKBAR_APP_RUNNING_STATE_ANIM) + + override fun get(btv: BubbleTextView): Float = btv.runningStateTranslateYProp.value + + override fun setValue(btv: BubbleTextView, translateY: Float) { + btv.runningStateTranslateYProp.value = translateY + btv.invalidate() + } + } + +private val LINE_COLOR_PROPERTY = + object : IntProperty("lineIndicatorColor") { + override fun get(btv: BubbleTextView): Int = btv.lineIndicatorColor + + override fun setValue(btv: BubbleTextView, color: Int) { + btv.lineIndicatorColor = color + } + } + +private val LINE_WIDTH_PROPERTY = + object : FloatProperty("lineIndicatorWidth") { + override fun get(btv: BubbleTextView): Float = btv.lineIndicatorWidth + + override fun setValue(btv: BubbleTextView, width: Float) { + btv.lineIndicatorWidth = width + } + } + +/** Manages Taskbar [BubbleTextView] animations from changes in [RunningAppState]. */ +class TaskbarRunningAppStateAnimationController(context: Context) { + + /** Animating [BubbleTextView] instances, where invoking each value cancels the animation. */ + private val runningAnimations = mutableMapOf Unit>() + + private val argbEvaluator = ArgbEvaluator() + private val runningLineColor = + context.resources.getColor(R.color.taskbar_running_app_indicator_color, context.theme) + private val minimizedLineColor = + context.resources.getColor(R.color.taskbar_minimized_app_indicator_color, context.theme) + + private val runningLineWidth = + context.resources + .getDimensionPixelSize(R.dimen.taskbar_running_app_indicator_width) + .toFloat() + private val minimizedLineWidth = + context.resources + .getDimensionPixelSize(R.dimen.taskbar_minimized_app_indicator_width) + .toFloat() + + private val appTranslateYSpring = + context.resources.getDimensionPixelSize(R.dimen.taskbar_app_translate_y_spring).toFloat() + private val lineWidthSpring = + context.resources + .getDimensionPixelSize(R.dimen.taskbar_line_indicator_width_spring) + .toFloat() + + // Copies the keys to avoid concurrent modification due to value callbacks modifying the map. + fun onDestroy() = runningAnimations.keys.toList().forEach { cancelAnimation(it) } + + @UiThread + fun updateRunningState(btv: BubbleTextView, runningState: RunningAppState, animate: Boolean) { + val prevRunningState = btv.runningAppState ?: NOT_RUNNING + if (runningState == prevRunningState) return + + cancelAnimation(btv) + btv.runningAppState = runningState + if (!animate) return applyRunningState(btv) + + val isPinnedApp = btv.tag is TaskItemInfo + if ( + (prevRunningState == RUNNING && runningState == MINIMIZED) || + (prevRunningState == MINIMIZED && runningState == RUNNING) || + (isPinnedApp && runningState == RUNNING) + ) { + return startAppBounceAnimation(btv) + } + + // Otherwise just animate line width and color. + AnimatorSet().run { + if (runningState == RUNNING) { + // New unpinned app - delay animation until icon is mostly scaled in. + startDelay = UNPINNED_APP_LINE_ANIM_DELAY + } + + duration = LINE_ANIM_DURATION + interpolator = EMPHASIZED + + playTogether( + ObjectAnimator.ofFloat(btv, LINE_WIDTH_PROPERTY, runningState.lineWidth), + ObjectAnimator.ofArgb(btv, LINE_COLOR_PROPERTY, runningState.lineColor), + ) + + doOnEnd { + runningAnimations.remove(btv) + applyRunningState(btv) + } + + runningAnimations[btv] = this::cancel + start() + } + } + + fun isAnimationRunning(btv: BubbleTextView): Boolean = runningAnimations.containsKey(btv) + + private fun cancelAnimation(btv: BubbleTextView) = runningAnimations[btv]?.invoke() + + private fun startAppBounceAnimation(btv: BubbleTextView) { + val isMinimized = btv.runningAppState == MINIMIZED + val translateYSpring = if (isMinimized) appTranslateYSpring else -appTranslateYSpring + val prevLineWidth = btv.lineIndicatorWidth + val prevLineColor = btv.lineIndicatorColor + + val translateYProp = + btv.translateDelegate.getTranslationY(INDEX_TASKBAR_APP_RUNNING_STATE_ANIM) + fun updateTranslateY(value: Float) { + translateYProp.value = value + btv.invalidate() + } + + SpringAnimation(FloatValueHolder()).run { + spring = SPRING_NO_BOUNCY + addUpdateListener { _, v, _ -> + updateTranslateY(mapValue(v, 0f, translateYSpring)) + if (isMinimized) { + btv.lineIndicatorWidth = mapValue(v, prevLineWidth, lineWidthSpring) + } + } + + addEndListener { _, canceled, _, _ -> + runningAnimations.remove(btv) + if (canceled) return@addEndListener applyRunningState(btv) + + val startLineWidth = if (isMinimized) lineWidthSpring else prevLineWidth + val endLineWidth = btv.runningAppState.lineWidth + val endLineColor = btv.runningAppState.lineColor + + val springs = + listOf( + SpringAnimation(FloatValueHolder()).apply { + spring = SPRING_MEDIUM_BOUNCY + addUpdateListener { _, v, _ -> + updateTranslateY(mapValue(v, translateYSpring, 0f)) + btv.lineIndicatorWidth = mapValue(v, startLineWidth, endLineWidth) + } + }, + SpringAnimation(FloatValueHolder()).apply { + spring = SPRING_NO_BOUNCY + addUpdateListener { _, v, _ -> + btv.lineIndicatorColor = + argbEvaluator.evaluate( + v / SPRING_END, + prevLineColor, + endLineColor, + ) as Int + } + }, + ) + + runningAnimations[btv] = { for (s in springs) s.cancel() } + var runningSprings = springs.size + for (s in springs) { + s.addEndListener { _, canceled2, _, _ -> + if (--runningSprings == 0) { + runningAnimations.remove(btv) + if (canceled2) applyRunningState(btv) + } + } + s.start() + } + } + + runningAnimations[btv] = this::cancel + start() + } + } + + private fun applyRunningState(btv: BubbleTextView) { + btv.lineIndicatorWidth = btv.runningAppState.lineWidth + btv.lineIndicatorColor = btv.runningAppState.lineColor + TRANSLATE_Y_PROPERTY[btv] = 0f + } + + private fun mapValue(value: Float, min: Float, max: Float): Float { + return LauncherUtilities.mapToRange(value, SPRING_START, SPRING_END, min, max, LINEAR) + } + + @get:ColorInt + val RunningAppState.lineColor: Int + get() { + return when (this) { + NOT_RUNNING -> TRANSPARENT + RUNNING -> runningLineColor + MINIMIZED -> minimizedLineColor + } + } + + @get:Px + val RunningAppState.lineWidth: Float + get() { + return when (this) { + NOT_RUNNING -> 0f + RUNNING -> runningLineWidth + MINIMIZED -> minimizedLineWidth + } + } + + companion object { + const val LINE_ANIM_DURATION = 100L + const val UNPINNED_APP_LINE_ANIM_DELAY = TRANSITION_DEFAULT_DURATION - LINE_ANIM_DURATION + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java index 48d2bc2ff74..80b884d5552 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java @@ -20,15 +20,17 @@ import static com.android.launcher3.taskbar.bubbles.BubbleBarController.isBubbleBarEnabled; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED; -import static com.android.wm.shell.common.bubbles.BubbleConstants.BUBBLE_EXPANDED_SCRIM_ALPHA; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE; +import static com.android.wm.shell.shared.bubbles.BubbleConstants.BUBBLE_EXPANDED_SCRIM_ALPHA; import android.animation.ObjectAnimator; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; +import androidx.annotation.VisibleForTesting; + import com.android.launcher3.anim.AnimatedFloat; -import com.android.launcher3.util.DisplayController; +import com.android.launcher3.taskbar.bubbles.BubbleControllers; import com.android.quickstep.SystemUiProxy; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; @@ -65,6 +67,7 @@ public TaskbarScrimViewController(TaskbarActivityContext activity, TaskbarScrimV */ public void init(TaskbarControllers controllers) { mControllers = controllers; + onTaskbarVisibilityChanged(mControllers.taskbarViewController.getTaskbarVisibility()); } /** @@ -75,7 +78,7 @@ public void init(TaskbarControllers controllers) { public void onTaskbarVisibilityChanged(int visibility) { mTaskbarVisible = visibility == VISIBLE; if (shouldShowScrim()) { - showScrim(true, getScrimAlpha(), false /* skipAnim */); + showScrim(true, computeScrimAlpha(), false /* skipAnim */); } else if (mScrimView.getScrimAlpha() > 0f) { showScrim(false, 0, false /* skipAnim */); } @@ -85,26 +88,42 @@ public void onTaskbarVisibilityChanged(int visibility) { * Updates the scrim state based on the flags. */ public void updateStateForSysuiFlags(@SystemUiStateFlags long stateFlags, boolean skipAnim) { - if (isBubbleBarEnabled() && DisplayController.isTransientTaskbar(mActivity)) { + if (mActivity.isPhoneMode()) { + // There is no scrim for the bar in the phone mode. + return; + } + boolean isTransient = mActivity.isTransientTaskbar(); + if (isBubbleBarEnabled() && isTransient) { // These scrims aren't used if bubble bar & transient taskbar are active. return; } mSysUiStateFlags = stateFlags; - showScrim(shouldShowScrim(), getScrimAlpha(), skipAnim); + showScrim(shouldShowScrim(), computeScrimAlpha(), skipAnim); } private boolean shouldShowScrim() { final boolean bubblesExpanded = (mSysUiStateFlags & SYSUI_STATE_BUBBLES_EXPANDED) != 0; boolean isShadeVisible = (mSysUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE) != 0; + BubbleControllers bubbleControllers = mActivity.getBubbleControllers(); + boolean isBubbleControllersPresented = bubbleControllers != null; + // when the taskbar is in persistent mode, we hide the task bar icons on bubble bar expand, + // which makes the taskbar invisible, so need to check if the bubble bar is not on home + // to show the scrim view + boolean showScrimForBubbles = bubblesExpanded + && !mTaskbarVisible + && isBubbleControllersPresented + && !mActivity.isTransientTaskbar() + && !bubbleControllers.bubbleStashController.isBubblesShowingOnHome(); return bubblesExpanded && !mControllers.navbarButtonsViewController.isImeVisible() && !isShadeVisible && !mControllers.taskbarStashController.isStashed() - && mTaskbarVisible; + && (mTaskbarVisible || showScrimForBubbles) + && !mControllers.taskbarStashController.isHiddenForBubbles(); } - private float getScrimAlpha() { - final boolean isPersistentTaskBarVisible = - mTaskbarVisible && !DisplayController.isTransientTaskbar(mScrimView.getContext()); + private float computeScrimAlpha() { + boolean isTransient = mActivity.isTransientTaskbar(); + final boolean isPersistentTaskBarVisible = mTaskbarVisible && !isTransient; final boolean manageMenuExpanded = (mSysUiStateFlags & SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED) != 0; if (isPersistentTaskBarVisible && manageMenuExpanded) { @@ -123,7 +142,7 @@ private void showScrim(boolean showScrim, float alpha, boolean skipAnim) { mScrimView.setOnClickListener(showScrim ? (view) -> onClick() : null); mScrimView.setClickable(showScrim); if (skipAnim) { - mScrimView.setScrimAlpha(alpha); + mScrimAlpha.updateValue(alpha); } else { ObjectAnimator anim = mScrimAlpha.animateToValue(showScrim ? alpha : 0); anim.setInterpolator(showScrim ? SCRIM_ALPHA_IN : SCRIM_ALPHA_OUT); @@ -136,7 +155,19 @@ private void updateScrimAlpha() { } private void onClick() { - SystemUiProxy.INSTANCE.get(mActivity).onBackPressed(); + mControllers.bubbleControllers.map(bc -> bc.bubbleBarViewController).ifPresentOrElse( + /* BubbleBarViewController */ bBVC -> { + if (bBVC.hasBubbles() && bBVC.isExpanded()) { + bBVC.animateExpanded(/* isExpanded = */ false); + } else { + triggerBackEvent(); + } + }, this::triggerBackEvent + ); + } + + private void triggerBackEvent() { + SystemUiProxy.INSTANCE.get(mActivity).onBackEvent(null, mActivity.getDisplayId()); } @Override @@ -150,4 +181,14 @@ public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "\tmScrimAlpha.value=" + mScrimAlpha.value); } + + @VisibleForTesting + TaskbarScrimView getScrimView() { + return mScrimView; + } + + @VisibleForTesting + float getScrimAlpha() { + return mScrimAlpha.value; + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarSharedState.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarSharedState.java index edaeb633817..be9485a4e6b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarSharedState.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarSharedState.java @@ -29,7 +29,13 @@ import android.os.IBinder; import android.view.InsetsFrameProvider; +import com.android.quickstep.util.GroupTask; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import com.android.wm.shell.shared.bubbles.BubbleInfo; + +import java.util.ArrayList; +import java.util.List; /** * State shared across different taskbar instance @@ -43,6 +49,8 @@ public class TaskbarSharedState { // TaskbarManager#onSystemUiFlagsChanged @SystemUiStateFlags public long sysuiStateFlags; + // TaskBarStashController#init() + public boolean isTaskbarOnOverview; // TaskbarManager#disableNavBarElements() public int disableNavBarDisplayId; @@ -56,14 +64,54 @@ public class TaskbarSharedState { // TaskbarManager#onNavButtonsDarkIntensityChanged() public float navButtonsDarkIntensity; + // TaskbarManager#onTransitionModeUpdated() + public int barMode; + // TaskbarManager#onNavigationBarLumaSamplingEnabled() public int mLumaSamplingDisplayId = DEFAULT_DISPLAY; public boolean mIsLumaSamplingEnabled = true; + /** + * Whether long pressing home should bring up assistant. + * @see TaskbarManagerImpl#onLongPressHomeEnabled(boolean) + */ + public boolean assistantLongPressEnabled; + public boolean setupUIVisible = false; + public boolean wallpaperVisible = false; + public boolean allAppsVisible = false; + public boolean bubbleBarExpanded = false; + + public boolean bubbleBarStashed = false; + + public boolean bubbleBarHasOverflow; + + public String selectedBubbleKey; + + public BubbleBarLocation bubbleBarLocation; + + public List bubbleInfoItems; + + public List suppressedBubbleInfoItems; + + /** Returns whether there are a saved bubbles. */ + public boolean hasSavedBubbles() { + return bubbleInfoItems != null && !bubbleInfoItems.isEmpty(); + } + + /** Clears stored bubble bar data. */ + public void clearBubbleData() { + bubbleInfoItems = null; + selectedBubbleKey = null; + bubbleBarLocation = null; + bubbleBarExpanded = false; + bubbleBarStashed = false; + suppressedBubbleInfoItems = null; + } + // LauncherTaskbarUIController#mTaskbarInAppDisplayProgressMultiProp public float[] inAppDisplayProgressMultiPropValues = new float[DISPLAY_PROGRESS_COUNT]; @@ -97,5 +145,12 @@ public void setTaskbarWasPinned(boolean taskbarWasPinned) { // To track if taskbar was stashed / unstashed between configuration changes (which recreates // the task bar). - public Boolean taskbarWasStashedAuto = true; + public boolean taskbarWasStashedAuto = true; + + // should show corner radius on persistent taskbar when in desktop mode. + public boolean showCornerRadiusInDesktopMode = false; + + public List recentTasksBeforeTaskbarRecreate = new ArrayList<>(); + + public final List recentOrderedRunningTaskIds = new ArrayList<>(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarShortcutMenuAccessibilityDelegate.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarShortcutMenuAccessibilityDelegate.java index 25db960ea3c..b7abdd5f39f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarShortcutMenuAccessibilityDelegate.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarShortcutMenuAccessibilityDelegate.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.content.pm.LauncherApps; +import android.content.pm.ShortcutInfo; import android.util.Pair; import android.view.KeyEvent; import android.view.View; @@ -35,9 +36,12 @@ import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.model.data.WorkspaceItemInfo; +import com.android.launcher3.taskbar.bubbles.BubbleActivityStarter; import com.android.launcher3.util.ShortcutUtil; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.util.LogUtils; +import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper; +import com.android.wm.shell.shared.bubbles.logging.EntryPoint; import java.util.List; @@ -50,6 +54,7 @@ public class TaskbarShortcutMenuAccessibilityDelegate public static final int MOVE_TO_TOP_OR_LEFT = R.id.action_move_to_top_or_left; public static final int MOVE_TO_BOTTOM_OR_RIGHT = R.id.action_move_to_bottom_or_right; + public static final int CREATE_APPLICATION_BUBBLE = R.id.action_create_application_bubble; private final LauncherApps mLauncherApps; private final StatsLogManager mStatsLogManager; @@ -67,6 +72,9 @@ public TaskbarShortcutMenuAccessibilityDelegate(TaskbarActivityContext context) MOVE_TO_BOTTOM_OR_RIGHT, R.string.move_drop_target_bottom_or_right, KeyEvent.KEYCODE_R)); + mActions.put(CREATE_APPLICATION_BUBBLE, new LauncherAction( + CREATE_APPLICATION_BUBBLE, R.string.open_app_as_a_bubble, + KeyEvent.KEYCODE_L)); } @Override @@ -76,11 +84,30 @@ protected void getSupportedActions(View host, ItemInfo item, List

Do not stash if in small screen, with 3 button nav, and in landscape (or seascape). - *

Do not stash if taskbar is transient. - *

Do not stash if hardware keyboard is attached and taskbar is pinned and IME is docked. - *

Do not stash if a system gesture is started. + * Whether the Taskbar should be stashed when the IME is visible. This is {@code false} if: + *

    + *
  • IME is not visible + *
  • Device is a phone (non-large screen) + *
  • Taskbar is transient + *
  • IME is not docked + *
*/ private boolean shouldStashForIme() { - if (DisplayController.isTransientTaskbar(mActivity)) { - return false; - } - // Do not stash if in small screen, with 3 button nav, and in landscape. - if (mActivity.isPhoneMode() && mActivity.isThreeButtonNav() - && mActivity.getDeviceProfile().isLandscape) { + if (!mIsImeVisible) { return false; } - - // Do not stash if pinned taskbar, hardware keyboard is attached and no IME is docked - if (mActivity.isHardwareKeyboard() && DisplayController.isPinnedTaskbar(mActivity) - && !mActivity.isImeDocked()) { + if (mActivity.isPhoneMode()) { return false; } - - // Do not stash if hardware keyboard is attached, in 3 button nav and desktop windowing mode - DesktopVisibilityController visibilityController = - LauncherActivityInterface.INSTANCE.getDesktopVisibilityController(); - if (visibilityController != null && mActivity.isHardwareKeyboard() - && mActivity.isThreeButtonNav() && visibilityController.areDesktopTasksVisible()) { + if (mActivity.isTransientTaskbar()) { return false; } - - // Do not stash if a gesture started. - if (mIsSystemGestureInProgress) { - return false; - } - - return mIsImeShowing || mIsImeSwitcherShowing; + return mActivity.isImeDocked(); } /** @@ -1090,6 +1380,7 @@ public boolean updateStateForFlag(long flag, boolean enabled) { } else { mState &= ~flag; } + mTaskbarUiState.setStashStateRef(mState); return mState != oldState; } @@ -1108,7 +1399,11 @@ private void onStateChangeApplied(long changedFlags) { mControllers.taskbarAutohideSuspendController.updateFlag( TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER, !isInApp()); } - if (hasAnyFlag(changedFlags, FLAG_STASHED_IN_APP_AUTO)) { + + // The primary display's transient Taskbar flag isn't applicable for connected displays. + if (hasAnyFlag(changedFlags, FLAG_STASHED_IN_APP_AUTO) + && (!enableAutoStashConnectedDisplayTaskbar.isTrue() + || mActivity.isPrimaryDisplay())) { mActivity.getStatsLogManager().logger().log(hasAnyFlag(FLAG_STASHED_IN_APP_AUTO) ? LAUNCHER_TRANSIENT_TASKBAR_HIDE : LAUNCHER_TRANSIENT_TASKBAR_SHOW); @@ -1116,7 +1411,15 @@ private void onStateChangeApplied(long changedFlags) { TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR, !hasAnyFlag(FLAG_STASHED_IN_APP_AUTO)); } - mActivity.applyForciblyShownFlagWhileTransientTaskbarUnstashed(!isStashedInApp()); + if (hasAnyFlag(changedFlags, FLAG_IN_OVERVIEW | FLAG_IN_APP)) { + mControllers.runAfterInit(() -> mControllers.taskbarInsetsController + .onTaskbarOrBubblebarWindowHeightOrInsetsChanged()); + if (mInAppStateAffectsDesktopTasksVisibilityInTaskbar) { + mControllers.runAfterInit( + () -> mControllers.taskbarViewController.commitRunningAppsToUI()); + } + } + updateTaskbarWindowForciblyShownFlag(); } private void notifyStashChange(boolean visible, boolean stashed) { @@ -1125,12 +1428,19 @@ private void notifyStashChange(boolean visible, boolean stashed) { mControllers.rotationButtonController.onTaskbarStateChange(visible, stashed); } + private void updateTaskbarWindowForciblyShownFlag() { + boolean forceVisible = mControllers.taskbarAutohideSuspendController.shouldForceVisible(); + boolean forceShow = !isStashedInApp() || forceVisible; + mActivity.applyForciblyShownFlagWhileTransientTaskbarUnstashed(forceShow); + } + /** * Setup system action for showing Taskbar depending on its visibility. */ public void setUpTaskbarSystemAction(boolean visible) { UI_HELPER_EXECUTOR.execute(() -> { - if (!visible || !DisplayController.isTransientTaskbar(mActivity)) { + if (!visible || !mActivity.isTransientTaskbar() + || mActivity.isPhoneMode()) { mAccessibilityManager.unregisterSystemAction(SYSTEM_ACTION_ID_TASKBAR); mIsTaskbarSystemActionRegistered = false; return; @@ -1154,6 +1464,13 @@ public void setUpTaskbarSystemAction(boolean visible) { * Clean up on destroy from TaskbarControllers */ public void onDestroy() { + // If the controller is destroyed before the animation finishes, we cancel the animation + // so that we don't finish the CUJ. + if (mAnimator != null) { + mAnimator.cancel(); + mAnimator = null; + } + mTaskbarSharedState.isTaskbarOnOverview = hasAnyFlag(FLAG_IN_OVERVIEW); UI_HELPER_EXECUTOR.execute( () -> mAccessibilityManager.unregisterSystemAction(SYSTEM_ACTION_ID_TASKBAR)); } @@ -1174,11 +1491,16 @@ public void cancelTimeoutIfExists() { * If false, attempts to re/start the timeout */ public void updateTaskbarTimeout(boolean isAutohideSuspended) { - if (!DisplayController.isTransientTaskbar(mActivity)) { + if (!shouldAllowTaskbarToAutoStash()) { return; } if (isAutohideSuspended) { cancelTimeoutIfExists(); + // make sure taskbar is visible if auto hide is suspended + updateTaskbarWindowForciblyShownFlag(); + } else if (mIsStashed) { + // auto hide is no longer suspended and we're already stashed; hide taskbar if needed + updateTaskbarWindowForciblyShownFlag(); } else { tryStartTaskbarTimeout(); } @@ -1187,10 +1509,8 @@ public void updateTaskbarTimeout(boolean isAutohideSuspended) { /** * Attempts to start timer to auto hide the taskbar based on time. */ - public void tryStartTaskbarTimeout() { - if (!DisplayController.isTransientTaskbar(mActivity) - || mIsStashed - || mEnableBlockingTimeoutDuringTests) { + private void tryStartTaskbarTimeout() { + if (!shouldAllowTaskbarToAutoStash() || mIsStashed || mEnableBlockingTimeoutDuringTests) { return; } @@ -1209,10 +1529,21 @@ private long getTaskbarAutoHideTimeout() { } private void onTaskbarTimeout(Alarm alarm) { - if (mControllers.taskbarAutohideSuspendController.isTransientTaskbarStashingSuspended()) { + if (mActivity.isTransientTaskbar() + && mControllers.taskbarAutohideSuspendController + .isTransientTaskbarStashingSuspended()) { return; } - updateAndAnimateTransientTaskbarForTimeout(); + if (mActivity.isTransientTaskbar()) { + updateAndAnimateTransientTaskbarForTimeout(); + } else if (shouldAllowTaskbarToAutoStash()) { + updateAndAnimatePinnedTaskbarForTimeout(); + } + } + + @VisibleForTesting + Alarm getTimeoutAlarm() { + return mTimeoutAlarm; } @Override @@ -1224,14 +1555,12 @@ public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "\tmIsStashed=" + mIsStashed); pw.println(prefix + "\tappliedState=" + getStateString(mStatePropertyHolder.mPrevFlags)); pw.println(prefix + "\tmState=" + getStateString(mState)); - pw.println(prefix + "\tmIsSystemGestureInProgress=" + mIsSystemGestureInProgress); - pw.println(prefix + "\tmIsImeShowing=" + mIsImeShowing); - pw.println(prefix + "\tmIsImeSwitcherShowing=" + mIsImeSwitcherShowing); + pw.println(prefix + "\tmIsImeVisible=" + mIsImeVisible); } private static String getStateString(long flags) { StringJoiner sj = new StringJoiner("|"); - appendFlag(sj, flags, FLAGS_IN_APP, "FLAG_IN_APP"); + appendFlag(sj, flags, FLAG_IN_APP, "FLAG_IN_APP"); appendFlag(sj, flags, FLAG_STASHED_IN_APP_SYSUI, "FLAG_STASHED_IN_APP_SYSUI"); appendFlag(sj, flags, FLAG_STASHED_IN_APP_SETUP, "FLAG_STASHED_IN_APP_SETUP"); appendFlag(sj, flags, FLAG_STASHED_IME, "FLAG_STASHED_IN_APP_IME"); @@ -1242,6 +1571,13 @@ private static String getStateString(long flags) { appendFlag(sj, flags, FLAG_STASHED_SYSUI, "FLAG_STASHED_SYSUI"); appendFlag(sj, flags, FLAG_STASHED_DEVICE_LOCKED, "FLAG_STASHED_DEVICE_LOCKED"); appendFlag(sj, flags, FLAG_IN_OVERVIEW, "FLAG_IN_OVERVIEW"); + appendFlag(sj, flags, FLAG_DELAY_TASKBAR_BG_TAG, "FLAG_DELAY_TASKBAR_BG_TAG"); + appendFlag(sj, flags, FLAG_STASHED_FOR_BUBBLES, "FLAG_STASHED_FOR_BUBBLES"); + appendFlag(sj, flags, FLAG_TASKBAR_HIDDEN, "FLAG_TASKBAR_HIDDEN"); + appendFlag(sj, flags, FLAG_STASHED_BUBBLE_BAR_ON_PHONE, "FLAG_STASHED_BUBBLE_BAR_ON_PHONE"); + appendFlag(sj, flags, FLAG_IGNORE_IN_APP, "FLAG_IGNORE_IN_APP"); + appendFlag(sj, flags, FLAG_IN_DESKTOP_MODE_ON_CD, "FLAG_IN_DESKTOP_MODE"); + appendFlag(sj, flags, FLAG_IN_SECONDARY_LAUNCHER_ON_CD, "FLAG_IN_SECONDARY_LAUNCHER_ON_CD"); return sj.toString(); } @@ -1268,6 +1604,13 @@ private class StatePropertyHolder { */ @Nullable public Animator createSetStateAnimator(long flags, long duration) { + // We do this when we want to synchronize the app launch and taskbar stash animations. + if (syncAppLaunchWithTaskbarStash() + && hasAnyFlag(FLAG_IGNORE_IN_APP) + && hasAnyFlag(flags, FLAG_IN_APP)) { + flags = flags & ~FLAG_IN_APP; + } + boolean isStashed = mStashCondition.test(flags); if (DEBUG) { @@ -1315,10 +1658,14 @@ public Animator createSetStateAnimator(long flags, long duration) { if (mIsStashed != isStashed || transitionTypeChanged) { mIsStashed = isStashed; + // We will let animation created from createAnimToIsStashed() below to run expensive + // onIsStashedChanged(). For now just update TaskbarUiState#isTaskbarStashed(). + updateIsTaskbarStashed(mIsStashed); mLastStartedTransitionType = animationType; + boolean shouldDelayBackground = hasAnyFlag(FLAG_DELAY_TASKBAR_BG_TAG); // This sets mAnimator. - createAnimToIsStashed(mIsStashed, duration, animationType, + createAnimToIsStashed(mIsStashed, duration, animationType, shouldDelayBackground, computeTaskbarJankMonitorTag(changedFlags)); return mAnimator; } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt index deaf0244e95..fd259223d2b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt @@ -23,7 +23,6 @@ import com.android.launcher3.testing.shared.ResourceUtils import com.android.launcher3.touch.SingleAxisSwipeDetector import com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_NEGATIVE import com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL -import com.android.launcher3.util.DisplayController import com.android.launcher3.util.TouchController import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer @@ -39,7 +38,7 @@ import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : TouchController { private val activity: TaskbarActivityContext = controllers.taskbarActivityContext - private val enabled = DisplayController.isTransientTaskbar(activity) + private val enabled = activity.isTransientTaskbar private val swipeDownDetector: SingleAxisSwipeDetector private val translationCallback = controllers.taskbarTranslationController.transitionCallback /** Interpolator to apply resistance as user swipes down to the bottom of the screen. */ @@ -48,7 +47,8 @@ class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : Touc private val maxVisualDisplacement = activity.resources.getDimensionPixelSize(R.dimen.transient_taskbar_bottom_margin).toFloat() /** How far the swipe could go, if user swiped from the very top of TaskbarView. */ - private val maxTouchDisplacement = maxVisualDisplacement + activity.deviceProfile.taskbarHeight + private val maxTouchDisplacement = + maxVisualDisplacement + activity.deviceProfile.taskbarProfile.height private val touchDisplacementToStash = activity.resources.getDimensionPixelSize(R.dimen.taskbar_to_nav_threshold).toFloat() @@ -67,9 +67,10 @@ class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : Touc val gestureHeight: Int = ResourceUtils.getNavbarSize( ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, - activity.resources + activity.resources, ) - gestureHeightYThreshold = (activity.deviceProfile.heightPx - gestureHeight).toFloat() + gestureHeightYThreshold = + (activity.deviceProfile.deviceProperties.heightPx - gestureHeight).toFloat() } private fun createSwipeListener() = @@ -89,7 +90,7 @@ class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : Touc maxTouchDisplacement, 0f, maxVisualDisplacement, - displacementInterpolator + displacementInterpolator, ) ) return false @@ -127,6 +128,14 @@ class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : Touc if (ev.action == MotionEvent.ACTION_OUTSIDE) { controllers.taskbarStashController.updateAndAnimateTransientTaskbar(true) } else if (controllers.taskbarViewController.isEventOverAnyItem(screenCoordinatesEv)) { + // TODO (b/411155437) remove this once BubbleDragController implements TouchController + val bubbleBarDragInProgress = + controllers.bubbleControllers + .map { it.bubbleDragController.isDragging } + .orElse(false) + if (bubbleBarDragInProgress) { + return false + } swipeDownDetector.onTouchEvent(ev) if (swipeDownDetector.isDraggingState) { return true diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarThresholdUtils.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarThresholdUtils.java index 5b6fbef4fdf..d3d7f5e1439 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarThresholdUtils.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarThresholdUtils.java @@ -25,7 +25,6 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; -import com.android.launcher3.config.FeatureFlags; /** * Utility class that contains the different taskbar thresholds logic. @@ -39,11 +38,7 @@ public class TaskbarThresholdUtils { private static int getThreshold(Resources r, DeviceProfile dp, int thresholdDimen, int multiplierDimen) { - if (!FeatureFlags.ENABLE_DYNAMIC_TASKBAR_THRESHOLDS.get()) { - return r.getDimensionPixelSize(thresholdDimen); - } - - float landscapeScreenHeight = dp.isLandscape ? dp.heightPx : dp.widthPx; + float landscapeScreenHeight = dp.getDeviceProperties().isLandscape() ? dp.getDeviceProperties().getHeightPx() : dp.getDeviceProperties().getWidthPx(); float screenPart = (landscapeScreenHeight * SCREEN_UNITS); float defaultDp = dpiFromPx(screenPart, DisplayMetrics.DENSITY_DEVICE_STABLE); float thisDp = dpToPx(defaultDp); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarTransitions.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarTransitions.java new file mode 100644 index 00000000000..615db012ecb --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarTransitions.java @@ -0,0 +1,135 @@ +/* + * 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.launcher3.taskbar; + +import android.view.View; + +import com.android.launcher3.R; +import com.android.launcher3.taskbar.navbutton.NearestTouchFrame; +import com.android.systemui.shared.statusbar.phone.BarTransitions; + +import java.io.PrintWriter; + +/** Manages task bar transitions */ +public class TaskbarTransitions extends BarTransitions implements + TaskbarControllers.LoggableTaskbarController { + + private final TaskbarActivityContext mContext; + + private boolean mWallpaperVisible; + + private boolean mLightsOut; + private boolean mAutoDim; + private View mNavButtons; + private float mDarkIntensity; + + private final NearestTouchFrame mView; + + public TaskbarTransitions(TaskbarActivityContext context, NearestTouchFrame view) { + super(view, R.drawable.nav_background); + + mContext = context; + mView = view; + } + + void init() { + mView.addOnLayoutChangeListener( + (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { + mNavButtons = mView.findViewById(R.id.end_nav_buttons); + applyLightsOut(false, true); + }); + mNavButtons = mView.findViewById(R.id.end_nav_buttons); + + applyModeBackground(-1, getMode(), false /*animate*/); + applyLightsOut(false /*animate*/, true /*force*/); + if (mContext.isPhoneButtonNavMode()) { + mBarBackground.setOverrideAlpha(1); + } + } + + void setWallpaperVisibility(boolean visible) { + mWallpaperVisible = visible; + applyLightsOut(true, false); + } + + @Override + public void setAutoDim(boolean autoDim) { + // Ensure we aren't in gestural nav if we are triggering auto dim + if (autoDim && !mContext.isPhoneButtonNavMode()) { + return; + } + if (mAutoDim == autoDim) return; + mAutoDim = autoDim; + applyLightsOut(true, false); + } + + @Override + protected void onTransition(int oldMode, int newMode, boolean animate) { + super.onTransition(oldMode, newMode, animate); + applyLightsOut(animate, false /*force*/); + } + + private void applyLightsOut(boolean animate, boolean force) { + // apply to lights out + applyLightsOut(isLightsOut(getMode()), animate, force); + } + + private void applyLightsOut(boolean lightsOut, boolean animate, boolean force) { + if (!force && lightsOut == mLightsOut) return; + + mLightsOut = lightsOut; + if (mNavButtons == null) return; + + // ok, everyone, stop it right there + mNavButtons.animate().cancel(); + + // Bump percentage by 10% if dark. + float darkBump = mDarkIntensity / 10; + final float navButtonsAlpha = lightsOut ? 0.6f + darkBump : 1f; + + if (!animate) { + mNavButtons.setAlpha(navButtonsAlpha); + } else { + final int duration = lightsOut ? LIGHTS_OUT_DURATION : LIGHTS_IN_DURATION; + mNavButtons.animate() + .alpha(navButtonsAlpha) + .setDuration(duration) + .start(); + } + } + + void onDarkIntensityChanged(float darkIntensity) { + mDarkIntensity = darkIntensity; + if (mAutoDim) { + applyLightsOut(false, true); + } + } + + @Override + public void dumpLogs(String prefix, PrintWriter pw) { + pw.println(prefix + "TaskbarTransitions:"); + + pw.println(prefix + "\tmMode=" + getMode()); + pw.println(prefix + "\tmAlwaysOpaque: " + isAlwaysOpaque()); + pw.println(prefix + "\tmWallpaperVisible: " + mWallpaperVisible); + pw.println(prefix + "\tmLightsOut: " + mLightsOut); + pw.println(prefix + "\tmAutoDim: " + mAutoDim); + pw.println(prefix + "\tbg overrideAlpha: " + mBarBackground.getOverrideAlpha()); + pw.println(prefix + "\tbg color: " + mBarBackground.getColor()); + pw.println(prefix + "\tbg frame: " + mBarBackground.getFrame()); + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java index 144c0c25c87..13fb2964981 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java @@ -29,7 +29,6 @@ import com.android.app.animation.Interpolators; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.SpringAnimationBuilder; -import com.android.launcher3.util.DisplayController; import java.io.PrintWriter; @@ -63,7 +62,7 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable public TaskbarTranslationController(TaskbarActivityContext context) { mContext = context; - mIsTransientTaskbar = DisplayController.isTransientTaskbar(mContext); + mIsTransientTaskbar = mContext.isTransientTaskbar(); mCallback = new TransitionCallback(); } @@ -95,7 +94,8 @@ private void updateTranslationYForSwipe() { mControllers.taskbarDragLayerController.setTranslationYForSwipe(transY); mControllers.bubbleControllers.ifPresent(controllers -> { controllers.bubbleBarViewController.setTranslationYForSwipe(transY); - controllers.bubbleStashedHandleViewController.setTranslationYForSwipe(transY); + controllers.bubbleStashedHandleViewController.ifPresent( + controller -> controller.setTranslationYForSwipe(transY)); }); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java index aa712f9a04b..2d572bd0240 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java @@ -20,10 +20,9 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_APP; -import static com.android.quickstep.OverviewCommandHelper.TYPE_HIDE; +import android.animation.Animator; import android.content.Intent; -import android.graphics.drawable.BitmapDrawable; import android.view.MotionEvent; import android.view.View; import android.window.RemoteTransition; @@ -37,30 +36,36 @@ import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.popup.SystemShortcut; -import com.android.launcher3.util.DisplayController; +import com.android.launcher3.taskbar.bubbles.BubbleBarController; +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator; +import com.android.launcher3.taskbar.customization.TaskbarSpecsEvaluator; import com.android.launcher3.util.SplitConfigurationOptions; -import com.android.quickstep.OverviewCommandHelper; -import com.android.quickstep.util.GroupTask; -import com.android.quickstep.util.TISBindHelper; +import com.android.quickstep.GestureState; +import com.android.quickstep.RecentsAnimationCallbacks; +import com.android.quickstep.util.SplitTask; import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.TaskContainer; import com.android.quickstep.views.TaskView; -import com.android.quickstep.views.TaskView.TaskContainer; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; import java.io.PrintWriter; import java.util.Collections; +import java.util.Set; import java.util.stream.Stream; /** * Base class for providing different taskbar UI */ -public class TaskbarUIController { +public class TaskbarUIController implements BubbleBarController.BubbleBarLocationListener { public static final TaskbarUIController DEFAULT = new TaskbarUIController(); // Initialized in init. protected TaskbarControllers mControllers; + protected boolean mSkipLauncherVisibilityChange; + @CallSuper protected void init(TaskbarControllers taskbarControllers) { mControllers = taskbarControllers; @@ -69,6 +74,15 @@ protected void init(TaskbarControllers taskbarControllers) { @CallSuper protected void onDestroy() { mControllers = null; + RecentsView recentsView = getRecentsView(); + if (recentsView != null) { + recentsView.setTaskLaunchListener(null); + recentsView.setTaskLaunchCancelledRunnable(null); + } + } + + protected TaskbarSpecsEvaluator getTaskbarSpecsEvaluator() { + return mControllers.taskbarActivityContext.getTaskbarSpecsEvaluator(); } protected boolean isTaskbarTouchable() { @@ -76,69 +90,45 @@ protected boolean isTaskbarTouchable() { } /** - * This should only be called by TaskbarStashController so that a - * TaskbarUIController can + * This should only be called by TaskbarStashController so that a TaskbarUIController can * disable stashing. All other controllers should use - * {@link TaskbarStashController#supportsVisualStashing()} as the source of - * truth. + * {@link TaskbarStashController#supportsVisualStashing()} as the source of truth. */ public boolean supportsVisualStashing() { return true; } - protected void onStashedInAppChanged() { - } + protected void onStashedInAppChanged() { } /** * Called when taskbar icon layout bounds change. */ - protected void onIconLayoutBoundsChanged() { - } + protected void onIconLayoutBoundsChanged() { } protected String getTaskbarUIControllerName() { return "TaskbarUIController"; } /** Called when an icon is launched. */ - @CallSuper - public void onTaskbarIconLaunched(ItemInfo item) { - // When launching from Taskbar, e.g. from Overview, set FLAG_IN_APP immediately - // instead of - // waiting for onPause, to reduce potential visual noise during the app open - // transition. - if (mControllers.taskbarStashController == null) - return; - mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_APP, true); - mControllers.taskbarStashController.applyState(); - } + public void onTaskbarIconLaunched(ItemInfo item) { } public View getRootView() { return mControllers.taskbarActivityContext.getDragLayer(); } - /** - * Called when swiping from the bottom nav region in fully gestural mode. - * - * @param inProgress True if the animation started, false if we just settled on - * an end target. - */ - public void setSystemGestureInProgress(boolean inProgress) { - mControllers.taskbarStashController.setSystemGestureInProgress(inProgress); - } - /** * Manually closes the overlay window. */ public void hideOverlayWindow() { - if (!DisplayController.isTransientTaskbar(mControllers.taskbarActivityContext) - || mControllers.taskbarAllAppsController.isOpen()) { + mControllers.keyboardQuickSwitchController.closeQuickSwitchView(); + boolean isTransientTaskbar = mControllers.taskbarActivityContext.isTransientTaskbar(); + if (!isTransientTaskbar || mControllers.taskbarAllAppsController.isOpen()) { mControllers.taskbarOverlayController.hideWindow(); } } /** - * User expands PiP to full-screen (or split-screen) mode, try to hide the - * Taskbar. + * User expands PiP to full-screen (or split-screen) mode, try to hide the Taskbar. */ public void onExpandPip() { if (mControllers != null) { @@ -175,23 +165,31 @@ public void startTranslationSpring() { mControllers.taskbarActivityContext.startTranslationSpring(); } + /** + * @return if we should allow taskbar to auto stash + */ + public boolean shouldAllowTaskbarToAutoStash() { + return mControllers.taskbarActivityContext.shouldAllowTaskbarToAutoStash(); + } + + public TaskbarFeatureEvaluator getTaskbarFeatureEvaluator() { + return mControllers.taskbarActivityContext.getTaskbarFeatureEvaluator(); + } + /** * @param ev MotionEvent in screen coordinates. - * - * @return Whether any Taskbar item could handle the given MotionEvent if given - * the chance. + * @return Whether any Taskbar item could handle the given MotionEvent if given the chance. */ public boolean isEventOverAnyTaskbarItem(MotionEvent ev) { return mControllers.taskbarViewController.isEventOverAnyItem(ev) || mControllers.navbarButtonsViewController.isEventOverAnyItem(ev); } - /** - * Checks if the given {@link MotionEvent} is over the bubble bar stash handle. - */ - public boolean isEventOverBubbleBarStashHandle(MotionEvent ev) { + /** Checks if the given {@link MotionEvent} is over the bubble bar views. */ + public boolean isEventOverBubbleBarViews(MotionEvent ev) { return mControllers.bubbleControllers.map( - bubbleControllers -> bubbleControllers.bubbleStashController.isEventOverStashHandle(ev)) + bubbleControllers -> + bubbleControllers.bubbleStashController.isEventOverBubbleBarViews(ev)) .orElse(false); } @@ -203,23 +201,52 @@ public boolean isIconAlignedWithHotseat() { } /** - * Returns true if hotseat icons are on top of view hierarchy when aligned in - * the current state. + * Returns true if hotseat icons are on top of view hierarchy when aligned in the current state. */ public boolean isHotseatIconOnTopWhenAligned() { return true; } + public boolean isAnimatingToHotseat() { + return false; + } + + /** + * Skips to the end of the animation to Hotseat - should only be used if + * {@link #isAnimatingToHotseat()} returns true. + */ + public void endAnimationToHotseat() {} + /** Returns {@code true} if Taskbar is currently within overview. */ protected boolean isInOverviewUi() { return false; } + /** - * Returns {@code true} if Home All Apps available instead of Taskbar All Apps. + * Toggles all apps UI. Default implementation opens Taskbar All Apps, but may be overridden to + * open different Alls Apps variant depending on the context. + * @param focusSearch indicates whether All Apps should be opened with search input focused. */ - protected boolean canToggleHomeAllApps() { - return false; + protected void toggleAllApps(boolean focusSearch) { + if (focusSearch) { + mControllers.taskbarAllAppsController.toggleSearch(); + } else { + mControllers.taskbarAllAppsController.toggle(); + } + } + + /** + * Return true only if drags originating from taskbar window is dragging an item. Drag + * originating from all apps using {@link TaskbarOverlayContext} is excluded. + */ + public boolean isDraggingItem() { + boolean bubblesDragging = false; + if (mControllers.bubbleControllers.isPresent()) { + bubblesDragging = + mControllers.bubbleControllers.get().bubbleDragController.isDragging(); + } + return mControllers.taskbarDragController.isDragging() || bubblesDragging; } @CallSuper @@ -232,10 +259,8 @@ protected void dumpLogs(String prefix, PrintWriter pw) { /** * Returns RecentsView. Overwritten in LauncherTaskbarUIController and - * FallbackTaskbarUIController with Launcher-specific implementations. Returns - * null for other - * UI controllers (like DesktopTaskbarUIController) that don't have a - * RecentsView. + * FallbackTaskbarUIController with Launcher-specific implementations. Returns null for other + * UI controllers (like DesktopTaskbarUIController) that don't have a RecentsView. */ public @Nullable RecentsView getRecentsView() { return null; @@ -248,30 +273,59 @@ public void startSplitSelection(SplitConfigurationOptions.SplitSelectSource spli } recentsView.getSplitSelectController().findLastActiveTasksAndRunCallback( - Collections.singletonList(splitSelectSource.itemInfo.getComponentKey()), + Collections.singletonList(splitSelectSource.getItemInfo().getResolvedTargetInfo()), false /* findExactPairMatch */, foundTasks -> { - @Nullable - Task foundTask = foundTasks[0]; + @Nullable Task foundTask = foundTasks[0]; splitSelectSource.alreadyRunningTaskId = foundTask == null ? INVALID_TASK_ID : foundTask.key.id; splitSelectSource.animateCurrentTaskDismissal = foundTask != null; recentsView.initiateSplitSelect(splitSelectSource); - }); + } + ); + } + + /** + * Adds the provided `task` as a second app in splitscreen. + */ + public void moveRunningTaskToSplitSelection(@NonNull Task task, @Nullable ItemInfo itemInfo, + View startingView) { + // When launching from Taskbar, set FLAG_IN_APP immediately to reduce potential visual noise + // during the app open transition. + if (mControllers.taskbarStashController != null) { + mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_APP, true); + mControllers.taskbarStashController.applyState(); + } + + getRecentsView().confirmSplitSelect( + null /* containerTaskView */, + task /* task */, + task.icon, + startingView, + task.thumbnail != null ? task.thumbnail.getThumbnail() : null /* thumbnail */, + null /* intent */, + null /* user */, + itemInfo); } /** * Uses the clicked Taskbar icon to launch a second app for splitscreen. */ public void triggerSecondAppForSplit(ItemInfoWithIcon info, Intent intent, View startingView) { + // When launching from Taskbar, e.g. from Overview, set FLAG_IN_APP immediately + // to reduce potential visual noise during the app open transition. + if (mControllers.taskbarStashController != null) { + mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_APP, true); + mControllers.taskbarStashController.applyState(); + } + RecentsView recents = getRecentsView(); recents.getSplitSelectController().findLastActiveTasksAndRunCallback( - Collections.singletonList(info.getComponentKey()), + Collections.singletonList(info.getResolvedTargetInfo()), false /* findExactPairMatch */, foundTasks -> { - @Nullable - Task foundTask = foundTasks[0]; + @Nullable Task foundTask = foundTasks[0]; if (foundTask != null) { TaskView foundTaskView = recents.getTaskViewByTaskId(foundTask.key.id); // TODO (b/266482558): This additional null check is needed because there @@ -282,13 +336,14 @@ public void triggerSecondAppForSplit(ItemInfoWithIcon info, Intent intent, View if (foundTaskView != null) { // There is already a running app of this type, use that as second app. // Get index of task (0 or 1), in case it's a GroupedTaskView - TaskContainer taskContainer = foundTaskView.getTaskContainerById(foundTask.key.id); + TaskContainer taskContainer = + foundTaskView.getTaskContainerById(foundTask.key.id); recents.confirmSplitSelect( foundTaskView, foundTask, taskContainer.getIconView().getDrawable(), - taskContainer.getThumbnailViewDeprecated(), - taskContainer.getThumbnailViewDeprecated().getThumbnail(), + taskContainer.getSnapshotView(), + taskContainer.getThumbnail(), null /* intent */, null /* user */, info); @@ -300,20 +355,20 @@ public void triggerSecondAppForSplit(ItemInfoWithIcon info, Intent intent, View recents.confirmSplitSelect( null /* containerTaskView */, null /* task */, - new BitmapDrawable(info.bitmap.icon), + info.newIcon(mControllers.taskbarActivityContext), startingView, null /* thumbnail */, intent, info.user, info); - }); + } + ); } /** * Opens the Keyboard Quick Switch View. * - * This will set the focus to the first task from the right (from the left in - * RTL) + * This will set the focus to the first task from the right (from the left in RTL) */ public void openQuickSwitchView() { mControllers.keyboardQuickSwitchController.openQuickSwitchView(); @@ -322,30 +377,28 @@ public void openQuickSwitchView() { /** * Launches the focused task and closes the Keyboard Quick Switch View. * - * If the overlay or view are closed, or the overview task is focused, then - * Overview is - * launched. If the overview task is launched, then the first hidden task is - * focused. + * If the overlay or view are closed, or the overview task is focused, then Overview is + * launched. If the overview task is launched, then the first hidden task is focused. * - * @return the index of what task should be focused in ; -1 iff Overview - * shouldn't be launched + * @return the set of task ids associated with the task view that should be focused; null iff + * overview shouldn't be launched */ - public int launchFocusedTask() { - int focusedTaskIndex = mControllers.keyboardQuickSwitchController.launchFocusedTask(); + @Nullable + public Set launchFocusedTask() { + Set focusedTaskIds = + mControllers.keyboardQuickSwitchController.launchFocusedTask(); mControllers.keyboardQuickSwitchController.closeQuickSwitchView(); - return focusedTaskIndex; + return focusedTaskIds; } /** * Launches the given task in split-screen. */ public void launchSplitTasks( - @NonNull GroupTask groupTask, @Nullable RemoteTransition remoteTransition) { - } + @NonNull SplitTask splitTask, @Nullable RemoteTransition remoteTransition) { } /** * Returns the matching view (if any) in the taskbar. - * * @param view The view to match. */ public @Nullable View findMatchingView(View view) { @@ -357,8 +410,7 @@ public void launchSplitTasks( return null; } - // Taskbar has the same items as the hotseat and we can use screenId to find the - // match. + // Taskbar has the same items as the hotseat and we can use screenId to find the match. int screenId = info.screenId; View[] views = mControllers.taskbarViewController.getIconViews(); for (int i = views.length - 1; i >= 0; --i) { @@ -372,9 +424,7 @@ public void launchSplitTasks( } /** - * Callback for when launcher state transition completes after user swipes to - * home. - * + * Callback for when launcher state transition completes after user swipes to home. * @param finalState The final state of the transition. */ public void onStateTransitionCompletedAfterSwipeToHome(LauncherState finalState) { @@ -384,8 +434,7 @@ public void onStateTransitionCompletedAfterSwipeToHome(LauncherState finalState) /** * Refreshes the resumed state of this ui controller. */ - public void refreshResumedState() { - } + public void refreshResumedState() {} /** * Returns a stream of split screen menu options appropriate to the device. @@ -398,35 +447,19 @@ Stream> getSplitMenuOptions() { } /** Adjusts the hotseat for the bubble bar. */ - public void adjustHotseatForBubbleBar(boolean isBubbleBarVisible) { - } - - @Nullable - protected TISBindHelper getTISBindHelper() { - return null; - } + public void adjustHotseatForBubbleBar(boolean isBubbleBarVisible) {} /** - * Launches the focused task in the Keyboard Quick Switch view through the - * OverviewCommandHelper + * Launches the focused task in the Keyboard Quick Switch view through the OverviewCommandHelper *

* Use this helper method when the focused task may be the overview task. */ public void launchKeyboardFocusedTask() { - TISBindHelper tisBindHelper = getTISBindHelper(); - if (tisBindHelper == null) { - return; - } - OverviewCommandHelper overviewCommandHelper = tisBindHelper.getOverviewCommandHelper(); - if (overviewCommandHelper == null) { - return; - } - overviewCommandHelper.addCommand(TYPE_HIDE); + mControllers.navButtonController.hideOverview(); } /** * Adjusts the taskbar based on the visibility of the launcher. - * * @param isVisible True if launcher is visible, false otherwise. */ public void onLauncherVisibilityChanged(boolean isVisible) { @@ -435,8 +468,7 @@ public void onLauncherVisibilityChanged(boolean isVisible) { } /** - * Request for UI controller to ignore animations for the next callback for the - * end of recents + * Request for UI controller to ignore animations for the next callback for the end of recents * animation */ public void setSkipNextRecentsAnimEnd() { @@ -446,7 +478,59 @@ public void setSkipNextRecentsAnimEnd() { /** * Sets whether the user is going home based on the current gesture. */ - public void setUserIsGoingHome(boolean isGoingHome) { - mControllers.taskbarStashController.setUserIsGoingHome(isGoingHome); + public void setUserIsNotGoingHome(boolean isNotGoingHome) { + mControllers.taskbarStashController.setUserIsNotGoingHome(isNotGoingHome); + } + + /** + * Sets whether to prevent taskbar from reacting to launcher visibility during the recents + * transition animation. + */ + public void setSkipLauncherVisibilityChange(boolean skip) { + mSkipLauncherVisibilityChange = skip; + } + + /** + * @return whether the context menu option to pin an app to the taskbar is enabled. + */ + public boolean canPinAppWithContextMenu() { + return TaskbarPopupController.canPinAppWithContextMenu( + mControllers.taskbarActivityContext); + } + + /** Sets whether the hotseat is stashed */ + public void stashHotseat(boolean stash) { + } + + @Override + public void onBubbleBarLocationAnimated(BubbleBarLocation location) { + } + + @Override + public void onBubbleBarLocationUpdated(BubbleBarLocation location) { + } + + /** Un-stash the hotseat instantly */ + public void unStashHotseatInstantly() { + } + + /** + * Called when we want to unstash taskbar when user performs swipes up gesture. + */ + public void onSwipeToUnstashTaskbar() { + } + + /** + * Called at the end of a gesture (see {@link GestureState.GestureEndTarget}). + * @param endTarget Where the gesture animation is going to. + * @param callbacks callbacks to track the recents animation lifecycle. The state change is + * automatically reset once the recents animation finishes + * @return An optional Animator to play in parallel with the default gesture end animation. + */ + public @Nullable Animator getParallelAnimationToGestureEndTarget( + GestureState.GestureEndTarget endTarget, + long duration, + RecentsAnimationCallbacks callbacks) { + return null; } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUiState.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarUiState.kt new file mode 100644 index 00000000000..6bbaeb707fc --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUiState.kt @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.graphics.Rect +import android.view.MotionEvent +import androidx.annotation.Px +import com.android.launcher3.DeviceProfile +import com.android.launcher3.util.ImmutableRect +import com.android.launcher3.util.MutableListenableRef + +/** + * Data class that represents taskbar's UI states. This state is shared to launcher and recents. + * Taskbar's UI thread is responsible to update below fields whenever any field is changed. + * + * Timings when each field is changed: + * - [_hasBubblesRef]: when BubbleBarView's child bubble view count is changed between 0 vs + * non-zero. Should be reset to false if we don't show bubble bar view and BubbleBarViewController + * is not even created. + * - [_shouldShowEduOnAppLaunchRef]: when DeviceProfile, TaskbarUIController or tooltip steps is + * changed + * - [_isDraggingItemRef]: when ether bubble or taskbar is dragging item. Note that this flag only + * represents drags originating from the main Taskbar window and does NOT represents drags + * originating from all apps using TaskbarOverlayContext. + * - [_isTaskbarStashedRef]: when [TaskbarStashController.mIsStashed] has changed + * - [_isTaskbarAllAppsOpenRef]: when [TaskbarAllAppsController.isOpen] has changed + * - [_isTaskbarOnHomeRef]: when [TaskbarStashController.mState] is changed + * - [_showDesktopTaskbarForFreeformDisplayRef]: when [DisplayInfo] is changed + * - [_showLockedTaskbarOnHome]: when [DisplayInfo] is changed + * - [_isPrimaryDisplayRef]: when [TaskbarActivityContext] is constructed + */ +class TaskbarUiState { + + private val _hasBubblesRef = MutableListenableRef(false) + private val _shouldShowEduOnAppLaunchRef = MutableListenableRef(false) + private val _isDraggingItemRef = MutableListenableRef(false) + private val _isTaskbarStashedRef = MutableListenableRef(false) + private val _isTaskbarAllAppsOpenRef = MutableListenableRef(false) + private val _isTaskbarOnHomeRef = MutableListenableRef(false) + private val _showDesktopTaskbarForFreeformDisplayRef = MutableListenableRef(false) + private val _showLockedTaskbarOnHome = MutableListenableRef(false) + private val _isPrimaryDisplayRef = MutableListenableRef(false) + + private fun MutableListenableRef.diffAndDispatch(newValue: T) { + if (value != newValue) { + dispatchValue(newValue) + } + } + + val hasBubblesRef = _hasBubblesRef.asListenable() + val shouldShowEduOnAppLaunchRef = _shouldShowEduOnAppLaunchRef.asListenable() + val isDraggingItemRef = _isDraggingItemRef.asListenable() + val isTaskbarStashedRef = _isTaskbarStashedRef.asListenable() + val isTaskbarAllAppsOpenRef = _isTaskbarAllAppsOpenRef.asListenable() + val isTaskbarOnHomeRef = _isTaskbarOnHomeRef.asListenable() + val showDesktopTaskbarForFreeformDisplayRef = + _showDesktopTaskbarForFreeformDisplayRef.asListenable() + val showLockedTaskbarOnHome = _showLockedTaskbarOnHome.asListenable() + val isPrimaryDisplayRef = _isPrimaryDisplayRef.asListenable() + + private var _isBubbleDragging = false + private var _isTaskbarDragging = false + private var _stashState = 0L + private var _bubbleBarViewRect = ImmutableRect.EMPTY_RECT + private var _isBubbleBarViewVisible = true + private var _stashedBubbleBarHeightPx = Int.MAX_VALUE + private var _isStashedHandlerViewVisible = true + private var _stashedHandlerViewRect = ImmutableRect.EMPTY_RECT + + private var _isTaskbarViewShown = false + private var _taskbarIconsActualBounds = ImmutableRect.EMPTY_RECT + private var _navbarFloatingRotationButtonsBounds = ImmutableRect.EMPTY_RECT + + private var _deviceProfile = DeviceProfile.DEFAULT_DEVICE_PROFILE + + fun setHasBubble(hasBubbles: Boolean) { + _hasBubblesRef.diffAndDispatch(hasBubbles) + } + + fun setShouldShowEduOnAppLaunch(shouldShowEduOnAppLaunch: Boolean) { + _shouldShowEduOnAppLaunchRef.diffAndDispatch(shouldShowEduOnAppLaunch) + } + + fun setIsBubbleDragging(isBubbleDragging: Boolean) { + _isBubbleDragging = isBubbleDragging + _isDraggingItemRef.diffAndDispatch(_isBubbleDragging or _isTaskbarDragging) + } + + fun setIsTaskbarDragging(isTaskbarDragging: Boolean) { + _isTaskbarDragging = isTaskbarDragging + _isDraggingItemRef.diffAndDispatch(_isBubbleDragging or _isTaskbarDragging) + } + + fun setIsTaskbarStashed(isTaskbarStashed: Boolean) { + _isTaskbarStashedRef.diffAndDispatch(isTaskbarStashed) + } + + fun setIsTaskbarAllAppsOpen(isTaskbarAllAppsOpen: Boolean) { + _isTaskbarAllAppsOpenRef.diffAndDispatch(isTaskbarAllAppsOpen) + } + + fun setStashStateRef(state: Long) { + _stashState = state + _isTaskbarOnHomeRef.diffAndDispatch( + (_stashState and TaskbarStashController.FLAG_IN_OVERVIEW.toLong()) == 0L && + (_stashState and TaskbarStashController.FLAG_IN_APP.toLong()) == 0L + ) + } + + fun setShowDesktopTaskbarForFreeformDisplay(showDesktopTaskbarForFreeformDisplay: Boolean) { + _showDesktopTaskbarForFreeformDisplayRef.diffAndDispatch( + showDesktopTaskbarForFreeformDisplay + ) + } + + fun setShowLockedTaskbarOnHome(showLockedTaskbarOnHome: Boolean) { + _showLockedTaskbarOnHome.diffAndDispatch(showLockedTaskbarOnHome) + } + + fun setIsPrimaryDisplay(isPrimaryDisplay: Boolean) { + _isPrimaryDisplayRef.diffAndDispatch(isPrimaryDisplay) + } + + fun isEventOverBubbleBarViews(ev: MotionEvent): Boolean { + return isEventOverBubbleBarView(ev) || isEventOverStashedHandler(ev) + } + + private fun isEventOverBubbleBarView(e: MotionEvent) = + if (!_isBubbleBarViewVisible) { + false + } else { + _bubbleBarViewRect.contains(e.x, e.y) + } + + private fun isEventOverStashedHandler(ev: MotionEvent): Boolean { + if (!_isStashedHandlerViewVisible) { + return false + } + val top = _deviceProfile.deviceProperties.heightPx - _stashedBubbleBarHeightPx + val x = ev.rawX + val y = ev.rawY + return y >= top && x >= _stashedHandlerViewRect.left && x <= _stashedHandlerViewRect.right + } + + fun setBubbleBarRect(rect: Rect) { + _bubbleBarViewRect = ImmutableRect.from(rect) + } + + fun setIsBubbleBarViewVisible(isVisible: Boolean) { + _isBubbleBarViewVisible = isVisible + } + + fun setIsStashedHandlerViewVisible(isVisible: Boolean) { + _isStashedHandlerViewVisible = isVisible + } + + fun setStashedBubbleBarHeightPx(@Px height: Int) { + _stashedBubbleBarHeightPx = height + } + + fun setStashedHandlerViewRect(rect: Rect) { + _stashedHandlerViewRect = ImmutableRect.from(rect) + } + + fun isEventOverAnyTaskbarItem(ev: MotionEvent) = isEventOnTaskbarView(ev) || isEventOnNavbar(ev) + + private fun isEventOnTaskbarView(ev: MotionEvent) = + _isTaskbarViewShown and _taskbarIconsActualBounds.contains(ev.rawX, ev.rawY) + + fun setTaskbarViewIsShown(isShown: Boolean) { + _isTaskbarViewShown = isShown + } + + fun setTaskbarIconsActualBounds(rect: Rect) { + _taskbarIconsActualBounds = ImmutableRect.from(rect) + } + + private fun isEventOnNavbar(ev: MotionEvent) = + _navbarFloatingRotationButtonsBounds.contains(ev.x, ev.y) + + fun setNavbarFloatingRotationButtonsBounds(rect: Rect) { + _navbarFloatingRotationButtonsBounds = ImmutableRect.from(rect) + } + + fun setDeviceProfile(dp: DeviceProfile) { + _deviceProfile = dp + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUiStateMonitor.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarUiStateMonitor.kt new file mode 100644 index 00000000000..9b68f57cfd3 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUiStateMonitor.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.DaggerSingletonObject +import java.util.concurrent.ConcurrentHashMap +import javax.inject.Inject + +/** Holds and monitors [TaskbarUiState] for each taskbar. */ +@LauncherAppSingleton +class TaskbarUiStateMonitor @Inject constructor() { + + private val taskbarUiStateByDisplay = ConcurrentHashMap() + + fun getTaskbarUiState(displayId: Int): TaskbarUiState = + taskbarUiStateByDisplay.getOrPut(displayId) { TaskbarUiState() } + + companion object { + @JvmField + val INSTANCE: DaggerSingletonObject = + DaggerSingletonObject( + LauncherAppComponent::getTaskbarUiStateMonitor + ) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index 5ca41df590a..d533da8af86 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -15,83 +15,106 @@ */ package com.android.launcher3.taskbar; -import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED; +import static android.window.DesktopModeFlags.ENABLE_TASKBAR_OVERFLOW; import static com.android.launcher3.BubbleTextView.DISPLAY_TASKBAR; -import static com.android.launcher3.Flags.enableCursorHoverStates; +import static com.android.launcher3.Flags.enableLauncherIconShapes; +import static com.android.launcher3.Flags.enableRecentsInTaskbar; +import static com.android.launcher3.Flags.enableTaskbarRecentsThemedIcons; +import static com.android.launcher3.Flags.refactorTaskbarUiState; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APP_PAIR; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_FOLDER; -import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR; import static com.android.launcher3.config.FeatureFlags.enableTaskbarPinning; +import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED; import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import android.animation.LayoutTransition; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Rect; -import android.os.Bundle; +import android.graphics.drawable.Drawable; +import android.util.ArraySet; import android.util.AttributeSet; import android.view.DisplayCutout; import android.view.InputDevice; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; -import android.view.ViewConfiguration; -import android.view.accessibility.AccessibilityNodeInfo; +import android.view.ViewGroup; import android.widget.FrameLayout; -import androidx.annotation.DimenRes; -import androidx.annotation.DrawableRes; import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.BubbleTextView; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.apppairs.AppPairIcon; +import com.android.launcher3.celllayout.CellInfo; +import com.android.launcher3.deviceprofile.TaskbarProfile; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.folder.PreviewBackground; +import com.android.launcher3.graphics.ThemeManager; +import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.BitmapInfo.DrawableCreationFlags; +import com.android.launcher3.icons.IconShape; import com.android.launcher3.model.data.AppPairInfo; import com.android.launcher3.model.data.CollectionInfo; import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.LauncherBindableItemsContainer; +import com.android.launcher3.taskbar.customization.TaskbarAllAppsButtonContainer; +import com.android.launcher3.taskbar.customization.TaskbarDividerContainer; +import com.android.launcher3.taskbar.customization.TaskbarIconsContainer; +import com.android.launcher3.taskbar.handoff.HandoffSuggestion; +import com.android.launcher3.util.LauncherBindableItemsContainer.ItemOperator; import com.android.launcher3.util.Themes; import com.android.launcher3.views.ActivityContext; -import com.android.launcher3.views.IconButtonView; -import com.patrykmichalik.opto.core.PreferenceExtensionsKt; -import com.android.quickstep.DeviceConfigWrapper; -import com.android.quickstep.util.AssistStateManager; - -import java.util.function.Predicate; +import com.android.launcher3.views.PredictedAppIcon; +import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.SingleTask; +import com.android.quickstep.util.SplitTask; +import com.android.quickstep.views.TaskViewType; +import com.android.systemui.shared.recents.model.Task; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.hotseat.HotseatMode; import app.lawnchair.preferences2.PreferenceManager2; import app.lawnchair.theme.color.tokens.ColorTokens; /** - * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of - * other apps. + * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps. */ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconParent, Insettable, DeviceProfile.OnDeviceProfileChangeListener { private static final Rect sTmpRect = new Rect(); - - private final int[] mTempOutLocation = new int[2]; private final Rect mIconLayoutBounds; private final int mIconTouchSize; private final int mItemMarginLeftRight; private final int mItemPadding; private final int mFolderLeaveBehindColor; + private final int[] mFirstIconViewLocation = new int[2]; + private final int[] mLastIconViewLocation = new int[2]; private final boolean mIsRtl; + private final TaskbarUiState mTaskbarUiState; + private final TaskbarActivityContext mActivityContext; + @Nullable private BubbleBarLocation mBubbleBarLocation = null; // Initialized in init. private TaskbarViewCallbacks mControllerCallbacks; @@ -99,16 +122,43 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar private View.OnLongClickListener mIconLongClickListener; // Only non-null when the corresponding Folder is open. - private @Nullable FolderIcon mLeaveBehindFolderIcon; + @Nullable private FolderIcon mLeaveBehindFolderIcon; // Only non-null when device supports having an All Apps button. - private @Nullable IconButtonView mAllAppsButton; - private Runnable mAllAppsTouchRunnable; - private long mAllAppsButtonTouchDelayMs; - private boolean mAllAppsTouchTriggered; + private final TaskbarAllAppsButtonContainer mAllAppsButtonContainer; - // Only non-null when device supports having an All Apps button. - private @Nullable IconButtonView mTaskbarDivider; + // Only non-null when device supports having a Divider button. + @Nullable private TaskbarDividerContainer mTaskbarDividerContainer; + + // Only non-null when taskbar customization is enabled. + @Nullable private TaskbarIconsContainer mHotseatIconsContainer; + + // Only non-null when device supports having a Taskbar Overflow button for pinned items. + @Nullable private TaskbarOverflowView mTaskbarPinnedOverflowView; + + // Only non-null when device supports having a Taskbar Overflow button for recent tasks. + @Nullable private TaskbarOverflowView mTaskbarRecentsOverflowView; + + private int mMaxNumIconsLimitForTest = -1; + + // Iterates within child views of TaskbarView + private int mNextViewIndex = 0; + // Iterates within child views of mHotseatIconsContainer (if non-null) + private int mNextHotseatIndex = 0; + + public int getIgnoreTaskbarIconCount() { + return mIgnoreTaskbarIconCount; + } + + // TODO: clean it up in follow up cl with removal of taskbar icon alignment. + // Only used for edge of 3 button navigation mode, where we need to hide icons which go + // beyond the bounds. + private int mIgnoreTaskbarIconCount = 0; + /** + * Whether the divider is between Hotseat icons and Recents, + * instead of between All Apps button and Hotseat. + */ + private boolean mAddedDividerForRecents; private final View mQsb; @@ -116,6 +166,16 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar private boolean mShouldTryStartAlign; + private int mMaxNumIcons = 0; + private int mIdealNumIcons = 0; + + private final int mAllAppsButtonTranslationOffset; + + private int mNumStaticViews; + + private Set mPrevRecentTasks = Collections.emptySet(); + private Set mPrevOverflowTasks = Collections.emptySet(); + public TaskbarView(@NonNull Context context) { this(context, null); } @@ -137,18 +197,22 @@ public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int d mActivityContext = ActivityContext.lookupContext(context); mIconLayoutBounds = mActivityContext.getTransientTaskbarBounds(); Resources resources = getResources(); - boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivityContext) - && !mActivityContext.isPhoneMode(); mIsRtl = Utilities.isRtl(resources); + mTaskbarUiState = TaskbarUiStateMonitor.INSTANCE.get(context) + .getTaskbarUiState(context.getDisplayId()); + if (refactorTaskbarUiState()) { + mTaskbarUiState.setTaskbarViewIsShown(isShown()); + } mTransientTaskbarMinWidth = resources.getDimension(R.dimen.transient_taskbar_min_width); onDeviceProfileChanged(mActivityContext.getDeviceProfile()); int actualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing); - int actualIconSize = mActivityContext.getDeviceProfile().taskbarIconSize; - if (enableTaskbarPinning() && !mActivityContext.isThreeButtonNav()) { - DeviceProfile deviceProfile = mActivityContext.getTransientTaskbarDeviceProfile(); - actualIconSize = deviceProfile.taskbarIconSize; + int actualIconSize = + mActivityContext.getDeviceProfile().getTaskbarProfile().getIconSize(); + if (enableTaskbarPinning() && canTransitionToTransientTaskbar()) { + TaskbarProfile deviceProfile = mActivityContext.getTransientTaskbarProfile(); + actualIconSize = deviceProfile.getIconSize(); } int visualIconSize = (int) (actualIconSize * ICON_VISIBLE_AREA_FACTOR); @@ -158,34 +222,42 @@ public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int d // We layout the icons to be of mIconTouchSize in width and height mItemMarginLeftRight = actualMargin - (mIconTouchSize - visualIconSize) / 2; - // We always layout taskbar as a transient taskbar when we have taskbar pinning - // feature on, - // then we scale and translate the icons to match persistent taskbar designs, so - // we use - // taskbar icon size from current device profile to calculate correct item - // padding. - mItemPadding = (mIconTouchSize - mActivityContext.getDeviceProfile().taskbarIconSize) / 2; + if (Flags.enableTaskbarIconContainer()) { + mHotseatIconsContainer = + TaskbarIconsContainer.create(context, mIconTouchSize, mItemMarginLeftRight); + } + + // We always layout taskbar as a transient taskbar when we have taskbar pinning feature on, + // then we scale and translate the icons to match persistent taskbar designs, so we use + // taskbar icon size from current device profile to calculate correct item padding. + mItemPadding = (mIconTouchSize - mActivityContext + .getDeviceProfile() + .getTaskbarProfile() + .getIconSize()) / 2; mFolderLeaveBehindColor = Themes.getAttrColor(mActivityContext, android.R.attr.textColorTertiary); // Needed to draw folder leave-behind when opening one. setWillNotDraw(false); - mAllAppsButton = (IconButtonView) LayoutInflater.from(context) - .inflate(R.layout.taskbar_all_apps_button, this, false); - mAllAppsButton.setIconDrawable(resources.getDrawable( - getAllAppsButton(isTransientTaskbar))); - mAllAppsButton.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding); - mAllAppsButton.setForegroundTint( - mActivityContext.getColor(R.color.all_apps_button_color)); + mAllAppsButtonContainer = new TaskbarAllAppsButtonContainer(context); + mAllAppsButtonTranslationOffset = (int) getResources().getDimension( + mAllAppsButtonContainer.getAllAppsButtonTranslationXOffset( + mActivityContext.isTransientTaskbar())); + + if (enableTaskbarPinning() || enableRecentsInTaskbar()) { + mTaskbarDividerContainer = new TaskbarDividerContainer(context); + } + + if (ENABLE_TASKBAR_OVERFLOW.isTrue()) { + mTaskbarRecentsOverflowView = TaskbarOverflowView.inflateIcon( + R.layout.taskbar_overflow_view, this, mIconTouchSize, mItemPadding); + mTaskbarRecentsOverflowView.setId(R.id.taskbar_overflow_view); + } - if (enableTaskbarPinning()) { - mTaskbarDivider = (IconButtonView) LayoutInflater.from(context).inflate( - R.layout.taskbar_divider, - this, false); - mTaskbarDivider.setIconDrawable( - resources.getDrawable(R.drawable.taskbar_divider_button)); - mTaskbarDivider.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding); + if (TaskbarPopupController.canPinAppsOverflow()) { + mTaskbarPinnedOverflowView = TaskbarOverflowView.inflateIcon( + R.layout.taskbar_overflow_view, this, mIconTouchSize, mItemPadding); } // TODO: Disable touch events on QSB otherwise it can crash. @@ -194,35 +266,100 @@ public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int d } else { mQsb = LayoutInflater.from(context).inflate(R.layout.empty_view, this, false); } + } + + /** + * @return the maximum number of 'icons' that can fit in the taskbar. + */ + private int calculateMaxNumIcons() { + DeviceProfile deviceProfile = mActivityContext.getDeviceProfile(); + int availableWidth = deviceProfile.getDeviceProperties().getWidthPx(); + int defaultEdgeMargin = + (int) getResources().getDimension(deviceProfile.inv.inlineNavButtonsEndSpacing); + int spaceForBubbleBar = + Math.round(mControllerCallbacks.getBubbleBarMaxCollapsedWidthIfVisible()); + + // Reserve space required for edge margins, or for navbar if shown. If task bar needs to be + // center aligned with nav bar shown, reserve space on both sides. + availableWidth -= Math.max( + defaultEdgeMargin + spaceForBubbleBar, + deviceProfile.getHotseatProfile().getBarEndOffset()); + availableWidth -= Math.max( + defaultEdgeMargin + (mShouldTryStartAlign ? 0 : spaceForBubbleBar), + mShouldTryStartAlign ? 0 : deviceProfile.getHotseatProfile().getBarEndOffset()); + + // The space taken by an item icon used during layout. + int iconSize = 2 * mItemMarginLeftRight + mIconTouchSize; + + int additionalIcons = 0; + + if (mTaskbarDividerContainer != null) { + // Space for divider icon is reduced during layout compared to normal icon size, reserve + // space for the divider separately. + availableWidth -= iconSize - 4 * mItemMarginLeftRight; + ++additionalIcons; + } - // Default long press (touch) delay = 400ms - mAllAppsButtonTouchDelayMs = ViewConfiguration.getLongPressTimeout(); + // All apps icon takes less space compared to normal icon size, reserve space for the icon + // separately. + boolean forceTransientTaskbarSize = + enableTaskbarPinning() && canTransitionToTransientTaskbar(); + availableWidth -= iconSize - (int) getResources().getDimension( + mAllAppsButtonContainer.getAllAppsButtonTranslationXOffset( + forceTransientTaskbarSize || mActivityContext.isTransientTaskbar())); + ++additionalIcons; + + int maxIcons = Math.floorDiv(availableWidth, iconSize) + additionalIcons; + return Math.min(maxIcons, + mMaxNumIconsLimitForTest > 0 ? mMaxNumIconsLimitForTest : maxIcons); } - @DrawableRes - private int getAllAppsButton(boolean isTransientTaskbar) { - boolean shouldSelectTransientIcon = (isTransientTaskbar || enableTaskbarPinning()) - && !mActivityContext.isThreeButtonNav(); - if (ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get()) { - return shouldSelectTransientIcon - ? R.drawable.ic_transient_taskbar_all_apps_search_button - : R.drawable.ic_taskbar_all_apps_search_button; - } else { - return shouldSelectTransientIcon - ? R.drawable.ic_transient_taskbar_all_apps_button - : R.drawable.ic_taskbar_all_apps_button; + /** + * Whether the taskbar in the state context supports transition to a transient taskbar (e.g. + * using a popup menu). + */ + boolean canTransitionToTransientTaskbar() { + return mActivityContext.getTaskbarFeatureEvaluator() + .getSupportsTransitionToTransientTaskbar(); + } + + /** + * Recalculates the max number of icons the taskbar view can show without entering overflow. + * Returns whether the max number of icons changed and the change affects the number of icons + * that should be shown in the taskbar. + */ + boolean updateMaxNumIcons() { + if (!ENABLE_TASKBAR_OVERFLOW.isTrue()) { + return false; } + int oldMaxNumIcons = mMaxNumIcons; + mMaxNumIcons = calculateMaxNumIcons(); + return oldMaxNumIcons != mMaxNumIcons + && (mIdealNumIcons > oldMaxNumIcons || mIdealNumIcons > mMaxNumIcons); } - @DimenRes - public int getAllAppsButtonTranslationXOffset(boolean isTransientTaskbar) { - if (isTransientTaskbar) { - return R.dimen.transient_taskbar_all_apps_button_translation_x_offset; - } else { - return ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get() - ? R.dimen.taskbar_all_apps_search_button_translation_x_offset - : R.dimen.taskbar_all_apps_button_translation_x_offset; + /** + * Pre-adds views that are always children of this view for LayoutTransition support. + *

+ * Normally these views are removed and re-added when updating hotseat and recents. This + * approach does not behave well with LayoutTransition, so we instead need to add them + * initially and avoid removing them during updates. + */ + private int addStaticViews() { + int numStaticViews = 1; + addView(mAllAppsButtonContainer); + + if (mHotseatIconsContainer != null) { + addView(mHotseatIconsContainer, mIsRtl ? 0 : numStaticViews); + numStaticViews++; } + + if (mActivityContext.getDeviceProfile().isQsbInline) { + addView(mQsb, mIsRtl ? numStaticViews : 0); + mQsb.setVisibility(View.INVISIBLE); + numStaticViews++; + } + return numStaticViews; } @Override @@ -248,28 +385,7 @@ protected void onDetachedFromWindow() { @Override public void onDeviceProfileChanged(DeviceProfile dp) { - mShouldTryStartAlign = mActivityContext.isThreeButtonNav() && dp.startAlignTaskbar; - } - - @Override - public boolean performAccessibilityActionInternal(int action, Bundle arguments) { - if (action == AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS) { - announceForAccessibility(mContext.getString(R.string.taskbar_a11y_shown_title)); - } else if (action == AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS) { - announceForAccessibility(mContext.getString(R.string.taskbar_a11y_hidden_title)); - } - return super.performAccessibilityActionInternal(action, arguments); - - } - - protected void announceAccessibilityChanges() { - this.performAccessibilityAction( - isVisibleToUser() ? AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS - : AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS, - null); - - ActivityContext.lookupContext(getContext()).getDragLayer() - .sendAccessibilityEvent(TYPE_WINDOW_CONTENT_CHANGED); + mShouldTryStartAlign = mActivityContext.shouldStartAlignTaskbar(); } /** @@ -288,32 +404,48 @@ protected void init(TaskbarViewCallbacks callbacks) { mIconClickListener = mControllerCallbacks.getIconOnClickListener(); mIconLongClickListener = mControllerCallbacks.getIconOnLongClickListener(); - if (mAllAppsButton != null) { - mAllAppsButton.setOnClickListener(this::onAllAppsButtonClick); - mAllAppsButton.setOnLongClickListener(this::onAllAppsButtonLongClick); - mAllAppsButton.setOnTouchListener(this::onAllAppsButtonTouch); - mAllAppsButton.setHapticFeedbackEnabled( - mControllerCallbacks.isAllAppsButtonHapticFeedbackEnabled()); - mAllAppsTouchRunnable = () -> { - mControllerCallbacks.triggerAllAppsButtonLongClick(); - mAllAppsTouchTriggered = true; - }; - AssistStateManager assistStateManager = AssistStateManager.INSTANCE.get(mContext); - if (DeviceConfigWrapper.get().getCustomLpaaThresholds() - && assistStateManager.getLPNHDurationMillis().isPresent()) { - mAllAppsButtonTouchDelayMs = assistStateManager.getLPNHDurationMillis().get(); - } + mAllAppsButtonContainer.setUpCallbacks(callbacks); + if (mTaskbarRecentsOverflowView != null) { + mTaskbarRecentsOverflowView.setOnClickListener( + mControllerCallbacks.getRecentsOverflowOnClickListener()); + mTaskbarRecentsOverflowView.setOnLongClickListener( + mControllerCallbacks.getRecentsOverflowOnLongClickListener()); + setHoverListenerForIcon(mTaskbarRecentsOverflowView); } - if (mTaskbarDivider != null && !mActivityContext.isThreeButtonNav()) { - mTaskbarDivider.setOnLongClickListener( - mControllerCallbacks.getTaskbarDividerLongClickListener()); - mTaskbarDivider.setOnTouchListener( - mControllerCallbacks.getTaskbarDividerRightClickListener()); + + if (mTaskbarPinnedOverflowView != null) { + mTaskbarPinnedOverflowView.setOnClickListener( + mControllerCallbacks.getPinnedOverflowOnClickListener()); + mTaskbarPinnedOverflowView.setOnLongClickListener( + mControllerCallbacks.getPinnedOverflowOnLongClickListener()); + setHoverListenerForIcon(mTaskbarPinnedOverflowView); + } + + if (ENABLE_TASKBAR_OVERFLOW.isTrue()) { + mMaxNumIcons = calculateMaxNumIcons(); + } + } + + void updatePinningPopupEventHandlers() { + boolean supportsPinningPopup = + mActivityContext.getTaskbarFeatureEvaluator().getSupportsPinningPopup(); + if (mTaskbarDividerContainer != null) { + mTaskbarDividerContainer.setUpCallbacks( + supportsPinningPopup ? mControllerCallbacks : null); + } + + if (Flags.showTaskbarPinningPopupFromAnywhere()) { + setOnTouchListener( + supportsPinningPopup ? mControllerCallbacks.getTaskbarTouchListener() : null); } } private void removeAndRecycle(View view) { - removeView(view); + removeAndRecycle(this, view); + } + + private void removeAndRecycle(ViewGroup parent, View view) { + parent.removeView(view); view.setOnClickListener(null); view.setOnLongClickListener(null); if (!(view.getTag() instanceof CollectionInfo)) { @@ -322,31 +454,229 @@ private void removeAndRecycle(View view) { view.setTag(null); } + /** Inflates/binds the hotseat items, recent tasks, and handoff suggestions to the view. */ + protected void updateItems( + ItemInfo[] hotseatItemInfos, + List recentTasks, + List handoffSuggestions) { + + if (mActivityContext.isDestroyed()) return; + // Filter out unsupported items. + hotseatItemInfos = Arrays.stream(hotseatItemInfos) + .filter(Objects::nonNull) + .toArray(ItemInfo[]::new); + recentTasks = recentTasks.stream() + .filter(it -> it instanceof SingleTask || it instanceof SplitTask) + .toList(); + + if (mNumStaticViews == 0) { + mNumStaticViews = addStaticViews(); + } + + // Skip static views and potential All Apps divider, if they are on the left. + mNextViewIndex = mIsRtl ? 0 : mNumStaticViews; + if (getChildAt(mNextViewIndex) == mTaskbarDividerContainer && !mAddedDividerForRecents) { + mNextViewIndex++; + } + + mIgnoreTaskbarIconCount = getIgnoreCountForTaskbarIcons(recentTasks.size(), + hotseatItemInfos.length); + + // If pinned apps overflows, the maximum length of hotseat is still the same where the + // last item is replaced by the overflow icon. + final int hotseatItemLength = TaskbarPopupController.canPinAppsOverflow() ? Math.min( + hotseatItemInfos.length, + mActivityContext.getTaskbarSpecsEvaluator().getNumShownHotseatIcons()) + : hotseatItemInfos.length; + + // Update left section. + if (mIsRtl) { + updateHandoffSuggestions(handoffSuggestions); + updateRecents(recentTasks.reversed(), hotseatItemLength); + } else { + updateHotseatItems(hotseatItemInfos); + } + + // Now at theoretical position for recent apps divider. + updateRecentsDivider(!recentTasks.isEmpty()); + if (getChildAt(mNextViewIndex) == mTaskbarDividerContainer) { + mNextViewIndex++; + } + + // Update right section. + if (mIsRtl) { + updateHotseatItems(hotseatItemInfos); + } else { + updateRecents(recentTasks, hotseatItemLength); + updateHandoffSuggestions(handoffSuggestions); + } + + // Recents divider takes priority. + if (!mAddedDividerForRecents) { + boolean allAppsDividerAllowed = !mActivityContext.isTaskbarShowingDesktopTasks(); + if (allAppsDividerAllowed) { + updateAllAppsDivider(); + } else if (getChildAt(getExpectedAllAppsDividerIndex()) == mTaskbarDividerContainer) { + removeView(mTaskbarDividerContainer); + } + } + + mAllAppsButtonContainer.updateTaskbarMinimalState(isTaskbarInMinimalState()); + } + + public boolean isTaskbarInMinimalState() { + return getIconViews().length <= 1; + } + + private void updateRecentsDivider(boolean hasRecents) { + if (hasRecents && !mAddedDividerForRecents) { + mAddedDividerForRecents = true; + + // Remove possible All Apps divider. + if (getChildAt(mNumStaticViews) == mTaskbarDividerContainer) { + mNextViewIndex--; // All Apps divider on the left. Need to account for removing it. + } + removeView(mTaskbarDividerContainer); + + addView(mTaskbarDividerContainer, mNextViewIndex); + } else if (!hasRecents && mAddedDividerForRecents) { + mAddedDividerForRecents = false; + removeViewAt(mNextViewIndex); + } + } + + private void updateAllAppsDivider() { + // Index where All Apps divider would be if it is already in Taskbar. + final int expectedAllAppsDividerIndex = getExpectedAllAppsDividerIndex(); + boolean hasAtLeastOneIcon = mHotseatIconsContainer == null + ? getChildCount() >= mNumStaticViews + 1 + : getChildCount() - mNumStaticViews == 0 + && mHotseatIconsContainer.getChildCount() > 0; + if (getChildAt(expectedAllAppsDividerIndex) == mTaskbarDividerContainer + && getTotalNumberOfIcons() == mNumStaticViews) { + // Only static views with divider so remove divider. + removeView(mTaskbarDividerContainer); + } else if (getChildAt(expectedAllAppsDividerIndex) != mTaskbarDividerContainer + && hasAtLeastOneIcon) { + // Static views with at least one app icon so add divider. For RTL, add it after the + // icon that is at the expected index. + addView( + mTaskbarDividerContainer, + mIsRtl ? expectedAllAppsDividerIndex + 1 : expectedAllAppsDividerIndex); + } + } + + private int getExpectedAllAppsDividerIndex() { + if (mHotseatIconsContainer == null) { + return mIsRtl + ? getChildCount() - mNumStaticViews - 1 + : mNumStaticViews; + } else { + return mIsRtl + ? getChildCount() - mNumStaticViews + : mNumStaticViews - 1; // -1 to exclude mHotseatIconsContainer + } + } + /** - * Inflates/binds the Hotseat views to show in the Taskbar given their - * ItemInfos. + * Calculate how many icon we need to not show in Taskbar that are present in hotseat. */ - protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) { - int nextViewIndex = 0; - int numViewsAnimated = 0; + private int getIgnoreCountForTaskbarIcons(int recentsIcons, int hotseatIcons) { + + if (!mActivityContext.isThreeButtonNav() + || mActivityContext.getTaskbarFeatureEvaluator().isRecentsEnabled()) { + return 0; + } - if (mAllAppsButton != null) { - removeView(mAllAppsButton); + DeviceProfile deviceProfile = mActivityContext.getDeviceProfile(); - if (mTaskbarDivider != null) { - removeView(mTaskbarDivider); - } + // Add icon for all apps. + int icons = 1; + + // Only include divider line in count if will be added to Taskbar view which is in + // conditions below. + if (mActivityContext.isInDesktopMode() && recentsIcons > 0) { + icons += 1; + } else if (recentsIcons + hotseatIcons != 0) { + icons += 1; + } + int spaceNeeded = getIconLayoutWidth(icons + recentsIcons + hotseatIcons); + + boolean areBubblesVisible = + mControllerCallbacks.isBubbleBarEnabled() && mBubbleBarLocation != null; + int screenWidth = this.getResources().getDisplayMetrics().widthPixels; + int navSpaceNeeded = deviceProfile.getHotseatProfile().getBarEndOffset(); + + int ignoreCount = 0; + //Screen Width - nav space + int amountOfSpaceTaskbarIconsCanHave = screenWidth - navSpaceNeeded; + if (areBubblesVisible) { + // size of bubbles Icon and margin on the side. + int bubbleBarMargin = getResources().getDimensionPixelSize( + R.dimen.transient_taskbar_bottom_margin); + amountOfSpaceTaskbarIconsCanHave -= (mIconTouchSize + bubbleBarMargin); } - removeView(mQsb); + int taskbarIconSpaceNeeded = spaceNeeded; + while (amountOfSpaceTaskbarIconsCanHave < taskbarIconSpaceNeeded) { + ignoreCount++; + int iconSpace = mIconTouchSize + (2 * mItemMarginLeftRight); + taskbarIconSpaceNeeded -= iconSpace; + } + return ignoreCount; + } - for (int i = 0; i < hotseatItemInfos.length; i++) { - ItemInfo hotseatItemInfo = hotseatItemInfos[i]; - if (hotseatItemInfo == null) { - continue; + private void updateHotseatItems(ItemInfo[] hotseatItemInfos) { + int numViewsAnimated = 0; + final int numMaxIcons = + mActivityContext.getTaskbarSpecsEvaluator().getNumShownHotseatIcons(); + final int hotseatLength = hotseatItemInfos.length; + final boolean hasOverflow = + mTaskbarPinnedOverflowView != null && hotseatLength > numMaxIcons; + + // The starting index of the pinned items on the taskbar. + int onTaskbarStartIdx = 0; + // The last index of the pinned items on the taskbar. This does not include the overflow + // icon and the items inside the overflow icon if the pinned items overflow. + int onTaskbarEndIdx = hotseatLength; + + boolean hasHotseatContainer = mHotseatIconsContainer != null; + mNextHotseatIndex = hasHotseatContainer + ? 0 // Start the count at 0 because the views are in a separate container + : mNextViewIndex; + + if (hasOverflow) { + final int itemsNotOverflown = numMaxIcons - 1; + onTaskbarStartIdx = mIsRtl ? hotseatLength - itemsNotOverflown : 0; + onTaskbarEndIdx = mIsRtl ? hotseatLength : itemsNotOverflown; + + final int overflownStartIndex = mIsRtl ? 0 : onTaskbarEndIdx; + final int overflownEndIndex = mIsRtl ? onTaskbarStartIdx : hotseatLength; + final List overflownItems = Arrays.asList(hotseatItemInfos).subList( + overflownStartIndex, overflownEndIndex); + mTaskbarPinnedOverflowView.setItems( + overflownItems.stream().map( + iteminfo -> new ItemInfoWrapper(iteminfo, mActivityContext)).toList()); + if (mIsRtl) { + maybeAddPinOverflowView(); + } + } else if (isOverflowViewShowing()) { + if (hasHotseatContainer) { + mHotseatIconsContainer.removeView(mTaskbarPinnedOverflowView); + } else { + removeView(mTaskbarPinnedOverflowView); } + mTaskbarPinnedOverflowView.clearItems(); + } - // Replace any Hotseat views with the appropriate type if it's not already that - // type. + // if there are ignore icons and make sure we are not removing more icons than we have. + // mainly problem for tests. + if (onTaskbarEndIdx - mIgnoreTaskbarIconCount >= 0) { + onTaskbarEndIdx -= mIgnoreTaskbarIconCount; + } + + for (ItemInfo hotseatItemInfo : Arrays.asList(hotseatItemInfos).subList(onTaskbarStartIdx, + onTaskbarEndIdx)) { + // Replace any Hotseat views with the appropriate type if it's not already that type. final int expectedLayoutResId; boolean isCollection = false; if (hotseatItemInfo.isPredictedItem()) { @@ -361,8 +691,11 @@ protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) { } View hotseatView = null; - while (nextViewIndex < getChildCount()) { - hotseatView = getChildAt(nextViewIndex); + while ((hasHotseatContainer && isNextViewInHotseat(ItemInfo.class)) + || (!hasHotseatContainer && isNextViewInSection(ItemInfo.class))) { + hotseatView = hasHotseatContainer + ? mHotseatIconsContainer.getChildAt(mNextHotseatIndex) + : getChildAt(mNextViewIndex); // see if the view can be reused if ((hotseatView.getSourceLayoutResId() != expectedLayoutResId) @@ -370,7 +703,11 @@ protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) { // Unlike for BubbleTextView, we can't reapply a new FolderInfo after inflation, // so if the info changes we need to reinflate. This should only happen if a new // folder is dragged to the position that another folder previously existed. - removeAndRecycle(hotseatView); + if (hasHotseatContainer) { + removeAndRecycle(mHotseatIconsContainer, hotseatView); + } else { + removeAndRecycle(hotseatView); + } hotseatView = null; } else { // View found @@ -401,42 +738,312 @@ protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) { } else { hotseatView = inflate(expectedLayoutResId); } - LayoutParams lp = new LayoutParams(mIconTouchSize, mIconTouchSize); + LayoutParams lp = new TaskbarLayoutParams(mIconTouchSize, mIconTouchSize); hotseatView.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding); - addView(hotseatView, nextViewIndex, lp); + if (hasHotseatContainer) { + mHotseatIconsContainer.addView(hotseatView, mNextHotseatIndex, lp); + } else { + addView(hotseatView, mNextViewIndex, lp); + } + } else if (hotseatView instanceof FolderIcon fi) { + fi.onItemsChanged(false); + fi.getFolder().reapplyItemInfo(); } - // Apply the Hotseat ItemInfos, or hide the view if there is none for a given - // index. - if (hotseatView instanceof BubbleTextView - && hotseatItemInfo instanceof WorkspaceItemInfo) { - BubbleTextView btv = (BubbleTextView) hotseatView; - WorkspaceItemInfo workspaceInfo = (WorkspaceItemInfo) hotseatItemInfo; - - boolean animate = btv.shouldAnimateIconChange((WorkspaceItemInfo) hotseatItemInfo); - btv.applyFromWorkspaceItem(workspaceInfo, animate, numViewsAnimated); - if (animate) { - numViewsAnimated++; + if (hotseatView.getLayoutParams() instanceof TaskbarLayoutParams tlp) { + tlp.bindInfo = new CellInfo(hotseatView, + hotseatItemInfo.screenId, hotseatItemInfo.container, + hotseatItemInfo.cellX, hotseatItemInfo.cellY, + hotseatItemInfo.spanX, hotseatItemInfo.spanY); + } + + // Apply the Hotseat ItemInfos, or hide the view if there is none for a given index. + if (hotseatView instanceof BubbleTextView btv + && hotseatItemInfo instanceof WorkspaceItemInfo workspaceInfo) { + if (btv instanceof PredictedAppIcon pai) { + if (pai.applyFromWorkspaceItemWithAnimation(workspaceInfo, numViewsAnimated)) { + numViewsAnimated++; + } + } else { + btv.applyFromWorkspaceItem(workspaceInfo); } } setClickAndLongClickListenersForIcon(hotseatView); - if (enableCursorHoverStates()) { - setHoverListenerForIcon(hotseatView); + setHoverListenerForIcon(hotseatView); + + mNextHotseatIndex++; + if (!hasHotseatContainer) { + mNextViewIndex = mNextHotseatIndex; } - nextViewIndex++; } - // Remove remaining views - while (nextViewIndex < getChildCount()) { - removeAndRecycle(getChildAt(nextViewIndex)); + + if (hasHotseatContainer) { + while (isNextViewInHotseat(ItemInfo.class)) { + removeAndRecycle(mHotseatIconsContainer, + mHotseatIconsContainer.getChildAt(mNextHotseatIndex)); + } + } else { + while (isNextViewInSection(ItemInfo.class)) { + removeAndRecycle(getChildAt(mNextViewIndex)); + } } - if (mAllAppsButton != null) { + if (hasOverflow && !mIsRtl) { + maybeAddPinOverflowView(); } - if (mActivityContext.getDeviceProfile().isQsbInline) { - addView(mQsb, mIsRtl ? getChildCount() : 0); - // Always set QSB to invisible after re-adding. - mQsb.setVisibility(View.INVISIBLE); + } + + private boolean isOverflowViewShowing() { + if (mTaskbarPinnedOverflowView == null) return false; + if (mHotseatIconsContainer != null) { + return mHotseatIconsContainer.indexOfChild(mTaskbarPinnedOverflowView) != -1; } + return indexOfChild(mTaskbarPinnedOverflowView) != -1; + } + + private void maybeAddPinOverflowView() { + if (!TaskbarPopupController.canPinAppsOverflow()) { + return; + } + if (mHotseatIconsContainer != null) { + if (!isOverflowViewShowing()) { + mHotseatIconsContainer.addView(mTaskbarPinnedOverflowView, mNextHotseatIndex); + } + mNextHotseatIndex++; + } else { + if (!isOverflowViewShowing()) { + addView(mTaskbarPinnedOverflowView, mNextViewIndex); + } + // [mNextViewIndex] follows the same index as [mNextHotseatIndex] so updates both + // pointer here. + mNextHotseatIndex++; + mNextViewIndex++; + } + } + + private void updateRecents(List recentTasks, int hotseatSize) { + boolean supportsOverflow = ENABLE_TASKBAR_OVERFLOW.isTrue() && recentTasks.size() > 1; + int overflowSize = 0; + boolean hasOverflow = false; + if (supportsOverflow && mTaskbarRecentsOverflowView != null) { + // Need to account for All Apps and the divider. If we need to have an overflow, we will + // have a divider for recents. + final int nonTaskIconsToBeAdded = 2; + mIdealNumIcons = hotseatSize + recentTasks.size() + nonTaskIconsToBeAdded; + overflowSize = mIdealNumIcons - mMaxNumIcons; + hasOverflow = overflowSize > 0; + + // RTL case is handled after we add the recent icons, because the button needs to + // then be to the right of them. + if (hasOverflow && !mIsRtl) { + if (mPrevOverflowTasks.isEmpty()) { + addView(mTaskbarRecentsOverflowView, mNextViewIndex); + } + // NOTE: If overflow already existed, assume the overflow view is already + // at the correct position. + mNextViewIndex++; + } else if (!hasOverflow && !mPrevOverflowTasks.isEmpty()) { + removeView(mTaskbarRecentsOverflowView); + mTaskbarRecentsOverflowView.clearItems(); + } + } else if (mTaskbarRecentsOverflowView != null && !mPrevOverflowTasks.isEmpty()) { + // Handle the case when closing all the windows together such as "clear all" + // from overview. + removeView(mTaskbarRecentsOverflowView); + mTaskbarRecentsOverflowView.clearItems(); + } + + // An extra item needs to be added to overflow button to account for the space taken up by + // the overflow button. + final int itemsToAddToOverflow = + hasOverflow ? Math.min(overflowSize + 1, recentTasks.size()) : 0; + final Set overflownRecentsSet; + if (hasOverflow && mTaskbarRecentsOverflowView != null) { + final int startIndex = mIsRtl ? recentTasks.size() - itemsToAddToOverflow : 0; + final int endIndex = mIsRtl ? recentTasks.size() : itemsToAddToOverflow; + final List overflownRecents = recentTasks.subList(startIndex, endIndex); + mTaskbarRecentsOverflowView.setItems( + overflownRecents.stream().map( + t -> new TaskWrapper(mActivityContext, ((SingleTask) t))).toList()); + overflownRecentsSet = new ArraySet<>(overflownRecents); + } else { + overflownRecentsSet = Collections.emptySet(); + } + + // Add Recent/Running icons. + final Set recentTasksSet = new ArraySet<>(recentTasks); + final int startIndex = mIsRtl ? 0 : itemsToAddToOverflow; + final int endIndex = + mIsRtl ? recentTasks.size() - itemsToAddToOverflow : recentTasks.size(); + for (GroupTask task : recentTasks.subList(startIndex, endIndex)) { + // Replace any Recent views with the appropriate type if it's not already that type. + final int expectedLayoutResId; + boolean isCollection = false; + if (!(task instanceof SingleTask)) { + if (task.taskViewType == TaskViewType.DESKTOP) { + expectedLayoutResId = -1; + } else { + expectedLayoutResId = R.layout.app_pair_icon; + } + isCollection = true; + } else { + expectedLayoutResId = R.layout.taskbar_app_icon; + } + + View recentIcon = null; + // If a task is new, we should not reuse a view so that it animates in when it is added. + final boolean canReuseView = + mPrevRecentTasks.contains(task) && !mPrevOverflowTasks.contains(task); + while (canReuseView && isNextViewInSection(GroupTask.class)) { + recentIcon = getChildAt(mNextViewIndex); + GroupTask tag = (GroupTask) recentIcon.getTag(); + + // see if the view can be reused + if (recentIcon.getSourceLayoutResId() != expectedLayoutResId + || (isCollection && tag != task && !(tag instanceof SplitTask)) + // Remove view corresponding to removed task so that it animates out. + || !recentTasksSet.contains(tag) + || overflownRecentsSet.contains(tag)) { + removeAndRecycle(recentIcon); + recentIcon = null; + } else { + // View found + break; + } + } + + if (recentIcon == null) { + if (task instanceof SingleTask) { + recentIcon = inflate(expectedLayoutResId); + } else if (task instanceof SplitTask st) { + recentIcon = AppPairIcon.inflateIcon(expectedLayoutResId, mActivityContext, + this, st.toAppPairInfo(), DISPLAY_TASKBAR); + ((AppPairIcon) recentIcon).setTextVisible(false); + recentIcon.setTag(task); + } + LayoutParams lp = new TaskbarLayoutParams(mIconTouchSize, mIconTouchSize); + recentIcon.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding); + addView(recentIcon, mNextViewIndex, lp); + } else if (recentIcon instanceof AppPairIcon api && task instanceof SplitTask st) { + api.updateInfo(st.toAppPairInfo()); + } + + if (recentIcon instanceof BubbleTextView btv) { + applyGroupTaskToBubbleTextView(btv, task); + } + setClickAndLongClickListenersForIcon(recentIcon); + setHoverListenerForIcon(recentIcon); + mNextViewIndex++; + } + + while (isNextViewInSection(GroupTask.class)) { + removeAndRecycle(getChildAt(mNextViewIndex)); + } + + if (mIsRtl && hasOverflow) { + if (mPrevOverflowTasks.isEmpty()) { + addView(mTaskbarRecentsOverflowView, mNextViewIndex); + } + mNextViewIndex++; + } + + mPrevRecentTasks = recentTasksSet; + mPrevOverflowTasks = overflownRecentsSet; + } + + private void updateHandoffSuggestions(List handoffSuggestions) { + Set tasksToAdd = new HashSet<>(handoffSuggestions); + while (isNextViewInSection(HandoffSuggestion.class)) { + View view = getChildAt(mNextViewIndex); + if (tasksToAdd.contains(view.getTag())) { + tasksToAdd.remove(view.getTag()); + mNextViewIndex++; + } else { + removeAndRecycle(getChildAt(mNextViewIndex)); + } + } + + for (HandoffSuggestion handoffSuggestion : tasksToAdd) { + View recentIcon = inflate(R.layout.taskbar_app_icon); + LayoutParams lp = new TaskbarLayoutParams(mIconTouchSize, mIconTouchSize); + recentIcon.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding); + addView(recentIcon, mNextViewIndex++, lp); + applyHandoffSuggestionToBubbleTextView((BubbleTextView) recentIcon, handoffSuggestion); + } + } + + public void applyHandoffSuggestionToBubbleTextView( + BubbleTextView bubbleTextView, + HandoffSuggestion handoffSuggestion) { + + HandoffSuggestion.Metadata metadata = handoffSuggestion.getMetadata(); + if (metadata != null) { + bubbleTextView.applyIconAndLabel( + metadata.getIcon(), + metadata.getLabel(), + metadata.getLabel()); + } + + bubbleTextView.setTag(handoffSuggestion); + } + + private boolean isNextViewInSection(Class tagClass) { + return mNextViewIndex < getChildCount() + && tagClass.isInstance(getChildAt(mNextViewIndex).getTag()); + } + + private boolean isNextViewInHotseat(Class tagClass) { + if (mHotseatIconsContainer == null) { + return false; + } + final int nextIndex = mNextHotseatIndex; + return nextIndex < mHotseatIconsContainer.getChildCount() + && tagClass.isInstance(mHotseatIconsContainer.getChildAt(nextIndex).getTag()); + } + + protected View mapOverItems(ViewGroup parent, @NonNull ItemOperator op) { + final int itemCount = parent.getChildCount(); + for (int itemIdx = 0; itemIdx < itemCount; itemIdx++) { + View item = parent.getChildAt(itemIdx); + if (item instanceof TaskbarIconsContainer tic) { + mapOverItems(tic, op); + } + if (item.getTag() instanceof ItemInfo itemInfo && op.evaluate(itemInfo, item)) { + return item; + } + } + return null; + } + + /** Binds the SingleTask to the BubbleTextView to be ready to present to the user. */ + public void applyGroupTaskToBubbleTextView(BubbleTextView btv, GroupTask groupTask) { + if (!(groupTask instanceof SingleTask singleTask)) { + return; + } + + Task task = singleTask.getTask(); + // TODO(b/344038728): use FastBitmapDrawable instead of Drawable, to get disabled state + // while dragging. + BitmapInfo bitmapInfo = groupTask.getBitmapInfos().get(0); + final Drawable taskIcon; + if (enableTaskbarRecentsThemedIcons()) { + ThemeManager themeManager = ThemeManager.INSTANCE.get(mActivityContext); + @DrawableCreationFlags int creationFlags = + themeManager.isIconThemeEnabled() ? FLAG_THEMED : 0; + @Nullable IconShape iconShape = + enableLauncherIconShapes() ? themeManager.getIconShapeData().getValue() : null; + taskIcon = Optional.ofNullable(bitmapInfo) + .map(bi -> bi.newIcon(mActivityContext, creationFlags, iconShape)) + .orElse(null); + } else { + taskIcon = Optional.ofNullable(task.icon) + .map(Drawable::getConstantState) + .map(cs -> cs.newDrawable().mutate()) + .orElse(null); + } + + btv.applyIconAndLabel(taskIcon, task.title, task.titleDescription); + btv.setTag(singleTask); } /** @@ -464,55 +1071,77 @@ private void setHoverListenerForIcon(View icon) { icon.setOnHoverListener(mControllerCallbacks.getIconOnHoverListener(icon)); } + /** Updates taskbar icons accordingly to the new bubble bar location. */ + public void onBubbleBarLocationUpdated(BubbleBarLocation location) { + if (mBubbleBarLocation == location) return; + mBubbleBarLocation = location; + requestLayout(); + } + + /** + * Returns translation X for the taskbar icons for provided {@link BubbleBarLocation}. If the + * bubble bar is not enabled, or location of the bubble bar is the same, or taskbar is not start + * aligned - returns 0. + */ + public float getTranslationXForBubbleBarPosition(BubbleBarLocation location) { + if (!mControllerCallbacks.isBubbleBarEnabled() + || location == mBubbleBarLocation + || !mActivityContext.shouldStartAlignTaskbar() + ) { + return 0; + } + Rect iconsBounds = getTransientTaskbarIconLayoutBoundsInParent(); + + return getTaskBarIconsEndForBubbleBarLocation(location) - iconsBounds.right; + } + @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - int count = getChildCount(); - DeviceProfile deviceProfile = mActivityContext.getDeviceProfile(); int spaceNeeded = getIconLayoutWidth(); - int navSpaceNeeded = deviceProfile.hotseatBarEndOffset; boolean layoutRtl = isLayoutRtl(); - int centerAlignIconEnd = right - (right - left - spaceNeeded) / 2; - int iconEnd; - + DeviceProfile deviceProfile = mActivityContext.getDeviceProfile(); + int navSpaceNeeded = deviceProfile.getHotseatProfile().getBarEndOffset(); + int centerAlignIconEnd = (right + left + spaceNeeded) / 2; + int iconEnd = centerAlignIconEnd; if (mShouldTryStartAlign) { - // Taskbar is aligned to the start - int startSpacingPx = deviceProfile.inlineNavButtonsEndSpacingPx; - - if (layoutRtl) { - iconEnd = right - startSpacingPx; + int startSpacingPx = + deviceProfile.getHotseatProfile().getInlineNavButtonsEndSpacingPx(); + if (mControllerCallbacks.isBubbleBarEnabled() + && mBubbleBarLocation != null + && mActivityContext.shouldStartAlignTaskbar()) { + iconEnd = (int) getTaskBarIconsEndForBubbleBarLocation(mBubbleBarLocation); } else { - iconEnd = startSpacingPx + spaceNeeded; + if (layoutRtl) { + iconEnd = right - startSpacingPx; + } else { + iconEnd = startSpacingPx + spaceNeeded; + } + boolean needMoreSpaceForNav = layoutRtl + ? navSpaceNeeded > (iconEnd - spaceNeeded) + : iconEnd > (right - navSpaceNeeded); + if (needMoreSpaceForNav) { + // Add offset to account for nav bar when taskbar is centered + int offset = layoutRtl + ? navSpaceNeeded - (centerAlignIconEnd - spaceNeeded) + : (right - navSpaceNeeded) - centerAlignIconEnd; + iconEnd = centerAlignIconEnd + offset; + } } - } else { - iconEnd = centerAlignIconEnd; } - boolean needMoreSpaceForNav = layoutRtl - ? navSpaceNeeded > (iconEnd - spaceNeeded) - : iconEnd > (right - navSpaceNeeded); - if (needMoreSpaceForNav) { - // Add offset to account for nav bar when taskbar is centered - int offset = layoutRtl - ? navSpaceNeeded - (centerAlignIconEnd - spaceNeeded) - : (right - navSpaceNeeded) - centerAlignIconEnd; - - iconEnd = centerAlignIconEnd + offset; - } - - // Currently, we support only one device with display cutout and we only are - // concern about + // Currently, we support only one device with display cutout and we only are concern about // it when the bottom rect is present and non empty DisplayCutout displayCutout = getDisplay().getCutout(); if (displayCutout != null && !displayCutout.getBoundingRectBottom().isEmpty()) { Rect cutoutBottomRect = displayCutout.getBoundingRectBottom(); - // when cutout present at the bottom of screen align taskbar icons to cutout - // offset + // when cutout present at the bottom of screen align taskbar icons to cutout offset // if taskbar icon overlaps with cutout int taskbarIconLeftBound = iconEnd - spaceNeeded; int taskbarIconRightBound = iconEnd; - boolean doesTaskbarIconsOverlapWithCutout = taskbarIconLeftBound <= cutoutBottomRect.centerX() - && cutoutBottomRect.centerX() <= taskbarIconRightBound; + boolean doesTaskbarIconsOverlapWithCutout = + taskbarIconLeftBound <= cutoutBottomRect.centerX() + && cutoutBottomRect.centerX() <= taskbarIconRightBound; if (doesTaskbarIconsOverlapWithCutout) { if (!layoutRtl) { @@ -529,6 +1158,18 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto mIconLayoutBounds.right = iconEnd; mIconLayoutBounds.top = (bottom - top - mIconTouchSize) / 2; mIconLayoutBounds.bottom = mIconLayoutBounds.top + mIconTouchSize; + + // With rtl layout, the all apps button will be translated by `allAppsButtonOffset` after + // layout completion (by `TaskbarViewController`). Offset the icon end by the same amount + // when laying out icons, so the taskbar content remains centered after all apps button + // translation. + if (layoutRtl) { + iconEnd += mAllAppsButtonTranslationOffset; + } + + mControllerCallbacks.onPreLayoutChildren(); + + int count = getChildCount(); for (int i = count; i > 0; i--) { View child = getChildAt(i - 1); if (child == mQsb) { @@ -541,14 +1182,21 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto qsbEnd = iconEnd - mItemMarginLeftRight; qsbStart = qsbEnd - deviceProfile.hotseatQsbWidth; } - int qsbTop = (bottom - top - deviceProfile.hotseatQsbHeight) / 2; - int qsbBottom = qsbTop + deviceProfile.hotseatQsbHeight; + int qsbTop = (bottom - top - deviceProfile.getHotseatProfile().getQsbHeight()) / 2; + int qsbBottom = qsbTop + deviceProfile.getHotseatProfile().getQsbHeight(); child.layout(qsbStart, qsbTop, qsbEnd, qsbBottom); - } else if (child == mTaskbarDivider) { + } else if (child == mTaskbarDividerContainer) { iconEnd += mItemMarginLeftRight; int iconStart = iconEnd - mIconTouchSize; child.layout(iconStart, mIconLayoutBounds.top, iconEnd, mIconLayoutBounds.bottom); iconEnd = iconStart + mItemMarginLeftRight; + } else if (child instanceof TaskbarIconsContainer tic) { + iconEnd -= mItemMarginLeftRight; + int numItems = tic.getChildCount(); + int iconStart = iconEnd - (mIconTouchSize * numItems) + - (2 * (mItemMarginLeftRight * (numItems - 1))); + child.layout(iconStart, mIconLayoutBounds.top, iconEnd, mIconLayoutBounds.bottom); + iconEnd = iconStart - mItemMarginLeftRight; } else { iconEnd -= mItemMarginLeftRight; int iconStart = iconEnd - mIconTouchSize; @@ -559,6 +1207,15 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto mIconLayoutBounds.left = iconEnd; + // Adjust the icon layout bounds by the amount by which all apps button will be translated + // post layout to maintain margin between all apps button and the edge of the transient + // taskbar background. Done for ltr layout only - for rtl layout, the offset needs to be + // adjusted on the right, which is done by offsetting `iconEnd` after setting + // `mIconLayoutBounds.right`. + if (!layoutRtl) { + mIconLayoutBounds.left += mAllAppsButtonTranslationOffset; + } + if (mIconLayoutBounds.right - mIconLayoutBounds.left < mTransientTaskbarMinWidth) { int center = mIconLayoutBounds.centerX(); int distanceFromCenter = (int) mTransientTaskbarMinWidth / 2; @@ -572,66 +1229,188 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto } /** - * Returns whether the given MotionEvent, *in screen coorindates*, is within any - * Taskbar item's + * Returns whether the given MotionEvent, *in screen coordinates*, is within any Taskbar item's * touch bounds. */ public boolean isEventOverAnyItem(MotionEvent ev) { - getLocationOnScreen(mTempOutLocation); - int xInOurCoordinates = (int) ev.getX() - mTempOutLocation[0]; - int yInOurCoorindates = (int) ev.getY() - mTempOutLocation[1]; - return isShown() && mIconLayoutBounds.contains(xInOurCoordinates, yInOurCoorindates); + int xInOurCoordinates = (int) ev.getRawX(); + int yInOurCoordinates = (int) ev.getRawY(); + return isShown() && getTaskbarIconsActualBounds().contains(xInOurCoordinates, + yInOurCoordinates); + } + + /** + * Returns the current visual taskbar icons bounds (unlike `mIconLayoutBounds` which contains + * bounds for transient mode only). + */ + Rect getTaskbarIconsActualBounds() { + View[] iconViews = getIconViews(); + if (iconViews.length == 0) { + return new Rect(); + } + iconViews[0].getLocationOnScreen(mFirstIconViewLocation); + iconViews[iconViews.length - 1].getLocationOnScreen(mLastIconViewLocation); + + return new Rect( + mFirstIconViewLocation[0], + mFirstIconViewLocation[1], + mLastIconViewLocation[0] + mIconTouchSize, + mLastIconViewLocation[1] + mIconTouchSize); } - public Rect getIconLayoutBounds() { - return mIconLayoutBounds; + @Override + public void onVisibilityAggregated(boolean isVisible) { + super.onVisibilityAggregated(isVisible); + if (refactorTaskbarUiState()) { + mTaskbarUiState.setTaskbarViewIsShown(isShown()); + } } /** - * Returns the space used by the icons + * Gets visual bounds of the taskbar view. The visual bounds correspond to the taskbar touch + * area, rather than layout placement in the parent view. */ - public int getIconLayoutWidth() { - int countExcludingQsb = getChildCount(); - DeviceProfile deviceProfile = mActivityContext.getDeviceProfile(); - if (deviceProfile.isQsbInline) { - countExcludingQsb--; + public Rect getTransientTaskbarIconLayoutBounds() { + return new Rect(mIconLayoutBounds); + } + + /** Gets taskbar layout bounds in parent view. */ + public Rect getTransientTaskbarIconLayoutBoundsInParent() { + Rect actualBounds = new Rect(mIconLayoutBounds); + actualBounds.top = getTop(); + actualBounds.bottom = getBottom(); + return actualBounds; + } + + /** Returns the total number of icons in the taskbar. **/ + public int getTotalNumberOfIcons() { + int numContainers = 0; + int numIconsInContainers = 0; + for (int i = getChildCount() - 1; i >= 0; --i) { + if (getChildAt(i) instanceof TaskbarIconsContainer tic) { + numContainers++; + numIconsInContainers += tic.getChildCount(); + } } - int iconLayoutBoundsWidth = countExcludingQsb * (mItemMarginLeftRight * 2 + mIconTouchSize); - if (enableTaskbarPinning() && countExcludingQsb > 1) { + int count = getChildCount() + - numContainers + + numIconsInContainers; + if (mActivityContext.getDeviceProfile().isQsbInline) { + count--; // Exclude QSB + } + // count can be negative if views aren't added + return Math.max(0, count); + } + /** + * Returns the space used by the icons. + */ + private int getIconLayoutWidth() { + return getIconLayoutWidth(getTotalNumberOfIcons()); + } + + /** + * Return the space needed based on the number of taskbar icons supplied vs existing children. + */ + private int getIconLayoutWidth(int expectedNumberOfTaskbarIcons) { + int iconLayoutBoundsWidth = + expectedNumberOfTaskbarIcons * (mItemMarginLeftRight * 2 + mIconTouchSize); + + if (enableTaskbarPinning() && expectedNumberOfTaskbarIcons > 1) { // We are removing 4 * mItemMarginLeftRight as there should be no space between // All Apps icon, divider icon, and first app icon in taskbar iconLayoutBoundsWidth -= mItemMarginLeftRight * 4; } + + // The all apps button container gets offset horizontally, reducing the overall taskbar + // view size. + iconLayoutBoundsWidth -= mAllAppsButtonTranslationOffset; + return iconLayoutBoundsWidth; } + @Override + public void setLayoutTransition(LayoutTransition transition) { + super.setLayoutTransition(transition); + if (mHotseatIconsContainer != null) { + mHotseatIconsContainer.setLayoutTransition(transition); + } + } + /** - * Returns the app icons currently shown in the taskbar. + * Returns the app icons currently shown in the taskbar. The returned list does not include qsb, + * but it includes all apps button and icon divider views. */ public View[] getIconViews() { final int count = getChildCount(); - View[] icons = new View[count]; + final int totalCount = getTotalNumberOfIcons(); + if (totalCount == 0) { + return new View[0]; + } + View[] icons = new View[totalCount]; + int insertionPoint = 0; for (int i = 0; i < count; i++) { - icons[i] = getChildAt(i); + if (getChildAt(i) == mQsb) continue; + if (getChildAt(i) instanceof TaskbarIconsContainer tic) { + int ticCount = tic.getChildCount(); + for (int j = 0; j < ticCount; j++) { + icons[insertionPoint++] = tic.getChildAt(j); + } + continue; + } + icons[insertionPoint++] = getChildAt(i); } return icons; } + /** + * The max number of icon views the taskbar can have when taskbar overflow is enabled. + */ + int getMaxNumIconViews() { + return mMaxNumIcons; + } + + void limitMaxNumIconViewsForTest(int maxNumIconLimit) { + mMaxNumIconsLimitForTest = maxNumIconLimit; + } + /** * Returns the all apps button in the taskbar. */ - @Nullable - public View getAllAppsButtonView() { - return mAllAppsButton; + public TaskbarAllAppsButtonContainer getAllAppsButtonContainer() { + return mAllAppsButtonContainer; } /** * Returns the taskbar divider in the taskbar. */ @Nullable - public View getTaskbarDividerView() { - return mTaskbarDivider; + public TaskbarDividerContainer getTaskbarDividerViewContainer() { + return mTaskbarDividerContainer; + } + + /** + * Returns the taskbar recent tasks overflow view in the taskbar. + */ + @Nullable + public TaskbarOverflowView getTaskbarRecentsOverflowView() { + return mTaskbarRecentsOverflowView; + } + + /** + * Returns the taskbar overflow view for pinned apps in the taskbar. + */ + @Nullable + public TaskbarOverflowView getTaskbarPinnedOverflowView() { + return mTaskbarPinnedOverflowView; + } + + /** + * Returns whether the divider is between Hotseat icons and Recents, + * instead of between All Apps button and Hotseat. + */ + public boolean isDividerForRecents() { + return mAddedDividerForRecents; } /** @@ -671,6 +1450,12 @@ protected void onDraw(Canvas canvas) { } } + @Override + protected void dispatchDraw(Canvas canvas) { + if (mActivityContext.isDestroyed()) return; + super.dispatchDraw(canvas); + } + private View inflate(@LayoutRes int layoutResId) { return mActivityContext.getViewCache().getView(layoutResId, mActivityContext, this); } @@ -686,81 +1471,57 @@ public boolean areIconsVisible() { } /** - * Maps {@code op} over all the child views. + * @return The all apps button horizontal offset used to calculate the taskbar contents width + * during layout. */ - public void mapOverItems(LauncherBindableItemsContainer.ItemOperator op) { - // map over all the shortcuts on the taskbar - for (int i = 0; i < getChildCount(); i++) { - View item = getChildAt(i); - if (op.evaluate((ItemInfo) item.getTag(), item)) { - return; - } - } + public int getAllAppsButtonTranslationXOffsetUsedForLayout() { + return mAllAppsButtonTranslationOffset; } /** - * Finds the first icon to match one of the given matchers, from highest to - * lowest priority. - * - * @return The first match, or All Apps button if no match was found. + * This method only works for bubble bar enabled in persistent task bar and the taskbar is start + * aligned. */ - public View getFirstMatch(Predicate... matchers) { - for (Predicate matcher : matchers) { - for (int i = 0; i < getChildCount(); i++) { - View item = getChildAt(i); - if (!(item.getTag() instanceof ItemInfo)) { - // Should only happen for All Apps button. - continue; - } - ItemInfo info = (ItemInfo) item.getTag(); - if (matcher.test(info)) { - return item; - } - } + private float getTaskBarIconsEndForBubbleBarLocation(BubbleBarLocation location) { + DeviceProfile deviceProfile = mActivityContext.getDeviceProfile(); + boolean navbarOnRight = location.isOnLeft(isLayoutRtl()); + int navSpaceNeeded = deviceProfile.getHotseatProfile().getBarEndOffset(); + if (navbarOnRight) { + return getWidth() - navSpaceNeeded; + } else { + return navSpaceNeeded + getIconLayoutWidth(); } - return mAllAppsButton; } - private boolean onAllAppsButtonTouch(View view, MotionEvent ev) { - switch (ev.getAction()) { - case MotionEvent.ACTION_DOWN: - mAllAppsTouchTriggered = false; - MAIN_EXECUTOR.getHandler().postDelayed( - mAllAppsTouchRunnable, mAllAppsButtonTouchDelayMs); - break; - case MotionEvent.ACTION_UP: - case MotionEvent.ACTION_CANCEL: - cancelAllAppsButtonTouch(); - } - return false; + @Override + protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) { + return new TaskbarLayoutParams(lp); } - private void cancelAllAppsButtonTouch() { - MAIN_EXECUTOR.getHandler().removeCallbacks(mAllAppsTouchRunnable); - // ACTION_UP is first triggered, then click listener / long-click listener is - // triggered on - // the next frame, so we need to post twice and delay the reset. - if (mAllAppsButton != null) { - mAllAppsButton.post(() -> { - mAllAppsButton.post(() -> { - mAllAppsTouchTriggered = false; - }); - }); - } + @Override + public LayoutParams generateLayoutParams(AttributeSet attrs) { + return new TaskbarLayoutParams(getContext(), attrs); } - private void onAllAppsButtonClick(View view) { - if (!mAllAppsTouchTriggered) { - mControllerCallbacks.triggerAllAppsButtonClick(view); - } + @Override + protected boolean checkLayoutParams(ViewGroup.LayoutParams p) { + return p instanceof TaskbarLayoutParams; } - // Handle long click from Switch Access and Voice Access - private boolean onAllAppsButtonLongClick(View view) { - if (!MAIN_EXECUTOR.getHandler().hasCallbacks(mAllAppsTouchRunnable) - && !mAllAppsTouchTriggered) { - mControllerCallbacks.triggerAllAppsButtonLongClick(); + public static class TaskbarLayoutParams extends FrameLayout.LayoutParams { + + @Nullable public CellInfo bindInfo; + + public TaskbarLayoutParams(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public TaskbarLayoutParams(ViewGroup.LayoutParams source) { + super(source); + } + + public TaskbarLayoutParams(int width, int height) { + super(width, height); } - return true; } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java index 3c646cb7fa2..a03940e0e0b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java @@ -16,15 +16,26 @@ package com.android.launcher3.taskbar; +import static com.android.launcher3.config.FeatureFlags.enableTaskbarPinning; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_ALLAPPS_BUTTON_LONG_PRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_ALLAPPS_BUTTON_TAP; +import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW; +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.GestureDetector; +import android.view.HapticFeedbackConstants; import android.view.InputDevice; import android.view.MotionEvent; import android.view.View; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.jank.Cuj; +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; /** * Callbacks for {@link TaskbarView} to interact with its controller. @@ -34,12 +45,14 @@ public class TaskbarViewCallbacks { private final TaskbarActivityContext mActivity; private final TaskbarControllers mControllers; private final TaskbarView mTaskbarView; + private final GestureDetector mGestureDetector; public TaskbarViewCallbacks(TaskbarActivityContext activity, TaskbarControllers controllers, TaskbarView taskbarView) { mActivity = activity; mControllers = controllers; mTaskbarView = taskbarView; + mGestureDetector = new GestureDetector(activity, new TaskbarViewGestureListener()); } public View.OnClickListener getIconOnClickListener() { @@ -47,25 +60,40 @@ public View.OnClickListener getIconOnClickListener() { } /** Trigger All Apps button click action. */ - protected void triggerAllAppsButtonClick(View v) { + public void triggerAllAppsButtonClick(View v) { InteractionJankMonitorWrapper.begin(v, Cuj.CUJ_LAUNCHER_OPEN_ALL_APPS, /* tag= */ "TASKBAR_BUTTON"); mActivity.getStatsLogManager().logger().log(LAUNCHER_TASKBAR_ALLAPPS_BUTTON_TAP); - mControllers.taskbarAllAppsController.toggle(); + if (mActivity.showLockedTaskbarOnHome() + || mActivity.showDesktopTaskbarForFreeformDisplay()) { + // If the taskbar can be shown on the home screen, use mAllAppsToggler to toggle all + // apps, which will toggle the launcher activity all apps when on home screen. + // TODO(b/395913143): Reconsider this if a gap in taskbar all apps functionality that + // prevents users to drag items to workspace is addressed. + mControllers.uiController.toggleAllApps(false); + } else { + mControllers.taskbarAllAppsController.toggle(); + } } /** Trigger All Apps button long click action. */ - protected void triggerAllAppsButtonLongClick() { + public void triggerAllAppsButtonLongClick() { mActivity.getStatsLogManager().logger().log(LAUNCHER_TASKBAR_ALLAPPS_BUTTON_LONG_PRESS); } - public boolean isAllAppsButtonHapticFeedbackEnabled() { + /** @return true if haptic feedback should occur when long pressing the all apps button. */ + public boolean isAllAppsButtonHapticFeedbackEnabled(Context context) { return false; } + @SuppressLint("ClickableViewAccessibility") + public View.OnTouchListener getTaskbarTouchListener() { + return (view, event) -> mGestureDetector.onTouchEvent(event); + } + public View.OnLongClickListener getTaskbarDividerLongClickListener() { return v -> { - mControllers.taskbarPinningController.showPinningView(v); + mControllers.taskbarPinningController.showPinningView(v, getDividerCenterX()); return true; }; } @@ -73,8 +101,9 @@ public View.OnLongClickListener getTaskbarDividerLongClickListener() { public View.OnTouchListener getTaskbarDividerRightClickListener() { return (v, event) -> { if (event.isFromSource(InputDevice.SOURCE_MOUSE) + && event.getAction() == MotionEvent.ACTION_DOWN && event.getButtonState() == MotionEvent.BUTTON_SECONDARY) { - mControllers.taskbarPinningController.showPinningView(v); + mControllers.taskbarPinningController.showPinningView(v, getDividerCenterX()); return true; } return false; @@ -90,11 +119,18 @@ public View.OnHoverListener getIconOnHoverListener(View icon) { return new TaskbarHoverToolTipController(mActivity, mTaskbarView, icon); } + /** Callback invoked before Taskbar icons are laid out. */ + void onPreLayoutChildren() { + if (enableTaskbarPinning()) { + mControllers.taskbarViewController.updateTaskbarIconTranslationXForPinning(); + } + } + /** * Notifies launcher to update icon alignment. */ public void notifyIconLayoutBoundsChanged() { - mControllers.uiController.onIconLayoutBoundsChanged(); + mControllers.taskbarViewController.notifyIconLayoutBoundsChanged(); } /** @@ -104,4 +140,146 @@ public void notifyVisibilityChanged() { mControllers.taskbarScrimViewController.onTaskbarVisibilityChanged( mTaskbarView.getVisibility()); } + + /** + * Get current location of bubble bar, if it is visible. + * Returns {@code null} if bubble bar is not shown. + */ + @Nullable + public BubbleBarLocation getBubbleBarLocationIfVisible() { + BubbleBarViewController bubbleBarViewController = + mControllers.bubbleControllers.map(c -> c.bubbleBarViewController).orElse(null); + if (bubbleBarViewController != null && bubbleBarViewController.isBubbleBarVisible()) { + return bubbleBarViewController.getBubbleBarLocation(); + } + return null; + } + + /** + * Get the max bubble bar collapsed width for the current bubble bar visibility state. Used to + * reserve space for the bubble bar when transitioning taskbar view into overflow. + */ + public float getBubbleBarMaxCollapsedWidthIfVisible() { + return mControllers.bubbleControllers + .filter(c -> !c.bubbleBarViewController.isHiddenForNoBubbles()) + .map(c -> c.bubbleBarViewController.getCollapsedWidthWithMaxVisibleBubbles()) + .orElse(0f); + } + + /** Returns true if bubble bar controllers are present. */ + public boolean isBubbleBarEnabled() { + return mControllers.bubbleControllers.isPresent(); + } + + /** Returns on click listener for the taskbar overflow view. */ + public View.OnClickListener getRecentsOverflowOnClickListener() { + return v -> toggleKeyboardQuickSwitchView(); + } + + /** Returns on long click listener for the taskbar overflow view. */ + public View.OnLongClickListener getRecentsOverflowOnLongClickListener() { + return v -> { + toggleKeyboardQuickSwitchView(); + return true; + }; + } + + /** Returns on click listener for the taskbar overflow view. */ + public View.OnClickListener getPinnedOverflowOnClickListener() { + return this::togglePinnedOverflowView; + } + + /** Returns on long click listener for the taskbar overflow view. */ + public View.OnLongClickListener getPinnedOverflowOnLongClickListener() { + return v -> { + togglePinnedOverflowView(v); + return true; + }; + } + + private void toggleKeyboardQuickSwitchView() { + if (mTaskbarView.getTaskbarRecentsOverflowView() != null) { + mTaskbarView.getTaskbarRecentsOverflowView().setIsActive( + !mTaskbarView.getTaskbarRecentsOverflowView().getIsActive()); + mControllers.taskbarAutohideSuspendController + .updateFlag(FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW, + mTaskbarView.getTaskbarRecentsOverflowView().getIsActive()); + } + mControllers.keyboardQuickSwitchController.toggleQuickSwitchViewForTaskbar( + mControllers.taskbarViewController.getShownTaskIds(), + this::onKeyboardQuickSwitchViewClosed); + } + + private void onKeyboardQuickSwitchViewClosed() { + if (mTaskbarView.getTaskbarRecentsOverflowView() != null) { + mTaskbarView.getTaskbarRecentsOverflowView().setIsActive(false); + } + mControllers.taskbarAutohideSuspendController.updateFlag( + FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW, false); + } + + private void togglePinnedOverflowView(View view) { + if (!(view instanceof TaskbarOverflowView overflowIcon) + || mTaskbarView.getTaskbarPinnedOverflowView() == null) { + return; + } + mTaskbarView.getTaskbarPinnedOverflowView().setIsActive( + !mTaskbarView.getTaskbarPinnedOverflowView().getIsActive()); + mControllers.taskbarAutohideSuspendController + .updateFlag(FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW, + mTaskbarView.getTaskbarPinnedOverflowView().getIsActive()); + mControllers.taskbarViewController.getOverflownAppsContainerController() + .toggleOverflownAppsView( + overflowIcon, + mTaskbarView.getTaskbarPinnedOverflowView().getOverflowInfoList(), + this::onOverflownAppsContainerClosed); + } + + private void onOverflownAppsContainerClosed() { + if (mTaskbarView.getTaskbarPinnedOverflowView() != null) { + mTaskbarView.getTaskbarPinnedOverflowView().setIsActive(false); + } + mControllers.taskbarAutohideSuspendController.updateFlag( + FLAG_AUTOHIDE_SUSPEND_TASKBAR_OVERFLOW, false); + } + + private float getDividerCenterX() { + View divider = mTaskbarView.getTaskbarDividerViewContainer(); + if (divider == null) { + return 0.0f; + } + return divider.getX() + (float) divider.getWidth() / 2; + } + + private class TaskbarViewGestureListener extends GestureDetector.SimpleOnGestureListener { + @Override + public boolean onDown(@NonNull MotionEvent event) { + if (event.isFromSource(InputDevice.SOURCE_MOUSE) + && event.getButtonState() == MotionEvent.BUTTON_SECONDARY) { + maybeShowPinningView(event); + } + return true; + } + + @Override + public boolean onSingleTapUp(@NonNull MotionEvent event) { + return true; + } + + @Override + public void onLongPress(@NonNull MotionEvent event) { + if (maybeShowPinningView(event)) { + mTaskbarView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); + } + } + + /** Returns true if the taskbar pinning popup view was shown for {@code event}. */ + private boolean maybeShowPinningView(@NonNull MotionEvent event) { + if (!mActivity.isPinnedTaskbar() || mTaskbarView.isEventOverAnyItem(event)) { + return false; + } + mControllers.taskbarPinningController.showPinningView(mTaskbarView, event.getRawX()); + return true; + } + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt index ba0f5a01b07..58e9becd91a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt @@ -16,28 +16,65 @@ package com.android.launcher3.taskbar +import android.app.contextualsearch.ContextualSearchConfig +import android.app.contextualsearch.ContextualSearchManager.ENTRYPOINT_LONG_PRESS_META import android.content.Context -import com.android.launcher3.R -import com.android.launcher3.util.ResourceBasedOverride -import com.android.launcher3.util.ResourceBasedOverride.Overrides +import android.graphics.Rect +import com.android.launcher3.dagger.LauncherComponentProvider +import com.android.launcher3.logging.StatsLogManager +import com.android.quickstep.TopTaskTracker +import com.android.quickstep.util.ContextualSearchInvoker +import javax.inject.Inject /** Creates [TaskbarViewCallbacks] instances. */ -open class TaskbarViewCallbacksFactory : ResourceBasedOverride { +open class TaskbarViewCallbacksFactory @Inject constructor() { open fun create( activity: TaskbarActivityContext, controllers: TaskbarControllers, taskbarView: TaskbarView, - ): TaskbarViewCallbacks = TaskbarViewCallbacks(activity, controllers, taskbarView) + ): TaskbarViewCallbacks { + return object : TaskbarViewCallbacks(activity, controllers, taskbarView) { + val tempRect = Rect() + + override fun triggerAllAppsButtonLongClick() { + super.triggerAllAppsButtonLongClick() + + taskbarView.allAppsButtonContainer.getBoundsOnScreen(tempRect) + val config = + ContextualSearchConfig.Builder() + .setSourceBounds(tempRect) + .setDisplayId(activity.displayId) + .build() + val contextualSearchInvoked = + ContextualSearchInvoker(activity).show(ENTRYPOINT_LONG_PRESS_META, config) + if (contextualSearchInvoked) { + val runningPackage = + TopTaskTracker.INSTANCE[activity].getCachedTopTask( + /* filterOnlyVisibleRecents */ true, + activity.displayId, + ) + .getPackageName() + activity.statsLogManager + .logger() + .withPackageName(runningPackage) + .log(StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_SUCCESSFUL_META) + } + } + + override fun isAllAppsButtonHapticFeedbackEnabled(context: Context): Boolean { + return longPressAllAppsToStartContextualSearch(context) + } + } + } + + open fun longPressAllAppsToStartContextualSearch(context: Context): Boolean = + ContextualSearchInvoker(context).runContextualSearchInvocationChecksAndLogFailures() companion object { @JvmStatic fun newInstance(context: Context): TaskbarViewCallbacksFactory { - return Overrides.getObject( - TaskbarViewCallbacksFactory::class.java, - context, - R.string.taskbar_view_callbacks_factory_class, - ) + return LauncherComponentProvider.get(context).getTaskbarViewCallbacksFactory() } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 55745b557a5..224eb310e67 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -15,9 +15,17 @@ */ package com.android.launcher3.taskbar; +import static android.animation.LayoutTransition.APPEARING; +import static android.animation.LayoutTransition.CHANGE_APPEARING; +import static android.animation.LayoutTransition.CHANGE_DISAPPEARING; +import static android.animation.LayoutTransition.DISAPPEARING; +import static android.view.Display.DEFAULT_DISPLAY; +import static android.window.DesktopModeFlags.ENABLE_TASKBAR_OVERFLOW; + +import static com.android.app.animation.Interpolators.EMPHASIZED; import static com.android.app.animation.Interpolators.FINAL_FRAME; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; +import static com.android.launcher3.Flags.refactorTaskbarUiState; import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; @@ -25,27 +33,35 @@ import static com.android.launcher3.Utilities.mapRange; import static com.android.launcher3.anim.AnimatedFloat.VALUE; import static com.android.launcher3.anim.AnimatorListeners.forEndCallback; -import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION; import static com.android.launcher3.config.FeatureFlags.enableTaskbarPinning; import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_PERSISTENT; import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_TRANSIENT; +import static com.android.launcher3.taskbar.bubbles.BubbleBarView.FADE_IN_ANIM_ALPHA_DURATION_MS; +import static com.android.launcher3.taskbar.bubbles.BubbleBarView.FADE_OUT_ANIM_POSITION_DURATION_MS; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; +import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_BUBBLE_BAR_ANIM; +import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_NAV_BAR_ANIM; import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_TASKBAR_ALIGNMENT_ANIM; import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_TASKBAR_PINNING_ANIM; import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_TASKBAR_REVEAL_ANIM; import android.animation.Animator; import android.animation.AnimatorSet; +import android.animation.LayoutTransition; +import android.animation.LayoutTransition.TransitionListener; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.annotation.NonNull; import android.graphics.Rect; +import android.util.FloatProperty; import android.util.Log; import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.view.animation.Interpolator; import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import androidx.core.view.OneShotPreDrawListener; import com.android.app.animation.Interpolators; @@ -61,29 +77,49 @@ import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.anim.RevealOutlineAnimation; import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; +import com.android.launcher3.apppairs.AppPairIcon; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.deviceprofile.TaskbarProfile; +import com.android.launcher3.model.ModelWriter; import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.util.DisplayController; +import com.android.launcher3.model.data.TaskItemInfo; +import com.android.launcher3.taskbar.bubbles.BubbleBarController; +import com.android.launcher3.taskbar.bubbles.BubbleControllers; +import com.android.launcher3.taskbar.customization.TaskbarAllAppsButtonContainer; +import com.android.launcher3.taskbar.customization.TaskbarDividerContainer; +import com.android.launcher3.taskbar.customization.TaskbarIconsContainer; +import com.android.launcher3.taskbar.handoff.HandoffSuggestion; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.MultiPropertyFactory; +import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; import com.android.launcher3.util.MultiTranslateDelegate; import com.android.launcher3.util.MultiValueAlpha; -import com.android.launcher3.views.IconButtonView; +import com.android.launcher3.util.SandboxContext; +import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.SingleTask; +import com.android.quickstep.util.SplitTask; +import com.android.systemui.shared.recents.model.Task; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; import java.io.PrintWriter; +import java.util.Collections; +import java.util.HashSet; import java.util.Set; import java.util.function.Predicate; /** * Handles properties/data collection, then passes the results to TaskbarView to render. */ -public class TaskbarViewController implements TaskbarControllers.LoggableTaskbarController { +public class TaskbarViewController implements TaskbarControllers.LoggableTaskbarController, + BubbleBarController.BubbleBarLocationListener { private static final String TAG = "TaskbarViewController"; private static final Runnable NO_OP = () -> { }; + public static long TRANSLATION_X_FOR_BUBBLEBAR_ANIM_DURATION_MS = 250; + public static final int ALPHA_INDEX_HOME = 0; public static final int ALPHA_INDEX_KEYGUARD = 1; public static final int ALPHA_INDEX_STASH = 2; @@ -91,13 +127,29 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar public static final int ALPHA_INDEX_NOTIFICATION_EXPANDED = 4; public static final int ALPHA_INDEX_ASSISTANT_INVOKED = 5; public static final int ALPHA_INDEX_SMALL_SCREEN = 6; - private static final int NUM_ALPHA_CHANNELS = 7; + public static final int ALPHA_INDEX_BUBBLE_BAR = 7; + public static final int ALPHA_INDEX_RECREATE = 8; + + private static final int NUM_ALPHA_CHANNELS = 9; + + /** Only used for animation purposes, to position the divider between two item indices. */ + public static final float DIVIDER_VIEW_POSITION_OFFSET = 0.5f; + + /** Used if an unexpected edge case is hit in {@link #getPositionInHotseat}. */ + private static final float ERROR_POSITION_IN_HOTSEAT_NOT_FOUND = -100; + + private static final int TRANSITION_DELAY = 50; + static final int TRANSITION_DEFAULT_DURATION = 500; + private static final int TRANSITION_FADE_IN_DURATION = 167; + private static final int TRANSITION_FADE_OUT_DURATION = 83; private final TaskbarActivityContext mActivity; - private final TaskbarView mTaskbarView; + private @Nullable TaskbarDragLayerController mDragLayerController; + private @NonNull TaskbarView mTaskbarView; + private @NonNull TaskbarUiState mTaskbarUiState; private final MultiValueAlpha mTaskbarIconAlpha; private final AnimatedFloat mTaskbarIconScaleForStash = new AnimatedFloat(this::updateScale); - private final AnimatedFloat mTaskbarIconTranslationYForHome = new AnimatedFloat( + public final AnimatedFloat mTaskbarIconTranslationYForHome = new AnimatedFloat( this::updateTranslationY); private final AnimatedFloat mTaskbarIconTranslationYForStash = new AnimatedFloat( this::updateTranslationY); @@ -106,15 +158,29 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar this::updateTaskbarIconsScale); private final AnimatedFloat mTaskbarIconTranslationXForPinning = new AnimatedFloat( - this::updateTaskbarIconTranslationXForPinning); + () -> updateTaskbarIconTranslationXForPinning()); + + private final AnimatedFloat mIconsTranslationXForNavbar = new AnimatedFloat( + this::updateTranslationXForNavBar); + + private final AnimatedFloat mTranslationXForBubbleBar = new AnimatedFloat( + this::updateTranslationXForBubbleBar); + + private final TransitionEndBoundsChangedNotifier mTransitionEndBoundsChangedNotifier = + new TransitionEndBoundsChangedNotifier(); + + @Nullable + private Animator mTaskbarShiftXAnim; + @Nullable + private BubbleBarLocation mCurrentBubbleBarLocation; + @Nullable + private BubbleControllers mBubbleControllers = null; + @Nullable + private ObjectAnimator mTranslationXAnimation; private final AnimatedFloat mTaskbarIconTranslationYForPinning = new AnimatedFloat( this::updateTranslationY); - private final View.OnLayoutChangeListener mTaskbarViewLayoutChangeListener = - (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) - -> updateTaskbarIconTranslationXForPinning(); - private AnimatedFloat mTaskbarNavButtonTranslationY; private AnimatedFloat mTaskbarNavButtonTranslationYForInAppDisplay; @@ -129,12 +195,22 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar // Initialized in init. private TaskbarControllers mControllers; + private final View.OnLayoutChangeListener mTaskbarViewLayoutChangeListener = + (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { + if (enableTaskbarPinning() && mBubbleControllers != null) { + mControllers.navbarButtonsViewController.onLayoutsUpdated(); + adjustTaskbarXForBubbleBar(); + } + updateTaskbarIconsActualBounds(); + }; + // Animation to align icons with Launcher, created lazily. This allows the controller to be // active only during the animation and does not need to worry about layout changes. private AnimatorPlaybackController mIconAlignControllerLazy = null; private Runnable mOnControllerPreCreateCallback = NO_OP; // Stored here as signals to determine if the mIconAlignController needs to be recreated. + private boolean mIsIconAlignedWithHotseat; private boolean mIsHotseatIconOnTopWhenAligned; private boolean mIsStashed; @@ -143,88 +219,218 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar private final boolean mIsRtl; - private final DeviceProfile mTransientTaskbarDp; - private final DeviceProfile mPersistentTaskbarDp; + private final TaskbarProfile mTransientTaskbarProfile; + private final TaskbarProfile mPersistentTaskbarProfile; private final int mTransientIconSize; private final int mPersistentIconSize; private final float mTaskbarLeftRightMargin; - public TaskbarViewController(TaskbarActivityContext activity, TaskbarView taskbarView) { + private final TaskbarRunningAppStateAnimationController mRunningStateController; + + private final OverflownAppsContainerController mOverflownAppsContainerController; + + public TaskbarViewController( + TaskbarActivityContext activity, + TaskbarView taskbarView, + @NonNull TaskbarUiState taskbarUiState) { mActivity = activity; - mTransientTaskbarDp = mActivity.getTransientTaskbarDeviceProfile(); - mPersistentTaskbarDp = mActivity.getPersistentTaskbarDeviceProfile(); - mTransientIconSize = mTransientTaskbarDp.taskbarIconSize; - mPersistentIconSize = mPersistentTaskbarDp.taskbarIconSize; + mTransientTaskbarProfile = mActivity.getTransientTaskbarProfile(); + mPersistentTaskbarProfile = mActivity.getPersistentTaskbarProfile(); + + mTransientIconSize = mTransientTaskbarProfile.getIconSize(); + mPersistentIconSize = mPersistentTaskbarProfile.getIconSize(); mTaskbarView = taskbarView; + mTaskbarUiState = taskbarUiState; mTaskbarIconAlpha = new MultiValueAlpha(mTaskbarView, NUM_ALPHA_CHANNELS); mTaskbarIconAlpha.setUpdateVisibility(true); mModelCallbacks = TaskbarModelCallbacksFactory.newInstance(mActivity) .create(mActivity, mTaskbarView); - mTaskbarBottomMargin = activity.getDeviceProfile().taskbarBottomMargin; + mTaskbarBottomMargin = activity.getDeviceProfile().getTaskbarProfile().getBottomMargin(); mStashedHandleHeight = activity.getResources() .getDimensionPixelSize(R.dimen.taskbar_stashed_handle_height); mIsRtl = Utilities.isRtl(mTaskbarView.getResources()); mTaskbarLeftRightMargin = mActivity.getResources().getDimensionPixelSize( R.dimen.transient_taskbar_padding); - + mRunningStateController = new TaskbarRunningAppStateAnimationController(mActivity); + mOverflownAppsContainerController = new OverflownAppsContainerController(mActivity); } - public void init(TaskbarControllers controllers) { + /** + * Init of taskbar view controller. + */ + public void init(TaskbarControllers controllers, AnimatorSet startAnimation) { mControllers = controllers; - mTaskbarView.init(TaskbarViewCallbacksFactory.newInstance(mActivity).create( - mActivity, mControllers, mTaskbarView)); + controllers.bubbleControllers.ifPresent(bc -> mBubbleControllers = bc); + + if (startAnimation != null) { + MultiPropertyFactory.MultiProperty multiProperty = + mTaskbarIconAlpha.get(ALPHA_INDEX_RECREATE); + multiProperty.setValue(0f); + Animator iconAlphaAnimator = multiProperty.animateToValue(1f); + iconAlphaAnimator.setInterpolator(EMPHASIZED); + startAnimation.play(iconAlphaAnimator); + if (mActivity.getTaskbarFeatureEvaluator().isPersistent()) { + mTaskbarIconTranslationYForHome.value = (float) mActivity + .getDeviceProfile() + .getTaskbarProfile() + .getHeight(); + Animator iconYTranslationAnimator = + mTaskbarIconTranslationYForHome.animateToValue(0); + iconYTranslationAnimator.setInterpolator(EMPHASIZED); + startAnimation.play(iconYTranslationAnimator); + } + } + + TaskbarViewCallbacks viewCallbacks = TaskbarViewCallbacksFactory.newInstance( + mActivity).create(mActivity, mControllers, mTaskbarView); + mTaskbarView.init(viewCallbacks); + // Pinning popup feature availability depends on taskbar controllers, wait for the + // controllers state initialization before evaluating the feature. + mControllers.runAfterInit(mTaskbarView::updatePinningPopupEventHandlers); mTaskbarView.getLayoutParams().height = mActivity.isPhoneMode() ? mActivity.getResources().getDimensionPixelSize(R.dimen.taskbar_phone_size) - : mActivity.getDeviceProfile().taskbarHeight; + : mActivity.getDeviceProfile().getTaskbarProfile().getHeight(); + mOverflownAppsContainerController.init(viewCallbacks); mTaskbarIconScaleForStash.updateValue(1f); - float pinningValue = DisplayController.isTransientTaskbar(mActivity) - ? PINNING_TRANSIENT - : PINNING_PERSISTENT; + float pinningValue = + mActivity.isTransientTaskbar() ? PINNING_TRANSIENT : PINNING_PERSISTENT; mTaskbarIconScaleForPinning.updateValue(pinningValue); mTaskbarIconTranslationYForPinning.updateValue(pinningValue); mTaskbarIconTranslationXForPinning.updateValue(pinningValue); mModelCallbacks.init(controllers); - if (mActivity.isUserSetupComplete()) { + if (mActivity.isUserSetupComplete() + && !(mActivity.getApplicationContext() instanceof SandboxContext)) { // Only load the callbacks if user setup is completed - LauncherAppState.getInstance(mActivity).getModel().addCallbacksAndLoad(mModelCallbacks); + controllers.runAfterInit(() -> LauncherAppState.getInstance(mActivity).getModel() + .addCallbacksAndLoad(mModelCallbacks)); } mTaskbarNavButtonTranslationY = controllers.navbarButtonsViewController.getTaskbarNavButtonTranslationY(); mTaskbarNavButtonTranslationYForInAppDisplay = controllers.navbarButtonsViewController .getTaskbarNavButtonTranslationYForInAppDisplay(); - + mDragLayerController = controllers.taskbarDragLayerController; mActivity.addOnDeviceProfileChangeListener(mDeviceProfileChangeListener); - if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) { - // This gets modified in NavbarButtonsViewController, but the initial value it reads - // may be incorrect since it's state gets destroyed on taskbar recreate, so reset here - mTaskbarIconAlpha.get(ALPHA_INDEX_SMALL_SCREEN) - .animateToValue(mActivity.isPhoneButtonNavMode() ? 0 : 1).start(); - } - if (enableTaskbarPinning()) { + // This gets modified in NavbarButtonsViewController, but the initial value it reads + // may be incorrect since it's state gets destroyed on taskbar recreate, so reset here + mTaskbarIconAlpha.get(ALPHA_INDEX_SMALL_SCREEN).setValue(mActivity.isPhoneMode() ? 0 : 1); + + if (enableTaskbarPinning() || refactorTaskbarUiState()) { mTaskbarView.addOnLayoutChangeListener(mTaskbarViewLayoutChangeListener); } } /** - * Announcement for Accessibility when Taskbar stashes/unstashes. + * Called whenever a new ui controller is set. + */ + public void onUiControllerChanged() { + // Pinning availability may depend on UI state when home has "locked" pinned taskbar. + mTaskbarView.updatePinningPopupEventHandlers(); + } + + /** Adjusts start aligned taskbar layout accordingly to the bubble bar position. */ + @Override + public void onBubbleBarLocationUpdated(BubbleBarLocation location) { + updateCurrentBubbleBarLocation(location); + if (mActivity.isTransientTaskbar()) { + translateTaskbarXForBubbleBar(/* animate= */ false); + } else if (mActivity.shouldStartAlignTaskbar()) { + cancelTaskbarShiftAnimation(); + // reset translation x, taskbar will position icons with the updated location + mIconsTranslationXForNavbar.updateValue(0); + mTaskbarView.onBubbleBarLocationUpdated(location); + } + } + + /** Animates start aligned taskbar accordingly to the bubble bar position. */ + @Override + public void onBubbleBarLocationAnimated(BubbleBarLocation location) { + boolean locationUpdated = updateCurrentBubbleBarLocation(location); + if (mActivity.isTransientTaskbar()) { + translateTaskbarXForBubbleBar(/* animate= */ true); + } else if (locationUpdated && mActivity.shouldStartAlignTaskbar()) { + cancelTaskbarShiftAnimation(); + float translationX = mTaskbarView.getTranslationXForBubbleBarPosition(location); + mTaskbarShiftXAnim = createTaskbarIconsShiftAnimator(translationX); + mTaskbarShiftXAnim.start(); + } + } + + private void translateTaskbarXForBubbleBar(boolean animate) { + cancelCurrentTranslationXAnimation(); + if (!mActivity.isTransientTaskbar()) return; + int shiftX = getTransientTaskbarShiftXForBubbleBar(); + if (animate) { + mTranslationXAnimation = mTranslationXForBubbleBar.animateToValue(shiftX); + mTranslationXAnimation.setInterpolator(EMPHASIZED); + mTranslationXAnimation.setDuration(TRANSLATION_X_FOR_BUBBLEBAR_ANIM_DURATION_MS); + mTranslationXAnimation.start(); + } else { + mTranslationXForBubbleBar.updateValue(shiftX); + } + } + + private void cancelCurrentTranslationXAnimation() { + if (mTranslationXAnimation != null) { + if (mTranslationXAnimation.isRunning()) { + mTranslationXAnimation.cancel(); + } + mTranslationXAnimation = null; + } + } + + private int getTransientTaskbarShiftXForBubbleBar() { + if (mBubbleControllers == null || !mActivity.isTransientTaskbar()) { + return 0; + } + return mBubbleControllers.bubbleBarViewController + .getTransientTaskbarTranslationXForBubbleBar(mCurrentBubbleBarLocation); + } + + /** Updates the mCurrentBubbleBarLocation, returns {@code} true if location is updated. */ + private boolean updateCurrentBubbleBarLocation(BubbleBarLocation location) { + if (mCurrentBubbleBarLocation == location || location == null) { + return false; + } else { + mCurrentBubbleBarLocation = location; + return true; + } + } + + private void cancelTaskbarShiftAnimation() { + if (mTaskbarShiftXAnim != null) { + mTaskbarShiftXAnim.cancel(); + } + } + + /** + * Called with destroying Taskbar with animation. */ - public void announceForAccessibility() { - mTaskbarView.announceAccessibilityChanges(); + public void onDestroyAnimation(AnimatorSet animatorSet) { + animatorSet.play( + mTaskbarIconAlpha.get(TaskbarViewController.ALPHA_INDEX_RECREATE).animateToValue( + 0f)); } public void onDestroy() { - if (enableTaskbarPinning()) { + if (enableTaskbarPinning() || refactorTaskbarUiState()) { mTaskbarView.removeOnLayoutChangeListener(mTaskbarViewLayoutChangeListener); } LauncherAppState.getInstance(mActivity).getModel().removeCallbacks(mModelCallbacks); mActivity.removeOnDeviceProfileChangeListener(mDeviceProfileChangeListener); - mModelCallbacks.unregisterListeners(); + mRunningStateController.onDestroy(); + } + + /** + * Gets the taskbar {@link View.Visibility visibility}. + */ + public int getTaskbarVisibility() { + return mTaskbarView.getVisibility(); } public boolean areIconsVisible() { @@ -235,12 +441,19 @@ public MultiPropertyFactory getTaskbarIconAlpha() { return mTaskbarIconAlpha; } + /** Creates a ModelWriter for updating model properties */ + public ModelWriter getModelWriter() { + return LauncherAppState.getInstance(mActivity).getModel() + .getWriter(false, mActivity.getCellPosMapper(), mModelCallbacks); + } + /** * Should be called when the recents button is disabled, so we can hide Taskbar icons as well. */ public void setRecentsButtonDisabled(boolean isDisabled) { // TODO: check TaskbarStashController#supportsStashing(), to stash instead of setting alpha. - mTaskbarIconAlpha.get(ALPHA_INDEX_RECENTS_DISABLED).setValue(isDisabled ? 0 : 1); + mTaskbarIconAlpha.get(ALPHA_INDEX_RECENTS_DISABLED).animateToValue(isDisabled ? 0 : 1) + .start(); } /** @@ -259,21 +472,33 @@ public void addOneTimePreDrawListener(@NonNull Runnable listener) { OneShotPreDrawListener.add(mTaskbarView, listener); } - public Rect getIconLayoutBounds() { - return mTaskbarView.getIconLayoutBounds(); + @VisibleForTesting + void limitMaxTaskbarIconsNum(int maxIconNumLimit) { + mTaskbarView.limitMaxNumIconViewsForTest(maxIconNumLimit); + if (mTaskbarView.updateMaxNumIcons()) { + commitRunningAppsToUI(); + } } - public int getIconLayoutWidth() { - return mTaskbarView.getIconLayoutWidth(); + @VisibleForTesting + int getMaxNumIconViews() { + return mTaskbarView.getMaxNumIconViews(); + } + + public Rect getTransientTaskbarIconLayoutBounds() { + return mTaskbarView.getTransientTaskbarIconLayoutBounds(); + } + + public Rect getTransientTaskbarIconLayoutBoundsInParent() { + return mTaskbarView.getTransientTaskbarIconLayoutBoundsInParent(); } public View[] getIconViews() { return mTaskbarView.getIconViews(); } - @Nullable public View getAllAppsButtonView() { - return mTaskbarView.getAllAppsButtonView(); + return mTaskbarView.getAllAppsButtonContainer(); } public AnimatedFloat getTaskbarIconScaleForStash() { @@ -313,7 +538,8 @@ private void updateTaskbarIconsScale() { View[] iconViews = mTaskbarView.getIconViews(); float finalScale; - if (mControllers.getSharedState().startTaskbarVariantIsTransient) { + TaskbarSharedState sharedState = mControllers.getSharedState(); + if (sharedState != null && sharedState.startTaskbarVariantIsTransient) { finalScale = mapRange(scale, 1f, ((float) mPersistentIconSize / mTransientIconSize)); } else { finalScale = mapRange(scale, ((float) mTransientIconSize / mPersistentIconSize), 1f); @@ -336,16 +562,39 @@ public void animateAwayNotificationDotsDuringTaskbarPinningAnimation() { } } - private void updateTaskbarIconTranslationXForPinning() { + void updateTaskbarIconTranslationXForPinning() { + updateTaskbarIconTranslationXForPinning(/* updateShiftXForBubbleBar = */ true); + } + + void updateTaskbarIconTranslationXForPinning(boolean updateShiftXForBubbleBar) { View[] iconViews = mTaskbarView.getIconViews(); float scale = mTaskbarIconTranslationXForPinning.value; float transientTaskbarAllAppsOffset = mActivity.getResources().getDimension( - mTaskbarView.getAllAppsButtonTranslationXOffset(true)); + mTaskbarView.getAllAppsButtonContainer().getAllAppsButtonTranslationXOffset(true)); float persistentTaskbarAllAppsOffset = mActivity.getResources().getDimension( - mTaskbarView.getAllAppsButtonTranslationXOffset(false)); - + mTaskbarView.getAllAppsButtonContainer().getAllAppsButtonTranslationXOffset(false)); + if (mBubbleControllers != null && updateShiftXForBubbleBar) { + cancelCurrentTranslationXAnimation(); + int translationXForTransientTaskbar = mBubbleControllers.bubbleBarViewController + .getTransientTaskbarTranslationXForBubbleBar(mCurrentBubbleBarLocation); + float currentTranslationXForTransientTaskbar = mapRange(scale, + translationXForTransientTaskbar, 0); + mTranslationXForBubbleBar.updateValue(currentTranslationXForTransientTaskbar); + } float allAppIconTranslateRange = mapRange(scale, transientTaskbarAllAppsOffset, persistentTaskbarAllAppsOffset); + // Task icons are laid out so the taskbar content is centered. The taskbar width (used for + // centering taskbar icons) depends on the all apps button X translation, and is different + // for persistent and transient taskbar. If the offset used for current taskbar layout is + // different than the offset used in final taskbar state, the icons may jump when the + // animation completes, and the taskbar is replaced. Adjust item transform to account for + // this mismatch. + float sizeDiffTranslationRange = + mapRange(scale, + (mTaskbarView.getAllAppsButtonTranslationXOffsetUsedForLayout() + - transientTaskbarAllAppsOffset) / 2, + (mTaskbarView.getAllAppsButtonTranslationXOffsetUsedForLayout() + - persistentTaskbarAllAppsOffset) / 2); // no x translation required when all apps button is the only icon in taskbar. if (iconViews.length <= 1) { @@ -354,36 +603,30 @@ private void updateTaskbarIconTranslationXForPinning() { if (mIsRtl) { allAppIconTranslateRange *= -1; + sizeDiffTranslationRange *= -1; } - if (mActivity.isThreeButtonNav()) { - ((IconButtonView) mTaskbarView.getAllAppsButtonView()) + if (!mTaskbarView.canTransitionToTransientTaskbar()) { + mTaskbarView.getAllAppsButtonContainer() .setTranslationXForTaskbarAllAppsIcon(allAppIconTranslateRange); return; } - float taskbarCenterX = - mTaskbarView.getLeft() + (mTaskbarView.getRight() - mTaskbarView.getLeft()) / 2.0f; - float finalMarginScale = mapRange(scale, 0f, mTransientIconSize - mPersistentIconSize); - float halfIconCount = iconViews.length / 2.0f; + // The index of the "middle" icon which will be used as a index from which the icon margins + // will be scaled. If number of icons is even, using the middle point between indices of two + // central icons. + float middleIndex = (iconViews.length - 1) / 2.0f; for (int iconIndex = 0; iconIndex < iconViews.length; iconIndex++) { View iconView = iconViews[iconIndex]; MultiTranslateDelegate translateDelegate = ((Reorderable) iconView).getTranslateDelegate(); - float iconCenterX = - iconView.getLeft() + (iconView.getRight() - iconView.getLeft()) / 2.0f; - if (iconCenterX <= taskbarCenterX) { - translateDelegate.getTranslationX(INDEX_TASKBAR_PINNING_ANIM).setValue( - finalMarginScale * (halfIconCount - iconIndex)); - } else { - translateDelegate.getTranslationX(INDEX_TASKBAR_PINNING_ANIM).setValue( - -finalMarginScale * (iconIndex - halfIconCount)); - } + translateDelegate.getTranslationX(INDEX_TASKBAR_PINNING_ANIM).setValue( + finalMarginScale * (middleIndex - iconIndex) + sizeDiffTranslationRange); - if (iconView.equals(mTaskbarView.getAllAppsButtonView())) { - ((IconButtonView) iconView).setTranslationXForTaskbarAllAppsIcon( + if (iconView.equals(mTaskbarView.getAllAppsButtonContainer())) { + mTaskbarView.getAllAppsButtonContainer().setTranslationXForTaskbarAllAppsIcon( allAppIconTranslateRange); } } @@ -393,18 +636,14 @@ private void updateTaskbarIconTranslationXForPinning() { * Calculates visual taskbar view width. */ public float getCurrentVisualTaskbarWidth() { - if (mTaskbarView.getIconViews().length == 0) { + View[] iconViews = mTaskbarView.getIconViews(); + if (iconViews.length == 0) { return 0; } - View[] iconViews = mTaskbarView.getIconViews(); + float left = iconViews[0].getX(); - int leftIndex = mActivity.getDeviceProfile().isQsbInline && !mIsRtl ? 1 : 0; - int rightIndex = mActivity.getDeviceProfile().isQsbInline && mIsRtl - ? iconViews.length - 2 - : iconViews.length - 1; - - float left = iconViews[leftIndex].getX(); + int rightIndex = iconViews.length - 1; float right = iconViews[rightIndex].getRight() + iconViews[rightIndex].getTranslationX(); return right - left + (2 * mTaskbarLeftRightMargin); @@ -427,11 +666,48 @@ public void setTranslationYForStash(float transY) { } private void updateTranslationY() { - mTaskbarView.setTranslationY(mTaskbarIconTranslationYForHome.value + final float oldTranslationY = mTaskbarView.getTranslationY(); + final float newTranslationY = mTaskbarIconTranslationYForHome.value + mTaskbarIconTranslationYForStash.value + mTaskbarIconTranslationYForSwipe + getTaskbarIconTranslationYForPinningValue() - + mTaskbarIconTranslationYForSpringOnStash); + + mTaskbarIconTranslationYForSpringOnStash; + if (newTranslationY != oldTranslationY) { + mTaskbarView.setTranslationY(newTranslationY); + // Updating mTaskbarView's translationY will not trigger layout pass but it will change + // taskbar icons' bounds on screen, thus we need to update taskbar icons bounds here. + if (mTaskbarView.isShown()) { + updateTaskbarIconsActualBounds(); + } + } + } + + private void updateTaskbarIconsActualBounds() { + if (refactorTaskbarUiState()) { + mTaskbarUiState.setTaskbarIconsActualBounds( + mTaskbarView.getTaskbarIconsActualBounds()); + } + } + + private void updateTranslationXForNavBar() { + updateIconViewsTranslationX(INDEX_NAV_BAR_ANIM, mIconsTranslationXForNavbar.value); + } + + private void updateTranslationXForBubbleBar() { + float translationX = mTranslationXForBubbleBar.value; + updateIconViewsTranslationX(INDEX_BUBBLE_BAR_ANIM, translationX); + if (mDragLayerController != null) { + mDragLayerController.setTranslationXForBubbleBar(translationX); + } + } + + private void updateIconViewsTranslationX(int translationXChannel, float translationX) { + View[] iconViews = mTaskbarView.getIconViews(); + for (View iconView : iconViews) { + MultiTranslateDelegate translateDelegate = + ((Reorderable) iconView).getTranslateDelegate(); + translateDelegate.getTranslationX(translationXChannel).setValue(translationX); + } } /** @@ -447,18 +723,19 @@ private float getTaskbarIconTranslationYForPinningValue() { // aligning the icon bound to be at bottom of current taskbar view and then // finally placing the icon in the middle of new taskbar background height. if (mControllers.getSharedState().startTaskbarVariantIsTransient) { - float transY = - mTransientTaskbarDp.taskbarBottomMargin + (mTransientTaskbarDp.taskbarHeight - - mTaskbarView.getIconLayoutBounds().bottom) - - (mPersistentTaskbarDp.taskbarHeight - - mTransientTaskbarDp.taskbarIconSize) / 2f; + float transY = mTransientTaskbarProfile.getBottomMargin() + + (mTransientTaskbarProfile.getHeight() + - mTaskbarView.getTransientTaskbarIconLayoutBounds().bottom) + - (mPersistentTaskbarProfile.getHeight() + - mTransientTaskbarProfile.getIconSize()) / 2f; taskbarIconTranslationYForPinningValue = mapRange(scale, 0f, transY); } else { - float transY = - -mTransientTaskbarDp.taskbarBottomMargin + (mPersistentTaskbarDp.taskbarHeight - - mTaskbarView.getIconLayoutBounds().bottom) - - (mTransientTaskbarDp.taskbarHeight - - mTransientTaskbarDp.taskbarIconSize) / 2f; + float transY = -mTransientTaskbarProfile.getBottomMargin() + + (mPersistentTaskbarProfile.getHeight() + - mTaskbarView.getTransientTaskbarIconLayoutBounds().bottom) + - (mTransientTaskbarProfile.getHeight() + - mTransientTaskbarProfile.getIconSize()) + / 2f; taskbarIconTranslationYForPinningValue = mapRange(scale, transY, 0f); } return taskbarIconTranslationYForPinningValue; @@ -511,30 +788,72 @@ private ValueAnimator createRevealAnimForView(View view, boolean isStashed, floa } public View getTaskbarDividerView() { - return mTaskbarView.getTaskbarDividerView(); + return mTaskbarView.getTaskbarDividerViewContainer(); + } + + /** + * Updates which icons are marked as running or minimized given the Sets of currently running + * and minimized tasks. + */ + public void updateIconViewsRunningStates() { + for (View iconView : getIconViews()) { + if (iconView instanceof BubbleTextView btv) { + updateRunningState(btv); + if (shouldUpdateIconContentDescription(btv)) { + btv.setContentDescription( + btv.getContentDescription() + " " + btv.getIconStateDescription()); + } + } + } } - /** Updates which icons are marked as running given the Set of currently running packages. */ - public void updateIconViewsRunningStates(Set runningPackages, - Set minimizedPackages) { + private boolean shouldUpdateIconContentDescription(BubbleTextView btv) { + boolean isInDesktopMode = + mControllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar( + DEFAULT_DISPLAY); + boolean isAllAppsButton = btv instanceof TaskbarAllAppsButtonContainer; + boolean isDividerButton = btv instanceof TaskbarDividerContainer; + return isInDesktopMode && !isAllAppsButton && !isDividerButton; + } + + /** + * @return A set of Task ids shown in the taskbar - includes task ID for running tasks of pinned + * apps, and standalone running tasks. + */ + protected Set getShownTaskIds() { + if (!ENABLE_TASKBAR_OVERFLOW.isTrue()) { + return Collections.emptySet(); + } + + Set shownTasks = new HashSet<>(); for (View iconView : getIconViews()) { if (iconView instanceof BubbleTextView btv) { - btv.updateRunningState( - getRunningAppState(btv.getTargetPackageName(), runningPackages, - minimizedPackages)); + if (btv.getTag() instanceof TaskItemInfo itemInfo) { + shownTasks.add(itemInfo.getTaskId()); + } else if (btv.getTag() instanceof SingleTask task) { + shownTasks.add(task.getTask().getKey().id); + } } } + return shownTasks; } - private BubbleTextView.RunningAppState getRunningAppState( - String packageName, - Set runningPackages, - Set minimizedPackages) { - if (minimizedPackages.contains(packageName)) { - return BubbleTextView.RunningAppState.MINIMIZED; + private void updateRunningState(BubbleTextView btv) { + mRunningStateController.updateRunningState( + btv, + getRunningAppState(btv), + /* animate = */ mTaskbarView.getLayoutTransition() != null); + } + + private BubbleTextView.RunningAppState getRunningAppState(BubbleTextView btv) { + Object tag = btv.getTag(); + if (tag instanceof TaskItemInfo itemInfo) { + return mControllers.taskbarRecentAppsController.getRunningAppState( + itemInfo.getTaskId()); } - if (runningPackages.contains(packageName)) { - return BubbleTextView.RunningAppState.RUNNING; + if (tag instanceof SingleTask singleTask) { + return mControllers.taskbarRecentAppsController.getRunningAppState( + singleTask.getTask().key.id); } return BubbleTextView.RunningAppState.NOT_RUNNING; } @@ -561,16 +880,30 @@ public void addRevealAnimToIsStashed(AnimatorSet as, boolean isStashed, long dur Rect stashedBounds = new Rect(); mControllers.stashedHandleViewController.getStashedHandleBounds(stashedBounds); + int totalNumIcons = mTaskbarView.getTotalNumberOfIcons(); + + animateIconsForReveal(mTaskbarView, reveal, as, isStashed, totalNumIcons, duration, + stashedBounds, dispatchOnAnimationStart); - int numIcons = mTaskbarView.getChildCount(); - float newChildWidth = stashedBounds.width() / (float) numIcons; + reveal.setInterpolator(interpolator); + as.play(reveal); + } + private void animateIconsForReveal(ViewGroup parent, AnimatorSet reveal, AnimatorSet as, + boolean isStashed, int totalNumIcons, long duration, Rect stashedBounds, + boolean dispatchOnAnimationStart) { + float newChildWidth = stashedBounds.width() / (float) totalNumIcons; // All children move the same y-amount since they will be cropped to the same centerY. float croppedTransY = mTaskbarView.getIconTouchSize() - stashedBounds.height(); - for (int i = mTaskbarView.getChildCount() - 1; i >= 0; i--) { - View child = mTaskbarView.getChildAt(i); + for (int i = parent.getChildCount() - 1; i >= 0; i--) { + View child = parent.getChildAt(i); boolean isQsb = child == mTaskbarView.getQsb(); + if (child instanceof TaskbarIconsContainer tic) { + animateIconsForReveal(tic, reveal, as, isStashed, totalNumIcons, duration, + stashedBounds, dispatchOnAnimationStart); + continue; + } // Crop the icons to/from the nav handle shape. reveal.play(createRevealAnimForView(child, isStashed, newChildWidth, isQsb, @@ -580,14 +913,18 @@ public void addRevealAnimToIsStashed(AnimatorSet as, boolean isStashed, long dur // All of the Taskbar icons will overlap the entirety of the stashed handle // And the QSB, if inline, will overlap part of stashed handle as well. - float currentPosition = isQsb ? child.getX() : child.getLeft(); + float currentPosition = isQsb + ? child.getX() + parent.getX() + : child.getLeft() + parent.getLeft(); float newPosition = stashedBounds.left + (newChildWidth * i); final float croppedTransX; // We look at 'left' and 'right' values to ensure that the children stay within the // bounds of the stashed handle since the new width only occurs at the end of the anim. + if (currentPosition > newPosition) { - float newRight = stashedBounds.right - (newChildWidth - * (numIcons - 1 - i)); + int iconNumber = totalNumIcons - 1 - i + - ((ViewGroup) parent.getParent()).indexOfChild(parent); + float newRight = stashedBounds.right - (newChildWidth * iconNumber); croppedTransX = -(currentPosition + child.getWidth() - newRight); } else { croppedTransX = newPosition - currentPosition; @@ -619,9 +956,15 @@ public void addRevealAnimToIsStashed(AnimatorSet as, boolean isStashed, long dur })); } } + } - reveal.setInterpolator(interpolator); - as.play(reveal); + void notifyIconLayoutBoundsChanged() { + if (isTaskbarAppTransitionRunning()) { + // Defers notify until after transitions finish. + mTransitionEndBoundsChangedNotifier.mIsCanceled = false; + } else { + mControllers.uiController.onIconLayoutBoundsChanged(); + } } /** @@ -635,16 +978,23 @@ public void setLauncherIconAlignment(float alignmentRatio, DeviceProfile launche mIconAlignControllerLazy = null; return; } - boolean isHotseatIconOnTopWhenAligned = mControllers.uiController.isHotseatIconOnTopWhenAligned(); + boolean isIconAlignedWithHotseat = mControllers.uiController.isIconAlignedWithHotseat(); boolean isStashed = mControllers.taskbarStashController.isStashed(); - // Re-create animation when mIsHotseatIconOnTopWhenAligned or mIsStashed changes. + // Re-create animation when any of these values change. if (mIconAlignControllerLazy == null || mIsHotseatIconOnTopWhenAligned != isHotseatIconOnTopWhenAligned + || mIsIconAlignedWithHotseat != isIconAlignedWithHotseat || mIsStashed != isStashed) { mIsHotseatIconOnTopWhenAligned = isHotseatIconOnTopWhenAligned; + mIsIconAlignedWithHotseat = isIconAlignedWithHotseat; mIsStashed = isStashed; + + if (isTaskbarAppTransitionRunning()) { + mTransitionEndBoundsChangedNotifier.mIsCanceled = true; + mTaskbarView.getLayoutTransition().cancel(); + } mIconAlignControllerLazy = createIconAlignmentController(launcherDp); } mIconAlignControllerLazy.setPlayFraction(alignmentRatio); @@ -654,9 +1004,23 @@ public void setLauncherIconAlignment(float alignmentRatio, DeviceProfile launche } } - /** Resets the icon alignment controller so that it can be recreated again later. */ - void resetIconAlignmentController() { + /** + * Resets the icon alignment controller so that it can be recreated again later, and updates + * the list of icons shown in the taskbar if the bubble bar visibility changes the taskbar + * overflow state. + */ + void adjustTaskbarForBubbleBar() { mIconAlignControllerLazy = null; + if (mTaskbarView.updateMaxNumIcons()) { + commitRunningAppsToUI(); + } + adjustTaskbarXForBubbleBar(); + } + + private void adjustTaskbarXForBubbleBar() { + if (mBubbleControllers != null && mActivity.isTransientTaskbar()) { + translateTaskbarXForBubbleBar(/* animate= */ true); + } } /** @@ -664,86 +1028,138 @@ void resetIconAlignmentController() { */ private AnimatorPlaybackController createIconAlignmentController(DeviceProfile launcherDp) { PendingAnimation setter = new PendingAnimation(100); + // icon alignment not needed for pinned taskbar. + if (mActivity.getTaskbarFeatureEvaluator().isPersistent()) { + return setter.createPlaybackController(); + } mOnControllerPreCreateCallback.run(); DeviceProfile taskbarDp = mActivity.getDeviceProfile(); - Rect hotseatPadding = launcherDp.getHotseatLayoutPadding(mActivity); - boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity); + boolean isTransientTaskbar = mActivity.isTransientTaskbar(); - float scaleUp = ((float) launcherDp.iconSizePx) / taskbarDp.taskbarIconSize; - int borderSpacing = launcherDp.hotseatBorderSpace; - int hotseatCellSize = DeviceProfile.calculateCellWidth( - launcherDp.availableWidthPx - hotseatPadding.left - hotseatPadding.right, - borderSpacing, - launcherDp.numShownHotseatIcons); - - boolean isToHome = mControllers.uiController.isIconAlignedWithHotseat(); + boolean isDeviceLocked = mControllers.taskbarStashController.isDeviceLocked(); // If Hotseat is not the top element, Taskbar should maintain in-app state as it fades out, // or fade in while already in in-app state. Interpolator interpolator = mIsHotseatIconOnTopWhenAligned ? LINEAR : FINAL_FRAME; - int offsetY = launcherDp.getTaskbarOffsetY(); + int offsetY = + isDeviceLocked ? taskbarDp.getTaskbarOffsetY() : launcherDp.getTaskbarOffsetY(); setter.setFloat(mTaskbarIconTranslationYForHome, VALUE, -offsetY, interpolator); setter.setFloat(mTaskbarNavButtonTranslationY, VALUE, -offsetY, interpolator); setter.setFloat(mTaskbarNavButtonTranslationYForInAppDisplay, VALUE, offsetY, interpolator); - + if (mBubbleControllers != null + && mCurrentBubbleBarLocation != null + && mActivity.isTransientTaskbar()) { + int offsetX = mBubbleControllers.bubbleBarViewController + .getTransientTaskbarTranslationXForBubbleBar(mCurrentBubbleBarLocation); + if (offsetX != 0) { + // if taskbar should be adjusted for the bubble bar adjust the taskbar translation + mTranslationXForBubbleBar.updateValue(offsetX); + setter.setFloat(mTranslationXForBubbleBar, VALUE, 0, interpolator); + } + } int collapsedHeight = mActivity.getDefaultTaskbarWindowSize(); - int expandedHeight = Math.max(collapsedHeight, taskbarDp.taskbarHeight + offsetY); + int expandedHeight = Math.max(collapsedHeight, + taskbarDp.getTaskbarProfile().getHeight() + offsetY); setter.addOnFrameListener(anim -> mActivity.setTaskbarWindowSize( anim.getAnimatedFraction() > 0 ? expandedHeight : collapsedHeight)); mTaskbarBottomMargin = isTransientTaskbar - ? mTransientTaskbarDp.taskbarBottomMargin - : mPersistentTaskbarDp.taskbarBottomMargin; + ? mTransientTaskbarProfile.getBottomMargin() + : mPersistentTaskbarProfile.getBottomMargin(); + + int hotseatNavBarTranslationX = 0; + if (mCurrentBubbleBarLocation != null) { + boolean isBubblesOnLeft = mCurrentBubbleBarLocation + .isOnLeft(mTaskbarView.isLayoutRtl()); + hotseatNavBarTranslationX = taskbarDp + .getHotseatTranslationXForNavBar(mActivity, isBubblesOnLeft); + } + + animateChildViews(mTaskbarView, setter, launcherDp, taskbarDp, hotseatNavBarTranslationX, + interpolator); + AnimatorPlaybackController controller = setter.createPlaybackController(); + mOnControllerPreCreateCallback = () -> controller.setPlayFraction(0); + return controller; + } + + private void animateChildViews(ViewGroup parent, PendingAnimation setter, + DeviceProfile launcherDp, DeviceProfile taskbarDp, int hotseatNavBarTranslationX, + Interpolator interpolator) { + boolean isToHome = mControllers.uiController.isIconAlignedWithHotseat(); + float scaleUp = ((float) launcherDp.getWorkspaceIconProfile().getIconSizePx()) + / taskbarDp.getTaskbarProfile().getIconSize(); + int borderSpacing = launcherDp.hotseatBorderSpace; + Rect hotseatPadding = launcherDp.getHotseatLayoutPadding(mActivity); + int hotseatCellSize = DeviceProfile.calculateCellWidth( + launcherDp.getDeviceProperties().getAvailableWidthPx() + - hotseatPadding.left + - hotseatPadding.right, + borderSpacing, + launcherDp.numShownHotseatIcons); + + for (int i = 0; i < parent.getChildCount(); i++) { + View child = parent.getChildAt(i); + boolean isAllAppsButton = child == mTaskbarView.getAllAppsButtonContainer(); + boolean isTaskbarDividerView = child == mTaskbarView.getTaskbarDividerViewContainer(); + boolean isTaskbarOverflowView = child == mTaskbarView.getTaskbarRecentsOverflowView(); + boolean isRecentTask = child.getTag() instanceof GroupTask; + // TODO(b/343522351): show recents on the home screen. + final boolean isRecentsInHotseat = false; + + if (child instanceof TaskbarIconsContainer tic) { + animateChildViews(tic, setter, launcherDp, taskbarDp, hotseatNavBarTranslationX, + interpolator); + continue; + } - for (int i = 0; i < mTaskbarView.getChildCount(); i++) { - View child = mTaskbarView.getChildAt(i); - boolean isAllAppsButton = child == mTaskbarView.getAllAppsButtonView(); - boolean isTaskbarDividerView = child == mTaskbarView.getTaskbarDividerView(); if (!mIsHotseatIconOnTopWhenAligned) { // When going to home, the EMPHASIZED interpolator in TaskbarLauncherStateController // plays iconAlignment to 1 really fast, therefore moving the fading towards the end // to avoid icons disappearing rather than fading out visually. setter.setViewAlpha(child, 0, Interpolators.clampToProgress(LINEAR, 0.8f, 1f)); - } else if ((isAllAppsButton && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get()) - || (isTaskbarDividerView && enableTaskbarPinning())) { + } else if ((isAllAppsButton && !FeatureFlags.enableAllAppsButtonInHotseat()) + || (isTaskbarDividerView && enableTaskbarPinning()) + || (isRecentTask && !isRecentsInHotseat) + || isTaskbarOverflowView) { if (!isToHome && mIsHotseatIconOnTopWhenAligned && mIsStashed) { // Prevent All Apps icon from appearing when going from hotseat to nav handle. setter.setViewAlpha(child, 0, Interpolators.clampToProgress(LINEAR, 0f, 0f)); - } else if (enableScalingRevealHomeAnimation()) { + } else { // Tighten clamp so that these icons do not linger as the spring settles. setter.setViewAlpha(child, 0, isToHome ? Interpolators.clampToProgress(LINEAR, 0f, 0.07f) : Interpolators.clampToProgress(LINEAR, 0.93f, 1f)); - } else { - setter.setViewAlpha(child, 0, - isToHome - ? Interpolators.clampToProgress(LINEAR, 0f, 0.17f) - : Interpolators.clampToProgress(LINEAR, 0.72f, 0.84f)); } } - if (child == mTaskbarView.getQsb()) { boolean isRtl = Utilities.isRtl(child.getResources()); float hotseatIconCenter = isRtl - ? launcherDp.widthPx - hotseatPadding.right + borderSpacing + ? launcherDp.getDeviceProperties().getWidthPx() + - hotseatPadding.right + borderSpacing + launcherDp.hotseatQsbWidth / 2f : hotseatPadding.left - borderSpacing - launcherDp.hotseatQsbWidth / 2f; + if (taskbarDp.isQsbInline) { + hotseatIconCenter += hotseatNavBarTranslationX; + } float childCenter = (child.getLeft() + child.getRight()) / 2f; - childCenter += ((Reorderable) child).getTranslateDelegate().getTranslationX( - INDEX_TASKBAR_PINNING_ANIM).getValue(); + if (child instanceof Reorderable reorderableChild) { + childCenter += reorderableChild.getTranslateDelegate().getTranslationX( + INDEX_TASKBAR_PINNING_ANIM).getValue(); + } float halfQsbIconWidthDiff = - (launcherDp.hotseatQsbWidth - taskbarDp.taskbarIconSize) / 2f; - float scale = ((float) taskbarDp.taskbarIconSize) - / launcherDp.hotseatQsbVisualHeight; + (launcherDp.hotseatQsbWidth - taskbarDp.getTaskbarProfile().getIconSize()) + / 2f; + float scale = ((float) taskbarDp.getTaskbarProfile().getIconSize()) + / launcherDp.getHotseatProfile().getQsbVisualHeight(); setter.addFloat(child, SCALE_PROPERTY, scale, 1f, interpolator); float fromX = isRtl ? -halfQsbIconWidthDiff : halfQsbIconWidthDiff; float toX = hotseatIconCenter - childCenter; - if (child instanceof Reorderable) { - MultiTranslateDelegate mtd = ((Reorderable) child).getTranslateDelegate(); + if (child instanceof Reorderable reorderableChild) { + MultiTranslateDelegate mtd = reorderableChild.getTranslateDelegate(); setter.addFloat(mtd.getTranslationX(INDEX_TASKBAR_ALIGNMENT_ANIM), MULTI_PROPERTY_VALUE, fromX, toX, interpolator); @@ -766,30 +1182,25 @@ private AnimatorPlaybackController createIconAlignmentController(DeviceProfile l continue; } - float positionInHotseat; - if (isAllAppsButton) { - // Note that there is no All Apps button in the hotseat, - // this position is only used as its convenient for animation purposes. - positionInHotseat = Utilities.isRtl(child.getResources()) - ? taskbarDp.numShownHotseatIcons - : -1; - } else if (isTaskbarDividerView) { - // Note that there is no taskbar divider view in the hotseat, - // this position is only used as its convenient for animation purposes. - positionInHotseat = Utilities.isRtl(child.getResources()) - ? taskbarDp.numShownHotseatIcons - 0.5f - : -0.5f; - } else if (child.getTag() instanceof ItemInfo) { - positionInHotseat = ((ItemInfo) child.getTag()).screenId; - } else { - Log.w(TAG, "Unsupported view found in createIconAlignmentController, v=" + child); - continue; + int firstRecentTaskIndex = -1; + int recentTaskIndex = -1; + if (isRecentTask) { + if (firstRecentTaskIndex < 0) { + firstRecentTaskIndex = i; + } + recentTaskIndex = i - firstRecentTaskIndex; } + float positionInHotseat = getPositionInHotseat(taskbarDp.numShownHotseatIcons, child, + mIsRtl, isAllAppsButton, isTaskbarDividerView, + mTaskbarView.isDividerForRecents(), recentTaskIndex); + if (positionInHotseat == ERROR_POSITION_IN_HOTSEAT_NOT_FOUND) continue; + - float hotseatAdjustedBorderSpace = - launcherDp.getHotseatAdjustedBorderSpaceForBubbleBar(child.getContext()); float hotseatIconCenter; - if (bubbleBarHasBubbles() && hotseatAdjustedBorderSpace != 0) { + if (launcherDp.shouldAdjustHotseatForBubbleBar(child.getContext(), + bubbleBarHasBubbles())) { + float hotseatAdjustedBorderSpace = + launcherDp.getHotseatAdjustedBorderSpaceForBubbleBar(child.getContext()); hotseatIconCenter = hotseatPadding.left + hotseatCellSize + (hotseatCellSize + hotseatAdjustedBorderSpace) * positionInHotseat + hotseatCellSize / 2f; @@ -798,7 +1209,11 @@ private AnimatorPlaybackController createIconAlignmentController(DeviceProfile l + (hotseatCellSize + borderSpacing) * positionInHotseat + hotseatCellSize / 2f; } + hotseatIconCenter += hotseatNavBarTranslationX; float childCenter = (child.getLeft() + child.getRight()) / 2f; + if (parent instanceof TaskbarIconsContainer tic) { + childCenter += tic.getLeft(); + } childCenter += ((Reorderable) child).getTranslateDelegate().getTranslationX( INDEX_TASKBAR_PINNING_ANIM).getValue(); float toX = hotseatIconCenter - childCenter; @@ -814,15 +1229,63 @@ private AnimatorPlaybackController createIconAlignmentController(DeviceProfile l } setter.setFloat(child, SCALE_PROPERTY, scaleUp, interpolator); } + } - AnimatorPlaybackController controller = setter.createPlaybackController(); - mOnControllerPreCreateCallback = () -> controller.setPlayFraction(0); - return controller; + /** + * Returns the index of the given child relative to its position in hotseat. + * Examples: + * -1 is the item before the first hotseat item. + * -0.5 is between those (e.g. for the divider). + * {@link #ERROR_POSITION_IN_HOTSEAT_NOT_FOUND} if there's no calculation relative to hotseat. + */ + @VisibleForTesting + float getPositionInHotseat(int numShownHotseatIcons, View child, boolean isRtl, + boolean isAllAppsButton, boolean isTaskbarDividerView, boolean isDividerForRecents, + int recentTaskIndex) { + float positionInHotseat; + // Note that there is no All Apps button in the hotseat, + // this position is only used as it's convenient for animation purposes. + float allAppsButtonPositionInHotseat = isRtl + // Right after all hotseat items. + // [HHHHHH]|[>A<] + ? numShownHotseatIcons + // Right before all hotseat items. + // [>A<]|[HHHHHH] + : -1; + // Note that there are no recent tasks in the hotseat, + // this position is only used as it's convenient for animation purposes. + float firstRecentTaskPositionInHotseat = isRtl + // After all hotseat icons and All Apps button. + // [HHHHHH][A]|[>RR 0 + ? relativePosition - DIVIDER_VIEW_POSITION_OFFSET + : relativePosition + DIVIDER_VIEW_POSITION_OFFSET; + } else if (child.getTag() instanceof ItemInfo) { + positionInHotseat = ((ItemInfo) child.getTag()).screenId; + } else if (recentTaskIndex >= 0) { + positionInHotseat = firstRecentTaskPositionInHotseat + recentTaskIndex; + } else { + Log.w(TAG, "Unsupported view found in createIconAlignmentController, v=" + child); + return ERROR_POSITION_IN_HOTSEAT_NOT_FOUND; + } + return positionInHotseat; } private boolean bubbleBarHasBubbles() { - return mControllers.bubbleControllers.isPresent() - && mControllers.bubbleControllers.get().bubbleBarViewController.hasBubbles(); + return mBubbleControllers != null + && mBubbleControllers.bubbleBarViewController.hasBubbles(); } public void onRotationChanged(DeviceProfile deviceProfile) { @@ -837,17 +1300,19 @@ public void onRotationChanged(DeviceProfile deviceProfile) { ? R.dimen.taskbar_phone_size : R.dimen.taskbar_stashed_size); } else { - taskbarWindowSize = deviceProfile.taskbarHeight + deviceProfile.getTaskbarOffsetY(); + taskbarWindowSize = mActivity.getDefaultTaskbarWindowSize(); + } + if (mBubbleControllers != null) { + int bubbleBarMaxHeight = mBubbleControllers.bubbleBarViewController + .getBubbleBarWithFlyoutMaximumHeight(); + taskbarWindowSize = Math.max(taskbarWindowSize, bubbleBarMaxHeight); } mActivity.setTaskbarWindowSize(taskbarWindowSize); mTaskbarNavButtonTranslationY.updateValue(-deviceProfile.getTaskbarOffsetY()); } - /** - * Maps the given operator to all the top-level children of TaskbarView. - */ - public void mapOverItems(LauncherBindableItemsContainer.ItemOperator op) { - mTaskbarView.mapOverItems(op); + public LauncherBindableItemsContainer getContent() { + return mModelCallbacks; } /** @@ -857,8 +1322,8 @@ public void mapOverItems(LauncherBindableItemsContainer.ItemOperator op) { * 3) All Apps button */ public View getFirstIconMatch(Predicate matcher) { - Predicate collectionMatcher = ItemInfoMatcher.forFolderMatch(matcher); - return mTaskbarView.getFirstMatch(matcher, collectionMatcher); + View icon = mModelCallbacks.getFirstMatch(matcher, ItemInfoMatcher.forFolderMatch(matcher)); + return icon != null ? icon : mTaskbarView.getAllAppsButtonContainer(); } /** @@ -869,10 +1334,160 @@ public boolean isEventOverAnyItem(MotionEvent ev) { return mTaskbarView.isEventOverAnyItem(ev); } + /** Called when there's a change in running apps to update the UI. */ + public void commitRunningAppsToUI() { + mModelCallbacks.commitRunningAppsToUI(); + if (!mActivity.isTransientTaskbar() && mTaskbarView.getLayoutTransition() == null) { + // Set up after the first commit so that the initial recents do not animate (janky). + mTaskbarView.setLayoutTransition(createLayoutTransitionForRunningApps()); + } + } + + /** Called when there's a change in handoff suggestions to update the UI. */ + public void commitHandoffSuggestionsToUI() { + if (!android.companion.Flags.enableTaskContinuity()) { + return; + } + + mModelCallbacks.commitHandoffSuggestionsToUI(); + } + + private LayoutTransition createLayoutTransitionForRunningApps() { + LayoutTransition layoutTransition = new LayoutTransition(); + layoutTransition.setDuration(TRANSITION_DEFAULT_DURATION); + layoutTransition.addTransitionListener(new TransitionListener() { + + @Override + public void startTransition( + LayoutTransition transition, ViewGroup container, View view, int type) { + if (type == APPEARING) { + view.setAlpha(0f); + view.setScaleX(0f); + view.setScaleY(0f); + } else if (type == DISAPPEARING && view instanceof BubbleTextView btv) { + // Running state updates happen after removing this view, so update it here. + updateRunningState(btv); + } + } + + @Override + public void endTransition( + LayoutTransition transition, ViewGroup container, View view, int type) { + // Do nothing. + } + }); + layoutTransition.addTransitionListener(mTransitionEndBoundsChangedNotifier); + + // Appearing. + AnimatorSet appearingSet = new AnimatorSet(); + Animator appearingAlphaAnimator = ObjectAnimator.ofFloat(null, "alpha", 0f, 1f); + appearingAlphaAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0f, + (float) TRANSITION_FADE_IN_DURATION / TRANSITION_DEFAULT_DURATION)); + Animator appearingScaleAnimator = ObjectAnimator.ofFloat(null, SCALE_PROPERTY, 0f, 1f); + appearingScaleAnimator.setInterpolator(EMPHASIZED); + appearingSet.playTogether(appearingAlphaAnimator, appearingScaleAnimator); + layoutTransition.setAnimator(APPEARING, appearingSet); + layoutTransition.setStartDelay(APPEARING, TRANSITION_DELAY); + + // Disappearing. + AnimatorSet disappearingSet = new AnimatorSet(); + Animator disappearingAlphaAnimator = ObjectAnimator.ofFloat(null, "alpha", 1f, 0f); + disappearingAlphaAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, + (float) TRANSITION_DELAY / TRANSITION_DEFAULT_DURATION, + (float) (TRANSITION_DELAY + TRANSITION_FADE_OUT_DURATION) + / TRANSITION_DEFAULT_DURATION)); + Animator disappearingScaleAnimator = ObjectAnimator.ofFloat(null, SCALE_PROPERTY, 1f, 0f); + disappearingScaleAnimator.setInterpolator(EMPHASIZED); + disappearingSet.playTogether(disappearingAlphaAnimator, disappearingScaleAnimator); + layoutTransition.setAnimator(DISAPPEARING, disappearingSet); + + // Change transitions. + FloatProperty translateXPinning = new FloatProperty<>("translateXPinning") { + @Override + public void setValue(View view, float value) { + getTranslationXForPinning(view).setValue(value); + } + + @Override + public Float get(View view) { + return getTranslationXForPinning(view).getValue(); + } + + private MultiProperty getTranslationXForPinning(View view) { + return ((Reorderable) view).getTranslateDelegate() + .getTranslationX(INDEX_TASKBAR_PINNING_ANIM); + } + }; + AnimatorSet changeSet = new AnimatorSet(); + changeSet.playTogether( + layoutTransition.getAnimator(CHANGE_APPEARING), + ObjectAnimator.ofFloat(null, translateXPinning, 0f, 1f)); + + // Change appearing. + layoutTransition.setAnimator(CHANGE_APPEARING, changeSet); + layoutTransition.setInterpolator(CHANGE_APPEARING, EMPHASIZED); + + // Change disappearing. + layoutTransition.setAnimator(CHANGE_DISAPPEARING, changeSet); + layoutTransition.setInterpolator(CHANGE_DISAPPEARING, EMPHASIZED); + layoutTransition.setStartDelay(CHANGE_DISAPPEARING, TRANSITION_DELAY); + + return layoutTransition; + } + + + /** Returns whether a LayoutTransition is currently running on the TaskbarView. */ + public boolean isTaskbarAppTransitionRunning() { + LayoutTransition transition = mTaskbarView.getLayoutTransition(); + return transition != null && transition.isRunning(); + } + + public boolean isTaskbarInMinimalState() { + return mTaskbarView.isTaskbarInMinimalState(); + } + + /** + * To be called when the given Task is updated, so that we can tell TaskbarView to also update. + * @param task The Task whose e.g. icon changed. + */ + public void onTaskUpdated(Task task, GroupTask parentGroupTask) { + // Find the icon view(s) that changed. + for (View view : mTaskbarView.getIconViews()) { + if (view instanceof BubbleTextView btv + && view.getTag() instanceof GroupTask groupTask) { + if (groupTask.containsTask(task.key.id)) { + mTaskbarView.applyGroupTaskToBubbleTextView(btv, groupTask); + } + } else if (view instanceof AppPairIcon appPairIcon + && view.getTag() instanceof SplitTask st + && st.containsTask(task.key.id)) { + appPairIcon.updateInfo(st.toAppPairInfo()); + } else if (view instanceof TaskbarOverflowView overflowButton + && parentGroupTask instanceof SingleTask singleTask) { + overflowButton.updateTaskIsShown(singleTask); + } + } + } + + public void onHandoffSuggestionUpdated(HandoffSuggestion suggestion) { + // Find the icon view(s) that changed. + for (View view : mTaskbarView.getIconViews()) { + if (view instanceof BubbleTextView btv + && view.getTag() instanceof HandoffSuggestion handoffSuggestion + && handoffSuggestion.equals(suggestion)) { + mTaskbarView.applyHandoffSuggestionToBubbleTextView(btv, suggestion); + } + } + } + + OverflownAppsContainerController getOverflownAppsContainerController() { + return mOverflownAppsContainerController; + } + @Override public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "TaskbarViewController:"); - + pw.println(prefix + "\tignoreTaskbarIconCount=" + mTaskbarView.getIgnoreTaskbarIconCount()); mTaskbarIconAlpha.dump( prefix + "\t", pw, @@ -883,20 +1498,42 @@ public void dumpLogs(String prefix, PrintWriter pw) { "ALPHA_INDEX_RECENTS_DISABLED", "ALPHA_INDEX_NOTIFICATION_EXPANDED", "ALPHA_INDEX_ASSISTANT_INVOKED", - "ALPHA_INDEX_IME_BUTTON_NAV", "ALPHA_INDEX_SMALL_SCREEN"); mModelCallbacks.dumpLogs(prefix + "\t", pw); } - /** Called when there's a change in running apps to update the UI. */ - public void commitRunningAppsToUI() { - mModelCallbacks.commitRunningAppsToUI(); + private ObjectAnimator createTaskbarIconsShiftAnimator(float translationX) { + ObjectAnimator animator = mIconsTranslationXForNavbar.animateToValue(translationX); + animator.setStartDelay(FADE_OUT_ANIM_POSITION_DURATION_MS); + animator.setDuration(FADE_IN_ANIM_ALPHA_DURATION_MS); + animator.setInterpolator(EMPHASIZED); + return animator; } - /** Call TaskbarModelCallbacks to update running apps. */ - public void updateRunningApps() { - mModelCallbacks.updateRunningApps(); - } + private class TransitionEndBoundsChangedNotifier implements TransitionListener { + private boolean mIsCanceled = true; // Start as disabled. + private int mRunningTransitionsCount; + + @Override + public void startTransition( + LayoutTransition transition, ViewGroup container, View view, int type) { + mRunningTransitionsCount++; + } + @Override + public void endTransition( + LayoutTransition transition, ViewGroup container, View view, int type) { + mRunningTransitionsCount--; + if (mRunningTransitionsCount == 0 + && !mControllers.taskbarPopupController.isPopupOpened()) { + // Reset the taskbar window size to default after all animations are done so + // there won't be janky animation with window resize. + mActivity.setTaskbarWindowFullscreen(false); + } + if (!transition.isRunning() && !mIsCanceled) { + mControllers.uiController.onIconLayoutBoundsChanged(); + } + } + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/Utilities.java b/quickstep/src/com/android/launcher3/taskbar/Utilities.java index 47d66847272..9182e031753 100644 --- a/quickstep/src/com/android/launcher3/taskbar/Utilities.java +++ b/quickstep/src/com/android/launcher3/taskbar/Utilities.java @@ -16,12 +16,18 @@ package com.android.launcher3.taskbar; +import static com.android.launcher3.Utilities.dpToPx; + +import com.android.launcher3.graphics.ThemeManager; +import com.android.launcher3.taskbar.customization.TaskbarIconSpecs; + /** * Various utilities shared amongst the Taskbar's classes. */ public final class Utilities { - private Utilities() {} + private Utilities() { + } /** * Sets drag, long-click, and split selection behavior on 1P and 3P launchers with Taskbar @@ -36,4 +42,22 @@ static void setOverviewDragState(TaskbarControllers controllers, controllers.taskbarPopupController.setAllowInitialSplitSelection( allowInitialSplitSelection); } + + /** + * Gives radius for Transient Taskbar based on selected Launcher Icon Shape. + * Transient Taskbar radius = (icon shape radius * icon size ratio) + padding. + * + * @return The radius for Transient Taskbar. + */ + static float getShapedTaskbarRadius(TaskbarActivityContext activityContext) { + float taskbarIconSize = + activityContext.getTaskbarSpecsEvaluator().getTaskbarIconSize().getSize(); + float maxIconSize = TaskbarIconSpecs.INSTANCE.getIconSize52dp().getSize(); + float iconShapeRadius = + ThemeManager.INSTANCE.get(activityContext).getIconState().getShapeRadius(); + float iconSizeRatio = taskbarIconSize / maxIconSize; + return dpToPx((iconShapeRadius * iconSizeRatio) + + TaskbarIconSpecs.INSTANCE.getDefaultTransientIconMargin().getSize(), + activityContext); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/VoiceInteractionWindowController.kt b/quickstep/src/com/android/launcher3/taskbar/VoiceInteractionWindowController.kt index 5a5ff8e8802..c065d355282 100644 --- a/quickstep/src/com/android/launcher3/taskbar/VoiceInteractionWindowController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/VoiceInteractionWindowController.kt @@ -22,7 +22,6 @@ import android.view.ViewTreeObserver import android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION import android.view.WindowManager import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY -import com.android.launcher3.util.DisplayController import com.android.launcher3.views.BaseDragLayer import com.android.systemui.animation.ViewRootSync import java.io.PrintWriter @@ -41,7 +40,7 @@ private const val TEMP_BACKGROUND_WINDOW_TITLE = "VoiceInteractionTaskbarBackgro class VoiceInteractionWindowController(val context: TaskbarActivityContext) : TaskbarControllers.LoggableTaskbarController, TaskbarControllers.BackgroundRendererController { - private val isSeparateBackgroundEnabled = !DisplayController.isTransientTaskbar(context) + private val isSeparateBackgroundEnabled = !context.isTransientTaskbar && !context.isPhoneMode private val taskbarBackgroundRenderer = TaskbarBackgroundRenderer(context) private val nonTouchableInsetsComputer = ViewTreeObserver.OnComputeInternalInsetsListener { @@ -68,6 +67,7 @@ class VoiceInteractionWindowController(val context: TaskbarActivityContext) : separateWindowForTaskbarBackground = object : BaseDragLayer(context, null, 0) { override fun recreateControllers() { + super.recreateControllers() mControllers = emptyArray() } @@ -96,7 +96,7 @@ class VoiceInteractionWindowController(val context: TaskbarActivityContext) : separateWindowLayoutParams = context.createDefaultWindowLayoutParams( TYPE_APPLICATION_OVERLAY, - TEMP_BACKGROUND_WINDOW_TITLE + TEMP_BACKGROUND_WINDOW_TITLE, ) separateWindowLayoutParams?.isSystemApplicationOverlay = true } @@ -109,7 +109,7 @@ class VoiceInteractionWindowController(val context: TaskbarActivityContext) : } fun setIsVoiceInteractionWindowVisible(visible: Boolean, skipAnim: Boolean) { - if (isVoiceInteractionWindowVisible == visible) { + if (isVoiceInteractionWindowVisible == visible || context.isPhoneMode) { return } isVoiceInteractionWindowVisible = visible @@ -162,7 +162,7 @@ class VoiceInteractionWindowController(val context: TaskbarActivityContext) : // First add the temporary window, then hide the overlapping taskbar background. context.addWindowView( separateWindowForTaskbarBackground, - separateWindowLayoutParams + separateWindowLayoutParams, ); { controllers.taskbarDragLayerController.setIsBackgroundDrawnElsewhere(true) } } else { @@ -178,7 +178,7 @@ class VoiceInteractionWindowController(val context: TaskbarActivityContext) : ViewRootSync.synchronizeNextDraw( separateWindowForTaskbarBackground!!, context.dragLayer, - onWindowsSynchronized + onWindowsSynchronized, ) } } diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java index 05f1a2f2fbb..a46845affa8 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java @@ -17,13 +17,10 @@ import android.content.Context; import android.util.AttributeSet; -import android.view.View; import androidx.annotation.Nullable; -import com.android.launcher3.R; import com.android.launcher3.allapps.ActivityAllAppsContainerView; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext; import java.util.Optional; @@ -46,23 +43,6 @@ void setOnInvalidateHeaderListener(OnInvalidateHeaderListener onInvalidateHeader mOnInvalidateHeaderListener = onInvalidateHeaderListener; } - @Override - protected View inflateSearchBar() { - if (isSearchSupported()) { - return super.inflateSearchBar(); - } - - // Remove top padding of header, since we do not have any search - mHeader.setPadding(mHeader.getPaddingLeft(), 0, - mHeader.getPaddingRight(), mHeader.getPaddingBottom()); - - TaskbarAllAppsFallbackSearchContainer searchView = new TaskbarAllAppsFallbackSearchContainer(getContext(), - null); - searchView.setId(R.id.search_container_all_apps); - searchView.setVisibility(GONE); - return searchView; - } - @Override public void invalidateHeader() { super.invalidateHeader(); @@ -70,11 +50,6 @@ public void invalidateHeader() { OnInvalidateHeaderListener::onInvalidateHeader); } - @Override - protected boolean isSearchSupported() { - return FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get(); - } - @Override public boolean isInAllApps() { // All apps is always open diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java index 24c0e897132..e4b0fa8e3e6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java @@ -16,45 +16,46 @@ package com.android.launcher3.taskbar.allapps; import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableCustomHeightForAllAppsOnCd; +import android.content.res.Resources; +import android.view.Gravity; import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.appprediction.PredictionRowView; import com.android.launcher3.dragndrop.DragOptions.PreDragCondition; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.taskbar.TaskbarControllers; +import com.android.launcher3.taskbar.TaskbarUiState; import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext; import com.android.launcher3.util.PackageUserKey; +import com.android.launcher3.views.BaseDragLayer; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.function.Predicate; - /** * Handles the all apps overlay window initialization, updates, and its data. *

- * All apps is in an application overlay window instead of taskbar's navigation - * bar panel window, - * because a navigation bar panel is higher than UI components that all apps - * should be below such as + * All apps is in an application overlay window instead of taskbar's navigation bar panel window, + * because a navigation bar panel is higher than UI components that all apps should be below such as * the notification tray. *

- * The all apps window is created and destroyed upon opening and closing all - * apps, respectively. - * Application data may be bound while the window does not exist, so this - * controller will store + * The all apps window is created and destroyed upon opening and closing all apps, respectively. + * Application data may be bound while the window does not exist, so this controller will store * the models for the next all apps session. */ public final class TaskbarAllAppsController { private TaskbarControllers mControllers; + private TaskbarUiState mTaskbarUiState; private @Nullable TaskbarOverlayContext mOverlayContext; private @Nullable TaskbarAllAppsSlideInView mSlideInView; private @Nullable TaskbarAllAppsContainerView mAppsView; @@ -67,16 +68,24 @@ public final class TaskbarAllAppsController { private @Nullable List mZeroStateSearchSuggestions; private boolean mDisallowGlobalDrag; private boolean mDisallowLongClick; + private float mTaskbarAllAppsConnectedDisplayCustomHeightMultiple; + private float mTaskbarAllAppsConnectedDisplayCustomHeightLimit; private Map mPackageUserKeytoUidMap = Collections.emptyMap(); /** Initialize the controller. */ - public void init(TaskbarControllers controllers, boolean allAppsVisible) { + public void init( + TaskbarControllers controllers, TaskbarUiState taskbarUiState, boolean allAppsVisible) { mControllers = controllers; + mTaskbarUiState = taskbarUiState; + Resources res = mControllers.taskbarActivityContext.getResources(); + mTaskbarAllAppsConnectedDisplayCustomHeightMultiple = + res.getFloat(R.dimen.taskbar_all_apps_connected_display_custom_height_multiple); + mTaskbarAllAppsConnectedDisplayCustomHeightLimit = + res.getFloat(R.dimen.taskbar_all_apps_connected_display_custom_height_limit); /* - * Recreate All Apps if it was open in the previous Taskbar instance (e.g. the - * configuration + * Recreate All Apps if it was open in the previous Taskbar instance (e.g. the configuration * changed). */ if (allAppsVisible) { @@ -95,8 +104,7 @@ public void setApps(@Nullable AppInfo[] apps, int flags, Map zeroStateSearchSuggesti mZeroStateSearchSuggestions = zeroStateSearchSuggestions; } - /** Updates the current notification dots. */ - public void updateNotificationDots(Predicate updatedDots) { - if (mAppsView != null) { - mAppsView.getAppsStore().updateNotificationDots(updatedDots); - } - } - - /** - * Toggles visibility of {@link TaskbarAllAppsContainerView} in the overlay - * window. - */ + /** Toggles visibility of {@link TaskbarAllAppsContainerView} in the overlay window. */ public void toggle() { toggle(false); } - /** - * Toggles visibility of {@link TaskbarAllAppsContainerView} with the keyboard - * for search. - */ + /** Toggles visibility of {@link TaskbarAllAppsContainerView} with the keyboard for search. */ public void toggleSearch() { toggle(true); } @@ -153,6 +148,8 @@ private void toggle(boolean showKeyboard) { if (isOpen()) { mSlideInView.close(true); } else { + mControllers.taskbarEduTooltipController.hide(); + mControllers.taskbarPopupController.maybeCloseMultiInstanceMenu(); show(true, showKeyboard); } } @@ -170,11 +167,6 @@ private void show(boolean animate, boolean showKeyboard) { if (mAppsView != null) { return; } - // mControllers and getSharedState should never be null here. Do not handle - // null-pointer - // to catch invalid states. - mControllers.getSharedState().allAppsVisible = true; - mOverlayContext = mControllers.taskbarOverlayController.requestWindow(); // Initialize search session for All Apps. @@ -188,10 +180,30 @@ private void show(boolean animate, boolean showKeyboard) { mSlideInView = (TaskbarAllAppsSlideInView) mOverlayContext.getLayoutInflater().inflate( R.layout.taskbar_all_apps_sheet, mOverlayContext.getDragLayer(), false); - // Ensures All Apps gets touch events in case it is not the top floating view. - // Floating - // views above it may not be able to intercept the touch, so All Apps should try - // to. + + if (!mOverlayContext.isPrimaryDisplay() + && enableCustomHeightForAllAppsOnCd.isTrue()) { + // Not doing these calculations in init because the device properties may change, for + // example if there's a display size setting change. + DeviceProfile dp = mOverlayContext.getDeviceProfile(); + int maxAllAppsHeight = (int) Math.ceil(mTaskbarAllAppsConnectedDisplayCustomHeightLimit + * dp.getDeviceProperties().getAvailableHeightPx()); + int allAppsHeight = (int) Math.ceil(dp.getAllAppsProfile().getCellHeightPx() + * mTaskbarAllAppsConnectedDisplayCustomHeightMultiple + * dp.numShownAllAppsColumns); + + // If the desired height of all apps is greater than the limit then continue with + // fullscreen all apps. + if (allAppsHeight <= maxAllAppsHeight) { + BaseDragLayer.LayoutParams lp = + (BaseDragLayer.LayoutParams) mSlideInView.getLayoutParams(); + lp.height = allAppsHeight; + lp.gravity = Gravity.BOTTOM; + } + } + + // Ensures All Apps gets touch events in case it is not the top floating view. Floating + // views above it may not be able to intercept the touch, so All Apps should try to. mOverlayContext.getDragLayer().addTouchController(mSlideInView); mSlideInView.addOnCloseListener(this::cleanUpOverlay); TaskbarAllAppsViewController viewController = new TaskbarAllAppsViewController( @@ -203,23 +215,21 @@ private void show(boolean animate, boolean showKeyboard) { viewController.show(animate); mAppsView = mOverlayContext.getAppsView(); - mAppsView.getAppsStore().setApps(mApps, mAppsModelFlags, mPackageUserKeytoUidMap, false); + mAppsView.getAppsStore().setApps(mApps, mAppsModelFlags, mPackageUserKeytoUidMap); mAppsView.getFloatingHeaderView() .findFixedRowByType(PredictionRowView.class) .setPredictedApps(mPredictedApps); // 1 alternative that would be more work: - // Create a shared drag layer between taskbar and taskbarAllApps so that when - // dragging - // starts and taskbarAllApps can close, but the drag layer that the view is - // being dragged in + // Create a shared drag layer between taskbar and taskbarAllApps so that when dragging + // starts and taskbarAllApps can close, but the drag layer that the view is being dragged in // doesn't also close mOverlayContext.getDragController().setDisallowGlobalDrag(mDisallowGlobalDrag); mOverlayContext.getDragController().setDisallowLongClick(mDisallowLongClick); + mTaskbarUiState.setIsTaskbarAllAppsOpen(true); } private void cleanUpOverlay() { - // Floating search bar is added to the drag layer in - // ActivityAllAppsContainerView onAttach; + // Floating search bar is added to the drag layer in ActivityAllAppsContainerView onAttach; // removed here as this is a special case that we remove the all apps panel. if (mAppsView != null && mOverlayContext != null && mAppsView.getSearchUiDelegate().isSearchBarFloating()) { @@ -237,19 +247,23 @@ private void cleanUpOverlay() { } mSlideInView = null; mAppsView = null; + mTaskbarUiState.setIsTaskbarAllAppsOpen(false); + } + + @Nullable + public TaskbarAllAppsContainerView getAppsView() { + return mAppsView; } @VisibleForTesting public int getTaskbarAllAppsTopPadding() { - // Allow null-pointer since this should only be null if the apps view is not - // showing. + // Allow null-pointer since this should only be null if the apps view is not showing. return mAppsView.getActiveRecyclerView().getClipBounds().top; } @VisibleForTesting public int getTaskbarAllAppsScroll() { - // Allow null-pointer since this should only be null if the apps view is not - // showing. + // Allow null-pointer since this should only be null if the apps view is not showing. return mAppsView.getActiveRecyclerView().computeVerticalScrollOffset(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsFallbackSearchContainer.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsFallbackSearchContainer.java deleted file mode 100644 index 53fe06d32c3..00000000000 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsFallbackSearchContainer.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.taskbar.allapps; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; - -import androidx.annotation.Nullable; - -import com.android.launcher3.ExtendedEditText; -import com.android.launcher3.allapps.ActivityAllAppsContainerView; -import com.android.launcher3.allapps.SearchUiManager; - -/** Empty search container for Taskbar All Apps used as a fallback if search is not supported. */ -public class TaskbarAllAppsFallbackSearchContainer extends View implements SearchUiManager { - public TaskbarAllAppsFallbackSearchContainer(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public TaskbarAllAppsFallbackSearchContainer( - Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - @Override - public void initializeSearch(ActivityAllAppsContainerView containerView) { - // Do nothing. - } - - @Override - public void resetSearch() { - // Do nothing. - } - - @Nullable - @Override - public ExtendedEditText getEditText() { - return null; - } -} diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java index 39cd5ef31b3..f1fe088a367 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java @@ -15,10 +15,14 @@ */ package com.android.launcher3.taskbar.allapps; +import static android.os.Trace.TRACE_TAG_APP; + +import static com.android.app.animation.Interpolators.DECELERATED_EASE; import static com.android.app.animation.Interpolators.EMPHASIZED; -import static com.android.launcher3.Flags.enablePredictiveBackGesture; +import static com.android.app.animation.Interpolators.LINEAR; import static com.android.launcher3.touch.AllAppsSwipeController.ALL_APPS_FADE_MANUAL; import static com.android.launcher3.touch.AllAppsSwipeController.SCRIM_FADE_MANUAL; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import android.animation.Animator; import android.content.Context; @@ -26,34 +30,47 @@ import android.graphics.Rect; import android.os.Handler; import android.os.Looper; +import android.os.Trace; import android.util.AttributeSet; +import android.util.Log; +import android.view.CrossWindowBlurListeners; import android.view.MotionEvent; import android.view.View; +import android.view.ViewRootImpl; import android.view.animation.Interpolator; import android.window.OnBackInvokedDispatcher; import androidx.annotation.Nullable; +import app.lawnchair.theme.color.tokens.ColorTokens; +import app.lawnchair.util.LawnchairUtilsKt; import com.android.app.animation.Interpolators; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorListeners; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.taskbar.allapps.TaskbarAllAppsViewController.TaskbarAllAppsCallbacks; import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext; import com.android.launcher3.util.Themes; import com.android.launcher3.views.AbstractSlideInView; +import java.util.function.Consumer; + /** Wrapper for taskbar all apps with slide-in behavior. */ public class TaskbarAllAppsSlideInView extends AbstractSlideInView implements Insettable, DeviceProfile.OnDeviceProfileChangeListener { + private static final String TAG = "TaskbarAllAppsSlideInView"; + private final Handler mHandler; + private final int mMaxBlurRadius; + private final Consumer mWindowBlurListener = blursEnabled -> invalidate(); private TaskbarAllAppsContainerView mAppsView; private float mShiftRange; + private int mBlurRadius; private @Nullable Runnable mShowOnFullyAttachedToWindowRunnable; // Initialized in init. @@ -67,6 +84,8 @@ public TaskbarAllAppsSlideInView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); mHandler = new Handler(Looper.myLooper()); + mMaxBlurRadius = getResources().getDimensionPixelSize( + R.dimen.max_depth_blur_radius_enhanced); } void init(TaskbarAllAppsCallbacks callbacks) { @@ -98,10 +117,21 @@ public void onViewDetachedFromWindow(View v) { } private void showOnFullyAttachedToWindow(boolean animate) { + if (mActivityContext.isAllAppsBackgroundBlurEnabled()) { + ViewRootImpl overlayVri = mActivityContext.getRootView().getViewRootImpl(); + if (overlayVri == null) { + Log.w(TAG, "overlayVRI is null, cannot notifyRendererOfExpensiveFrame()"); + } else { + Trace.instantForTrack(TRACE_TAG_APP, TAG, "notifyRendererForGpuLoadUp"); + overlayVri.notifyRendererForGpuLoadUp("opening taskbar all apps"); + overlayVri.notifyRendererOfExpensiveFrame(); + } + } mAllAppsCallbacks.onAllAppsTransitionStart(true); if (!animate) { mAllAppsCallbacks.onAllAppsTransitionEnd(true); setTranslationShift(TRANSLATION_SHIFT_OPENED); + mBlurRadius = mMaxBlurRadius; return; } @@ -120,18 +150,28 @@ private void showOnFullyAttachedToWindow(boolean animate) { protected void onOpenCloseAnimationPending(PendingAnimation animation) { final boolean isOpening = mToTranslationShift == TRANSLATION_SHIFT_OPENED; - if (mActivityContext.getDeviceProfile().isPhone) { - final Interpolator allAppsFadeInterpolator = isOpening ? ALL_APPS_FADE_MANUAL - : Interpolators.reverse(ALL_APPS_FADE_MANUAL); + if (mActivityContext.getDeviceProfile().getDeviceProperties().isPhone()) { + final Interpolator allAppsFadeInterpolator = + isOpening ? ALL_APPS_FADE_MANUAL : Interpolators.reverse(ALL_APPS_FADE_MANUAL); animation.setViewAlpha(mAppsView, 1 - mToTranslationShift, allAppsFadeInterpolator); } + if (Flags.allAppsBlur()) { + Interpolator blurInterpolator = isOpening ? LINEAR : DECELERATED_EASE; + animation.addOnFrameListener(a -> { + float blurProgress = + isOpening ? a.getAnimatedFraction() : 1 - a.getAnimatedFraction(); + mBlurRadius = + (int) (mMaxBlurRadius * blurInterpolator.getInterpolation(blurProgress)); + }); + } + mAllAppsCallbacks.onAllAppsAnimationPending(animation, isOpening); } @Override protected Interpolator getScrimInterpolator() { - if (mActivityContext.getDeviceProfile().isTablet) { + if (mActivityContext.getDeviceProfile().getDeviceProperties().isTablet()) { return super.getScrimInterpolator(); } return mToTranslationShift == TRANSLATION_SHIFT_OPENED @@ -176,15 +216,13 @@ protected boolean isOfType(int type) { protected void onFinishInflate() { super.onFinishInflate(); mAppsView = findViewById(R.id.apps_view); - if (mActivityContext.getDeviceProfile().isPhone) { + if (mActivityContext.getDeviceProfile().getDeviceProperties().isPhone()) { mAppsView.setAlpha(0); } mContent = mAppsView; // Setup header protection for search bar, if enabled. - if (FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get()) { - mAppsView.setOnInvalidateHeaderListener(this::invalidate); - } + mAppsView.setOnInvalidateHeaderListener(this::invalidate); DeviceProfile dp = mActivityContext.getDeviceProfile(); setShiftRange(dp.allAppsShiftRange); @@ -194,49 +232,41 @@ protected void onFinishInflate() { protected void onAttachedToWindow() { super.onAttachedToWindow(); mActivityContext.addOnDeviceProfileChangeListener(this); - if (enablePredictiveBackGesture()) { - mAppsView.getAppsRecyclerViewContainer().setOutlineProvider(mViewOutlineProvider); - mAppsView.getAppsRecyclerViewContainer().setClipToOutline(true); - OnBackInvokedDispatcher dispatcher; - if (!Utilities.ATLEAST_U) return; - dispatcher = findOnBackInvokedDispatcher(); - if (dispatcher != null) { - dispatcher.registerOnBackInvokedCallback( - OnBackInvokedDispatcher.PRIORITY_DEFAULT, null); - } + mAppsView.getAppsRecyclerViewContainer().setOutlineProvider(mViewOutlineProvider); + mAppsView.getAppsRecyclerViewContainer().setClipToOutline(true); + if (!Utilities.ATLEAST_U) return; + OnBackInvokedDispatcher dispatcher = findOnBackInvokedDispatcher(); + if (dispatcher != null) { + dispatcher.registerOnBackInvokedCallback( + OnBackInvokedDispatcher.PRIORITY_DEFAULT, this); } + CrossWindowBlurListeners.getInstance().addListener(MAIN_EXECUTOR, mWindowBlurListener); } @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); mActivityContext.removeOnDeviceProfileChangeListener(this); - if (enablePredictiveBackGesture()) { - mAppsView.getAppsRecyclerViewContainer().setOutlineProvider(null); - mAppsView.getAppsRecyclerViewContainer().setClipToOutline(false); - OnBackInvokedDispatcher dispatcher; - if (!Utilities.ATLEAST_U) return; - dispatcher = findOnBackInvokedDispatcher(); - if (dispatcher != null && Utilities.ATLEAST_T) { - dispatcher.unregisterOnBackInvokedCallback(null); - } + mAppsView.getAppsRecyclerViewContainer().setOutlineProvider(null); + mAppsView.getAppsRecyclerViewContainer().setClipToOutline(false); + if (!Utilities.ATLEAST_U) return; + OnBackInvokedDispatcher dispatcher = findOnBackInvokedDispatcher(); + if (dispatcher != null) { + dispatcher.unregisterOnBackInvokedCallback(this); } + CrossWindowBlurListeners.getInstance().removeListener(mWindowBlurListener); } @Override protected void dispatchDraw(Canvas canvas) { - // We should call drawOnScrimWithBottomOffset() rather than - // drawOnScrimWithScale(). Because - // for taskbar all apps, the scrim view is a child view of AbstractSlideInView. - // Thus scaling - // down in AbstractSlideInView#onScaleProgressChanged() with SCALE_PROPERTY has - // already - // done the job - there is no need to re-apply scale effect here. But it also - // means we need - // to pass extra bottom offset to background scrim to fill the bottom gap during - // predictive + // We should call drawOnScrimWithBottomOffset() rather than drawOnScrimWithScale(). Because + // for taskbar all apps, the scrim view is a child view of AbstractSlideInView. Thus scaling + // down in AbstractSlideInView#onScaleProgressChanged() with SCALE_PROPERTY has already + // done the job - there is no need to re-apply scale effect here. But it also means we need + // to pass extra bottom offset to background scrim to fill the bottom gap during predictive // back swipe. mAppsView.drawOnScrimWithBottomOffset(canvas, getBottomOffsetPx()); + mActivityContext.getOverlayController().setBackgroundBlurRadius(mBlurRadius); super.dispatchDraw(canvas); } @@ -248,9 +278,15 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) { @Override protected int getScrimColor(Context context) { - return mActivityContext.getDeviceProfile().isPhone - ? Themes.getAttrColor(context, R.attr.allAppsScrimColor) - : context.getColor(R.color.widgets_picker_scrim); + if (!mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()) { + // Always use an opaque scrim if there's no sheet. + // Lawnchair-TODO-Colour: Check R.color.materialColorSurfaceDim + return context.getResources().getColor(R.color.materialColorSurfaceDim); + } else if (!Flags.allAppsBlur()) { + // If there's a sheet but no blur, use the old scrim color. + return ColorTokens.WidgetsPickerScrim.resolveColor(context); + } + return LawnchairUtilsKt.getAllAppsScrimColor(context); } @Override @@ -272,6 +308,7 @@ public void setInsets(Rect insets) { public void onDeviceProfileChanged(DeviceProfile dp) { setShiftRange(dp.allAppsShiftRange); setTranslationShift(TRANSLATION_SHIFT_OPENED); + mBlurRadius = mMaxBlurRadius; } private void setShiftRange(float shiftRange) { @@ -289,10 +326,8 @@ protected boolean isEventOverContent(MotionEvent ev) { } /** - * In taskbar all apps search mode, we should scale down content inside all - * apps, rather - * than the whole all apps bottom sheet, to indicate we will navigate back - * within the all apps. + * In taskbar all apps search mode, we should scale down content inside all apps, rather + * than the whole all apps bottom sheet, to indicate we will navigate back within the all apps. */ @Override public boolean shouldAnimateContentViewInBackSwipe() { @@ -309,8 +344,7 @@ protected void onUserSwipeToDismissProgressChanged() { @Override public void onBackInvoked() { if (mAllAppsCallbacks.handleSearchBackInvoked()) { - // We need to scale back taskbar all apps if we navigate back within search - // inside all + // We need to scale back taskbar all apps if we navigate back within search inside all // apps post(this::animateSwipeToDismissProgressToStart); } else { diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java index 52f71769102..f1ccd39e4ab 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java @@ -31,7 +31,6 @@ import com.android.launcher3.taskbar.TaskbarStashController; import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext; import com.android.launcher3.taskbar.overlay.TaskbarOverlayController; -import com.android.launcher3.util.DisplayController; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import java.util.Optional; @@ -90,7 +89,7 @@ private void setUpAppDivider() { } private void setUpTaskbarStashing() { - if (DisplayController.isTransientTaskbar(mContext)) { + if (mContext.isTransientTaskbar()) { mTaskbarStashController.updateStateForFlag(FLAG_STASHED_IN_TASKBAR_ALL_APPS, true); mTaskbarStashController.applyState(); } @@ -103,7 +102,7 @@ private void setUpTaskbarStashing() { AbstractFloatingView.closeOpenContainer( mContext, AbstractFloatingView.TYPE_ACTION_POPUP); - if (DisplayController.isTransientTaskbar(mContext)) { + if (mContext.isTransientTaskbar()) { mTaskbarStashController.updateStateForFlag(FLAG_STASHED_IN_TASKBAR_ALL_APPS, false); mTaskbarStashController.applyState(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarSearchSessionController.kt b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarSearchSessionController.kt index 4d0b376351f..61fc3eb416f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarSearchSessionController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarSearchSessionController.kt @@ -16,19 +16,16 @@ package com.android.launcher3.taskbar.allapps -import android.content.Context import android.view.View -import com.android.launcher3.R import com.android.launcher3.allapps.AllAppsTransitionListener import com.android.launcher3.anim.PendingAnimation -import com.android.launcher3.config.FeatureFlags import com.android.launcher3.dragndrop.DragOptions.PreDragCondition import com.android.launcher3.model.data.ItemInfo -import com.android.launcher3.util.ResourceBasedOverride -import com.android.launcher3.util.ResourceBasedOverride.Overrides +import com.android.launcher3.views.ActivityContext +import javax.inject.Inject /** Stub for managing the Taskbar search session. */ -open class TaskbarSearchSessionController : ResourceBasedOverride, AllAppsTransitionListener { +open class TaskbarSearchSessionController @Inject constructor() : AllAppsTransitionListener { /** Start the search session lifecycle. */ open fun startLifecycle() = Unit @@ -61,16 +58,7 @@ open class TaskbarSearchSessionController : ResourceBasedOverride, AllAppsTransi companion object { @JvmStatic - fun newInstance(context: Context): TaskbarSearchSessionController { - if (!FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get()) { - return TaskbarSearchSessionController() - } - - return Overrides.getObject( - TaskbarSearchSessionController::class.java, - context, - R.string.taskbar_search_session_controller_class, - ) - } + fun newInstance(activityContext: ActivityContext): TaskbarSearchSessionController = + activityContext.activityComponent.createTaskbarSearchSessionController() } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleActivityStarter.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleActivityStarter.kt new file mode 100644 index 00000000000..0196442dabf --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleActivityStarter.kt @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.bubbles + +import android.content.Intent +import android.content.pm.ShortcutInfo +import android.os.UserHandle +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.DaggerSingletonObject +import com.android.quickstep.SystemUiProxy +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import com.android.wm.shell.shared.bubbles.logging.EntryPoint +import javax.inject.Inject + +/** Utility class to request WMShell to launch an app into a bubble and open that bubble. */ +@LauncherAppSingleton +class BubbleActivityStarter @Inject constructor(private val systemUiProxy: SystemUiProxy) { + + private val listeners = mutableListOf() + + /** Tell SysUI to show the provided shortcut in a bubble. */ + @JvmOverloads + fun showShortcutBubble( + info: ShortcutInfo?, + entryPoint: EntryPoint, + bubbleBarLocation: BubbleBarLocation? = null, + ) { + systemUiProxy.showShortcutBubble(info, entryPoint, bubbleBarLocation) + notifyListeners() + } + + /** Tells SysUI to show a bubble of an app. */ + @JvmOverloads + fun showAppBubble( + intent: Intent?, + user: UserHandle, + entryPoint: EntryPoint, + bubbleBarLocation: BubbleBarLocation? = null, + ) { + systemUiProxy.showAppBubble(intent, user, entryPoint, bubbleBarLocation) + notifyListeners() + } + + /** Adds [Listener]. Returns `true` if listener was added. */ + fun addListener(listener: Listener): Boolean { + return listeners.add(listener) + } + + /** Removes [Listener]. Returns `true` if listener was removed. */ + fun removeListener(listener: Listener): Boolean { + return listeners.remove(listener) + } + + private fun notifyListeners() { + for (listener in listeners) { + listener.onBubbleLaunchRequested() + } + } + + /** Interface for listening of bubble lunch requests. */ + fun interface Listener { + + /** Invoked when bubble launch is requested. */ + fun onBubbleLaunchRequested() + } + + companion object { + + @JvmField + val INSTANCE = DaggerSingletonObject(LauncherAppComponent::getBubbleActivityStarter) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt index 25939e1eb52..3d19e0e0246 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt @@ -43,10 +43,13 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) private val arrowTipRadius: Float private val arrowVisibleHeight: Float - private val shadowAlpha: Float - private var shadowBlur = 0f - private var keyShadowDistance = 0f + private val strokeColor: Int + private val strokeColorDropTarget: Int + private val shadowAlpha: Int + private val shadowBlur: Float + private val keyShadowDistance: Float private var arrowHeightFraction = 1f + private var isShowingDropTarget: Boolean = false var arrowPositionX: Float = 0f private set @@ -71,6 +74,27 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) } } + /** + * Scale of the background in the x direction. Pivot is at the left edge if [anchorLeft] is + * `true` and at the right edge if it is `false` + */ + var scaleX: Float = 1f + set(value) { + if (field != value) { + field = value + invalidateSelf() + } + } + + /** Scale of the background in the y direction. Pivot is at the bottom edge. */ + var scaleY: Float = 1f + set(value) { + if (field != value) { + field = value + invalidateSelf() + } + } + init { val res = context.resources // configure fill paint @@ -78,19 +102,19 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) fillPaint.flags = Paint.ANTI_ALIAS_FLAG fillPaint.style = Paint.Style.FILL // configure stroke paint - strokePaint.color = context.getColor(R.color.taskbar_stroke) + strokeColor = context.getColor(R.color.taskbar_stroke) + strokeColorDropTarget = context.getColor(com.android.internal.R.color.system_primary_fixed) + strokePaint.color = strokeColor strokePaint.flags = Paint.ANTI_ALIAS_FLAG strokePaint.style = Paint.Style.STROKE strokePaint.strokeWidth = res.getDimension(R.dimen.transient_taskbar_stroke_width) // apply theme alpha attributes if (Utilities.isDarkTheme(context)) { - strokePaint.alpha = DARK_THEME_STROKE_ALPHA shadowAlpha = DARK_THEME_SHADOW_ALPHA } else { - strokePaint.alpha = LIGHT_THEME_STROKE_ALPHA shadowAlpha = LIGHT_THEME_SHADOW_ALPHA } - + strokePaint.alpha = STROKE_ALPHA shadowBlur = res.getDimension(R.dimen.transient_taskbar_shadow_blur) keyShadowDistance = res.getDimension(R.dimen.transient_taskbar_key_shadow_distance) arrowWidth = res.getDimension(R.dimen.bubblebar_pointer_width) @@ -111,25 +135,28 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) override fun draw(canvas: Canvas) { canvas.save() - // TODO (b/277359345): Should animate the alpha similar to taskbar (see TaskbarDragLayer) // Draw shadows. val newShadowAlpha = - mapToRange(fillPaint.alpha.toFloat(), 0f, 255f, 0f, shadowAlpha, Interpolators.LINEAR) + mapToRange(fillPaint.alpha, 0, 255, 0, shadowAlpha, Interpolators.LINEAR) fillPaint.setShadowLayer( shadowBlur, 0f, keyShadowDistance, - setColorAlphaBound(Color.BLACK, Math.round(newShadowAlpha)) + setColorAlphaBound(Color.BLACK, newShadowAlpha), ) // Create background path val backgroundPath = Path() - val topOffset = backgroundHeight - bounds.height().toFloat() + val scaledBackgroundHeight = backgroundHeight * scaleY + val scaledWidth = width * scaleX + val topOffset = scaledBackgroundHeight - bounds.height().toFloat() val radius = backgroundHeight / 2f - val left = bounds.left + (if (anchorLeft) 0f else bounds.width().toFloat() - width) - val right = bounds.left + (if (anchorLeft) width else bounds.width().toFloat()) - val top = bounds.top - topOffset + arrowVisibleHeight - val bottom = bounds.top + bounds.height().toFloat() + val left = bounds.left + (if (anchorLeft) 0f else bounds.width().toFloat() - scaledWidth) + val right = bounds.left + (if (anchorLeft) scaledWidth else bounds.width().toFloat()) + // Calculate top with scaled heights for background and arrow to align with stash handle + val top = bounds.bottom - scaledBackgroundHeight + getScaledArrowVisibleHeight() + val bottom = bounds.bottom.toFloat() + backgroundPath.addRoundRect(left, top, right, bottom, radius, radius, Path.Direction.CW) addArrowPathIfNeeded(backgroundPath, topOffset) @@ -142,19 +169,20 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) private fun addArrowPathIfNeeded(sourcePath: Path, topOffset: Float) { if (!showingArrow || arrowHeightFraction <= 0) return val arrowPath = Path() + val scaledHeight = getScaledArrowHeight() RoundedArrowDrawable.addDownPointingRoundedTriangleToPath( arrowWidth, - arrowHeight, + scaledHeight, arrowTipRadius, - arrowPath + arrowPath, ) // flip it horizontally val pathTransform = Matrix() - pathTransform.setRotate(180f, arrowWidth * 0.5f, arrowHeight * 0.5f) + pathTransform.setRotate(180f, arrowWidth * 0.5f, scaledHeight * 0.5f) arrowPath.transform(pathTransform) // shift to arrow position val arrowStart = bounds.left + arrowPositionX - (arrowWidth / 2f) - val arrowTop = (1 - arrowHeightFraction) * arrowVisibleHeight - topOffset + val arrowTop = (1 - arrowHeightFraction) * getScaledArrowVisibleHeight() - topOffset arrowPath.offset(arrowStart, arrowTop) // union with rectangle sourcePath.op(arrowPath, Path.Op.UNION) @@ -170,6 +198,7 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) override fun setAlpha(alpha: Int) { fillPaint.alpha = alpha + strokePaint.alpha = mapToRange(alpha, 0, 255, 0, STROKE_ALPHA, Interpolators.LINEAR) invalidateSelf() } @@ -183,6 +212,7 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) fun setBackgroundHeight(newHeight: Float) { backgroundHeight = newHeight + invalidateSelf() } /** @@ -199,10 +229,33 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) invalidateSelf() } + private fun getScaledArrowHeight(): Float { + return arrowHeight * scaleY + } + + private fun getScaledArrowVisibleHeight(): Float { + return max(0f, getScaledArrowHeight() - (arrowHeight - arrowVisibleHeight)) + } + + /** Set whether the background should show the drop target */ + fun showDropTarget(isDropTarget: Boolean) { + if (isShowingDropTarget == isDropTarget) { + return + } + isShowingDropTarget = isDropTarget + val strokeColor = if (isDropTarget) strokeColorDropTarget else strokeColor + val alpha = if (isDropTarget) DRAG_STROKE_ALPHA else STROKE_ALPHA + strokePaint.color = strokeColor + strokePaint.alpha = alpha + invalidateSelf() + } + + fun isShowingDropTarget() = isShowingDropTarget + companion object { - private const val DARK_THEME_STROKE_ALPHA = 51 - private const val LIGHT_THEME_STROKE_ALPHA = 41 - private const val DARK_THEME_SHADOW_ALPHA = 51f - private const val LIGHT_THEME_SHADOW_ALPHA = 25f + private const val STROKE_ALPHA = 51 + private const val DRAG_STROKE_ALPHA = 255 + private const val DARK_THEME_SHADOW_ALPHA = 51 + private const val LIGHT_THEME_SHADOW_ALPHA = 25 } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java index 87b99ff955d..aa8d6dba0e8 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java @@ -15,17 +15,11 @@ */ package com.android.launcher3.taskbar.bubbles; -import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_GET_PERSONS_DATA; -import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED; -import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC; -import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER; import static android.os.Process.THREAD_PRIORITY_BACKGROUND; -import static com.android.launcher3.icons.FastBitmapDrawable.WHITE_SCRIM_ALPHA; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_VISIBLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING; @@ -33,76 +27,54 @@ import static java.util.stream.Collectors.toList; +import android.annotation.AnyThread; import android.annotation.BinderThread; +import android.annotation.NonNull; import android.annotation.Nullable; -import android.app.Notification; import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.LauncherApps; -import android.content.pm.PackageManager; -import android.content.pm.ShortcutInfo; -import android.content.res.TypedArray; -import android.graphics.Bitmap; -import android.graphics.Color; -import android.graphics.Matrix; -import android.graphics.Path; import android.graphics.Point; -import android.graphics.drawable.AdaptiveIconDrawable; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.InsetDrawable; import android.os.Bundle; -import android.os.Process; import android.os.SystemProperties; -import android.os.UserHandle; import android.util.ArrayMap; import android.util.Log; -import android.util.PathParser; -import android.view.LayoutInflater; +import android.view.View; -import androidx.appcompat.content.res.AppCompatResources; - -import com.android.internal.graphics.ColorUtils; -import com.android.launcher3.R; -import com.android.launcher3.icons.BitmapInfo; -import com.android.launcher3.icons.BubbleIconFactory; -import com.android.launcher3.shortcuts.ShortcutRequest; +import com.android.launcher3.taskbar.TaskbarSharedState; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController; import com.android.launcher3.util.Executors.SimpleThreadFactory; +import com.android.launcher3.util.MultiPropertyFactory; import com.android.quickstep.SystemUiProxy; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; import com.android.wm.shell.Flags; import com.android.wm.shell.bubbles.IBubblesListener; -import com.android.wm.shell.common.bubbles.BubbleBarLocation; -import com.android.wm.shell.common.bubbles.BubbleBarUpdate; -import com.android.wm.shell.common.bubbles.BubbleInfo; -import com.android.wm.shell.common.bubbles.RemovedBubble; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import com.android.wm.shell.shared.bubbles.BubbleBarUpdate; +import com.android.wm.shell.shared.bubbles.BubbleInfo; +import com.android.wm.shell.shared.bubbles.RemovedBubble; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.concurrent.Executor; import java.util.concurrent.Executors; /** - * This registers a listener with SysUIProxy to get information about changes to - * the bubble - * stack state from WMShell (SysUI). The controller is also responsible for - * loading the necessary + * This registers a listener with SysUIProxy to get information about changes to the bubble + * stack state from WMShell (SysUI). The controller is also responsible for loading the necessary * information to render each of the bubbles & dispatches changes to - * {@link BubbleBarViewController} which will then update {@link BubbleBarView} - * as needed. + * {@link BubbleBarViewController} which will then update {@link BubbleBarView} as needed. * - *

- * For details around the behavior of the bubble bar, see {@link BubbleBarView}. + *

For details around the behavior of the bubble bar, see {@link BubbleBarView}. */ -public class BubbleBarController extends IBubblesListener.Stub { +public class BubbleBarController { private static final String TAG = "BubbleBarController"; private static final boolean DEBUG = false; /** - * Determines whether bubbles can be shown in the bubble bar. This value updates - * when the + * Determines whether bubbles can be shown in the bubble bar. This value updates when the * taskbar is recreated. * * @see #onTaskbarRecreated() @@ -115,10 +87,7 @@ public static boolean isBubbleBarEnabled() { return sBubbleBarEnabled; } - /** - * Re-reads the value of the flag from SystemProperties when taskbar is - * recreated. - */ + /** Re-reads the value of the flag from SystemProperties when taskbar is recreated. */ public static void onTaskbarRecreated() { sBubbleBarEnabled = Flags.enableBubbleBar() || SystemProperties.getBoolean("persist.wm.debug.bubble_bar", false); @@ -127,14 +96,14 @@ public static void onTaskbarRecreated() { private static final long MASK_HIDE_BUBBLE_BAR = SYSUI_STATE_BOUNCER_SHOWING | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED - | SYSUI_STATE_IME_SHOWING + | SYSUI_STATE_IME_VISIBLE | SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED - | SYSUI_STATE_QUICK_SETTINGS_EXPANDED - | SYSUI_STATE_IME_SWITCHER_SHOWING; + | SYSUI_STATE_QUICK_SETTINGS_EXPANDED; private static final long MASK_HIDE_HANDLE_VIEW = SYSUI_STATE_BOUNCER_SHOWING | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING - | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED; + | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED + | SYSUI_STATE_IME_VISIBLE; private static final long MASK_SYSUI_LOCKED = SYSUI_STATE_BOUNCER_SHOWING | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING @@ -143,28 +112,28 @@ public static void onTaskbarRecreated() { private final Context mContext; private final BubbleBarView mBarView; private final ArrayMap mBubbles = new ArrayMap<>(); + private final ArrayMap mSuppressedBubbles = new ArrayMap<>(); private static final Executor BUBBLE_STATE_EXECUTOR = Executors.newSingleThreadExecutor( new SimpleThreadFactory("BubbleStateUpdates-", THREAD_PRIORITY_BACKGROUND)); - private final LauncherApps mLauncherApps; - private final BubbleIconFactory mIconFactory; private final SystemUiProxy mSystemUiProxy; + private final BubbleBarListener mListener; private BubbleBarItem mSelectedBubble; - private BubbleBarOverflow mOverflowBubble; - private ImeVisibilityChecker mImeVisibilityChecker; + private TaskbarSharedState mSharedState; private BubbleBarViewController mBubbleBarViewController; private BubbleStashController mBubbleStashController; - private BubbleStashedHandleViewController mBubbleStashedHandleViewController; - private BubblePinController mBubblePinController; + private Optional mBubbleStashedHandleViewController; + private BubbleCreator mBubbleCreator; + private BubbleBarLocationListener mBubbleBarLocationListener; - // Cache last sent top coordinate to avoid sending duplicate updates to shell - private int mLastSentBubbleBarTop; + private int mLastSentBubbleBarTopToScreenBottom; + + private boolean mIsImeVisible = false; /** - * Similar to {@link BubbleBarUpdate} but rather than {@link BubbleInfo}s it - * uses + * Similar to {@link BubbleBarUpdate} but rather than {@link BubbleInfo}s it uses * {@link BubbleBarBubble}s so that it can be used to update the views. */ private static class BubbleBarViewUpdate { @@ -179,6 +148,9 @@ private static class BubbleBarViewUpdate { List removedBubbles; List bubbleKeysInOrder; Point expandedViewDropTargetSize; + boolean showOverflow; + boolean showOverflowChanged; + boolean suppressAnimation; // These need to be loaded in the background BubbleBarBubble addedBubble; @@ -197,6 +169,9 @@ private static class BubbleBarViewUpdate { removedBubbles = update.removedBubbles; bubbleKeysInOrder = update.bubbleKeysInOrder; expandedViewDropTargetSize = update.expandedViewDropTargetSize; + showOverflow = update.showOverflow; + showOverflowChanged = update.showOverflowChanged; + suppressAnimation = update.suppressAnimation; } } @@ -204,82 +179,92 @@ public BubbleBarController(Context context, BubbleBarView bubbleView) { mContext = context; mBarView = bubbleView; // Need the view for inflating bubble views. + mListener = new BubbleBarListener(this); mSystemUiProxy = SystemUiProxy.INSTANCE.get(context); - - if (sBubbleBarEnabled) { - mSystemUiProxy.setBubblesListener(this); - } - mLauncherApps = context.getSystemService(LauncherApps.class); - mIconFactory = new BubbleIconFactory(context, - context.getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_size), - context.getResources().getDimensionPixelSize(R.dimen.bubblebar_badge_size), - context.getResources().getColor(R.color.important_conversation), - context.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.importance_ring_stroke_width)); } public void onDestroy() { + mListener.clear(); mSystemUiProxy.setBubblesListener(null); + // Saves bubble bar state + mSharedState.bubbleBarExpanded = mBubbleBarViewController.isExpanded(); + mSharedState.bubbleBarStashed = mBubbleStashController.isStashed(); + mSharedState.bubbleBarHasOverflow = mBubbleBarViewController.isOverflowAdded(); + mSharedState.selectedBubbleKey = mSelectedBubble != null ? mSelectedBubble.getKey() : null; + BubbleInfo[] bubbleInfoItems = new BubbleInfo[mBubbles.size()]; + mBubbles.values().forEach(bubbleBarBubble -> { + int index = mBubbleBarViewController.bubbleViewIndex(bubbleBarBubble.getView()); + if (index < 0 || index >= bubbleInfoItems.length) { + Log.e(TAG, "Found improper index: " + index + " for " + bubbleBarBubble); + } else { + bubbleInfoItems[index] = bubbleBarBubble.getInfo(); + } + }); + mSharedState.bubbleInfoItems = Arrays.asList(bubbleInfoItems); + mSharedState.suppressedBubbleInfoItems = new ArrayList<>(mSuppressedBubbles.size()); + for (int i = 0; i < mSuppressedBubbles.size(); i++) { + mSharedState.suppressedBubbleInfoItems.add(mSuppressedBubbles.valueAt(i).getInfo()); + } } /** Initializes controllers. */ public void init(BubbleControllers bubbleControllers, - ImeVisibilityChecker imeVisibilityChecker) { - mImeVisibilityChecker = imeVisibilityChecker; + BubbleBarLocationListener bubbleBarLocationListener, + TaskbarSharedState sharedState) { + mSharedState = sharedState; mBubbleBarViewController = bubbleControllers.bubbleBarViewController; mBubbleStashController = bubbleControllers.bubbleStashController; mBubbleStashedHandleViewController = bubbleControllers.bubbleStashedHandleViewController; - mBubblePinController = bubbleControllers.bubblePinController; + mBubbleCreator = bubbleControllers.bubbleCreator; + mBubbleBarLocationListener = bubbleBarLocationListener; bubbleControllers.runAfterInit(() -> { + restoreSavedState(sharedState); mBubbleBarViewController.setHiddenForBubbles( !sBubbleBarEnabled || mBubbles.isEmpty()); - mBubbleStashedHandleViewController.setHiddenForBubbles( - !sBubbleBarEnabled || mBubbles.isEmpty()); + mBubbleStashedHandleViewController.ifPresent( + controller -> controller.setHiddenForBubbles( + !sBubbleBarEnabled || mBubbles.isEmpty())); mBubbleBarViewController.setUpdateSelectedBubbleAfterCollapse( key -> setSelectedBubbleInternal(mBubbles.get(key))); mBubbleBarViewController.setBoundsChangeListener(this::onBubbleBarBoundsChanged); + mBubbleBarLocationListener.onBubbleBarLocationUpdated( + mBubbleBarViewController.getBubbleBarLocation()); + if (sBubbleBarEnabled) { + mSystemUiProxy.setBubblesListener(mListener); + mSystemUiProxy.setHasBubbleBar(true); + } }); } /** - * Creates and adds the overflow bubble to the bubble bar if it hasn't been - * created yet. - * - *

- * This should be called on the {@link #BUBBLE_STATE_EXECUTOR} executor to avoid - * inflating - * the overflow multiple times. - */ - private void createAndAddOverflowIfNeeded() { - if (mOverflowBubble == null) { - BubbleBarOverflow overflow = createOverflow(mContext); - MAIN_EXECUTOR.execute(() -> { - // we're on the main executor now, so check that the overflow hasn't been - // created - // again to avoid races. - if (mOverflowBubble == null) { - mBubbleBarViewController.addBubble( - overflow, /* isExpanding= */ false, /* suppressAnimation= */ true); - mOverflowBubble = overflow; - } - }); - } - } - - /** - * Updates the bubble bar, handle bar, and stash controllers based on sysui - * state flags. + * Updates the bubble bar, handle bar, and stash controllers based on sysui state flags. */ public void updateStateForSysuiFlags(@SystemUiStateFlags long flags) { boolean hideBubbleBar = (flags & MASK_HIDE_BUBBLE_BAR) != 0; mBubbleBarViewController.setHiddenForSysui(hideBubbleBar); boolean hideHandleView = (flags & MASK_HIDE_HANDLE_VIEW) != 0; - mBubbleStashedHandleViewController.setHiddenForSysui(hideHandleView); + mBubbleStashedHandleViewController.ifPresent(controller -> { + controller.setHiddenForSysui(hideHandleView); + MultiPropertyFactory.MultiProperty handleViewAlpha = + mBubbleStashController.getHandleViewAlpha(); + boolean shouldShowHandleView = handleViewAlpha != null + && !hideHandleView + && mBubbleStashController.isStashed() + && mBubbleBarViewController.hasBubbles(); + if (shouldShowHandleView) { + // TODO: (b/273592694) animate it? + handleViewAlpha.setValue(1f); + } + }); boolean sysuiLocked = (flags & MASK_SYSUI_LOCKED) != 0; - mBubbleStashController.onSysuiLockedStateChange(sysuiLocked); + mBubbleStashController.setSysuiLocked(sysuiLocked); + mIsImeVisible = (flags & SYSUI_STATE_IME_VISIBLE) != 0; + if (mIsImeVisible) { + mBubbleBarViewController.onImeVisible(); + } } // @@ -287,8 +272,7 @@ public void updateStateForSysuiFlags(@SystemUiStateFlags long flags) { // @BinderThread - @Override - public void onBubbleStateChange(Bundle bundle) { + private void onBubbleStateChange(Bundle bundle) { bundle.setClassLoader(BubbleBarUpdate.class.getClassLoader()); BubbleBarUpdate update = bundle.getParcelable("update", BubbleBarUpdate.class); BubbleBarViewUpdate viewUpdate = new BubbleBarViewUpdate(update); @@ -297,20 +281,24 @@ public void onBubbleStateChange(Bundle bundle) { || !update.currentBubbleList.isEmpty()) { // We have bubbles to load BUBBLE_STATE_EXECUTOR.execute(() -> { - createAndAddOverflowIfNeeded(); if (update.addedBubble != null) { - viewUpdate.addedBubble = populateBubble(mContext, update.addedBubble, mBarView, + viewUpdate.addedBubble = mBubbleCreator.populateBubble(mContext, + update.addedBubble, + mBarView, null /* existingBubble */); } if (update.updatedBubble != null) { BubbleBarBubble existingBubble = mBubbles.get(update.updatedBubble.getKey()); - viewUpdate.updatedBubble = populateBubble(mContext, update.updatedBubble, mBarView, - existingBubble); + viewUpdate.updatedBubble = + mBubbleCreator.populateBubble(mContext, update.updatedBubble, + mBarView, + existingBubble); } if (update.currentBubbleList != null && !update.currentBubbleList.isEmpty()) { List currentBubbles = new ArrayList<>(); for (int i = 0; i < update.currentBubbleList.size(); i++) { - BubbleBarBubble b = populateBubble(mContext, update.currentBubbleList.get(i), mBarView, + BubbleBarBubble b = mBubbleCreator.populateBubble(mContext, + update.currentBubbleList.get(i), mBarView, null /* existingBubble */); currentBubbles.add(b); } @@ -325,49 +313,171 @@ public void onBubbleStateChange(Bundle bundle) { } } + private void restoreSavedState(TaskbarSharedState sharedState) { + if (sharedState.bubbleBarLocation != null) { + updateBubbleBarLocationInternal(sharedState.bubbleBarLocation); + } + List savedBubbles = sharedState.bubbleInfoItems; + boolean hasSavedBubbles = savedBubbles != null && !savedBubbles.isEmpty(); + if (hasSavedBubbles) { + restoreSavedBubbles(savedBubbles); + } + restoreSuppressed(sharedState.suppressedBubbleInfoItems); + if (hasSavedBubbles) { + if (sharedState.bubbleBarHasOverflow) { + mBubbleBarViewController.showOverflow(true); + } + setSelectedBubbleInternal(mBubbles.get(sharedState.selectedBubbleKey)); + if (sharedState.bubbleBarExpanded) { + // We don't want state restore to have side effects which update the Shell state. + // Use the method for setting expanded state from sysui as that won't trigger an + // update back to Shell. + mBubbleBarViewController.setExpandedFromSysui(/* isExpanded= */ true, + /* animate= */ false); + } else if (sharedState.bubbleBarStashed) { + mBubbleStashController.stashBubbleBarImmediate(); + } else { + mBubbleStashController.showBubbleBarImmediate(); + } + } + } + + private void restoreSavedBubbles(List bubbleInfos) { + // Iterate in reverse because new bubbles are added in front and the list is in order. + for (int i = bubbleInfos.size() - 1; i >= 0; i--) { + BubbleBarBubble bubble = mBubbleCreator.populateBubble(mContext, + bubbleInfos.get(i), mBarView, /* existingBubble = */ null); + if (bubble == null) { + Log.e(TAG, "Could not instantiate BubbleBarBubble for " + bubbleInfos.get(i)); + continue; + } + mBubbles.put(bubble.getKey(), bubble); + mBubbleBarViewController.restoreBubble(bubble); + } + } + + private void restoreSuppressed(List bubbleInfos) { + if (bubbleInfos == null || bubbleInfos.isEmpty()) return; + for (BubbleInfo bubbleInfo : bubbleInfos.reversed()) { + BubbleBarBubble bb = mBubbleCreator.populateBubble(mContext, bubbleInfo, + mBarView, /* existingBubble= */ + null); + if (bb != null) { + mSuppressedBubbles.put(bb.getKey(), bb); + } + } + } + private void applyViewChanges(BubbleBarViewUpdate update) { + if (update.initialState) { + // it is possible that we tried to notify shell too early with the bubble bar bounds, + // so force update shell about the bubble bar bounds in the initial handshake. + onBubbleBarBoundsChanged(/* forceUpdate= */ true); + } final boolean isCollapsed = (update.expandedChanged && !update.expanded) || (!update.expandedChanged && !mBubbleBarViewController.isExpanded()); final boolean isExpanding = update.expandedChanged && update.expanded; - // don't animate bubbles if this is the initial state because we may be - // unfolding or - // enabling gesture nav. also suppress animation if the bubble bar is hidden for - // sysui e.g. + // don't animate bubbles if this is the initial state because we may be unfolding or + // enabling gesture nav. also suppress animation if the bubble bar is hidden for sysui e.g. // the shade is open, or we're locked. - final boolean suppressAnimation = update.initialState || mBubbleBarViewController.isHiddenForSysui() - || mImeVisibilityChecker.isImeVisible(); + final boolean suppressAnimation = + update.initialState || update.suppressAnimation + || mBubbleBarViewController.isHiddenForSysui() || mIsImeVisible; + + if (update.initialState && mSharedState.hasSavedBubbles()) { + // clear restored state + mBubbleBarViewController.removeAllBubbles(); + mBubbles.clear(); + // During the initial sync, Shell's update might not have the correct overflow + // state yet. Trust our restored state in this case to prevent the overflow + // button from disappearing on rotation. + mBubbleBarViewController.showOverflow( + mSharedState.bubbleBarHasOverflow || update.showOverflow); + } + if (update.addedBubble != null) { + mBubbles.put(update.addedBubble.getKey(), update.addedBubble); + } BubbleBarBubble bubbleToSelect = null; - if (!update.removedBubbles.isEmpty()) { - for (int i = 0; i < update.removedBubbles.size(); i++) { - RemovedBubble removedBubble = update.removedBubbles.get(i); - BubbleBarBubble bubble = mBubbles.remove(removedBubble.getKey()); - if (bubble != null) { - mBubbleBarViewController.removeBubble(bubble); - } else { - Log.w(TAG, "trying to remove bubble that doesn't exist: " - + removedBubble.getKey()); + if (update.selectedBubbleKey != null) { + if (mSelectedBubble == null + || !update.selectedBubbleKey.equals(mSelectedBubble.getKey())) { + BubbleBarBubble newlySelected = mBubbles.get(update.selectedBubbleKey); + if (newlySelected != null) { + bubbleToSelect = newlySelected; } } } - if (update.addedBubble != null) { - mBubbles.put(update.addedBubble.getKey(), update.addedBubble); - mBubbleBarViewController.addBubble(update.addedBubble, isExpanding, suppressAnimation); - if (isCollapsed) { - // If we're collapsed, the most recently added bubble will be selected. - bubbleToSelect = update.addedBubble; + if (Flags.enableOptionalBubbleOverflow() + && update.showOverflowChanged && !update.showOverflow && update.addedBubble != null + && update.removedBubbles.isEmpty() + && !mBubbles.isEmpty()) { + // A bubble was added from the overflow (& now it's empty / not showing) + mBubbleBarViewController.removeOverflowAndAddBubble(update.addedBubble, bubbleToSelect); + } else if (update.addedBubble != null && update.removedBubbles.size() == 1) { + // we're adding and removing a bubble at the same time. handle this as a single update. + RemovedBubble removedBubble = update.removedBubbles.get(0); + BubbleBarBubble bubbleToRemove = mBubbles.remove(removedBubble.getKey()); + boolean showOverflow = update.showOverflowChanged && update.showOverflow; + if (bubbleToRemove != null) { + mBubbleBarViewController.addBubbleAndRemoveBubble(update.addedBubble, + bubbleToRemove, bubbleToSelect, isExpanding, suppressAnimation, + showOverflow); + } else { + mBubbleBarViewController.addBubble(update.addedBubble, isExpanding, + suppressAnimation, bubbleToSelect); + Log.w(TAG, "trying to remove bubble that doesn't exist: " + removedBubble.getKey()); + } + } else { + boolean overflowNeedsToBeAdded = Flags.enableOptionalBubbleOverflow() + && update.showOverflowChanged && update.showOverflow; + if (!update.removedBubbles.isEmpty()) { + for (int i = 0; i < update.removedBubbles.size(); i++) { + RemovedBubble removedBubble = update.removedBubbles.get(i); + BubbleBarBubble bubble = mBubbles.remove(removedBubble.getKey()); + if (bubble != null && overflowNeedsToBeAdded) { + // First removal, show the overflow + overflowNeedsToBeAdded = false; + mBubbleBarViewController.addOverflowAndRemoveBubble(bubble, bubbleToSelect); + } else if (bubble != null) { + mBubbleBarViewController.removeBubble(bubble); + } else { + Log.w(TAG, "trying to remove bubble that doesn't exist: " + + removedBubble.getKey()); + } + } + } + if (update.addedBubble != null) { + mBubbleBarViewController.addBubble(update.addedBubble, isExpanding, + suppressAnimation, bubbleToSelect); } + if (Flags.enableOptionalBubbleOverflow() + && update.showOverflowChanged + && update.showOverflow != mBubbleBarViewController.isOverflowAdded()) { + mBubbleBarViewController.showOverflow(update.showOverflow); + } + } + + // if a bubble was updated upstream, but removed before the update was received, add it back + if (update.updatedBubble != null && !mBubbles.containsKey(update.updatedBubble.getKey())) { + addBubbleInternally(update.updatedBubble, isExpanding, suppressAnimation); + } + if (update.addedBubble != null && isCollapsed && bubbleToSelect == null) { + // If we're collapsed, the most recently added bubble will be selected. + bubbleToSelect = update.addedBubble; } + if (update.currentBubbles != null && !update.currentBubbles.isEmpty()) { - // Iterate in reverse because new bubbles are added in front and the list is in - // order. + // Iterate in reverse because new bubbles are added in front and the list is in order. for (int i = update.currentBubbles.size() - 1; i >= 0; i--) { BubbleBarBubble bubble = update.currentBubbles.get(i); if (bubble != null) { - mBubbles.put(bubble.getKey(), bubble); - mBubbleBarViewController.addBubble(bubble, isExpanding, suppressAnimation); - if (isCollapsed) { + if (bubble.getKey().equals(update.selectedBubbleKey)) { + bubbleToSelect = bubble; + } + addBubbleInternally(bubble, isExpanding, suppressAnimation); + if (isCollapsed && bubbleToSelect == null) { // If we're collapsed, the most recently added bubble will be selected. bubbleToSelect = bubble; } @@ -377,11 +487,37 @@ private void applyViewChanges(BubbleBarViewUpdate update) { } } } + if (Flags.enableOptionalBubbleOverflow() && update.initialState && update.showOverflow) { + mBubbleBarViewController.showOverflow(true); + } - // Adds and removals have happened, update visibility before any other visual - // changes. - mBubbleBarViewController.setHiddenForBubbles(mBubbles.isEmpty()); - mBubbleStashedHandleViewController.setHiddenForBubbles(mBubbles.isEmpty()); + if (update.suppressedBubbleKey != null) { + BubbleBarBubble bb = mBubbles.remove(update.suppressedBubbleKey); + if (bb != null) { + mSuppressedBubbles.put(update.suppressedBubbleKey, bb); + mBubbleBarViewController.removeBubble(bb); + } + } + if (update.unsuppressedBubbleKey != null) { + BubbleBarBubble bb = mSuppressedBubbles.remove(update.unsuppressedBubbleKey); + if (bb != null) { + // Unsuppressing an existing bubble should not cause the bar to expand or animate + addBubbleInternally(bb, /* isExpanding= */ false, /* suppressAnimation= */ true); + if (mBubbleBarViewController.isHiddenForNoBubbles()) { + mBubbleBarViewController.setHiddenForBubbles(false); + } + } + } + + // Update the visibility if this is the initial state, if there are no bubbles, or if the + // animation is suppressed. + // If this is the initial bubble, the bubble bar will become visible as part of the + // animation. + if (update.initialState || mBubbles.isEmpty() || suppressAnimation) { + mBubbleBarViewController.setHiddenForBubbles(mBubbles.isEmpty()); + } + mBubbleStashedHandleViewController.ifPresent( + controller -> controller.setHiddenForBubbles(mBubbles.isEmpty())); if (mBubbles.isEmpty()) { // all bubbles were removed. clear the selected bubble @@ -389,104 +525,80 @@ private void applyViewChanges(BubbleBarViewUpdate update) { } if (update.updatedBubble != null) { - // Updates mean the dot state may have changed; any other changes were updated - // in + // Updates mean the dot state may have changed; any other changes were updated in // the populateBubble step. BubbleBarBubble bb = mBubbles.get(update.updatedBubble.getKey()); - // If we're not stashed, we're visible so animate - bb.getView().updateDotVisibility(!mBubbleStashController.isStashed() /* animate */); - mBubbleBarViewController.animateBubbleNotification(bb, /* isExpanding= */ false); + if (suppressAnimation) { + // since we're not animating this update, we should update the dot visibility here. + bb.getView().updateDotVisibility(/* animate= */ false); + } else { + mBubbleBarViewController.animateBubbleNotification( + bb, /* isExpanding= */ false, /* isUpdate= */ true); + } } if (update.bubbleKeysInOrder != null && !update.bubbleKeysInOrder.isEmpty()) { // Create the new list List newOrder = update.bubbleKeysInOrder.stream() - .map(mBubbles::get).filter(Objects::nonNull).collect(toList()); + .map(mBubbles::get).filter(Objects::nonNull).toList(); if (!newOrder.isEmpty()) { mBubbleBarViewController.reorderBubbles(newOrder); } } - if (update.suppressedBubbleKey != null) { - // TODO: (b/273316505) handle suppression - } - if (update.unsuppressedBubbleKey != null) { - // TODO: (b/273316505) handle suppression - } - if (update.selectedBubbleKey != null) { - if (mSelectedBubble == null - || !update.selectedBubbleKey.equals(mSelectedBubble.getKey())) { - BubbleBarBubble newlySelected = mBubbles.get(update.selectedBubbleKey); - if (newlySelected != null) { - bubbleToSelect = newlySelected; - } else { - Log.w(TAG, "trying to select bubble that doesn't exist:" - + update.selectedBubbleKey); - } - } - } if (bubbleToSelect != null) { setSelectedBubbleInternal(bubbleToSelect); + } else if (update.initialState && BubbleBarOverflow.KEY.equals(update.selectedBubbleKey)) { + // this is the initial update with the overflow selected which could happen after + // unfolding with the overflow expanded + setSelectedBubbleInternal(mBubbleBarViewController.getOverflowBubble()); } if (update.shouldShowEducation) { mBubbleBarViewController.prepareToShowEducation(); } if (update.expandedChanged) { - if (update.expanded != mBubbleBarViewController.isExpanded()) { - mBubbleBarViewController.setExpandedFromSysui(update.expanded); - } else { - Log.w(TAG, "expansion was changed but is the same"); - } + // If we start as expanded, show bar immediately without waiting for animation. + boolean animate = !update.initialState; + mBubbleBarViewController.setExpandedFromSysui(update.expanded, animate); } if (update.bubbleBarLocation != null) { + mSharedState.bubbleBarLocation = update.bubbleBarLocation; if (update.bubbleBarLocation != mBubbleBarViewController.getBubbleBarLocation()) { updateBubbleBarLocationInternal(update.bubbleBarLocation); } } - if (update.expandedViewDropTargetSize != null) { - mBubblePinController.setDropTargetSize(update.expandedViewDropTargetSize); - } + } + + /** + * Removes the given bubble from the backing list of bubbles after it was dismissed by the user. + */ + public void onBubbleDismissed(BubbleView bubble) { + mBubbles.remove(bubble.getBubble().getKey()); } /** Tells WMShell to show the currently selected bubble. */ public void showSelectedBubble() { if (getSelectedBubbleKey() != null) { - if (mSelectedBubble instanceof BubbleBarBubble) { - // Because we've visited this bubble, we should suppress the notification. - // This is updated on WMShell side when we show the bubble, but that update - // isn't - // passed to launcher, instead we apply it directly here. - BubbleInfo info = ((BubbleBarBubble) mSelectedBubble).getInfo(); - info.setFlags( - info.getFlags() | Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION); - mSelectedBubble.getView().updateDotVisibility(true /* animate */); - } - mLastSentBubbleBarTop = mBarView.getRestingTopPositionOnScreen(); - mSystemUiProxy.showBubble(getSelectedBubbleKey(), mLastSentBubbleBarTop); + mLastSentBubbleBarTopToScreenBottom = mBarView.getTopToScreenBottom(); + mSystemUiProxy.showBubble(getSelectedBubbleKey(), mLastSentBubbleBarTopToScreenBottom); } else { Log.w(TAG, "Trying to show the selected bubble but it's null"); } } - /** - * Updates the currently selected bubble for launcher views and tells WMShell to - * show it. - */ + /** Updates the currently selected bubble for launcher views and tells WMShell to show it. */ public void showAndSelectBubble(BubbleBarItem b) { - if (DEBUG) - Log.w(TAG, "showingSelectedBubble: " + b.getKey()); + if (DEBUG) Log.w(TAG, "showingSelectedBubble: " + b.getKey()); setSelectedBubbleInternal(b); showSelectedBubble(); } /** - * Sets the bubble that should be selected. This notifies the views, it does not - * notify + * Sets the bubble that should be selected. This notifies the views, it does not notify * WMShell that the selection has changed, that should go through either * {@link #showSelectedBubble()} or {@link #showAndSelectBubble(BubbleBarItem)}. */ private void setSelectedBubbleInternal(BubbleBarItem b) { if (!Objects.equals(b, mSelectedBubble)) { - if (DEBUG) - Log.w(TAG, "selectingBubble: " + b.getKey()); + if (DEBUG) Log.w(TAG, "selectingBubble: " + b.getKey()); mSelectedBubble = b; mBubbleBarViewController.updateSelectedBubble(mSelectedBubble); } @@ -508,164 +620,118 @@ public String getSelectedBubbleKey() { *

* Updates the value locally in Launcher and in WMShell. */ - public void updateBubbleBarLocation(BubbleBarLocation location) { + public void updateBubbleBarLocation(BubbleBarLocation location, + @BubbleBarLocation.UpdateSource int source) { updateBubbleBarLocationInternal(location); - mSystemUiProxy.setBubbleBarLocation(location); + mSystemUiProxy.setBubbleBarLocation(location, source); } private void updateBubbleBarLocationInternal(BubbleBarLocation location) { mBubbleBarViewController.setBubbleBarLocation(location); mBubbleStashController.setBubbleBarLocation(location); + mBubbleBarLocationListener.onBubbleBarLocationUpdated(location); } - @Override public void animateBubbleBarLocation(BubbleBarLocation bubbleBarLocation) { MAIN_EXECUTOR.execute( - () -> mBubbleBarViewController.animateBubbleBarLocation(bubbleBarLocation)); + () -> { + mBubbleBarViewController.animateBubbleBarLocation(bubbleBarLocation); + mBubbleBarLocationListener.onBubbleBarLocationAnimated(bubbleBarLocation); + }); + } + + private void showBubbleBarDropTargetAt(@Nullable BubbleBarLocation location) { + MAIN_EXECUTOR.execute(() -> mBubbleBarViewController.showBubbleBarDropTargetAt(location)); + } + + + /** Notifies WMShell to show the expanded view. */ + void showExpandedView() { + mSystemUiProxy.showExpandedView(); } // // Loading data for the bubbles // - @Nullable - private BubbleBarBubble populateBubble(Context context, BubbleInfo b, BubbleBarView bbv, - @Nullable BubbleBarBubble existingBubble) { - String appName; - Bitmap badgeBitmap; - Bitmap bubbleBitmap; - Path dotPath; - int dotColor; - - boolean isImportantConvo = b.isImportantConversation(); - - ShortcutRequest.QueryResult result = new ShortcutRequest(context, - new UserHandle(b.getUserId())) - .forPackage(b.getPackageName(), b.getShortcutId()) - .query(FLAG_MATCH_DYNAMIC - | FLAG_MATCH_PINNED_BY_ANY_LAUNCHER - | FLAG_MATCH_CACHED - | FLAG_GET_PERSONS_DATA); - - ShortcutInfo shortcutInfo = result.size() > 0 ? result.get(0) : null; - if (shortcutInfo == null) { - Log.w(TAG, "No shortcutInfo found for bubble: " + b.getKey() - + " with shortcutId: " + b.getShortcutId()); - } - - ApplicationInfo appInfo; - try { - appInfo = mLauncherApps.getApplicationInfo( - b.getPackageName(), - 0, - new UserHandle(b.getUserId())); - } catch (PackageManager.NameNotFoundException e) { - // If we can't find package... don't think we should show the bubble. - Log.w(TAG, "Unable to find packageName: " + b.getPackageName()); - return null; - } - if (appInfo == null) { - Log.w(TAG, "Unable to find appInfo: " + b.getPackageName()); - return null; - } - PackageManager pm = context.getPackageManager(); - appName = String.valueOf(appInfo.loadLabel(pm)); - Drawable appIcon = appInfo.loadUnbadgedIcon(pm); - Drawable badgedIcon = pm.getUserBadgedIcon(appIcon, new UserHandle(b.getUserId())); - - // Badged bubble image - Drawable bubbleDrawable = mIconFactory.getBubbleDrawable(context, shortcutInfo, - b.getIcon()); - if (bubbleDrawable == null) { - // Default to app icon - bubbleDrawable = appIcon; - } - - BitmapInfo badgeBitmapInfo = mIconFactory.getBadgeBitmap(badgedIcon, isImportantConvo); - badgeBitmap = badgeBitmapInfo.icon; - - float[] bubbleBitmapScale = new float[1]; - bubbleBitmap = mIconFactory.getBubbleBitmap(bubbleDrawable, bubbleBitmapScale); - - // Dot color & placement - Path iconPath = PathParser.createPathFromPathData( - context.getResources().getString( - com.android.internal.R.string.config_icon_mask)); - Matrix matrix = new Matrix(); - float scale = bubbleBitmapScale[0]; - float radius = BubbleView.DEFAULT_PATH_SIZE / 2f; - matrix.setScale(scale /* x scale */, scale /* y scale */, radius /* pivot x */, - radius /* pivot y */); - iconPath.transform(matrix); - dotPath = iconPath; - dotColor = ColorUtils.blendARGB(badgeBitmapInfo.color, - Color.WHITE, WHITE_SCRIM_ALPHA / 255f); - - if (existingBubble == null) { - LayoutInflater inflater = LayoutInflater.from(context); - BubbleView bubbleView = (BubbleView) inflater.inflate( - R.layout.bubblebar_item_view, bbv, false /* attachToRoot */); - - BubbleBarBubble bubble = new BubbleBarBubble(b, bubbleView, - badgeBitmap, bubbleBitmap, dotColor, dotPath, appName); - bubbleView.setBubble(bubble); - return bubble; - } else { - // If we already have a bubble (so it already has an inflated view), update it. - existingBubble.setInfo(b); - existingBubble.setBadge(badgeBitmap); - existingBubble.setIcon(bubbleBitmap); - existingBubble.setDotColor(dotColor); - existingBubble.setDotPath(dotPath); - existingBubble.setAppName(appName); - return existingBubble; + private void onBubbleBarBoundsChanged() { + onBubbleBarBoundsChanged(/* forceUpdate= */ false); + } + + private void onBubbleBarBoundsChanged(boolean forceUpdate) { + int bubbleBarTopToScreenBottom = mBarView.getTopToScreenBottom(); + if (bubbleBarTopToScreenBottom != mLastSentBubbleBarTopToScreenBottom || forceUpdate) { + mLastSentBubbleBarTopToScreenBottom = bubbleBarTopToScreenBottom; + mSystemUiProxy.updateBubbleBarTopToScreenBottom(bubbleBarTopToScreenBottom); } } - private BubbleBarOverflow createOverflow(Context context) { - Bitmap bitmap = createOverflowBitmap(context); - LayoutInflater inflater = LayoutInflater.from(context); - BubbleView bubbleView = (BubbleView) inflater.inflate( - R.layout.bubblebar_item_view, mBarView, false /* attachToRoot */); - BubbleBarOverflow overflow = new BubbleBarOverflow(bubbleView); - bubbleView.setOverflow(overflow, bitmap); - return overflow; + private void addBubbleInternally(BubbleBarBubble bubble, boolean isExpanding, + boolean suppressAnimation) { + mBubbles.put(bubble.getKey(), bubble); + mBubbleBarViewController.addBubble(bubble, isExpanding, + suppressAnimation, /* bubbleToSelect = */ null); } - private Bitmap createOverflowBitmap(Context context) { - Drawable iconDrawable = AppCompatResources.getDrawable(mContext, - R.drawable.bubble_ic_overflow_button); + /** Listener of {@link BubbleBarLocation} updates. */ + public interface BubbleBarLocationListener { - final TypedArray ta = mContext.obtainStyledAttributes( - new int[] { - com.android.internal.R.attr.materialColorOnPrimaryFixed, - com.android.internal.R.attr.materialColorPrimaryFixed - }); - int overflowIconColor = ta.getColor(0, Color.WHITE); - int overflowBackgroundColor = ta.getColor(1, Color.BLACK); - ta.recycle(); + /** Called when {@link BubbleBarLocation} is animated, but change is not yet final. */ + void onBubbleBarLocationAnimated(BubbleBarLocation location); - iconDrawable.setTint(overflowIconColor); + /** Called when {@link BubbleBarLocation} is updated permanently. */ + void onBubbleBarLocationUpdated(BubbleBarLocation location); + } - int inset = context.getResources().getDimensionPixelSize(R.dimen.bubblebar_overflow_inset); - Drawable foreground = new InsetDrawable(iconDrawable, inset); - Drawable drawable = new AdaptiveIconDrawable(new ColorDrawable(overflowBackgroundColor), - foreground); + /** + * {@link IBubblesListener.Stub} that wraps {@link BubbleBarController} as host obj and + * allow clearing it so that: + * 1. Launcher process doesn't accumulate expensive {@link #mContext} objects which cannot be + * GCed until remote process runs GC to clear the binder objects. This will reduce the high + * water mark memory usage for client process. + * 2. Leak canary doesn't raise false positive alarms. + */ + private static class BubbleBarListener extends IBubblesListener.Stub { - return mIconFactory.createBadgedIconBitmap(drawable).icon; - } + private @Nullable BubbleBarController mController; - private void onBubbleBarBoundsChanged() { - int newTop = mBarView.getRestingTopPositionOnScreen(); - if (newTop != mLastSentBubbleBarTop) { - mLastSentBubbleBarTop = newTop; - mSystemUiProxy.updateBubbleBarTopOnScreen(newTop); + BubbleBarListener(@NonNull BubbleBarController controller) { + mController = controller; + } + + @BinderThread + @Override + public void onBubbleStateChange(Bundle bundle) { + BubbleBarController controller = mController; + if (controller != null) { + controller.onBubbleStateChange(bundle); + } + } + + @Override + public void animateBubbleBarLocation(BubbleBarLocation bubbleBarLocation) { + BubbleBarController controller = mController; + if (controller != null) { + controller.animateBubbleBarLocation(bubbleBarLocation); + } } - } - /** Interface for checking whether the IME is visible. */ - public interface ImeVisibilityChecker { - /** Whether the IME is visible. */ - boolean isImeVisible(); + @Override + public void showBubbleBarDropTargetAt(@Nullable BubbleBarLocation location) { + BubbleBarController controller = mController; + if (controller != null) { + controller.showBubbleBarDropTargetAt(location); + } + } + + /** + * Since the lifecycle of this binder obj depends on remote process's GC, calling this + * method will allow Launcher process GC {@link mController} earlier, and also avoid false + * positive leak signal from leak canary. + */ + @AnyThread + private void clear() { + mController = null; + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarItem.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarItem.kt index 43e21f40854..6837e918f1a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarItem.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarItem.kt @@ -16,22 +16,27 @@ package com.android.launcher3.taskbar.bubbles import android.graphics.Bitmap -import android.graphics.Path -import com.android.wm.shell.common.bubbles.BubbleInfo +import com.android.launcher3.icons.BitmapInfo +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutMessage +import com.android.wm.shell.shared.bubbles.BubbleInfo /** An entity in the bubble bar. */ -sealed class BubbleBarItem(open var key: String, open var view: BubbleView) +sealed class BubbleBarItem(open val key: String, open var view: BubbleView) /** Contains state info about a bubble in the bubble bar as well as presentation information. */ data class BubbleBarBubble( var info: BubbleInfo, override var view: BubbleView, - var badge: Bitmap, + var badge: BitmapInfo, var icon: Bitmap, var dotColor: Int, - var dotPath: Path, - var appName: String + var appName: String, + var flyoutMessage: BubbleBarFlyoutMessage?, ) : BubbleBarItem(info.key, view) /** Represents the overflow bubble in the bubble bar. */ -data class BubbleBarOverflow(override var view: BubbleView) : BubbleBarItem("Overflow", view) +data class BubbleBarOverflow(override var view: BubbleView) : BubbleBarItem(KEY, view) { + companion object { + const val KEY = "Overflow" + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationCompositeListener.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationCompositeListener.kt new file mode 100644 index 00000000000..8e176ac6bd9 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationCompositeListener.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.launcher3.taskbar.bubbles + +import com.android.launcher3.taskbar.bubbles.BubbleBarController.BubbleBarLocationListener +import com.android.wm.shell.shared.bubbles.BubbleBarLocation + +/** Composite implementation of [BubbleBarLocationListener] interface */ +class BubbleBarLocationCompositeListener(private val listeners: List) : + BubbleBarLocationListener { + + constructor(vararg listeners: BubbleBarLocationListener) : this(listOf(*listeners)) + + override fun onBubbleBarLocationAnimated(location: BubbleBarLocation?) { + listeners.forEach { it.onBubbleBarLocationAnimated(location) } + } + + override fun onBubbleBarLocationUpdated(location: BubbleBarLocation?) { + listeners.forEach { it.onBubbleBarLocationUpdated(location) } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationDropTarget.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationDropTarget.kt new file mode 100644 index 00000000000..9c46105cab1 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationDropTarget.kt @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.bubbles + +import android.graphics.Rect +import android.view.View +import com.android.launcher3.DropTarget +import com.android.launcher3.DropTarget.DragObject +import com.android.launcher3.dragndrop.DragOptions +import com.android.wm.shell.shared.bubbles.DragZoneFactory +import com.android.wm.shell.shared.bubbles.DropTargetManager + +/** + * Implementation of the {@link DropTarget} that handles drag and drop events over the bubble bar + * locations. + */ +class BubbleBarLocationDropTarget( + private val bubbleBarDropTargetController: BubbleBarDropTargetController, + dragZoneFactory: DragZoneFactory, + private var dropTargetManager: DropTargetManager, + private val isLeftDropTarget: Boolean, +) : DropTarget { + + /** Whether the [DragObject] can be dropped on the bubble bar drop target. */ + var isDropCanBeAccepted: Boolean = false + + interface BubbleBarDropTargetController { + + /** Called after [DragObject] dropped on the bubble bar drop target. */ + fun onDrop(dragObject: DragObject, isLeftDropTarget: Boolean) + } + + /** Sets the drop target manager that drop target will use. */ + fun setDropTargetManager(dropTargetManager: DropTargetManager) { + this.dropTargetManager = dropTargetManager + } + + private val dropRect = dragZoneFactory.getBubbleBarDropRect(isLeftDropTarget) + + override fun isDropEnabled(): Boolean = isDropCanBeAccepted + + override fun onDrop(dragObject: DragObject, options: DragOptions) { + bubbleBarDropTargetController.onDrop(dragObject, isLeftDropTarget) + } + + override fun onDragEnter(dragObject: DragObject) { + dropTargetManager.onDragUpdated(dragObject.x, dragObject.y) + } + + override fun onDragOver(dragObject: DragObject) { + dropTargetManager.onDragUpdated(dragObject.x, dragObject.y) + } + + override fun onDragExit(dragObject: DragObject) { + dropTargetManager.onDragUpdated(dragObject.x, dragObject.y) + } + + override fun acceptDrop(dragObject: DragObject): Boolean = isDropCanBeAccepted + + override fun prepareAccessibilityDrop() {} + + override fun getHitRectRelativeToDragLayer(outRect: Rect) { + outRect.set(dropRect) + } + + override fun getDropView(): View? = null +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarParentViewHeightUpdateNotifier.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarParentViewHeightUpdateNotifier.kt new file mode 100644 index 00000000000..f69ad74f80e --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarParentViewHeightUpdateNotifier.kt @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar.bubbles + +/** Controls the parent view height. */ +interface BubbleBarParentViewHeightUpdateNotifier { + + /** Notify parent that top boundary should be updated. */ + fun updateTopBoundary() +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarPinController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarPinController.kt deleted file mode 100644 index 9e5ffc9dc4d..00000000000 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarPinController.kt +++ /dev/null @@ -1,97 +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.launcher3.taskbar.bubbles - -import android.annotation.SuppressLint -import android.content.Context -import android.graphics.Point -import android.view.Gravity.BOTTOM -import android.view.Gravity.LEFT -import android.view.Gravity.RIGHT -import android.view.LayoutInflater -import android.view.View -import android.widget.FrameLayout -import androidx.core.view.updateLayoutParams -import com.android.launcher3.R -import com.android.wm.shell.common.bubbles.BaseBubblePinController -import com.android.wm.shell.common.bubbles.BubbleBarLocation - -/** - * Controller to manage pinning bubble bar to left or right when dragging starts from the bubble bar - */ -class BubbleBarPinController( - private val context: Context, - private val container: FrameLayout, - screenSizeProvider: () -> Point -) : BaseBubblePinController(screenSizeProvider) { - - private lateinit var bubbleBarViewController: BubbleBarViewController - private lateinit var bubbleStashController: BubbleStashController - private var exclRectWidth: Float = 0f - private var exclRectHeight: Float = 0f - - private var dropTargetView: View? = null - - fun init(bubbleControllers: BubbleControllers) { - bubbleBarViewController = bubbleControllers.bubbleBarViewController - bubbleStashController = bubbleControllers.bubbleStashController - exclRectWidth = context.resources.getDimension(R.dimen.bubblebar_dismiss_zone_width) - exclRectHeight = context.resources.getDimension(R.dimen.bubblebar_dismiss_zone_height) - } - - override fun getExclusionRectWidth(): Float { - return exclRectWidth - } - - override fun getExclusionRectHeight(): Float { - return exclRectHeight - } - - override fun getDropTargetView(): View? { - return dropTargetView - } - - override fun removeDropTargetView(view: View) { - container.removeView(view) - dropTargetView = null - } - - override fun createDropTargetView(): View { - return LayoutInflater.from(context) - .inflate(R.layout.bubble_bar_drop_target, container, false) - .also { view -> - dropTargetView = view - container.addView(view) - } - } - - @SuppressLint("RtlHardcoded") - override fun updateLocation(location: BubbleBarLocation) { - val onLeft = location.isOnLeft(container.isLayoutRtl) - - val bounds = bubbleBarViewController.bubbleBarBounds - val horizontalMargin = bubbleBarViewController.horizontalMargin - dropTargetView?.updateLayoutParams { - width = bounds.width() - height = bounds.height() - gravity = BOTTOM or (if (onLeft) LEFT else RIGHT) - leftMargin = horizontalMargin - rightMargin = horizontalMargin - bottomMargin = -bubbleStashController.bubbleBarTranslationY.toInt() - } - } -} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarSwipeController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarSwipeController.kt new file mode 100644 index 00000000000..cdf90dd7c26 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarSwipeController.kt @@ -0,0 +1,217 @@ +/* + * 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.launcher3.taskbar.bubbles + +import android.animation.ValueAnimator +import android.content.Context +import androidx.annotation.VisibleForTesting +import androidx.core.animation.doOnEnd +import androidx.dynamicanimation.animation.SpringForce +import com.android.launcher3.anim.AnimatedFloat +import com.android.launcher3.anim.SpringAnimationBuilder +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarThresholdUtils +import com.android.launcher3.taskbar.bubbles.BubbleBarSwipeController.BarState.COLLAPSED +import com.android.launcher3.taskbar.bubbles.BubbleBarSwipeController.BarState.EXPANDED +import com.android.launcher3.taskbar.bubbles.BubbleBarSwipeController.BarState.STASHED +import com.android.launcher3.taskbar.bubbles.BubbleBarSwipeController.BarState.UNKNOWN +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController +import com.android.launcher3.touch.OverScroll + +/** Handle swipe events on the bubble bar and handle */ +class BubbleBarSwipeController { + + private val context: Context + + private var bubbleStashedHandleViewController: BubbleStashedHandleViewController? = null + private lateinit var bubbleBarViewController: BubbleBarViewController + private lateinit var bubbleStashController: BubbleStashController + + private var springAnimation: ValueAnimator? = null + private val animatedSwipeTranslation = AnimatedFloat(this::onSwipeUpdate) + + private val unstashThreshold: Int + private val maxOverscroll: Int + + private var swipeState: SwipeState = SwipeState(startState = UNKNOWN) + + constructor(tac: TaskbarActivityContext) : this(tac, DefaultDimensionProvider(tac)) + + @VisibleForTesting + constructor(context: Context, dimensionProvider: DimensionProvider) { + this.context = context + unstashThreshold = dimensionProvider.unstashThreshold + maxOverscroll = dimensionProvider.maxOverscroll + } + + fun init(bubbleControllers: BubbleControllers) { + bubbleStashedHandleViewController = + bubbleControllers.bubbleStashedHandleViewController.orElse(null) + bubbleBarViewController = bubbleControllers.bubbleBarViewController + bubbleStashController = bubbleControllers.bubbleStashController + } + + /** Start tracking a new swipe gesture */ + fun start() { + if (springAnimation != null) reset() + val startState = + when { + bubbleStashController.isStashed -> STASHED + bubbleBarViewController.isExpanded -> EXPANDED + bubbleStashController.isBubbleBarVisible() -> COLLAPSED + else -> UNKNOWN + } + swipeState = SwipeState(startState = startState, currentState = startState) + } + + /** Update swipe distance to [dy] */ + fun swipeTo(dy: Float) { + if (!canHandleSwipe(dy)) { + return + } + animatedSwipeTranslation.updateValue(dy) + + swipeState.passedUnstash = isUnstash(dy) + // Tracking swipe gesture if we pass unstash threshold at least once during gesture + swipeState.isSwipe = swipeState.isSwipe || swipeState.passedUnstash + when { + canUnstash() && swipeState.passedUnstash -> { + swipeState.currentState = COLLAPSED + bubbleStashController.showBubbleBar(expandBubbles = false, bubbleBarGesture = true) + } + canStash() && !swipeState.passedUnstash -> { + swipeState.currentState = STASHED + bubbleStashController.stashBubbleBar() + } + } + } + + /** Finish tracking swipe gesture. Animate views back to resting state */ + fun finish() { + if (swipeState.passedUnstash && swipeState.startState in setOf(STASHED, COLLAPSED)) { + bubbleStashController.showBubbleBar(expandBubbles = true, bubbleBarGesture = true) + } + if (animatedSwipeTranslation.value == 0f) { + reset() + } else { + springToRest() + } + } + + /** Returns `true` if we are tracking a swipe gesture */ + fun isSwipeGesture(): Boolean { + return swipeState.isSwipe + } + + private fun canHandleSwipe(dy: Float): Boolean { + return when (swipeState.startState) { + STASHED -> { + if (swipeState.currentState == COLLAPSED) { + // if we have unstashed the bar, allow swipe in both directions + true + } else { + // otherwise, only allow swipe up on stash handle + dy < 0 + } + } + COLLAPSED -> dy < 0 // collapsed bar can only be swiped up + UNKNOWN, + EXPANDED -> false // expanded bar can't be swiped + } + } + + private fun isUnstash(dy: Float): Boolean { + return dy < -unstashThreshold + } + + private fun canStash(): Boolean { + // Only allow stashing if we started from stashed state + return swipeState.startState == STASHED && swipeState.currentState == COLLAPSED + } + + private fun canUnstash(): Boolean { + return swipeState.currentState == STASHED + } + + private fun reset() { + springAnimation?.let { + if (it.isRunning) { + it.removeAllListeners() + it.cancel() + animatedSwipeTranslation.updateValue(0f) + } + } + springAnimation = null + swipeState = SwipeState(startState = UNKNOWN) + } + + private fun onSwipeUpdate(value: Float) { + val dampedSwipe = -OverScroll.dampedScroll(-value, maxOverscroll).toFloat() + bubbleStashedHandleViewController?.setTranslationYForSwipe(dampedSwipe) + bubbleBarViewController.setTranslationYForSwipe(dampedSwipe) + } + + private fun springToRest() { + springAnimation = + SpringAnimationBuilder(context) + .setStartValue(animatedSwipeTranslation.value) + .setEndValue(0f) + .setDampingRatio(SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY) + .setStiffness(SpringForce.STIFFNESS_LOW) + .build(animatedSwipeTranslation, AnimatedFloat.VALUE) + .also { it.doOnEnd { reset() } } + springAnimation?.start() + } + + internal data class SwipeState( + val startState: BarState, + var currentState: BarState = UNKNOWN, + var passedUnstash: Boolean = false, + var isSwipe: Boolean = false, + ) + + internal enum class BarState { + UNKNOWN, + STASHED, + COLLAPSED, + EXPANDED, + } + + /** Allows overriding the dimension provider for testing */ + @VisibleForTesting + interface DimensionProvider { + val unstashThreshold: Int + val maxOverscroll: Int + } + + private class DefaultDimensionProvider(taskbarActivityContext: TaskbarActivityContext) : + DimensionProvider { + override val unstashThreshold: Int + override val maxOverscroll: Int + + init { + val resources = taskbarActivityContext.resources + unstashThreshold = + TaskbarThresholdUtils.getFromNavThreshold( + resources, + taskbarActivityContext.deviceProfile, + ) + maxOverscroll = + taskbarActivityContext.deviceProfile.deviceProperties.heightPx - unstashThreshold + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java index ca0cb94bade..088e3109832 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java @@ -15,13 +15,10 @@ */ package com.android.launcher3.taskbar.bubbles; -import static com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE; import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.annotation.NonNull; @@ -30,116 +27,107 @@ import android.content.Context; import android.graphics.PointF; import android.graphics.Rect; +import android.os.Bundle; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.LayoutDirection; import android.util.Log; +import android.util.TypedValue; +import android.view.DisplayCutout; import android.view.Gravity; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; +import android.view.WindowMetrics; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.FrameLayout; -import androidx.dynamicanimation.animation.SpringForce; - +import com.android.app.animation.Interpolators; +import com.android.launcher3.Flags; import com.android.launcher3.R; -import com.android.launcher3.anim.SpringAnimationBuilder; +import com.android.launcher3.anim.AnimatorListeners; +import com.android.launcher3.taskbar.BarsLocationAnimatorHelper; +import com.android.launcher3.taskbar.bubbles.animation.BubbleAnimator; import com.android.launcher3.util.DisplayController; -import com.android.wm.shell.Flags; -import com.android.wm.shell.common.bubbles.BubbleBarLocation; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import java.io.PrintWriter; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.function.Consumer; /** - * The view that holds all the bubble views. Modifying this view should happen - * through - * {@link BubbleBarViewController}. Updates to the bubbles themselves (adds, - * removes, updates, - * selection) should happen through {@link BubbleBarController} which is the - * source of truth + * The view that holds all the bubble views. Modifying this view should happen through + * {@link BubbleBarViewController}. Updates to the bubbles themselves (adds, removes, updates, + * selection) should happen through {@link BubbleBarController} which is the source of truth * for state information about the bubbles. *

* The bubble bar has a couple of visual states: * - stashed as a handle - * - unstashed but collapsed, in this state the bar is showing but the bubbles - * are stacked within it - * - unstashed and expanded, in this state the bar is showing and the bubbles - * are shown in a row - * with one of the bubbles being selected. Additionally, WMShell will display - * the expanded bubble + * - unstashed but collapsed, in this state the bar is showing but the bubbles are stacked within it + * - unstashed and expanded, in this state the bar is showing and the bubbles are shown in a row + * with one of the bubbles being selected. Additionally, WMShell will display the expanded bubble * view above the bar. *

* The bubble bar has some behavior related to taskbar: - * - When taskbar is unstashed, bubble bar will also become unstashed (but in - * its "collapsed" + * - When taskbar is unstashed, bubble bar will also become unstashed (but in its "collapsed" * state) - * - When taskbar is stashed, bubble bar will also become stashed (unless bubble - * bar is in its + * - When taskbar is stashed, bubble bar will also become stashed (unless bubble bar is in its * "expanded" state) * - When bubble bar is in its "expanded" state, taskbar becomes stashed *

- * If there are no bubbles, the bubble bar and bubble stashed handle are not - * shown. Additionally + * If there are no bubbles, the bubble bar and bubble stashed handle are not shown. Additionally * the bubble bar and stashed handle are not shown on lockscreen. *

- * When taskbar is in persistent or 3 button nav mode, the bubble bar is not - * available, and instead + * When taskbar is in persistent or 3 button nav mode, the bubble bar is not available, and instead * the bubbles are shown fully by WMShell in their floating mode. */ public class BubbleBarView extends FrameLayout { + public static final long FADE_OUT_ANIM_POSITION_DURATION_MS = 100L; + public static final long FADE_IN_ANIM_ALPHA_DURATION_MS = 100L; + public static final long FADE_OUT_BUBBLE_BAR_DURATION_MS = 150L; private static final String TAG = "BubbleBarView"; - - // TODO: (b/273594744) calculate the amount of space we have and base the max on - // that - // if it's smaller than 5. + // TODO: (b/273594744) calculate the amount of space we have and base the max on that + // if it's smaller than 5. private static final int MAX_BUBBLES = 5; private static final int MAX_VISIBLE_BUBBLES_COLLAPSED = 2; private static final int ARROW_POSITION_ANIMATION_DURATION_MS = 200; - private static final int WIDTH_ANIMATION_DURATION_MS = 200; + private static final int WIDTH_ANIMATION_DURATION_MS = 400; private static final int SCALE_ANIMATION_DURATION_MS = 200; - private static final long FADE_OUT_ANIM_ALPHA_DURATION_MS = 50L; - private static final long FADE_OUT_ANIM_ALPHA_DELAY_MS = 50L; - private static final long FADE_OUT_ANIM_POSITION_DURATION_MS = 100L; - // During fade out animation we shift the bubble bar 1/80th of the screen width - private static final float FADE_OUT_ANIM_POSITION_SHIFT = 1 / 80f; - - private static final long FADE_IN_ANIM_ALPHA_DURATION_MS = 100L; - // Use STIFFNESS_MEDIUMLOW which is not defined in the API constants - private static final float FADE_IN_ANIM_POSITION_SPRING_STIFFNESS = 400f; - // During fade in animation we shift the bubble bar 1/60th of the screen width - private static final float FADE_IN_ANIM_POSITION_SHIFT = 1 / 60f; - - private static final int SCALE_IN_ANIMATION_DURATION_MS = 250; - /** - * Custom property to set alpha value for the bar view while a bubble is being - * dragged. + * Custom property to set alpha value for the bar view while a bubble is being dragged. * Skips applying alpha to the dragged bubble. */ - private static final FloatProperty BUBBLE_DRAG_ALPHA = new FloatProperty<>("bubbleDragAlpha") { - @Override - public void setValue(BubbleBarView bubbleBarView, float alpha) { - bubbleBarView.setAlphaDuringBubbleDrag(alpha); - } + private static final FloatProperty BUBBLE_DRAG_ALPHA = + new FloatProperty<>("bubbleDragAlpha") { + @Override + public void setValue(BubbleBarView bubbleBarView, float alpha) { + bubbleBarView.setAlphaDuringBubbleDrag(alpha); + } - @Override - public Float get(BubbleBarView bubbleBarView) { - return bubbleBarView.mAlphaDuringDrag; - } - }; + @Override + public Float get(BubbleBarView bubbleBarView) { + return bubbleBarView.mAlphaDuringDrag; + } + }; private final BubbleBarBackground mBubbleBarBackground; - private boolean mIsAnimatingNewBubble = false; - /** - * The current bounds of all the bubble bar. Note that these bounds may not - * account for - * translation. The bounds should be retrieved using - * {@link #getBubbleBarBounds()} which + * The default margin applied to the {@link BubbleBarView}. + */ + private final int mDefaultMargin; + /** + * The additional padding from a cutout. + */ + private final int mCutoutPadding; + /** + * The current bounds of all the bubble bar. Note that these bounds may not account for + * translation. The bounds should be retrieved using {@link #getBubbleBarBounds()} which * updates the bounds and accounts for translation. */ private final Rect mBubbleBarBounds = new Rect(); @@ -170,26 +158,25 @@ public Float get(BubbleBarView bubbleBarView) { private float mRelativePivotX = 1f; private float mRelativePivotY = 1f; - // An animator that represents the expansion state of the bubble bar, where 0 - // corresponds to the + // An animator that represents the expansion state of the bubble bar, where 0 corresponds to the // collapsed state and 1 to the fully expanded state. - private final ValueAnimator mWidthAnimator = ValueAnimator.ofFloat(0, 1); + @Nullable + private ValueAnimator mWidthAnimator; - /** - * An animator used for scaling in a new bubble to the bubble bar while - * expanded. - */ @Nullable - private ValueAnimator mNewBubbleScaleInAnimator = null; + private ValueAnimator mDismissAnimator = null; + + /** An animator used for animating individual bubbles in the bubble bar while expanded. */ + @Nullable + private BubbleAnimator mBubbleAnimator = null; @Nullable private ValueAnimator mScalePaddingAnimator; + @Nullable private Animator mBubbleBarLocationAnimator = null; - // We don't reorder the bubbles when they are expanded as it could be jarring - // for the user - // this runnable will be populated with any reordering of the bubbles that - // should be applied + // We don't reorder the bubbles when they are expanded as it could be jarring for the user + // this runnable will be populated with any reordering of the bubbles that should be applied // once they are collapsed. @Nullable private Runnable mReorderRunnable; @@ -201,12 +188,19 @@ public Float get(BubbleBarView bubbleBarView) { @Nullable private BubbleView mDraggedBubbleView; + @Nullable + private BubbleView mDismissedByDragBubbleView; private float mAlphaDuringDrag = 1f; + /** Additional translation in the y direction that is applied to each bubble */ + private float mBubbleOffsetY; + private Controller mController; private int mPreviousLayoutDirection = LayoutDirection.UNDEFINED; + private final WindowManager mWindowManager; + public BubbleBarView(Context context) { this(context, null); } @@ -221,7 +215,6 @@ public BubbleBarView(Context context, AttributeSet attrs, int defStyleAttr) { public BubbleBarView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - setAlpha(0); setVisibility(INVISIBLE); mIconOverlapAmount = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_overlap); mBubbleBarPadding = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_spacing); @@ -229,41 +222,22 @@ public BubbleBarView(Context context, AttributeSet attrs, int defStyleAttr, int mExpandedBarIconsSpacing = getResources().getDimensionPixelSize( R.dimen.bubblebar_expanded_icon_spacing); mBubbleElevation = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_elevation); - mDragElevation = getResources().getDimensionPixelSize(R.dimen.bubblebar_drag_elevation); + mDragElevation = getResources().getDimensionPixelSize(R.dimen.dragged_bubble_elevation); mPointerSize = getResources() .getDimensionPixelSize(R.dimen.bubblebar_pointer_visible_size); + mDefaultMargin = getResources() + .getDimensionPixelSize(R.dimen.transient_taskbar_bottom_margin); + mWindowManager = Objects.requireNonNull(context.getSystemService(WindowManager.class)); + mCutoutPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, + getResources().getDisplayMetrics()); setClipToPadding(false); mBubbleBarBackground = new BubbleBarBackground(context, getBubbleBarExpandedHeight()); setBackgroundDrawable(mBubbleBarBackground); - - mWidthAnimator.setDuration(WIDTH_ANIMATION_DURATION_MS); - - addAnimationCallBacks(mWidthAnimator, - /* onStart= */ () -> mBubbleBarBackground.showArrow(true), - /* onEnd= */ () -> { - mBubbleBarBackground.showArrow(mIsBarExpanded); - if (!mIsBarExpanded && mReorderRunnable != null) { - mReorderRunnable.run(); - mReorderRunnable = null; - } - // If the bar was just collapsed and the overflow was the last bubble that was - // selected, set the first bubble as selected. - if (!mIsBarExpanded && mUpdateSelectedBubbleAfterCollapse != null - && mSelectedBubbleView != null - && mSelectedBubbleView.getBubble() instanceof BubbleBarOverflow) { - BubbleView firstBubble = (BubbleView) getChildAt(0); - mUpdateSelectedBubbleAfterCollapse.accept(firstBubble.getBubble().getKey()); - } - updateWidth(); - }, - /* onUpdate= */ animator -> { - updateBubblesLayoutProperties(mBubbleBarLocation); - invalidate(); - }); } + /** * Animates icon sizes and spacing between icons and bubble bar borders. * @@ -274,9 +248,6 @@ public void animateBubbleBarIconSize(float newIconSize, float newBubbleBarPaddin if (!isIconSizeOrPaddingUpdated(newIconSize, newBubbleBarPadding)) { return; } - if (!Flags.animateBubbleSizeChange()) { - setIconSizeAndPadding(newIconSize, newBubbleBarPadding); - } if (mScalePaddingAnimator != null && mScalePaddingAnimator.isRunning()) { mScalePaddingAnimator.cancel(); } @@ -294,7 +265,8 @@ public void animateBubbleBarIconSize(float newIconSize, float newBubbleBarPaddin /* onUpdate= */ animator -> { float transitionProgress = (float) animator.getAnimatedValue(); if (isIconSizeUpdated) { - mIconScale = initialScale + (targetScale - initialScale) * transitionProgress; + mIconScale = + initialScale + (targetScale - initialScale) * transitionProgress; } if (isPaddingUpdated) { mBubbleBarPadding = initialPadding @@ -311,8 +283,7 @@ public void animateBubbleBarIconSize(float newIconSize, float newBubbleBarPaddin public void setTranslationX(float translationX) { super.setTranslationX(translationX); if (mDraggedBubbleView != null) { - // Apply reverse of the translation as an offset to the dragged view. This - // ensures + // Apply reverse of the translation as an offset to the dragged view. This ensures // that the dragged bubble stays at the current location on the screen and its // position is not affected by the parent translation. mDraggedBubbleView.setOffsetX(-translationX); @@ -320,12 +291,61 @@ public void setTranslationX(float translationX) { } /** - * Sets new icon sizes and newBubbleBarPadding between icons and bubble bar - * borders. + * Set scale for bubble bar background in x direction + */ + public void setBackgroundScaleX(float scaleX) { + mBubbleBarBackground.setScaleX(scaleX); + } + + /** + * Set scale for bubble bar background in y direction + */ + public void setBackgroundScaleY(float scaleY) { + mBubbleBarBackground.setScaleY(scaleY); + } + + /** + * Set alpha for bubble views + */ + public void setBubbleAlpha(float alpha) { + for (int i = 0; i < getChildCount(); i++) { + getChildAt(i).setAlpha(alpha); + } + } + + /** + * Set alpha for bar background + */ + public void setBackgroundAlpha(float alpha) { + mBubbleBarBackground.setAlpha((int) (255 * alpha)); + } + + /** + * Sets offset of each bubble view in the y direction from the base position in the bar. + */ + public void setBubbleOffsetY(float offsetY) { + mBubbleOffsetY = offsetY; + for (int i = 0; i < getChildCount(); i++) { + getChildAt(i).setTranslationY(getBubbleTranslationY()); + } + } + + /** + * Set the bubble icons size and spacing between the bubbles and the borders of the bubble + * bar. + */ + public void setIconSizeAndPaddingForPinning(float newIconSize, float newBubbleBarPadding) { + mBubbleBarPadding = newBubbleBarPadding; + mIconScale = newIconSize / mIconSize; + updateBubblesLayoutProperties(mBubbleBarLocation); + invalidate(); + } + + /** + * Sets new icon sizes and newBubbleBarPadding between icons and bubble bar borders. * * @param newIconSize new icon size - * @param newBubbleBarPadding newBubbleBarPadding between icons and bubble bar - * borders. + * @param newBubbleBarPadding newBubbleBarPadding between icons and bubble bar borders. */ public void setIconSizeAndPadding(float newIconSize, float newBubbleBarPadding) { // TODO(b/335457839): handle new bubble animation during the size change @@ -338,7 +358,7 @@ public void setIconSizeAndPadding(float newIconSize, float newBubbleBarPadding) int childCount = getChildCount(); for (int i = 0; i < childCount; i++) { View childView = getChildAt(i); - childView.setScaleY(mIconScale); + childView.setScaleX(mIconScale); childView.setScaleY(mIconScale); FrameLayout.LayoutParams params = (LayoutParams) childView.getLayoutParams(); params.height = (int) mIconSize; @@ -362,8 +382,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto mBubbleBarBounds.bottom = bottom; // The bubble bar handle is aligned according to the relative pivot, - // by default it's aligned to the bottom edge of the screen so scale towards - // that + // by default it's aligned to the bottom edge of the screen so scale towards that setPivotX(mRelativePivotX * getWidth()); setPivotY(mRelativePivotY * getHeight()); @@ -384,6 +403,48 @@ public void onRtlPropertiesChanged(int layoutDirection) { } } + @Override + public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfoInternal(info); + // Always show only expand action as the menu is only for collapsed bubble bar + info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_EXPAND); + info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK); + info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.action_dismiss_all, + getResources().getString(R.string.bubble_bar_action_dismiss_all))); + if (mBubbleBarLocation.isOnLeft(isLayoutRtl())) { + info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.action_move_right, + getResources().getString(R.string.bubble_bar_action_move_right))); + } else { + info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.action_move_left, + getResources().getString(R.string.bubble_bar_action_move_left))); + } + } + + @Override + public boolean performAccessibilityActionInternal(int action, + @androidx.annotation.Nullable Bundle arguments) { + if (action == AccessibilityNodeInfo.ACTION_EXPAND + || action == AccessibilityNodeInfo.ACTION_CLICK) { + mController.expandBubbleBar(); + return true; + } + if (action == R.id.action_dismiss_all) { + mController.dismissBubbleBar(); + return true; + } + if (action == R.id.action_move_left) { + mController.updateBubbleBarLocation(BubbleBarLocation.LEFT, + BubbleBarLocation.UpdateSource.A11Y_ACTION_BAR); + return true; + } + if (action == R.id.action_move_right) { + mController.updateBubbleBarLocation(BubbleBarLocation.RIGHT, + BubbleBarLocation.UpdateSource.A11Y_ACTION_BAR); + return true; + } + return super.performAccessibilityActionInternal(action, arguments); + } + @SuppressLint("RtlHardcoded") private void onBubbleBarLocationChanged() { final boolean onLeft = mBubbleBarLocation.isOnLeft(isLayoutRtl()); @@ -391,7 +452,13 @@ private void onBubbleBarLocationChanged() { mRelativePivotX = onLeft ? 0f : 1f; LayoutParams lp = (LayoutParams) getLayoutParams(); lp.gravity = Gravity.BOTTOM | (onLeft ? Gravity.LEFT : Gravity.RIGHT); + if (Flags.avoidDisplayCutoutBubbleBar()) { + WindowMetrics windowMetrics = mWindowManager.getCurrentWindowMetrics(); + lp.leftMargin = computeMargin(lp.leftMargin, windowMetrics, /* isLeftSide */ true); + lp.rightMargin = computeMargin(lp.rightMargin, windowMetrics, /* isLeftSide */ false); + } setLayoutParams(lp); // triggers a relayout + updateBubbleAccessibilityStates(); } /** @@ -420,37 +487,30 @@ public void setIsDragging(boolean dragging) { return; } mDragging = dragging; - setElevation(dragging ? mDragElevation : mBubbleElevation); + mController.setIsDragging(dragging); if (!mDragging) { - // Relayout after dragging to ensure that the dragged bubble is positioned - // correctly + // Relayout after dragging to ensure that the dragged bubble is positioned correctly requestLayout(); } } /** - * Get translation for bubble bar when drag is released and it needs to animate - * back to the + * Get translation for bubble bar when drag is released and it needs to animate back to the * resting position. - * Resting position is based on the supplied location. If the supplied location - * is different - * from the internal location that was used during bubble bar layout, - * translation values are + * Resting position is based on the supplied location. If the supplied location is different + * from the internal location that was used during bubble bar layout, translation values are * calculated to position the bar at the desired location. * * @param initialTranslation initial bubble bar translation at the start of drag - * @param location desired location of the bubble bar when drag is - * released + * @param location desired location of the bubble bar when drag is released * @return point with x and y values representing translation on x and y-axis */ public PointF getBubbleBarDragReleaseTranslation(PointF initialTranslation, BubbleBarLocation location) { float dragEndTranslationX = initialTranslation.x; if (getBubbleBarLocation().isOnLeft(isLayoutRtl()) != location.isOnLeft(isLayoutRtl())) { - // Bubble bar is laid out on left or right side of the screen. And the desired - // new - // location is on the other side. Calculate x translation value required to - // shift + // Bubble bar is laid out on left or right side of the screen. And the desired new + // location is on the other side. Calculate x translation value required to shift // bubble bar from one side to the other. final float shift = getDistanceFromOtherSide(); if (location.isOnLeft(isLayoutRtl())) { @@ -467,19 +527,14 @@ public PointF getBubbleBarDragReleaseTranslation(PointF initialTranslation, } /** - * Get translation for a bubble when drag is released and it needs to animate - * back to the + * Get translation for a bubble when drag is released and it needs to animate back to the * resting position. - * Resting position is based on the supplied location. If the supplied location - * is different - * from the internal location that was used during bubble bar layout, - * translation values are + * Resting position is based on the supplied location. If the supplied location is different + * from the internal location that was used during bubble bar layout, translation values are * calculated to position the bar at the desired location. * - * @param initialTranslation initial bubble translation inside the bar at the - * start of drag - * @param location desired location of the bubble bar when drag is - * released + * @param initialTranslation initial bubble translation inside the bar at the start of drag + * @param location desired location of the bubble bar when drag is released * @return point with x and y values representing translation on x and y-axis */ public PointF getDraggedBubbleReleaseTranslation(PointF initialTranslation, @@ -489,8 +544,9 @@ public PointF getDraggedBubbleReleaseTranslation(PointF initialTranslation, if (getBubbleBarLocation().isOnLeft(isLayoutRtl()) != newLocationOnLeft) { // Calculate translationX based on bar and bubble translations float bubbleBarTx = getBubbleBarDragReleaseTranslation(initialTranslation, location).x; - float bubbleTx = getExpandedBubbleTranslationX( - indexOfChild(mDraggedBubbleView), getChildCount(), newLocationOnLeft); + float bubbleTx = + getExpandedBubbleTranslationX( + indexOfChild(mDraggedBubbleView), getChildCount(), newLocationOnLeft); dragEndTranslationX = bubbleBarTx + bubbleTx; } // translationY does not change during drag and can be reused @@ -508,9 +564,18 @@ private float getDistanceFromOtherSide() { return (float) (displayWidth - getWidth() - margin); } + /** Set whether the background should show the drop target */ + public void showDropTarget(boolean isDropTarget) { + mBubbleBarBackground.showDropTarget(isDropTarget); + } + + /** Returns whether the Bubble Bar is currently displaying a drop target. */ + public boolean isShowingDropTarget() { + return mBubbleBarBackground.isShowingDropTarget(); + } + /** - * Animate bubble bar to the given location transiently. Does not modify the - * layout or the value + * Animate bubble bar to the given location transiently. Does not modify the layout or the value * returned by {@link #getBubbleBarLocation()}. */ public void animateToBubbleBarLocation(BubbleBarLocation bubbleBarLocation) { @@ -521,84 +586,58 @@ public void animateToBubbleBarLocation(BubbleBarLocation bubbleBarLocation) { // Location animation uses two separate animators. // First animator hides the bar. - // After it completes, bubble positions in the bar and arrow position is - // updated. + // After it completes, bubble positions in the bar and arrow position is updated. // Second animator is started to show the bar. - mBubbleBarLocationAnimator = getLocationUpdateFadeOutAnimator(bubbleBarLocation); - mBubbleBarLocationAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - updateBubblesLayoutProperties(bubbleBarLocation); - mBubbleBarBackground.setAnchorLeft(bubbleBarLocation.isOnLeft(isLayoutRtl())); - - // Animate it in - mBubbleBarLocationAnimator = getLocationUpdateFadeInAnimator(bubbleBarLocation); - mBubbleBarLocationAnimator.start(); - } - }); + mBubbleBarLocationAnimator = animateToBubbleBarLocationOut(bubbleBarLocation); + mBubbleBarLocationAnimator.addListener(AnimatorListeners.forEndCallback(() -> { + // Animate it in + mBubbleBarLocationAnimator = animateToBubbleBarLocationIn(mBubbleBarLocation, + bubbleBarLocation); + mBubbleBarLocationAnimator.start(); + })); mBubbleBarLocationAnimator.start(); } - private Animator getLocationUpdateFadeOutAnimator(BubbleBarLocation newLocation) { - final float shift = getResources().getDisplayMetrics().widthPixels * FADE_OUT_ANIM_POSITION_SHIFT; - final boolean onLeft = newLocation.isOnLeft(isLayoutRtl()); - final float tx = getTranslationX() + (onLeft ? -shift : shift); - - ObjectAnimator positionAnim = ObjectAnimator.ofFloat(this, VIEW_TRANSLATE_X, tx) - .setDuration(FADE_OUT_ANIM_POSITION_DURATION_MS); - positionAnim.setInterpolator(EMPHASIZED_ACCELERATE); - - ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(this, getLocationAnimAlphaProperty(), 0f) - .setDuration(FADE_OUT_ANIM_ALPHA_DURATION_MS); - alphaAnim.setStartDelay(FADE_OUT_ANIM_ALPHA_DELAY_MS); - - AnimatorSet animatorSet = new AnimatorSet(); - animatorSet.playTogether(positionAnim, alphaAnim); - return animatorSet; + /** Creates animator for animating bubble bar in. */ + public Animator animateToBubbleBarLocationIn(BubbleBarLocation fromLocation, + BubbleBarLocation toLocation) { + updateBubblesLayoutProperties(toLocation); + mBubbleBarBackground.setAnchorLeft(toLocation.isOnLeft(isLayoutRtl())); + ObjectAnimator alphaInAnim = ObjectAnimator.ofFloat(BubbleBarView.this, + getLocationAnimAlphaProperty(), 1f); + return BarsLocationAnimatorHelper.getBubbleBarLocationInAnimator(toLocation, fromLocation, + getDistanceFromOtherSide(), alphaInAnim, this); } - private Animator getLocationUpdateFadeInAnimator(BubbleBarLocation newLocation) { - final float shift = getResources().getDisplayMetrics().widthPixels * FADE_IN_ANIM_POSITION_SHIFT; - - final boolean onLeft = newLocation.isOnLeft(isLayoutRtl()); - final float startTx; - final float finalTx; - if (newLocation == mBubbleBarLocation) { - // Animated location matches layout location. - finalTx = 0; - } else { - // We are animating in to a transient location, need to move the bar - // accordingly. - finalTx = getDistanceFromOtherSide() * (onLeft ? -1 : 1); - } - if (onLeft) { - // Bar will be shown on the left side. Start point is shifted right. - startTx = finalTx + shift; - } else { - // Bar will be shown on the right side. Start point is shifted left. - startTx = finalTx - shift; - } - - ValueAnimator positionAnim = new SpringAnimationBuilder(getContext()) - .setStartValue(startTx) - .setEndValue(finalTx) - .setDampingRatio(SpringForce.DAMPING_RATIO_LOW_BOUNCY) - .setStiffness(FADE_IN_ANIM_POSITION_SPRING_STIFFNESS) - .build(this, VIEW_TRANSLATE_X); - - ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(this, getLocationAnimAlphaProperty(), 1f) - .setDuration(FADE_IN_ANIM_ALPHA_DURATION_MS); - - AnimatorSet animatorSet = new AnimatorSet(); - animatorSet.playTogether(positionAnim, alphaAnim); - return animatorSet; + /** + * Creates animator for animating bubble bar out. + * + * @param targetLocation the location bubble br should animate to. + */ + public Animator animateToBubbleBarLocationOut(BubbleBarLocation targetLocation) { + ObjectAnimator alphaOutAnim = ObjectAnimator.ofFloat( + this, getLocationAnimAlphaProperty(), 0f); + Animator outAnimation = BarsLocationAnimatorHelper.getBubbleBarLocationOutAnimator( + this, + targetLocation, + alphaOutAnim); + outAnimation.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(@NonNull Animator animation, boolean isReverse) { + // need to restore the original bar view state in case icon is dropped to the bubble + // bar original location + updateBubblesLayoutProperties(targetLocation); + mBubbleBarBackground.setAnchorLeft(targetLocation.isOnLeft(isLayoutRtl())); + setTranslationX(0f); + } + }); + return outAnimation; } /** * Get property that can be used to animate the alpha value for the bar. * When a bubble is being dragged, uses {@link #BUBBLE_DRAG_ALPHA}. - * Falls back to {@link com.android.launcher3.LauncherAnimUtils#VIEW_ALPHA} - * otherwise. + * Falls back to {@link com.android.launcher3.LauncherAnimUtils#VIEW_ALPHA} otherwise. */ private FloatProperty getLocationAnimAlphaProperty() { return mDraggedBubbleView == null ? VIEW_ALPHA : BUBBLE_DRAG_ALPHA; @@ -606,14 +645,11 @@ private FloatProperty getLocationAnimAlphaProperty() { /** * Set alpha value for the bar while a bubble is being dragged. - * We can not update the alpha on the bar directly because the dragged bubble - * would be affected + * We can not update the alpha on the bar directly because the dragged bubble would be affected * as well. As it is a child view. - * Instead, while a bubble is being dragged, set alpha on each child view, that - * is not the + * Instead, while a bubble is being dragged, set alpha on each child view, that is not the * dragged view. And set an alpha on the background. - * This allows for the dragged bubble to remain visible while the bar is hidden - * during + * This allows for the dragged bubble to remain visible while the bar is hidden during * animation. */ private void setAlphaDuringBubbleDrag(float alpha) { @@ -638,33 +674,47 @@ private void resetDragAnimation() { } setAlphaDuringBubbleDrag(1f); setTranslationX(0f); - setAlpha(1f); + if (mIsBarExpanded && getBubbleChildCount() > 0) { + setAlpha(1f); + } } - /** - * Get bubble bar top coordinate on screen when bar is resting - */ - public int getRestingTopPositionOnScreen() { - int displayHeight = DisplayController.INSTANCE.get(getContext()).getInfo().currentSize.y; + /** Get the distance between the bubble bar top coordinate and the bottom of the screen */ + public int getTopToScreenBottom() { + // the bottom of the bubble bar is aligned with the bottom of the screen. the distance + // between the top of the bubble bar and the bottom of the screen is the height of the + // bubble bar minus the y translation. since the bubble bar is always above the bottom of + // the screen, the translation is negative and the overall result is a positive value that + // represents the distance int bubbleBarHeight = getBubbleBarBounds().height(); - return displayHeight - bubbleBarHeight + (int) mController.getBubbleBarTranslationY(); + return bubbleBarHeight - (int) mController.getBubbleBarTranslationY(); } - /** - * Updates the bounds with translation that may have been applied and returns - * the result. - */ + /** Returns the bounds with translation that may have been applied. */ public Rect getBubbleBarBounds() { - mBubbleBarBounds.top = getTop() + (int) getTranslationY() + mPointerSize; - mBubbleBarBounds.bottom = getBottom() + (int) getTranslationY(); - return mBubbleBarBounds; + Rect bounds = new Rect(mBubbleBarBounds); + bounds.top = getTop() + (int) getTranslationY() + mPointerSize; + bounds.bottom = getBottom() + (int) getTranslationY(); + return bounds; + } + + /** Returns the expanded bounds with translation that may have been applied. */ + public Rect getBubbleBarExpandedBounds() { + Rect expandedBounds = getBubbleBarBounds(); + if (!isExpanded() || isExpanding()) { + if (mBubbleBarLocation.isOnLeft(isLayoutRtl())) { + expandedBounds.right = expandedBounds.left + (int) expandedWidth(); + } else { + expandedBounds.left = expandedBounds.right - (int) expandedWidth(); + } + } + return expandedBounds; } /** - * Set bubble bar relative pivot value for X and Y, applied as a fraction of - * view width/height + * Set bubble bar relative pivot value for X and Y, applied as a fraction of view width/height * respectively. If the value is not in range of 0 to 1 it will be normalized. - * + * * @param x relative X pivot value in range 0..1 * @param y relative Y pivot value in range 0..1 */ @@ -693,68 +743,191 @@ public float getRelativePivotY() { return mRelativePivotY; } - /** Notifies the bubble bar that a new bubble animation is starting. */ - public void onAnimatingBubbleStarted() { - mIsAnimatingNewBubble = true; + /** Add a new bubble to the bubble bar without updating the selected bubble. */ + public void addBubble(BubbleView bubble, boolean suppressAnimation) { + addBubble(bubble, /* bubbleToSelect = */ null, suppressAnimation); } - /** Notifies the bubble bar that a new bubble animation is complete. */ - public void onAnimatingBubbleCompleted() { - mIsAnimatingNewBubble = false; - } + /** + * Add a new bubble to the bubble bar and selects the provided bubble. + * + * @param bubble bubble to add + * @param bubbleToSelect if {@code null}, then selected bubble does not change + */ + public void addBubble(BubbleView bubble, @Nullable BubbleView bubbleToSelect, + boolean suppressAnimation) { + FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams((int) mIconSize, (int) mIconSize, + Gravity.LEFT); + final int index = bubble.isOverflow() ? getChildCount() : 0; - /** Add a new bubble to the bubble bar. */ - public void addBubble(View bubble, FrameLayout.LayoutParams lp) { - if (isExpanded()) { + if (isExpanded() && !suppressAnimation) { // if we're expanded scale the new bubble in bubble.setScaleX(0f); bubble.setScaleY(0f); - addView(bubble, 0, lp); - createNewBubbleScaleInAnimator(bubble); - mNewBubbleScaleInAnimator.start(); + addView(bubble, index, lp); + bubble.showDotIfNeeded(/* animate= */ false); + + mBubbleAnimator = new BubbleAnimator(mIconSize, mExpandedBarIconsSpacing, + getChildCount(), mBubbleBarLocation.isOnLeft(isLayoutRtl())); + BubbleAnimator.Listener listener = new BubbleAnimator.Listener() { + + @Override + public void onAnimationEnd() { + updateLayoutParams(); + mBubbleAnimator = null; + } + + @Override + public void onAnimationCancel() { + bubble.setScaleX(1); + bubble.setScaleY(1); + } + + @Override + public void onAnimationUpdate(float animatedFraction) { + bubble.setScaleX(animatedFraction); + bubble.setScaleY(animatedFraction); + updateBubblesLayoutProperties(mBubbleBarLocation); + invalidate(); + } + }; + if (bubbleToSelect != null) { + mBubbleAnimator.animateNewBubble(indexOfChild(mSelectedBubbleView), + indexOfChild(bubbleToSelect), listener); + } else { + mBubbleAnimator.animateNewBubble(indexOfChild(mSelectedBubbleView), listener); + } } else { - addView(bubble, 0, lp); + addView(bubble, index, lp); } } - private void createNewBubbleScaleInAnimator(View bubble) { - mNewBubbleScaleInAnimator = ValueAnimator.ofFloat(0, 1); - mNewBubbleScaleInAnimator.setDuration(SCALE_IN_ANIMATION_DURATION_MS); - mNewBubbleScaleInAnimator.addUpdateListener(animation -> { - float animatedFraction = animation.getAnimatedFraction(); - bubble.setScaleX(animatedFraction); - bubble.setScaleY(animatedFraction); - updateBubblesLayoutProperties(mBubbleBarLocation); - invalidate(); - }); - mNewBubbleScaleInAnimator.addListener(new AnimatorListenerAdapter() { + /** Add a new bubble and remove an old bubble from the bubble bar. */ + public void addBubbleAndRemoveBubble(BubbleView addedBubble, BubbleView removedBubble, + @Nullable BubbleView bubbleToSelect, boolean suppressAnimation, + Runnable onEndRunnable) { + FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams((int) mIconSize, (int) mIconSize, + Gravity.LEFT); + int addedIndex = addedBubble.isOverflow() ? getChildCount() : 0; + if (suppressAnimation || !isExpanded()) { + removeView(removedBubble); + addView(addedBubble, addedIndex, lp); + if (onEndRunnable != null) { + onEndRunnable.run(); + } + return; + } + addedBubble.setScaleX(0f); + addedBubble.setScaleY(0f); + addView(addedBubble, addedIndex, lp); + int indexOfCurrentSelectedBubble = indexOfChild(mSelectedBubbleView); + int indexOfBubbleToRemove = indexOfChild(removedBubble); + int indexOfNewlySelectedBubble = bubbleToSelect == null + ? indexOfCurrentSelectedBubble : indexOfChild(bubbleToSelect); + // Since removed bubble is kept till the end of the animation we should check if there are + // more than one bubble. In such a case the bar will remain open without the selected bubble + if (mSelectedBubbleView == removedBubble + && bubbleToSelect == null + && getBubbleChildCount() > 1) { + Log.w(TAG, "Remove the currently selected bubble without selecting a new one."); + } + mBubbleAnimator = new BubbleAnimator(mIconSize, mExpandedBarIconsSpacing, + getChildCount(), mBubbleBarLocation.isOnLeft(isLayoutRtl())); + BubbleAnimator.Listener listener = new BubbleAnimator.Listener() { + @Override - public void onAnimationCancel(Animator animation) { - bubble.setScaleX(1); - bubble.setScaleY(1); + public void onAnimationEnd() { + removeView(removedBubble); + updateLayoutParams(); + mBubbleAnimator = null; + if (onEndRunnable != null) { + onEndRunnable.run(); + } } @Override - public void onAnimationEnd(Animator animation) { - updateWidth(); - mNewBubbleScaleInAnimator = null; + public void onAnimationCancel() { + addedBubble.setScaleX(1); + addedBubble.setScaleY(1); + removedBubble.setScaleX(0); + removedBubble.setScaleY(0); } - }); + + @Override + public void onAnimationUpdate(float animatedFraction) { + addedBubble.setScaleX(animatedFraction); + addedBubble.setScaleY(animatedFraction); + removedBubble.setScaleX(1 - animatedFraction); + removedBubble.setScaleY(1 - animatedFraction); + updateBubblesLayoutProperties(mBubbleBarLocation); + invalidate(); + } + }; + mBubbleAnimator.animateNewAndRemoveOld(indexOfCurrentSelectedBubble, + indexOfNewlySelectedBubble, indexOfBubbleToRemove, addedIndex, listener); } - // TODO: (b/280605790) animate it @Override public void addView(View child, int index, ViewGroup.LayoutParams params) { - if (getChildCount() + 1 > MAX_BUBBLES) { - // the last child view is the overflow bubble and we shouldn't remove that. - // remove the - // second to last child view. - removeViewInLayout(getChildAt(getChildCount() - 2)); - } super.addView(child, index, params); - updateWidth(); + updateLayoutParams(); updateBubbleAccessibilityStates(); updateContentDescription(); + updateDotsAndBadgesIfCollapsed(); + } + + /** Removes the given bubble from the bubble bar. */ + public void removeBubble(View bubble) { + if (isExpanded()) { + final boolean dismissedByDrag = mDraggedBubbleView == bubble; + if (dismissedByDrag) { + mDismissedByDragBubbleView = mDraggedBubbleView; + } + boolean removingLastRemainingBubble = getBubbleChildCount() == 1; + int bubbleCount = getChildCount(); + mBubbleAnimator = new BubbleAnimator(mIconSize, mExpandedBarIconsSpacing, + bubbleCount, mBubbleBarLocation.isOnLeft(isLayoutRtl())); + BubbleAnimator.Listener listener = new BubbleAnimator.Listener() { + + @Override + public void onAnimationEnd() { + removeView(bubble); + mBubbleAnimator = null; + } + + @Override + public void onAnimationCancel() { + bubble.setScaleX(0); + bubble.setScaleY(0); + } + + @Override + public void onAnimationUpdate(float animatedFraction) { + // don't update the scale if this bubble was dismissed by drag + if (!dismissedByDrag) { + bubble.setScaleX(1 - animatedFraction); + bubble.setScaleY(1 - animatedFraction); + } + updateBubblesLayoutProperties(mBubbleBarLocation); + invalidate(); + } + }; + int bubbleIndex = indexOfChild(bubble); + BubbleView lastBubble = (BubbleView) getChildAt(bubbleCount - 1); + String lastBubbleKey = lastBubble.getBubble().getKey(); + boolean removingLastBubble = + BubbleBarOverflow.KEY.equals(lastBubbleKey) + ? bubbleIndex == bubbleCount - 2 + : bubbleIndex == bubbleCount - 1; + mBubbleAnimator.animateRemovedBubble( + indexOfChild(bubble), indexOfChild(mSelectedBubbleView), removingLastBubble, + removingLastRemainingBubble, listener); + if (removingLastRemainingBubble && mDismissAnimator == null) { + createDismissAnimator().start(); + } + } else { + removeView(bubble); + } } // TODO: (b/283309949) animate it @@ -765,61 +938,225 @@ public void removeView(View view) { mSelectedBubbleView = null; mBubbleBarBackground.showArrow(false); } - updateWidth(); + updateLayoutParams(); updateBubbleAccessibilityStates(); updateContentDescription(); + mDismissedByDragBubbleView = null; + updateDotsAndBadgesIfCollapsed(); + } + + private ValueAnimator createDismissAnimator() { + ValueAnimator animator = + ValueAnimator.ofFloat(0, 1).setDuration(FADE_OUT_BUBBLE_BAR_DURATION_MS); + animator.setInterpolator(Interpolators.EMPHASIZED); + Runnable onEnd = () -> { + mDismissAnimator = null; + setAlpha(0); + }; + addAnimationCallBacks(animator, /* onStart= */ null, onEnd, + /* onUpdate= */ anim -> setAlpha(1 - anim.getAnimatedFraction())); + mDismissAnimator = animator; + return animator; + } + + /** Dismisses the bubble bar */ + public void dismiss(Runnable onDismissed) { + if (mDismissAnimator == null) { + createDismissAnimator().start(); + } + addAnimationCallBacks(mDismissAnimator, null, onDismissed, null); } - private void updateWidth() { - LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams(); - lp.width = (int) (mIsBarExpanded ? expandedWidth() : collapsedWidth()); - setLayoutParams(lp); + /** + * Return child views in the order which they are shown on the screen. + *

+ * Child views (bubbles) are always ordered based on recency. The most recent bubble is at index + * 0. + * For example if the child views are (1)(2)(3) then (1) is the most recent bubble and at index + * 0.
+ * + * How bubbles show up on the screen depends on the bubble bar location. If the bar is on the + * left, the most recent bubble is shown on the right. The bubbles from the example above would + * be shown as: (3)(2)(1).
+ * + * If bubble bar is on the right, then the most recent bubble is on the left. Bubbles from the + * example above would be shown as: (1)(2)(3). + */ + private List getChildViewsInOnScreenOrder() { + List childViews = new ArrayList<>(getChildCount()); + for (int i = 0; i < getChildCount(); i++) { + childViews.add(getChildAt(i)); + } + if (mBubbleBarLocation.isOnLeft(isLayoutRtl())) { + // Visually child views are shown in reverse order when bar is on the left + return childViews.reversed(); + } + return childViews; + } + + private void updateDotsAndBadgesIfCollapsed() { + if (isExpanded()) { + return; + } + for (int i = 0; i < getChildCount(); i++) { + BubbleView bubbleView = (BubbleView) getChildAt(i); + // when we're collapsed, the first bubble should show the badge and the dot if it has + // it. the rest of the bubbles should hide their badges and dots. + if (i == 0) { + bubbleView.showBadge(); + if (bubbleView.hasUnseenContent()) { + bubbleView.showDotIfNeeded(/* animate= */ true); + } else { + bubbleView.hideDot(); + } + } else { + bubbleView.hideBadge(); + bubbleView.hideDot(); + } + } } private void updateLayoutParams() { LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams(); lp.height = (int) getBubbleBarExpandedHeight(); lp.width = (int) (mIsBarExpanded ? expandedWidth() : collapsedWidth()); + + if (Flags.avoidDisplayCutoutBubbleBar()) { + WindowMetrics windowMetrics = mWindowManager.getCurrentWindowMetrics(); + lp.leftMargin = computeMargin(lp.leftMargin, windowMetrics, /* isLeftSide */ true); + lp.rightMargin = computeMargin(lp.rightMargin, windowMetrics, /* isLeftSide */ false); + } + setLayoutParams(lp); } + /** + * Computes the horizontal margin for the bubble bar, taking display cutouts into account. + * + *

A {@link DisplayCutout} might overlap with the bubble bar. The algorithm is to shift the + * {@link BubbleBarView} toward the center of the screen if it overlaps with a cutout. This + * method handles calculations for both the left and right margins to avoid code duplication. + * + * The current margin from the {@link android.view.ViewGroup.LayoutParams} is passed in so + * that we do not needlessly update it. An initial thought might be to use the default margin + * if the view avoids the {@link DisplayCutout}, but this can cause issues. When you update the + * margin the first time to avoid a cutout, subsequent checks might find no intersection, + * potentially leading to an incorrect reset to the default margin. Using the original margin + * as a fallback prevents this. + * + * The opposite margin is calculated to avoid the cutout. An initial thought might be to use + * the default margin but this causes a bug when the bubble bar is being moved around. The bug + * is that the margin where the cutout is has not taken the cutout into account so the preview + * will overlap the cutout but after the position is changed the bubble bar will not overlap. + * + * @param originalMargin The current margin of the {@link android.view.View}. + * @param windowMetrics The current {@link WindowMetrics} of the root + * {@link android.view.View}. + * @return The calculated margin in pixels that will avoid any overlapping display cutouts. + */ + private int computeMargin(int originalMargin, @NonNull WindowMetrics windowMetrics, + boolean isLeftSide) { + boolean isLayoutRtl = isLayoutRtl(); + DisplayCutout displayCutout = getDisplayCutout(); + if (displayCutout == null) { + return mDefaultMargin; + } + List displayCutoutRects = displayCutout.getBoundingRects(); + if (displayCutoutRects.isEmpty()) { + return mDefaultMargin; + } + + Rect windowBounds = windowMetrics.getBounds(); + Rect boundsOnScreen = mTempRect; + getBoundsOnScreen(boundsOnScreen); + + // The opposite margin avoids the cutout during a preview of changing the bubble bar + // location. We flip the coordinates to calculate where the bubble bar will be when it + // is moved and have the appropriate margin. + boolean shouldFlipCoordinates = switch (mBubbleBarLocation) { + case LEFT -> !isLeftSide; + case RIGHT -> isLeftSide; + case DEFAULT -> (isLayoutRtl && isLeftSide) || (!isLayoutRtl && !isLeftSide); + }; + + if (shouldFlipCoordinates) { + int distanceFromLeft = boundsOnScreen.left - windowBounds.left; + int distanceFromRight = windowBounds.right - boundsOnScreen.right; + boundsOnScreen.left = windowBounds.left + distanceFromRight; + boundsOnScreen.right = windowBounds.right - distanceFromLeft; + } + + int midpoint = windowBounds.centerX(); + int cutoutMargin; + + if (isLeftSide) { + int rightMostBound = windowBounds.left; + for (Rect rect : displayCutoutRects) { + if (rect.left < midpoint && Rect.intersects(boundsOnScreen, rect)) { + rightMostBound = Math.max(rightMostBound, rect.right); + } + } + cutoutMargin = rightMostBound - windowBounds.left; + } else { // is on the right + int leftMostBound = windowBounds.right; + for (Rect rect : displayCutoutRects) { + if (rect.right > midpoint && Rect.intersects(boundsOnScreen, rect)) { + leftMostBound = Math.min(leftMostBound, rect.left); + } + } + cutoutMargin = windowBounds.right - leftMostBound; + } + + if (cutoutMargin > 0) { + return cutoutMargin + mCutoutPadding; + } + return originalMargin; + } + + private DisplayCutout getDisplayCutout() { + Context context = getContext(); + DisplayController controller = DisplayController.INSTANCE.get(context); + + if (controller != null) { + return controller.getInfo().displayCutout; + } + return mWindowManager.getCurrentWindowMetrics().getWindowInsets().getDisplayCutout(); + } + + private float getBubbleBarHeight() { return mIsBarExpanded ? getBubbleBarExpandedHeight() : getBubbleBarCollapsedHeight(); } - /** - * @return the horizontal margin between the bubble bar and the edge of the - * screen. - */ + /** @return the horizontal margin between the bubble bar and the edge of the screen. */ int getHorizontalMargin() { LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams(); return lp.getMarginEnd(); } /** - * Updates the z order, positions, and badge visibility of the bubble views in - * the bar based + * Updates the z order, positions, and badge visibility of the bubble views in the bar based * on the expanded state. */ private void updateBubblesLayoutProperties(BubbleBarLocation bubbleBarLocation) { - final float widthState = (float) mWidthAnimator.getAnimatedValue(); + final float widthState; + if (mWidthAnimator == null) { + widthState = mIsBarExpanded ? 1f : 0f; + } else { + widthState = (float) mWidthAnimator.getAnimatedValue(); + } final float currentWidth = getWidth(); final float expandedWidth = expandedWidth(); final float collapsedWidth = collapsedWidth(); - int bubbleCount = getChildCount(); - float viewBottom = mBubbleBarBounds.height() + (isExpanded() ? mPointerSize : 0); - float bubbleBarAnimatedTop = viewBottom - getBubbleBarHeight(); - // When translating X & Y the scale is ignored, so need to deduct it from the - // translations - final float ty = bubbleBarAnimatedTop + mBubbleBarPadding - getScaleIconShift(); - final boolean animate = getVisibility() == VISIBLE; + int childCount = getChildCount(); + final float ty = getBubbleTranslationY(); final boolean onLeft = bubbleBarLocation.isOnLeft(isLayoutRtl()); // elevation state is opposite to widthState - when expanded all icons are flat float elevationState = (1 - widthState); - for (int i = 0; i < bubbleCount; i++) { + for (int i = 0; i < childCount; i++) { BubbleView bv = (BubbleView) getChildAt(i); - if (bv == mDraggedBubbleView) { + if (bv == mDraggedBubbleView || bv == mDismissedByDragBubbleView) { // Skip the dragged bubble. Its translation is managed by the drag controller. continue; } @@ -827,46 +1164,72 @@ private void updateBubblesLayoutProperties(BubbleBarLocation bubbleBarLocation) bv.setDragTranslationX(0f); bv.setOffsetX(0f); - bv.setScaleX(mIconScale); - bv.setScaleY(mIconScale); + if (mBubbleAnimator == null || !mBubbleAnimator.isRunning()) { + // if the bubble animator is running don't set scale here, it will be set by the + // animator + bv.setScaleX(mIconScale); + bv.setScaleY(mIconScale); + } bv.setTranslationY(ty); + // the position of the bubble when the bar is fully expanded - final float expandedX = getExpandedBubbleTranslationX(i, bubbleCount, onLeft); + final float expandedX = getExpandedBubbleTranslationX(i, childCount, onLeft); // the position of the bubble when the bar is fully collapsed - final float collapsedX = getCollapsedBubbleTranslationX(i, bubbleCount, onLeft); + final float collapsedX = getCollapsedBubbleTranslationX(i, childCount, onLeft); // slowly animate elevation while keeping correct Z ordering float fullElevationForChild = (MAX_BUBBLES * mBubbleElevation) - i; bv.setZ(fullElevationForChild * elevationState); - if (mIsBarExpanded) { - // If bar is on the right, account for bubble bar expanding and shifting left - final float expandedBarShift = onLeft ? 0 : currentWidth - expandedWidth; - // where the bubble will end up when the animation ends - final float targetX = expandedX + expandedBarShift; - bv.setTranslationX(widthState * (targetX - collapsedX) + collapsedX); - // When we're expanded, we're not stacked so we're not behind the stack - bv.setBehindStack(false, animate); - bv.setAlpha(1); + // only update the dot and badge scale if we're expanding or collapsing + if (mWidthAnimator != null && mWidthAnimator.isRunning()) { + // The dot for the selected bubble scales in the opposite direction of the expansion + // animation. + bv.showDotIfNeeded(bv == mSelectedBubbleView ? 1 - widthState : widthState); + // The badge for the selected bubble is always at full scale. All other bubbles + // scale according to the expand animation. + bv.setBadgeScale(bv == mSelectedBubbleView ? 1 : widthState); + } + + if (onLeft) { + bv.setTranslationX(widthState * (expandedX - collapsedX) + collapsedX); } else { - // If bar is on the right, account for bubble bar expanding and shifting left - final float collapsedBarShift = onLeft ? 0 : currentWidth - collapsedWidth; - final float targetX = collapsedX + collapsedBarShift; - bv.setTranslationX(widthState * (expandedX - targetX) + targetX); - // If we're not the first bubble we're behind the stack - bv.setBehindStack(i > 0, animate); - // If we're fully collapsed, hide all bubbles except for the first 2. If there - // are - // only 2 bubbles, hide the second bubble as well because it's the overflow. - if (widthState == 0) { - if (i > MAX_VISIBLE_BUBBLES_COLLAPSED - 1) { - bv.setAlpha(0); - } else if (i == MAX_VISIBLE_BUBBLES_COLLAPSED - 1 - && bubbleCount == MAX_VISIBLE_BUBBLES_COLLAPSED) { - bv.setAlpha(0); - } else { - bv.setAlpha(1); - } + final boolean changingWidth = + mIsBarExpanded + ? currentWidth != expandedWidth + : currentWidth != collapsedWidth; + // when the bubble bar is on the right, the bubble bar x position is its left-most + // bound. when the bar expands and collapses, the left bound changes due to the + // change in width. this impacts the position of the bubbles. + // during the expansion animation, the width of the bubble bar remains unchanged, + // and only updates at the end of the animation. e.g. while expanding, the width of + // the bubble bar is typically the collapsed width. and similarly while collapsing, + // the width is the expanded width. however if we start collapsing in the middle of + // expanding, the width of the bubble bar during the animation will be the collapsed + // width. in this case the path that bubbles travel on is the same path as "normal" + // expansion, just in the other direction. + final boolean useExpandingPath = + (mIsBarExpanded && changingWidth) || (!mIsBarExpanded && !changingWidth); + if (useExpandingPath) { + final float widthDelta = currentWidth - expandedWidth; + final float targetX = expandedX + widthDelta; + bv.setTranslationX(widthState * (targetX - collapsedX) + collapsedX); + } else { + final float widthDelta = currentWidth - collapsedWidth; + final float targetX = collapsedX + widthDelta; + bv.setTranslationX(widthState * (expandedX - targetX) + targetX); + } + } + + if (mIsBarExpanded) { + bv.setVisibility(VISIBLE); + } else if (widthState == 0) { + // If we're fully collapsed, hide all bubbles except for the first 2, excluding + // the overflow. + if (bv.isOverflow() || i > MAX_VISIBLE_BUBBLES_COLLAPSED - 1) { + bv.setVisibility(INVISIBLE); + } else { + bv.setVisibility(VISIBLE); } } } @@ -875,7 +1238,8 @@ private void updateBubblesLayoutProperties(BubbleBarLocation bubbleBarLocation) final float collapsedArrowPosition = arrowPositionForSelectedWhenCollapsed( bubbleBarLocation); final float expandedArrowPosition = arrowPositionForSelectedWhenExpanded(bubbleBarLocation); - final float interpolatedWidth = widthState * (expandedWidth - collapsedWidth) + collapsedWidth; + final float interpolatedWidth = + widthState * (expandedWidth - collapsedWidth) + collapsedWidth; final float arrowPosition; float interpolatedShift = (expandedArrowPosition - collapsedArrowPosition) * widthState; @@ -887,7 +1251,8 @@ private void updateBubblesLayoutProperties(BubbleBarLocation bubbleBarLocation) + interpolatedShift; } else { final float targetPosition = currentWidth - collapsedWidth + collapsedArrowPosition; - arrowPosition = targetPosition + widthState * (expandedArrowPosition - targetPosition); + arrowPosition = + targetPosition + widthState * (expandedArrowPosition - targetPosition); } } mBubbleBarBackground.setArrowPosition(arrowPosition); @@ -906,9 +1271,8 @@ private float getExpandedBubbleTranslationX(int bubbleIndex, int bubbleCount, bo } final float iconAndSpacing = getScaledIconSize() + mExpandedBarIconsSpacing; float translationX; - if (mNewBubbleScaleInAnimator != null && mNewBubbleScaleInAnimator.isRunning()) { - translationX = getExpandedBubbleTranslationXDuringScaleAnimation( - bubbleIndex, bubbleCount, onLeft); + if (mBubbleAnimator != null && mBubbleAnimator.isRunning()) { + return mBubbleAnimator.getBubbleTranslationX(bubbleIndex) + mBubbleBarPadding; } else if (onLeft) { translationX = mBubbleBarPadding + (bubbleCount - bubbleIndex - 1) * iconAndSpacing; } else { @@ -917,82 +1281,43 @@ private float getExpandedBubbleTranslationX(int bubbleIndex, int bubbleCount, bo return translationX - getScaleIconShift(); } - /** - * Returns the translation X for the bubble at index {@code bubbleIndex} when - * the bubble bar is - * expanded and a new bubble is animating in. - * - *

- * This method assumes that the animation is running so callers are expected to - * verify that - * before calling it. - */ - private float getExpandedBubbleTranslationXDuringScaleAnimation( - int bubbleIndex, int bubbleCount, boolean onLeft) { - // when the new bubble scale animation is running, a new bubble is animating in - // while the - // bubble bar is expanded, so we have at least 2 bubbles in the bubble bar - the - // expanded - // one, and the new one animating in. - - if (mNewBubbleScaleInAnimator == null) { - // callers of this method are expected to verify that the animation is running, - // but the - // compiler doesn't know that. + private float getCollapsedBubbleTranslationX(int bubbleIndex, int childCount, boolean onLeft) { + if (bubbleIndex < 0 || bubbleIndex >= childCount) { return 0; } - final float iconAndSpacing = getScaledIconSize() + mExpandedBarIconsSpacing; - final float newBubbleScale = mNewBubbleScaleInAnimator.getAnimatedFraction(); - // the new bubble is scaling in from the center, so we need to adjust its - // translation so - // that the distance to the adjacent bubble scales at the same rate. - final float pivotAdjustment = -(1 - newBubbleScale) * getScaledIconSize() / 2f; - + float translationX; if (onLeft) { - if (bubbleIndex == 0) { - // this is the animating bubble. use scaled spacing between it and the bubble to - // its left - return (bubbleCount - 1) * getScaledIconSize() - + (bubbleCount - 2) * mExpandedBarIconsSpacing - + newBubbleScale * mExpandedBarIconsSpacing - + pivotAdjustment; + // Shift the first bubble only if there are more bubbles + if (bubbleIndex == 0 && getBubbleChildCount() >= MAX_VISIBLE_BUBBLES_COLLAPSED) { + translationX = mIconOverlapAmount; + } else { + translationX = 0f; } - // when the bubble bar is on the left, only the translation of the right-most - // bubble - // is affected by the scale animation. - return (bubbleCount - bubbleIndex - 1) * iconAndSpacing; - } else if (bubbleIndex == 0) { - // the bubble bar is on the right, and this is the animating bubble. it only - // needs - // to be adjusted for the scaling pivot. - return pivotAdjustment; } else { - return iconAndSpacing * (bubbleIndex - 1 + newBubbleScale); + // when the bar is on the right, the first bubble always has translation 0. the only + // case where another bubble has translation 0 is when we only have 1 bubble and the + // overflow. otherwise all other bubbles should be shifted by the overlap amount. + if (bubbleIndex == 0 || getBubbleChildCount() == 1) { + translationX = 0f; + } else { + translationX = mIconOverlapAmount; + } } + return mBubbleBarPadding + translationX - getScaleIconShift(); } - private float getCollapsedBubbleTranslationX(int bubbleIndex, int bubbleCount, - boolean onLeft) { - if (bubbleIndex < 0 || bubbleIndex >= bubbleCount) { - return 0; - } - float translationX; - if (onLeft) { - // Shift the first bubble only if there are more bubbles in addition to overflow - translationX = mBubbleBarPadding + (bubbleIndex == 0 && bubbleCount > MAX_VISIBLE_BUBBLES_COLLAPSED - ? mIconOverlapAmount - : 0); - } else { - translationX = mBubbleBarPadding + (bubbleIndex == 0 ? 0 : mIconOverlapAmount); - } - return translationX - getScaleIconShift(); + private float getBubbleTranslationY() { + float viewBottom = mBubbleBarBounds.height() + (isExpanded() ? mPointerSize : 0); + float bubbleBarAnimatedTop = viewBottom - getBubbleBarHeight(); + // When translating X & Y the scale is ignored, so need to deduct it from the translations + return mBubbleOffsetY + bubbleBarAnimatedTop + mBubbleBarPadding - getScaleIconShift(); } /** * Reorders the views to match the provided list. */ public void reorder(List viewOrder) { - if (isExpanded() || mWidthAnimator.isRunning()) { + if (isExpanded() || (mWidthAnimator != null && mWidthAnimator.isRunning())) { mReorderRunnable = () -> doReorder(viewOrder); } else { doReorder(viewOrder); @@ -1014,6 +1339,7 @@ private void doReorder(List viewOrder) { } updateBubblesLayoutProperties(mBubbleBarLocation); updateContentDescription(); + updateDotsAndBadgesIfCollapsed(); } } @@ -1022,7 +1348,7 @@ public void setUpdateSelectedBubbleAfterCollapse( mUpdateSelectedBubbleAfterCollapse = updateSelectedBubbleAfterCollapse; } - void setController(Controller controller) { + public void setController(Controller controller) { mController = controller; } @@ -1033,15 +1359,23 @@ public void setSelectedBubble(BubbleView view) { BubbleView previouslySelectedBubble = mSelectedBubbleView; mSelectedBubbleView = view; mBubbleBarBackground.showArrow(view != null); - // TODO: (b/283309949) remove animation should be implemented first, so than - // arrow - // animation is adjusted, skip animation for now - updateArrowForSelected(previouslySelectedBubble != null); + + // if bubbles are being animated, the arrow position will be set as part of the animation + if (mBubbleAnimator == null) { + updateArrowForSelected(previouslySelectedBubble != null); + } + if (view != null) { + if (isExpanded()) { + view.markSeen(); + } else { + // when collapsed, the selected bubble should show the dot if it has it + view.showDotIfNeeded(/* animate= */ true); + } + } } /** - * Sets the dragged bubble view to correctly apply Z order. Dragged view should - * appear on top + * Sets the dragged bubble view to correctly apply Z order. Dragged view should appear on top */ public void setDraggedBubble(@Nullable BubbleView view) { if (mDraggedBubbleView != null) { @@ -1050,6 +1384,8 @@ public void setDraggedBubble(@Nullable BubbleView view) { mDraggedBubbleView = view; if (view != null) { view.setZ(mDragElevation); + // we started dragging a bubble. reset the bubble that was previously dismissed by drag + mDismissedByDragBubbleView = null; } setIsDragging(view != null); } @@ -1057,18 +1393,15 @@ public void setDraggedBubble(@Nullable BubbleView view) { /** * Update the arrow position to match the selected bubble. * - * @param shouldAnimate whether or not to animate the arrow. If the bar was just - * expanded, this - * should be set to {@code false}. Otherwise set this to - * {@code true}. + * @param shouldAnimate whether or not to animate the arrow. If the bar was just expanded, this + * should be set to {@code false}. Otherwise set this to {@code true}. */ private void updateArrowForSelected(boolean shouldAnimate) { if (mSelectedBubbleView == null) { Log.w(TAG, "trying to update selection arrow without a selected view!"); return; } - // Find the center of the bubble when it's expanded, set the arrow position to - // it. + // Find the center of the bubble when it's expanded, set the arrow position to it. final float tx = arrowPositionForSelectedWhenExpanded(mBubbleBarLocation); final float currentArrowPosition = mBubbleBarBackground.getArrowPositionX(); if (tx == currentArrowPosition) { @@ -1095,6 +1428,9 @@ private void updateArrowForSelected(boolean shouldAnimate) { } private float arrowPositionForSelectedWhenExpanded(BubbleBarLocation bubbleBarLocation) { + if (mBubbleAnimator != null && mBubbleAnimator.isRunning()) { + return mBubbleAnimator.getArrowPosition() + mBubbleBarPadding; + } final int index = indexOfChild(mSelectedBubbleView); final float selectedBubbleTranslationX = getExpandedBubbleTranslationX( index, getChildCount(), bubbleBarLocation.isOnLeft(isLayoutRtl())); @@ -1110,8 +1446,7 @@ private float arrowPositionForSelectedWhenCollapsed(BubbleBarLocation bubbleBarL bubblePosition = index == 0 && getChildCount() > MAX_VISIBLE_BUBBLES_COLLAPSED ? 1 : 0; } else { bubblePosition = index >= MAX_VISIBLE_BUBBLES_COLLAPSED - ? MAX_VISIBLE_BUBBLES_COLLAPSED - 1 - : index; + ? MAX_VISIBLE_BUBBLES_COLLAPSED - 1 : index; } return mBubbleBarPadding + bubblePosition * (mIconOverlapAmount) + getScaledIconSize() / 2f; } @@ -1123,32 +1458,46 @@ public void setOnClickListener(View.OnClickListener listener) { } /** - * The click listener used for the bubble view gets added / removed depending on - * whether - * the bar is expanded or collapsed, this updates whether the listener is set - * based on state. + * The click listener used for the bubble view gets added / removed depending on whether + * the bar is expanded or collapsed, this updates whether the listener is set based on state. */ private void setOrUnsetClickListener() { super.setOnClickListener(mIsBarExpanded ? null : mOnClickListener); } /** - * Sets whether the bubble bar is expanded or collapsed. + * Update bubble bar expanded state. */ public void setExpanded(boolean isBarExpanded) { - if (mIsBarExpanded != isBarExpanded) { - mIsBarExpanded = isBarExpanded; - updateArrowForSelected(/* shouldAnimate= */ false); - setOrUnsetClickListener(); - if (isBarExpanded) { - mWidthAnimator.start(); - } else { - mWidthAnimator.reverse(); - } - updateBubbleAccessibilityStates(); + setExpandedInternal(isBarExpanded, false); + } + + /** + * Update bubble bar expanded state with animation. + *

+ * Also triggers a talkback announcement for accessibility. + */ + public void animateExpanded(boolean isBarExpanded) { + setExpandedInternal(isBarExpanded, true); + } + + private void setExpandedInternal(boolean isBarExpanded, boolean animate) { + if (mIsBarExpanded == isBarExpanded) return; + mIsBarExpanded = isBarExpanded; + updateArrowForSelected(/* shouldAnimate= */ false); + setOrUnsetClickListener(); + if (animate) { + mWidthAnimator = createExpansionAnimator(isBarExpanded); + mWidthAnimator.start(); + announceExpandedStateChange(); + } else { + onExpandedChanged(); } + updateBubbleAccessibilityStates(); + mController.onBubbleBarExpandedStateChanged(mIsBarExpanded); } + /** * Returns whether the bubble bar is expanded. */ @@ -1156,59 +1505,79 @@ public boolean isExpanded() { return mIsBarExpanded; } + /** + * Returns whether the bubble bar is expanding. + */ + public boolean isExpanding() { + return mWidthAnimator != null && mWidthAnimator.isRunning() && mIsBarExpanded; + } + /** * Get width of the bubble bar as if it would be expanded. * - * @return width of the bubble bar in its expanded state, regardless of current - * width + * @return width of the bubble bar in its expanded state, regardless of current width */ public float expandedWidth() { final int childCount = getChildCount(); - // spaces amount is less than child count by 1, or 0 if no child views - final float totalSpace; - final float totalIconSize; - if (mNewBubbleScaleInAnimator != null && mNewBubbleScaleInAnimator.isRunning()) { - // when this animation is running, a new bubble is animating in while the bubble - // bar is - // expanded, so we have at least 2 bubbles in the bubble bar. - final float newBubbleScale = mNewBubbleScaleInAnimator.getAnimatedFraction(); - totalSpace = (childCount - 2 + newBubbleScale) * mExpandedBarIconsSpacing; - totalIconSize = (childCount - 1 + newBubbleScale) * getScaledIconSize(); - } else { - totalSpace = Math.max(childCount - 1, 0) * mExpandedBarIconsSpacing; - totalIconSize = childCount * getScaledIconSize(); + final float horizontalPadding = 2 * mBubbleBarPadding; + if (mBubbleAnimator != null && mBubbleAnimator.isRunning()) { + return mBubbleAnimator.getExpandedWidth() + horizontalPadding; } - return totalIconSize + totalSpace + 2 * mBubbleBarPadding; + // spaces amount is less than child count by 1, or 0 if no child views + final float totalSpace = Math.max(childCount - 1, 0) * mExpandedBarIconsSpacing; + final float totalIconSize = childCount * getScaledIconSize(); + return totalIconSize + totalSpace + horizontalPadding; } - private float collapsedWidth() { - final int childCount = getChildCount(); + /** + * Get width of the bubble bar if it is collapsed + */ + float collapsedWidth() { + final int bubbleChildCount = getBubbleChildCount(); final float horizontalPadding = 2 * mBubbleBarPadding; - // If there are more than 2 bubbles, the first 2 should be visible when - // collapsed. - // Otherwise just the first bubble should be visible because we don't show the - // overflow. - return childCount > MAX_VISIBLE_BUBBLES_COLLAPSED - ? getScaledIconSize() + mIconOverlapAmount + horizontalPadding + // If there are more than 2 bubbles, the first 2 should be visible when collapsed, + // excluding the overflow. + return bubbleChildCount >= MAX_VISIBLE_BUBBLES_COLLAPSED + ? getCollapsedWidthWithMaxVisibleBubbles() : getScaledIconSize() + horizontalPadding; } + float getCollapsedWidthWithMaxVisibleBubbles() { + return getScaledIconSize() + mIconOverlapAmount + 2 * mBubbleBarPadding; + } + + float getCollapsedWidthForIconSizeAndPadding(int iconSize, int bubbleBarPadding) { + final int bubbleChildCount = Math.min(getBubbleChildCount(), MAX_VISIBLE_BUBBLES_COLLAPSED); + if (bubbleChildCount == 0) return 0; + final int spacesCount = bubbleChildCount - 1; + final float horizontalPadding = 2 * bubbleBarPadding; + return iconSize * bubbleChildCount + mIconOverlapAmount * spacesCount + horizontalPadding; + } + + /** Returns the child count excluding the overflow if it's present. */ + int getBubbleChildCount() { + return hasOverflow() ? getChildCount() - 1 : getChildCount(); + } + private float getBubbleBarExpandedHeight() { return getBubbleBarCollapsedHeight() + mPointerSize; } + float getArrowHeight() { + return mPointerSize; + } + float getBubbleBarCollapsedHeight() { // the pointer is invisible when collapsed return getScaledIconSize() + mBubbleBarPadding * 2; } /** - * Returns whether the given MotionEvent, *in screen coordinates*, is within - * bubble bar + * Returns whether the given MotionEvent, *in screen coordinates*, is within bubble bar * touch bounds. */ public boolean isEventOverAnyItem(MotionEvent ev) { - if (getVisibility() == View.VISIBLE) { + if (getVisibility() == VISIBLE) { getBoundsOnScreen(mTempRect); return mTempRect.contains((int) ev.getX(), (int) ev.getY()); } @@ -1217,9 +1586,7 @@ public boolean isEventOverAnyItem(MotionEvent ev) { @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - if (mIsAnimatingNewBubble) { - mController.onBubbleBarTouchedWhileAnimating(); - } + mController.onBubbleBarTouched(); if (!mIsBarExpanded) { // When the bar is collapsed, all taps on it should expand it. return true; @@ -1227,13 +1594,8 @@ public boolean onInterceptTouchEvent(MotionEvent ev) { return super.onInterceptTouchEvent(ev); } - /** Whether a new bubble is currently animating. */ - public boolean isAnimatingNewBubble() { - return mIsAnimatingNewBubble; - } - - private boolean hasOverview() { - // Overview is always the last bubble + private boolean hasOverflow() { + // Overflow is always the last bubble View lastChild = getChildAt(getChildCount() - 1); if (lastChild instanceof BubbleView bubbleView) { return bubbleView.getBubble() instanceof BubbleBarOverflow; @@ -1242,22 +1604,39 @@ private boolean hasOverview() { } private void updateBubbleAccessibilityStates() { - final int childA11y; if (mIsBarExpanded) { // Bar is expanded, focus on the bubbles setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); - childA11y = View.IMPORTANT_FOR_ACCESSIBILITY_YES; + + // Set up a11y navigation order. Get list of child views in the order they are shown + // on screen. And use that to set up navigation so that swiping left focuses the view + // on the left and swiping right focuses view on the right. + View prevChild = null; + for (View childView : getChildViewsInOnScreenOrder()) { + childView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); + childView.setFocusable(true); + final View finalPrevChild = prevChild; + // Always need to set a new delegate to clear out any previous. + childView.setAccessibilityDelegate(new AccessibilityDelegate() { + @Override + public void onInitializeAccessibilityNodeInfo(View host, + AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfo(host, info); + if (finalPrevChild != null) { + info.setTraversalAfter(finalPrevChild); + } + } + }); + prevChild = childView; + } } else { // Bar is collapsed, only focus on the bar setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); - childA11y = View.IMPORTANT_FOR_ACCESSIBILITY_NO; - } - for (int i = 0; i < getChildCount(); i++) { - getChildAt(i).setImportantForAccessibility(childA11y); - // Only allowing focusing on bubbles when bar is expanded. Otherwise, in - // talkback mode, - // bubbles can be navigates to in collapsed mode. - getChildAt(i).setFocusable(mIsBarExpanded); + for (int i = 0; i < getChildCount(); i++) { + View childView = getChildAt(i); + childView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); + childView.setFocusable(false); + } } } @@ -1266,7 +1645,7 @@ private void updateContentDescription() { CharSequence contentDesc = firstChild != null ? firstChild.getContentDescription() : ""; // Don't count overflow if it exists - int bubbleCount = getChildCount() - (hasOverview() ? 1 : 0); + int bubbleCount = getChildCount() - (hasOverflow() ? 1 : 0); if (bubbleCount > 1) { contentDesc = getResources().getString(R.string.bubble_bar_description_multiple_bubbles, contentDesc, bubbleCount - 1); @@ -1274,6 +1653,26 @@ private void updateContentDescription() { setContentDescription(contentDesc); } + private void announceExpandedStateChange() { + final CharSequence selectedBubbleContentDesc; + if (mSelectedBubbleView != null) { + selectedBubbleContentDesc = mSelectedBubbleView.getContentDescription(); + } else { + selectedBubbleContentDesc = getResources().getString( + R.string.bubble_bar_bubble_fallback_description); + } + + final String msg; + if (mIsBarExpanded) { + msg = getResources().getString(R.string.bubble_bar_accessibility_announce_expand, + selectedBubbleContentDesc); + } else { + msg = getResources().getString(R.string.bubble_bar_accessibility_announce_collapse, + selectedBubbleContentDesc); + } + announceForAccessibility(msg); + } + private boolean isIconSizeOrPaddingUpdated(float newIconSize, float newBubbleBarPadding) { return isIconSizeUpdated(newIconSize) || isPaddingUpdated(newBubbleBarPadding); } @@ -1290,8 +1689,7 @@ private void addAnimationCallBacks(@NonNull ValueAnimator animator, @Nullable Runnable onStart, @Nullable Runnable onEnd, @Nullable ValueAnimator.AnimatorUpdateListener onUpdate) { - if (onUpdate != null) - animator.addUpdateListener(onUpdate); + if (onUpdate != null) animator.addUpdateListener(onUpdate); animator.addListener(new Animator.AnimatorListener() { @Override public void onAnimationCancel(Animator animator) { @@ -1300,14 +1698,12 @@ public void onAnimationCancel(Animator animator) { @Override public void onAnimationStart(Animator animator) { - if (onStart != null) - onStart.run(); + if (onStart != null) onStart.run(); } @Override public void onAnimationEnd(Animator animator) { - if (onEnd != null) - onEnd.run(); + if (onEnd != null) onEnd.run(); } @Override @@ -1317,16 +1713,136 @@ public void onAnimationRepeat(Animator animator) { }); } + /** Dumps the current state of BubbleBarView. */ + public void dump(PrintWriter pw) { + pw.println("BubbleBarView state:"); + pw.println(" bubbleBarLocation: " + mBubbleBarLocation); + pw.println(" visibility: " + getVisibility()); + pw.println(" alpha: " + getAlpha()); + pw.println(" translationY: " + getTranslationY()); + pw.println(" childCount: " + getChildCount()); + pw.println(" hasOverflow: " + hasOverflow()); + for (BubbleView bubbleView : getBubbles()) { + BubbleBarItem bubble = bubbleView.getBubble(); + String key = bubble == null ? "null" : bubble.getKey(); + pw.println(" bubble key: " + key); + } + pw.println(" isExpanded: " + isExpanded()); + if (mBubbleAnimator != null) { + pw.println(" mBubbleAnimator.isRunning(): " + mBubbleAnimator.isRunning()); + pw.println(" mBubbleAnimator is null"); + } + pw.println(" mDragging: " + mDragging); + } + + private List getBubbles() { + List bubbles = new ArrayList<>(); + for (int i = 0; i < getChildCount(); i++) { + View child = getChildAt(i); + if (child instanceof BubbleView bubble) { + bubbles.add(bubble); + } + } + return bubbles; + } + + /** Creates an animator based on the expanding or collapsing action. */ + private ValueAnimator createExpansionAnimator(boolean expanding) { + float startValue = expanding ? 0 : 1; + if ((mWidthAnimator != null && mWidthAnimator.isRunning())) { + startValue = (float) mWidthAnimator.getAnimatedValue(); + mWidthAnimator.cancel(); + } + float endValue = expanding ? 1 : 0; + ValueAnimator animator = ValueAnimator.ofFloat(startValue, endValue); + animator.setDuration(WIDTH_ANIMATION_DURATION_MS); + animator.setInterpolator(Interpolators.EMPHASIZED); + addAnimationCallBacks(animator, + /* onStart= */ () -> mBubbleBarBackground.showArrow(true), + /* onEnd= */ this::onExpandedChanged, + /* onUpdate= */ anim -> { + updateBubblesLayoutProperties(mBubbleBarLocation); + invalidate(); + }); + return animator; + } + + private void onExpandedChanged() { + mBubbleBarBackground.showArrow(mIsBarExpanded); + if (!mIsBarExpanded && mReorderRunnable != null) { + mReorderRunnable.run(); + mReorderRunnable = null; + } + // If the bar was just collapsed and the overflow was the last bubble that was + // selected, set the first bubble as selected. + if (!mIsBarExpanded && mUpdateSelectedBubbleAfterCollapse != null + && mSelectedBubbleView != null + && mSelectedBubbleView.getBubble() instanceof BubbleBarOverflow) { + BubbleView firstBubble = (BubbleView) getChildAt(0); + mUpdateSelectedBubbleAfterCollapse.accept(firstBubble.getBubble().getKey()); + } + // If the bar was just expanded, remove the dot from the selected bubble. + if (mIsBarExpanded && mSelectedBubbleView != null) { + mSelectedBubbleView.markSeen(); + } + updateLayoutParams(); + } + + /** + * Returns the distance between the top left corner of the bubble bar to the center of the dot + * of the selected bubble. + */ + PointF getSelectedBubbleDotDistanceFromTopLeft() { + if (mSelectedBubbleView == null) { + return new PointF(0, 0); + } + final int indexOfSelectedBubble = indexOfChild(mSelectedBubbleView); + final boolean onLeft = mBubbleBarLocation.isOnLeft(isLayoutRtl()); + final float selectedBubbleTx = isExpanded() + ? getExpandedBubbleTranslationX(indexOfSelectedBubble, getChildCount(), onLeft) + : getCollapsedBubbleTranslationX(indexOfSelectedBubble, getChildCount(), onLeft); + PointF selectedBubbleDotCenter = mSelectedBubbleView.getDotCenter(); + + return new PointF( + selectedBubbleTx + selectedBubbleDotCenter.x, + mBubbleBarPadding + mPointerSize + selectedBubbleDotCenter.y); + } + + int getSelectedBubbleDotColor() { + return mSelectedBubbleView == null ? 0 : mSelectedBubbleView.getDotColor(); + } + + int getPointerSize() { + return mPointerSize; + } + + float getBubbleElevation() { + return mBubbleElevation; + } + /** Interface for BubbleBarView to communicate with its controller. */ - interface Controller { + public interface Controller { /** Returns the translation Y that the bubble bar should have. */ float getBubbleBarTranslationY(); - /** - * Notifies the controller that the bubble bar was touched while it was - * animating. - */ - void onBubbleBarTouchedWhileAnimating(); + /** Notifies the controller that the bubble bar was touched. */ + void onBubbleBarTouched(); + + /** Requests the controller to expand bubble bar */ + void expandBubbleBar(); + + /** Requests the controller to dismiss the bubble bar */ + void dismissBubbleBar(); + + /** Requests the controller to update bubble bar location to the given value */ + void updateBubbleBarLocation(BubbleBarLocation location, + @BubbleBarLocation.UpdateSource int source); + + /** Notifies the controller that bubble bar is being dragged */ + void setIsDragging(boolean dragging); + + /** Notifies the controller that bubble bar expanded state changed */ + void onBubbleBarExpandedStateChanged(boolean expanded); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java index 8e25c5c5d14..5f2b0b1b3b0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java @@ -18,6 +18,16 @@ import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; +import static com.android.launcher3.Flags.refactorTaskbarUiState; +import static com.android.launcher3.Utilities.mapRange; +import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_BUBBLES; +import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_PERSISTENT; +import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_TRANSIENT; + +import android.animation.Animator; +import android.animation.AnimatorSet; +import android.content.Intent; +import android.content.pm.ShortcutInfo; import static java.util.stream.Collectors.toList; import android.content.res.Resources; @@ -27,33 +37,44 @@ import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; -import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.widget.FrameLayout; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.app.animation.Interpolators; import com.android.launcher3.R; import com.android.launcher3.anim.AnimatedFloat; +import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; +import com.android.launcher3.deviceprofile.TaskbarProfile; import com.android.launcher3.taskbar.TaskbarActivityContext; +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController; import com.android.launcher3.taskbar.TaskbarControllers; import com.android.launcher3.taskbar.TaskbarInsetsController; +import com.android.launcher3.taskbar.TaskbarSharedState; import com.android.launcher3.taskbar.TaskbarStashController; +import com.android.launcher3.taskbar.TaskbarUiState; import com.android.launcher3.taskbar.bubbles.animation.BubbleBarViewAnimator; +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutController; +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutPositioner; +import com.android.launcher3.taskbar.bubbles.flyout.FlyoutCallbacks; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.MultiValueAlpha; import com.android.quickstep.SystemUiProxy; -import com.android.wm.shell.common.bubbles.BubbleBarLocation; +import com.android.wm.shell.Flags; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import java.io.PrintWriter; import java.util.List; import java.util.Objects; import java.util.function.Consumer; /** - * Controller for {@link BubbleBarView}. Manages the visibility of the bubble - * bar as well as + * Controller for {@link BubbleBarView}. Manages the visibility of the bubble bar as well as * responding to changes in bubble state provided by BubbleBarController. */ public class BubbleBarViewController { @@ -62,10 +83,17 @@ public class BubbleBarViewController { private static final float APP_ICON_SMALL_DP = 44f; private static final float APP_ICON_MEDIUM_DP = 48f; private static final float APP_ICON_LARGE_DP = 52f; + /** The dot size is defined as a percentage of the icon size. */ + private static final float DOT_TO_BUBBLE_SIZE_RATIO = 0.228f; + public static final int TASKBAR_FADE_IN_DURATION_MS = 150; + public static final int TASKBAR_FADE_IN_DELAY_MS = 50; + public static final int TASKBAR_FADE_OUT_DURATION_MS = 100; private final SystemUiProxy mSystemUiProxy; private final TaskbarActivityContext mActivity; private final BubbleBarView mBarView; private int mIconSize; + private int mBubbleBarPadding; + private final int mDragElevation; // Initialized in init. private BubbleStashController mBubbleStashController; @@ -73,55 +101,149 @@ public class BubbleBarViewController { private BubbleDragController mBubbleDragController; private TaskbarStashController mTaskbarStashController; private TaskbarInsetsController mTaskbarInsetsController; + private TaskbarAutohideSuspendController mTaskbarAutohideSuspendController; + private TaskbarViewPropertiesProvider mTaskbarViewPropertiesProvider; private View.OnClickListener mBubbleClickListener; - private View.OnClickListener mBubbleBarClickListener; + private BubbleView.Controller mBubbleViewController; + private BubbleBarOverflow mOverflowBubble; - // These are exposed to {@link BubbleStashController} to animate for - // stashing/un-stashing + // These are exposed to {@link BubbleStashController} to animate for stashing/un-stashing private final MultiValueAlpha mBubbleBarAlpha; - private final AnimatedFloat mBubbleBarScale = new AnimatedFloat(this::updateScale); + private final AnimatedFloat mBubbleBarBubbleAlpha = new AnimatedFloat(this::updateBubbleAlpha); + private final AnimatedFloat mBubbleBarBackgroundAlpha = new AnimatedFloat( + this::updateBackgroundAlpha); + private final AnimatedFloat mBubbleBarScaleX = new AnimatedFloat(this::updateScaleX); + private final AnimatedFloat mBubbleBarScaleY = new AnimatedFloat(this::updateScaleY); + private final AnimatedFloat mBubbleBarBackgroundScaleX = new AnimatedFloat( + this::updateBackgroundScaleX); + private final AnimatedFloat mBubbleBarBackgroundScaleY = new AnimatedFloat( + this::updateBackgroundScaleY); private final AnimatedFloat mBubbleBarTranslationY = new AnimatedFloat( this::updateTranslationY); + private final AnimatedFloat mBubbleOffsetY = new AnimatedFloat( + this::updateBubbleOffsetY); + private final AnimatedFloat mBubbleBarPinning = new AnimatedFloat(pinningProgress -> { + updateTranslationY(); + setBubbleBarScaleAndPadding(pinningProgress); + }); + private final TaskbarUiState mTaskbarUiState; + private final Rect mTempRect = new Rect(); + private final View.OnLayoutChangeListener mBubbleBarViewOnLayoutChangeListener = + new View.OnLayoutChangeListener() { + @Override + public void onLayoutChange(View v, int left, int top, int right, int bottom, + int oldLeft, int oldTop, int oldRight, int oldBottom) { + v.getBoundsOnScreen(mTempRect); + if (mTaskbarUiState != null) { + mTaskbarUiState.setBubbleBarRect(mTempRect); + mTaskbarUiState.setIsBubbleBarViewVisible(v.getVisibility() == VISIBLE); + } + } + }; // Modified when swipe up is happening on the bubble bar or task bar. private float mBubbleBarSwipeUpTranslationY; - + // Modified when bubble bar is springing back into the stash handle. + private float mBubbleBarStashTranslationY; + // Minimum distance between the BubbleBar and the taskbar + private final int mBubbleBarTaskbarMinDistance; // Whether the bar is hidden for a sysui state. private boolean mHiddenForSysui; // Whether the bar is hidden because there are no bubbles. private boolean mHiddenForNoBubbles = true; + // Whether the bar is hidden when stashed + private boolean mHiddenForStashed; private boolean mShouldShowEducation; + public boolean mOverflowAdded; + // While a drag actions happens, bubble bar should be unstashed to show as a target, this + // indicates if stash state should be applied after the drag action is complete. + private Boolean mStashedBeforeDropTarget = null; + + /** This field is used solely to track the bubble bar location prior to the start of the drag */ + private @Nullable BubbleBarLocation mBubbleBarDragLocation; private BubbleBarViewAnimator mBubbleBarViewAnimator; + private final FrameLayout mBubbleBarContainer; + private BubbleBarFlyoutController mBubbleBarFlyoutController; + private DragToBubbleController mDragToBubbleController; + private TaskbarSharedState mTaskbarSharedState; + private final TimeSource mTimeSource = System::currentTimeMillis; + private final int mTaskbarTranslationDelta; @Nullable private BubbleBarBoundsChangeListener mBoundsChangeListener; - public BubbleBarViewController(TaskbarActivityContext activity, BubbleBarView barView) { + public BubbleBarViewController(TaskbarActivityContext activity, TaskbarUiState taskbarUiState, + BubbleBarView barView, + FrameLayout bubbleBarContainer) { mActivity = activity; + mTaskbarUiState = taskbarUiState; mBarView = barView; + if (refactorTaskbarUiState()) { + mBarView.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() { + @Override + public void onChildViewAdded(View view, View view1) { + onChildViewCountChanged(); + } + + @Override + public void onChildViewRemoved(View view, View view1) { + onChildViewCountChanged(); + } + + private void onChildViewCountChanged() { + taskbarUiState.setHasBubble(mBarView.getBubbleChildCount() > 0); + } + }); + mBarView.addOnLayoutChangeListener(mBubbleBarViewOnLayoutChangeListener); + mBarView.getBoundsOnScreen(mTempRect); + mTaskbarUiState.setBubbleBarRect(mTempRect); + mTaskbarUiState.setIsBubbleBarViewVisible(mBarView.getVisibility() == VISIBLE); + } + mBubbleBarContainer = bubbleBarContainer; mSystemUiProxy = SystemUiProxy.INSTANCE.get(mActivity); mBubbleBarAlpha = new MultiValueAlpha(mBarView, 1 /* num alpha channels */); - mIconSize = activity.getResources().getDimensionPixelSize( - R.dimen.bubblebar_icon_size); + Resources res = activity.getResources(); + mIconSize = res.getDimensionPixelSize(R.dimen.bubblebar_icon_size); + mBubbleBarTaskbarMinDistance = res.getDimensionPixelSize( + R.dimen.bubblebar_transient_taskbar_min_distance); + mDragElevation = res.getDimensionPixelSize(R.dimen.dragged_bubble_elevation); + mTaskbarTranslationDelta = getBubbleBarTranslationDeltaForTaskbar(activity); } - public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) { + /** Initializes controller. */ + public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers, + TaskbarViewPropertiesProvider taskbarViewPropertiesProvider) { + mTaskbarSharedState = controllers.getSharedState(); mBubbleStashController = bubbleControllers.bubbleStashController; mBubbleBarController = bubbleControllers.bubbleBarController; mBubbleDragController = bubbleControllers.bubbleDragController; + mDragToBubbleController = bubbleControllers.dragToBubbleController; mTaskbarStashController = controllers.taskbarStashController; mTaskbarInsetsController = controllers.taskbarInsetsController; - mBubbleBarViewAnimator = new BubbleBarViewAnimator(mBarView, mBubbleStashController); - + mTaskbarAutohideSuspendController = controllers.taskbarAutohideSuspendController; + mBubbleBarFlyoutController = new BubbleBarFlyoutController( + mBubbleBarContainer, createFlyoutPositioner(), createFlyoutCallbacks()); + mBubbleBarViewAnimator = new BubbleBarViewAnimator( + mBarView, mBubbleStashController, mBubbleBarFlyoutController, + createBubbleBarParentViewController(), mBubbleBarController::showExpandedView, + () -> setHiddenForBubbles(false), this::onBubbleAnimationEnded); + mTaskbarViewPropertiesProvider = taskbarViewPropertiesProvider; + onBubbleBarConfigurationChanged(/* animate= */ false); mActivity.addOnDeviceProfileChangeListener( - dp -> updateBubbleBarIconSize(dp.taskbarIconSize, /* animate= */ true)); - updateBubbleBarIconSize(mActivity.getDeviceProfile().taskbarIconSize, /* animate= */ false); - mBubbleBarScale.updateValue(1f); - mBubbleClickListener = v -> onBubbleClicked(v); - mBubbleBarClickListener = v -> onBubbleBarClicked(); + dp -> onBubbleBarConfigurationChanged(/* animate= */ true)); + mBubbleBarScaleY.updateValue(1f); + mBubbleClickListener = v -> onBubbleClicked((BubbleView) v); mBubbleDragController.setupBubbleBarView(mBarView); - mBarView.setOnClickListener(mBubbleBarClickListener); + mOverflowBubble = bubbleControllers.bubbleCreator.createOverflow(mBarView); + if (!Flags.enableOptionalBubbleOverflow()) { + showOverflow(true); + } + if (!mBubbleStashController.isTransientTaskBar()) { + // TODO(b/380274085) for transient taskbar mode, the click is also handled by the input + // consumer. This check can be removed once b/380274085 is fixed. + mBarView.setOnClickListener(v -> animateExpanded(!mBarView.isExpanded())); + } mBarView.addOnLayoutChangeListener( (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { mTaskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged(); @@ -129,6 +251,10 @@ public void init(TaskbarControllers controllers, BubbleControllers bubbleControl mBoundsChangeListener.onBoundsChanged(); } }); + float pinningValue = mActivity.isTransientTaskbar() + ? PINNING_TRANSIENT + : PINNING_PERSISTENT; + mBubbleBarPinning.updateValue(pinningValue); mBarView.setController(new BubbleBarView.Controller() { @Override public float getBubbleBarTranslationY() { @@ -136,14 +262,165 @@ public float getBubbleBarTranslationY() { } @Override - public void onBubbleBarTouchedWhileAnimating() { - BubbleBarViewController.this.onBubbleBarTouchedWhileAnimating(); + public void onBubbleBarTouched() { + if (isAnimatingNewBubble()) { + interruptAnimationForTouch(); + } + } + + @Override + public void expandBubbleBar() { + BubbleBarViewController.this.animateExpanded( + /* isExpanded= */ true, /* maybeShowEdu*/ true); + } + + @Override + public void dismissBubbleBar() { + onDismissAllBubbles(); + } + + @Override + public void updateBubbleBarLocation(BubbleBarLocation location, + @BubbleBarLocation.UpdateSource int source) { + mBubbleBarController.updateBubbleBarLocation(location, source); + } + + @Override + public void setIsDragging(boolean dragging) { + mBubbleBarContainer.setElevation(dragging ? mDragElevation : 0); + } + + @Override + public void onBubbleBarExpandedStateChanged(boolean expanded) { + ensureTaskbarWindowVisibilityForBubbles(expanded); + if (expanded && !mTaskbarStashController.isStashed()) { + mTaskbarStashController.updateAndAnimateTransientTaskbar(true /* stash */, + false /* shouldBubblesFollow */); + } } }); + + mBubbleViewController = new BubbleView.Controller() { + @Override + public BubbleBarLocation getBubbleBarLocation() { + return BubbleBarViewController.this.getBubbleBarLocation(); + } + + @Override + public void dismiss(BubbleView bubble) { + if (bubble.getBubble() != null) { + notifySysUiBubbleDismissed(bubble.getBubble()); + } + onBubbleDismissed(bubble); + } + + @Override + public void collapse() { + collapseBubbleBar(); + } + + @Override + public void updateBubbleBarLocation(BubbleBarLocation location, + @BubbleBarLocation.UpdateSource int source) { + mBubbleBarController.updateBubbleBarLocation(location, source); + } + }; + } + + /** Called when animations for new and updated bubbles ended. */ + private void onBubbleAnimationEnded() { + ensureTaskbarWindowVisibilityForBubbles(isExpanded()); + } + + /** Returns animated float property responsible for pinning transition animation. */ + public AnimatedFloat getBubbleBarPinning() { + return mBubbleBarPinning; + } + + private BubbleBarFlyoutPositioner createFlyoutPositioner() { + return new BubbleBarFlyoutPositioner() { + + @Override + public boolean isOnLeft() { + boolean shouldRevertLocation = + mBarView.isShowingDropTarget() && isDropTargetLocationDiffersFromOriginal(); + boolean isOnLeft = mBarView.getBubbleBarLocation().isOnLeft(mBarView.isLayoutRtl()); + return shouldRevertLocation != isOnLeft; + } + + @Override + public float getTargetTy() { + return mBarView.getTranslationY() - mBarView.getHeight(); + } + + @Override + @NonNull + public PointF getDistanceToCollapsedPosition() { + // the flyout animates from the selected bubble dot. calculate the distance it needs + // to translate itself to its starting position. + PointF distanceToDotCenter = mBarView.getSelectedBubbleDotDistanceFromTopLeft(); + + // if we're gravitating left, return the distance between the top left corner of the + // bubble bar and the bottom left corner of the dot. + // if we're gravitating right, return the distance between the top right corner of + // the bubble bar and the bottom right corner of the dot. + float distanceX = isOnLeft() + ? distanceToDotCenter.x - getCollapsedSize() / 2 + : mBarView.getWidth() - distanceToDotCenter.x - getCollapsedSize() / 2; + float distanceY = distanceToDotCenter.y + getCollapsedSize() / 2; + return new PointF(distanceX, distanceY); + } + + @Override + public float getCollapsedSize() { + return mIconSize * DOT_TO_BUBBLE_SIZE_RATIO; + } + + @Override + public int getCollapsedColor() { + return mBarView.getSelectedBubbleDotColor(); + } + + @Override + public float getCollapsedElevation() { + return mBarView.getBubbleElevation(); + } + + @Override + public float getDistanceToRevealTriangle() { + return getDistanceToCollapsedPosition().y - mBarView.getPointerSize(); + } + }; + } + + private FlyoutCallbacks createFlyoutCallbacks() { + return new FlyoutCallbacks() { + @Override + public void flyoutClicked() { + interruptAnimationForTouch(); + animateExpanded(/* isExpanded= */ true, /* maybeShowEdu*/ true); + } + }; } - private void onBubbleClicked(View v) { - BubbleBarItem bubble = ((BubbleView) v).getBubble(); + private BubbleBarParentViewHeightUpdateNotifier createBubbleBarParentViewController() { + return new BubbleBarParentViewHeightUpdateNotifier() { + @Override + public void updateTopBoundary() { + mActivity.setTaskbarWindowForAnimatingBubble(); + } + }; + } + + /** Returns the overflow bubble. */ + public BubbleBarOverflow getOverflowBubble() { + return mOverflowBubble; + } + + private void onBubbleClicked(BubbleView bubbleView) { + if (mBubbleBarPinning.isAnimating()) return; + bubbleView.markSeen(); + BubbleBarItem bubble = bubbleView.getBubble(); if (bubble == null) { Log.e(TAG, "bubble click listener, bubble was null"); } @@ -151,19 +428,32 @@ private void onBubbleClicked(View v) { final String currentlySelected = mBubbleBarController.getSelectedBubbleKey(); if (mBarView.isExpanded() && Objects.equals(bubble.getKey(), currentlySelected)) { // Tapping the currently selected bubble while expanded collapses the view. - setExpanded(false); - mBubbleStashController.stashBubbleBar(); + collapseBubbleBar(); } else { mBubbleBarController.showAndSelectBubble(bubble); } } - private void onBubbleBarTouchedWhileAnimating() { - mBubbleBarViewAnimator.onBubbleBarTouchedWhileAnimating(); + /** Interrupts the running animation for a touch event on the bubble bar or flyout. */ + private void interruptAnimationForTouch() { + mBubbleBarViewAnimator.interruptForTouch(); mBubbleStashController.onNewBubbleAnimationInterrupted(false, mBarView.getTranslationY()); } - private void onBubbleBarClicked() { + private void collapseBubbleBar() { + animateExpanded(false); + mBubbleStashController.stashBubbleBar(); + } + + /** Notifies that the stash state is changing. */ + public void onStashStateChanging() { + if (isAnimatingNewBubble()) { + mBubbleBarViewAnimator.onStashStateChangingWhileAnimating(); + } + } + + /** Shows the education view if it was previously requested. */ + private boolean maybeShowEduView() { if (mShouldShowEducation) { mShouldShowEducation = false; // Get the bubble bar bounds on screen @@ -173,26 +463,20 @@ private void onBubbleBarClicked() { Point position = new Point(bounds.centerX(), bounds.top); // Show user education relative to the reference point mSystemUiProxy.showUserEducation(position); - } else { - // ensure that the bubble bar has the correct translation. we may have just - // interrupted - // the animation by touching the bubble bar. - mBubbleBarTranslationY.animateToValue(mBubbleStashController.getBubbleBarTranslationY()) - .start(); - setExpanded(true); + return true; } + return false; } - /** Notifies that the stash state is changing. */ - public void onStashStateChanging() { + /** Notifies that the IME became visible. */ + public void onImeVisible() { if (isAnimatingNewBubble()) { - mBubbleBarViewAnimator.onStashStateChangingWhileAnimating(); + mBubbleBarViewAnimator.interruptForIme(); } } // - // The below animators are exposed to BubbleStashController so it can manage the - // stashing + // The below animators are exposed to BubbleStashController so it can manage the stashing // animation. // @@ -200,18 +484,72 @@ public MultiPropertyFactory getBubbleBarAlpha() { return mBubbleBarAlpha; } - public AnimatedFloat getBubbleBarScale() { - return mBubbleBarScale; + public AnimatedFloat getBubbleBarBubbleAlpha() { + return mBubbleBarBubbleAlpha; + } + + public AnimatedFloat getBubbleBarBackgroundAlpha() { + return mBubbleBarBackgroundAlpha; + } + + public AnimatedFloat getBubbleBarScaleX() { + return mBubbleBarScaleX; + } + + public AnimatedFloat getBubbleBarScaleY() { + return mBubbleBarScaleY; + } + + public AnimatedFloat getBubbleBarBackgroundScaleX() { + return mBubbleBarBackgroundScaleX; + } + + public AnimatedFloat getBubbleBarBackgroundScaleY() { + return mBubbleBarBackgroundScaleY; } public AnimatedFloat getBubbleBarTranslationY() { return mBubbleBarTranslationY; } - float getBubbleBarCollapsedHeight() { + public AnimatedFloat getBubbleOffsetY() { + return mBubbleOffsetY; + } + + public float getBubbleBarCollapsedWidth() { + return mBarView.collapsedWidth(); + } + + public float getBubbleBarCollapsedHeight() { return mBarView.getBubbleBarCollapsedHeight(); } + /** Returns the bubble bar arrow height.*/ + public float getBubbleBarArrowHeight() { + return mBarView.getArrowHeight(); + } + + /** + * @see BubbleBarView#getRelativePivotX() + */ + public float getBubbleBarRelativePivotX() { + return mBarView.getRelativePivotX(); + } + + /** + * @see BubbleBarView#getRelativePivotY() + */ + public float getBubbleBarRelativePivotY() { + return mBarView.getRelativePivotY(); + } + + /** + * @see BubbleBarView#setRelativePivot(float, float) + */ + public void setBubbleBarRelativePivot(float x, float y) { + mBarView.setRelativePivot(x, y); + } + /** * Whether the bubble bar is visible or not. */ @@ -221,7 +559,7 @@ public boolean isBubbleBarVisible() { /** Whether the bubble bar has bubbles. */ public boolean hasBubbles() { - return mBubbleBarController.getSelectedBubbleKey() != null; + return mBarView.getBubbleChildCount() > 0; } /** @@ -231,6 +569,21 @@ public BubbleBarLocation getBubbleBarLocation() { return mBarView.getBubbleBarLocation(); } + /** + * @return the max collapsed width for the bubble bar. + */ + public float getCollapsedWidthWithMaxVisibleBubbles() { + return mBarView.getCollapsedWidthWithMaxVisibleBubbles(); + } + + /** + * @return {@code true} if bubble bar is on the left edge of the screen, {@code false} if on + * the right + */ + public boolean isBubbleBarOnLeft() { + return mBarView.getBubbleBarLocation().isOnLeft(mBarView.isLayoutRtl()); + } + /** * Update bar {@link BubbleBarLocation} */ @@ -239,16 +592,105 @@ public void setBubbleBarLocation(BubbleBarLocation bubbleBarLocation) { } /** - * Animate bubble bar to the given location. The location change is transient. - * It does not + * Animate bubble bar to the given location. The location change is transient. It does not * update the state of the bubble bar. - * To update bubble bar pinned location, use - * {@link #setBubbleBarLocation(BubbleBarLocation)}. + * To update bubble bar pinned location, use {@link #setBubbleBarLocation(BubbleBarLocation)}. */ public void animateBubbleBarLocation(BubbleBarLocation bubbleBarLocation) { mBarView.animateToBubbleBarLocation(bubbleBarLocation); } + /** Return animator for animating bubble bar in. */ + public Animator animateBubbleBarLocationIn(BubbleBarLocation fromLocation, + BubbleBarLocation toLocation) { + return mBarView.animateToBubbleBarLocationIn(fromLocation, toLocation); + } + + /** Return animator for animating bubble bar out. */ + public Animator animateBubbleBarLocationOut(BubbleBarLocation toLocation) { + return mBarView.animateToBubbleBarLocationOut(toLocation); + } + + /** Returns whether the Bubble Bar is currently displaying a drop target. */ + public boolean isShowingDropTarget() { + return mBarView.isShowingDropTarget(); + } + + /** Tells bubble bar view if it should show the drop target. */ + public void setShowingDropTarget(boolean showingDropTarget) { + mBarView.showDropTarget(showingDropTarget); + } + + /** + * Called while a drag action is happening and the bubble bar drop target should be + * shown at a different location or hidden (e.g. user has dragged to a new bubble + * location or is no longer in a bubble drop zone). If the user has bubbles, the + * bubble bar shows a highlight, if the user has no bubbles a target is shown. + * + * @param bubbleBarLocation - the location to show the target at, or null if the user + * is not in a bubble drop zone and bubble targets should be hidden. + */ + public void showBubbleBarDropTargetAt(@Nullable BubbleBarLocation bubbleBarLocation) { + setShowingDropTarget(bubbleBarLocation != null); + if (hasBubbles()) { + if (bubbleBarLocation == null) { + restoreBubbleBarStateBeforeDropTarget(); + } else { + applyBubbleBarDropTargetLocationUpdate(bubbleBarLocation); + } + } else { + mDragToBubbleController.showShellBubbleBarDropTargetAt(bubbleBarLocation); + } + } + + /** Applies bubble bar drop target location update. */ + private void applyBubbleBarDropTargetLocationUpdate( + @NonNull BubbleBarLocation bubbleBarLocation) { + if (mStashedBeforeDropTarget == null) { + mStashedBeforeDropTarget = mBubbleStashController.isStashed(); + } + mBubbleBarDragLocation = bubbleBarLocation; + if (mStashedBeforeDropTarget) { + mBubbleStashController.showBubbleBarAtLocation( + /* fromLocation = */ getBubbleBarLocation(), + /* toLocation = */ mBubbleBarDragLocation + ); + } else if (isDropTargetLocationDiffersFromOriginal()) { + animateBubbleBarLocation(bubbleBarLocation); + } + } + + /** Restores bubble bar state to its original before showing as a drop target. */ + private void restoreBubbleBarStateBeforeDropTarget() { + if (mStashedBeforeDropTarget != null) { + if (mStashedBeforeDropTarget && mBubbleBarDragLocation != null) { + // bubble bar was stashed - stash to original location + mBubbleStashController.stashBubbleBarToLocation( + /* fromLocation = */ mBubbleBarDragLocation, + /* toLocation = */ getBubbleBarLocation() + ); + } else if (isDropTargetLocationDiffersFromOriginal()) { + // bubble bar has bubbles and location was changed - return to the original + // location + animateBubbleBarLocation(getBubbleBarLocation()); + } + mStashedBeforeDropTarget = null; + mBubbleBarDragLocation = null; + } + } + + /** + * Returns {@code true} if location was updated after most recent + * {@link #showBubbleBarDropTargetAt}}. + */ + private boolean isDropTargetLocationDiffersFromOriginal() { + boolean isRtl = mBarView.isLayoutRtl(); + return BubbleBarLocation.isDifferentSides( + mBubbleBarDragLocation, + getBubbleBarLocation(), + isRtl); + } + /** * The bounds of the bubble bar. */ @@ -256,9 +698,29 @@ public Rect getBubbleBarBounds() { return mBarView.getBubbleBarBounds(); } + /** Returns the bounds of the flyout view if it exists, or {@code null} otherwise. */ + @Nullable + public Rect getFlyoutBounds() { + return mBubbleBarFlyoutController.getFlyoutBounds(); + } + + /** Checks that bubble bar is visible and that the motion event is within bounds. */ + public boolean isEventOverBubbleBar(MotionEvent event) { + if (!isBubbleBarVisible()) return false; + final Rect bounds = getBubbleBarBounds(); + final int bubbleBarTopOnScreen = + mActivity.getScreenSize().y - mBarView.getTopToScreenBottom(); + final float x = event.getX(); + return event.getRawY() >= bubbleBarTopOnScreen && x >= bounds.left && x <= bounds.right; + } + /** Whether a new bubble is animating. */ public boolean isAnimatingNewBubble() { - return mBarView.isAnimatingNewBubble(); + return mBubbleBarViewAnimator != null && mBubbleBarViewAnimator.isAnimating(); + } + + public boolean isNewBubbleAnimationRunningOrPending() { + return mBubbleBarViewAnimator != null && mBubbleBarViewAnimator.hasAnimation(); } /** The horizontal margin of the bubble bar from the edge of the screen. */ @@ -267,10 +729,8 @@ public int getHorizontalMargin() { } /** - * When the bubble bar is not stashed, it can be collapsed (the icons are in a - * stack) or - * expanded (the icons are in a row). This indicates whether the bubble bar is - * expanded. + * When the bubble bar is not stashed, it can be collapsed (the icons are in a stack) or + * expanded (the icons are in a row). This indicates whether the bubble bar is expanded. */ public boolean isExpanded() { return mBarView.isExpanded(); @@ -294,41 +754,60 @@ public boolean isHiddenForNoBubbles() { return mHiddenForNoBubbles; } + /** Returns maximum height of the bubble bar with the flyout view. */ + public int getBubbleBarWithFlyoutMaximumHeight() { + if (!hasBubbles() && !isAnimatingNewBubble()) return 0; + int bubbleBarTopOnHome = (int) (mBubbleStashController.getBubbleBarVerticalCenterForHome() + + mBarView.getBubbleBarCollapsedHeight() / 2 + mBarView.getArrowHeight()); + if (isAnimatingNewBubble()) { + if (mTaskbarStashController.isInApp() && mBubbleStashController.getHasHandleView()) { + // when animating a bubble in an app, the bubble bar will be higher than its + // position on home + float bubbleBarTopDistanceFromBottom = + -mBubbleStashController.getBubbleBarTranslationYForTaskbar() + + mBarView.getHeight(); + return (int) bubbleBarTopDistanceFromBottom + + mBubbleBarFlyoutController.getMaximumFlyoutHeight(); + } + return bubbleBarTopOnHome + mBubbleBarFlyoutController.getMaximumFlyoutHeight(); + } else { + return bubbleBarTopOnHome; + } + } + /** * Sets whether the bubble bar should be hidden because there are no bubbles. */ public void setHiddenForBubbles(boolean hidden) { if (mHiddenForNoBubbles != hidden) { mHiddenForNoBubbles = hidden; - updateVisibilityForStateChange(); if (hidden) { - mBarView.setAlpha(0); - mBarView.setExpanded(false); + mBarView.dismiss(() -> { + updateVisibilityForStateChange(); + mBarView.animateExpanded(false); + adjustTaskbarAndHotseatToBubbleBarState(/* isBubbleBarExpanded= */ false); + mActivity.bubbleBarVisibilityChanged(/* isVisible= */ false); + }); + } else { + updateVisibilityForStateChange(); + mActivity.bubbleBarVisibilityChanged(/* isVisible= */ true); } - mActivity.bubbleBarVisibilityChanged(!hidden); } } - /** - * Sets a callback that updates the selected bubble after the bubble bar - * collapses. - */ + /** Sets a callback that updates the selected bubble after the bubble bar collapses. */ public void setUpdateSelectedBubbleAfterCollapse( Consumer updateSelectedBubbleAfterCollapse) { mBarView.setUpdateSelectedBubbleAfterCollapse(updateSelectedBubbleAfterCollapse); } - /** - * Returns whether the bubble bar should be hidden because of the current sysui - * state. - */ + /** Returns whether the bubble bar should be hidden because of the current sysui state. */ boolean isHiddenForSysui() { return mHiddenForSysui; } /** - * Sets whether the bubble bar should be hidden due to SysUI state (e.g. on - * lockscreen). + * Sets whether the bubble bar should be hidden due to SysUI state (e.g. on lockscreen). */ public void setHiddenForSysui(boolean hidden) { if (mHiddenForSysui != hidden) { @@ -337,40 +816,132 @@ public void setHiddenForSysui(boolean hidden) { } } - // TODO: (b/273592694) animate it + /** Sets whether the bubble bar should be hidden due to stashed state */ + public void setHiddenForStashed(boolean hidden) { + if (mHiddenForStashed != hidden) { + mHiddenForStashed = hidden; + updateVisibilityForStateChange(); + } + } + private void updateVisibilityForStateChange() { - if (!mHiddenForSysui && !mHiddenForNoBubbles) { + boolean hiddenForStashedAndNotAnimating = + mHiddenForStashed && !mBubbleBarViewAnimator.isAnimating(); + if (mHiddenForSysui || mHiddenForNoBubbles || hiddenForStashedAndNotAnimating) { + //TODO(b/404870188) this visibility change cause search view drag misbehavior + mBarView.setVisibility(INVISIBLE); + } else { mBarView.setVisibility(VISIBLE); + } + } + + /** + * Returns the translation X of the transient taskbar according to the bubble bar location + * regardless of the current taskbar mode. + */ + public int getTransientTaskbarTranslationXForBubbleBar(BubbleBarLocation location) { + int taskbarShift = 0; + if (!isBubbleBarVisible() || mTaskbarViewPropertiesProvider == null) return taskbarShift; + Rect taskbarViewBounds = mTaskbarViewPropertiesProvider.getTaskbarViewBounds(); + if (taskbarViewBounds.isEmpty()) return taskbarShift; + int actualDistance = + getDistanceBetweenTransientTaskbarAndBubbleBar(location, taskbarViewBounds); + if (actualDistance < mBubbleBarTaskbarMinDistance) { + taskbarShift = mBubbleBarTaskbarMinDistance - actualDistance; + if (!location.isOnLeft(mBarView.isLayoutRtl())) { + taskbarShift = -taskbarShift; + } + } + return taskbarShift; + } + + private int getDistanceBetweenTransientTaskbarAndBubbleBar(BubbleBarLocation location, + Rect taskbarViewBounds) { + Resources res = mActivity.getResources(); + TaskbarProfile transientDp = mActivity.getTransientTaskbarProfile(); + int transientIconSize = getBubbleBarIconSizeFromDeviceProfile(res, transientDp); + int transientPadding = getBubbleBarPaddingFromDeviceProfile(res, transientDp); + int transientWidthWithMargin = (int) (mBarView.getCollapsedWidthForIconSizeAndPadding( + transientIconSize, transientPadding) + mBarView.getHorizontalMargin()); + int distance; + if (location.isOnLeft(mBarView.isLayoutRtl())) { + distance = taskbarViewBounds.left - transientWidthWithMargin; } else { - mBarView.setVisibility(INVISIBLE); + int displayWidth = res.getDisplayMetrics().widthPixels; + int bubbleBarLeft = displayWidth - transientWidthWithMargin; + distance = bubbleBarLeft - taskbarViewBounds.right; } + return distance; } // // Modifying view related properties. // - private void updateBubbleBarIconSize(int newIconSize, boolean animate) { + /** Notifies controller of configuration change, so bubble bar can be adjusted */ + public void onBubbleBarConfigurationChanged(boolean animate) { + int newIconSize; + int newPadding; Resources res = mActivity.getResources(); + if (mBubbleStashController.isBubblesShowingOnHome() + || mBubbleStashController.isTransientTaskBar()) { + newIconSize = getBubbleBarIconSizeFromDeviceProfile(res); + newPadding = getBubbleBarPaddingFromDeviceProfile(res); + } else { + // the bubble bar is shown inside the persistent task bar, use preset sizes + newIconSize = res.getDimensionPixelSize(R.dimen.bubblebar_icon_size_persistent_taskbar); + newPadding = res.getDimensionPixelSize( + R.dimen.bubblebar_icon_spacing_persistent_taskbar); + } + updateBubbleBarIconSizeAndPadding(newIconSize, newPadding, animate); + } + + private int getBubbleBarIconSizeFromDeviceProfile(Resources res) { + return getBubbleBarIconSizeFromDeviceProfile(res, + mActivity.getDeviceProfile().getTaskbarProfile()); + } + + private static int getBubbleBarIconSizeFromDeviceProfile(Resources res, + TaskbarProfile deviceProfile) { DisplayMetrics dm = res.getDisplayMetrics(); float smallIconSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, APP_ICON_SMALL_DP, dm); + float mediumIconSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, + APP_ICON_MEDIUM_DP, dm); + float smallMediumThreshold = (smallIconSize + mediumIconSize) / 2f; + int taskbarIconSize = deviceProfile.getIconSize(); + return taskbarIconSize <= smallMediumThreshold + ? res.getDimensionPixelSize(R.dimen.bubblebar_icon_size_small) : + res.getDimensionPixelSize(R.dimen.bubblebar_icon_size); + + } + + private int getBubbleBarPaddingFromDeviceProfile(Resources res) { + return getBubbleBarPaddingFromDeviceProfile(res, + mActivity.getDeviceProfile().getTaskbarProfile()); + } + + private static int getBubbleBarPaddingFromDeviceProfile(Resources res, + TaskbarProfile deviceProfile) { + DisplayMetrics dm = res.getDisplayMetrics(); float mediumIconSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, APP_ICON_MEDIUM_DP, dm); float largeIconSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, APP_ICON_LARGE_DP, dm); - float smallMediumThreshold = (smallIconSize + mediumIconSize) / 2f; float mediumLargeThreshold = (mediumIconSize + largeIconSize) / 2f; - mIconSize = newIconSize <= smallMediumThreshold - ? res.getDimensionPixelSize(R.dimen.bubblebar_icon_size_small) - : res.getDimensionPixelSize(R.dimen.bubblebar_icon_size); - float bubbleBarPadding = newIconSize >= mediumLargeThreshold - ? res.getDimensionPixelSize(R.dimen.bubblebar_icon_spacing_large) - : res.getDimensionPixelSize(R.dimen.bubblebar_icon_spacing); + return deviceProfile.getIconSize() >= mediumLargeThreshold + ? res.getDimensionPixelSize(R.dimen.bubblebar_icon_spacing_large) : + res.getDimensionPixelSize(R.dimen.bubblebar_icon_spacing); + } + + private void updateBubbleBarIconSizeAndPadding(int iconSize, int padding, boolean animate) { + if (mIconSize == iconSize && mBubbleBarPadding == padding) return; + mIconSize = iconSize; + mBubbleBarPadding = padding; if (animate) { - mBarView.animateBubbleBarIconSize(mIconSize, bubbleBarPadding); + mBarView.animateBubbleBarIconSize(iconSize, padding); } else { - mBarView.setIconSizeAndPadding(mIconSize, bubbleBarPadding); + mBarView.setIconSizeAndPadding(iconSize, padding); } } @@ -382,20 +953,95 @@ public void setTranslationYForSwipe(float transY) { updateTranslationY(); } + /** + * Sets the translation of the bubble bar during the stash animation. + */ + public void setTranslationYForStash(float transY) { + mBubbleBarStashTranslationY = transY; + updateTranslationY(); + } + private void updateTranslationY() { - mBarView.setTranslationY(mBubbleBarTranslationY.value - + mBubbleBarSwipeUpTranslationY); + mBarView.setTranslationY(mBubbleBarTranslationY.value + mBubbleBarSwipeUpTranslationY + + mBubbleBarStashTranslationY + getBubbleBarTranslationYForTaskbarPinning()); + } + + /** Computes translation y for taskbar pinning. */ + private float getBubbleBarTranslationYForTaskbarPinning() { + if (mTaskbarSharedState == null) return 0f; + float pinningProgress = mBubbleBarPinning.value; + if (mTaskbarSharedState.startTaskbarVariantIsTransient) { + return mapRange(pinningProgress, /* min = */ 0f, mTaskbarTranslationDelta); + } else { + return mapRange(pinningProgress, -mTaskbarTranslationDelta, /* max = */ 0f); + } + } + + private void setBubbleBarScaleAndPadding(float pinningProgress) { + Resources res = mActivity.getResources(); + // determine icon scale for pinning + int persistentIconSize = res.getDimensionPixelSize( + R.dimen.bubblebar_icon_size_persistent_taskbar); + int transientIconSize = getBubbleBarIconSizeFromDeviceProfile(res, + mActivity.getTransientTaskbarProfile()); + float pinningIconSize = mapRange(pinningProgress, transientIconSize, persistentIconSize); + + // determine bubble bar padding for pinning + int persistentPadding = res.getDimensionPixelSize( + R.dimen.bubblebar_icon_spacing_persistent_taskbar); + int transientPadding = getBubbleBarPaddingFromDeviceProfile(res, + mActivity.getTransientTaskbarProfile()); + float pinningPadding = mapRange(pinningProgress, transientPadding, persistentPadding); + mBarView.setIconSizeAndPaddingForPinning(pinningIconSize, pinningPadding); } /** - * Applies scale properties for the entire bubble bar. + * Calculates the vertical difference in the bubble bar positions for pinned and transient + * taskbar modes. */ - private void updateScale() { - float scale = mBubbleBarScale.value; + private int getBubbleBarTranslationDeltaForTaskbar(TaskbarActivityContext activity) { + Resources res = activity.getResources(); + int persistentBubbleSize = res + .getDimensionPixelSize(R.dimen.bubblebar_icon_size_persistent_taskbar); + int persistentSpacingSize = res + .getDimensionPixelSize(R.dimen.bubblebar_icon_spacing_persistent_taskbar); + int persistentBubbleBarSize = persistentBubbleSize + persistentSpacingSize * 2; + int persistentTaskbarHeight = + activity.getPersistentTaskbarProfile().getHeight(); + int persistentBubbleBarY = (persistentTaskbarHeight - persistentBubbleBarSize) / 2; + int transientBubbleBarY = + activity.getTransientTaskbarProfile().getBottomMargin(); + return transientBubbleBarY - persistentBubbleBarY; + } + + private void updateScaleX(float scale) { mBarView.setScaleX(scale); + } + + private void updateScaleY(float scale) { mBarView.setScaleY(scale); } + private void updateBackgroundScaleX(float scale) { + mBarView.setBackgroundScaleX(scale); + } + + private void updateBackgroundScaleY(float scale) { + mBarView.setBackgroundScaleY(scale); + } + + private void updateBubbleAlpha(float alpha) { + mBarView.setBubbleAlpha(alpha); + } + + private void updateBubbleOffsetY(float transY) { + mBarView.setBubbleOffsetY(transY); + } + + private void updateBackgroundAlpha(float alpha) { + mBarView.setBackgroundAlpha(alpha); + } + // // Manipulating the specific bubble views in the bar // @@ -403,60 +1049,172 @@ private void updateScale() { /** * Removes the provided bubble from the bubble bar. */ - public void removeBubble(BubbleBarItem b) { + public void removeBubble(BubbleBarBubble b) { if (b != null) { - mBarView.removeView(b.getView()); + mBarView.removeBubble(b.getView()); + b.getView().setController(null); } else { Log.w(TAG, "removeBubble, bubble was null!"); } } + /** Adds a new bubble and removes an old bubble at the same time. */ + public void addBubbleAndRemoveBubble(BubbleBarBubble addedBubble, BubbleBarBubble removedBubble, + @Nullable BubbleBarBubble bubbleToSelect, boolean isExpanding, + boolean suppressAnimation, boolean addOverflowToo) { + BubbleView bubbleToSelectView = bubbleToSelect == null ? null : bubbleToSelect.getView(); + mBarView.addBubbleAndRemoveBubble(addedBubble.getView(), removedBubble.getView(), + bubbleToSelectView, suppressAnimation, + addOverflowToo ? () -> showOverflow(true) : null); + addedBubble.getView().setOnClickListener(mBubbleClickListener); + addedBubble.getView().setController(mBubbleViewController); + removedBubble.getView().setController(null); + mBubbleDragController.setupBubbleView(addedBubble.getView()); + if (!suppressAnimation) { + animateBubbleNotification(addedBubble, isExpanding, /* isUpdate= */ false); + } + } + + /** Whether the overflow view is added to the bubble bar. */ + public boolean isOverflowAdded() { + return mOverflowAdded; + } + + /** Shows or hides the overflow view. */ + public void showOverflow(boolean showOverflow) { + if (mOverflowAdded == showOverflow) return; + mOverflowAdded = showOverflow; + if (mOverflowAdded) { + mBarView.addBubble(mOverflowBubble.getView(), /* suppressAnimation= */ true); + mOverflowBubble.getView().setOnClickListener(mBubbleClickListener); + mOverflowBubble.getView().setController(mBubbleViewController); + } else { + mBarView.removeBubble(mOverflowBubble.getView()); + mOverflowBubble.getView().setOnClickListener(null); + mOverflowBubble.getView().setController(null); + } + } + + /** Adds the overflow view to the bubble bar while animating a view away. */ + public void addOverflowAndRemoveBubble(BubbleBarBubble removedBubble, + @Nullable BubbleBarBubble bubbleToSelect) { + if (mOverflowAdded) return; + mOverflowAdded = true; + BubbleView bubbleToSelectView = bubbleToSelect == null ? null : bubbleToSelect.getView(); + mBarView.addBubbleAndRemoveBubble(mOverflowBubble.getView(), removedBubble.getView(), + bubbleToSelectView, false /* suppressAnimation */, null /* onEndRunnable */); + mOverflowBubble.getView().setOnClickListener(mBubbleClickListener); + mOverflowBubble.getView().setController(mBubbleViewController); + removedBubble.getView().setController(null); + } + + /** Removes the overflow view to the bubble bar while animating a view in. */ + public void removeOverflowAndAddBubble(BubbleBarBubble addedBubble, + @Nullable BubbleBarBubble bubbleToSelect) { + if (!mOverflowAdded) return; + mOverflowAdded = false; + BubbleView bubbleToSelectView = bubbleToSelect == null ? null : bubbleToSelect.getView(); + mBarView.addBubbleAndRemoveBubble(addedBubble.getView(), mOverflowBubble.getView(), + bubbleToSelectView, false /* suppressAnimation */, null /* onEndRunnable */); + addedBubble.getView().setOnClickListener(mBubbleClickListener); + addedBubble.getView().setController(mBubbleViewController); + mOverflowBubble.getView().setController(null); + } + /** * Adds the provided bubble to the bubble bar. */ - public void addBubble(BubbleBarItem b, boolean isExpanding, boolean suppressAnimation) { + public void addBubble(BubbleBarItem b, + boolean isExpanding, + boolean suppressAnimation, + @Nullable BubbleBarBubble bubbleToSelect + ) { if (b != null) { - mBarView.addBubble( - b.getView(), new FrameLayout.LayoutParams(mIconSize, mIconSize, Gravity.LEFT)); - b.getView().setOnClickListener(mBubbleClickListener); - mBubbleDragController.setupBubbleView(b.getView()); - - if (b instanceof BubbleBarOverflow) { - return; - } + BubbleView bubbleToSelectView = + bubbleToSelect == null ? null : bubbleToSelect.getView(); + addBubbleView(b.getView(), suppressAnimation, bubbleToSelectView); if (suppressAnimation || !(b instanceof BubbleBarBubble bubble)) { - // the bubble bar and handle are initialized as part of the first bubble - // animation. + // the bubble bar and handle are initialized as part of the first bubble animation. // if the animation is suppressed, immediately stash or show the bubble bar to // ensure they've been initialized. - if (mTaskbarStashController.isInApp()) { + if (mTaskbarStashController.isInApp() + && mBubbleStashController.isTransientTaskBar() + && mTaskbarStashController.isStashed() + && !isExpanded()) { mBubbleStashController.stashBubbleBarImmediate(); } else { mBubbleStashController.showBubbleBarImmediate(); } return; } - animateBubbleNotification(bubble, isExpanding); + animateBubbleNotification(bubble, isExpanding, /* isUpdate= */ false); } else { Log.w(TAG, "addBubble, bubble was null!"); } } + private void addBubbleView(BubbleView bubbleView, boolean suppressAnimation, + BubbleView selectedBubbleView) { + mBarView.addBubble(bubbleView, selectedBubbleView, suppressAnimation); + bubbleView.setOnClickListener(mBubbleClickListener); + mBubbleDragController.setupBubbleView(bubbleView); + bubbleView.setController(mBubbleViewController); + } + + /** + * Restore a previous bubble that is stored in {@link TaskbarSharedState}. + */ + public void restoreBubble(BubbleBarItem b) { + addBubbleView(b.getView(), /* suppressAnimation= */ true, /* bubbleToSelectView= */ null); + } + /** Animates the bubble bar to notify the user about a bubble change. */ - public void animateBubbleNotification(BubbleBarBubble bubble, boolean isExpanding) { + public void animateBubbleNotification(BubbleBarBubble bubble, boolean isExpanding, + boolean isUpdate) { + // if we're not already animating another bubble, update the dot visibility. otherwise the + // the dot will be handled as part of the animation. + if (!mBubbleBarViewAnimator.isAnimating()) { + bubble.getView().updateDotVisibility( + /* animate= */ !mBubbleStashController.isStashed()); + } + // if we're expanded, don't animate the bubble bar. + if (isExpanded()) { + return; + } + // we're going to animate the bubble; make sure the taskbar window is visible + ensureTaskbarWindowVisibilityForBubbles(true); boolean isInApp = mTaskbarStashController.isInApp(); - // if this is the first bubble, animate to the initial state. one bubble is the - // overflow - // so check for at most 2 children. - if (mBarView.getChildCount() <= 2) { - mBubbleBarViewAnimator.animateToInitialState(bubble, isInApp, isExpanding); + // if this is the first bubble, animate to the initial state. + if (mBarView.getBubbleChildCount() == 1 && !isUpdate) { + mBubbleBarViewAnimator.animateToInitialState(bubble, isInApp, isExpanding, + mBarView.isShowingDropTarget()); + return; + } + // if we're not stashed or we're in persistent taskbar, animate for collapsed state. + boolean animateForCollapsed = !mBubbleStashController.isStashed() + || !mBubbleStashController.isTransientTaskBar(); + if (animateForCollapsed) { + mBubbleBarViewAnimator.animateBubbleBarForCollapsed(bubble, isExpanding); return; } - // only animate the new bubble if we're in an app and not auto expanding - if (isInApp && !isExpanding && !isExpanded()) { - mBubbleBarViewAnimator.animateBubbleInForStashed(bubble); + if (isInApp && mBubbleStashController.getHasHandleView()) { + mBubbleBarViewAnimator.animateBubbleInForStashed(bubble, isExpanding); + } + } + + /** + * Ensures the taskbar window is forcibly shown for bubbles. + * + *

The window has to be visible whenever new and updated bubbles are animating, and when the + * bubble bar is expanded. + */ + private void ensureTaskbarWindowVisibilityForBubbles(boolean visible) { + if (mBubbleStashController.isTransientTaskBar()) { + mTaskbarAutohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, visible); + } else { + mActivity.applyForciblyShownFlagForBubblesInPersistentTaskbar(visible); } } @@ -465,7 +1223,7 @@ public void animateBubbleNotification(BubbleBarBubble bubble, boolean isExpandin */ public void reorderBubbles(List newOrder) { List viewList = newOrder.stream().filter(Objects::nonNull) - .map(BubbleBarBubble::getView).collect(toList()); + .map(BubbleBarBubble::getView).toList(); mBarView.reorder(viewList); } @@ -476,58 +1234,113 @@ public void updateSelectedBubble(BubbleBarItem newlySelected) { mBarView.setSelectedBubble(newlySelected.getView()); } + /** @see #animateExpanded(boolean, boolean) */ + public void animateExpanded(boolean isExpanded) { + animateExpanded(isExpanded, /* maybeShowEdu= */ false); + } + /** - * Sets whether the bubble bar should be expanded (not unstashed, but have the - * contents - * within it expanded). This method notifies SystemUI that the bubble bar is - * expanded and - * showing a selected bubble. This method should ONLY be called from UI events - * originating - * from Launcher. + * Sets whether the bubble bar should be animated to expanded state (not unstashed, but have + * the contents within it expanded). This method notifies SystemUI that the bubble bar is + * expanded and showing a selected bubble. This method should ONLY be called from UI events + * originating from Launcher. + * + * @param isExpanded whether the bar should be expanded + * @param maybeShowEdu whether we should show the edu view before expanding */ - public void setExpanded(boolean isExpanded) { - if (isExpanded != mBarView.isExpanded()) { - mBarView.setExpanded(isExpanded); + public void animateExpanded(boolean isExpanded, boolean maybeShowEdu) { + // if we're trying to expand try showing the edu view instead + if (maybeShowEdu && isExpanded && !mBarView.isExpanded() && maybeShowEduView()) { + return; + } + if (!mBubbleBarPinning.isAnimating() && isExpanded != mBarView.isExpanded()) { + mBarView.animateExpanded(isExpanded); + adjustTaskbarAndHotseatToBubbleBarState(isExpanded); if (!isExpanded) { mSystemUiProxy.collapseBubbles(); } else { mBubbleBarController.showSelectedBubble(); - mTaskbarStashController.updateAndAnimateTransientTaskbar(true /* stash */, - false /* shouldBubblesFollow */); } } } /** - * Sets whether the bubble bar should be expanded. This method is used in - * response to UI events + * Hides the persistent taskbar if it is going to intersect with the expanded bubble bar if in + * app or overview. + */ + private void adjustTaskbarAndHotseatToBubbleBarState(boolean isBubbleBarExpanded) { + if (!mBubbleStashController.isBubblesShowingOnHome() + && !mBubbleStashController.isTransientTaskBar()) { + boolean hideTaskbar = isBubbleBarExpanded && isIntersectingTaskbar(); + Animator taskbarAlphaAnimator = mTaskbarViewPropertiesProvider.getIconsAlpha() + .animateToValue(hideTaskbar ? 0 : 1); + taskbarAlphaAnimator.setDuration(hideTaskbar + ? TASKBAR_FADE_OUT_DURATION_MS : TASKBAR_FADE_IN_DURATION_MS); + if (!hideTaskbar) { + taskbarAlphaAnimator.setStartDelay(TASKBAR_FADE_IN_DELAY_MS); + } + taskbarAlphaAnimator.setInterpolator(Interpolators.LINEAR); + taskbarAlphaAnimator.start(); + } + } + + /** Return {@code true} if expanded bubble bar would intersect the taskbar. */ + public boolean isIntersectingTaskbar() { + if (mBarView.isExpanding() || mBarView.isExpanded()) { + Rect taskbarViewBounds = mTaskbarViewPropertiesProvider.getTaskbarViewBounds(); + return mBarView.getBubbleBarExpandedBounds().intersect(taskbarViewBounds); + } else { + return false; + } + } + + /** + * Sets whether the bubble bar should be expanded. This method is used in response to UI events * from SystemUI. */ - public void setExpandedFromSysui(boolean isExpanded) { - if (!isExpanded) { - mBubbleStashController.stashBubbleBar(); + public void setExpandedFromSysui(boolean isExpanded, boolean animate) { + if (isNewBubbleAnimationRunningOrPending()) { + if (isExpanded) { + mBubbleBarViewAnimator.expandedWhileAnimating(); + } else { + mBubbleBarViewAnimator.collapsedWhileAnimating(); + } + return; + } + if (animate) { + if (!isExpanded) { + mBubbleStashController.stashBubbleBar(); + } else { + mBubbleStashController.showBubbleBar(true /* expand the bubbles */); + } } else { - mBubbleStashController.showBubbleBar(true /* expand the bubbles */); + if (!isExpanded) { + mBubbleStashController.stashBubbleBarImmediate(); + } else { + mBubbleStashController.showBubbleBarImmediate(); + mBarView.setExpanded(true); + adjustTaskbarAndHotseatToBubbleBarState(true); + } } } /** - * Marks as should show education and shows the bubble bar in a collapsed state + * Stores a request to show the education view for later processing when appropriate. + * + * @see #maybeShowEduView() */ public void prepareToShowEducation() { mShouldShowEducation = true; - mBubbleStashController.showBubbleBar(false /* expand the bubbles */); } /** * Updates the dragged bubble view in the bubble bar view, and notifies SystemUI * that a bubble is being dragged to dismiss. - * + * * @param bubbleView dragged bubble view */ public void onBubbleDragStart(@NonNull BubbleView bubbleView) { - if (bubbleView.getBubble() == null) - return; + if (bubbleView.getBubble() == null) return; mSystemUiProxy.startBubbleDrag(bubbleView.getBubble().getKey()); mBarView.setDraggedBubble(bubbleView); @@ -537,7 +1350,13 @@ public void onBubbleDragStart(@NonNull BubbleView bubbleView) { * Notifies SystemUI to expand the selected bubble when the bubble is released. */ public void onBubbleDragRelease(BubbleBarLocation location) { - mSystemUiProxy.stopBubbleDrag(location, mBarView.getRestingTopPositionOnScreen()); + mSystemUiProxy.stopBubbleDrag(location, mBarView.getTopToScreenBottom()); + } + + /** Handle given bubble being dismissed */ + public void onBubbleDismissed(BubbleView bubble) { + mBubbleBarController.onBubbleDismissed(bubble); + mBarView.removeBubble(bubble); } /** @@ -549,8 +1368,7 @@ public void onBubbleDragEnd() { /** Notifies that dragging the bubble bar ended. */ public void onBubbleBarDragEnd() { - // we may have changed the bubble bar translation Y value from the value it had - // at the + // we may have changed the bubble bar translation Y value from the value it had at the // beginning of the drag, so update the translation Y animator state mBubbleBarTranslationY.updateValue(mBarView.getTranslationY()); } @@ -558,8 +1376,7 @@ public void onBubbleBarDragEnd() { /** * Get translation for bubble bar when drag is released. * - * @see BubbleBarView#getBubbleBarDragReleaseTranslation(PointF, - * BubbleBarLocation) + * @see BubbleBarView#getBubbleBarDragReleaseTranslation(PointF, BubbleBarLocation) */ public PointF getBubbleBarDragReleaseTranslation(PointF initialTranslation, BubbleBarLocation location) { @@ -569,8 +1386,7 @@ public PointF getBubbleBarDragReleaseTranslation(PointF initialTranslation, /** * Get translation for bubble view when drag is released. * - * @see BubbleBarView#getDraggedBubbleReleaseTranslation(PointF, - * BubbleBarLocation) + * @see BubbleBarView#getDraggedBubbleReleaseTranslation(PointF, BubbleBarLocation) */ public PointF getDraggedBubbleReleaseTranslation(PointF initialTranslation, BubbleBarLocation location) { @@ -581,21 +1397,30 @@ public PointF getDraggedBubbleReleaseTranslation(PointF initialTranslation, } /** - * Called when bubble was dragged into the dismiss target. Notifies System - * - * @param bubble dismissed bubble item + * Notify SystemUI that the given bubble has been dismissed. */ - public void onDismissBubbleWhileDragging(@NonNull BubbleBarItem bubble) { - mSystemUiProxy.dragBubbleToDismiss(bubble.getKey()); + public void notifySysUiBubbleDismissed(@NonNull BubbleBarItem bubble) { + mSystemUiProxy.dragBubbleToDismiss(bubble.getKey(), mTimeSource.currentTimeMillis()); } /** - * Called when bubble stack was dragged into the dismiss target + * Called when bubble stack was dismissed */ - public void onDismissAllBubblesWhileDragging() { + public void onDismissAllBubbles() { mSystemUiProxy.removeAllBubbles(); } + /** Removes all existing bubble views */ + public void removeAllBubbles() { + mOverflowAdded = false; + mBarView.removeAllViews(); + } + + /** Returns the view index of the existing bubble */ + public int bubbleViewIndex(View bubbleView) { + return mBarView.indexOfChild(bubbleView); + } + /** * Set listener to be notified when bubble bar bounds have changed */ @@ -603,6 +1428,69 @@ public void setBoundsChangeListener(@Nullable BubbleBarBoundsChangeListener list mBoundsChangeListener = listener; } + /** Called when the controller is destroyed. */ + public void onDestroy() { + adjustTaskbarAndHotseatToBubbleBarState(/*isBubbleBarExpanded = */false); + if (refactorTaskbarUiState()) { + mBarView.removeOnLayoutChangeListener(mBubbleBarViewOnLayoutChangeListener); + } + } + + /** + * Removes the bubble from the bubble bar and notifies sysui that the bubble should move to + * full screen. + */ + public void moveDraggedBubbleToFullscreen(@NonNull BubbleView bubbleView, Point dropLocation) { + if (bubbleView.getBubble() == null) { + return; + } + String key = bubbleView.getBubble().getKey(); + mSystemUiProxy.moveDraggedBubbleToFullscreen(key, dropLocation); + onBubbleDismissed(bubbleView); + } + + /** + * Create an animator for showing or hiding bubbles when stashed state changes + * + * @param isStashed {@code true} when bubble bar should be stashed to the handle + */ + public Animator createRevealAnimatorForStashChange(boolean isStashed) { + Rect stashedHandleBounds = new Rect(); + mBubbleStashController.getHandleBounds(stashedHandleBounds); + int childCount = mBarView.getChildCount(); + float newChildWidth = (float) stashedHandleBounds.width() / childCount; + AnimatorSet animatorSet = new AnimatorSet(); + for (int i = 0; i < childCount; i++) { + BubbleView child = (BubbleView) mBarView.getChildAt(i); + animatorSet.play( + createRevealAnimForBubble(child, isStashed, stashedHandleBounds, + newChildWidth)); + } + return animatorSet; + } + + private Animator createRevealAnimForBubble(BubbleView bubbleView, boolean isStashed, + Rect stashedHandleBounds, float newWidth) { + Rect viewBounds = new Rect(0, 0, bubbleView.getWidth(), bubbleView.getHeight()); + + int viewCenterY = viewBounds.centerY(); + int halfHandleHeight = stashedHandleBounds.height() / 2; + int widthDelta = Math.max(0, (int) (viewBounds.width() - newWidth) / 2); + + Rect stashedViewBounds = new Rect( + viewBounds.left + widthDelta, + viewCenterY - halfHandleHeight, + viewBounds.right - widthDelta, + viewCenterY + halfHandleHeight + ); + + float viewRadius = 0f; // Use 0 to not clip the new message dot or the app icon + float stashedRadius = stashedViewBounds.height() / 2f; + + return new RoundedRectRevealOutlineProvider(viewRadius, stashedRadius, viewBounds, + stashedViewBounds).createRevealAnimator(bubbleView, !isStashed, 0); + } + /** * Listener to receive updates about bubble bar bounds changing */ @@ -610,4 +1498,36 @@ public interface BubbleBarBoundsChangeListener { /** Called when bounds have changed */ void onBoundsChanged(); } + + /** Interface for getting the current timestamp. */ + interface TimeSource { + long currentTimeMillis(); + } + + /** Dumps the state of BubbleBarViewController. */ + public void dump(PrintWriter pw) { + pw.println("Bubble bar view controller state:"); + pw.println(" mHiddenForSysui: " + mHiddenForSysui); + pw.println(" mHiddenForNoBubbles: " + mHiddenForNoBubbles); + pw.println(" mHiddenForStashed: " + mHiddenForStashed); + pw.println(" mShouldShowEducation: " + mShouldShowEducation); + pw.println(" mBubbleBarTranslationY.value: " + mBubbleBarTranslationY.value); + pw.println(" mBubbleBarSwipeUpTranslationY: " + mBubbleBarSwipeUpTranslationY); + pw.println(" mOverflowAdded: " + mOverflowAdded); + if (mBarView != null) { + mBarView.dump(pw); + } else { + pw.println(" Bubble bar view is null!"); + } + } + + /** Interface for BubbleBarViewController to get the taskbar view properties. */ + public interface TaskbarViewPropertiesProvider { + + /** Returns the bounds of the taskbar. */ + Rect getTaskbarViewBounds(); + + /** Returns taskbar icons alpha */ + MultiPropertyFactory.MultiProperty getIconsAlpha(); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleControllers.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleControllers.java index 0b45bd902d5..9052edd541d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleControllers.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleControllers.java @@ -15,22 +15,35 @@ */ package com.android.launcher3.taskbar.bubbles; +import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_BUBBLE_BAR; + +import android.graphics.Rect; +import android.view.View; + import com.android.launcher3.taskbar.TaskbarControllers; +import com.android.launcher3.taskbar.TaskbarSharedState; +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController.TaskbarViewPropertiesProvider; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleBarLocationOnDemandListener; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController; +import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.RunnableList; +import com.android.wm.shell.shared.bubbles.DragZoneFactory; -/** - * Hosts various bubble controllers to facilitate passing between one another. - */ +import java.io.PrintWriter; +import java.util.Optional; + +/** Hosts various bubble controllers to facilitate passing between one another. */ public class BubbleControllers { public final BubbleBarController bubbleBarController; public final BubbleBarViewController bubbleBarViewController; public final BubbleStashController bubbleStashController; - public final BubbleStashedHandleViewController bubbleStashedHandleViewController; + public final Optional bubbleStashedHandleViewController; public final BubbleDragController bubbleDragController; public final BubbleDismissController bubbleDismissController; - public final BubbleBarPinController bubbleBarPinController; - public final BubblePinController bubblePinController; + public final Optional bubbleBarSwipeController; + public final BubbleCreator bubbleCreator; + public final DragToBubbleController dragToBubbleController; private final RunnableList mPostInitRunnables = new RunnableList(); @@ -43,19 +56,21 @@ public BubbleControllers( BubbleBarController bubbleBarController, BubbleBarViewController bubbleBarViewController, BubbleStashController bubbleStashController, - BubbleStashedHandleViewController bubbleStashedHandleViewController, + Optional bubbleStashedHandleViewController, BubbleDragController bubbleDragController, BubbleDismissController bubbleDismissController, - BubbleBarPinController bubbleBarPinController, - BubblePinController bubblePinController) { + Optional bubbleBarSwipeController, + DragToBubbleController dragToBubbleController, + BubbleCreator bubbleCreator) { this.bubbleBarController = bubbleBarController; this.bubbleBarViewController = bubbleBarViewController; this.bubbleStashController = bubbleStashController; this.bubbleStashedHandleViewController = bubbleStashedHandleViewController; this.bubbleDragController = bubbleDragController; this.bubbleDismissController = bubbleDismissController; - this.bubbleBarPinController = bubbleBarPinController; - this.bubblePinController = bubblePinController; + this.bubbleBarSwipeController = bubbleBarSwipeController; + this.bubbleCreator = bubbleCreator; + this.dragToBubbleController = dragToBubbleController; } /** @@ -65,17 +80,61 @@ public BubbleControllers( * were created * in constructors for now, as some controllers may still be waiting for init(). */ - public void init(TaskbarControllers taskbarControllers) { + public void init(TaskbarSharedState taskbarSharedState, TaskbarControllers taskbarControllers) { + BubbleBarLocationCompositeListener bubbleBarLocationListeners = + new BubbleBarLocationCompositeListener( + taskbarControllers.navbarButtonsViewController, + taskbarControllers.taskbarViewController, + new BubbleBarLocationOnDemandListener(() -> taskbarControllers.uiController) + ); bubbleBarController.init(this, - taskbarControllers.navbarButtonsViewController::isImeVisible); - bubbleBarViewController.init(taskbarControllers, this); - bubbleStashedHandleViewController.init(taskbarControllers, this); - bubbleStashController.init(taskbarControllers, this); - bubbleDragController.init(/* bubbleControllers = */ this); + bubbleBarLocationListeners, + taskbarSharedState); + bubbleStashedHandleViewController.ifPresent( + controller -> controller.init(/* bubbleControllers = */ this)); + bubbleStashController.init( + taskbarControllers.taskbarInsetsController, + bubbleBarViewController, + bubbleStashedHandleViewController.orElse(null), + taskbarControllers::runAfterInit + ); + bubbleBarViewController.init(taskbarControllers, /* bubbleControllers = */ this, + new TaskbarViewPropertiesProvider() { + @Override + public Rect getTaskbarViewBounds() { + return taskbarControllers.taskbarViewController + .getTransientTaskbarIconLayoutBoundsInParent(); + } + + @Override + public MultiPropertyFactory.MultiProperty getIconsAlpha() { + return taskbarControllers.taskbarViewController + .getTaskbarIconAlpha() + .get(ALPHA_INDEX_BUBBLE_BAR); + } + }); + bubbleDragController.init(/* bubbleControllers = */ this, bubbleBarLocationListeners); bubbleDismissController.init(/* bubbleControllers = */ this); - bubbleBarPinController.init(this); - bubblePinController.init(this); + bubbleBarSwipeController.ifPresent(c -> c.init(this)); + dragToBubbleController.init(bubbleBarViewController, + new DragZoneFactory.BubbleBarPropertiesProvider() { + @Override + public int getHeight() { + return (int) bubbleBarViewController.getBubbleBarCollapsedHeight(); + } + + @Override + public int getWidth() { + return (int) bubbleBarViewController.getBubbleBarCollapsedWidth(); + } + @Override + public int getBottomPadding() { + return -(int) bubbleStashController.getBubbleBarTranslationY(); + } + }, + bubbleBarLocationListeners, + BubbleActivityStarter.INSTANCE.get(taskbarControllers.taskbarActivityContext)); mPostInitRunnables.executeAllAndDestroy(); } @@ -96,7 +155,13 @@ public void runAfterInit(Runnable runnable) { * Cleans up all controllers. */ public void onDestroy() { - bubbleStashedHandleViewController.onDestroy(); + bubbleStashedHandleViewController.ifPresent(BubbleStashedHandleViewController::onDestroy); bubbleBarController.onDestroy(); + bubbleBarViewController.onDestroy(); + } + + /** Dumps bubble controllers state. */ + public void dump(PrintWriter pw) { + bubbleBarViewController.dump(pw); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleCreator.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleCreator.java new file mode 100644 index 00000000000..5a3b92a4a19 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleCreator.java @@ -0,0 +1,213 @@ +/* + * 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.launcher3.taskbar.bubbles; + +import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_GET_PERSONS_DATA; +import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED; +import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC; +import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER; + +import static com.android.launcher3.icons.BaseIconFactory.MODE_WITH_SHADOW; +import static com.android.launcher3.icons.FastBitmapDrawable.WHITE_SCRIM_ALPHA; +import static com.android.wm.shell.shared.bubbles.FlyoutDrawableLoader.loadFlyoutDrawable; + +import android.annotation.Nullable; +import android.annotation.SuppressLint; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.LauncherApps; +import android.content.pm.PackageManager; +import android.content.pm.ShortcutInfo; +import android.graphics.Bitmap; +import android.graphics.Color; +import android.graphics.drawable.Drawable; +import android.os.UserHandle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.VisibleForTesting; + +import com.android.internal.graphics.ColorUtils; +import com.android.launcher3.R; +import com.android.launcher3.icons.BaseIconFactory.IconOptions; +import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.BubbleIconFactory; +import com.android.launcher3.shortcuts.ShortcutRequest; +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutMessage; +import com.android.wm.shell.shared.bubbles.BubbleInfo; +import com.android.wm.shell.shared.bubbles.ParcelableFlyoutMessage; + +/** + * Loads the necessary info to populate / present a bubble (name, icon, shortcut). + */ +public class BubbleCreator { + + private static final String TAG = BubbleCreator.class.getSimpleName(); + + private final Context mContext; + private final LauncherApps mLauncherApps; + private final BubbleIconFactory mIconFactory; + + public BubbleCreator(Context context) { + mContext = context; + mLauncherApps = mContext.getSystemService(LauncherApps.class); + mIconFactory = new BubbleIconFactory(context, + context.getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_size), + context.getResources().getDimensionPixelSize(R.dimen.bubblebar_badge_size), + context.getResources().getColor(R.color.important_conversation), + context.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.importance_ring_stroke_width)); + } + + /** + * Creates a BubbleBarBubble object, including the view if needed, and populates it with + * the info needed for presentation. + * + * @param context the context to use for inflation. + * @param info the info to use to populate the bubble. + * @param barView the parent view for the bubble (bubble is not added to the view). + * @param existingBubble if a bubble exists already, this object gets updated with the new + * info & returned (& any existing views are reused instead of inflating + * new ones. + */ + @Nullable + public BubbleBarBubble populateBubble(Context context, BubbleInfo info, ViewGroup barView, + @Nullable BubbleBarBubble existingBubble) { + ApplicationInfo appInfo; + try { + appInfo = mLauncherApps.getApplicationInfo( + info.getPackageName(), + 0, + new UserHandle(info.getUserId())); + } catch (PackageManager.NameNotFoundException e) { + // If we can't find package... don't think we should show the bubble. + Log.w(TAG, "Unable to find packageName: " + info.getPackageName()); + return null; + } + if (appInfo == null) { + Log.w(TAG, "Unable to find appInfo: " + info.getPackageName()); + return null; + } + // TODO: Can use BubbleInfo to get icon and label + PackageManager pm = context.getPackageManager(); + String appName = info.getAppName(); + Drawable appIcon = appInfo.loadUnbadgedIcon(pm); + + return populateBubble(context, info, appIcon, appName, barView, existingBubble); + } + + /** + * @see #populateBubble(Context, BubbleInfo, ViewGroup, BubbleBarBubble) + */ + @Nullable + @VisibleForTesting + public BubbleBarBubble populateBubble(Context context, BubbleInfo info, + Drawable appIcon, String appName, + ViewGroup barView, + @Nullable BubbleBarBubble existingBubble) { + boolean isImportantConvo = info.isImportantConversation(); + ShortcutRequest.QueryResult result = new ShortcutRequest(context, + new UserHandle(info.getUserId())) + .forPackage(info.getPackageName(), info.getShortcutId()) + .query(FLAG_MATCH_DYNAMIC + | FLAG_MATCH_PINNED_BY_ANY_LAUNCHER + | FLAG_MATCH_CACHED + | FLAG_GET_PERSONS_DATA); + ShortcutInfo shortcutInfo = result.size() > 0 ? result.get(0) : null; + if (shortcutInfo == null) { + Log.w(TAG, "No shortcutInfo found for bubble: " + info.getKey() + + " with shortcutId: " + info.getShortcutId()); + } + + // Badged bubble image + Drawable bubbleDrawable = mIconFactory.getBubbleDrawable( + context, shortcutInfo, info.getIcon()); + if (bubbleDrawable == null) { + // Default to app icon + bubbleDrawable = appIcon; + } + BitmapInfo badgeBitmapInfo = mIconFactory.getBadgeBitmap( + appIcon, new UserHandle(info.getUserId()), isImportantConvo); + Bitmap bubbleBitmap = mIconFactory.getBubbleBitmap(bubbleDrawable); + + int dotColor = ColorUtils.blendARGB(badgeBitmapInfo.color, + Color.WHITE, WHITE_SCRIM_ALPHA / 255f); + + final BubbleBarFlyoutMessage flyoutMessage = + getFlyoutMessage(info.getParcelableFlyoutMessage()); + + if (existingBubble == null) { + LayoutInflater inflater = LayoutInflater.from(context); + BubbleView bubbleView = (BubbleView) inflater.inflate( + R.layout.bubblebar_item_view, barView, false /* attachToRoot */); + + BubbleBarBubble bubble = new BubbleBarBubble(info, bubbleView, + badgeBitmapInfo, bubbleBitmap, dotColor, appName, flyoutMessage); + bubbleView.setBubble(bubble); + return bubble; + } else { + // If we already have a bubble (so it already has an inflated view), update it. + existingBubble.setInfo(info); + existingBubble.setBadge(badgeBitmapInfo); + existingBubble.setIcon(bubbleBitmap); + existingBubble.setDotColor(dotColor); + existingBubble.setAppName(appName); + existingBubble.setFlyoutMessage(flyoutMessage); + return existingBubble; + } + } + + @Nullable + private BubbleBarFlyoutMessage getFlyoutMessage( + @Nullable ParcelableFlyoutMessage parcelableFlyoutMessage) { + if (parcelableFlyoutMessage == null) { + return null; + } + String title = parcelableFlyoutMessage.getTitle(); + String message = parcelableFlyoutMessage.getMessage(); + return new BubbleBarFlyoutMessage( + loadFlyoutDrawable(parcelableFlyoutMessage.getIcon(), mContext), + title == null ? "" : title, + message == null ? "" : message); + } + + /** + * Creates the overflow view shown in the bubble bar. + * + * @param barView the parent view for the bubble (bubble is not added to the view). + */ + public BubbleBarOverflow createOverflow(ViewGroup barView) { + Bitmap bitmap = createOverflowBitmap(); + LayoutInflater inflater = LayoutInflater.from(mContext); + BubbleView bubbleView = (BubbleView) inflater.inflate( + R.layout.bubble_bar_overflow_button, barView, false /* attachToRoot */); + BubbleBarOverflow overflow = new BubbleBarOverflow(bubbleView); + bubbleView.setOverflow(overflow, bitmap); + return overflow; + } + + @SuppressLint("UseCompatLoadingForDrawables") + private Bitmap createOverflowBitmap() { + Drawable iconDrawable = mContext.getDrawable(R.drawable.bubble_ic_overflow_button); + return mIconFactory.createBadgedIconBitmap(iconDrawable, + new IconOptions() + .setBitmapGenerationMode(MODE_WITH_SHADOW) + .setExtractedColor(Color.TRANSPARENT)).icon; + } + +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissController.java index e3e95dc8687..ca81d0c98fa 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissController.java @@ -29,8 +29,8 @@ import com.android.launcher3.R; import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarDragLayer; -import com.android.wm.shell.common.bubbles.DismissView; -import com.android.wm.shell.common.magnetictarget.MagnetizedObject; +import com.android.wm.shell.shared.bubbles.DismissView; +import com.android.wm.shell.shared.magnetictarget.MagnetizedObject; /** @@ -144,10 +144,10 @@ private void dismissMagnetizedObject() { if (mMagnetizedObject.getUnderlyingObject() instanceof BubbleView) { BubbleView bubbleView = (BubbleView) mMagnetizedObject.getUnderlyingObject(); if (bubbleView.getBubble() != null) { - mBubbleBarViewController.onDismissBubbleWhileDragging(bubbleView.getBubble()); + mBubbleBarViewController.notifySysUiBubbleDismissed(bubbleView.getBubble()); } } else if (mMagnetizedObject.getUnderlyingObject() instanceof BubbleBarView) { - mBubbleBarViewController.onDismissAllBubblesWhileDragging(); + mBubbleBarViewController.onDismissAllBubbles(); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissViewExt.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissViewExt.kt index a4797451b38..9f7163dd263 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissViewExt.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissViewExt.kt @@ -18,7 +18,8 @@ package com.android.launcher3.taskbar.bubbles import com.android.launcher3.R -import com.android.wm.shell.common.bubbles.DismissView +import com.android.wm.shell.shared.R as SharedR // WM and WMShared are "shared" or linked together. +import com.android.wm.shell.shared.bubbles.DismissView /** * Dismiss view is shared from WMShell. It requires setup with local resources. @@ -35,9 +36,10 @@ fun DismissView.setup() { iconSizeResId = R.dimen.bubblebar_dismiss_target_icon_size, bottomMarginResId = R.dimen.bubblebar_dismiss_target_bottom_margin, floatingGradientHeightResId = R.dimen.bubblebar_dismiss_floating_gradient_height, - floatingGradientColorResId = R.color.system_neutral1_900, - backgroundResId = R.drawable.bg_bubble_dismiss_circle, - iconResId = R.drawable.ic_bubble_dismiss_white + floatingGradientColorResId = android.R.color.system_neutral1_900, + backgroundResId = SharedR.drawable.floating_dismiss_background, + iconResId = SharedR.drawable.floating_dismiss_ic_close, + applyMarginOverNavBarInset = false, ) ) } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDragAnimator.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDragAnimator.java index 7b049c510d1..b2c60a8d9b0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDragAnimator.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDragAnimator.java @@ -29,14 +29,14 @@ import androidx.dynamicanimation.animation.FloatPropertyCompat; import com.android.launcher3.R; -import com.android.wm.shell.common.bubbles.DismissCircleView; -import com.android.wm.shell.common.bubbles.DismissView; +import com.android.wm.shell.shared.bubbles.DismissCircleView; +import com.android.wm.shell.shared.bubbles.DismissView; +//import com.android.wm.shell.shared.animation.PhysicsAnimator; import app.lawnchair.animation.PhysicsAnimator; /** - * The animator performs the bubble animations while dragging and coordinates - * bubble and dismiss + * The animator performs the bubble animations while dragging and coordinates bubble and dismiss * view animations when it gets magnetized, released or dismissed. */ public class BubbleDragAnimator { @@ -46,11 +46,11 @@ public class BubbleDragAnimator { // 400f matches to MEDIUM_LOW spring stiffness private static final float TRANSLATION_SPRING_STIFFNESS = 400f; - private final PhysicsAnimator.SpringConfig mDefaultConfig = new PhysicsAnimator.SpringConfig(STIFFNESS_LOW, - DAMPING_RATIO_LOW_BOUNCY); - private final PhysicsAnimator.SpringConfig mTranslationConfig = new PhysicsAnimator.SpringConfig( - TRANSLATION_SPRING_STIFFNESS, - DAMPING_RATIO_LOW_BOUNCY); + private final PhysicsAnimator.SpringConfig mDefaultConfig = + new PhysicsAnimator.SpringConfig(STIFFNESS_LOW, DAMPING_RATIO_LOW_BOUNCY); + private final PhysicsAnimator.SpringConfig mTranslationConfig = + new PhysicsAnimator.SpringConfig(TRANSLATION_SPRING_STIFFNESS, + DAMPING_RATIO_LOW_BOUNCY); @NonNull private final View mView; @NonNull @@ -114,8 +114,7 @@ public void animateFocused() { * * @param restingPosition the position to animate to * @param velocity the initial velocity to use for the spring animation - * @param endActions gets called when the animation completes or gets - * cancelled + * @param endActions gets called when the animation completes or gets cancelled */ public void animateToRestingState(@NonNull PointF restingPosition, @NonNull PointF velocity, @Nullable Runnable endActions) { @@ -131,7 +130,7 @@ public void animateToRestingState(@NonNull PointF restingPosition, @NonNull Poin boolean wasFling, boolean canceled, float finalValue, float finalVelocity, boolean allRelevantPropertyAnimationsEnded) -> { if (canceled || allRelevantPropertyAnimationsEnded) { - resetAnimatedViews(restingPosition); + resetAnimatedViews(restingPosition, /* dismissed= */ false); if (endActions != null) { endActions.run(); } @@ -141,8 +140,7 @@ public void animateToRestingState(@NonNull PointF restingPosition, @NonNull Poin } /** - * Animates the dragged view alongside the dismiss view when it gets captured in - * the dismiss + * Animates the dragged view alongside the dismiss view when it gets captured in the dismiss * target area. */ public void animateDismissCaptured() { @@ -163,8 +161,7 @@ public void animateDismissCaptured() { } /** - * Animates the dragged view alongside the dismiss view when it gets released - * from the dismiss + * Animates the dragged view alongside the dismiss view when it gets released from the dismiss * target area. */ public void animateDismissReleased() { @@ -185,13 +182,10 @@ public void animateDismissReleased() { } /** - * Animates the dragged bubble dismiss when it's released in the dismiss target - * area. + * Animates the dragged bubble dismiss when it's released in the dismiss target area. * - * @param initialPosition the initial position to move the bubble too after - * animation finishes - * @param endActions gets called when the animation completes or gets - * cancelled + * @param initialPosition the initial position to move the bubble too after animation finishes + * @param endActions gets called when the animation completes or gets cancelled */ public void animateDismiss(@NonNull PointF initialPosition, @Nullable Runnable endActions) { float dismissHeight = mDismissView != null ? mDismissView.getHeight() : 0f; @@ -205,9 +199,8 @@ public void animateDismiss(@NonNull PointF initialPosition, @Nullable Runnable e boolean wasFling, boolean canceled, float finalValue, float finalVelocity, boolean allRelevantPropertyAnimationsEnded) -> { if (canceled || allRelevantPropertyAnimationsEnded) { - resetAnimatedViews(initialPosition); - if (endActions != null) - endActions.run(); + resetAnimatedViews(initialPosition, /* dismissed= */ true); + if (endActions != null) endActions.run(); } }) .start(); @@ -217,11 +210,14 @@ public void animateDismiss(@NonNull PointF initialPosition, @Nullable Runnable e * Reset the animated views to the initial state * * @param initialPosition position of the bubble + * @param dismissed whether the animated view was dismissed */ - private void resetAnimatedViews(@NonNull PointF initialPosition) { + private void resetAnimatedViews(@NonNull PointF initialPosition, boolean dismissed) { mView.setScaleX(1f); mView.setScaleY(1f); - mView.setAlpha(1f); + if (!dismissed) { + mView.setAlpha(1f); + } mView.setTranslationX(initialPosition.x); mView.setTranslationY(initialPosition.y); diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDragController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDragController.java index efc747c7256..8ee8daaabc9 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDragController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDragController.java @@ -16,19 +16,34 @@ package com.android.launcher3.taskbar.bubbles; import android.annotation.SuppressLint; +import android.content.Context; +import android.graphics.Point; import android.graphics.PointF; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; import android.view.ViewConfiguration; +import android.view.WindowManager; +import android.widget.FrameLayout; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.dynamicanimation.animation.FloatPropertyCompat; import com.android.launcher3.taskbar.TaskbarActivityContext; -import com.android.wm.shell.common.bubbles.BaseBubblePinController.LocationChangeListener; -import com.android.wm.shell.common.bubbles.BubbleBarLocation; +import com.android.launcher3.taskbar.TaskbarUiState; +import com.android.launcher3.taskbar.bubbles.BubbleBarController.BubbleBarLocationListener; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import com.android.wm.shell.shared.bubbles.ContextUtils; +import com.android.wm.shell.shared.bubbles.DeviceConfig; +import com.android.wm.shell.shared.bubbles.DragZone; +import com.android.wm.shell.shared.bubbles.DragZoneFactory; +import com.android.wm.shell.shared.bubbles.DragZoneFactory.BubbleBarPropertiesProvider; +import com.android.wm.shell.shared.bubbles.DragZoneFactory.DesktopWindowModeChecker; +import com.android.wm.shell.shared.bubbles.DragZoneFactory.SplitScreenModeChecker; +import com.android.wm.shell.shared.bubbles.DraggedObject; +import com.android.wm.shell.shared.bubbles.DropTargetManager; +import com.android.wm.shell.shared.bubbles.DropTargetManager.DragZoneChangedListener; /** * Controls bubble bar drag interactions. @@ -71,14 +86,58 @@ public void setValue(View view, float value) { }; private final TaskbarActivityContext mActivity; + private final TaskbarUiState mTaskbarUiState; private BubbleBarController mBubbleBarController; private BubbleBarViewController mBubbleBarViewController; private BubbleDismissController mBubbleDismissController; - private BubbleBarPinController mBubbleBarPinController; - private BubblePinController mBubblePinController; + private BubbleBarLocationListener mBubbleBarLocationListener; + private final DropTargetManager mDropTargetManager; + private final DragZoneFactory mDragZoneFactory; + private final BubbleDragZoneChangedListener mBubbleDragZoneChangedListener; - public BubbleDragController(TaskbarActivityContext activity) { + private boolean mIsDragging; + + public BubbleDragController(TaskbarActivityContext activity, Context context, + FrameLayout dropTargetParent, TaskbarUiState taskbarUiState) { mActivity = activity; + mTaskbarUiState = taskbarUiState; + WindowManager windowManager = context.getSystemService(WindowManager.class); + DeviceConfig deviceConfig = DeviceConfig.create(context, windowManager); + SplitScreenModeChecker splitScreenModeChecker = new SplitScreenModeChecker() { + @NonNull + @Override + public SplitScreenMode getSplitScreenMode() { + return SplitScreenMode.NONE; + } + }; + DesktopWindowModeChecker desktopWindowModeChecker = new DesktopWindowModeChecker() { + @Override + public boolean isSupported() { + return false; + } + }; + BubbleBarPropertiesProvider bubbleBarPropertiesProvider = + new BubbleBarPropertiesProvider() { + @Override + public int getHeight() { + return (int) mBubbleBarViewController.getBubbleBarCollapsedHeight(); + } + + @Override + public int getWidth() { + return (int) mBubbleBarViewController.getBubbleBarCollapsedWidth(); + } + + @Override + public int getBottomPadding() { + return (int) -mBubbleBarViewController.getBubbleBarTranslationY().value; + } + }; + mDragZoneFactory = new DragZoneFactory(context, deviceConfig, + splitScreenModeChecker, desktopWindowModeChecker, bubbleBarPropertiesProvider); + mBubbleDragZoneChangedListener = new BubbleDragZoneChangedListener(); + mDropTargetManager = + new DropTargetManager(context, dropTargetParent, mBubbleDragZoneChangedListener); } /** @@ -86,19 +145,12 @@ public BubbleDragController(TaskbarActivityContext activity) { * Should be careful to only access things that were created in constructors for now, as some * controllers may still be waiting for init(). */ - public void init(@NonNull BubbleControllers bubbleControllers) { + public void init(@NonNull BubbleControllers bubbleControllers, + BubbleBarLocationListener bubbleBarLocationListener) { mBubbleBarController = bubbleControllers.bubbleBarController; mBubbleBarViewController = bubbleControllers.bubbleBarViewController; mBubbleDismissController = bubbleControllers.bubbleDismissController; - mBubbleBarPinController = bubbleControllers.bubbleBarPinController; - mBubblePinController = bubbleControllers.bubblePinController; - mBubbleDismissController.setListener( - stuck -> { - if (stuck) { - mBubbleBarPinController.onStuckToDismissTarget(); - mBubblePinController.onStuckToDismissTarget(); - } - }); + mBubbleBarLocationListener = bubbleBarLocationListener; } /** @@ -113,60 +165,60 @@ public void setupBubbleView(@NonNull BubbleView bubbleView) { bubbleView.setOnTouchListener(new BubbleTouchListener() { - private BubbleBarLocation mReleasedLocation = BubbleBarLocation.DEFAULT; - - private final LocationChangeListener mLocationChangeListener = - new LocationChangeListener() { - @Override - public void onChange(@NonNull BubbleBarLocation location) { - mBubbleBarController.animateBubbleBarLocation(location); - } - - @Override - public void onRelease(@NonNull BubbleBarLocation location) { - mReleasedLocation = location; - } - }; - @Override void onDragStart() { - mBubblePinController.setListener(mLocationChangeListener); mBubbleBarViewController.onBubbleDragStart(bubbleView); - mBubblePinController.onDragStart( - mBubbleBarViewController.getBubbleBarLocation().isOnLeft( - bubbleView.isLayoutRtl())); + DraggedObject.Bubble draggedBubble = + new DraggedObject.Bubble( + mBubbleBarViewController.getBubbleBarLocation()); + mDropTargetManager.onDragStarted(draggedBubble, + mDragZoneFactory.createSortedDragZones(draggedBubble)); } @Override protected void onDragUpdate(float x, float y, float newTx, float newTy) { bubbleView.setDragTranslationX(newTx); bubbleView.setTranslationY(newTy); - mBubblePinController.onDragUpdate(x, y); } @Override protected void onDragRelease() { - mBubblePinController.onDragEnd(); - mBubbleBarViewController.onBubbleDragRelease(mReleasedLocation); + mDropTargetManager.onDragEnded(); + if (!mBubbleDragZoneChangedListener.isDraggedToFullscreen()) { + // TODO b/393173014: check for desktop window and split once they're + // implemented. this notifies wm shell that the dragged bubble was + // released so that we can show the expanded view. we only want to show it + // after releasing in a Bubble zone. But Split and Desktop Window aren't + // implemented yet, so we only check for full screen for now. + mBubbleBarViewController.onBubbleDragRelease( + mBubbleDragZoneChangedListener.mBubbleBarLocation); + } } @Override protected void onDragDismiss() { - mBubblePinController.onDragEnd(); + mDropTargetManager.onDragEnded(); + mBubbleBarViewController.onBubbleDismissed(bubbleView); mBubbleBarViewController.onBubbleDragEnd(); } @Override - void onDragEnd() { - mBubbleBarController.updateBubbleBarLocation(mReleasedLocation); + void onDragEnd(float x, float y) { + mBubbleBarController.updateBubbleBarLocation( + mBubbleDragZoneChangedListener.mBubbleBarLocation, + BubbleBarLocation.UpdateSource.DRAG_BUBBLE); + mDropTargetManager.onDragEnded(); + if (mBubbleDragZoneChangedListener.isDraggedToFullscreen()) { + mBubbleBarViewController.moveDraggedBubbleToFullscreen( + bubbleView, new Point((int) x, (int) y)); + } mBubbleBarViewController.onBubbleDragEnd(); - mBubblePinController.setListener(null); } @Override protected PointF getRestingPosition() { return mBubbleBarViewController.getDraggedBubbleReleaseTranslation( - getInitialPosition(), mReleasedLocation); + getInitialPosition(), mBubbleDragZoneChangedListener.mBubbleBarLocation); } }); } @@ -179,11 +231,6 @@ public void setupBubbleBarView(@NonNull BubbleBarView bubbleBarView) { PointF initialRelativePivot = new PointF(); bubbleBarView.setOnTouchListener(new BubbleTouchListener() { - private BubbleBarLocation mReleasedLocation = BubbleBarLocation.DEFAULT; - - private final LocationChangeListener mLocationChangeListener = - location -> mReleasedLocation = location; - @Override protected boolean onTouchDown(@NonNull View view, @NonNull MotionEvent event) { if (bubbleBarView.isExpanded()) return false; @@ -192,53 +239,66 @@ protected boolean onTouchDown(@NonNull View view, @NonNull MotionEvent event) { @Override void onDragStart() { - mBubbleBarPinController.setListener(mLocationChangeListener); initialRelativePivot.set(bubbleBarView.getRelativePivotX(), bubbleBarView.getRelativePivotY()); // By default the bubble bar view pivot is in bottom right corner, while dragging // it should be centered in order to align it with the dismiss target view bubbleBarView.setRelativePivot(/* x = */ 0.5f, /* y = */ 0.5f); bubbleBarView.setIsDragging(true); - mBubbleBarPinController.onDragStart( - bubbleBarView.getBubbleBarLocation().isOnLeft(bubbleBarView.isLayoutRtl())); + DraggedObject.BubbleBar draggedBubbleBar = new DraggedObject.BubbleBar( + mBubbleBarViewController.getBubbleBarLocation()); + mDropTargetManager.onDragStarted(draggedBubbleBar, + mDragZoneFactory.createSortedDragZones(draggedBubbleBar)); } @Override protected void onDragUpdate(float x, float y, float newTx, float newTy) { bubbleBarView.setTranslationX(newTx); bubbleBarView.setTranslationY(newTy); - mBubbleBarPinController.onDragUpdate(x, y); } @Override protected void onDragRelease() { - mBubbleBarPinController.onDragEnd(); + mDropTargetManager.onDragEnded(); } @Override protected void onDragDismiss() { - mBubbleBarPinController.onDragEnd(); + mDropTargetManager.onDragEnded(); } @Override - void onDragEnd() { + void onDragEnd(float x, float y) { // Make sure to update location as the first thing. Pivot update causes a relayout - mBubbleBarController.updateBubbleBarLocation(mReleasedLocation); + mBubbleBarController.updateBubbleBarLocation( + mBubbleDragZoneChangedListener.mBubbleBarLocation, + BubbleBarLocation.UpdateSource.DRAG_BAR); bubbleBarView.setIsDragging(false); // Restoring the initial pivot for the bubble bar view bubbleBarView.setRelativePivot(initialRelativePivot.x, initialRelativePivot.y); mBubbleBarViewController.onBubbleBarDragEnd(); - mBubbleBarPinController.setListener(null); + mDropTargetManager.onDragEnded(); } @Override protected PointF getRestingPosition() { return mBubbleBarViewController.getBubbleBarDragReleaseTranslation( - getInitialPosition(), mReleasedLocation); + getInitialPosition(), mBubbleDragZoneChangedListener.mBubbleBarLocation); } }); } + /** Whether there is an item being dragged or not. */ + public boolean isDragging() { + return mIsDragging; + } + + /** Sets whether something is being dragged or not. */ + public void setIsDragging(boolean isDragging) { + mIsDragging = isDragging; + mTaskbarUiState.setIsBubbleDragging(isDragging); + } + /** * Bubble touch listener for handling a single bubble view or bubble bar view while dragging. * The dragging starts after "shorter" long click (the long click duration might change): @@ -284,7 +344,7 @@ private enum State { private final PointF mTouchDownLocation = new PointF(); private final PointF mViewInitialPosition = new PointF(); private final VelocityTracker mVelocityTracker = VelocityTracker.obtain(); - private final long mPressToDragTimeout = ViewConfiguration.getLongPressTimeout() / 2; + private final long mPressToDragTimeout = ViewConfiguration.getLongPressTimeout(); private State mState = State.IDLE; private int mTouchSlop = -1; private BubbleDragAnimator mAnimator; @@ -305,7 +365,7 @@ private enum State { /** * Called when the dragging interaction has ended and all the animations have completed */ - abstract void onDragEnd(); + abstract void onDragEnd(float x, float y); /** * Called when the dragged bubble is released outside of the dismiss target area and will @@ -435,6 +495,7 @@ protected void onTouchCancel(@NonNull View view, @NonNull MotionEvent event) { private void startDragging(@NonNull View view) { onDragStart(); + BubbleDragController.this.setIsDragging(true); mActivity.setTaskbarWindowFullscreen(true); mAnimator = new BubbleDragAnimator(view); mAnimator.animateFocused(); @@ -444,17 +505,26 @@ private void startDragging(@NonNull View view) { private void drag(@NonNull View view, @NonNull MotionEvent event, float dx, float dy, float x, float y) { - if (mBubbleDismissController.handleTouchEvent(event)) return; + // notify drop target manager about the new drag location regardless of whether we + // are in the dismiss zone so that it can keep track of the current zone and update + // the drop target view + mDropTargetManager.onDragUpdated((int) x, (int) y); + if (mBubbleDismissController.handleTouchEvent(event)) { + // if we're dragging within the dismiss target, return immediately; the dragged + // object is manipulated by the dismiss target + return; + } final float newTx = mViewInitialPosition.x + dx; final float newTy = mViewInitialPosition.y + dy; onDragUpdate(x, y, newTx, newTy); } private void stopDragging(@NonNull View view, @NonNull MotionEvent event) { + BubbleDragController.this.setIsDragging(false); Runnable onComplete = () -> { mActivity.setTaskbarWindowFullscreen(false); cleanUp(view); - onDragEnd(); + onDragEnd(event.getRawX(), event.getRawY()); }; if (mBubbleDismissController.handleTouchEvent(event)) { @@ -462,8 +532,12 @@ private void stopDragging(@NonNull View view, @NonNull MotionEvent event) { mAnimator.animateDismiss(mViewInitialPosition, onComplete); } else { onDragRelease(); - mAnimator.animateToRestingState(getRestingPosition(), getCurrentVelocity(), - onComplete); + if (mBubbleDragZoneChangedListener.isDraggedToFullscreen()) { + onComplete.run(); + } else { + mAnimator.animateToRestingState(getRestingPosition(), getCurrentVelocity(), + onComplete); + } } mBubbleDismissController.hideDismissView(); } @@ -503,4 +577,65 @@ private PointF getCurrentVelocity() { return new PointF(mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity()); } } + + private class BubbleDragZoneChangedListener implements DragZoneChangedListener { + + private BubbleBarLocation mInitialLocation = BubbleBarLocation.DEFAULT; + private BubbleBarLocation mBubbleBarLocation = BubbleBarLocation.DEFAULT; + private DragZone mDragZone; + + boolean isDraggedToFullscreen() { + return mDragZone instanceof DragZone.FullScreen; + } + + @Override + public void onInitialDragZoneSet(@Nullable DragZone dragZone) { + mDragZone = dragZone; + if (dragZone instanceof DragZone.Bubble.Left) { + mBubbleBarLocation = BubbleBarLocation.LEFT; + } else if (dragZone instanceof DragZone.Bubble.Right) { + mBubbleBarLocation = BubbleBarLocation.RIGHT; + } + mInitialLocation = mBubbleBarLocation; + } + + @Override + public void onDragZoneChanged(@NonNull DraggedObject draggedObject, @Nullable DragZone from, + @Nullable DragZone to) { + mDragZone = to; + final boolean inLeftBubbleZone = to instanceof DragZone.Bubble.Left; + final boolean inRightBubbleZone = to instanceof DragZone.Bubble.Right; + final boolean inDismissZone = to instanceof DragZone.Dismiss; + final boolean draggingBubble = draggedObject instanceof DraggedObject.Bubble; + + if (inLeftBubbleZone && mBubbleBarLocation != BubbleBarLocation.LEFT) { + if (draggingBubble) { + // listener will be notified by BubbleBarController + mBubbleBarController.animateBubbleBarLocation(BubbleBarLocation.LEFT); + } else { + // otherwise notify listener manually + mBubbleBarLocationListener.onBubbleBarLocationAnimated(BubbleBarLocation.LEFT); + } + mBubbleBarLocation = BubbleBarLocation.LEFT; + } else if (inRightBubbleZone && mBubbleBarLocation != BubbleBarLocation.RIGHT) { + if (draggingBubble) { + mBubbleBarController.animateBubbleBarLocation(BubbleBarLocation.RIGHT); + } else { + mBubbleBarLocationListener.onBubbleBarLocationAnimated(BubbleBarLocation.RIGHT); + } + mBubbleBarLocation = BubbleBarLocation.RIGHT; + } else if (inDismissZone && draggingBubble) { + final boolean lastBubbleLocationDifferentFromInitial = + BubbleBarLocation.isDifferentSides(mBubbleBarLocation, mInitialLocation, + ContextUtils.isRtl(mActivity)); + if (lastBubbleLocationDifferentFromInitial) { + mBubbleBarLocation = mInitialLocation; + mBubbleBarController.animateBubbleBarLocation(mInitialLocation); + } + } + } + + @Override + public void onDragEnded(@Nullable DragZone zone) {} + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubblePinController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubblePinController.kt deleted file mode 100644 index a77e685d002..00000000000 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubblePinController.kt +++ /dev/null @@ -1,111 +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.launcher3.taskbar.bubbles - -import android.annotation.SuppressLint -import android.content.Context -import android.graphics.Point -import android.view.Gravity.BOTTOM -import android.view.Gravity.LEFT -import android.view.Gravity.RIGHT -import android.view.LayoutInflater -import android.view.View -import android.widget.FrameLayout -import androidx.core.view.updateLayoutParams -import com.android.launcher3.R -import com.android.wm.shell.common.bubbles.BaseBubblePinController -import com.android.wm.shell.common.bubbles.BubbleBarLocation - -/** Controller to manage pinning bubble bar to left or right when dragging starts from a bubble */ -class BubblePinController( - private val context: Context, - private val container: FrameLayout, - screenSizeProvider: () -> Point -) : BaseBubblePinController(screenSizeProvider) { - - var dropTargetSize: Point? = null - - private lateinit var bubbleBarViewController: BubbleBarViewController - private lateinit var bubbleStashController: BubbleStashController - private var exclRectWidth: Float = 0f - private var exclRectHeight: Float = 0f - - private var dropTargetView: View? = null - // Fallback width and height in case shell has not sent the size over - private var dropTargetDefaultWidth: Int = 0 - private var dropTargetDefaultHeight: Int = 0 - private var dropTargetMargin: Int = 0 - - fun init(bubbleControllers: BubbleControllers) { - bubbleBarViewController = bubbleControllers.bubbleBarViewController - bubbleStashController = bubbleControllers.bubbleStashController - exclRectWidth = context.resources.getDimension(R.dimen.bubblebar_dismiss_zone_width) - exclRectHeight = context.resources.getDimension(R.dimen.bubblebar_dismiss_zone_height) - dropTargetDefaultWidth = - context.resources.getDimensionPixelSize( - R.dimen.bubble_expanded_view_drop_target_default_width - ) - dropTargetDefaultHeight = - context.resources.getDimensionPixelSize( - R.dimen.bubble_expanded_view_drop_target_default_height - ) - dropTargetMargin = - context.resources.getDimensionPixelSize(R.dimen.bubble_expanded_view_drop_target_margin) - } - - override fun getExclusionRectWidth(): Float { - return exclRectWidth - } - - override fun getExclusionRectHeight(): Float { - return exclRectHeight - } - - override fun getDropTargetView(): View? { - return dropTargetView - } - - override fun removeDropTargetView(view: View) { - container.removeView(view) - dropTargetView = null - } - - override fun createDropTargetView(): View { - return LayoutInflater.from(context) - .inflate(R.layout.bubble_expanded_view_drop_target, container, false) - .also { view -> - dropTargetView = view - container.addView(view) - } - } - - @SuppressLint("RtlHardcoded") - override fun updateLocation(location: BubbleBarLocation) { - val onLeft = location.isOnLeft(container.isLayoutRtl) - - val bubbleBarBounds = bubbleBarViewController.bubbleBarBounds - dropTargetView?.updateLayoutParams { - gravity = BOTTOM or (if (onLeft) LEFT else RIGHT) - width = dropTargetSize?.x ?: dropTargetDefaultWidth - height = dropTargetSize?.y ?: dropTargetDefaultHeight - bottomMargin = - -bubbleStashController.bubbleBarTranslationY.toInt() + - bubbleBarBounds.height() + - dropTargetMargin - } - } -} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java deleted file mode 100644 index 4f927f07c35..00000000000 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java +++ /dev/null @@ -1,481 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.taskbar.bubbles; - -import static java.lang.Math.abs; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; -import android.annotation.Nullable; -import android.view.InsetsController; -import android.view.MotionEvent; -import android.view.View; - -import com.android.launcher3.R; -import com.android.launcher3.anim.AnimatedFloat; -import com.android.launcher3.taskbar.StashedHandleViewController; -import com.android.launcher3.taskbar.TaskbarActivityContext; -import com.android.launcher3.taskbar.TaskbarControllers; -import com.android.launcher3.taskbar.TaskbarInsetsController; -import com.android.launcher3.taskbar.TaskbarStashController; -import com.android.launcher3.util.MultiPropertyFactory; -import com.android.wm.shell.common.bubbles.BubbleBarLocation; -import com.android.wm.shell.shared.animation.PhysicsAnimator; - -/** - * Coordinates between controllers such as BubbleBarView and - * BubbleHandleViewController to - * create a cohesive animation between stashed/unstashed states. - */ -public class BubbleStashController { - - private static final String TAG = "BubbleStashController"; - - /** - * How long to stash/unstash. - */ - public static final long BAR_STASH_DURATION = InsetsController.ANIMATION_DURATION_RESIZE; - - /** - * The scale bubble bar animates to when being stashed. - */ - private static final float STASHED_BAR_SCALE = 0.5f; - - protected final TaskbarActivityContext mActivity; - - // Initialized in init. - private TaskbarControllers mControllers; - private TaskbarInsetsController mTaskbarInsetsController; - private BubbleBarViewController mBarViewController; - private BubbleStashedHandleViewController mHandleViewController; - private TaskbarStashController mTaskbarStashController; - - private MultiPropertyFactory.MultiProperty mIconAlphaForStash; - private AnimatedFloat mIconScaleForStash; - private AnimatedFloat mIconTranslationYForStash; - private MultiPropertyFactory.MultiProperty mBubbleStashedHandleAlpha; - - private boolean mRequestedStashState; - private boolean mRequestedExpandedState; - - private boolean mIsStashed; - private int mStashedHeight; - private int mUnstashedHeight; - private boolean mBubblesShowingOnHome; - private boolean mBubblesShowingOnOverview; - private boolean mIsSysuiLocked; - - private final float mHandleCenterFromScreenBottom; - - @Nullable - private AnimatorSet mAnimator; - - public BubbleStashController(TaskbarActivityContext activity) { - mActivity = activity; - // the handle is centered within the stashed taskbar area - mHandleCenterFromScreenBottom = mActivity.getResources().getDimensionPixelSize(R.dimen.bubblebar_stashed_size) - / 2f; - } - - public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) { - mControllers = controllers; - mTaskbarInsetsController = controllers.taskbarInsetsController; - mBarViewController = bubbleControllers.bubbleBarViewController; - mHandleViewController = bubbleControllers.bubbleStashedHandleViewController; - mTaskbarStashController = controllers.taskbarStashController; - - mIconAlphaForStash = mBarViewController.getBubbleBarAlpha().get(0); - mIconScaleForStash = mBarViewController.getBubbleBarScale(); - mIconTranslationYForStash = mBarViewController.getBubbleBarTranslationY(); - - mBubbleStashedHandleAlpha = mHandleViewController.getStashedHandleAlpha().get( - StashedHandleViewController.ALPHA_INDEX_STASHED); - - mStashedHeight = mHandleViewController.getStashedHeight(); - mUnstashedHeight = mHandleViewController.getUnstashedHeight(); - } - - /** - * Returns the touchable height of the bubble bar based on it's stashed state. - */ - public int getTouchableHeight() { - return mIsStashed ? mStashedHeight : mUnstashedHeight; - } - - /** - * Returns whether the bubble bar is currently stashed. - */ - public boolean isStashed() { - return mIsStashed; - } - - /** - * Animates the handle (or bubble bar depending on state) to be visible after - * the device is - * unlocked. - * - *

- * Normally either the bubble bar or the handle is visible, - * and {@link #showBubbleBar(boolean)} and {@link #stashBubbleBar()} are used to - * transition - * between these two states. But the transition from the state where both the - * bar and handle - * are invisible is slightly different. - */ - private void animateAfterUnlock() { - AnimatorSet animatorSet = new AnimatorSet(); - if (mBubblesShowingOnHome || mBubblesShowingOnOverview) { - mIsStashed = false; - animatorSet.playTogether(mIconScaleForStash.animateToValue(1), - mIconTranslationYForStash.animateToValue(getBubbleBarTranslationY()), - mIconAlphaForStash.animateToValue(1)); - } else { - mIsStashed = true; - animatorSet.playTogether(mBubbleStashedHandleAlpha.animateToValue(1)); - } - - animatorSet.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - onIsStashedChanged(); - } - }); - animatorSet.setDuration(BAR_STASH_DURATION).start(); - } - - /** - * Called when launcher enters or exits the home page. Bubbles are unstashed on - * home. - */ - public void setBubblesShowingOnHome(boolean onHome) { - if (mBubblesShowingOnHome != onHome) { - mBubblesShowingOnHome = onHome; - - if (!mBarViewController.hasBubbles()) { - // if there are no bubbles, there's nothing to show, so just return. - return; - } - - if (mBubblesShowingOnHome) { - showBubbleBar(/* expanded= */ false); - // When transitioning from app to home the stash animator may already have been - // created, so we need to animate the bubble bar here to align with hotseat. - if (!mIsStashed) { - mIconTranslationYForStash.animateToValue(getBubbleBarTranslationYForHotseat()) - .start(); - } - // If the bubble bar is already unstashed, the taskbar touchable region won't be - // updated correctly, so force an update here. - mControllers - .runAfterInit(() -> mTaskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged()); - } else if (!mBarViewController.isExpanded()) { - stashBubbleBar(); - } - } - } - - /** Whether bubbles are showing on the launcher home page. */ - public boolean isBubblesShowingOnHome() { - return mBubblesShowingOnHome; - } - - // TODO: when tapping on an app in overview, this is a bit delayed compared to - // taskbar stashing - /** - * Called when launcher enters or exits overview. Bubbles are unstashed on - * overview. - */ - public void setBubblesShowingOnOverview(boolean onOverview) { - if (mBubblesShowingOnOverview != onOverview) { - mBubblesShowingOnOverview = onOverview; - if (!mBubblesShowingOnOverview && !mBarViewController.isExpanded()) { - stashBubbleBar(); - } else { - // When transitioning to overview the stash animator may already have been - // created, so we need to animate the bubble bar here to align with taskbar. - mIconTranslationYForStash.animateToValue(getBubbleBarTranslationYForTaskbar()) - .start(); - } - } - } - - /** Whether bubbles are showing on Overview. */ - public boolean isBubblesShowingOnOverview() { - return mBubblesShowingOnOverview; - } - - /** - * Called when sysui locked state changes, when locked, bubble bar is stashed. - */ - public void onSysuiLockedStateChange(boolean isSysuiLocked) { - if (isSysuiLocked != mIsSysuiLocked) { - mIsSysuiLocked = isSysuiLocked; - if (!mIsSysuiLocked && mBarViewController.hasBubbles()) { - animateAfterUnlock(); - } - } - } - - /** - * Stashes the bubble bar if allowed based on other state (e.g. on home and - * overview the - * bar does not stash). - */ - public void stashBubbleBar() { - mRequestedStashState = true; - mRequestedExpandedState = false; - updateStashedAndExpandedState(); - } - - /** - * Shows the bubble bar, and expands bubbles depending on - * {@param expandBubbles}. - */ - public void showBubbleBar(boolean expandBubbles) { - mRequestedStashState = false; - mRequestedExpandedState = expandBubbles; - updateStashedAndExpandedState(); - } - - private void updateStashedAndExpandedState() { - if (mBarViewController.isHiddenForNoBubbles()) { - // If there are no bubbles the bar and handle are invisible, nothing to do here. - return; - } - boolean isStashed = mRequestedStashState - && !mBubblesShowingOnHome - && !mBubblesShowingOnOverview; - if (mIsStashed != isStashed) { - // notify the view controller that the stash state is about to change so that it - // can - // cancel an ongoing animation if there is one. - // note that this has to be called before updating mIsStashed with the new - // value, - // otherwise interrupting an ongoing animation may update it again with the - // wrong state - mBarViewController.onStashStateChanging(); - mIsStashed = isStashed; - if (mAnimator != null) { - mAnimator.cancel(); - } - mAnimator = createStashAnimator(mIsStashed, BAR_STASH_DURATION); - mAnimator.start(); - onIsStashedChanged(); - } - if (mBarViewController.isExpanded() != mRequestedExpandedState) { - mBarViewController.setExpanded(mRequestedExpandedState); - } - } - - /** - * Create a stash animation. - * - * @param isStashed whether it's a stash animation or an unstash animation - * @param duration duration of the animation - * @return the animation - */ - private AnimatorSet createStashAnimator(boolean isStashed, long duration) { - AnimatorSet animatorSet = new AnimatorSet(); - - AnimatorSet fullLengthAnimatorSet = new AnimatorSet(); - // Not exactly half and may overlap. See [first|second]HalfDurationScale below. - AnimatorSet firstHalfAnimatorSet = new AnimatorSet(); - AnimatorSet secondHalfAnimatorSet = new AnimatorSet(); - - final float firstHalfDurationScale; - final float secondHalfDurationScale; - - if (isStashed) { - firstHalfDurationScale = 0.75f; - secondHalfDurationScale = 0.5f; - - fullLengthAnimatorSet.play( - mIconTranslationYForStash.animateToValue(getStashTranslation())); - - firstHalfAnimatorSet.playTogether( - mIconAlphaForStash.animateToValue(0), - mIconScaleForStash.animateToValue(STASHED_BAR_SCALE)); - secondHalfAnimatorSet.playTogether( - mBubbleStashedHandleAlpha.animateToValue(1)); - } else { - firstHalfDurationScale = 0.5f; - secondHalfDurationScale = 0.75f; - - final float translationY = getBubbleBarTranslationY(); - - fullLengthAnimatorSet.playTogether( - mIconScaleForStash.animateToValue(1), - mIconTranslationYForStash.animateToValue(translationY)); - - firstHalfAnimatorSet.playTogether( - mBubbleStashedHandleAlpha.animateToValue(0)); - secondHalfAnimatorSet.playTogether( - mIconAlphaForStash.animateToValue(1)); - } - - fullLengthAnimatorSet.play(mHandleViewController.createRevealAnimToIsStashed(isStashed)); - - fullLengthAnimatorSet.setDuration(duration); - firstHalfAnimatorSet.setDuration((long) (duration * firstHalfDurationScale)); - secondHalfAnimatorSet.setDuration((long) (duration * secondHalfDurationScale)); - secondHalfAnimatorSet.setStartDelay((long) (duration * (1 - secondHalfDurationScale))); - - animatorSet.playTogether(fullLengthAnimatorSet, firstHalfAnimatorSet, - secondHalfAnimatorSet); - animatorSet.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mAnimator = null; - mControllers.runAfterInit(() -> { - if (isStashed) { - mBarViewController.setExpanded(false); - } - mTaskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged(); - }); - } - }); - return animatorSet; - } - - private float getStashTranslation() { - return (mUnstashedHeight - mStashedHeight) / 2f; - } - - private void onIsStashedChanged() { - mControllers.runAfterInit(() -> { - mHandleViewController.onIsStashedChanged(); - mTaskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged(); - }); - } - - public float getBubbleBarTranslationYForTaskbar() { - return -mActivity.getDeviceProfile().taskbarBottomMargin; - } - - private float getBubbleBarTranslationYForHotseat() { - final float hotseatBottomSpace = mActivity.getDeviceProfile().hotseatBarBottomSpacePx; - final float hotseatCellHeight = mActivity.getDeviceProfile().hotseatCellHeightPx; - return -hotseatBottomSpace - hotseatCellHeight + mUnstashedHeight - abs( - hotseatCellHeight - mUnstashedHeight) / 2; - } - - public float getBubbleBarTranslationY() { - // If we're on home, adjust the translation so the bubble bar aligns with - // hotseat. - // Otherwise we're either showing in an app or in overview. In either case - // adjust it so - // the bubble bar aligns with the taskbar. - return mBubblesShowingOnHome ? getBubbleBarTranslationYForHotseat() - : getBubbleBarTranslationYForTaskbar(); - } - - /** - * The difference on the Y axis between the center of the handle and the center - * of the bubble - * bar. - */ - public float getDiffBetweenHandleAndBarCenters() { - // the difference between the centers of the handle and the bubble bar is the - // difference - // between their distance from the bottom of the screen. - - float barCenter = mBarViewController.getBubbleBarCollapsedHeight() / 2f; - return mHandleCenterFromScreenBottom - barCenter; - } - - /** The distance the handle moves as part of the new bubble animation. */ - public float getStashedHandleTranslationForNewBubbleAnimation() { - // the should move up to the top of the stashed taskbar area. it is centered - // within it so - // it should move the same distance as it is away from the bottom. - return -mHandleCenterFromScreenBottom; - } - - /** Checks whether the motion event is over the stash handle. */ - public boolean isEventOverStashHandle(MotionEvent ev) { - return mHandleViewController.isEventOverHandle(ev); - } - - /** Set a bubble bar location */ - public void setBubbleBarLocation(BubbleBarLocation bubbleBarLocation) { - mHandleViewController.setBubbleBarLocation(bubbleBarLocation); - } - - /** Returns the [PhysicsAnimator] for the stashed handle view. */ - public PhysicsAnimator getStashedHandlePhysicsAnimator() { - return mHandleViewController.getPhysicsAnimator(); - } - - /** Notifies taskbar that it should update its touchable region. */ - public void updateTaskbarTouchRegion() { - mTaskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged(); - } - - /** Shows the bubble bar immediately without animation. */ - public void showBubbleBarImmediate() { - mHandleViewController.setTranslationYForSwipe(0); - mIconTranslationYForStash.updateValue(getBubbleBarTranslationY()); - mIconAlphaForStash.setValue(1); - mIconScaleForStash.updateValue(1); - mIsStashed = false; - onIsStashedChanged(); - } - - /** Stashes the bubble bar immediately without animation. */ - public void stashBubbleBarImmediate() { - mHandleViewController.setTranslationYForSwipe(0); - mBubbleStashedHandleAlpha.setValue(1); - mIconAlphaForStash.setValue(0); - mIconTranslationYForStash.updateValue(getStashTranslation()); - mIconScaleForStash.updateValue(STASHED_BAR_SCALE); - mIsStashed = true; - onIsStashedChanged(); - } - - /** - * Updates the values of the internal animators after the new bubble animation - * was interrupted - * - * @param isStashed whether the current state should be stashed - * @param bubbleBarTranslationY the current bubble bar translation. this is only - * used if the - * bubble bar is showing to ensure that the stash - * animator runs - * smoothly. - */ - public void onNewBubbleAnimationInterrupted(boolean isStashed, float bubbleBarTranslationY) { - if (isStashed) { - mBubbleStashedHandleAlpha.setValue(1); - mIconAlphaForStash.setValue(0); - mIconScaleForStash.updateValue(STASHED_BAR_SCALE); - mIconTranslationYForStash.updateValue(getStashTranslation()); - } else { - mBubbleStashedHandleAlpha.setValue(0); - mHandleViewController.setTranslationYForSwipe(0); - mIconAlphaForStash.setValue(1); - mIconScaleForStash.updateValue(1); - mIconTranslationYForStash.updateValue(bubbleBarTranslationY); - } - mIsStashed = isStashed; - onIsStashedChanged(); - } - - /** Set the translation Y for the stashed handle. */ - public void setHandleTranslationY(float ty) { - mHandleViewController.setTranslationYForSwipe(ty); - } -} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashedHandleViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashedHandleViewController.java index 9d8186908ce..2a0c2163437 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashedHandleViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashedHandleViewController.java @@ -18,9 +18,12 @@ import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; +import static com.android.launcher3.Flags.refactorTaskbarUiState; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; +import android.annotation.Nullable; import android.content.res.Resources; import android.graphics.Outline; import android.graphics.Rect; @@ -28,47 +31,53 @@ import android.view.View; import android.view.ViewOutlineProvider; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.anim.RevealOutlineAnimation; import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; import com.android.launcher3.taskbar.StashedHandleView; import com.android.launcher3.taskbar.TaskbarActivityContext; -import com.android.launcher3.taskbar.TaskbarControllers; +import com.android.launcher3.taskbar.TaskbarUiState; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController; import com.android.launcher3.util.Executors; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.MultiValueAlpha; -import com.android.systemui.shared.navigationbar.RegionSamplingHelper; -import com.android.wm.shell.common.bubbles.BubbleBarLocation; import com.android.wm.shell.shared.animation.PhysicsAnimator; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import com.android.wm.shell.shared.handles.RegionSamplingHelper; /** - * Handles properties/data collection, then passes the results to our stashed - * handle View to render. + * Handles properties/data collection, then passes the results to our stashed handle View to render. */ public class BubbleStashedHandleViewController { private final TaskbarActivityContext mActivity; private final StashedHandleView mStashedHandleView; + private final TaskbarUiState mTaskbarUiState; private final MultiValueAlpha mStashedHandleAlpha; + private float mTranslationForSwipeY; + private float mTranslationForStashY; // Initialized in init. private BubbleBarViewController mBarViewController; private BubbleStashController mBubbleStashController; private RegionSamplingHelper mRegionSamplingHelper; - private int mBarSize; - private int mStashedTaskbarHeight; + // Height of the area for the stash handle. Handle will be drawn in the center of this. + // This is also the area where touch is handled on the handle. + private int mStashedBubbleBarHeight; private int mStashedHandleWidth; private int mStashedHandleHeight; - // The bounds we want to clip to in the settled state when showing the stashed - // handle. + // The bounds of the stashed handle in settled state. private final Rect mStashedHandleBounds = new Rect(); + private float mStashedHandleRadius; - // When the reveal animation is cancelled, we can assume it's about to create a - // new animation, + // When the reveal animation is cancelled, we can assume it's about to create a new animation, // which should start off at the same point the cancelled one left off. private float mStartProgressForNextRevealAnim; - private boolean mWasLastRevealAnimReversed; + // Use a nullable boolean to handle initial case where the last animation direction is not known + @Nullable + private Boolean mWasLastRevealAnimReversed = null; // XXX: if there are more of these maybe do state flags instead private boolean mHiddenForSysui; @@ -76,36 +85,49 @@ public class BubbleStashedHandleViewController { private boolean mHiddenForHomeButtonDisabled; public BubbleStashedHandleViewController(TaskbarActivityContext activity, - StashedHandleView stashedHandleView) { + StashedHandleView stashedHandleView, TaskbarUiState taskbarUiState) { mActivity = activity; mStashedHandleView = stashedHandleView; + mTaskbarUiState = taskbarUiState; mStashedHandleAlpha = new MultiValueAlpha(mStashedHandleView, 1); } - public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) { + /** Initialize controller. */ + public void init(BubbleControllers bubbleControllers) { mBarViewController = bubbleControllers.bubbleBarViewController; mBubbleStashController = bubbleControllers.bubbleStashController; + DeviceProfile deviceProfile = mActivity.getDeviceProfile(); Resources resources = mActivity.getResources(); mStashedHandleHeight = resources.getDimensionPixelSize( R.dimen.bubblebar_stashed_handle_height); mStashedHandleWidth = resources.getDimensionPixelSize( R.dimen.bubblebar_stashed_handle_width); - mBarSize = resources.getDimensionPixelSize(R.dimen.bubblebar_size); - final int bottomMargin = resources.getDimensionPixelSize( - R.dimen.transient_taskbar_bottom_margin); - mStashedHandleView.getLayoutParams().height = mBarSize + bottomMargin; + int barSize = resources.getDimensionPixelSize(R.dimen.bubblebar_size); + // Use the max translation for bubble bar whether it is on the home screen or in app. + // Use values directly from device profile to avoid referencing other bubble controllers + // during init flow. + int maxTy = Math.max(deviceProfile.hotseatBarBottomSpacePx, + deviceProfile.getTaskbarProfile().getBottomMargin()); + // Adjust handle view size to accommodate the handle morphing into the bubble bar + mStashedHandleView.getLayoutParams().height = barSize + maxTy; mStashedHandleAlpha.get(0).setValue(0); - mStashedTaskbarHeight = resources.getDimensionPixelSize( + mStashedBubbleBarHeight = resources.getDimensionPixelSize( R.dimen.bubblebar_stashed_size); + if (refactorTaskbarUiState()) { + mTaskbarUiState.setIsStashedHandlerViewVisible( + mStashedHandleView.getVisibility() == VISIBLE); + mTaskbarUiState.setStashedBubbleBarHeightPx(mStashedBubbleBarHeight); + } + mStashedHandleView.setOutlineProvider(new ViewOutlineProvider() { @Override public void getOutline(View view, Outline outline) { - float stashedHandleRadius = view.getHeight() / 2f; - outline.setRoundRect(mStashedHandleBounds, stashedHandleRadius); + mStashedHandleRadius = view.getHeight() / 2f; + outline.setRoundRect(mStashedHandleBounds, mStashedHandleRadius); } }); @@ -120,10 +142,15 @@ public void onRegionDarknessChanged(boolean isRegionDark) { public Rect getSampledRegion(View sampledView) { return mStashedHandleView.getSampledRegion(); } - }, Executors.UI_HELPER_EXECUTOR); + }, Executors.MAIN_EXECUTOR, Executors.UI_HELPER_EXECUTOR); - mStashedHandleView.addOnLayoutChangeListener( - (view, i, i1, i2, i3, i4, i5, i6, i7) -> updateBounds(mBarViewController.getBubbleBarLocation())); + mStashedHandleView.addOnLayoutChangeListener((view, i, i1, i2, i3, i4, i5, i6, i7) -> { + updateBounds(mBarViewController.getBubbleBarLocation()); + if (refactorTaskbarUiState()) { + mTaskbarUiState.setIsStashedHandlerViewVisible( + view.getVisibility() == VISIBLE); + } + }); } /** Returns the [PhysicsAnimator] for the stashed handle view. */ @@ -132,30 +159,30 @@ public PhysicsAnimator getPhysicsAnimator() { } private void updateBounds(BubbleBarLocation bubbleBarLocation) { - // As more bubbles get added, the icon bounds become larger. To ensure a - // consistent + // As more bubbles get added, the icon bounds become larger. To ensure a consistent // handle bar position, we pin it to the edge of the screen. - final int stashedCenterY = mStashedHandleView.getHeight() - mStashedTaskbarHeight / 2; + final int stashedCenterY = mStashedHandleView.getHeight() - mStashedBubbleBarHeight / 2; + final int stashedCenterX; if (bubbleBarLocation.isOnLeft(mStashedHandleView.isLayoutRtl())) { final int left = mBarViewController.getHorizontalMargin(); - mStashedHandleBounds.set( - left, - stashedCenterY - mStashedHandleHeight / 2, - left + mStashedHandleWidth, - stashedCenterY + mStashedHandleHeight / 2); - mStashedHandleView.setPivotX(0); + stashedCenterX = left + mStashedHandleWidth / 2; } else { - final int right = mActivity.getDeviceProfile().widthPx - mBarViewController.getHorizontalMargin(); - mStashedHandleBounds.set( - right - mStashedHandleWidth, - stashedCenterY - mStashedHandleHeight / 2, - right, - stashedCenterY + mStashedHandleHeight / 2); - mStashedHandleView.setPivotX(mStashedHandleView.getWidth()); + final int right = + mStashedHandleView.getRight() - mBarViewController.getHorizontalMargin(); + stashedCenterX = right - mStashedHandleWidth / 2; + } + mStashedHandleBounds.set( + stashedCenterX - mStashedHandleWidth / 2, + stashedCenterY - mStashedHandleHeight / 2, + stashedCenterX + mStashedHandleWidth / 2, + stashedCenterY + mStashedHandleHeight / 2 + ); + if (refactorTaskbarUiState() && mTaskbarUiState != null) { + mTaskbarUiState.setStashedHandlerViewRect(mStashedHandleBounds); } - mStashedHandleView.updateSampledRegion(mStashedHandleBounds); - mStashedHandleView.setPivotY(mStashedHandleView.getHeight() - mStashedTaskbarHeight / 2f); + mStashedHandleView.setPivotX(stashedCenterX); + mStashedHandleView.setPivotY(stashedCenterY); } public void onDestroy() { @@ -163,6 +190,13 @@ public void onDestroy() { mRegionSamplingHelper = null; } + /** + * Returns the width of the stashed handle. + */ + public int getStashedWidth() { + return mStashedHandleWidth; + } + /** * Returns the height of the stashed handle. */ @@ -171,16 +205,14 @@ public int getStashedHeight() { } /** - * Returns the height when the bubble bar is unstashed (so the height of the - * bubble bar). + * Returns bounds of the stashed handle view */ - public int getUnstashedHeight() { - return mBarSize; + public void getBounds(Rect bounds) { + bounds.set(mStashedHandleBounds); } /** - * Called when system ui state changes. Bubbles don't show when the device is - * locked. + * Called when system ui state changes. Bubbles don't show when the device is locked. */ public void setHiddenForSysui(boolean hidden) { if (mHiddenForSysui != hidden) { @@ -190,8 +222,7 @@ public void setHiddenForSysui(boolean hidden) { } /** - * Called when the handle should be hidden (or shown) because there are no - * bubbles + * Called when the handle should be hidden (or shown) because there are no bubbles * (or 1+ bubbles). */ public void setHiddenForBubbles(boolean hidden) { @@ -202,8 +233,7 @@ public void setHiddenForBubbles(boolean hidden) { } /** - * Called when the home button is enabled / disabled. Bubbles don't show if home - * is disabled. + * Called when the home button is enabled / disabled. Bubbles don't show if home is disabled. */ // TODO: is this needed for bubbles? public void setIsHomeButtonDisabled(boolean homeDisabled) { @@ -223,8 +253,7 @@ private void updateVisibilityForStateChange() { } /** - * Called when bubble bar is stash state changes so that updates to the stashed - * handle color + * Called when bubble bar is stash state changes so that updates to the stashed handle color * can be started or stopped. */ public void onIsStashedChanged() { @@ -249,37 +278,56 @@ private void updateRegionSampling() { * Sets the translation of the stashed handle during the swipe up gesture. */ public void setTranslationYForSwipe(float transY) { - mStashedHandleView.setTranslationY(transY); + mTranslationForSwipeY = transY; + updateTranslationY(); + } + + /** + * Sets the translation of the stashed handle during the spring on stash animation. + */ + public void setTranslationYForStash(float transY) { + mTranslationForStashY = transY; + updateTranslationY(); + } + + /** Sets translation X for stash handle. */ + public void setTranslationX(float translationX) { + mStashedHandleView.setTranslationX(translationX); + } + + private void updateTranslationY() { + mStashedHandleView.setTranslationY(mTranslationForSwipeY + mTranslationForStashY); + } + + /** Returns the translation of the stashed handle. */ + public float getTranslationY() { + return mStashedHandleView.getTranslationY(); } /** - * Used by {@link BubbleStashController} to animate the handle when stashing or - * un stashing. + * Used by {@link BubbleStashController} to animate the handle when stashing or un stashing. */ public MultiPropertyFactory getStashedHandleAlpha() { return mStashedHandleAlpha; } /** - * Creates and returns an Animator that updates the stashed handle shape and - * size. - * When stashed, the shape is a thin rounded pill. When unstashed, the shape - * morphs into + * Creates and returns an Animator that updates the stashed handle shape and size. + * When stashed, the shape is a thin rounded pill. When unstashed, the shape morphs into * the size of where the bubble bar icons will be. */ public Animator createRevealAnimToIsStashed(boolean isStashed) { - Rect bubbleBarBounds = new Rect(mBarViewController.getBubbleBarBounds()); + Rect bubbleBarBounds = getLocalBubbleBarBounds(); - // Account for the full visual height of the bubble bar - int heightDiff = (mBarSize - bubbleBarBounds.height()) / 2; - bubbleBarBounds.top -= heightDiff; - bubbleBarBounds.bottom += heightDiff; - float stashedHandleRadius = mStashedHandleView.getHeight() / 2f; + float bubbleBarRadius = bubbleBarBounds.height() / 2f; final RevealOutlineAnimation handleRevealProvider = new RoundedRectRevealOutlineProvider( - stashedHandleRadius, stashedHandleRadius, bubbleBarBounds, mStashedHandleBounds); + bubbleBarRadius, mStashedHandleRadius, bubbleBarBounds, mStashedHandleBounds); boolean isReversed = !isStashed; - boolean changingDirection = mWasLastRevealAnimReversed != isReversed; + // We are only changing direction when mWasLastRevealAnimReversed is set at least once + boolean changingDirection = + mWasLastRevealAnimReversed != null && mWasLastRevealAnimReversed != isReversed; + mWasLastRevealAnimReversed = isReversed; if (changingDirection) { mStartProgressForNextRevealAnim = 1f - mStartProgressForNextRevealAnim; @@ -297,25 +345,33 @@ public void onAnimationEnd(Animator animation) { } /** - * Checks that the stash handle is visible and that the motion event is within - * bounds. + * Get bounds for the bubble bar in the space of the handle view */ + private Rect getLocalBubbleBarBounds() { + // Position the bubble bar bounds to the space of handle view + Rect bubbleBarBounds = new Rect(mBarViewController.getBubbleBarBounds()); + // Start by moving bubble bar bounds to the bottom of handle view + int height = bubbleBarBounds.height(); + bubbleBarBounds.bottom = mStashedHandleView.getHeight(); + bubbleBarBounds.top = bubbleBarBounds.bottom - height; + // Then apply translation that is applied to the bubble bar + bubbleBarBounds.offset(0, (int) mBubbleStashController.getBubbleBarTranslationY()); + return bubbleBarBounds; + } + + /** Checks that the stash handle is visible and that the motion event is within bounds. */ public boolean isEventOverHandle(MotionEvent ev) { if (mStashedHandleView.getVisibility() != VISIBLE) { return false; } - // the bounds of the handle only include the visible part, so we check that the - // Y coordinate - // is anywhere within the stashed taskbar height. - int top = mActivity.getDeviceProfile().heightPx - mStashedTaskbarHeight; - - return (int) ev.getRawY() >= top && containsX((int) ev.getRawX()); - } - - /** Checks if the given x coordinate is within the stashed handle bounds. */ - public boolean containsX(int x) { - return x >= mStashedHandleBounds.left && x <= mStashedHandleBounds.right; + // the bounds of the handle only include the visible part, so we check that the Y coordinate + // is anywhere within the stashed height of bubble bar (same as taskbar stashed height). + final int top = mActivity.getDeviceProfile().getDeviceProperties().getHeightPx() + - mStashedBubbleBarHeight; + final float x = ev.getRawX(); + return ev.getRawY() >= top && x >= mStashedHandleBounds.left + && x <= mStashedHandleBounds.right; } /** Set a bubble bar location */ diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleView.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleView.java index a475fc047fb..51fc57879eb 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleView.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleView.java @@ -16,24 +16,29 @@ package com.android.launcher3.taskbar.bubbles; import android.annotation.Nullable; +import android.app.Notification; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.Outline; +import android.graphics.Color; +import android.graphics.PointF; import android.graphics.Rect; +import android.os.Bundle; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewOutlineProvider; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ImageView; import androidx.constraintlayout.widget.ConstraintLayout; import com.android.launcher3.R; import com.android.launcher3.icons.DotRenderer; -import com.android.launcher3.icons.IconNormalizer; -import com.android.wm.shell.animation.Interpolators; +import com.android.launcher3.icons.DotRenderer.IconShapeInfo; +import com.android.wm.shell.shared.animation.Interpolators; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import com.android.wm.shell.shared.bubbles.BubbleInfo; + import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.preferences2.PreferenceManager2; import app.lawnchair.theme.color.ColorOption; @@ -43,40 +48,23 @@ // TODO: (b/276978250) This is will be similar to WMShell's BadgedImageView, it'd be nice to share. /** - * View that displays a bubble icon, along with an app badge on either the left - * or + * View that displays a bubble icon, along with an app badge on either the left or * right side of the view. */ public class BubbleView extends ConstraintLayout { - public static final int DEFAULT_PATH_SIZE = 100; - - /** - * Flags that suppress the visibility of the 'new' dot or the app badge, for one - * reason or - * another. If any of these flags are set, the dot will not be shown. - * If {@link SuppressionFlag#BEHIND_STACK} then the app badge will not be shown. - */ - enum SuppressionFlag { - // TODO: (b/277815200) implement flyout - // Suppressed because the flyout is visible - it will morph into the dot via - // animation. - FLYOUT_VISIBLE, - // Suppressed because this bubble is behind others in the collapsed stack. - BEHIND_STACK, - } - - private final EnumSet mSuppressionFlags = EnumSet.noneOf(SuppressionFlag.class); + /** Duration for animating the scale of the dot and badge. */ + private static final int SCALE_ANIMATION_DURATION_MS = 200; private final ImageView mBubbleIcon; private final ImageView mAppIcon; - private final int mBubbleSize; + private int mBubbleSize; private float mDragTranslationX; private float mOffsetX; private DotRenderer mDotRenderer; - private DotRenderer.DrawParams mDrawParams; + private final DotRenderer.DrawParams mDrawParams; private int mDotColor; private Rect mTempBounds = new Rect(); @@ -86,12 +74,15 @@ enum SuppressionFlag { private float mAnimatingToDotScale; // The current scale value of the dot private float mDotScale; - - // TODO: (b/273310265) handle RTL - // Whether the bubbles are positioned on the left or right side of the screen - private boolean mOnLeft = false; + private boolean mDotSuppressedForBubbleUpdate = false; private BubbleBarItem mBubble; + private boolean mIsOverflow; + + private Bitmap mIcon; + + @Nullable + private Controller mController; PreferenceManager2 preferenceManager2; @@ -114,35 +105,36 @@ public BubbleView(Context context, AttributeSet attrs, int defStyleAttr, setLayoutDirection(LAYOUT_DIRECTION_LTR); LayoutInflater.from(context).inflate(R.layout.bubble_view, this); - - mBubbleSize = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_size); mBubbleIcon = findViewById(R.id.icon_view); mAppIcon = findViewById(R.id.app_icon_view); preferenceManager2 = PreferenceManager2.INSTANCE.get(context); mDrawParams = new DotRenderer.DrawParams(); + // TODO: (b/273310265) handle RTL + // Whether the bubbles are positioned on the left or right side of the screen + mDrawParams.leftAlign = false; + mDrawParams.shapeInfo = IconShapeInfo.DEFAULT_NORMALIZED; setFocusable(true); setClickable(true); - setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - BubbleView.this.getOutline(outline); - } - }); + + // We manage the shadow ourselves when creating the bitmap + setOutlineAmbientShadowColor(Color.TRANSPARENT); + setOutlineSpotShadowColor(Color.TRANSPARENT); } - private void getOutline(Outline outline) { - final int normalizedSize = IconNormalizer.getNormalizedCircleSize(mBubbleSize); - final int inset = (mBubbleSize - normalizedSize) / 2; - outline.setOval(inset, inset, inset + normalizedSize, inset + normalizedSize); + private void updateBubbleSizeAndDotRender() { + int updatedBubbleSize = Math.min(getWidth(), getHeight()); + if (updatedBubbleSize == mBubbleSize) return; + mBubbleSize = updatedBubbleSize; + if (mBubble == null || mBubble instanceof BubbleBarOverflow) return; + mDotRenderer = new DotRenderer(mBubbleSize); } /** * Set translation-x while this bubble is being dragged. - * Translation applied to the view is a sum of {@code translationX} and offset - * defined by + * Translation applied to the view is a sum of {@code translationX} and offset defined by * {@link #setOffsetX(float)}. */ public void setDragTranslationX(float translationX) { @@ -159,11 +151,9 @@ public float getDragTranslationX() { /** * Set offset on x-axis while dragging. - * Used to counter parent translation in order to keep the dragged view at the - * current position + * Used to counter parent translation in order to keep the dragged view at the current position * on screen. - * Translation applied to the view is a sum of {@code offsetX} and translation - * defined by + * Translation applied to the view is a sum of {@code offsetX} and translation defined by * {@link #setDragTranslationX(float)} */ public void setOffsetX(float offsetX) { @@ -175,6 +165,12 @@ private void applyDragTranslation() { setTranslationX(mDragTranslationX + mOffsetX); } + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + updateBubbleSizeAndDotRender(); + } + @Override public void dispatchDraw(Canvas canvas) { super.dispatchDraw(canvas); @@ -184,27 +180,84 @@ public void dispatchDraw(Canvas canvas) { } getDrawingRect(mTempBounds); - - mDrawParams.appColor = mDotColor; mDrawParams.iconBounds = mTempBounds; - mDrawParams.leftAlign = mOnLeft; mDrawParams.scale = mDotScale; - mDotRenderer.draw(canvas, mDrawParams, -1); + mDotRenderer.draw(canvas, mDrawParams); + } + + @Override + public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfoInternal(info); + info.addAction(AccessibilityNodeInfo.ACTION_COLLAPSE); + if (mBubble instanceof BubbleBarBubble) { + info.addAction(AccessibilityNodeInfo.ACTION_DISMISS); + } + if (mController != null) { + if (mController.getBubbleBarLocation().isOnLeft(isLayoutRtl())) { + info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.action_move_right, + getResources().getString(R.string.bubble_bar_action_move_right))); + } else { + info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.action_move_left, + getResources().getString(R.string.bubble_bar_action_move_left))); + } + } + } + + @Override + public boolean performAccessibilityActionInternal(int action, Bundle arguments) { + if (super.performAccessibilityActionInternal(action, arguments)) { + return true; + } + if (action == AccessibilityNodeInfo.ACTION_COLLAPSE) { + if (mController != null) { + mController.collapse(); + } + return true; + } + if (action == AccessibilityNodeInfo.ACTION_DISMISS) { + if (mController != null) { + mController.dismiss(this); + } + return true; + } + if (action == R.id.action_move_left) { + if (mController != null) { + mController.updateBubbleBarLocation(BubbleBarLocation.LEFT, + BubbleBarLocation.UpdateSource.A11Y_ACTION_BUBBLE); + } + } + if (action == R.id.action_move_right) { + if (mController != null) { + mController.updateBubbleBarLocation(BubbleBarLocation.RIGHT, + BubbleBarLocation.UpdateSource.A11Y_ACTION_BUBBLE); + } + } + return false; + } + + void setController(@Nullable Controller controller) { + mController = controller; } /** Sets the bubble being rendered in this view. */ public void setBubble(BubbleBarBubble bubble) { mBubble = bubble; - mBubbleIcon.setImageBitmap(bubble.getIcon()); - mAppIcon.setImageBitmap(bubble.getBadge()); + mIcon = bubble.getIcon(); + updateBubbleIcon(); + if (bubble.getInfo().showAppBadge()) { + mAppIcon.setImageDrawable(bubble.getBadge().newIcon(getContext())); + } else { + mAppIcon.setVisibility(GONE); + } mDotColor = bubble.getDotColor(); + mDrawParams.setDotColor(mDotColor); ColorOption dotColorOption = PreferenceExtensionsKt.firstBlocking(preferenceManager2.getNotificationDotColor()); int dotColor = dotColorOption.getColorPreferenceEntry().getLightColor().invoke(getContext()); ColorOption counterColorOption = PreferenceExtensionsKt .firstBlocking(preferenceManager2.getNotificationDotTextColor()); int countColor = counterColorOption.getColorPreferenceEntry().getLightColor().invoke(getContext()); - mDotRenderer = new DotRenderer(mBubbleSize, bubble.getDotPath(), DEFAULT_PATH_SIZE, false, null, dotColor, + mDotRenderer = new DotRenderer(mBubbleSize, false, null, dotColor, countColor); String contentDesc = bubble.getInfo().getTitle(); if (TextUtils.isEmpty(contentDesc)) { @@ -218,32 +271,45 @@ public void setBubble(BubbleBarBubble bubble) { setContentDescription(contentDesc); } + private void updateBubbleIcon() { + mBubbleIcon.setImageBitmap(mIcon); + } + /** - * Sets that this bubble represents the overflow. The overflow appears in the - * list of bubbles - * but does not represent app content, instead it shows recent bubbles that - * couldn't fit into - * the list of bubbles. It doesn't show an app icon because it is part of system - * UI / doesn't + * Sets that this bubble represents the overflow. The overflow appears in the list of bubbles + * but does not represent app content, instead it shows recent bubbles that couldn't fit into + * the list of bubbles. It doesn't show an app icon because it is part of system UI / doesn't * come from an app. */ public void setOverflow(BubbleBarOverflow overflow, Bitmap bitmap) { mBubble = overflow; - mBubbleIcon.setImageBitmap(bitmap); + mIsOverflow = true; + mIcon = bitmap; + updateBubbleIcon(); mAppIcon.setVisibility(GONE); // Overflow doesn't show the app badge setContentDescription(getResources().getString(R.string.bubble_bar_overflow_description)); } + /** Whether this view represents the overflow button. */ + public boolean isOverflow() { + return mIsOverflow; + } + /** Returns the bubble being rendered in this view. */ @Nullable public BubbleBarItem getBubble() { return mBubble; } - void updateDotVisibility(boolean animate) { - final float targetScale = shouldDrawDot() ? 1f : 0f; + /** Updates the dot visibility if it's not suppressed based on whether it has unseen content. */ + public void updateDotVisibility(boolean animate) { + if (mDotSuppressedForBubbleUpdate) { + // if the dot is suppressed for an update, there's nothing to do + return; + } + final float targetScale = hasUnseenContent() ? 1f : 0f; if (animate) { - animateDotScale(); + animateDotScale(targetScale); } else { mDotScale = targetScale; mAnimatingToDotScale = targetScale; @@ -251,77 +317,132 @@ void updateDotVisibility(boolean animate) { } } - void updateBadgeVisibility() { - if (mBubble instanceof BubbleBarOverflow) { - // The overflow bubble does not have a badge, so just bail. - return; + void setBadgeScale(float fraction) { + if (hasBadge()) { + mAppIcon.setScaleX(fraction); + mAppIcon.setScaleY(fraction); } - BubbleBarBubble bubble = (BubbleBarBubble) mBubble; - Bitmap appBadgeBitmap = bubble.getBadge(); - int translationX = mOnLeft - ? -(bubble.getIcon().getWidth() - appBadgeBitmap.getWidth()) - : 0; - mAppIcon.setTranslationX(translationX); - mAppIcon.setVisibility(isBehindStack() ? GONE : VISIBLE); - } - - /** Sets whether this bubble is in the stack & not the first bubble. **/ - void setBehindStack(boolean behindStack, boolean animate) { - if (behindStack) { - mSuppressionFlags.add(SuppressionFlag.BEHIND_STACK); - } else { - mSuppressionFlags.remove(SuppressionFlag.BEHIND_STACK); + } + + void showBadge() { + animateBadgeScale(1); + } + + void hideBadge() { + animateBadgeScale(0); + } + + private boolean hasBadge() { + return mAppIcon.getVisibility() == VISIBLE; + } + + private void animateBadgeScale(float scale) { + if (!hasBadge()) { + return; } - updateDotVisibility(animate); - updateBadgeVisibility(); + mAppIcon.clearAnimation(); + mAppIcon.animate() + .setDuration(SCALE_ANIMATION_DURATION_MS) + .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) + .scaleX(scale) + .scaleY(scale) + .start(); } - /** Whether this bubble is in the stack & not the first bubble. **/ - boolean isBehindStack() { - return mSuppressionFlags.contains(SuppressionFlag.BEHIND_STACK); + /** Suppresses drawing the dot due to an update for this bubble. */ + public void suppressDotForBubbleUpdate() { + mDotSuppressedForBubbleUpdate = true; + setDotScale(0); } - /** Whether the dot indicating unseen content in a bubble should be shown. */ - private boolean shouldDrawDot() { - boolean bubbleHasUnseenContent = mBubble != null + /** + * Unsuppresses the dot after the bubble update finished animating. + * + * @param animate whether or not to animate the dot back in + */ + public void unsuppressDotForBubbleUpdate(boolean animate) { + mDotSuppressedForBubbleUpdate = false; + showDotIfNeeded(animate); + } + + boolean hasUnseenContent() { + return mBubble != null && mBubble instanceof BubbleBarBubble - && mSuppressionFlags.isEmpty() && !((BubbleBarBubble) mBubble).getInfo().isNotificationSuppressed(); + } - // Always render the dot if it's animating, since it could be animating out. - // Otherwise, show - // it if the bubble wants to show it, and we aren't suppressing it. - return bubbleHasUnseenContent || mDotIsAnimating; + /** + * Used to determine if we can skip drawing frames. + * + *

Generally we should draw the dot when it is requested to be shown and there is unseen + * content. But when the dot is removed, we still want to draw frames so that it can be scaled + * out. + */ + private boolean shouldDrawDot() { + // if there's no dot there's nothing to draw, unless the dot was removed and we're in the + // middle of removing it + return hasUnseenContent() || mDotIsAnimating; } - /** How big the dot should be, fraction from 0 to 1. */ + /** Updates the dot scale to the specified fraction from 0 to 1. */ private void setDotScale(float fraction) { + if (!shouldDrawDot()) { + return; + } mDotScale = fraction; invalidate(); } - /** - * Animates the dot to the given scale. - */ - private void animateDotScale() { - float toScale = shouldDrawDot() ? 1f : 0f; - mDotIsAnimating = true; + void showDotIfNeeded(float fraction) { + if (!hasUnseenContent()) { + return; + } + setDotScale(fraction); + } - // Don't restart the animation if we're already animating to the given value. - if (mAnimatingToDotScale == toScale || !shouldDrawDot()) { - mDotIsAnimating = false; + void showDotIfNeeded(boolean animate) { + // only show the dot if we have unseen content and it's not suppressed + if (!hasUnseenContent() || mDotSuppressedForBubbleUpdate) { return; } + if (animate) { + animateDotScale(1f); + } else { + setDotScale(1f); + } + } + void hideDot() { + animateDotScale(0f); + } + + /** Marks this bubble such that it no longer has unseen content, and hides the dot. */ + void markSeen() { + if (mBubble instanceof BubbleBarBubble bubble) { + BubbleInfo info = bubble.getInfo(); + info.setFlags( + info.getFlags() | Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION); + hideDot(); + } + } + + /** Animates the dot to the given scale. */ + private void animateDotScale(float toScale) { + boolean isDotScaleChanging = Float.compare(mDotScale, toScale) != 0; + + // Don't restart the animation if we're already animating to the given value or if the dot + // scale is not changing + if ((mDotIsAnimating && mAnimatingToDotScale == toScale) || !isDotScaleChanging) { + return; + } + mDotIsAnimating = true; mAnimatingToDotScale = toScale; final boolean showDot = toScale > 0f; - // Do NOT wait until after animation ends to setShowDot - // to avoid overriding more recent showDot states. clearAnimation(); animate() - .setDuration(200) + .setDuration(SCALE_ANIMATION_DURATION_MS) .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) .setUpdateListener((valueAnimator) -> { float fraction = valueAnimator.getAnimatedFraction(); @@ -333,9 +454,41 @@ private void animateDotScale() { }).start(); } + /** + * Returns the distance from the top left corner of this bubble view to the center of its dot. + */ + public PointF getDotCenter() { + PointF dotPosition = mDrawParams.getDotPosition(); + getDrawingRect(mTempBounds); + float dotCenterX = mTempBounds.width() * dotPosition.x; + float dotCenterY = mTempBounds.height() * dotPosition.y; + return new PointF(dotCenterX, dotCenterY); + } + + /** Returns the dot color. */ + public int getDotColor() { + return mDotColor; + } + @Override public String toString() { String toString = mBubble != null ? mBubble.getKey() : "null"; return "BubbleView{" + toString + "}"; } + + /** Interface for BubbleView to communicate with its controller */ + public interface Controller { + /** Get current bubble bar {@link BubbleBarLocation} */ + BubbleBarLocation getBubbleBarLocation(); + + /** This bubble should be dismissed */ + void dismiss(BubbleView bubble); + + /** Collapse the bubble bar */ + void collapse(); + + /** Request bubble bar location to be updated to the given location */ + void updateBubbleBarLocation(BubbleBarLocation location, + @BubbleBarLocation.UpdateSource int source); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/DragToBubbleController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/DragToBubbleController.kt new file mode 100644 index 00000000000..148fd817dd8 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/DragToBubbleController.kt @@ -0,0 +1,294 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.bubbles + +import android.content.Context +import android.content.Intent +import android.view.WindowManager +import android.widget.FrameLayout +import com.android.launcher3.DropTarget.DragObject +import com.android.launcher3.dragndrop.DragController +import com.android.launcher3.dragndrop.DragOptions +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.taskbar.bubbles.BubbleBarController.BubbleBarLocationListener +import com.android.launcher3.taskbar.bubbles.BubbleBarLocationDropTarget.BubbleBarDropTargetController +import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import com.android.wm.shell.shared.bubbles.ContextUtils.isRtl +import com.android.wm.shell.shared.bubbles.DeviceConfig +import com.android.wm.shell.shared.bubbles.DragToBubblesZoneChangeListener +import com.android.wm.shell.shared.bubbles.DragZone +import com.android.wm.shell.shared.bubbles.DragZoneFactory +import com.android.wm.shell.shared.bubbles.DragZoneFactory.BubbleBarPropertiesProvider +import com.android.wm.shell.shared.bubbles.DragZoneFactory.DesktopWindowModeChecker +import com.android.wm.shell.shared.bubbles.DragZoneFactory.SplitScreenModeChecker +import com.android.wm.shell.shared.bubbles.DragZoneFactory.SplitScreenModeChecker.SplitScreenMode +import com.android.wm.shell.shared.bubbles.DraggedObject +import com.android.wm.shell.shared.bubbles.DraggedObject.LauncherIcon +import com.android.wm.shell.shared.bubbles.DropTargetManager +import com.android.wm.shell.shared.bubbles.DropTargetManager.DragZoneChangedListener +import com.android.wm.shell.shared.bubbles.logging.EntryPoint +import com.google.common.annotations.VisibleForTesting +import kotlin.math.min + +class DragToBubbleController( + private val context: Context, + private val bubbleBarContainer: FrameLayout, +) : DragController.DragListener { + + // Two DropTargetManagers are needed because the drag call chain has + // conflicting states that require showing different targets: + // - Launcher#onDragStart() -> Shows 2 drop targets. + // - Shell#onShellDragStateChanged(true) -> Shows only the secondary target. + // It is not possible to alter drop targets (drag zones) in runtime, because they are data + // classes so the only way is to restart the drag. + @VisibleForTesting var launcherDropTargetManager = createDropTargetManager(bubbleBarContainer) + @VisibleForTesting var shellDropTargetManager = createDropTargetManager(bubbleBarContainer) + + @VisibleForTesting lateinit var bubbleBarLeftDropTarget: BubbleBarLocationDropTarget + @VisibleForTesting lateinit var bubbleBarRightDropTarget: BubbleBarLocationDropTarget + @VisibleForTesting lateinit var dragZoneFactory: DragZoneFactory + // If item drop is handled the next sysui update will set the bubble bar location + @VisibleForTesting var isItemDropHandled = false + private lateinit var bubbleBarLocationListener: BubbleBarLocationListener + private lateinit var bubbleActivityStarter: BubbleActivityStarter + private lateinit var bubbleBarViewController: BubbleBarViewController + private val bubbleDropController: BubbleBarDropTargetController = createDropController() + private var isShellDragInProgress = false + private var isLauncherDragInProgress = false + + /** The field value is true if the drag is in progress. */ + val isDragInProgress: Boolean + get() = isLauncherDragInProgress || isShellDragInProgress + + fun init( + bubbleBarViewController: BubbleBarViewController, + bubbleBarPropertiesProvider: BubbleBarPropertiesProvider, + bubbleBarLocationListener: BubbleBarLocationListener, + bubbleActivityStarter: BubbleActivityStarter, + ) { + this.bubbleBarViewController = bubbleBarViewController + this.bubbleActivityStarter = bubbleActivityStarter + this.bubbleBarLocationListener = bubbleBarLocationListener + dragZoneFactory = createDragZoneFactory(bubbleBarPropertiesProvider) + bubbleBarLeftDropTarget = createDropTarget(bubbleDropController, isLeftDropTarget = true) + bubbleBarRightDropTarget = createDropTarget(bubbleDropController, isLeftDropTarget = false) + } + + /** Adds bubble bar locations drop zones to the drag controller. */ + fun addBubbleBarDropTargets(dragController: DragController<*>) { + if (!BubbleAnythingFlagHelper.enableCreateAnyBubble()) { + return + } + dragController.addDragListener(this) + dragController.addDropTarget(bubbleBarLeftDropTarget) + dragController.addDropTarget(bubbleBarRightDropTarget) + } + + /** Removes bubble bar locations drop zones to the drag controller. */ + fun removeBubbleBarDropTargets(dragController: DragController<*>) { + dragController.removeDragListener(this) + dragController.removeDropTarget(bubbleBarLeftDropTarget) + dragController.removeDropTarget(bubbleBarRightDropTarget) + } + + /** + * Runs the provided action once all drop target views are removed from the container. If there + * are no drop target views currently present or being animated, the action will be executed + * immediately. + */ + fun runAfterDropTargetsHidden(afterHiddenAction: Runnable) { + launcherDropTargetManager.onDropTargetRemoved(afterHiddenAction) + } + + fun setOverlayContainerView(containerView: FrameLayout?) { + val container = containerView ?: bubbleBarContainer + // onDragEnded() call will remove added drop target views + launcherDropTargetManager.onDragEnded() + shellDropTargetManager.onDragEnded() + // create new drop target managers + launcherDropTargetManager = createDropTargetManager(container) + shellDropTargetManager = createDropTargetManager(container) + // update drop target managers in bubble bar drop targets + bubbleBarLeftDropTarget.setDropTargetManager(launcherDropTargetManager) + bubbleBarRightDropTarget.setDropTargetManager(launcherDropTargetManager) + } + + fun onShellDragStateChanged(started: Boolean) { + if (!BubbleAnythingFlagHelper.enableCreateAnyBubble()) { + return + } + isShellDragInProgress = started + if (started) { + onDragStarted(showDropTarget = false, shellDropTargetManager) + } else { + shellDropTargetManager.onDragEnded() + } + } + + fun showShellBubbleBarDropTargetAt(location: BubbleBarLocation?) { + bubbleBarViewController.isShowingDropTarget = location != null + if (location == null) { + val leftDropRect = dragZoneFactory.getBubbleBarDropRect(isLeftSide = true) + val rightDropRect = dragZoneFactory.getBubbleBarDropRect(isLeftSide = false) + // drag to no zones, so bubble bar drop target view is hidden + val x = (leftDropRect.right + rightDropRect.left) / 2 + val y = min(leftDropRect.top, rightDropRect.top) - 1 + shellDropTargetManager.onDragUpdated(x, y) + return + } + val dropRect = dragZoneFactory.getBubbleBarDropRect(location.isOnLeft(context.isRtl)) + // drag to the zone center, so bubble bar drop target view is shown + shellDropTargetManager.onDragUpdated(dropRect.centerX(), dropRect.centerY()) + } + + override fun onDragStart(dragObject: DragObject, options: DragOptions) { + isLauncherDragInProgress = true + isItemDropHandled = false + val isDropCanBeAccepted = canAcceptDrop(dragObject) + bubbleBarLeftDropTarget.isDropCanBeAccepted = isDropCanBeAccepted + bubbleBarRightDropTarget.isDropCanBeAccepted = isDropCanBeAccepted + if (isDropCanBeAccepted) { + onDragStarted(showDropTarget = true, launcherDropTargetManager) + } + } + + override fun onDragEnd() { + isLauncherDragInProgress = false + launcherDropTargetManager.onDragEnded() + } + + private fun onDragStarted(showDropTarget: Boolean, dropTargetManager: DropTargetManager) { + val launcherIcon: DraggedObject = + LauncherIcon( + showExpandedViewDropTarget = showDropTarget, + showBubbleBarPillowDropTarget = !bubbleBarViewController.hasBubbles(), + ) + val dragZones: List = dragZoneFactory.createSortedDragZones(launcherIcon) + dropTargetManager.onDragStarted(launcherIcon, dragZones) + } + + private fun createDropTargetManager(bubbleBarContainer: FrameLayout): DropTargetManager { + val listener: DragZoneChangedListener = + DragToBubblesZoneChangeListener( + context.isRtl, + object : DragToBubblesZoneChangeListener.Callback { + + private var currentBarLocation: BubbleBarLocation? = null + + override fun onDragEnteredLocation(bubbleBarLocation: BubbleBarLocation?) { + bubbleBarViewController.isShowingDropTarget = bubbleBarLocation != null + if (isItemDropHandled) return + val updatedLocation = bubbleBarLocation ?: getStartingBubbleBarLocation() + currentBarLocation = currentBarLocation ?: getStartingBubbleBarLocation() + if (updatedLocation != currentBarLocation) { + currentBarLocation = updatedLocation + bubbleBarLocationListener.onBubbleBarLocationAnimated(updatedLocation) + } + } + + override fun getStartingBubbleBarLocation(): BubbleBarLocation { + return bubbleBarViewController.bubbleBarLocation + ?: BubbleBarLocation.DEFAULT + } + + override fun hasBubbles(): Boolean = bubbleBarViewController.hasBubbles() + + override fun animateBubbleBarLocation(bubbleBarLocation: BubbleBarLocation) { + if (isItemDropHandled) return + bubbleBarViewController.animateBubbleBarLocation(bubbleBarLocation) + } + }, + ) + return DropTargetManager(context, bubbleBarContainer, listener) + } + + private fun createDragZoneFactory( + bubbleBarPropertiesProvider: BubbleBarPropertiesProvider + ): DragZoneFactory { + val splitScreenModeChecker = SplitScreenModeChecker { SplitScreenMode.NONE } + val desktopWindowModeChecker = DesktopWindowModeChecker { false } + val windowManager: WindowManager = context.getSystemService(WindowManager::class.java)!! + val deviceConfig: DeviceConfig = DeviceConfig.create(context, windowManager) + return DragZoneFactory( + context, + deviceConfig, + splitScreenModeChecker, + desktopWindowModeChecker, + bubbleBarPropertiesProvider, + ) + } + + private fun canAcceptDrop(dragObject: DragObject): Boolean { + val itemInfo = dragObject.dragInfo + return itemInfo != null && (hasShortcutInfo(itemInfo) || itemInfo.intent?.component != null) + } + + private fun hasShortcutInfo(itemInfo: ItemInfo): Boolean { + return itemInfo is WorkspaceItemInfo && itemInfo.deepShortcutInfo != null + } + + private fun createDropController(): BubbleBarDropTargetController { + return object : BubbleBarDropTargetController { + + override fun onDrop(dragObject: DragObject, isLeftDropTarget: Boolean) { + val itemInfo = dragObject.dragInfo ?: return + isItemDropHandled = handleDrop(itemInfo, isLeftDropTarget) + } + + private fun handleDrop(itemInfo: ItemInfo, isLeftDropTarget: Boolean): Boolean { + val location = + if (isLeftDropTarget) { + BubbleBarLocation.LEFT + } else { + BubbleBarLocation.RIGHT + } + val entryPoint = + if (itemInfo.isInAllApps) { + EntryPoint.ALL_APPS_ICON_DRAG + } else { + EntryPoint.TASKBAR_ICON_DRAG + } + if (hasShortcutInfo(itemInfo)) { + val si = (itemInfo as WorkspaceItemInfo).deepShortcutInfo + bubbleActivityStarter.showShortcutBubble(si, entryPoint, location) + return true + } + if (itemInfo.intent == null) { + return false + } + val itemIntent = Intent(itemInfo.intent) + val packageName = itemIntent.component?.packageName ?: return false + itemIntent.setPackage(packageName) + bubbleActivityStarter.showAppBubble(itemIntent, itemInfo.user, entryPoint, location) + return true + } + } + } + + private fun createDropTarget( + dropController: BubbleBarDropTargetController, + isLeftDropTarget: Boolean, + ) = + BubbleBarLocationDropTarget( + dropController, + dragZoneFactory, + launcherDropTargetManager, + isLeftDropTarget, + ) +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleAnimator.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleAnimator.kt new file mode 100644 index 00000000000..6fe0bdb1c50 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleAnimator.kt @@ -0,0 +1,492 @@ +/* + * 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.launcher3.taskbar.bubbles.animation + +import android.animation.Animator +import android.animation.ValueAnimator +import kotlin.math.max +import kotlin.math.min + +/** + * Animates individual bubbles within the bubble bar while the bubble bar is expanded. + * + * This class should only be kept for the duration of the animation and a new instance should be + * created for each animation. + */ +class BubbleAnimator( + private val iconSize: Float, + private val expandedBarIconSpacing: Float, + private val bubbleCount: Int, + private val onLeft: Boolean, +) { + + companion object { + const val ANIMATION_DURATION_MS = 250L + } + + private var state: State = State.Idle + private lateinit var animator: ValueAnimator + + @JvmOverloads + fun animateNewBubble( + selectedBubbleIndex: Int, + newlySelectedBubbleIndex: Int? = null, + listener: Listener, + ) { + animator = createAnimator(listener) + state = State.AddingBubble(selectedBubbleIndex, newlySelectedBubbleIndex) + animator.start() + } + + fun animateRemovedBubble( + bubbleIndex: Int, + selectedBubbleIndex: Int, + removingLastBubble: Boolean, + removingLastRemainingBubble: Boolean, + listener: Listener, + ) { + animator = createAnimator(listener) + state = + State.RemovingBubble( + bubbleIndex = bubbleIndex, + selectedBubbleIndex = selectedBubbleIndex, + removingLastBubble = removingLastBubble, + removingLastRemainingBubble = removingLastRemainingBubble, + ) + animator.start() + } + + fun animateNewAndRemoveOld( + selectedBubbleIndex: Int, + newlySelectedBubbleIndex: Int, + removedBubbleIndex: Int, + addedBubbleIndex: Int, + listener: Listener, + ) { + animator = createAnimator(listener) + state = + State.AddingAndRemoving( + selectedBubbleIndex = selectedBubbleIndex, + newlySelectedBubbleIndex = newlySelectedBubbleIndex, + removedBubbleIndex = removedBubbleIndex, + addedBubbleIndex = addedBubbleIndex, + ) + animator.start() + } + + private fun createAnimator(listener: Listener): ValueAnimator { + val animator = ValueAnimator.ofFloat(0f, 1f).setDuration(ANIMATION_DURATION_MS) + animator.addUpdateListener { animation -> + val animatedFraction = (animation as ValueAnimator).animatedFraction + listener.onAnimationUpdate(animatedFraction) + } + animator.addListener( + object : Animator.AnimatorListener { + + override fun onAnimationCancel(animation: Animator) { + listener.onAnimationCancel() + } + + override fun onAnimationEnd(animation: Animator) { + state = State.Idle + listener.onAnimationEnd() + } + + override fun onAnimationRepeat(animation: Animator) {} + + override fun onAnimationStart(animation: Animator) {} + } + ) + return animator + } + + /** + * The translation X of the bubble at index [bubbleIndex] when the bubble bar is expanded + * according to the progress of this animation. + * + * Callers should verify that the animation is running before calling this. + * + * @see isRunning + */ + fun getBubbleTranslationX(bubbleIndex: Int): Float { + return when (val state = state) { + State.Idle -> 0f + is State.AddingBubble -> + getBubbleTranslationXWhileScalingBubble( + bubbleIndex = bubbleIndex, + scalingBubbleIndex = 0, + bubbleScale = animator.animatedFraction, + ) + + is State.RemovingBubble -> + getBubbleTranslationXWhileScalingBubble( + bubbleIndex = bubbleIndex, + scalingBubbleIndex = state.bubbleIndex, + bubbleScale = 1 - animator.animatedFraction, + ) + + is State.AddingAndRemoving -> + getBubbleTranslationXWhileAddingBubbleAtLimit( + bubbleIndex = bubbleIndex, + removedBubbleIndex = state.removedBubbleIndex, + addedBubbleIndex = state.addedBubbleIndex, + addedBubbleScale = animator.animatedFraction, + removedBubbleScale = 1 - animator.animatedFraction, + ) + } + } + + /** + * The expanded width of the bubble bar according to the progress of the animation. + * + * Callers should verify that the animation is running before calling this. + * + * @see isRunning + */ + fun getExpandedWidth(): Float { + val bubbleScale = + when (state) { + State.Idle -> 0f + is State.AddingBubble -> animator.animatedFraction + is State.RemovingBubble -> 1 - animator.animatedFraction + is State.AddingAndRemoving -> { + // since we're adding a bubble and removing another bubble, their sizes together + // equal to a single bubble. the width is the same as having bubbleCount - 1 + // bubbles at full scale. + val totalSpace = (bubbleCount - 2) * expandedBarIconSpacing + val totalIconSize = (bubbleCount - 1) * iconSize + return totalIconSize + totalSpace + } + } + // When this animator is running the bubble bar is expanded so it's safe to assume that we + // have at least 2 bubbles, but should update the logic to support optional overflow. + // If we're removing the last bubble, the entire bar should animate and we shouldn't get + // here. + val totalSpace = (bubbleCount - 2 + bubbleScale) * expandedBarIconSpacing + val totalIconSize = (bubbleCount - 1 + bubbleScale) * iconSize + return totalIconSize + totalSpace + } + + /** + * Returns the arrow position according to the progress of the animation and, if the selected + * bubble is being removed, accounting to the newly selected bubble. + * + * Callers should verify that the animation is running before calling this. + * + * @see isRunning + */ + fun getArrowPosition(): Float { + return when (val state = state) { + State.Idle -> 0f + is State.AddingBubble -> getArrowPositionWhenAddingBubble(state) + is State.RemovingBubble -> getArrowPositionWhenRemovingBubble(state) + is State.AddingAndRemoving -> getArrowPositionWhenAddingAndRemovingBubble(state) + } + } + + private fun getArrowPositionWhenAddingBubble(state: State.AddingBubble): Float { + val scale = animator.animatedFraction + var tx = + getBubbleTranslationXWhileScalingBubble( + bubbleIndex = state.selectedBubbleIndex, + scalingBubbleIndex = 0, + bubbleScale = scale, + ) + iconSize / 2f + if (state.newlySelectedBubbleIndex != null) { + val selectedBubbleScale = if (state.newlySelectedBubbleIndex == 0) scale else 1f + val finalTx = + getBubbleTranslationXWhileScalingBubble( + bubbleIndex = state.newlySelectedBubbleIndex, + scalingBubbleIndex = 0, + bubbleScale = scale, + ) + iconSize * selectedBubbleScale / 2f + tx += (finalTx - tx) * animator.animatedFraction + } + return tx + } + + private fun getArrowPositionWhenRemovingBubble(state: State.RemovingBubble): Float = + if (state.selectedBubbleIndex != state.bubbleIndex || state.removingLastRemainingBubble) { + // if we're not removing the selected bubble or if we're removing the last remaining + // bubble, the selected bubble doesn't change so just return the translation X of the + // selected bubble and add half icon + val tx = + getBubbleTranslationXWhileScalingBubble( + bubbleIndex = state.selectedBubbleIndex, + scalingBubbleIndex = state.bubbleIndex, + bubbleScale = 1 - animator.animatedFraction, + ) + tx + iconSize / 2f + } else { + // we're removing the selected bubble so the arrow needs to point to a different bubble. + // if we're removing the last bubble the newly selected bubble will be the second to + // last. otherwise, it'll be the next bubble (closer to the overflow) + val iconAndSpacing = iconSize + expandedBarIconSpacing + if (state.removingLastBubble) { + if (onLeft) { + // the newly selected bubble is the bubble to the right. at the end of the + // animation all the bubbles will have shifted left, so the arrow stays at the + // same distance from the left edge of bar + (bubbleCount - state.bubbleIndex - 1) * iconAndSpacing + iconSize / 2f + } else { + // the newly selected bubble is the bubble to the left. at the end of the + // animation all the bubbles will have shifted right, and the arrow would + // eventually be closer to the left edge of the bar by iconAndSpacing + val initialTx = state.bubbleIndex * iconAndSpacing + iconSize / 2f + initialTx - animator.animatedFraction * iconAndSpacing + } + } else { + if (onLeft) { + // the newly selected bubble is to the left, and bubbles are shifting left, so + // move the arrow closer to the left edge of the bar by iconAndSpacing + val initialTx = + (bubbleCount - state.bubbleIndex - 1) * iconAndSpacing + iconSize / 2f + initialTx - animator.animatedFraction * iconAndSpacing + } else { + // the newly selected bubble is to the right, and bubbles are shifting right, so + // the arrow stays at the same distance from the left edge of the bar + state.bubbleIndex * iconAndSpacing + iconSize / 2f + } + } + } + + private fun getArrowPositionWhenAddingAndRemovingBubble(state: State.AddingAndRemoving): Float { + // The bubble bar keeps constant width while adding and removing bubble. So we just need to + // find selected bubble arrow position on the animation start and newly selected bubble + // arrow position on the animation end interpolating the arrow between these positions + // during the animation. + // The indexes in the state are provided for the bubble bar containing all bubbles. So for + // certain circumstances indexes should be adjusted. + // When animation is started added bubble has zero scale as well as removed bubble when the + // animation is ended, so for both cases we should compute translation as it is one less + // bubble. + val bubbleCountOnEnd = bubbleCount - 1 + var selectedIndex = state.selectedBubbleIndex + // We only need to adjust the selected index if added bubble was added before the selected. + if (selectedIndex > state.addedBubbleIndex) { + // If the selectedIndex is higher index than the added bubble index, we need to reduce + // selectedIndex by one because the added bubble has zero scale when animation is + // started. + selectedIndex-- + } + var newlySelectedIndex = state.newlySelectedBubbleIndex + // We only need to adjust newlySelectedIndex if removed bubble was removed before the newly + // selected bubble. + if (newlySelectedIndex > state.removedBubbleIndex) { + // If the newlySelectedIndex is higher index than the removed bubble index, we need to + // reduce newlySelectedIndex by one because the removed bubble has zero scale when + // animation is ended. + newlySelectedIndex-- + } + val iconAndSpacing: Float = iconSize + expandedBarIconSpacing + val startTx = getBubblesToTheLeft(selectedIndex, bubbleCountOnEnd) * iconAndSpacing + val endTx = getBubblesToTheLeft(newlySelectedIndex, bubbleCountOnEnd) * iconAndSpacing + val tx = startTx + (endTx - startTx) * animator.animatedFraction + return tx + iconSize / 2f + } + + private fun getBubblesToTheLeft(bubbleIndex: Int, bubbleCount: Int = this.bubbleCount): Int = + // when bar is on left the index - 0 corresponds to the right - most bubble and when the + // bubble bar is on the right - 0 corresponds to the left - most bubble. + if (onLeft) bubbleCount - bubbleIndex - 1 else bubbleIndex + + /** + * Returns the translation X for the bubble at index {@code bubbleIndex} when the bubble bar is + * expanded and a bubble is animating in or out. + * + * @param bubbleIndex the index of the bubble for which the translation is requested + * @param scalingBubbleIndex the index of the bubble that is animating + * @param bubbleScale the current scale of the animating bubble + */ + private fun getBubbleTranslationXWhileScalingBubble( + bubbleIndex: Int, + scalingBubbleIndex: Int, + bubbleScale: Float, + ): Float { + val iconAndSpacing = iconSize + expandedBarIconSpacing + // the bubble is scaling from the center, so we need to adjust its translation so + // that the distance to the adjacent bubble scales at the same rate. + val pivotAdjustment = -(1 - bubbleScale) * iconSize / 2f + + return if (onLeft) { + when { + bubbleIndex < scalingBubbleIndex -> + // the bar is on the left and the current bubble is to the right of the scaling + // bubble so account for its scale + (bubbleCount - bubbleIndex - 2 + bubbleScale) * iconAndSpacing + + bubbleIndex == scalingBubbleIndex -> { + // the bar is on the left and this is the scaling bubble + val totalIconSize = (bubbleCount - bubbleIndex - 1) * iconSize + // don't count the spacing between the scaling bubble and the bubble on the left + // because we need to scale that space + val totalSpacing = (bubbleCount - bubbleIndex - 2) * expandedBarIconSpacing + val scaledSpace = bubbleScale * expandedBarIconSpacing + totalIconSize + totalSpacing + scaledSpace + pivotAdjustment + } + + else -> + // the bar is on the left and the scaling bubble is on the right. the current + // bubble is unaffected by the scaling bubble + (bubbleCount - bubbleIndex - 1) * iconAndSpacing + } + } else { + when { + bubbleIndex < scalingBubbleIndex -> + // the bar is on the right and the scaling bubble is on the right. the current + // bubble is unaffected by the scaling bubble + iconAndSpacing * bubbleIndex + + bubbleIndex == scalingBubbleIndex -> + // the bar is on the right, and this is the animating bubble. it only needs to + // be adjusted for the scaling pivot. + iconAndSpacing * bubbleIndex + pivotAdjustment + + else -> + // the bar is on the right and the scaling bubble is on the left so account for + // its scale + iconAndSpacing * (bubbleIndex - 1 + bubbleScale) + } + } + } + + private fun getBubbleTranslationXWhileAddingBubbleAtLimit( + bubbleIndex: Int, + removedBubbleIndex: Int, + addedBubbleIndex: Int, + addedBubbleScale: Float, + removedBubbleScale: Float, + ): Float { + val iconAndSpacing = iconSize + expandedBarIconSpacing + // the bubbles are scaling from the center, so we need to adjust their translation so + // that the distance to the adjacent bubble scales at the same rate. + val addedBubblePivotAdjustment = (addedBubbleScale - 1) * iconSize / 2f + val removedBubblePivotAdjustment = (removedBubbleScale - 1) * iconSize / 2f + + val minAddedRemovedIndex = min(addedBubbleIndex, removedBubbleIndex) + val maxAddedRemovedIndex = max(addedBubbleIndex, removedBubbleIndex) + val isBetweenAddedAndRemoved = + bubbleIndex in (minAddedRemovedIndex + 1).. { + if (isRemovedBubbleToLeftOfAddedBubble) { + // the removed bubble is to the left so account for it + (bubblesToLeft - 1 + removedBubbleScale) * iconAndSpacing + } else { + // the added bubble is to the left so account for it + (bubblesToLeft - 1 + addedBubbleScale) * iconAndSpacing + } + } + + bubbleIndex == addedBubbleIndex -> { + if (isRemovedBubbleToLeftOfAddedBubble) { + // the removed bubble is to the left so account for it + (bubblesToLeft - 1 + removedBubbleScale) * iconAndSpacing + } else { + // it's the left-most scaling bubble, all bubbles on the left are at full scale + bubblesToLeft * iconAndSpacing + } + addedBubblePivotAdjustment + } + + bubbleIndex == removedBubbleIndex -> { + if (isRemovedBubbleToLeftOfAddedBubble) { + // All the bubbles to the left are at full scale, but we need to scale the + // spacing between the removed bubble and the bubble next to it + val totalIconSize = bubblesToLeft * iconSize + val totalSpacing = + (bubblesToLeft - 1 + removedBubbleScale) * expandedBarIconSpacing + totalIconSize + totalSpacing + } else { + // The added bubble is to the left, so account for it + (bubblesToLeft - 1 + addedBubbleScale) * iconAndSpacing + } + removedBubblePivotAdjustment + } + + else -> { + // if bubble index is on the right side of the animated bubbles, we need to deduct + // one, since both the added and the removed bubbles takes a single place + val onTheRightOfAnimatedBubbles = + if (onLeft) { + bubbleIndex < minAddedRemovedIndex + } else { + bubbleIndex > maxAddedRemovedIndex + } + (bubblesToLeft - if (onTheRightOfAnimatedBubbles) 1 else 0) * iconAndSpacing + } + } + } + + val isRunning: Boolean + get() = state != State.Idle + + /** The state of the animation. */ + sealed interface State { + + /** The animation is not running. */ + data object Idle : State + + /** A new bubble is being added to the bubble bar. */ + data class AddingBubble( + /** The index of the selected bubble. */ + val selectedBubbleIndex: Int, + /** The index of the newly selected bubble. */ + val newlySelectedBubbleIndex: Int?, + ) : State + + /** A bubble is being removed from the bubble bar. */ + data class RemovingBubble( + /** The index of the bubble being removed. */ + val bubbleIndex: Int, + /** The index of the selected bubble. */ + val selectedBubbleIndex: Int, + /** Whether the bubble being removed is also the last bubble. */ + val removingLastBubble: Boolean, + /** Whether we're removing the last remaining bubble. */ + val removingLastRemainingBubble: Boolean, + ) : State + + /** A new bubble is being added and an old bubble is being removed from the bubble bar. */ + data class AddingAndRemoving( + /** The index of the selected bubble. */ + val selectedBubbleIndex: Int, + /** The index of the newly selected bubble. */ + val newlySelectedBubbleIndex: Int, + /** The index of the bubble being removed. */ + val removedBubbleIndex: Int, + /** The index of the added bubble. */ + val addedBubbleIndex: Int, + ) : State + } + + /** Callbacks for the animation. */ + interface Listener { + + /** + * Notifies the listener of an animation update event, where `animatedFraction` represents + * the progress of the animation starting from 0 and ending at 1. + */ + fun onAnimationUpdate(animatedFraction: Float) + + /** Notifies the listener that the animation was canceled. */ + fun onAnimationCancel() + + /** Notifies that listener that the animation ended. */ + fun onAnimationEnd() + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt index d88e2723329..62a44955885 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt @@ -16,14 +16,21 @@ package com.android.launcher3.taskbar.bubbles.animation +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ObjectAnimator import android.view.View import android.view.View.VISIBLE import androidx.dynamicanimation.animation.DynamicAnimation import androidx.dynamicanimation.animation.SpringForce +import com.android.launcher3.R import com.android.launcher3.taskbar.bubbles.BubbleBarBubble +import com.android.launcher3.taskbar.bubbles.BubbleBarParentViewHeightUpdateNotifier import com.android.launcher3.taskbar.bubbles.BubbleBarView -import com.android.launcher3.taskbar.bubbles.BubbleStashController import com.android.launcher3.taskbar.bubbles.BubbleView +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutController +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutMessage +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController import com.android.wm.shell.shared.animation.PhysicsAnimator /** Handles animations for bubble bar bubbles. */ @@ -32,26 +39,70 @@ class BubbleBarViewAnimator constructor( private val bubbleBarView: BubbleBarView, private val bubbleStashController: BubbleStashController, - private val scheduler: Scheduler = HandlerScheduler(bubbleBarView) + private val bubbleBarFlyoutController: BubbleBarFlyoutController, + private val bubbleBarParentViewHeightUpdateNotifier: BubbleBarParentViewHeightUpdateNotifier, + private val onExpanded: Runnable, + private val onBubbleBarVisible: Runnable, + private val onAnimationEnded: Runnable, + private val scheduler: Scheduler = HandlerScheduler(bubbleBarView), ) { private var animatingBubble: AnimatingBubble? = null + private val bubbleBarBounceDistanceInPx = + bubbleBarView.resources.getDimensionPixelSize(R.dimen.bubblebar_bounce_distance) + + fun hasAnimation() = animatingBubble != null + + val isAnimating: Boolean + get() { + val animatingBubble = animatingBubble ?: return false + return animatingBubble.state != AnimatingBubble.State.CREATED + } + + private var interceptedHandleAnimator = false private companion object { /** The time to show the flyout. */ - const val FLYOUT_DELAY_MS: Long = 2500 + const val FLYOUT_DELAY_MS: Long = 3000 /** The initial scale Y value that the new bubble is set to before the animation starts. */ const val BUBBLE_ANIMATION_INITIAL_SCALE_Y = 0.3f /** The minimum alpha value to make the bubble bar touchable. */ const val MIN_ALPHA_FOR_TOUCHABLE = 0.5f + /** The duration of the bounce animation. */ + const val BUBBLE_BAR_BOUNCE_ANIMATION_DURATION_MS = 250L } /** Wrapper around the animating bubble with its show and hide animations. */ private data class AnimatingBubble( val bubbleView: BubbleView, val showAnimation: Runnable, - val hideAnimation: Runnable - ) + val hideAnimation: Runnable, + val expand: Boolean, + val state: State = State.CREATED, + ) { + + /** + * The state of the animation. + * + * The animation is initially created but will be scheduled later using the [Scheduler]. + * + * The normal uninterrupted cycle is for the bubble notification to animate in, then be in a + * transient state and eventually to animate out. + * + * However different events, such as touch and external signals, may cause the animation to + * end earlier. + */ + enum class State { + /** The animation is created but not started yet. */ + CREATED, + /** The bubble notification is animating in. */ + ANIMATING_IN, + /** The bubble notification is now fully showing and waiting to be hidden. */ + IN, + /** The bubble notification is animating out. */ + ANIMATING_OUT, + } + } /** An interface for scheduling jobs. */ interface Scheduler { @@ -85,19 +136,34 @@ constructor( private val springConfig = PhysicsAnimator.SpringConfig( stiffness = SpringForce.STIFFNESS_LOW, - dampingRatio = SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY + dampingRatio = SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY, ) + private fun cancelAnimationIfPending() { + val animatingBubble = animatingBubble ?: return + if (animatingBubble.state != AnimatingBubble.State.CREATED) return + scheduler.cancel(animatingBubble.showAnimation) + scheduler.cancel(animatingBubble.hideAnimation) + } + /** Animates a bubble for the state where the bubble bar is stashed. */ - fun animateBubbleInForStashed(b: BubbleBarBubble) { + fun animateBubbleInForStashed(b: BubbleBarBubble, isExpanding: Boolean) { + if (isAnimating) { + interruptAndUpdateAnimatingBubble(b.view, isExpanding) + return + } + cancelAnimationIfPending() + val bubbleView = b.view val animator = PhysicsAnimator.getInstance(bubbleView) if (animator.isRunning()) animator.cancel() - // the animation of a new bubble is divided into 2 parts. The first part shows the bubble - // and the second part hides it after a delay. + // the animation of a new bubble is divided into 2 parts. The first part transforms the + // handle to the bubble bar and then shows the flyout. The second part hides the flyout and + // transforms the bubble bar back to the handle. val showAnimation = buildHandleToBubbleBarAnimation() - val hideAnimation = buildBubbleBarToHandleAnimation() - animatingBubble = AnimatingBubble(bubbleView, showAnimation, hideAnimation) + val hideAnimation = if (isExpanding) Runnable {} else buildBubbleBarToHandleAnimation() + animatingBubble = + AnimatingBubble(bubbleView, showAnimation, hideAnimation, expand = isExpanding) scheduler.post(showAnimation) scheduler.postDelayed(FLYOUT_DELAY_MS, hideAnimation) } @@ -116,40 +182,48 @@ constructor( * 3. The third part is the overshoot of the spring animation, where we make the bubble fully * visible which helps avoiding further updates when we re-enter the second part. */ - private fun buildHandleToBubbleBarAnimation() = Runnable { - // prepare the bubble bar for the animation - bubbleBarView.onAnimatingBubbleStarted() - bubbleBarView.visibility = VISIBLE - bubbleBarView.alpha = 0f - bubbleBarView.translationY = 0f - bubbleBarView.scaleX = 1f - bubbleBarView.scaleY = BUBBLE_ANIMATION_INITIAL_SCALE_Y - bubbleBarView.relativePivotY = 0.5f + private fun buildHandleToBubbleBarAnimation(initialVelocity: Float? = null) = Runnable { + moveToState(AnimatingBubble.State.ANIMATING_IN) + // prepare the bubble bar for the animation if we're starting fresh + if (initialVelocity == null) { + bubbleBarView.visibility = VISIBLE + bubbleBarView.alpha = 0f + bubbleBarView.translationY = 0f + bubbleBarView.scaleX = 1f + bubbleBarView.scaleY = BUBBLE_ANIMATION_INITIAL_SCALE_Y + bubbleBarView.setBackgroundScaleX(1f) + bubbleBarView.setBackgroundScaleY(1f) + bubbleBarView.relativePivotY = 0.5f + } // this is the offset between the center of the bubble bar and the center of the stash // handle. when the handle becomes invisible and we start animating in the bubble bar, // the translation y is offset by this value to make the transition from the handle to the // bar smooth. - val offset = bubbleStashController.diffBetweenHandleAndBarCenters + val offset = bubbleStashController.getDiffBetweenHandleAndBarCenters() + val stashedHandleTranslationYForAnimation = + bubbleStashController.getStashedHandleTranslationForNewBubbleAnimation() val stashedHandleTranslationY = - bubbleStashController.stashedHandleTranslationForNewBubbleAnimation + bubbleStashController.getHandleTranslationY() ?: return@Runnable + val translationTracker = TranslationTracker(stashedHandleTranslationY) // this is the total distance that both the stashed handle and the bubble will be traveling // at the end of the animation the bubble bar will be positioned in the same place when it // shows while we're in an app. val totalTranslationY = bubbleStashController.bubbleBarTranslationYForTaskbar + offset - val animator = bubbleStashController.stashedHandlePhysicsAnimator + val animator = bubbleStashController.getStashedHandlePhysicsAnimator() ?: return@Runnable animator.setDefaultSpringConfig(springConfig) - animator.spring(DynamicAnimation.TRANSLATION_Y, totalTranslationY) + animator.spring(DynamicAnimation.TRANSLATION_Y, totalTranslationY, initialVelocity ?: 0f) animator.addUpdateListener { handle, values -> val ty = values[DynamicAnimation.TRANSLATION_Y]?.value ?: return@addUpdateListener + if (animatingBubble == null) return@addUpdateListener when { - ty >= stashedHandleTranslationY -> { + ty >= stashedHandleTranslationYForAnimation -> { // we're in the first leg of the animation. only animate the handle. the bubble // bar remains hidden during this part of the animation // map the path [0, stashedHandleTranslationY] to [0,1] - val fraction = ty / stashedHandleTranslationY + val fraction = ty / stashedHandleTranslationYForAnimation handle.alpha = 1 - fraction } ty >= totalTranslationY -> { @@ -163,8 +237,8 @@ constructor( if (bubbleBarView.alpha != 1f) { // map the path [stashedHandleTranslationY, totalTranslationY] to [0, 1] val fraction = - (ty - stashedHandleTranslationY) / - (totalTranslationY - stashedHandleTranslationY) + (ty - stashedHandleTranslationYForAnimation) / + (totalTranslationY - stashedHandleTranslationYForAnimation) bubbleBarView.alpha = fraction bubbleBarView.scaleY = BUBBLE_ANIMATION_INITIAL_SCALE_Y + @@ -184,18 +258,17 @@ constructor( bubbleStashController.updateTaskbarTouchRegion() } } + translationTracker.updateTyAndExpandIfNeeded(ty) } animator.addEndListener { _, _, _, canceled, _, _, _ -> // if the show animation was canceled, also cancel the hide animation. this is typically // canceled in this class, but could potentially be canceled elsewhere. - if (canceled) { - val hideAnimation = animatingBubble?.hideAnimation ?: return@addEndListener - scheduler.cancel(hideAnimation) - animatingBubble = null - bubbleBarView.onAnimatingBubbleCompleted() - bubbleBarView.relativePivotY = 1f + if (canceled || animatingBubble?.expand == true) { + cancelHideAnimation() return@addEndListener } + setupAndShowFlyout() + // the bubble bar is now fully settled in. update taskbar touch region so it's touchable bubbleStashController.updateTaskbarTouchRegion() } @@ -218,13 +291,14 @@ constructor( */ private fun buildBubbleBarToHandleAnimation() = Runnable { if (animatingBubble == null) return@Runnable - val offset = bubbleStashController.diffBetweenHandleAndBarCenters + moveToState(AnimatingBubble.State.ANIMATING_OUT) + val offset = bubbleStashController.getDiffBetweenHandleAndBarCenters() val stashedHandleTranslationY = - bubbleStashController.stashedHandleTranslationForNewBubbleAnimation + bubbleStashController.getStashedHandleTranslationForNewBubbleAnimation() // this is the total distance that both the stashed handle and the bar will be traveling val totalTranslationY = bubbleStashController.bubbleBarTranslationYForTaskbar + offset bubbleStashController.setHandleTranslationY(totalTranslationY) - val animator = bubbleStashController.stashedHandlePhysicsAnimator + val animator = bubbleStashController.getStashedHandlePhysicsAnimator() ?: return@Runnable animator.setDefaultSpringConfig(springConfig) animator.spring(DynamicAnimation.TRANSLATION_Y, 0f) animator.addUpdateListener { handle, values -> @@ -260,88 +334,464 @@ constructor( } } } - animator.addEndListener { _, _, _, canceled, _, _, _ -> - animatingBubble = null + animator.addEndListener { _, _, _, canceled, _, finalVelocity, _ -> + // PhysicsAnimator calls the end listeners when the animation is replaced with a new one + // if we're not in ANIMATING_OUT state, then this animation never started and we should + // return + if (animatingBubble?.state != AnimatingBubble.State.ANIMATING_OUT) return@addEndListener + if (interceptedHandleAnimator) { + interceptedHandleAnimator = false + // post this to give a PhysicsAnimator a chance to clean up its internal listeners. + // otherwise this end listener will be called as soon as we create a new spring + // animation + scheduler.post(buildHandleToBubbleBarAnimation(initialVelocity = finalVelocity)) + return@addEndListener + } + clearAnimatingBubble() if (!canceled) bubbleStashController.stashBubbleBarImmediate() - bubbleBarView.onAnimatingBubbleCompleted() bubbleBarView.relativePivotY = 1f + bubbleBarView.scaleY = 1f bubbleStashController.updateTaskbarTouchRegion() } - animator.start() + + val bubble = animatingBubble?.bubbleView?.bubble as? BubbleBarBubble + val flyout = bubble?.flyoutMessage + if (flyout != null) { + bubbleBarFlyoutController.collapseFlyout { + onFlyoutRemoved() + animator.start() + } + } else { + animator.start() + } } /** Animates to the initial state of the bubble bar, when there are no previous bubbles. */ - fun animateToInitialState(b: BubbleBarBubble, isInApp: Boolean, isExpanding: Boolean) { + fun animateToInitialState( + b: BubbleBarBubble, + isInApp: Boolean, + isExpanding: Boolean, + isDragging: Boolean = false, + ) { val bubbleView = b.view val animator = PhysicsAnimator.getInstance(bubbleView) if (animator.isRunning()) animator.cancel() - // the animation of a new bubble is divided into 2 parts. The first part shows the bubble - // and the second part hides it after a delay if we are in an app. - val showAnimation = buildBubbleBarBounceAnimation() + // the animation of a new bubble is divided into 2 parts. The first part slides in the + // bubble bar and shows the flyout. The second part hides the flyout and transforms the + // bubble bar to the handle if we're in an app. + val showAnimation = buildBubbleBarSpringInAnimation() val hideAnimation = - if (isInApp && !isExpanding) { + if (isInApp && !isExpanding && !isDragging) { buildBubbleBarToHandleAnimation() } else { - // in this case the bubble bar remains visible so not much to do. once we implement - // the flyout we'll update this runnable to hide it. Runnable { - animatingBubble = null + collapseFlyoutAndUpdateState() + if (isDragging) return@Runnable bubbleStashController.showBubbleBarImmediate() - bubbleBarView.onAnimatingBubbleCompleted() bubbleStashController.updateTaskbarTouchRegion() } } - animatingBubble = AnimatingBubble(bubbleView, showAnimation, hideAnimation) + animatingBubble = + AnimatingBubble(bubbleView, showAnimation, hideAnimation, expand = isExpanding) scheduler.post(showAnimation) scheduler.postDelayed(FLYOUT_DELAY_MS, hideAnimation) } - private fun buildBubbleBarBounceAnimation() = Runnable { + private fun buildBubbleBarSpringInAnimation() = Runnable { + moveToState(AnimatingBubble.State.ANIMATING_IN) // prepare the bubble bar for the animation - bubbleBarView.onAnimatingBubbleStarted() bubbleBarView.translationY = bubbleBarView.height.toFloat() bubbleBarView.visibility = VISIBLE + onBubbleBarVisible.run() bubbleBarView.alpha = 1f bubbleBarView.scaleX = 1f bubbleBarView.scaleY = 1f + bubbleBarView.setBackgroundScaleX(1f) + bubbleBarView.setBackgroundScaleY(1f) + + val translationTracker = TranslationTracker(bubbleBarView.translationY) val animator = PhysicsAnimator.getInstance(bubbleBarView) animator.setDefaultSpringConfig(springConfig) animator.spring(DynamicAnimation.TRANSLATION_Y, bubbleStashController.bubbleBarTranslationY) - animator.addUpdateListener { _, _ -> bubbleStashController.updateTaskbarTouchRegion() } + animator.addUpdateListener { _, values -> + val ty = values[DynamicAnimation.TRANSLATION_Y]?.value ?: return@addUpdateListener + translationTracker.updateTyAndExpandIfNeeded(ty) + bubbleStashController.updateTaskbarTouchRegion() + } animator.addEndListener { _, _, _, _, _, _, _ -> + if (animatingBubble?.expand == true) { + cancelHideAnimation() + } else { + setupAndShowFlyout() + } // the bubble bar is now fully settled in. update taskbar touch region so it's touchable bubbleStashController.updateTaskbarTouchRegion() } animator.start() } - /** Handles touching the animating bubble bar. */ - fun onBubbleBarTouchedWhileAnimating() { + fun animateBubbleBarForCollapsed(b: BubbleBarBubble, isExpanding: Boolean) { + if (isAnimating) { + interruptAndUpdateAnimatingBubble(b.view, isExpanding) + return + } + cancelAnimationIfPending() + + val bubbleView = b.view + val animator = PhysicsAnimator.getInstance(bubbleView) + if (animator.isRunning()) animator.cancel() + // first bounce the bubble bar and show the flyout. Then hide the flyout. + val showAnimation = buildBubbleBarBounceAnimation() + val hideAnimation = Runnable { + collapseFlyoutAndUpdateState() + bubbleStashController.showBubbleBarImmediate() + bubbleStashController.updateTaskbarTouchRegion() + } + animatingBubble = + AnimatingBubble(bubbleView, showAnimation, hideAnimation, expand = isExpanding) + scheduler.post(showAnimation) + scheduler.postDelayed(FLYOUT_DELAY_MS, hideAnimation) + } + + private fun collapseFlyoutAndUpdateState() { + moveToState(AnimatingBubble.State.ANIMATING_OUT) + bubbleBarFlyoutController.collapseFlyout { + onFlyoutRemoved() + clearAnimatingBubble() + } + } + + /** + * The bubble bar animation when it is collapsed is divided into 2 chained animations. The first + * animation is a regular accelerate animation that moves the bubble bar upwards. When it ends + * the bubble bar moves back to its initial position with a spring animation. + */ + private fun buildBubbleBarBounceAnimation() = Runnable { + moveToState(AnimatingBubble.State.ANIMATING_IN) + val ty = bubbleStashController.bubbleBarTranslationY + + val springBackAnimation = PhysicsAnimator.getInstance(bubbleBarView) + springBackAnimation.setDefaultSpringConfig(springConfig) + springBackAnimation.spring(DynamicAnimation.TRANSLATION_Y, ty) + springBackAnimation.addEndListener { _, _, _, _, _, _, _ -> + val animatingBubble = animatingBubble ?: return@addEndListener + if (animatingBubble.expand) { + expandBubbleBar() + cancelHideAnimation() + } else { + setupAndShowFlyout() + } + } + + // animate the bubble bar up and start the spring back down animation when it ends. + ObjectAnimator.ofFloat(bubbleBarView, View.TRANSLATION_Y, ty - bubbleBarBounceDistanceInPx) + .withDuration(BUBBLE_BAR_BOUNCE_ANIMATION_DURATION_MS) + .withEndAction { + val animatingBubble = animatingBubble ?: return@withEndAction + springBackAnimation.start() + if (animatingBubble.expand) expandBubbleBar() + } + .start() + } + + private fun setupAndShowFlyout() { + val bubbleView = animatingBubble?.bubbleView + val bubble = bubbleView?.bubble as? BubbleBarBubble + val flyout = bubble?.flyoutMessage + if (flyout != null) { + bubbleBarFlyoutController.setUpAndShowFlyout( + BubbleBarFlyoutMessage(flyout.icon, flyout.title, flyout.message), + onInit = { bubbleView.suppressDotForBubbleUpdate() }, + onEnd = { + moveToState(AnimatingBubble.State.IN) + bubbleStashController.updateTaskbarTouchRegion() + }, + ) + } else { + moveToState(AnimatingBubble.State.IN) + } + } + + private fun cancelFlyout() { + animatingBubble?.bubbleView?.unsuppressDotForBubbleUpdate(/* animate= */ true) + bubbleBarFlyoutController.cancelFlyout { bubbleStashController.updateTaskbarTouchRegion() } + } + + private fun onFlyoutRemoved() { + animatingBubble?.bubbleView?.unsuppressDotForBubbleUpdate(/* animate= */ false) + bubbleStashController.updateTaskbarTouchRegion() + } + + /** Interrupts the animation due to touching the bubble bar or flyout. */ + fun interruptForTouch() { + animatingBubble?.hideAnimation?.let { scheduler.cancel(it) } PhysicsAnimator.getInstance(bubbleBarView).cancelIfRunning() - bubbleStashController.stashedHandlePhysicsAnimator.cancelIfRunning() - val hideAnimation = animatingBubble?.hideAnimation ?: return - scheduler.cancel(hideAnimation) - bubbleBarView.onAnimatingBubbleCompleted() - bubbleBarView.relativePivotY = 1f - animatingBubble = null + bubbleStashController.getStashedHandlePhysicsAnimator().cancelIfRunning() + cancelFlyout() + resetBubbleBarPropertiesOnInterrupt() + clearAnimatingBubble() } /** Notifies the animator that the taskbar area was touched during an animation. */ fun onStashStateChangingWhileAnimating() { + animatingBubble?.hideAnimation?.let { scheduler.cancel(it) } + cancelFlyout() + clearAnimatingBubble() + bubbleStashController.getStashedHandlePhysicsAnimator().cancelIfRunning() + resetBubbleBarPropertiesOnInterrupt() + bubbleStashController.onNewBubbleAnimationInterrupted( + /* isStashed= */ bubbleStashController.isStashed, + bubbleBarView.translationY, + ) + } + + /** Interrupts the animation due to the IME becoming visible. */ + fun interruptForIme() { + cancelFlyout() val hideAnimation = animatingBubble?.hideAnimation ?: return scheduler.cancel(hideAnimation) - animatingBubble = null - bubbleStashController.stashedHandlePhysicsAnimator.cancel() - bubbleBarView.onAnimatingBubbleCompleted() - bubbleBarView.relativePivotY = 1f + clearAnimatingBubble() + bubbleStashController.getStashedHandlePhysicsAnimator().cancelIfRunning() + resetBubbleBarPropertiesOnInterrupt() + // stash the bubble bar since the IME is now visible bubbleStashController.onNewBubbleAnimationInterrupted( - /* isStashed= */ bubbleBarView.alpha == 0f, - bubbleBarView.translationY + /* isStashed= */ true, + bubbleBarView.translationY, ) } - private fun PhysicsAnimator.cancelIfRunning() { - if (isRunning()) cancel() + fun expandedWhileAnimating() { + val animatingBubble = animatingBubble ?: return + this.animatingBubble = animatingBubble.copy(expand = true) + // if we're fully in and waiting to hide, cancel the hide animation and clean up + if (animatingBubble.state == AnimatingBubble.State.IN) { + cancelFlyout() + expandBubbleBar() + cancelHideAnimation() + } + } + + fun collapsedWhileAnimating() { + val animatingBubble = animatingBubble ?: return + // we are collapsing in the middle of animating a bubble in, which means we previously + // received a signal to expand. if we already moved on to the IN state, the expand signal + // would have already interrupted the animation, so we must still be animating in. + if (animatingBubble.state == AnimatingBubble.State.ANIMATING_IN) { + clearAnimatingBubble() + // cancel the currently running animation + PhysicsAnimator.getInstance(bubbleBarView).cancelIfRunning() + bubbleStashController.getStashedHandlePhysicsAnimator().cancelIfRunning() + scheduler.cancel(animatingBubble.hideAnimation) + bubbleBarView.relativePivotY = 1f + if ( + bubbleStashController.isBubblesShowingOnHome || + bubbleStashController.isBubblesShowingOnOverview + ) { + bubbleStashController.showBubbleBarImmediate() + ObjectAnimator.ofFloat( + bubbleBarView, + View.TRANSLATION_Y, + bubbleStashController.bubbleBarTranslationY, + ) + .withDuration(BUBBLE_BAR_BOUNCE_ANIMATION_DURATION_MS) + .start() + bubbleBarView.animateExpanded(/* isBarExpanded= */ false) + } else { + bubbleStashController.stashBubbleBar() + } + } + } + + private fun interruptAndUpdateAnimatingBubble(bubbleView: BubbleView, isExpanding: Boolean) { + val animatingBubble = animatingBubble ?: return + when (animatingBubble.state) { + AnimatingBubble.State.CREATED -> {} // nothing to do since the animation hasn't started + AnimatingBubble.State.ANIMATING_IN -> + updateAnimationWhileAnimatingIn(animatingBubble, bubbleView, isExpanding) + AnimatingBubble.State.IN -> + updateAnimationWhileIn(animatingBubble, bubbleView, isExpanding) + AnimatingBubble.State.ANIMATING_OUT -> + updateAnimationWhileAnimatingOut(animatingBubble, bubbleView, isExpanding) + } + } + + private fun updateAnimationWhileAnimatingIn( + animatingBubble: AnimatingBubble, + bubbleView: BubbleView, + isExpanding: Boolean, + ) { + this.animatingBubble = animatingBubble.copy(bubbleView = bubbleView, expand = isExpanding) + if (!bubbleBarFlyoutController.hasFlyout()) { + // if the flyout does not yet exist, then we're only animating the bubble bar. + // the animating bubble has been updated, so the when the flyout expands it will + // show the right message. we only need to update the dot visibility. + bubbleView.updateDotVisibility(/* animate= */ !bubbleStashController.isStashed) + return + } + + val bubble = bubbleView.bubble as? BubbleBarBubble + val flyout = bubble?.flyoutMessage + if (flyout != null) { + // the flyout is currently expanding and we need to update it with new data + bubbleView.suppressDotForBubbleUpdate() + bubbleBarFlyoutController.updateFlyoutWhileExpanding(flyout) + } else { + // the flyout is expanding but we don't have new flyout data to update it with, + // so cancel the expanding flyout. + cancelFlyout() + } + } + + private fun updateAnimationWhileIn( + animatingBubble: AnimatingBubble, + bubbleView: BubbleView, + isExpanding: Boolean, + ) { + // unsuppress the current bubble because we are about to hide its flyout + animatingBubble.bubbleView.unsuppressDotForBubbleUpdate(/* animate= */ false) + this.animatingBubble = animatingBubble.copy(bubbleView = bubbleView, expand = isExpanding) + + // we're currently idle, waiting for the hide animation to start. update the flyout + // data and reschedule the hide animation to run later to give the user a chance to + // see the new flyout. + val hideAnimation = animatingBubble.hideAnimation + scheduler.cancel(hideAnimation) + scheduler.postDelayed(FLYOUT_DELAY_MS, hideAnimation) + + val bubble = bubbleView.bubble as? BubbleBarBubble + val flyout = bubble?.flyoutMessage + if (flyout != null) { + bubbleView.suppressDotForBubbleUpdate() + bubbleBarFlyoutController.updateFlyoutFullyExpanded(flyout) { + bubbleStashController.updateTaskbarTouchRegion() + } + } else { + cancelFlyout() + } + } + + private fun updateAnimationWhileAnimatingOut( + animatingBubble: AnimatingBubble, + bubbleView: BubbleView, + isExpanding: Boolean, + ) { + // unsuppress the current bubble because we are about to hide its flyout + animatingBubble.bubbleView.unsuppressDotForBubbleUpdate(/* animate= */ false) + this.animatingBubble = animatingBubble.copy(bubbleView = bubbleView, expand = isExpanding) + + // the hide animation already started so it can't be canceled, just post it again + val hideAnimation = animatingBubble.hideAnimation + scheduler.postDelayed(FLYOUT_DELAY_MS, hideAnimation) + + val bubble = bubbleView.bubble as? BubbleBarBubble + val flyout = bubble?.flyoutMessage + if (bubbleBarFlyoutController.hasFlyout()) { + // the flyout is collapsing. update it with the new flyout + if (flyout != null) { + moveToState(AnimatingBubble.State.ANIMATING_IN) + bubbleView.suppressDotForBubbleUpdate() + bubbleBarFlyoutController.updateFlyoutWhileCollapsing(flyout) { + moveToState(AnimatingBubble.State.IN) + bubbleStashController.updateTaskbarTouchRegion() + } + } else { + cancelFlyout() + moveToState(AnimatingBubble.State.IN) + } + } else { + // the flyout is already gone. if we're animating the handle cancel it. the + // animation itself can handle morphing back into the bubble bar and restarting + // and show the flyout. + val handleAnimator = bubbleStashController.getStashedHandlePhysicsAnimator() + if (handleAnimator != null && handleAnimator.isRunning()) { + interceptedHandleAnimator = true + handleAnimator.cancel() + } + + // if we're not animating the handle, then the hide animation simply hides the + // flyout, but if the flyout is gone then the animation has ended. + } + } + + private fun cancelHideAnimation() { + val hideAnimation = animatingBubble?.hideAnimation ?: return + scheduler.cancel(hideAnimation) + clearAnimatingBubble() + bubbleBarView.relativePivotY = 1f + bubbleStashController.showBubbleBarImmediate() + } + + private fun resetBubbleBarPropertiesOnInterrupt() { + bubbleBarView.relativePivotY = 1f + bubbleBarView.scaleX = 1f + bubbleBarView.scaleY = 1f + } + + private fun PhysicsAnimator?.cancelIfRunning() { + if (this?.isRunning() == true) cancel() + } + + private fun ObjectAnimator.withDuration(duration: Long): ObjectAnimator { + setDuration(duration) + return this + } + + private fun ObjectAnimator.withEndAction(endAction: () -> Unit): ObjectAnimator { + addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + endAction() + } + } + ) + return this + } + + private fun moveToState(state: AnimatingBubble.State) { + val animatingBubble = this.animatingBubble ?: return + this.animatingBubble = animatingBubble.copy(state = state) + if (state == AnimatingBubble.State.ANIMATING_IN) { + bubbleBarParentViewHeightUpdateNotifier.updateTopBoundary() + } + } + + private fun clearAnimatingBubble() { + animatingBubble = null + bubbleBarParentViewHeightUpdateNotifier.updateTopBoundary() + onAnimationEnded.run() + } + + private fun expandBubbleBar() { + bubbleBarView.animateExpanded(true) + onExpanded.run() + } + + /** + * Tracks the translation Y of the bubble bar during the animation. When the bubble bar expands + * as part of the animation, the expansion should start after the bubble bar reaches the peak + * position. + */ + private inner class TranslationTracker(initialTy: Float) { + private var previousTy = initialTy + private var startedExpanding = false + private var reachedPeak = false + + fun updateTyAndExpandIfNeeded(ty: Float) { + if (!reachedPeak) { + // the bubble bar is positioned at the bottom of the screen and moves up using + // negative ty values. the peak is reached the first time we see a value that is + // greater than the previous. + if (ty > previousTy) { + reachedPeak = true + } + } + val expand = animatingBubble?.expand ?: false + if (reachedPeak && expand && !startedExpanding) { + expandBubbleBar() + startedExpanding = true + } + previousTy = ty + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutController.kt new file mode 100644 index 00000000000..4a2f029fd5b --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutController.kt @@ -0,0 +1,188 @@ +/* + * 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.launcher3.taskbar.bubbles.flyout + +import android.animation.ValueAnimator +import android.graphics.Rect +import android.view.Gravity +import android.view.ViewGroup +import android.widget.FrameLayout +import androidx.core.animation.addListener +import com.android.app.animation.Interpolators +import com.android.launcher3.R + +/** Creates and manages the visibility of the [BubbleBarFlyoutView]. */ +class BubbleBarFlyoutController +@JvmOverloads +constructor( + private val container: FrameLayout, + private val positioner: BubbleBarFlyoutPositioner, + private val callbacks: FlyoutCallbacks, + private val flyoutScheduler: FlyoutScheduler = HandlerScheduler(container), +) { + + val maximumFlyoutHeight: Int = BubbleBarFlyoutView.getMaximumViewHeight(container.context) + + private companion object { + const val EXPAND_ANIMATION_DURATION_MS = 400L + const val COLLAPSE_ANIMATION_DURATION_MS = 350L + } + + private var flyout: BubbleBarFlyoutView? = null + private var animator: ValueAnimator? = null + private val horizontalMargin = + container.context.resources.getDimensionPixelSize(R.dimen.transient_taskbar_bottom_margin) + + private enum class AnimationType { + /** Morphs the flyout between a dot and a rounded rectangle. */ + MORPH, + /** Fades the flyout in or out. */ + FADE, + } + + /** The bounds of the flyout. */ + val flyoutBounds: Rect? + get() { + val flyout = this.flyout ?: return null + val rect = Rect(flyout.bounds) + rect.offset(0, flyout.translationY.toInt()) + return rect + } + + fun setUpAndShowFlyout(message: BubbleBarFlyoutMessage, onInit: () -> Unit, onEnd: () -> Unit) { + animator?.cancel() + flyout?.let(container::removeView) + val flyout = BubbleBarFlyoutView(container.context, positioner, flyoutScheduler) + + flyout.translationY = positioner.targetTy + + val lp = + FrameLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + Gravity.BOTTOM or if (positioner.isOnLeft) Gravity.LEFT else Gravity.RIGHT, + ) + lp.marginStart = horizontalMargin + lp.marginEnd = horizontalMargin + container.addView(flyout, lp) + + this.flyout = flyout + flyout.showFromCollapsed(message) { + flyout.updateExpansionProgress(0f) + onInit() + showFlyout(AnimationType.MORPH, onEnd) + } + } + + private fun showFlyout(animationType: AnimationType, endAction: () -> Unit) { + val flyout = this.flyout ?: return + val startValue = getCurrentAnimatedValueIfRunning() ?: 0f + val duration = (EXPAND_ANIMATION_DURATION_MS * (1f - startValue)).toLong() + animator?.cancel() + val animator = ValueAnimator.ofFloat(startValue, 1f).setDuration(duration) + animator.interpolator = Interpolators.EMPHASIZED + this.animator = animator + when (animationType) { + AnimationType.FADE -> + animator.addUpdateListener { _ -> flyout.alpha = animator.animatedValue as Float } + AnimationType.MORPH -> + animator.addUpdateListener { _ -> + flyout.updateExpansionProgress(animator.animatedValue as Float) + } + } + animator.addListener( + onEnd = { + endAction() + flyout.setOnClickListener { callbacks.flyoutClicked() } + } + ) + animator.start() + } + + fun updateFlyoutFullyExpanded(message: BubbleBarFlyoutMessage, onEnd: () -> Unit) { + val flyout = flyout ?: return + hideFlyout(AnimationType.FADE) { + flyout.updateData(message) { showFlyout(AnimationType.FADE, onEnd) } + } + } + + fun updateFlyoutWhileExpanding(message: BubbleBarFlyoutMessage) { + val flyout = flyout ?: return + flyout.updateData(message) {} + } + + fun updateFlyoutWhileCollapsing(message: BubbleBarFlyoutMessage, onEnd: () -> Unit) { + val flyout = flyout ?: return + animator?.pause() + animator?.removeAllListeners() + flyout.updateData(message) { showFlyout(AnimationType.MORPH, onEnd) } + } + + fun cancelFlyout(endAction: () -> Unit) { + hideFlyout(AnimationType.FADE) { + cleanupFlyoutView() + endAction() + } + } + + fun collapseFlyout(endAction: () -> Unit) { + hideFlyout(AnimationType.MORPH) { + cleanupFlyoutView() + endAction() + } + } + + private fun hideFlyout(animationType: AnimationType, endAction: () -> Unit) { + val flyout = this.flyout ?: return + val startValue = getCurrentAnimatedValueIfRunning() ?: 1f + val duration = (COLLAPSE_ANIMATION_DURATION_MS * startValue).toLong() + animator?.cancel() + val animator = ValueAnimator.ofFloat(startValue, 0f).setDuration(duration) + animator.interpolator = Interpolators.EMPHASIZED + this.animator = animator + when (animationType) { + AnimationType.FADE -> + animator.addUpdateListener { _ -> flyout.alpha = animator.animatedValue as Float } + AnimationType.MORPH -> + animator.addUpdateListener { _ -> + flyout.updateExpansionProgress(animator.animatedValue as Float) + } + } + animator.addListener( + onStart = { + flyout.setOnClickListener(null) + if (animationType == AnimationType.MORPH) { + flyout.updateTranslationToCollapsedPosition() + } + }, + onEnd = { endAction() }, + ) + animator.start() + } + + private fun cleanupFlyoutView() { + container.removeView(flyout) + this@BubbleBarFlyoutController.flyout = null + } + + fun hasFlyout() = flyout != null + + private fun getCurrentAnimatedValueIfRunning(): Float? { + val animator = animator ?: return null + return if (animator.isRunning) animator.animatedValue as Float else null + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutMessage.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutMessage.kt new file mode 100644 index 00000000000..14b456c73fe --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutMessage.kt @@ -0,0 +1,21 @@ +/* + * 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.launcher3.taskbar.bubbles.flyout + +import android.graphics.drawable.Drawable + +data class BubbleBarFlyoutMessage(val icon: Drawable?, val title: String, val message: String) diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutPositioner.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutPositioner.kt new file mode 100644 index 00000000000..aa2555e8656 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutPositioner.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar.bubbles.flyout + +import android.graphics.PointF + +/** Provides positioning data to the flyout view. */ +interface BubbleBarFlyoutPositioner { + + /** Whether the flyout view should be positioned on left or the right edge. */ + val isOnLeft: Boolean + + /** The target translation Y that the flyout view should have when displayed. */ + val targetTy: Float + + /** + * The distance between the expanded position of the flyout and the collapsed position. + * + * The distance is calculated between the bottom corner which is aligned with the bubble bar. + */ + val distanceToCollapsedPosition: PointF + + /** The size of the flyout when collapsed. */ + val collapsedSize: Float + + /** The color of the flyout when collapsed. */ + val collapsedColor: Int + + /** The elevation of the flyout when collapsed. */ + val collapsedElevation: Float + + /** + * The distance the flyout must pass from its collapsed position until it can start revealing + * the triangle. + */ + val distanceToRevealTriangle: Float +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutView.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutView.kt new file mode 100644 index 00000000000..ac87b5ee009 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutView.kt @@ -0,0 +1,433 @@ +/* + * 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.launcher3.taskbar.bubbles.flyout + +import android.content.Context +import android.content.res.Configuration +import android.content.res.Resources +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Outline +import android.graphics.Paint +import android.graphics.Path +import android.graphics.PointF +import android.graphics.Rect +import android.graphics.RectF +import android.view.LayoutInflater +import android.view.View +import android.view.ViewOutlineProvider +import android.widget.ImageView +import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.animation.ArgbEvaluator +import com.android.launcher3.R +import com.android.launcher3.popup.RoundedArrowDrawable +import com.android.wm.shell.shared.TypefaceUtils +import com.android.wm.shell.shared.TypefaceUtils.Companion.setTypeface +import kotlin.math.min + +/** The flyout view used to notify the user of a new bubble notification. */ +class BubbleBarFlyoutView( + context: Context, + private val positioner: BubbleBarFlyoutPositioner, + scheduler: FlyoutScheduler? = null, +) : ConstraintLayout(context) { + + companion object { + // the rate multiple for the background color animation relative to the morph animation. + const val BACKGROUND_COLOR_CHANGE_RATE = 5 + // the minimum progress of the expansion animation before the content starts fading in. + private const val MIN_EXPANSION_PROGRESS_FOR_CONTENT_ALPHA = 0.75f + + private const val TEXT_ROW_HEIGHT_SP = 20 + private const val MAX_ROWS_COUNT = 3 + + /** Returns the maximum possible height of the flyout view. */ + fun getMaximumViewHeight(context: Context): Int { + val verticalPaddings = getFlyoutPadding(context) * 2 + val textSizeSp = TEXT_ROW_HEIGHT_SP * MAX_ROWS_COUNT + val textSizePx = textSizeSp * Resources.getSystem().displayMetrics.scaledDensity + val triangleHeight = + context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_triangle_height) + return verticalPaddings + textSizePx.toInt() + triangleHeight + } + + private fun getFlyoutPadding(context: Context) = + context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_padding) + } + + private val scheduler: FlyoutScheduler = scheduler ?: HandlerScheduler(this) + private val title: TextView by + lazy(LazyThreadSafetyMode.NONE) { findViewById(R.id.bubble_flyout_title) } + + private val icon: ImageView by + lazy(LazyThreadSafetyMode.NONE) { findViewById(R.id.bubble_flyout_icon) } + + private val message: TextView by + lazy(LazyThreadSafetyMode.NONE) { findViewById(R.id.bubble_flyout_text) } + + private val flyoutPadding by lazy(LazyThreadSafetyMode.NONE) { getFlyoutPadding(context) } + + private val triangleHeight by + lazy(LazyThreadSafetyMode.NONE) { + context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_triangle_height) + } + + private val triangleOverlap by + lazy(LazyThreadSafetyMode.NONE) { + context.resources.getDimensionPixelSize( + R.dimen.bubblebar_flyout_triangle_overlap_amount + ) + } + + private val triangleWidth by + lazy(LazyThreadSafetyMode.NONE) { + context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_triangle_width) + } + + private val triangleRadius by + lazy(LazyThreadSafetyMode.NONE) { + context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_triangle_radius) + } + + private val minFlyoutWidth by + lazy(LazyThreadSafetyMode.NONE) { + context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_min_width) + } + + private val maxFlyoutWidth by + lazy(LazyThreadSafetyMode.NONE) { + context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_max_width) + } + + private val flyoutElevation by + lazy(LazyThreadSafetyMode.NONE) { + context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_elevation).toFloat() + } + + /** The bounds of the background rect. */ + private val backgroundRect = RectF() + private val cornerRadius: Float + private val triangle: Path = Path() + private val triangleOutline = Outline() + private var backgroundColor = Color.BLACK + /** Represents the progress of the expansion animation. 0 when collapsed. 1 when expanded. */ + private var expansionProgress = 0f + /** Translation x-y values to move the flyout to its collapsed position. */ + private var translationToCollapsedPosition = PointF(0f, 0f) + /** The size of the flyout when it's collapsed. */ + private var collapsedSize = 0f + /** The corner radius of the flyout when it's collapsed. */ + private var collapsedCornerRadius = 0f + /** The color of the flyout when collapsed. */ + private var collapsedColor = 0 + /** The elevation of the flyout when collapsed. */ + private var collapsedElevation = 0f + /** The minimum progress of the expansion animation before the triangle is made visible. */ + private var minExpansionProgressForTriangle = 0f + + /** The corner radius of the background according to the progress of the animation. */ + private val currentCornerRadius + get() = collapsedCornerRadius + (cornerRadius - collapsedCornerRadius) * expansionProgress + + /** Translation X of the background. */ + private val backgroundRectTx + get() = translationToCollapsedPosition.x * (1 - expansionProgress) + + /** Translation Y of the background. */ + private val backgroundRectTy + get() = translationToCollapsedPosition.y * (1 - expansionProgress) + + /** + * The paint used to draw the background, whose color changes as the flyout transitions to the + * tinted notification dot. + */ + private val backgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG) + + /** The bounds of the flyout relative to the parent view. */ + val bounds = Rect() + + init { + LayoutInflater.from(context).inflate(R.layout.bubblebar_flyout, this, true) + id = R.id.bubble_bar_flyout_view + + setTypeface(title, TypefaceUtils.FontFamily.GSF_LABEL_LARGE) + setTypeface(message, TypefaceUtils.FontFamily.GSF_BODY_MEDIUM) + + val ta = context.obtainStyledAttributes(intArrayOf(android.R.attr.dialogCornerRadius)) + cornerRadius = ta.getDimensionPixelSize(0, 0).toFloat() + ta.recycle() + + setWillNotDraw(false) + clipChildren = true + clipToPadding = false + + val padding = context.resources.getDimensionPixelSize(R.dimen.bubblebar_flyout_padding) + // add extra padding to the bottom of the view to include the triangle + setPadding(padding, padding, padding, padding + triangleHeight - triangleOverlap) + translationZ = flyoutElevation + + RoundedArrowDrawable.addDownPointingRoundedTriangleToPath( + triangleWidth.toFloat(), + triangleHeight.toFloat(), + triangleRadius.toFloat(), + triangle, + ) + triangleOutline.setPath(triangle) + + outlineProvider = + object : ViewOutlineProvider() { + override fun getOutline(view: View, outline: Outline) { + this@BubbleBarFlyoutView.getOutline(outline) + } + } + clipToOutline = true + + applyConfigurationColors(resources.configuration) + } + + override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { + super.onLayout(changed, left, top, right, bottom) + bounds.left = left + bounds.top = top + bounds.right = right + bounds.bottom = bottom + } + + /** Sets the data for the flyout and starts playing the expand animation. */ + fun showFromCollapsed(flyoutMessage: BubbleBarFlyoutMessage, expandAnimation: () -> Unit) { + icon.alpha = 0f + title.alpha = 0f + message.alpha = 0f + setData(flyoutMessage) + + updateTranslationToCollapsedPosition() + collapsedSize = positioner.collapsedSize + collapsedCornerRadius = collapsedSize / 2 + collapsedColor = positioner.collapsedColor + collapsedElevation = positioner.collapsedElevation + + // calculate the expansion progress required before we start showing the triangle as part of + // the expansion animation + minExpansionProgressForTriangle = + positioner.distanceToRevealTriangle / translationToCollapsedPosition.y + + backgroundPaint.color = collapsedColor + + // post the request to start the expand animation to the looper so the view can measure + // itself + scheduler.runAfterLayout(expandAnimation) + } + + /** Updates the content of the flyout and schedules [afterLayout] to run after a layout pass. */ + fun updateData(flyoutMessage: BubbleBarFlyoutMessage, afterLayout: () -> Unit) { + setData(flyoutMessage) + scheduler.runAfterLayout(afterLayout) + } + + private fun setData(flyoutMessage: BubbleBarFlyoutMessage) { + if (flyoutMessage.icon != null) { + icon.visibility = VISIBLE + icon.setImageDrawable(flyoutMessage.icon) + } else { + icon.visibility = GONE + } + + val minTextViewWidth: Int + val maxTextViewWidth: Int + if (icon.visibility == VISIBLE) { + minTextViewWidth = minFlyoutWidth - icon.width - flyoutPadding * 2 + maxTextViewWidth = maxFlyoutWidth - icon.width - flyoutPadding * 2 + } else { + // when there's no avatar, the width of the text view is constant, so we're setting the + // min and max to the same value + minTextViewWidth = minFlyoutWidth - flyoutPadding * 2 + maxTextViewWidth = minTextViewWidth + } + + if (flyoutMessage.title.isEmpty()) { + title.visibility = GONE + } else { + title.minWidth = minTextViewWidth + title.maxWidth = maxTextViewWidth + title.text = flyoutMessage.title + title.visibility = VISIBLE + } + + message.minWidth = minTextViewWidth + message.maxWidth = maxTextViewWidth + message.text = flyoutMessage.message + } + + /** + * This should be called to update [translationToCollapsedPosition] before we start expanding or + * collapsing to make sure that we're animating the flyout to and from the correct position. + */ + fun updateTranslationToCollapsedPosition() { + val txToCollapsedPosition = + if (positioner.isOnLeft) { + positioner.distanceToCollapsedPosition.x + } else { + -positioner.distanceToCollapsedPosition.x + } + val tyToCollapsedPosition = + positioner.distanceToCollapsedPosition.y + triangleHeight - triangleOverlap + translationToCollapsedPosition = PointF(txToCollapsedPosition, tyToCollapsedPosition) + } + + /** Updates the flyout view with the progress of the animation. */ + fun updateExpansionProgress(fraction: Float) { + expansionProgress = fraction + + updateTranslationForAnimation(message) + updateTranslationForAnimation(title) + updateTranslationForAnimation(icon) + + // start fading in the content only after we're past the threshold + val alpha = + ((expansionProgress - MIN_EXPANSION_PROGRESS_FOR_CONTENT_ALPHA) / + (1f - MIN_EXPANSION_PROGRESS_FOR_CONTENT_ALPHA)) + .coerceIn(0f, 1f) + title.alpha = alpha + message.alpha = alpha + icon.alpha = alpha + + translationZ = + collapsedElevation + (flyoutElevation - collapsedElevation) * expansionProgress + + invalidate() + } + + override fun onDraw(canvas: Canvas) { + // interpolate the width, height, corner radius and translation based on the progress of the + // animation. + // the background is drawn from the bottom left corner to the top right corner if we're + // positioned on the left, and from the bottom right corner to the top left if we're + // positioned on the right. + + // the current width of the background rect according to the progress of the animation + val currentWidth = collapsedSize + (width - collapsedSize) * expansionProgress + val rectBottom = height - triangleHeight + triangleOverlap + val currentHeight = collapsedSize + (rectBottom - collapsedSize) * expansionProgress + + backgroundRect.set( + if (positioner.isOnLeft) 0f else width.toFloat() - currentWidth, + height.toFloat() - triangleHeight + triangleOverlap - currentHeight, + if (positioner.isOnLeft) currentWidth else width.toFloat(), + height.toFloat() - triangleHeight + triangleOverlap, + ) + + // transform the flyout color between the collapsed and expanded states. the color + // transformation completes at a faster rate (BACKGROUND_COLOR_CHANGE_RATE) than the + // expansion animation. this helps make the color change smooth. + backgroundPaint.color = + ArgbEvaluator.getInstance() + .evaluate( + min(expansionProgress * BACKGROUND_COLOR_CHANGE_RATE, 1f), + collapsedColor, + backgroundColor, + ) + + canvas.save() + canvas.translate(backgroundRectTx, backgroundRectTy) + // draw the background starting from the bottom left if we're positioned left, or the bottom + // right if we're positioned right. + canvas.drawRoundRect( + backgroundRect, + currentCornerRadius, + currentCornerRadius, + backgroundPaint, + ) + if (expansionProgress >= minExpansionProgressForTriangle) { + drawTriangle(canvas) + } + canvas.restore() + invalidateOutline() + super.onDraw(canvas) + } + + private fun drawTriangle(canvas: Canvas) { + canvas.save() + val triangleX = + if (positioner.isOnLeft) { + currentCornerRadius + } else { + width - currentCornerRadius - triangleWidth + } + // instead of scaling the triangle, increasingly reveal it from the background. this has the + // effect of the triangle scaling. + + // the translation y of the triangle before we start revealing it. align its bottom with the + // bottom of the rect + val triangleYCollapsed = height - triangleHeight - (triangleHeight - triangleOverlap) + // the translation y of the triangle when it's fully revealed + val triangleYExpanded = height - triangleHeight + val interpolatedExpansion = + ((expansionProgress - minExpansionProgressForTriangle) / + (1 - minExpansionProgressForTriangle)) + .coerceIn(0f, 1f) + val triangleY = + triangleYCollapsed + (triangleYExpanded - triangleYCollapsed) * interpolatedExpansion + canvas.translate(triangleX, triangleY) + canvas.drawPath(triangle, backgroundPaint) + triangleOutline.setPath(triangle) + triangleOutline.offset(triangleX.toInt(), triangleY.toInt()) + canvas.restore() + } + + private fun getOutline(outline: Outline) { + val path = Path() + path.addRoundRect( + backgroundRect, + currentCornerRadius, + currentCornerRadius, + Path.Direction.CW, + ) + if (expansionProgress >= minExpansionProgressForTriangle) { + path.addPath(triangleOutline.mPath) + } + outline.setPath(path) + outline.offset(backgroundRectTx.toInt(), backgroundRectTy.toInt()) + } + + private fun updateTranslationForAnimation(view: View) { + val tx = + if (positioner.isOnLeft) { + translationToCollapsedPosition.x - view.left + } else { + width - view.left - translationToCollapsedPosition.x + } + val ty = height - view.top + translationToCollapsedPosition.y + view.translationX = tx * (1f - expansionProgress) + view.translationY = ty * (1f - expansionProgress) + } + + private fun applyConfigurationColors(configuration: Configuration) { + val nightModeFlags = configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK + val isNightModeOn = nightModeFlags == Configuration.UI_MODE_NIGHT_YES + val defaultBackgroundColor = if (isNightModeOn) Color.BLACK else Color.WHITE + val defaultTextColor = if (isNightModeOn) Color.WHITE else Color.BLACK + + backgroundColor = + context.getColor(com.android.internal.R.color.materialColorSurfaceContainer) + title.setTextColor(context.getColor(com.android.internal.R.color.materialColorOnSurface)) + message.setTextColor( + context.getColor(com.android.internal.R.color.materialColorOnSurfaceVariant) + ) + backgroundPaint.color = backgroundColor + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/FlyoutCallbacks.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/FlyoutCallbacks.kt new file mode 100644 index 00000000000..0804a62d6ef --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/FlyoutCallbacks.kt @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar.bubbles.flyout + +/** Callbacks that the flyout uses to notify of events. */ +interface FlyoutCallbacks { + + /** The flyout was clicked. */ + fun flyoutClicked() +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/FlyoutScheduler.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/FlyoutScheduler.kt new file mode 100644 index 00000000000..6f5d700b0f6 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/FlyoutScheduler.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.launcher3.taskbar.bubbles.flyout + +import android.view.View + +/** Interface for scheduling jobs by flyout. */ +fun interface FlyoutScheduler { + /** Runs the given [block] after layout. */ + fun runAfterLayout(block: () -> Unit) +} + +/** A [FlyoutScheduler] that uses a Handler to schedule jobs. */ +class HandlerScheduler(val view: View) : FlyoutScheduler { + override fun runAfterLayout(block: () -> Unit) { + view.post(block) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleBarLocationOnDemandListener.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleBarLocationOnDemandListener.kt new file mode 100644 index 00000000000..ffe7c4473ba --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleBarLocationOnDemandListener.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar.bubbles.stashing + +import com.android.launcher3.taskbar.bubbles.BubbleBarController.BubbleBarLocationListener +import com.android.wm.shell.shared.bubbles.BubbleBarLocation + +/** On demand implementation of [BubbleBarLocationListener]. */ +class BubbleBarLocationOnDemandListener( + private val listenerProvider: () -> BubbleBarLocationListener +) : BubbleBarLocationListener { + + override fun onBubbleBarLocationAnimated(location: BubbleBarLocation) { + listenerProvider().onBubbleBarLocationAnimated(location) + } + + override fun onBubbleBarLocationUpdated(location: BubbleBarLocation) { + listenerProvider().onBubbleBarLocationUpdated(location) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleStashController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleStashController.kt new file mode 100644 index 00000000000..2deb09ab34a --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleStashController.kt @@ -0,0 +1,235 @@ +/* + * 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.launcher3.taskbar.bubbles.stashing + +import android.graphics.Rect +import android.view.InsetsController +import android.view.MotionEvent +import android.view.View +import com.android.launcher3.taskbar.TaskbarInsetsController +import com.android.launcher3.taskbar.bubbles.BubbleBarView +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController +import com.android.launcher3.taskbar.bubbles.BubbleStashedHandleViewController +import com.android.launcher3.util.MultiPropertyFactory +import com.android.wm.shell.shared.animation.PhysicsAnimator +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import java.io.PrintWriter + +/** StashController that defines stashing behaviour for the taskbar modes. */ +interface BubbleStashController { + + /** + * Abstraction on the task bar activity context to only provide the dimensions required for + * [BubbleBarView] translation Y computation. + */ + interface TaskbarHotseatDimensionsProvider { + + /** Provides taskbar bottom space in pixels. */ + fun getTaskbarBottomSpace(): Int + + /** Provides taskbar height in pixels. */ + fun getTaskbarHeight(): Int + } + + /** Execute passed action only after controllers are initiated. */ + interface ControllersAfterInitAction { + /** Execute action after controllers are initiated. */ + fun runAfterInit(action: Runnable) + } + + /** Launcher states bubbles cares about */ + enum class BubbleLauncherState { + /* When launcher is in overview */ + OVERVIEW, + /* When launcher is on home */ + HOME, + /* We're in an app */ + IN_APP, + } + + /** The current launcher state */ + var launcherState: BubbleLauncherState + + /** Whether bubble bar is currently stashed */ + val isStashed: Boolean + + /** Whether launcher enters or exits the home page. */ + val isBubblesShowingOnHome: Boolean + get() = launcherState == BubbleLauncherState.HOME + + /** Whether launcher enters or exits the overview page. */ + val isBubblesShowingOnOverview: Boolean + get() = launcherState == BubbleLauncherState.OVERVIEW + + /** Bubble bar vertical center for launcher home. */ + var bubbleBarVerticalCenterForHome: Int + + /** Updated when sysui locked state changes, when locked, bubble bar is not shown. */ + var isSysuiLocked: Boolean + + /** Whether there is a transient taskbar mode */ + val isTransientTaskBar: Boolean + + /** Whether stash control has a handle view */ + val hasHandleView: Boolean + + /** Initialize controller */ + fun init( + taskbarInsetsController: TaskbarInsetsController, + bubbleBarViewController: BubbleBarViewController, + bubbleStashedHandleViewController: BubbleStashedHandleViewController?, + controllersAfterInitAction: ControllersAfterInitAction, + ) + + /** Shows the bubble bar at [bubbleBarTranslationY] position immediately without animation. */ + fun showBubbleBarImmediate() + + /** Shows the bubble bar at [bubbleBarTranslationY] position immediately without animation. */ + fun showBubbleBarImmediate(bubbleBarTranslationY: Float) + + /** Stashes the bubble bar immediately without animation. */ + fun stashBubbleBarImmediate() + + /** Returns the touchable height of the bubble bar based on it's stashed state. */ + fun getTouchableHeight(): Int + + /** Whether bubble bar is currently visible */ + fun isBubbleBarVisible(): Boolean + + /** + * Updates the values of the internal animators after the new bubble animation was interrupted + * + * @param isStashed whether the current state should be stashed + * @param bubbleBarTranslationY the current bubble bar translation. this is only used if the + * bubble bar is showing to ensure that the stash animator runs smoothly. + */ + fun onNewBubbleAnimationInterrupted(isStashed: Boolean, bubbleBarTranslationY: Float) + + /** Checks whether the motion event is over the stash handle or bubble bar. */ + fun isEventOverBubbleBarViews(ev: MotionEvent): Boolean + + /** Set a bubble bar location */ + fun setBubbleBarLocation(bubbleBarLocation: BubbleBarLocation) + + /** Stashes the bubble bar in the persistent taskbar mode. */ + fun setStashedInPersistentTaskBar(stashed: Boolean) {} + + /** + * Stashes the bubble bar (transform to the handle view), or just shrink width of the expanded + * bubble bar based on the controller implementation. + */ + fun stashBubbleBar() + + /** + * Animates the bubble bar to the handle at provided location. Does not update bubble bar + * location. + */ + fun stashBubbleBarToLocation(fromLocation: BubbleBarLocation, toLocation: BubbleBarLocation) {} + + /** Shows the bubble bar, and expands bubbles depending on [expandBubbles]. */ + fun showBubbleBar(expandBubbles: Boolean) { + showBubbleBar(expandBubbles = expandBubbles, bubbleBarGesture = false) + } + + /** + * Shows the bubble bar, and expands bubbles depending on [expandBubbles]. + * + * Set [bubbleBarGesture] to true if this request originates from a touch gesture on the bubble + * bar. + */ + fun showBubbleBar(expandBubbles: Boolean, bubbleBarGesture: Boolean) + + /** Animates the bubble bar at the provided location. Does not update bubble bar location. */ + fun showBubbleBarAtLocation(fromLocation: BubbleBarLocation, toLocation: BubbleBarLocation) {} + + // TODO(b/354218264): Move to BubbleBarViewAnimator + /** + * The difference on the Y axis between the center of the handle and the center of the bubble + * bar. + */ + fun getDiffBetweenHandleAndBarCenters(): Float + + // TODO(b/354218264): Move to BubbleBarViewAnimator + /** The distance the handle moves as part of the new bubble animation. */ + fun getStashedHandleTranslationForNewBubbleAnimation(): Float + + // TODO(b/354218264): Move to BubbleBarViewAnimator + /** Returns the [PhysicsAnimator] for the stashed handle view. */ + fun getStashedHandlePhysicsAnimator(): PhysicsAnimator? + + // TODO(b/354218264): Move to BubbleBarViewAnimator + /** Notifies taskbar that it should update its touchable region. */ + fun updateTaskbarTouchRegion() + + // TODO(b/354218264): Move to BubbleBarViewAnimator + /** Set the translation Y for the stashed handle. */ + fun setHandleTranslationY(translationY: Float) + + /** Returns the translation of the handle. */ + fun getHandleTranslationY(): Float? + + /** Returns bounds of the handle */ + fun getHandleBounds(bounds: Rect) + + /** Returns MultiValueAlpha of the handle view when the handle view is shown. */ + fun getHandleViewAlpha(): MultiPropertyFactory.MultiProperty? = null + + /** + * Default implementation only analyse [isBubblesShowingOnHome] and return value is equal to + * [targetTranslationYForState]. + */ + val bubbleBarTranslationY: Float + get() = targetTranslationYForState + + /** Returns bubble bar Y target position according to [isBubblesShowingOnHome] value. */ + val targetTranslationYForState: Float + get() = + if (isBubblesShowingOnHome) { + bubbleBarTranslationYForHotseat + } else { + bubbleBarTranslationYForTaskbar + } + + /** Translation Y to align the bubble bar with the taskbar. */ + val bubbleBarTranslationYForTaskbar: Float + + /** Return translation Y to align the bubble bar with the hotseat. */ + val bubbleBarTranslationYForHotseat: Float + + /** + * Show bubble bar is if it were in-app while launcher state is still on home. Set as a progress + * value between 0 and 1: 0 - use home layout, 1 - use in-app layout. + */ + var inAppDisplayOverrideProgress: Float + + /** Dumps the state of BubbleStashController. */ + fun dump(pw: PrintWriter) { + pw.println("Bubble stash controller state:") + pw.println(" isStashed: $isStashed") + pw.println(" isBubblesShowingOnOverview: $isBubblesShowingOnOverview") + pw.println(" isBubblesShowingOnHome: $isBubblesShowingOnHome") + pw.println(" isSysuiLocked: $isSysuiLocked") + } + + companion object { + /** How long to stash/unstash. */ + const val BAR_STASH_DURATION = InsetsController.ANIMATION_DURATION_RESIZE.toLong() + + /** How long to translate Y coordinate of the BubbleBar. */ + const val BAR_TRANSLATION_DURATION = 300L + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/DeviceProfileDimensionsProviderAdapter.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/DeviceProfileDimensionsProviderAdapter.kt new file mode 100644 index 00000000000..2408274c9fb --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/DeviceProfileDimensionsProviderAdapter.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.launcher3.taskbar.bubbles.stashing + +import com.android.launcher3.DeviceProfile +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.TaskbarHotseatDimensionsProvider + +/** + * Implementation of the [TaskbarHotseatDimensionsProvider] that take sizes from the + * [DeviceProfile]. + */ +class DeviceProfileDimensionsProviderAdapter( + private val taskbarActivityContext: TaskbarActivityContext +) : TaskbarHotseatDimensionsProvider { + override fun getTaskbarBottomSpace(): Int = taskbarDp().taskbarProfile.bottomMargin + + override fun getTaskbarHeight(): Int = taskbarDp().taskbarProfile.height + + private fun taskbarDp(): DeviceProfile = taskbarActivityContext.deviceProfile +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashController.kt new file mode 100644 index 00000000000..e4ffff731a5 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashController.kt @@ -0,0 +1,302 @@ +/* + * 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.launcher3.taskbar.bubbles.stashing + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.AnimatorSet +import android.graphics.Rect +import android.view.MotionEvent +import android.view.View +import com.android.app.animation.Interpolators +import com.android.launcher3.Utilities +import com.android.launcher3.anim.AnimatedFloat +import com.android.launcher3.taskbar.TaskbarInsetsController +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController +import com.android.launcher3.taskbar.bubbles.BubbleStashedHandleViewController +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.BubbleLauncherState +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.Companion.BAR_STASH_DURATION +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.Companion.BAR_TRANSLATION_DURATION +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.ControllersAfterInitAction +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.TaskbarHotseatDimensionsProvider +import com.android.launcher3.util.MultiPropertyFactory +import com.android.wm.shell.shared.animation.PhysicsAnimator +import com.android.wm.shell.shared.bubbles.BubbleBarLocation + +class PersistentBubbleStashController( + private val taskbarHotseatDimensionsProvider: TaskbarHotseatDimensionsProvider +) : BubbleStashController { + + private lateinit var taskbarInsetsController: TaskbarInsetsController + private lateinit var bubbleBarViewController: BubbleBarViewController + private lateinit var bubbleBarTranslationYAnimator: AnimatedFloat + private lateinit var bubbleBarAlphaAnimator: MultiPropertyFactory.MultiProperty + private lateinit var bubbleBarScaleAnimator: AnimatedFloat + private lateinit var controllersAfterInitAction: ControllersAfterInitAction + override var bubbleBarVerticalCenterForHome: Int = 0 + + override var launcherState: BubbleLauncherState = BubbleLauncherState.IN_APP + set(state) { + if (field == state) return + val transitionFromHome = field == BubbleLauncherState.HOME + field = state + val hasBubbles = bubbleBarViewController.hasBubbles() + bubbleBarViewController.onBubbleBarConfigurationChanged(hasBubbles) + if (!hasBubbles) { + // if there are no bubbles, there's nothing to show, so just return. + return + } + if (field == BubbleLauncherState.OVERVIEW && inAppDisplayOverrideProgress != 0f) { + // we will never return to launcher -1 page from the overview state + inAppDisplayOverrideProgress = 0f + } + if (transitionFromHome || field == BubbleLauncherState.HOME) { + // If we're transitioning to or from home, animate the Y because we're in hotseat + // on home but in persistent taskbar elsewhere so the position is different. + animateBubbleBarY() + } + } + + override var isSysuiLocked: Boolean = false + set(isLocked) { + if (field == isLocked) return + field = isLocked + if (!isLocked && bubbleBarViewController.hasBubbles()) { + animateAfterUnlock() + } + } + + override var isTransientTaskBar: Boolean = false + + /** When the bubble bar is shown for the persistent task bar, there is no handle view. */ + override val hasHandleView: Boolean = false + + override var isStashed: Boolean = false + + /** Determines whether stashing is allowed. */ + private var allowStashing: Boolean = false + + override val bubbleBarTranslationYForTaskbar: Float + get() { + val taskbarBottomMargin = taskbarHotseatDimensionsProvider.getTaskbarBottomSpace() + val bubbleBarHeight: Float = bubbleBarViewController.bubbleBarCollapsedHeight + val taskbarHeight = taskbarHotseatDimensionsProvider.getTaskbarHeight() + return -taskbarBottomMargin - (taskbarHeight - bubbleBarHeight) / 2f + } + + private val stashedBubbleBarTranslationY: Float + get() { + return bubbleBarTranslationYForTaskbar + + taskbarHotseatDimensionsProvider.getTaskbarHeight() + } + + override val bubbleBarTranslationYForHotseat: Float + get() { + val bubbleBarHeight = bubbleBarViewController.bubbleBarCollapsedHeight + return -bubbleBarVerticalCenterForHome + bubbleBarHeight / 2 + } + + /** + * Returns bubble bar Y target position according to [isBubblesShowingOnHome] value. Value could + * be adjusted to the display override progress. + */ + override val bubbleBarTranslationY: Float + get() = + if (inAppDisplayOverrideProgress > 0f && launcherState == BubbleLauncherState.HOME) { + Utilities.mapToRange( + inAppDisplayOverrideProgress, + /* fromMin = */ 0f, + /* fromMax = */ 1f, + bubbleBarTranslationYForHotseat, + bubbleBarTranslationYForTaskbar, + Interpolators.LINEAR, + ) + } else { + targetTranslationYForState + } + + override var inAppDisplayOverrideProgress: Float = 0f + set(value) { + if (field == value) return + field = value + if (launcherState == BubbleLauncherState.HOME) { + if (bubbleBarTranslationYAnimator.isAnimating) { + bubbleBarTranslationYAnimator.cancelAnimation() + } + bubbleBarTranslationYAnimator.updateValue(bubbleBarTranslationY) + if (value == 0f || value == 1f) { + // Update insets only when we reach the end values + taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + } + } + + override fun init( + taskbarInsetsController: TaskbarInsetsController, + bubbleBarViewController: BubbleBarViewController, + bubbleStashedHandleViewController: BubbleStashedHandleViewController?, + controllersAfterInitAction: ControllersAfterInitAction, + ) { + this.taskbarInsetsController = taskbarInsetsController + this.bubbleBarViewController = bubbleBarViewController + this.controllersAfterInitAction = controllersAfterInitAction + bubbleBarTranslationYAnimator = bubbleBarViewController.bubbleBarTranslationY + // bubble bar has only alpha property, getting it at index 0 + bubbleBarAlphaAnimator = bubbleBarViewController.bubbleBarAlpha.get(/* index= */ 0) + bubbleBarScaleAnimator = bubbleBarViewController.bubbleBarScaleY + } + + private fun animateAfterUnlock() { + val animatorSet = AnimatorSet() + if (isBubblesShowingOnHome || isBubblesShowingOnOverview) { + animatorSet.playTogether( + bubbleBarScaleAnimator.animateToValue(1f), + bubbleBarTranslationYAnimator.animateToValue(bubbleBarTranslationY), + bubbleBarAlphaAnimator.animateToValue(1f), + ) + } + updateTouchRegionOnAnimationEnd(animatorSet) + animatorSet.setDuration(BAR_STASH_DURATION).start() + } + + override fun showBubbleBarImmediate() = showBubbleBarImmediate(bubbleBarTranslationY) + + override fun showBubbleBarImmediate(bubbleBarTranslationY: Float) { + isStashed = false + bubbleBarTranslationYAnimator.updateValue(bubbleBarTranslationY) + bubbleBarAlphaAnimator.setValue(1f) + bubbleBarScaleAnimator.updateValue(1f) + } + + override fun setStashedInPersistentTaskBar(stashed: Boolean) { + // if instructed to stash in persistent taskbar, - allow all stash operations + allowStashing = stashed + isStashed = stashed + val targetTranslationY = + if (stashed) stashedBubbleBarTranslationY else bubbleBarTranslationY + animateBubbleBarY(targetTranslationY) + } + + override fun setBubbleBarLocation(bubbleBarLocation: BubbleBarLocation) { + // When the bubble bar is shown for the persistent task bar, there is no handle view, so no + // operation is performed. + } + + override fun stashBubbleBar() { + // only stash persistent bubble bar if it is allowed to be stashed + if (allowStashing) { + isStashed = true + animateBubbleBarY(stashedBubbleBarTranslationY) + } + updateExpandedState(expand = false) + } + + override fun showBubbleBar(expandBubbles: Boolean, bubbleBarGesture: Boolean) { + isStashed = false + animateBubbleBarY() + updateExpandedState(expand = expandBubbles, bubbleBarGesture = bubbleBarGesture) + } + + override fun stashBubbleBarImmediate() { + // only stash persistent bubble bar if it is allowed to be stashed + if (allowStashing) { + isStashed = true + bubbleBarTranslationYAnimator.updateValue(stashedBubbleBarTranslationY) + } + updateExpandedState(expand = false) + } + + /** If bubble bar is visible return bubble bar height, 0 otherwise */ + override fun getTouchableHeight() = + if (isBubbleBarVisible()) { + bubbleBarViewController.bubbleBarCollapsedHeight.toInt() + } else { + 0 + } + + override fun isBubbleBarVisible(): Boolean = bubbleBarViewController.hasBubbles() + + override fun onNewBubbleAnimationInterrupted(isStashed: Boolean, bubbleBarTranslationY: Float) { + showBubbleBarImmediate(bubbleBarTranslationY) + } + + override fun isEventOverBubbleBarViews(ev: MotionEvent): Boolean = + bubbleBarViewController.isEventOverAnyItem(ev) + + override fun getDiffBetweenHandleAndBarCenters(): Float { + // distance from the bottom of the screen and the bubble bar center. + return -bubbleBarViewController.bubbleBarCollapsedHeight / 2f + } + + /** When the bubble bar is shown for the persistent task bar, there is no handle view. */ + override fun getStashedHandleTranslationForNewBubbleAnimation(): Float = 0f + + /** When the bubble bar is shown for the persistent task bar, there is no handle view. */ + override fun getStashedHandlePhysicsAnimator(): PhysicsAnimator? = null + + override fun updateTaskbarTouchRegion() { + taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + /** + * When the bubble bar is shown for the persistent task bar the bar does not stash, so no + * operation is performed + */ + override fun setHandleTranslationY(translationY: Float) { + // no op since does not have a handle view + } + + override fun getHandleTranslationY(): Float? = null + + override fun getHandleBounds(bounds: Rect) { + // no op since does not have a handle view + } + + private fun updateExpandedState(expand: Boolean, bubbleBarGesture: Boolean = false) { + if (bubbleBarViewController.isHiddenForNoBubbles) { + // If there are no bubbles the bar is invisible, nothing to do here. + return + } + if (bubbleBarViewController.isExpanded != expand) { + val maybeShowEdu = expand && bubbleBarGesture + bubbleBarViewController.animateExpanded(expand, maybeShowEdu) + } + } + + /** + * Animates bubble bar Y to provided [translationY], by default accordingly to the showing mode. + */ + private fun animateBubbleBarY(translationY: Float = bubbleBarTranslationY) { + val animator = bubbleBarViewController.bubbleBarTranslationY.animateToValue(translationY) + updateTouchRegionOnAnimationEnd(animator) + animator.setDuration(BAR_TRANSLATION_DURATION) + animator.start() + } + + private fun updateTouchRegionOnAnimationEnd(animator: Animator) { + animator.addListener( + object : AnimatorListenerAdapter() { + + override fun onAnimationEnd(animation: Animator) { + controllersAfterInitAction.runAfterInit { + taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + } + } + ) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/TransientBubbleStashController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/TransientBubbleStashController.kt new file mode 100644 index 00000000000..00e79029e2d --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/TransientBubbleStashController.kt @@ -0,0 +1,684 @@ +/* + * 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.launcher3.taskbar.bubbles.stashing + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Rect +import android.view.MotionEvent +import android.view.View +import androidx.annotation.VisibleForTesting +import androidx.core.animation.doOnEnd +import androidx.core.animation.doOnStart +import androidx.dynamicanimation.animation.SpringForce +import com.android.app.animation.Interpolators.EMPHASIZED +import com.android.app.animation.Interpolators.LINEAR +import com.android.launcher3.R +import com.android.launcher3.anim.AnimatedFloat +import com.android.launcher3.anim.SpringAnimationBuilder +import com.android.launcher3.taskbar.BarsLocationAnimatorHelper.FADE_IN_ANIM_ALPHA_DURATION_MS +import com.android.launcher3.taskbar.BarsLocationAnimatorHelper.FADE_OUT_ANIM_ALPHA_DELAY_MS +import com.android.launcher3.taskbar.BarsLocationAnimatorHelper.FADE_OUT_ANIM_ALPHA_DURATION_MS +import com.android.launcher3.taskbar.BarsLocationAnimatorHelper.FADE_OUT_ANIM_POSITION_DURATION_MS +import com.android.launcher3.taskbar.BarsLocationAnimatorHelper.inShiftX +import com.android.launcher3.taskbar.BarsLocationAnimatorHelper.outShift +import com.android.launcher3.taskbar.TaskbarInsetsController +import com.android.launcher3.taskbar.TaskbarStashController.TASKBAR_STASH_ALPHA_START_DELAY +import com.android.launcher3.taskbar.TaskbarStashController.TRANSIENT_TASKBAR_STASH_ALPHA_DURATION +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController +import com.android.launcher3.taskbar.bubbles.BubbleStashedHandleViewController +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.BubbleLauncherState +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.Companion.BAR_STASH_DURATION +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.Companion.BAR_TRANSLATION_DURATION +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.ControllersAfterInitAction +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.TaskbarHotseatDimensionsProvider +import com.android.launcher3.util.MultiPropertyFactory +import com.android.wm.shell.shared.animation.PhysicsAnimator +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import com.android.wm.shell.shared.bubbles.ContextUtils.isRtl +import kotlin.math.max + +class TransientBubbleStashController( + private val taskbarHotseatDimensionsProvider: TaskbarHotseatDimensionsProvider, + private val context: Context, +) : BubbleStashController { + + private lateinit var bubbleBarViewController: BubbleBarViewController + private lateinit var taskbarInsetsController: TaskbarInsetsController + private lateinit var controllersAfterInitAction: ControllersAfterInitAction + + // stash view properties + private var bubbleStashedHandleViewController: BubbleStashedHandleViewController? = null + private var stashHandleViewAlpha: MultiPropertyFactory.MultiProperty? = null + private var translationYDuringStash = AnimatedFloat { transY -> + bubbleStashedHandleViewController?.setTranslationYForStash(transY) + bubbleBarViewController.setTranslationYForStash(transY) + } + private val stashHandleStashVelocity = + context.resources.getDimension(R.dimen.bubblebar_stashed_handle_spring_velocity_dp_per_s) + private var stashedHeight: Int = 0 + + // bubble bar properties + private lateinit var bubbleBarAlpha: MultiPropertyFactory.MultiProperty + private lateinit var bubbleBarBubbleAlpha: AnimatedFloat + private lateinit var bubbleBarBackgroundAlpha: AnimatedFloat + private lateinit var bubbleBarTranslationYAnimator: AnimatedFloat + private lateinit var bubbleBarBubbleTranslationY: AnimatedFloat + private lateinit var bubbleBarBackgroundScaleX: AnimatedFloat + private lateinit var bubbleBarBackgroundScaleY: AnimatedFloat + private val handleCenterFromScreenBottom = + context.resources.getDimensionPixelSize(R.dimen.bubblebar_stashed_size) / 2f + + private var animator: AnimatorSet? = null + override var bubbleBarVerticalCenterForHome: Int = 0 + + override var isStashed: Boolean = false + @VisibleForTesting set + + override var launcherState: BubbleLauncherState = BubbleLauncherState.IN_APP + set(state) { + if (field == state) return + field = state + val hasBubbles = bubbleBarViewController.hasBubbles() + bubbleBarViewController.onBubbleBarConfigurationChanged(hasBubbles) + if (!hasBubbles) { + // if there are no bubbles, there's no need to update the bubble bar, just keep the + // isStashed state up to date so that we can process state changes when bubbles are + // created. + isStashed = launcherState == BubbleLauncherState.IN_APP + return + } + if (field == BubbleLauncherState.HOME) { + // When to home we need to animate the bubble bar + // here to align with hotseat center. + animateBubbleBarYToHotseat() + } else if (field == BubbleLauncherState.OVERVIEW) { + // When transitioning to overview we need to animate the bubble bar to align with + // the taskbar bottom. + animateBubbleBarYToTaskbar() + } + // Only stash if we're in an app, otherwise we're in home or overview where we should + // be un-stashed + val stash = field == BubbleLauncherState.IN_APP + val expand = + if (stash) { + // Always collapse when we are stashing + false + } else { + // If unstashing, keep the current state + bubbleBarViewController.isExpanded + } + updateStashedAndExpandedState(stash, expand) + } + + override var isSysuiLocked: Boolean = false + set(isLocked) { + if (field == isLocked) return + field = isLocked + if (!isLocked && bubbleBarViewController.hasBubbles()) { + animateAfterUnlock() + } + } + + override val isTransientTaskBar: Boolean = true + + override val bubbleBarTranslationYForHotseat: Float + get() { + val bubbleBarHeight = bubbleBarViewController.bubbleBarCollapsedHeight + return -bubbleBarVerticalCenterForHome + bubbleBarHeight / 2 + } + + override val bubbleBarTranslationYForTaskbar: Float = + -taskbarHotseatDimensionsProvider.getTaskbarBottomSpace().toFloat() + + /** Not supported in transient mode */ + override var inAppDisplayOverrideProgress: Float = 0f + + /** Check if we have handle view controller */ + override val hasHandleView: Boolean + get() = bubbleStashedHandleViewController != null + + override fun init( + taskbarInsetsController: TaskbarInsetsController, + bubbleBarViewController: BubbleBarViewController, + bubbleStashedHandleViewController: BubbleStashedHandleViewController?, + controllersAfterInitAction: ControllersAfterInitAction, + ) { + this.taskbarInsetsController = taskbarInsetsController + this.bubbleBarViewController = bubbleBarViewController + this.bubbleStashedHandleViewController = bubbleStashedHandleViewController + this.controllersAfterInitAction = controllersAfterInitAction + bubbleBarTranslationYAnimator = bubbleBarViewController.bubbleBarTranslationY + bubbleBarBubbleTranslationY = bubbleBarViewController.bubbleOffsetY + // bubble bar has only alpha property, getting it at index 0 + bubbleBarAlpha = bubbleBarViewController.bubbleBarAlpha.get(/* index= */ 0) + bubbleBarBubbleAlpha = bubbleBarViewController.bubbleBarBubbleAlpha + bubbleBarBackgroundAlpha = bubbleBarViewController.bubbleBarBackgroundAlpha + bubbleBarBackgroundScaleX = bubbleBarViewController.bubbleBarBackgroundScaleX + bubbleBarBackgroundScaleY = bubbleBarViewController.bubbleBarBackgroundScaleY + stashedHeight = bubbleStashedHandleViewController?.stashedHeight ?: 0 + stashHandleViewAlpha = bubbleStashedHandleViewController?.stashedHandleAlpha?.get(0) + } + + private fun animateAfterUnlock() { + val animatorSet = AnimatorSet() + if (isBubblesShowingOnHome || isBubblesShowingOnOverview) { + isStashed = false + animatorSet.playTogether( + bubbleBarBackgroundScaleX.animateToValue(1f), + bubbleBarBackgroundScaleY.animateToValue(1f), + bubbleBarTranslationYAnimator.animateToValue(bubbleBarTranslationY), + bubbleBarAlpha.animateToValue(1f), + bubbleBarBubbleAlpha.animateToValue(1f), + bubbleBarBackgroundAlpha.animateToValue(1f), + ) + } else { + isStashed = true + stashHandleViewAlpha?.let { animatorSet.playTogether(it.animateToValue(1f)) } + } + animatorSet + .updateBarVisibility(isStashed) + .updateTouchRegionOnAnimationEnd() + .setDuration(BAR_STASH_DURATION) + .start() + } + + override fun showBubbleBarImmediate() { + showBubbleBarImmediate(bubbleBarTranslationY) + } + + override fun showBubbleBarImmediate(bubbleBarTranslationY: Float) { + showBubbleBarImmediateVisually(bubbleBarTranslationY) + onIsStashedChanged() + } + + private fun showBubbleBarImmediateVisually(bubbleBarTranslationY: Float) { + bubbleStashedHandleViewController?.setTranslationYForSwipe(0f) + stashHandleViewAlpha?.value = 0f + this.bubbleBarTranslationYAnimator.updateValue(bubbleBarTranslationY) + bubbleBarAlpha.setValue(1f) + bubbleBarBubbleAlpha.updateValue(1f) + bubbleBarBackgroundAlpha.updateValue(1f) + bubbleBarBackgroundScaleX.updateValue(1f) + bubbleBarBackgroundScaleY.updateValue(1f) + isStashed = false + bubbleBarViewController.setHiddenForStashed(false) + } + + override fun stashBubbleBarImmediate() { + stashBubbleBarImmediateVisually() + onIsStashedChanged() + } + + private fun stashBubbleBarImmediateVisually() { + bubbleStashedHandleViewController?.setTranslationYForSwipe(0f) + stashHandleViewAlpha?.value = 1f + this.bubbleBarTranslationYAnimator.updateValue(getStashTranslation()) + bubbleBarAlpha.setValue(0f) + // Reset bubble and background alpha to 1 and only keep the bubble bar alpha at 0 + bubbleBarBubbleAlpha.updateValue(1f) + bubbleBarBackgroundAlpha.updateValue(1f) + bubbleBarBackgroundScaleX.updateValue(getStashScaleX()) + bubbleBarBackgroundScaleY.updateValue(getStashScaleY()) + isStashed = true + bubbleBarViewController.setHiddenForStashed(true) + } + + override fun getTouchableHeight(): Int = + when { + isStashed -> stashedHeight + isBubbleBarVisible() -> bubbleBarViewController.bubbleBarCollapsedHeight.toInt() + else -> 0 + } + + override fun isBubbleBarVisible(): Boolean = bubbleBarViewController.hasBubbles() && !isStashed + + override fun onNewBubbleAnimationInterrupted(isStashed: Boolean, bubbleBarTranslationY: Float) { + if (isStashed) { + stashBubbleBarImmediate() + } else { + showBubbleBarImmediate(bubbleBarTranslationY) + } + } + + /** Check if [ev] belongs to the stash handle or the bubble bar views. */ + override fun isEventOverBubbleBarViews(ev: MotionEvent): Boolean { + val isOverHandle = bubbleStashedHandleViewController?.isEventOverHandle(ev) ?: false + return isOverHandle || bubbleBarViewController.isEventOverAnyItem(ev) + } + + /** Set the bubble bar stash handle location . */ + override fun setBubbleBarLocation(bubbleBarLocation: BubbleBarLocation) { + bubbleStashedHandleViewController?.setBubbleBarLocation(bubbleBarLocation) + } + + override fun stashBubbleBar() { + updateStashedAndExpandedState(stash = true, expand = false) + } + + override fun stashBubbleBarToLocation( + fromLocation: BubbleBarLocation, + toLocation: BubbleBarLocation, + ) { + if (fromLocation.isSameSideWith(toLocation)) { + updateStashedAndExpandedState( + stash = true, + expand = false, + updateTouchRegionOnEnd = false, + ) + return + } + cancelAnimation() + animator = + AnimatorSet().apply { + playSequentially( + bubbleBarViewController.animateBubbleBarLocationOut(toLocation), + createHandleInAnimator(location = toLocation), + ) + start() + } + } + + override fun showBubbleBar(expandBubbles: Boolean, bubbleBarGesture: Boolean) { + updateStashedAndExpandedState( + stash = false, + expand = expandBubbles, + bubbleBarGesture = bubbleBarGesture, + ) + } + + override fun showBubbleBarAtLocation( + fromLocation: BubbleBarLocation, + toLocation: BubbleBarLocation, + ) { + if (fromLocation.isSameSideWith(toLocation)) { + updateStashedAndExpandedState( + stash = false, + expand = false, + updateTouchRegionOnEnd = false, + ) + return + } + cancelAnimation() + val bubbleBarInAnimation = + bubbleBarViewController.animateBubbleBarLocationIn(fromLocation, toLocation).apply { + doOnStart { showBubbleBarImmediateVisually(bubbleBarTranslationY) } + } + animator = + AnimatorSet().apply { + playSequentially( + createHandleOutAnimator(location = toLocation), + bubbleBarInAnimation, + ) + start() + } + } + + override fun getDiffBetweenHandleAndBarCenters(): Float { + // the difference between the centers of the handle and the bubble bar is the difference + // between their distance from the bottom of the screen. + val barCenter: Float = bubbleBarViewController.bubbleBarCollapsedHeight / 2f + return handleCenterFromScreenBottom - barCenter + } + + override fun getStashedHandleTranslationForNewBubbleAnimation(): Float { + return -handleCenterFromScreenBottom + } + + override fun getStashedHandlePhysicsAnimator(): PhysicsAnimator? { + return bubbleStashedHandleViewController?.physicsAnimator + } + + override fun updateTaskbarTouchRegion() { + taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + override fun setHandleTranslationY(translationY: Float) { + bubbleStashedHandleViewController?.setTranslationYForSwipe(translationY) + } + + override fun getHandleTranslationY(): Float? = bubbleStashedHandleViewController?.translationY + + override fun getHandleBounds(bounds: Rect) { + bubbleStashedHandleViewController?.getBounds(bounds) + } + + private fun getStashTranslation(): Float { + return (bubbleBarTranslationY - stashedHeight) / 2f + } + + @VisibleForTesting + fun getStashScaleX(): Float { + val handleWidth = bubbleStashedHandleViewController?.stashedWidth ?: 0 + return handleWidth / bubbleBarViewController.bubbleBarCollapsedWidth + } + + @VisibleForTesting + fun getStashScaleY(): Float { + val handleHeight = bubbleStashedHandleViewController?.stashedHeight ?: 0 + return handleHeight / bubbleBarViewController.bubbleBarCollapsedHeight + } + + /** + * Create a stash animation. + * + * @param isStashed whether it's a stash animation or an unstash animation + * @param duration duration of the animation + * @return the animation + */ + @Suppress("SameParameterValue") + private fun createStashAnimator(isStashed: Boolean, duration: Long): AnimatorSet { + val animatorSet = AnimatorSet() + + animatorSet.play( + createBackgroundAlphaAnimator(isStashed).apply { + val alphaDuration = + if (isStashed) duration else TRANSIENT_TASKBAR_STASH_ALPHA_DURATION + val alphaDelay = if (isStashed) TASKBAR_STASH_ALPHA_START_DELAY else 0L + this.duration = max(0L, alphaDuration - alphaDelay) + this.startDelay = alphaDelay + this.interpolator = LINEAR + } + ) + + animatorSet.play( + bubbleBarBubbleAlpha + .animateToValue(getBarAlphaStart(isStashed), getBarAlphaEnd(isStashed)) + .apply { + this.duration = TRANSIENT_TASKBAR_STASH_ALPHA_DURATION + this.startDelay = TASKBAR_STASH_ALPHA_START_DELAY + this.interpolator = LINEAR + } + ) + + animatorSet.play( + createSpringOnStashAnimator(isStashed).apply { + this.duration = duration + this.interpolator = LINEAR + } + ) + + animatorSet.play( + bubbleBarViewController.createRevealAnimatorForStashChange(isStashed).apply { + this.duration = duration + this.interpolator = EMPHASIZED + } + ) + + // Animate bubble translation to keep reveal animation in the bounds of the bar + val bubbleTyStart = if (isStashed) 0f else -bubbleBarTranslationY + val bubbleTyEnd = if (isStashed) -bubbleBarTranslationY else 0f + animatorSet.play( + bubbleBarBubbleTranslationY.animateToValue(bubbleTyStart, bubbleTyEnd).apply { + this.duration = duration + this.interpolator = EMPHASIZED + } + ) + + animatorSet.play( + bubbleStashedHandleViewController?.createRevealAnimToIsStashed(isStashed)?.apply { + this.duration = duration + this.interpolator = EMPHASIZED + } + ) + + val pivotX = if (bubbleBarViewController.isBubbleBarOnLeft) 0f else 1f + animatorSet.play( + createScaleAnimator(isStashed).apply { + this.duration = duration + this.interpolator = EMPHASIZED + this.setBubbleBarPivotDuringAnim(pivotX, 1f) + } + ) + + val translationYTarget = if (isStashed) getStashTranslation() else bubbleBarTranslationY + animatorSet.play( + bubbleBarTranslationYAnimator.animateToValue(translationYTarget).apply { + this.duration = duration + this.interpolator = EMPHASIZED + } + ) + + animatorSet.doOnStart { + // Update the start value for bubble view and background alpha when the entire animation + // begins. + // Alpha animation has a delay, and if we set the initial values at the start of the + // alpha animation, it will cause flickers. + bubbleBarBubbleAlpha.updateValue(getBarAlphaStart(isStashed)) + bubbleBarBackgroundAlpha.updateValue(getBarAlphaStart(isStashed)) + // We animate alpha for background and bubble views separately. Make sure the container + // is always visible. + bubbleBarAlpha.value = 1f + } + animatorSet.doOnEnd { + cancelAnimation() + controllersAfterInitAction.runAfterInit { + if (isStashed) { + bubbleBarAlpha.value = 0f + // reset bubble view alpha + bubbleBarBubbleAlpha.updateValue(1f) + bubbleBarBackgroundAlpha.updateValue(1f) + // reset stash translation + translationYDuringStash.updateValue(0f) + bubbleBarBubbleTranslationY.updateValue(0f) + bubbleBarViewController.animateExpanded(false) + } + taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + } + return animatorSet + } + + private fun createBackgroundAlphaAnimator(isStashed: Boolean): AnimatorSet { + return AnimatorSet().apply { + play( + bubbleBarBackgroundAlpha.animateToValue( + getBarAlphaStart(isStashed), + getBarAlphaEnd(isStashed), + ) + ) + play(stashHandleViewAlpha?.animateToValue(getHandleAlphaEnd(isStashed))) + } + } + + private fun getBarAlphaStart(isStashed: Boolean): Float { + return if (isStashed) 1f else 0f + } + + private fun getBarAlphaEnd(isStashed: Boolean): Float { + return if (isStashed) 0f else 1f + } + + private fun getHandleAlphaEnd(isStashed: Boolean): Float { + return if (isStashed) 1f else 0f + } + + private fun createSpringOnStashAnimator(isStashed: Boolean): Animator { + if (!isStashed) { + // Animate the stash translation back to 0 + return translationYDuringStash.animateToValue(0f) + } + // Apply a spring to the handle + return SpringAnimationBuilder(context) + .setStartValue(translationYDuringStash.value) + .setEndValue(0f) + .setDampingRatio(SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY) + .setStiffness(SpringForce.STIFFNESS_LOW) + .setStartVelocity(stashHandleStashVelocity) + .build(translationYDuringStash, AnimatedFloat.VALUE) + } + + private fun createScaleAnimator(isStashed: Boolean): AnimatorSet { + val scaleXTarget = if (isStashed) getStashScaleX() else 1f + val scaleYTarget = if (isStashed) getStashScaleY() else 1f + return AnimatorSet().apply { + play(bubbleBarBackgroundScaleX.animateToValue(scaleXTarget)) + play(bubbleBarBackgroundScaleY.animateToValue(scaleYTarget)) + } + } + + private fun onIsStashedChanged() { + controllersAfterInitAction.runAfterInit { + taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + bubbleStashedHandleViewController?.onIsStashedChanged() + } + } + + private fun animateBubbleBarYToHotseat() { + translateBubbleBarYUpdateTouchRegionOnCompletion(bubbleBarTranslationYForHotseat) + } + + private fun animateBubbleBarYToTaskbar() { + translateBubbleBarYUpdateTouchRegionOnCompletion(bubbleBarTranslationYForTaskbar) + } + + private fun translateBubbleBarYUpdateTouchRegionOnCompletion(toY: Float) { + bubbleBarViewController.bubbleBarTranslationY + .animateToValue(toY) + .updateTouchRegionOnAnimationEnd() + .setDuration(BAR_TRANSLATION_DURATION) + .start() + } + + @VisibleForTesting + fun updateStashedAndExpandedState( + stash: Boolean, + expand: Boolean, + bubbleBarGesture: Boolean = false, + updateTouchRegionOnEnd: Boolean = true, + ) { + if (bubbleBarViewController.isHiddenForNoBubbles) { + // If there are no bubbles the bar and handle are invisible, nothing to do here. + cancelAnimation() + return + } + val isStashed = stash && !isBubblesShowingOnHome && !isBubblesShowingOnOverview + if (this.isStashed != isStashed) { + this.isStashed = isStashed + + // notify the view controller that the stash state is about to change so that it can + // cancel an ongoing animation if there is one. + bubbleBarViewController.onStashStateChanging() + cancelAnimation() + animator = + createStashAnimator(isStashed, BAR_STASH_DURATION).apply { + updateBarVisibility(isStashed) + if (updateTouchRegionOnEnd) { + updateTouchRegionOnAnimationEnd() + } + start() + } + } + if (bubbleBarViewController.isExpanded != expand) { + val maybeShowEdu = expand && bubbleBarGesture + bubbleBarViewController.animateExpanded(expand, maybeShowEdu) + } + } + + private fun cancelAnimation() { + animator?.cancel() + animator = null + } + + override fun getHandleViewAlpha(): MultiPropertyFactory.MultiProperty? = + // only return handle alpha if the bubble bar is stashed and has bubbles + if (isStashed && bubbleBarViewController.hasBubbles()) { + stashHandleViewAlpha + } else { + null + } + + private fun Animator.updateTouchRegionOnAnimationEnd(): Animator { + doOnEnd { onIsStashedChanged() } + return this + } + + private fun T.updateBarVisibility(stashed: Boolean): T { + if (stashed) { + doOnEnd { bubbleBarViewController.setHiddenForStashed(true) } + } else { + doOnStart { bubbleBarViewController.setHiddenForStashed(false) } + } + return this + } + + // TODO(b/399678274) add tests + private fun createHandleInAnimator(location: BubbleBarLocation): Animator? { + val stashHandleViewController = bubbleStashedHandleViewController ?: return null + val handleAlpha = stashHandleViewController.stashedHandleAlpha.get(0) + val shift = context.inShiftX + val startX = if (location.isOnLeft(context.isRtl)) shift else -shift + val handleTranslationX = + ValueAnimator.ofFloat(startX, 0f).apply { + addUpdateListener { v -> + stashHandleViewController.setTranslationX(v.animatedValue as Float) + } + duration = FADE_IN_ANIM_ALPHA_DURATION_MS + } + val handleAlphaAnimation = + handleAlpha.animateToValue(1f).apply { duration = FADE_IN_ANIM_ALPHA_DURATION_MS } + return AnimatorSet().apply { + playTogether(handleTranslationX, handleAlphaAnimation) + doOnStart { stashBubbleBarImmediateVisually() } + } + } + + private fun createHandleOutAnimator(location: BubbleBarLocation): Animator? { + val stashHandleViewController = bubbleStashedHandleViewController ?: return null + val handleAlpha = stashHandleViewController.stashedHandleAlpha.get(0) + val shift = context.outShift + val endX = if (location.isOnLeft(context.isRtl)) -shift else shift + val handleTranslationX = + ValueAnimator.ofFloat(0f, endX).apply { + addUpdateListener { v -> + stashHandleViewController.setTranslationX(v.animatedValue as Float) + } + duration = FADE_OUT_ANIM_POSITION_DURATION_MS + // in case item dropped to the opposite side - need to clear translation + doOnEnd { stashHandleViewController.setTranslationX(0f) } + } + val handleAlphaAnimation = + handleAlpha.animateToValue(0f).apply { + duration = FADE_OUT_ANIM_ALPHA_DURATION_MS + startDelay = FADE_OUT_ANIM_ALPHA_DELAY_MS + } + return AnimatorSet().apply { playTogether(handleTranslationX, handleAlphaAnimation) } + } + + private fun Animator.setBubbleBarPivotDuringAnim(pivotX: Float, pivotY: Float): Animator { + var initialPivotX = Float.NaN + var initialPivotY = Float.NaN + doOnStart { + initialPivotX = bubbleBarViewController.bubbleBarRelativePivotX + initialPivotY = bubbleBarViewController.bubbleBarRelativePivotY + bubbleBarViewController.setBubbleBarRelativePivot(pivotX, pivotY) + } + doOnEnd { + if (!initialPivotX.isNaN() && !initialPivotY.isNaN()) { + bubbleBarViewController.setBubbleBarRelativePivot(initialPivotX, initialPivotY) + } + } + return this + } + + private fun BubbleBarLocation.isSameSideWith(anotherLocation: BubbleBarLocation): Boolean { + val isRtl = context.isRtl + return this.isOnLeft(isRtl) == anotherLocation.isOnLeft(isRtl) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/CustomizableTaskbarView.kt b/quickstep/src/com/android/launcher3/taskbar/customization/CustomizableTaskbarView.kt new file mode 100644 index 00000000000..e384586b45c --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/customization/CustomizableTaskbarView.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.launcher3.taskbar.customization + +import android.content.Context +import android.graphics.Rect +import android.util.AttributeSet +import androidx.constraintlayout.widget.ConstraintLayout +import com.android.launcher3.Insettable +import com.android.launcher3.R +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.views.ActivityContext + +/** TaskbarView that is customizeable via Taskbar containers. */ +class CustomizableTaskbarView(context: Context, attrs: AttributeSet? = null) : + ConstraintLayout(context, attrs), Insettable { + private val activityContext: TaskbarActivityContext = ActivityContext.lookupContext(context) + + init { + inflate(context, R.layout.customizable_taskbar_view, this) + } + + override fun setInsets(insets: Rect?) { + // Ignore, we just implement Insettable to draw behind system insets. + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt new file mode 100644 index 00000000000..28076681073 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar.customization + +import android.annotation.SuppressLint +import android.content.Context +import android.content.res.ColorStateList +import android.graphics.Color.TRANSPARENT +import android.util.AttributeSet +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import androidx.annotation.DimenRes +import androidx.annotation.DrawableRes +import androidx.core.view.setPadding +import com.android.launcher3.R +import com.android.launcher3.Utilities.dpToPx +import com.android.launcher3.config.FeatureFlags.enableTaskbarPinning +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarViewCallbacks +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.views.ActivityContext +import com.android.launcher3.views.IconButtonView +import com.android.quickstep.DeviceConfigWrapper +import com.android.quickstep.util.ContextualSearchStateManager +import com.android.wm.shell.Flags + +/** Taskbar all apps button container for customizable taskbar. */ +class TaskbarAllAppsButtonContainer +@JvmOverloads +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + IconButtonView(context, attrs), TaskbarContainer { + + private val activityContext: TaskbarActivityContext = ActivityContext.lookupContext(context) + private var allAppsTouchTriggered = false + private var allAppsTouchRunnable: Runnable? = null + private var allAppsButtonTouchDelayMs: Long = ViewConfiguration.getLongPressTimeout().toLong() + private var isTaskbarInMinimalState = false + private lateinit var taskbarViewCallbacks: TaskbarViewCallbacks + + override val spaceNeeded: Int + get() { + return dpToPx( + activityContext.taskbarSpecsEvaluator.taskbarIconSize.size.toFloat(), + activityContext, + ) + } + + init { + contentDescription = context.getString(R.string.all_apps_button_label) + setUpIcon() + } + + @SuppressLint("UseCompatLoadingForDrawables", "ResourceAsColor") + private fun setUpIcon() { + val drawable = + resources.getDrawable( + getAllAppsButton(activityContext.taskbarFeatureEvaluator.isTransient) + ) + backgroundTintList = ColorStateList.valueOf(TRANSPARENT) + setIconDrawable(drawable) + if (!activityContext.isTransientTaskbar) { + setPadding( + dpToPx( + (activityContext.taskbarSpecsEvaluator.taskbarIconPadding).toFloat(), + activityContext, + ) + ) + } + setForegroundTint(activityContext.getColor(R.color.all_apps_button_color)) + } + + @SuppressLint("ClickableViewAccessibility") + fun setUpCallbacks(callbacks: TaskbarViewCallbacks) { + taskbarViewCallbacks = callbacks + setOnClickListener(this::onAllAppsButtonClick) + setOnLongClickListener(this::onAllAppsButtonLongClick) + setOnTouchListener(this::onAllAppsButtonTouch) + isHapticFeedbackEnabled = + taskbarViewCallbacks.isAllAppsButtonHapticFeedbackEnabled(mContext) + allAppsTouchRunnable = Runnable { + taskbarViewCallbacks.triggerAllAppsButtonLongClick() + allAppsTouchTriggered = true + } + val contextualSearchStateManager = ContextualSearchStateManager.INSTANCE[mContext] + if ( + DeviceConfigWrapper.get().customLpaaThresholds && + contextualSearchStateManager.lpnhDurationMillis.isPresent + ) { + allAppsButtonTouchDelayMs = contextualSearchStateManager.lpnhDurationMillis.get() + } + } + + @DrawableRes + private fun getAllAppsButton(isTransientTaskbar: Boolean): Int { + if (Flags.enableGsf()) { + return getAllAppsButtonForExpressiveTheme() + } + val shouldSelectTransientIcon = + isTransientTaskbar || + (enableTaskbarPinning() && + activityContext.taskbarFeatureEvaluator.supportsTransitionToTransientTaskbar) + return if (shouldSelectTransientIcon) R.drawable.ic_transient_taskbar_all_apps_search_button + else R.drawable.ic_taskbar_all_apps_search_button + } + + @DrawableRes + private fun getAllAppsButtonForExpressiveTheme(): Int { + return if (isTaskbarInMinimalState) { + R.drawable.ic_taskbar_minimal_state_all_apps_search_button_expressive_theme + } else { + R.drawable.ic_taskbar_all_apps_search_button_expressive_theme + } + } + + @DimenRes + fun getAllAppsButtonTranslationXOffset(isTransientTaskbar: Boolean): Int { + if (Flags.enableGsf()) { + return R.dimen.taskbar_all_apps_search_button_translation_x_offset_for_expressive_theme + } + return if (isTransientTaskbar) { + R.dimen.transient_taskbar_all_apps_button_translation_x_offset + } else { + R.dimen.taskbar_all_apps_search_button_translation_x_offset + } + } + + /** Taskbar minimal state is that taskbar does not host anything other than all apps button. */ + fun updateTaskbarMinimalState(isInMinimalState: Boolean) { + if (isTaskbarInMinimalState != isInMinimalState) { + isTaskbarInMinimalState = isInMinimalState + setUpIcon() + } + } + + private fun onAllAppsButtonTouch(view: View, ev: MotionEvent): Boolean { + when (ev.action) { + MotionEvent.ACTION_DOWN -> { + allAppsTouchTriggered = false + MAIN_EXECUTOR.handler.postDelayed(allAppsTouchRunnable!!, allAppsButtonTouchDelayMs) + } + MotionEvent.ACTION_UP, + MotionEvent.ACTION_CANCEL -> cancelAllAppsButtonTouch() + } + return false + } + + private fun cancelAllAppsButtonTouch() { + MAIN_EXECUTOR.handler.removeCallbacks(allAppsTouchRunnable!!) + // ACTION_UP is first triggered, then click listener / long-click listener is triggered on + // the next frame, so we need to post twice and delay the reset. + this.post { this.post { allAppsTouchTriggered = false } } + } + + private fun onAllAppsButtonClick(view: View) { + if (!allAppsTouchTriggered) { + taskbarViewCallbacks.triggerAllAppsButtonClick(view) + } + } + + // Handle long click from Switch Access and Voice Access + private fun onAllAppsButtonLongClick(view: View): Boolean { + if (!MAIN_EXECUTOR.handler.hasCallbacks(allAppsTouchRunnable!!) && !allAppsTouchTriggered) { + taskbarViewCallbacks.triggerAllAppsButtonLongClick() + } + return true + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarContainer.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarContainer.kt index 3c4b63a1d7a..35ae43cd29c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarContainer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarContainer.kt @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.android.launcher3.taskbar.customization -/** Enums for all feature container that taskbar supports. */ -enum class TaskbarContainer { - ALL_APPS, - DIVIDER, - APP_ICONS, - RECENTS, - NAV_BUTTONS, - BUBBLES, +import androidx.annotation.Dimension + +/** + * Interface to be implemented by all taskbar container to expose [spaceNeeded] for each container. + */ +interface TaskbarContainer { + @get:Dimension(unit = Dimension.DP) val spaceNeeded: Int } diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarContainers.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarContainers.kt new file mode 100644 index 00000000000..d4548f5efeb --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarContainers.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.launcher3.taskbar.customization + +/** Enums for all feature container that taskbar supports. */ +enum class TaskbarContainers { + ALL_APPS, + DIVIDER, + APP_ICONS, + RECENTS, + NAV_BUTTONS, + BUBBLES, +} diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarDividerContainer.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarDividerContainer.kt new file mode 100644 index 00000000000..96dc5c84470 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarDividerContainer.kt @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar.customization + +import android.annotation.SuppressLint +import android.content.Context +import android.content.res.ColorStateList +import android.graphics.Color.TRANSPARENT +import android.graphics.drawable.Drawable +import android.util.AttributeSet +import androidx.core.view.setPadding +import com.android.launcher3.R +import com.android.launcher3.Utilities.dpToPx +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarViewCallbacks +import com.android.launcher3.views.ActivityContext +import com.android.launcher3.views.IconButtonView +import com.android.wm.shell.Flags + +/** Taskbar divider view container for customizable taskbar. */ +class TaskbarDividerContainer +@JvmOverloads +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + IconButtonView(context, attrs), TaskbarContainer { + private val activityContext: TaskbarActivityContext = ActivityContext.lookupContext(context) + + override val spaceNeeded: Int + get() { + return dpToPx( + activityContext.taskbarSpecsEvaluator.taskbarIconSize.size.toFloat(), + activityContext, + ) + } + + init { + contentDescription = context.getString(R.string.taskbar_divider_a11y_title) + setUpIcon() + } + + fun setUpIcon() { + backgroundTintList = ColorStateList.valueOf(TRANSPARENT) + val drawable = getTaskbarDividerIcon() + setIconDrawable(drawable) + if (!activityContext.isTransientTaskbar) { + setPadding( + dpToPx( + activityContext.taskbarSpecsEvaluator.taskbarIconPadding.toFloat(), + activityContext, + ) + ) + } + } + + @SuppressLint("UseCompatLoadingForDrawables") + fun getTaskbarDividerIcon(): Drawable { + return if (Flags.enableGsf()) { + resources.getDrawable(R.drawable.taskbar_divider_button_expressive_theme) + } else { + resources.getDrawable(R.drawable.taskbar_divider_button) + } + } + + @SuppressLint("ClickableViewAccessibility") + fun setUpCallbacks(callbacks: TaskbarViewCallbacks?) { + setOnLongClickListener(callbacks?.taskbarDividerLongClickListener) + setOnTouchListener(callbacks?.taskbarDividerRightClickListener) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarFeatureEvaluator.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarFeatureEvaluator.kt index 1ec075ffaad..89d8655d445 100644 --- a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarFeatureEvaluator.kt +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarFeatureEvaluator.kt @@ -16,29 +16,79 @@ package com.android.launcher3.taskbar.customization +import android.content.Context +import com.android.launcher3.Flags.enableRecentsInTaskbar +import com.android.launcher3.LauncherPrefs +import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING +import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING_IN_DESKTOP_MODE import com.android.launcher3.config.FeatureFlags.enableTaskbarPinning -import com.android.launcher3.taskbar.TaskbarActivityContext -import com.android.launcher3.taskbar.TaskbarControllers -import com.android.launcher3.taskbar.TaskbarRecentAppsController +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.util.DaggerSingletonObject import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.NavigationMode.* +import javax.inject.Inject /** Evaluates all the features taskbar can have. */ -class TaskbarFeatureEvaluator( - private val taskbarActivityContext: TaskbarActivityContext, - private val taskbarControllers: TaskbarControllers, +@LauncherAppSingleton +class TaskbarFeatureEvaluator +@Inject +constructor( + @ApplicationContext private val context: Context, + private val displayController: DisplayController, + private val desktopVisibilityController: DesktopVisibilityController, + private val launcherPrefs: LauncherPrefs, ) { - - val hasAllApps = true - val hasAppIcons = true + val primaryDisplayId = context.displayId val hasBubbles = false - val hasNavButtons = taskbarActivityContext.isThreeButtonNav - - val hasRecents: Boolean - get() = taskbarControllers.taskbarRecentAppsController.isEnabled + val hasNavButtons: Boolean + get() = displayController.info.navigationMode == THREE_BUTTONS - val hasDivider: Boolean - get() = enableTaskbarPinning() || hasRecents + val isRecentsEnabled: Boolean + get() = enableRecentsInTaskbar() val isTransient: Boolean - get() = DisplayController.isTransientTaskbar(taskbarActivityContext) + get() = + if ( + displayController.info.navigationMode != NO_BUTTON || + desktopVisibilityController.isInDesktopMode(primaryDisplayId) || + displayController.info.showDesktopTaskbarForFreeformDisplay() || + (displayController.info.showLockedTaskbarOnHome() && + displayController.info.isHomeVisible) + ) { + false + } else if (enableTaskbarPinning()) { + !isPinned + } else { + true + } + + val isPinned: Boolean + get() = + if ( + desktopVisibilityController.isInDesktopModeAndNotInOverview(primaryDisplayId) || + displayController.info.showDesktopTaskbarForFreeformDisplay() + ) { + true + } else if (desktopVisibilityController.isInDesktopMode(primaryDisplayId)) { + launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE) + } else { + launcherPrefs.get(TASKBAR_PINNING) + } + + val supportsPinningPopup: Boolean + get() = !hasNavButtons + + val isPersistent: Boolean + get() = isPinned || hasNavButtons + + val supportsTransitionToTransientTaskbar: Boolean + get() = !hasNavButtons && !DisplayController.showDesktopTaskbarForFreeformDisplay(context) + + companion object { + @JvmField + val INSTANCE = DaggerSingletonObject(LauncherAppComponent::getTaskbarFeatureEvaluator) + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarIconSpecs.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarIconSpecs.kt index 4cd895de4d3..e55cb1f50dc 100644 --- a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarIconSpecs.kt +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarIconSpecs.kt @@ -19,23 +19,35 @@ package com.android.launcher3.taskbar.customization /** Taskbar Icon Specs */ object TaskbarIconSpecs { - val iconSize40dp = TaskbarIconSize(40) - val iconSize44dp = TaskbarIconSize(44) - val iconSize48dp = TaskbarIconSize(48) - val iconSize52dp = TaskbarIconSize(52) + // Mapping of visual icon size to icon specs value http://b/235886078 + val iconSize40dp = TaskbarIconSize(44) + val iconSize44dp = TaskbarIconSize(48) + val iconSize48dp = TaskbarIconSize(52) + val iconSize52dp = TaskbarIconSize(57) val transientTaskbarIconSizes = arrayOf(iconSize44dp, iconSize48dp, iconSize52dp) val defaultPersistentIconSize = iconSize40dp val defaultTransientIconSize = iconSize44dp - // defined as row, columns + val minimumIconSize = iconSize40dp + + val defaultPersistentIconMargin = TaskbarIconMarginSize(6) + val defaultTransientIconMargin = TaskbarIconMarginSize(12) + + val minimumTaskbarIconTouchSize = TaskbarIconSize(48) + + val transientOrPinnedTaskbarIconPaddingSize = iconSize52dp + val transientTaskbarIconSizeByGridSize = mapOf( - Pair(6, 5) to iconSize52dp, - Pair(4, 5) to iconSize48dp, - Pair(5, 4) to iconSize48dp, - Pair(4, 4) to iconSize48dp, - Pair(5, 6) to iconSize44dp, + TransientTaskbarIconSizeKey(6, 5, false) to iconSize52dp, + TransientTaskbarIconSizeKey(6, 5, true) to iconSize52dp, + TransientTaskbarIconSizeKey(4, 4, false) to iconSize48dp, + TransientTaskbarIconSizeKey(4, 4, true) to iconSize52dp, + TransientTaskbarIconSizeKey(4, 5, false) to iconSize48dp, + TransientTaskbarIconSizeKey(4, 5, true) to iconSize48dp, + TransientTaskbarIconSizeKey(5, 5, false) to iconSize44dp, + TransientTaskbarIconSizeKey(5, 5, true) to iconSize44dp, ) } diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarIconsContainer.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarIconsContainer.kt new file mode 100644 index 00000000000..e6e0fc89802 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarIconsContainer.kt @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.customization + +import android.content.Context +import android.util.AttributeSet +import android.view.ViewGroup +import android.widget.FrameLayout +import com.android.launcher3.Reorderable +import com.android.launcher3.taskbar.TaskbarView.TaskbarLayoutParams +import com.android.launcher3.util.MultiTranslateDelegate + +/** This manages a group of icons within [TaskbarView]. */ +class TaskbarIconsContainer +@JvmOverloads +constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, + defStyleRes: Int = 0, +) : FrameLayout(context, attrs, defStyleAttr, defStyleRes), Reorderable, TaskbarContainer { + private var iconTouchSize = 0 + private var itemMarginLeftRight = 0 + private val translateDelegate = MultiTranslateDelegate(this) + private var reorderBounceScale = DEFAULT_BOUNCE_SCALE + + override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { + val iconTop = 0 + val iconBottom = iconTop + iconTouchSize + + val count = childCount + var iconEnd = spaceNeeded + itemMarginLeftRight + for (i in count downTo 1) { + val child = getChildAt(i - 1) + iconEnd -= itemMarginLeftRight + val iconStart = iconEnd - iconTouchSize + child.layout(iconStart, iconTop, iconEnd, iconBottom) + iconEnd = iconStart - itemMarginLeftRight + } + } + + override fun generateLayoutParams(lp: ViewGroup.LayoutParams): ViewGroup.LayoutParams = + TaskbarLayoutParams(lp) + + override fun generateLayoutParams(attrs: AttributeSet): LayoutParams = + TaskbarLayoutParams(context, attrs) + + override fun checkLayoutParams(p: ViewGroup.LayoutParams): Boolean = p is TaskbarLayoutParams + + override fun getTranslateDelegate(): MultiTranslateDelegate = translateDelegate + + override fun setReorderBounceScale(scale: Float) { + reorderBounceScale = scale + } + + override fun getReorderBounceScale(): Float = reorderBounceScale + + override val spaceNeeded: Int + get() = + if (childCount == 0) 0 + else (childCount * iconTouchSize) + ((childCount - 1) * itemMarginLeftRight * 2) + + companion object { + // effectively a no-op since we do not scale this container. + private const val DEFAULT_BOUNCE_SCALE = 1f + + /** @return a new instance of [TaskbarIconsContainer]. */ + @JvmStatic + fun create( + context: Context, + iconTouchSize: Int, + itemMarginLeftRight: Int, + ): TaskbarIconsContainer { + return TaskbarIconsContainer(context).apply { + this.iconTouchSize = iconTouchSize + this.itemMarginLeftRight = itemMarginLeftRight + // App icon views draw running state indicators outside of the icon view bounds, and + // thus outside the icons container bounds - don't clip the children so running + // state indicators remain visible. + this.clipChildren = false + } + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarSpecsEvaluator.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarSpecsEvaluator.kt index 02e5947b32b..b020ca08314 100644 --- a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarSpecsEvaluator.kt +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarSpecsEvaluator.kt @@ -16,13 +16,59 @@ package com.android.launcher3.taskbar.customization +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarPopupController + +/** The maximum number of icons that can be pinned with the taskbar overflow. */ +const val TASKBAR_OVERFLOW_PIN_LIMIT = 16 + /** Evaluates the taskbar specs based on the taskbar grid size and the taskbar icon size. */ -class TaskbarSpecsEvaluator(private val taskbarFeatureEvaluator: TaskbarFeatureEvaluator) { +class TaskbarSpecsEvaluator( + private val taskbarActivityContext: TaskbarActivityContext, + private val taskbarFeatureEvaluator: TaskbarFeatureEvaluator, + numRows: Int = taskbarActivityContext.deviceProfile.inv.numRows, + numColumns: Int = taskbarActivityContext.deviceProfile.inv.numColumns, +) { + var taskbarIconSize: TaskbarIconSize = getIconSizeByGrid(numColumns, numRows) + val numShownHotseatIcons + get() = taskbarActivityContext.deviceProfile.numShownHotseatIcons + + val maxPinnableCount + get() = + if (TaskbarPopupController.canPinAppsOverflow()) { + TASKBAR_OVERFLOW_PIN_LIMIT + } else { + numShownHotseatIcons + } + + // TODO(b/341146605) : initialize it to taskbar container in later cl. + private var taskbarContainer: List = emptyList() + + val taskbarIconPadding: Int = + if ( + TaskbarIconSpecs.transientOrPinnedTaskbarIconPaddingSize.size > taskbarIconSize.size && + taskbarFeatureEvaluator.supportsTransitionToTransientTaskbar + ) { + (TaskbarIconSpecs.iconSize52dp.size - taskbarIconSize.size) / 2 + } else { + 0 + } + + val taskbarIconMargin: TaskbarIconMarginSize = + if (taskbarFeatureEvaluator.isTransient) { + TaskbarIconSpecs.defaultTransientIconMargin + } else { + TaskbarIconSpecs.defaultPersistentIconMargin + } - fun getIconSizeByGrid(row: Int, column: Int): TaskbarIconSize { + fun getIconSizeByGrid(columns: Int, rows: Int): TaskbarIconSize { return if (taskbarFeatureEvaluator.isTransient) { TaskbarIconSpecs.transientTaskbarIconSizeByGridSize.getOrDefault( - Pair(row, column), + TransientTaskbarIconSizeKey( + columns, + rows, + taskbarActivityContext.deviceProfile.deviceProperties.isLandscape, + ), TaskbarIconSpecs.defaultTransientIconSize, ) } else { @@ -36,8 +82,11 @@ class TaskbarSpecsEvaluator(private val taskbarFeatureEvaluator: TaskbarFeatureE val currentIconSizeIndex = TaskbarIconSpecs.transientTaskbarIconSizes.indexOf(iconSize) // return the current icon size if supplied icon size is unknown or we have reached the // min icon size. - return if (currentIconSizeIndex == -1 || currentIconSizeIndex == 0) iconSize - else TaskbarIconSpecs.transientTaskbarIconSizes[currentIconSizeIndex - 1] + return if (currentIconSizeIndex == -1 || currentIconSizeIndex == 0) { + iconSize + } else { + TaskbarIconSpecs.transientTaskbarIconSizes[currentIconSizeIndex - 1] + } } fun getIconSizeStepUp(iconSize: TaskbarIconSize): TaskbarIconSize { @@ -52,9 +101,28 @@ class TaskbarSpecsEvaluator(private val taskbarFeatureEvaluator: TaskbarFeatureE ) { iconSize } else { - TaskbarIconSpecs.transientTaskbarIconSizes.get(currentIconSizeIndex + 1) + TaskbarIconSpecs.transientTaskbarIconSizes[currentIconSizeIndex + 1] } } + + // TODO(jagrutdesai) : Call this in init once the containers are ready. + private fun calculateTaskbarIconSize() { + while ( + taskbarIconSize != TaskbarIconSpecs.minimumIconSize && + taskbarActivityContext.transientTaskbarBounds.width() < + calculateSpaceNeeded(taskbarContainer) + ) { + taskbarIconSize = getIconSizeStepDown(taskbarIconSize) + } + } + + private fun calculateSpaceNeeded(containers: List): Int { + return containers.sumOf { it.spaceNeeded } + } } data class TaskbarIconSize(val size: Int) + +data class TransientTaskbarIconSizeKey(val columns: Int, val rows: Int, val isLandscape: Boolean) + +data class TaskbarIconMarginSize(val size: Int) diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/ActionPerformers.kt b/quickstep/src/com/android/launcher3/taskbar/growth/ActionPerformers.kt new file mode 100644 index 00000000000..17c950993df --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/ActionPerformers.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.growth + +import android.content.Context +import android.content.Intent +import android.net.Uri + +object ActionPerformers { + fun interface DismissCallback { + fun invoke() + } + + fun performActions(actions: List, context: Context, dismissCallback: DismissCallback) { + for (action in actions) { + performAction(action, context, dismissCallback) + } + } + + private fun performAction(action: Action, context: Context, dismissCallback: DismissCallback) { + when (action) { + is Action.Dismiss -> { + // TODO: b/396239267 - Handle marking the campaign dismissed with dismissal + // retention. + dismissCallback.invoke() + } + is Action.OpenUrl -> openUrl(action.url, context) + // Handle other actions + } + } + + fun openUrl(url: String, context: Context) { + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/GrowthConstants.java b/quickstep/src/com/android/launcher3/taskbar/growth/GrowthConstants.java new file mode 100644 index 00000000000..7d760fc9bbd --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/GrowthConstants.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.growth; + +/** + * Constants for registering Growth framework. + */ +public final class GrowthConstants { + /** + * For Taskbar broadcast intent filter. + */ + public static final String BROADCAST_SHOW_NUDGE = + "com.android.launcher3.growth.BROADCAST_SHOW_NUDGE"; + + /** + * For filtering package of broadcast intent received. + */ + public static final String GROWTH_NUDGE_PERMISSION = + "com.android.growth.permission.GROWTH_NUDGE_PERMISSION" + + " android:protectionLevel=\"signature|preinstalled\""; + + private GrowthConstants() {} +} diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/NudgeController.kt b/quickstep/src/com/android/launcher3/taskbar/growth/NudgeController.kt new file mode 100644 index 00000000000..5c5990eb24c --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/NudgeController.kt @@ -0,0 +1,238 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.growth + +import android.content.Context +import android.os.Bundle +import android.view.View +import android.view.View.GONE +import android.view.ViewGroup.LayoutParams.MATCH_PARENT +import android.view.ViewGroup.MarginLayoutParams +import android.view.accessibility.AccessibilityEvent +import android.view.accessibility.AccessibilityNodeInfo +import android.widget.Button +import android.widget.ImageView +import android.widget.TextView +import androidx.annotation.LayoutRes +import androidx.core.view.updateLayoutParams +import com.airbnb.lottie.LottieAnimationView +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN +import com.android.launcher3.taskbar.TaskbarControllers +import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController +import com.android.launcher3.views.ActivityContext +import com.android.quickstep.util.LottieAnimationColorUtils +import java.io.PrintWriter + +/** + * Controls nudge lifecycles. + * + * TODO: b/413718172 - Refactor to reduce code duplication with [TaskbarEduTooltipController]. + */ +class NudgeController(context: Context) : LoggableTaskbarController { + + protected val activityContext: TaskbarActivityContext = ActivityContext.lookupContext(context) + + private val isNudgeEnabled: Boolean + get() { + return !Utilities.isRunningInTestHarness() && + !activityContext.isPhoneMode && + !activityContext.isTinyTaskbar + } + + val isNudgeOpen: Boolean + get() = nudgeView?.isOpen == true + + private lateinit var controllers: TaskbarControllers + + private var nudgeView: NudgeView? = null + + fun init(controllers: TaskbarControllers) { + this.controllers = controllers + } + + fun maybeShow(model: NudgePayload) { + if (!isNudgeEnabled || !activityContext.isTransientTaskbar) { + return + } + + inflateNudgeContent(R.layout.growth_nudge) + nudgeView?.run { + allowTouchDismissal = false + + fun updateButton(button: Button, buttonPayload: ButtonPayload?) { + if (buttonPayload != null) { + button.apply { + text = buttonPayload.label + setOnClickListener { + ActionPerformers.performActions( + /*actions=*/ buttonPayload.actions, + /*context=*/ activityContext, + /*dismissCallback=*/ ::hide, + ) + } + } + } else { + button.visibility = GONE + } + } + + fun updateImage(image: Image?) { + val imageView = requireViewById(R.id.image_view) + when (image) { + is Image.ResourceId -> { + imageView.setImageDrawable(context.getDrawable(image.resId)) + } + null -> imageView.visibility = GONE + } + } + + fun updateContent() { + // Update content. + val title = requireViewById(R.id.title) + title.text = model.titleText + val body = requireViewById(R.id.body) + body.text = model.bodyText + updateButton(requireViewById(R.id.primary_button), model.primaryButton) + updateButton(requireViewById(R.id.secondary_button), model.secondaryButton) + updateImage(model.image) + } + + fun updateLayout() { + content.updateLayoutParams { width = MATCH_PARENT } + val sideSpacing = + resources.getDimensionPixelSize(R.dimen.nudge_default_position_side_spacing) + updateLayoutParams { + if (Utilities.isRtl(context.getResources())) { + rightMargin = sideSpacing + } else { + leftMargin = sideSpacing + } + width = resources.getDimensionPixelSize(R.dimen.nudge_width) + } + } + + updateContent() + updateLayout() + show() + } + } + + /** Closes the current [nudgeView]. */ + fun hide() { + nudgeView?.close(true) + } + + /** Initializes [nudgeView] with content from [contentResId]. */ + private fun inflateNudgeContent(@LayoutRes contentResId: Int) { + val overlayContext = controllers.taskbarOverlayController.requestWindow() + val nudgeView = + overlayContext.layoutInflater.inflate( + R.layout.taskbar_nudge_container, + overlayContext.dragLayer, + false, + ) as NudgeView + + controllers.taskbarAutohideSuspendController.updateFlag( + FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN, + true, + ) + + nudgeView.onCloseCallback = { + this.nudgeView = null + controllers.taskbarAutohideSuspendController.updateFlag( + FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN, + false, + ) + controllers.taskbarStashController.updateAndAnimateTransientTaskbar(true) + } + nudgeView.accessibilityDelegate = createAccessibilityDelegate() + + overlayContext.layoutInflater.inflate(contentResId, nudgeView.content, true) + this.nudgeView = nudgeView + } + + private fun createAccessibilityDelegate() = + object : View.AccessibilityDelegate() { + override fun performAccessibilityAction( + host: View, + action: Int, + args: Bundle?, + ): Boolean { + if (action == R.id.close) { + hide() + return true + } + return super.performAccessibilityAction(host, action, args) + } + + override fun onPopulateAccessibilityEvent(host: View, event: AccessibilityEvent) { + super.onPopulateAccessibilityEvent(host, event) + if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) { + event.text.add(host.context?.getText(R.string.nudge_a11y_title)) + } + } + + override fun onInitializeAccessibilityNodeInfo( + host: View, + info: AccessibilityNodeInfo, + ) { + super.onInitializeAccessibilityNodeInfo(host, info) + info.addAction( + AccessibilityNodeInfo.AccessibilityAction( + R.id.close, + host.context?.getText(R.string.nudge_a11y_close), + ) + ) + } + } + + override fun dumpLogs(prefix: String?, pw: PrintWriter?) { + pw?.println(prefix + "NudgeController:") + pw?.println("$prefix\tisNudgeEnabled=$isNudgeEnabled") + pw?.println("$prefix\tisOpen=$isNudgeOpen") + } +} + +/** + * Maps colors in the dark-themed Lottie assets to their light-themed equivalents. + * + * For instance, `".blue100" to R.color.lottie_blue400` means objects that are material blue100 in + * dark theme should be changed to material blue400 in light theme. + */ +private val DARK_TO_LIGHT_COLORS = + mapOf( + ".blue100" to R.color.lottie_blue400, + ".blue400" to R.color.lottie_blue600, + ".green100" to R.color.lottie_green400, + ".green400" to R.color.lottie_green600, + ".grey300" to R.color.lottie_grey600, + ".grey400" to R.color.lottie_grey700, + ".grey800" to R.color.lottie_grey200, + ".red400" to R.color.lottie_red600, + ".yellow100" to R.color.lottie_yellow400, + ".yellow400" to R.color.lottie_yellow600, + ) + +private fun LottieAnimationView.supportLightTheme() { + if (Utilities.isDarkTheme(context)) { + return + } + + LottieAnimationColorUtils.updateToColorResources(this, DARK_TO_LIGHT_COLORS, context.theme) +} diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/NudgePayload.kt b/quickstep/src/com/android/launcher3/taskbar/growth/NudgePayload.kt new file mode 100644 index 00000000000..7c167b959da --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/NudgePayload.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.growth + +sealed interface Action { + data class Dismiss( + val markAsDismissed: Boolean = true, + val dismissRetentionInDays: Int? = null, + ) : Action + + data class OpenUrl(val url: String) : Action +} + +sealed class Image { + data class ResourceId(val resId: Int) : Image() +} + +data class ButtonPayload(val label: String, val actions: List) + +data class NudgePayload( + val titleText: String, + val bodyText: String, + val image: Image?, + val primaryButton: ButtonPayload?, + val secondaryButton: ButtonPayload?, + + // TODO: b/396223717 - add anchoring information. +) diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/NudgeView.kt b/quickstep/src/com/android/launcher3/taskbar/growth/NudgeView.kt new file mode 100644 index 00000000000..5a832b14232 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/NudgeView.kt @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.growth + +import android.animation.AnimatorSet +import android.animation.ValueAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.MotionEvent +import android.view.ViewGroup +import android.view.animation.Interpolator +import android.window.OnBackInvokedDispatcher +import androidx.core.view.updateLayoutParams +import com.android.app.animation.Interpolators +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.R +import com.android.launcher3.anim.AnimatorListeners +import com.android.launcher3.views.ActivityContext + +private const val ENTER_DURATION_MS = 300L +private const val EXIT_DURATION_MS = 150L + +/** Floating nudge. */ +class NudgeView +@JvmOverloads +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + AbstractFloatingView(context, attrs, defStyleAttr) { + + private val activityContext: ActivityContext = ActivityContext.lookupContext(context) + + private val enterYDelta = resources.getDimension(R.dimen.nudge_enter_y_delta) + private val exitYDelta = resources.getDimension(R.dimen.nudge_exit_y_delta) + + /** Container where the nudge's body should be inflated. */ + lateinit var content: ViewGroup + private set + + /** Callback invoked when the nudge is being closed. */ + var onCloseCallback: () -> Unit = {} + private var openCloseAnimator: AnimatorSet? = null + /** Used to set whether users can tap outside the current nudge window to dismiss it */ + var allowTouchDismissal = true + + /** Animates the nudge into view. */ + fun show() { + if (isOpen) { + return + } + + mIsOpen = true + activityContext.dragLayer.addView(this) + + // Make sure we have enough height to display all of the content, which can be an issue on + // large text and display scaling configurations. If we run out of height, remove the width + // constraint to reduce the number of lines of text and hopefully free up some height. + activityContext.dragLayer.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED) + if ( + measuredHeight + activityContext.deviceProfile.taskbarProfile.height >= + activityContext.deviceProfile.deviceProperties.availableHeightPx + ) { + updateLayoutParams { width = LayoutParams.MATCH_PARENT } + } + + openCloseAnimator = createOpenCloseAnimator(isOpening = true).apply { start() } + } + + override fun onFinishInflate() { + super.onFinishInflate() + + content = requireViewById(R.id.content) + } + + override fun handleClose(animate: Boolean) { + if (!isOpen) { + return + } + + onCloseCallback() + if (!animate) { + return closeComplete() + } + + openCloseAnimator?.cancel() + openCloseAnimator = createOpenCloseAnimator(isOpening = false) + openCloseAnimator?.apply { + addListener(AnimatorListeners.forEndCallback(this@NudgeView::closeComplete)) + start() + } + } + + override fun isOfType(type: Int): Boolean = type and TYPE_NUDGE != 0 + + override fun onControllerInterceptTouchEvent(ev: MotionEvent?): Boolean { + if ( + ev?.action == MotionEvent.ACTION_DOWN && + !activityContext.dragLayer.isEventOverView(this, ev) && + allowTouchDismissal + ) { + close(true) + } + return false + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + findOnBackInvokedDispatcher() + ?.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + findOnBackInvokedDispatcher()?.unregisterOnBackInvokedCallback(this) + // TODO: b/396507770 - investigate and coordinate with letterbox flow. + } + + private fun closeComplete() { + openCloseAnimator?.cancel() + openCloseAnimator = null + mIsOpen = false + activityContext.dragLayer.removeView(this) + } + + private fun createOpenCloseAnimator(isOpening: Boolean): AnimatorSet { + val duration: Long + val alphaValues: FloatArray + val translateYValues: FloatArray + val fadeInterpolator: Interpolator + val translateYInterpolator: Interpolator + + if (isOpening) { + duration = ENTER_DURATION_MS + alphaValues = floatArrayOf(0f, 1f) + translateYValues = floatArrayOf(enterYDelta, 0f) + fadeInterpolator = Interpolators.STANDARD + translateYInterpolator = Interpolators.EMPHASIZED_DECELERATE + } else { + duration = EXIT_DURATION_MS + alphaValues = floatArrayOf(1f, 0f) + translateYValues = floatArrayOf(0f, exitYDelta) + fadeInterpolator = Interpolators.EMPHASIZED_ACCELERATE + translateYInterpolator = Interpolators.EMPHASIZED_ACCELERATE + } + + val fade = + ValueAnimator.ofFloat(*alphaValues).apply { + interpolator = fadeInterpolator + addUpdateListener { + val alpha = it.animatedValue as Float + content.alpha = alpha + } + } + + val translateY = + ValueAnimator.ofFloat(*translateYValues).apply { + interpolator = translateYInterpolator + addUpdateListener { + val translationY = it.animatedValue as Float + content.translationY = translationY + } + } + + return AnimatorSet().apply { + this.duration = duration + playTogether(fade, translateY) + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/README b/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/README new file mode 100644 index 00000000000..36c583ba7d7 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/README @@ -0,0 +1,3 @@ +This directory contains growth framework nudge proto definition for communication with the Growth App. + +Keep in sync with the proto in //depot/google3/java/com/google/android/desktop/growth/proto \ No newline at end of file diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/button.proto b/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/button.proto new file mode 100644 index 00000000000..47f6b53e915 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/button.proto @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; + +package com.google.android.desktop.growth.proto; + +import "google/protobuf/duration.proto"; + +option java_package = "com.google.android.desktop.growth.proto"; +option java_outer_classname = "Nudge"; +option java_multiple_files = true; + +message DismissParam { + // Optional. Whether to report the action as dismissed. + optional bool mark_as_dismissed = 1 [default = true]; + + // Optional. The duration specifies how long to wait before showing the nudge + // again after it was auto dismissed without user interaction. Will be ignored + // if mark_as_dismissed is false. + optional google.protobuf.Duration duration = 2; +} + +message OpenUrlParam { + // Required. The URL to open. + required string url = 1; +} + +// Action to be performed when the button is clicked. +message Action { + oneof param { + DismissParam dismiss_param = 1; + OpenUrlParam open_url_param = 2; + } +} + +// Payload for a nudge button. +message ButtonPayload { + // Required. Contains the label of the button. + required string label = 1; + + // Optional. Contains the actions of the button. If not specified, the default + // action is to dismiss the nudge. + repeated Action actions = 2; +} diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/image.proto b/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/image.proto new file mode 100644 index 00000000000..42d5618c4ef --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/image.proto @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; + +package com.google.android.desktop.growth.proto; + +option java_package = "com.google.android.desktop.growth.proto"; +option java_outer_classname = "Nudge"; +option java_multiple_files = true; + +// Image object. This can be used to represent an image using the URL. +message ImagePayload { + oneof image { + // Contains the resource URL of the image. + string url = 1; + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/payload.proto b/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/payload.proto new file mode 100644 index 00000000000..c5d39021afb --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/proto/nudge/payload.proto @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; + +package com.google.android.desktop.growth.proto; + +option java_package = "com.google.android.desktop.growth.proto"; +option java_outer_classname = "Nudge"; +option java_multiple_files = true; + +// Nudge payload used for passing data from Growth Framework to the UI +// Component. +message NudgePayload { + // Required. Contains the title text of the nudge. + string title_text = 1; + + // Required. Contains the body text of the nudge. + string body_text = 2; + + // Optional. Contains the image of the nudge. + ImagePayload image = 3; + + // Optional. The primary button of the nudge. + ButtonPayload primary_button = 4; + + // Optional. The secondary button of the nudge. Typically for the + // "Dismiss" button. + ButtonPayload secondary_button = 5; +} \ No newline at end of file diff --git a/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestion.kt b/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestion.kt new file mode 100644 index 00000000000..4beb654f259 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestion.kt @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.handoff + +import android.companion.datatransfer.continuity.RemoteTask +import android.graphics.drawable.Drawable + +/** A suggestion for a remote application that can be handed off to this device. */ +class HandoffSuggestion { + + data class Metadata(val label: String, val icon: Drawable) + + var remoteTask: RemoteTask + private set + + /** The device ID of the remote device that this suggestion is for. */ + val deviceId: Int + get() = remoteTask.deviceId + + /** Metadata for this suggestion. This is `null` until it is loaded. */ + var metadata: Metadata? = null + + constructor(remoteTask: RemoteTask) { + this.remoteTask = remoteTask + } + + /** + * Updates the suggested application with the given remote task. + * + * If the remote task is the same as the previous remote task, this is a no-op. If the + * application has changed, the associated metadata is cleared to indicate that a reload is + * needed. + */ + fun updateRemoteTask(remoteTask: RemoteTask) { + if (remoteTask.id != this.remoteTask.id) { + this.remoteTask = remoteTask + this.metadata = null + } + } + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (other !is HandoffSuggestion) return false + + return deviceId == other.deviceId + } + + override fun hashCode(): Int = deviceId +} diff --git a/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionList.kt b/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionList.kt new file mode 100644 index 00000000000..94c16f405fb --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionList.kt @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.handoff + +import android.companion.datatransfer.continuity.RemoteTask +import android.util.Log + +/** List of [HandoffSuggestion] instances that are currently available for handoff. */ +class HandoffSuggestionList { + + private val previousSuggestions = mutableMapOf() + + /** Currently active Handoff suggestions. */ + val suggestions: List + get() = previousSuggestions.values.toList() + + /** + * Updates the list of suggestions based on the given list of remote tasks, returning `true` if + * a new suggestion was added or an existing suggestion was removed. + */ + fun updateSuggestions(remoteTasks: List): Boolean { + Log.v(TAG, "Updating handoff suggestions.") + var didChange = false + for (remoteTask in remoteTasks) { + val suggestion = previousSuggestions[remoteTask.deviceId] + if (suggestion == null) { + previousSuggestions[remoteTask.deviceId] = HandoffSuggestion(remoteTask) + + Log.v(TAG, "Adding new suggestion for deviceId ${remoteTask.deviceId}") + didChange = true + } else { + Log.v(TAG, "Updating suggestion for deviceId ${remoteTask.deviceId}") + previousSuggestions[remoteTask.deviceId]?.updateRemoteTask(remoteTask) + } + } + + for (deviceId in previousSuggestions.keys) { + if (remoteTasks.none { it.deviceId == deviceId }) { + Log.v(TAG, "Removing suggestion for deviceId ${deviceId}") + previousSuggestions.remove(deviceId) + didChange = true + } + } + + Log.v(TAG, "Finished updating handoff suggestions. didChange=$didChange") + return didChange + } + + /** Clears the list of suggestions. */ + public fun clear() { + Log.v(TAG, "Clearing Handoff suggestions.") + previousSuggestions.clear() + } + + private companion object { + const val TAG = "HandoffSuggestionList" + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionMetadataLoader.kt b/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionMetadataLoader.kt new file mode 100644 index 00000000000..ec5563020e2 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionMetadataLoader.kt @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.handoff + +import android.content.Context +import android.graphics.drawable.Drawable +import android.os.Handler +import android.util.Log + +/** + * Loads metadata for [HandoffSuggestion] instances. + * + * This class is responsible for loading the label and icon for a [HandoffSuggestion]. It uses a + * [Handler] to schedule the icon loading on the main thread, and it notifies a callback when the + * metadata is loaded. + */ +class HandoffSuggestionMetadataLoader(private val context: Context, private val handler: Handler) { + + /** Callback used when retrieving app icons from cache. */ + fun interface OnHandoffSuggestionMetadataLoadedCallback { + /** Called when metadata is loaded for a [HandoffSuggestion]. */ + fun onLoaded(handoffSuggestion: HandoffSuggestion) + } + + /** + * Loads metadata for the given suggestions. If a suggestion already has metadata, it will not + * be loaded again. + */ + fun loadMetadata( + suggestions: List, + onLoad: OnHandoffSuggestionMetadataLoadedCallback, + ) { + // Cancel any pending metadata load requests. + cancelPendingLoads() + + // Load metadata for each suggestion that doesn't already have it. + for (suggestion in suggestions) { + loadMetadataForSuggestion(suggestion, onLoad) + } + } + + /** Cancels any pending metadata load requests. */ + fun cancelPendingLoads() { + Log.v(TAG, "cancelPendingLoads") + handler.removeCallbacksAndMessages(null) + } + + private fun loadMetadataForSuggestion( + suggestion: HandoffSuggestion, + onLoad: OnHandoffSuggestionMetadataLoadedCallback, + ) { + // If the suggestion already has metadata, don't load it again. + if (suggestion.metadata != null) { + Log.v(TAG, "loadMetadataForSuggestion: suggestion already has metadata") + return + } + + val icon = suggestion.remoteTask.icon ?: return + Log.v(TAG, "loadMetadataForSuggestion: requesting drawable") + icon.loadDrawableAsync( + context, + { drawable -> + if (drawable != null) { + Log.v(TAG, "loadMetadataForSuggestion: drawable loaded") + onDrawableLoaded(suggestion, drawable, onLoad) + } else { + Log.v(TAG, "loadMetadataForSuggestion: drawable is null") + } + }, + handler, + ) + } + + private fun onDrawableLoaded( + suggestion: HandoffSuggestion, + drawable: Drawable?, + callback: OnHandoffSuggestionMetadataLoadedCallback, + ) { + if (drawable != null) { + Log.v(TAG, "onDrawableLoaded: drawable loaded") + suggestion.metadata = HandoffSuggestion.Metadata(suggestion.remoteTask.label, drawable) + callback.onLoaded(suggestion) + } else { + Log.v(TAG, "onDrawableLoaded: drawable is null") + } + } + + private companion object { + const val TAG = "HandoffSuggestionMetadataLoader" + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/handoff/TaskbarHandoffController.kt b/quickstep/src/com/android/launcher3/taskbar/handoff/TaskbarHandoffController.kt new file mode 100644 index 00000000000..6c3994d848d --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/handoff/TaskbarHandoffController.kt @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.handoff + +import android.companion.datatransfer.continuity.RemoteTask +import android.companion.datatransfer.continuity.TaskContinuityManager +import android.os.Handler +import android.util.Log +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController +import java.io.PrintWriter + +/** + * Controller for the Handoff feature in the Taskbar. + * + * This controller is responsible for managing the Handoff suggestions and loading the metadata + * (label and icon) for them. It also updates the suggestions in the UI when the metadata is loaded. + */ +class TaskbarHandoffController(val taskbarActivityContext: TaskbarActivityContext) : + LoggableTaskbarController, TaskContinuityManager.RemoteTaskListener { + + private var taskContinuityManager: TaskContinuityManager? = null + private val suggestionList = HandoffSuggestionList() + private val suggestionMetadataLoader = + HandoffSuggestionMetadataLoader( + taskbarActivityContext, + Handler(taskbarActivityContext.mainLooper), + ) + + /** A list of currently active Handoff suggestions. */ + public val suggestions: List + get() { + return suggestionList.suggestions + } + + /** Starts the controller. */ + public fun init() { + if (android.companion.Flags.enableTaskContinuity()) { + taskContinuityManager = + taskbarActivityContext.applicationContext.getSystemService( + TaskContinuityManager::class.java + ) + + taskContinuityManager?.registerRemoteTaskListener( + taskbarActivityContext.mainExecutor, + this, + ) + } + } + + /** Stops the controller. */ + public fun onDestroy() { + if (DEBUG) { + Log.d(TAG, "Stopping controller.") + } + + suggestionMetadataLoader.cancelPendingLoads() + suggestionList.clear() + taskContinuityManager?.unregisterRemoteTaskListener(this) + } + + public override fun onRemoteTasksChanged(remoteTasks: List) { + if (DEBUG) { + Log.d(TAG, "onRemoteTasksChanged: updating suggestions.") + } + + suggestionList.updateSuggestions(remoteTasks) + suggestionMetadataLoader.loadMetadata(suggestionList.suggestions) { suggestion -> + if (DEBUG) { + Log.d( + TAG, + "HandoffSuggestion metadata updated for deviceId ${suggestion.deviceId}.") + } + // TODO: joeantonetti - Update the suggestion in the UI. + } + } + + override fun dumpLogs(prefix: String, pw: PrintWriter) { + pw.println(prefix + "TaskbarHandoffController:") + pw.println(prefix + "\tsuggestions=" + suggestionList.suggestions) + } + + private companion object { + const val DEBUG = false + const val TAG = "TaskbarHandoffController" + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt index e487f9fd40f..fc3d6e69484 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt @@ -18,6 +18,9 @@ package com.android.launcher3.taskbar.navbutton import android.content.res.Resources import android.graphics.drawable.RotateDrawable +import android.net.Uri +import android.provider.Settings +import android.provider.Settings.Secure.NAVIGATIONBAR_KEY_ORDER import android.view.Gravity import android.view.ViewGroup import android.widget.FrameLayout @@ -27,8 +30,8 @@ import android.widget.Space import com.android.launcher3.DeviceProfile import com.android.launcher3.R import com.android.launcher3.Utilities -import com.android.launcher3.taskbar.TaskbarActivityContext import com.android.launcher3.taskbar.navbutton.NavButtonLayoutFactory.NavButtonLayoutter +import com.android.launcher3.util.SettingsCache /** * Meant to be a simple container for data subclasses will need @@ -48,15 +51,17 @@ abstract class AbstractNavButtonLayoutter( protected val startContextualContainer: ViewGroup, protected val imeSwitcher: ImageView?, protected val a11yButton: ImageView?, - protected val space: Space? + protected val space: Space?, + protected val backButton: ImageView? = navButtonContainer.findViewById(R.id.back), + protected val homeButton: ImageView? = navButtonContainer.findViewById(R.id.home), + protected val recentsButton: ImageView? = navButtonContainer.findViewById(R.id.recent_apps), ) : NavButtonLayoutter { - protected val homeButton: ImageView? = navButtonContainer.findViewById(R.id.home) - protected val recentsButton: ImageView? = navButtonContainer.findViewById(R.id.recent_apps) - protected val backButton: ImageView? = navButtonContainer.findViewById(R.id.back) + + open val orientation: Int = LinearLayout.HORIZONTAL init { // setup back button drawable - if (backButton != null) { + if (backButton != null && backButton.resources != null) { val rotateDrawable = RotateDrawable() rotateDrawable.drawable = backButton.context?.getDrawable(R.drawable.ic_sysbar_back) rotateDrawable.fromDegrees = 0f @@ -69,26 +74,29 @@ abstract class AbstractNavButtonLayoutter( val params = FrameLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT + ViewGroup.LayoutParams.MATCH_PARENT, ) params.gravity = Gravity.CENTER return params } + /** + * Adjusts the layout parameters of the nav bar container for setup in phone mode. + * + * @param nearestTouchFrameLayoutParams The layout parameters of the navButtonsView, which is + * the ViewGroup that contains start, end, nav button ViewGroups + * @param deviceProfile The device profile containing information about the device's + * configuration. + */ fun adjustForSetupInPhoneMode( - navButtonsLayoutParams: FrameLayout.LayoutParams, - navButtonsViewLayoutParams: FrameLayout.LayoutParams, - deviceProfile: DeviceProfile + nearestTouchFrameLayoutParams: FrameLayout.LayoutParams, + deviceProfile: DeviceProfile, ) { val phoneOrPortraitSetupMargin = resources.getDimensionPixelSize(R.dimen.taskbar_contextual_button_suw_margin) - navButtonsLayoutParams.marginStart = phoneOrPortraitSetupMargin - navButtonsLayoutParams.bottomMargin = - if (!deviceProfile.isLandscape) 0 - else - phoneOrPortraitSetupMargin - - resources.getDimensionPixelSize(R.dimen.taskbar_nav_buttons_size) / 2 - navButtonsViewLayoutParams.height = + nearestTouchFrameLayoutParams.marginStart = phoneOrPortraitSetupMargin + nearestTouchFrameLayoutParams.bottomMargin = 0 + nearestTouchFrameLayoutParams.height = resources.getDimensionPixelSize(R.dimen.taskbar_contextual_button_suw_height) } @@ -97,7 +105,7 @@ abstract class AbstractNavButtonLayoutter( buttonSize: Int, barAxisMarginStart: Int, barAxisMarginEnd: Int, - gravity: Int + gravity: Int, ) { val contextualContainerParams = FrameLayout.LayoutParams(buttonSize, ViewGroup.LayoutParams.MATCH_PARENT) @@ -110,4 +118,41 @@ abstract class AbstractNavButtonLayoutter( contextualContainerParams.gravity = gravity or Gravity.CENTER_VERTICAL contextualContainer.layoutParams = contextualContainerParams } + + /** For ordered layouts, this determines if the order of buttons should be flipped. */ + open fun shouldFlipButtonOrder(): Boolean { + val isFlipEnabledBySetting = + android.view.accessibility.Flags.navbarFlipOrderOption() && + SettingsCache.INSTANCE.get(navButtonContainer.context) + .getValue(NAVBAR_KEY_ORDER_URI) + + return Utilities.isRtl(resources) xor isFlipEnabledBySetting + } + + /** + * Attaches the three primary buttons to the nav button container, in the appropriate order. + * Clears all views from the container beforehand. + */ + override fun addThreeButtons() { + if (backButton == null || homeButton == null || recentsButton == null) { + return + } + + navButtonContainer.removeAllViews() + navButtonContainer.orientation = orientation + // Flip ordering of back and recents buttons + if (shouldFlipButtonOrder()) { + navButtonContainer.addView(recentsButton) + navButtonContainer.addView(homeButton) + navButtonContainer.addView(backButton) + } else { + navButtonContainer.addView(backButton) + navButtonContainer.addView(homeButton) + navButtonContainer.addView(recentsButton) + } + } + + companion object { + val NAVBAR_KEY_ORDER_URI: Uri = Settings.Secure.getUriFor(NAVIGATIONBAR_KEY_ORDER) + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt index aa8f5a34e2a..627efd38c82 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt @@ -37,7 +37,7 @@ class KidsNavLayoutter( startContextualContainer: ViewGroup, imeSwitcher: ImageView?, a11yButton: ImageView?, - space: Space? + space: Space?, ) : AbstractNavButtonLayoutter( resources, @@ -46,7 +46,7 @@ class KidsNavLayoutter( startContextualContainer, imeSwitcher, a11yButton, - space + space, ) { override fun layoutButtons(context: TaskbarActivityContext, isA11yButtonPersistent: Boolean) { @@ -110,7 +110,7 @@ class KidsNavLayoutter( WRAP_CONTENT, contextualMargin, contextualMargin, - Gravity.START + Gravity.START, ) if (imeSwitcher != null) { @@ -122,4 +122,8 @@ class KidsNavLayoutter( a11yButton.layoutParams = getParamsToCenterView() } } + + override fun addThreeButtons() { + // No-op + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt index 2497fbb98ed..0f1b337749d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt @@ -66,7 +66,7 @@ class NavButtonLayoutFactory { isInSetup: Boolean, isThreeButtonNav: Boolean, phoneMode: Boolean, - @Rotation surfaceRotation: Int + @Rotation surfaceRotation: Int, ): NavButtonLayoutter { val navButtonContainer = navButtonsView.requireViewById(ID_END_NAV_BUTTONS) @@ -77,8 +77,20 @@ class NavButtonLayoutFactory { val isPhoneNavMode = phoneMode && isThreeButtonNav val isPhoneGestureMode = phoneMode && !isThreeButtonNav return when { + isInSetup -> { + SetupNavLayoutter( + resources, + navButtonsView, + navButtonContainer, + endContextualContainer, + startContextualContainer, + imeSwitcher, + a11yButton, + space, + ) + } isPhoneNavMode -> { - if (!deviceProfile.isLandscape) { + if (!deviceProfile.deviceProperties.isLandscape) { navButtonsView.setIsVertical(false) PhonePortraitNavLayoutter( resources, @@ -87,7 +99,7 @@ class NavButtonLayoutFactory { startContextualContainer, imeSwitcher, a11yButton, - space + space, ) } else if (surfaceRotation == ROTATION_90) { navButtonsView.setIsVertical(true) @@ -98,7 +110,7 @@ class NavButtonLayoutFactory { startContextualContainer, imeSwitcher, a11yButton, - space + space, ) } else { navButtonsView.setIsVertical(true) @@ -109,36 +121,23 @@ class NavButtonLayoutFactory { startContextualContainer, imeSwitcher, a11yButton, - space + space, ) } } isPhoneGestureMode -> { PhoneGestureLayoutter( resources, - navButtonsView, navButtonContainer, endContextualContainer, startContextualContainer, imeSwitcher, a11yButton, - space + space, ) } deviceProfile.isTaskbarPresent -> { return when { - isInSetup -> { - SetupNavLayoutter( - resources, - navButtonsView, - navButtonContainer, - endContextualContainer, - startContextualContainer, - imeSwitcher, - a11yButton, - space - ) - } isKidsMode -> { KidsNavLayoutter( resources, @@ -147,7 +146,7 @@ class NavButtonLayoutFactory { startContextualContainer, imeSwitcher, a11yButton, - space + space, ) } else -> @@ -158,7 +157,7 @@ class NavButtonLayoutFactory { startContextualContainer, imeSwitcher, a11yButton, - space + space, ) } } @@ -170,5 +169,8 @@ class NavButtonLayoutFactory { /** Lays out and provides access to the home, recents, and back buttons for various mischief */ interface NavButtonLayoutter { fun layoutButtons(context: TaskbarActivityContext, isA11yButtonPersistent: Boolean) + + /** Isolated logic for updating the order of the 3 buttons. */ + fun addThreeButtons() } } diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/NearestTouchFrame.java b/quickstep/src/com/android/launcher3/taskbar/navbutton/NearestTouchFrame.java index bbf08bf903a..844f1af2883 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/NearestTouchFrame.java +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/NearestTouchFrame.java @@ -194,6 +194,7 @@ public boolean onTouchEvent(MotionEvent event) { event.offsetLocation(mTouchingChild.getWidth() / 2 - x, mTouchingChild.getHeight() / 2 - y); return mTouchingChild.getVisibility() == VISIBLE + && mTouchingChild.isAttachedToWindow() && mTouchingChild.dispatchTouchEvent(event); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneGestureLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneGestureLayoutter.kt index 390ec342e18..9ddff0ae80e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneGestureLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneGestureLayoutter.kt @@ -17,25 +17,21 @@ package com.android.launcher3.taskbar.navbutton import android.content.res.Resources -import android.view.Gravity import android.view.ViewGroup -import android.widget.FrameLayout import android.widget.ImageView import android.widget.LinearLayout import android.widget.Space -import com.android.launcher3.DeviceProfile import com.android.launcher3.taskbar.TaskbarActivityContext /** Layoutter for showing gesture navigation on phone screen. No buttons here, no-op container */ class PhoneGestureLayoutter( resources: Resources, - navButtonsView: NearestTouchFrame, navBarContainer: LinearLayout, endContextualContainer: ViewGroup, startContextualContainer: ViewGroup, imeSwitcher: ImageView?, a11yButton: ImageView?, - space: Space? + space: Space?, ) : AbstractNavButtonLayoutter( resources, @@ -44,34 +40,15 @@ class PhoneGestureLayoutter( startContextualContainer, imeSwitcher, a11yButton, - space + space, ) { - private val mNavButtonsView = navButtonsView override fun layoutButtons(context: TaskbarActivityContext, isA11yButtonPersistent: Boolean) { - // TODO: look into if we should use SetupNavLayoutter instead. - if (!context.isUserSetupComplete) { - // Since setup wizard only has back button enabled, it looks strange to be - // end-aligned, so start-align instead. - val navButtonsLayoutParams = navButtonContainer.layoutParams as FrameLayout.LayoutParams - val navButtonsViewLayoutParams = - mNavButtonsView.layoutParams as FrameLayout.LayoutParams - val deviceProfile: DeviceProfile = context.deviceProfile - - navButtonsLayoutParams.marginEnd = 0 - navButtonsLayoutParams.gravity = Gravity.START - context.setTaskbarWindowSize(context.setupWindowSize) - - adjustForSetupInPhoneMode( - navButtonsLayoutParams, - navButtonsViewLayoutParams, - deviceProfile - ) - mNavButtonsView.layoutParams = navButtonsViewLayoutParams - navButtonContainer.layoutParams = navButtonsLayoutParams - } - endContextualContainer.removeAllViews() startContextualContainer.removeAllViews() } + + override fun addThreeButtons() { + // No-op + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneLandscapeNavLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneLandscapeNavLayoutter.kt index 9f7f07e7738..2b089b8d9f7 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneLandscapeNavLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneLandscapeNavLayoutter.kt @@ -34,7 +34,7 @@ open class PhoneLandscapeNavLayoutter( startContextualContainer: ViewGroup, imeSwitcher: ImageView?, a11yButton: ImageView?, - space: Space? + space: Space?, ) : AbstractNavButtonLayoutter( resources, @@ -43,11 +43,13 @@ open class PhoneLandscapeNavLayoutter( startContextualContainer, imeSwitcher, a11yButton, - space + space, ) { + override val orientation = LinearLayout.VERTICAL + override fun layoutButtons(context: TaskbarActivityContext, isA11yButtonPersistent: Boolean) { - val totalHeight = context.deviceProfile.heightPx + val totalHeight = context.deviceProfile.deviceProperties.heightPx val homeButtonHeight = resources.getDimensionPixelSize(R.dimen.taskbar_phone_home_button_size) val roundedCornerContentMargin = @@ -72,9 +74,6 @@ open class PhoneLandscapeNavLayoutter( } // Ensure order of buttons is correct - navButtonContainer.removeAllViews() - navButtonContainer.orientation = LinearLayout.VERTICAL - addThreeButtons() navButtonContainer.layoutParams = navContainerParams @@ -110,11 +109,9 @@ open class PhoneLandscapeNavLayoutter( repositionContextualButtons(contextualButtonHeight.toInt()) } - open fun addThreeButtons() { - // Swap recents and back button - navButtonContainer.addView(recentsButton) - navButtonContainer.addView(homeButton) - navButtonContainer.addView(backButton) + /** Landscape flips the default order to account for rotation. */ + override fun shouldFlipButtonOrder(): Boolean { + return !super.shouldFlipButtonOrder() } open fun repositionContextualButtons(buttonSize: Int) { @@ -129,14 +126,14 @@ open class PhoneLandscapeNavLayoutter( buttonSize, roundedCornerContentMargin + contentPadding, 0, - Gravity.TOP + Gravity.TOP, ) repositionContextualContainer( endContextualContainer, buttonSize, 0, roundedCornerContentMargin + contentPadding, - Gravity.BOTTOM + Gravity.BOTTOM, ) if (imeSwitcher != null) { @@ -155,7 +152,7 @@ open class PhoneLandscapeNavLayoutter( buttonSize: Int, barAxisMarginTop: Int, barAxisMarginBottom: Int, - gravity: Int + gravity: Int, ) { val contextualContainerParams = FrameLayout.LayoutParams(MATCH_PARENT, buttonSize) contextualContainerParams.apply { diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/PhonePortraitNavLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/PhonePortraitNavLayoutter.kt index 5b24ebfe1d5..5f8475e8d2b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/PhonePortraitNavLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/PhonePortraitNavLayoutter.kt @@ -34,7 +34,7 @@ class PhonePortraitNavLayoutter( startContextualContainer: ViewGroup, imeSwitcher: ImageView?, a11yButton: ImageView?, - space: Space? + space: Space?, ) : AbstractNavButtonLayoutter( resources, @@ -43,11 +43,11 @@ class PhonePortraitNavLayoutter( startContextualContainer, imeSwitcher, a11yButton, - space + space, ) { override fun layoutButtons(context: TaskbarActivityContext, isA11yButtonPersistent: Boolean) { - val totalWidth = context.deviceProfile.widthPx + val totalWidth = context.deviceProfile.deviceProperties.widthPx val homeButtonWidth = resources.getDimensionPixelSize(R.dimen.taskbar_phone_home_button_size) val roundedCornerContentMargin = @@ -63,7 +63,7 @@ class PhonePortraitNavLayoutter( val navContainerParams = FrameLayout.LayoutParams( navButtonContainerWidth.toInt(), - ViewGroup.LayoutParams.MATCH_PARENT + ViewGroup.LayoutParams.MATCH_PARENT, ) navContainerParams.apply { topMargin = 0 @@ -75,12 +75,7 @@ class PhonePortraitNavLayoutter( } // Ensure order of buttons is correct - navButtonContainer.removeAllViews() - navButtonContainer.orientation = LinearLayout.HORIZONTAL - - navButtonContainer.addView(backButton) - navButtonContainer.addView(homeButton) - navButtonContainer.addView(recentsButton) + addThreeButtons() navButtonContainer.layoutParams = navContainerParams navButtonContainer.gravity = Gravity.CENTER @@ -120,14 +115,14 @@ class PhonePortraitNavLayoutter( contextualButtonWidth.toInt(), roundedCornerContentMargin + contentPadding, 0, - Gravity.START + Gravity.START, ) repositionContextualContainer( endContextualContainer, contextualButtonWidth.toInt(), 0, roundedCornerContentMargin + contentPadding, - Gravity.END + Gravity.END, ) startContextualContainer.addView(space, MATCH_PARENT, MATCH_PARENT) diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneSeascapeNavLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneSeascapeNavLayoutter.kt index f0b47f4caa2..2b90abcde34 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneSeascapeNavLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneSeascapeNavLayoutter.kt @@ -32,7 +32,7 @@ class PhoneSeascapeNavLayoutter( startContextualContainer: ViewGroup, imeSwitcher: ImageView?, a11yButton: ImageView?, - space: Space? + space: Space?, ) : PhoneLandscapeNavLayoutter( resources, @@ -41,16 +41,9 @@ class PhoneSeascapeNavLayoutter( startContextualContainer, imeSwitcher, a11yButton, - space + space, ) { - override fun addThreeButtons() { - // Flip ordering of back and recents buttons - navButtonContainer.addView(backButton) - navButtonContainer.addView(homeButton) - navButtonContainer.addView(recentsButton) - } - override fun repositionContextualButtons(buttonSize: Int) { endContextualContainer.removeAllViews() startContextualContainer.removeAllViews() @@ -63,14 +56,14 @@ class PhoneSeascapeNavLayoutter( buttonSize, roundedCornerContentMargin + contentPadding, 0, - Gravity.TOP + Gravity.TOP, ) repositionContextualContainer( endContextualContainer, buttonSize, 0, roundedCornerContentMargin + contentPadding, - Gravity.BOTTOM + Gravity.BOTTOM, ) startContextualContainer.addView(space, MATCH_PARENT, MATCH_PARENT) diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/SetupNavLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/SetupNavLayoutter.kt index 22a36301b33..50606ea1186 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/SetupNavLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/SetupNavLayoutter.kt @@ -17,6 +17,7 @@ package com.android.launcher3.taskbar.navbutton import android.content.res.Resources +import android.os.SystemProperties import android.view.Gravity import android.view.ViewGroup import android.view.ViewGroup.LayoutParams.WRAP_CONTENT @@ -28,18 +29,21 @@ import com.android.launcher3.DeviceProfile import com.android.launcher3.R import com.android.launcher3.taskbar.TaskbarActivityContext +const val SUW_THEME_SYSTEM_PROPERTY = "setupwizard.theme" +const val GLIF_EXPRESSIVE_THEME = "glif_expressive" +const val GLIF_EXPRESSIVE_LIGHT_THEME = "glif_expressive_light" const val SQUARE_ASPECT_RATIO_BOTTOM_BOUND = 0.95 const val SQUARE_ASPECT_RATIO_UPPER_BOUND = 1.05 class SetupNavLayoutter( resources: Resources, - navButtonsView: NearestTouchFrame, + nearestTouchFrame: NearestTouchFrame, navButtonContainer: LinearLayout, endContextualContainer: ViewGroup, startContextualContainer: ViewGroup, imeSwitcher: ImageView?, a11yButton: ImageView?, - space: Space? + space: Space?, ) : AbstractNavButtonLayoutter( resources, @@ -48,56 +52,62 @@ class SetupNavLayoutter( startContextualContainer, imeSwitcher, a11yButton, - space + space, ) { - private val mNavButtonsView = navButtonsView + // mNearestTouchFrame is a ViewGroup that contains start, end, nav button ViewGroups + private val mNearestTouchFrame = nearestTouchFrame override fun layoutButtons(context: TaskbarActivityContext, isA11yButtonPersistent: Boolean) { + val SUWTheme = SystemProperties.get(SUW_THEME_SYSTEM_PROPERTY, "") + val expressiveThemeEnabled = + SUWTheme == GLIF_EXPRESSIVE_THEME || SUWTheme == GLIF_EXPRESSIVE_LIGHT_THEME + if (expressiveThemeEnabled && !context.isSimpleViewEnabled) { + return + } // Since setup wizard only has back button enabled, it looks strange to be // end-aligned, so start-align instead. val navButtonsLayoutParams = navButtonContainer.layoutParams as FrameLayout.LayoutParams - val navButtonsViewLayoutParams = mNavButtonsView.layoutParams as FrameLayout.LayoutParams + val navButtonsOverallViewGroupLayoutParams = + mNearestTouchFrame.layoutParams as FrameLayout.LayoutParams val deviceProfile: DeviceProfile = context.deviceProfile navButtonsLayoutParams.marginEnd = 0 - navButtonsLayoutParams.gravity = Gravity.START + navButtonsLayoutParams.gravity = Gravity.START or Gravity.CENTER_VERTICAL context.setTaskbarWindowSize(context.setupWindowSize) // If SUW is on a large screen device that is landscape (or has a square aspect // ratio) the back button has to be placed accordingly if ( - deviceProfile.isTablet && deviceProfile.isLandscape || - (deviceProfile.aspectRatio > SQUARE_ASPECT_RATIO_BOTTOM_BOUND && - deviceProfile.aspectRatio < SQUARE_ASPECT_RATIO_UPPER_BOUND) + deviceProfile.deviceProperties.isTablet && deviceProfile.deviceProperties.isLandscape || + (deviceProfile.deviceProperties.aspectRatio > SQUARE_ASPECT_RATIO_BOTTOM_BOUND && + deviceProfile.deviceProperties.aspectRatio < SQUARE_ASPECT_RATIO_UPPER_BOUND) ) { navButtonsLayoutParams.marginStart = resources.getDimensionPixelSize(R.dimen.taskbar_back_button_suw_start_margin) - navButtonsViewLayoutParams.bottomMargin = + navButtonsOverallViewGroupLayoutParams.bottomMargin = resources.getDimensionPixelSize(R.dimen.taskbar_back_button_suw_bottom_margin) navButtonsLayoutParams.height = resources.getDimensionPixelSize(R.dimen.taskbar_back_button_suw_height) } else { - adjustForSetupInPhoneMode( - navButtonsLayoutParams, - navButtonsViewLayoutParams, - deviceProfile - ) + adjustForSetupInPhoneMode(navButtonsOverallViewGroupLayoutParams, deviceProfile) } - mNavButtonsView.layoutParams = navButtonsViewLayoutParams + mNearestTouchFrame.layoutParams = navButtonsOverallViewGroupLayoutParams navButtonContainer.layoutParams = navButtonsLayoutParams endContextualContainer.removeAllViews() startContextualContainer.removeAllViews() + val contextualButtonWidth = + resources.getDimensionPixelSize(R.dimen.taskbar_contextual_button_suw_width) val contextualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_contextual_button_padding) repositionContextualContainer(endContextualContainer, WRAP_CONTENT, 0, 0, Gravity.END) repositionContextualContainer( startContextualContainer, - WRAP_CONTENT, + contextualButtonWidth, contextualMargin, contextualMargin, - Gravity.START + Gravity.START, ) if (imeSwitcher != null) { @@ -109,4 +119,8 @@ class SetupNavLayoutter( a11yButton.layoutParams = getParamsToCenterView() } } + + override fun addThreeButtons() { + // No-op + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/TaskbarNavLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/TaskbarNavLayoutter.kt index a59e8a847b8..15170763159 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/TaskbarNavLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/TaskbarNavLayoutter.kt @@ -35,7 +35,7 @@ class TaskbarNavLayoutter( startContextualContainer: ViewGroup, imeSwitcher: ImageView?, a11yButton: ImageView?, - space: Space? + space: Space?, ) : AbstractNavButtonLayoutter( resources, @@ -44,7 +44,7 @@ class TaskbarNavLayoutter( startContextualContainer, imeSwitcher, a11yButton, - space + space, ) { override fun layoutButtons(context: TaskbarActivityContext, isA11yButtonPersistent: Boolean) { @@ -69,7 +69,7 @@ class TaskbarNavLayoutter( val navButtonParams = FrameLayout.LayoutParams( FrameLayout.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.MATCH_PARENT + ViewGroup.LayoutParams.MATCH_PARENT, ) navButtonParams.apply { gravity = Gravity.END or Gravity.CENTER_VERTICAL @@ -101,16 +101,18 @@ class TaskbarNavLayoutter( endContextualContainer.removeAllViews() startContextualContainer.removeAllViews() - if (!context.deviceProfile.isGestureMode) { + if (!context.deviceProfile.deviceProperties.isGestureMode) { + val contextualButtonWidth = + resources.getDimensionPixelSize(R.dimen.taskbar_contextual_button_width) val contextualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_contextual_button_padding) repositionContextualContainer(endContextualContainer, WRAP_CONTENT, 0, 0, Gravity.END) repositionContextualContainer( startContextualContainer, - WRAP_CONTENT, + contextualButtonWidth, contextualMargin, contextualMargin, - Gravity.START + Gravity.START, ) if (imeSwitcher != null) { @@ -122,7 +124,7 @@ class TaskbarNavLayoutter( val imeSwitcherButtonParams = FrameLayout.LayoutParams( FrameLayout.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT + ViewGroup.LayoutParams.MATCH_PARENT, ) imeSwitcherButtonParams.apply { marginStart = imeStartMargin diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java index bed23b3976e..567c81442a2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java @@ -15,15 +15,19 @@ */ package com.android.launcher3.taskbar.overlay; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; + import android.content.Context; +import android.graphics.Point; import android.view.View; +import android.widget.FrameLayout; import androidx.annotation.Nullable; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; +import com.android.launcher3.InsettableFrameLayout.LayoutParams; import com.android.launcher3.R; -import com.android.launcher3.dot.DotInfo; -import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.taskbar.BaseTaskbarContext; import com.android.launcher3.taskbar.TaskbarActivityContext; @@ -32,13 +36,17 @@ import com.android.launcher3.taskbar.TaskbarUIController; import com.android.launcher3.taskbar.allapps.TaskbarAllAppsContainerView; import com.android.launcher3.taskbar.allapps.TaskbarSearchSessionController; +import com.android.launcher3.taskbar.bubbles.DragToBubbleController; +import com.android.launcher3.taskbar.customization.TaskbarSpecsEvaluator; +import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource; +import java.util.Optional; + /** * Window context for the taskbar overlays such as All Apps and EDU. *

- * Overlays have their own window and need a window context. Some properties are - * delegated to the + * Overlays have their own window and need a window context. Some properties are delegated to the * {@link TaskbarActivityContext} such as {@link PopupDataProvider}. */ public class TaskbarOverlayContext extends BaseTaskbarContext { @@ -47,6 +55,8 @@ public class TaskbarOverlayContext extends BaseTaskbarContext { private final TaskbarOverlayController mOverlayController; private final TaskbarDragController mDragController; private final TaskbarOverlayDragLayer mDragLayer; + private FrameLayout mBubbleBarDropViewContainer; + private final Optional mDragToBubbleController; private final int mStashedTaskbarHeight; private final TaskbarUIController mUiController; @@ -57,15 +67,28 @@ public TaskbarOverlayContext( Context windowContext, TaskbarActivityContext taskbarContext, TaskbarControllers controllers) { - super(windowContext); + super(windowContext, taskbarContext.getDisplayId(), taskbarContext.isPrimaryDisplay()); mTaskbarContext = taskbarContext; mOverlayController = controllers.taskbarOverlayController; + mDragToBubbleController = controllers.bubbleControllers.map(c -> c.dragToBubbleController); mDragController = new TaskbarDragController(this); - mDragController.init(controllers); + // We don't query isDragging from DragController attached to TaskbarOverlayContext. Instead + // we only query it from DragController attached to TaskbarControllers. Thus we don't pass + // TaskbarUiState to DragController here. + mDragController.init(controllers, null); mDragLayer = new TaskbarOverlayDragLayer(this); mStashedTaskbarHeight = controllers.taskbarStashController.getStashedHeight(); + updateBlurStyle(); mUiController = controllers.uiController; + onViewCreated(); + } + + /** Called when the controller is destroyed. */ + @Override + public void onDestroy() { + super.onDestroy(); + mDragController.onDestroy(); } public @Nullable TaskbarSearchSessionController getSearchSessionController() { @@ -85,13 +108,13 @@ public TaskbarOverlayController getOverlayController() { return mOverlayController; } - /** - * Returns {@code true} if overlay or Taskbar windows are handling a system - * drag. - */ + public TaskbarSpecsEvaluator getSpecsEvaluator() { + return mTaskbarContext.getTaskbarSpecsEvaluator(); + } + + /** Returns {@code true} if overlay or Taskbar windows are handling a system drag. */ boolean isAnySystemDragInProgress() { - return mDragController.isSystemDragInProgress() - || mTaskbarContext.getDragController().isSystemDragInProgress(); + return mOverlayController.isAnySystemDragInProgress(); } @Override @@ -120,8 +143,17 @@ public TaskbarAllAppsContainerView getAppsView() { } @Override - public boolean isBindingItems() { - return mTaskbarContext.isBindingItems(); + public boolean isAllAppsBackgroundBlurEnabled() { + return Flags.allAppsBlur() && mOverlayController != null + && mOverlayController.isBackgroundBlurEnabled(); + } + + /** Apply the blur or blur fallback style to the current theme. */ + private void updateBlurStyle() { + if (!Flags.allAppsBlur()) { + return; + } + getTheme().applyStyle(getAllAppsBlurStyleResId(), true); } @Override @@ -135,34 +167,89 @@ public View.OnLongClickListener getAllAppsItemLongClickListener() { } @Override - public PopupDataProvider getPopupDataProvider() { - return mTaskbarContext.getPopupDataProvider(); + public void startSplitSelection(SplitSelectSource splitSelectSource) { + mUiController.startSplitSelection(splitSelectSource); + } + + @Override + public boolean isTransientTaskbar() { + return mTaskbarContext.isTransientTaskbar(); } @Override - public void startSplitSelection(SplitSelectSource splitSelectSource) { - mUiController.startSplitSelection(splitSelectSource); + public boolean isPinnedTaskbar() { + return mTaskbarContext.isPinnedTaskbar(); + } + + @Override + public NavigationMode getNavigationMode() { + return mTaskbarContext.getNavigationMode(); + } + + @Override + public boolean isInDesktopMode() { + return mTaskbarContext.isInDesktopMode(); + } + + @Override + public boolean isTaskbarShowingDesktopTasks() { + return mTaskbarContext.isTaskbarShowingDesktopTasks(); + } + + @Override + public boolean showLockedTaskbarOnHome() { + return mTaskbarContext.showLockedTaskbarOnHome(); + } + + @Override + public boolean showDesktopTaskbarForFreeformDisplay() { + return mTaskbarContext.showDesktopTaskbarForFreeformDisplay(); + } + + @Override + public Point getScreenSize() { + return mTaskbarContext.getScreenSize(); + } + + @Override + public int getDisplayHeight() { + return mTaskbarContext.getDisplayHeight(); } @Override - public DotInfo getDotInfoForItem(ItemInfo info) { - return mTaskbarContext.getDotInfoForItem(info); + public void notifyConfigChanged() { + mTaskbarContext.notifyConfigChanged(); } @Override public void onDragStart() { + mDragToBubbleController.ifPresent(c -> { + setupBubbleBarDropViewContainer(); + c.setOverlayContainerView(mBubbleBarDropViewContainer); + }); } @Override public void onDragEnd() { + mDragToBubbleController.ifPresent(c -> c.setOverlayContainerView(null)); mOverlayController.maybeCloseWindow(); } @Override - public void onPopupVisibilityChanged(boolean isVisible) { - } + public void onPopupVisibilityChanged(boolean isVisible) {} @Override public void onSplitScreenMenuButtonClicked() { } + + private void setupBubbleBarDropViewContainer() { + if (mDragToBubbleController.isEmpty() || mBubbleBarDropViewContainer != null) { + return; + } + mBubbleBarDropViewContainer = new FrameLayout(this); + mDragLayer.addView(mBubbleBarDropViewContainer); + LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT); + lp.ignoreInsets = true; + mBubbleBarDropViewContainer.setLayoutParams(lp); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContextFactory.kt b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContextFactory.kt new file mode 100644 index 00000000000..8606df71f50 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContextFactory.kt @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.overlay + +import android.content.Context +import com.android.launcher3.dagger.LauncherComponentProvider +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarControllers +import javax.inject.Inject + +/** Creates [TaskbarOverlayContext] instances. */ +open class TaskbarOverlayContextFactory @Inject constructor() { + + open fun create( + windowContext: Context, + activityContext: TaskbarActivityContext, + controllers: TaskbarControllers, + ): TaskbarOverlayContext = TaskbarOverlayContext(windowContext, activityContext, controllers) + + companion object { + @JvmStatic + fun newInstance(context: Context): TaskbarOverlayContextFactory { + return LauncherComponentProvider.get(context).getTaskbarOverlayContextFactory() + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java index 7eb34a51c81..73545557bae 100644 --- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java +++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java @@ -15,9 +15,11 @@ */ package com.android.launcher3.taskbar.overlay; +import static android.os.Trace.TRACE_TAG_APP; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_CONSUME_IME_INSETS; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; +import static android.window.DesktopModeFlags.ENABLE_TASKBAR_OVERFLOW; import static com.android.launcher3.AbstractFloatingView.TYPE_ALL; import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE; @@ -26,8 +28,16 @@ import android.annotation.SuppressLint; import android.content.Context; import android.graphics.PixelFormat; +import android.gui.EarlyWakeupInfo; +import android.os.Binder; +import android.os.Trace; +import android.util.Log; +import android.view.AttachedSurfaceControl; +import android.view.CrossWindowBlurListeners; import android.view.Gravity; import android.view.MotionEvent; +import android.view.SurfaceControl; +import android.view.ViewRootImpl; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; @@ -35,8 +45,13 @@ import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; +import com.android.launcher3.R; import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarControllers; +import com.android.launcher3.taskbar.bubbles.BubbleActivityStarter; +import com.android.launcher3.taskbar.bubbles.BubbleActivityStarter.Listener; +import com.android.systemui.shared.system.BlurUtils; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; @@ -51,12 +66,22 @@ */ public final class TaskbarOverlayController { + private static final String TAG = "TaskbarOverlayController"; private static final String WINDOW_TITLE = "Taskbar Overlay"; private final TaskbarActivityContext mTaskbarContext; private final Context mWindowContext; private final TaskbarOverlayProxyView mProxyView; private final LayoutParams mLayoutParams; + private final int mMaxBlurRadius; + private final BubbleActivityStarter mBubbleBarActivityStarter; + + private final Listener mBubbleShowListener = new Listener() { + @Override + public void onBubbleLaunchRequested() { + mBubbleShowRequested = true; + } + }; private final TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() { @Override @@ -79,7 +104,10 @@ public void onTaskStackChanged() { private void hideWindowOnTaskStackChange() { // A task was launched while overlay window was open, so stash Taskbar. - mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true); + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar( + /* stash = */ true, + /* shouldBubblesFollow = */ !mBubbleShowRequested + ); hideWindow(); } }; @@ -87,6 +115,13 @@ private void hideWindowOnTaskStackChange() { private DeviceProfile mLauncherDeviceProfile; private @Nullable TaskbarOverlayContext mOverlayContext; private TaskbarControllers mControllers; // Initialized in init. + // True if we have alerted surface flinger of an expensive call for blur. + private boolean mInEarlyWakeUp; + private boolean mBubbleShowRequested; + /** + * Token for early wakeup requests to SurfaceFlinger. + */ + private EarlyWakeupInfo mEarlyWakeupInfo = new EarlyWakeupInfo(); public TaskbarOverlayController( TaskbarActivityContext taskbarContext, DeviceProfile launcherDeviceProfile) { @@ -95,6 +130,11 @@ public TaskbarOverlayController( mProxyView = new TaskbarOverlayProxyView(); mLayoutParams = createLayoutParams(); mLauncherDeviceProfile = launcherDeviceProfile; + mMaxBlurRadius = mTaskbarContext.getResources().getDimensionPixelSize( + R.dimen.max_depth_blur_radius_enhanced); + mEarlyWakeupInfo.token = new Binder(); + mEarlyWakeupInfo.trace = TaskbarOverlayController.class.getName(); + mBubbleBarActivityStarter = BubbleActivityStarter.INSTANCE.get(taskbarContext); } /** Initialize the controller. */ @@ -108,8 +148,9 @@ public void init(TaskbarControllers controllers) { */ public TaskbarOverlayContext requestWindow() { if (mOverlayContext == null) { - mOverlayContext = new TaskbarOverlayContext( + mOverlayContext = TaskbarOverlayContextFactory.newInstance(mWindowContext).create( mWindowContext, mTaskbarContext, mControllers); + mBubbleBarActivityStarter.addListener(mBubbleShowListener); } if (!mProxyView.isOpen()) { @@ -149,10 +190,16 @@ private boolean canCloseWindow() { /** Destroys the controller and any overlay window if present. */ public void onDestroy() { TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener); - Optional.ofNullable(mOverlayContext) - .map(c -> c.getSystemService(WindowManager.class)) - .ifPresent(m -> m.removeViewImmediate(mOverlayContext.getDragLayer())); + Optional.ofNullable(mOverlayContext).ifPresent(c -> { + c.onDestroy(); + WindowManager wm = c.getSystemService(WindowManager.class); + if (wm != null) { + wm.removeViewImmediate(mOverlayContext.getDragLayer()); + } + }); mOverlayContext = null; + mBubbleBarActivityStarter.removeListener(mBubbleShowListener); + mBubbleShowRequested = false; } /** The current device profile for the overlay window. */ @@ -160,7 +207,7 @@ public DeviceProfile getLauncherDeviceProfile() { return mLauncherDeviceProfile; } - /** Updates {@link DeviceProfile} instance for Taskbar's overlay window. */ + /** Updates {@link deviceprofile} instance for Taskbar's overlay window. */ public void updateLauncherDeviceProfile(DeviceProfile dp) { mLauncherDeviceProfile = dp; Optional.ofNullable(mOverlayContext).ifPresent(c -> { @@ -183,7 +230,7 @@ public int getCloseDuration() { private LayoutParams createLayoutParams() { LayoutParams layoutParams = new LayoutParams( TYPE_APPLICATION_OVERLAY, - LayoutParams.FLAG_SPLIT_TOUCH, + /* flags = */ 0, PixelFormat.TRANSLUCENT); layoutParams.setTitle(WINDOW_TITLE); layoutParams.gravity = Gravity.BOTTOM; @@ -195,6 +242,97 @@ private LayoutParams createLayoutParams() { return layoutParams; } + /** + * Sets the blur radius for the overlay window. + * + * @param radius the blur radius in pixels. This will automatically change to {@code 0} if blurs + * are unsupported on the device. + */ + public void setBackgroundBlurRadius(int radius) { + if (!Flags.allAppsBlur()) { + return; + } + if (!BlurUtils.supportsBlursOnWindows(mWindowContext)) { + Log.d(TAG, "setBackgroundBlurRadius: not supported, setting to 0"); + radius = 0; + // intentionally falling through in case a non-0 blur was previously set. + } + if (!CrossWindowBlurListeners.getInstance().isCrossWindowBlurEnabled()) { + Log.d(TAG, "setBackgroundBlurRadius: disabled, setting to 0"); + radius = 0; + // intentionally falling through in case a non-0 blur was previously set. + } + if (mOverlayContext == null) { + Log.w(TAG, "setBackgroundBlurRadius: no overlay context"); + return; + } + TaskbarOverlayDragLayer dragLayer = mOverlayContext.getDragLayer(); + if (dragLayer == null) { + Log.w(TAG, "setBackgroundBlurRadius: no drag layer"); + return; + } + ViewRootImpl dragLayerViewRoot = dragLayer.getViewRootImpl(); + if (dragLayerViewRoot == null) { + Log.w(TAG, "setBackgroundBlurRadius: dragLayerViewRoot is null"); + return; + } + AttachedSurfaceControl rootSurfaceControl = dragLayer.getRootSurfaceControl(); + if (rootSurfaceControl == null) { + Log.w(TAG, "setBackgroundBlurRadius: rootSurfaceControl is null"); + return; + } + SurfaceControl surfaceControl = dragLayerViewRoot.getSurfaceControl(); + if (surfaceControl == null || !surfaceControl.isValid()) { + Log.w(TAG, "setBackgroundBlurRadius: surfaceControl is null or invalid"); + return; + } + Log.v(TAG, "setBackgroundBlurRadius: " + radius); + final SurfaceControl.Transaction transaction = + new SurfaceControl.Transaction().setBackgroundBlurRadius(surfaceControl, radius); + + try (transaction) { + // Set early wake-up flags when we know we're executing an expensive operation, this way + // SurfaceFlinger will adjust its internal offsets to avoid jank. + boolean wantsEarlyWakeUp = radius > 0 && radius < mMaxBlurRadius; + if (wantsEarlyWakeUp && !mInEarlyWakeUp) { + Log.d(TAG, "setBackgroundBlurRadius: setting early wakeup with token " + + mEarlyWakeupInfo); + Trace.instantForTrack(TRACE_TAG_APP, TAG, "notifyRendererForGpuLoadUp"); + dragLayerViewRoot.notifyRendererForGpuLoadUp("setBackgroundBlurRadius"); + try { + transaction.setEarlyWakeupStart(mEarlyWakeupInfo); + } catch (NoSuchMethodError e) { + // LC-Ignored: wtf? + } + mInEarlyWakeUp = true; + } else if (!wantsEarlyWakeUp && mInEarlyWakeUp) { + Log.d(TAG, "setBackgroundBlurRadius: clearing early wakeup with token " + + mEarlyWakeupInfo); + try { + transaction.setEarlyWakeupEnd(mEarlyWakeupInfo); + } catch (NoSuchMethodError e) { + // LC-Ignored: wtf? + } + mInEarlyWakeUp = false; + } + + rootSurfaceControl.applyTransactionOnDraw(transaction); + } + } + + boolean isBackgroundBlurEnabled() { + return BlurUtils.supportsBlursOnWindows(mWindowContext) + && CrossWindowBlurListeners.getInstance().isCrossWindowBlurEnabled(); + } + + /** Returns {@code true} if overlay or Taskbar windows are handling a system drag. */ + public boolean isAnySystemDragInProgress() { + boolean overlaySystemDragInProgress = mOverlayContext != null + && mOverlayContext.getDragController().isSystemDragInProgress(); + return overlaySystemDragInProgress + || mTaskbarContext.getDragController().isSystemDragInProgress(); + } + /** * Proxy view connecting taskbar drag layer to the overlay window. * @@ -216,6 +354,13 @@ private void show() { @Override protected void handleClose(boolean animate) { if (!mIsOpen) return; + if (ENABLE_TASKBAR_OVERFLOW.isTrue()) { + // Mark the view closed before attempting to remove it, so the drag layer does not + // schedule another call to close. Needed for taskbar overflow in case the KQS + // view shown for taskbar overflow needs to be reshown - delayed close call would + // would result in reshown KQS view getting hidden. + mIsOpen = false; + } mTaskbarContext.getDragLayer().removeView(this); Optional.ofNullable(mOverlayContext).ifPresent(c -> { if (canCloseWindow()) { diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java index 773b0b956fc..9ecffdc6b3b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java +++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java @@ -34,7 +34,6 @@ import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; -import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.TouchController; import com.android.launcher3.views.BaseDragLayer; @@ -72,8 +71,9 @@ protected void onDetachedFromWindow() { @Override public void recreateControllers() { + super.recreateControllers(); List controllers = new ArrayList<>(); - controllers.add(mActivity.getDragController()); + controllers.add(mContainer.getDragController()); controllers.addAll(mTouchControllers); mControllers = controllers.toArray(new TouchController[0]); } @@ -87,7 +87,7 @@ public boolean dispatchTouchEvent(MotionEvent ev) { @Override public boolean dispatchKeyEvent(KeyEvent event) { if (event.getAction() == ACTION_UP && event.getKeyCode() == KEYCODE_BACK) { - AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity); + AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mContainer); if (topView != null && topView.canHandleBack()) { topView.onBackInvoked(); return true; @@ -96,7 +96,7 @@ public boolean dispatchKeyEvent(KeyEvent event) { && event.getKeyCode() == KeyEvent.KEYCODE_ESCAPE && event.hasNoModifiers()) { // Ignore escape if pressed in conjunction with any modifier keys. Close each // floating view one at a time for each key press. - AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity); + AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mContainer); if (topView != null) { topView.close(/* animate= */ true); return true; @@ -107,7 +107,7 @@ public boolean dispatchKeyEvent(KeyEvent event) { @Override public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo inoutInfo) { - if (mActivity.isAnySystemDragInProgress()) { + if (mContainer.isAnySystemDragInProgress()) { inoutInfo.touchableRegion.setEmpty(); inoutInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); } @@ -123,7 +123,7 @@ public WindowInsets onApplyWindowInsets(WindowInsets insets) { @Override public void onViewRemoved(View child) { super.onViewRemoved(child); - mActivity.getOverlayController().maybeCloseWindow(); + mContainer.getOverlayController().maybeCloseWindow(); } /** Adds a {@link TouchController} to this drag layer. */ @@ -147,14 +147,14 @@ public void removeTouchController(@NonNull TouchController touchController) { * 2) Sets tappableInsets bottom inset to 0. */ private WindowInsets updateInsetsDueToStashing(WindowInsets oldInsets) { - if (!DisplayController.isTransientTaskbar(mActivity)) { + if (!mContainer.isTransientTaskbar()) { return oldInsets; } WindowInsets.Builder updatedInsetsBuilder = new WindowInsets.Builder(oldInsets); Insets oldNavInsets = oldInsets.getInsets(WindowInsets.Type.navigationBars()); Insets newNavInsets = Insets.of(oldNavInsets.left, oldNavInsets.top, oldNavInsets.right, - mActivity.getStashedTaskbarHeight()); + mContainer.getStashedTaskbarHeight()); updatedInsetsBuilder.setInsets(WindowInsets.Type.navigationBars(), newNavInsets); Insets oldTappableInsets = oldInsets.getInsets(WindowInsets.Type.tappableElement()); diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java deleted file mode 100644 index 14d391ba1c0..00000000000 --- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java +++ /dev/null @@ -1,161 +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.launcher3.uioverrides; - -import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE; -import static com.android.app.animation.Interpolators.AGGRESSIVE_EASE_IN_OUT; -import static com.android.app.animation.Interpolators.FINAL_FRAME; -import static com.android.app.animation.Interpolators.INSTANT; -import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.LauncherState.QUICK_SWITCH_FROM_HOME; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SPLIT_SELECTION_EXIT_HOME; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y; -import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; -import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET; -import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS; -import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; -import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; -import static com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA; - -import android.util.FloatProperty; -import android.view.animation.Interpolator; - -import androidx.annotation.NonNull; - -import com.android.launcher3.LauncherState; -import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.statemanager.StateManager.StateHandler; -import com.android.launcher3.states.StateAnimationConfig; -import com.android.quickstep.views.RecentsView; - -/** - * State handler for recents view. Manages UI changes and animations for recents view based off the - * current {@link LauncherState}. - * - * @param the recents view - */ -public abstract class BaseRecentsViewStateController - implements StateHandler { - protected final T mRecentsView; - protected final QuickstepLauncher mLauncher; - - public BaseRecentsViewStateController(@NonNull QuickstepLauncher launcher) { - mLauncher = launcher; - mRecentsView = launcher.getOverviewPanel(); - } - - @Override - public void setState(@NonNull LauncherState state) { - float[] scaleAndOffset = state.getOverviewScaleAndOffset(mLauncher); - RECENTS_SCALE_PROPERTY.set(mRecentsView, scaleAndOffset[0]); - ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, scaleAndOffset[1]); - TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f); - - getContentAlphaProperty().set(mRecentsView, state.isRecentsViewVisible ? 1f : 0); - getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness()); - RECENTS_GRID_PROGRESS.set(mRecentsView, - state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f); - TASK_THUMBNAIL_SPLASH_ALPHA.set(mRecentsView, state.showTaskThumbnailSplash() ? 1f : 0f); - } - - @Override - public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config, - PendingAnimation builder) { - if (config.hasAnimationFlag(SKIP_OVERVIEW)) { - return; - } - setStateWithAnimationInternal(toState, config, builder); - builder.addEndListener(success -> { - if (!success) { - mRecentsView.reset(); - } - }); - } - - /** - * Core logic for animating the recents view UI. - * - * @param toState state to animate to - * @param config current animation config - * @param setter animator set builder - */ - void setStateWithAnimationInternal(@NonNull final LauncherState toState, - @NonNull StateAnimationConfig config, @NonNull PendingAnimation setter) { - float[] scaleAndOffset = toState.getOverviewScaleAndOffset(mLauncher); - setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0], - config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR)); - setter.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1], - config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR)); - setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f, - config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR)); - - boolean exitingOverview = - !FeatureFlags.enableSplitContextually() && !toState.isRecentsViewVisible; - if (mRecentsView.isSplitSelectionActive() && exitingOverview) { - setter.add(mRecentsView.getSplitSelectController().getSplitAnimationController() - .createPlaceholderDismissAnim(mLauncher, LAUNCHER_SPLIT_SELECTION_EXIT_HOME, - setter.getDuration())); - setter.setViewAlpha( - mRecentsView.getSplitInstructionsView(), - 0, - config.getInterpolator( - ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE, - LINEAR - ) - ); - } - - setter.setFloat(mRecentsView, getContentAlphaProperty(), - toState.isRecentsViewVisible ? 1 : 0, - config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT)); - - setter.setFloat( - mRecentsView, getTaskModalnessProperty(), - toState.getOverviewModalness(), - config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR)); - - LauncherState fromState = mLauncher.getStateManager().getState(); - setter.setFloat(mRecentsView, TASK_THUMBNAIL_SPLASH_ALPHA, - toState.showTaskThumbnailSplash() ? 1f : 0f, - getOverviewInterpolator(fromState, toState)); - - setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, - toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f, - getOverviewInterpolator(fromState, toState)); - } - - private Interpolator getOverviewInterpolator(LauncherState fromState, LauncherState toState) { - return fromState == QUICK_SWITCH_FROM_HOME - ? ACCELERATE_DECELERATE - : toState.isRecentsViewVisible ? INSTANT : FINAL_FRAME; - } - - abstract FloatProperty getTaskModalnessProperty(); - - /** - * Get property for content alpha for the recents view. - * - * @return the float property for the view's content alpha - */ - abstract FloatProperty getContentAlphaProperty(); -} diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java deleted file mode 100644 index f91569824a0..00000000000 --- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java +++ /dev/null @@ -1,465 +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.launcher3.uioverrides; - -import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE; -import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED; -import static com.android.launcher3.icons.FastBitmapDrawable.getDisabledColorFilter; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ArgbEvaluator; -import android.animation.Keyframe; -import android.animation.ObjectAnimator; -import android.animation.PropertyValuesHolder; -import android.animation.ValueAnimator; -import android.annotation.Nullable; -import android.content.Context; -import android.graphics.BlurMaskFilter; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Matrix; -import android.graphics.Paint; -import android.graphics.Path; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.os.Process; -import android.util.AttributeSet; -import android.util.FloatProperty; -import android.view.LayoutInflater; -import android.view.ViewGroup; - -import androidx.core.graphics.ColorUtils; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherSettings; -import com.android.launcher3.R; -import com.android.launcher3.anim.AnimatorListeners; -import com.android.launcher3.celllayout.CellLayoutLayoutParams; -import com.android.launcher3.celllayout.DelegatedCellDrawing; -import com.android.launcher3.icons.BitmapInfo; -import com.android.launcher3.icons.GraphicsUtils; -import com.android.launcher3.icons.IconNormalizer; -import com.android.launcher3.icons.LauncherIcons; -import com.android.launcher3.model.data.ItemInfoWithIcon; -import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.touch.ItemLongClickListener; -import com.android.launcher3.util.SafeCloseable; -import com.android.launcher3.views.ActivityContext; -import com.android.launcher3.views.DoubleShadowBubbleTextView; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import app.lawnchair.theme.color.tokens.ColorTokens; - -/** - * A BubbleTextView with a ring around it's drawable - */ -public class PredictedAppIcon extends DoubleShadowBubbleTextView { - - private static final int RING_SHADOW_COLOR = 0x99000000; - private static final float RING_EFFECT_RATIO = 0.095f; - - private static final long ICON_CHANGE_ANIM_DURATION = 360; - private static final long ICON_CHANGE_ANIM_STAGGER = 50; - - boolean mIsDrawingDot = false; - private final DeviceProfile mDeviceProfile; - private final Paint mIconRingPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - private final Path mRingPath = new Path(); - private final int mNormalizedIconSize; - private final Path mShapePath; - private final Matrix mTmpMatrix = new Matrix(); - - private final BlurMaskFilter mShadowFilter; - - private boolean mIsPinned = false; - private int mPlateColor; - boolean mDrawForDrag = false; - - // Used for the "slot-machine" education animation. - private List mSlotMachineIcons; - private Animator mSlotMachineAnim; - private float mSlotMachineIconTranslationY; - - private static final FloatProperty SLOT_MACHINE_TRANSLATION_Y = new FloatProperty( - "slotMachineTranslationY") { - @Override - public void setValue(PredictedAppIcon predictedAppIcon, float transY) { - predictedAppIcon.mSlotMachineIconTranslationY = transY; - predictedAppIcon.invalidate(); - } - - @Override - public Float get(PredictedAppIcon predictedAppIcon) { - return predictedAppIcon.mSlotMachineIconTranslationY; - } - }; - - public PredictedAppIcon(Context context) { - this(context, null, 0); - } - - public PredictedAppIcon(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - Context mContext; - - public PredictedAppIcon(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - mContext = context; - mDeviceProfile = ActivityContext.lookupContext(context).getDeviceProfile(); - mNormalizedIconSize = IconNormalizer.getNormalizedCircleSize(getIconSize()); - int shadowSize = context.getResources().getDimensionPixelSize( - R.dimen.blur_size_thin_outline); - mShadowFilter = new BlurMaskFilter(shadowSize, BlurMaskFilter.Blur.OUTER); - mShapePath = GraphicsUtils.getShapePath(context, mNormalizedIconSize); - } - - @Override - public void onDraw(Canvas canvas) { - int count = canvas.save(); - boolean isSlotMachineAnimRunning = mSlotMachineAnim != null; - if (!mIsPinned) { - drawEffect(canvas); - if (isSlotMachineAnimRunning) { - // Clip to to outside of the ring during the slot machine animation. - canvas.clipPath(mRingPath); - } - canvas.translate(getWidth() * RING_EFFECT_RATIO, getHeight() * RING_EFFECT_RATIO); - canvas.scale(1 - 2 * RING_EFFECT_RATIO, 1 - 2 * RING_EFFECT_RATIO); - } - if (isSlotMachineAnimRunning) { - drawSlotMachineIcons(canvas); - } else { - super.onDraw(canvas); - } - canvas.restoreToCount(count); - } - - private void drawSlotMachineIcons(Canvas canvas) { - canvas.translate((getWidth() - getIconSize()) / 2f, - (getHeight() - getIconSize()) / 2f + mSlotMachineIconTranslationY); - for (Drawable icon : mSlotMachineIcons) { - icon.setBounds(0, 0, getIconSize(), getIconSize()); - icon.draw(canvas); - canvas.translate(0, getSlotMachineIconPlusSpacingSize()); - } - } - - private float getSlotMachineIconPlusSpacingSize() { - return getIconSize() + getOutlineOffsetY(); - } - - @Override - protected void drawDotIfNecessary(Canvas canvas) { - mIsDrawingDot = true; - int count = canvas.save(); - canvas.translate(-getWidth() * RING_EFFECT_RATIO, -getHeight() * RING_EFFECT_RATIO); - canvas.scale(1 + 2 * RING_EFFECT_RATIO, 1 + 2 * RING_EFFECT_RATIO); - super.drawDotIfNecessary(canvas); - canvas.restoreToCount(count); - mIsDrawingDot = false; - } - - @Override - public void applyFromWorkspaceItem(WorkspaceItemInfo info, boolean animate, int staggerIndex) { - // Create the slot machine animation first, since it uses the current icon to - // start. - Animator slotMachineAnim = animate - ? createSlotMachineAnim(Collections.singletonList(info.bitmap), false) - : null; - super.applyFromWorkspaceItem(info, animate, staggerIndex); - int oldPlateColor = mPlateColor; - - int newPlateColor; - if (getIcon().isThemed()) { - newPlateColor = ColorTokens.PredictedPlateColor.resolveColor(getContext()); - } else { - float[] hctPlateColor = new float[3]; - ColorUtils.colorToM3HCT(mDotParams.appColor, hctPlateColor); - newPlateColor = ColorUtils.M3HCTToColor(hctPlateColor[0], 36, 85); - } - - if (!animate) { - mPlateColor = newPlateColor; - } - if (mIsPinned) { - setContentDescription(info.contentDescription); - } else { - setContentDescription( - getContext().getString(R.string.hotseat_prediction_content_description, - info.contentDescription)); - } - - if (animate) { - ValueAnimator plateColorAnim = ValueAnimator.ofObject(new ArgbEvaluator(), - oldPlateColor, newPlateColor); - plateColorAnim.addUpdateListener(valueAnimator -> { - mPlateColor = (int) valueAnimator.getAnimatedValue(); - invalidate(); - }); - AnimatorSet changeIconAnim = new AnimatorSet(); - if (slotMachineAnim != null) { - changeIconAnim.play(slotMachineAnim); - } - changeIconAnim.play(plateColorAnim); - changeIconAnim.setStartDelay(staggerIndex * ICON_CHANGE_ANIM_STAGGER); - changeIconAnim.setDuration(ICON_CHANGE_ANIM_DURATION).start(); - } - } - - /** - * Returns an Animator that translates the given icons in a "slot-machine" - * fashion, beginning - * and ending with the original icon. - */ - public @Nullable Animator createSlotMachineAnim(List iconsToAnimate) { - return createSlotMachineAnim(iconsToAnimate, true); - } - - /** - * Returns an Animator that translates the given icons in a "slot-machine" - * fashion, beginning - * with the original icon, then cycling through the given icons, optionally - * ending back with - * the original icon. - * - * @param endWithOriginalIcon Whether we should land back on the icon we started - * with, rather - * than the last item in iconsToAnimate. - */ - public @Nullable Animator createSlotMachineAnim(List iconsToAnimate, - boolean endWithOriginalIcon) { - if (mIsPinned || iconsToAnimate == null || iconsToAnimate.isEmpty()) { - return null; - } - if (mSlotMachineAnim != null) { - mSlotMachineAnim.end(); - } - - // Bookend the other animating icons with the original icon on both ends. - mSlotMachineIcons = new ArrayList<>(iconsToAnimate.size() + 2); - mSlotMachineIcons.add(getIcon()); - iconsToAnimate.stream() - .map(iconInfo -> iconInfo.newIcon(mContext)) - .forEach(mSlotMachineIcons::add); - if (endWithOriginalIcon) { - mSlotMachineIcons.add(getIcon()); - } - - float finalTrans = -getSlotMachineIconPlusSpacingSize() * (mSlotMachineIcons.size() - 1); - Keyframe[] keyframes = new Keyframe[] { - Keyframe.ofFloat(0f, 0f), - Keyframe.ofFloat(0.82f, finalTrans - getOutlineOffsetY() / 2f), // Overshoot - Keyframe.ofFloat(1f, finalTrans) // Ease back into the final position - }; - keyframes[1].setInterpolator(ACCELERATE_DECELERATE); - keyframes[2].setInterpolator(ACCELERATE_DECELERATE); - - mSlotMachineAnim = ObjectAnimator.ofPropertyValuesHolder(this, - PropertyValuesHolder.ofKeyframe(SLOT_MACHINE_TRANSLATION_Y, keyframes)); - mSlotMachineAnim.addListener(AnimatorListeners.forEndCallback(() -> { - mSlotMachineIcons = null; - mSlotMachineAnim = null; - mSlotMachineIconTranslationY = 0; - invalidate(); - })); - return mSlotMachineAnim; - } - - /** - * Removes prediction ring from app icon - */ - public void pin(WorkspaceItemInfo info) { - if (mIsPinned) - return; - mIsPinned = true; - applyFromWorkspaceItem(info); - setOnLongClickListener(ItemLongClickListener.INSTANCE_WORKSPACE); - ((CellLayoutLayoutParams) getLayoutParams()).canReorder = true; - invalidate(); - } - - /** - * prepares prediction icon for usage after bind - */ - public void finishBinding(OnLongClickListener longClickListener) { - setOnLongClickListener(longClickListener); - ((CellLayoutLayoutParams) getLayoutParams()).canReorder = false; - setTextVisibility(false); - verifyHighRes(); - } - - @Override - public void getIconBounds(Rect outBounds) { - super.getIconBounds(outBounds); - if (!mIsPinned && !mIsDrawingDot) { - int predictionInset = (int) (getIconSize() * RING_EFFECT_RATIO); - outBounds.inset(predictionInset, predictionInset); - } - } - - public boolean isPinned() { - return mIsPinned; - } - - private int getOutlineOffsetX() { - return (getMeasuredWidth() - mNormalizedIconSize) / 2; - } - - private int getOutlineOffsetY() { - if (mDisplay != DISPLAY_TASKBAR) { - return getPaddingTop() + mDeviceProfile.folderIconOffsetYPx; - } - return (getMeasuredHeight() - mNormalizedIconSize) / 2; - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - updateRingPath(); - } - - @Override - public void setTag(Object tag) { - super.setTag(tag); - updateRingPath(); - } - - private void updateRingPath() { - boolean isBadged = false; - if (getTag() instanceof WorkspaceItemInfo) { - WorkspaceItemInfo info = (WorkspaceItemInfo) getTag(); - isBadged = !Process.myUserHandle().equals(info.user) - || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; - } - - mRingPath.reset(); - mTmpMatrix.setTranslate(getOutlineOffsetX(), getOutlineOffsetY()); - - mRingPath.addPath(mShapePath, mTmpMatrix); - if (isBadged) { - float outlineSize = mNormalizedIconSize * RING_EFFECT_RATIO; - float iconSize = getIconSize() * (1 - 2 * RING_EFFECT_RATIO); - float badgeSize = LauncherIcons.getBadgeSizeForIconSize((int) iconSize) + outlineSize; - float scale = badgeSize / mNormalizedIconSize; - mTmpMatrix.postTranslate(mNormalizedIconSize, mNormalizedIconSize); - mTmpMatrix.preScale(scale, scale); - mTmpMatrix.preTranslate(-mNormalizedIconSize, -mNormalizedIconSize); - mRingPath.addPath(mShapePath, mTmpMatrix); - } - } - - private void drawEffect(Canvas canvas) { - // Don't draw ring effect if item is about to be dragged. - if (mDrawForDrag) { - return; - } - mIconRingPaint.setColor(RING_SHADOW_COLOR); - mIconRingPaint.setMaskFilter(mShadowFilter); - canvas.drawPath(mRingPath, mIconRingPaint); - mIconRingPaint.setColor(mPlateColor); - mIconRingPaint.setMaskFilter(null); - canvas.drawPath(mRingPath, mIconRingPaint); - } - - @Override - public void setIconDisabled(boolean isDisabled) { - super.setIconDisabled(isDisabled); - mIconRingPaint.setColorFilter(isDisabled ? getDisabledColorFilter() : null); - invalidate(); - } - - @Override - protected void setItemInfo(ItemInfoWithIcon itemInfo) { - super.setItemInfo(itemInfo); - setIconDisabled(itemInfo.isDisabled()); - } - - @Override - public void getSourceVisualDragBounds(Rect bounds) { - super.getSourceVisualDragBounds(bounds); - if (!mIsPinned) { - int internalSize = (int) (bounds.width() * RING_EFFECT_RATIO); - bounds.inset(internalSize, internalSize); - } - } - - @Override - public SafeCloseable prepareDrawDragView() { - mDrawForDrag = true; - invalidate(); - SafeCloseable r = super.prepareDrawDragView(); - return () -> { - r.close(); - mDrawForDrag = false; - }; - } - - /** - * Creates and returns a new instance of PredictedAppIcon from WorkspaceItemInfo - */ - public static PredictedAppIcon createIcon(ViewGroup parent, WorkspaceItemInfo info) { - PredictedAppIcon icon = (PredictedAppIcon) LayoutInflater.from(parent.getContext()) - .inflate(R.layout.predicted_app_icon, parent, false); - icon.applyFromWorkspaceItem(info); - Launcher launcher = Launcher.getLauncher(parent.getContext()); - icon.setOnClickListener(launcher.getItemOnClickListener()); - icon.setOnFocusChangeListener(launcher.getFocusHandler()); - return icon; - } - - /** - * Draws Predicted Icon outline on cell layout - */ - public static class PredictedIconOutlineDrawing extends DelegatedCellDrawing { - - private final PredictedAppIcon mIcon; - private final Paint mOutlinePaint = new Paint(Paint.ANTI_ALIAS_FLAG); - - public PredictedIconOutlineDrawing(int cellX, int cellY, PredictedAppIcon icon) { - mDelegateCellX = cellX; - mDelegateCellY = cellY; - mIcon = icon; - mOutlinePaint.setStyle(Paint.Style.FILL); - mOutlinePaint.setColor(Color.argb(24, 245, 245, 245)); - } - - /** - * Draws predicted app icon outline under CellLayout - */ - @Override - public void drawUnderItem(Canvas canvas) { - canvas.save(); - canvas.translate(mIcon.getOutlineOffsetX(), mIcon.getOutlineOffsetY()); - canvas.drawPath(mIcon.mShapePath, mOutlinePaint); - canvas.restore(); - } - - /** - * Draws PredictedAppIcon outline over CellLayout - */ - @Override - public void drawOverItem(Canvas canvas) { - // Does nothing - } - } -} diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepAppWidgetHost.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepAppWidgetHost.java deleted file mode 100644 index 45813ce52e3..00000000000 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepAppWidgetHost.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.uioverrides; - -import static com.android.launcher3.widget.LauncherWidgetHolder.APPWIDGET_HOST_ID; - -import android.appwidget.AppWidgetHost; -import android.appwidget.AppWidgetProviderInfo; -import android.content.Context; -import android.os.Looper; - -import androidx.annotation.NonNull; - -import com.android.launcher3.LauncherAppState; -import com.android.launcher3.util.Executors; -import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; -import com.android.launcher3.widget.LauncherWidgetHolder; - -import java.util.function.IntConsumer; - -/** - * {@link AppWidgetHost} that is used to receive the changes to the widgets without - * storing any {@code Activity} info like that of the launcher. - */ -final class QuickstepAppWidgetHost extends AppWidgetHost { - private final @NonNull Context mContext; - private final @NonNull IntConsumer mAppWidgetRemovedCallback; - private final @NonNull LauncherWidgetHolder.ProviderChangedListener mProvidersChangedListener; - - QuickstepAppWidgetHost(@NonNull Context context, @NonNull IntConsumer appWidgetRemovedCallback, - @NonNull LauncherWidgetHolder.ProviderChangedListener listener, - @NonNull Looper looper) { - super(context, APPWIDGET_HOST_ID, null, looper); - mContext = context; - mAppWidgetRemovedCallback = appWidgetRemovedCallback; - mProvidersChangedListener = listener; - } - - @Override - protected void onProvidersChanged() { - mProvidersChangedListener.notifyWidgetProvidersChanged(); - } - - @Override - public void onAppWidgetRemoved(int appWidgetId) { - // Route the call via model thread, in case it comes while a loader-bind is in progress - Executors.MODEL_EXECUTOR.execute( - () -> Executors.MAIN_EXECUTOR.execute( - () -> mAppWidgetRemovedCallback.accept(appWidgetId))); - } - - @Override - protected void onProviderChanged(int appWidgetId, @NonNull AppWidgetProviderInfo appWidget) { - LauncherAppWidgetProviderInfo info = LauncherAppWidgetProviderInfo.fromProviderInfo( - mContext, appWidget); - super.onProviderChanged(appWidgetId, info); - // The super method updates the dimensions of the providerInfo. Update the - // launcher spans accordingly. - info.initSpans(mContext, LauncherAppState.getIDP(mContext)); - } -} diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepAppWidgetHostProvider.kt b/quickstep/src/com/android/launcher3/uioverrides/QuickstepAppWidgetHostProvider.kt new file mode 100644 index 00000000000..7a8aa4b1f51 --- /dev/null +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepAppWidgetHostProvider.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.uioverrides + +import android.app.ActivityThread +import android.content.Context +import android.content.ContextWrapper +import com.android.launcher3.BuildConfigs +import com.android.launcher3.util.LooperExecutor +import com.android.launcher3.widget.LauncherWidgetHolder +import com.android.launcher3.widget.ListenableAppWidgetHost + +object QuickstepAppWidgetHostProvider { + + /** Static widget host which is always listening and is lazily created */ + @JvmStatic + val staticQuickstepHost: ListenableAppWidgetHost by lazy { + ListenableAppWidgetHost( + LooperContext( + ActivityThread.currentApplication(), + ListenableAppWidgetHost.widgetHolderExecutor, + ), + LauncherWidgetHolder.APPWIDGET_HOST_ID, + ) + .apply { if (BuildConfigs.WIDGETS_ENABLED) startListening() } + } + + private class LooperContext(ctx: Context, val executor: LooperExecutor) : ContextWrapper(ctx) { + + override fun getMainLooper() = executor.looper + + override fun getMainExecutor() = executor + } +} diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java index aa0cc1f0f00..a3843ee597e 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java @@ -23,7 +23,6 @@ import android.app.IActivityTaskManagerHidden; import android.app.PendingIntent; import android.content.Intent; -import android.os.IBinder; import android.os.RemoteException; import android.util.Log; import android.util.Pair; @@ -31,20 +30,19 @@ import android.widget.RemoteViews; import android.window.SplashScreen; -import com.android.launcher3.Utilities; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.util.ActivityOptionsWrapper; import com.android.launcher3.widget.LauncherAppWidgetHostView; -import app.lawnchair.LawnchairApp; +import java.util.function.Consumer; + import dev.rikka.tools.refine.Refine; +import app.lawnchair.LawnchairApp; -/** - * Provides a Quickstep specific animation when launching an activity from an - * app widget. - */ -public class QuickstepInteractionHandler implements RemoteViews.InteractionHandler { +/** Provides a Quickstep specific animation when launching an activity from an app widget. */ +class QuickstepInteractionHandler implements RemoteViews.InteractionHandler, + Consumer { private static final String TAG = "QuickstepInteractionHandler"; @@ -54,10 +52,15 @@ public QuickstepInteractionHandler(QuickstepLauncher launcher) { mLauncher = launcher; } + @Override + public void accept(LauncherAppWidgetHostView host) { + host.setInteractionHandler(this); + } + @SuppressWarnings("NewApi") @Override public boolean onInteraction(View view, PendingIntent pendingIntent, - RemoteViews.RemoteResponse remoteResponse) { + RemoteViews.RemoteResponse remoteResponse) { LauncherAppWidgetHostView hostView = findHostViewAncestor(view); if (hostView == null) { Log.e(TAG, "View did not have a LauncherAppWidgetHostView ancestor."); @@ -72,8 +75,14 @@ public boolean onInteraction(View view, PendingIntent pendingIntent, return true; } Pair options = remoteResponse.getLaunchOptions(view); - ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager() - .getActivityLaunchOptions(hostView); + + ActivityOptionsWrapper activityOptions = null; + try { + activityOptions = mLauncher.getAppTransitionManager() + .getActivityLaunchOptions(hostView, (ItemInfo) hostView.getTag()); + } catch (NullPointerException e) { + Log.e("pE(C7evQZDJ)", "Failed to get activity launch options"); + } if (!pendingIntent.isActivity()) { // In the event this pending intent eventually launches an activity, i.e. a trampoline, // use the Quickstep transition animation. @@ -89,7 +98,8 @@ public boolean onInteraction(View view, PendingIntent pendingIntent, pendingIntent.getCreatorPackage(), activityOptions.options.getRemoteAnimationAdapter()); } - } catch (RemoteException e) { + } catch (NullPointerException | RemoteException e) { + // pE-TODO(C7evQZDJ): Remove NullPointerException after fixing // Do nothing. } } @@ -101,16 +111,24 @@ public boolean onInteraction(View view, PendingIntent pendingIntent, } catch (Throwable t) { // ignore } - options = Pair.create(options.first, activityOptions.options); + // pE-TODO(C7evQZDJ): Remove activityOptions null check + if (activityOptions != null) { + options = Pair.create(options.first, activityOptions.options); + } if (pendingIntent.isActivity()) { logAppLaunch(hostView.getTag()); } - return RemoteViews.startPendingIntent(hostView, pendingIntent, options); + if (activityOptions != null) { + return RemoteViews.startPendingIntent(hostView, pendingIntent, options); + } else { + Log.d("pE(C7evQZDJ)", "activityOptions is null!"); + return RemoteViews.startPendingIntent(hostView, pendingIntent, + remoteResponse.getLaunchOptions(view)); + } } /** * Logs that the app was launched from the widget. - * * @param itemInfo the widget info. */ private void logAppLaunch(Object itemInfo) { @@ -123,9 +141,8 @@ private void logAppLaunch(Object itemInfo) { private LauncherAppWidgetHostView findHostViewAncestor(View v) { while (v != null) { - if (v instanceof LauncherAppWidgetHostView) - return (LauncherAppWidgetHostView) v; - v = (View) v.getParent(); + if (v instanceof LauncherAppWidgetHostView) return (LauncherAppWidgetHostView) v; + v = (v.getParent() instanceof View parentView) ? parentView : null; } return null; } diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 03aa1006082..b6327965e0c 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -16,40 +16,59 @@ package com.android.launcher3.uioverrides; import static android.app.ActivityTaskManager.INVALID_TASK_ID; +import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_OPTIMIZE_MEASURE; import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED; import static com.android.app.animation.Interpolators.EMPHASIZED; import static com.android.internal.jank.Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE; -import static com.android.launcher3.Flags.enablePredictiveBackGesture; +import static com.android.launcher3.Flags.enableExpressiveDismissTaskMotion; +import static com.android.launcher3.Flags.enableOverviewBackgroundWallpaperBlur; import static com.android.launcher3.Flags.enableUnfoldStateAnimation; +import static com.android.launcher3.Flags.refactorTaskbarUiState; import static com.android.launcher3.LauncherConstants.SavedInstanceKeys.PENDING_SPLIT_SELECT_INFO; import static com.android.launcher3.LauncherConstants.SavedInstanceKeys.RUNTIME_STATE; import static com.android.launcher3.LauncherSettings.Animation.DEFAULT_NO_ICON; import static com.android.launcher3.LauncherSettings.Animation.VIEW_BACKGROUND; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; import static com.android.launcher3.LauncherState.ALL_APPS; +import static com.android.launcher3.LauncherState.FLAG_SKIP_STATE_ANNOUNCEMENT; +import static com.android.launcher3.LauncherState.HOTSEAT_ICONS; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.NO_OFFSET; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK; import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT; +import static com.android.launcher3.Utilities.ATLEAST_BAKLAVA; +import static com.android.launcher3.Utilities.ATLEAST_S; +import static com.android.launcher3.Utilities.ATLEAST_S_V2; +import static com.android.launcher3.Utilities.ATLEAST_T; +import static com.android.launcher3.Utilities.isRtl; +import static com.android.launcher3.anim.AnimatorListeners.forEndCallback; import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent; -import static com.android.launcher3.config.FeatureFlags.enableSplitContextually; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SPLIT_SELECTION_EXIT_HOME; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SPLIT_SELECTION_EXIT_INTERRUPTED; +import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_NOT_PINNABLE; import static com.android.launcher3.popup.QuickstepSystemShortcut.getSplitSelectShortcutByPosition; +import static com.android.launcher3.popup.SystemShortcut.ADD_TO_HOME_SCREEN; import static com.android.launcher3.popup.SystemShortcut.APP_INFO; +import static com.android.launcher3.popup.SystemShortcut.BUBBLE_SHORTCUT; import static com.android.launcher3.popup.SystemShortcut.DONT_SUGGEST_APP; import static com.android.launcher3.popup.SystemShortcut.INSTALL; import static com.android.launcher3.popup.SystemShortcut.PRIVATE_PROFILE_INSTALL; +import static com.android.launcher3.popup.SystemShortcut.REMOVE; import static com.android.launcher3.popup.SystemShortcut.UNINSTALL_APP; import static com.android.launcher3.popup.SystemShortcut.WIDGETS; import static com.android.launcher3.taskbar.LauncherTaskbarUIController.ALL_APPS_PAGE_PROGRESS_INDEX; import static com.android.launcher3.taskbar.LauncherTaskbarUIController.MINUS_ONE_PAGE_PROGRESS_INDEX; import static com.android.launcher3.taskbar.LauncherTaskbarUIController.WIDGETS_PAGE_PROGRESS_INDEX; +import static com.android.launcher3.taskbar.PinToTaskbarShortcut.PIN_ITEM_FROM_LAUNCHER; import static com.android.launcher3.testing.shared.TestProtocol.HINT_STATE_ORDINAL; import static com.android.launcher3.testing.shared.TestProtocol.HINT_STATE_TWO_BUTTON_ORDINAL; import static com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_STATE_ORDINAL; @@ -60,9 +79,7 @@ import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback; import static com.android.quickstep.util.SplitAnimationTimings.TABLET_HOME_TO_SPLIT; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY; -import static com.android.window.flags2.Flags.enableDesktopWindowingMode; -import static com.android.window.flags2.Flags.enableDesktopWindowingWallpaperActivity; -import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -71,6 +88,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentSender; +import android.content.pm.ShortcutInfo; import android.content.res.Configuration; import android.graphics.Rect; import android.graphics.RectF; @@ -78,17 +96,18 @@ import android.media.permission.SafeCloseable; import android.os.Build; import android.os.Bundle; -import android.os.Handler; -import android.os.IBinder; import android.os.IRemoteCallback; -import android.os.Looper; import android.os.SystemProperties; +import android.os.UserHandle; +import android.text.TextUtils; import android.util.AttributeSet; -import android.view.Display; import android.view.HapticFeedbackConstants; import android.view.KeyEvent; import android.view.View; +import android.widget.AnalogClock; +import android.widget.TextClock; import android.window.BackEvent; +import android.window.DesktopExperienceFlags; import android.window.OnBackAnimationCallback; import android.window.OnBackInvokedDispatcher; import android.window.RemoteTransition; @@ -97,22 +116,26 @@ import androidx.annotation.BinderThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import com.android.app.viewcapture.ViewCaptureFactory; import com.android.launcher3.AbstractFloatingView; +import com.android.launcher3.BuildConfig; +import com.android.launcher3.BuildConfigs; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Flags; +import com.android.launcher3.GestureNavContract; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.LauncherState; -import com.android.launcher3.OnBackPressedHandler; import com.android.launcher3.QuickstepAccessibilityDelegate; import com.android.launcher3.QuickstepTransitionManager; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; +import com.android.launcher3.allapps.AllAppsRecyclerView; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.apppairs.AppPairIcon; @@ -123,20 +146,25 @@ import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager.StatsLogger; -import com.android.launcher3.model.BgDataModel.FixedContainerItems; import com.android.launcher3.model.WellbeingModel; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.ItemInfoWithIcon; +import com.android.launcher3.model.data.PredictedContainerInfo; import com.android.launcher3.popup.SystemShortcut; import com.android.launcher3.proxy.ProxyActivityStarter; import com.android.launcher3.statehandlers.DepthController; import com.android.launcher3.statehandlers.DesktopVisibilityController; +import com.android.launcher3.statemanager.StateManager; import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory; import com.android.launcher3.statemanager.StateManager.StateHandler; -import com.android.launcher3.taskbar.LauncherTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.taskbar.TaskbarManager; +import com.android.launcher3.taskbar.TaskbarUiState; +import com.android.launcher3.taskbar.TaskbarUiStateMonitor; +import com.android.launcher3.taskbar.bubbles.BubbleActivityStarter; +import com.android.launcher3.taskbar.bubbles.BubbleBarController; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; -import com.android.launcher3.uioverrides.QuickstepWidgetHolder.QuickstepHolderFactory; import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory; import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController; import com.android.launcher3.uioverrides.touchcontrollers.NoButtonNavbarToOverviewTouchController; @@ -144,7 +172,10 @@ import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController; import com.android.launcher3.uioverrides.touchcontrollers.QuickSwitchTouchController; import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController; -import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewDismissTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewLaunchTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewRecentsTouchContext; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchControllerDeprecated; import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController; import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarTouchController; import com.android.launcher3.util.ActivityOptionsWrapper; @@ -152,26 +183,35 @@ import com.android.launcher3.util.IntSet; import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.ObjectWrapper; +import com.android.launcher3.util.OverviewCommandHelperProtoLogProxy; import com.android.launcher3.util.PendingRequestArgs; import com.android.launcher3.util.PendingSplitSelectInfo; import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource; +import com.android.launcher3.util.StableViewInfo; import com.android.launcher3.util.StartActivityParams; import com.android.launcher3.util.TouchController; -import com.android.launcher3.widget.LauncherWidgetHolder; +import com.android.launcher3.views.FloatingIconView; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.LauncherActivityInterface; import com.android.quickstep.OverviewCommandHelper; import com.android.quickstep.OverviewComponentObserver; -import com.android.quickstep.RecentsAnimationDeviceState; +import com.android.quickstep.OverviewComponentObserver.OverviewChangeListener; import com.android.quickstep.RecentsModel; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TaskUtils; import com.android.quickstep.TouchInteractionService.TISBinder; -import com.android.quickstep.util.GroupTask; +import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.fallback.RecentsStateUtilsKt; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; +import com.android.quickstep.util.AnimUtils; +import com.android.quickstep.util.AsyncClockEventDelegate; import com.android.quickstep.util.LauncherUnfoldAnimationController; import com.android.quickstep.util.QuickstepOnboardingPrefs; import com.android.quickstep.util.SplitSelectStateController; +import com.android.quickstep.util.SplitTask; import com.android.quickstep.util.SplitToWorkspaceController; import com.android.quickstep.util.SplitWithKeyboardShortcutController; import com.android.quickstep.util.TISBindHelper; @@ -182,7 +222,11 @@ import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; import com.android.quickstep.views.TaskView; +import com.android.quickstep.window.RecentsWindowFlags; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.systemui.animation.back.FlingOnBackAnimationCallback; import com.android.systemui.shared.recents.model.Task; +import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.unfold.RemoteUnfoldSharedComponent; import com.android.systemui.unfold.UnfoldTransitionFactory; import com.android.systemui.unfold.UnfoldTransitionProgressProvider; @@ -191,9 +235,12 @@ import com.android.systemui.unfold.dagger.UnfoldMain; import com.android.systemui.unfold.progress.RemoteUnfoldTransitionReceiver; import com.android.systemui.unfold.updates.RotationChangeProvider; +import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper; +import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import com.android.wm.shell.shared.bubbles.logging.EntryPoint; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.desktopmode.DesktopState; -import app.lawnchair.LawnchairApp; -import app.lawnchair.compat.LawnchairQuickstepCompat; import kotlin.Unit; import java.io.FileDescriptor; @@ -208,24 +255,26 @@ import java.util.function.Predicate; import java.util.stream.Stream; -public class QuickstepLauncher extends Launcher implements RecentsViewContainer { +import app.lawnchair.LawnchairApp; +import app.lawnchair.compat.LawnchairQuickstepCompat; + +public class QuickstepLauncher extends Launcher implements RecentsViewContainer, + SystemShortcut.BubbleActivityStarter { private static final boolean TRACE_LAYOUTS = SystemProperties.getBoolean("persist.debug.trace_layouts", false); private static final String TRACE_RELAYOUT_CLASS = SystemProperties.get("persist.debug.trace_request_layout_class", null); - public static final boolean GO_LOW_RAM_RECENTS_ENABLED = false; protected static final String RING_APPEAR_ANIMATION_PREFIX = "RingAppearAnimation\t"; - private FixedContainerItems mAllAppsPredictions; + private PredictedContainerInfo mAllAppsPredictions; private HotseatPredictionController mHotseatPredictionController; private DepthController mDepthController; - private @Nullable DesktopVisibilityController mDesktopVisibilityController; private QuickstepTransitionManager mAppTransitionManager; private OverviewActionsView mActionsView; private TISBindHelper mTISBindHelper; - private @Nullable LauncherTaskbarUIController mTaskbarUIController; + private @Nullable TaskbarInteractor mTaskbarInteractor; // Will be updated when dragging from taskbar. private @Nullable UnfoldTransitionProgressProvider mUnfoldTransitionProgressProvider; private @Nullable LauncherUnfoldAnimationController mLauncherUnfoldAnimationController; @@ -233,6 +282,9 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer private SplitSelectStateController mSplitSelectStateController; private SplitWithKeyboardShortcutController mSplitWithKeyboardShortcutController; private SplitToWorkspaceController mSplitToWorkspaceController; + private BubbleBarLocation mBubbleBarLocation; + + private TaskbarUiState mTaskbarUiState; /** * If Launcher restarted while in the middle of an Overview split select, it needs this data to @@ -249,35 +301,62 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer private boolean mIsPredictiveBackToHomeInProgress; - public static QuickstepLauncher getLauncher(Context context) { - return fromContext(context); - } + private boolean mCanShowAllAppsEducationView; + + private boolean mIsOverlayVisible; + + private final OverviewChangeListener mOverviewChangeListener = this::onOverviewTargetChanged; + + private boolean mOverviewBlurEnabled; + + private final TaskViewRecentsTouchContext mTaskViewRecentsTouchContext = + new TaskViewRecentsTouchContext() { + @Override + public boolean isRecentsInteractive() { + return isInState(OVERVIEW) || isInState(OVERVIEW_MODAL_TASK); + } + + @Override + public boolean isRecentsModal() { + return isInState(OVERVIEW_MODAL_TASK); + } + + @Override + public void onUserControlledAnimationCreated( + AnimatorPlaybackController animController) { + getStateManager().setCurrentUserControlledAnimation(animController); + } + }; @Override protected void setupViews() { + // pE-TODO(CompatTier2): Android 9/10/11 support + if (ATLEAST_S) { + getAppWidgetHolder().setOnViewCreationCallback(new QuickstepInteractionHandler(this)); + } + mDepthController = new DepthController(this); + mOverviewBlurEnabled = isOverviewBackgroundBlurEnabled(); + getTheme().applyStyle(getOverviewBlurStyleResId(), true); super.setupViews(); + mDepthController.setSurfaceTransactionApplier(getRootView()); mActionsView = findViewById(R.id.overview_actions_view); - RecentsView overviewPanel = getOverviewPanel(); + RecentsView overviewPanel = getOverviewPanel(); SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(this); mSplitSelectStateController = - new SplitSelectStateController(this, mHandler, getStateManager(), + new SplitSelectStateController(this, getStateManager(), getDepthController(), getStatsLogManager(), systemUiProxy, RecentsModel.INSTANCE.get(this), () -> onStateBack()); - RecentsAnimationDeviceState deviceState = new RecentsAnimationDeviceState(asContext()); - // TODO(b/337863494): Explore use of the same OverviewComponentObserver across launcher - OverviewComponentObserver overviewComponentObserver = new OverviewComponentObserver( - asContext(), deviceState); - if (enableDesktopWindowingMode() && LawnchairApp.isRecentsEnabled()) { + if (DesktopModeStatus.canEnterDesktopMode(this) && LawnchairApp.isRecentsEnabled()) { mDesktopRecentsTransitionController = new DesktopRecentsTransitionController( getStateManager(), systemUiProxy, LawnchairApp.getInstance().getIApplicationThread(), - getDepthController()); + getDepthController(), DesktopState.getInstance(this)); } overviewPanel.init(mActionsView, mSplitSelectStateController, mDesktopRecentsTransitionController); - mSplitWithKeyboardShortcutController = new SplitWithKeyboardShortcutController(this, - mSplitSelectStateController, overviewComponentObserver, deviceState); + mSplitWithKeyboardShortcutController = new SplitWithKeyboardShortcutController( + this, mSplitSelectStateController); mSplitToWorkspaceController = new SplitToWorkspaceController(this, mSplitSelectStateController); mActionsView.updateDimension(getDeviceProfile(), overviewPanel.getLastComputedTaskSize()); @@ -290,12 +369,12 @@ protected void setupViews() { } mTISBindHelper = new TISBindHelper(this, this::onTISConnected); - mDepthController = new DepthController(this); - if (enableDesktopWindowingMode()) { - mDesktopVisibilityController = new DesktopVisibilityController(this); - mDesktopVisibilityController.registerSystemUiListener(); - mSplitSelectStateController.initSplitFromDesktopController(this, - overviewComponentObserver); + + if (DesktopModeStatus.canEnterDesktopModeOrShowAppHandle(this)) { + mSplitSelectStateController.initSplitFromDesktopController(this); + } + if (refactorTaskbarUiState()) { + mSplitSelectStateController.setLauncherUiState(mLauncherUiState); } mHotseatPredictionController = new HotseatPredictionController(this); @@ -305,11 +384,15 @@ protected void setupViews() { if (Utilities.ATLEAST_U) { addBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler()); } + if (refactorTaskbarUiState()) { + mTaskbarUiState = TaskbarUiStateMonitor.INSTANCE.get(this) + .getTaskbarUiState(getDisplayId()); + } } @Override public void logAppLaunch(StatsLogManager statsLogManager, ItemInfo info, - InstanceId instanceId) { + InstanceId instanceId) { // If the app launch is from any of the surfaces in AllApps then add the InstanceId from // LiveSearchManager to recreate the AllApps session on the server side. if (mAllAppsSessionLogId != null && ALL_APPS.equals( @@ -322,16 +405,16 @@ public void logAppLaunch(StatsLogManager statsLogManager, ItemInfo info, if (mAllAppsPredictions != null && (info.itemType == ITEM_TYPE_APPLICATION || info.itemType == ITEM_TYPE_DEEP_SHORTCUT)) { - int count = mAllAppsPredictions.items.size(); + List items = mAllAppsPredictions.getContents(); + int count = items.size(); for (int i = 0; i < count; i++) { - ItemInfo targetInfo = mAllAppsPredictions.items.get(i); + ItemInfo targetInfo = items.get(i); if (targetInfo.itemType == info.itemType && targetInfo.user.equals(info.user) && Objects.equals(targetInfo.getIntent(), info.getIntent())) { logger.withRank(i); break; } - } } logger.log(LAUNCHER_APP_LAUNCH_TAP); @@ -341,7 +424,7 @@ public void logAppLaunch(StatsLogManager statsLogManager, ItemInfo info, @Override protected void completeAddShortcut(Intent data, int container, int screenId, int cellX, - int cellY, PendingRequestArgs args) { + int cellY, PendingRequestArgs args) { if (container == CONTAINER_HOTSEAT) { mHotseatPredictionController.onDeferredDrop(cellX, cellY); } @@ -381,31 +464,19 @@ public void onConfigurationChanged(Configuration newConfig) { @Override public RunnableList startActivitySafely(View v, Intent intent, ItemInfo item) { - // Only pause is taskbar controller is not present until the transition (if it exists) ends - mHotseatPredictionController.setPauseUIUpdate(getTaskbarUIController() == null); PredictionRowView predictionRowView = getAppsView().getFloatingHeaderView().findFixedRowByType(PredictionRowView.class); // Pause the prediction row updates until the transition (if it exists) ends. predictionRowView.setPredictionUiUpdatePaused(true); RunnableList result = super.startActivitySafely(v, intent, item); if (result == null) { - mHotseatPredictionController.setPauseUIUpdate(false); predictionRowView.setPredictionUiUpdatePaused(false); } else { - result.add(() -> { - mHotseatPredictionController.setPauseUIUpdate(false); - predictionRowView.setPredictionUiUpdatePaused(false); - }); + result.add(() -> predictionRowView.setPredictionUiUpdatePaused(false)); } return result; } - @Override - public void startBinding() { - super.startBinding(); - mHotseatPredictionController.verifyUIUpdateNotPaused(); - } - @Override protected void onActivityFlagsChanged(int changeBits) { if ((changeBits & ACTIVITY_STATE_STARTED) != 0) { @@ -413,8 +484,8 @@ protected void onActivityFlagsChanged(int changeBits) { } if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) { - if (!FeatureFlags.enableHomeTransitionListener() && mTaskbarUIController != null) { - mTaskbarUIController.onLauncherVisibilityChanged(hasBeenResumed()); + if (!FeatureFlags.enableHomeTransitionListener() && mTaskbarInteractor != null) { + mTaskbarInteractor.onLauncherVisibilityChanged(hasBeenResumed()); } } @@ -423,6 +494,9 @@ protected void onActivityFlagsChanged(int changeBits) { | ACTIVITY_STATE_USER_ACTIVE | ACTIVITY_STATE_TRANSITION_ACTIVE)) != 0) { onStateOrResumeChanging((getActivityFlags() & ACTIVITY_STATE_TRANSITION_ACTIVE) == 0); } + if (refactorTaskbarUiState()) { + mLauncherUiState.setActivityFlag(getActivityFlags()); + } } @Override @@ -431,9 +505,38 @@ protected void showAllAppsFromIntent(boolean alreadyOnHome) { super.showAllAppsFromIntent(alreadyOnHome); } + @Override + public boolean isAllAppsBackgroundBlurEnabled() { + return mDepthController != null && mDepthController.isCrossWindowBlursEnabled() + && Flags.allAppsBlur(); + } + + @Override + public boolean isOverviewBackgroundBlurEnabled() { + return mDepthController != null && mDepthController.isCrossWindowBlursEnabled() + && enableOverviewBackgroundWallpaperBlur(); + } + + /** Apply the blur or blur fallback style to the current theme. */ + public void updateBlurStyle() { + if (enableOverviewBackgroundWallpaperBlur()) { + if (isOverviewBackgroundBlurEnabled() != mOverviewBlurEnabled) { + mWallpaperThemeManager.recreateToUpdateTheme(); + } + } else if (Flags.allAppsBlur()) { + // For all apps, we only need to update the scrim, which draws the panel. But if the + // activity was recreated above, this is unnecessary. + getAppsView().invalidateHeader(); + } + } + + public TaskbarUiState getTaskbarUiState() { + return mTaskbarUiState; + } + protected void onItemClicked(View view) { if (!mSplitToWorkspaceController.handleSecondAppSelectionForSplit(view)) { - QuickstepLauncher.super.getItemOnClickListener().onClick(view); + super.getItemOnClickListener().onClick(view); } } @@ -443,27 +546,76 @@ public View.OnClickListener getItemOnClickListener() { } @Override - public Stream getSupportedShortcuts() { + public Stream getSupportedShortcuts(ItemInfo itemInfo) { // Order matters as it affects order of appearance in popup container List shortcuts = new ArrayList(Arrays.asList( APP_INFO, WellbeingModel.SHORTCUT_FACTORY, mHotseatPredictionController)); + int container = itemInfo.container; + if (canPinAppWithContextMenu() + && DisplayController.showDesktopTaskbarForFreeformDisplay(this) + && (container == CONTAINER_ALL_APPS + || container == CONTAINER_ALL_APPS_PREDICTION)) { + shortcuts.add(0, PIN_ITEM_FROM_LAUNCHER); + } + shortcuts.addAll(getSplitShortcuts()); shortcuts.add(WIDGETS); shortcuts.add(INSTALL); - if (Flags.enablePrivateSpaceInstallShortcut()) { - shortcuts.add(PRIVATE_PROFILE_INSTALL); - } - if (Flags.enableShortcutDontSuggestApp()) { - shortcuts.add(DONT_SUGGEST_APP); - } + // TODO(b/444744861): Update private space apps to have its own container. + boolean isPinnable = itemInfo instanceof ItemInfoWithIcon info + && (info.runtimeStatusFlags & FLAG_NOT_PINNABLE) == 0; + if (container == CONTAINER_HOTSEAT || container == CONTAINER_DESKTOP + || /* Folder */ container > 0) { + shortcuts.add(REMOVE); + } else if (isPinnable && (container == CONTAINER_ALL_APPS + || container == CONTAINER_ALL_APPS_PREDICTION)) { + shortcuts.add(ADD_TO_HOME_SCREEN); + } + shortcuts.add(DONT_SUGGEST_APP); + shortcuts.add(PRIVATE_PROFILE_INSTALL); if (Flags.enablePrivateSpace()) { shortcuts.add(UNINSTALL_APP); } + if (BubbleAnythingFlagHelper.enableCreateAnyBubble()) { + shortcuts.add(BUBBLE_SHORTCUT); + } return shortcuts.stream(); } + private boolean canPinAppWithContextMenu() { + if (refactorTaskbarUiState()) { + final boolean ret = newCanPinAppWithContextMenu(); + if (BuildConfigs.IS_STUDIO_BUILD && ret != legacyCanPinAppWithContextMenu()) { + throw new IllegalStateException("canPinAppWithContextMenu() doesn't match"); + } + return ret; + } else { + return legacyCanPinAppWithContextMenu(); + } + } + + private boolean legacyCanPinAppWithContextMenu() { + return mTaskbarInteractor != null + && mTaskbarInteractor.canPinAppWithContextMenu(); + } + + /** Mimic the impl of {@link TaskbarPopupController#canPinAppWithContextMenu}. */ + private boolean newCanPinAppWithContextMenu() { + if (!DesktopExperienceFlags.ENABLE_PINNING_APP_WITH_CONTEXT_MENU.isTrue()) { + return false; + } + return DesktopVisibilityController.INSTANCE.get(this).isInDesktopMode(getDisplayId()) + || mTaskbarUiState.getShowDesktopTaskbarForFreeformDisplayRef().getValue() + || (mTaskbarUiState.getShowLockedTaskbarOnHome().getValue() + && mTaskbarUiState.isTaskbarOnHomeRef().getValue()); + } + private List> getSplitShortcuts() { - if (!mDeviceProfile.isTablet || mSplitSelectStateController.isSplitSelectActive()) { + if (!mDeviceProfile.getDeviceProperties().isTablet() || mSplitSelectStateController.isSplitSelectActive()) { + return Collections.emptyList(); + } + if (getDisplayId() != DEFAULT_DISPLAY + && !DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX.isTrue()) { return Collections.emptyList(); } RecentsView recentsView = getOverviewPanel(); @@ -484,36 +636,47 @@ private List> getSplitShortcuts() { private void onStateOrResumeChanging(boolean inTransition) { LauncherState state = getStateManager().getState(); boolean started = ((getActivityFlags() & ACTIVITY_STATE_STARTED)) != 0; - if (started) { - DeviceProfile profile = getDeviceProfile(); - boolean willUserBeActive = - (getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0; - boolean visible = (state == NORMAL || state == OVERVIEW) - && (willUserBeActive || isUserActive()) - && !profile.isVerticalBarLayout(); - SystemUiProxy.INSTANCE.get(this) - .setLauncherKeepClearAreaHeight(visible, profile.hotseatBarSizePx); - } + DeviceProfile profile = getDeviceProfile(); + boolean visible = state.areElementsVisible(getLauncherUiState(), HOTSEAT_ICONS) + && started + && isUserActive() + && !profile.isVerticalBarLayout() + && !mIsOverlayVisible; + SystemUiProxy.INSTANCE.get(this) + .setLauncherKeepClearAreaHeight(visible, profile.hotseatBarSizePx); if (state == NORMAL && !inTransition) { ((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false); } } @Override - public void bindExtraContainerItems(FixedContainerItems item) { - if (item.containerId == Favorites.CONTAINER_PREDICTION) { - mAllAppsPredictions = item; - PredictionRowView predictionRowView = - getAppsView().getFloatingHeaderView().findFixedRowByType( - PredictionRowView.class); - predictionRowView.setPredictedApps(item.items); - } else if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION) { - mHotseatPredictionController.setPredictedItems(item); - } else if (item.containerId == Favorites.CONTAINER_WIDGETS_PREDICTION) { - getPopupDataProvider().setRecommendedWidgets(item.items); + public void onOverlayVisibilityChanged(boolean visible) { + super.onOverlayVisibilityChanged(visible); + mIsOverlayVisible = visible; + } + + @Override + public void bindPredictedContainerInfo(PredictedContainerInfo info) { + super.bindPredictedContainerInfo(info); + switch (info.id) { + case Favorites.CONTAINER_ALL_APPS_PREDICTION: + mAllAppsPredictions = info; + getAppsView().getFloatingHeaderView().findFixedRowByType( + PredictionRowView.class).setPredictedApps(info.getContents()); + break; + case Favorites.CONTAINER_HOTSEAT_PREDICTION: + mHotseatPredictionController.setPredictedItems(info); + break; + case Favorites.CONTAINER_WIDGETS_PREDICTION: + getWidgetPickerDataProvider().setWidgetRecommendations(info.getContents()); + break; } } + public void onItemPinnedFromContextMenu() { + mHotseatPredictionController.onItemPinnedFromContextMenu(); + } + @Override public void bindWorkspaceComponentsRemoved(Predicate matcher) { super.bindWorkspaceComponentsRemoved(matcher); @@ -533,23 +696,24 @@ public void onDestroy() { mUnfoldTransitionProgressProvider.destroy(); } + OverviewComponentObserver.INSTANCE.get(this) + .removeOverviewChangeListener(mOverviewChangeListener); mTISBindHelper.onDestroy(); if (mLauncherUnfoldAnimationController != null) { mLauncherUnfoldAnimationController.onDestroy(); } - if (mDesktopVisibilityController != null) { - mDesktopVisibilityController.unregisterSystemUiListener(); - } - if (mSplitSelectStateController != null) { mSplitSelectStateController.onDestroy(); } + RecentsView recentsView = getOverviewPanel(); + if (recentsView != null) { + recentsView.destroy(); + } + super.onDestroy(); - mHotseatPredictionController.destroy(); - mSplitWithKeyboardShortcutController.onDestroy(); if (mViewCapture != null) mViewCapture.close(); if (Utilities.ATLEAST_U) { removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler()); @@ -583,9 +747,16 @@ public void onStateSetEnd(LauncherState state) { } case QUICK_SWITCH_STATE_ORDINAL: { RecentsView rv = getOverviewPanel(); - TaskView tasktolaunch = rv.getCurrentPageTaskView(); - if (tasktolaunch != null) { - tasktolaunch.launchTask(success -> { + TaskView currentPageTask = rv.getCurrentPageTaskView(); + TaskView fallbackTask = rv.getFirstTaskView(); + if (currentPageTask != null || fallbackTask != null) { + TaskView taskToLaunch = currentPageTask; + if (currentPageTask == null) { + taskToLaunch = fallbackTask; + ActiveGestureProtoLogProxy.logQuickSwitchFromHomeFallback( + rv.getCurrentPage()); + } + taskToLaunch.launchWithoutAnimation(success -> { if (!success) { getStateManager().goToState(OVERVIEW); } else { @@ -594,6 +765,7 @@ public void onStateSetEnd(LauncherState state) { return Unit.INSTANCE; }); } else { + ActiveGestureProtoLogProxy.logQuickSwitchFromHomeFailed(rv.getCurrentPage()); getStateManager().goToState(NORMAL); } break; @@ -602,6 +774,14 @@ public void onStateSetEnd(LauncherState state) { } } + @Override + protected void setTitle(@NonNull LauncherState state) { + // Prevent accessibility title update announcement + getWindow().getAttributes().accessibilityTitle = state.hasFlag(FLAG_SKIP_STATE_ANNOUNCEMENT) + ? getString(state.getTitle()) : null; + super.setTitle(state); + } + @Override public TouchController[] createTouchControllers() { NavigationMode mode = DisplayController.getNavigationMode(this); @@ -636,63 +816,54 @@ public TouchController[] createTouchControllers() { break; } - if (!getDeviceProfile().isMultiWindowMode) { - list.add(new StatusBarTouchController(this)); - } + list.add(new StatusBarTouchController(this, () -> this.isInState(LauncherState.NORMAL))); - list.add(new LauncherTaskViewController(this)); + if (enableExpressiveDismissTaskMotion()) { + list.add(new TaskViewLaunchTouchController<>(this, mTaskViewRecentsTouchContext)); + list.add(new TaskViewDismissTouchController<>(this, mTaskViewRecentsTouchContext)); + } else { + list.add(new TaskViewTouchControllerDeprecated<>(this, mTaskViewRecentsTouchContext)); + } return list.toArray(new TouchController[list.size()]); } @Override - public AtomicAnimationFactory createAtomicAnimationFactory() { + public AtomicAnimationFactory createAtomicAnimationFactory() { return new QuickstepAtomicAnimationFactory(this); } - @Override - protected LauncherWidgetHolder createAppWidgetHolder() { - final QuickstepHolderFactory factory = - (QuickstepHolderFactory) LauncherWidgetHolder.HolderFactory.newFactory(this); - return factory.newInstance(this, - appWidgetId -> getWorkspace().removeWidget(appWidgetId), - new QuickstepInteractionHandler(this)); - } - @Override protected void onCreate(Bundle savedInstanceState) { - // Back dispatcher is registered in {@link BaseActivity#onCreate}. For predictive back to - // work, we must opt-in BEFORE registering back dispatcher. So we need to call - // setEnableOnBackInvokedCallback() before super.onCreate() - if (Utilities.ATLEAST_U && enablePredictiveBackGesture()) { - try { - getApplicationInfo().setEnableOnBackInvokedCallback(true); - } catch (NoSuchMethodError e) { - // Ignore - } - - } super.onCreate(savedInstanceState); if (savedInstanceState != null) { mPendingSplitSelectInfo = ObjectWrapper.unwrap( savedInstanceState.getIBinder(PENDING_SPLIT_SELECT_INFO)); } - addMultiWindowModeChangedListener(mDepthController); initUnfoldTransitionProgressProvider(); - if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) { - mViewCapture = ViewCaptureFactory.getInstance(this).startCapture(getWindow()); - } + mViewCapture = ViewCaptureFactory.getInstance(this).startCapture(getWindow()); // getWindow().addPrivateFlags(PRIVATE_FLAG_OPTIMIZE_MEASURE); QuickstepOnboardingPrefs.setup(this); // View.setTraceLayoutSteps(TRACE_LAYOUTS); // View.setTracedRequestLayoutClassClass(TRACE_RELAYOUT_CLASS); + OverviewComponentObserver.INSTANCE.get(this) + .addOverviewChangeListener(mOverviewChangeListener); } @Override protected boolean initDeviceProfile(InvariantDeviceProfile idp) { final boolean ret = super.initDeviceProfile(idp); -// mDeviceProfile.isPredictiveBackSwipe = -// getApplicationInfo().isOnBackInvokedCallbackEnabled(); - mDeviceProfile.isPredictiveBackSwipe = false; + try { + mDeviceProfile.isPredictiveBackSwipe = + getApplicationInfo().isOnBackInvokedCallbackEnabled(); + } catch (Throwable t) { + mDeviceProfile.isPredictiveBackSwipe = false; + } + if (ATLEAST_S_V2) { + if (ret) { + SystemUiProxy.INSTANCE.get(this).setLauncherAppIconSize( + mDeviceProfile.getWorkspaceIconProfile().getIconSizePx()); + } + } return ret; } @@ -702,7 +873,7 @@ public void startSplitSelection(SplitSelectSource splitSelectSource) { // Check if there is already an instance of this app running, if so, initiate the split // using that. mSplitSelectStateController.findLastActiveTasksAndRunCallback( - Collections.singletonList(splitSelectSource.itemInfo.getComponentKey()), + Collections.singletonList(splitSelectSource.getItemInfo().getResolvedTargetInfo()), false /* findExactPairMatch */, foundTasks -> { @Nullable Task foundTask = foundTasks[0]; @@ -710,11 +881,7 @@ public void startSplitSelection(SplitSelectSource splitSelectSource) { splitSelectSource.alreadyRunningTaskId = taskWasFound ? foundTask.key.id : INVALID_TASK_ID; - if (enableSplitContextually()) { - startSplitToHome(splitSelectSource); - } else { - recentsView.initiateSplitSelect(splitSelectSource); - } + startSplitToHome(splitSelectSource); } ); } @@ -729,7 +896,7 @@ private void startSplitToHome(SplitSelectSource source) { Rect tempRect = new Rect(); mSplitSelectStateController.setInitialTaskSelect(source.intent, - source.position.stagePosition, source.itemInfo, source.splitEvent, + source.position.stagePosition, source.getItemInfo(), source.splitEvent, source.alreadyRunningTaskId); RecentsView recentsView = getOverviewPanel(); @@ -747,6 +914,8 @@ splitPlaceholderSize, splitPlaceholderInset, getDeviceProfile(), floatingTaskView.setOnClickListener(view -> mSplitSelectStateController.getSplitAnimationController(). playAnimPlaceholderToFullscreen(this, view, Optional.empty())); + floatingTaskView.setContentDescription(source.getItemInfo().contentDescription); + mSplitSelectStateController.setFirstFloatingTaskView(floatingTaskView); anim.addListener(new AnimatorListenerAdapter() { @Override @@ -776,8 +945,8 @@ public boolean areBothSplitAppsConfirmed() { @Override public void onStateTransitionCompletedAfterSwipeToHome(LauncherState finalState) { - if (mTaskbarUIController != null) { - mTaskbarUIController.onStateTransitionCompletedAfterSwipeToHome(finalState); + if (mTaskbarInteractor != null) { + mTaskbarInteractor.onStateTransitionCompletedAfterSwipeToHome(finalState); } } @@ -788,6 +957,10 @@ protected void onResume() { if (mLauncherUnfoldAnimationController != null) { mLauncherUnfoldAnimationController.onResume(); } + + if (mTaskbarInteractor != null && FeatureFlags.enableHomeTransitionListener()) { + mTaskbarInteractor.onLauncherResume(); + } } @Override @@ -798,25 +971,54 @@ protected void onPause() { super.onPause(); - if (enableSplitContextually()) { - // If Launcher pauses before both split apps are selected, exit split screen. - if (!mSplitSelectStateController.isBothSplitAppsConfirmed() && - !mSplitSelectStateController.isLaunchingFirstAppFullscreen()) { - mSplitSelectStateController - .logExitReason(LAUNCHER_SPLIT_SELECTION_EXIT_INTERRUPTED); - mSplitSelectStateController.getSplitAnimationController() - .playPlaceholderDismissAnim(this, LAUNCHER_SPLIT_SELECTION_EXIT_INTERRUPTED); - } + // If Launcher pauses before both split apps are selected, exit split screen. + if (!mSplitSelectStateController.isBothSplitAppsConfirmed() && + !mSplitSelectStateController.isLaunchingFirstAppFullscreen()) { + mSplitSelectStateController + .logExitReason(LAUNCHER_SPLIT_SELECTION_EXIT_INTERRUPTED); + mSplitSelectStateController.getSplitAnimationController() + .playPlaceholderDismissAnim(this, LAUNCHER_SPLIT_SELECTION_EXIT_INTERRUPTED, + () -> getStateManager().moveToRestState()); + } + + if (mTaskbarInteractor != null && FeatureFlags.enableHomeTransitionListener()) { + mTaskbarInteractor.onLauncherPause(); + } + } + + @Override + protected void onStop() { + super.onStop(); + if (mTaskbarInteractor != null && FeatureFlags.enableHomeTransitionListener()) { + mTaskbarInteractor.onLauncherStop(); } } @Override protected void onNewIntent(Intent intent) { + boolean intentHasGnc = GestureNavContract.canBuildFromIntent(intent); super.onNewIntent(intent); OverviewCommandHelper overviewCommandHelper = mTISBindHelper.getOverviewCommandHelper(); if (overviewCommandHelper != null) { overviewCommandHelper.clearPendingCommands(); } + if (RecentsWindowFlags.getEnableOverviewInWindow() && !intentHasGnc) { + BaseContainerInterface defaultDisplayContainerInterface = + OverviewComponentObserver.INSTANCE.get(this).getContainerInterface( + DEFAULT_DISPLAY); + if (defaultDisplayContainerInterface != null + && defaultDisplayContainerInterface.getCreatedContainer() + instanceof RecentsWindowManager defaultRecentsWindowManager) { + defaultRecentsWindowManager.hideRecentsWindow(); + } + } + } + + @Override + protected void logOnNewIntent(boolean alreadyOnHome, boolean shouldMoveToDefaultScreen, + String action, boolean internalStateHandled) { + OverviewCommandHelperProtoLogProxy.logOnNewIntent(alreadyOnHome, shouldMoveToDefaultScreen, + action, internalStateHandled); } public QuickstepTransitionManager getAppTransitionManager() { @@ -835,7 +1037,9 @@ public void onEnterAnimationComplete() { @Override protected void handleGestureContract(Intent intent) { - if (FeatureFlags.SEPARATE_RECENTS_ACTIVITY.get()) { + if (GestureNavContract.isContractEnabled(intent) + && (FeatureFlags.SEPARATE_RECENTS_ACTIVITY.get() + || RecentsWindowFlags.getEnableOverviewInWindow())) { super.handleGestureContract(intent); } } @@ -865,7 +1069,8 @@ public void onWidgetsTransition(float progress) { onTaskbarInAppDisplayProgressUpdate(progress, WIDGETS_PAGE_PROGRESS_INDEX); if (mEnableWidgetDepth) { getDepthController().widgetDepth.setValue(Utilities.mapToRange( - progress, 0f, 1f, 0f, getDeviceProfile().bottomSheetDepth, EMPHASIZED)); + progress, 0f, 1f, 0f, + getDeviceProfile().getBottomSheetProfile().getBottomSheetDepth(), EMPHASIZED)); } } @@ -881,71 +1086,68 @@ private boolean tryHandleBackKey(KeyEvent event) { // event won't go through ViewRootImpl#InputStage#onProcess. // So when receive back key, try to do the same check thing in // ViewRootImpl#NativePreImeInputStage#onProcess - if (!Utilities.ATLEAST_U || !enablePredictiveBackGesture() - || event.getKeyCode() != KeyEvent.KEYCODE_BACK + if (event.getKeyCode() != KeyEvent.KEYCODE_BACK || event.getAction() != KeyEvent.ACTION_UP || event.isCanceled()) { return false; } + // Lawnchair-TODO-Merge: LC disabled this, 16r2 enabled it. // getOnBackAnimationCallback().onBackInvoked(); return true; } @Override protected void registerBackDispatcher() { - if (!enablePredictiveBackGesture()) { - super.registerBackDispatcher(); - return; - } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + if (Utilities.ATLEAST_U) { getOnBackInvokedDispatcher().registerOnBackInvokedCallback( OnBackInvokedDispatcher.PRIORITY_DEFAULT, - new OnBackAnimationCallback() { - - @Nullable - OnBackPressedHandler mActiveOnBackPressedHandler; + new FlingOnBackAnimationCallback() { + + @Nullable OnBackAnimationCallback mActiveOnBackAnimationCallback; @Override - public void onBackStarted(@NonNull BackEvent backEvent) { - if (mActiveOnBackPressedHandler != null) { - mActiveOnBackPressedHandler.onBackCancelled(); + public void onBackStartedCompat(@NonNull BackEvent backEvent) { + if (mActiveOnBackAnimationCallback != null) { + mActiveOnBackAnimationCallback.onBackCancelled(); } - mActiveOnBackPressedHandler = getOnBackPressedHandler(); - mActiveOnBackPressedHandler.onBackStarted(); + mActiveOnBackAnimationCallback = getOnBackAnimationCallback(); + mActiveOnBackAnimationCallback.onBackStarted(backEvent); } - + + @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) @Override - public void onBackInvoked() { - // Recreate mActiveOnBackPressedHandler if necessary to avoid NPE + public void onBackInvokedCompat() { + // Recreate mActiveOnBackAnimationCallback if necessary to avoid NPE // because: // 1. b/260636433: In 3-button-navigation mode, onBackStarted() is not // called on ACTION_DOWN before onBackInvoked() is called in ACTION_UP. // 2. Launcher#onBackPressed() will call onBackInvoked() without calling // onBackInvoked() beforehand. - if (mActiveOnBackPressedHandler == null) { - mActiveOnBackPressedHandler = getOnBackPressedHandler(); + if (mActiveOnBackAnimationCallback == null) { + mActiveOnBackAnimationCallback = getOnBackAnimationCallback(); } - mActiveOnBackPressedHandler.onBackInvoked(); - mActiveOnBackPressedHandler = null; + mActiveOnBackAnimationCallback.onBackInvoked(); + mActiveOnBackAnimationCallback = null; TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onBackInvoked"); } + @Override - public void onBackProgressed(@NonNull BackEvent backEvent) { + public void onBackProgressedCompat(@NonNull BackEvent backEvent) { if (!FeatureFlags.IS_STUDIO_BUILD - && mActiveOnBackPressedHandler == null) { + && mActiveOnBackAnimationCallback == null) { return; } - mActiveOnBackPressedHandler.onBackProgressed(backEvent.getProgress()); + mActiveOnBackAnimationCallback.onBackProgressed(backEvent); } - + @Override - public void onBackCancelled() { + public void onBackCancelledCompat() { if (!FeatureFlags.IS_STUDIO_BUILD - && mActiveOnBackPressedHandler == null) { + && mActiveOnBackAnimationCallback == null) { return; } - mActiveOnBackPressedHandler.onBackCancelled(); - mActiveOnBackPressedHandler = null; + mActiveOnBackAnimationCallback.onBackCancelled(); + mActiveOnBackAnimationCallback = null; } }); } @@ -955,15 +1157,15 @@ private void onTaskbarInAppDisplayProgressUpdate(float progress, int flag) { TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); if (taskbarManager == null || taskbarManager.getCurrentActivityContext() == null - || mTaskbarUIController == null) { + || mTaskbarInteractor == null) { return; } - mTaskbarUIController.onTaskbarInAppDisplayProgressUpdate(progress, flag); + mTaskbarInteractor.onTaskbarInAppDisplayProgressUpdate(progress, flag); } @Override public void startIntentSenderForResult(IntentSender intent, int requestCode, - Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags, Bundle options) { + Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags, Bundle options) { if (requestCode != -1) { mPendingActivityRequestCode = requestCode; StartActivityParams params = new StartActivityParams(this, requestCode); @@ -995,14 +1197,6 @@ public void startActivityForResult(Intent intent, int requestCode, Bundle option @Override public void setResumed() { - if (!enableDesktopWindowingWallpaperActivity() - && mDesktopVisibilityController != null - && mDesktopVisibilityController.areDesktopTasksVisible() - && !mDesktopVisibilityController.isRecentsGestureInProgress()) { - // Return early to skip setting activity to appear as resumed - // TODO: b/333533253 - Remove after flag rollout - return; - } super.setResumed(); } @@ -1023,6 +1217,13 @@ private void handlePendingActivityRequest() { } } + private void onOverviewTargetChanged(boolean isHomeAndOverviewSame) { + QuickstepTransitionManager transitionManager = getAppTransitionManager(); + if (transitionManager != null) { + transitionManager.onOverviewTargetChange(); + } + } + private void onTISConnected(TISBinder binder) { TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); if (taskbarManager != null) { @@ -1053,7 +1254,6 @@ private void initUnfoldTransitionProgressProvider() { /** Receives animation progress from sysui process. */ private void initRemotelyCalculatedUnfoldAnimation(UnfoldTransitionConfig config) { - RemoteUnfoldSharedComponent unfoldComponent = UnfoldTransitionFactory.createRemoteUnfoldSharedComponent( /* context= */ this, @@ -1081,7 +1281,7 @@ private void initRemotelyCalculatedUnfoldAnimation(UnfoldTransitionConfig config } private void initUnfoldAnimationController(UnfoldTransitionProgressProvider progressProvider, - @UnfoldMain RotationChangeProvider rotationChangeProvider) { + @UnfoldMain RotationChangeProvider rotationChangeProvider) { mLauncherUnfoldAnimationController = new LauncherUnfoldAnimationController( /* launcher= */ this, getWindowManager(), @@ -1090,12 +1290,30 @@ private void initUnfoldAnimationController(UnfoldTransitionProgressProvider prog ); } - public void setTaskbarUIController(LauncherTaskbarUIController taskbarUIController) { - mTaskbarUIController = taskbarUIController; + @Override + public void setTaskbarInteractor(@Nullable TaskbarInteractor taskbarInteractor) { + mTaskbarInteractor = taskbarInteractor; + } + + public @Nullable TaskbarInteractor getTaskbarInteractor() { + return mTaskbarInteractor; } - public @Nullable LauncherTaskbarUIController getTaskbarUIController() { - return mTaskbarUIController; + /** Offset [targetRect] to account for the hotseat translation if applicable. */ + public void offsetBoundsXToHotseatIfApplicable(RectF targetRect, View targetView) { + if (!(targetView.getTag() instanceof ItemInfo itemInfo) || !itemInfo.isInHotseat()) { + return; + } + int dx = 0; + if (isBubbleBarEnabled() && mBubbleBarLocation != null) { + boolean isBubblesOnLeft = mBubbleBarLocation.isOnLeft(isRtl(getResources())); + dx += mDeviceProfile.getHotseatTranslationXForNavBar(this, isBubblesOnLeft); + } + if (isBubbleBarEnabled() + && mDeviceProfile.shouldAdjustHotseatForBubbleBar(asContext(), hasBubbles())) { + dx += (int) mDeviceProfile.getHotseatAdjustedTranslation(asContext(), itemInfo.cellX); + } + targetRect.offset(dx, 0); } public SplitToWorkspaceController getSplitToWorkspaceController() { @@ -1138,11 +1356,6 @@ public DepthController getDepthController() { return mDepthController; } - @Nullable - public DesktopVisibilityController getDesktopVisibilityController() { - return mDesktopVisibilityController; - } - @Nullable public UnfoldTransitionProgressProvider getUnfoldTransitionProgressProvider() { return mUnfoldTransitionProgressProvider; @@ -1173,23 +1386,29 @@ public void finishBindingItems(IntSet pagesBoundFirst) { } } + @NonNull @Override public ActivityOptionsWrapper getActivityLaunchOptions(View v, @Nullable ItemInfo item) { - ActivityOptionsWrapper activityOptions = mAppTransitionManager.getActivityLaunchOptions(v); + ActivityOptionsWrapper activityOptions = mAppTransitionManager.getActivityLaunchOptions( + v, item != null ? item : (ItemInfo) v.getTag()); if (mLastTouchUpTime > 0) { activityOptions.options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_LAUNCHER, mLastTouchUpTime); } - if (item != null && (item.animationType == DEFAULT_NO_ICON + if (ATLEAST_T) { + if (item != null && (item.animationType == DEFAULT_NO_ICON || item.animationType == VIEW_BACKGROUND)) { - activityOptions.options.setSplashScreenStyle( + activityOptions.options.setSplashScreenStyle( SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR); - } else { - activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON); + } else { + activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON); + activityOptions.options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED); + } } activityOptions.options.setLaunchDisplayId( (v != null && v.getDisplay() != null) ? v.getDisplay().getDisplayId() - : Display.DEFAULT_DISPLAY); + : DEFAULT_DISPLAY); Utilities.allowBGLaunch(activityOptions.options); return activityOptions; } @@ -1198,9 +1417,13 @@ public ActivityOptionsWrapper getActivityLaunchOptions(View v, @Nullable ItemInf public ActivityOptionsWrapper makeDefaultActivityOptions(int splashScreenStyle) { RunnableList callbacks = new RunnableList(); ActivityOptions options = ActivityOptions.makeCustomAnimation(this, 0, 0); - options.setSplashScreenStyle(splashScreenStyle); + if (ATLEAST_T) { + options.setSplashScreenStyle(splashScreenStyle); + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED); + } Utilities.allowBGLaunch(options); - IRemoteCallback endCallback = completeRunnableListCallback(callbacks); + IRemoteCallback endCallback = completeRunnableListCallback(callbacks, this); options.setOnAnimationAbortListener(endCallback); options.setOnAnimationFinishedListener(endCallback); return new ActivityOptionsWrapper(options, callbacks); @@ -1208,8 +1431,8 @@ public ActivityOptionsWrapper makeDefaultActivityOptions(int splashScreenStyle) @Override @BinderThread - public void enterStageSplitFromRunningApp(boolean leftOrTop) { - mSplitWithKeyboardShortcutController.enterStageSplit(leftOrTop); + public void enterStageSplitFromRunningApp(boolean leftOrTop, int displayId) { + mSplitWithKeyboardShortcutController.enterStageSplit(leftOrTop, displayId); } @Override @@ -1288,49 +1511,47 @@ public void setPredictiveBackToHomeInProgress(boolean isInProgress) { mTISBindHelper.setPredictiveBackToHomeInProgress(isInProgress); } + public boolean getPredictiveBackToHomeInProgress() { + return mIsPredictiveBackToHomeInProgress; + } + @Override public boolean areDesktopTasksVisible() { - if (mDesktopVisibilityController != null) { - return mDesktopVisibilityController.areDesktopTasksVisible(); - } - return false; + return DesktopVisibilityController.INSTANCE.get(this) + .isInDesktopModeAndNotInOverview(getDisplayId()); } @Override - protected void onDeviceProfileInitiated() { - super.onDeviceProfileInitiated(); - SystemUiProxy.INSTANCE.get(this).setLauncherAppIconSize(mDeviceProfile.iconSizePx); + public boolean shouldShowHomeBehindDesktop() { + return DesktopState.getInstance(this).getShouldShowHomeBehindDesktop(); } @Override public void dispatchDeviceProfileChanged() { super.dispatchDeviceProfileChanged(); - SystemUiProxy.INSTANCE.get(this).setLauncherAppIconSize(mDeviceProfile.iconSizePx); + SystemUiProxy.INSTANCE.get(this).setLauncherAppIconSize( + mDeviceProfile.getWorkspaceIconProfile().getIconSizePx()); TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); if (taskbarManager != null) { - taskbarManager.debugWhyTaskbarNotDestroyed("QuickstepLauncher#onDeviceProfileChanged"); + taskbarManager.debugPrimaryTaskbar("QuickstepLauncher#onDeviceProfileChanged", + true); } } /** - * Launches the given {@link GroupTask} in splitscreen. + * Launches the given {@link SplitTask} in splitscreen. */ public void launchSplitTasks( - @NonNull GroupTask groupTask, @Nullable RemoteTransition remoteTransition) { - // Top/left and bottom/right tasks respectively. - Task task1 = groupTask.task1; - // task2 should never be null when calling this method. Allow a crash to catch invalid calls - Task task2 = groupTask.task2; - mSplitSelectStateController.launchExistingSplitPair( - null /* launchingTaskView */, - task1.key.id, - task2.key.id, + @NonNull SplitTask splitTask, @Nullable RemoteTransition remoteTransition) { + mSplitSelectStateController.launchExistingSplitPair(null /* launchingTaskView */, + splitTask.getTopLeftTask().key.id, + splitTask.getBottomRightTask().key.id, SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT, /* callback= */ success -> mSplitSelectStateController.resetState(), /* freezeTaskList= */ false, - groupTask.mSplitBounds == null - ? SNAP_TO_50_50 - : groupTask.mSplitBounds.snapPosition, + splitTask.getSplitBounds() == null + ? SNAP_TO_2_50_50 + : splitTask.getSplitBounds().snapPosition, remoteTransition); } @@ -1338,8 +1559,30 @@ public void launchSplitTasks( * Launches two apps as an app pair. */ public void launchAppPair(AppPairIcon appPairIcon) { + // Potentially show the Taskbar education once the app pair launch finishes mSplitSelectStateController.getAppPairsController().launchAppPair(appPairIcon, - CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE); + CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE, + (success) -> { + if (success && mTaskbarInteractor != null) { + mTaskbarInteractor.showEduOnAppLaunch(); + } + }); + } + + @Override + public void startHome(boolean animated, @Nullable Runnable onHomeAnimationComplete) { + StateManager stateManager = getStateManager(); + animated &= stateManager.shouldAnimateStateChange(); + if (mSplitSelectStateController.isSplitSelectActive()) { + AnimUtils.goToNormalStateWithSplitDismissal(stateManager, this, + LAUNCHER_SPLIT_SELECTION_EXIT_HOME, + mSplitSelectStateController.getSplitAnimationController(), + onHomeAnimationComplete); + } else { + stateManager.goToState(NORMAL, animated, + onHomeAnimationComplete != null ? forEndCallback(onHomeAnimationComplete) + : null); + } } public boolean canStartHomeSafely() { @@ -1349,49 +1592,93 @@ public boolean canStartHomeSafely() { @Override public boolean isBubbleBarEnabled() { - return (mTaskbarUIController != null && mTaskbarUIController.isBubbleBarEnabled()); + return (mTaskbarInteractor != null && BubbleBarController.isBubbleBarEnabled()); } @Override public boolean hasBubbles() { - return (mTaskbarUIController != null && mTaskbarUIController.hasBubbles()); + if (refactorTaskbarUiState()) { + final boolean ret = newHasBubbles(); + if (BuildConfigs.IS_STUDIO_BUILD && ret != legacyHasBubbles()) { + throw new IllegalStateException("hasBubbles() doesn't match"); + } + return ret; + } else { + return legacyHasBubbles(); + } } - @NonNull - public TISBindHelper getTISBindHelper() { - return mTISBindHelper; + private boolean newHasBubbles() { + return mTaskbarUiState.getHasBubblesRef().getValue(); + } + + private boolean legacyHasBubbles() { + return mTaskbarInteractor != null && mTaskbarInteractor.hasBubbles(); } @Override public boolean handleIncorrectSplitTargetSelection() { - if (!enableSplitContextually() || !mSplitSelectStateController.isSplitSelectActive()) { + if (!mSplitSelectStateController.isSplitSelectActive()) { return false; } mSplitSelectStateController.getSplitInstructionsView().goBoing(); return true; } - private static final class LauncherTaskViewController extends - TaskViewTouchController { + @Override + public void showShortcutBubble(ShortcutInfo info, EntryPoint entryPoint) { + if (info == null) return; + BubbleActivityStarter.INSTANCE.get(this).showShortcutBubble(info, entryPoint); + } - LauncherTaskViewController(QuickstepLauncher activity) { - super(activity); - } + @Override + public void showAppBubble(Intent intent, UserHandle user, EntryPoint entryPoint) { + if (intent == null || intent.getPackage() == null) return; + BubbleActivityStarter.INSTANCE.get(this).showAppBubble(intent, user, entryPoint); + } - @Override - protected boolean isRecentsInteractive() { - return mContainer.isInState(OVERVIEW) || mContainer.isInState(OVERVIEW_MODAL_TASK); - } + /** Sets the location of the bubble bar */ + public void setBubbleBarLocation(BubbleBarLocation bubbleBarLocation) { + mBubbleBarLocation = bubbleBarLocation; + } - @Override - protected boolean isRecentsModal() { - return mContainer.isInState(OVERVIEW_MODAL_TASK); - } + /** + * Similar to {@link #getFirstHomeElementForAppClose} but also matches all apps if its visible + */ + @Nullable + public View getFirstVisibleElementForAppClose( + @Nullable StableViewInfo svi, String packageName, UserHandle user) { + if (isInState(LauncherState.ALL_APPS)) { + AllAppsRecyclerView activeRecyclerView = getAppsView().getActiveRecyclerView(); + View v = null; + if (svi != null) { + // Preferred item match + v = activeRecyclerView.findViewByPredicate(view -> + view.isAggregatedVisible() + && view.getTag() instanceof ItemInfo info && svi.matches(info)); + } + if (v == null) { + // Package user match + v = activeRecyclerView.findViewByPredicate(view -> + view.isAggregatedVisible() && view.getTag() instanceof ItemInfo info + && info.itemType == ITEM_TYPE_APPLICATION + && info.user.equals(user) + && TextUtils.equals(info.getTargetPackage(), packageName)); + } - @Override - protected void onUserControlledAnimationCreated(AnimatorPlaybackController animController) { - mContainer.getStateManager().setCurrentUserControlledAnimation(animController); + if (v != null && activeRecyclerView.computeVerticalScrollOffset() > 0) { + RectF locationBounds = new RectF(); + FloatingIconView.getLocationBoundsForView(this, v, false, locationBounds, + new Rect()); + if (locationBounds.top < getAppsView().getHeaderBottom()) { + // Icon is covered by scrim, return null to play fallback animation. + return null; + } + } + return v; } + + return getFirstHomeElementForAppClose(svi, packageName, user); } @Override @@ -1421,6 +1708,18 @@ public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] @Override public View onCreateView(View parent, String name, Context context, AttributeSet attrs) { + switch (name) { + case "TextClock", "android.widget.TextClock" -> { + TextClock tc = new TextClock(context, attrs); + tc.setClockEventDelegate(AsyncClockEventDelegate.INSTANCE.get(this)); + return tc; + } + case "AnalogClock", "android.widget.AnalogClock" -> { + AnalogClock ac = new AnalogClock(context, attrs); + ac.setClockEventDelegate(AsyncClockEventDelegate.INSTANCE.get(this)); + return ac; + } + } return super.onCreateView(parent, name, context, attrs); } @@ -1428,4 +1727,38 @@ public View onCreateView(View parent, String name, Context context, AttributeSet public boolean isRecentsViewVisible() { return getStateManager().getState().isRecentsViewVisible; } + + public boolean isCanShowAllAppsEducationView() { + return mCanShowAllAppsEducationView; + } + + public void setCanShowAllAppsEducationView(boolean canShowAllAppsEducationView) { + mCanShowAllAppsEducationView = canShowAllAppsEducationView; + } + + @Override + public void returnToHomescreen() { + getStateManager().goToState(LauncherState.NORMAL); + } + + @Override + public int getOverviewBlurStyleResId() { + return isOverviewBackgroundBlurEnabled() ? R.style.OverviewBlurStyle + : R.style.OverviewBlurFallbackStyle; + } + + @Override + public LauncherActivityInterface getContainerInterface() { + return LauncherActivityInterface.INSTANCE; + } + + @Override + public SplitSelectStateController getSplitSelectStateController() { + return mSplitSelectStateController; + } + + @Override + public void goToRecentsState(RecentsState recentsState, boolean animated) { + getStateManager().goToState(RecentsStateUtilsKt.toLauncherState(recentsState), animated); + } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java index 45398b0267e..846c850a180 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java @@ -16,43 +16,43 @@ package com.android.launcher3.uioverrides; import static com.android.launcher3.BuildConfigs.WIDGETS_ENABLED; +import static com.android.launcher3.uioverrides.QuickstepAppWidgetHostProvider.getStaticQuickstepHost; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; +import static com.android.launcher3.widget.ListenableAppWidgetHost.getWidgetHolderExecutor; +import android.appwidget.AppWidgetEvent; import android.appwidget.AppWidgetHost; import android.appwidget.AppWidgetHostView; import android.appwidget.AppWidgetProviderInfo; import android.content.Context; -import android.util.Log; import android.util.SparseArray; import android.widget.RemoteViews; import androidx.annotation.AnyThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.UiThread; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.SafeCloseable; import com.android.launcher3.widget.LauncherAppWidgetHostView; import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.LauncherWidgetHolder; -import java.util.ArrayList; +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; + import java.util.Collections; -import java.util.List; import java.util.Set; import java.util.WeakHashMap; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import java.util.function.BiConsumer; -import java.util.function.IntConsumer; /** * {@link LauncherWidgetHolder} that puts the app widget host in the background */ -public class QuickstepWidgetHolder extends LauncherWidgetHolder { - - private static final String TAG = "QuickstepWidgetHolder"; +public final class QuickstepWidgetHolder extends LauncherWidgetHolder { private static final UpdateKey KEY_PROVIDER_UPDATE = AppWidgetHostView::onUpdateProviderInfo; @@ -60,52 +60,22 @@ public class QuickstepWidgetHolder extends LauncherWidgetHolder { AppWidgetHostView::updateAppWidget; private static final UpdateKey KEY_VIEW_DATA_CHANGED = AppWidgetHostView::onViewDataChanged; + private static final UpdateKey KEY_COLLECT_WIDGET_EVENT = + (view, event) -> { + event.merge(view.collectWidgetEvent()); + }; - private static final List sHolders = new ArrayList<>(); private static final SparseArray sListeners = new SparseArray<>(); - private static AppWidgetHost sWidgetHost = null; - private final UpdateHandler mUpdateHandler = this::onWidgetUpdate; - private final @Nullable RemoteViews.InteractionHandler mInteractionHandler; - - private final @NonNull IntConsumer mAppWidgetRemovedCallback; // Map to all pending updated keyed with appWidgetId; private final SparseArray mPendingUpdateMap = new SparseArray<>(); - public QuickstepWidgetHolder(@NonNull Context context, - @Nullable IntConsumer appWidgetRemovedCallback, - @Nullable RemoteViews.InteractionHandler interactionHandler) { - super(context, appWidgetRemovedCallback); - mAppWidgetRemovedCallback = appWidgetRemovedCallback != null ? appWidgetRemovedCallback - : i -> {}; - mInteractionHandler = interactionHandler; - MAIN_EXECUTOR.execute(() -> sHolders.add(this)); - } - - @Override - @NonNull - protected AppWidgetHost createHost(@NonNull Context context, - @Nullable IntConsumer appWidgetRemovedCallback) { - if (sWidgetHost == null) { - sWidgetHost = new QuickstepAppWidgetHost(context.getApplicationContext(), - i -> MAIN_EXECUTOR.execute(() -> - sHolders.forEach(h -> h.mAppWidgetRemovedCallback.accept(i))), - () -> MAIN_EXECUTOR.execute(() -> - sHolders.forEach(h -> - // Listeners might remove themselves from the list during the - // iteration. Creating a copy of the list to avoid exceptions - // for concurrent modification. - new ArrayList<>(h.mProviderChangedListeners).forEach( - ProviderChangedListener::notifyWidgetProvidersChanged))), - UI_HELPER_EXECUTOR.getLooper()); - if (WIDGETS_ENABLED) { - sWidgetHost.startListening(); - } - } - return sWidgetHost; + @AssistedInject + public QuickstepWidgetHolder(@Assisted("UI_CONTEXT") @NonNull Context context) { + super(context, getStaticQuickstepHost()); } @Override @@ -169,21 +139,6 @@ public void deleteAppWidgetId(int appWidgetId) { sListeners.remove(appWidgetId); } - /** - * Called when the launcher is destroyed - */ - @Override - public void destroy() { - try { - MAIN_EXECUTOR.submit(() -> { - clearViews(); - sHolders.remove(this); - }).get(); - } catch (Exception e) { - Log.e(TAG, "Failed to remove self from holder list", e); - } - } - @Override protected boolean shouldListen(int flags) { return (flags & (FLAG_STATE_IS_NORMAL | FLAG_ACTIVITY_STARTED)) @@ -199,12 +154,10 @@ public void stopListening() { return; } - try { - sWidgetHost.setAppWidgetHidden(); - } catch (Throwable t) { - // Ignore - } - setListeningFlag(false); + getWidgetHolderExecutor().execute(() -> { + mWidgetHost.setAppWidgetHidden(); + setListeningFlag(false); + }); } @Override @@ -220,7 +173,7 @@ public void onWidgetUpdate(int widgetId, UpdateKey key, T data) { }; QuickstepWidgetHolderListener holderListener = getHolderListener(appWidgetId); holderListener.addHolder(handler); - return () -> holderListener.mListeningHolders.remove(handler); + return () -> holderListener.removeHolder(handler); } /** @@ -242,7 +195,6 @@ protected LauncherAppWidgetHostView recycleExistingView(LauncherAppWidgetHostVie protected LauncherAppWidgetHostView createViewInternal( int appWidgetId, @NonNull LauncherAppWidgetProviderInfo appWidget) { LauncherAppWidgetHostView widgetView = new LauncherAppWidgetHostView(mContext); - widgetView.setInteractionHandler(mInteractionHandler); widgetView.setAppWidget(appWidgetId, appWidget); widgetView.updateAppWidget(getHolderListener(appWidgetId).addHolder(mUpdateHandler)); return widgetView; @@ -252,7 +204,7 @@ private static QuickstepWidgetHolderListener getHolderListener(int appWidgetId) QuickstepWidgetHolderListener listener = sListeners.get(appWidgetId); if (listener == null) { listener = new QuickstepWidgetHolderListener(appWidgetId); - sWidgetHost.setListener(appWidgetId, listener); + getStaticQuickstepHost().setListener(appWidgetId, listener); sListeners.put(appWidgetId, listener); } return listener; @@ -265,7 +217,7 @@ private static QuickstepWidgetHolderListener getHolderListener(int appWidgetId) public void clearViews() { mViews.clear(); for (int i = sListeners.size() - 1; i >= 0; i--) { - sListeners.valueAt(i).mListeningHolders.remove(mUpdateHandler); + sListeners.valueAt(i).removeHolder(mUpdateHandler); } } @@ -292,13 +244,15 @@ private static class QuickstepWidgetHolderListener mWidgetId = widgetId; } - @UiThread - @Nullable public RemoteViews addHolder(@NonNull UpdateHandler holder) { - mListeningHolders.add(holder); + MAIN_EXECUTOR.execute(() -> mListeningHolders.add(holder)); return mRemoteViews; } + public void removeHolder(@NonNull UpdateHandler holder) { + MAIN_EXECUTOR.execute(() -> mListeningHolders.remove(holder)); + } + @Override @AnyThread public void onUpdateProviderInfo(@Nullable AppWidgetProviderInfo info) { @@ -319,50 +273,38 @@ public void onViewDataChanged(int viewId) { executeOnMainExecutor(KEY_VIEW_DATA_CHANGED, viewId); } + @Nullable + @Override + public AppWidgetEvent collectWidgetEvent() { + if (!android.appwidget.flags.Flags.engagementMetrics()) return null; + + CompletableFuture future = new CompletableFuture<>(); + MAIN_EXECUTOR.execute(() -> { + AppWidgetEvent.Builder event = new AppWidgetEvent.Builder(); + mListeningHolders.forEach(holder -> + holder.onWidgetUpdate(mWidgetId, KEY_COLLECT_WIDGET_EVENT, event)); + future.complete(event.isEmpty() ? null : event.build()); + }); + try { + return future.get(); + } catch (InterruptedException | ExecutionException e) { + return null; + } + } + private void executeOnMainExecutor(UpdateKey key, T data) { MAIN_EXECUTOR.execute(() -> mListeningHolders.forEach(holder -> holder.onWidgetUpdate(mWidgetId, key, data))); } } - /** - * {@code HolderFactory} subclass that takes an interaction handler as one of the parameters - * when creating a new instance. - */ - public static class QuickstepHolderFactory extends HolderFactory { - @SuppressWarnings("unused") - public QuickstepHolderFactory(Context context) { } + /** A factory that generates new instances of {@code LauncherWidgetHolder} */ + @AssistedFactory + public interface QuickstepWidgetHolderFactory extends WidgetHolderFactory { @Override - public LauncherWidgetHolder newInstance(@NonNull Context context, - @Nullable IntConsumer appWidgetRemovedCallback) { - return newInstance(context, appWidgetRemovedCallback, null); - } - - /** - * @param context The context of the caller - * @param appWidgetRemovedCallback The callback that is called when widgets are removed - * @param interactionHandler The interaction handler when the widgets are clicked - * @return A new {@link LauncherWidgetHolder} instance - */ - public LauncherWidgetHolder newInstance(@NonNull Context context, - @Nullable IntConsumer appWidgetRemovedCallback, - @Nullable RemoteViews.InteractionHandler interactionHandler) { - - if (!FeatureFlags.ENABLE_WIDGET_HOST_IN_BACKGROUND.get()) { - return new LauncherWidgetHolder(context, appWidgetRemovedCallback) { - @Override - protected AppWidgetHost createHost(Context context, - @Nullable IntConsumer appWidgetRemovedCallback) { - AppWidgetHost host = super.createHost(context, appWidgetRemovedCallback); - host.setInteractionHandler(interactionHandler); - return host; - } - }; - } - return new QuickstepWidgetHolder(context, appWidgetRemovedCallback, interactionHandler); - } + QuickstepWidgetHolder newInstance(@Assisted("UI_CONTEXT") @NonNull Context context); } private interface UpdateKey extends BiConsumer { } diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java deleted file mode 100644 index 235ec7b1018..00000000000 --- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.uioverrides; - -import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON; -import static com.android.launcher3.LauncherState.OVERVIEW; -import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS; -import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE; -import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA; -import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS; -import static com.android.quickstep.views.RecentsView.TASK_MODALNESS; -import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION; -import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION; -import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL; -import static com.android.wm.shell.Flags.enableSplitContextual; - -import android.animation.AnimatorSet; -import android.annotation.TargetApi; -import android.os.Build; -import android.util.FloatProperty; -import android.util.Log; -import android.util.Pair; - -import androidx.annotation.NonNull; - -import com.android.launcher3.LauncherState; -import com.android.launcher3.Utilities; -import com.android.launcher3.anim.AnimatedFloat; -import com.android.launcher3.anim.AnimatorListeners; -import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.anim.PropertySetter; -import com.android.launcher3.states.StateAnimationConfig; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.AnimUtils; -import com.android.quickstep.util.SplitAnimationTimings; -import com.android.quickstep.views.ClearAllButton; -import com.android.quickstep.views.LauncherRecentsView; -import com.android.quickstep.views.RecentsView; - -/** - * State handler for handling UI changes for {@link LauncherRecentsView}. In addition to managing - * the basic view properties, this class also manages changes in the task visuals. - */ -@TargetApi(Build.VERSION_CODES.O) -public final class RecentsViewStateController extends - BaseRecentsViewStateController { - - public RecentsViewStateController(QuickstepLauncher launcher) { - super(launcher); - } - - @Override - public void setState(@NonNull LauncherState state) { - super.setState(state); - if (state.isRecentsViewVisible) { - mRecentsView.updateEmptyMessage(); - } else { - mRecentsView.resetTaskVisuals(); - } - setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, new StateAnimationConfig(), state); - mRecentsView.setFullscreenProgress(state.getOverviewFullscreenProgress()); - // In Overview, we may be layering app surfaces behind Launcher, so we need to notify - // DepthController to prevent optimizations which might occlude the layers behind - mLauncher.getDepthController().setHasContentBehindLauncher(state.isRecentsViewVisible); - - PendingAnimation builder = - new PendingAnimation(state.getTransitionDuration(mLauncher, true)); - - handleSplitSelectionState(state, builder, /* animate */false); - } - - @Override - void setStateWithAnimationInternal(@NonNull LauncherState toState, - @NonNull StateAnimationConfig config, @NonNull PendingAnimation builder) { - super.setStateWithAnimationInternal(toState, config, builder); - - if (toState.isRecentsViewVisible) { - // While animating into recents, update the visible task data as needed - builder.addOnFrameCallback(() -> mRecentsView.loadVisibleTaskData(FLAG_UPDATE_ALL)); - mRecentsView.updateEmptyMessage(); - // TODO(b/246283207): Remove logging once root cause of flake detected. - if (Utilities.isRunningInTestHarness()) { - Log.d("b/246283207", "RecentsView#setStateWithAnimationInternal getCurrentPage(): " - + mRecentsView.getCurrentPage() - + ", getScrollForPage(getCurrentPage())): " - + mRecentsView.getScrollForPage(mRecentsView.getCurrentPage())); - } - } else { - builder.addListener( - AnimatorListeners.forSuccessCallback(mRecentsView::resetTaskVisuals)); - } - // In Overview, we may be layering app surfaces behind Launcher, so we need to notify - // DepthController to prevent optimizations which might occlude the layers behind - builder.addListener(AnimatorListeners.forSuccessCallback(() -> - mLauncher.getDepthController().setHasContentBehindLauncher( - toState.isRecentsViewVisible))); - - handleSplitSelectionState(toState, builder, /* animate */true); - - setAlphas(builder, config, toState); - builder.setFloat(mRecentsView, FULLSCREEN_PROGRESS, - toState.getOverviewFullscreenProgress(), LINEAR); - } - - /** - * Create or dismiss split screen select animations. - * @param builder if null then this will run the split select animations right away, otherwise - * will add animations to builder. - */ - private void handleSplitSelectionState(@NonNull LauncherState toState, - @NonNull PendingAnimation builder, boolean animate) { - boolean goingToOverviewFromWorkspaceContextual = enableSplitContextual() && - toState == OVERVIEW && mLauncher.isSplitSelectionActive(); - if (toState != OVERVIEW_SPLIT_SELECT && !goingToOverviewFromWorkspaceContextual) { - // Not going to split - return; - } - - // Create transition animations to split select - RecentsPagedOrientationHandler orientationHandler = - ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler(); - Pair, FloatProperty> taskViewsFloat = - orientationHandler.getSplitSelectTaskOffset( - TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION, - mLauncher.getDeviceProfile()); - - SplitAnimationTimings timings = - AnimUtils.getDeviceOverviewToSplitTimings(mLauncher.getDeviceProfile().isTablet); - if (!goingToOverviewFromWorkspaceContextual) { - // This animation is already done for the contextual case, don't redo it - mRecentsView.createSplitSelectInitAnimation(builder, - toState.getTransitionDuration(mLauncher, true /* isToState */)); - } - // Shift tasks vertically downward to get out of placeholder view - builder.setFloat(mRecentsView, taskViewsFloat.first, - toState.getSplitSelectTranslation(mLauncher), - timings.getGridSlidePrimaryInterpolator()); - // Zero out horizontal translation - builder.setFloat(mRecentsView, taskViewsFloat.second, - 0, - timings.getGridSlideSecondaryInterpolator()); - - if (!animate) { - AnimatorSet as = builder.buildAnim(); - as.start(); - as.end(); - } - } - - private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config, - LauncherState state) { - float clearAllButtonAlpha = state.areElementsVisible(mLauncher, CLEAR_ALL_BUTTON) ? 1 : 0; - propertySetter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA, - clearAllButtonAlpha, LINEAR); - float overviewButtonAlpha = state.areElementsVisible(mLauncher, OVERVIEW_ACTIONS) ? 1 : 0; - propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(), - AnimatedFloat.VALUE, overviewButtonAlpha, config.getInterpolator( - ANIM_OVERVIEW_ACTIONS_FADE, LINEAR)); - } - - @Override - FloatProperty getTaskModalnessProperty() { - return TASK_MODALNESS; - } - - @Override - FloatProperty getContentAlphaProperty() { - return CONTENT_ALPHA; - } -} diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt new file mode 100644 index 00000000000..87d2666858f --- /dev/null +++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt @@ -0,0 +1,324 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.uioverrides + +import com.android.app.animation.Interpolators.ACCELERATE_DECELERATE +import com.android.app.animation.Interpolators.AGGRESSIVE_EASE_IN_OUT +import com.android.app.animation.Interpolators.FINAL_FRAME +import com.android.app.animation.Interpolators.INSTANT +import com.android.app.animation.Interpolators.LINEAR +import com.android.launcher3.Flags.enableDesktopExplodedView +import com.android.launcher3.LauncherState +import com.android.launcher3.anim.AnimatedFloat +import com.android.launcher3.anim.AnimatorListeners.forSuccessCallback +import com.android.launcher3.anim.PendingAnimation +import com.android.launcher3.anim.PropertySetter +import com.android.launcher3.statemanager.StateManager.StateHandler +import com.android.launcher3.states.StateAnimationConfig +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y +import com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW +import com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview +import com.android.quickstep.util.AnimUtils +import com.android.quickstep.views.AddDesktopButton +import com.android.quickstep.views.ClearAllButton +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET +import com.android.quickstep.views.RecentsView.CONTENT_ALPHA +import com.android.quickstep.views.RecentsView.DESKTOP_CAROUSEL_DETACH_PROGRESS +import com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS +import com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS +import com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY +import com.android.quickstep.views.RecentsView.TASK_MODALNESS +import com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION +import com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION +import com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION +import com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA +import com.android.quickstep.views.RecentsViewUtils.Companion.DESK_EXPLODE_PROGRESS +import com.android.quickstep.views.TaskView.Companion.FLAG_UPDATE_ALL + +/** + * State handler for handling UI changes for [com.android.quickstep.views.LauncherRecentsView]. In + * addition to managing the basic view properties, this class also manages changes in the task + * visuals. + */ +class RecentsViewStateController(private val launcher: QuickstepLauncher) : + StateHandler { + private val recentsView: RecentsView<*, *> = launcher.getOverviewPanel() + + override fun setState(state: LauncherState) { + val scaleAndOffset = state.getOverviewScaleAndOffset(launcher) + RECENTS_SCALE_PROPERTY.set(recentsView, scaleAndOffset[0]) + ADJACENT_PAGE_HORIZONTAL_OFFSET.set(recentsView, scaleAndOffset[1]) + TASK_SECONDARY_TRANSLATION.set(recentsView, 0f) + + CONTENT_ALPHA.set(recentsView, if (state.isRecentsViewVisible) 1f else 0f) + TASK_MODALNESS.set(recentsView, state.overviewModalness) + RECENTS_GRID_PROGRESS.set( + recentsView, + if (state.displayOverviewTasksAsGrid(launcher.deviceProfile)) 1f else 0f, + ) + if (enableDesktopExplodedView()) { + DESK_EXPLODE_PROGRESS.set(recentsView, if (state.showExplodedDesktopView()) 1f else 0f) + } + + TASK_THUMBNAIL_SPLASH_ALPHA.set( + recentsView, + if (state.showTaskThumbnailSplash()) 1f else 0f, + ) + DESKTOP_CAROUSEL_DETACH_PROGRESS.set( + recentsView, + if (state.detachDesktopCarousel()) 1f else 0f, + ) + + if (state.isRecentsViewVisible) { + recentsView.updateEmptyMessage() + } else { + recentsView.resetTaskVisuals() + } + setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, StateAnimationConfig(), state) + recentsView.setFullscreenProgress(state.overviewFullscreenProgress) + // In Overview, we may be layering app surfaces behind Launcher, so we need to notify + // DepthController to prevent optimizations which might occlude the layers behind + launcher.depthController.setHasContentBehindLauncher(state.isRecentsViewVisible) + + val builder = PendingAnimation(state.getTransitionDuration(launcher, true).toLong()) + handleSplitSelectionState(state, builder, animate = false) + } + + override fun setStateWithAnimation( + toState: LauncherState, + config: StateAnimationConfig, + builder: PendingAnimation, + ) { + if (config.hasAnimationFlag(SKIP_OVERVIEW)) return + + val scaleAndOffset = toState.getOverviewScaleAndOffset(launcher) + builder.setFloat( + recentsView, + RECENTS_SCALE_PROPERTY, + scaleAndOffset[0], + config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR), + ) + builder.setFloat( + recentsView, + ADJACENT_PAGE_HORIZONTAL_OFFSET, + scaleAndOffset[1], + config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR), + ) + builder.setFloat( + recentsView, + TASK_SECONDARY_TRANSLATION, + 0f, + config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR), + ) + + builder.setFloat( + recentsView, + CONTENT_ALPHA, + if (toState.isRecentsViewVisible) 1f else 0f, + config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT), + ) + + builder.setFloat( + recentsView, + TASK_MODALNESS, + toState.overviewModalness, + config.getInterpolator( + ANIM_OVERVIEW_MODAL, + if (enableGridOnlyOverview() && !toState.isRecentsViewVisible) FINAL_FRAME + else LINEAR, + ), + ) + + val fromState = launcher.stateManager.state + builder.setFloat( + recentsView, + TASK_THUMBNAIL_SPLASH_ALPHA, + if (toState.showTaskThumbnailSplash()) 1f else 0f, + getOverviewInterpolator(fromState, toState), + ) + + builder.setFloat( + recentsView, + RECENTS_GRID_PROGRESS, + if (toState.displayOverviewTasksAsGrid(launcher.deviceProfile)) 1f else 0f, + getOverviewInterpolator(fromState, toState), + ) + + if (enableDesktopExplodedView()) { + builder.setFloat( + recentsView, + DESK_EXPLODE_PROGRESS, + if (toState.showExplodedDesktopView()) 1f else 0f, + getOverviewInterpolator(fromState, toState), + ) + } + + builder.setFloat( + recentsView, + DESKTOP_CAROUSEL_DETACH_PROGRESS, + if (toState.detachDesktopCarousel()) 1f else 0f, + getOverviewInterpolator(fromState, toState), + ) + + if (toState.isRecentsViewVisible) { + // While animating into recents, update the visible task data as needed + builder.addOnFrameCallback { recentsView.loadVisibleTaskData(FLAG_UPDATE_ALL) } + recentsView.updateEmptyMessage() + } else { + builder.addListener(forSuccessCallback { recentsView.resetTaskVisuals() }) + } + // In Overview, we may be layering app surfaces behind Launcher, so we need to notify + // DepthController to prevent optimizations which might occlude the layers behind + builder.addListener( + forSuccessCallback { + launcher.depthController.setHasContentBehindLauncher(toState.isRecentsViewVisible) + } + ) + + handleSplitSelectionState(toState, builder, animate = true) + + setAlphas(builder, config, toState) + builder.setFloat( + recentsView, + FULLSCREEN_PROGRESS, + toState.overviewFullscreenProgress, + LINEAR, + ) + + builder.addEndListener { success: Boolean -> + if (!success && !toState.isRecentsViewVisible) { + recentsView.reset() + } + } + } + + /** + * Create or dismiss split screen select animations. + * + * @param builder if null then this will run the split select animations right away, otherwise + * will add animations to builder. + */ + private fun handleSplitSelectionState( + toState: LauncherState, + builder: PendingAnimation, + animate: Boolean, + ) { + val goingToOverviewFromWorkspaceContextual = + toState == LauncherState.OVERVIEW && launcher.isSplitSelectionActive + if ( + toState != LauncherState.OVERVIEW_SPLIT_SELECT && + !goingToOverviewFromWorkspaceContextual + ) { + // Not going to split + return + } + + // Create transition animations to split select + val orientationHandler = recentsView.pagedOrientationHandler + val taskViewsFloat = + orientationHandler.getSplitSelectTaskOffset( + TASK_PRIMARY_SPLIT_TRANSLATION, + TASK_SECONDARY_SPLIT_TRANSLATION, + launcher.deviceProfile, + ) + + val timings = + AnimUtils.getDeviceOverviewToSplitTimings( + launcher.deviceProfile.getDeviceProperties().isTablet + ) + if (!goingToOverviewFromWorkspaceContextual) { + // This animation is already done for the contextual case, don't redo it + recentsView.createSplitSelectInitAnimation( + builder, + toState.getTransitionDuration(launcher, true), + ) + } + // Shift tasks vertically downward to get out of placeholder view + builder.setFloat( + recentsView, + taskViewsFloat.first, + toState.getSplitSelectTranslation(launcher), + timings.gridSlidePrimaryInterpolator, + ) + // Zero out horizontal translation + builder.setFloat( + recentsView, + taskViewsFloat.second, + 0f, + timings.gridSlideSecondaryInterpolator, + ) + + recentsView.handleDesktopTaskInSplitSelectState( + builder, + timings.desktopTaskFadeInterpolator, + ) + + if (!animate) { + builder.buildAnim().apply { + start() + end() + } + } + } + + private fun setAlphas( + propertySetter: PropertySetter, + config: StateAnimationConfig, + state: LauncherState, + ) { + val launcherUiState = launcher.launcherUiState + val clearAllButtonAlpha = + if (state.areElementsVisible(launcherUiState, LauncherState.CLEAR_ALL_BUTTON)) 1f + else 0f + propertySetter.setFloat( + recentsView.clearAllButton, + ClearAllButton.VISIBILITY_ALPHA, + clearAllButtonAlpha, + LINEAR, + ) + val overviewButtonAlpha = + if (state.areElementsVisible(launcherUiState, LauncherState.OVERVIEW_ACTIONS)) 1f + else 0f + propertySetter.setFloat( + launcher.actionsView.visibilityAlpha, + AnimatedFloat.VALUE, + overviewButtonAlpha, + config.getInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR), + ) + recentsView.addDeskButton?.let { + propertySetter.setFloat( + it, + AddDesktopButton.VISIBILITY_ALPHA, + if (state.areElementsVisible(launcherUiState, LauncherState.ADD_DESK_BUTTON)) 1f + else 0f, + LINEAR, + ) + } + } + + private fun getOverviewInterpolator(fromState: LauncherState, toState: LauncherState) = + when { + fromState == LauncherState.QUICK_SWITCH_FROM_HOME -> ACCELERATE_DECELERATE + toState.isRecentsViewVisible -> INSTANT + else -> FINAL_FRAME + } +} diff --git a/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt b/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt index fe04a57e9f3..a7d46a20366 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt @@ -26,31 +26,40 @@ import android.content.pm.ActivityInfo import android.content.pm.LauncherActivityInfo import android.content.pm.LauncherApps import android.content.pm.ShortcutInfo +import android.graphics.Bitmap +import android.graphics.Rect import android.os.Build import android.os.Bundle +import android.os.Flags.allowPrivateProfile import android.os.IBinder import android.os.UserHandle -import android.os.UserManager -import android.util.ArrayMap +import android.view.SurfaceControlViewHost import android.widget.Toast import android.window.RemoteTransition +import android.window.ScreenCapture.ScreenCaptureParams +import android.window.ScreenCaptureInternal +import com.android.launcher3.BaseActivity import androidx.annotation.RequiresApi -import app.lawnchair.LawnchairApp import com.android.launcher3.Flags.enablePrivateSpace -import com.android.launcher3.Flags.enablePrivateSpaceInstallShortcut -import com.android.launcher3.Flags.privateSpaceAppInstallerButton -import com.android.launcher3.Flags.privateSpaceSysAppsSeparation import com.android.launcher3.R import com.android.launcher3.Utilities +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppSingleton import com.android.launcher3.proxy.ProxyActivityStarter +import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController import com.android.launcher3.util.ApiWrapper import com.android.launcher3.util.Executors import com.android.launcher3.util.StartActivityParams -import com.android.launcher3.util.UserIconInfo import com.android.quickstep.util.FadeOutRemoteTransition +import java.util.function.Supplier +import javax.inject.Inject + +import app.lawnchair.LawnchairApp /** A wrapper for the hidden API calls */ -open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { +@LauncherAppSingleton +open class SystemApiWrapper @Inject constructor(@ApplicationContext context: Context?) : + ApiWrapper(context) { override fun getPersons(si: ShortcutInfo) = si.persons ?: Utilities.EMPTY_PERSON_ARRAY @@ -65,60 +74,16 @@ open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { override fun createFadeOutAnimOptions(): ActivityOptions { return try { ActivityOptions.makeBasic().apply { - remoteTransition = RemoteTransition(FadeOutRemoteTransition()) + remoteTransition = RemoteTransition(FadeOutRemoteTransition(), "FadeOut") } } catch (t: Throwable) { super.createFadeOutAnimOptions() } } - @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) - override fun queryAllUsers(): Map { - if (!enablePrivateSpace() || !LawnchairApp.isRecentsEnabled) { - return super.queryAllUsers() - } - return try { - val users = ArrayMap() - mContext.getSystemService(UserManager::class.java)!!.userProfiles?.forEach { user -> - mContext.getSystemService(LauncherApps::class.java)!!.getLauncherUserInfo(user)?.apply { - users[user] = - UserIconInfo( - user, - when (userType) { - UserManager.USER_TYPE_PROFILE_MANAGED -> UserIconInfo.TYPE_WORK - UserManager.USER_TYPE_PROFILE_CLONE -> UserIconInfo.TYPE_CLONED - UserManager.USER_TYPE_PROFILE_PRIVATE -> UserIconInfo.TYPE_PRIVATE - else -> UserIconInfo.TYPE_MAIN - }, - userSerialNumber.toLong() - ) - } - } - return users - } catch (t : Throwable) { - return super.queryAllUsers() - } - } - - @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) - override fun getPreInstalledSystemPackages(user: UserHandle): List { - return try { - if (enablePrivateSpace() && privateSpaceSysAppsSeparation()) - mContext - .getSystemService(LauncherApps::class.java)!! - .getPreInstalledSystemPackages(user) - else ArrayList() - } catch (t: Throwable) { - super.getPreInstalledSystemPackages(user) - } - } - override fun getAppMarketActivityIntent(packageName: String, user: UserHandle): Intent { return try { - if ( - enablePrivateSpace() && - (privateSpaceAppInstallerButton() || enablePrivateSpaceInstallShortcut()) - ) + if (allowPrivateProfile() && enablePrivateSpace()) ProxyActivityStarter.getLaunchIntent( mContext, StartActivityParams(null as PendingIntent?, 0).apply { @@ -133,7 +98,7 @@ open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { ) .toBundle() requireActivityResult = false - } + }, ) else super.getAppMarketActivityIntent(packageName, user) } catch (t: Throwable) { @@ -144,7 +109,7 @@ open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { /** Returns an intent which can be used to open Private Space Settings. */ override fun getPrivateSpaceSettingsIntent(): Intent? { return try { - if (enablePrivateSpace()) + if (allowPrivateProfile() && enablePrivateSpace()) ProxyActivityStarter.getLaunchIntent( mContext, StartActivityParams(null as PendingIntent?, 0).apply { @@ -159,7 +124,7 @@ open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { ) .toBundle() requireActivityResult = false - } + }, ) else null } catch (t: Throwable) { @@ -175,6 +140,14 @@ open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { } } + override fun supportsMultiInstance(lai: LauncherActivityInfo): Boolean { + return try { + super.supportsMultiInstance(lai) || lai.supportsMultiInstance() + } catch (t: Throwable) { + false + } + } + /** * Starts an Activity which can be used to set this Launcher as the HOME app, via a consent * screen. In case the consent screen cannot be shown, or the user does not set current Launcher @@ -198,7 +171,7 @@ open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { allowlistToken: IBinder?, finishedReceiver: IIntentReceiver?, requiredPermission: String?, - options: Bundle? + options: Bundle?, ) { if (code != -1) { Executors.MAIN_EXECUTOR.execute { @@ -206,9 +179,9 @@ open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { context, context.getString( R.string.set_default_home_app, - context.getString(R.string.derived_app_name) + context.getString(R.string.derived_app_name), ), - Toast.LENGTH_LONG + Toast.LENGTH_LONG, ) .show() } @@ -224,4 +197,25 @@ open class SystemApiWrapper(context: Context?) : ApiWrapper(context) { super.assignDefaultHomeRole(context) } } + + override fun createStatusBarTouchController( + launcher: BaseActivity, + isEnabledCheck: Supplier, + ): StatusBarTouchController? { + return StatusBarTouchController(launcher, isEnabledCheck) + } + + override fun isFileDrawable(shortcutInfo: ShortcutInfo) = + shortcutInfo.hasIconFile() || shortcutInfo.hasIconUri() + + override fun captureSnapshot(host: SurfaceControlViewHost, width: Int, height: Int): Bitmap = + ScreenCaptureInternal.captureLayers( + ScreenCaptureInternal.LayerCaptureArgs.Builder(host.surfacePackage!!.surfaceControl) + .setSourceCrop(Rect(0, 0, width, height)) + .setProtectedContentPolicy(ScreenCaptureParams.PROTECTED_CONTENT_POLICY_CAPTURE) + .setPreserveDisplayColors(true) + .build() + ) + .asBitmap() + .copy(Bitmap.Config.ARGB_8888, true) } diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt b/quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt index 4ae4577fe13..d1effa08a2a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt @@ -17,8 +17,6 @@ package com.android.launcher3.uioverrides.flags import android.app.PendingIntent -import android.app.blob.BlobHandle.createWithSha256 -import android.app.blob.BlobStoreManager import android.content.Context import android.content.IIntentReceiver import android.content.IIntentSender.Stub @@ -29,14 +27,10 @@ import android.content.pm.PackageManager import android.net.Uri import android.os.Bundle import android.os.IBinder -import android.os.ParcelFileDescriptor.AutoCloseOutputStream +import android.provider.DeviceConfig import android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS -import android.provider.Settings.Secure import android.text.Html import android.util.AttributeSet -import android.util.Base64 -import android.util.Base64.NO_PADDING -import android.util.Base64.NO_WRAP import android.view.inputmethod.EditorInfo import android.widget.TextView import android.widget.Toast @@ -46,47 +40,31 @@ import androidx.preference.PreferenceCategory import androidx.preference.PreferenceGroup import androidx.preference.PreferenceViewHolder import androidx.preference.SwitchPreference -import com.android.launcher3.AutoInstallsLayout import com.android.launcher3.ExtendedEditText import com.android.launcher3.LauncherAppState import com.android.launcher3.LauncherPrefs -import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP -import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT -import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION -import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET -import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT -import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_FOLDER -import com.android.launcher3.LauncherSettings.Settings.LAYOUT_DIGEST_KEY -import com.android.launcher3.LauncherSettings.Settings.LAYOUT_DIGEST_LABEL -import com.android.launcher3.LauncherSettings.Settings.LAYOUT_DIGEST_TAG import com.android.launcher3.R -import com.android.launcher3.model.data.FolderInfo -import com.android.launcher3.model.data.ItemInfo -import com.android.launcher3.model.data.LauncherAppWidgetInfo -import com.android.launcher3.pm.UserCache +import com.android.launcher3.dagger.LauncherComponentProvider.appComponent import com.android.launcher3.proxy.ProxyActivityStarter import com.android.launcher3.secondarydisplay.SecondaryDisplayLauncher -import com.android.launcher3.shortcuts.ShortcutKey import com.android.launcher3.uioverrides.plugins.PluginManagerWrapperImpl import com.android.launcher3.util.Executors.MAIN_EXECUTOR -import com.android.launcher3.util.Executors.MODEL_EXECUTOR import com.android.launcher3.util.Executors.ORDERED_BG_EXECUTOR -import com.android.launcher3.util.LauncherLayoutBuilder import com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT import com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_COUNT import com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_SEEN import com.android.launcher3.util.OnboardingPrefs.HOTSEAT_DISCOVERY_TIP_COUNT import com.android.launcher3.util.OnboardingPrefs.HOTSEAT_LONGPRESS_TIP_SEEN import com.android.launcher3.util.OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP +import com.android.launcher3.util.OnboardingPrefs.TASKBAR_SEARCH_EDU_SEEN import com.android.launcher3.util.PluginManagerWrapper import com.android.launcher3.util.StartActivityParams -import com.android.launcher3.util.UserIconInfo import com.android.quickstep.util.DeviceConfigHelper +import com.android.quickstep.util.DeviceConfigHelper.Companion.NAMESPACE_LAUNCHER import com.android.quickstep.util.DeviceConfigHelper.DebugInfo -import com.android.systemui.shared.plugins.PluginEnabler +import com.android.systemui.shared.plugins.PluginEnabler.DisableReason import com.android.systemui.shared.plugins.PluginPrefs -import java.io.OutputStreamWriter -import java.security.MessageDigest +import java.nio.charset.StandardCharsets import java.util.Locale import java.util.concurrent.Executor @@ -236,10 +214,15 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a ) private fun DebugInfo.getBoolValue() = - DeviceConfigHelper.prefs.getBoolean(this.key, this.valueInCode) + DeviceConfigHelper.prefs.getBoolean( + this.key, + DeviceConfig.getBoolean(NAMESPACE_LAUNCHER, this.key, this.valueInCode), + ) private fun DebugInfo.getIntValueAsString() = - DeviceConfigHelper.prefs.getInt(this.key, this.valueInCode).toString() + DeviceConfigHelper.prefs + .getInt(this.key, DeviceConfig.getInt(NAMESPACE_LAUNCHER, this.key, this.valueInCode)) + .toString() /** * Inflates the preferences for plugins @@ -257,7 +240,7 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a val pluginPermissionApps = pm.getPackagesHoldingPermissions( arrayOf(PLUGIN_PERMISSION), - PackageManager.MATCH_DISABLED_COMPONENTS + PackageManager.MATCH_DISABLED_COMPONENTS, ) .map { it.packageName } @@ -266,7 +249,7 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a pm.queryIntentServices( Intent(action), PackageManager.MATCH_DISABLED_COMPONENTS or - PackageManager.GET_RESOLVED_FILTER + PackageManager.GET_RESOLVED_FILTER, ) .filter { pluginPermissionApps.contains(it.serviceInfo.packageName) } } @@ -303,12 +286,12 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a setOnPreferenceChangeListener { _, newVal -> val disabledState = - if (newVal as Boolean) PluginEnabler.ENABLED - else PluginEnabler.DISABLED_MANUALLY + if (newVal as Boolean) DisableReason.ENABLED + else DisableReason.DISABLED_MANUALLY infoList.forEach { manager.pluginEnabler.setDisabled( it.serviceInfo.componentName, - disabledState + disabledState, ) } manager.notifyChange(Intent(Intent.ACTION_PACKAGE_CHANGED, pluginUri)) @@ -332,6 +315,12 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a intent = Intent(launchSandboxIntent).putExtra("use_tutorial_menu", true) } ) + addPreference( + Preference(context).apply { + title = "Launch Full Gesture Tutorial" + intent = Intent(launchSandboxIntent).putExtra("use_tutorial_menu", false) + } + ) addPreference( Preference(context).apply { title = "Launch Back Tutorial" @@ -379,14 +368,15 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a addOnboardPref( "All Apps Bounce", HOME_BOUNCE_SEEN.sharedPrefKey, - HOME_BOUNCE_COUNT.sharedPrefKey + HOME_BOUNCE_COUNT.sharedPrefKey, ) addOnboardPref( "Hybrid Hotseat Education", HOTSEAT_DISCOVERY_TIP_COUNT.sharedPrefKey, - HOTSEAT_LONGPRESS_TIP_SEEN.sharedPrefKey + HOTSEAT_LONGPRESS_TIP_SEEN.sharedPrefKey, ) addOnboardPref("Taskbar Education", TASKBAR_EDU_TOOLTIP_STEP.sharedPrefKey) + addOnboardPref("Taskbar Search Education", TASKBAR_SEARCH_EDU_SEEN.sharedPrefKey) addOnboardPref("All Apps Visited Count", ALL_APPS_VISITED_COUNT.sharedPrefKey) } } @@ -414,26 +404,12 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a title = "Export" intent = createUriPickerIntent(ACTION_CREATE_DOCUMENT, MAIN_EXECUTOR) { uri -> - model.enqueueModelUpdateTask { _, dataModel, _ -> - val builder = LauncherLayoutBuilder() - dataModel.workspaceItems.forEach { info -> - val loc = - when (info.container) { - CONTAINER_DESKTOP -> - builder.atWorkspace(info.cellX, info.cellY, info.screenId) - CONTAINER_HOTSEAT -> builder.atHotseat(info.screenId) - else -> return@forEach - } - loc.addItem(info) - } - dataModel.appWidgets.forEach { info -> - builder.atWorkspace(info.cellX, info.cellY, info.screenId).addItem(info) - } - + context.appComponent.layoutImportExportHelper.exportModelDbAsXml { layoutXml -> context.contentResolver.openOutputStream(uri).use { os -> - builder.build(OutputStreamWriter(os)) + val bytes: ByteArray = + layoutXml.toByteArray(StandardCharsets.UTF_8) // Encode to UTF-8 + os?.write(bytes) } - MAIN_EXECUTOR.execute { Toast.makeText(context, "File saved", Toast.LENGTH_LONG).show() } @@ -451,67 +427,16 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a resolver.openInputStream(uri).use { stream -> stream?.readAllBytes() ?: return@createUriPickerIntent } - - val digest = MessageDigest.getInstance("SHA-256").digest(data) - val handle = createWithSha256(digest, LAYOUT_DIGEST_LABEL, 0, LAYOUT_DIGEST_TAG) - val blobManager = context.getSystemService(BlobStoreManager::class.java)!! - - blobManager.openSession(blobManager.createSession(handle)).use { session -> - AutoCloseOutputStream(session.openWrite(0, -1)).use { it.write(data) } - session.allowPublicAccess() - - session.commit(ORDERED_BG_EXECUTOR) { - val key = Base64.encodeToString(digest, NO_WRAP or NO_PADDING) - Secure.putString(resolver, LAYOUT_DIGEST_KEY, key) - - MODEL_EXECUTOR.submit { model.modelDbController.createEmptyDB() }.get() - MAIN_EXECUTOR.submit { model.forceReload() }.get() - MODEL_EXECUTOR.submit {}.get() - Secure.putString(resolver, LAYOUT_DIGEST_KEY, null) - } - } + context.appComponent.layoutImportExportHelper.importModelFromXml(data) } category.addPreference(this) } } - private fun LauncherLayoutBuilder.ItemTarget.addItem(info: ItemInfo) { - val userType: String? = - when (UserCache.INSTANCE.get(context).getUserInfo(info.user).type) { - UserIconInfo.TYPE_WORK -> AutoInstallsLayout.USER_TYPE_WORK - UserIconInfo.TYPE_CLONED -> AutoInstallsLayout.USER_TYPE_CLONED - else -> null - } - when (info.itemType) { - ITEM_TYPE_APPLICATION -> - info.targetComponent?.let { c -> putApp(c.packageName, c.className, userType) } - ITEM_TYPE_DEEP_SHORTCUT -> - ShortcutKey.fromItemInfo(info).let { key -> - putShortcut(key.packageName, key.id, userType) - } - ITEM_TYPE_FOLDER -> - (info as FolderInfo).let { folderInfo -> - putFolder(folderInfo.title?.toString() ?: "").also { folderBuilder -> - folderInfo.getContents().forEach { folderContent -> - folderBuilder.addItem(folderContent) - } - } - } - ITEM_TYPE_APPWIDGET -> - putWidget( - (info as LauncherAppWidgetInfo).providerName.packageName, - info.providerName.className, - info.spanX, - info.spanY, - userType - ) - } - } - private fun createUriPickerIntent( action: String, executor: Executor, - callback: (uri: Uri) -> Unit + callback: (uri: Uri) -> Unit, ): Intent { val pendingIntent = PendingIntent( @@ -523,7 +448,7 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a allowlistToken: IBinder?, finishedReceiver: IIntentReceiver?, requiredPermission: String?, - options: Bundle? + options: Bundle?, ) { intent.data?.let { uri -> executor.execute { callback(uri) } } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java index 4e09f1fc59f..d4454e4e7d9 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java +++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java @@ -15,9 +15,10 @@ package com.android.launcher3.uioverrides.plugins; import android.content.ComponentName; -import android.content.Context; import android.content.SharedPreferences; +import androidx.annotation.NonNull; + import com.android.launcher3.LauncherPrefs; import com.android.systemui.shared.plugins.PluginEnabler; @@ -27,8 +28,8 @@ public class PluginEnablerImpl implements PluginEnabler { final private SharedPreferences mSharedPrefs; - public PluginEnablerImpl(Context context) { - mSharedPrefs = LauncherPrefs.getDevicePrefs(context); + public PluginEnablerImpl(LauncherPrefs launcherPrefs) { + mSharedPrefs = launcherPrefs.getDevicePrefs(); } @Override @@ -37,8 +38,8 @@ public void setEnabled(ComponentName component) { } @Override - public void setDisabled(ComponentName component, int reason) { - setState(component, reason == ENABLED); + public void setDisabled(ComponentName component, @NonNull DisableReason reason) { + setState(component, reason == DisableReason.ENABLED); } private void setState(ComponentName component, boolean enabled) { @@ -50,9 +51,10 @@ public boolean isEnabled(ComponentName component) { return mSharedPrefs.getBoolean(pluginEnabledKey(component), true); } + @NonNull @Override - public int getDisableReason(ComponentName componentName) { - return isEnabled(componentName) ? ENABLED : DISABLED_MANUALLY; + public DisableReason getDisableReason(ComponentName componentName) { + return isEnabled(componentName) ? DisableReason.ENABLED : DisableReason.DISABLED_MANUALLY; } private static String pluginEnabledKey(ComponentName cn) { diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapperImpl.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapperImpl.java index 83f66b1f1ff..4b4744f56eb 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapperImpl.java +++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapperImpl.java @@ -26,20 +26,18 @@ import android.content.Intent; import android.content.pm.ResolveInfo; -import androidx.core.content.ContextCompat; - -import com.android.launcher3.BuildConfigs; -import com.android.launcher3.Utilities; -import com.android.launcher3.util.MainThreadInitializedObject; -import com.android.launcher3.BuildConfig; +import com.android.launcher3.LauncherPrefs; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; import com.android.launcher3.util.PluginManagerWrapper; import com.android.systemui.plugins.Plugin; import com.android.systemui.plugins.PluginListener; +import com.android.systemui.plugins.PluginManager; import com.android.systemui.shared.plugins.PluginActionManager; import com.android.systemui.shared.plugins.PluginInstance; import com.android.systemui.shared.plugins.PluginManagerImpl; import com.android.systemui.shared.plugins.PluginPrefs; -import com.android.systemui.shared.system.UncaughtExceptionPreHandlerManager; +import com.android.systemui.shared.plugins.VersionCheckerImpl; import java.io.PrintWriter; import java.util.ArrayList; @@ -47,31 +45,33 @@ import java.util.List; import java.util.Set; -public class PluginManagerWrapperImpl extends PluginManagerWrapper { +import javax.inject.Inject; - private static final UncaughtExceptionPreHandlerManager UNCAUGHT_EXCEPTION_PRE_HANDLER_MANAGER = new UncaughtExceptionPreHandlerManager(); +@LauncherAppSingleton +public class PluginManagerWrapperImpl extends PluginManagerWrapper { private final Context mContext; private final PluginManagerImpl mPluginManager; private final PluginEnablerImpl mPluginEnabler; - public PluginManagerWrapperImpl(Context c) { + @Inject + public PluginManagerWrapperImpl(@ApplicationContext Context c, LauncherPrefs launcherPrefs) { mContext = c; - mPluginEnabler = new PluginEnablerImpl(c); - List privilegedPlugins = Collections.emptyList(); + mPluginEnabler = new PluginEnablerImpl(launcherPrefs); + PluginManager.Config pluginConfig = new PluginManager.Config(Collections.emptyList()); PluginInstance.Factory instanceFactory = new PluginInstance.Factory( - getClass().getClassLoader(), new PluginInstance.InstanceFactory<>(), - new PluginInstance.VersionCheckerImpl(), privilegedPlugins, - BuildConfigs.IS_DEBUG_DEVICE); + new VersionCheckerImpl(), getClass().getClassLoader(), + pluginConfig); PluginActionManager.Factory instanceManagerFactory = new PluginActionManager.Factory( - c, c.getPackageManager(), ContextCompat.getMainExecutor(c), MODEL_EXECUTOR, + c, c.getPackageManager(), c.getMainExecutor(), MODEL_EXECUTOR, c.getSystemService(NotificationManager.class), mPluginEnabler, - privilegedPlugins, instanceFactory); + pluginConfig, instanceFactory); + // Use null preHandlerManager, as the handler is never unregistered which can cause leaks + // when using multiple dagger graphs. mPluginManager = new PluginManagerImpl(c, instanceManagerFactory, - BuildConfigs.IS_DEBUG_DEVICE, - UNCAUGHT_EXCEPTION_PRE_HANDLER_MANAGER, mPluginEnabler, - new PluginPrefs(c), privilegedPlugins); + null /* preHandlerManager */, mPluginEnabler, + new PluginPrefs(c), pluginConfig); } public PluginEnablerImpl getPluginEnabler() { diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java index 1f1fe627207..59c8bf18f9f 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -16,19 +16,22 @@ package com.android.launcher3.uioverrides.states; import static com.android.app.animation.Interpolators.DECELERATE_2; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS; import android.content.Context; +import android.graphics.Color; +import app.lawnchair.theme.color.tokens.ColorTokens; import com.android.internal.jank.Cuj; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; +import com.android.launcher3.LauncherUiState; import com.android.launcher3.R; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.Themes; import com.android.launcher3.views.ActivityContext; +import com.android.launcher3.views.ScrimColors; import com.android.quickstep.util.BaseDepthController; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; @@ -52,8 +55,7 @@ public AllAppsState(int id) { } @Override - public int getTransitionDuration( - DEVICE_PROFILE_CONTEXT context, boolean isToState) { + public int getTransitionDuration(ActivityContext context, boolean isToState) { return isToState ? context.getDeviceProfile().allAppsOpenDuration : context.getDeviceProfile().allAppsCloseDuration; @@ -106,7 +108,7 @@ public String getDescription(Launcher launcher) { @Override public int getTitle() { - return R.string.all_apps_label; + return R.string.all_apps_list_label; } @Override @@ -116,49 +118,50 @@ public float getVerticalProgress(Launcher launcher) { @Override public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { - return new ScaleAndTranslation(launcher.getDeviceProfile().workspaceContentScale, NO_OFFSET, + return new ScaleAndTranslation( + launcher.getDeviceProfile().mWorkspaceProfile.getWorkspaceContentScale(), NO_OFFSET, NO_OFFSET); } @Override public ScaleAndTranslation getHotseatScaleAndTranslation(Launcher launcher) { - if (launcher.getDeviceProfile().isTablet) { + if (launcher.getDeviceProfile().shouldShowAllAppsOnSheet()) { return getWorkspaceScaleAndTranslation(launcher); } else { ScaleAndTranslation overviewScaleAndTranslation = LauncherState.OVERVIEW .getWorkspaceScaleAndTranslation(launcher); return new ScaleAndTranslation( - launcher.getDeviceProfile().workspaceContentScale, + launcher.getDeviceProfile().mWorkspaceProfile.getWorkspaceContentScale(), overviewScaleAndTranslation.translationX, overviewScaleAndTranslation.translationY); } } @Override - protected float getDepthUnchecked( - DEVICE_PROFILE_CONTEXT context) { - if (context.getDeviceProfile().isTablet) { - return context.getDeviceProfile().bottomSheetDepth; + protected + float getDepthUnchecked(DEVICE_PROFILE_CONTEXT context) { + if (context.getDeviceProfile().shouldShowAllAppsOnSheet()) { + return context.getDeviceProfile().getBottomSheetProfile().getBottomSheetDepth(); } else { // The scrim fades in at approximately 50% of the swipe gesture. - if (enableScalingRevealHomeAnimation()) { - // This means that the depth should be twice of what we want, in order to fully zoom - // out during the visible portion of the animation. - return BaseDepthController.DEPTH_60_PERCENT; - } else { - // This means that the depth should be greater than 1, in order to fully zoom out. - return 2f; - } + // The depth should be twice of what we want, in order to fully zoom out during the + // visible portion of the animation. + return BaseDepthController.DEPTH_60_PERCENT; } } + @Override + public boolean shouldBlurWorkspace(LauncherState targetState) { + return targetState == ALL_APPS || targetState == NORMAL; + } + @Override public PageAlphaProvider getWorkspacePageAlphaProvider(Launcher launcher) { PageAlphaProvider superPageAlphaProvider = super.getWorkspacePageAlphaProvider(launcher); return new PageAlphaProvider(DECELERATE_2) { @Override public float getPageAlpha(int pageIndex) { - return launcher.getDeviceProfile().isTablet + return isWorkspaceVisible(launcher.getDeviceProfile()) ? superPageAlphaProvider.getPageAlpha(pageIndex) : 0; } @@ -166,15 +169,18 @@ public float getPageAlpha(int pageIndex) { } @Override - public int getVisibleElements(Launcher launcher) { + public int getVisibleElements(LauncherUiState launcherUiState) { int elements = ALL_APPS_CONTENT | FLOATING_SEARCH_BAR; - // Only add HOTSEAT_ICONS for tablets in ALL_APPS state. - if (launcher.getDeviceProfile().isTablet) { + if (isWorkspaceVisible(launcherUiState.getDeviceProfileRef().getValue())) { elements |= HOTSEAT_ICONS; } return elements; } + private static boolean isWorkspaceVisible(DeviceProfile deviceProfile) { + return deviceProfile.getDeviceProperties().isTablet() || (Flags.allAppsSheetForHandheld() && Flags.allAppsBlur()); + } + @Override public int getFloatingSearchBarRestingMarginBottom(Launcher launcher) { return 0; @@ -195,30 +201,22 @@ public int getFloatingSearchBarRestingMarginEnd(Launcher launcher) { @Override public boolean shouldFloatingSearchBarUsePillWhenUnfocused(Launcher launcher) { DeviceProfile dp = launcher.getDeviceProfile(); - return dp.isPhone && !dp.isLandscape; + return dp.getDeviceProperties().isPhone() && !dp.getDeviceProperties().isLandscape(); } @Override - public LauncherState getHistoryForState(LauncherState previousState) { - return previousState == BACKGROUND_APP ? QUICK_SWITCH_FROM_HOME - : previousState == OVERVIEW ? OVERVIEW : NORMAL; - } - - @Override - public float[] getOverviewScaleAndOffset(Launcher launcher) { - if (!FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get()) { - return super.getOverviewScaleAndOffset(launcher); + public ScrimColors getWorkspaceScrimColor(Launcher launcher) { + int backgroundColor; + if (!launcher.getDeviceProfile().shouldShowAllAppsOnSheet()) { + // Always use an opaque scrim if there's no sheet. + // Lawnchair-TODO-Colour: Check R.color.materialColorSurfaceDim + backgroundColor = launcher.getResources().getColor(R.color.materialColorSurfaceDim); + } else if (!Flags.allAppsBlur()) { + // If there's a sheet but no blur, use the old scrim color. + backgroundColor = ColorTokens.WidgetsPickerScrim.resolveColor(launcher); + } else { + backgroundColor = LawnchairUtilsKt.getAllAppsScrimColor(launcher); } - // This handles the case of returning to the previous app from Overview -> All Apps gesture. - // This is the start scale/offset of overview that will be used for that transition. - // TODO (b/283336332): Translate in Y direction (ideally with overview resistance). - return new float[] {0.5f /* scale */, NO_OFFSET}; - } - - @Override - public int getWorkspaceScrimColor(Launcher launcher) { - return launcher.getDeviceProfile().isTablet - ? launcher.getResources().getColor(android.R.color.transparent) - : LawnchairUtilsKt.getAllAppsScrimColor(launcher); + return new ScrimColors(backgroundColor, /* foregroundColor */ Color.TRANSPARENT); } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index 262564613a1..c02af3ef437 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -15,16 +15,18 @@ */ package com.android.launcher3.uioverrides.states; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND; -import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS; import android.content.Context; import android.graphics.Color; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherUiState; import com.android.launcher3.allapps.AllAppsTransitionController; +import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.views.ScrimColors; +import com.android.quickstep.fallback.RecentsState; import com.android.quickstep.util.BaseDepthController; import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.views.RecentsView; @@ -35,7 +37,8 @@ public class BackgroundAppState extends OverviewState { private static final int STATE_FLAGS = FLAG_DISABLE_RESTORE | FLAG_RECENTS_VIEW_VISIBLE - | FLAG_WORKSPACE_INACCESSIBLE | FLAG_NON_INTERACTIVE | FLAG_CLOSE_POPUPS; + | FLAG_WORKSPACE_INACCESSIBLE | FLAG_NON_INTERACTIVE | FLAG_CLOSE_POPUPS + | FLAG_SKIP_STATE_ANNOUNCEMENT; public BackgroundAppState(int id) { this(id, LAUNCHER_STATE_BACKGROUND); @@ -51,9 +54,11 @@ public float getVerticalProgress(Launcher launcher) { return super.getVerticalProgress(launcher); } RecentsView recentsView = launcher.getOverviewPanel(); - int transitionLength = LayoutUtils.getShelfTrackingDistance(launcher, + int transitionLength = LayoutUtils.getShelfTrackingDistance( + launcher, launcher.getDeviceProfile(), - recentsView.getPagedOrientationHandler()); + recentsView.getPagedOrientationHandler(), + recentsView.getContainerInterface()); AllAppsTransitionController controller = launcher.getAllAppsController(); float scrollRange = Math.max(controller.getShiftRange(), 1); float progressDelta = (transitionLength / scrollRange); @@ -62,7 +67,7 @@ public float getVerticalProgress(Launcher launcher) { @Override public float[] getOverviewScaleAndOffset(Launcher launcher) { - return getOverviewScaleAndOffsetForBackgroundState(launcher.getOverviewPanel()); + return RecentsState.BACKGROUND_APP.getOverviewScaleAndOffset((QuickstepLauncher) launcher); } @Override @@ -71,11 +76,12 @@ public float getOverviewFullscreenProgress() { } @Override - public int getVisibleElements(Launcher launcher) { - return super.getVisibleElements(launcher) + public int getVisibleElements(LauncherUiState launcherUiState) { + return super.getVisibleElements(launcherUiState) & ~OVERVIEW_ACTIONS & ~CLEAR_ALL_BUTTON - & ~VERTICAL_SWIPE_INDICATOR; + & ~VERTICAL_SWIPE_INDICATOR + & ~ADD_DESK_BUTTON; } @Override @@ -88,27 +94,26 @@ public boolean showTaskThumbnailSplash() { return true; } + @Override + public boolean showExplodedDesktopView() { + return false; + } + @Override protected float getDepthUnchecked(Context context) { if (Launcher.getLauncher(context).areDesktopTasksVisible()) { // Don't blur the background while desktop tasks are visible return BaseDepthController.DEPTH_0_PERCENT; - } else if (enableScalingRevealHomeAnimation()) { - return BaseDepthController.DEPTH_70_PERCENT; } else { - return 1f; + return BaseDepthController.DEPTH_70_PERCENT; } } @Override - public int getWorkspaceScrimColor(Launcher launcher) { - return Color.TRANSPARENT; - } - - @Override - public boolean isTaskbarAlignedWithHotseat(Launcher launcher) { - if (ENABLE_SHELL_TRANSITIONS) return false; - return super.isTaskbarAlignedWithHotseat(launcher); + public ScrimColors getWorkspaceScrimColor(Launcher launcher) { + return new ScrimColors( + /* backgroundColor= */ Color.TRANSPARENT, + /* foregroundColor= */ Color.TRANSPARENT); } @Override @@ -122,9 +127,4 @@ public boolean allowTaskbarInitialSplitSelection() { // Disallow split select from taskbar items in overview return false; } - - public static float[] getOverviewScaleAndOffsetForBackgroundState( - RecentsView recentsView) { - return new float[] {recentsView.getMaxScaleForFullScreen(), NO_OFFSET}; - } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java b/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java new file mode 100644 index 00000000000..a40de454c47 --- /dev/null +++ b/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.uioverrides.states; + +import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME; + +import android.content.Context; +import android.graphics.Color; + +import androidx.core.graphics.ColorUtils; + +import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherState; +import com.android.launcher3.views.ActivityContext; +import com.android.launcher3.views.ScrimColors; + +import app.lawnchair.theme.color.tokens.ColorTokens; + +/** + * Scale down workspace/hotseat to hint at going to either overview (on pause) or first home screen. + */ +public class HintState extends LauncherState { + + private static final int STATE_FLAGS = FLAG_WORKSPACE_INACCESSIBLE | FLAG_DISABLE_RESTORE + | FLAG_HAS_SYS_UI_SCRIM; + + public static final float DEPTH_5_PERCENT = 0.05f; + + public HintState(int id) { + this(id, LAUNCHER_STATE_HOME); + } + + public HintState(int id, int statsLogOrdinal) { + super(id, statsLogOrdinal, STATE_FLAGS); + } + + @Override + public int getTransitionDuration(ActivityContext context, boolean isToState) { + return 80; + } + + @Override + protected float getDepthUnchecked(Context context) { + return DEPTH_5_PERCENT; + } + + @Override + public ScrimColors getWorkspaceScrimColor(Launcher launcher) { +// ScrimColors overviewStateColor = OVERVIEW.getWorkspaceScrimColor(launcher); + return new ScrimColors( + /* backgroundColor */ + ColorUtils.setAlphaComponent(ColorTokens.OverviewScrim.resolveColor(launcher), + Math.round(Color.valueOf(ColorTokens.OverviewScrim.resolveColor(launcher)).alpha() + * 100)), + /* foregroundColor */ Color.TRANSPARENT); + } + + @Override + public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { + return new ScaleAndTranslation(0.92f, 0, 0); + } +} diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java index 932d2413071..bd17d17379a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java @@ -15,15 +15,15 @@ */ package com.android.launcher3.uioverrides.states; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW; -import android.content.Context; -import android.graphics.Rect; - -import com.android.launcher3.Flags; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherState; -import com.android.quickstep.views.RecentsView; +import com.android.launcher3.LauncherUiState; +import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.views.ActivityContext; +import com.android.quickstep.fallback.RecentsState; /** * An Overview state that shows the current task in a modal fashion. Modal state is where the @@ -39,18 +39,18 @@ public OverviewModalTaskState(int id) { } @Override - public int getTransitionDuration(Context launcher, boolean isToState) { + public int getTransitionDuration(ActivityContext launcher, boolean isToState) { return 300; } @Override - public int getVisibleElements(Launcher launcher) { - return OVERVIEW_ACTIONS | CLEAR_ALL_BUTTON; + public int getVisibleElements(LauncherUiState launcherUiState) { + return OVERVIEW_ACTIONS; } @Override public float[] getOverviewScaleAndOffset(Launcher launcher) { - return getOverviewScaleAndOffsetForModalState(launcher.getOverviewPanel()); + return RecentsState.MODAL_TASK.getOverviewScaleAndOffset((QuickstepLauncher) launcher); } @Override @@ -59,26 +59,10 @@ public float getOverviewModalness() { } @Override - public void onBackInvoked(Launcher launcher) { - launcher.getStateManager().goToState(LauncherState.OVERVIEW); - } - - @Override - public boolean isTaskbarStashed(Launcher launcher) { - if (Flags.enableGridOnlyOverview()) { + public boolean isTaskbarStashed(DeviceProfile deviceProfile) { + if (enableGridOnlyOverview()) { return true; } - return super.isTaskbarStashed(launcher); - } - - public static float[] getOverviewScaleAndOffsetForModalState(RecentsView recentsView) { - Rect taskSize = recentsView.getSelectedTaskBounds(); - Rect modalTaskSize = new Rect(); - recentsView.getModalTaskSize(modalTaskSize); - - float scale = Math.min((float) modalTaskSize.height() / taskSize.height(), - (float) modalTaskSize.width() / taskSize.width()); - - return new float[] {scale, NO_OFFSET}; + return super.isTaskbarStashed(deviceProfile); } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java index ea1b01b4d58..237691a227e 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -16,24 +16,30 @@ package com.android.launcher3.uioverrides.states; import static com.android.app.animation.Interpolators.DECELERATE_2; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; +import static com.android.launcher3.Flags.enableDesktopExplodedView; +import static com.android.launcher3.Flags.enablePredictiveBackInOverview; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW; -import static com.android.wm.shell.Flags.enableSplitContextual; import android.content.Context; import android.graphics.Rect; import android.os.SystemProperties; +import androidx.core.graphics.ColorUtils; + import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; +import com.android.launcher3.LauncherUiState; import com.android.launcher3.R; +import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.Themes; +import com.android.launcher3.views.ActivityContext; +import com.android.launcher3.views.ScrimColors; +import com.android.quickstep.fallback.RecentsStateUtilsKt; import com.android.quickstep.util.BaseDepthController; import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.views.RecentsView; -import com.android.quickstep.views.TaskView; import app.lawnchair.preferences.PreferenceManager; import app.lawnchair.theme.color.tokens.ColorTokens; @@ -66,11 +72,10 @@ protected OverviewState(int id, int logContainer, int stateFlags) { } @Override - public int getTransitionDuration(Context context, boolean isToState) { + public int getTransitionDuration(ActivityContext context, boolean isToState) { if (isToState) { - // In gesture modes, overview comes in all the way from the side, so give it - // more time. - return DisplayController.getNavigationMode(context).hasGestures + // In gesture modes, overview comes in all the way from the side, so give it more time. + return DisplayController.getNavigationMode(context.asContext()).hasGestures ? OVERVIEW_SLIDE_IN_DURATION : OVERVIEW_POP_IN_DURATION; } else { @@ -85,9 +90,8 @@ public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { recentsView.getTaskSize(sTempRect); float scale; DeviceProfile deviceProfile = launcher.getDeviceProfile(); - if (deviceProfile.isTwoPanels) { - // In two panel layout, width does not include both panels or space between - // them, so + if (deviceProfile.getDeviceProperties().isTwoPanels()) { + // In two panel layout, width does not include both panels or space between them, so // use height instead. We do not use height for handheld, as cell layout can be // shorter than a task and we want the workspace to scale down to task size. scale = (float) sTempRect.height() / deviceProfile.getCellLayoutHeight(); @@ -100,7 +104,7 @@ public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { @Override public float[] getOverviewScaleAndOffset(Launcher launcher) { - return new float[] { NO_SCALE, NO_OFFSET }; + return new float[] {NO_SCALE, NO_OFFSET}; } @Override @@ -114,32 +118,33 @@ public float getPageAlpha(int pageIndex) { } @Override - public int getVisibleElements(Launcher launcher) { - if (PreferenceManager.getInstance(launcher).getRecentsActionClearAll().get()) { + public int getVisibleElements(LauncherUiState launcherUiState) { + // pE-TODO(QPR2): Better way to get context? + if (PreferenceManager.getInstance(launcherUiState.getDeviceProfileRef().getValue().getDisplayInfo().context).getRecentsActionClearAll().get()) { return OVERVIEW_ACTIONS; } - int elements = CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS; - DeviceProfile dp = launcher.getDeviceProfile(); + int elements = CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS | ADD_DESK_BUTTON; boolean showFloatingSearch; - if (dp.isPhone) { + DeviceProfile dp = launcherUiState.getDeviceProfileRef().getValue(); + if (dp.getDeviceProperties().isPhone()) { // Only show search in phone overview in portrait mode. - showFloatingSearch = !dp.isLandscape; + showFloatingSearch = !dp.getDeviceProperties().isLandscape(); } else { // Only show search in tablet overview if taskbar is not visible. - showFloatingSearch = !dp.isTaskbarPresent || isTaskbarStashed(launcher); + showFloatingSearch = !dp.isTaskbarPresent || isTaskbarStashed(dp); } if (showFloatingSearch) { elements |= FLOATING_SEARCH_BAR; } - if (enableSplitContextual() && launcher.isSplitSelectionActive()) { - elements &= ~CLEAR_ALL_BUTTON; + if (launcherUiState.isSplitSelectActiveRef().getValue()) { + elements &= ~CLEAR_ALL_BUTTON & ~ADD_DESK_BUTTON; } return elements; } @Override public float getSplitSelectTranslation(Launcher launcher) { - if (!enableSplitContextual() || !launcher.isSplitSelectionActive()) { + if (!launcher.isSplitSelectionActive()) { return 0f; } RecentsView recentsView = launcher.getOverviewPanel(); @@ -148,29 +153,40 @@ public float getSplitSelectTranslation(Launcher launcher) { @Override public int getFloatingSearchBarRestingMarginBottom(Launcher launcher) { - return areElementsVisible(launcher, FLOATING_SEARCH_BAR) ? 0 + return areElementsVisible(launcher.getLauncherUiState(), FLOATING_SEARCH_BAR) ? 0 : super.getFloatingSearchBarRestingMarginBottom(launcher); } @Override public boolean shouldFloatingSearchBarUsePillWhenUnfocused(Launcher launcher) { DeviceProfile dp = launcher.getDeviceProfile(); - return dp.isPhone && !dp.isLandscape; + return dp.getDeviceProperties().isPhone() && !dp.getDeviceProperties().isLandscape(); } @Override - public boolean isTaskbarAlignedWithHotseat(Launcher launcher) { + public boolean isTaskbarAlignedWithHotseat() { return false; } @Override - public int getWorkspaceScrimColor(Launcher launcher) { - return ColorTokens.OverviewScrim.resolveColor(launcher); + public ScrimColors getWorkspaceScrimColor(Launcher launcher) { + // Lawnchair-TODO-Colour: Check overviewScrimForegroundPrimary and overviewScrimForegroundSecondary + // Lawnchair-TODO-Colour: Move to OverviewScrim + return new ScrimColors( + /* backgroundColor */ Themes.getAttrColor(launcher, ColorTokens.OverviewScrimOverBlur.resolveColor(launcher)), + /* foregroundColor */ ColorUtils.compositeColors( + Themes.getAttrColor(launcher, R.attr.overviewScrimForegroundPrimary), + Themes.getAttrColor(launcher, R.attr.overviewScrimForegroundSecondary))); } @Override public boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) { - return deviceProfile.isTablet; + return deviceProfile.getDeviceProperties().isTablet(); + } + + @Override + public boolean showExplodedDesktopView() { + return enableDesktopExplodedView(); } @Override @@ -202,30 +218,35 @@ public static float getDefaultSwipeHeight(Launcher launcher) { @Override protected float getDepthUnchecked(Context context) { // TODO(178661709): revert to always scaled - if (enableScalingRevealHomeAnimation()) { - return SystemProperties.getBoolean("ro.launcher.depth.overview", true) - ? BaseDepthController.DEPTH_70_PERCENT - : BaseDepthController.DEPTH_0_PERCENT; + return SystemProperties.getBoolean("ro.launcher.depth.overview", true) + ? BaseDepthController.DEPTH_70_PERCENT + : BaseDepthController.DEPTH_0_PERCENT; + } + + @Override + public void onBackStarted(Launcher launcher) { + if (enablePredictiveBackInOverview()) { + RecentsStateUtilsKt.toRecentsState(this).onBackStarted((QuickstepLauncher) launcher); } else { - return SystemProperties.getBoolean("ro.launcher.depth.overview", true) ? 1 : 0; + super.onBackStarted(launcher); } } @Override - public void onBackInvoked(Launcher launcher) { - RecentsView recentsView = launcher.getOverviewPanel(); - TaskView taskView = recentsView.getRunningTaskView(); - if (taskView != null) { - if (recentsView.isTaskViewFullyVisible(taskView)) { - taskView.launchTasks(); - } else { - recentsView.snapToPage(recentsView.indexOfChild(taskView)); - } + public void onBackProgressed(Launcher launcher, float backProgress) { + if (enablePredictiveBackInOverview()) { + RecentsStateUtilsKt.toRecentsState(this).onBackProgressed((QuickstepLauncher) launcher, + backProgress); } else { - super.onBackInvoked(launcher); + super.onBackProgressed(launcher, backProgress); } } + @Override + public void onBackInvoked(Launcher launcher) { + RecentsStateUtilsKt.toRecentsState(this).onBackInvoked((QuickstepLauncher) launcher); + } + public static OverviewState newBackgroundState(int id) { return new BackgroundAppState(id); } @@ -235,16 +256,14 @@ public static OverviewState newSwitchState(int id) { } /** - * New Overview substate that represents the overview in modal mode (one task - * shown on its own) + * New Overview substate that represents the overview in modal mode (one task shown on its own) */ public static OverviewState newModalTaskState(int id) { return new OverviewModalTaskState(id); } /** - * New Overview substate representing state where 1 app for split screen has - * been selected and + * New Overview substate representing state where 1 app for split screen has been selected and * pinned and user is selecting the second one */ public static OverviewState newSplitSelectState(int id) { diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java index dfad4096bc7..4804a3546c7 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java @@ -17,12 +17,9 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND; -import android.graphics.Color; - import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; -import com.android.launcher3.R; -import com.android.launcher3.util.Themes; +import com.android.launcher3.LauncherUiState; /** * State to indicate we are about to launch a recent task. Note that this state is only used when @@ -43,19 +40,6 @@ public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { return new ScaleAndTranslation(0.9f, 0, translationY); } - @Override - public int getWorkspaceScrimColor(Launcher launcher) { - if (launcher.areDesktopTasksVisible()) { - // No scrim while desktop tasks are visible - return Color.TRANSPARENT; - } - DeviceProfile dp = launcher.getDeviceProfile(); - if (dp.isTaskbarPresentInApps) { - return launcher.getColor(R.color.taskbar_background); - } - return Themes.getAttrColor(launcher, R.attr.overviewScrimColor); - } - @Override public float getVerticalProgress(Launcher launcher) { // Don't move all apps shelf while quick-switching (just let it fade). @@ -63,17 +47,17 @@ public float getVerticalProgress(Launcher launcher) { } @Override - public int getVisibleElements(Launcher launcher) { + public int getVisibleElements(LauncherUiState launcherUiState) { return NONE; } @Override - public boolean isTaskbarStashed(Launcher launcher) { - return !launcher.getDeviceProfile().isTaskbarPresentInApps; + public boolean isTaskbarStashed(DeviceProfile deviceProfile) { + return !deviceProfile.isTaskbarPresentInApps; } @Override - public boolean isTaskbarAlignedWithHotseat(Launcher launcher) { - return false; + public boolean detachDesktopCarousel() { + return true; } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java index 41a9c047f45..8fb1dd0092b 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java @@ -17,55 +17,20 @@ import static android.view.View.VISIBLE; -import static com.android.app.animation.Interpolators.ACCELERATE; -import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE; -import static com.android.app.animation.Interpolators.DECELERATE; -import static com.android.app.animation.Interpolators.DECELERATE_1_7; -import static com.android.app.animation.Interpolators.DECELERATE_3; -import static com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE; -import static com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE; -import static com.android.app.animation.Interpolators.FAST_OUT_SLOW_IN; -import static com.android.app.animation.Interpolators.FINAL_FRAME; -import static com.android.app.animation.Interpolators.INSTANT; -import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.app.animation.Interpolators.OVERSHOOT_0_75; -import static com.android.app.animation.Interpolators.OVERSHOOT_1_2; -import static com.android.app.animation.Interpolators.clampToProgress; -import static com.android.launcher3.LauncherState.ALL_APPS; -import static com.android.launcher3.LauncherState.HINT_STATE; -import static com.android.launcher3.LauncherState.HINT_STATE_TWO_BUTTON; -import static com.android.launcher3.LauncherState.NORMAL; -import static com.android.launcher3.LauncherState.OVERVIEW; -import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT; import static com.android.launcher3.WorkspaceStateTransitionAnimation.getWorkspaceSpringScaleAnimator; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SPLIT_SELECT_FLOATING_TASK_TRANSLATE_OFFSCREEN; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE; -import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; import android.animation.ValueAnimator; +import androidx.annotation.NonNull; + import com.android.launcher3.CellLayout; import com.android.launcher3.Hotseat; import com.android.launcher3.LauncherState; -import com.android.launcher3.QuickstepTransitionManager; import com.android.launcher3.Workspace; import com.android.launcher3.states.StateAnimationConfig; import com.android.launcher3.touch.AllAppsSwipeController; import com.android.launcher3.uioverrides.QuickstepLauncher; -import com.android.launcher3.util.DisplayController; import com.android.quickstep.util.RecentsAtomicAnimationFactory; -import com.android.quickstep.util.SplitAnimationTimings; import com.android.quickstep.views.RecentsView; /** @@ -74,18 +39,10 @@ public class QuickstepAtomicAnimationFactory extends RecentsAtomicAnimationFactory { - // Scale recents takes before animating in - private static final float RECENTS_PREPARE_SCALE = 1.33f; // Scale workspace takes before animating in private static final float WORKSPACE_PREPARE_SCALE = 0.92f; - // Constants to specify how to scroll RecentsView to the default page if it's - // not already there. - private static final int DEFAULT_PAGE = 0; - private static final int PER_PAGE_SCROLL_DURATION = 150; - private static final int MAX_PAGE_SCROLL_DURATION = 750; - // Due to use of physics, duration may differ between devices so we need to - // calculate and + // Due to use of physics, duration may differ between devices so we need to calculate and // cache the value. private int mHintToNormalDuration = -1; @@ -94,143 +51,57 @@ public QuickstepAtomicAnimationFactory(QuickstepLauncher activity) { } @Override - public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toState, - StateAnimationConfig config) { - RecentsView overview = mContainer.getOverviewPanel(); - if ((fromState == OVERVIEW || fromState == OVERVIEW_SPLIT_SELECT) && toState == NORMAL) { - overview.switchToScreenshot(() -> overview.finishRecentsAnimation(true /* toRecents */, null)); - - if (fromState == OVERVIEW_SPLIT_SELECT) { - config.setInterpolator(ANIM_OVERVIEW_SPLIT_SELECT_FLOATING_TASK_TRANSLATE_OFFSCREEN, - clampToProgress(EMPHASIZED_ACCELERATE, 0, 0.4f)); - config.setInterpolator(ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE, - clampToProgress(LINEAR, 0, 0.33f)); - } - - // We sync the scrim fade with the taskbar animation duration to avoid any - // flickers for - // taskbar icons disappearing before hotseat icons show up. - float scrimUpperBoundFromSplit = QuickstepTransitionManager.getTaskbarToHomeDuration() - / (float) config.duration; - config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(LINEAR, 0, 0.25f)); - config.setInterpolator(ANIM_SCRIM_FADE, - fromState == OVERVIEW_SPLIT_SELECT - ? clampToProgress(LINEAR, 0.33f, scrimUpperBoundFromSplit) - : LINEAR); - config.setInterpolator(ANIM_WORKSPACE_SCALE, DECELERATE); - config.setInterpolator(ANIM_WORKSPACE_FADE, ACCELERATE); - - if (DisplayController.getNavigationMode(mContainer).hasGestures - && overview.getTaskViewCount() > 0) { - // Overview is going offscreen, so keep it at its current scale and opacity. - config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME); - config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME); - config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, - fromState == OVERVIEW_SPLIT_SELECT - ? EMPHASIZED_DECELERATE - : clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f)); - config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME); - - // Scroll RecentsView to page 0 as it goes offscreen, if necessary. - int numPagesToScroll = overview.getNextPage() - DEFAULT_PAGE; - long scrollDuration = Math.min(MAX_PAGE_SCROLL_DURATION, - numPagesToScroll * PER_PAGE_SCROLL_DURATION); - config.duration = Math.max(config.duration, scrollDuration); - - // Sync scroll so that it ends before or at the same time as the taskbar - // animation. - if (mContainer.getDeviceProfile().isTaskbarPresent) { - config.duration = Math.min( - config.duration, QuickstepTransitionManager.getTaskbarToHomeDuration()); - } - overview.snapToPage(DEFAULT_PAGE, Math.toIntExact(config.duration)); - } else { - config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCELERATE_DECELERATE); - config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCELERATE, 0, 0.9f)); - config.setInterpolator(ANIM_OVERVIEW_FADE, DECELERATE_1_7); - } + protected void applyOverviewToHomeAnimConfig( + LauncherState fromState, + StateAnimationConfig config, + RecentsView overview, + boolean isPinnedTaskbar, + boolean isThreeButton) { + super.applyOverviewToHomeAnimConfig(fromState, config, overview, isPinnedTaskbar, + isThreeButton); + Workspace workspace = getContainer().getWorkspace(); + // Start from a higher workspace scale, but only if we're invisible so we don't jump. + boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE; + if (isWorkspaceVisible) { + CellLayout currentChild = (CellLayout) workspace.getChildAt( + workspace.getCurrentPage()); + isWorkspaceVisible = currentChild.getVisibility() == VISIBLE + && currentChild.getShortcutsAndWidgets().getAlpha() > 0; + } + if (!isWorkspaceVisible) { + workspace.setScaleX(WORKSPACE_PREPARE_SCALE); + workspace.setScaleY(WORKSPACE_PREPARE_SCALE); + } + Hotseat hotseat = getContainer().getHotseat(); + boolean isHotseatVisible = hotseat.getVisibility() == VISIBLE && hotseat.getAlpha() > 0; + if (!isHotseatVisible) { + hotseat.setScaleX(WORKSPACE_PREPARE_SCALE); + hotseat.setScaleY(WORKSPACE_PREPARE_SCALE); + } + } - Workspace workspace = mContainer.getWorkspace(); - // Start from a higher workspace scale, but only if we're invisible so we don't - // jump. - boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE; - if (isWorkspaceVisible) { - CellLayout currentChild = (CellLayout) workspace.getChildAt( - workspace.getCurrentPage()); - isWorkspaceVisible = currentChild.getVisibility() == VISIBLE - && currentChild.getShortcutsAndWidgets().getAlpha() > 0; - } - if (!isWorkspaceVisible) { - workspace.setScaleX(WORKSPACE_PREPARE_SCALE); - workspace.setScaleY(WORKSPACE_PREPARE_SCALE); - } - Hotseat hotseat = mContainer.getHotseat(); - boolean isHotseatVisible = hotseat.getVisibility() == VISIBLE && hotseat.getAlpha() > 0; - if (!isHotseatVisible) { - hotseat.setScaleX(WORKSPACE_PREPARE_SCALE); - hotseat.setScaleY(WORKSPACE_PREPARE_SCALE); - } - } else if ((fromState == NORMAL || fromState == HINT_STATE - || fromState == HINT_STATE_TWO_BUTTON) && toState == OVERVIEW) { - if (DisplayController.getNavigationMode(mContainer).hasGestures) { - config.setInterpolator(ANIM_WORKSPACE_SCALE, - fromState == NORMAL ? ACCELERATE : OVERSHOOT_1_2); - config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCELERATE); + @Override + protected int getHintToNormalAnimationDuration(@NonNull LauncherState toState) { + if (mHintToNormalDuration == -1) { + QuickstepLauncher container = getContainer(); + ValueAnimator va = getWorkspaceSpringScaleAnimator( + container, + container.getWorkspace(), + toState.getWorkspaceScaleAndTranslation(container).scale); + mHintToNormalDuration = (int) va.getDuration(); + } + return mHintToNormalDuration; + } - // Scrolling in tasks, so show straight away - if (overview.getTaskViewCount() > 0) { - config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT); - } else { - config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2); - } - } else { - config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2); - config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2); + @Override + protected void applyAllAppsToNormalConfig(@NonNull StateAnimationConfig config) { + super.applyAllAppsToNormalConfig(config); + AllAppsSwipeController.applyAllAppsToNormalConfig(getContainer(), config); + } - // Scale up the recents, if it is not coming from the side - if (overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) { - RECENTS_SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE); - } - } - config.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2); - config.setInterpolator(ANIM_ALL_APPS_FADE, OVERSHOOT_1_2); - config.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2); - config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2); - config.setInterpolator(ANIM_SCRIM_FADE, t -> { - // Animate at the same rate until reaching progress 1, and skip the overshoot. - return Math.min(1, OVERSHOOT_1_2.getInterpolation(t)); - }); - config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_2); - config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_2); - } else if (fromState == HINT_STATE && toState == NORMAL) { - config.setInterpolator(ANIM_DEPTH, DECELERATE_3); - if (mHintToNormalDuration == -1) { - ValueAnimator va = getWorkspaceSpringScaleAnimator(mContainer, - mContainer.getWorkspace(), - toState.getWorkspaceScaleAndTranslation(mContainer).scale); - mHintToNormalDuration = (int) va.getDuration(); - } - config.duration = Math.max(config.duration, mHintToNormalDuration); - } else if (fromState == ALL_APPS && toState == NORMAL) { - AllAppsSwipeController.applyAllAppsToNormalConfig(mContainer, config); - } else if (fromState == NORMAL && toState == ALL_APPS) { - AllAppsSwipeController.applyNormalToAllAppsAnimConfig(mContainer, config); - } else if (fromState == OVERVIEW && toState == OVERVIEW_SPLIT_SELECT) { - SplitAnimationTimings timings = mContainer.getDeviceProfile().isTablet - ? SplitAnimationTimings.TABLET_OVERVIEW_TO_SPLIT - : SplitAnimationTimings.PHONE_OVERVIEW_TO_SPLIT; - config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(LINEAR, - timings.getActionsFadeStartOffset(), - timings.getActionsFadeEndOffset())); - } else if ((fromState == NORMAL || fromState == ALL_APPS) - && toState == OVERVIEW_SPLIT_SELECT) { - // Splitting from Home is currently only available on tablets - SplitAnimationTimings timings = SplitAnimationTimings.TABLET_HOME_TO_SPLIT; - config.setInterpolator(ANIM_SCRIM_FADE, clampToProgress(LINEAR, - timings.getScrimFadeInStartOffset(), - timings.getScrimFadeInEndOffset())); - config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_0_75); - config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_0_75); - } + @Override + protected void applyNormalToAllAppsAnimConfig(@NonNull StateAnimationConfig config) { + super.applyNormalToAllAppsAnimConfig(config); + AllAppsSwipeController.applyNormalToAllAppsAnimConfig(getContainer(), config); } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java index 3ae221bbeb2..e64b23d93fe 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java @@ -16,9 +16,9 @@ package com.android.launcher3.uioverrides.states; -import android.content.Context; - import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherUiState; +import com.android.launcher3.views.ActivityContext; import com.android.quickstep.util.SplitAnimationTimings; import com.android.quickstep.views.RecentsView; @@ -32,7 +32,7 @@ public SplitScreenSelectState(int id) { } @Override - public int getVisibleElements(Launcher launcher) { + public int getVisibleElements(LauncherUiState launcherUiState) { return SPLIT_PLACHOLDER_VIEW; } @@ -43,11 +43,10 @@ public float getSplitSelectTranslation(Launcher launcher) { } @Override - public int getTransitionDuration(Context context, boolean isToState) { - boolean isTablet = ((Launcher) context).getDeviceProfile().isTablet; - if (isToState && isTablet) { + public int getTransitionDuration(ActivityContext context, boolean isToState) { + if (isToState && context.getDeviceProfile().getDeviceProperties().isTablet()) { return SplitAnimationTimings.TABLET_ENTER_DURATION; - } else if (isToState && !isTablet) { + } else if (isToState) { return SplitAnimationTimings.PHONE_ENTER_DURATION; } else { return SplitAnimationTimings.ABORT_DURATION; diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java index 11e0ed528c6..0125066f2d8 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java @@ -28,6 +28,7 @@ import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE; import static com.android.launcher3.util.NavigationMode.THREE_BUTTONS; +import static com.android.launcher3.util.ScrollableLayoutManager.PREDICTIVE_BACK_MIN_SCALE; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; import android.animation.AnimatorSet; @@ -44,15 +45,16 @@ import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.compat.AccessibilityManagerCompat; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.statemanager.StateManager; import com.android.launcher3.touch.SingleAxisSwipeDetector; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.TouchController; +import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TaskUtils; import com.android.quickstep.util.AnimatorControllerWithResistance; import com.android.quickstep.util.OverviewToHomeAnim; import com.android.quickstep.views.RecentsView; +import com.android.systemui.contextualeducation.GestureType; import java.util.function.BiConsumer; @@ -134,7 +136,7 @@ public final boolean onControllerTouchEvent(MotionEvent ev) { } private float getShiftRange() { - return mLauncher.getDeviceProfile().heightPx; + return mLauncher.getDeviceProfile().getDeviceProperties().getHeightPx(); } @Override @@ -155,10 +157,16 @@ private void initCurrentAnimation() { AbstractFloatingView.closeOpenContainer(mLauncher, AbstractFloatingView.TYPE_TASK_MENU); } else if (mStartState == ALL_APPS) { AllAppsTransitionController allAppsController = mLauncher.getAllAppsController(); - builder.setFloat(allAppsController, ALL_APPS_PULL_BACK_TRANSLATION, - -mPullbackDistance, PULLBACK_INTERPOLATOR); - builder.setFloat(allAppsController, ALL_APPS_PULL_BACK_ALPHA, - 0.5f, PULLBACK_INTERPOLATOR); + if (mLauncher.getDeviceProfile().shouldShowAllAppsOnSheet()) { + allAppsController.setShouldScaleHeader(true); + builder.addAnimatedFloat(allAppsController.getAllAppScale(), 1f, + PREDICTIVE_BACK_MIN_SCALE, PULLBACK_INTERPOLATOR); + } else { + builder.setFloat(allAppsController, ALL_APPS_PULL_BACK_TRANSLATION, + -mPullbackDistance, PULLBACK_INTERPOLATOR); + builder.setFloat(allAppsController, ALL_APPS_PULL_BACK_ALPHA, + 0.5f, PULLBACK_INTERPOLATOR); + } } AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mLauncher); if (topView != null) { @@ -193,7 +201,7 @@ public void onDragEnd(float velocity) { if (success) { RecentsView recentsView = mLauncher.getOverviewPanel(); recentsView.switchToScreenshot(null, - () -> recentsView.finishRecentsAnimation(true /* toRecents */, null)); + () -> recentsView.finishRecentsAnimation(true /* toHome */, null)); if (mStartState.isRecentsViewVisible) { Runnable onReachedHome = () -> { StateManager.StateListener listener = @@ -208,10 +216,7 @@ public void onStateTransitionComplete(LauncherState finalState) { mLauncher.getStateManager().addStateListener(listener); onSwipeInteractionCompleted(mEndState); }; - new OverviewToHomeAnim(mLauncher, onReachedHome, - FeatureFlags.enableSplitContextually() - ? mCancelSplitRunnable - : null) + new OverviewToHomeAnim(mLauncher, onReachedHome, mCancelSplitRunnable) .animateWithVelocity(velocity); } else { mLauncher.getStateManager().goToState(mEndState, true, @@ -219,6 +224,8 @@ public void onStateTransitionComplete(LauncherState finalState) { } if (mStartState != mEndState) { logHomeGesture(); + SystemUiProxy.INSTANCE.get(mLauncher).updateContextualEduStats( + mSwipeDetector.isTrackpadGesture(), GestureType.HOME); } AbstractFloatingView topOpenView = AbstractFloatingView.getTopOpenView(mLauncher); if (topOpenView != null) { diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java index 3325009b710..911e8d47ec3 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java @@ -17,7 +17,7 @@ package com.android.launcher3.uioverrides.touchcontrollers; import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE; -import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR; +import static com.android.launcher3.LauncherAnimUtils.SCRIM_COLORS; import static com.android.launcher3.LauncherAnimUtils.newSingleUseCancelListener; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.HINT_STATE; @@ -39,16 +39,15 @@ import android.view.ViewConfiguration; import com.android.internal.jank.Cuj; -import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorPlaybackController; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.states.StateAnimationConfig; -import com.android.launcher3.taskbar.LauncherTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.VibratorWrapper; +import com.android.launcher3.views.ScrimColorsEvaluator; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.util.AnimatorControllerWithResistance; import com.android.quickstep.util.MotionPauseDetector; @@ -64,6 +63,8 @@ * first home screen instead of to Overview. */ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouchController { + + public static final String TAG = "NoButtonNavbarToOverviewTouchController"; private static final float ONE_HANDED_ACTIVATED_SLOP_MULTIPLIER = 2.5f; // How much of the movement to use for translating overview after swipe and hold. @@ -86,15 +87,19 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch private AnimatorPlaybackController mOverviewResistYAnim; // Normal to Hint animation has flag SKIP_OVERVIEW, so we update this scrim with this animator. - private ObjectAnimator mNormalToHintOverviewScrimAnimator; + private ValueAnimator mNormalToHintOverviewScrimAnimator; + + private final QuickstepLauncher mLauncher; + private boolean mIsTrackpadSwipe; /** * @param cancelSplitRunnable Called when split placeholder view needs to be cancelled. * Animation should be added to the provided AnimatorSet */ - public NoButtonNavbarToOverviewTouchController(Launcher l, + public NoButtonNavbarToOverviewTouchController(QuickstepLauncher l, BiConsumer cancelSplitRunnable) { super(l); + mLauncher = l; mRecentsView = l.getOverviewPanel(); mMotionPauseDetector = new MotionPauseDetector(l); mMotionPauseMinDisplacement = ViewConfiguration.get(l).getScaledTouchSlop(); @@ -104,7 +109,9 @@ public NoButtonNavbarToOverviewTouchController(Launcher l, @Override protected boolean canInterceptTouch(MotionEvent ev) { - if (!isTrackpadMotionEvent(ev) && DisplayController.getNavigationMode(mLauncher) + mIsTrackpadSwipe = isTrackpadMotionEvent(ev); + mLauncher.setCanShowAllAppsEducationView(!mIsTrackpadSwipe); + if (!mIsTrackpadSwipe && DisplayController.getNavigationMode(mLauncher) == THREE_BUTTONS) { return false; } @@ -130,7 +137,7 @@ protected float initCurrentAnimation() { float progressMultiplier = super.initCurrentAnimation(); if (mToState == HINT_STATE) { // Track the drag across the entire height of the screen. - progressMultiplier = -1f / mLauncher.getDeviceProfile().heightPx; + progressMultiplier = -1f / mLauncher.getDeviceProfile().getDeviceProperties().getHeightPx(); } return progressMultiplier; } @@ -138,16 +145,16 @@ protected float initCurrentAnimation() { @Override public void onDragStart(boolean start, float startDisplacement) { if (mLauncher.isInState(ALL_APPS)) { - LauncherTaskbarUIController controller = - ((QuickstepLauncher) mLauncher).getTaskbarUIController(); - if (controller != null) { - controller.setShouldDelayLauncherStateAnim(true); + TaskbarInteractor taskbarInteractor = mLauncher.getTaskbarInteractor(); + if (taskbarInteractor != null) { + taskbarInteractor.setShouldDelayLauncherStateAnim(true); } } super.onDragStart(start, startDisplacement); mMotionPauseDetector.clear(); + mMotionPauseDetector.setIsTrackpadGesture(mIsTrackpadSwipe); if (handlingOverviewAnim()) { InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS, @@ -156,9 +163,10 @@ public void onDragStart(boolean start, float startDisplacement) { } if (mFromState == NORMAL && mToState == HINT_STATE) { - mNormalToHintOverviewScrimAnimator = ObjectAnimator.ofArgb( + mNormalToHintOverviewScrimAnimator = ObjectAnimator.ofObject( mLauncher.getScrimView(), - VIEW_BACKGROUND_COLOR, + SCRIM_COLORS, + ScrimColorsEvaluator.INSTANCE, mFromState.getWorkspaceScrimColor(mLauncher), mToState.getWorkspaceScrimColor(mLauncher)); } @@ -167,6 +175,11 @@ public void onDragStart(boolean start, float startDisplacement) { mOverviewResistYAnim = null; } + @Override + public String dump() { + return TAG; + } + @Override protected void updateProgress(float fraction) { super.updateProgress(fraction); @@ -177,10 +190,9 @@ protected void updateProgress(float fraction) { @Override public void onDragEnd(float velocity) { - LauncherTaskbarUIController controller = - ((QuickstepLauncher) mLauncher).getTaskbarUIController(); - if (controller != null) { - controller.setShouldDelayLauncherStateAnim(false); + TaskbarInteractor taskbarInteractor = mLauncher.getTaskbarInteractor(); + if (taskbarInteractor != null) { + taskbarInteractor.setShouldDelayLauncherStateAnim(false); } if (mStartedOverview) { @@ -191,6 +203,7 @@ public void onDragEnd(float velocity) { } mMotionPauseDetector.clear(); + mIsTrackpadSwipe = false; mNormalToHintOverviewScrimAnimator = null; if (mLauncher.isInState(OVERVIEW)) { // Normally we would cleanup the state based on mCurrentAnimation, but since we stop @@ -214,11 +227,6 @@ protected void updateSwipeCompleteAnimation(ValueAnimator animator, long expecte mCancelSplitRunnable.accept(animatorSet, duration); animatorSet.start(); } - if (FeatureFlags.ENABLE_PREMIUM_HAPTICS_ALL_APPS.get() && - ((mFromState == NORMAL && mToState == ALL_APPS) - || (mFromState == ALL_APPS && mToState == NORMAL)) && isFling) { - mVibratorWrapper.vibrateForDragBump(); - } } private void onMotionPauseDetected() { diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java index 20e9960e573..2f3ac5f48ca 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java @@ -16,7 +16,6 @@ package com.android.launcher3.uioverrides.touchcontrollers; import static android.view.MotionEvent.ACTION_DOWN; -import static android.view.MotionEvent.ACTION_MOVE; import static com.android.app.animation.Interpolators.ACCELERATE_0_75; import static com.android.app.animation.Interpolators.DECELERATE_3; @@ -52,6 +51,7 @@ import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs; import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET; import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA; +import static com.android.quickstep.views.RecentsView.DESKTOP_CAROUSEL_DETACH_PROGRESS; import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS; import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; @@ -65,6 +65,7 @@ import android.graphics.PointF; import android.view.MotionEvent; import android.view.animation.Interpolator; +import android.window.DesktopModeFlags; import com.android.internal.jank.Cuj; import com.android.launcher3.LauncherState; @@ -87,12 +88,11 @@ import com.android.quickstep.util.WorkspaceRevealAnim; import com.android.quickstep.views.RecentsView; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; /** - * Handles quick switching to a recent task from the home screen. To give as - * much flexibility to - * the user as possible, also handles swipe up and hold to go to overview and - * swiping back home. + * Handles quick switching to a recent task from the home screen. To give as much flexibility to + * the user as possible, also handles swipe up and hold to go to overview and swiping back home. */ public class NoButtonQuickSwitchTouchController implements TouchController, BothAxesSwipeDetector.Listener { @@ -115,26 +115,28 @@ public class NoButtonQuickSwitchTouchController implements TouchController, newCancelListener(this::clearState, /* isSingleUse = */ false); private boolean mNoIntercept; - private Boolean mIsTrackpadFourFingerSwipe; private LauncherState mStartState; private boolean mIsHomeScreenVisible = true; - // As we drag, we control 3 animations: one to get non-overview components out - // of the way, + // As we drag, we control 3 animations: one to get non-overview components out of the way, // and the other two to set overview properties based on x and y progress. private AnimatorPlaybackController mNonOverviewAnim; private AnimatorPlaybackController mXOverviewAnim; private AnimatedFloat mYOverviewAnim; + private boolean mIsTrackpadSwipe; public NoButtonQuickSwitchTouchController(QuickstepLauncher launcher) { mLauncher = launcher; mSwipeDetector = new BothAxesSwipeDetector(mLauncher, this); mRecentsView = mLauncher.getOverviewPanel(); - mXRange = mLauncher.getDeviceProfile().widthPx / 2f; + mXRange = mLauncher.getDeviceProfile().getDeviceProperties().getWidthPx() / 2f; mYRange = LayoutUtils.getShelfTrackingDistance( - mLauncher, mLauncher.getDeviceProfile(), mRecentsView.getPagedOrientationHandler()); - mMaxYProgress = mLauncher.getDeviceProfile().heightPx / mYRange; + mLauncher, + mLauncher.getDeviceProfile(), + mRecentsView.getPagedOrientationHandler(), + mRecentsView.getContainerInterface()); + mMaxYProgress = mLauncher.getDeviceProfile().getDeviceProperties().getHeightPx() / mYRange; mMotionPauseDetector = new MotionPauseDetector(mLauncher); mMotionPauseMinDisplacement = mLauncher.getResources().getDimension( R.dimen.motion_pause_detector_min_displacement_from_app); @@ -148,17 +150,9 @@ public boolean onControllerInterceptTouchEvent(MotionEvent ev) { return false; } - // Only detect horizontal swipe for intercept, then we will allow swipe up as - // well. + // Only detect horizontal swipe for intercept, then we will allow swipe up as well. mSwipeDetector.setDetectableScrollConditions(DIRECTION_RIGHT, false /* ignoreSlopWhenSettling */); - } else if (isTrackpadMultiFingerSwipe(ev) && mIsTrackpadFourFingerSwipe == null - && ev.getActionMasked() == ACTION_MOVE) { - mIsTrackpadFourFingerSwipe = isTrackpadFourFingerSwipe(ev); - mNoIntercept = !mIsTrackpadFourFingerSwipe; - if (mNoIntercept) { - return false; - } } if (mNoIntercept) { @@ -175,7 +169,8 @@ public boolean onControllerTouchEvent(MotionEvent ev) { } private boolean canInterceptTouch(MotionEvent ev) { - if (!isTrackpadMotionEvent(ev) && DisplayController.getNavigationMode(mLauncher) == THREE_BUTTONS) { + if (!isTrackpadMotionEvent(ev) && DisplayController.getNavigationMode(mLauncher) + == THREE_BUTTONS) { return false; } if (!mLauncher.isInState(LauncherState.NORMAL)) { @@ -189,7 +184,14 @@ private boolean canInterceptTouch(MotionEvent ev) { return false; } if (isTrackpadMultiFingerSwipe(ev)) { - return isTrackpadFourFingerSwipe(ev); + mIsTrackpadSwipe = isTrackpadFourFingerSwipe(ev); + return mIsTrackpadSwipe; + } + if (DesktopModeStatus.canEnterDesktopMode(mLauncher) + //TODO(b/345296916): replace with dev option once in teamfood + && DesktopModeFlags.ENABLE_QUICKSWITCH_DESKTOP_SPLIT_BUGFIX.isTrue() + && mRecentsView.getNonDesktopTaskViewCount() < 1) { + return false; } return true; } @@ -197,6 +199,7 @@ private boolean canInterceptTouch(MotionEvent ev) { @Override public void onDragStart(boolean start) { mMotionPauseDetector.clear(); + mMotionPauseDetector.setIsTrackpadGesture(mIsTrackpadSwipe); if (start) { InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_QUICK_SWITCH); InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS, @@ -229,7 +232,7 @@ private void setupAnimators() { updateNonOverviewAnim(QUICK_SWITCH_FROM_HOME, nonOverviewBuilder); mNonOverviewAnim.dispatchOnStart(); - if (mRecentsView.getTaskViewCount() == 0) { + if (!mRecentsView.hasTaskViews()) { mRecentsView.setOnEmptyMessageUpdatedListener(isEmpty -> { if (!isEmpty && mSwipeDetector.isDraggingState()) { // We have loaded tasks, update the animators to start at the correct scale etc. @@ -258,32 +261,38 @@ private void setupOverviewAnimators() { RECENTS_SCALE_PROPERTY.set(mRecentsView, fromState.getOverviewScaleAndOffset(mLauncher)[0]); ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, 1f); TASK_THUMBNAIL_SPLASH_ALPHA.set(mRecentsView, fromState.showTaskThumbnailSplash() ? 1f : 0); + DESKTOP_CAROUSEL_DETACH_PROGRESS.set(mRecentsView, + fromState.detachDesktopCarousel() ? 1f : 0); mRecentsView.setContentAlpha(1); mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress()); + final boolean isOverviewActionVisible = ( + fromState.getVisibleElements(mLauncher.getLauncherUiState()) + & OVERVIEW_ACTIONS) != 0; mLauncher.getActionsView().getVisibilityAlpha().updateValue( - (fromState.getVisibleElements(mLauncher) & OVERVIEW_ACTIONS) != 0 ? 1f : 0f); - mRecentsView.setTaskIconScaledDown(true); + isOverviewActionVisible ? 1f : 0f); + mRecentsView.setTaskIconVisible(false); float[] scaleAndOffset = toState.getOverviewScaleAndOffset(mLauncher); // As we drag right, animate the following properties: - // - RecentsView translationX - // - OverviewScrim - // - RecentsView fade (if it's empty) + // - RecentsView translationX + // - OverviewScrim + // - RecentsView fade (if it's empty) PendingAnimation xAnim = new PendingAnimation((long) (mXRange * 2)); xAnim.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1], LINEAR); // Use QuickSwitchState instead of OverviewState to determine scrim color, // since we need to take potential taskbar into account. - xAnim.setViewBackgroundColor(mLauncher.getScrimView(), - QUICK_SWITCH_FROM_HOME.getWorkspaceScrimColor(mLauncher), LINEAR); - if (mRecentsView.getTaskViewCount() == 0) { + xAnim.setScrimColors(mLauncher.getScrimView(), + QUICK_SWITCH_FROM_HOME.getWorkspaceScrimColor(mLauncher), + LINEAR); + if (!mRecentsView.hasTaskViews()) { xAnim.addFloat(mRecentsView, CONTENT_ALPHA, 0f, 1f, LINEAR); } mXOverviewAnim = xAnim.createPlaybackController(); mXOverviewAnim.dispatchOnStart(); // As we drag up, animate the following properties: - // - RecentsView scale - // - RecentsView fullscreenProgress + // - RecentsView scale + // - RecentsView fullscreenProgress PendingAnimation yAnim = new PendingAnimation((long) (mYRange * 2)); yAnim.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0], SCALE_DOWN_INTERPOLATOR); @@ -313,7 +322,8 @@ public boolean onDrag(PointF displacement, MotionEvent ev) { if (wasHomeScreenVisible && mNonOverviewAnim != null) { mNonOverviewAnim.setPlayFraction(xProgress); } - mIsHomeScreenVisible = FADE_OUT_INTERPOLATOR.getInterpolation(xProgress) <= 1 - ALPHA_CUTOFF_THRESHOLD; + mIsHomeScreenVisible = FADE_OUT_INTERPOLATOR.getInterpolation(xProgress) + <= 1 - ALPHA_CUTOFF_THRESHOLD; mMotionPauseDetector.setDisallowPause(-displacement.y < mMotionPauseMinDisplacement); mMotionPauseDetector.addPosition(ev); @@ -345,13 +355,12 @@ public void onDragEnd(PointF velocity) { public void onAnimationEnd(Animator animation) { onAnimationToStateCompleted(OVERVIEW); // Animate the icon after onAnimationToStateCompleted() so it doesn't clobber. - mRecentsView.animateUpTaskIconScale(); + mRecentsView.startIconFadeInOnGestureComplete(); } }); overviewAnim.start(); - // Create an empty state transition so StateListeners get - // onStateTransitionStart(). + // Create an empty state transition so StateListeners get onStateTransitionStart(). mLauncher.getStateManager().createAnimationToNewWorkspace( OVERVIEW, config.duration, StateAnimationConfig.SKIP_ALL_ANIMATIONS) .dispatchOnStart(); @@ -373,8 +382,7 @@ public void onAnimationEnd(Animator animation) { // Flinging up and right could go either home or to quick switch. // Determine the target based on the higher velocity. targetState = Math.abs(velocity.x) > Math.abs(velocity.y) - ? QUICK_SWITCH_FROM_HOME - : NORMAL; + ? QUICK_SWITCH_FROM_HOME : NORMAL; } } } else if (horizontalFling) { @@ -386,8 +394,7 @@ public void onAnimationEnd(Animator animation) { boolean passedHorizontalThreshold = mXOverviewAnim.getInterpolatedProgress() > 0.5f; boolean passedVerticalThreshold = mYOverviewAnim.value > 1f; targetState = passedHorizontalThreshold && !passedVerticalThreshold - ? QUICK_SWITCH_FROM_HOME - : NORMAL; + ? QUICK_SWITCH_FROM_HOME : NORMAL; } // Animate the various components to the target state. diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java index 4df0f631169..68940dc65c2 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java @@ -48,9 +48,9 @@ public PortraitOverviewStateTouchHelper(Launcher launcher) { * @return true if we should intercept the motion event */ boolean canInterceptTouch(MotionEvent ev) { - if (mRecentsView.getTaskViewCount() > 0) { + if (mRecentsView.hasTaskViews()) { // Allow swiping up in the gap between the hotseat and overview. - return ev.getY() >= mRecentsView.getTaskViewAt(0).getBottom(); + return ev.getY() >= mRecentsView.getFirstTaskView().getBottom(); } else { // If there are no tasks, we only intercept if we're below the hotseat height. return isTouchOverHotseat(mLauncher, ev); diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index b5914a1880f..22055821fa3 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -26,18 +26,20 @@ import com.android.app.animation.Interpolators; import com.android.internal.jank.Cuj; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.allapps.AllAppsTransitionController; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.states.StateAnimationConfig; import com.android.launcher3.touch.AbstractStateChangeTouchController; import com.android.launcher3.touch.AllAppsSwipeController; import com.android.launcher3.touch.SingleAxisSwipeDetector; +import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.uioverrides.states.OverviewState; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.views.RecentsView; +import com.android.systemui.contextualeducation.GestureType; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; /** @@ -93,9 +95,7 @@ protected boolean canInterceptTouch(MotionEvent ev) { @Override protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) { if (fromState == ALL_APPS && !isDragTowardPositive) { - return FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get() - ? mLauncher.getStateManager().getLastState() - : NORMAL; + return NORMAL; } else if (fromState == NORMAL && shouldOpenAllApps(isDragTowardPositive)) { return ALL_APPS; } @@ -145,8 +145,11 @@ protected float initCurrentAnimation() { .createPlaybackController(); mLauncher.getStateManager().setCurrentUserControlledAnimation(mCurrentAnimation); RecentsView recentsView = mLauncher.getOverviewPanel(); - totalShift = LayoutUtils.getShelfTrackingDistance(mLauncher, - mLauncher.getDeviceProfile(), recentsView.getPagedOrientationHandler()); + totalShift = LayoutUtils.getShelfTrackingDistance( + mLauncher, + mLauncher.getDeviceProfile(), + recentsView.getPagedOrientationHandler(), + recentsView.getContainerInterface()); } else { mCurrentAnimation = mLauncher.getStateManager() .createAnimationToNewWorkspace(mToState, config); @@ -163,8 +166,19 @@ protected float initCurrentAnimation() { @Override protected void onSwipeInteractionCompleted(LauncherState targetState) { super.onSwipeInteractionCompleted(targetState); + SystemUiProxy sysUIProxy = SystemUiProxy.INSTANCE.get(mLauncher); if (mStartState == NORMAL && targetState == OVERVIEW) { - SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG); + sysUIProxy.onOverviewShown(true, TAG); + } + + if (targetState == OVERVIEW) { + sysUIProxy.updateContextualEduStats( + mDetector.isTrackpadGesture(), GestureType.OVERVIEW); + } else if (targetState == ALL_APPS && !mDetector.isTrackpadGesture()) { + // Only update if it is touch gesture as trackpad gesture is not relevant for all apps + // which only provides keyboard education. + sysUIProxy.updateContextualEduStats( + /* isTrackpadGesture= */ false, GestureType.ALL_APPS); } } @@ -204,6 +218,11 @@ public boolean onControllerInterceptTouchEvent(MotionEvent ev) { @Override protected void onReinitToState(LauncherState newToState) { super.onReinitToState(newToState); + if (Flags.allAppsBlur() && mLauncher.isAllAppsBackgroundBlurEnabled() + && newToState == ALL_APPS) { + // About to start blurring during swipe to All Apps; prepare the renderer. + ((QuickstepLauncher) mLauncher).getDepthController().setEarlyWakeup(true); + } if (newToState != ALL_APPS) { InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_OPEN_ALL_APPS); } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java index 93e4fbdc007..14896e53c70 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java @@ -149,9 +149,9 @@ private void updateFullscreenProgress(float progress) { mOverviewPanel.setFullscreenProgress(progress); if (progress > UPDATE_SYSUI_FLAGS_THRESHOLD) { int sysuiFlags = 0; - TaskView tv = mOverviewPanel.getTaskViewAt(0); - if (tv != null) { - sysuiFlags = tv.getFirstThumbnailViewDeprecated().getSysUiStatusNavFlags(); + TaskView firstTaskView = mOverviewPanel.getFirstTaskView(); + if (firstTaskView != null) { + sysuiFlags = firstTaskView.getSysUiStatusNavFlags(); } mLauncher.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, sysuiFlags); } else { @@ -161,6 +161,6 @@ private void updateFullscreenProgress(float progress) { @Override protected float getShiftRange() { - return mLauncher.getDeviceProfile().widthPx / 2f; + return mLauncher.getDeviceProfile().getDeviceProperties().getWidthPx() / 2f; } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java index 3d22c4835d5..9d501ed1161 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Modifications copyright 2021, Lawnchair + * Modifications copyright 2025, Lawnchair */ package com.android.launcher3.uioverrides.touchcontrollers; @@ -24,102 +24,69 @@ import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; import static com.android.launcher3.MotionEventsUtils.isTrackpadScroll; +import static com.android.launcher3.Utilities.shouldEnableMouseInteractionChanges; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN; -import android.annotation.SuppressLint; import android.graphics.PointF; import android.util.SparseArray; +import android.view.InputDevice; import android.view.MotionEvent; import android.view.ViewConfiguration; import android.view.Window; import android.view.WindowManager; import com.android.launcher3.AbstractFloatingView; +import com.android.launcher3.BaseActivity; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherState; import com.android.launcher3.Utilities; import com.android.launcher3.util.TouchController; -import com.android.launcher3.util.VibratorWrapper; import com.android.quickstep.SystemUiProxy; -import java.io.PrintWriter; +import java.util.function.Supplier; import java.lang.reflect.InvocationTargetException; import app.lawnchair.LawnchairAppKt; import app.lawnchair.util.CompatibilityKt; /** - * TouchController for handling touch events that get sent to the StatusBar. - * Once the - * Once the event delta mDownY passes the touch slop, the events start getting - * forwarded. + * TouchController for handling touch events that get sent to the StatusBar. Once the + * Once the event delta mDownY passes the touch slop, the events start getting forwarded. * All events are offset by initial Y value of the pointer. */ public class StatusBarTouchController implements TouchController { private static final String TAG = "StatusBarController"; - private final Launcher mLauncher; + private final BaseActivity mLauncher; private final SystemUiProxy mSystemUiProxy; private final float mTouchSlop; private int mLastAction; private final SparseArray mDownEvents; + private final Supplier mIsEnabledCheck; - /* - * If {@code false}, this controller should not handle the input {@link - * MotionEvent}. - */ + /* If {@code false}, this controller should not handle the input {@link MotionEvent}.*/ private boolean mCanIntercept; - private boolean mExpanded; - private boolean mVibrated; - private boolean mIsTrackpadReverseScroll; - - public StatusBarTouchController(Launcher l) { + public StatusBarTouchController(BaseActivity l, Supplier isEnabledCheck) { mLauncher = l; mSystemUiProxy = SystemUiProxy.INSTANCE.get(mLauncher); // Guard against TAPs by increasing the touch slop. mTouchSlop = 2 * ViewConfiguration.get(l).getScaledTouchSlop(); mDownEvents = new SparseArray<>(); + mIsEnabledCheck = isEnabledCheck; } @Override - public void dump(String prefix, PrintWriter writer) { - writer.println(prefix + "mCanIntercept:" + mCanIntercept); - writer.println(prefix + "mLastAction:" + MotionEvent.actionToString(mLastAction)); - writer.println(prefix + "mSysUiProxy available:" - + SystemUiProxy.INSTANCE.get(mLauncher).isActive()); + public String dump() { + return "mCanIntercept:" + mCanIntercept + + " , mLastAction:" + MotionEvent.actionToString(mLastAction) + + " , mSysUiProxy available:" + SystemUiProxy.INSTANCE.get(mLauncher).isActive(); } private void dispatchTouchEvent(MotionEvent ev) { if (mSystemUiProxy.isActive()) { mLastAction = ev.getActionMasked(); mSystemUiProxy.onStatusBarTouchEvent(ev); - } else if (!mExpanded) { - mExpanded = true; - expand(); - } - if (!mVibrated) { - mVibrated = true; - vibrate(); - } - } - - @SuppressLint({"WrongConstant", "PrivateApi"}) - private void expand() { - try { - Class.forName("android.app.StatusBarManager") - .getMethod("expandNotificationsPanel") - .invoke(mLauncher.getSystemService("statusbar")); - } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException | ClassNotFoundException e) { - e.printStackTrace(); - } - } - - private void vibrate() { - if (!LawnchairAppKt.getLawnchairApp(mLauncher).isVibrateOnIconAnimation()) { - VibratorWrapper.INSTANCE.get(mLauncher).vibrate(VibratorWrapper.OVERVIEW_HAPTIC); } } @@ -134,11 +101,7 @@ public final boolean onControllerInterceptTouchEvent(MotionEvent ev) { return false; } mDownEvents.clear(); - mExpanded = false; - mVibrated = false; mDownEvents.put(pid, new PointF(ev.getX(), ev.getY())); - mIsTrackpadReverseScroll = !mLauncher.isNaturalScrollingEnabled() - && isTrackpadScroll(ev); } else if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) { // Check!! should only set it only when threshold is not entered. mDownEvents.put(pid, new PointF(ev.getX(idx), ev.getY(idx))); @@ -152,9 +115,6 @@ public final boolean onControllerInterceptTouchEvent(MotionEvent ev) { if (action == ACTION_MOVE && mDownEvents.contains(pid)) { float dy = ev.getY(idx) - mDownEvents.get(pid).y; float dx = ev.getX(idx) - mDownEvents.get(pid).x; - if (mIsTrackpadReverseScroll) { - dy = -dy; - } // Currently input dispatcher will not do touch transfer if there are more than // one touch pointer. Hence, even if slope passed, only set the slippery flag // when there is single touch event. (context: InputDispatcher.cpp line 1445) @@ -179,7 +139,6 @@ public final boolean onControllerTouchEvent(MotionEvent ev) { mLauncher.getStatsLogManager().logger() .log(LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN); setWindowSlippery(false); - mIsTrackpadReverseScroll = false; return true; } else if (CompatibilityKt.isOnePlusStock() && action == ACTION_MOVE) { dispatchTouchEvent(ev); @@ -208,9 +167,11 @@ private void setWindowSlippery(boolean enable) { } private boolean canInterceptTouch(MotionEvent ev) { - if (!mLauncher.isInState(LauncherState.NORMAL) || - AbstractFloatingView.getTopOpenViewWithType(mLauncher, - AbstractFloatingView.TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW) != null) { + if (isTrackpadScroll(ev) || !mIsEnabledCheck.get() + || AbstractFloatingView.getTopOpenViewWithType(mLauncher, + AbstractFloatingView.TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW) != null || ( + shouldEnableMouseInteractionChanges(mLauncher.asContext()) + && ev.getSource() == InputDevice.SOURCE_MOUSE)) { return false; } else { // For NORMAL state, only listen if the event originated above the navbar height @@ -219,6 +180,6 @@ private boolean canInterceptTouch(MotionEvent ev) { return false; } } - return true; + return SystemUiProxy.INSTANCE.get(mLauncher).isActive(); } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt new file mode 100644 index 00000000000..a386fbc419b --- /dev/null +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt @@ -0,0 +1,457 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.uioverrides.touchcontrollers + +import android.content.Context +import android.graphics.Rect +import android.view.MotionEvent +import androidx.dynamicanimation.animation.SpringAnimation +import com.android.app.animation.Interpolators.DECELERATE +import com.android.app.animation.Interpolators.LINEAR +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.R +import com.android.launcher3.Utilities.EDGE_NAV_BAR +import com.android.launcher3.Utilities.boundToRange +import com.android.launcher3.Utilities.debugLog +import com.android.launcher3.Utilities.isRtl +import com.android.launcher3.Utilities.mapToRange +import com.android.launcher3.statemanager.BaseState +import com.android.launcher3.statemanager.StateManager.StateListener +import com.android.launcher3.statemanager.StatefulContainer +import com.android.launcher3.touch.SingleAxisSwipeDetector +import com.android.launcher3.util.MSDLPlayerWrapper +import com.android.launcher3.util.TouchController +import com.android.mechanics.spec.Breakpoint +import com.android.mechanics.spec.Breakpoint.Companion.maxLimit +import com.android.mechanics.spec.Breakpoint.Companion.minLimit +import com.android.mechanics.spec.BreakpointKey +import com.android.mechanics.spec.DirectionalMotionSpec +import com.android.mechanics.spec.Guarantee +import com.android.mechanics.spec.InputDirection +import com.android.mechanics.spec.Mapping +import com.android.mechanics.spec.MotionSpec +import com.android.mechanics.spring.SpringParameters +import com.android.mechanics.view.DistanceGestureContext +import com.android.mechanics.view.ViewMotionValue +import com.android.quickstep.views.RecentsDismissUtils +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.TaskView +import com.google.android.msdl.data.model.MSDLToken +import kotlin.math.abs +import kotlin.math.ceil + +/** Touch controller for handling task view card dismiss swipes */ +class TaskViewDismissTouchController>( + private val container: CONTAINER, + private val taskViewRecentsTouchContext: TaskViewRecentsTouchContext, +) : TouchController, SingleAxisSwipeDetector.Listener where +CONTAINER : Context, +CONTAINER : RecentsViewContainer, +CONTAINER : StatefulContainer { + private val recentsView: RecentsView<*, *> = container.getOverviewPanel() + private val detector: SingleAxisSwipeDetector = + SingleAxisSwipeDetector( + container as Context, + this, + recentsView.pagedOrientationHandler.upDownSwipeDirection, + ) + private val isRtl = isRtl(container.resources) + private val upDirection: Int = recentsView.pagedOrientationHandler.getUpDirection(isRtl) + private val maxUndershoot = + container.resources.getDimension(R.dimen.task_dismiss_max_undershoot) + private val maxAttachOvershoot = + container.resources.getDimension(R.dimen.task_dismiss_max_attach_overshoot) + private val detachThreshold = + container.resources.getDimension(R.dimen.task_dismiss_detach_threshold) + private val stateListener = + object : StateListener { + override fun onStateTransitionStart(toState: T) { + springAnimation?.cancel() + clearState() + } + } + private val tempTaskThumbnailBounds = Rect() + + private var taskBeingDragged: TaskView? = null + private var taskDragDisplacementValue: ViewMotionValue? = null + private var springAnimation: RecentsDismissUtils.SpringSet? = null + private var dismissLength: Int = 0 + private var verticalFactor: Int = 0 + private var hasDismissThresholdHapticRun = false + private var initialDisplacement: Float = 0f + private var recentsScaleAnimation: SpringAnimation? = null + private var canInterceptTouch = false + private var isDismissing = false + private var allowDetach = true + + init { + container.getStateManager().addStateListener(stateListener) + } + + override fun onTouchControllerDestroyed() { + container.getStateManager().removeStateListener(stateListener) + } + + private fun canInterceptTouch(ev: MotionEvent): Boolean = + when { + // Don't intercept swipes on the nav bar, as user might be trying to go home during a + // task dismiss animation. + (ev.edgeFlags and EDGE_NAV_BAR) != 0 -> { + debugLog(TAG, "Not intercepting edge swipe on nav bar.") + false + } + + // Floating views that a TouchController should not try to intercept touches from. + AbstractFloatingView.getTopOpenViewWithType( + container, + AbstractFloatingView.TYPE_TOUCH_CONTROLLER_NO_INTERCEPT, + ) != null -> { + debugLog(TAG, "Not intercepting, open floating view blocking touch.") + false + } + + // Disable swiping if the task overlay is modal. + taskViewRecentsTouchContext.isRecentsModal -> { + debugLog(TAG, "Not intercepting touch in modal overlay.") + false + } + + // Do not allow dismiss while recents is scrolling. + !recentsView.scroller.isFinished -> { + debugLog(TAG, "Not intercepting touch, recents scrolling.") + false + } + + else -> + taskViewRecentsTouchContext.isRecentsInteractive.also { isRecentsInteractive -> + if (!isRecentsInteractive) { + debugLog(TAG, "Not intercepting touch, recents not interactive.") + } + } + } + + override fun onControllerInterceptTouchEvent(ev: MotionEvent): Boolean { + // On consecutive events, end animation early so user can dismiss next task. + springAnimation?.speedUpSpringsToEnd() + + if ((ev.action == MotionEvent.ACTION_UP || ev.action == MotionEvent.ACTION_CANCEL)) { + clearState() + } + if (ev.action == MotionEvent.ACTION_DOWN) { + canInterceptTouch = onActionDown(ev) + if (!canInterceptTouch) { + return false + } + } + // Ignore other actions if touch intercepting has not been enabled in an ACTION_DOWN event. + if (!canInterceptTouch) { + return false + } + onControllerTouchEvent(ev) + val upDirectionIsPositive = upDirection == SingleAxisSwipeDetector.DIRECTION_POSITIVE + val wasInitialTouchUp = + (upDirectionIsPositive && detector.wasInitialTouchPositive()) || + (!upDirectionIsPositive && !detector.wasInitialTouchPositive()) + return detector.isDraggingState && wasInitialTouchUp + } + + override fun onControllerTouchEvent(ev: MotionEvent?): Boolean = detector.onTouchEvent(ev) + + private fun onActionDown(ev: MotionEvent): Boolean { + if (!canInterceptTouch(ev)) { + return false + } + val taskBeingDragged = + recentsView.taskViews.firstOrNull { + recentsView.isTaskViewVisible(it) && container.dragLayer.isEventOverView(it, ev) + } + // If event is not over a taskView, check if it would have been either over the + // currently dismissing task being dragged, or over where the next task will be. + ?: recentsView.taskViews.firstOrNull { taskView -> + if (!recentsView.isTaskViewVisible(taskView)) return@firstOrNull false + container.dragLayer.getDescendantRectRelativeToSelf( + taskView, + tempTaskThumbnailBounds, + ) + if (taskView == taskBeingDragged && !isDismissing) { + val secondaryTranslation = + -taskView.secondaryDismissTranslationProperty.get(taskView).toInt() + recentsView.pagedOrientationHandler.extendRectForSecondaryTranslation( + tempTaskThumbnailBounds, + secondaryTranslation, + ) + } else { + val primaryTranslation = + recentsView.taskViewsDismissPrimaryTranslations[taskView] ?: 0 + recentsView.pagedOrientationHandler.extendRectForPrimaryTranslation( + tempTaskThumbnailBounds, + primaryTranslation, + ) + } + tempTaskThumbnailBounds.contains(ev.x.toInt(), ev.y.toInt()) + } + this.taskBeingDragged = taskBeingDragged + if (taskBeingDragged == null) { + debugLog(TAG, "Not intercepting touch, null dragged task.") + return false + } + val secondaryLayerDimension = + recentsView.pagedOrientationHandler.getSecondaryDimension(container.dragLayer) + // Dismiss length as bottom of task so it is fully off screen when dismissed. + // Take into account the recents scale when fully zoomed out on dismiss. + taskBeingDragged.getThumbnailBounds(tempTaskThumbnailBounds, relativeToDragLayer = true) + dismissLength = + ceil( + recentsView.pagedOrientationHandler.getTaskDismissLength( + secondaryLayerDimension, + tempTaskThumbnailBounds, + ) / RECENTS_SCALE_ON_DISMISS_SUCCESS + ) + .toInt() + verticalFactor = recentsView.pagedOrientationHandler.getTaskDismissVerticalDirection() + taskBeingDragged.isBeingDraggedForDismissal = true + allowDetach = recentsView.canRemoveTaskView(taskBeingDragged) + detector.setDetectableScrollConditions(upDirection, /* ignoreSlop= */ false) + return true + } + + override fun onDragStart(start: Boolean, startDisplacement: Float) { + val taskBeingDragged = taskBeingDragged ?: return + debugLog(TAG, "Handling touch event.") + + initialDisplacement = + taskBeingDragged.secondaryDismissTranslationProperty.get(taskBeingDragged) + taskDragDisplacementValue = + generateMotionValue( + initialDisplacement, + detachThreshold * verticalFactor, + container.asContext(), + ) { currentDisplacement -> + taskBeingDragged.secondaryDismissTranslationProperty.setValue( + taskBeingDragged, + currentDisplacement, + ) + if (taskBeingDragged.isRunningTask && recentsView.enableDrawingLiveTile) { + recentsView.runActionOnRemoteHandles { remoteTargetHandle -> + remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation.value = + currentDisplacement + } + recentsView.redrawLiveTile() + } + } + + // Add a tiny bit of translation Z, so that it draws on top of other views. This is relevant + // (e.g.) when we dismiss a task by sliding it upward: if there is a row of icons above, we + // want the dragged task to stay above all other views. + taskBeingDragged.translationZ = 0.1f + } + + private fun getBoundedDisplacement(boundedDisplacement: Float, maxDisplacement: Float): Float = + mapToRange( + boundedDisplacement, + 0f, + dismissLength.toFloat(), + 0f, + maxDisplacement, + DECELERATE, + ) + + override fun onDrag(displacement: Float): Boolean { + taskBeingDragged ?: return false + val currentDisplacement = displacement + initialDisplacement + val boundedDisplacement = + boundToRange(abs(currentDisplacement), 0f, dismissLength.toFloat()) + // When swiping below origin, allow slight undershoot to simulate resisting the movement. + val isAboveOrigin = + recentsView.pagedOrientationHandler.isGoingUp(currentDisplacement, isRtl) + val totalDisplacement = + when { + !isAboveOrigin -> getBoundedDisplacement(boundedDisplacement, maxUndershoot) * -1 + + !allowDetach -> getBoundedDisplacement(boundedDisplacement, maxAttachOvershoot) + + else -> boundedDisplacement + } * verticalFactor + val dismissFraction = displacement / (dismissLength * verticalFactor).toFloat() + taskDragDisplacementValue?.input = totalDisplacement + RECENTS_SCALE_PROPERTY.setValue(recentsView, getRecentsScale(dismissFraction)) + playDismissThresholdHaptic(displacement) + return true + } + + /** + * Play a haptic to alert the user they have passed the dismiss threshold. + * + *

Check within a range of the threshold value, as the drag event does not necessarily happen + * at the exact threshold's displacement. + */ + private fun playDismissThresholdHaptic(displacement: Float) { + val dismissThreshold = (DISMISS_THRESHOLD_FRACTION * dismissLength * verticalFactor) + val inHapticRange = + displacement >= (dismissThreshold - DISMISS_THRESHOLD_HAPTIC_RANGE) && + displacement <= (dismissThreshold + DISMISS_THRESHOLD_HAPTIC_RANGE) + if (!inHapticRange) { + hasDismissThresholdHapticRun = false + } else if (!hasDismissThresholdHapticRun) { + MSDLPlayerWrapper.INSTANCE.get(recentsView.context) + .playToken(MSDLToken.SWIPE_THRESHOLD_INDICATOR) + hasDismissThresholdHapticRun = true + } + } + + override fun onDragEnd(velocity: Float) { + val taskBeingDragged = taskBeingDragged ?: return + taskDragDisplacementValue?.dispose() + taskBeingDragged.isBeingDraggedForDismissal = false + + val currentDisplacement = + taskBeingDragged.secondaryDismissTranslationProperty.get(taskBeingDragged) + val isBeyondDismissThreshold = + abs(currentDisplacement) > abs(DISMISS_THRESHOLD_FRACTION * dismissLength) + val velocityIsGoingUp = recentsView.pagedOrientationHandler.isGoingUp(velocity, isRtl) + val isFlingingTowardsDismiss = detector.isFling(velocity) && velocityIsGoingUp + val isFlingingTowardsRestState = detector.isFling(velocity) && !velocityIsGoingUp + isDismissing = + allowDetach && isFlingingTowardsDismiss || + (isBeyondDismissThreshold && !isFlingingTowardsRestState) + val dismissThreshold = (DISMISS_THRESHOLD_FRACTION * dismissLength * verticalFactor).toInt() + val finalPosition = if (isDismissing) (dismissLength * verticalFactor).toFloat() else 0f + springAnimation = + recentsView.runTaskDismissSettlingSpringAnimation( + taskBeingDragged, + isDismissing, + RecentsDismissUtils.DismissedTaskData( + startVelocity = velocity, + dismissLength = dismissLength, + finalPosition = finalPosition, + dismissThreshold = dismissThreshold, + ), + /* shouldRemoveTaskView= */ isDismissing, + /* isSplitSelection= */ false, + ) + recentsScaleAnimation = + recentsView.animateRecentsScale(RECENTS_SCALE_DEFAULT).addEndListener { _, _, _, _ -> + recentsScaleAnimation = null + } + } + + private fun clearState() { + detector.finishedScrolling() + detector.setDetectableScrollConditions(0, false) + taskBeingDragged?.resetViewTransforms() + taskBeingDragged = null + springAnimation = null + taskDragDisplacementValue = null + isDismissing = false + allowDetach = true + } + + private fun getRecentsScale(dismissFraction: Float): Float { + return when { + // Do not scale recents when dragging below origin. + dismissFraction <= 0 -> { + RECENTS_SCALE_DEFAULT + } + // Initially scale recents as the drag begins, up to the first threshold. + !allowDetach || dismissFraction < RECENTS_SCALE_FIRST_THRESHOLD_FRACTION -> { + mapToRange( + dismissFraction, + 0f, + RECENTS_SCALE_FIRST_THRESHOLD_FRACTION, + RECENTS_SCALE_DEFAULT, + RECENTS_SCALE_ON_DISMISS_CANCEL, + LINEAR, + ) + } + // Keep scale consistent until dragging to the dismiss threshold. + dismissFraction < RECENTS_SCALE_DISMISS_THRESHOLD_FRACTION -> { + RECENTS_SCALE_ON_DISMISS_CANCEL + } + // Scale beyond the dismiss threshold again, to indicate dismiss will occur on release. + dismissFraction < RECENTS_SCALE_SECOND_THRESHOLD_FRACTION -> { + mapToRange( + dismissFraction, + RECENTS_SCALE_DISMISS_THRESHOLD_FRACTION, + RECENTS_SCALE_SECOND_THRESHOLD_FRACTION, + RECENTS_SCALE_ON_DISMISS_CANCEL, + RECENTS_SCALE_ON_DISMISS_SUCCESS, + LINEAR, + ) + } + // Keep scale beyond the dismiss threshold scaling consistent. + else -> { + RECENTS_SCALE_ON_DISMISS_SUCCESS + } + } + } + + private fun generateMotionValue( + initialDisplacement: Float, + detachThreshold: Float, + context: Context, + updateCallback: (Float) -> Unit, + ): ViewMotionValue { + val direction = if (initialDisplacement < 0) InputDirection.Max else InputDirection.Min + val distanceGestureContext = + DistanceGestureContext.create(context, initialDisplacement, direction) + val viewMotionValue = + ViewMotionValue( + initialDisplacement, + distanceGestureContext, + generateMotionSpec(detachThreshold), + label = "taskDismiss::displacement", + ) + + viewMotionValue.addUpdateCallback { motionValue -> updateCallback(motionValue.output) } + return viewMotionValue + } + + /** Motion spec for an initial magnetic detach. Track linearly otherwise. No reattach. */ + private fun generateMotionSpec(detachThreshold: Float): MotionSpec { + val spring = SpringParameters(stiffness = 800f, dampingRatio = 0.95f) + val detachKey = BreakpointKey("TaskDismiss::Detach") + val breakpoints = mutableListOf() + val mappings = mutableListOf() + + breakpoints.add(minLimit) + if (allowDetach) { + mappings.add(Mapping.Identity) + breakpoints.add(Breakpoint(detachKey, detachThreshold, spring, Guarantee.None)) + } + mappings.add(Mapping.Linear(MAGNETIC_DETACH_INTERPOLATION_FRACTION)) + breakpoints.add(maxLimit) + + return MotionSpec(DirectionalMotionSpec(breakpoints, mappings)) + } + + companion object { + private const val TAG = "TaskViewDismissTouchController" + + private const val DISMISS_THRESHOLD_FRACTION = 0.5f + private const val DISMISS_THRESHOLD_HAPTIC_RANGE = 10f + + private const val RECENTS_SCALE_ON_DISMISS_CANCEL = 0.9875f + private const val RECENTS_SCALE_ON_DISMISS_SUCCESS = 0.975f + private const val RECENTS_SCALE_DEFAULT = 1f + private const val RECENTS_SCALE_FIRST_THRESHOLD_FRACTION = 0.2f + private const val RECENTS_SCALE_DISMISS_THRESHOLD_FRACTION = 0.5f + private const val RECENTS_SCALE_SECOND_THRESHOLD_FRACTION = 0.575f + + private const val MAGNETIC_DETACH_INTERPOLATION_FRACTION = 0.35f + } +} diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt new file mode 100644 index 00000000000..6225c47835d --- /dev/null +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt @@ -0,0 +1,231 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.uioverrides.touchcontrollers + +import android.content.Context +import android.graphics.Rect +import android.view.MotionEvent +import com.android.app.animation.Interpolators.ZOOM_IN +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.LauncherAnimUtils +import com.android.launcher3.Utilities.EDGE_NAV_BAR +import com.android.launcher3.Utilities.boundToRange +import com.android.launcher3.Utilities.debugLog +import com.android.launcher3.Utilities.isRtl +import com.android.launcher3.anim.AnimatorPlaybackController +import com.android.launcher3.touch.BaseSwipeDetector +import com.android.launcher3.touch.SingleAxisSwipeDetector +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.FlingBlockCheck +import com.android.launcher3.util.TouchController +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.TaskView +import kotlin.math.abs + +/** Touch controller which handles dragging task view cards for launch. */ +class TaskViewLaunchTouchController( + private val container: CONTAINER, + private val taskViewRecentsTouchContext: TaskViewRecentsTouchContext, +) : TouchController, SingleAxisSwipeDetector.Listener where +CONTAINER : Context, +CONTAINER : RecentsViewContainer { + private val tempRect = Rect() + private val flingBlockCheck = FlingBlockCheck() + private val recentsView: RecentsView<*, *> = container.getOverviewPanel() + private val detector: SingleAxisSwipeDetector = + SingleAxisSwipeDetector( + container as Context, + this, + recentsView.pagedOrientationHandler.upDownSwipeDirection, + ) + private val isRtl = isRtl(container.resources) + private val downDirection = recentsView.pagedOrientationHandler.getDownDirection(isRtl) + + private var taskBeingDragged: TaskView? = null + private var launchEndDisplacement: Float = 0f + private var playbackController: AnimatorPlaybackController? = null + private var verticalFactor: Int = 0 + private var canInterceptTouch = false + + private fun canTaskLaunchTaskView(taskView: TaskView?) = + taskView != null && + taskView === recentsView.currentPageTaskView && + DisplayController.getNavigationMode(container).hasGestures && + (!recentsView.showAsGrid() || taskView.isLargeTile) && + recentsView.isTaskInExpectedScrollPosition(taskView) + + private fun canInterceptTouch(ev: MotionEvent): Boolean = + when { + // Don't intercept swipes on the nav bar, as user might be trying to go home during a + // task dismiss animation. + (ev.edgeFlags and EDGE_NAV_BAR) != 0 -> { + debugLog(TAG, "Not intercepting edge swipe on nav bar.") + false + } + + // Floating views that a TouchController should not try to intercept touches from. + AbstractFloatingView.getTopOpenViewWithType( + container, + AbstractFloatingView.TYPE_TOUCH_CONTROLLER_NO_INTERCEPT, + ) != null -> { + debugLog(TAG, "Not intercepting, open floating view blocking touch.") + false + } + + // Disable swiping if the task overlay is modal. + taskViewRecentsTouchContext.isRecentsModal -> { + debugLog(TAG, "Not intercepting touch in modal overlay.") + false + } + + // Do not allow launch while recents is scrolling. + !recentsView.scroller.isFinished -> { + debugLog(TAG, "Not intercepting touch, recents scrolling.") + false + } + + else -> + taskViewRecentsTouchContext.isRecentsInteractive.also { isRecentsInteractive -> + if (!isRecentsInteractive) { + debugLog(TAG, "Not intercepting touch, recents not interactive.") + } + } + } + + override fun onControllerInterceptTouchEvent(ev: MotionEvent): Boolean { + if ( + (ev.action == MotionEvent.ACTION_UP || ev.action == MotionEvent.ACTION_CANCEL) && + playbackController == null + ) { + clearState() + } + if (ev.action == MotionEvent.ACTION_DOWN) { + canInterceptTouch = onActionDown(ev) + if (!canInterceptTouch) { + clearState() + return false + } + } + // Ignore other actions if touch intercepting has not been enabled in an ACTION_DOWN event. + if (!canInterceptTouch) { + return false + } + onControllerTouchEvent(ev) + val downDirectionIsNegative = downDirection == SingleAxisSwipeDetector.DIRECTION_NEGATIVE + val wasInitialTouchDown = + (downDirectionIsNegative && !detector.wasInitialTouchPositive()) || + (!downDirectionIsNegative && detector.wasInitialTouchPositive()) + return detector.isDraggingState && wasInitialTouchDown + } + + override fun onControllerTouchEvent(ev: MotionEvent) = detector.onTouchEvent(ev) + + private fun onActionDown(ev: MotionEvent): Boolean { + if (!canInterceptTouch(ev)) { + return false + } + taskBeingDragged = + recentsView.taskViews + .firstOrNull { + recentsView.isTaskViewVisible(it) && container.dragLayer.isEventOverView(it, ev) + } + ?.also { + verticalFactor = + recentsView.pagedOrientationHandler.getTaskDragDisplacementFactor(isRtl) + } + if (!canTaskLaunchTaskView(taskBeingDragged)) { + debugLog(TAG, "Not intercepting touch, task cannot be launched.") + return false + } + detector.setDetectableScrollConditions(downDirection, /* ignoreSlop= */ false) + return true + } + + override fun onDragStart(start: Boolean, startDisplacement: Float) { + val taskBeingDragged = taskBeingDragged ?: return + debugLog(TAG, "Handling touch event.") + + val secondaryLayerDimension: Int = + recentsView.pagedOrientationHandler.getSecondaryDimension(container.getDragLayer()) + val maxDuration = 2L * secondaryLayerDimension + recentsView.clearPendingAnimation() + val pendingAnimation = + recentsView.createTaskLaunchAnimation(taskBeingDragged, maxDuration, ZOOM_IN) + // Since the thumbnail is what is filling the screen, based the end displacement on it. + taskBeingDragged.getThumbnailBounds(tempRect, /* relativeToDragLayer= */ true) + launchEndDisplacement = + recentsView.pagedOrientationHandler + .getTaskLaunchLength(secondaryLayerDimension, tempRect) + .toFloat() * verticalFactor + playbackController = + pendingAnimation.createPlaybackController()?.apply { + taskViewRecentsTouchContext.onUserControlledAnimationCreated(this) + dispatchOnStart() + } + } + + override fun onDrag(displacement: Float): Boolean { + playbackController?.setPlayFraction( + boundToRange(displacement / launchEndDisplacement, 0f, 1f) + ) + return true + } + + override fun onDragEnd(velocity: Float) { + val playbackController = playbackController ?: return + + val isBeyondLaunchThreshold = + abs(playbackController.progressFraction) > abs(LAUNCH_THRESHOLD_FRACTION) + val velocityIsNegative = !recentsView.pagedOrientationHandler.isGoingUp(velocity, isRtl) + val isFlingingTowardsLaunch = detector.isFling(velocity) && velocityIsNegative + val isFlingingTowardsRestState = detector.isFling(velocity) && !velocityIsNegative + val isLaunching = + isFlingingTowardsLaunch || (isBeyondLaunchThreshold && !isFlingingTowardsRestState) + + val progress = playbackController.progressFraction + var animationDuration = + BaseSwipeDetector.calculateDuration( + velocity, + if (isLaunching) (1 - progress) else progress, + ) + if (detector.isFling(velocity) && flingBlockCheck.isBlocked && !isLaunching) { + animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity).toLong() + } + + playbackController.setEndAction(this::clearState) + playbackController.startWithVelocity( + container, + isLaunching, + velocity, + launchEndDisplacement, + animationDuration, + ) + } + + private fun clearState() { + detector.finishedScrolling() + detector.setDetectableScrollConditions(0, false) + taskBeingDragged = null + playbackController = null + } + + companion object { + private const val TAG = "TaskViewLaunchTouchController" + private const val LAUNCH_THRESHOLD_FRACTION: Float = 0.5f + } +} diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewRecentsTouchContext.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewRecentsTouchContext.java new file mode 100644 index 00000000000..e8d31c183ac --- /dev/null +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewRecentsTouchContext.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.uioverrides.touchcontrollers; + +import com.android.launcher3.anim.AnimatorPlaybackController; + +/** Interface providing context about the RecentsView state to a {@link TaskViewTouchController}. */ +public interface TaskViewRecentsTouchContext { + /** Returns whether Recents is interactive for touch. */ + boolean isRecentsInteractive(); + + /** Returns if Recents is showing a single task in a modal way. */ + boolean isRecentsModal(); + + /** Runs when a user controlled animation is created. */ + default void onUserControlledAnimationCreated(AnimatorPlaybackController animController) { + } +} diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java deleted file mode 100644 index 205da70513b..00000000000 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java +++ /dev/null @@ -1,395 +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.launcher3.uioverrides.touchcontrollers; - -import static com.android.launcher3.AbstractFloatingView.TYPE_TOUCH_CONTROLLER_NO_INTERCEPT; -import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS; -import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.content.Context; -import android.os.VibrationEffect; -import android.view.MotionEvent; -import android.view.View; -import android.view.animation.Interpolator; - -import com.android.app.animation.Interpolators; -import com.android.launcher3.AbstractFloatingView; -import com.android.launcher3.LauncherAnimUtils; -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.anim.AnimatorPlaybackController; -import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.touch.BaseSwipeDetector; -import com.android.launcher3.touch.SingleAxisSwipeDetector; -import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.FlingBlockCheck; -import com.android.launcher3.util.TouchController; -import com.android.launcher3.util.VibratorWrapper; -import com.android.launcher3.views.BaseDragLayer; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.VibrationConstants; -import com.android.quickstep.views.RecentsView; -import com.android.quickstep.views.RecentsViewContainer; -import com.android.quickstep.views.TaskView; - -/** - * Touch controller for handling task view card swipes - */ -public abstract class TaskViewTouchController - extends AnimatorListenerAdapter implements TouchController, - SingleAxisSwipeDetector.Listener { - - private static final float ANIMATION_PROGRESS_FRACTION_MIDPOINT = 0.5f; - private static final long MIN_TASK_DISMISS_ANIMATION_DURATION = 300; - private static final long MAX_TASK_DISMISS_ANIMATION_DURATION = 600; - - public static final int TASK_DISMISS_VIBRATION_PRIMITIVE = - VibrationEffect.Composition.PRIMITIVE_TICK; - public static final float TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE = 1f; - public static final VibrationEffect TASK_DISMISS_VIBRATION_FALLBACK = - VibrationConstants.EFFECT_TEXTURE_TICK; - - protected final CONTAINER mContainer; - private final SingleAxisSwipeDetector mDetector; - private final RecentsView mRecentsView; - private final int[] mTempCords = new int[2]; - private final boolean mIsRtl; - - private AnimatorPlaybackController mCurrentAnimation; - private boolean mCurrentAnimationIsGoingUp; - private boolean mAllowGoingUp; - private boolean mAllowGoingDown; - - private boolean mNoIntercept; - - private float mDisplacementShift; - private float mProgressMultiplier; - private float mEndDisplacement; - private boolean mDraggingEnabled = true; - private FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck(); - private Float mOverrideVelocity = null; - - private TaskView mTaskBeingDragged; - - private boolean mIsDismissHapticRunning = false; - - public TaskViewTouchController(CONTAINER container) { - mContainer = container; - mRecentsView = container.getOverviewPanel(); - mIsRtl = Utilities.isRtl(container.getResources()); - SingleAxisSwipeDetector.Direction dir = - mRecentsView.getPagedOrientationHandler().getUpDownSwipeDirection(); - mDetector = new SingleAxisSwipeDetector(container, this, dir); - } - - private boolean canInterceptTouch(MotionEvent ev) { - if ((ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) != 0) { - // Don't intercept swipes on the nav bar, as user might be trying to go home - // during a task dismiss animation. - if (mCurrentAnimation != null) { - mCurrentAnimation.getAnimationPlayer().end(); - } - return false; - } - if (mCurrentAnimation != null) { - mCurrentAnimation.forceFinishIfCloseToEnd(); - } - if (mCurrentAnimation != null) { - // If we are already animating from a previous state, we can intercept. - return true; - } - if (AbstractFloatingView.getTopOpenViewWithType( - mContainer, TYPE_TOUCH_CONTROLLER_NO_INTERCEPT) != null) { - return false; - } - return isRecentsInteractive(); - } - - protected abstract boolean isRecentsInteractive(); - - /** Is recents view showing a single task in a modal way. */ - protected abstract boolean isRecentsModal(); - - protected void onUserControlledAnimationCreated(AnimatorPlaybackController animController) { - } - - @Override - public void onAnimationCancel(Animator animation) { - if (mCurrentAnimation != null && animation == mCurrentAnimation.getTarget()) { - clearState(); - } - } - - @Override - public boolean onControllerInterceptTouchEvent(MotionEvent ev) { - if ((ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_CANCEL) - && mCurrentAnimation == null) { - clearState(); - } - if (ev.getAction() == MotionEvent.ACTION_DOWN) { - mNoIntercept = !canInterceptTouch(ev); - if (mNoIntercept) { - return false; - } - - // Now figure out which direction scroll events the controller will start - // calling the callbacks. - int directionsToDetectScroll = 0; - boolean ignoreSlopWhenSettling = false; - if (mCurrentAnimation != null) { - directionsToDetectScroll = DIRECTION_BOTH; - ignoreSlopWhenSettling = true; - } else { - mTaskBeingDragged = null; - - for (int i = 0; i < mRecentsView.getTaskViewCount(); i++) { - TaskView view = mRecentsView.getTaskViewAt(i); - - if (mRecentsView.isTaskViewVisible(view) && mContainer.getDragLayer() - .isEventOverView(view, ev)) { - // Disable swiping up and down if the task overlay is modal. - if (isRecentsModal()) { - mTaskBeingDragged = null; - break; - } - mTaskBeingDragged = view; - int upDirection = mRecentsView.getPagedOrientationHandler() - .getUpDirection(mIsRtl); - - // The task can be dragged up to dismiss it - mAllowGoingUp = true; - - // The task can be dragged down to open it if: - // - It's the current page - // - We support gestures to enter overview - // - It's the focused task if in grid view - // - The task is snapped - mAllowGoingDown = i == mRecentsView.getCurrentPage() - && DisplayController.getNavigationMode(mContainer).hasGestures - && (!mRecentsView.showAsGrid() || mTaskBeingDragged.isFocusedTask()) - && mRecentsView.isTaskInExpectedScrollPosition(i); - - directionsToDetectScroll = mAllowGoingDown ? DIRECTION_BOTH : upDirection; - break; - } - } - if (mTaskBeingDragged == null) { - mNoIntercept = true; - return false; - } - } - - mDetector.setDetectableScrollConditions( - directionsToDetectScroll, ignoreSlopWhenSettling); - } - - if (mNoIntercept) { - return false; - } - - onControllerTouchEvent(ev); - return mDetector.isDraggingOrSettling(); - } - - @Override - public boolean onControllerTouchEvent(MotionEvent ev) { - return mDetector.onTouchEvent(ev); - } - - private void reInitAnimationController(boolean goingUp) { - if (mCurrentAnimation != null && mCurrentAnimationIsGoingUp == goingUp) { - // No need to init - return; - } - if ((goingUp && !mAllowGoingUp) || (!goingUp && !mAllowGoingDown)) { - // Trying to re-init in an unsupported direction. - return; - } - if (mCurrentAnimation != null) { - mCurrentAnimation.setPlayFraction(0); - mCurrentAnimation.getTarget().removeListener(this); - mCurrentAnimation.dispatchOnCancel(); - } - - RecentsPagedOrientationHandler orientationHandler = - mRecentsView.getPagedOrientationHandler(); - mCurrentAnimationIsGoingUp = goingUp; - BaseDragLayer dl = mContainer.getDragLayer(); - final int secondaryLayerDimension = orientationHandler.getSecondaryDimension(dl); - long maxDuration = 2 * secondaryLayerDimension; - int verticalFactor = orientationHandler.getTaskDragDisplacementFactor(mIsRtl); - int secondaryTaskDimension = orientationHandler.getSecondaryDimension(mTaskBeingDragged); - // The interpolator controlling the most prominent visual movement. We use this to determine - // whether we passed SUCCESS_TRANSITION_PROGRESS. - final Interpolator currentInterpolator; - PendingAnimation pa; - if (goingUp) { - currentInterpolator = Interpolators.LINEAR; - pa = new PendingAnimation(maxDuration); - mRecentsView.createTaskDismissAnimation(pa, mTaskBeingDragged, - true /* animateTaskView */, true /* removeTask */, maxDuration, - false /* dismissingForSplitSelection*/); - - mEndDisplacement = -secondaryTaskDimension; - } else { - currentInterpolator = Interpolators.ZOOM_IN; - pa = mRecentsView.createTaskLaunchAnimation( - mTaskBeingDragged, maxDuration, currentInterpolator); - - // Since the thumbnail is what is filling the screen, based the end displacement on it. - View thumbnailView = mTaskBeingDragged.getFirstThumbnailViewDeprecated(); - mTempCords[1] = orientationHandler.getSecondaryDimension(thumbnailView); - dl.getDescendantCoordRelativeToSelf(thumbnailView, mTempCords); - mEndDisplacement = secondaryLayerDimension - mTempCords[1]; - } - mEndDisplacement *= verticalFactor; - mCurrentAnimation = pa.createPlaybackController(); - - // Setting this interpolator doesn't affect the visual motion, but is used to determine - // whether we successfully reached the target state in onDragEnd(). - mCurrentAnimation.getTarget().setInterpolator(currentInterpolator); - onUserControlledAnimationCreated(mCurrentAnimation); - mCurrentAnimation.getTarget().addListener(this); - mCurrentAnimation.dispatchOnStart(); - mProgressMultiplier = 1 / mEndDisplacement; - } - - @Override - public void onDragStart(boolean start, float startDisplacement) { - if (!mDraggingEnabled) return; - - RecentsPagedOrientationHandler orientationHandler = - mRecentsView.getPagedOrientationHandler(); - if (mCurrentAnimation == null) { - reInitAnimationController(orientationHandler.isGoingUp(startDisplacement, mIsRtl)); - mDisplacementShift = 0; - } else { - mDisplacementShift = mCurrentAnimation.getProgressFraction() / mProgressMultiplier; - mCurrentAnimation.pause(); - } - mFlingBlockCheck.unblockFling(); - mOverrideVelocity = null; - } - - @Override - public boolean onDrag(float displacement) { - if (!mDraggingEnabled) return true; - - RecentsPagedOrientationHandler orientationHandler = - mRecentsView.getPagedOrientationHandler(); - float totalDisplacement = displacement + mDisplacementShift; - boolean isGoingUp = totalDisplacement == 0 ? mCurrentAnimationIsGoingUp : - orientationHandler.isGoingUp(totalDisplacement, mIsRtl); - if (isGoingUp != mCurrentAnimationIsGoingUp) { - reInitAnimationController(isGoingUp); - mFlingBlockCheck.blockFling(); - } else { - mFlingBlockCheck.onEvent(); - } - - if (isGoingUp) { - if (mCurrentAnimation.getProgressFraction() < ANIMATION_PROGRESS_FRACTION_MIDPOINT) { - // Halve the value when dismissing, as we are animating the drag across the full - // length for only the first half of the progress - mCurrentAnimation.setPlayFraction( - Utilities.boundToRange(totalDisplacement * mProgressMultiplier / 2, 0, 1)); - } else { - // Set mOverrideVelocity to control task dismiss velocity in onDragEnd - int velocityDimenId = R.dimen.default_task_dismiss_drag_velocity; - if (mRecentsView.showAsGrid()) { - if (mTaskBeingDragged.isFocusedTask()) { - velocityDimenId = - R.dimen.default_task_dismiss_drag_velocity_grid_focus_task; - } else { - velocityDimenId = R.dimen.default_task_dismiss_drag_velocity_grid; - } - } - mOverrideVelocity = -mTaskBeingDragged.getResources().getDimension(velocityDimenId); - - // Once halfway through task dismissal interpolation, switch from reversible - // dragging-task animation to playing the remaining task translation animations, - // while this is in progress disable dragging. - mDraggingEnabled = false; - } - } else { - mCurrentAnimation.setPlayFraction( - Utilities.boundToRange(totalDisplacement * mProgressMultiplier, 0, 1)); - } - - return true; - } - - @Override - public void onDragEnd(float velocity) { - if (mOverrideVelocity != null) { - velocity = mOverrideVelocity; - mOverrideVelocity = null; - } - // Limit velocity, as very large scalar values make animations play too quickly - float maxTaskDismissDragVelocity = mTaskBeingDragged.getResources().getDimension( - R.dimen.max_task_dismiss_drag_velocity); - velocity = Utilities.boundToRange(velocity, -maxTaskDismissDragVelocity, - maxTaskDismissDragVelocity); - boolean fling = mDraggingEnabled && mDetector.isFling(velocity); - final boolean goingToEnd; - boolean blockedFling = fling && mFlingBlockCheck.isBlocked(); - if (blockedFling) { - fling = false; - } - RecentsPagedOrientationHandler orientationHandler = - mRecentsView.getPagedOrientationHandler(); - boolean goingUp = orientationHandler.isGoingUp(velocity, mIsRtl); - float progress = mCurrentAnimation.getProgressFraction(); - float interpolatedProgress = mCurrentAnimation.getInterpolatedProgress(); - if (fling) { - goingToEnd = goingUp == mCurrentAnimationIsGoingUp; - } else { - goingToEnd = interpolatedProgress > SUCCESS_TRANSITION_PROGRESS; - } - long animationDuration = BaseSwipeDetector.calculateDuration( - velocity, goingToEnd ? (1 - progress) : progress); - if (blockedFling && !goingToEnd) { - animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity); - } - // Due to very high or low velocity dismissals, animation durations can be inconsistently - // long or short. Bound the duration for animation of task translations for a more - // standardized feel. - animationDuration = Utilities.boundToRange(animationDuration, - MIN_TASK_DISMISS_ANIMATION_DURATION, MAX_TASK_DISMISS_ANIMATION_DURATION); - - mCurrentAnimation.setEndAction(this::clearState); - mCurrentAnimation.startWithVelocity(mContainer, goingToEnd, Math.abs(velocity), - mEndDisplacement, animationDuration); - if (goingUp && goingToEnd && !mIsDismissHapticRunning) { - VibratorWrapper.INSTANCE.get(mContainer).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE, - TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK); - mIsDismissHapticRunning = true; - } - - mDraggingEnabled = true; - } - - private void clearState() { - mDetector.finishedScrolling(); - mDetector.setDetectableScrollConditions(0, false); - mDraggingEnabled = true; - mTaskBeingDragged = null; - mCurrentAnimation = null; - mIsDismissHapticRunning = false; - } -} \ No newline at end of file diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchControllerDeprecated.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchControllerDeprecated.java new file mode 100644 index 00000000000..d9b0366a406 --- /dev/null +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchControllerDeprecated.java @@ -0,0 +1,397 @@ +/* + * 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.launcher3.uioverrides.touchcontrollers; + +import static com.android.launcher3.AbstractFloatingView.TYPE_TOUCH_CONTROLLER_NO_INTERCEPT; +import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS; +import static com.android.launcher3.Utilities.debugLog; +import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.content.Context; +import android.graphics.Rect; +import android.os.VibrationEffect; +import android.view.MotionEvent; +import android.view.animation.Interpolator; + +import com.android.app.animation.Interpolators; +import com.android.launcher3.AbstractFloatingView; +import com.android.launcher3.LauncherAnimUtils; +import com.android.launcher3.R; +import com.android.launcher3.Utilities; +import com.android.launcher3.anim.AnimatorPlaybackController; +import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.touch.BaseSwipeDetector; +import com.android.launcher3.touch.SingleAxisSwipeDetector; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.FlingBlockCheck; +import com.android.launcher3.util.TouchController; +import com.android.launcher3.util.VibratorWrapper; +import com.android.launcher3.views.BaseDragLayer; +import com.android.quickstep.orientation.RecentsPagedOrientationHandler; +import com.android.quickstep.util.VibrationConstants; +import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.views.TaskView; + +/** + * Touch controller for handling task view card swipes + * + * @deprecated This class will be replaced by the new {@link TaskViewTouchController}. + */ +@Deprecated +public class TaskViewTouchControllerDeprecated< + CONTAINER extends Context & RecentsViewContainer> extends AnimatorListenerAdapter + implements TouchController, SingleAxisSwipeDetector.Listener { + private static final String TAG = "TaskViewTouchControllerDeprecated"; + + private static final float ANIMATION_PROGRESS_FRACTION_MIDPOINT = 0.5f; + private static final long MIN_TASK_DISMISS_ANIMATION_DURATION = 300; + private static final long MAX_TASK_DISMISS_ANIMATION_DURATION = 600; + + public static final int TASK_DISMISS_VIBRATION_PRIMITIVE = + VibrationEffect.Composition.PRIMITIVE_TICK; + public static final float TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE = 1f; + public static final VibrationEffect TASK_DISMISS_VIBRATION_FALLBACK = + VibrationConstants.EFFECT_TEXTURE_TICK; + + protected final CONTAINER mContainer; + private final TaskViewRecentsTouchContext mTaskViewRecentsTouchContext; + private final SingleAxisSwipeDetector mDetector; + private final RecentsView mRecentsView; + private final Rect mTempRect = new Rect(); + private final boolean mIsRtl; + + private AnimatorPlaybackController mCurrentAnimation; + private boolean mCurrentAnimationIsGoingUp; + private boolean mAllowGoingUp; + private boolean mAllowGoingDown; + + private boolean mNoIntercept; + + private float mDisplacementShift; + private float mProgressMultiplier; + private float mEndDisplacement; + private boolean mDraggingEnabled = true; + private FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck(); + private Float mOverrideVelocity = null; + + private TaskView mTaskBeingDragged; + + private boolean mIsDismissHapticRunning = false; + + public TaskViewTouchControllerDeprecated(CONTAINER container, + TaskViewRecentsTouchContext taskViewRecentsTouchContext) { + mContainer = container; + mTaskViewRecentsTouchContext = taskViewRecentsTouchContext; + mRecentsView = container.getOverviewPanel(); + mIsRtl = Utilities.isRtl(container.getResources()); + SingleAxisSwipeDetector.Direction dir = + mRecentsView.getPagedOrientationHandler().getUpDownSwipeDirection(); + mDetector = new SingleAxisSwipeDetector(container, this, dir); + } + + private boolean canInterceptTouch(MotionEvent ev) { + if ((ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) != 0) { + // Don't intercept swipes on the nav bar, as user might be trying to go home + // during a task dismiss animation. + if (mCurrentAnimation != null) { + mCurrentAnimation.getAnimationPlayer().end(); + } + debugLog(TAG, "Not intercepting edge swipe on nav bar."); + return false; + } + if (mCurrentAnimation != null) { + mCurrentAnimation.forceFinishIfCloseToEnd(); + } + if (mCurrentAnimation != null) { + // If we are already animating from a previous state, we can intercept. + return true; + } + if (AbstractFloatingView.getTopOpenViewWithType( + mContainer, TYPE_TOUCH_CONTROLLER_NO_INTERCEPT) != null) { + debugLog(TAG, "Not intercepting, open floating view blocking touch."); + return false; + } + return mTaskViewRecentsTouchContext.isRecentsInteractive(); + } + + @Override + public void onAnimationCancel(Animator animation) { + if (mCurrentAnimation != null && animation == mCurrentAnimation.getTarget()) { + clearState(); + } + } + + @Override + public boolean onControllerInterceptTouchEvent(MotionEvent ev) { + if ((ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_CANCEL) + && mCurrentAnimation == null) { + clearState(); + } + if (ev.getAction() == MotionEvent.ACTION_DOWN) { + mNoIntercept = !canInterceptTouch(ev); + if (mNoIntercept) { + debugLog(TAG, "Not intercepting touch."); + return false; + } + + // Now figure out which direction scroll events the controller will start + // calling the callbacks. + int directionsToDetectScroll = 0; + boolean ignoreSlopWhenSettling = false; + if (mCurrentAnimation != null) { + directionsToDetectScroll = DIRECTION_BOTH; + ignoreSlopWhenSettling = true; + } else { + mTaskBeingDragged = null; + + for (TaskView taskView : mRecentsView.getTaskViews()) { + if (mRecentsView.isTaskViewVisible(taskView) && mContainer.getDragLayer() + .isEventOverView(taskView, ev)) { + // Disable swiping up and down if the task overlay is modal. + if (mTaskViewRecentsTouchContext.isRecentsModal()) { + mTaskBeingDragged = null; + break; + } + mTaskBeingDragged = taskView; + int upDirection = mRecentsView.getPagedOrientationHandler() + .getUpDirection(mIsRtl); + + // The task can be dragged up to dismiss it + mAllowGoingUp = true; + + // The task can be dragged down to open it if: + // - It's the current page + // - We support gestures to enter overview + // - It's the focused task if in grid view + // - The task is snapped + mAllowGoingDown = taskView == mRecentsView.getCurrentPageTaskView() + && DisplayController.getNavigationMode(mContainer).hasGestures + && (!mRecentsView.showAsGrid() || mTaskBeingDragged.isLargeTile()) + && mRecentsView.isTaskInExpectedScrollPosition(taskView); + + directionsToDetectScroll = mAllowGoingDown ? DIRECTION_BOTH : upDirection; + break; + } + } + if (mTaskBeingDragged == null) { + mNoIntercept = true; + debugLog(TAG, "Not intercepting touch, no task to drag."); + return false; + } + } + + mDetector.setDetectableScrollConditions( + directionsToDetectScroll, ignoreSlopWhenSettling); + } + + if (mNoIntercept) { + debugLog(TAG, "Not intercepting touch."); + return false; + } + + onControllerTouchEvent(ev); + return mDetector.isDraggingOrSettling(); + } + + @Override + public boolean onControllerTouchEvent(MotionEvent ev) { + return mDetector.onTouchEvent(ev); + } + + private void reInitAnimationController(boolean goingUp) { + if (mCurrentAnimation != null && mCurrentAnimationIsGoingUp == goingUp) { + // No need to init + return; + } + if ((goingUp && !mAllowGoingUp) || (!goingUp && !mAllowGoingDown)) { + // Trying to re-init in an unsupported direction. + return; + } + if (mCurrentAnimation != null) { + mCurrentAnimation.setPlayFraction(0); + mCurrentAnimation.getTarget().removeListener(this); + mCurrentAnimation.dispatchOnCancel(); + } + + RecentsPagedOrientationHandler orientationHandler = + mRecentsView.getPagedOrientationHandler(); + mCurrentAnimationIsGoingUp = goingUp; + BaseDragLayer dl = mContainer.getDragLayer(); + final int secondaryLayerDimension = orientationHandler.getSecondaryDimension(dl); + long maxDuration = 2 * secondaryLayerDimension; + int verticalFactor = orientationHandler.getTaskDragDisplacementFactor(mIsRtl); + int secondaryTaskDimension = orientationHandler.getSecondaryDimension(mTaskBeingDragged); + // The interpolator controlling the most prominent visual movement. We use this to determine + // whether we passed SUCCESS_TRANSITION_PROGRESS. + final Interpolator currentInterpolator; + PendingAnimation pa; + if (goingUp) { + currentInterpolator = Interpolators.LINEAR; + pa = new PendingAnimation(maxDuration); + mRecentsView.createTaskDismissAnimation(pa, mTaskBeingDragged, + true /* animateTaskView */, true /* removeTask */, maxDuration, + false /* dismissingForSplitSelection*/, null /* gridEndData */); + + mEndDisplacement = -secondaryTaskDimension; + } else { + currentInterpolator = Interpolators.ZOOM_IN; + pa = mRecentsView.createTaskLaunchAnimation( + mTaskBeingDragged, maxDuration, currentInterpolator); + + // Since the thumbnail is what is filling the screen, based the end displacement on it. + mTaskBeingDragged.getThumbnailBounds(mTempRect, /*relativeToDragLayer=*/true); + mEndDisplacement = secondaryLayerDimension - mTempRect.bottom; + } + mEndDisplacement *= verticalFactor; + mCurrentAnimation = pa.createPlaybackController(); + + // Setting this interpolator doesn't affect the visual motion, but is used to determine + // whether we successfully reached the target state in onDragEnd(). + mCurrentAnimation.getTarget().setInterpolator(currentInterpolator); + mTaskViewRecentsTouchContext.onUserControlledAnimationCreated(mCurrentAnimation); + mCurrentAnimation.getTarget().addListener(this); + mCurrentAnimation.dispatchOnStart(); + mProgressMultiplier = 1 / mEndDisplacement; + } + + @Override + public void onDragStart(boolean start, float startDisplacement) { + if (!mDraggingEnabled) return; + debugLog(TAG, "Handling touch."); + + RecentsPagedOrientationHandler orientationHandler = + mRecentsView.getPagedOrientationHandler(); + if (mCurrentAnimation == null) { + reInitAnimationController(orientationHandler.isGoingUp(startDisplacement, mIsRtl)); + mDisplacementShift = 0; + } else { + mDisplacementShift = mCurrentAnimation.getProgressFraction() / mProgressMultiplier; + mCurrentAnimation.pause(); + } + mFlingBlockCheck.unblockFling(); + mOverrideVelocity = null; + } + + @Override + public boolean onDrag(float displacement) { + if (!mDraggingEnabled) return true; + + RecentsPagedOrientationHandler orientationHandler = + mRecentsView.getPagedOrientationHandler(); + float totalDisplacement = displacement + mDisplacementShift; + boolean isGoingUp = totalDisplacement == 0 ? mCurrentAnimationIsGoingUp : + orientationHandler.isGoingUp(totalDisplacement, mIsRtl); + if (isGoingUp != mCurrentAnimationIsGoingUp) { + reInitAnimationController(isGoingUp); + mFlingBlockCheck.blockFling(); + } else { + mFlingBlockCheck.onEvent(); + } + + if (isGoingUp) { + if (mCurrentAnimation.getProgressFraction() < ANIMATION_PROGRESS_FRACTION_MIDPOINT) { + // Halve the value when dismissing, as we are animating the drag across the full + // length for only the first half of the progress + mCurrentAnimation.setPlayFraction( + Utilities.boundToRange(totalDisplacement * mProgressMultiplier / 2, 0, 1)); + } else { + // Set mOverrideVelocity to control task dismiss velocity in onDragEnd + int velocityDimenId = R.dimen.default_task_dismiss_drag_velocity; + if (mRecentsView.showAsGrid()) { + if (mTaskBeingDragged.isLargeTile()) { + velocityDimenId = + R.dimen.default_task_dismiss_drag_velocity_grid_focus_task; + } else { + velocityDimenId = R.dimen.default_task_dismiss_drag_velocity_grid; + } + } + mOverrideVelocity = -mTaskBeingDragged.getResources().getDimension(velocityDimenId); + + // Once halfway through task dismissal interpolation, switch from reversible + // dragging-task animation to playing the remaining task translation animations, + // while this is in progress disable dragging. + mDraggingEnabled = false; + } + } else { + mCurrentAnimation.setPlayFraction( + Utilities.boundToRange(totalDisplacement * mProgressMultiplier, 0, 1)); + } + + return true; + } + + @Override + public void onDragEnd(float velocity) { + if (mOverrideVelocity != null) { + velocity = mOverrideVelocity; + mOverrideVelocity = null; + } + // Limit velocity, as very large scalar values make animations play too quickly + float maxTaskDismissDragVelocity = mTaskBeingDragged.getResources().getDimension( + R.dimen.max_task_dismiss_drag_velocity); + velocity = Utilities.boundToRange(velocity, -maxTaskDismissDragVelocity, + maxTaskDismissDragVelocity); + boolean fling = mDraggingEnabled && mDetector.isFling(velocity); + final boolean goingToEnd; + boolean blockedFling = fling && mFlingBlockCheck.isBlocked(); + if (blockedFling) { + fling = false; + } + RecentsPagedOrientationHandler orientationHandler = + mRecentsView.getPagedOrientationHandler(); + boolean goingUp = orientationHandler.isGoingUp(velocity, mIsRtl); + float progress = mCurrentAnimation.getProgressFraction(); + float interpolatedProgress = mCurrentAnimation.getInterpolatedProgress(); + if (fling) { + goingToEnd = goingUp == mCurrentAnimationIsGoingUp; + } else { + goingToEnd = interpolatedProgress > SUCCESS_TRANSITION_PROGRESS; + } + long animationDuration = BaseSwipeDetector.calculateDuration( + velocity, goingToEnd ? (1 - progress) : progress); + if (blockedFling && !goingToEnd) { + animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity); + } + // Due to very high or low velocity dismissals, animation durations can be inconsistently + // long or short. Bound the duration for animation of task translations for a more + // standardized feel. + animationDuration = Utilities.boundToRange(animationDuration, + MIN_TASK_DISMISS_ANIMATION_DURATION, MAX_TASK_DISMISS_ANIMATION_DURATION); + + mCurrentAnimation.setEndAction(this::clearState); + mCurrentAnimation.startWithVelocity(mContainer, goingToEnd, Math.abs(velocity), + mEndDisplacement, animationDuration); + if (goingUp && goingToEnd && !mIsDismissHapticRunning) { + VibratorWrapper.INSTANCE.get(mContainer).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE, + TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK); + mIsDismissHapticRunning = true; + } + + mDraggingEnabled = true; + } + + private void clearState() { + mDetector.finishedScrolling(); + mDetector.setDetectableScrollConditions(0, false); + mDraggingEnabled = true; + mTaskBeingDragged = null; + mCurrentAnimation = null; + mIsDismissHapticRunning = false; + } +} \ No newline at end of file diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java index b70cabe76d6..e7d2cd23c63 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java @@ -39,6 +39,6 @@ protected float initCurrentAnimation() { @Override protected float getShiftRange() { - return mLauncher.getDeviceProfile().heightPx / 2f; + return mLauncher.getDeviceProfile().getDeviceProperties().getHeightPx() / 2f; } } diff --git a/quickstep/src/com/android/launcher3/widget/picker/WidgetCategoryFilter.kt b/quickstep/src/com/android/launcher3/widget/picker/WidgetCategoryFilter.kt new file mode 100644 index 00000000000..69feb4ab963 --- /dev/null +++ b/quickstep/src/com/android/launcher3/widget/picker/WidgetCategoryFilter.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widget.picker + +/** + * A filter that can be applied on the widgetCategory attribute from appwidget-provider to identify + * if the widget can be displayed on a specific widget surface. + * - Negative value (e.g. "category_a.inv() and category_b.inv()" excludes the widgets with given + * categories. + * - Positive value (e.g. "category_a or category_b" includes widgets with those categories. + * - 0 means no filter. + */ +class WidgetCategoryFilter(val categoryMask: Int) { + /** Applies the [categoryMask] to return if the [widgetCategory] matches. */ + fun matches(widgetCategory: Int): Boolean { + return if (categoryMask > 0) { // inclusion filter + (widgetCategory and categoryMask) != 0 + } else if (categoryMask < 0) { // exclusion filter + (widgetCategory and categoryMask) == widgetCategory + } else { + true // no filter + } + } +} diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index fe3c35251bf..71198e99fe2 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -16,6 +16,7 @@ package com.android.quickstep; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.view.Surface.ROTATION_0; import static android.view.Surface.ROTATION_270; import static android.view.Surface.ROTATION_90; @@ -30,38 +31,42 @@ import static com.android.launcher3.BaseActivity.EVENT_STARTED; import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER; import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS; -import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; -import static com.android.launcher3.Flags.enableGridOnlyOverview; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; +import static com.android.launcher3.Flags.msdlFeedback; +import static com.android.launcher3.Flags.refactorTaskbarUiState; import static com.android.launcher3.PagedView.INVALID_PAGE; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_GESTURE; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_ENTER_DESKTOP_MODE; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_EXIT_DESKTOP_MODE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_LEFT; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_RIGHT; +import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL; +import static com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_STATE_ORDINAL; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK; import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC; import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs; -import static com.android.quickstep.GestureState.GestureEndTarget.ALL_APPS; +import static com.android.quickstep.BaseContainerInterface.AnimationFactory; import static com.android.quickstep.GestureState.GestureEndTarget.HOME; import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK; import static com.android.quickstep.GestureState.GestureEndTarget.NEW_TASK; import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS; +import static com.android.quickstep.GestureState.GestureEndTarget.REJECT_HOME; import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINISHED; import static com.android.quickstep.GestureState.STATE_END_TARGET_SET; import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_CANCELED; +import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED; import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED; +import static com.android.quickstep.GestureState.displaySupportsHomeGesture; import static com.android.quickstep.MultiStateCallback.DEBUG_STATES; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.CANCEL_RECENTS_ANIMATION; +import static com.android.quickstep.TaskViewUtils.extractTargetsAndStates; import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.EXPECTING_TASK_APPEARED; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.INVALID_VELOCITY_ON_SWIPE_UP; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.LAUNCHER_DESTROYED; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_SETTLED_ON_END_TARGET; import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; +import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_CAN_HAND_OFF_ANIMATION; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -80,6 +85,9 @@ import android.os.IBinder; import android.os.SystemClock; import android.util.Log; +import android.util.Pair; +import android.util.TimeUtils; +import android.view.Choreographer; import android.view.MotionEvent; import android.view.RemoteAnimationTarget; import android.view.SurfaceControl; @@ -91,39 +99,58 @@ import android.view.WindowInsets; import android.view.animation.Interpolator; import android.widget.Toast; +import android.window.DesktopExperienceFlags; +import android.window.DesktopModeFlags; import android.window.PictureInPictureSurfaceTransaction; +import android.window.TransitionInfo; +import android.window.WindowAnimationState; +import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; import com.android.internal.jank.Cuj; import com.android.internal.util.LatencyTracker; import com.android.launcher3.AbstractFloatingView; +import com.android.launcher3.BuildConfig; +import com.android.launcher3.BuildConfigs; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.LauncherPrefs; +import com.android.launcher3.LifecycleTracker; +import com.android.launcher3.QuickstepTransitionManager; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; +import com.android.launcher3.compat.AccessibilityManagerCompat; +import com.android.launcher3.dagger.LauncherComponentProvider; import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager.StatsLogger; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.BaseState; +import com.android.launcher3.statemanager.StatefulContainer; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.taskbar.TaskbarThresholdUtils; -import com.android.launcher3.taskbar.TaskbarUIController; +import com.android.launcher3.taskbar.TaskbarUiState; +import com.android.launcher3.taskbar.TaskbarUiStateMonitor; +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator; import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.MSDLPlayerWrapper; +import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.SafeCloseable; import com.android.launcher3.util.TraceHelper; import com.android.launcher3.util.VibratorWrapper; -import com.android.launcher3.util.WindowBounds; -import com.android.quickstep.BaseActivityInterface.AnimationFactory; import com.android.quickstep.GestureState.GestureEndTarget; import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle; import com.android.quickstep.util.ActiveGestureErrorDetector; import com.android.quickstep.util.ActiveGestureLog; -import com.android.quickstep.util.ActivityInitListener; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; import com.android.quickstep.util.AnimatorControllerWithResistance; +import com.android.quickstep.util.ContextInitListener; import com.android.quickstep.util.InputConsumerProxy; import com.android.quickstep.util.InputProxyHandlerFactory; import com.android.quickstep.util.MotionPauseDetector; @@ -138,9 +165,11 @@ import com.android.quickstep.views.DesktopTaskView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.views.TaskContainer; import com.android.quickstep.views.TaskView; -import com.android.quickstep.views.TaskView.TaskContainer; -import com.android.systemui.shared.recents.model.Task; +import com.android.quickstep.views.TaskViewType; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.systemui.contextualeducation.GestureType; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.InputConsumerController; @@ -148,9 +177,13 @@ import com.android.systemui.shared.system.SysUiStatsLog; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; -import com.android.window.flags2.Flags; -import com.android.wm.shell.common.TransactionPool; -import com.android.wm.shell.startingsurface.SplashScreenExitAnimationUtils; +import com.android.wm.shell.shared.GroupedTaskInfo; +import com.android.wm.shell.shared.TransactionPool; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.pip.PipFlags; +import com.android.wm.shell.shared.startingsurface.SplashScreenExitAnimationUtils; + +import com.google.android.msdl.data.model.MSDLToken; import kotlin.Unit; @@ -158,7 +191,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; -import java.util.Objects; import java.util.Optional; import java.util.OptionalInt; import java.util.function.Consumer; @@ -166,8 +198,9 @@ /** * Handles the navigation gestures when Launcher is the default home activity. */ -public abstract class AbsSwipeUpHandler> +public abstract class AbsSwipeUpHandler< + RECENTS_CONTAINER extends Context & RecentsViewContainer & StatefulContainer, + RECENTS_VIEW extends RecentsView, STATE extends BaseState> extends SwipeUpAnimationLogic implements OnApplyWindowInsetsListener, RecentsAnimationCallbacks.RecentsAnimationListener { private static final String TAG = "AbsSwipeUpHandler"; @@ -177,30 +210,26 @@ public abstract class AbsSwipeUpHandler mContainerInterface; + protected final RecentsAnimationDeviceState mDeviceState; + protected final BaseContainerInterface mContainerInterface; protected final InputConsumerProxy mInputConsumerProxy; - protected final ActivityInitListener mActivityInitListener; + protected final ContextInitListener mContextInitListener; // Callbacks to be made once the recents animation starts private final ArrayList mRecentsAnimationStartCallbacks = new ArrayList<>(); private final OnScrollChangedListener mOnRecentsScrollListener = this::onRecentsViewScroll; // Null if the recents animation hasn't started yet or has been canceled or finished. protected @Nullable RecentsAnimationController mRecentsAnimationController; - protected @Nullable RecentsAnimationController mDeferredCleanupRecentsAnimationController; protected RecentsAnimationTargets mRecentsAnimationTargets; - protected @Nullable T mContainer; - protected @Nullable Q mRecentsView; + protected @Nullable RECENTS_CONTAINER mContainer; + protected @Nullable RECENTS_VIEW mRecentsView; protected Runnable mGestureEndCallback; + protected Runnable mGestureAnimationEndCallback; protected MultiStateCallback mStateCallback; protected boolean mCanceled; private boolean mRecentsViewScrollLinked = false; - - private final Runnable mLauncherOnDestroyCallback = () -> { - ActiveGestureLog.INSTANCE.addLog("Launcher destroyed", LAUNCHER_DESTROYED); - mRecentsView = null; - mContainer = null; - mStateCallback.clearState(STATE_LAUNCHER_PRESENT); - }; + // The previous task view type before the user quick switches between tasks + private TaskViewType mPreviousTaskViewType; private static int FLAG_COUNT = 0; private static int getNextStateFlag(String name) { @@ -240,7 +269,7 @@ private static int getNextStateFlag(String name) { getNextStateFlag("STATE_HANDLER_INVALIDATED"); private static final int STATE_GESTURE_STARTED = getNextStateFlag("STATE_GESTURE_STARTED"); - private static final int STATE_GESTURE_CANCELLED = + protected static final int STATE_GESTURE_CANCELLED = getNextStateFlag("STATE_GESTURE_CANCELLED"); private static final int STATE_GESTURE_COMPLETED = getNextStateFlag("STATE_GESTURE_COMPLETED"); @@ -260,8 +289,8 @@ private static int getNextStateFlag(String name) { getNextStateFlag("STATE_CURRENT_TASK_FINISHED"); private static final int STATE_FINISH_WITH_NO_END = getNextStateFlag("STATE_FINISH_WITH_NO_END"); - private static final int STATE_SETTLED_ON_ALL_APPS = - getNextStateFlag("STATE_SETTLED_ON_ALL_APPS"); + private static final int STATE_REJECT_HOME = + getNextStateFlag("STATE_REJECT_HOME"); private static final int LAUNCHER_UI_STATES = STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_LAUNCHER_STARTED | @@ -290,8 +319,10 @@ private static int getNextStateFlag(String name) { */ private static final int LOG_NO_OP_PAGE_INDEX = -1; - protected final TaskAnimationManager mTaskAnimationManager; + private static final int REJECT_HOME_ANIM_DURATION_MS = 200; + private static final float REJECT_HOME_ANIM_MINIMUM_SHIFT = 0.1f; + protected TaskAnimationManager mTaskAnimationManager; // Either RectFSpringAnim (if animating home) or ObjectAnimator (from mCurrentShift) otherwise private RunningWindowAnim[] mRunningWindowAnim; // Possible second animation running at the same time as mRunningWindowAnim @@ -315,7 +346,6 @@ private static int getNextStateFlag(String name) { private boolean mGestureStarted; private boolean mLogDirectionUpOrLeft = true; private boolean mIsLikelyToStartNewTask; - private boolean mIsInAllAppsRegion; private final long mTouchTimeMs; private long mLauncherFrameDrawnTime; @@ -332,6 +362,8 @@ private static int getNextStateFlag(String name) { private final SwipePipToHomeAnimator[] mSwipePipToHomeAnimators = new SwipePipToHomeAnimator[2]; + private final Runnable mLauncherOnDestroyCallback; + // Interpolate RecentsView scale from start of quick switch scroll until this scroll threshold private final float mQuickSwitchScaleScrollThreshold; @@ -346,18 +378,39 @@ private static int getNextStateFlag(String name) { // Indicates whether the divider is shown, only used when split screen is activated. private boolean mIsDividerShown = true; private boolean mStartMovingTasks; + // Whether the animation to home should be handed off to another handler once the gesture is + // committed. + protected boolean mHandOffAnimationToHome = false; @Nullable private RemoteAnimationTargets.ReleaseCheck mSwipePipToHomeReleaseCheck = null; - public AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceState, - TaskAnimationManager taskAnimationManager, GestureState gestureState, - long touchTimeMs, boolean continuingLastGesture, - InputConsumerController inputConsumer) { - super(context, deviceState, gestureState); + private final MSDLPlayerWrapper mMSDLPlayerWrapper; + + private final RotationTouchHelper mRotationTouchHelper; + + public AbsSwipeUpHandler(Context context, + TaskAnimationManager taskAnimationManager, RecentsAnimationDeviceState deviceState, + RotationTouchHelper rotationTouchHelper, GestureState gestureState, + long touchTimeMs, boolean continuingLastGesture, + InputConsumerController inputConsumer, + MSDLPlayerWrapper msdlPlayerWrapper) { + super(context, gestureState, rotationTouchHelper); mContainerInterface = gestureState.getContainerInterface(); - mActivityInitListener = + mContextInitListener = mContainerInterface.createActivityInitListener(this::onActivityInit); + mLauncherOnDestroyCallback = () -> { + ActiveGestureProtoLogProxy.logLauncherDestroyed(); + if (mRecentsView != null) { + mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener); + mRecentsView = null; + } + mContainer = null; + mStateCallback.clearState(STATE_LAUNCHER_PRESENT); + mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED); + mRecentsAnimationStartCallbacks.clear(); + mTaskAnimationManager.onLauncherDestroyed(); + }; mInputConsumerProxy = new InputConsumerProxy(context, /* rotationSupplier = */ () -> { if (mRecentsView == null) { @@ -369,8 +422,10 @@ public AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceStat endLauncherTransitionController(); }, new InputProxyHandlerFactory(mContainerInterface, mGestureState)); mTaskAnimationManager = taskAnimationManager; + mDeviceState = deviceState; mTouchTimeMs = touchTimeMs; mContinuingLastGesture = continuingLastGesture; + mRotationTouchHelper = rotationTouchHelper; Resources res = context.getResources(); mQuickSwitchScaleScrollThreshold = res @@ -379,15 +434,16 @@ public AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceStat mSplashMainWindowShiftLength = -res .getDimensionPixelSize(R.dimen.starting_surface_exit_animation_window_shift_length); + mMSDLPlayerWrapper = msdlPlayerWrapper; + initTransitionEndpoints(mRemoteTargetHandles[0].getTaskViewSimulator() - .getOrientationState().getLauncherDeviceProfile()); + .getOrientationState().getLauncherDeviceProfile(gestureState.getDisplayId())); initStateCallbacks(); - mIsTransientTaskbar = mDp.isTaskbarPresent - && DisplayController.isTransientTaskbar(context); - TaskbarUIController controller = mContainerInterface.getTaskbarController(); - mTaskbarAlreadyOpen = controller != null && !controller.isTaskbarStashed(); - mIsTaskbarAllAppsOpen = controller != null && controller.isTaskbarAllAppsOpen(); + mIsTransientTaskbar = mDp.isTaskbarPresent && TaskbarFeatureEvaluator.INSTANCE.get( + context).isTransient(); + mTaskbarAlreadyOpen = !isTaskbarStashed(context); + mIsTaskbarAllAppsOpen = isTaskbarAllAppsOpen(context); mTaskbarAppWindowThreshold = TaskbarThresholdUtils.getAppWindowThreshold(res, mDp); boolean swipeWillNotShowTaskbar = mTaskbarAlreadyOpen || mGestureState.isTrackpadGesture(); @@ -397,6 +453,53 @@ public AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceStat mTaskbarCatchUpThreshold = TaskbarThresholdUtils.getCatchUpThreshold(res, mDp); } + private boolean isTaskbarStashed(Context context) { + if (refactorTaskbarUiState()) { + final boolean ret = newIsTaskbarStashed(context); + if (BuildConfigs.IS_STUDIO_BUILD && ret != legacyIsTaskbarStashed()) { + throw new IllegalStateException("isTaskbarStashed() doesn't match"); + } + return ret; + } else { + return legacyIsTaskbarStashed(); + } + } + + private boolean newIsTaskbarStashed(Context context) { + TaskbarUiState taskbarUiState = TaskbarUiStateMonitor.INSTANCE.get(context) + .getTaskbarUiState(context.getDisplayId()); + return taskbarUiState.isTaskbarStashedRef().getValue(); + } + + private boolean legacyIsTaskbarStashed() { + TaskbarInteractor controller = mContainerInterface.getTaskbarInteractor(); + return controller != null && controller.isTaskbarStashed(); + } + + + private boolean isTaskbarAllAppsOpen(Context context) { + if (refactorTaskbarUiState()) { + final boolean ret = newIsTaskbarAllAppsOpen(context); + if (BuildConfigs.IS_STUDIO_BUILD && ret != legacyIsTaskbarAllAppsOpen()) { + throw new IllegalStateException("isTaskbarAllAppsOpen() doesn't match"); + } + return ret; + } else { + return legacyIsTaskbarAllAppsOpen(); + } + } + + private boolean newIsTaskbarAllAppsOpen(Context context) { + TaskbarUiState taskbarUiState = TaskbarUiStateMonitor.INSTANCE.get(context) + .getTaskbarUiState(context.getDisplayId()); + return taskbarUiState.isTaskbarAllAppsOpenRef().getValue(); + } + + private boolean legacyIsTaskbarAllAppsOpen() { + TaskbarInteractor interactor = mContainerInterface.getTaskbarInteractor(); + return interactor != null && interactor.isTaskbarAllAppsOpen(); + } + @Nullable private static ActiveGestureErrorDetector.GestureEvent getTrackedEventForState(int stateFlag) { if (stateFlag == STATE_GESTURE_STARTED) { @@ -436,6 +539,8 @@ private void initStateCallbacks() { mStateCallback.runOnceAtState(STATE_RESUME_LAST_TASK | STATE_APP_CONTROLLER_RECEIVED, this::resumeLastTask); + mStateCallback.runOnceAtState(STATE_REJECT_HOME | STATE_APP_CONTROLLER_RECEIVED, + this::finishRejectHome); mStateCallback.runOnceAtState(STATE_START_NEW_TASK | STATE_SCREENSHOT_CAPTURED, this::startNewTask); @@ -450,11 +555,9 @@ private void initStateCallbacks() { mStateCallback.runOnceAtState(STATE_SCREENSHOT_CAPTURED | STATE_GESTURE_COMPLETED | STATE_SCALED_CONTROLLER_HOME, this::finishCurrentTransitionToHome); - mStateCallback.runOnceAtState(STATE_SCALED_CONTROLLER_HOME | STATE_CURRENT_TASK_FINISHED, + mStateCallback.runOnceAtState(STATE_SCALED_CONTROLLER_HOME | STATE_CURRENT_TASK_FINISHED + | STATE_PARALLEL_ANIM_FINISHED, this::reset); - mStateCallback.runOnceAtState(STATE_SETTLED_ON_ALL_APPS | STATE_SCREENSHOT_CAPTURED - | STATE_GESTURE_COMPLETED, - this::finishCurrentTransitionToAllApps); mStateCallback.runOnceAtState(STATE_LAUNCHER_PRESENT | STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_DRAWN | STATE_SCALED_CONTROLLER_RECENTS @@ -467,26 +570,30 @@ private void initStateCallbacks() { mGestureState.runOnceAtState(STATE_END_TARGET_ANIMATION_FINISHED | STATE_RECENTS_SCROLLING_FINISHED, this::onSettledOnEndTarget); + mGestureState.runOnceAtState(STATE_END_TARGET_SET | STATE_RECENTS_ANIMATION_STARTED, + this::onCalculateEndTarget); mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED, this::invalidateHandler); mStateCallback.runOnceAtState(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED, this::invalidateHandlerWithLauncher); mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_RESUME_LAST_TASK, this::resetStateForAnimationCancel); + mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_REJECT_HOME, + this::resetStateForAnimationCancel); mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_FINISH_WITH_NO_END, this::resetStateForAnimationCancel); } - protected boolean onActivityInit(Boolean alreadyOnHome) { + protected boolean onActivityInit(Boolean isHomeStarted) { if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) { return false; } - T createdContainer = (T) mContainerInterface.getCreatedContainer(); + RECENTS_CONTAINER createdContainer = mContainerInterface.getCreatedContainer(); if (createdContainer != null) { initTransitionEndpoints(createdContainer.getDeviceProfile()); } - final T container = (T) mContainerInterface.getCreatedContainer(); + final RECENTS_CONTAINER container = mContainerInterface.getCreatedContainer(); if (mContainer == container) { return true; } @@ -505,11 +612,11 @@ protected boolean onActivityInit(Boolean alreadyOnHome) { initStateCallbacks(); mStateCallback.setState(oldState); } - mWasLauncherAlreadyVisible = alreadyOnHome; + mWasLauncherAlreadyVisible = isHomeStarted; mContainer = container; // Override the visibility of the activity until the gesture actually starts and we swipe // up, or until we transition home and the home animation is composed - if (alreadyOnHome) { + if (isHomeStarted) { mContainer.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS); } else { mContainer.addForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS); @@ -519,7 +626,7 @@ protected boolean onActivityInit(Boolean alreadyOnHome) { mRecentsView.setOnPageTransitionEndCallback(null); mStateCallback.setState(STATE_LAUNCHER_PRESENT); - if (alreadyOnHome) { + if (isHomeStarted) { onLauncherStart(); } else { container.addEventCallback(EVENT_STARTED, mLauncherOnStartCallback); @@ -535,13 +642,15 @@ protected boolean onActivityInit(Boolean alreadyOnHome) { if (snapshots != null) { mRecentsView.switchToScreenshot(snapshots, () -> { if (mRecentsAnimationController != null) { - mRecentsAnimationController.cleanupScreenshot(); - } else if (mDeferredCleanupRecentsAnimationController != null) { - mDeferredCleanupRecentsAnimationController.cleanupScreenshot(); - mDeferredCleanupRecentsAnimationController = null; + mRecentsAnimationController.finish( + /* toHome= */ true, + /* onFinishComplete= */ () -> {}, + new ActiveGestureLog.CompoundString( + "AbsSwipeUpHandler.onActivityInit: switch to screenshot on " + + "recents animation canceled")); } + mRecentsView.onRecentsAnimationComplete(); }); - mRecentsView.onRecentsAnimationComplete(); } }); @@ -560,8 +669,8 @@ protected boolean moveWindowWithRecentsScroll() { } private void onLauncherStart() { - final T container = (T) mContainerInterface.getCreatedContainer(); - if (container == null || mContainer != container) { + final RECENTS_CONTAINER container = mContainerInterface.getCreatedContainer(); + if (container == null || mContainer != container || mRecentsView == null) { return; } if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) { @@ -573,11 +682,17 @@ private void onLauncherStart() { runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() .setOrientationState(mRecentsView.getPagedViewOrientedState())); - // If we've already ended the gesture and are going home, don't prepare recents UI, - // as that will set the state as BACKGROUND_APP, overriding the animation to NORMAL. - if (mGestureState.getEndTarget() != HOME) { + boolean shouldPrepareRecents = true; + GestureState.GestureEndTarget endTarget = mGestureState.getEndTarget(); + if (endTarget != null) { + shouldPrepareRecents = switch (mGestureState.getEndTarget()) { + case HOME, REJECT_HOME -> false; + case ALL_APPS, RECENTS, NEW_TASK, LAST_TASK -> true; + }; + } + if (shouldPrepareRecents) { Runnable initAnimFactory = () -> { - mAnimationFactory = mContainerInterface.prepareRecentsUI(mDeviceState, + mAnimationFactory = mContainerInterface.prepareRecentsUI( mWasLauncherAlreadyVisible, this::onAnimatorPlaybackControllerCreated); maybeUpdateRecentsAttachedState(false /* animate */); if (mGestureState.getEndTarget() != null) { @@ -644,20 +759,19 @@ private void onLauncherPresentAndGestureStarted() { mOnDeferredActivityLaunch); mGestureState.runOnceAtState(STATE_END_TARGET_SET, - () -> { - mDeviceState.getRotationTouchHelper() - .onEndTargetCalculated(mGestureState.getEndTarget(), - mContainerInterface); - }); + () -> mRotationTouchHelper.onEndTargetCalculated(mGestureState.getEndTarget(), + mContainerInterface)); notifyGestureStarted(); } private void onDeferredActivityLaunch() { mContainerInterface.switchRunningTaskViewToScreenshot( - null, () -> { - mTaskAnimationManager.finishRunningRecentsAnimation(true /* toHome */); - }); + null, () -> mTaskAnimationManager.finishRunningRecentsAnimation( + /* toHome= */ true, + /* reason= */ new ActiveGestureLog.CompoundString( + "AbsSwipeUpHandler.onDeferredActivityLaunch: " + + "switching running task view to screenshot"))); } private void setupRecentsViewUi() { @@ -669,26 +783,27 @@ private void setupRecentsViewUi() { } protected void notifyGestureAnimationStartToRecents() { - Task[] runningTasks; - TopTaskTracker.CachedTaskInfo cachedTaskInfo = mGestureState.getRunningTask(); - if (mIsSwipeForSplit) { - int[] splitTaskIds = TopTaskTracker.INSTANCE.get(mContext).getRunningSplitTaskIds(); - runningTasks = cachedTaskInfo.getPlaceholderTasks(splitTaskIds); - } else { - runningTasks = cachedTaskInfo.getPlaceholderTasks(); - } + int[] splitTaskIds = mIsSwipeForSplit + ? TopTaskTracker.INSTANCE.get(mContext).getRunningSplitTaskIds() + : null; + GroupedTaskInfo groupedTaskInfo = + mGestureState.getRunningTask().getPlaceholderGroupedTaskInfo(splitTaskIds); // Safeguard against any null tasks being sent to recents view, happens when quickswitching // very quickly w/ split tasks because TopTaskTracker provides stale information compared to // actual running tasks in the recents animation. // TODO(b/236226779), Proper fix (ag/22237143) - if (Arrays.stream(runningTasks).anyMatch(Objects::isNull)) { + if (groupedTaskInfo == null) { return; } if (mRecentsView == null) { return; } - mRecentsView.onGestureAnimationStart(runningTasks, mDeviceState.getRotationTouchHelper()); + mRecentsView.onGestureAnimationStart(groupedTaskInfo); + TaskView currentPageTaskView = mRecentsView.getCurrentPageTaskView(); + if (currentPageTaskView != null) { + mPreviousTaskViewType = currentPageTaskView.getType(); + } } private void launcherFrameDrawn() { @@ -715,11 +830,9 @@ public MotionPauseDetector.OnMotionPauseListener getMotionPauseListener() { public void onMotionPauseDetected() { mHasMotionEverBeenPaused = true; maybeUpdateRecentsAttachedState(true/* animate */, true/* moveRunningTask */); - Optional.ofNullable(mContainerInterface.getTaskbarController()) - .ifPresent(TaskbarUIController::startTranslationSpring); - if (!mIsInAllAppsRegion) { - performHapticFeedback(); - } + Optional.ofNullable(mContainerInterface.getTaskbarInteractor()) + .ifPresent(TaskbarInteractor::startTranslationSpring); + performHapticFeedback(); } @Override @@ -730,27 +843,43 @@ public void onMotionPauseChanged(boolean isPaused) { } private void maybeUpdateRecentsAttachedState() { - maybeUpdateRecentsAttachedState(true /* animate */); + maybeUpdateRecentsAttachedState(/* animate= */ true); } protected void maybeUpdateRecentsAttachedState(boolean animate) { - maybeUpdateRecentsAttachedState(animate, false /* moveRunningTask */); + maybeUpdateRecentsAttachedState(animate, /* moveRunningTask= */ false); + } + + protected void maybeUpdateRecentsAttachedState(boolean animate, boolean moveRunningTask) { + maybeUpdateRecentsAttachedState( + animate, + moveRunningTask, + mRecentsView != null && mRecentsView.shouldUpdateRunningTaskAlpha()); } /** * Determines whether to show or hide RecentsView. The window is always * synchronized with its corresponding TaskView in RecentsView, so if * RecentsView is shown, it will appear to be attached to the window. + * For 3 button mode navigation, update alpha of the running task to show desktop task + * background. * - * Note this method has no effect unless the navigation mode is NO_BUTTON. - * @param animate whether to animate when attaching RecentsView - * @param moveRunningTask whether to move running task to front when attaching + * @param animate whether to animate when attaching RecentsView + * @param moveRunningTask whether to move running task to front when attaching + * @param updateRunningTaskAlpha Whether to update the running task's attached alpha */ - private void maybeUpdateRecentsAttachedState(boolean animate, boolean moveRunningTask) { - if ((!mDeviceState.isFullyGesturalNavMode() && !mGestureState.isTrackpadGesture()) - || mRecentsView == null) { + private void maybeUpdateRecentsAttachedState( + boolean animate, boolean moveRunningTask, boolean updateRunningTaskAlpha) { + if (mRecentsView == null) { return; } + + boolean isGestureMode = + mDeviceState.isFullyGesturalNavMode() || mGestureState.isTrackpadGesture(); + if (!isGestureMode && !updateRunningTaskAlpha) { + return; + } + // looking at single target is fine here since either app of a split pair would // have their "isInRecents" field set? (that's what this is used for below) RemoteAnimationTarget runningTaskTarget = mRecentsAnimationTargets != null @@ -758,9 +887,7 @@ private void maybeUpdateRecentsAttachedState(boolean animate, boolean moveRunnin .findTask(mGestureState.getTopRunningTaskId()) : null; final boolean recentsAttachedToAppWindow; - if (mIsInAllAppsRegion) { - recentsAttachedToAppWindow = false; - } else if (mGestureState.getEndTarget() != null) { + if (mGestureState.getEndTarget() != null) { recentsAttachedToAppWindow = mGestureState.getEndTarget().recentsAttachedToAppWindow; } else if (mContinuingLastGesture && mRecentsView.getRunningTaskIndex() != mRecentsView.getNextPage()) { @@ -771,13 +898,24 @@ private void maybeUpdateRecentsAttachedState(boolean animate, boolean moveRunnin } else { recentsAttachedToAppWindow = mHasMotionEverBeenPaused || mIsLikelyToStartNewTask; } + + if (!isGestureMode) { + mAnimationFactory.setRecentsAttachedToAppWindow( + /* attached= */ recentsAttachedToAppWindow, + /* animate= */ false, + /*updateRunningTaskAlpha= */ true); + return; + } + if (moveRunningTask && !mAnimationFactory.hasRecentsEverAttachedToAppWindow() && recentsAttachedToAppWindow) { // Only move running task if RecentsView has never been attached before, to avoid // TaskView jumping to new position as we move the tasks. - mRecentsView.moveRunningTaskToFront(); + mRecentsView.moveRunningTaskToExpectedPosition(); } - mAnimationFactory.setRecentsAttachedToAppWindow(recentsAttachedToAppWindow, animate); + + mAnimationFactory.setRecentsAttachedToAppWindow( + recentsAttachedToAppWindow, animate, updateRunningTaskAlpha); // Reapply window transform throughout the attach animation, as the animation affects how // much the window is bound by overscroll (vs moving freely). @@ -816,37 +954,12 @@ private void setIsLikelyToStartNewTask(boolean isLikelyToStartNewTask, boolean a } } - /** - * Update whether user is currently dragging in a region that will trigger all apps. - */ - private void setIsInAllAppsRegion(boolean isInAllAppsRegion) { - if (mIsInAllAppsRegion == isInAllAppsRegion - || !mContainerInterface.allowAllAppsFromOverview()) { - return; - } - mIsInAllAppsRegion = isInAllAppsRegion; - - // Newly entering or exiting the zone - do haptic and animate recent tasks. - VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC); - maybeUpdateRecentsAttachedState(true); - - if (mContainer != null) { - mContainer.getAppsView().getSearchUiManager() - .prepareToFocusEditText(mIsInAllAppsRegion); - } - - // Draw active task below Launcher so that All Apps can appear over it. - runActionOnRemoteHandles(remoteTargetHandle -> - remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(isInAllAppsRegion)); - } - - private void buildAnimationController() { if (!canCreateNewOrUpdateExistingLauncherTransitionController()) { return; } initTransitionEndpoints(mContainer.getDeviceProfile()); - mAnimationFactory.createActivityInterface(mTransitionDragLength); + mAnimationFactory.createContainerInterface(mTransitionDragLength); } /** @@ -890,18 +1003,22 @@ private void onAnimatorPlaybackControllerCreated(AnimatorControllerWithResistanc } } - public Intent getLaunchIntent() { - return mGestureState.getOverviewIntent(); + public Intent getHomeIntent() { + return mGestureState.getHomeIntent(); } + public Intent getLaunchIntent() { + // todo differentiate intent based on if we are on home or in app for overview in window + boolean useHomeIntentForWindow = + mContainerInterface.getCreatedContainer() instanceof RecentsWindowManager; + return useHomeIntentForWindow ? getHomeIntent() : mGestureState.getOverviewIntent(); + } /** * Called when the value of {@link #mCurrentShift} changes */ @UiThread @Override public void onCurrentShiftUpdated() { - float threshold = DeviceConfigWrapper.get().getAllAppsOverviewThreshold() / 100f; - setIsInAllAppsRegion(mCurrentShift.value >= threshold); updateSysUiFlags(mCurrentShift.value); applyScrollAndTransform(); @@ -928,17 +1045,17 @@ private void updateSysUiFlags(float windowProgress) { TaskView runningTask = mRecentsView.getRunningTaskView(); TaskView centermostTask = mRecentsView.getTaskViewNearestToCenterOfScreen(); int centermostTaskFlags = centermostTask == null ? 0 - : centermostTask.getFirstThumbnailViewDeprecated().getSysUiStatusNavFlags(); + : centermostTask.getSysUiStatusNavFlags(); boolean swipeUpThresholdPassed = windowProgress > 1 - UPDATE_SYSUI_FLAGS_THRESHOLD; boolean quickswitchThresholdPassed = centermostTask != runningTask; // We will handle the sysui flags based on the centermost task view. mRecentsAnimationController.setUseLauncherSystemBarFlags(swipeUpThresholdPassed || (quickswitchThresholdPassed && centermostTaskFlags != 0)); - mRecentsAnimationController.setSplitScreenMinimized(mContext, swipeUpThresholdPassed); // Provide a hint to WM the direction that we will be settling in case the animation // needs to be canceled - mRecentsAnimationController.setWillFinishToHome(swipeUpThresholdPassed); + mRecentsAnimationController.setWillFinishToHome( + swipeUpThresholdPassed && getHomeTarget() == HOME); if (mContainer == null) return; if (swipeUpThresholdPassed) { @@ -952,10 +1069,24 @@ private void updateSysUiFlags(float windowProgress) { @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { - super.onRecentsAnimationStart(controller, targets); - if (targets.hasDesktopTasks()) { - mRemoteTargetHandles = mTargetGluer.assignTargetsForDesktop(targets); + RecentsAnimationTargets targets, @Nullable TransitionInfo transitionInfo) { + super.onRecentsAnimationStart(controller, targets, transitionInfo); + boolean forDesktop; + if (DesktopModeStatus.enableMultipleDesktops(mContext)) { + GroupedTaskInfo groupedTaskInfo; + if (mGestureState.getRunningTask() != null + && (groupedTaskInfo = + mGestureState.getRunningTask().getPlaceholderGroupedTaskInfo( + /* splitTaskIds = */ null)) != null) { + forDesktop = groupedTaskInfo.isBaseType(GroupedTaskInfo.TYPE_DESK); + } else { + forDesktop = false; + } + } else { + forDesktop = targets.hasDesktopTasks(mContext); + } + if (forDesktop) { + mRemoteTargetHandles = mTargetGluer.assignTargetsForDesktop(targets, transitionInfo); } else { int untrimmedAppCount = mRemoteTargetHandles.length; mRemoteTargetHandles = mTargetGluer.assignTargetsForSplitScreen(targets); @@ -969,30 +1100,21 @@ public void onRecentsAnimationStart(RecentsAnimationController controller, mSwipePipToHomeReleaseCheck = new RemoteAnimationTargets.ReleaseCheck(); mSwipePipToHomeReleaseCheck.setCanRelease(true); mRecentsAnimationTargets.addReleaseCheck(mSwipePipToHomeReleaseCheck); + mHandOffAnimationToHome = + targets.extras.getBoolean(KEY_EXTRA_SHELL_CAN_HAND_OFF_ANIMATION, false); // Only initialize the device profile, if it has not been initialized before, as in some // configurations targets.homeContentInsets may not be correct. if (mContainer == null) { - RemoteAnimationTarget primaryTaskTarget = targets.apps[0]; // orientation state is independent of which remote target handle we use since both // should be pointing to the same one. Just choose index 0 for now since that works for // both split and non-split RecentsOrientedState orientationState = mRemoteTargetHandles[0].getTaskViewSimulator() .getOrientationState(); - DeviceProfile dp = orientationState.getLauncherDeviceProfile(); - if (targets.minimizedHomeBounds != null && primaryTaskTarget != null) { - Rect overviewStackBounds = mContainerInterface - .getOverviewWindowBounds(targets.minimizedHomeBounds, primaryTaskTarget); - dp = dp.getMultiWindowProfile(mContext, - new WindowBounds(overviewStackBounds, targets.homeContentInsets)); - } else { - // If we are not in multi-window mode, home insets should be same as system insets. - dp = dp.copy(mContext); - } + DeviceProfile dp = orientationState.getLauncherDeviceProfile( + mGestureState.getDisplayId()).copy(); dp.updateInsets(targets.homeContentInsets); - dp.updateIsSeascape(mContext); initTransitionEndpoints(dp); - orientationState.setMultiWindowMode(dp.isMultiWindowMode); } // Notify when the animation starts @@ -1006,13 +1128,8 @@ public void onRecentsAnimationStart(RecentsAnimationController controller, @Override public void onRecentsAnimationCanceled(HashMap thumbnailDatas) { - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "cancelRecentsAnimation", - /* gestureEvent= */ CANCEL_RECENTS_ANIMATION); - mActivityInitListener.unregister("AbsSwipeUpHandler.onRecentsAnimationCanceled"); - // Cache the recents animation controller so we can defer its cleanup to after having - // properly cleaned up the screenshot without accidentally using it. - mDeferredCleanupRecentsAnimationController = mRecentsAnimationController; + ActiveGestureProtoLogProxy.logAbsSwipeUpHandlerOnRecentsAnimationCanceled(); + mContextInitListener.unregister("AbsSwipeUpHandler.onRecentsAnimationCanceled"); mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED); // Defer clearing the controller and the targets until after we've updated the state mRecentsAnimationController = null; @@ -1020,6 +1137,9 @@ public void onRecentsAnimationCanceled(HashMap thumbnail if (mRecentsView != null) { mRecentsView.setRecentsAnimationTargets(null, null); } + if (!mGestureState.useSyntheticRecentsTransition()) { + maybeHandleUnfinishedTaskLaunch("onRecentsAnimationCanceled"); + } } @UiThread @@ -1039,12 +1159,10 @@ public void onDraw() { } mHandled = true; - InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_QUICK_SWITCH, - 2000 /* ms timeout */); - InteractionJankMonitorWrapper.begin(mRecentsView, - Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); - InteractionJankMonitorWrapper.begin(mRecentsView, - Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS); + InteractionJankMonitorWrapper.begin( + rv, Cuj.CUJ_LAUNCHER_QUICK_SWITCH, /* timeoutMs= */ 2000); + InteractionJankMonitorWrapper.begin(rv, Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); + InteractionJankMonitorWrapper.begin(rv, Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS); rv.post(() -> rv.getViewTreeObserver().removeOnDrawListener(this)); } @@ -1084,7 +1202,7 @@ private void setClampScrollOffset(boolean clampScrollOffset) { */ @UiThread private void notifyGestureStarted() { - final T curActivity = mContainer; + final RECENTS_CONTAINER curActivity = mContainer; if (curActivity != null) { // Once the gesture starts, we can no longer transition home through the button, so // reset the force override of the activity visibility @@ -1099,7 +1217,12 @@ private void notifyGestureStarted() { public void onGestureCancelled() { updateDisplacement(0); mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED); - handleNormalGestureEnd(0, false, new PointF(), true /* isCancel */); + handleNormalGestureEnd( + /* endVelocityPxPerMs= */ 0, + /* isFling= */ false, + /* velocityPxPerMs= */ new PointF(), + /* isCancel= */ true, + /* horizontalTouchSlopPassed= */ false); } /** @@ -1108,7 +1231,8 @@ public void onGestureCancelled() { * @param velocityPxPerMs The x and y components of the velocity when the gesture ends. */ @UiThread - public void onGestureEnded(float endVelocityPxPerMs, PointF velocityPxPerMs) { + public void onGestureEnded( + float endVelocityPxPerMs, PointF velocityPxPerMs, boolean horizontalTouchSlopPassed) { float flingThreshold = mContext.getResources() .getDimension(R.dimen.quickstep_fling_threshold_speed); boolean isFling = mGestureStarted && !mIsMotionPaused @@ -1121,7 +1245,11 @@ public void onGestureEnded(float endVelocityPxPerMs, PointF velocityPxPerMs) { mLogDirectionUpOrLeft = velocityPxPerMs.x < 0; } Runnable handleNormalGestureEndCallback = () -> handleNormalGestureEnd( - endVelocityPxPerMs, isFling, velocityPxPerMs, /* isCancel= */ false); + endVelocityPxPerMs, + isFling, + velocityPxPerMs, + /* isCancel= */ false, + horizontalTouchSlopPassed); if (mRecentsView != null) { mRecentsView.runOnPageScrollsInitialized(handleNormalGestureEndCallback); } else { @@ -1152,27 +1280,49 @@ private void endRunningWindowAnim(boolean cancel) { } } - private void onSettledOnEndTarget() { + /** + * Called if the end target has been set and the recents animation is started. + */ + @VisibleForTesting + protected void onCalculateEndTarget() { + final GestureEndTarget endTarget = mGestureState.getEndTarget(); + + switch (endTarget) { + case HOME: + // Early detach the nav bar if endTarget is determined as HOME + if (mRecentsAnimationController != null) { + mRecentsAnimationController.detachNavigationBarFromApp(true); + } + break; + } + } + + @VisibleForTesting + protected void onSettledOnEndTarget() { // Fast-finish the attaching animation if it's still running. maybeUpdateRecentsAttachedState(false); final GestureEndTarget endTarget = mGestureState.getEndTarget(); - // Wait until the given View (if supplied) draws before resuming the last task. - View postResumeLastTask = mContainerInterface.onSettledOnEndTarget(endTarget); + // TODO(b/378443899): Add a CUJ for REJECT_HOME if (endTarget != NEW_TASK) { InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_QUICK_SWITCH); + } else { + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_QUICK_SWITCH); } if (endTarget != HOME) { InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); + } else { + AccessibilityManagerCompat.sendStateEventToTest(mContext, NORMAL_STATE_ORDINAL); + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); } if (endTarget != RECENTS) { InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS); + } else { + AccessibilityManagerCompat.sendStateEventToTest(mContext, OVERVIEW_STATE_ORDINAL); + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS); } switch (endTarget) { - case ALL_APPS: - mStateCallback.setState(STATE_SETTLED_ON_ALL_APPS | STATE_CAPTURE_SCREENSHOT); - break; case HOME: mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME | STATE_CAPTURE_SCREENSHOT); // Notify the SysUI to use fade-in animation when entering PiP @@ -1186,38 +1336,23 @@ private void onSettledOnEndTarget() { mStateCallback.setState(STATE_START_NEW_TASK | STATE_CAPTURE_SCREENSHOT); break; case LAST_TASK: - if (postResumeLastTask != null) { - ViewUtils.postFrameDrawn(postResumeLastTask, - () -> mStateCallback.setState(STATE_RESUME_LAST_TASK)); - } else { + // Wait until the given View (if supplied) draws before resuming the last task. + if (!mContainerInterface.onSettledOnEndTarget( + () -> mStateCallback.setState(STATE_RESUME_LAST_TASK), MAIN_EXECUTOR)) { mStateCallback.setState(STATE_RESUME_LAST_TASK); } // Restore the divider as it resumes the last top-tasks. setDividerShown(true); break; + case REJECT_HOME: + mStateCallback.setState(STATE_REJECT_HOME); + break; } - if (mContainerInterface.getTaskbarController() != null) { + if (mContainerInterface.getTaskbarInteractor() != null) { // Resets this value as the gesture is now complete. - mContainerInterface.getTaskbarController().setUserIsGoingHome(false); + mContainerInterface.getTaskbarInteractor().setUserIsNotGoingHome(false); } - ActiveGestureLog.INSTANCE.addLog( - new ActiveGestureLog.CompoundString("onSettledOnEndTarget ") - .append(endTarget.name()), - /* gestureEvent= */ ON_SETTLED_ON_END_TARGET); - } - - /** @return Whether this was the task we were waiting to appear, and thus handled it. */ - protected boolean handleTaskAppeared(RemoteAnimationTarget[] appearedTaskTarget) { - if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) { - return false; - } - boolean hasStartedTaskBefore = Arrays.stream(appearedTaskTarget).anyMatch( - mGestureState.mLastStartedTaskIdPredicate); - if (mStateCallback.hasStates(STATE_START_NEW_TASK) && hasStartedTaskBefore) { - reset(); - return true; - } - return false; + ActiveGestureProtoLogProxy.logOnSettledOnEndTarget(endTarget.name()); } private float dpiFromPx(float pixels) { @@ -1225,36 +1360,50 @@ private float dpiFromPx(float pixels) { } private GestureEndTarget calculateEndTarget( - PointF velocityPxPerMs, float endVelocityPxPerMs, boolean isFlingY, boolean isCancel) { - - ActiveGestureErrorDetector.GestureEvent gestureEvent = - velocityPxPerMs.x == 0 && velocityPxPerMs.y == 0 - ? INVALID_VELOCITY_ON_SWIPE_UP - : null; - ActiveGestureLog.INSTANCE.addLog( - new ActiveGestureLog.CompoundString("calculateEndTarget: velocities=(x=") - .append(dpiFromPx(velocityPxPerMs.x)) - .append("dp/ms, y=") - .append(dpiFromPx(velocityPxPerMs.y)) - .append("dp/ms), angle=") - .append(Math.toDegrees(Math.atan2( - -velocityPxPerMs.y, velocityPxPerMs.x))), gestureEvent); + PointF velocityPxPerMs, + float endVelocityPxPerMs, + boolean isFlingY, + boolean isCancel, + boolean horizontalTouchSlopPassed) { + ActiveGestureProtoLogProxy.logOnCalculateEndTarget( + dpiFromPx(velocityPxPerMs.x), + dpiFromPx(velocityPxPerMs.y), + Math.toDegrees(Math.atan2(-velocityPxPerMs.y, velocityPxPerMs.x))); + ActiveGestureLog.CompoundString reasonString = + ActiveGestureLog.CompoundString.newEmptyString(); if (mGestureState.isHandlingAtomicEvent()) { - // Button mode, this is only used to go to recents. - return RECENTS; + GestureEndTarget endTarget = mGestureState.getAtomicEndTarget(); + ActiveGestureProtoLogProxy.logCalculateEndTargetResultAndReason( + endTarget.toString(), + new ActiveGestureLog.CompoundString( + "mGestureState.isHandlingAtomicEvent = true")); + return endTarget; } GestureEndTarget endTarget; + ActiveGestureLog.CompoundString potentialReason = + ActiveGestureLog.CompoundString.newEmptyString(); if (isCancel) { + potentialReason.append("isCancel = true"); endTarget = LAST_TASK; } else if (isFlingY) { - endTarget = calculateEndTargetForFlingY(velocityPxPerMs, endVelocityPxPerMs); + potentialReason.append("isFlingY = true -> used calculateEndTargetForFlingY -> "); + endTarget = calculateEndTargetForFlingY( + velocityPxPerMs, endVelocityPxPerMs, potentialReason); } else { - endTarget = calculateEndTargetForNonFling(velocityPxPerMs); + potentialReason.append("isFlingY = false -> used calculateEndTargetForNonFling -> "); + endTarget = calculateEndTargetForNonFling( + velocityPxPerMs, horizontalTouchSlopPassed, potentialReason); } if (mDeviceState.isOverviewDisabled() && endTarget == RECENTS) { + reasonString.append("mDeviceState.isOverviewDisabled = true and " + + "endTarget = RECENTS [") + .append(potentialReason) + .append("]"); + ActiveGestureProtoLogProxy.logCalculateEndTargetResultAndReason( + "LAST_TASK", reasonString); return LAST_TASK; } @@ -1263,44 +1412,111 @@ private GestureEndTarget calculateEndTarget( TaskView currentPageTaskView = mRecentsView != null ? mRecentsView.getCurrentPageTaskView() : null; - if (Flags.enableDesktopWindowingMode() - && !(Flags.enableDesktopWindowingWallpaperActivity() - && Flags.enableDesktopWindowingQuickSwitch())) { + if (DesktopModeStatus.canEnterDesktopMode(mContext) + && !(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY.isTrue() + && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH.isTrue())) { if ((nextPageTaskView instanceof DesktopTaskView || currentPageTaskView instanceof DesktopTaskView) && endTarget == NEW_TASK) { + reasonString.append("LAST_TASK", "Desktop mode checks passed and ") + .append((nextPageTaskView instanceof DesktopTaskView) + ? "nextPageTaskView instanceof DesktopTaskView" + : "currentPageTaskView instanceof DesktopTaskView") + .append(" and endTarget == NEW_TASK [") + .append(potentialReason) + .append("]"); + ActiveGestureProtoLogProxy.logCalculateEndTargetResultAndReason( + "LAST_TASK", reasonString); return LAST_TASK; } } + ActiveGestureProtoLogProxy.logCalculateEndTargetResultAndReason( + endTarget.toString(), potentialReason); return endTarget; } - private GestureEndTarget calculateEndTargetForFlingY(PointF velocity, float endVelocity) { + @VisibleForTesting + protected GestureEndTarget getHomeTarget() { + // If the user is swiping up to go home but the gesture is on a secondary display, we + // should reject the gesture and roll back any in-progress animations. + return displaySupportsHomeGesture(mGestureState.getDisplayId()) + ? HOME + : REJECT_HOME; + } + + private GestureEndTarget calculateEndTargetForFlingY( + PointF velocity, float endVelocity, ActiveGestureLog.CompoundString reasonString) { // If swiping at a diagonal, base end target on the faster velocity direction. + ActiveGestureLog.CompoundString isScrollingToNewTaskReason = + ActiveGestureLog.CompoundString.newEmptyString(); + final boolean isScrollingToNewTask = isScrollingToNewTask(isScrollingToNewTaskReason); final boolean willGoToNewTask = - isScrollingToNewTask() && Math.abs(velocity.x) > Math.abs(endVelocity); + isScrollingToNewTask && Math.abs(velocity.x) > Math.abs(endVelocity); final boolean isSwipeUp = endVelocity < 0; - if (mIsInAllAppsRegion) { - return isSwipeUp ? ALL_APPS : LAST_TASK; - } - if (!isSwipeUp) { - final boolean isCenteredOnNewTask = mRecentsView != null - && mRecentsView.getDestinationPage() != mRecentsView.getRunningTaskIndex(); - return willGoToNewTask || isCenteredOnNewTask ? NEW_TASK : LAST_TASK; - } - - return willGoToNewTask ? NEW_TASK : HOME; - } - private GestureEndTarget calculateEndTargetForNonFling(PointF velocity) { - final boolean isScrollingToNewTask = isScrollingToNewTask(); + reasonString.append("willGoToNewTask = %b, " + + "isSwipeUp = %b " + + "[isScrollingToNewTask = %b [", + willGoToNewTask, + isSwipeUp, + isScrollingToNewTask) + .append(isScrollingToNewTaskReason) + .append("], " + + "Math.abs(velocity.x) = %fdp/ms, " + + "Math.abs(endVelocity) = %fdp/ms]", + Math.abs(velocity.x), + Math.abs(endVelocity)); + if (!isSwipeUp) { + Integer destinationPage = mRecentsView == null + ? null : mRecentsView.getDestinationPage(); + Integer runningTaskIndex = mRecentsView == null + ? null : mRecentsView.getRunningTaskIndex(); + final boolean isCenteredOnNewTask = destinationPage != null + && runningTaskIndex != null + && !destinationPage.equals(runningTaskIndex); + GestureEndTarget endTarget = + willGoToNewTask || isCenteredOnNewTask ? NEW_TASK : LAST_TASK; + + reasonString.append("; isCenteredOnNewTask = %s " + + "[mRecentsView.getDestinationPage = %s, " + + "mRecentsView.getRunningTaskIndex = %s]", + isCenteredOnNewTask, + destinationPage, + runningTaskIndex); + + return endTarget; + } + + return willGoToNewTask ? NEW_TASK : getHomeTarget(); + } + + private GestureEndTarget calculateEndTargetForNonFling( + PointF velocity, + boolean horizontalTouchSlopPassed, + ActiveGestureLog.CompoundString reasonString) { + ActiveGestureLog.CompoundString isScrollingToNewTaskReason = + ActiveGestureLog.CompoundString.newEmptyString(); + final boolean isScrollingToNewTask = isScrollingToNewTask(isScrollingToNewTaskReason); + + final float thresholdSpeed = + mContext.getResources().getDimension(R.dimen.quickstep_fling_threshold_speed); // Fully gestural mode. - final boolean isFlingX = Math.abs(velocity.x) > mContext.getResources() - .getDimension(R.dimen.quickstep_fling_threshold_speed); - if (mIsInAllAppsRegion) { - return ALL_APPS; - } else if (isScrollingToNewTask && isFlingX) { + final boolean isFlingX = Math.abs(velocity.x) > thresholdSpeed && horizontalTouchSlopPassed; + + reasonString.append("isScrollingToNewTask = %b [", isScrollingToNewTask) + .append(isScrollingToNewTaskReason) + .append("], isFlingX = %b " + + "[Math.abs(velocity.x) = %fdp/ms, " + + "thresholdSpeed = %fdp/ms, " + + "horizontalTouchSlopPassed = %b], " + + "mIsMotionPaused = %b", + isFlingX, + Math.abs(velocity.x), + thresholdSpeed, + horizontalTouchSlopPassed, + mIsMotionPaused); + if (isScrollingToNewTask && isFlingX) { // Flinging towards new task takes precedence over mIsMotionPaused (which only // checks y-velocity). return NEW_TASK; @@ -1309,20 +1525,29 @@ private GestureEndTarget calculateEndTargetForNonFling(PointF velocity) { } else if (isScrollingToNewTask) { return NEW_TASK; } - return velocity.y < 0 && mCanSlowSwipeGoHome ? HOME : LAST_TASK; + reasonString.append(", velocity.y = %fdp/ms, mCanSlowSwipeGoHome = %b", + velocity.y, mCanSlowSwipeGoHome); + return velocity.y < 0 && mCanSlowSwipeGoHome ? getHomeTarget() : LAST_TASK; } - private boolean isScrollingToNewTask() { + private boolean isScrollingToNewTask(ActiveGestureLog.CompoundString reasonString) { if (mRecentsView == null) { + reasonString.append("mRecentsView is null"); return false; } if (!hasTargets()) { // If there are no running tasks, then we can assume that this is a continuation of // the last gesture, but after the recents animation has finished. + reasonString.append("no running animation targets"); return true; } int runningTaskIndex = mRecentsView.getRunningTaskIndex(); - return runningTaskIndex >= 0 && mRecentsView.getNextPage() != runningTaskIndex; + int nextPageIndex = mRecentsView.getNextPage(); + + reasonString.append( + "runningTaskIndex = %d, nextPageIndex = %d", runningTaskIndex, nextPageIndex); + + return runningTaskIndex >= 0 && nextPageIndex != runningTaskIndex; } /** @@ -1339,24 +1564,25 @@ public void setCanSlowSwipeGoHome(boolean canSlowSwipeGoHome) { @UiThread private void handleNormalGestureEnd( - float endVelocityPxPerMs, boolean isFling, PointF velocityPxPerMs, boolean isCancel) { + float endVelocityPxPerMs, + boolean isFling, + PointF velocityPxPerMs, + boolean isCancel, + boolean horizontalTouchSlopPassed) { long duration = MAX_SWIPE_DURATION; float currentShift = mCurrentShift.value; final GestureEndTarget endTarget = calculateEndTarget( - velocityPxPerMs, endVelocityPxPerMs, isFling, isCancel); + velocityPxPerMs, endVelocityPxPerMs, isFling, isCancel, horizontalTouchSlopPassed); // Set the state, but don't notify until the animation completes mGestureState.setEndTarget(endTarget, false /* isAtomic */); mAnimationFactory.setEndTarget(endTarget); - if (enableScalingRevealHomeAnimation() - && mIsTransientTaskbar - && mContainerInterface.getTaskbarController() != null) { - mContainerInterface.getTaskbarController() - .setUserIsGoingHome(endTarget == GestureState.GestureEndTarget.HOME); + if (mIsTransientTaskbar && mContainerInterface.getTaskbarInteractor() != null) { + mContainerInterface.getTaskbarInteractor() + .setUserIsNotGoingHome(endTarget != HOME); } - float endShift = endTarget == ALL_APPS ? mDragLengthFactor - : endTarget.isLauncher ? 1 : 0; + float endShift = endTarget.isLauncher ? 1 : 0; final float startShift; if (!isFling) { long expectedDuration = Math.abs(Math.round((endShift - currentShift) @@ -1377,7 +1603,7 @@ private void handleNormalGestureEnd( } } Interpolator interpolator; - S state = mContainerInterface.stateFromGestureEndTarget(endTarget); + STATE state = mContainerInterface.stateFromGestureEndTarget(endTarget); if (isKeyboardTaskFocusPending()) { interpolator = EMPHASIZED; } else if (state.displayOverviewTasksAsGrid(mDp)) { @@ -1392,13 +1618,20 @@ private void handleNormalGestureEnd( mInputConsumerProxy.enable(); } if (endTarget == HOME) { + boolean isPinnedTaskbar = !mIsTransientTaskbar; + boolean isThreeButton = DisplayController.getNavigationMode(mContext) + == NavigationMode.THREE_BUTTONS; + boolean isNotInDesktop = !DesktopVisibilityController.INSTANCE.get( + mContext).isInDesktopMode(mContext.getDisplayId()); duration = mContainer != null && mContainer.getDeviceProfile().isTaskbarPresent - ? StaggeredWorkspaceAnim.DURATION_TASKBAR_MS + ? QuickstepTransitionManager.getTaskbarToHomeDuration( + (isThreeButton || isPinnedTaskbar) && isNotInDesktop) : StaggeredWorkspaceAnim.DURATION_MS; - // Early detach the nav bar once the endTarget is determined as HOME - if (mRecentsAnimationController != null) { - mRecentsAnimationController.detachNavigationBarFromApp(true); - } + SystemUiProxy.INSTANCE.get(mContext).updateContextualEduStats( + mGestureState.isTrackpadGesture(), GestureType.HOME); + } else if (endTarget == REJECT_HOME) { + interpolator = ACCELERATE_DECELERATE; + duration = Math.max(REJECT_HOME_ANIM_DURATION_MS, duration); } else if (endTarget == RECENTS) { if (mRecentsView != null) { int nearestPage = mRecentsView.getDestinationPage(); @@ -1423,6 +1656,8 @@ private void handleNormalGestureEnd( if (!mGestureState.isHandlingAtomicEvent() || isScrolling) { duration = Math.max(duration, mRecentsView.getScroller().getDuration()); } + SystemUiProxy.INSTANCE.get(mContext).updateContextualEduStats( + mGestureState.isTrackpadGesture(), GestureType.OVERVIEW); } } else if (endTarget == LAST_TASK && mRecentsView != null && mRecentsView.getNextPage() != mRecentsView.getRunningTaskIndex()) { @@ -1436,9 +1671,9 @@ private void handleNormalGestureEnd( setClampScrollOffset(false); }; - if (Flags.enableDesktopWindowingMode() - && !(Flags.enableDesktopWindowingWallpaperActivity() - && Flags.enableDesktopWindowingQuickSwitch())) { + if (DesktopModeStatus.canEnterDesktopMode(mContext) + && !(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY.isTrue() + && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH.isTrue())) { if (mRecentsView != null && (mRecentsView.getCurrentPageTaskView() != null && !(mRecentsView.getCurrentPageTaskView() instanceof DesktopTaskView))) { ActiveGestureLog.INSTANCE.trackEvent(ActiveGestureErrorDetector.GestureEvent @@ -1457,31 +1692,56 @@ private void handleNormalGestureEnd( onPageTransitionEnd.run(); } } + long finalDuration = duration; + Interpolator finalInterpolator = interpolator; + runOnRecentsAnimationAndLauncherBound(() -> { + animateGestureEnd( + startShift, endShift, finalDuration, finalInterpolator, endTarget, velocityPxPerMs); + }); + } - animateToProgress(startShift, endShift, duration, interpolator, endTarget, velocityPxPerMs); + @UiThread + protected void animateGestureEnd( + float startShift, + float endShift, + long duration, + @NonNull Interpolator interpolator, + @NonNull GestureEndTarget endTarget, + @NonNull PointF velocityPxPerMs) { + animateToProgressInternal( + startShift, endShift, duration, interpolator, endTarget, velocityPxPerMs); } - private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTask) { - if (mDp == null || !mDp.isGestureMode) { + private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTaskView) { + if (mDp == null || !mDp.getDeviceProperties().isGestureMode()) { // We probably never received an animation controller, skip logging. return; } - StatsLogManager.EventEnum event; + ArrayList events = new ArrayList<>(); switch (endTarget) { case HOME: - event = LAUNCHER_HOME_GESTURE; + events.add(LAUNCHER_HOME_GESTURE); break; case RECENTS: - event = LAUNCHER_OVERVIEW_GESTURE; + events.add(LAUNCHER_OVERVIEW_GESTURE); break; case LAST_TASK: case NEW_TASK: - event = mLogDirectionUpOrLeft ? LAUNCHER_QUICKSWITCH_LEFT - : LAUNCHER_QUICKSWITCH_RIGHT; + events.add(mLogDirectionUpOrLeft ? LAUNCHER_QUICKSWITCH_LEFT + : LAUNCHER_QUICKSWITCH_RIGHT); + if (targetTaskView != null && DesktopModeStatus.canEnterDesktopMode(mContext) + && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH.isTrue()) { + if (targetTaskView.getType() == TaskViewType.DESKTOP) { + events.add(LAUNCHER_QUICKSWITCH_ENTER_DESKTOP_MODE); + } else if (mPreviousTaskViewType == TaskViewType.DESKTOP) { + events.add(LAUNCHER_QUICKSWITCH_EXIT_DESKTOP_MODE); + } + } break; + // TODO(b/378443899): add event for the reject home case default: - event = IGNORE; + events.add(IGNORE); } StatsLogger logger = StatsLogManager.newInstance( mContainer != null ? mContainer.asContext() : mContext).logger() @@ -1490,23 +1750,15 @@ private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetT .withInputType(mGestureState.isTrackpadGesture() ? SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__TRACKPAD : SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__TOUCH); - if (targetTask != null) { - logger.withItemInfo(targetTask.getFirstItemInfo()); + if (targetTaskView != null) { + logger.withItemInfo(targetTaskView.getItemInfo()); } int pageIndex = endTarget == LAST_TASK || mRecentsView == null ? LOG_NO_OP_PAGE_INDEX : mRecentsView.getNextPage(); logger.withRank(pageIndex); - logger.log(event); - } - - /** Animates to the given progress, where 0 is the current app and 1 is overview. */ - @UiThread - private void animateToProgress(float start, float end, long duration, Interpolator interpolator, - GestureEndTarget target, PointF velocityPxPerMs) { - runOnRecentsAnimationAndLauncherBound(() -> animateToProgressInternal(start, end, duration, - interpolator, target, velocityPxPerMs)); + events.forEach(logger::log); } protected abstract HomeAnimationFactory createHomeAnimationFactory( @@ -1520,7 +1772,7 @@ protected abstract HomeAnimationFactory createHomeAnimationFactory( private final TaskStackChangeListener mActivityRestartListener = new TaskStackChangeListener() { @Override public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task, - boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) { + boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) { boolean taskRunningAndNotHome = Arrays.stream(mGestureState .getRunningTaskIds(true /*getMultipleTasks*/)) .anyMatch(taskId -> task.taskId == taskId @@ -1539,7 +1791,7 @@ public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task, @UiThread private void animateToProgressInternal(float start, float end, long duration, - Interpolator interpolator, GestureEndTarget target, PointF velocityPxPerMs) { + Interpolator interpolator, GestureEndTarget target, PointF velocityPxPerMs) { maybeUpdateRecentsAttachedState(); // If we are transitioning to launcher, then listen for the activity to be restarted while @@ -1554,15 +1806,34 @@ private void animateToProgressInternal(float start, float end, long duration, TaskStackChangeListeners.getInstance().registerTaskStackListener( mActivityRestartListener); - mParallelRunningAnim = mContainerInterface.getParallelAnimationToLauncher( + mParallelRunningAnim = mContainerInterface.getParallelAnimationToGestureEndTarget( mGestureState.getEndTarget(), duration, mTaskAnimationManager.getCurrentCallbacks()); if (mParallelRunningAnim != null) { mParallelRunningAnim.addListener(new AnimatorListenerAdapter() { + final DesktopVisibilityController desktopVisibilityController = + DesktopVisibilityController.INSTANCE.get(mContext); + final boolean isInDesktopMode = + desktopVisibilityController.isInDesktopMode(mContext.getDisplayId()); + @Override + public void onAnimationStart(Animator animation) { + if (isInDesktopMode && mGestureState.getEndTarget() == HOME) { + // Set launcher animation started, so we don't notify from + // desktop visibility controller + desktopVisibilityController.setLauncherAnimationRunning(true); + } + } + @Override public void onAnimationEnd(Animator animation) { mParallelRunningAnim = null; mStateCallback.setStateOnUiThread(STATE_PARALLEL_ANIM_FINISHED); + // Swipe to home animation finished, notify DesktopVisibilityController + // to recreate Taskbar + if (isInDesktopMode && mGestureState.getEndTarget() == HOME) { + desktopVisibilityController.onLauncherAnimationFromDesktopEnd( + mGestureState.getDisplayId()); + } } }); mParallelRunningAnim.start(); @@ -1587,19 +1858,25 @@ public void onAnimationEnd(Animator animation) { boolean hasValidLeash = runningTaskTarget != null && runningTaskTarget.leash != null && runningTaskTarget.leash.isValid(); + final boolean swipeUpInDesktopWindowing = + DesktopExperienceFlags.ENABLE_DESKTOP_WINDOWING_PIP.isTrue() + && runningTaskTarget != null + && runningTaskTarget.taskInfo.getWindowingMode() + == WINDOWING_MODE_FREEFORM; boolean appCanEnterPip = !mDeviceState.isPipActive() && hasValidLeash && runningTaskTarget.allowEnterPip && runningTaskTarget.taskInfo.pictureInPictureParams != null - && runningTaskTarget.taskInfo.pictureInPictureParams.isAutoEnterEnabled(); + && runningTaskTarget.taskInfo.pictureInPictureParams.isAutoEnterEnabled() + && !swipeUpInDesktopWindowing; + HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory( cookies, duration, isTranslucent, appCanEnterPip, runningTaskTarget, - !enableAdditionalHomeAnimations() - || mRecentsView == null + mRecentsView == null || mRecentsView.getCurrentPage() == mRecentsView.getRunningTaskIndex() ? null : mRecentsView.getCurrentPageTaskView()); SwipePipToHomeAnimator swipePipToHomeAnimator = !mIsSwipeForSplit && appCanEnterPip @@ -1646,6 +1923,9 @@ public void onAnimationEnd(Animator animation) { } windowAnim = createWindowAnimationToHome(start, homeAnimFactory); + if (mHandOffAnimationToHome) { + handOffAnimation(velocityPxPerMs); + } windowAnim[0].addAnimatorListener(new AnimationSuccessListener() { @Override public void onAnimationSuccess(Animator animator) { @@ -1675,9 +1955,55 @@ public void onAnimationSuccess(Animator animator) { mLauncherTransitionController = null; if (mRecentsView != null) { - mRecentsView.onPrepareGestureEndAnimation(null, mGestureState.getEndTarget(), - getRemoteTaskViewSimulators()); + AnimatorSet animatorSet = new AnimatorSet(); + mRecentsView.onPrepareGestureEndAnimation(animatorSet, mGestureState.getEndTarget(), + mRemoteTargetHandles, /* isHandlingAtomicEvent= */ true); + animatorSet.setDuration(0).start(); + } + } else if (mGestureState.getEndTarget() == REJECT_HOME) { + AnimatorSet animatorSet = new AnimatorSet(); + AnimationSuccessListener successListener = new AnimationSuccessListener() { + @Override + public void onAnimationSuccess(Animator animator) { + mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED); + } + }; + if (start > REJECT_HOME_ANIM_MINIMUM_SHIFT) { + // Animate directly from start to 0 + ValueAnimator directAnim = mCurrentShift.animateToValue(start, 0f); + directAnim.setDuration(duration); + directAnim.setInterpolator(interpolator); + directAnim.addListener(successListener); + animatorSet.play(directAnim); + } else { + // Animate from start to REJECT_HOME_ANIM_MINIMUM_SHIFT + // Then from REJECT_HOME_ANIM_MINIMUM_SHIFT to 0 + // + // Calculate the duration of each animation based on the proportion of the total + // effect. EG down and up should go at the same rate (~handwaving interpolation~) + // Down displacement is always MINIMUM_SHIFT to 0 + // Up displacement is from start to MINIMUM_SHIFT + float goingUpDistance = REJECT_HOME_ANIM_MINIMUM_SHIFT - start; + float goingDownDistance = REJECT_HOME_ANIM_MINIMUM_SHIFT; + float totalDistanceToCover = goingUpDistance + goingDownDistance; + long goingUpDuration = + (long) (duration * (goingUpDistance / totalDistanceToCover)); + long goingDownDuration = duration - goingUpDuration; + + ValueAnimator goingUpAnim = mCurrentShift.animateToValue( + start, REJECT_HOME_ANIM_MINIMUM_SHIFT); + ValueAnimator goingDownAnim = mCurrentShift.animateToValue( + REJECT_HOME_ANIM_MINIMUM_SHIFT, 0f); + goingUpAnim.setDuration(goingUpDuration); + goingDownAnim.setDuration(goingDownDuration); + goingDownAnim.addListener(successListener); + + animatorSet.play(goingUpAnim); + animatorSet.play(goingDownAnim).after(goingUpAnim); } + animatorSet.setInterpolator(interpolator); + animatorSet.start(); + mRunningWindowAnim = new RunningWindowAnim[]{RunningWindowAnim.wrap(animatorSet)}; } else { AnimatorSet animatorSet = new AnimatorSet(); ValueAnimator windowAnim = mCurrentShift.animateToValue(start, end); @@ -1718,9 +2044,10 @@ public void onAnimationSuccess(Animator animator) { animatorSet.play(windowAnim); if (mRecentsView != null) { mRecentsView.onPrepareGestureEndAnimation( - mGestureState.isHandlingAtomicEvent() ? null : animatorSet, + animatorSet, mGestureState.getEndTarget(), - getRemoteTaskViewSimulators()); + mRemoteTargetHandles, + mGestureState.isHandlingAtomicEvent()); } animatorSet.setDuration(duration).setInterpolator(interpolator); animatorSet.start(); @@ -1728,15 +2055,39 @@ public void onAnimationSuccess(Animator animator) { } } + private void handOffAnimation(PointF velocityPxPerMs) { + // This function is not guaranteed to be called inside a frame. We try to access the frame + // time immediately, but if we're not inside a frame we must post a callback to be run at + // the beginning of the next frame. + try { + handOffAnimationInternal(Choreographer.getInstance().getFrameTime(), velocityPxPerMs); + } catch (IllegalStateException e) { + Choreographer.getInstance().postFrameCallback( + frameTimeNanos -> handOffAnimationInternal( + frameTimeNanos / TimeUtils.NANOS_PER_MS, velocityPxPerMs)); + } + } + + private void handOffAnimationInternal(long timestamp, PointF velocityPxPerMs) { + if (mRecentsAnimationController == null) { + return; + } + + Pair targetsAndStates = + extractTargetsAndStates( + mRemoteTargetHandles, timestamp, velocityPxPerMs); + mRecentsAnimationController.handOffAnimation( + targetsAndStates.first, targetsAndStates.second); + ActiveGestureProtoLogProxy.logHandOffAnimation(); + } + private int calculateWindowRotation(RemoteAnimationTarget runningTaskTarget, RecentsOrientedState orientationState) { // LC: https://github.com/LawnchairLauncher/lawnchair/pull/3776 try { - if (runningTaskTarget.rotationChange != 0 - && TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) { + if (runningTaskTarget.rotationChange != 0) { return Math.abs(runningTaskTarget.rotationChange) == ROTATION_90 - ? ROTATION_270 - : ROTATION_90; + ? ROTATION_270 : ROTATION_90; } else { return orientationState.getDisplayRotation(); } @@ -1747,7 +2098,7 @@ private int calculateWindowRotation(RemoteAnimationTarget runningTaskTarget, @Nullable private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory homeAnimFactory, - RemoteAnimationTarget runningTaskTarget, float startProgress) { + RemoteAnimationTarget runningTaskTarget, float startProgress) { if (mRecentsView == null) { // Overview was destroyed, bail early. return null; @@ -1770,9 +2121,7 @@ private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory h final Rect hotseatKeepClearArea = getKeepClearAreaForHotseat(); final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext) - .startSwipePipToHome(taskInfo.topActivity, - taskInfo.topActivityInfo, - runningTaskTarget.taskInfo.pictureInPictureParams, + .startSwipePipToHome(taskInfo, homeRotation, hotseatKeepClearArea); if (destinationBounds == null) { @@ -1793,7 +2142,7 @@ private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory h .setContext(mContext) .setTaskId(runningTaskTarget.taskId) .setActivityInfo(taskInfo.topActivityInfo) - .setAppIconSizePx(mDp.iconSizePx) + .setAppIconSizePx(mDp.getWorkspaceIconProfile().getIconSizePx()) .setLeash(runningTaskTarget.leash) .setSourceRectHint( runningTaskTarget.taskInfo.pictureInPictureParams.getSourceRectHint()) @@ -1801,8 +2150,7 @@ private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory h .setHomeToWindowPositionMap(homeToWindowPositionMap) .setStartBounds(startRect) .setDestinationBounds(destinationBounds) - .setCornerRadius(mRecentsView.getPipCornerRadius()) - .setShadowRadius(mRecentsView.getPipShadowRadius()) + .setPipResources(mRecentsView.getPipResources()) .setAttachedView(mRecentsView); // We would assume home and app window always in the same rotation While homeRotation // is not ROTATION_0 (which implies the rotation is turned on in launcher settings). @@ -1810,6 +2158,8 @@ private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory h && (windowRotation == ROTATION_90 || windowRotation == ROTATION_270)) { builder.setFromRotation(mRemoteTargetHandles[0].getTaskViewSimulator(), windowRotation, taskInfo.displayCutoutInsets); + } else if (taskInfo.displayCutoutInsets != null) { + builder.setDisplayCutoutInsets(taskInfo.displayCutoutInsets); } final SwipePipToHomeAnimator swipePipToHomeAnimator = builder.build(); AnimatorPlaybackController activityAnimationToHome = @@ -1838,30 +2188,32 @@ public void onAnimationEnd(Animator animation) { mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED); } }); - setupWindowAnimation(new RectFSpringAnim[]{swipePipToHomeAnimator}); + setupWindowAnimationToHome(new RectFSpringAnim[]{swipePipToHomeAnimator}); return swipePipToHomeAnimator; } private Rect getKeepClearAreaForHotseat() { Rect keepClearArea; + final int heightPx = mDp.getDeviceProperties().getHeightPx(); + final int widthPx = mDp.getDeviceProperties().getWidthPx(); // the keep clear area in global screen coordinates, in pixels - if (mDp.isPhone) { + if (mDp.getDeviceProperties().isPhone()) { if (mDp.isSeascape()) { // in seascape the Hotseat is on the left edge of the screen - keepClearArea = new Rect(0, 0, mDp.hotseatBarSizePx, mDp.heightPx); - } else if (mDp.isLandscape) { + keepClearArea = new Rect(0, 0, mDp.hotseatBarSizePx, heightPx); + } else if (mDp.getDeviceProperties().isLandscape()) { // in landscape the Hotseat is on the right edge of the screen - keepClearArea = new Rect(mDp.widthPx - mDp.hotseatBarSizePx, 0, - mDp.widthPx, mDp.heightPx); + keepClearArea = new Rect(widthPx - mDp.hotseatBarSizePx, 0, + widthPx, heightPx); } else { // in portrait mode the Hotseat is at the bottom of the screen - keepClearArea = new Rect(0, mDp.heightPx - mDp.hotseatBarSizePx, - mDp.widthPx, mDp.heightPx); + keepClearArea = new Rect(0, heightPx - mDp.hotseatBarSizePx, + widthPx, heightPx); } } else { // large screens have Hotseat always at the bottom of the screen - keepClearArea = new Rect(0, mDp.heightPx - mDp.hotseatBarSizePx, - mDp.widthPx, mDp.heightPx); + keepClearArea = new Rect(0, heightPx - mDp.hotseatBarSizePx, + widthPx, heightPx); } return keepClearArea; } @@ -1906,28 +2258,60 @@ private void continueComputingRecentsScrollIfNecessary() { */ @Override protected RectFSpringAnim[] createWindowAnimationToHome(float startProgress, - HomeAnimationFactory homeAnimationFactory) { + HomeAnimationFactory homeAnimationFactory) { RectFSpringAnim[] anim = super.createWindowAnimationToHome(startProgress, homeAnimationFactory); - setupWindowAnimation(anim); + setupWindowAnimationToHome(anim); return anim; } - private void setupWindowAnimation(RectFSpringAnim[] anims) { - anims[0].addOnUpdateListener((r, p) -> { - updateSysUiFlags(Math.max(p, mCurrentShift.value)); - }); - anims[0].addAnimatorListener(new AnimationSuccessListener() { + @VisibleForTesting + @NonNull + protected AnimationSuccessListener getWindowAnimationToHomeListener() { + return new AnimationSuccessListener() { + + @Nullable private TaskView runningTaskView; + @Override - public void onAnimationSuccess(Animator animator) { + public void onAnimationStart(Animator animation) { + super.onAnimationStart(animation); + runningTaskView = mRecentsView == null ? null : mRecentsView.getRunningTaskView(); + + if (runningTaskView != null) { + runningTaskView.setClickable(false); + } + } + + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + final View taskView = runningTaskView; + runningTaskView = null; if (mRecentsView != null) { - mRecentsView.post(mRecentsView::resetTaskVisuals); + final RECENTS_VIEW rv = mRecentsView; + rv.post(() -> { + rv.resetTaskVisuals(); + if (taskView != null) { + taskView.setClickable(true); + } + }); } + } + + @Override + public void onAnimationSuccess(Animator animator) { // Make sure recents is in its final state maybeUpdateRecentsAttachedState(false); - mContainerInterface.onSwipeUpToHomeComplete(mDeviceState); + mContainerInterface.onSwipeUpToHomeComplete(); } + }; + } + + private void setupWindowAnimationToHome(RectFSpringAnim[] anims) { + anims[0].addOnUpdateListener((r, p) -> { + updateSysUiFlags(Math.max(p, mCurrentShift.value)); }); + anims[0].addAnimatorListener(getWindowAnimationToHomeListener()); if (mRecentsAnimationTargets != null) { mRecentsAnimationTargets.addReleaseCheck(anims[0]); } @@ -1954,16 +2338,39 @@ public boolean isCanceled() { @UiThread private void resumeLastTask() { if (mRecentsAnimationController != null) { - mRecentsAnimationController.finish(false /* toRecents */, null); + mRecentsAnimationController.finish( + /* toHome= */ false, + /* onFinishComplete= */ null, + /* reason= */ new ActiveGestureLog.CompoundString( + "AbsSwipeUpHandler.resumeLastTask")); } doLogGesture(LAST_TASK, null); reset(); } + @UiThread + private void finishRejectHome() { + if (mRecentsAnimationController != null) { + mRecentsAnimationController.finish( + /* toHome= */ false, + /* onFinishComplete= */ null, + /* reason= */ new ActiveGestureLog.CompoundString( + "AbsSwipeUpHandler.finishRejectHome")); + } + doLogGesture(REJECT_HOME, null); + reset(); + } + @UiThread private void startNewTask() { - TaskView taskToLaunch = mRecentsView == null ? null : mRecentsView.getNextPageTaskView(); - startNewTask(success -> { + // Launch the task user scrolled to (mRecentsView.getNextPage()). + startNewTask(mRecentsView == null ? null : mRecentsView.getNextPageTaskView()); + } + + @UiThread + private void startNewTask(@Nullable TaskView taskToLaunch) { + doLogGesture(NEW_TASK, taskToLaunch); + startNewTask(taskToLaunch, success -> { if (!success) { reset(); // We couldn't launch the task, so take user to overview so they can @@ -1971,7 +2378,6 @@ private void startNewTask() { endLauncherTransitionController(); updateSysUiFlags(1 /* windowProgress == overview */); } - doLogGesture(NEW_TASK, taskToLaunch); }); } @@ -1981,22 +2387,20 @@ private void startNewTask() { * specific edge case: if we switch from A to B, and back to A before B appears, we need to * start A again to ensure it stays on top. */ - @androidx.annotation.CallSuper + @CallSuper protected void onRestartPreviouslyAppearedTask() { // Finish the controller here, since we won't get onTaskAppeared() for a task that already // appeared. if (mRecentsAnimationController != null) { - mRecentsAnimationController.finish(false, null); + mRecentsAnimationController.finish( + /* toHome= */ false, + /* onfinishComplete= */ null, + /* reason= */ new ActiveGestureLog.CompoundString( + "AbsSwipeUpHandler.onRestartPreviouslyAppearedTask")); } reset(); } - @UiThread - private void finishCurrentTransitionToAllApps() { - finishCurrentTransitionToHome(); - reset(); - } - private void reset() { mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED); if (mContainer != null) { @@ -2009,15 +2413,13 @@ private void reset() { * handler (in case of quick switch). */ private void cancelCurrentAnimation() { - ActiveGestureLog.INSTANCE.addLog( - "AbsSwipeUpHandler.cancelCurrentAnimation", - ActiveGestureErrorDetector.GestureEvent.CANCEL_CURRENT_ANIMATION); + ActiveGestureProtoLogProxy.logAbsSwipeUpHandlerCancelCurrentAnimation(); mCanceled = true; mCurrentShift.cancelAnimation(); // Cleanup when switching handlers mInputConsumerProxy.unregisterOnTouchDownCallback(); - mActivityInitListener.unregister("AbsSwipeUpHandler.cancelCurrentAnimation"); + mContextInitListener.unregister("AbsSwipeUpHandler.cancelCurrentAnimation"); TaskStackChangeListeners.getInstance().unregisterTaskStackListener( mActivityRestartListener); mTaskSnapshotCache.clear(); @@ -2035,10 +2437,15 @@ private void invalidateHandler() { mGestureEndCallback.run(); } - mActivityInitListener.unregister("AbsSwipeUpHandler.invalidateHandler"); + mContextInitListener.unregister("AbsSwipeUpHandler.invalidateHandler"); TaskStackChangeListeners.getInstance().unregisterTaskStackListener( mActivityRestartListener); mTaskSnapshotCache.clear(); + + for (LifecycleTracker tracker: + LauncherComponentProvider.get(mContext).getLifecycleTrackers()) { + tracker.trackLifecycleOnDestroy(this, 1000L); + } } private void invalidateHandlerWithLauncher() { @@ -2047,6 +2454,9 @@ private void invalidateHandlerWithLauncher() { if (mRecentsView != null) { mRecentsView.onGestureAnimationEnd(); } + if (mGestureAnimationEndCallback != null) { + mGestureAnimationEndCallback.run(); + } resetLauncherListeners(); } @@ -2080,6 +2490,7 @@ private void resetLauncherListeners() { if (mRecentsView != null) { mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener); } + mGestureState.getContainerInterface().setOnDeferredActivityLaunchCallback(null); } private void resetStateForAnimationCancel() { @@ -2097,7 +2508,6 @@ protected void switchToScreenshot() { // If there are no targets, then we don't need to capture anything mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED); } else { - boolean finishTransitionPosted = false; // If we already have cached screenshot(s) from running tasks, skip update boolean shouldUpdate = false; int[] runningTaskIds = mGestureState.getRunningTaskIds(mIsSwipeForSplit); @@ -2121,45 +2531,31 @@ protected void switchToScreenshot() { } MAIN_EXECUTOR.execute(() -> { - if (!updateThumbnail(false /* refreshView */)) { - setScreenshotCapturedState(); - } + updateThumbnail(); + setScreenshotCapturedState(); }); }); return; } - finishTransitionPosted = updateThumbnail(false /* refreshView */); + updateThumbnail(); } - if (!finishTransitionPosted) { - setScreenshotCapturedState(); - } + setScreenshotCapturedState(); } } // Returns whether finish transition was posted. - private boolean updateThumbnail(boolean refreshView) { + private void updateThumbnail() { if (mGestureState.getEndTarget() == HOME || mGestureState.getEndTarget() == NEW_TASK - || mGestureState.getEndTarget() == ALL_APPS || mRecentsView == null) { // Capture the screenshot before finishing the transition to home or quickswitching to // ensure it's taken in the correct orientation, but no need to update the thumbnail. - return false; - } - - boolean finishTransitionPosted = false; - TaskView updatedTaskView = mRecentsView.updateThumbnail(mTaskSnapshotCache, refreshView); - if (updatedTaskView != null && refreshView && !mCanceled) { - // Defer finishing the animation until the next launcher frame with the - // new thumbnail - finishTransitionPosted = ViewUtils.postFrameDrawn(updatedTaskView, - () -> mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED), - this::isCanceled); + return; } - return finishTransitionPosted; + mRecentsView.updateThumbnail(mTaskSnapshotCache); } private void setScreenshotCapturedState() { @@ -2221,8 +2617,9 @@ private void maybeFinishSwipePipToHome() { mSwipePipToHomeAnimator.getFinishTransaction(), mSwipePipToHomeAnimator.getContentOverlay()); mIsSwipingPipToHome = false; - } else if (mIsSwipeForSplit) { + } else if (mIsSwipeForSplit && !PipFlags.isPip2ExperimentEnabled()) { // Transaction to hide the task to avoid flicker for entering PiP from split-screen. + // Note: PiP2 handles entering differently, so skip if enable_pip2=true PictureInPictureSurfaceTransaction tx = new PictureInPictureSurfaceTransaction.Builder() .setAlpha(0f) @@ -2261,9 +2658,17 @@ private static boolean isNotInRecents(RemoteAnimationTarget app) { } protected void performHapticFeedback() { - VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC); + if (msdlFeedback()) { + mMSDLPlayerWrapper.playToken(MSDLToken.SWIPE_THRESHOLD_INDICATOR); + } else { + VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC); + } } + /** + * The returned Consumer has strong ref to RecentsView and thus Launcher activity. Caller should + * ensure it clears the ref to returned consumer once gesture is ended. + */ public Consumer getRecentsViewDispatcher(float navbarRotation) { return mRecentsView != null ? mRecentsView.getEventDispatcher(navbarRotation) : null; } @@ -2272,13 +2677,17 @@ public void setGestureEndCallback(Runnable gestureEndCallback) { mGestureEndCallback = gestureEndCallback; } + public void setGestureAnimationEndCallback(Runnable gestureAnimationEndCallback) { + mGestureAnimationEndCallback = gestureAnimationEndCallback; + } + protected void linkRecentsViewScroll() { if (mRecentsView == null) { return; } SurfaceTransactionApplier applier = new SurfaceTransactionApplier(mRecentsView); runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams() - .setSyncTransactionApplier(applier)); + .setSyncTransactionApplier(applier)); runOnRecentsAnimationAndLauncherBound(() -> mRecentsAnimationTargets.addReleaseCheck(applier)); @@ -2291,9 +2700,9 @@ protected void linkRecentsViewScroll() { mRecentsAnimationController, mRecentsAnimationTargets); }); - if (Flags.enableDesktopWindowingMode() - && !(Flags.enableDesktopWindowingWallpaperActivity() - && Flags.enableDesktopWindowingQuickSwitch())) { + if (DesktopModeStatus.canEnterDesktopMode(mContext) + && !(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY.isTrue() + && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH.isTrue())) { if (mRecentsView.getNextPageTaskView() instanceof DesktopTaskView || mRecentsView.getCurrentPageTaskView() instanceof DesktopTaskView) { mRecentsViewScrollLinked = false; @@ -2321,55 +2730,59 @@ private void onRecentsViewScroll() { } } - protected void startNewTask(Consumer resultCallback) { - // Launch the task user scrolled to (mRecentsView.getNextPage()). - if (!mCanceled) { - TaskView nextTask = mRecentsView == null ? null : mRecentsView.getNextPageTaskView(); - if (nextTask != null) { - int[] taskIds = nextTask.getTaskIds(); - ActiveGestureLog.CompoundString nextTaskLog = new ActiveGestureLog.CompoundString( - "Launching task: "); - for (TaskContainer container : nextTask.getTaskContainers()) { - if (container == null) { - continue; - } - nextTaskLog - .append("[id: ") - .append(container.getTask().key.id) - .append(", pkg: ") - .append(container.getTask().key.getPackageName()) - .append("] | "); - } - mGestureState.updateLastStartedTaskIds(taskIds); - boolean hasTaskPreviouslyAppeared = Arrays.stream(taskIds).anyMatch( + protected void startNewTask(@Nullable TaskView taskToLaunch, Consumer resultCallback) { + if (mCanceled) { + mCanceled = false; + return; + } + if (taskToLaunch == null) { + mContainerInterface.onLaunchTaskFailed(); + Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show(); + if (mRecentsAnimationController != null) { + mRecentsAnimationController.finish( + /* toHome= */ true, + /* onFinishComplete= */ null, + /* reason= */ new ActiveGestureLog.CompoundString( + "AbsSwipeUpHander.startNewTask: missing task to launch")); + } + mCanceled = false; + return; + } + int[] taskIds = taskToLaunch.getTaskIds(); + ActiveGestureLog.CompoundString nextTaskLog = + ActiveGestureLog.CompoundString.newEmptyString(); + for (TaskContainer container : taskToLaunch.getTaskContainers()) { + nextTaskLog.append("[id: %d, pkg: %s] | ", + container.getTask().key.id, + container.getTask().key.getPackageName()); + } + mGestureState.updateLastStartedTaskIds(taskIds); + boolean hasTaskPreviouslyAppeared = Arrays.stream(taskIds).anyMatch( taskId -> mGestureState.getPreviouslyAppearedTaskIds() .contains(taskId)); - if (!hasTaskPreviouslyAppeared) { - ActiveGestureLog.INSTANCE.trackEvent(EXPECTING_TASK_APPEARED); + if (!hasTaskPreviouslyAppeared) { + ActiveGestureLog.INSTANCE.trackEvent(EXPECTING_TASK_APPEARED); + } + ActiveGestureProtoLogProxy.logStartNewTask(nextTaskLog); + taskToLaunch.launchWithoutAnimation(true, success -> { + resultCallback.accept(success); + if (success) { + if (hasTaskPreviouslyAppeared) { + onRestartPreviouslyAppearedTask(); } - ActiveGestureLog.INSTANCE.addLog(nextTaskLog); - nextTask.launchTask(success -> { - resultCallback.accept(success); - if (success) { - if (hasTaskPreviouslyAppeared) { - onRestartPreviouslyAppearedTask(); - } - } else { - mContainerInterface.onLaunchTaskFailed(); - if (mRecentsAnimationController != null) { - mRecentsAnimationController.finish(true /* toRecents */, null); - } - } - return Unit.INSTANCE; - }, true /* freezeTaskList */); } else { mContainerInterface.onLaunchTaskFailed(); - Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show(); if (mRecentsAnimationController != null) { - mRecentsAnimationController.finish(true /* toRecents */, null); + mRecentsAnimationController.finish( + /* toHome= */ true, + /* onFinishComplete= */ null, + /* reason= */ new ActiveGestureLog.CompoundString( + "AbsSwipeUpHander.startNewTask: " + + "launchWithoutAnimation failed")); } } - } + return Unit.INSTANCE; + } /* freezeTaskList */); mCanceled = false; } @@ -2414,60 +2827,110 @@ public void onRecentsAnimationFinished(@NonNull RecentsAnimationController contr } } + private boolean hasStartedTaskBefore(@NonNull RemoteAnimationTarget[] appearedTaskTargets) { + return Arrays.stream(appearedTaskTargets) + .anyMatch(mGestureState.getLastStartedTaskIdPredicate()); + } + @Override - public void onTasksAppeared(@NonNull RemoteAnimationTarget[] appearedTaskTargets) { + public void onTasksAppeared(@NonNull RemoteAnimationTarget[] appearedTaskTargets, + @Nullable TransitionInfo transitionInfo) { if (mRecentsAnimationController == null) { return; } - boolean hasStartedTaskBefore = Arrays.stream(appearedTaskTargets).anyMatch( - mGestureState.mLastStartedTaskIdPredicate); - if (!mStateCallback.hasStates(STATE_GESTURE_COMPLETED) && !hasStartedTaskBefore) { + final Runnable onFinishComplete = () -> { + ActiveGestureProtoLogProxy.logAbsSwipeUpHandlerOnTasksAppeared(); + mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED); + }; + if (!mStateCallback.hasStates(STATE_GESTURE_COMPLETED) + && !hasStartedTaskBefore(appearedTaskTargets)) { // This is a special case, if a task is started mid-gesture that wasn't a part of a // previous quickswitch task launch, then cancel the animation back to the app RemoteAnimationTarget appearedTaskTarget = appearedTaskTargets[0]; TaskInfo taskInfo = appearedTaskTarget.taskInfo; - ActiveGestureLog.INSTANCE.addLog( - new ActiveGestureLog.CompoundString("Unexpected task appeared") - .append(" id=") - .append(taskInfo.taskId) - .append(" pkg=") - .append(taskInfo.baseIntent.getComponent().getPackageName())); - finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */); + onInvalidTasksAppeared( + () -> { + onFinishComplete.run(); + maybeHandleUnfinishedTaskLaunch( + "onTasksAppeared: unexpected task appeared mid-gesture"); + }, + new ActiveGestureLog.CompoundString( + "Unexpected task appeared id=%d, pkg=%s", + taskInfo.taskId, + taskInfo.baseIntent.getComponent().getPackageName())); return; } - if (!handleTaskAppeared(appearedTaskTargets)) { + ActiveGestureLog.CompoundString forceFinishReason = + ActiveGestureLog.CompoundString.newEmptyString(); + if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) { + forceFinishReason.append("State handler was invalidated"); + onInvalidTasksAppeared(onFinishComplete, forceFinishReason); return; } - Optional taskTargetOptional = - Arrays.stream(appearedTaskTargets) - .filter(mGestureState.mLastStartedTaskIdPredicate) - .findFirst(); - if (!taskTargetOptional.isPresent()) { - ActiveGestureLog.INSTANCE.addLog("No appeared task matching started task id"); - finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */); + if (!mStateCallback.hasStates(STATE_START_NEW_TASK)) { + forceFinishReason.append("STATE_START_NEW_TASK was never set"); + onInvalidTasksAppeared(onFinishComplete, forceFinishReason); return; } - RemoteAnimationTarget taskTarget = taskTargetOptional.get(); + if (!hasStartedTaskBefore(appearedTaskTargets)) { + TaskInfo taskInfo = appearedTaskTargets[0].taskInfo; + forceFinishReason.append("Unexpected task appeared id=%d, pkg=%s", + taskInfo.taskId, + taskInfo.baseIntent.getComponent().getPackageName()); + onInvalidTasksAppeared(() -> { + onFinishComplete.run(); + maybeHandleUnfinishedTaskLaunch("onTasksAppeared: unexpected task appeared"); + }, forceFinishReason); + return; + } + reset(); + RemoteAnimationTarget[] taskTargets = Arrays.stream(appearedTaskTargets) + .filter(mGestureState.getLastStartedTaskIdPredicate()) + .toArray(RemoteAnimationTarget[]::new); + if (taskTargets.length == 0) { + forceFinishReason.append("No appeared task matching started task id"); + onInvalidTasksAppeared(onFinishComplete, forceFinishReason); + return; + } + RemoteAnimationTarget taskTarget = taskTargets[0]; TaskView taskView = mRecentsView == null ? null : mRecentsView.getTaskViewByTaskId(taskTarget.taskId); - if (taskView == null - || !taskView.getFirstThumbnailViewDeprecated().shouldShowSplashView()) { - ActiveGestureLog.INSTANCE.addLog("Invalid task view splash state"); - finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */); + if (taskView == null || taskView.getTaskContainers().stream().noneMatch( + TaskContainer::getShouldShowSplashView)) { + forceFinishReason.append("Splash not needed"); + onInvalidTasksAppeared(onFinishComplete, forceFinishReason); return; } if (mContainer == null) { - ActiveGestureLog.INSTANCE.addLog("Activity destroyed"); - finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */); + forceFinishReason.append("Activity destroyed"); + onInvalidTasksAppeared(onFinishComplete, forceFinishReason); return; } - animateSplashScreenExit(mContainer, appearedTaskTargets, taskTarget.leash); + animateSplashScreenExit(mContainer, appearedTaskTargets, taskTargets); + } + + private void maybeHandleUnfinishedTaskLaunch(@NonNull String reason) { + GestureEndTarget endTarget = mGestureState.getEndTarget(); + // Edge cases where a gesture that would have launched/resumed a task was interrupted. + // These are just fallback cases to prevent leaving the user in a broken state. + ActiveGestureLog.CompoundString msg = new ActiveGestureLog.CompoundString(reason); + if (endTarget == NEW_TASK || endTarget == LAST_TASK) { + if (endTarget == NEW_TASK && mRecentsView != null) { + int nextTaskIndex = mRecentsView.getCurrentPage() + 1; + msg.append(". Attempting to start new task at index %d.", nextTaskIndex); + startNewTask(mRecentsView.getTaskViewAt(nextTaskIndex)); + } else if (endTarget == LAST_TASK) { + msg.append(". Attempting to resume last task."); + resumeLastTask(); + } + ActiveGestureProtoLogProxy.logHandleUnfinishedTaskLaunch(endTarget.toString(), msg); + } } private void animateSplashScreenExit( - @NonNull T activity, + @NonNull RECENTS_CONTAINER activity, @NonNull RemoteAnimationTarget[] appearedTaskTargets, - @NonNull SurfaceControl leash) { + @NonNull RemoteAnimationTarget[] animatingTargets) { ViewGroup splashView = activity.getDragLayer(); final QuickstepLauncher quickstepLauncher = activity instanceof QuickstepLauncher ? (QuickstepLauncher) activity : null; @@ -2485,33 +2948,46 @@ private void animateSplashScreenExit( } surfaceApplier.scheduleApply(transaction); - SplashScreenExitAnimationUtils.startAnimations(splashView, leash, - mSplashMainWindowShiftLength, new TransactionPool(), new Rect(), - SPLASH_ANIMATION_DURATION, SPLASH_FADE_OUT_DURATION, - /* iconStartAlpha= */ 0, /* brandingStartAlpha= */ 0, - SPLASH_APP_REVEAL_DELAY, SPLASH_APP_REVEAL_DURATION, - new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - // Hiding launcher which shows the app surface behind, then - // finishing recents to the app. After transition finish, showing - // the views on launcher again, so it can be visible when next - // animation starts. - splashView.setAlpha(0); - if (quickstepLauncher != null) { - quickstepLauncher.getDepthController() - .pauseBlursOnWindows(false); + for (RemoteAnimationTarget target : animatingTargets) { + SplashScreenExitAnimationUtils.startAnimations(splashView, target.leash, + mSplashMainWindowShiftLength, new TransactionPool(), target.screenSpaceBounds, + SPLASH_ANIMATION_DURATION, SPLASH_FADE_OUT_DURATION, + /* iconStartAlpha= */ 0, /* brandingStartAlpha= */ 0, + SPLASH_APP_REVEAL_DELAY, SPLASH_APP_REVEAL_DURATION, + new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + // Hiding launcher which shows the app surface behind, then + // finishing recents to the app. After transition finish, showing + // the views on launcher again, so it can be visible when next + // animation starts. + splashView.setAlpha(0); + if (quickstepLauncher != null) { + quickstepLauncher.getDepthController() + .pauseBlursOnWindows(false); + } + if (mRecentsAnimationController != null) { + mRecentsAnimationController.finish( + /* toHome= */ false, + /* onFinishComplete= */ () -> splashView.setAlpha(1), + /* reason= */ new ActiveGestureLog.CompoundString( + "AbsSwipeUpHandler.animateSplashScreenExit")); + } } - finishRecentsAnimationOnTasksAppeared(() -> splashView.setAlpha(1)); - } - }); + }); + } } - private void finishRecentsAnimationOnTasksAppeared(Runnable onFinishComplete) { + private void onInvalidTasksAppeared( + Runnable onFinishComplete, ActiveGestureLog.CompoundString failureReason) { + ActiveGestureProtoLogProxy.logOnInvalidTasksAppeared(failureReason); if (mRecentsAnimationController != null) { - mRecentsAnimationController.finish(false /* toRecents */, onFinishComplete); + mRecentsAnimationController.finish( + /* toHome= */ false, + onFinishComplete, + new ActiveGestureLog.CompoundString( + "AbsSwipeUpHandler.onInvalidTasksAppeared")); } - ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimationOnTasksAppeared"); } /** @@ -2546,13 +3022,18 @@ public void initWhenReady(String reasonString) { // Preload the plan RecentsModel.INSTANCE.get(mContext).getTasks(null); - mActivityInitListener.register(reasonString); + mContextInitListener.register(reasonString); } private boolean shouldFadeOutTargetsForKeyboardQuickSwitch( TransformParams transformParams, TaskViewSimulator taskViewSimulator, float progress) { + // Do not fade out if the focus isn't changing to a different task. + if (mRecentsView != null && mRecentsView.getKeyboardFocusTaskView() + == mRecentsView.getCurrentPageTaskView()) { + return false; + } RemoteAnimationTargets targets = transformParams.getTargetSet(); boolean fadeAppTargets = isKeyboardTaskFocusPending() && targets != null @@ -2576,7 +3057,8 @@ private boolean shouldFadeOutTargetsForKeyboardQuickSwitch( transaction.setAlpha(app.leash, 1f - fadeProgress); transaction.setPosition(app.leash, /* x= */ app.startBounds.left - + (mContainer.getDeviceProfile().overviewPageSpacing + + ( + mContainer.getDeviceProfile().getOverviewProfile().getPageSpacing() * (mRecentsView.isRtl() ? fadeProgress : -fadeProgress)), /* y= */ 0f); transaction.setScale(app.leash, 1f, 1f); @@ -2627,15 +3109,13 @@ protected void applyScrollAndTransform() { // Scaling of RecentsView during quick switch based on amount of recents scroll private float getScaleProgressDueToScroll() { - if (mContainer == null || !mContainer.getDeviceProfile().isTablet || mRecentsView == null + if (mContainer == null || !mContainer.getDeviceProfile().getDeviceProperties().isTablet() || mRecentsView == null || !shouldLinkRecentsViewScroll()) { return 0; } float scrollOffset = Math.abs(mRecentsView.getScrollOffset(mRecentsView.getCurrentPage())); - Rect carouselTaskSize = enableGridOnlyOverview() - ? mRecentsView.getLastComputedCarouselTaskSize() - : mRecentsView.getLastComputedTaskSize(); + Rect carouselTaskSize = mRecentsView.getLastComputedTaskSize(); int maxScrollOffset = mRecentsView.getPagedOrientationHandler().getPrimaryValue( carouselTaskSize.width(), carouselTaskSize.height()); maxScrollOffset += mRecentsView.getPageSpacing(); @@ -2664,7 +3144,7 @@ private float getScaleProgressDueToScroll() { */ @Override protected float overrideDisplacementForTransientTaskbar(float displacement) { - if (!mIsTransientTaskbar) { + if (!shouldAllowTaskbarToAutoStash()) { return displacement; } @@ -2685,6 +3165,46 @@ protected float overrideDisplacementForTransientTaskbar(float displacement) { return displacement; } + private boolean shouldAllowTaskbarToAutoStash() { + if (refactorTaskbarUiState()) { + final boolean ret = newShouldAllowTaskbarToAutoStash(); + if (BuildConfigs.IS_STUDIO_BUILD && ret != legacyShouldAllowTaskbarToAutoStash()) { + throw new IllegalStateException("shouldAllowTaskbarToAutoStash() doesn't match"); + } + return ret; + } else { + return legacyShouldAllowTaskbarToAutoStash(); + } + } + + private boolean legacyShouldAllowTaskbarToAutoStash() { + return mContainerInterface.getTaskbarInteractor() == null + ? mIsTransientTaskbar + : mContainerInterface.getTaskbarInteractor().shouldAllowTaskbarToAutoStash(); + } + + private boolean newShouldAllowTaskbarToAutoStash() { + final int displayId = mContext.getDisplayId(); + final TaskbarUiState taskbarUiState = TaskbarUiStateMonitor.INSTANCE.get(mContext) + .getTaskbarUiState(displayId); + + // Mimic TaskbarActivityContext.isTransientTaskbar + final boolean isInPhoneMode = mDp.getDeviceProperties().isPhone() && !mDp.isTaskbarPresent; + if (mIsTransientTaskbar + && taskbarUiState.isPrimaryDisplayRef().getValue() && !isInPhoneMode) { + return true; + } + + final boolean isTaskbarPinningOnInDesktopMode = + LauncherPrefs.TASKBAR_PINNING_IN_DESKTOP_MODE.get(mContext); + final boolean isTaskbarShowingDesktopTasks = + DesktopVisibilityController.INSTANCE.get(mContext).isInDesktopMode(displayId) + || taskbarUiState.getShowDesktopTaskbarForFreeformDisplayRef().getValue() + || (taskbarUiState.getShowLockedTaskbarOnHome().getValue() + && taskbarUiState.isTaskbarOnHomeRef().getValue()); + return !isTaskbarPinningOnInDesktopMode && isTaskbarShowingDesktopTasks; + } + private void setDividerShown(boolean shown) { if (mRecentsAnimationTargets == null || mIsDividerShown == shown) { return; @@ -2695,6 +3215,7 @@ private void setDividerShown(boolean shown) { } public interface Factory { - AbsSwipeUpHandler newHandler(GestureState gestureState, long touchTimeMs); + @Nullable + AbsSwipeUpHandler newHandler(GestureState gestureState, long touchTimeMs); } } diff --git a/quickstep/src/com/android/quickstep/AllAppsActionManager.kt b/quickstep/src/com/android/quickstep/AllAppsActionManager.kt index 6fd68d551e3..c36e5404a0a 100644 --- a/quickstep/src/com/android/quickstep/AllAppsActionManager.kt +++ b/quickstep/src/com/android/quickstep/AllAppsActionManager.kt @@ -21,10 +21,18 @@ import android.app.PendingIntent import android.app.RemoteAction import android.content.Context import android.graphics.drawable.Icon +import android.provider.Settings +import android.provider.Settings.Secure.USER_SETUP_COMPLETE import android.view.accessibility.AccessibilityManager import com.android.launcher3.R +import com.android.launcher3.util.SettingsCache +import com.android.launcher3.util.SettingsCache.OnChangeListener +import com.android.quickstep.input.QuickstepKeyGestureEventsManager +import java.io.PrintWriter import java.util.concurrent.Executor +private val USER_SETUP_COMPLETE_URI = Settings.Secure.getUriFor(USER_SETUP_COMPLETE) + /** * Registers a [RemoteAction] for toggling All Apps if needed. * @@ -35,9 +43,16 @@ import java.util.concurrent.Executor class AllAppsActionManager( private val context: Context, private val bgExecutor: Executor, + private val quickstepKeyGestureEventsManager: QuickstepKeyGestureEventsManager, private val createAllAppsPendingIntent: () -> PendingIntent, ) { + private val onSettingsChangeListener = OnChangeListener { v -> isUserSetupComplete = v } + + init { + SettingsCache.INSTANCE[context].register(USER_SETUP_COMPLETE_URI, onSettingsChangeListener) + } + /** `true` if home and overview are the same Activity. */ var isHomeAndOverviewSame = false set(value) { @@ -52,40 +67,87 @@ class AllAppsActionManager( updateSystemAction() } + /** `true` if the setup UI is visible. */ + var isSetupUiVisible = false + set(value) { + field = value + updateSystemAction() + } + + private var isUserSetupComplete = + SettingsCache.INSTANCE[context].getValue(USER_SETUP_COMPLETE_URI) + set(value) { + field = value + updateSystemAction() + } + /** `true` if the action should be registered. */ var isActionRegistered = false private set + private var isUserUnlocked = false + + fun onUserUnlocked() { + isUserUnlocked = true + updateSystemAction() + } + private fun updateSystemAction() { - val shouldRegisterAction = isHomeAndOverviewSame || isTaskbarPresent - if (isActionRegistered == shouldRegisterAction) return - isActionRegistered = shouldRegisterAction - - bgExecutor.execute { - val accessibilityManager = - context.getSystemService(AccessibilityManager::class.java) ?: return@execute - if (shouldRegisterAction) { - accessibilityManager.registerSystemAction( - RemoteAction( - Icon.createWithResource(context, R.drawable.ic_apps), - context.getString(R.string.all_apps_label), - context.getString(R.string.all_apps_label), - createAllAppsPendingIntent(), - ), - GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS, - ) - } else { - accessibilityManager.unregisterSystemAction(GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS) + synchronized(this) { + val isInSetupFlow = isSetupUiVisible || !isUserSetupComplete + val shouldRegisterAction = + (isHomeAndOverviewSame || isTaskbarPresent) && !isInSetupFlow && isUserUnlocked + if (isActionRegistered == shouldRegisterAction) return + isActionRegistered = shouldRegisterAction + + bgExecutor.execute { + val accessibilityManager = + context.getSystemService(AccessibilityManager::class.java) ?: return@execute + if (shouldRegisterAction) { + val allAppsPendingIntent = createAllAppsPendingIntent() + accessibilityManager.registerSystemAction( + RemoteAction( + Icon.createWithResource(context, R.drawable.ic_apps), + context.getString(R.string.all_apps_label), + context.getString(R.string.all_apps_label), + allAppsPendingIntent, + ), + GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS, + ) + quickstepKeyGestureEventsManager.registerAllAppsKeyGestureEvent( + allAppsPendingIntent + ) + } else { + accessibilityManager.unregisterSystemAction( + GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS + ) + quickstepKeyGestureEventsManager.unregisterAllAppsKeyGestureEvent() + } } } } fun onDestroy() { - isActionRegistered = false - context - .getSystemService(AccessibilityManager::class.java) - ?.unregisterSystemAction( - GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS, + synchronized(this) { + isActionRegistered = false + context + .getSystemService(AccessibilityManager::class.java) + ?.unregisterSystemAction(GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS) + quickstepKeyGestureEventsManager.unregisterAllAppsKeyGestureEvent() + SettingsCache.INSTANCE[context].unregister( + USER_SETUP_COMPLETE_URI, + onSettingsChangeListener, ) + } + } + + fun dump(pw: PrintWriter) { + pw.println("AllAppsActionManager:") + pw.println("\tisHomeAndOverviewSame=$isHomeAndOverviewSame") + pw.println("\tisTaskbarPresent=$isTaskbarPresent") + pw.println("\tisSetupUiVisible=$isSetupUiVisible") + pw.println("\tisUserSetupComplete=$isUserSetupComplete") + pw.println("\tisActionRegistered=$isActionRegistered") + pw.println("\tisUserUnlocked=$isUserUnlocked") } } diff --git a/quickstep/src/com/android/quickstep/AspectRatioSystemShortcut.kt b/quickstep/src/com/android/quickstep/AspectRatioSystemShortcut.kt new file mode 100644 index 00000000000..9013ff082b3 --- /dev/null +++ b/quickstep/src/com/android/quickstep/AspectRatioSystemShortcut.kt @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.content.Intent +import android.provider.Settings +import android.view.View +import androidx.core.net.toUri +import com.android.launcher3.AbstractFloatingViewHelper +import com.android.launcher3.R +import com.android.launcher3.logging.StatsLogManager.LauncherEvent +import com.android.launcher3.popup.SystemShortcut +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.TaskContainer +import com.android.window.flags2.Flags.universalResizableByDefault + +/** + * System shortcut to change the application's aspect ratio compatibility mode. + * + * This shows up only on screens that are not compact, ie. shortest-width greater than {@link + * com.android.launcher3.util.window.WindowManagerProxy#MIN_TABLET_WIDTH}. + */ +class AspectRatioSystemShortcut( + viewContainer: RecentsViewContainer, + taskContainer: TaskContainer, + abstractFloatingViewHelper: AbstractFloatingViewHelper, +) : + SystemShortcut( + R.drawable.ic_aspect_ratio, + R.string.recent_task_option_aspect_ratio, + viewContainer, + taskContainer.itemInfo, + taskContainer.taskView, + abstractFloatingViewHelper, + ) { + override fun onClick(view: View) { + dismissTaskMenuView() + + val intent = + Intent(Settings.ACTION_MANAGE_USER_ASPECT_RATIO_SETTINGS) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + if (mItemInfo.targetPackage != null) { + intent.setData(("package:" + mItemInfo.targetPackage).toUri()) + } + + mTarget.startActivitySafely(view, intent, mItemInfo) + mTarget.statsLogManager + .logger() + .withItemInfo(mItemInfo) + .log(LauncherEvent.LAUNCHER_ASPECT_RATIO_SETTINGS_SYSTEM_SHORTCUT_TAP) + } + + companion object { + /** Optionally create a factory for the aspect ratio system shortcut. */ + @JvmOverloads + fun createFactory( + abstractFloatingViewHelper: AbstractFloatingViewHelper = AbstractFloatingViewHelper() + ): TaskShortcutFactory { + return object : TaskShortcutFactory { + override fun getShortcuts( + viewContainer: RecentsViewContainer, + taskContainer: TaskContainer, + ): List? { + return when { + // Only available when the feature flag is on. + !universalResizableByDefault() -> null + + // The option is only shown on sw600dp+ screens (checked by isTablet) + !viewContainer.deviceProfile.deviceProperties.isTablet -> null + + else -> { + listOf( + AspectRatioSystemShortcut( + viewContainer, + taskContainer, + abstractFloatingViewHelper, + ) + ) + } + } + } + } + } + } +} diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java index 00cd60b1d65..f76e33f6846 100644 --- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java +++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java @@ -15,35 +15,19 @@ */ package com.android.quickstep; -import static com.android.app.animation.Interpolators.ACCELERATE_2; -import static com.android.app.animation.Interpolators.INSTANT; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe; -import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION; -import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK; -import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_FADE_ANIM; -import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_X_ANIM; -import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET; import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS; import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; -import android.graphics.Color; -import android.view.MotionEvent; - import androidx.annotation.Nullable; -import androidx.annotation.UiThread; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.statehandlers.DepthController; -import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulActivity; -import com.android.launcher3.taskbar.TaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.NavigationMode; import com.android.quickstep.util.AnimatorControllerWithResistance; @@ -61,48 +45,14 @@ public abstract class BaseActivityInterface, ACTIVITY_TYPE extends StatefulActivity & RecentsViewContainer> extends BaseContainerInterface { - private final STATE_TYPE mBackgroundState; private STATE_TYPE mTargetState; - @Nullable private Runnable mOnInitBackgroundStateUICallback = null; - protected BaseActivityInterface(boolean rotationSupportedByActivity, STATE_TYPE overviewState, STATE_TYPE backgroundState) { + super(backgroundState); this.rotationSupportedByActivity = rotationSupportedByActivity; mTargetState = overviewState; - mBackgroundState = backgroundState; - } - - /** - * Called when the current gesture transition is cancelled. - * @param activityVisible Whether the user can see the changes we make here, so try to animate. - * @param endTarget If the gesture ended before we got cancelled, where we were headed. - */ - public void onTransitionCancelled(boolean activityVisible, - @Nullable GestureState.GestureEndTarget endTarget) { - ACTIVITY_TYPE activity = getCreatedContainer(); - if (activity == null) { - return; - } - STATE_TYPE startState = activity.getStateManager().getRestState(); - if (endTarget != null) { - // We were on our way to this state when we got canceled, end there instead. - startState = stateFromGestureEndTarget(endTarget); - DesktopVisibilityController controller = getDesktopVisibilityController(); - if (controller != null && controller.areDesktopTasksVisible() - && endTarget == LAST_TASK) { - // When we are cancelling the transition and going back to last task, move to - // rest state instead when desktop tasks are visible. - // If a fullscreen task is visible, launcher goes to normal state when the - // activity is stopped. This does not happen when desktop tasks are visible - // on top of launcher. Force the launcher state to rest state here. - startState = activity.getStateManager().getRestState(); - // Do not animate the transition - activityVisible = false; - } - } - activity.getStateManager().goToState(startState, activityVisible); } @Nullable @@ -123,27 +73,12 @@ public final boolean isStarted() { return activity != null && activity.isStarted(); } - @UiThread - @Nullable - public abstract T getVisibleRecentsView(); - - @UiThread - public abstract boolean switchToRecentsIfVisible(Animator.AnimatorListener animatorListener); - - public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) { - TaskbarUIController controller = getTaskbarController(); - boolean isEventOverBubbleBarStashHandle = - controller != null && controller.isEventOverBubbleBarStashHandle(ev); - return deviceState.isInDeferredGestureRegion(ev) || deviceState.isImeRenderingNavButtons() - || isTrackpadMultiFingerSwipe(ev) || isEventOverBubbleBarStashHandle; - } - /** * Closes any overlays. */ public void closeOverlay() { - Optional.ofNullable(getTaskbarController()).ifPresent( - TaskbarUIController::hideOverlayWindow); + Optional.ofNullable(getTaskbarInteractor()).ifPresent( + TaskbarInteractor::hideOverlayWindow); } public void switchRunningTaskViewToScreenshot(HashMap thumbnailDatas, @@ -162,48 +97,7 @@ public void switchRunningTaskViewToScreenshot(HashMap th recentsView.switchToScreenshot(thumbnailDatas, runnable); } - - protected void runOnInitBackgroundStateUI(Runnable callback) { - ACTIVITY_TYPE activity = getCreatedContainer(); - if (activity != null && activity.getStateManager().getState() == mBackgroundState) { - callback.run(); - onInitBackgroundStateUI(); - return; - } - mOnInitBackgroundStateUICallback = callback; - } - - private void onInitBackgroundStateUI() { - if (mOnInitBackgroundStateUICallback != null) { - mOnInitBackgroundStateUICallback.run(); - mOnInitBackgroundStateUICallback = null; - } - } - - public interface AnimationFactory { - - void createActivityInterface(long transitionLength); - - /** - * @param attached Whether to show RecentsView alongside the app window. If false, recents - * will be hidden by some property we can animate, e.g. alpha. - * @param animate Whether to animate recents to/from its new attached state. - */ - default void setRecentsAttachedToAppWindow(boolean attached, boolean animate) { } - - default boolean isRecentsAttachedToAppWindow() { - return false; - } - - default boolean hasRecentsEverAttachedToAppWindow() { - return false; - } - - /** Called when the gesture ends and we know what state it is going towards */ - default void setEndTarget(GestureState.GestureEndTarget endTarget) { } - } - - class DefaultAnimationFactory implements AnimationFactory { + class DefaultAnimationFactory implements AnimationFactory { protected final ACTIVITY_TYPE mActivity; private final STATE_TYPE mStartState; @@ -231,7 +125,7 @@ protected ACTIVITY_TYPE initBackgroundStateUI() { } @Override - public void createActivityInterface(long transitionLength) { + public void createContainerInterface(long transitionLength) { PendingAnimation pa = new PendingAnimation(transitionLength * 2); createBackgroundToOverviewAnim(mActivity, pa); AnimatorPlaybackController controller = pa.createPlaybackController(); @@ -254,47 +148,22 @@ public void createActivityInterface(long transitionLength) { // (because we set the animation as the current state animation), so we reapply the // attached state here as well to ensure recents is shown/hidden appropriately. if (DisplayController.getNavigationMode(mActivity) == NavigationMode.NO_BUTTON) { - setRecentsAttachedToAppWindow(mIsAttachedToWindow, false); + setRecentsAttachedToAppWindow( + mIsAttachedToWindow, false, recentsView.shouldUpdateRunningTaskAlpha()); } } @Override - public void setRecentsAttachedToAppWindow(boolean attached, boolean animate) { - if (mIsAttachedToWindow == attached && animate) { - return; - } - mActivity.getStateManager() - .cancelStateElementAnimation(INDEX_RECENTS_FADE_ANIM); - mActivity.getStateManager() - .cancelStateElementAnimation(INDEX_RECENTS_TRANSLATE_X_ANIM); - - AnimatorSet animatorSet = new AnimatorSet(); - animatorSet.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); - mIsAttachedToWindow = attached; - if (attached) { - mHasEverAttachedToWindow = true; - } - }}); - - long animationDuration = animate ? RECENTS_ATTACH_DURATION : 0; - Animator fadeAnim = mActivity.getStateManager() - .createStateElementAnimation(INDEX_RECENTS_FADE_ANIM, attached ? 1 : 0); - fadeAnim.setInterpolator(attached ? INSTANT : ACCELERATE_2); - fadeAnim.setDuration(animationDuration); - animatorSet.play(fadeAnim); - - float fromTranslation = ADJACENT_PAGE_HORIZONTAL_OFFSET.get( - mActivity.getOverviewPanel()); - float toTranslation = attached ? 0 : 1; + public ACTIVITY_TYPE getContainer() { + return mActivity; + } - Animator translationAnimator = mActivity.getStateManager().createStateElementAnimation( - INDEX_RECENTS_TRANSLATE_X_ANIM, fromTranslation, toTranslation); - translationAnimator.setDuration(animationDuration); - animatorSet.play(translationAnimator); - animatorSet.start(); + @Override + public void onAttachedToWindowStateUpdated(boolean isAttachedToWindow) { + mIsAttachedToWindow = isAttachedToWindow; + if (isAttachedToWindow) { + mHasEverAttachedToWindow = true; + } } @Override @@ -318,16 +187,6 @@ protected void createBackgroundToOverviewAnim(ACTIVITY_TYPE activity, PendingAni pa.addFloat(recentsView, RECENTS_SCALE_PROPERTY, recentsView.getMaxScaleForFullScreen(), 1, LINEAR); pa.addFloat(recentsView, FULLSCREEN_PROGRESS, 1, 0, LINEAR); - - pa.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - TaskbarUIController taskbarUIController = getTaskbarController(); - if (taskbarUIController != null) { - taskbarUIController.setSystemGestureInProgress(true); - } - } - }); } } } diff --git a/quickstep/src/com/android/quickstep/BaseContainerInterface.java b/quickstep/src/com/android/quickstep/BaseContainerInterface.java index 0994f8e24ff..c8887581c4b 100644 --- a/quickstep/src/com/android/quickstep/BaseContainerInterface.java +++ b/quickstep/src/com/android/quickstep/BaseContainerInterface.java @@ -15,13 +15,26 @@ */ package com.android.quickstep; +import static com.android.app.animation.Interpolators.ACCELERATE_2; import static com.android.app.animation.Interpolators.INSTANT; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR; +import static com.android.launcher3.Flags.refactorTaskbarUiState; +import static com.android.launcher3.LauncherAnimUtils.SCRIM_COLORS; +import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; +import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION; +import static com.android.quickstep.GestureState.GestureEndTarget.HOME; import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK; import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS; +import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_ATTACHED_ALPHA_ANIM; +import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_FADE_ANIM; +import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_X_ANIM; +import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET; +import static com.android.quickstep.views.RecentsView.RUNNING_TASK_ATTACH_ALPHA; import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Resources; @@ -31,58 +44,95 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.RemoteAnimationTarget; -import android.view.View; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import com.android.launcher3.BuildConfig; +import com.android.launcher3.BuildConfigs; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Flags; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.BaseState; -import com.android.launcher3.taskbar.TaskbarUIController; +import com.android.launcher3.statemanager.StatefulContainer; +import com.android.launcher3.taskbar.TaskbarInteractor; +import com.android.launcher3.taskbar.TaskbarUiState; +import com.android.launcher3.taskbar.TaskbarUiStateMonitor; import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.WindowBounds; +import com.android.launcher3.views.ScrimColors; +import com.android.launcher3.views.ScrimColorsEvaluator; import com.android.launcher3.views.ScrimView; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.ActivityInitListener; import com.android.quickstep.util.AnimatorControllerWithResistance; +import com.android.quickstep.util.ContextInitListener; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; import com.android.systemui.shared.recents.model.ThumbnailData; +import com.android.wm.shell.shared.desktopmode.DesktopState; import java.util.HashMap; +import java.util.List; +import java.util.concurrent.Executor; import java.util.function.Consumer; import java.util.function.Predicate; public abstract class BaseContainerInterface, - CONTAINER_TYPE extends RecentsViewContainer> { + CONTAINER_TYPE extends RecentsViewContainer & StatefulContainer> { public boolean rotationSupportedByActivity = false; + protected final STATE_TYPE mBackgroundState; + + protected BaseContainerInterface(STATE_TYPE backgroundState) { + mBackgroundState = backgroundState; + } + + @UiThread + @Nullable + public abstract > T getVisibleRecentsView(); + + @UiThread + public abstract boolean switchToRecentsIfVisible(Animator.AnimatorListener animatorListener); @Nullable public abstract CONTAINER_TYPE getCreatedContainer(); + @Nullable + protected Runnable mOnInitBackgroundStateUICallback = null; + public abstract boolean isInLiveTileMode(); public abstract void onAssistantVisibilityChanged(float assistantVisibility); - public abstract boolean allowMinimizeSplitScreen(); - public abstract boolean isResumed(); public abstract boolean isStarted(); - public abstract boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, - MotionEvent ev); - - /** @return whether to allow going to All Apps from Overview. */ - public abstract boolean allowAllAppsFromOverview(); + public boolean deferStartingActivity( + @NonNull RecentsAnimationDeviceState deviceState, MotionEvent ev) { + final TaskbarInteractor interactor = getTaskbarInteractor(); + final CONTAINER_TYPE container = getCreatedContainer(); + final TaskbarUiState taskbarUiState = container != null + ? TaskbarUiStateMonitor.INSTANCE.get(container.asContext()) + .getTaskbarUiState(ev.getDisplayId()) + : null; + boolean isEventOverBubbleBarStashHandle = + isEventOverBubbleBarView(interactor, taskbarUiState, ev); + boolean isEventOverAnyTaskbarItem = + isEventOverAnyTaskbarView(interactor, taskbarUiState, ev); + return deviceState.isInDeferredGestureRegion(ev) + || deviceState.isImeRenderingNavButtons() + || isTrackpadMultiFingerSwipe(ev) + || isEventOverBubbleBarStashHandle + || isEventOverAnyTaskbarItem; + } /** * Returns the color of the scrim behind overview when at rest in this state. * Return {@link Color#TRANSPARENT} for no scrim. */ - protected abstract int getOverviewScrimColorForState(CONTAINER_TYPE container, + protected abstract ScrimColors getOverviewScrimColorForState(CONTAINER_TYPE container, STATE_TYPE state); public abstract int getSwipeUpDestinationAndLength( @@ -90,18 +140,101 @@ public abstract int getSwipeUpDestinationAndLength( RecentsPagedOrientationHandler orientationHandler); @Nullable - public abstract TaskbarUIController getTaskbarController(); + public abstract TaskbarInteractor getTaskbarInteractor(); + + public interface AnimationFactory, + CONTAINER_TYPE extends RecentsViewContainer & StatefulContainer> { + + void createContainerInterface(long transitionLength); + + /** + * @param attached Whether to show RecentsView alongside the app window. If false, recents + * will be hidden by some property we can animate, e.g. alpha. + * @param animate Whether to animate recents to/from its new attached state. + * @param updateRunningTaskAlpha Whether to update the running task's attached alpha + */ + default void setRecentsAttachedToAppWindow( + boolean attached, boolean animate, boolean updateRunningTaskAlpha) { + CONTAINER_TYPE container = getContainer(); + if (container == null) { + return; + } + if (isRecentsAttachedToAppWindow() == attached && animate) { + return; + } + container.getStateManager() + .cancelStateElementAnimation(INDEX_RECENTS_FADE_ANIM); + container.getStateManager() + .cancelStateElementAnimation(INDEX_RECENTS_TRANSLATE_X_ANIM); + if (updateRunningTaskAlpha) { + container.getStateManager() + .cancelStateElementAnimation(INDEX_RECENTS_ATTACHED_ALPHA_ANIM); + } + + AnimatorSet animatorSet = new AnimatorSet(); + animatorSet.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + super.onAnimationStart(animation); + onAttachedToWindowStateUpdated(attached); + }}); + + long animationDuration = animate ? RECENTS_ATTACH_DURATION : 0; + Animator fadeAnim = container.getStateManager() + .createStateElementAnimation(INDEX_RECENTS_FADE_ANIM, attached ? 1f : 0f); + fadeAnim.setInterpolator(attached ? INSTANT : ACCELERATE_2); + fadeAnim.setDuration(animationDuration); + animatorSet.play(fadeAnim); + + float fromTranslation = ADJACENT_PAGE_HORIZONTAL_OFFSET.get( + container.getOverviewPanel()); + float toTranslation = attached ? 0f : 1f; + Animator translationAnimator = container.getStateManager().createStateElementAnimation( + INDEX_RECENTS_TRANSLATE_X_ANIM, fromTranslation, toTranslation); + translationAnimator.setDuration(animationDuration); + animatorSet.play(translationAnimator); + + if (updateRunningTaskAlpha) { + float fromAlpha = RUNNING_TASK_ATTACH_ALPHA.get(container.getOverviewPanel()); + float toAlpha = attached ? 1f : 0f; + Animator runningTaskAttachAlphaAnimator = container.getStateManager() + .createStateElementAnimation( + INDEX_RECENTS_ATTACHED_ALPHA_ANIM, fromAlpha, toAlpha); + runningTaskAttachAlphaAnimator.setDuration(animationDuration); + animatorSet.play(runningTaskAttachAlphaAnimator); + } + animatorSet.start(); + } + + default CONTAINER_TYPE getContainer() { + return null; + } + + default void onAttachedToWindowStateUpdated(boolean isAttachedToWindow) { } - public abstract BaseActivityInterface.AnimationFactory prepareRecentsUI( - RecentsAnimationDeviceState deviceState, boolean activityVisible, + default boolean isRecentsAttachedToAppWindow() { + return false; + } + + default boolean hasRecentsEverAttachedToAppWindow() { + return false; + } + + /** Called when the gesture ends and we know what state it is going towards */ + default void setEndTarget(GestureState.GestureEndTarget endTarget) { } + } + + public abstract BaseContainerInterface.AnimationFactory prepareRecentsUI( + boolean activityVisible, Consumer callback); - public abstract ActivityInitListener createActivityInitListener( + public abstract ContextInitListener createActivityInitListener( Predicate onInitListener); /** * Returns the expected STATE_TYPE from the provided GestureEndTarget. */ - public abstract STATE_TYPE stateFromGestureEndTarget(GestureState.GestureEndTarget endTarget); + public abstract STATE_TYPE stateFromGestureEndTarget( + @NonNull GestureState.GestureEndTarget endTarget); public abstract void switchRunningTaskViewToScreenshot(HashMap thumbnailDatas, Runnable runnable); @@ -113,11 +246,17 @@ public abstract Rect getOverviewWindowBounds( public abstract void onLaunchTaskFailed(); - public abstract void onExitOverview(RotationTouchHelper deviceState, - Runnable exitRunnable); + public abstract void onExitOverview(Runnable exitRunnable); + + /** + * @return {@code true} iff the launcher's -1 page is showing + */ + public boolean isLauncherOverlayShowing() { + return false; + } /** Called when the animation to home has fully settled. */ - public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {} + public void onSwipeUpToHomeComplete() {} /** * Sets a callback to be run when an activity launch happens while launcher is not yet resumed. @@ -126,20 +265,46 @@ public void setOnDeferredActivityLaunchCallback(Runnable r) {} /** * @return Whether the gesture in progress should be cancelled. */ - public boolean shouldCancelCurrentGesture() { - return false; + public boolean shouldCancelCurrentGesture(int displayId) { + if (refactorTaskbarUiState()) { + final boolean ret = newIsDraggingItem(displayId); + if (BuildConfigs.IS_STUDIO_BUILD && ret != legacyIsDraggingItem()) { + throw new IllegalStateException("isDraggingItem() doesn't match"); + } + return ret; + } else { + return legacyIsDraggingItem(); + } } - @Nullable - public DesktopVisibilityController getDesktopVisibilityController() { - return null; + private boolean legacyIsDraggingItem() { + TaskbarInteractor taskbarInteractor = getTaskbarInteractor(); + return taskbarInteractor != null && taskbarInteractor.isDraggingItem(); + } + + private boolean newIsDraggingItem(int displayId) { + CONTAINER_TYPE container = getCreatedContainer(); + return container != null + && TaskbarUiStateMonitor.INSTANCE.get(container.asContext()) + .getTaskbarUiState(displayId).isDraggingItemRef().getValue(); + } + + public void runOnInitBackgroundStateUI(Runnable callback) { + StatefulContainer container = getCreatedContainer(); + if (container != null + && container.getStateManager().getState() == mBackgroundState) { + callback.run(); + onInitBackgroundStateUI(); + return; + } + mOnInitBackgroundStateUICallback = callback; } /** * Called when the gesture ends and the animation starts towards the given target. Used to add * an optional additional animation with the same duration. */ - public @Nullable Animator getParallelAnimationToLauncher( + public @Nullable Animator getParallelAnimationToGestureEndTarget( GestureState.GestureEndTarget endTarget, long duration, RecentsAnimationCallbacks callbacks) { if (endTarget == RECENTS) { @@ -150,28 +315,32 @@ public DesktopVisibilityController getDesktopVisibilityController() { RecentsView recentsView = container.getOverviewPanel(); STATE_TYPE state = stateFromGestureEndTarget(endTarget); ScrimView scrimView = container.getScrimView(); - ObjectAnimator anim = ObjectAnimator.ofArgb(scrimView, VIEW_BACKGROUND_COLOR, - getOverviewScrimColorForState(container, state)); - anim.setDuration(duration); - anim.setInterpolator(recentsView == null || !recentsView.isKeyboardTaskFocusPending() - ? LINEAR : INSTANT); - return anim; + ObjectAnimator animScrim = ObjectAnimator.ofObject(scrimView, SCRIM_COLORS, + ScrimColorsEvaluator.INSTANCE, getOverviewScrimColorForState(container, state)); + animScrim.setDuration(duration); + animScrim.setInterpolator( + recentsView == null || !recentsView.isKeyboardTaskFocusPending() + ? LINEAR : INSTANT); + + return animScrim; } return null; } /** - * Called when the animation to the target has finished, but right before updating the state. - * @return A View that needs to draw before ending the recents animation to LAST_TASK. - * (This is a hack to ensure Taskbar draws its background first to avoid flickering.) + * Schedule a {@link FrameHandler} on taskbar's root view before ending the recents animation to + * LAST_TASK. This method is called when the animation to the target has finished, but right + * before updating the state. (This is a hack to ensure Taskbar draws its background first to + * avoid flickering.) + * + * @return true if {@link FrameHandler} is successfully posted and vice versa. */ - public @Nullable View onSettledOnEndTarget(GestureState.GestureEndTarget endTarget) { - TaskbarUIController taskbarUIController = getTaskbarController(); - if (taskbarUIController != null) { - taskbarUIController.setSystemGestureInProgress(false); - return taskbarUIController.getRootView(); + public boolean onSettledOnEndTarget(Runnable callback, Executor executor) { + TaskbarInteractor taskbarInteractor = getTaskbarInteractor(); + if (taskbarInteractor != null) { + return taskbarInteractor.postOnRootViewDraw(callback, executor); } - return null; + return false; } /** @@ -181,50 +350,49 @@ public DesktopVisibilityController getDesktopVisibilityController() { */ public void onTransitionCancelled(boolean activityVisible, @Nullable GestureState.GestureEndTarget endTarget) { - RecentsViewContainer container = getCreatedContainer(); + CONTAINER_TYPE container = getCreatedContainer(); if (container == null) { return; } - RecentsView recentsView = container.getOverviewPanel(); - BaseState startState = recentsView.getStateManager().getRestState(); + STATE_TYPE startState = container.getStateManager().getRestState(); + final var context = container.asContext(); + if (DesktopVisibilityController.INSTANCE.get(context).isInDesktopModeAndNotInOverview( + context.getDisplayId()) && endTarget == null) { + // When tapping on the Taskbar in Desktop mode, reset to BackgroundApp to avoid the + // home screen icons flickering. Technically we could probably be do this for + // non-desktop as well, but limiting to this use case to reduce risk. + endTarget = LAST_TASK; + } if (endTarget != null) { - // We were on our way to this state when we got canceled, end there instead. - startState = stateFromGestureEndTarget(endTarget); - DesktopVisibilityController controller = getDesktopVisibilityController(); - if (controller != null && controller.areDesktopTasksVisible() - && endTarget == LAST_TASK) { - // When we are cancelling the transition and going back to last task, move to - // rest state instead when desktop tasks are visible. - // If a fullscreen task is visible, launcher goes to normal state when the - // activity is stopped. This does not happen when desktop tasks are visible - // on top of launcher. Force the launcher state to rest state here. - startState = recentsView.getStateManager().getRestState(); - // Do not animate the transition + // In the case where home is always shown behind desktop, ensure that we reset to + // Normal home state, and set `activityVisible` to false so we don't animate home + // because home is already showing. + if (DesktopState.getInstance(context).getShouldShowHomeBehindDesktop()) { + endTarget = HOME; activityVisible = false; } + // We were on our way to this state when we got canceled, end there instead. + startState = stateFromGestureEndTarget(endTarget); } - recentsView.getStateManager().goToState(startState, activityVisible); + container.getStateManager().goToState(startState, activityVisible); } public final void calculateTaskSize(Context context, DeviceProfile dp, Rect outRect, RecentsPagedOrientationHandler orientationHandler) { - if (dp.isTablet) { - if (Flags.enableGridOnlyOverview()) { - calculateGridTaskSize(context, dp, outRect, orientationHandler); - } else { - calculateFocusTaskSize(context, dp, outRect); - } + if (dp.getDeviceProperties().isTablet()) { + calculateLargeTileSize(context, dp, outRect); } else { Resources res = context.getResources(); float maxScale = res.getFloat(R.dimen.overview_max_scale); - int taskMargin = dp.overviewTaskMarginPx; + int taskMargin = dp.getOverviewProfile().getTaskMarginPx(); // In fake orientation, OverviewActions is hidden and we only leave a margin there. int overviewActionsClaimedSpace = orientationHandler.isLayoutNaturalToLauncher() - ? dp.getOverviewActionsClaimedSpace() : dp.overviewActionsTopMarginPx; + ? dp.getOverviewActionsClaimedSpace() + : dp.getOverviewProfile().getActionsTopMarginPx(); calculateTaskSizeInternal( context, dp, - dp.overviewTaskThumbnailTopMarginPx, + dp.getOverviewProfile().getTaskThumbnailTopMarginPx(), overviewActionsClaimedSpace, res.getDimensionPixelSize(R.dimen.overview_minimum_next_prev_size) + taskMargin, maxScale, @@ -234,35 +402,18 @@ public final void calculateTaskSize(Context context, DeviceProfile dp, Rect outR } } - /** - * Calculates the taskView size for carousel during app to overview animation on tablets. - */ - public final void calculateCarouselTaskSize(Context context, DeviceProfile dp, Rect outRect, - RecentsPagedOrientationHandler orientationHandler) { - if (dp.isTablet && dp.isGestureMode) { - Resources res = context.getResources(); - float minScale = res.getFloat(R.dimen.overview_carousel_min_scale); - Rect gridRect = new Rect(); - calculateGridSize(dp, context, gridRect); - calculateTaskSizeInternal(context, dp, gridRect, minScale, Gravity.CENTER | Gravity.TOP, - outRect); - } else { - calculateTaskSize(context, dp, outRect, orientationHandler); - } - } - - private void calculateFocusTaskSize(Context context, DeviceProfile dp, Rect outRect) { + private void calculateLargeTileSize(Context context, DeviceProfile dp, Rect outRect) { Resources res = context.getResources(); float maxScale = res.getFloat(R.dimen.overview_max_scale); Rect gridRect = new Rect(); calculateGridSize(dp, context, gridRect); - calculateTaskSizeInternal(context, dp, gridRect, maxScale, Gravity.CENTER, outRect); + calculateTaskSizeInternal(dp, gridRect, maxScale, Gravity.CENTER, outRect); } private void calculateTaskSizeInternal(Context context, DeviceProfile dp, int claimedSpaceAbove, int claimedSpaceBelow, int minimumHorizontalPadding, float maxScale, int gravity, Rect outRect, RecentsPagedOrientationHandler orientationHandler) { - Rect potentialTaskRect = new Rect(0, 0, dp.widthPx, dp.heightPx); + Rect potentialTaskRect = new Rect(0, 0, dp.getDeviceProperties().getWidthPx(), dp.getDeviceProperties().getHeightPx()); Rect insets; if (orientationHandler.isLayoutNaturalToLauncher()) { @@ -270,8 +421,11 @@ private void calculateTaskSizeInternal(Context context, DeviceProfile dp, int cl } else { Rect portraitInsets = dp.getInsets(); DisplayController displayController = DisplayController.INSTANCE.get(context); - Rect deviceRotationInsets = displayController.getInfo().getCurrentBounds().get( - orientationHandler.getRotation()).insets; + @Nullable List windowBounds = + displayController.getInfo().getCurrentBounds(); + Rect deviceRotationInsets = windowBounds != null + ? windowBounds.get(orientationHandler.getRotation()).insets + : new Rect(); // Obtain the landscape/seascape insets, and rotate it to portrait perspective. orientationHandler.rotateInsets(deviceRotationInsets, outRect); // Then combine with portrait's insets to leave space for status bar/nav bar in @@ -295,12 +449,12 @@ private void calculateTaskSizeInternal(Context context, DeviceProfile dp, int cl orientationHandler.rotateInsets(outRect, outRect); // potentialTaskRect.inset(outRect); - calculateTaskSizeInternal(context, dp, potentialTaskRect, maxScale, gravity, outRect); + calculateTaskSizeInternal(dp, potentialTaskRect, maxScale, gravity, outRect); } - private void calculateTaskSizeInternal(Context context, DeviceProfile dp, + private void calculateTaskSizeInternal(DeviceProfile dp, Rect potentialTaskRect, float targetScale, int gravity, Rect outRect) { - PointF taskDimension = getTaskDimension(context, dp); + PointF taskDimension = getTaskDimension(dp); float scale = Math.min( potentialTaskRect.width() / taskDimension.x, @@ -312,20 +466,21 @@ private void calculateTaskSizeInternal(Context context, DeviceProfile dp, Gravity.apply(gravity, outWidth, outHeight, potentialTaskRect, outRect); } - private static PointF getTaskDimension(Context context, DeviceProfile dp) { + private static PointF getTaskDimension(DeviceProfile dp) { PointF dimension = new PointF(); - getTaskDimension(context, dp, dimension); + getTaskDimension(dp, dimension); return dimension; } /** * Gets the dimension of the task in the current system state. */ - public static void getTaskDimension(Context context, DeviceProfile dp, PointF out) { - out.x = dp.widthPx; - out.y = dp.heightPx; - if (dp.isTablet && !DisplayController.isTransientTaskbar(context)) { - out.y -= dp.taskbarHeight; + public static void getTaskDimension(DeviceProfile dp, PointF out) { + out.x = dp.getDeviceProperties().getWidthPx(); + out.y = dp.getDeviceProperties().getHeightPx(); + if (dp.getDeviceProperties().isTablet() + && !dp.getTaskbarProfile().isTransientTaskbar()) { + out.y -= dp.getTaskbarProfile().getHeight(); } } @@ -334,17 +489,11 @@ public static void getTaskDimension(Context context, DeviceProfile dp, PointF ou */ public final void calculateGridSize(DeviceProfile dp, Context context, Rect outRect) { Rect insets = dp.getInsets(); - int topMargin = dp.overviewTaskThumbnailTopMarginPx; + int topMargin = dp.getOverviewProfile().getTaskThumbnailTopMarginPx(); int bottomMargin = dp.getOverviewActionsClaimedSpace(); - if (dp.isTaskbarPresent && Flags.enableGridOnlyOverview()) { - topMargin += context.getResources().getDimensionPixelSize( - R.dimen.overview_top_margin_grid_only); - bottomMargin += context.getResources().getDimensionPixelSize( - R.dimen.overview_bottom_margin_grid_only); - } - int sideMargin = dp.overviewGridSideMargin; + int sideMargin = dp.getOverviewProfile().getGridSideMargin(); - outRect.set(0, 0, dp.widthPx, dp.heightPx); + outRect.set(0, 0, dp.getDeviceProperties().getWidthPx(), dp.getDeviceProperties().getHeightPx()); if (Utilities.ATLEAST_S) { outRect.inset(Math.max(insets.left, sideMargin), insets.top + topMargin, Math.max(insets.right, sideMargin), Math.max(insets.bottom, bottomMargin)); @@ -365,17 +514,15 @@ public final void calculateGridTaskSize(Context context, DeviceProfile dp, Rect RecentsPagedOrientationHandler orientationHandler) { Resources res = context.getResources(); Rect potentialTaskRect = new Rect(); - if (Flags.enableGridOnlyOverview()) { - calculateGridSize(dp, context, potentialTaskRect); - } else { - calculateFocusTaskSize(context, dp, potentialTaskRect); - } + calculateLargeTileSize(context, dp, potentialTaskRect); - float rowHeight = (potentialTaskRect.height() + dp.overviewTaskThumbnailTopMarginPx - - dp.overviewRowSpacing) / 2f; + float rowHeight = (potentialTaskRect.height() + + dp.getOverviewProfile().getTaskThumbnailTopMarginPx() + - dp.getOverviewProfile().getRowSpacing()) / 2f; - PointF taskDimension = getTaskDimension(context, dp); - float scale = (rowHeight - dp.overviewTaskThumbnailTopMarginPx) / taskDimension.y; + PointF taskDimension = getTaskDimension(dp); + float scale = (rowHeight - dp.getOverviewProfile().getTaskThumbnailTopMarginPx()) + / taskDimension.y; int outWidth = Math.round(scale * taskDimension.x); int outHeight = Math.round(scale * taskDimension.y); @@ -390,25 +537,75 @@ public final void calculateGridTaskSize(Context context, DeviceProfile dp, Rect public final void calculateModalTaskSize(Context context, DeviceProfile dp, Rect outRect, RecentsPagedOrientationHandler orientationHandler) { calculateTaskSize(context, dp, outRect, orientationHandler); - boolean isGridOnlyOverview = dp.isTablet && Flags.enableGridOnlyOverview(); - int claimedSpaceBelow = isGridOnlyOverview - ? dp.overviewActionsTopMarginPx + dp.overviewActionsHeight + dp.stashedTaskbarHeight - : (dp.heightPx - outRect.bottom - dp.getInsets().bottom); + boolean isGridOnlyOverview = dp.getDeviceProperties().isTablet() && enableGridOnlyOverview(); int minimumHorizontalPadding = 0; if (!isGridOnlyOverview) { float maxScale = context.getResources().getFloat(R.dimen.overview_modal_max_scale); minimumHorizontalPadding = - Math.round((dp.availableWidthPx - outRect.width() * maxScale) / 2); + Math.round((dp.getDeviceProperties().getAvailableWidthPx() - outRect.width() * maxScale) / 2); } calculateTaskSizeInternal( context, dp, - dp.overviewTaskMarginPx, - claimedSpaceBelow, + dp.getOverviewProfile().getTaskMarginPx(), + getModalClaimedSpaceBelow(dp, outRect, isGridOnlyOverview), minimumHorizontalPadding, 1f /*maxScale*/, Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM, outRect, orientationHandler); } + + private boolean isEventOverBubbleBarView( + @Nullable TaskbarInteractor interactor, + @Nullable TaskbarUiState taskbarUiState, MotionEvent ev) { + if (refactorTaskbarUiState()) { + final boolean ret = taskbarUiState != null + && taskbarUiState.isEventOverBubbleBarViews(ev); + if (BuildConfigs.IS_STUDIO_BUILD && ret + != (interactor != null && interactor.isEventOverBubbleBarViews(ev))) { + throw new IllegalStateException("isEventOverBubbleBarView doesn't match"); + } + return ret; + } else { + return interactor != null && interactor.isEventOverBubbleBarViews(ev); + } + } + + private boolean isEventOverAnyTaskbarView(@Nullable TaskbarInteractor interactor, + @Nullable TaskbarUiState taskbarUiState, MotionEvent ev) { + if (refactorTaskbarUiState()) { + final boolean ret = taskbarUiState != null + && taskbarUiState.isEventOverAnyTaskbarItem(ev); + if (BuildConfigs.IS_STUDIO_BUILD && ret + != (interactor != null && interactor.isEventOverAnyTaskbarItem(ev))) { + throw new IllegalStateException("isEventOverAnyTaskbarView doesn't match"); + } + return ret; + } else { + return interactor != null && interactor.isEventOverAnyTaskbarItem(ev); + } + } + + private static int getModalClaimedSpaceBelow(DeviceProfile dp, Rect outRect, + boolean isGridOnlyOverview) { + if (isGridOnlyOverview) { + int modalTaskbarHeight = dp.getTaskbarProfile().isTransientTaskbar() + ? dp.getTaskbarProfile().getStashedTaskbarHeight() + : dp.getTaskbarProfile().getHeight(); + return dp.getOverviewProfile().getActionsTopMarginPx() + + dp.getOverviewProfile().getActionsHeight() + + modalTaskbarHeight + + dp.getOverviewProfile().getActionsTopMarginPx(); + } else { + return dp.getDeviceProperties().getHeightPx() - outRect.bottom - dp.getInsets().bottom; + } + } + + protected void onInitBackgroundStateUI() { + if (mOnInitBackgroundStateUICallback != null) { + mOnInitBackgroundStateUICallback.run(); + mOnInitBackgroundStateUICallback = null; + } + } } diff --git a/quickstep/src/com/android/quickstep/BaseWindowInterface.java b/quickstep/src/com/android/quickstep/BaseWindowInterface.java new file mode 100644 index 00000000000..fd9c4812dcf --- /dev/null +++ b/quickstep/src/com/android/quickstep/BaseWindowInterface.java @@ -0,0 +1,211 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep; + +import static com.android.app.animation.Interpolators.LINEAR; +import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS; +import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; +import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; + +import androidx.annotation.Nullable; + +import com.android.launcher3.Launcher; +import com.android.launcher3.anim.AnimatorPlaybackController; +import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.statehandlers.DepthController; +import com.android.launcher3.taskbar.TaskbarInteractor; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.NavigationMode; +import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.util.AnimatorControllerWithResistance; +import com.android.quickstep.views.RecentsView; +import com.android.quickstep.window.RecentsWindowFlags; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.systemui.shared.recents.model.ThumbnailData; + +import java.util.HashMap; +import java.util.Optional; +import java.util.function.Consumer; + +/** + * Temporary utility class in place for differences needed between + * Recents in Window in Launcher vs Fallback + */ +public abstract class BaseWindowInterface extends + BaseContainerInterface { + + final String TAG = "BaseWindowInterface"; + private RecentsState mTargetState; + + + protected BaseWindowInterface(RecentsState overviewState, RecentsState backgroundState) { + super(backgroundState); + mTargetState = overviewState; + } + + @Nullable + public abstract RecentsWindowManager getCreatedContainer(); + + @Nullable + public DepthController getDepthController() { + return null; + } + + public final boolean isResumed() { + return isStarted(); + } + + public final boolean isStarted() { + RecentsWindowManager windowManager = getCreatedContainer(); + return windowManager != null && windowManager.isStarted(); + } + + /** + * Closes any overlays. + */ + public void closeOverlay() { + Optional.ofNullable(getTaskbarInteractor()).ifPresent( + TaskbarInteractor::hideOverlayWindow); + } + + public void switchRunningTaskViewToScreenshot(HashMap thumbnailDatas, + Runnable runnable) { + RecentsWindowManager windowManager = getCreatedContainer(); + if (windowManager == null) { + return; + } + RecentsView recentsView = windowManager.getOverviewPanel(); + if (recentsView == null) { + if (runnable != null) { + runnable.run(); + } + return; + } + recentsView.switchToScreenshot(thumbnailDatas, runnable); + } + + @Override + public boolean isLauncherOverlayShowing() { + if (!RecentsWindowFlags.enableLauncherOverviewInWindow) { + return false; + } + Launcher launcher = Launcher.ACTIVITY_TRACKER.getCreatedContext(); + + return launcher != null && launcher.getWorkspace().isOverlayShown(); + } + + /** + * todo: Create an abstract animation factory to handle both activity and window implementations + * todo: move new factory into BaseContainerInterface and cleanup. + */ + + class DefaultAnimationFactory implements AnimationFactory { + + protected final RecentsWindowManager mRecentsWindowManager; + private final RecentsState mStartState; + private final Consumer mCallback; + + private boolean mIsAttachedToWindow; + private boolean mHasEverAttachedToWindow; + + DefaultAnimationFactory(Consumer callback) { + mCallback = callback; + + mRecentsWindowManager = getCreatedContainer(); + mStartState = mRecentsWindowManager.getStateManager().getState(); + } + + protected RecentsWindowManager initBackgroundStateUI() { + RecentsState resetState = mStartState; + if (mStartState.shouldDisableRestore()) { + resetState = mRecentsWindowManager.getStateManager().getRestState(); + } + mRecentsWindowManager.getStateManager().setRestState(resetState); + mRecentsWindowManager.getStateManager().goToState(mBackgroundState, false); + onInitBackgroundStateUI(); + return mRecentsWindowManager; + } + + @Override + public void createContainerInterface(long transitionLength) { + PendingAnimation pa = new PendingAnimation(transitionLength * 2); + createBackgroundToOverviewAnim(mRecentsWindowManager, pa); + AnimatorPlaybackController controller = pa.createPlaybackController(); + mRecentsWindowManager.getStateManager().setCurrentUserControlledAnimation(controller); + + // Since we are changing the start position of the UI, reapply the state, at the end + controller.setEndAction(() -> { + mRecentsWindowManager.getStateManager().goToState( + controller.getInterpolatedProgress() > 0.5 ? mTargetState + : mBackgroundState, + /* animated= */ false); + }); + + RecentsView recentsView = mRecentsWindowManager.getOverviewPanel(); + AnimatorControllerWithResistance controllerWithResistance = + AnimatorControllerWithResistance.createForRecents(controller, + mRecentsWindowManager, recentsView.getPagedViewOrientedState(), + mRecentsWindowManager.getDeviceProfile(), recentsView, + RECENTS_SCALE_PROPERTY, recentsView, TASK_SECONDARY_TRANSLATION); + mCallback.accept(controllerWithResistance); + + // Creating the activity controller animation sometimes reapplies the launcher state + // (because we set the animation as the current state animation), so we reapply the + // attached state here as well to ensure recents is shown/hidden appropriately. + if (DisplayController.getNavigationMode(mRecentsWindowManager) + == NavigationMode.NO_BUTTON) { + setRecentsAttachedToAppWindow(mIsAttachedToWindow, false, false); + } + } + + @Override + public RecentsWindowManager getContainer() { + return mRecentsWindowManager; + } + + @Override + public void onAttachedToWindowStateUpdated(boolean isAttachedToWindow) { + mIsAttachedToWindow = isAttachedToWindow; + if (isAttachedToWindow) { + mHasEverAttachedToWindow = true; + } + } + + @Override + public boolean isRecentsAttachedToAppWindow() { + return mIsAttachedToWindow; + } + + @Override + public boolean hasRecentsEverAttachedToAppWindow() { + return mHasEverAttachedToWindow; + } + + @Override + public void setEndTarget(GestureState.GestureEndTarget endTarget) { + mTargetState = stateFromGestureEndTarget(endTarget); + } + + protected void createBackgroundToOverviewAnim(RecentsWindowManager container, + PendingAnimation pa) { + // Scale down recents from being full screen to being in overview. + RecentsView recentsView = container.getOverviewPanel(); + pa.addFloat(recentsView, RECENTS_SCALE_PROPERTY, + recentsView.getMaxScaleForFullScreen(), 1, LINEAR); + pa.addFloat(recentsView, FULLSCREEN_PROGRESS, 1, 0, LINEAR); + } + } +} diff --git a/quickstep/src/com/android/quickstep/BinderTracker.java b/quickstep/src/com/android/quickstep/BinderTracker.java index a876cd868b0..2a42861352b 100644 --- a/quickstep/src/com/android/quickstep/BinderTracker.java +++ b/quickstep/src/com/android/quickstep/BinderTracker.java @@ -26,11 +26,14 @@ import android.os.Trace; import android.util.Log; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.util.SafeCloseable; import com.android.launcher3.util.TraceHelper; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.LinkedList; import java.util.Set; import java.util.function.Consumer; @@ -43,6 +46,9 @@ public class BinderTracker { private static final String TAG = "BinderTracker"; + private static final Boolean DEBUG_STACKTRACE = false; + + private static final String[] sActionablePackageKeywords = {"launcher3", "systemui"}; // Common IPCs that are ok to block the main thread. private static final Set sAllowedFrameworkClasses = Set.of( @@ -145,13 +151,32 @@ public Object onTransactStarted(IBinder binder, int transactionCode, int flags) if (ipcBypass == null) { mUnexpectedTransactionCallback.accept(new BinderCallSite( - mMainThreadTraceStack.peekLast(), descriptor, transactionCode)); + mMainThreadTraceStack.peekLast(), descriptor, transactionCode, + getActionableStacktrace())); } else { Log.d(TAG, "MainThread-IPC " + descriptor + " ignored due to " + ipcBypass); } return null; } + @NonNull + private static String getActionableStacktrace() { + if (!DEBUG_STACKTRACE) { + return "DEBUG_STACKTRACE not turned on."; + } + final StringWriter sw = new StringWriter(); + new Throwable().printStackTrace(new PrintWriter(sw)); + final String stackTrace = sw.toString(); + + for (String actionablePackageKeyword : sActionablePackageKeywords) { + if (stackTrace.contains(actionablePackageKeyword)) { + return stackTrace; + } + } + + return "Not actionable to launcher"; + } + @Override public Object onTransactStarted(IBinder binder, int transactionCode) { // Do nothing @@ -177,11 +202,14 @@ public static class BinderCallSite { public final String activeTrace; public final String descriptor; public final int transactionCode; + public final String stackTrace; - BinderCallSite(String activeTrace, String descriptor, int transactionCode) { + BinderCallSite( + String activeTrace, String descriptor, int transactionCode, String stackTrace) { this.activeTrace = activeTrace; this.descriptor = descriptor; this.transactionCode = transactionCode; + this.stackTrace = stackTrace; } } } diff --git a/quickstep/src/com/android/quickstep/DesktopFullscreenDrawParams.kt b/quickstep/src/com/android/quickstep/DesktopFullscreenDrawParams.kt new file mode 100644 index 00000000000..7cf4f71b475 --- /dev/null +++ b/quickstep/src/com/android/quickstep/DesktopFullscreenDrawParams.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.quickstep + +import android.content.Context +import com.android.wm.shell.shared.R + +// DesktopTaskView thumbnail's corner radius is independent of fullscreenProgress. +open class DesktopFullscreenDrawParams +@JvmOverloads +constructor(context: Context, cornerRadiusProvider: (Context) -> Float = ::computeCornerRadius) : + FullscreenDrawParams(context, cornerRadiusProvider, cornerRadiusProvider) { + companion object { + // computeCornerRadius is used as cornerRadiusProvider, so + // QuickStepContract::getWindowCornerRadius can be mocked properly. + fun computeCornerRadius(context: Context): Float = + context.resources.getDimension(R.dimen.desktop_windowing_freeform_rounded_corner_radius) + } +} diff --git a/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt b/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt index 9c188f31c3f..6a43d91f82f 100644 --- a/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt +++ b/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt @@ -17,37 +17,42 @@ package com.android.quickstep import android.view.View +import com.android.internal.jank.Cuj +import com.android.internal.policy.DesktopModeCompatPolicy import com.android.launcher3.AbstractFloatingViewHelper import com.android.launcher3.R import com.android.launcher3.logging.StatsLogManager.LauncherEvent import com.android.launcher3.popup.SystemShortcut import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsViewContainer -import com.android.quickstep.views.TaskView.TaskContainer -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource -import com.android.wm.shell.shared.DesktopModeStatus +import com.android.quickstep.views.TaskContainer +import com.android.systemui.shared.system.InteractionJankMonitorWrapper +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource /** A menu item, "Desktop", that allows the user to bring the current app into Desktop Windowing. */ class DesktopSystemShortcut( container: RecentsViewContainer, private val taskContainer: TaskContainer, - abstractFloatingViewHelper: AbstractFloatingViewHelper + abstractFloatingViewHelper: AbstractFloatingViewHelper, ) : SystemShortcut( - R.drawable.ic_caption_desktop_button_foreground, + R.drawable.ic_desktop, R.string.recent_task_option_desktop, container, taskContainer.itemInfo, taskContainer.taskView, - abstractFloatingViewHelper + abstractFloatingViewHelper, ) { override fun onClick(view: View) { + InteractionJankMonitorWrapper.begin(view, Cuj.CUJ_DESKTOP_MODE_ENTER_FROM_OVERVIEW_MENU) dismissTaskMenuView() val recentsView = mTarget.getOverviewPanel>() recentsView.moveTaskToDesktop( taskContainer, - DesktopModeTransitionSource.APP_FROM_OVERVIEW + DesktopModeTransitionSource.OVERVIEW_TASK_MENU, ) { + InteractionJankMonitorWrapper.end(Cuj.CUJ_DESKTOP_MODE_ENTER_FROM_OVERVIEW_MENU) mTarget.statsLogManager .logger() .withItemInfo(taskContainer.itemInfo) @@ -60,26 +65,45 @@ class DesktopSystemShortcut( @JvmOverloads fun createFactory( abstractFloatingViewHelper: AbstractFloatingViewHelper = AbstractFloatingViewHelper() - ): TaskShortcutFactory { - return object : TaskShortcutFactory { + ): TaskShortcutFactory = + object : TaskShortcutFactory { + override fun getShortcuts( container: RecentsViewContainer, - taskContainer: TaskContainer + taskContainer: TaskContainer, ): List? { - return if (!DesktopModeStatus.canEnterDesktopMode(container.asContext())) null - else if (!taskContainer.task.isDockable) null - else - listOf( - DesktopSystemShortcut( - container, - taskContainer, - abstractFloatingViewHelper + val context = container.asContext() + val taskKey = taskContainer.task.key + val desktopModeCompatPolicy = DesktopModeCompatPolicy(context) + + return when { + !DesktopModeStatus.isDesktopModeSupportedOnDisplay( + context, + context.display, + ) -> null + + desktopModeCompatPolicy.shouldDisableDesktopEntryPoints( + taskKey.baseActivity?.packageName, + taskKey.numActivities, + taskKey.isTopActivityNoDisplay, + taskKey.isActivityStackTransparent, + taskKey.topActivityType, + ) -> null + + !taskContainer.task.isDockable -> null + + else -> + listOf( + DesktopSystemShortcut( + container, + taskContainer, + abstractFloatingViewHelper, + ) ) - ) + } } override fun showForGroupedTask() = true } - } } } diff --git a/quickstep/src/com/android/quickstep/DeviceConfigWrapper.kt b/quickstep/src/com/android/quickstep/DeviceConfigWrapper.kt index 3549a1281d5..9d7f7042288 100644 --- a/quickstep/src/com/android/quickstep/DeviceConfigWrapper.kt +++ b/quickstep/src/com/android/quickstep/DeviceConfigWrapper.kt @@ -52,7 +52,11 @@ class DeviceConfigWrapper private constructor(propReader: PropReader) { ) val lpnhTimeoutMs = - propReader.get("LPNH_TIMEOUT_MS", 450, "Controls lpnh timeout in milliseconds") + propReader.get( + "LPNH_TIMEOUT_MS", + DEFAULT_LPNH_TIMEOUT_MS, + "Controls lpnh timeout in milliseconds" + ) val lpnhSlopPercentage = propReader.get("LPNH_SLOP_PERCENTAGE", 100, "Controls touch slop percentage for lpnh") @@ -64,11 +68,19 @@ class DeviceConfigWrapper private constructor(propReader: PropReader) { "Enable two stage for LPNH duration and touch slop" ) - val twoStageMultiplier = + val twoStageDurationPercentage = + propReader.get( + "TWO_STAGE_DURATION_PERCENTAGE", + 200, + "Extends the duration to trigger a long press after a fraction of the gesture " + + "slop is passed, expressed as a percentage (i.e. 200 = 2x)." + ) + + val twoStageSlopPercentage = propReader.get( - "TWO_STAGE_MULTIPLIER", - 2, - "Extends the duration and touch slop if the initial slop is passed" + "TWO_STAGE_SLOP_PERCENTAGE", + 50, + "Percentage of gesture slop region to trigger the extended long press duration." ) val animateLpnh = propReader.get("ANIMATE_LPNH", false, "Animates navbar when long pressing") @@ -130,13 +142,6 @@ class DeviceConfigWrapper private constructor(propReader: PropReader) { "Controls extra dp on the nav bar sides to trigger LPNH. Can be negative for a smaller touch region." ) - val allAppsOverviewThreshold = - propReader.get( - "ALL_APPS_OVERVIEW_THRESHOLD", - 180, - "Threshold to open All Apps from Overview" - ) - /** Dump config values. */ fun dump(prefix: String, writer: PrintWriter) { writer.println("$prefix DeviceConfigWrapper:") @@ -147,6 +152,9 @@ class DeviceConfigWrapper private constructor(propReader: PropReader) { writer.println("$prefix\tanimateLpnh=$animateLpnh") writer.println("$prefix\tshrinkNavHandleOnPress=$shrinkNavHandleOnPress") writer.println("$prefix\tlpnhTimeoutMs=$lpnhTimeoutMs") + writer.println("$prefix\tenableLpnhTwoStages=$enableLpnhTwoStages") + writer.println("$prefix\ttwoStageDurationPercentage=$twoStageDurationPercentage") + writer.println("$prefix\ttwoStageSlopPercentage=$twoStageSlopPercentage") writer.println("$prefix\tenableLongPressNavHandle=$enableLongPressNavHandle") writer.println("$prefix\tenableSearchHapticHint=$enableSearchHapticHint") writer.println("$prefix\tenableSearchHapticCommit=$enableSearchHapticCommit") @@ -157,12 +165,13 @@ class DeviceConfigWrapper private constructor(propReader: PropReader) { writer.println("$prefix\tenableLpnhDeepPress=$enableLpnhDeepPress") writer.println("$prefix\tlpnhHapticHintDelay=$lpnhHapticHintDelay") writer.println("$prefix\tlpnhExtraTouchWidthDp=$lpnhExtraTouchWidthDp") - writer.println("$prefix\tallAppsOverviewThreshold=$allAppsOverviewThreshold") } companion object { @JvmStatic val configHelper by lazy { DeviceConfigHelper(::DeviceConfigWrapper) } @JvmStatic fun get() = configHelper.config + + const val DEFAULT_LPNH_TIMEOUT_MS = 450 } } diff --git a/quickstep/src/com/android/quickstep/DisplayModel.kt b/quickstep/src/com/android/quickstep/DisplayModel.kt new file mode 100644 index 00000000000..af2a43898a2 --- /dev/null +++ b/quickstep/src/com/android/quickstep/DisplayModel.kt @@ -0,0 +1,139 @@ +/* + * 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.quickstep + +import android.content.Context +import android.hardware.display.DisplayManager +import android.util.Log +import android.util.SparseArray +import android.view.Display +import android.window.DesktopExperienceFlags +import androidx.core.util.valueIterator +import com.android.app.displaylib.DisplayDecorationListener +import com.android.app.displaylib.DisplaysWithDecorationsRepositoryCompat +import com.android.quickstep.DisplayModel.DisplayResource +import java.io.PrintWriter +import kotlinx.coroutines.CoroutineDispatcher + +/** data model for managing resources with lifecycles that match that of the connected display */ +abstract class DisplayModel( + val context: Context, + private val systemDecorationChangeObserver: SystemDecorationChangeObserver, + private val displaysWithDecorationsRepositoryCompat: DisplaysWithDecorationsRepositoryCompat, + private val dispatcher: CoroutineDispatcher, +) : DisplayDecorationListener { + + companion object { + private const val TAG = "DisplayModel" + private const val DEBUG = false + } + + private val displayManager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager + private val displayResourceArray = SparseArray() + private val useDisplayDecorationListener: Boolean = + DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue() && + DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue() + + override fun onDisplayAddSystemDecorations(displayId: Int) { + if (DEBUG) Log.d(TAG, "onDisplayAdded: displayId=$displayId") + storeDisplayResource(displayId) + } + + override fun onDisplayRemoved(displayId: Int) { + if (DEBUG) Log.d(TAG, "onDisplayRemoved: displayId=$displayId") + deleteDisplayResource(displayId) + } + + override fun onDisplayRemoveSystemDecorations(displayId: Int) { + if (DEBUG) Log.d(TAG, "onDisplayRemoveSystemDecorations: displayId=$displayId") + deleteDisplayResource(displayId) + } + + protected abstract fun createDisplayResource(display: Display): RESOURCE_TYPE + + protected fun initializeDisplays() { + if (useDisplayDecorationListener) { + displaysWithDecorationsRepositoryCompat.registerDisplayDecorationListener( + this, + dispatcher, + ) + } else { + systemDecorationChangeObserver.registerDisplayDecorationListener(this) + } + displayManager.displays + .filter { getDisplayResource(it.displayId) == null } + .forEach { storeDisplayResource(it.displayId) } + } + + fun destroy() { + if (useDisplayDecorationListener) { + displaysWithDecorationsRepositoryCompat.unregisterDisplayDecorationListener(this) + } else { + systemDecorationChangeObserver.unregisterDisplayDecorationListener(this) + } + displayResourceArray.valueIterator().forEach { displayResource -> + displayResource.cleanup() + } + displayResourceArray.clear() + } + + fun getDisplayResource(displayId: Int): RESOURCE_TYPE? { + if (DEBUG) Log.d(TAG, Log.getStackTraceString(Throwable("get: displayId=$displayId"))) + return displayResourceArray[displayId] + } + + fun deleteDisplayResource(displayId: Int) { + if (DEBUG) Log.d(TAG, "delete: displayId=$displayId") + getDisplayResource(displayId)?.let { + it.cleanup() + displayResourceArray.remove(displayId) + } + } + + fun storeDisplayResource(displayId: Int) { + if (DEBUG) Log.d(TAG, "store: displayId=$displayId") + getDisplayResource(displayId)?.let { + return + } + val display = displayManager.getDisplay(displayId) + if (display == null) { + if (DEBUG) + Log.w( + TAG, + "storeDisplayResource: could not create display for displayId=$displayId", + Exception(), + ) + return + } + displayResourceArray[displayId] = createDisplayResource(display) + } + + fun dump(prefix: String, writer: PrintWriter) { + writer.println("${prefix}${this::class.simpleName}: display resources=[") + + displayResourceArray.valueIterator().forEach { displayResource -> + displayResource.dump("${prefix}\t", writer) + } + writer.println("${prefix}]") + } + + abstract class DisplayResource { + abstract fun cleanup() + + abstract fun dump(prefix: String, writer: PrintWriter) + } +} diff --git a/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt b/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt new file mode 100644 index 00000000000..06cf97ec55d --- /dev/null +++ b/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt @@ -0,0 +1,105 @@ +/* + * 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.quickstep + +import android.view.View +import com.android.internal.policy.DesktopModeCompatPolicy +import com.android.launcher3.AbstractFloatingViewHelper +import com.android.launcher3.R +import com.android.launcher3.logging.StatsLogManager.LauncherEvent +import com.android.launcher3.popup.SystemShortcut +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.TaskContainer +import com.android.window.flags2.Flags +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource + +/** A menu item that allows the user to move the current app into external display. */ +class ExternalDisplaySystemShortcut( + container: RecentsViewContainer, + abstractFloatingViewHelper: AbstractFloatingViewHelper, + private val taskContainer: TaskContainer, +) : + SystemShortcut( + R.drawable.ic_external_display, + R.string.recent_task_option_external_display, + container, + taskContainer.itemInfo, + taskContainer.taskView, + abstractFloatingViewHelper, + ) { + override fun onClick(view: View) { + dismissTaskMenuView() + val recentsView = mTarget.getOverviewPanel>() + recentsView.moveTaskToExternalDisplay( + taskContainer, + DesktopModeTransitionSource.OVERVIEW_TASK_MENU, + ) { + mTarget.statsLogManager + .logger() + .withItemInfo(taskContainer.itemInfo) + .log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_EXTERNAL_DISPLAY_TAP) + } + } + + companion object { + @JvmOverloads + /** + * Creates a factory for creating move task to external display system shortcuts in + * [com.android.quickstep.TaskOverlayFactory]. + */ + fun createFactory( + abstractFloatingViewHelper: AbstractFloatingViewHelper = AbstractFloatingViewHelper() + ): TaskShortcutFactory = + object : TaskShortcutFactory { + override fun getShortcuts( + container: RecentsViewContainer, + taskContainer: TaskContainer, + ): List? { + val context = container.asContext() + val taskKey = taskContainer.task.key + val desktopModeCompatPolicy = DesktopModeCompatPolicy(context) + return when { + !DesktopModeStatus.canEnterDesktopMode(context) -> null + + !Flags.moveToExternalDisplayShortcut() -> null + + desktopModeCompatPolicy.shouldDisableDesktopEntryPoints( + taskKey.baseActivity?.packageName, + taskKey.numActivities, + taskKey.isTopActivityNoDisplay, + taskKey.isActivityStackTransparent, + taskKey.topActivityType, + ) -> null + + else -> { + listOf( + ExternalDisplaySystemShortcut( + container, + abstractFloatingViewHelper, + taskContainer, + ) + ) + } + } + } + + override fun showForGroupedTask() = true + } + } +} diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java index 89fbf4ad548..f3967e363bd 100644 --- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java +++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java @@ -27,17 +27,19 @@ import android.view.MotionEvent; import android.view.RemoteAnimationTarget; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.DeviceProfile; import com.android.launcher3.statemanager.StateManager; -import com.android.launcher3.taskbar.FallbackTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.util.DisplayController; +import com.android.launcher3.views.ScrimColors; import com.android.quickstep.GestureState.GestureEndTarget; import com.android.quickstep.fallback.RecentsState; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.ActivityInitListener; import com.android.quickstep.util.AnimatorControllerWithResistance; +import com.android.quickstep.util.ContextInitListener; import com.android.quickstep.views.RecentsView; import java.util.function.Consumer; @@ -63,9 +65,9 @@ public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rec RecentsPagedOrientationHandler orientationHandler) { calculateTaskSize(context, dp, outRect, orientationHandler); if (dp.isVerticalBarLayout() && DisplayController.getNavigationMode(context) != NO_BUTTON) { - return dp.isSeascape() ? outRect.left : (dp.widthPx - outRect.right); + return dp.isSeascape() ? outRect.left : (dp.getDeviceProperties().getWidthPx() - outRect.right); } else { - return dp.heightPx - outRect.bottom; + return dp.getDeviceProperties().getHeightPx() - outRect.bottom; } } @@ -79,34 +81,34 @@ public void onAssistantVisibilityChanged(float visibility) { /** 6 */ @Override - public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState, + public AnimationFactory prepareRecentsUI( boolean activityVisible, Consumer callback) { - notifyRecentsOfOrientation(deviceState.getRotationTouchHelper()); + notifyRecentsOfOrientation(); DefaultAnimationFactory factory = new DefaultAnimationFactory(callback); factory.initBackgroundStateUI(); return factory; } @Override - public ActivityInitListener createActivityInitListener( + public ContextInitListener createActivityInitListener( Predicate onInitListener) { - return new ActivityInitListener<>((activity, alreadyOnHome) -> + return new ContextInitListener<>((activity, alreadyOnHome) -> onInitListener.test(alreadyOnHome), RecentsActivity.ACTIVITY_TRACKER); } @Nullable @Override public RecentsActivity getCreatedContainer() { - return RecentsActivity.ACTIVITY_TRACKER.getCreatedActivity(); + return RecentsActivity.ACTIVITY_TRACKER.getCreatedContext(); } @Override - public FallbackTaskbarUIController getTaskbarController() { + public TaskbarInteractor getTaskbarInteractor() { RecentsActivity activity = getCreatedContainer(); if (activity == null) { return null; } - return activity.getTaskbarUIController(); + return activity.getTaskbarInteractor(); } @Nullable @@ -133,18 +135,8 @@ public Rect getOverviewWindowBounds(Rect homeBounds, RemoteAnimationTarget targe } @Override - public boolean allowMinimizeSplitScreen() { - // TODO: Remove this once b/77875376 is fixed - return false; - } - - @Override - public boolean allowAllAppsFromOverview() { - return false; - } - - @Override - public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) { + public boolean deferStartingActivity( + @NonNull RecentsAnimationDeviceState deviceState, MotionEvent ev) { // In non-gesture mode, user might be clicking on the home button which would directly // start the home activity instead of going through recents. In that case, defer starting // recents until we are sure it is a gesture. @@ -153,12 +145,12 @@ public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, Mo } @Override - public void onExitOverview(RotationTouchHelper deviceState, Runnable exitRunnable) { + public void onExitOverview(Runnable exitRunnable) { final StateManager stateManager = getCreatedContainer().getStateManager(); if (stateManager.getState() == HOME) { exitRunnable.run(); - notifyRecentsOfOrientation(deviceState); + notifyRecentsOfOrientation(); return; } @@ -169,7 +161,7 @@ public void onStateTransitionComplete(RecentsState toState) { // Are we going from Recents to Workspace? if (toState == HOME) { exitRunnable.run(); - notifyRecentsOfOrientation(deviceState); + notifyRecentsOfOrientation(); stateManager.removeStateListener(this); } } @@ -185,47 +177,38 @@ public boolean isInLiveTileMode() { @Override public void onLaunchTaskFailed() { - // TODO: probably go back to overview instead. RecentsActivity activity = getCreatedContainer(); if (activity == null) { return; } - activity.getOverviewPanel().startHome(); + activity.getStateManager().goToState(DEFAULT); } @Override - public RecentsState stateFromGestureEndTarget(GestureEndTarget endTarget) { - switch (endTarget) { - case RECENTS: - return DEFAULT; - case NEW_TASK: - case LAST_TASK: - return BACKGROUND_APP; - case HOME: - case ALL_APPS: - default: - return HOME; - } + public RecentsState stateFromGestureEndTarget(@NonNull GestureEndTarget endTarget) { + return switch (endTarget) { + case RECENTS -> DEFAULT; + case NEW_TASK, LAST_TASK -> BACKGROUND_APP; + default -> HOME; + }; } - private void notifyRecentsOfOrientation(RotationTouchHelper rotationTouchHelper) { + private void notifyRecentsOfOrientation() { // reset layout on swipe to home - RecentsView recentsView = getCreatedContainer().getOverviewPanel(); - recentsView.setLayoutRotation(rotationTouchHelper.getCurrentActiveRotation(), - rotationTouchHelper.getDisplayRotation()); + getCreatedContainer().getOverviewPanel().reapplyActiveRotation(); } @Override - public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget, + public @Nullable Animator getParallelAnimationToGestureEndTarget(GestureEndTarget endTarget, long duration, RecentsAnimationCallbacks callbacks) { - FallbackTaskbarUIController uiController = getTaskbarController(); - Animator superAnimator = super.getParallelAnimationToLauncher( + TaskbarInteractor interactor = getTaskbarInteractor(); + Animator superAnimator = super.getParallelAnimationToGestureEndTarget( endTarget, duration, callbacks); - if (uiController == null) { + if (interactor == null) { return superAnimator; } - RecentsState toState = stateFromGestureEndTarget(endTarget); - Animator taskbarAnimator = uiController.createAnimToRecentsState(toState, duration); + Animator taskbarAnimator = interactor.getParallelAnimationToGestureEndTarget( + endTarget, duration, callbacks); if (taskbarAnimator == null) { return superAnimator; } @@ -238,7 +221,8 @@ private void notifyRecentsOfOrientation(RotationTouchHelper rotationTouchHelper) } @Override - protected int getOverviewScrimColorForState(RecentsActivity activity, RecentsState state) { + protected ScrimColors getOverviewScrimColorForState(RecentsActivity activity, + RecentsState state) { return state.getScrimColor(activity); } } diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java index deb3ca5c71e..919aa5a4549 100644 --- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java @@ -20,6 +20,7 @@ import static android.content.Intent.EXTRA_USER; import static com.android.app.animation.Interpolators.ACCELERATE; +import static com.android.launcher3.GestureNavContract.EXTRA_ENABLE_GESTURE_CONTRACT; import static com.android.launcher3.GestureNavContract.EXTRA_GESTURE_CONTRACT; import static com.android.launcher3.GestureNavContract.EXTRA_ICON_POSITION; import static com.android.launcher3.GestureNavContract.EXTRA_ICON_SURFACE; @@ -52,6 +53,7 @@ import android.view.Surface; import android.view.SurfaceControl; import android.view.SurfaceControl.Transaction; +import android.window.TransitionInfo; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -64,8 +66,10 @@ import com.android.launcher3.anim.SpringAnimationBuilder; import com.android.launcher3.states.StateAnimationConfig; import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.MSDLPlayerWrapper; import com.android.quickstep.fallback.FallbackRecentsView; import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.util.ActiveGestureLog; import com.android.quickstep.util.RectFSpringAnim; import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; import com.android.quickstep.util.TransformParams; @@ -86,7 +90,7 @@ * Handles the navigation gestures when a 3rd party launcher is the default home activity. */ public class FallbackSwipeHandler extends - AbsSwipeUpHandler { + AbsSwipeUpHandler, RecentsState> { private static final String TAG = "FallbackSwipeHandler"; @@ -105,11 +109,13 @@ public class FallbackSwipeHandler extends private boolean mAppCanEnterPip; - public FallbackSwipeHandler(Context context, RecentsAnimationDeviceState deviceState, - TaskAnimationManager taskAnimationManager, GestureState gestureState, long touchTimeMs, - boolean continuingLastGesture, InputConsumerController inputConsumer) { - super(context, deviceState, taskAnimationManager, gestureState, touchTimeMs, - continuingLastGesture, inputConsumer); + public FallbackSwipeHandler(Context context, TaskAnimationManager taskAnimationManager, + RecentsAnimationDeviceState deviceState, RotationTouchHelper rotationTouchHelper, + GestureState gestureState, long touchTimeMs, + boolean continuingLastGesture, InputConsumerController inputConsumer, + MSDLPlayerWrapper msdlPlayerWrapper) { + super(context, taskAnimationManager, deviceState, rotationTouchHelper, gestureState, + touchTimeMs, continuingLastGesture, inputConsumer, msdlPlayerWrapper); mRunningOverHome = mGestureState.getRunningTask() != null && mGestureState.getRunningTask().isHomeTask(); @@ -168,22 +174,22 @@ private void startHomeIntent( @NonNull String reason) { ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0); Intent intent = new Intent(mGestureState.getHomeIntent()); - var runningTask = TopTaskTracker.INSTANCE.get(mContext).getCachedTopTask(true); - if (gestureContractAnimationFactory != null && runningTaskTarget != null && runningTask.getTaskId() == runningTaskTarget.taskId) { - gestureContractAnimationFactory.addGestureContract(intent, runningTask.mAllCachedTasks.get(0)); + if (gestureContractAnimationFactory != null && runningTaskTarget != null) { + gestureContractAnimationFactory.addGestureContract(intent, runningTaskTarget.taskInfo); } startHomeIntentSafely(mContext, intent, options.toBundle(), reason); } @Override - protected boolean handleTaskAppeared(RemoteAnimationTarget[] appearedTaskTarget) { - if (mActiveAnimationFactory != null - && mActiveAnimationFactory.handleHomeTaskAppeared(appearedTaskTarget)) { + public void onTasksAppeared(@NonNull RemoteAnimationTarget[] appearedTaskTargets, + @Nullable TransitionInfo transitionInfo) { + if (mActiveAnimationFactory != null && mActiveAnimationFactory.handleHomeTaskAppeared( + appearedTaskTargets)) { mActiveAnimationFactory = null; - return false; + return; } - return super.handleTaskAppeared(appearedTaskTarget); + super.onTasksAppeared(appearedTaskTargets, transitionInfo); } @Override @@ -200,9 +206,15 @@ protected void finishRecentsControllerToHome(Runnable callback) { } else { recentsCallback = callback; } - mRecentsView.cleanupRemoteTargets(); + if (mRecentsView != null) { + mRecentsView.cleanupRemoteTargets(); + } mRecentsAnimationController.finish( - mAppCanEnterPip /* toRecents */, recentsCallback, true /* sendUserLeaveHint */); + /* toHome= */mAppCanEnterPip, + recentsCallback, + /* sendUserLeaveHint= */ true, + /* reason= */ new ActiveGestureLog.CompoundString( + "FallbackSwipeHandler.finishRecentsControllerToHome")); } @Override @@ -217,14 +229,16 @@ protected void switchToScreenshot() { @Override protected void notifyGestureAnimationStartToRecents() { - if (mRunningOverHome) { - if (DisplayController.getNavigationMode(mContext).hasGestures) { - mRecentsView.onGestureAnimationStartOnHome( - mGestureState.getRunningTask().getPlaceholderTasks(), - mDeviceState.getRotationTouchHelper()); - } - } else { + if (!mRunningOverHome) { super.notifyGestureAnimationStartToRecents(); + return; + } + if ((DisplayController.getNavigationMode(mContext).hasGestures + || mGestureState.isTrackpadGesture()) + && mRecentsView != null) { + mRecentsView.onGestureAnimationStartOnHome( + mGestureState.getRunningTask().getPlaceholderGroupedTaskInfo( + /* splitTaskIds = */ null)); } } @@ -233,7 +247,7 @@ private class FallbackPipToHomeAnimationFactory extends HomeAnimationFactory { @Override public AnimatorPlaybackController createActivityAnimationToHome() { // copied from {@link LauncherSwipeHandlerV2.LauncherHomeAnimationFactory} - long accuracy = 2 * Math.max(mDp.widthPx, mDp.heightPx); + long accuracy = 2 * Math.max(mDp.getDeviceProperties().getWidthPx(), mDp.getDeviceProperties().getHeightPx()); return mContainer.getStateManager().createAnimationToNewWorkspace( RecentsState.HOME, accuracy, StateAnimationConfig.SKIP_ALL_ANIMATIONS); } @@ -342,7 +356,7 @@ public void playAtomicAnimation(float velocity) { .setStartValue(mVerticalShiftForScale.value) .setEndValue(0) .setStartVelocity(-velocity / mTransitionDragLength) - .setMinimumVisibleChange(1f / mDp.heightPx) + .setMinimumVisibleChange(1f / mDp.getDeviceProperties().getHeightPx()) .setDampingRatio(0.6f) .setStiffness(800) .build(mVerticalShiftForScale, AnimatedFloat.VALUE) @@ -416,6 +430,8 @@ private void addGestureContract(Intent intent, RunningTaskInfo runningTaskInfo) } Bundle gestureNavContract = new Bundle(); + gestureNavContract.putBoolean( + EXTRA_ENABLE_GESTURE_CONTRACT, mRemoteTargetHandles.length <= 1); gestureNavContract.putParcelable(EXTRA_COMPONENT_NAME, key.getComponent()); gestureNavContract.putParcelable(EXTRA_USER, UserHandle.of(key.userId)); gestureNavContract.putParcelable( diff --git a/quickstep/src/com/android/quickstep/FallbackWindowInterface.java b/quickstep/src/com/android/quickstep/FallbackWindowInterface.java new file mode 100644 index 00000000000..9c331e2eb7f --- /dev/null +++ b/quickstep/src/com/android/quickstep/FallbackWindowInterface.java @@ -0,0 +1,246 @@ +/* + * 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.quickstep; + +import static com.android.launcher3.util.NavigationMode.NO_BUTTON; +import static com.android.quickstep.fallback.RecentsState.BACKGROUND_APP; +import static com.android.quickstep.fallback.RecentsState.DEFAULT; +import static com.android.quickstep.fallback.RecentsState.HOME; + +import android.animation.Animator; +import android.animation.AnimatorSet; +import android.content.Context; +import android.graphics.Rect; +import android.view.RemoteAnimationTarget; +import android.view.SurfaceControl; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.app.displaylib.PerDisplayRepository; +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.statemanager.StateManager; +import com.android.launcher3.taskbar.TaskbarInteractor; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.views.ScrimColors; +import com.android.quickstep.GestureState.GestureEndTarget; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; +import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.orientation.RecentsPagedOrientationHandler; +import com.android.quickstep.util.AnimatorControllerWithResistance; +import com.android.quickstep.util.ContextInitListener; +import com.android.quickstep.views.RecentsView; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.quickstep.window.RecentsWindowTracker; + +import dagger.assisted.AssistedInject; + +import java.util.function.Consumer; +import java.util.function.Predicate; + + +/** + * {@link BaseWindowInterface} for recents when the default launcher is different than the + * currently running one and apps should interact with the {@link RecentsWindowManager} as opposed + * to the in-launcher one. + */ +public final class FallbackWindowInterface extends BaseWindowInterface { + + public static final DaggerSingletonObject> + REPOSITORY_INSTANCE = new DaggerSingletonObject<>( + QuickstepBaseAppComponent::getFallbackWindowInterfaceRepository); + + @NonNull private final RecentsWindowTracker mRecentsWindowTracker; + @Nullable private RecentsWindowManager mRecentsWindowManager = null; + + @AssistedInject + public FallbackWindowInterface(@NonNull RecentsWindowTracker recentsWindowTracker) { + super(DEFAULT, BACKGROUND_APP); + mRecentsWindowTracker = recentsWindowTracker; + } + + public void setRecentsWindowManager(@Nullable RecentsWindowManager recentsWindowManager) { + mRecentsWindowManager = recentsWindowManager; + } + + /** 2 */ + @Override + public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect, + RecentsPagedOrientationHandler orientationHandler) { + calculateTaskSize(context, dp, outRect, orientationHandler); + if (dp.isVerticalBarLayout() && DisplayController.getNavigationMode(context) != NO_BUTTON) { + return dp.isSeascape() ? outRect.left : (dp.getDeviceProperties().getWidthPx() - outRect.right); + } else { + return dp.getDeviceProperties().getHeightPx() - outRect.bottom; + } + } + + /** 5 */ + @Override + public void onAssistantVisibilityChanged(float visibility) { + // This class becomes active when the screen is locked. + // Rather than having it handle assistant visibility changes, the assistant visibility is + // set to zero prior to this class becoming active. + } + + /** 6 */ + @Override + public BaseWindowInterface.AnimationFactory prepareRecentsUI(boolean activityVisible, + Consumer callback) { + notifyRecentsOfOrientation(); + BaseWindowInterface.DefaultAnimationFactory factory = + new BaseWindowInterface.DefaultAnimationFactory(callback); + factory.initBackgroundStateUI(); + return factory; + } + + @Override + public ContextInitListener createActivityInitListener( + Predicate onInitListener) { + return new ContextInitListener<>( + (activity, alreadyOnHome) -> onInitListener.test(alreadyOnHome), + mRecentsWindowTracker); + } + + @Nullable + @Override + public RecentsWindowManager getCreatedContainer() { + return mRecentsWindowManager; + } + + @Nullable + public SurfaceControl getOverviewOverlay() { + if (mRecentsWindowManager == null) { + return null; + } + return mRecentsWindowManager.getOverviewOverlay(); + } + + + @Override + public TaskbarInteractor getTaskbarInteractor() { + RecentsWindowManager manager = getCreatedContainer(); + return manager == null ? null : manager.getTaskbarInteractor(); + } + + @Override + public Rect getOverviewWindowBounds(Rect homeBounds, RemoteAnimationTarget target) { + // TODO: Remove this once b/77875376 is fixed + return target.screenSpaceBounds; + } + + @Nullable + @Override + public > T getVisibleRecentsView() { + RecentsWindowManager manager = getCreatedContainer(); + if (manager != null && (manager.isStarted() || isInLiveTileMode())) { + return manager.getOverviewPanel(); + } + return null; + } + + @Override + public boolean switchToRecentsIfVisible(Animator.AnimatorListener animatorListener) { + return false; + } + + @Override + protected ScrimColors getOverviewScrimColorForState(RecentsWindowManager container, + RecentsState state) { + return state.getScrimColor(container.asContext()); + } + + @Override + public void onExitOverview(Runnable exitRunnable) { + RecentsWindowManager windowManager = getCreatedContainer(); + final StateManager stateManager = + windowManager != null ? windowManager.getStateManager() : null; + if (stateManager == null || stateManager.getState() == HOME) { + exitRunnable.run(); + notifyRecentsOfOrientation(); + return; + } + + stateManager.addStateListener( + new StateManager.StateListener() { + @Override + public void onStateTransitionComplete(RecentsState toState) { + // Are we going from Recents to Workspace? + if (toState == HOME) { + exitRunnable.run(); + notifyRecentsOfOrientation(); + stateManager.removeStateListener(this); + } + } + }); + } + + @Override + public boolean isInLiveTileMode() { + RecentsWindowManager windowManager = getCreatedContainer(); + return windowManager != null && windowManager.getStateManager().getState() == DEFAULT && + windowManager.isStarted(); + } + + @Override + public void onLaunchTaskFailed() { + RecentsWindowManager manager = getCreatedContainer(); + if (manager == null) { + return; + } + manager.getStateManager().goToState(DEFAULT); + } + + @Override + public RecentsState stateFromGestureEndTarget(@NonNull GestureEndTarget endTarget) { + return switch (endTarget) { + case RECENTS -> DEFAULT; + case NEW_TASK, LAST_TASK -> BACKGROUND_APP; + default -> HOME; + }; + } + + private void notifyRecentsOfOrientation() { + RecentsWindowManager recentsWindowManager = getCreatedContainer(); + if (recentsWindowManager != null) { + // reset layout on swipe to home + ((RecentsView) recentsWindowManager.getOverviewPanel()).reapplyActiveRotation(); + } + } + + @Override + public @Nullable Animator getParallelAnimationToGestureEndTarget(GestureEndTarget endTarget, + long duration, RecentsAnimationCallbacks callbacks) { + TaskbarInteractor taskbarInteractor = getTaskbarInteractor(); + Animator superAnimator = super.getParallelAnimationToGestureEndTarget( + endTarget, duration, callbacks); + if (taskbarInteractor == null) { + return superAnimator; + } + Animator taskbarAnimator = taskbarInteractor.getParallelAnimationToGestureEndTarget( + endTarget, duration, callbacks); + if (taskbarAnimator == null) { + return superAnimator; + } + if (superAnimator == null) { + return taskbarAnimator; + } + AnimatorSet animatorSet = new AnimatorSet(); + animatorSet.playTogether(superAnimator, taskbarAnimator); + return animatorSet; + } +} diff --git a/quickstep/src/com/android/quickstep/FocusState.kt b/quickstep/src/com/android/quickstep/FocusState.kt new file mode 100644 index 00000000000..44e84794150 --- /dev/null +++ b/quickstep/src/com/android/quickstep/FocusState.kt @@ -0,0 +1,66 @@ +/* + * 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.quickstep + +import android.os.RemoteException +import android.util.Log +import android.view.Display.DEFAULT_DISPLAY +import androidx.annotation.VisibleForTesting +import com.android.launcher3.util.Executors +import com.android.wm.shell.shared.IFocusTransitionListener.Stub +import com.android.wm.shell.shared.IShellTransitions + +/** Class to track focus state of displays and windows */ +class FocusState { + + var focusedDisplayId = DEFAULT_DISPLAY + @VisibleForTesting + set(value) { + field = value + listeners.forEach { it.onFocusedDisplayChanged(value) } + } + + private var listeners = mutableSetOf() + + fun addListener(l: FocusChangeListener) = listeners.add(l) + + fun removeListener(l: FocusChangeListener) = listeners.remove(l) + + fun init(transitions: IShellTransitions?) { + try { + transitions?.setFocusTransitionListener( + object : Stub() { + override fun onFocusedDisplayChanged(displayId: Int) { + Executors.MAIN_EXECUTOR.execute { focusedDisplayId = displayId } + } + } + ) + } catch (e: RemoteException) { + Log.w(TAG, "Failed call setFocusTransitionListener", e) + } + } + + interface FocusChangeListener { + fun onFocusedDisplayChanged(displayId: Int) + } + + override fun toString() = "{FocusState focusedDisplayId=$focusedDisplayId}" + + companion object { + private const val TAG = "FocusState" + } +} diff --git a/quickstep/src/com/android/quickstep/FullscreenDrawParams.kt b/quickstep/src/com/android/quickstep/FullscreenDrawParams.kt new file mode 100644 index 00000000000..054719a5804 --- /dev/null +++ b/quickstep/src/com/android/quickstep/FullscreenDrawParams.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.quickstep + +import android.content.Context +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator +import com.android.launcher3.util.SafeCloseable +import com.android.launcher3.views.ActivityContext +import com.android.quickstep.util.TaskCornerRadius +import com.android.systemui.shared.system.QuickStepContract + +/** + * Class for computing corner radius by interpolating between overview and fullscreen corner radius + * with fullscreenProgress set in [setProgress]. + */ +open class FullscreenDrawParams +@JvmOverloads +constructor( + context: Context, + private val taskCornerRadiusProvider: (Context) -> Float = ::computeTaskCornerRadius, + private val windowCornerRadiusProvider: (Context) -> Float = ::computeWindowCornerRadius, +) : SafeCloseable { + private var taskCornerRadius = 0f + private var windowCornerRadius = 0f + var currentCornerRadius = 0f + + init { + updateCornerRadius(context) + } + + /** Recomputes the start and end corner radius for the given Context. */ + fun updateCornerRadius(context: Context) { + taskCornerRadius = taskCornerRadiusProvider(context) + windowCornerRadius = windowCornerRadiusProvider(context) + } + + /** Sets the progress in range [0, 1] */ + fun setProgress(fullscreenProgress: Float, parentScale: Float, taskViewScale: Float) { + currentCornerRadius = + Utilities.mapRange(fullscreenProgress, taskCornerRadius, windowCornerRadius) / + parentScale / + taskViewScale + } + + override fun close() {} + + companion object { + private fun computeTaskCornerRadius(context: Context): Float = TaskCornerRadius.get(context) + + private fun computeWindowCornerRadius(context: Context): Float { + val activityContext: ActivityContext? = ActivityContext.lookupContextNoThrow(context) + return if ( + activityContext?.deviceProfile?.isTaskbarPresent == true && + TaskbarFeatureEvaluator.INSTANCE.get(context).isTransient + ) { + context.resources + .getDimensionPixelSize(R.dimen.persistent_taskbar_corner_radius) + .toFloat() + } else { + // The corner radius is fixed to match when Taskbar is persistent mode + QuickStepContract.getWindowCornerRadius(context) + } + } + } +} diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java index 778bc7ae7b5..58b793007a9 100644 --- a/quickstep/src/com/android/quickstep/GestureState.java +++ b/quickstep/src/com/android/quickstep/GestureState.java @@ -16,6 +16,7 @@ package com.android.quickstep; import static android.app.ActivityTaskManager.INVALID_TASK_ID; +import static android.view.Display.DEFAULT_DISPLAY; import static com.android.launcher3.MotionEventsUtils.isTrackpadFourFingerSwipe; import static com.android.launcher3.MotionEventsUtils.isTrackpadThreeFingerSwipe; @@ -23,25 +24,32 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW; +import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_UNCHANGED; import static com.android.quickstep.MultiStateCallback.DEBUG_STATES; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.SET_END_TARGET; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.INCORRECT_HOME_GESTURE_REQUEST; import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.SET_END_TARGET_ALL_APPS; import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.SET_END_TARGET_HOME; import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.SET_END_TARGET_NEW_TASK; import android.content.Intent; import android.os.SystemClock; +import android.view.Display; import android.view.MotionEvent; import android.view.RemoteAnimationTarget; +import android.window.DesktopExperienceFlags; +import android.window.TransitionInfo; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.statemanager.BaseState; +import com.android.launcher3.statemanager.StatefulContainer; import com.android.quickstep.TopTaskTracker.CachedTaskInfo; import com.android.quickstep.util.ActiveGestureErrorDetector; import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.recents.model.ThumbnailData; import java.io.PrintWriter; @@ -54,13 +62,12 @@ import java.util.function.Predicate; /** - * Manages the state for an active system gesture, listens for events from the - * system and Launcher, + * Manages the state for an active system gesture, listens for events from the system and Launcher, * and fires events when the states change. */ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationListener { - final Predicate mLastStartedTaskIdPredicate = new Predicate<>() { + private final Predicate mLastStartedTaskIdPredicate = new Predicate<>() { @Override public boolean test(RemoteAnimationTarget targetCompat) { for (int taskId : mLastStartedTaskId) { @@ -84,7 +91,9 @@ public enum GestureEndTarget { LAST_TASK(false, LAUNCHER_STATE_BACKGROUND, true), - ALL_APPS(true, LAUNCHER_STATE_ALLAPPS, false); + ALL_APPS(true, LAUNCHER_STATE_ALLAPPS, false), + + REJECT_HOME(false, LAUNCHER_STATE_UNCHANGED, false); GestureEndTarget(boolean isLauncher, int containerType, boolean recentsAttachedToAppWindow) { @@ -93,19 +102,12 @@ public enum GestureEndTarget { this.recentsAttachedToAppWindow = recentsAttachedToAppWindow; } - /** - * Whether the target is in the launcher activity. Implicitly, if the end target - * is going - * to Launcher, then we can not interrupt the animation to start another - * gesture. - */ + /** Whether the target is in the launcher activity. Implicitly, if the end target is going + to Launcher, then we can not interrupt the animation to start another gesture. */ public final boolean isLauncher; /** Used to log where the user ended up after the gesture ends */ public final int containerType; - /** - * Whether RecentsView should be attached to the window as we animate to this - * target - */ + /** Whether RecentsView should be attached to the window as we animate to this target */ public final boolean recentsAttachedToAppWindow; } @@ -115,7 +117,6 @@ public enum GestureEndTarget { public static final GestureState DEFAULT_STATE = new GestureState(); private static int FLAG_COUNT = 0; - private static int getNextStateFlag(String name) { if (DEBUG_STATES) { STATE_NAMES.add(name); @@ -126,33 +127,37 @@ private static int getNextStateFlag(String name) { } // Called when the end target as been set - public static final int STATE_END_TARGET_SET = getNextStateFlag("STATE_END_TARGET_SET"); + public static final int STATE_END_TARGET_SET = + getNextStateFlag("STATE_END_TARGET_SET"); // Called when the end target animation has finished - public static final int STATE_END_TARGET_ANIMATION_FINISHED = getNextStateFlag( - "STATE_END_TARGET_ANIMATION_FINISHED"); + public static final int STATE_END_TARGET_ANIMATION_FINISHED = + getNextStateFlag("STATE_END_TARGET_ANIMATION_FINISHED"); // Called when the recents animation has been requested to start - public static final int STATE_RECENTS_ANIMATION_INITIALIZED = getNextStateFlag( - "STATE_RECENTS_ANIMATION_INITIALIZED"); + public static final int STATE_RECENTS_ANIMATION_INITIALIZED = + getNextStateFlag("STATE_RECENTS_ANIMATION_INITIALIZED"); - // Called when the recents animation is started and the TaskAnimationManager has - // been updated + // Called when the recents animation is started and the TaskAnimationManager has been updated // with the controller and targets - public static final int STATE_RECENTS_ANIMATION_STARTED = getNextStateFlag("STATE_RECENTS_ANIMATION_STARTED"); + public static final int STATE_RECENTS_ANIMATION_STARTED = + getNextStateFlag("STATE_RECENTS_ANIMATION_STARTED"); // Called when the recents animation is canceled - public static final int STATE_RECENTS_ANIMATION_CANCELED = getNextStateFlag("STATE_RECENTS_ANIMATION_CANCELED"); + public static final int STATE_RECENTS_ANIMATION_CANCELED = + getNextStateFlag("STATE_RECENTS_ANIMATION_CANCELED"); // Called when the recents animation finishes - public static final int STATE_RECENTS_ANIMATION_FINISHED = getNextStateFlag("STATE_RECENTS_ANIMATION_FINISHED"); + public static final int STATE_RECENTS_ANIMATION_FINISHED = + getNextStateFlag("STATE_RECENTS_ANIMATION_FINISHED"); - // Always called when the recents animation ends (regardless of cancel or - // finish) - public static final int STATE_RECENTS_ANIMATION_ENDED = getNextStateFlag("STATE_RECENTS_ANIMATION_ENDED"); + // Always called when the recents animation ends (regardless of cancel or finish) + public static final int STATE_RECENTS_ANIMATION_ENDED = + getNextStateFlag("STATE_RECENTS_ANIMATION_ENDED"); // Called when RecentsView stops scrolling and settles on a TaskView. - public static final int STATE_RECENTS_SCROLLING_FINISHED = getNextStateFlag("STATE_RECENTS_SCROLLING_FINISHED"); + public static final int STATE_RECENTS_SCROLLING_FINISHED = + getNextStateFlag("STATE_RECENTS_SCROLLING_FINISHED"); // Needed to interact with the current activity private final Intent mHomeIntent; @@ -160,6 +165,7 @@ private static int getNextStateFlag(String name) { private final BaseContainerInterface mContainerInterface; private final MultiStateCallback mStateCallback; private final int mGestureId; + private final int mDisplayId; public enum TrackpadGestureType { NONE, @@ -183,26 +189,27 @@ public static TrackpadGestureType getTrackpadGestureType(MotionEvent event) { private GestureEndTarget mEndTarget; private RemoteAnimationTarget[] mLastAppearedTaskTargets; private Set mPreviouslyAppearedTaskIds = new HashSet<>(); - private int[] mLastStartedTaskId = new int[] { INVALID_TASK_ID, INVALID_TASK_ID }; - private RecentsAnimationController mRecentsAnimationController; + private int[] mLastStartedTaskId = new int[]{INVALID_TASK_ID, INVALID_TASK_ID}; private HashMap mRecentsAnimationCanceledSnapshots; /** The time when the swipe up gesture is triggered. */ private final long mSwipeUpStartTimeMs = SystemClock.uptimeMillis(); - private boolean mHandlingAtomicEvent; + private GestureEndTarget mAtomicEndTarget; private boolean mIsInExtendedSlopRegion; - public GestureState(OverviewComponentObserver componentObserver, int gestureId) { - mHomeIntent = componentObserver.getHomeIntent(); + public GestureState(OverviewComponentObserver componentObserver, int displayId, int gestureId) { + mDisplayId = displayId; + mHomeIntent = componentObserver.getHomeIntent(displayId); mOverviewIntent = componentObserver.getOverviewIntent(); - mContainerInterface = componentObserver.getActivityInterface(); + mContainerInterface = componentObserver.getContainerInterface(displayId); mStateCallback = new MultiStateCallback( STATE_NAMES.toArray(new String[0]), GestureState::getTrackedEventForState); mGestureId = gestureId; } public GestureState(GestureState other) { + mDisplayId = other.mDisplayId; mHomeIntent = other.mHomeIntent; mOverviewIntent = other.mOverviewIntent; mContainerInterface = other.mContainerInterface; @@ -217,6 +224,7 @@ public GestureState(GestureState other) { public GestureState() { // Do nothing, only used for initializing the gesture state prior to user unlock + mDisplayId = Display.DEFAULT_DISPLAY; mHomeIntent = new Intent(); mOverviewIntent = new Intent(); mContainerInterface = null; @@ -237,9 +245,16 @@ private static ActiveGestureErrorDetector.GestureEvent getTrackedEventForState(i return null; } + public static boolean displaySupportsHomeGesture(int displayId) { + if (DesktopExperienceFlags.ENABLE_REJECT_HOME_TRANSITION.isTrue() + && displayId != DEFAULT_DISPLAY) { + return false; + } + return true; + } + /** - * @return whether the gesture state has the provided {@param stateMask} flags - * set. + * @return whether the gesture state has the provided {@param stateMask} flags set. */ public boolean hasState(int stateMask) { return mStateCallback.hasStates(stateMask); @@ -253,8 +268,7 @@ public void setState(int stateFlag) { } /** - * Adds a callback for when the states matching the given {@param stateMask} is - * set. + * Adds a callback for when the states matching the given {@param stateMask} is set. */ public void runOnceAtState(int stateMask, Runnable callback) { mStateCallback.runOnceAtState(stateMask, callback); @@ -275,10 +289,9 @@ public Intent getOverviewIntent() { } /** - * @return the interface to the activity handing the UI updates for this - * gesture. + * @return the interface to the activity handing the UI updates for this gesture. */ - public , T extends RecentsViewContainer> + public , T extends RecentsViewContainer & StatefulContainer> BaseContainerInterface getContainerInterface() { return mContainerInterface; } @@ -291,8 +304,14 @@ public int getGestureId() { } /** - * Sets if the gesture is is from the trackpad, if so, whether 3-finger, or - * 4-finger + * @return the id for the display this particular gesture was performed on. + */ + public int getDisplayId() { + return mDisplayId; + } + + /** + * Sets if the gesture is is from the trackpad, if so, whether 3-finger, or 4-finger */ public void setTrackpadGestureType(TrackpadGestureType trackpadGestureType) { mTrackpadGestureType = trackpadGestureType; @@ -310,6 +329,17 @@ public boolean isFourFingerTrackpadGesture() { return mTrackpadGestureType == TrackpadGestureType.FOUR_FINGER; } + /** + * Requests that handling for this gesture should use a synthetic transition, as in that it + * will need to start a recents transition that is not backed by a system transition. This is + * generally only needed in scenarios where a system transition can not be created due to no + * changes in the WM hierarchy (ie. starting recents transition when you are already over home). + */ + public boolean useSyntheticRecentsTransition() { + return mRunningTask.isHomeTask() + && mContainerInterface.getCreatedContainer() instanceof RecentsWindowManager; + } + /** * @return the running task for this gesture. */ @@ -319,21 +349,24 @@ public CachedTaskInfo getRunningTask() { } /** - * @param getMultipleTasks Whether multiple tasks or not are to be returned (for - * split) + * @param getMultipleTasks Whether multiple tasks or not are to be returned (for split) * @return the running task ids for this gesture. */ public int[] getRunningTaskIds(boolean getMultipleTasks) { if (mRunningTask == null) { - return new int[] { INVALID_TASK_ID, INVALID_TASK_ID }; + return new int[]{INVALID_TASK_ID, INVALID_TASK_ID}; } else { - int cachedTasksSize = mRunningTask.mAllCachedTasks.size(); - int count = Math.min(cachedTasksSize, getMultipleTasks ? 2 : 1); - int[] runningTaskIds = new int[count]; - for (int i = 0; i < count; i++) { - runningTaskIds[i] = mRunningTask.mAllCachedTasks.get(i).taskId; + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + return mRunningTask.topGroupedTaskIds(); + } else { + int cachedTasksSize = mRunningTask.mAllCachedTasks.size(); + int count = Math.min(cachedTasksSize, getMultipleTasks ? 2 : 1); + int[] runningTaskIds = new int[count]; + for (int i = 0; i < count; i++) { + runningTaskIds[i] = mRunningTask.mAllCachedTasks.get(i).taskId; + } + return runningTaskIds; } - return runningTaskIds; } } @@ -342,12 +375,12 @@ public int[] getRunningTaskIds(boolean getMultipleTasks) { * @return the single top-most running taskId for this gesture */ public int getTopRunningTaskId() { - return getRunningTaskIds(false /* getMultipleTasks */)[0]; + var taskIds = getRunningTaskIds(/* getMultipleTasks = */ false); + return taskIds.length != 0 ? taskIds[0] : INVALID_TASK_ID; } /** - * Updates the running task for the gesture to be the given - * {@param runningTask}. + * Updates the running task for the gesture to be the given {@param runningTask}. */ public void updateRunningTask(@NonNull CachedTaskInfo runningTask) { mRunningTask = runningTask; @@ -371,7 +404,7 @@ public void updateLastAppearedTaskTargets(RemoteAnimationTarget[] lastAppearedTa */ public int[] getLastAppearedTaskIds() { if (mLastAppearedTaskTargets == null) { - return new int[] { INVALID_TASK_ID, INVALID_TASK_ID }; + return new int[]{INVALID_TASK_ID, INVALID_TASK_ID}; } else { return Arrays.stream(mLastAppearedTaskTargets) .mapToInt(target -> target != null ? target.taskId : INVALID_TASK_ID).toArray(); @@ -387,17 +420,15 @@ public Set getPreviouslyAppearedTaskIds() { } /** - * Updates the last task that we started via startActivityFromRecents() during - * this gesture. + * Updates the last task that we started via startActivityFromRecents() during this gesture. */ public void updateLastStartedTaskIds(int[] lastStartedTaskId) { mLastStartedTaskId = lastStartedTaskId; } /** - * @return The id of the task that was most recently started during this - * gesture, or -1 if - * no task has been started yet (i.e. we haven't settled on a new task). + * @return The id of the task that was most recently started during this gesture, or -1 if + * no task has been started yet (i.e. we haven't settled on a new task). */ public int[] getLastStartedTaskIds() { return mLastStartedTaskId; @@ -411,29 +442,31 @@ public GestureEndTarget getEndTarget() { } /** - * Sets the end target of this gesture and immediately notifies the state - * changes. + * Sets the end target of this gesture and immediately notifies the state changes. */ public void setEndTarget(GestureEndTarget target) { setEndTarget(target, true /* isAtomic */); } /** - * Sets the end target of this gesture, but if {@param isAtomic} is - * {@code false}, then the - * caller must explicitly set {@link #STATE_END_TARGET_ANIMATION_FINISHED} - * themselves. + * Sets the end target of this gesture, but if {@param isAtomic} is {@code false}, then the + * caller must explicitly set {@link #STATE_END_TARGET_ANIMATION_FINISHED} themselves. */ public void setEndTarget(GestureEndTarget target, boolean isAtomic) { mEndTarget = target; mStateCallback.setState(STATE_END_TARGET_SET); - ActiveGestureLog.INSTANCE.addLog( - new ActiveGestureLog.CompoundString("setEndTarget ") - .append(mEndTarget.name()), - /* gestureEvent= */ SET_END_TARGET); + ActiveGestureProtoLogProxy.logSetEndTarget(mEndTarget.name()); switch (mEndTarget) { case HOME: ActiveGestureLog.INSTANCE.trackEvent(SET_END_TARGET_HOME); + if (!displaySupportsHomeGesture(mDisplayId)) { + ActiveGestureLog.INSTANCE.trackEvent(INCORRECT_HOME_GESTURE_REQUEST); + } + break; + case REJECT_HOME: + if (displaySupportsHomeGesture(mDisplayId)) { + ActiveGestureLog.INSTANCE.trackEvent(INCORRECT_HOME_GESTURE_REQUEST); + } break; case NEW_TASK: ActiveGestureLog.INSTANCE.trackEvent(SET_END_TARGET_NEW_TASK); @@ -455,22 +488,27 @@ public void setEndTarget(GestureEndTarget target, boolean isAtomic) { * Indicates if the gesture is handling an atomic event like a click and not a * user controlled gesture. */ - public void setHandlingAtomicEvent(boolean handlingAtomicEvent) { - mHandlingAtomicEvent = handlingAtomicEvent; + public void setHandlingAtomicEvent(GestureEndTarget target) { + mAtomicEndTarget = target; } /** - * Returns true if the gesture is handling an atomic event like a click and not - * a + * Returns true if the gesture is handling an atomic event like a click and not a * user controlled gesture. */ public boolean isHandlingAtomicEvent() { - return mHandlingAtomicEvent; + return mAtomicEndTarget != null; + } + + /** + * Returns the end target of the atomic event. If not handling an atomic event, returns null. + */ + public GestureEndTarget getAtomicEndTarget() { + return mAtomicEndTarget; } /** - * @return whether the current gesture is still running a recents animation to a - * state in the + * @return whether the current gesture is still running a recents animation to a state in the * Launcher or Recents activity. */ public boolean isRunningAnimationToLauncher() { @@ -487,8 +525,7 @@ public boolean isRecentsAnimationRunning() { @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { - mRecentsAnimationController = controller; + RecentsAnimationTargets targets, TransitionInfo info) { mStateCallback.setState(STATE_RECENTS_ANIMATION_STARTED); } @@ -498,10 +535,6 @@ public void onRecentsAnimationCanceled(HashMap thumbnail mStateCallback.setState(STATE_RECENTS_ANIMATION_CANCELED); mStateCallback.setState(STATE_RECENTS_ANIMATION_ENDED); if (mRecentsAnimationCanceledSnapshots != null) { - // Clean up the screenshot to finalize the recents animation cancel - if (mRecentsAnimationController != null) { - mRecentsAnimationController.cleanupScreenshot(); - } mRecentsAnimationCanceledSnapshots = null; } } @@ -539,20 +572,25 @@ public boolean isInExtendedSlopRegion() { @Nullable HashMap consumeRecentsAnimationCanceledSnapshot() { if (mRecentsAnimationCanceledSnapshots != null) { - HashMap data = new HashMap( - mRecentsAnimationCanceledSnapshots); + HashMap data = + new HashMap<>(mRecentsAnimationCanceledSnapshots); mRecentsAnimationCanceledSnapshots = null; return data; } return null; } + Predicate getLastStartedTaskIdPredicate() { + return mLastStartedTaskIdPredicate; + } + long getSwipeUpStartTimeMs() { return mSwipeUpStartTimeMs; } public void dump(String prefix, PrintWriter pw) { pw.println(prefix + "GestureState:"); + pw.println(prefix + "\tdisplayID=" + mDisplayId); pw.println(prefix + "\tgestureID=" + mGestureId); pw.println(prefix + "\trunningTask=" + mRunningTask); pw.println(prefix + "\tendTarget=" + mEndTarget); diff --git a/quickstep/src/com/android/quickstep/HighResLoadingState.kt b/quickstep/src/com/android/quickstep/HighResLoadingState.kt new file mode 100644 index 00000000000..aabaecfdfe0 --- /dev/null +++ b/quickstep/src/com/android/quickstep/HighResLoadingState.kt @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.content.res.Resources +import com.android.quickstep.recents.data.HighResLoadingStateNotifier +import java.util.concurrent.CopyOnWriteArrayList + +/** Determines when high res or low res thumbnails should be loaded. */ +class HighResLoadingState : HighResLoadingStateNotifier { + // If the device does not support low-res thumbnails, only attempt to load high-res thumbnails + private val forceHighResThumbnails = !supportsLowResThumbnails() + var visible: Boolean = false + set(value) { + field = value + updateState() + } + + var flingingFast = false + set(value) { + field = value + updateState() + } + + var isEnabled: Boolean = false + private set + + private val callbacks = CopyOnWriteArrayList() + + interface HighResLoadingStateChangedCallback { + fun onHighResLoadingStateChanged(enabled: Boolean) + } + + override fun addCallback(callback: HighResLoadingStateChangedCallback) { + callbacks.add(callback) + } + + override fun removeCallback(callback: HighResLoadingStateChangedCallback) { + callbacks.remove(callback) + } + + private fun updateState() { + val prevState = isEnabled + isEnabled = forceHighResThumbnails || (visible && !flingingFast) + if (prevState != isEnabled) { + for (callback in callbacks) { + callback.onHighResLoadingStateChanged(isEnabled) + } + } + } + + /** + * Returns Whether device supports low-res thumbnails. Low-res files are an optimization for + * faster load times of snapshots. Devices can optionally disable low-res files so that they + * only store snapshots at high-res scale. The actual scale can be configured in frameworks/base + * config overlay. + */ + private fun supportsLowResThumbnails(): Boolean { + val res = Resources.getSystem() + val resId = res.getIdentifier("config_lowResTaskSnapshotScale", "dimen", "android") + if (resId != 0) { + return 0 < res.getFloat(resId) + } + return true + } +} diff --git a/quickstep/src/com/android/quickstep/HomeVisibilityState.kt b/quickstep/src/com/android/quickstep/HomeVisibilityState.kt index 241e16d1118..ce86a463f04 100644 --- a/quickstep/src/com/android/quickstep/HomeVisibilityState.kt +++ b/quickstep/src/com/android/quickstep/HomeVisibilityState.kt @@ -17,7 +17,11 @@ package com.android.quickstep import android.os.RemoteException +import android.os.UserHandle import android.util.Log +import android.view.InsetsState +import android.view.WindowInsets +import com.android.launcher3.Utilities import com.android.launcher3.config.FeatureFlags import com.android.launcher3.util.Executors import com.android.wm.shell.shared.IHomeTransitionListener.Stub @@ -29,6 +33,8 @@ class HomeVisibilityState { var isHomeVisible = true private set + @Volatile var navbarInsetPosition = 0 + private var listeners = mutableSetOf() fun addListener(l: VisibilityChangeListener) = listeners.add(l) @@ -41,12 +47,28 @@ class HomeVisibilityState { transitions?.setHomeTransitionListener( object : Stub() { override fun onHomeVisibilityChanged(isVisible: Boolean) { - Executors.MAIN_EXECUTOR.execute { + Utilities.postAsyncCallback(Executors.MAIN_EXECUTOR.handler) { isHomeVisible = isVisible - listeners.forEach { it.onHomeVisibilityChanged(isVisible) } + val copiedListeners = listeners.toSet() + copiedListeners.forEach { it.onHomeVisibilityChanged(isVisible) } } } - } + + override fun onDisplayInsetsChanged(insetsState: InsetsState) { + val displayFrame = insetsState.displayFrame + val bottomInset = + insetsState + .calculateInsets( + displayFrame, + displayFrame, + WindowInsets.Type.navigationBars(), + false, + ) + .bottom + navbarInsetPosition = displayFrame.bottom - bottomInset + } + }, + UserHandle.myUserId(), ) } catch (e: RemoteException) { Log.w(TAG, "Failed call setHomeTransitionListener", e) diff --git a/quickstep/src/com/android/quickstep/InputConsumer.java b/quickstep/src/com/android/quickstep/InputConsumer.java index b52ec0ab232..8ae3be0a827 100644 --- a/quickstep/src/com/android/quickstep/InputConsumer.java +++ b/quickstep/src/com/android/quickstep/InputConsumer.java @@ -17,6 +17,7 @@ import android.annotation.TargetApi; import android.os.Build; +import android.view.Display; import android.view.InputEvent; import android.view.KeyEvent; import android.view.MotionEvent; @@ -25,13 +26,13 @@ public interface InputConsumer { int TYPE_NO_OP = 1 << 0; - int TYPE_OVERVIEW = 1 << 1; + int TYPE_LAUNCHER = 1 << 1; int TYPE_OTHER_ACTIVITY = 1 << 2; int TYPE_ASSISTANT = 1 << 3; int TYPE_DEVICE_LOCKED = 1 << 4; int TYPE_ACCESSIBILITY = 1 << 5; int TYPE_SCREEN_PINNED = 1 << 6; - int TYPE_OVERVIEW_WITHOUT_FOCUS = 1 << 7; + int TYPE_LAUNCHER_WITHOUT_FOCUS = 1 << 7; int TYPE_RESET_GESTURE = 1 << 8; int TYPE_PROGRESS_DELEGATE = 1 << 9; int TYPE_SYSUI_OVERLAY = 1 << 10; @@ -40,45 +41,59 @@ public interface InputConsumer { int TYPE_STATUS_BAR = 1 << 13; int TYPE_CURSOR_HOVER = 1 << 14; int TYPE_NAV_HANDLE_LONG_PRESS = 1 << 15; + int TYPE_BUBBLE_BAR = 1 << 16; String[] NAMES = new String[] { - "TYPE_NO_OP", // 0 - "TYPE_OVERVIEW", // 1 - "TYPE_OTHER_ACTIVITY", // 2 - "TYPE_ASSISTANT", // 3 - "TYPE_DEVICE_LOCKED", // 4 - "TYPE_ACCESSIBILITY", // 5 - "TYPE_SCREEN_PINNED", // 6 - "TYPE_OVERVIEW_WITHOUT_FOCUS", // 7 - "TYPE_RESET_GESTURE", // 8 - "TYPE_PROGRESS_DELEGATE", // 9 - "TYPE_SYSUI_OVERLAY", // 10 - "TYPE_ONE_HANDED", // 11 - "TYPE_TASKBAR_STASH", // 12 - "TYPE_STATUS_BAR", // 13 - "TYPE_CURSOR_HOVER", // 14 - "TYPE_NAV_HANDLE_LONG_PRESS", // 15 + "TYPE_NO_OP", // 0 + "TYPE_LAUNCHER", // 1 + "TYPE_OTHER_ACTIVITY", // 2 + "TYPE_ASSISTANT", // 3 + "TYPE_DEVICE_LOCKED", // 4 + "TYPE_ACCESSIBILITY", // 5 + "TYPE_SCREEN_PINNED", // 6 + "TYPE_LAUNCHER_WITHOUT_FOCUS", // 7 + "TYPE_RESET_GESTURE", // 8 + "TYPE_PROGRESS_DELEGATE", // 9 + "TYPE_SYSUI_OVERLAY", // 10 + "TYPE_ONE_HANDED", // 11 + "TYPE_TASKBAR_STASH", // 12 + "TYPE_STATUS_BAR", // 13 + "TYPE_CURSOR_HOVER", // 14 + "TYPE_NAV_HANDLE_LONG_PRESS", // 15 + "TYPE_BUBBLE_BAR", // 16 }; - InputConsumer NO_OP = () -> TYPE_NO_OP; + InputConsumer DEFAULT_NO_OP = createNoOpInputConsumer(Display.DEFAULT_DISPLAY); + + static InputConsumer createNoOpInputConsumer(int displayId) { + return new InputConsumer() { + @Override + public int getType() { + return TYPE_NO_OP; + } + + @Override + public int getDisplayId() { + return displayId; + } + }; + } int getType(); + int getDisplayId(); + /** - * Returns true if the user has crossed the threshold for it to be an explicit - * action. + * Returns true if the user has crossed the threshold for it to be an explicit action. */ default boolean allowInterceptByParent() { return true; } /** - * Returns true if the lifecycle of this input consumer is detached from the - * normal gesture - * down/up flow. If so, it is the responsibility of the input consumer to call - * back to - * {@link TouchInteractionService#onConsumerInactive(InputConsumer)} after the - * consumer is + * Returns true if the lifecycle of this input consumer is detached from the normal gesture + * down/up flow. If so, it is the responsibility of the input consumer to call back to + * {@link TouchInteractionService#onConsumerInactive(InputConsumer)} after the consumer is * finished. */ default boolean isConsumerDetachedFromGesture() { @@ -88,8 +103,7 @@ default boolean isConsumerDetachedFromGesture() { /** * Handle and specific setup necessary based on the orientation of the device */ - default void notifyOrientationSetup() { - } + default void notifyOrientationSetup() {} /** * Returns the active input consumer is in the hierarchy of this input consumer. @@ -99,23 +113,17 @@ default InputConsumer getActiveConsumerInHierarchy() { } /** - * Called by the event queue when the consumer is about to be switched to a new - * consumer. - * Consumers should update the state accordingly here before the state is passed - * to the new + * Called by the event queue when the consumer is about to be switched to a new consumer. + * Consumers should update the state accordingly here before the state is passed to the new * consumer. */ - default void onConsumerAboutToBeSwitched() { - } + default void onConsumerAboutToBeSwitched() { } - default void onMotionEvent(MotionEvent ev) { - } + default void onMotionEvent(MotionEvent ev) { } - default void onHoverEvent(MotionEvent ev) { - } + default void onHoverEvent(MotionEvent ev) { } - default void onKeyEvent(KeyEvent ev) { - } + default void onKeyEvent(KeyEvent ev) { } default void onInputEvent(InputEvent ev) { if (ev instanceof MotionEvent) { diff --git a/quickstep/src/com/android/quickstep/InputConsumerUtils.kt b/quickstep/src/com/android/quickstep/InputConsumerUtils.kt new file mode 100644 index 00000000000..ece5b39bc67 --- /dev/null +++ b/quickstep/src/com/android/quickstep/InputConsumerUtils.kt @@ -0,0 +1,885 @@ +/* + * 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.quickstep + +import android.content.Context +import android.view.InputDevice +import android.view.MotionEvent +import androidx.annotation.VisibleForTesting +import com.android.launcher3.Utilities.shouldEnableMouseInteractionChanges +import com.android.launcher3.anim.AnimatedFloat +import com.android.launcher3.statemanager.BaseState +import com.android.launcher3.statemanager.StatefulContainer +import com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAutoStashConnectedDisplayTaskbar +import com.android.launcher3.taskbar.TaskbarManager +import com.android.launcher3.util.LockedUserState.Companion.get +import com.android.quickstep.inputconsumers.AccessibilityInputConsumer +import com.android.quickstep.inputconsumers.AssistantInputConsumer +import com.android.quickstep.inputconsumers.BubbleBarInputConsumer +import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer +import com.android.quickstep.inputconsumers.LauncherInputConsumer +import com.android.quickstep.inputconsumers.LauncherWithoutFocusInputConsumer +import com.android.quickstep.inputconsumers.NavHandleLongPressInputConsumer +import com.android.quickstep.inputconsumers.OneHandedModeInputConsumer +import com.android.quickstep.inputconsumers.OtherActivityInputConsumer +import com.android.quickstep.inputconsumers.ProgressDelegateInputConsumer +import com.android.quickstep.inputconsumers.ResetGestureInputConsumer +import com.android.quickstep.inputconsumers.ScreenPinnedInputConsumer +import com.android.quickstep.inputconsumers.SysUiOverlayInputConsumer +import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer +import com.android.quickstep.inputconsumers.TrackpadStatusBarInputConsumer +import com.android.quickstep.util.ActiveGestureErrorDetector +import com.android.quickstep.util.ActiveGestureLog +import com.android.quickstep.util.ActiveGestureLog.CompoundString +import com.android.quickstep.util.ActiveGestureProtoLogProxy +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.window.RecentsWindowManager +import com.android.systemui.shared.system.InputChannelCompat +import com.android.systemui.shared.system.InputMonitorCompat +import com.android.wm.shell.Flags +import com.android.wm.shell.shared.desktopmode.DesktopState +import java.util.function.Consumer +import java.util.function.Function + +/** Utility class for creating input consumers. */ +object InputConsumerUtils { + private const val SUBSTRING_PREFIX = "; " + private const val NEWLINE_PREFIX = "\n\t\t\t-> " + + @JvmStatic + fun , T> newConsumer( + context: Context, + userUnlocked: Boolean, + overviewComponentObserver: OverviewComponentObserver, + deviceState: RecentsAnimationDeviceState, + previousGestureState: GestureState, + gestureState: GestureState, + taskAnimationManager: TaskAnimationManager, + inputMonitorCompat: InputMonitorCompat, + swipeUpHandlerFactory: AbsSwipeUpHandler.Factory, + onCompleteCallback: Consumer, + inputEventReceiver: InputChannelCompat.InputEventReceiver, + taskbarManager: TaskbarManager, + swipeUpProxyProvider: Function, + overviewCommandHelper: OverviewCommandHelper, + event: MotionEvent, + rotationTouchHelper: RotationTouchHelper, + desktopState: DesktopState, + ): InputConsumer where T : RecentsViewContainer, T : StatefulContainer { + val tac = taskbarManager.getTaskbarForDisplay(event.displayId) + val bubbleControllers = tac?.bubbleControllers + if (bubbleControllers != null && BubbleBarInputConsumer.isEventOnBubbles(tac, event)) { + val consumer: InputConsumer = + BubbleBarInputConsumer( + context, + gestureState.displayId, + bubbleControllers, + inputMonitorCompat, + ) + logInputConsumerSelectionReason( + consumer, + newCompoundString("event is on bubbles, creating new input consumer"), + ) + return consumer + } + val progressProxy = swipeUpProxyProvider.apply(gestureState) + if (progressProxy != null) { + val consumer: InputConsumer = + ProgressDelegateInputConsumer( + context, + taskAnimationManager, + gestureState, + inputMonitorCompat, + progressProxy, + ) + + logInputConsumerSelectionReason( + consumer, + newCompoundString( + "mSwipeUpProxyProvider has been set, using ProgressDelegateInputConsumer" + ), + ) + + return consumer + } + + val canStartSystemGesture = + if (gestureState.isTrackpadGesture) deviceState.canStartTrackpadGesture() + else deviceState.canStartSystemGesture() + + if (!get(context).isUserUnlocked) { + val reasonString = newCompoundString("device locked") + val consumer = + if (canStartSystemGesture) { + // This handles apps launched in direct boot mode (e.g. dialer) as well as apps + // launched while device is locked even after exiting direct boot mode (e.g. + // camera). + createDeviceLockedInputConsumer( + context, + userUnlocked, + taskbarManager, + deviceState, + gestureState, + taskAnimationManager, + inputMonitorCompat, + reasonString.append("%scan start system gesture", SUBSTRING_PREFIX), + rotationTouchHelper, + ) + } else { + getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString.append("%scannot start system gesture", SUBSTRING_PREFIX), + ) + } + logInputConsumerSelectionReason(consumer, reasonString) + return consumer + } + + var reasonString: CompoundString + var base: InputConsumer + // When there is an existing recents animation running, bypass systemState check as this is + // a followup gesture and the first gesture started in a valid system state. + if (canStartSystemGesture || previousGestureState.isRecentsAnimationRunning) { + reasonString = + newCompoundString( + if (canStartSystemGesture) + "can start system gesture, trying to use base consumer" + else "recents animation was running, trying to use base consumer" + ) + base = + newBaseConsumer( + context, + userUnlocked, + taskbarManager, + overviewComponentObserver, + deviceState, + previousGestureState, + gestureState, + taskAnimationManager, + inputMonitorCompat, + swipeUpHandlerFactory, + onCompleteCallback, + inputEventReceiver, + event, + reasonString, + rotationTouchHelper, + desktopState, + ) + } else { + reasonString = + newCompoundString( + "cannot start system gesture and recents " + + "animation was not running, trying to use default input consumer" + ) + base = + getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString, + ) + } + if (deviceState.isGesturalNavMode || gestureState.isTrackpadGesture) { + handleOrientationSetup(base) + } + if ( + deviceState.isFullyGesturalNavMode || + gestureState.isTrackpadGesture || + (enableAutoStashConnectedDisplayTaskbar.isTrue && tac?.isPrimaryDisplay == false) + ) { + val reasonPrefix = + "device is in gesture navigation mode or 3-button mode with a trackpad gesture" + if (deviceState.canTriggerAssistantAction(event)) { + reasonString.append( + "%s%s%sgesture can trigger the assistant, " + + "trying to use assistant input consumer", + NEWLINE_PREFIX, + reasonPrefix, + SUBSTRING_PREFIX, + ) + base = + tryCreateAssistantInputConsumer( + context, + deviceState, + inputMonitorCompat, + base, + gestureState, + event, + reasonString, + ) + } + + // If Taskbar is present, we listen for swipe or cursor hover events to unstash it. + if (tac != null && base !is AssistantInputConsumer) { + // Present always on large screen or on small screen w/ flag + val useTaskbarConsumer = + (tac.deviceProfile.isTaskbarPresent && + !tac.isPhoneMode && + !tac.isInStashedLauncherState) + if (canStartSystemGesture && useTaskbarConsumer) { + reasonString.append( + "%s%s%sTaskbarActivityContext != null, " + + "using TaskbarUnstashInputConsumer", + NEWLINE_PREFIX, + reasonPrefix, + SUBSTRING_PREFIX, + ) + base = + TaskbarUnstashInputConsumer( + base, + inputMonitorCompat, + tac, + overviewCommandHelper, + gestureState, + ) + } + } + if (Flags.enableBubblesLongPressNavHandle()) { + // Create bubbles input consumer before NavHandleLongPressInputConsumer. + // This allows for nav handle to fall back to bubbles. + if (deviceState.isBubblesExpanded) { + reasonString = + newCompoundString(reasonPrefix) + .append( + "%sbubbles expanded, trying to use default input consumer", + SUBSTRING_PREFIX, + ) + // Bubbles can handle home gesture itself. + base = + getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString, + ) + } + } + + val navHandle = tac?.navHandle ?: SystemUiProxy.INSTANCE[context] + if ( + canStartSystemGesture && + !previousGestureState.isRecentsAnimationRunning && + navHandle.canNavHandleBeLongPressed() && + !ignoreThreeFingerTrackpadForNavHandleLongPress(gestureState) + ) { + reasonString.append( + "%s%s%sNot running recents animation, ", + NEWLINE_PREFIX, + reasonPrefix, + SUBSTRING_PREFIX, + ) + if (tac != null && tac.navHandle.canNavHandleBeLongPressed()) { + reasonString.append("stashed handle is long-pressable, ") + } + reasonString.append("using NavHandleLongPressInputConsumer") + base = + NavHandleLongPressInputConsumer( + context, + base, + inputMonitorCompat, + deviceState, + navHandle, + gestureState, + ) + } + + if (!Flags.enableBubblesLongPressNavHandle()) { + // Continue overriding nav handle input consumer with bubbles + if (deviceState.isBubblesExpanded) { + reasonString = + newCompoundString(reasonPrefix) + .append( + "%sbubbles expanded, trying to use default input consumer", + SUBSTRING_PREFIX, + ) + // Bubbles can handle home gesture itself. + base = + getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString, + ) + } + } + + if (deviceState.isSystemUiDialogShowing) { + reasonString = + newCompoundString(reasonPrefix) + .append( + "%ssystem dialog is showing, using SysUiOverlayInputConsumer", + SUBSTRING_PREFIX, + ) + base = + SysUiOverlayInputConsumer( + context, + gestureState.displayId, + deviceState, + inputMonitorCompat, + ) + } + + if ( + gestureState.isTrackpadGesture && + canStartSystemGesture && + !previousGestureState.isRecentsAnimationRunning + ) { + reasonString = + newCompoundString(reasonPrefix) + .append( + "%sTrackpad 3-finger gesture, using TrackpadStatusBarInputConsumer", + SUBSTRING_PREFIX, + ) + base = + TrackpadStatusBarInputConsumer( + context, + gestureState.displayId, + base, + inputMonitorCompat, + ) + } + + if (deviceState.isScreenPinningActive) { + reasonString = + newCompoundString(reasonPrefix) + .append( + "%sscreen pinning is active, using ScreenPinnedInputConsumer", + SUBSTRING_PREFIX, + ) + // Note: we only allow accessibility to wrap this, and it replaces the previous + // base input consumer (which should be NO_OP anyway since topTaskLocked == true). + base = ScreenPinnedInputConsumer(context, gestureState) + } + + if (deviceState.canTriggerOneHandedAction(event)) { + reasonString.append( + "%s%s%sgesture can trigger one handed mode, " + + "using OneHandedModeInputConsumer", + NEWLINE_PREFIX, + reasonPrefix, + SUBSTRING_PREFIX, + ) + base = + OneHandedModeInputConsumer( + context, + gestureState.displayId, + deviceState, + base, + inputMonitorCompat, + ) + } + + if (deviceState.isAccessibilityMenuAvailable) { + reasonString.append( + "%s%s%saccessibility menu is available, using AccessibilityInputConsumer", + NEWLINE_PREFIX, + reasonPrefix, + SUBSTRING_PREFIX, + ) + base = + AccessibilityInputConsumer( + context, + gestureState.displayId, + deviceState, + base, + inputMonitorCompat, + rotationTouchHelper, + ) + } + } else { + val reasonPrefix = "device is not in gesture navigation mode" + if (deviceState.isScreenPinningActive) { + reasonString = + newCompoundString(reasonPrefix) + .append( + "%sscreen pinning is active, trying to use default input consumer", + SUBSTRING_PREFIX, + ) + base = + getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString, + ) + } + + if (deviceState.canTriggerOneHandedAction(event)) { + reasonString.append( + "%s%s%sgesture can trigger one handed mode, " + + "using OneHandedModeInputConsumer", + NEWLINE_PREFIX, + reasonPrefix, + SUBSTRING_PREFIX, + ) + base = + OneHandedModeInputConsumer( + context, + gestureState.displayId, + deviceState, + base, + inputMonitorCompat, + ) + } + } + logInputConsumerSelectionReason(base, reasonString) + return base + } + + @JvmStatic + fun tryCreateAssistantInputConsumer( + context: Context, + deviceState: RecentsAnimationDeviceState, + inputMonitorCompat: InputMonitorCompat, + gestureState: GestureState, + motionEvent: MotionEvent, + ): InputConsumer { + return tryCreateAssistantInputConsumer( + context, + deviceState, + inputMonitorCompat, + InputConsumer.createNoOpInputConsumer(gestureState.displayId), + gestureState, + motionEvent, + CompoundString.NO_OP, + ) + } + + private fun tryCreateAssistantInputConsumer( + context: Context, + deviceState: RecentsAnimationDeviceState, + inputMonitorCompat: InputMonitorCompat, + base: InputConsumer, + gestureState: GestureState, + motionEvent: MotionEvent, + reasonString: CompoundString, + ): InputConsumer { + return if (deviceState.isGestureBlockedTask(gestureState.runningTask)) { + reasonString.append( + "%sis gesture-blocked task, using base input consumer", + SUBSTRING_PREFIX, + ) + base + } else { + reasonString.append("%susing AssistantInputConsumer", SUBSTRING_PREFIX) + AssistantInputConsumer( + context, + gestureState, + base, + inputMonitorCompat, + deviceState, + motionEvent, + ) + } + } + + @VisibleForTesting + @JvmStatic + fun , T> newBaseConsumer( + context: Context, + userUnlocked: Boolean, + taskbarManager: TaskbarManager, + overviewComponentObserver: OverviewComponentObserver, + deviceState: RecentsAnimationDeviceState, + previousGestureState: GestureState, + gestureState: GestureState, + taskAnimationManager: TaskAnimationManager, + inputMonitorCompat: InputMonitorCompat, + swipeUpHandlerFactory: AbsSwipeUpHandler.Factory, + onCompleteCallback: Consumer, + inputEventReceiver: InputChannelCompat.InputEventReceiver, + event: MotionEvent, + reasonString: CompoundString, + rotationTouchHelper: RotationTouchHelper, + desktopState: DesktopState, + ): InputConsumer where T : RecentsViewContainer, T : StatefulContainer { + if (deviceState.isKeyguardShowingOccluded) { + // This handles apps showing over the lockscreen (e.g. camera) + return createDeviceLockedInputConsumer( + context, + userUnlocked, + taskbarManager, + deviceState, + gestureState, + taskAnimationManager, + inputMonitorCompat, + reasonString.append( + "%skeyguard is showing occluded, " + + "trying to use device locked input consumer", + SUBSTRING_PREFIX, + ), + rotationTouchHelper, + ) + } + + reasonString.append("%skeyguard is not showing occluded", SUBSTRING_PREFIX) + + val runningTask = gestureState.runningTask + val containerInterface = gestureState.getContainerInterface() + // Use launcher input consumer for sharesheets on top of home. + val forceLauncherInputConsumer = + containerInterface.isStarted() && + runningTask != null && + runningTask.isRootChooseActivity + + if (!Flags.enableShellTopTaskTracking()) { + // In the case where we are in an excluded, translucent overlay, ignore it and treat the + // running activity as the task behind the overlay. + val otherVisibleTask = runningTask?.visibleNonExcludedTask + if (otherVisibleTask != null) { + ActiveGestureProtoLogProxy.logUpdateGestureStateRunningTask( + otherVisibleTask.packageName ?: "MISSING", + runningTask.packageName ?: "MISSING", + ) + gestureState.updateRunningTask(otherVisibleTask) + } + } + + val previousGestureAnimatedToLauncher = + (previousGestureState.isRunningAnimationToLauncher || + deviceState.isPredictiveBackToHomeInProgress) + // with shell-transitions, home is resumed during recents animation, so + // explicitly check against recents animation too. + // Home is always running and isn't resumed when home shows behind desktop. + val launcherResumedThroughShellTransition = + containerInterface.isResumed() && + !previousGestureState.isRecentsAnimationRunning && + !desktopState.shouldShowHomeBehindDesktop + + // If a task fragment within Launcher is resumed + val launcherChildActivityResumed = + runningTask != null && + runningTask.isHomeTask && + !previousGestureState.isRecentsAnimationRunning && + overviewComponentObserver.isHomeAndOverviewSame && + containerInterface.isLauncherOverlayShowing + + return if (containerInterface.isInLiveTileMode()) { + createLauncherInputConsumer( + userUnlocked, + taskAnimationManager, + taskbarManager, + deviceState, + inputMonitorCompat, + previousGestureState, + gestureState, + event, + reasonString.append( + "%sis in live tile mode, trying to use launcher input consumer", + SUBSTRING_PREFIX, + ), + ) + } else if (runningTask == null) { + getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString.append("%srunning task == null", SUBSTRING_PREFIX), + ) + } else if ( + previousGestureAnimatedToLauncher || + launcherResumedThroughShellTransition || + forceLauncherInputConsumer + ) { + createLauncherInputConsumer( + userUnlocked, + taskAnimationManager, + taskbarManager, + deviceState, + inputMonitorCompat, + previousGestureState, + gestureState, + event, + reasonString + .append( + if (previousGestureAnimatedToLauncher) + (if (previousGestureState.isRunningAnimationToLauncher) + "%sprevious gesture is still animating to launcher" + else "%spredictive back animation is still in progress") + else if (launcherResumedThroughShellTransition) + "%slauncher resumed through a shell transition" + else "%sforceLauncherInputConsumer == true", + SUBSTRING_PREFIX, + ) + .append(", trying to use launcher input consumer"), + ) + } else if ( + deviceState.isGestureBlockedTask(runningTask) || + launcherChildActivityResumed || + ignoreNonTrackpadMouseEvent(context, gestureState, event) + ) { + getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString.append( + if (launcherChildActivityResumed) + "%sis launcher child-task, trying to use default input consumer" + else if (deviceState.isGestureBlockedTask(runningTask)) + "%sis gesture-blocked task, trying to use default input consumer" + else "%sis non trackpad mouse event, trying to use default input consumer", + SUBSTRING_PREFIX, + ), + ) + } else { + reasonString.append("%susing OtherActivityInputConsumer", SUBSTRING_PREFIX) + createOtherActivityInputConsumer( + context, + swipeUpHandlerFactory, + overviewComponentObserver, + deviceState, + taskAnimationManager, + inputMonitorCompat, + onCompleteCallback, + inputEventReceiver, + gestureState, + event, + runningTask.isHomeTask, + rotationTouchHelper, + ) + } + } + + private fun createDeviceLockedInputConsumer( + context: Context, + userUnlocked: Boolean, + taskbarManager: TaskbarManager, + deviceState: RecentsAnimationDeviceState, + gestureState: GestureState, + taskAnimationManager: TaskAnimationManager, + inputMonitorCompat: InputMonitorCompat, + reasonString: CompoundString, + rotationTouchHelper: RotationTouchHelper, + ): InputConsumer { + return if ( + (deviceState.isFullyGesturalNavMode || gestureState.isTrackpadGesture) && + gestureState.runningTask != null + ) { + reasonString.append( + "%sdevice is in gesture nav mode or 3-button mode with a trackpad " + + "gesture and running task != null, using DeviceLockedInputConsumer", + SUBSTRING_PREFIX, + ) + DeviceLockedInputConsumer( + context, + deviceState, + taskAnimationManager, + gestureState, + inputMonitorCompat, + rotationTouchHelper, + ) + } else { + getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString.append( + if (deviceState.isFullyGesturalNavMode || gestureState.isTrackpadGesture) + "%srunning task == null, trying to use default input consumer" + else + ("%sdevice is not in gesture nav mode and it's not a trackpad gesture," + + " trying to use default input consumer"), + SUBSTRING_PREFIX, + ), + ) + } + } + + private fun , T> createLauncherInputConsumer( + userUnlocked: Boolean, + taskAnimationManager: TaskAnimationManager, + taskbarManager: TaskbarManager, + deviceState: RecentsAnimationDeviceState, + inputMonitorCompat: InputMonitorCompat, + previousGestureState: GestureState, + gestureState: GestureState, + event: MotionEvent, + reasonString: CompoundString, + ): InputConsumer where T : RecentsViewContainer, T : StatefulContainer { + val containerInterface = gestureState.getContainerInterface()!! + val container: T = + containerInterface.getCreatedContainer() + ?: return getDefaultInputConsumer( + gestureState.displayId, + userUnlocked, + taskAnimationManager, + taskbarManager, + reasonString.append( + "%sactivity == null, trying to use default input consumer", + SUBSTRING_PREFIX, + ), + ) + + val rootView = container.rootView + val hasWindowFocus = rootView?.hasWindowFocus() ?: false + val isPreviousGestureAnimatingToLauncher = + (previousGestureState.isRunningAnimationToLauncher || + deviceState.isPredictiveBackToHomeInProgress) + val isInLiveTileMode: Boolean = containerInterface.isInLiveTileMode() + + reasonString.append( + if (hasWindowFocus) "%sactivity has window focus" + else if (isPreviousGestureAnimatingToLauncher) + (if (previousGestureState.isRunningAnimationToLauncher) + "%sprevious gesture is still animating to launcher" + else "%spredictive back animation is still in progress") + else if (isInLiveTileMode) "%sdevice is in live mode" + else "%sall overview focus conditions failed", + SUBSTRING_PREFIX, + ) + return if (hasWindowFocus || isPreviousGestureAnimatingToLauncher || isInLiveTileMode) { + reasonString.append( + "%soverview should have focus, using LauncherInputConsumer", + SUBSTRING_PREFIX, + ) + LauncherInputConsumer( + gestureState, + container, + inputMonitorCompat, + /* startingInActivityBounds= */ false, + ) + } else { + reasonString.append( + "%soverview shouldn't have focus, using LauncherWithoutFocusInputConsumer", + SUBSTRING_PREFIX, + ) + val disableHorizontalSwipe = deviceState.isInExclusionRegion(event) + LauncherWithoutFocusInputConsumer( + container.asContext(), + deviceState, + gestureState, + inputMonitorCompat, + taskAnimationManager, + disableHorizontalSwipe, + ) + } + } + + /** Returns the [ResetGestureInputConsumer] if user is unlocked, else NO_OP. */ + @JvmStatic + fun getDefaultInputConsumer( + displayId: Int, + userUnlocked: Boolean, + taskAnimationManager: TaskAnimationManager?, + taskbarManager: TaskbarManager?, + reasonString: CompoundString, + ): InputConsumer { + return if (userUnlocked && taskAnimationManager != null && taskbarManager != null) { + reasonString.append( + "%sResetGestureInputConsumer available, using ResetGestureInputConsumer", + SUBSTRING_PREFIX, + ) + ResetGestureInputConsumer(displayId, taskAnimationManager) { + taskbarManager.getTaskbarForDisplay(displayId) + } + } else { + reasonString.append( + "%s${ + if (userUnlocked) "user is locked" + else if (taskAnimationManager == null) "taskAnimationManager is null" + else "taskbarManager is null" + }, using no-op input consumer", + SUBSTRING_PREFIX, + ) + // ResetGestureInputConsumer isn't available until onUserUnlocked(), so reset to + // NO_OP until then (we never want these to be null). + InputConsumer.createNoOpInputConsumer(displayId) + } + } + + private fun , T> createOtherActivityInputConsumer( + context: Context, + swipeUpHandlerFactory: AbsSwipeUpHandler.Factory, + overviewComponentObserver: OverviewComponentObserver, + deviceState: RecentsAnimationDeviceState, + taskAnimationManager: TaskAnimationManager, + inputMonitorCompat: InputMonitorCompat, + onCompleteCallback: Consumer, + inputEventReceiver: InputChannelCompat.InputEventReceiver, + gestureState: GestureState, + event: MotionEvent, + isHomeTask: Boolean, + rotationTouchHelper: RotationTouchHelper, + ): InputConsumer where T : RecentsViewContainer, T : StatefulContainer { + val containerInterface = gestureState.getContainerInterface() + val shouldDefer = + (!overviewComponentObserver.isHomeAndOverviewSame || + containerInterface.deferStartingActivity(deviceState, event)) + val disableHorizontalSwipe = + deviceState.isInExclusionRegion(event) && + (containerInterface.getCreatedContainer() !is RecentsWindowManager || !isHomeTask) + return OtherActivityInputConsumer( + /* base= */ context, + deviceState, + taskAnimationManager, + gestureState, + /* isDeferredDownTarget= */ shouldDefer, + onCompleteCallback, + inputMonitorCompat, + inputEventReceiver, + disableHorizontalSwipe, + swipeUpHandlerFactory, + rotationTouchHelper, + ) + } + + private fun newCompoundString(substring: String): CompoundString { + return CompoundString("%s%s", NEWLINE_PREFIX, substring) + } + + private fun logInputConsumerSelectionReason( + consumer: InputConsumer, + reasonString: CompoundString, + ) { + ActiveGestureProtoLogProxy.logSetInputConsumer(consumer.name, reasonString.toString()) + if ((consumer.type and InputConsumer.TYPE_OTHER_ACTIVITY) != 0) { + ActiveGestureLog.INSTANCE.trackEvent( + ActiveGestureErrorDetector.GestureEvent.FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER + ) + } + } + + private fun ignoreThreeFingerTrackpadForNavHandleLongPress( + gestureState: GestureState + ): Boolean { + return (com.android.launcher3.Flags.ignoreThreeFingerTrackpadForNavHandleLongPress() && + gestureState.isThreeFingerTrackpadGesture) + } + + private fun ignoreNonTrackpadMouseEvent( + context: Context, + gestureState: GestureState, + event: MotionEvent, + ): Boolean { + return shouldEnableMouseInteractionChanges(context) && + !gestureState.isTrackpadGesture() && + event.isFromSource(InputDevice.SOURCE_MOUSE) + } + + private fun handleOrientationSetup(baseInputConsumer: InputConsumer) { + baseInputConsumer.notifyOrientationSetup() + } +} diff --git a/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java b/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java index 33a23661574..bb208c49c75 100644 --- a/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java +++ b/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java @@ -24,9 +24,12 @@ import android.os.UserHandle; import android.util.Log; +import com.android.launcher3.dagger.ApplicationContext; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.util.InstantAppResolver; +import javax.inject.Inject; + /** * Implementation of InstantAppResolver using platform APIs */ @@ -38,7 +41,9 @@ public class InstantAppResolverImpl extends InstantAppResolver { private final PackageManager mPM; - public InstantAppResolverImpl(Context context) { + @Inject + public InstantAppResolverImpl(@ApplicationContext Context context) { + super(); mPM = context.getPackageManager(); } diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java index 0d5ef810285..4be85b412bf 100644 --- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java +++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java @@ -18,7 +18,6 @@ import static com.android.app.animation.Interpolators.LINEAR; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.BACKGROUND_APP; -import static com.android.launcher3.LauncherState.FLOATING_SEARCH_BAR; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; @@ -28,9 +27,9 @@ import android.animation.AnimatorSet; import android.content.Context; import android.graphics.Rect; -import android.view.MotionEvent; import android.view.RemoteAnimationTarget; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; @@ -40,21 +39,20 @@ import com.android.launcher3.LauncherInitListener; import com.android.launcher3.LauncherState; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.statehandlers.DepthController; -import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.StateManager; -import com.android.launcher3.taskbar.LauncherTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.NavigationMode; +import com.android.launcher3.views.ScrimColors; import com.android.quickstep.GestureState.GestureEndTarget; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.ActivityInitListener; import com.android.quickstep.util.AnimatorControllerWithResistance; import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.views.RecentsView; import com.android.systemui.plugins.shared.LauncherOverlayManager; +import com.android.wm.shell.shared.desktopmode.DesktopState; import java.util.function.Consumer; import java.util.function.Predicate; @@ -77,31 +75,27 @@ public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rec calculateTaskSize(context, dp, outRect, orientationHandler); if (dp.isVerticalBarLayout() && DisplayController.getNavigationMode(context) != NavigationMode.NO_BUTTON) { - return dp.isSeascape() ? outRect.left : (dp.widthPx - outRect.right); + return dp.isSeascape() ? outRect.left : (dp.getDeviceProperties().getWidthPx() - outRect.right); } else { - return LayoutUtils.getShelfTrackingDistance(context, dp, orientationHandler); + return LayoutUtils.getShelfTrackingDistance(context, dp, orientationHandler, this); } } @Override - public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) { + public void onSwipeUpToHomeComplete() { QuickstepLauncher launcher = getCreatedContainer(); if (launcher == null) { return; } - // When going to home, the state animator we use has SKIP_OVERVIEW because we - // assume that - // setRecentsAttachedToAppWindow() will handle animating Overview instead. Thus, - // at the end - // of the animation, we should ensure recents is at the correct position for - // NORMAL state. - // For example, when doing a long swipe to home, RecentsView may be scaled down. - // This is + // When going to home, the state animator we use has SKIP_OVERVIEW because we assume that + // setRecentsAttachedToAppWindow() will handle animating Overview instead. Thus, at the end + // of the animation, we should ensure recents is at the correct position for NORMAL state. + // For example, when doing a long swipe to home, RecentsView may be scaled down. This is // relatively expensive, so do it on the next frame instead of critical path. MAIN_EXECUTOR.getHandler().post(launcher.getStateManager()::reapplyState); launcher.getRootView().setForceHideBackArrow(false); - notifyRecentsOfOrientation(deviceState.getRotationTouchHelper()); + notifyRecentsOfOrientation(); } @Override @@ -114,9 +108,9 @@ public void onAssistantVisibilityChanged(float visibility) { } @Override - public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState, + public AnimationFactory prepareRecentsUI( boolean activityVisible, Consumer callback) { - notifyRecentsOfOrientation(deviceState.getRotationTouchHelper()); + notifyRecentsOfOrientation(); DefaultAnimationFactory factory = new DefaultAnimationFactory(callback) { @Override protected void createBackgroundToOverviewAnim(QuickstepLauncher activity, @@ -136,13 +130,14 @@ protected void createBackgroundToOverviewAnim(QuickstepLauncher activity, QuickstepLauncher launcher = factory.initBackgroundStateUI(); // Since all apps is not visible, we can safely reset the scroll position. // This ensures then the next swipe up to all-apps starts from scroll 0. - launcher.getAppsView().reset(false /* animate */); + launcher.getAppsView().reset(false /* animate */, true /* clearScrim */); return factory; } @Override - public ActivityInitListener createActivityInitListener(Predicate onInitListener) { - return new LauncherInitListener((activity, alreadyOnHome) -> onInitListener.test(alreadyOnHome)); + public LauncherInitListener createActivityInitListener(Predicate onInitListener) { + return new LauncherInitListener((activity, alreadyOnHome) -> + onInitListener.test(alreadyOnHome)); } @Override @@ -157,7 +152,7 @@ public void setOnDeferredActivityLaunchCallback(Runnable r) { @Nullable @Override public QuickstepLauncher getCreatedContainer() { - return QuickstepLauncher.ACTIVITY_TRACKER.getCreatedActivity(); + return QuickstepLauncher.ACTIVITY_TRACKER.getCreatedContext(); } @Nullable @@ -172,31 +167,21 @@ public DepthController getDepthController() { @Nullable @Override - public DesktopVisibilityController getDesktopVisibilityController() { + public TaskbarInteractor getTaskbarInteractor() { QuickstepLauncher launcher = getCreatedContainer(); if (launcher == null) { return null; } - return launcher.getDesktopVisibilityController(); - } - - @Nullable - @Override - public LauncherTaskbarUIController getTaskbarController() { - QuickstepLauncher launcher = getCreatedContainer(); - if (launcher == null) { - return null; - } - return launcher.getTaskbarUIController(); + return launcher.getTaskbarInteractor(); } @Nullable @Override public RecentsView getVisibleRecentsView() { QuickstepLauncher launcher = getVisibleLauncher(); - RecentsView recentsView = launcher != null && launcher.getStateManager().getState().isRecentsViewVisible - ? launcher.getOverviewPanel() - : null; + RecentsView recentsView = + launcher != null && launcher.getStateManager().getState().isRecentsViewVisible + ? launcher.getOverviewPanel() : null; if (recentsView == null || (!launcher.hasBeenResumed() && recentsView.getRunningTaskViewId() == -1)) { // If live tile has ended, return null. @@ -228,6 +213,12 @@ public boolean switchToRecentsIfVisible(Animator.AnimatorListener animatorListen if (launcher == null) { return false; } + if (DesktopState.getInstance(launcher.asContext()).getShouldShowHomeBehindDesktop() + && !launcher.hasWindowFocus()) { + // Home is always shown behind desktop, but it is currently not the top task, so treat + // it as if it is not visible. + return false; + } if (isInLiveTileMode()) { RecentsView recentsView = getVisibleRecentsView(); if (recentsView == null) { @@ -242,9 +233,11 @@ public boolean switchToRecentsIfVisible(Animator.AnimatorListener animatorListen return true; } + @Override - public void onExitOverview(RotationTouchHelper deviceState, Runnable exitRunnable) { - final StateManager stateManager = getCreatedContainer().getStateManager(); + public void onExitOverview(Runnable exitRunnable) { + final StateManager stateManager = + getCreatedContainer().getStateManager(); stateManager.addStateListener( new StateManager.StateListener() { @Override @@ -252,18 +245,16 @@ public void onStateTransitionComplete(LauncherState toState) { // Are we going from Recents to Workspace? if (toState == LauncherState.NORMAL) { exitRunnable.run(); - notifyRecentsOfOrientation(deviceState); + notifyRecentsOfOrientation(); stateManager.removeStateListener(this); } } }); } - private void notifyRecentsOfOrientation(RotationTouchHelper rotationTouchHelper) { + private void notifyRecentsOfOrientation() { // reset layout on swipe to home - RecentsView recentsView = getCreatedContainer().getOverviewPanel(); - recentsView.setLayoutRotation(rotationTouchHelper.getCurrentActiveRotation(), - rotationTouchHelper.getDisplayRotation()); + ((RecentsView) getCreatedContainer().getOverviewPanel()).reapplyActiveRotation(); } @Override @@ -271,19 +262,6 @@ public Rect getOverviewWindowBounds(Rect homeBounds, RemoteAnimationTarget targe return homeBounds; } - @Override - public boolean allowMinimizeSplitScreen() { - return true; - } - - @Override - public boolean allowAllAppsFromOverview() { - return FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get() - // If floating search bar would not show in overview, don't allow all apps - // gesture. - && OVERVIEW.areElementsVisible(getCreatedContainer(), FLOATING_SEARCH_BAR); - } - @Override public boolean isInLiveTileMode() { QuickstepLauncher launcher = getCreatedContainer(); @@ -291,7 +269,8 @@ public boolean isInLiveTileMode() { return launcher != null && launcher.getStateManager().getState() == OVERVIEW && launcher.isStarted() - && TopTaskTracker.INSTANCE.get(launcher).getCachedTopTask(false).isHomeTask(); + && TopTaskTracker.INSTANCE.get(launcher).getCachedTopTask(false, + launcher.getDisplayId()).isHomeTask(); } private boolean isInMinusOne() { @@ -300,7 +279,8 @@ private boolean isInMinusOne() { return launcher != null && launcher.getStateManager().getState() == NORMAL && !launcher.isStarted() - && TopTaskTracker.INSTANCE.get(launcher).getCachedTopTask(false).isHomeTask(); + && TopTaskTracker.INSTANCE.get(launcher).getCachedTopTask(false, + launcher.getDisplayId()).isHomeTask(); } @Override @@ -320,8 +300,7 @@ public void closeOverlay() { return; } LauncherOverlayManager om = launcher.getOverlayManager(); - if (!SystemUiProxy.INSTANCE.get(launcher).getHomeVisibilityState().isHomeVisible() - || launcher.isForceInvisible()) { + if (!SystemUiProxy.INSTANCE.get(launcher).getHomeVisibilityState().isHomeVisible()) { om.hideOverlay(false /* animate */); } else { om.hideOverlay(150); @@ -329,16 +308,16 @@ public void closeOverlay() { } @Override - public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget, + public @Nullable Animator getParallelAnimationToGestureEndTarget(GestureEndTarget endTarget, long duration, RecentsAnimationCallbacks callbacks) { - LauncherTaskbarUIController uiController = getTaskbarController(); - Animator superAnimator = super.getParallelAnimationToLauncher( + TaskbarInteractor interactor = getTaskbarInteractor(); + Animator superAnimator = super.getParallelAnimationToGestureEndTarget( endTarget, duration, callbacks); - if (uiController == null || callbacks == null) { + if (interactor == null || callbacks == null) { return superAnimator; } - LauncherState toState = stateFromGestureEndTarget(endTarget); - Animator taskbarAnimator = uiController.createAnimToLauncher(toState, callbacks, duration); + Animator taskbarAnimator = interactor.getParallelAnimationToGestureEndTarget(endTarget, + duration, callbacks); if (superAnimator == null) { return taskbarAnimator; } else { @@ -349,42 +328,25 @@ public void closeOverlay() { } @Override - protected int getOverviewScrimColorForState(QuickstepLauncher activity, LauncherState state) { + protected ScrimColors getOverviewScrimColorForState(QuickstepLauncher activity, + LauncherState state) { return state.getWorkspaceScrimColor(activity); } @Override - public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) { - LauncherTaskbarUIController uiController = getTaskbarController(); - if (uiController == null) { - return super.deferStartingActivity(deviceState, ev); - } - return uiController.isEventOverAnyTaskbarItem(ev) - || super.deferStartingActivity(deviceState, ev); + public LauncherState stateFromGestureEndTarget(@NonNull GestureEndTarget endTarget) { + return switch (endTarget) { + case RECENTS -> OVERVIEW; + case NEW_TASK, LAST_TASK -> BACKGROUND_APP; + case ALL_APPS -> ALL_APPS; + default -> NORMAL; + }; } @Override - public boolean shouldCancelCurrentGesture() { - LauncherTaskbarUIController uiController = getTaskbarController(); - if (uiController == null) { - return super.shouldCancelCurrentGesture(); - } - return uiController.isDraggingItem(); - } + public boolean isLauncherOverlayShowing() { + Launcher launcher = Launcher.ACTIVITY_TRACKER.getCreatedContext(); - @Override - public LauncherState stateFromGestureEndTarget(GestureEndTarget endTarget) { - switch (endTarget) { - case RECENTS: - return OVERVIEW; - case NEW_TASK: - case LAST_TASK: - return BACKGROUND_APP; - case ALL_APPS: - return ALL_APPS; - case HOME: - default: - return NORMAL; - } + return launcher != null && launcher.getWorkspace().isOverlayShown(); } } diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java index b38a4664f54..f7463dbd8bb 100644 --- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java +++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java @@ -16,6 +16,7 @@ package com.android.quickstep; +import static android.util.MathUtils.lerp; import static android.view.RemoteAnimationTarget.MODE_CLOSING; import static android.view.RemoteAnimationTarget.MODE_OPENING; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS; @@ -24,10 +25,10 @@ import static com.android.launcher3.BaseActivity.INVISIBLE_ALL; import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS; import static com.android.launcher3.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION; +import static com.android.launcher3.Flags.enableOverviewBackgroundWallpaperBlur; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; import android.animation.ValueAnimator; import android.content.ComponentCallbacks; import android.content.res.Configuration; @@ -38,7 +39,6 @@ import android.os.Handler; import android.os.RemoteException; import android.util.Log; -import android.util.Pair; import android.view.Choreographer; import android.view.IRemoteAnimationFinishedCallback; import android.view.IRemoteAnimationRunner; @@ -50,20 +50,27 @@ import android.window.BackEvent; import android.window.BackMotionEvent; import android.window.BackProgressAnimator; +import android.window.IBackAnimationHandoffHandler; import android.window.IOnBackInvokedCallback; +import com.android.app.animation.Animations; import com.android.app.animation.Interpolators; import com.android.internal.policy.SystemBarUtils; import com.android.internal.view.AppearanceRegion; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BubbleTextView; +import com.android.launcher3.Flags; +import com.android.launcher3.LauncherState; import com.android.launcher3.QuickstepTransitionManager; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.taskbar.LauncherTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.NavigationMode; import com.android.launcher3.widget.LauncherAppWidgetHostView; -import com.android.quickstep.util.RectFSpringAnim; +import com.android.quickstep.util.BackAnimState; +import com.android.quickstep.util.ScalingWorkspaceRevealAnim; import com.android.systemui.shared.system.QuickStepContract; import java.lang.ref.WeakReference; @@ -86,9 +93,10 @@ */ public class LauncherBackAnimationController { private static final int SCRIM_FADE_DURATION = 233; - private static final float MIN_WINDOW_SCALE = 0.85f; + private static final float MIN_WINDOW_SCALE = 0.75f; private static final float MAX_SCRIM_ALPHA_DARK = 0.8f; private static final float MAX_SCRIM_ALPHA_LIGHT = 0.2f; + private static final int MIN_BLUR_RADIUS_PRE_COMMIT = 10; private final QuickstepTransitionManager mQuickstepTransitionManager; private final Matrix mTransformMatrix = new Matrix(); @@ -109,10 +117,9 @@ public class LauncherBackAnimationController { private RemoteAnimationTarget mLauncherTarget; private View mLauncherTargetView; private final SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction(); - private boolean mSpringAnimationInProgress = false; - private boolean mAnimatorSetInProgress = false; private float mBackProgress = 0; private boolean mBackInProgress = false; + private boolean mWaitStartTransition = false; private OnBackInvokedCallbackStub mBackCallback; private IRemoteAnimationFinishedCallback mAnimationFinishedCallback; private BackProgressAnimator mProgressAnimator ; @@ -120,6 +127,8 @@ public class LauncherBackAnimationController { private ValueAnimator mScrimAlphaAnimator; private float mScrimAlpha; private boolean mOverridingStatusBarFlags; + private int mMaxBlurRadius; + private int mLastBlurRadius = 0; private final ComponentCallbacks mComponentCallbacks = new ComponentCallbacks() { @Override @@ -155,7 +164,7 @@ public void registerBackCallbacks(Handler handler) { mBackCallback = new OnBackInvokedCallbackStub(handler, mProgressAnimator, mProgressInterpolator, this); SystemUiProxy.INSTANCE.get(mLauncher).setBackToLauncherCallback(mBackCallback, - new RemoteAnimationRunnerStub(this)); + new RemoteAnimationRunnerStub(this, handler)); } private static class OnBackInvokedCallbackStub extends IOnBackInvokedCallback.Stub { @@ -192,7 +201,10 @@ public void onBackInvoked() { mHandler.post(() -> { LauncherBackAnimationController controller = mControllerRef.get(); if (controller != null) { - controller.startTransition(); + controller.mWaitStartTransition = true; + if (controller.mBackTarget != null && controller.mBackInProgress) { + controller.startTransition(); + } } mProgressAnimator.reset(); }); @@ -217,7 +229,8 @@ public void onBackStarted(BackMotionEvent backEvent) { mHandler.post(() -> { LauncherBackAnimationController controller = mControllerRef.get(); if (controller != null) { - controller.startBack(backEvent); + controller.initBackMotion(backEvent); + controller.tryStartBackAnimation(); mProgressAnimator.onBackStarted(backEvent, event -> { float backProgress = event.getProgress(); controller.mBackProgress = @@ -232,6 +245,12 @@ public void onBackStarted(BackMotionEvent backEvent) { public void setTriggerBack(boolean triggerBack) { // TODO(b/261654570): track touch from the Launcher process. } + + @Override + public void setHandoffHandler(IBackAnimationHandoffHandler unused) { + // For now, Launcher handles this internally so it doesn't need to hand off the + // animation. + } } private static class RemoteAnimationRunnerStub extends IRemoteAnimationRunner.Stub { @@ -239,9 +258,12 @@ private static class RemoteAnimationRunnerStub extends IRemoteAnimationRunner.St // LauncherBackAnimationController has strong reference to Launcher activity, the binder // callback should not hold strong reference to it to avoid memory leak. private WeakReference mControllerRef; + private final Handler mHandler; - private RemoteAnimationRunnerStub(LauncherBackAnimationController controller) { + private RemoteAnimationRunnerStub(LauncherBackAnimationController controller, + Handler handler) { mControllerRef = new WeakReference<>(controller); + mHandler = handler; } @Override @@ -252,15 +274,26 @@ public void onAnimationStart(int transit, RemoteAnimationTarget[] apps, if (controller == null) { return; } - for (final RemoteAnimationTarget target : apps) { - if (MODE_CLOSING == target.mode) { - controller.mBackTarget = target; + final Runnable r = () -> { + for (final RemoteAnimationTarget target : apps) { + if (MODE_CLOSING == target.mode) { + controller.mBackTarget = target; + } + if (MODE_OPENING == target.mode) { + controller.mLauncherTarget = target; + } } - if (MODE_OPENING == target.mode) { - controller.mLauncherTarget = target; + controller.mAnimationFinishedCallback = finishedCallback; + controller.tryStartBackAnimation(); + if (controller.mWaitStartTransition) { + controller.startTransition(); } + }; + if (mHandler != null) { + mHandler.post(r); + } else { + r.run(); } - controller.mAnimationFinishedCallback = finishedCallback; } @Override @@ -269,6 +302,10 @@ public void onAnimationCancelled() {} private void onCancelFinished() { customizeStatusBarAppearance(false); + if (!mLauncher.getWorkspace().isOverlayShown() + && !mLauncher.isInState(LauncherState.ALL_APPS)) { + setLauncherScale(ScalingWorkspaceRevealAnim.MAX_SIZE); + } finishAnimation(); } @@ -281,37 +318,47 @@ public void unregisterBackCallbacks() { mBackCallback = null; } - private void startBack(BackMotionEvent backEvent) { + private void initBackMotion(BackMotionEvent backEvent) { // in case we're still animating an onBackCancelled event, let's remove the finish- // callback from the progress animator to prevent calling finishAnimation() before // restarting a new animation - // Side note: startBack is never called during the post-commit phase if the back gesture - // was committed (not cancelled). BackAnimationController prevents that. Therefore we - // don't have to handle that case. + // Side note: initBackMotion is never called during the post-commit phase if the back + // gesture was committed (not cancelled). BackAnimationController prevents that. Therefore + // we don't have to handle that case. mProgressAnimator.removeOnBackCancelledFinishCallback(); - mBackInProgress = true; - RemoteAnimationTarget appTarget = backEvent.getDepartingAnimationTarget(); + mInitialTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY()); + } - if (appTarget == null || appTarget.leash == null || !appTarget.leash.isValid()) { + private void tryStartBackAnimation() { + if (mBackTarget == null || !mBackInProgress) { return; } mTransaction - .show(appTarget.leash) + .show(mBackTarget.leash) .setAnimationTransaction(); - mBackTarget = appTarget; - mInitialTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY()); + mStartRect.set(mBackTarget.windowConfiguration.getMaxBounds()); - mStartRect.set(appTarget.windowConfiguration.getMaxBounds()); - - // inset bottom in case of pinned taskbar being present - mStartRect.inset(0, 0, 0, appTarget.contentInsets.bottom); + // inset bottom in case of taskbar being present + if (mLauncher.getDeviceProfile().isTaskbarPresent + || DisplayController.getNavigationMode(mLauncher) == NavigationMode.NO_BUTTON) { + mStartRect.inset(0, 0, 0, mBackTarget.contentInsets.bottom); + } mLauncherTargetView = mQuickstepTransitionManager.findLauncherView( new RemoteAnimationTarget[]{ mBackTarget }); setLauncherTargetViewVisible(false); mCurrentRect.set(mStartRect); + if (!mLauncher.getWorkspace().isOverlayShown() + && !mLauncher.isInState(LauncherState.ALL_APPS)) { + Animations.cancelOngoingAnimation(mLauncher.getWorkspace()); + Animations.cancelOngoingAnimation(mLauncher.getHotseat()); + mLauncher.getDepthController().pauseBlursOnWindows(true); + mLauncher.getDepthController().stateDepth.setValue( + LauncherState.BACKGROUND_APP.getDepth(mLauncher)); + setLauncherScale(ScalingWorkspaceRevealAnim.MIN_SIZE); + } if (mScrimLayer == null) { addScrimLayer(); } @@ -326,6 +373,13 @@ private void setLauncherTargetViewVisible(boolean isVisible) { } } + private void setLauncherScale(float scale) { + mLauncher.getWorkspace().setScaleX(scale); + mLauncher.getWorkspace().setScaleY(scale); + mLauncher.getHotseat().setScaleX(scale); + mLauncher.getHotseat().setScaleY(scale); + } + void addScrimLayer() { SurfaceControl parent = mLauncherTarget != null ? mLauncherTarget.leash : null; if (parent == null || !parent.isValid()) { @@ -344,10 +398,13 @@ void addScrimLayer() { final float[] colorComponents = new float[] { 0f, 0f, 0f }; mScrimAlpha = (isDarkTheme) ? MAX_SCRIM_ALPHA_DARK : MAX_SCRIM_ALPHA_LIGHT; + setBlur(mMaxBlurRadius); mTransaction .setColor(mScrimLayer, colorComponents) .setAlpha(mScrimLayer, mScrimAlpha) - .show(mScrimLayer); + .show(mScrimLayer) + // Ensure the scrim layer occludes opening task & wallpaper + .setLayer(mScrimLayer, 1000); } void removeScrimLayer() { @@ -368,6 +425,9 @@ private void updateBackProgress(float progress, BackEvent event) { if (mScrimLayer == null) { // Scrim hasn't been attached yet. Let's attach it. addScrimLayer(); + } else { + mLastBlurRadius = (int) lerp(mMaxBlurRadius, MIN_BLUR_RADIUS_PRE_COMMIT, progress); + setBlur(mLastBlurRadius); } float screenWidth = mStartRect.width(); float screenHeight = mStartRect.height(); @@ -386,10 +446,11 @@ private void updateBackProgress(float progress, BackEvent event) { // Move the window along the Y axis. float top = (screenHeight - height) * 0.5f + deltaY; // Move the window along the X axis. - float left = event.getSwipeEdge() == BackEvent.EDGE_RIGHT - ? progress * mWindowScaleMarginX - : screenWidth - progress * mWindowScaleMarginX - width; - + float left = switch (event.getSwipeEdge()) { + case BackEvent.EDGE_RIGHT -> progress * mWindowScaleMarginX; + case BackEvent.EDGE_LEFT -> screenWidth - progress * mWindowScaleMarginX - width; + default -> (screenWidth - width) / 2; + }; mCurrentRect.set(left, top, left + width, top + height); float cornerRadius = Utilities.mapRange( progress, mWindowScaleStartCornerRadius, mWindowScaleEndCornerRadius); @@ -398,6 +459,10 @@ private void updateBackProgress(float progress, BackEvent event) { customizeStatusBarAppearance(top > mStatusBarHeight / 2); } + private void setBlur(int blurRadius) { + mTransaction.setBackgroundBlurRadius(mScrimLayer, blurRadius); + } + /** Transform the target window to match the target rect. */ private void applyTransform(RectF targetRect, float cornerRadius) { final float scale = targetRect.width() / mStartRect.width(); @@ -419,18 +484,14 @@ private void applyTransaction() { } private void startTransition() { - if (mBackTarget == null) { - // Trigger transition system instead of custom transition animation. - finishAnimation(); - return; - } + mWaitStartTransition = false; if (mLauncher.isDestroyed()) { return; } mLauncher.setPredictiveBackToHomeInProgress(true); - LauncherTaskbarUIController taskbarUIController = mLauncher.getTaskbarUIController(); - if (taskbarUIController != null) { - taskbarUIController.onLauncherVisibilityChanged(true); + TaskbarInteractor taskbarInteractor = mLauncher.getTaskbarInteractor(); + if (taskbarInteractor != null) { + taskbarInteractor.onLauncherVisibilityChanged(true); } // TODO: Catch the moment when launcher becomes visible after the top app un-occludes // launcher and start animating afterwards. Currently we occasionally get a flicker from @@ -452,22 +513,26 @@ private void startTransition() { mQuickstepTransitionManager.transferRectToTargetCoordinate( mBackTarget, mCurrentRect, true, resolveRectF); - Pair pair = + BackAnimState backAnim = mQuickstepTransitionManager.createWallpaperOpenAnimations( new RemoteAnimationTarget[]{mBackTarget}, new RemoteAnimationTarget[0], - false /* fromUnlock */, + new RemoteAnimationTarget[0], resolveRectF, cornerRadius, mBackInProgress /* fromPredictiveBack */); - startTransitionAnimations(pair.first, pair.second); - mLauncher.clearForceInvisibleFlag(INVISIBLE_ALL); - customizeStatusBarAppearance(true); + startTransitionAnimations(backAnim); } private void finishAnimation() { mLauncher.setPredictiveBackToHomeInProgress(false); + if (mBackTarget != null && mBackTarget.leash.isValid()) { + mBackTarget.leash.release(); + } mBackTarget = null; + if (mLauncherTarget != null && mLauncherTarget.leash.isValid()) { + mLauncherTarget.leash.release(); + } mLauncherTarget = null; mBackInProgress = false; mBackProgress = 0; @@ -475,8 +540,6 @@ private void finishAnimation() { mCurrentRect.setEmpty(); mStartRect.setEmpty(); mInitialTouchPos.set(0, 0); - mAnimatorSetInProgress = false; - mSpringAnimationInProgress = false; setLauncherTargetViewVisible(true); mLauncherTargetView = null; // We don't call customizeStatusBarAppearance here to prevent the status bar update with @@ -497,38 +560,25 @@ private void finishAnimation() { if (mScrimLayer != null) { removeScrimLayer(); } + if (!mLauncher.getWorkspace().isOverlayShown() + && !mLauncher.isInState(LauncherState.ALL_APPS)) { + mLauncher.getDepthController().pauseBlursOnWindows(false); + } + mLastBlurRadius = 0; } - private void startTransitionAnimations(RectFSpringAnim springAnim, AnimatorSet anim) { - mAnimatorSetInProgress = anim != null; - mSpringAnimationInProgress = springAnim != null; - if (springAnim != null) { - springAnim.addAnimatorListener( - new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mSpringAnimationInProgress = false; - tryFinishBackAnimation(); - } - } - ); - } - anim.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mAnimatorSetInProgress = false; - tryFinishBackAnimation(); - } - }); + private void startTransitionAnimations(BackAnimState backAnim) { + backAnim.addOnAnimCompleteCallback(this::finishAnimation); if (mScrimLayer == null) { // Scrim hasn't been attached yet. Let's attach it. addScrimLayer(); } - mScrimAlphaAnimator = new ValueAnimator().ofFloat(1, 0); + mScrimAlphaAnimator = ValueAnimator.ofFloat(1, 0); mScrimAlphaAnimator.addUpdateListener(animation -> { float value = (Float) animation.getAnimatedValue(); if (mScrimLayer != null && mScrimLayer.isValid()) { mTransaction.setAlpha(mScrimLayer, value * mScrimAlpha); + setBlur((int) lerp(mLastBlurRadius, 0, 1f - value)); applyTransaction(); } }); @@ -539,7 +589,9 @@ public void onAnimationEnd(Animator animation) { } }); mScrimAlphaAnimator.setDuration(SCRIM_FADE_DURATION).start(); - anim.start(); + mLauncher.clearForceInvisibleFlag(INVISIBLE_ALL); + customizeStatusBarAppearance(true); + backAnim.start(mLauncher.getStateManager()); } private void loadResources() { @@ -549,8 +601,14 @@ private void loadResources() { R.dimen.swipe_back_window_corner_radius) : 0; mWindowScaleStartCornerRadius = QuickStepContract.getWindowCornerRadius(mLauncher); -// mStatusBarHeight = SystemBarUtils.getStatusBarHeight(mLauncher); - mStatusBarHeight = 24; + // pE-TODO(QPR1): mStatusBarHeight is 24 + mStatusBarHeight = SystemBarUtils.getStatusBarHeight(mLauncher); + if (Flags.allAppsBlur() || enableOverviewBackgroundWallpaperBlur()) { + mMaxBlurRadius = mLauncher.getResources().getDimensionPixelSize( + R.dimen.max_depth_blur_radius_enhanced); + } else { + mMaxBlurRadius = mLauncher.getResources().getInteger(R.integer.max_depth_blur_radius); + } } /** @@ -573,12 +631,6 @@ private void resetScrim() { mScrimAlpha = 0; } - private void tryFinishBackAnimation() { - if (!mSpringAnimationInProgress && !mAnimatorSetInProgress) { - finishAnimation(); - } - } - private void customizeStatusBarAppearance(boolean overridingStatusBarFlags) { if (mOverridingStatusBarFlags == overridingStatusBarFlags) { return; diff --git a/quickstep/src/com/android/quickstep/LauncherDisplayRepository.kt b/quickstep/src/com/android/quickstep/LauncherDisplayRepository.kt new file mode 100644 index 00000000000..c56d2781f40 --- /dev/null +++ b/quickstep/src/com/android/quickstep/LauncherDisplayRepository.kt @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import com.android.launcher3.util.DaggerSingletonObject +import com.android.quickstep.dagger.QuickstepBaseAppComponent + +object LauncherDisplayRepository { + @JvmStatic val INSTANCE = DaggerSingletonObject(QuickstepBaseAppComponent::getDisplayRepository) +} diff --git a/quickstep/src/com/android/quickstep/LauncherDisplaysWithDecorationsRepositoryCompat.kt b/quickstep/src/com/android/quickstep/LauncherDisplaysWithDecorationsRepositoryCompat.kt new file mode 100644 index 00000000000..5d61abb3779 --- /dev/null +++ b/quickstep/src/com/android/quickstep/LauncherDisplaysWithDecorationsRepositoryCompat.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import com.android.launcher3.util.DaggerSingletonObject +import com.android.quickstep.dagger.QuickstepBaseAppComponent + +object LauncherDisplaysWithDecorationsRepositoryCompat { + @JvmStatic + val INSTANCE = + DaggerSingletonObject(QuickstepBaseAppComponent::getDisplaysWithDecorationsRepositoryCompat) +} diff --git a/quickstep/src/com/android/quickstep/LauncherRestoreEventLoggerImpl.kt b/quickstep/src/com/android/quickstep/LauncherRestoreEventLoggerImpl.kt index 9216e57579d..a253e3e54f4 100644 --- a/quickstep/src/com/android/quickstep/LauncherRestoreEventLoggerImpl.kt +++ b/quickstep/src/com/android/quickstep/LauncherRestoreEventLoggerImpl.kt @@ -5,17 +5,22 @@ import android.app.backup.BackupRestoreEventLogger import android.app.backup.BackupRestoreEventLogger.BackupRestoreDataType import android.app.backup.BackupRestoreEventLogger.BackupRestoreError import android.content.Context +import androidx.annotation.VisibleForTesting import com.android.launcher3.Flags.enableLauncherBrMetricsFixed import com.android.launcher3.LauncherSettings.Favorites import com.android.launcher3.Utilities import com.android.launcher3.backuprestore.LauncherRestoreEventLogger +import com.android.launcher3.dagger.ApplicationContext +import javax.inject.Inject /** * Concrete implementation for wrapper to log Restore event metrics for both success and failure to * restore Launcher workspace from a backup. This implementation accesses SystemApis so is only * available to QuickStep/NexusLauncher. */ -class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEventLogger() { +class LauncherRestoreEventLoggerImpl +@Inject +constructor(@ApplicationContext private val context: Context) : LauncherRestoreEventLogger() { companion object { const val TAG = "LauncherRestoreEventLoggerImpl" @@ -31,7 +36,12 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven } private val restoreEventLogger: BackupRestoreEventLogger? = if (Utilities.ATLEAST_S) { - BackupManager(context).delayedRestoreLogger + try { + BackupManager(context).delayedRestoreLogger + } catch (e: NoSuchMethodError) { + // Lawnchair-TODO: pE-TODO: wtf? + null + } } else { null } @@ -46,7 +56,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven override fun logLauncherItemsRestoreFailed( @BackupRestoreDataType dataType: String, count: Int, - @BackupRestoreError error: String? + @BackupRestoreError error: String?, ) { if (enableLauncherBrMetricsFixed()) { restoreEventLogger?.logItemsRestoreFailed(dataType, count, error) @@ -96,7 +106,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven */ override fun logSingleFavoritesItemRestoreFailed( favoritesId: Int, - @BackupRestoreError error: String? + @BackupRestoreError error: String?, ) { if (enableLauncherBrMetricsFixed()) { restoreEventLogger?.logItemsRestoreFailed(favoritesIdToDataType(favoritesId), 1, error) @@ -113,13 +123,13 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven override fun logFavoritesItemsRestoreFailed( favoritesId: Int, count: Int, - @BackupRestoreError error: String? + @BackupRestoreError error: String?, ) { if (enableLauncherBrMetricsFixed()) { restoreEventLogger?.logItemsRestoreFailed( favoritesIdToDataType(favoritesId), count, - error + error, ) } } diff --git a/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java b/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java deleted file mode 100644 index 5d6fbe2ca6e..00000000000 --- a/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java +++ /dev/null @@ -1,93 +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.quickstep; - -import android.annotation.TargetApi; -import android.content.Intent; -import android.content.pm.LauncherApps; -import android.content.pm.ResolveInfo; -import android.content.res.TypedArray; -import android.content.res.XmlResourceParser; -import android.database.Cursor; -import android.database.MatrixCursor; -import android.os.Build; -import android.provider.SearchIndexablesContract.XmlResource; -import android.provider.SearchIndexablesProvider; -import android.util.Xml; - -import com.android.launcher3.R; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - -import java.io.IOException; - -import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; -import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS; -import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS; - -@TargetApi(Build.VERSION_CODES.O) -public class LauncherSearchIndexablesProvider extends SearchIndexablesProvider { - @Override - public boolean onCreate() { - return true; - } - - @Override - public Cursor queryXmlResources(String[] strings) { - MatrixCursor cursor = new MatrixCursor(INDEXABLES_XML_RES_COLUMNS); - ResolveInfo settingsActivity = getContext().getPackageManager().resolveActivity( - new Intent(Intent.ACTION_APPLICATION_PREFERENCES) - .setPackage(getContext().getPackageName()), 0); - cursor.newRow() - .add(XmlResource.COLUMN_XML_RESID, R.xml.indexable_launcher_prefs) - .add(XmlResource.COLUMN_INTENT_ACTION, Intent.ACTION_APPLICATION_PREFERENCES) - .add(XmlResource.COLUMN_INTENT_TARGET_PACKAGE, getContext().getPackageName()) - .add(XmlResource.COLUMN_INTENT_TARGET_CLASS, settingsActivity.activityInfo.name); - return cursor; - } - - @Override - public Cursor queryRawData(String[] projection) { - return new MatrixCursor(INDEXABLES_RAW_COLUMNS); - } - - @Override - public Cursor queryNonIndexableKeys(String[] projection) { - MatrixCursor cursor = new MatrixCursor(NON_INDEXABLES_KEYS_COLUMNS); - if (!getContext().getSystemService(LauncherApps.class).hasShortcutHostPermission()) { - // We are not the current launcher. Hide all preferences - try (XmlResourceParser parser = getContext().getResources() - .getXml(R.xml.indexable_launcher_prefs)) { - final int depth = parser.getDepth(); - final int[] attrs = new int[] { android.R.attr.key }; - int type; - while (((type = parser.next()) != XmlPullParser.END_TAG || - parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) { - if (type == XmlPullParser.START_TAG) { - TypedArray a = getContext().obtainStyledAttributes( - Xml.asAttributeSet(parser), attrs); - cursor.addRow(new String[] {a.getString(0)}); - a.recycle(); - } - } - } catch (IOException |XmlPullParserException e) { - throw new RuntimeException(e); - } - } - return cursor; - } -} diff --git a/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.kt b/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.kt new file mode 100644 index 00000000000..15e980355eb --- /dev/null +++ b/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.kt @@ -0,0 +1,118 @@ +/* + * 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.quickstep + +import android.annotation.TargetApi +import android.content.Intent +import android.content.pm.LauncherApps +import android.database.Cursor +import android.database.MatrixCursor +import android.os.Build +import android.provider.SearchIndexablesContract +import android.provider.SearchIndexablesProvider +import android.util.Xml +import androidx.core.content.withStyledAttributes +import com.android.launcher3.Flags +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.InvariantDeviceProfile.TYPE_TABLET +import com.android.launcher3.R +import com.android.launcher3.model.DeviceGridState +import java.io.IOException +import org.xmlpull.v1.XmlPullParser +import org.xmlpull.v1.XmlPullParserException + +@TargetApi(Build.VERSION_CODES.O) +class LauncherSearchIndexablesProvider : SearchIndexablesProvider() { + + override fun onCreate(): Boolean = true + + override fun queryXmlResources(strings: Array): Cursor { + val cursor = MatrixCursor(SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS) + val context = context ?: return cursor + val settingsActivity = + context.packageManager.resolveActivity( + Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(context.packageName), + 0, + ) + cursor.newRow().apply { + add( + SearchIndexablesContract.XmlResource.COLUMN_XML_RESID, + R.xml.indexable_launcher_prefs, + ) + add( + SearchIndexablesContract.XmlResource.COLUMN_INTENT_ACTION, + Intent.ACTION_APPLICATION_PREFERENCES, + ) + add( + SearchIndexablesContract.XmlResource.COLUMN_INTENT_TARGET_PACKAGE, + context.packageName, + ) + add( + SearchIndexablesContract.XmlResource.COLUMN_INTENT_TARGET_CLASS, + settingsActivity!!.activityInfo!!.name, + ) + } + + return cursor + } + + fun isDeviceTablet(): Boolean { + return DeviceGridState(context).deviceType == TYPE_TABLET + } + + override fun queryRawData(projection: Array) = + MatrixCursor(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS) + + override fun queryNonIndexableKeys(projection: Array): Cursor { + val cursor = MatrixCursor(SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS) + if (Flags.oneGridSpecs() && !isDeviceTablet()) { + cursor.addRow(arrayOf(ALLOW_ROTATION_KEY)) + } else { + cursor.addRow(arrayOf(FIXED_LANDSCAPE_KEY)) + } + if (!context!!.getSystemService(LauncherApps::class.java)?.hasShortcutHostPermission()!!) { + // We are not the current launcher. Hide all preferences + try { + context!!.resources!!.getXml(R.xml.indexable_launcher_prefs).use { parser -> + val depth = parser.depth + val attrs = intArrayOf(android.R.attr.key) + var type: Int = parser.next() + while ( + (type != XmlPullParser.END_TAG || parser.depth > depth) && + type != XmlPullParser.END_DOCUMENT + ) { + if (type == XmlPullParser.START_TAG) { + context?.withStyledAttributes(Xml.asAttributeSet(parser), attrs) { + cursor.addRow(arrayOf(getString(0))) + } + } + type = parser.next() + } + } + } catch (e: IOException) { + throw RuntimeException(e) + } catch (e: XmlPullParserException) { + throw RuntimeException(e) + } + } + return cursor + } + + companion object { + private const val ALLOW_ROTATION_KEY = "pref_allowRotation" + private const val FIXED_LANDSCAPE_KEY = "pref_fixed_landscape_mode" + } +} diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java index 413ddbc9f8c..a0192b727b2 100644 --- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java +++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java @@ -17,11 +17,10 @@ import static com.android.app.animation.Interpolators.EXAGGERATED_EASE; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.Utilities.mapBoundToRange; import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION; -import static com.android.launcher3.views.FloatingIconView.getFloatingIconView; +import static com.android.quickstep.util.FloatingIconViewHelper.getFloatingIconView; import android.animation.AnimatorSet; import android.content.Context; @@ -36,23 +35,27 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.app.animation.Interpolators; import com.android.launcher3.LauncherState; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.states.StateAnimationConfig; import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.MSDLPlayerWrapper; import com.android.launcher3.util.StableViewInfo; import com.android.launcher3.views.ClipIconView; import com.android.launcher3.views.FloatingIconView; import com.android.launcher3.views.FloatingView; import com.android.launcher3.widget.LauncherAppWidgetHostView; +import com.android.quickstep.util.ActiveGestureLog; import com.android.quickstep.util.RectFSpringAnim; import com.android.quickstep.util.ScalingWorkspaceRevealAnim; -import com.android.quickstep.util.StaggeredWorkspaceAnim; import com.android.quickstep.util.TaskViewSimulator; import com.android.quickstep.views.FloatingWidgetView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; +import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.InputConsumerController; import java.util.Collections; @@ -64,11 +67,12 @@ public class LauncherSwipeHandlerV2 extends AbsSwipeUpHandler< QuickstepLauncher, RecentsView, LauncherState> { - public LauncherSwipeHandlerV2(Context context, RecentsAnimationDeviceState deviceState, - TaskAnimationManager taskAnimationManager, GestureState gestureState, long touchTimeMs, - boolean continuingLastGesture, InputConsumerController inputConsumer) { - super(context, deviceState, taskAnimationManager, gestureState, touchTimeMs, - continuingLastGesture, inputConsumer); + public LauncherSwipeHandlerV2(Context context, TaskAnimationManager taskAnimationManager, + RecentsAnimationDeviceState deviceState, RotationTouchHelper rotationTouchHelper, + GestureState gestureState, long touchTimeMs, boolean continuingLastGesture, + InputConsumerController inputConsumer, MSDLPlayerWrapper msdlPlayerWrapper) { + super(context, taskAnimationManager, deviceState, rotationTouchHelper, gestureState, + touchTimeMs, continuingLastGesture, inputConsumer, msdlPlayerWrapper); } @@ -81,8 +85,13 @@ protected HomeAnimationFactory createHomeAnimationFactory( RemoteAnimationTarget runningTaskTarget, @Nullable TaskView targetTaskView) { if (mContainer == null) { - mStateCallback.addChangeListener(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED, - isPresent -> mRecentsView.startHome()); + mStateCallback.addChangeListener( + STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED, + isPresent -> { + if (mRecentsView != null) { + mRecentsView.startHome(); + } + }); return new HomeAnimationFactory() { @Override public AnimatorPlaybackController createActivityAnimationToHome() { @@ -94,20 +103,20 @@ public AnimatorPlaybackController createActivityAnimationToHome() { TaskView sourceTaskView = mRecentsView == null && targetTaskView == null ? null : targetTaskView == null - ? mRecentsView.getRunningTaskView() - : targetTaskView; + ? mRecentsView.getRunningTaskView() + : targetTaskView; final View workspaceView = findWorkspaceView( targetTaskView == null ? launchCookies : Collections.emptyList(), sourceTaskView); boolean canUseWorkspaceView = workspaceView != null && workspaceView.isAttachedToWindow() && workspaceView.getHeight() > 0 - && (mContainer.getDesktopVisibilityController() == null - || !mContainer.getDesktopVisibilityController().areDesktopTasksVisible()); + && !DesktopVisibilityController.INSTANCE.get(mContainer) + .isInDesktopModeAndNotInOverview(mContainer.getDisplayId()); mContainer.getRootView().setForceHideBackArrow(true); - if (!canUseWorkspaceView || appCanEnterPip || mIsSwipeForSplit) { + if (mHandOffAnimationToHome || !canUseWorkspaceView || appCanEnterPip || mIsSwipeForSplit) { return new LauncherHomeAnimationFactory() { @Nullable @@ -128,13 +137,13 @@ private HomeAnimationFactory createIconHomeAnimationFactory( View workspaceView, @Nullable TaskView targetTaskView) { RectF iconLocation = new RectF(); FloatingIconView floatingIconView = getFloatingIconView(mContainer, workspaceView, null, - mContainer.getTaskbarUIController() == null + mContainer.getTaskbarInteractor() == null ? null - : mContainer.getTaskbarUIController().findMatchingView(workspaceView), + : mContainer.getTaskbarInteractor().findMatchingAsyncView(workspaceView), true /* hideOriginal */, iconLocation, false /* isOpening */); // We want the window alpha to be 0 once this threshold is met, so that the - // FolderIconView can be seen morphing into the icon shape. + // FloatingIconView can be seen morphing into the icon shape. float windowAlphaThreshold = 1f - SHAPE_PROGRESS_DURATION; return new FloatingViewHomeAnimationFactory(floatingIconView) { @@ -156,14 +165,10 @@ public boolean isInHotseat() { @NonNull @Override public RectF getWindowTargetRect() { - if (enableScalingRevealHomeAnimation()) { - if (mTargetRect == null) { - mTargetRect = new RectF(iconLocation); - } - return mTargetRect; - } else { - return iconLocation; + if (mTargetRect == null) { + mTargetRect = new RectF(iconLocation); } + return mTargetRect; } @Override @@ -182,7 +187,11 @@ public void update( float progress, float radius, int overlayAlpha) { - floatingIconView.update(1f /* alpha */, currentRect, progress, windowAlphaThreshold, + // We want the icon alpha to be 1 once this threshold is met, so that it can be + // seen morphing into the icon shape. But before the threshold, we want to limit + // the alpha to reduce the blur effect behind the window. + float iconAlpha = Interpolators.clampToProgress(progress, 0f, windowAlphaThreshold); + floatingIconView.update(iconAlpha, currentRect, progress, windowAlphaThreshold, radius, false, overlayAlpha); } @@ -242,14 +251,10 @@ protected View getViewIgnoredInWorkspaceRevealAnimation() { @Override public RectF getWindowTargetRect() { - if (enableScalingRevealHomeAnimation()) { - if (mTargetRect == null) { - mTargetRect = new RectF(backgroundLocation); - } - return mTargetRect; - } else { - return backgroundLocation; + if (mTargetRect == null) { + mTargetRect = new RectF(backgroundLocation); } + return mTargetRect; } @Override @@ -295,22 +300,30 @@ private View findWorkspaceView(List launchCookies, TaskView sourceTaskV // Disable if swiping to PIP return null; } - if (sourceTaskView == null || sourceTaskView.getFirstTask().key.getComponent() == null) { + Task firstTask; + if (sourceTaskView == null || ((firstTask = sourceTaskView.getFirstTask()) == null) + || firstTask.key.getComponent() == null) { // Disable if it's an invalid task return null; } - return mContainer.getFirstMatchForAppClose(StableViewInfo.fromLaunchCookies(launchCookies), + return mContainer.getFirstHomeElementForAppClose( + StableViewInfo.fromLaunchCookies(launchCookies), sourceTaskView.getFirstTask().key.getComponent().getPackageName(), - UserHandle.of(sourceTaskView.getFirstTask().key.userId), - false /* supportsAllAppsState */); + UserHandle.of(sourceTaskView.getFirstTask().key.userId)); } @Override protected void finishRecentsControllerToHome(Runnable callback) { - mRecentsView.cleanupRemoteTargets(); + if (mRecentsView != null) { + mRecentsView.cleanupRemoteTargets(); + } mRecentsAnimationController.finish( - true /* toRecents */, callback, true /* sendUserLeaveHint */); + /* toHome= */true, + callback, + /* sendUserLeaveHint= */ true, + /* reason= */ new ActiveGestureLog.CompoundString( + "LauncherSwipeHandlerV2.finishRecentsControllerToHome")); } private class FloatingViewHomeAnimationFactory extends LauncherHomeAnimationFactory { @@ -326,7 +339,8 @@ private class FloatingViewHomeAnimationFactory extends LauncherHomeAnimationFact protected void playScalingRevealAnimation() { if (mContainer != null) { new ScalingWorkspaceRevealAnim(mContainer, mSiblingAnimation, - getWindowTargetRect()).start(); + getWindowTargetRect(), true /* playAlphaReveal */, + true /* playBlur */).start(); } } @@ -352,20 +366,14 @@ protected View getViewIgnoredInWorkspaceRevealAnimation() { public AnimatorPlaybackController createActivityAnimationToHome() { // Return an empty APC here since we have an non-user controlled animation // to home. - long accuracy = 2 * Math.max(mDp.widthPx, mDp.heightPx); + long accuracy = 2 * Math.max(mDp.getDeviceProperties().getWidthPx(), mDp.getDeviceProperties().getHeightPx()); return mContainer.getStateManager().createAnimationToNewWorkspace( NORMAL, accuracy, StateAnimationConfig.SKIP_ALL_ANIMATIONS); } @Override public void playAtomicAnimation(float velocity) { - if (enableScalingRevealHomeAnimation()) { - playScalingRevealAnimation(); - } else { - new StaggeredWorkspaceAnim(mContainer, velocity, true /* animateOverviewScrim */, - getViewIgnoredInWorkspaceRevealAnimation()) - .start(); - } + playScalingRevealAnimation(); } /** @@ -375,9 +383,9 @@ public void playAtomicAnimation(float velocity) { protected void playScalingRevealAnimation() { if (mContainer != null) { new ScalingWorkspaceRevealAnim( - mContainer, null /* siblingAnimation */, - null /* windowTargetRect */).start(); + mContainer, null /* siblingAnimation */, null /* windowTargetRect */, + true /* playAlphaReveal */, true /* playBlur */).start(); } } } -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/quickstep/MultiStateCallback.java b/quickstep/src/com/android/quickstep/MultiStateCallback.java index df42efcc4e2..a9f196d8ff0 100644 --- a/quickstep/src/com/android/quickstep/MultiStateCallback.java +++ b/quickstep/src/com/android/quickstep/MultiStateCallback.java @@ -28,6 +28,7 @@ import com.android.launcher3.config.FeatureFlags; import com.android.quickstep.util.ActiveGestureErrorDetector; import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; import java.util.ArrayList; import java.util.LinkedList; @@ -114,10 +115,9 @@ private void trackGestureEvents(int stateFlags) { if (gestureEvent == null) { continue; } - if (gestureEvent.mLogEvent && gestureEvent.mTrackEvent) { - ActiveGestureLog.INSTANCE.addLog(gestureEvent.name(), gestureEvent); - } else if (gestureEvent.mLogEvent) { - ActiveGestureLog.INSTANCE.addLog(gestureEvent.name()); + if (gestureEvent.mLogEvent) { + ActiveGestureProtoLogProxy.logDynamicString( + gestureEvent.name(), gestureEvent.mTrackEvent ? gestureEvent : null); } else if (gestureEvent.mTrackEvent) { ActiveGestureLog.INSTANCE.trackEvent(gestureEvent); } diff --git a/quickstep/src/com/android/quickstep/NavHandle.java b/quickstep/src/com/android/quickstep/NavHandle.java index da3311f4753..223404ed287 100644 --- a/quickstep/src/com/android/quickstep/NavHandle.java +++ b/quickstep/src/com/android/quickstep/NavHandle.java @@ -16,7 +16,9 @@ package com.android.quickstep; +import android.annotation.Nullable; import android.content.Context; +import android.graphics.Rect; import com.android.launcher3.R; @@ -51,4 +53,10 @@ default boolean canNavHandleBeLongPressed() { default int getNavHandleWidth(Context context) { return context.getResources().getDimensionPixelSize(R.dimen.navigation_home_handle_width); } + + /** @return the bounding box of this nav handle in screen coordinates, in pixels */ + @Nullable + default Rect getBoundsOnScreen() { + return null; + } } diff --git a/quickstep/src/com/android/quickstep/OWNERS b/quickstep/src/com/android/quickstep/OWNERS new file mode 100644 index 00000000000..f0d0b2b442b --- /dev/null +++ b/quickstep/src/com/android/quickstep/OWNERS @@ -0,0 +1,8 @@ +# System Navigation team +brianji@google.com +jonmiranda@google.com +jagrutdesai@google.com +randypfohl@google.com +saumyaprakash@google.com +twickham@google.com +victortulias@google.com diff --git a/quickstep/src/com/android/quickstep/OrientationRectF.java b/quickstep/src/com/android/quickstep/OrientationRectF.java index 734ca084781..c344902aebc 100644 --- a/quickstep/src/com/android/quickstep/OrientationRectF.java +++ b/quickstep/src/com/android/quickstep/OrientationRectF.java @@ -69,13 +69,15 @@ public boolean applyTransformToRotation(MotionEvent event, int currentRotation, } public boolean applyTransform(MotionEvent event, int deltaRotation, boolean forceTransform) { + if (deltaRotation == 0) { + return contains(event.getX(), event.getY()); + } mTmpMatrix.reset(); postDisplayRotation(deltaRotation, mHeight, mWidth, mTmpMatrix); if (forceTransform) { if (DEBUG) { Log.d(TAG, "Transforming rotation due to forceTransform, " + "deltaRotation: " + deltaRotation - + "mRotation: " + mRotation + " this: " + this); } if (Utilities.ATLEAST_S) { diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java index 84f6b5514f3..5abc1f3489e 100644 --- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java +++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java @@ -37,6 +37,8 @@ import com.android.launcher3.util.DisplayController.Info; import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.window.CachedDisplayInfo; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; +import com.android.systemui.shared.Flags; import java.io.PrintWriter; import java.util.HashMap; @@ -104,19 +106,23 @@ interface QuickStepContractInfo { mResources = resources; mMode = mode; mContractInfo = contractInfo; - mNavBarGesturalHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE); + mNavBarGesturalHeight = calculateDefaultGesturalHeight(); mNavBarLargerGesturalHeight = ResourceUtils.getDimenByName( ResourceUtils.NAVBAR_BOTTOM_GESTURE_LARGER_SIZE, resources, mNavBarGesturalHeight); } - private void refreshTouchRegion(Info info, Resources newRes) { + private int calculateDefaultGesturalHeight() { + return getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE); + } + + private void refreshTouchRegion(Info info, Resources newRes, String reason) { // Swipe touch regions are independent of nav mode, so we have to clear them explicitly // here to avoid, for ex, a nav region for 2-button rotation 0 being used for 3-button mode // It tries to cache and reuse swipe regions whenever possible based only on rotation mResources = newRes; mSwipeTouchRegions.clear(); - resetSwipeRegions(info); + resetSwipeRegions(info, reason); } void setNavigationMode(NavigationMode newMode, Info info, Resources newRes) { @@ -127,15 +133,22 @@ void setNavigationMode(NavigationMode newMode, Info info, Resources newRes) { return; } this.mMode = newMode; - refreshTouchRegion(info, newRes); + refreshTouchRegion(info, newRes, "setNavigationMode"); } + /** + * Touches within this number of pixels from the bottom of the screen can get intercepted to + * handle gesture navigation. Passing a value less than 0 will revert to a default value. + */ void setGesturalHeight(int newGesturalHeight, Info info, Resources newRes) { + if (newGesturalHeight < 0) { + newGesturalHeight = calculateDefaultGesturalHeight(); + } if (mNavBarGesturalHeight == newGesturalHeight) { return; } mNavBarGesturalHeight = newGesturalHeight; - refreshTouchRegion(info, newRes); + refreshTouchRegion(info, newRes, "setGesturalHeight"); } /** @@ -146,14 +159,14 @@ void setGesturalHeight(int newGesturalHeight, Info info, Resources newRes) { * * @see #enableMultipleRegions(boolean, Info) */ - void createOrAddTouchRegion(Info info) { + void createOrAddTouchRegion(Info info, String reason) { mCachedDisplayInfo = new CachedDisplayInfo(info.currentSize, info.rotation); if (mQuickStepStartingRotation > QUICKSTEP_ROTATION_UNINITIALIZED && mCachedDisplayInfo.rotation == mQuickStepStartingRotation) { // User already was swiping and the current screen is same rotation as the starting one // Remove active nav bars in other rotations except for the one we started out in - resetSwipeRegions(info); + resetSwipeRegions(info, reason); return; } OrientationRectF region = mSwipeTouchRegions.get(mCachedDisplayInfo); @@ -162,9 +175,9 @@ void createOrAddTouchRegion(Info info) { } if (mEnableMultipleRegions) { - mSwipeTouchRegions.put(mCachedDisplayInfo, createRegionForDisplay(info)); + mSwipeTouchRegions.put(mCachedDisplayInfo, createRegionForDisplay(info, reason)); } else { - resetSwipeRegions(info); + resetSwipeRegions(info, reason); } } @@ -183,7 +196,7 @@ void enableMultipleRegions(boolean enableMultipleRegions, Info info) { mActiveTouchRotation = 0; mQuickStepStartingRotation = QUICKSTEP_ROTATION_UNINITIALIZED; } - resetSwipeRegions(info); + resetSwipeRegions(info, "enableMultipleRegions"); } /** @@ -197,7 +210,7 @@ void enableMultipleRegions(boolean enableMultipleRegions, Info info) { */ void setSingleActiveRegion(Info displayInfo) { mActiveTouchRotation = displayInfo.rotation; - resetSwipeRegions(displayInfo); + resetSwipeRegions(displayInfo, "setSingleActiveRegion"); } /** @@ -206,19 +219,21 @@ void setSingleActiveRegion(Info displayInfo) { * To be called whenever we want to stop tracking more than one swipe region. * Ok to call multiple times. */ - private void resetSwipeRegions(Info region) { + private void resetSwipeRegions(Info region, String reason) { if (enableLog()) { - Log.d(TAG, "clearing all regions except rotation: " + mCachedDisplayInfo.rotation); + Log.d(TAG, "clearing all regions except rotation: " + mCachedDisplayInfo.rotation + + " reason=" + reason); } mCachedDisplayInfo = new CachedDisplayInfo(region.currentSize, region.rotation); OrientationRectF regionToKeep = mSwipeTouchRegions.get(mCachedDisplayInfo); if (regionToKeep == null) { - regionToKeep = createRegionForDisplay(region); + regionToKeep = createRegionForDisplay(region, reason); } mSwipeTouchRegions.clear(); mSwipeTouchRegions.put(mCachedDisplayInfo, regionToKeep); updateAssistantRegions(regionToKeep); + updateOneHandedRegions(regionToKeep); } private void resetSwipeRegions() { @@ -227,22 +242,25 @@ private void resetSwipeRegions() { if (regionToKeep != null) { mSwipeTouchRegions.put(mCachedDisplayInfo, regionToKeep); updateAssistantRegions(regionToKeep); + updateOneHandedRegions(regionToKeep); } } - private OrientationRectF createRegionForDisplay(Info display) { + private OrientationRectF createRegionForDisplay(Info display, String reason) { if (enableLog()) { Log.d(TAG, "creating rotation region for: " + mCachedDisplayInfo.rotation + " with mode: " + mMode + " displayRotation: " + display.rotation + " displaySize: " + display.currentSize + - " navBarHeight: " + mNavBarGesturalHeight); + " navBarHeight: " + mNavBarGesturalHeight + + " reason: " + reason); } Point size = display.currentSize; int rotation = display.rotation; int touchHeight = mNavBarGesturalHeight; OrientationRectF orientationRectF = new OrientationRectF(0, 0, size.x, size.y, rotation); - if (mMode == NavigationMode.NO_BUTTON) { + if (mMode == NavigationMode.NO_BUTTON + || (mMode == NavigationMode.THREE_BUTTONS && Flags.threeButtonCornerSwipe())) { orientationRectF.top = orientationRectF.bottom - touchHeight; updateAssistantRegions(orientationRectF); } else { @@ -262,9 +280,10 @@ private OrientationRectF createRegionForDisplay(Info display) { orientationRectF.top = orientationRectF.bottom - touchHeight; } } - // One handed gestural only active on portrait mode - mOneHandedModeRegion.set(0, orientationRectF.bottom - mNavBarLargerGesturalHeight, - size.x, size.y); + updateOneHandedRegions(orientationRectF); + ActiveGestureProtoLogProxy.logCreateTouchRegionForDisplay(rotation, size, orientationRectF, + mOneHandedModeRegion, mNavBarGesturalHeight, mNavBarLargerGesturalHeight, + reason); return orientationRectF; } @@ -284,6 +303,12 @@ private void updateAssistantRegions(OrientationRectF orientationRectF) { mAssistantRightRegion.left = orientationRectF.right - assistantWidth; } + private void updateOneHandedRegions(OrientationRectF orientationRectF) { + // One handed gestural only active on portrait mode + mOneHandedModeRegion.set(0, orientationRectF.bottom - mNavBarLargerGesturalHeight, + orientationRectF.right, orientationRectF.bottom); + } + boolean touchInAssistantRegion(MotionEvent ev) { return mAssistantLeftRegion.contains(ev.getX(), ev.getY()) || mAssistantRightRegion.contains(ev.getX(), ev.getY()); @@ -409,9 +434,11 @@ public void dump(PrintWriter pw) { OrientationRectF rectF = mSwipeTouchRegions.get(key); regions.append(rectF).append(" "); } - pw.println(regions.toString()); + pw.println(regions); pw.println(" mNavBarGesturalHeight=" + mNavBarGesturalHeight); pw.println(" mNavBarLargerGesturalHeight=" + mNavBarLargerGesturalHeight); + pw.println(" mAssistantLeftRegion=" + mAssistantLeftRegion); + pw.println(" mAssistantRightRegion=" + mAssistantRightRegion); pw.println(" mOneHandedModeRegion=" + mOneHandedModeRegion); } } diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java deleted file mode 100644 index 7da92bce901..00000000000 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java +++ /dev/null @@ -1,525 +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.quickstep; - -import static com.android.launcher3.PagedView.INVALID_PAGE; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_3_BUTTON; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_QUICK_SWITCH; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_SHORTCUT; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.content.Intent; -import android.graphics.PointF; -import android.os.SystemClock; -import android.os.Trace; -import android.util.Log; -import android.view.View; - -import androidx.annotation.BinderThread; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; - -import com.android.internal.jank.Cuj; -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.logger.LauncherAtom; -import com.android.launcher3.logging.StatsLogManager; -import com.android.launcher3.statemanager.StatefulActivity; -import com.android.launcher3.taskbar.TaskbarUIController; -import com.android.launcher3.util.RunnableList; -import com.android.quickstep.RecentsAnimationCallbacks.RecentsAnimationListener; -import com.android.quickstep.util.ActiveGestureLog; -import com.android.quickstep.views.RecentsView; -import com.android.quickstep.views.RecentsViewContainer; -import com.android.quickstep.views.TaskView; -import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.InteractionJankMonitorWrapper; - -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashMap; - -/** - * Helper class to handle various atomic commands for switching between Overview. - */ -public class OverviewCommandHelper { - private static final String TAG = "OverviewCommandHelper"; - - public static final int TYPE_SHOW = 1; - public static final int TYPE_KEYBOARD_INPUT = 2; - public static final int TYPE_HIDE = 3; - public static final int TYPE_TOGGLE = 4; - public static final int TYPE_HOME = 5; - - /** - * Use case for needing a queue is double tapping recents button in 3 button nav. - * Size of 2 should be enough. We'll toss in one more because we're kind hearted. - */ - private final static int MAX_QUEUE_SIZE = 3; - - private static final String TRANSITION_NAME = "Transition:toOverview"; - - private final TouchInteractionService mService; - private final OverviewComponentObserver mOverviewComponentObserver; - private final TaskAnimationManager mTaskAnimationManager; - private final ArrayList mPendingCommands = new ArrayList<>(); - - /** - * Index of the TaskView that should be focused when launching Overview. Persisted so that we - * do not lose the focus across multiple calls of - * {@link OverviewCommandHelper#executeCommand(CommandInfo)} for the same command - */ - private int mKeyboardTaskFocusIndex = -1; - - /** - * Whether we should incoming toggle commands while a previous toggle command is still ongoing. - * This serves as a rate-limiter to prevent overlapping animations that can clobber each other - * and prevent clean-up callbacks from running. This thus prevents a recurring set of bugs with - * janky recents animations and unresponsive home and overview buttons. - */ - private boolean mWaitForToggleCommandComplete = false; - - public OverviewCommandHelper(TouchInteractionService service, - OverviewComponentObserver observer, - TaskAnimationManager taskAnimationManager) { - mService = service; - mOverviewComponentObserver = observer; - mTaskAnimationManager = taskAnimationManager; - } - - /** - * Called when the command finishes execution. - */ - private void scheduleNextTask(CommandInfo command) { - if (mPendingCommands.isEmpty()) { - Log.d(TAG, "no pending commands to schedule"); - return; - } - if (mPendingCommands.get(0) != command) { - Log.d(TAG, "next task not scheduled." - + " mPendingCommands[0] type is " + mPendingCommands.get(0) - + " - command type is: " + command); - return; - } - Log.d(TAG, "scheduleNextTask called: " + command); - mPendingCommands.remove(0); - executeNext(); - } - - /** - * Executes the next command from the queue. If the command finishes immediately (returns true), - * it continues to execute the next command, until the queue is empty of a command defer's its - * completion (returns false). - */ - @UiThread - private void executeNext() { - if (mPendingCommands.isEmpty()) { - Log.d(TAG, "executeNext - mPendingCommands is empty"); - return; - } - CommandInfo cmd = mPendingCommands.get(0); - - boolean result = executeCommand(cmd); - Log.d(TAG, "executeNext cmd type: " + cmd + ", result: " + result); - if (result) { - scheduleNextTask(cmd); - } - } - - @UiThread - private void addCommand(CommandInfo cmd) { - boolean wasEmpty = mPendingCommands.isEmpty(); - mPendingCommands.add(cmd); - if (wasEmpty) { - executeNext(); - } - } - - /** - * Adds a command to be executed next, after all pending tasks are completed. - * Max commands that can be queued is {@link #MAX_QUEUE_SIZE}. - * Requests after reaching that limit will be silently dropped. - */ - @BinderThread - public void addCommand(int type) { - if (mPendingCommands.size() >= MAX_QUEUE_SIZE) { - Log.d(TAG, "the pending command queue is full (" + mPendingCommands.size() + "). " - + "command not added: " + type); - return; - } - Log.d(TAG, "adding command type: " + type); - CommandInfo cmd = new CommandInfo(type); - MAIN_EXECUTOR.execute(() -> addCommand(cmd)); - } - - @UiThread - public void clearPendingCommands() { - Log.d(TAG, "clearing pending commands - size: " + mPendingCommands.size()); - mPendingCommands.clear(); - } - - @UiThread - public boolean canStartHomeSafely() { - return mPendingCommands.isEmpty() || mPendingCommands.get(0).type == TYPE_HOME; - } - - @Nullable - private TaskView getNextTask(RecentsView view) { - final TaskView runningTaskView = view.getRunningTaskView(); - - if (runningTaskView == null) { - return view.getTaskViewAt(0); - } else { - final TaskView nextTask = view.getNextTaskView(); - return nextTask != null ? nextTask : runningTaskView; - } - } - - private boolean launchTask(RecentsView recents, @Nullable TaskView taskView, CommandInfo cmd) { - RunnableList callbackList = null; - if (taskView != null) { - mWaitForToggleCommandComplete = true; - taskView.setEndQuickSwitchCuj(true); - callbackList = taskView.launchTasks(); - } - - if (callbackList != null) { - callbackList.add(() -> { - Log.d(TAG, "launching task callback: " + cmd); - scheduleNextTask(cmd); - mWaitForToggleCommandComplete = false; - }); - Log.d(TAG, "launching task - waiting for callback: " + cmd); - return false; - } else { - recents.startHome(); - mWaitForToggleCommandComplete = false; - return true; - } - } - - /** - * Executes the task and returns true if next task can be executed. If false, then the next - * task is deferred until {@link #scheduleNextTask} is called - */ - private & RecentsViewContainer> boolean executeCommand( - CommandInfo cmd) { - if (mWaitForToggleCommandComplete && cmd.type == TYPE_TOGGLE) { - Log.d(TAG, "executeCommand: " + cmd - + " - waiting for toggle command complete"); - return true; - } - BaseActivityInterface activityInterface = - mOverviewComponentObserver.getActivityInterface(); - - RecentsView visibleRecentsView = activityInterface.getVisibleRecentsView(); - RecentsView createdRecentsView; - - Log.d(TAG, "executeCommand: " + cmd - + " - visibleRecentsView: " + visibleRecentsView); - if (visibleRecentsView == null) { - T activity = activityInterface.getCreatedContainer(); - createdRecentsView = activity == null ? null : activity.getOverviewPanel(); - DeviceProfile dp = activity == null ? null : activity.getDeviceProfile(); - TaskbarUIController uiController = activityInterface.getTaskbarController(); - boolean allowQuickSwitch = FeatureFlags.ENABLE_KEYBOARD_QUICK_SWITCH.get() - && uiController != null - && dp != null - && (dp.isTablet || dp.isTwoPanels); - - switch (cmd.type) { - case TYPE_HIDE: - if (!allowQuickSwitch) { - return true; - } - mKeyboardTaskFocusIndex = uiController.launchFocusedTask(); - if (mKeyboardTaskFocusIndex == -1) { - return true; - } - break; - case TYPE_KEYBOARD_INPUT: - if (allowQuickSwitch) { - uiController.openQuickSwitchView(); - return true; - } else { - mKeyboardTaskFocusIndex = 0; - break; - } - case TYPE_HOME: - ActiveGestureLog.INSTANCE.addLog( - "OverviewCommandHelper.executeCommand(TYPE_HOME)"); - mService.startActivity(mOverviewComponentObserver.getHomeIntent()); - return true; - case TYPE_SHOW: - // When Recents is not currently visible, the command's type is TYPE_SHOW - // when overview is triggered via the keyboard overview button or Action+Tab - // keys (Not Alt+Tab which is KQS). The overview button on-screen in 3-button - // nav is TYPE_TOGGLE. - mKeyboardTaskFocusIndex = 0; - break; - default: - // continue below to handle displaying Recents. - } - } else { - createdRecentsView = visibleRecentsView; - switch (cmd.type) { - case TYPE_SHOW: - // already visible - return true; - case TYPE_KEYBOARD_INPUT: { - if (visibleRecentsView.isHandlingTouch()) { - return true; - } - } - case TYPE_HIDE: { - if (visibleRecentsView.isHandlingTouch()) { - return true; - } - mKeyboardTaskFocusIndex = INVALID_PAGE; - int currentPage = visibleRecentsView.getNextPage(); - TaskView tv = (currentPage >= 0 - && currentPage < visibleRecentsView.getTaskViewCount()) - ? (TaskView) visibleRecentsView.getPageAt(currentPage) - : null; - return launchTask(visibleRecentsView, tv, cmd); - } - case TYPE_TOGGLE: - return launchTask(visibleRecentsView, getNextTask(visibleRecentsView), cmd); - case TYPE_HOME: - visibleRecentsView.startHome(); - return true; - } - } - - if (createdRecentsView != null) { - createdRecentsView.setKeyboardTaskFocusIndex(mKeyboardTaskFocusIndex); - } - // Handle recents view focus when launching from home - Animator.AnimatorListener animatorListener = new AnimatorListenerAdapter() { - - @Override - public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); - updateRecentsViewFocus(cmd); - logShowOverviewFrom(cmd.type); - } - - @Override - public void onAnimationEnd(Animator animation) { - Log.d(TAG, "switching to Overview state - onAnimationEnd: " + cmd); - super.onAnimationEnd(animation); - onRecentsViewFocusUpdated(cmd); - scheduleNextTask(cmd); - } - }; - if (activityInterface.switchToRecentsIfVisible(animatorListener)) { - Log.d(TAG, "switching to Overview state - waiting: " + cmd); - // If successfully switched, wait until animation finishes - return false; - } - - final T activity = activityInterface.getCreatedContainer(); - if (activity != null) { - InteractionJankMonitorWrapper.begin( - activity.getRootView(), - Cuj.CUJ_LAUNCHER_QUICK_SWITCH); - } - - GestureState gestureState = mService.createGestureState(GestureState.DEFAULT_STATE, - GestureState.TrackpadGestureType.NONE); - gestureState.setHandlingAtomicEvent(true); - AbsSwipeUpHandler interactionHandler = mService.getSwipeUpHandlerFactory() - .newHandler(gestureState, cmd.createTime); - interactionHandler.setGestureEndCallback( - () -> onTransitionComplete(cmd, interactionHandler)); - interactionHandler.initWhenReady("OverviewCommandHelper: cmd.type=" + cmd.type); - - RecentsAnimationListener recentAnimListener = new RecentsAnimationListener() { - @Override - public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { - updateRecentsViewFocus(cmd); - logShowOverviewFrom(cmd.type); - activityInterface.runOnInitBackgroundStateUI(() -> - interactionHandler.onGestureEnded(0, new PointF())); - cmd.removeListener(this); - } - - @Override - public void onRecentsAnimationCanceled(HashMap thumbnailDatas) { - interactionHandler.onGestureCancelled(); - cmd.removeListener(this); - - T createdActivity = activityInterface.getCreatedContainer(); - if (createdActivity == null) { - return; - } - if (createdRecentsView != null) { - createdRecentsView.onRecentsAnimationComplete(); - } - } - }; - - if (visibleRecentsView != null) { - visibleRecentsView.moveRunningTaskToFront(); - } - if (mTaskAnimationManager.isRecentsAnimationRunning()) { - cmd.mActiveCallbacks = mTaskAnimationManager.continueRecentsAnimation(gestureState); - cmd.mActiveCallbacks.addListener(interactionHandler); - mTaskAnimationManager.notifyRecentsAnimationState(interactionHandler); - interactionHandler.onGestureStarted(true /*isLikelyToStartNewTask*/); - - cmd.mActiveCallbacks.addListener(recentAnimListener); - mTaskAnimationManager.notifyRecentsAnimationState(recentAnimListener); - } else { - Intent intent = new Intent(interactionHandler.getLaunchIntent()); - intent.putExtra(INTENT_EXTRA_LOG_TRACE_ID, gestureState.getGestureId()); - cmd.mActiveCallbacks = mTaskAnimationManager.startRecentsAnimation( - gestureState, intent, interactionHandler); - interactionHandler.onGestureStarted(false /*isLikelyToStartNewTask*/); - cmd.mActiveCallbacks.addListener(recentAnimListener); - } - Trace.beginAsyncSection(TRANSITION_NAME, 0); - Log.d(TAG, "switching via recents animation - onGestureStarted: " + cmd); - return false; - } - - private void onTransitionComplete(CommandInfo cmd, AbsSwipeUpHandler handler) { - Log.d(TAG, "switching via recents animation - onTransitionComplete: " + cmd); - cmd.removeListener(handler); - Trace.endAsyncSection(TRANSITION_NAME, 0); - onRecentsViewFocusUpdated(cmd); - scheduleNextTask(cmd); - } - - private void updateRecentsViewFocus(CommandInfo cmd) { - RecentsView recentsView = - mOverviewComponentObserver.getActivityInterface().getVisibleRecentsView(); - if (recentsView == null || (cmd.type != TYPE_KEYBOARD_INPUT && cmd.type != TYPE_HIDE - && cmd.type != TYPE_SHOW)) { - return; - } - // When the overview is launched via alt tab (cmd type is TYPE_KEYBOARD_INPUT), - // the touch mode somehow is not change to false by the Android framework. - // The subsequent tab to go through tasks in overview can only be dispatched to - // focuses views, while focus can only be requested in - // {@link View#requestFocusNoSearch(int, Rect)} when touch mode is false. To note, - // here we launch overview with live tile. - recentsView.getViewRootImpl().touchModeChanged(false); - // Ensure that recents view has focus so that it receives the followup key inputs - if (requestFocus(recentsView.getTaskViewAt(mKeyboardTaskFocusIndex))) { - return; - } - if (requestFocus(recentsView.getNextTaskView())) { - return; - } - if (requestFocus(recentsView.getTaskViewAt(0))) { - return; - } - requestFocus(recentsView); - } - - private void onRecentsViewFocusUpdated(CommandInfo cmd) { - RecentsView recentsView = - mOverviewComponentObserver.getActivityInterface().getVisibleRecentsView(); - if (recentsView == null - || cmd.type != TYPE_HIDE - || mKeyboardTaskFocusIndex == INVALID_PAGE) { - return; - } - recentsView.setKeyboardTaskFocusIndex(INVALID_PAGE); - recentsView.setCurrentPage(mKeyboardTaskFocusIndex); - mKeyboardTaskFocusIndex = INVALID_PAGE; - } - - private boolean requestFocus(@Nullable View taskView) { - if (taskView == null) { - return false; - } - taskView.post(() -> { - taskView.requestFocus(); - taskView.requestAccessibilityFocus(); - }); - return true; - } - - private & RecentsViewContainer> - void logShowOverviewFrom(int cmdType) { - BaseActivityInterface activityInterface = - mOverviewComponentObserver.getActivityInterface(); - var container = activityInterface.getCreatedContainer(); - if (container != null) { - StatsLogManager.LauncherEvent event; - switch (cmdType) { - case TYPE_SHOW -> event = LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_SHORTCUT; - case TYPE_HIDE -> - event = LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_QUICK_SWITCH; - case TYPE_TOGGLE -> event = LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_3_BUTTON; - default -> { - return; - } - } - - StatsLogManager.newInstance(container.asContext()) - .logger() - .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder() - .setTaskSwitcherContainer( - LauncherAtom.TaskSwitcherContainer.getDefaultInstance()) - .build()) - .log(event); - } - } - - public void dump(PrintWriter pw) { - pw.println("OverviewCommandHelper:"); - pw.println(" mPendingCommands=" + mPendingCommands.size()); - if (!mPendingCommands.isEmpty()) { - pw.println(" pendingCommandType=" + mPendingCommands.get(0).type); - } - pw.println(" mKeyboardTaskFocusIndex=" + mKeyboardTaskFocusIndex); - pw.println(" mWaitForToggleCommandComplete=" + mWaitForToggleCommandComplete); - } - - private static class CommandInfo { - public final long createTime = SystemClock.elapsedRealtime(); - public final int type; - RecentsAnimationCallbacks mActiveCallbacks; - - CommandInfo(int type) { - this.type = type; - } - - void removeListener(RecentsAnimationListener listener) { - if (mActiveCallbacks != null) { - mActiveCallbacks.removeListener(listener); - } - } - - @NonNull - @Override - public String toString() { - return "CommandInfo(" - + "type=" + type + ", " - + "createTime=" + createTime + ", " - + "mActiveCallbacks=" + mActiveCallbacks - + ")"; - } - } -} diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt new file mode 100644 index 00000000000..5e0350a2869 --- /dev/null +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt @@ -0,0 +1,843 @@ +/* + * 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.quickstep + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.annotation.ElapsedRealtimeLong +import android.content.Intent +import android.graphics.PointF + +import android.util.Log +import android.view.Display.DEFAULT_DISPLAY +import android.view.KeyEvent +import android.view.View +import android.window.TransitionInfo +import androidx.annotation.BinderThread +import androidx.annotation.UiThread +import androidx.annotation.VisibleForTesting +import com.android.app.displaylib.DisplayRepository +import com.android.app.displaylib.PerDisplayRepository + +import com.android.internal.jank.Cuj +import com.android.launcher3.DeviceProfile +import com.android.launcher3.logger.LauncherAtom +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_3_BUTTON +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_QUICK_SWITCH +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_SHORTCUT +import com.android.launcher3.taskbar.TaskbarInteractor +import com.android.launcher3.taskbar.TaskbarManager +import com.android.launcher3.util.OverviewCommandHelperProtoLogProxy +import com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview +import com.android.launcher3.util.RunnableList +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.GestureState.GestureEndTarget +import com.android.quickstep.GestureState.displaySupportsHomeGesture +import com.android.quickstep.OverviewCommandHelper.CommandInfo.CommandStatus +import com.android.quickstep.OverviewCommandHelper.CommandType.HIDE_ALT_TAB +import com.android.quickstep.OverviewCommandHelper.CommandType.HOME +import com.android.quickstep.OverviewCommandHelper.CommandType.SHOW_ALT_TAB +import com.android.quickstep.OverviewCommandHelper.CommandType.SHOW_WITH_FOCUS +import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE +import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE_OVERVIEW_PREVIOUS +import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE_WITH_FOCUS +import com.android.quickstep.util.ActiveGestureLog +import com.android.quickstep.util.ActiveGestureProtoLogProxy +import com.android.quickstep.views.DesktopTaskView +import com.android.quickstep.views.KeyboardFocusTask +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.TaskView +import com.android.quickstep.window.RecentsWindowManager +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.systemui.shared.system.InteractionJankMonitorWrapper +import com.android.wm.shell.Flags.enableShellTopTaskTracking +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import java.io.PrintWriter +import java.util.concurrent.ConcurrentLinkedDeque +import java.util.concurrent.TimeUnit +import kotlin.coroutines.resume +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.ensureActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withTimeout + +/** Helper class to handle various atomic commands for switching between Overview. */ +class OverviewCommandHelper +@AssistedInject +constructor( + @Assisted private val touchInteractionService: TouchInteractionService, + private val overviewComponentObserver: OverviewComponentObserver, + private val dispatcherProvider: DispatcherProvider, + private val displayRepository: DisplayRepository, + @Assisted private val taskbarManager: TaskbarManager, + private val taskAnimationManagerRepository: PerDisplayRepository, + @ElapsedRealtimeLong private val elapsedRealtime: () -> Long, + @Assisted private val systemUiProxy: SystemUiProxy, +) { + private val coroutineScope = + CoroutineScope(SupervisorJob() + dispatcherProvider.lightweightBackground) + + private val commandQueue = ConcurrentLinkedDeque() + + /** + * Index of the TaskView that should be focused when launching Overview. Persisted so that we do + * not lose the focus across multiple calls of [OverviewCommandHelper.executeCommand] for the + * same command + */ + private var keyboardFocusTask: KeyboardFocusTask = KeyboardFocusTask.Unfocused + + private val lastToggleInfo = mutableMapOf() + + private fun getContainerInterface(displayId: Int) = + overviewComponentObserver.getContainerInterface(displayId) + + private fun getVisibleRecentsView(displayId: Int) = + getContainerInterface(displayId)?.getVisibleRecentsView>() + + /** + * Adds a command to be executed next, after all pending tasks are completed. Max commands that + * can be queued is [.MAX_QUEUE_SIZE]. Requests after reaching that limit will be silently + * dropped. + * + * @param type The type of the command + * @param displayId The display to run the command on + */ + @BinderThread + @JvmOverloads + fun addCommand( + type: CommandType, + displayId: Int = DEFAULT_DISPLAY, + isLastOfBatch: Boolean = true, + ): CommandInfo? { + if (commandQueue.size >= MAX_QUEUE_SIZE) { + OverviewCommandHelperProtoLogProxy.logCommandQueueFull(type, commandQueue) + return null + } + + val command = + CommandInfo( + type, + displayId = displayId, + createTime = elapsedRealtime(), + isLastOfBatch = isLastOfBatch, + ) + commandQueue.add(command) + OverviewCommandHelperProtoLogProxy.logCommandAdded(command) + + if (commandQueue.size == 1) { + OverviewCommandHelperProtoLogProxy.logCommandExecuted(command, commandQueue.size) + coroutineScope.launch(dispatcherProvider.main) { processNextCommand() } + } else { + OverviewCommandHelperProtoLogProxy.logCommandNotExecuted(command, commandQueue.size) + } + + return command + } + + @BinderThread + fun addCommandsForDisplays(type: CommandType, displayIds: IntArray): CommandInfo? { + if (displayIds.isEmpty()) return null + var lastCommand: CommandInfo? = null + displayIds.forEachIndexed({ i, displayId -> + lastCommand = addCommand(type, displayId, i == displayIds.size - 1) + }) + return lastCommand + } + + @BinderThread + fun addCommandsForAllDisplays(type: CommandType) = + addCommandsForDisplays(type, displayRepository.displayIds.value.toIntArray()) + + @BinderThread + fun addCommandsForDisplaysExcept(type: CommandType, excludedDisplayId: Int) = + addCommandsForDisplays( + type, + displayRepository.displayIds.value + .filter { displayId -> displayId != excludedDisplayId } + .toIntArray(), + ) + + fun canStartHomeSafely(): Boolean = + commandQueue.isEmpty() || + commandQueue.first().type == HOME || + commandQueue.first().type == TOGGLE_OVERVIEW_PREVIOUS + + /** Clear pending or completed commands from the queue */ + fun clearPendingCommands() { + OverviewCommandHelperProtoLogProxy.logClearPendingCommands(commandQueue) + commandQueue.removeAll { it.status != CommandStatus.PROCESSING } + } + + /** + * Executes the next command from the queue. If the command finishes immediately (returns true), + * it continues to execute the next command, until the queue is empty of a command defer's its + * completion (returns false). + */ + @UiThread + private fun processNextCommand() { + val command: CommandInfo? = commandQueue.firstOrNull() + if (command == null) { + OverviewCommandHelperProtoLogProxy.logNoPendingCommands() + return + } + + command.status = CommandStatus.PROCESSING + OverviewCommandHelperProtoLogProxy.logExecutingCommand(command) + + coroutineScope.launch(dispatcherProvider.main) { + withTimeout(QUEUE_WAIT_DURATION_IN_MS) { + executeCommandSuspended(command) + ensureActive() + onCommandFinished(command) + } + } + } + + /** + * Executes the task and returns true if next task can be executed. If false, then the next task + * is deferred until [.scheduleNextTask] is called + */ + @VisibleForTesting + fun executeCommand(command: CommandInfo, onCallbackResult: () -> Unit): Boolean { + val recentsView = getVisibleRecentsView(command.displayId) + OverviewCommandHelperProtoLogProxy.logExecutingCommand(command, recentsView) + return if (recentsView != null) { + executeWhenRecentsIsVisible(command, recentsView, onCallbackResult) + } else { + executeWhenRecentsIsNotVisible(command, onCallbackResult) + } + } + + /** + * Executes the task and returns true if next task can be executed. If false, then the next task + * is deferred until [.scheduleNextTask] is called + */ + private suspend fun executeCommandSuspended(command: CommandInfo) = + suspendCancellableCoroutine { continuation -> + fun processResult(isCompleted: Boolean) { + OverviewCommandHelperProtoLogProxy.logExecutedCommandWithResult( + command, + isCompleted, + ) + if (isCompleted) { + continuation.resume(Unit) + } else { + OverviewCommandHelperProtoLogProxy.logWaitingForCommandCallback(command) + } + } + + val result = executeCommand(command, onCallbackResult = { processResult(true) }) + processResult(result) + + continuation.invokeOnCancellation { cancelCommand(command, it) } + } + + private fun executeWhenRecentsIsVisible( + command: CommandInfo, + recentsView: RecentsView<*, *>, + onCallbackResult: () -> Unit, + ): Boolean = + when (command.type) { + SHOW_WITH_FOCUS -> true // already visible + SHOW_ALT_TAB, + HIDE_ALT_TAB -> { + if (recentsView.isHandlingTouch) { + true + } else { + keyboardFocusTask = KeyboardFocusTask.Unfocused + val currentPage = recentsView.nextPage + val taskView = recentsView.getTaskViewAt(currentPage) + launchTask(recentsView, taskView, command, onCallbackResult) + } + } + + TOGGLE -> { + val runningTaskId = recentsView.runningTaskView?.taskIdSet + launchTask( + recentsView, + getNextToggledTaskView(recentsView, command.displayId), + command, + ) { + if (enableGridOnlyOverview() && runningTaskId != null) { + lastToggleInfo[command.displayId] = + ToggleInfo(command.createTime, runningTaskId) + } + onCallbackResult() + } + } + TOGGLE_OVERVIEW_PREVIOUS -> { + val taskView = recentsView.runningTaskView + if (taskView != null) { + launchTask(recentsView, taskView, command, onCallbackResult) + } else { + recentsView.startHome() + true + } + } + TOGGLE_WITH_FOCUS -> { + val focusedTask = recentsView.taskViews.firstOrNull { it.isFocused || it.isHovered } + focusedTask?.let { + return launchTask(recentsView, it, command, onCallbackResult) + } + val selectedDesktopTask = + recentsView.taskViews + .filterIsInstance() + .firstNotNullOfOrNull { desktopTaskView -> + desktopTaskView.selectedTaskId?.let { selectedTaskId -> + desktopTaskView to selectedTaskId + } + } + selectedDesktopTask?.let { (desktopTaskView, selectedTaskId) -> + return launchTaskWithDesktopController( + recentsView, + desktopTaskView, + selectedTaskId, + command, + onCallbackResult, + ) + } + launchTask(recentsView, recentsView.currentPageTaskView, command, onCallbackResult) + } + HOME -> { + if (displaySupportsHomeGesture(command.displayId)) { + recentsView.startHome { onCallbackResult() } + false + } else { + // TODO: b/378443899 - Add animation for reject home transition. + true + } + } + } + + private fun getNextToggledTaskView(recentsView: RecentsView<*, *>, displayId: Int): TaskView? { + val lastToggleInfo = lastToggleInfo[displayId] + val lastToggleTaskView = + if ( + enableGridOnlyOverview() && + lastToggleInfo != null && + elapsedRealtime() - lastToggleInfo.createTime < TOGGLE_PREVIOUS_TIMEOUT_MS + ) { + recentsView.getTaskViewByTaskIds(lastToggleInfo.taskIds.toIntArray()) + } else null + val runningTaskView = recentsView.runningTaskView + return when { + runningTaskView == null && !enableGridOnlyOverview() -> + // When running task view is null we return last large taskView - typically + // focusView or last desktop task view. + recentsView.lastLargeTaskView ?: recentsView.firstTaskView + runningTaskView == null -> + recentsView.firstNonDesktopTaskView ?: recentsView.lastDesktopTaskView + lastToggleTaskView != null && lastToggleTaskView != runningTaskView -> + lastToggleTaskView + else -> recentsView.nextTaskView ?: recentsView.previousTaskView ?: runningTaskView + } + } + + private fun launchTask( + recents: RecentsView<*, *>, + taskView: TaskView?, + command: CommandInfo, + onCallbackResult: () -> Unit, + ): Boolean { + var callbackList: RunnableList? = null + if (taskView != null) { + taskView.isEndQuickSwitchCuj = true + callbackList = taskView.launchWithAnimation() + } + return handleLaunchResult(callbackList, recents, command, onCallbackResult) + } + + private fun launchTaskWithDesktopController( + recents: RecentsView<*, *>, + taskView: DesktopTaskView, + taskIdToReorderToFront: Int, + command: CommandInfo, + onCallbackResult: () -> Unit, + ): Boolean { + val callbackList: RunnableList? = + taskView.launchTaskWithDesktopController(true, taskIdToReorderToFront) + return handleLaunchResult(callbackList, recents, command, onCallbackResult) + } + + private fun handleLaunchResult( + callbackList: RunnableList?, + recents: RecentsView<*, *>, + command: CommandInfo, + onCallbackResult: () -> Unit, + ): Boolean { + return if (callbackList != null) { + callbackList.add { + OverviewCommandHelperProtoLogProxy.logLaunchingTaskCallback(command) + onCallbackResult() + } + OverviewCommandHelperProtoLogProxy.logLaunchingTaskWaitingForCallback(command) + false + } else { + recents.startHome() + true + } + } + + // Returns false if callbacks should be awaited, true otherwise. + private fun executeWhenRecentsIsNotVisible( + command: CommandInfo, + onCallbackResult: () -> Unit, + ): Boolean { + val containerInterface = getContainerInterface(command.displayId) ?: return true + val recentsViewContainer = containerInterface.getCreatedContainer() + val recentsView: RecentsView<*, *>? = recentsViewContainer?.getOverviewPanel() + val deviceProfile = recentsViewContainer?.getDeviceProfile() + val taskbarInteractor: TaskbarInteractor? = + if ( + command.displayId != DEFAULT_DISPLAY && + recentsViewContainer !is RecentsWindowManager + ) { + // When recentsViewContainer is not RecentsWindowManager, get TaskbarUiController + // from TaskbarManager as a workaround. + taskbarManager.getUIControllerForDisplay(command.displayId)?.let { + TaskbarInteractor(it) + } + } else { + containerInterface.getTaskbarInteractor() + } + + val taskAnimationManager = taskAnimationManagerRepository[command.displayId] + if (taskAnimationManager == null) { + Log.e(TAG, "No TaskAnimationManager found for display ${command.displayId}") + ActiveGestureProtoLogProxy.logOnTaskAnimationManagerNotAvailable(command.displayId) + return false + } + + when (command.type) { + HIDE_ALT_TAB -> { + if ( + taskbarInteractor == null || + !shouldShowAltTabKqs(deviceProfile, command.displayId) + ) { + return true + } + val focusedTaskIds = + try { + taskbarInteractor.launchFocusedTask().get() + } catch (e: Exception) { + null + } + keyboardFocusTask = + if (focusedTaskIds == null) KeyboardFocusTask.Unfocused + else KeyboardFocusTask.TaskViewWithIds(focusedTaskIds) + + if (keyboardFocusTask is KeyboardFocusTask.Unfocused) return true + } + + SHOW_ALT_TAB -> + if ( + taskbarInteractor != null && + shouldShowAltTabKqs(deviceProfile, command.displayId) + ) { + taskbarInteractor.openQuickSwitchView() + return true + } else { + keyboardFocusTask = KeyboardFocusTask.CurrentPageTaskView + } + + HOME -> { + if (displaySupportsHomeGesture(command.displayId)) { + // Although IActivityTaskManager$Stub$Proxy.startActivity is a slow binder + // call, we should still call it on main thread because launcher is waiting + // for ActivityTaskManager to resume it. Also calling startActivity() on bg + // thread could potentially delay resuming launcher. See b/348668521 for + // more details. + systemUiProxy.onKeyEvent(KeyEvent.KEYCODE_HOME, command.displayId) + return true + } else { + // Initiate a recents animation that is immediately rejected, which will + // provide visual feedback that home is not supported. + return startRecentsTransitionWithEndTarget( + command, + onCallbackResult, + containerInterface, + taskAnimationManager, + GestureEndTarget.REJECT_HOME, + recentsView, + ) + } + } + + SHOW_WITH_FOCUS, + TOGGLE_WITH_FOCUS -> + // When Recents is not currently visible, the command's type is SHOW + // when overview is triggered via the keyboard overview button or Action+Tab + // keys (Not Alt+Tab which is KQS). The overview button on-screen in 3-button + // nav is TYPE_TOGGLE. + keyboardFocusTask = KeyboardFocusTask.ExpectedCurrentTask + + TOGGLE, + TOGGLE_OVERVIEW_PREVIOUS -> {} + } + + recentsView?.setKeyboardFocusTask(keyboardFocusTask) + + // Handle recents view focus when launching from home + val animatorListener: Animator.AnimatorListener = + object : AnimatorListenerAdapter() { + override fun onAnimationStart(animation: Animator) { + OverviewCommandHelperProtoLogProxy.logSwitchingToOverviewStateStart(command) + super.onAnimationStart(animation) + updateRecentsViewFocus(command) + logShowOverviewFrom(command) + } + + override fun onAnimationEnd(animation: Animator) { + OverviewCommandHelperProtoLogProxy.logSwitchingToOverviewStateEnd(command) + super.onAnimationEnd(animation) + onRecentsViewFocusUpdated(command) + onCallbackResult() + } + } + if (containerInterface.switchToRecentsIfVisible(animatorListener)) { + OverviewCommandHelperProtoLogProxy.logSwitchingToOverviewStateWaiting(command) + // If successfully switched, wait until animation finishes + return false + } + + return startRecentsTransitionWithEndTarget( + command, + onCallbackResult, + containerInterface, + taskAnimationManager, + GestureEndTarget.RECENTS, + recentsView, + ) + } + + private fun startRecentsTransitionWithEndTarget( + command: CommandInfo, + onCallbackResult: () -> Unit, + containerInterface: BaseContainerInterface<*, *>, + taskAnimationManager: TaskAnimationManager, + gestureEndTarget: GestureEndTarget, + recentsView: RecentsView<*, *>?, + ): Boolean { + val recentsViewContainer = containerInterface.getCreatedContainer() + if (gestureEndTarget == GestureEndTarget.RECENTS) { + // If we get here then launcher is not the top visible task, so we should animate + // that task. + if (recentsViewContainer !is RecentsWindowManager) { + recentsViewContainer?.rootView?.let { view -> + InteractionJankMonitorWrapper.begin(view, Cuj.CUJ_LAUNCHER_QUICK_SWITCH) + } + } + } + + val gestureState = + touchInteractionService + .createGestureState( + command.displayId, + GestureState.DEFAULT_STATE, + GestureState.TrackpadGestureType.NONE, + ) + .apply { + setHandlingAtomicEvent(gestureEndTarget) + if (!enableShellTopTaskTracking()) { + val runningTask = runningTask + // In the case where we are in an excluded, translucent overlay, ignore it + // and treat the running activity as the task behind the overlay. + val otherVisibleTask = runningTask?.visibleNonExcludedTask + if (otherVisibleTask != null) { + ActiveGestureProtoLogProxy.logUpdateGestureStateRunningTask( + otherVisibleTask.packageName ?: "MISSING", + runningTask.packageName ?: "MISSING", + ) + updateRunningTask(otherVisibleTask) + } + } + } + val interactionHandler = + touchInteractionService + .getSwipeUpHandlerFactory(command.displayId) + .newHandler(gestureState, command.createTime) + if (interactionHandler == null) { + // Can happen e.g. when a display is disconnected, so try to handle gracefully. + Log.d(TAG, "AbsSwipeUpHandler not available for displayId=${command.displayId})") + ActiveGestureProtoLogProxy.logOnAbsSwipeUpHandlerNotAvailable(command.displayId) + return true + } + interactionHandler.setGestureAnimationEndCallback { + onTransitionComplete(command, interactionHandler, onCallbackResult) + } + interactionHandler.initWhenReady("OverviewCommandHelper: command.type=${command.type}") + + val recentAnimListener: RecentsAnimationCallbacks.RecentsAnimationListener = + object : RecentsAnimationCallbacks.RecentsAnimationListener { + override fun onRecentsAnimationStart( + controller: RecentsAnimationController, + targets: RecentsAnimationTargets, + transitionInfo: TransitionInfo?, + ) { + OverviewCommandHelperProtoLogProxy.logRecentsAnimStarted(command) + if (gestureEndTarget == GestureEndTarget.RECENTS) { + if (recentsViewContainer is RecentsWindowManager) { + recentsViewContainer.rootView.let { view -> + InteractionJankMonitorWrapper.begin( + view, + Cuj.CUJ_LAUNCHER_QUICK_SWITCH, + ) + } + } + + updateRecentsViewFocus(command) + logShowOverviewFrom(command) + } + containerInterface.runOnInitBackgroundStateUI { + OverviewCommandHelperProtoLogProxy.logOnInitBackgroundStateUI(command) + interactionHandler.onGestureEnded( + 0f, + PointF(), + /* horizontalTouchSlopPassed= */ false, + ) + } + command.removeListener(this) + } + + override fun onRecentsAnimationCanceled( + thumbnailDatas: HashMap + ) { + OverviewCommandHelperProtoLogProxy.logRecentsAnimCanceled(command) + interactionHandler.onGestureCancelled() + command.removeListener(this) + + containerInterface.getCreatedContainer() ?: return + recentsView?.onRecentsAnimationComplete() + } + } + + if (taskAnimationManager.isRecentsAnimationRunning) { + command.setAnimationCallbacks( + taskAnimationManager.continueRecentsAnimation(gestureState) + ) + command.addListener(interactionHandler) + taskAnimationManager.notifyRecentsAnimationState(interactionHandler) + interactionHandler.onGestureStarted(true /*isLikelyToStartNewTask*/) + + command.addListener(recentAnimListener) + taskAnimationManager.notifyRecentsAnimationState(recentAnimListener) + } else { + val intent = + Intent(interactionHandler.getLaunchIntent()) + .putExtra(ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID, gestureState.gestureId) + command.setAnimationCallbacks( + taskAnimationManager.startRecentsAnimation(gestureState, intent, interactionHandler) + ) + interactionHandler.onGestureStarted(false /*isLikelyToStartNewTask*/) + command.addListener(recentAnimListener) + } + OverviewCommandHelperProtoLogProxy.logSwitchingViaRecentsAnim(command, gestureEndTarget) + return false + } + + private fun shouldShowAltTabKqs(deviceProfile: DeviceProfile?, displayId: Int): Boolean = + // Alt+Tab KQS is always shown on tablets (large screen devices). + deviceProfile?.deviceProperties?.isTablet == true || + // For small screen devices, it's only shown on connected displays. + displayId != DEFAULT_DISPLAY + + private fun onTransitionComplete( + command: CommandInfo, + handler: AbsSwipeUpHandler<*, *, *>, + onCommandResult: () -> Unit, + ) { + OverviewCommandHelperProtoLogProxy.logSwitchingViaRecentsAnimComplete(command) + command.removeListener(handler) + onRecentsViewFocusUpdated(command) + onCommandResult() + } + + /** Called when the command finishes execution. */ + private fun onCommandFinished(command: CommandInfo) { + command.status = CommandStatus.COMPLETED + if (commandQueue.firstOrNull() !== command) { + OverviewCommandHelperProtoLogProxy.logCommandFinishedButNotScheduled( + commandQueue.firstOrNull(), + command, + ) + return + } + + OverviewCommandHelperProtoLogProxy.logCommandFinishedSuccessfully(command) + commandQueue.remove(command) + processNextCommand() + } + + private fun cancelCommand(command: CommandInfo, throwable: Throwable?) { + command.status = CommandStatus.CANCELED + OverviewCommandHelperProtoLogProxy.logCommandCanceled(command, throwable) + commandQueue.remove(command) + processNextCommand() + } + + private fun updateRecentsViewFocus(command: CommandInfo) { + val recentsView: RecentsView<*, *> = getVisibleRecentsView(command.displayId) ?: return + if ( + command.type != SHOW_ALT_TAB && + command.type != HIDE_ALT_TAB && + command.type != SHOW_WITH_FOCUS && + command.type != TOGGLE_WITH_FOCUS + ) { + return + } + // When the overview is launched via alt tab (command type is TYPE_KEYBOARD_INPUT), + // the touch mode somehow is not change to false by the Android framework. + // The subsequent tab to go through tasks in overview can only be dispatched to + // focuses views, while focus can only be requested in + // {@link View#requestFocusNoSearch(int, Rect)} when touch mode is false. To note, + // here we launch overview with live tile. + if (recentsView.isAttachedToWindow) { + recentsView.viewRootImpl.touchModeChanged(false) + } else { + recentsView.post { recentsView.viewRootImpl.touchModeChanged(false) } + } + // Ensure that recents view has focus so that it receives the followup key inputs + // Stops requesting focused after first view gets focused. + recentsView.keyboardFocusTaskView.requestFocus() || + recentsView.nextTaskView.requestFocus() || + recentsView.firstTaskView.requestFocus() || + recentsView.requestFocus() + } + + private fun onRecentsViewFocusUpdated(command: CommandInfo) { + val recentsView: RecentsView<*, *> = getVisibleRecentsView(command.displayId) ?: return + if (command.type == HIDE_ALT_TAB && keyboardFocusTask !is KeyboardFocusTask.Unfocused) { + recentsView.currentPage = recentsView.indexOfChild(recentsView.keyboardFocusTaskView) + } + keyboardFocusTask = KeyboardFocusTask.Unfocused + recentsView.setKeyboardFocusTask(KeyboardFocusTask.Unfocused) + } + + private fun View?.requestFocus(): Boolean { + if (this == null) return false + post { + requestFocus() + requestAccessibilityFocus() + } + return true + } + + private fun logShowOverviewFrom(command: CommandInfo) { + val containerInterface = getContainerInterface(command.displayId) ?: return + val container = containerInterface.getCreatedContainer() ?: return + val event = + when (command.type) { + SHOW_WITH_FOCUS -> LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_SHORTCUT + HIDE_ALT_TAB -> LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_QUICK_SWITCH + TOGGLE -> LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_3_BUTTON + else -> return + } + StatsLogManager.newInstance(container.asContext()) + .logger() + .withContainerInfo( + LauncherAtom.ContainerInfo.newBuilder() + .setTaskSwitcherContainer( + LauncherAtom.TaskSwitcherContainer.getDefaultInstance() + ) + .build() + ) + .log(event) + } + + fun dump(pw: PrintWriter) { + pw.println("OverviewCommandHelper:") + pw.println(" pendingCommands=${commandQueue.size}") + if (commandQueue.isNotEmpty()) { + pw.println(" pendingCommandType=${commandQueue.first().type}") + } + pw.println(" keyboardFocusTask=$keyboardFocusTask") + } + + @VisibleForTesting + data class CommandInfo( + val type: CommandType, + var status: CommandStatus = CommandStatus.IDLE, + val createTime: Long, + private var animationCallbacks: RecentsAnimationCallbacks? = null, + val displayId: Int = DEFAULT_DISPLAY, + val isLastOfBatch: Boolean = true, + ) { + fun setAnimationCallbacks(recentsAnimationCallbacks: RecentsAnimationCallbacks) { + this.animationCallbacks = recentsAnimationCallbacks + } + + fun addListener(listener: RecentsAnimationCallbacks.RecentsAnimationListener) { + animationCallbacks?.addListener(listener) + } + + fun removeListener(listener: RecentsAnimationCallbacks.RecentsAnimationListener?) { + animationCallbacks?.removeListener(listener) + } + + enum class CommandStatus { + IDLE, + PROCESSING, + COMPLETED, + CANCELED, + } + } + + enum class CommandType { + SHOW_WITH_FOCUS, + SHOW_ALT_TAB, + HIDE_ALT_TAB, + /** Toggle between overview and the next task */ + TOGGLE, // Navigate to Overview + HOME, // Navigate to Home + /** + * Toggle between Overview and the previous screen before launching Overview, which can + * either be a task or the home screen. + */ + TOGGLE_OVERVIEW_PREVIOUS, + + /** Toggle between Overview and the keyboard-focused Overview task. */ + TOGGLE_WITH_FOCUS, + } + + data class ToggleInfo(val createTime: Long, val taskIds: Set) + + @AssistedFactory + interface Factory { + fun create( + touchInteractionService: TouchInteractionService, + taskbarManager: TaskbarManager, + systemUiProxy: SystemUiProxy, + ): OverviewCommandHelper + } + + companion object { + private const val TAG = "OverviewCommandHelper" + private const val TRANSITION_NAME = "Transition:toOverview" + + /** + * Use case for needing a queue is double tapping recents button in 3 button nav. Size of 2 + * should be enough. We'll toss in one more because we're kind hearted. + */ + private const val MAX_QUEUE_SIZE = 3 + private const val QUEUE_WAIT_DURATION_IN_MS = 5000L + @VisibleForTesting val TOGGLE_PREVIOUS_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(5) + } +} diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java index a71e3149ab7..38600b3589e 100644 --- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java +++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java @@ -19,8 +19,15 @@ import static android.content.Intent.ACTION_PACKAGE_ADDED; import static android.content.Intent.ACTION_PACKAGE_CHANGED; import static android.content.Intent.ACTION_PACKAGE_REMOVED; +import static android.view.Display.DEFAULT_DISPLAY; import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.util.SimpleBroadcastReceiver.actionsFilter; +import static com.android.launcher3.util.SimpleBroadcastReceiver.packageFilter; +import static com.android.quickstep.window.RecentsWindowFlags.enableFallbackOverviewInWindow; +import static com.android.quickstep.window.RecentsWindowFlags.enableLauncherOverviewInWindow; +import static com.android.quickstep.window.RecentsWindowFlags.enableOverviewOnConnectedDisplays; import static com.android.systemui.shared.system.PackageManagerWrapper.ACTION_PREFERRED_ACTIVITY_CHANGED; import android.content.ActivityNotFoundException; @@ -36,60 +43,87 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import com.android.app.displaylib.PerDisplayRepository; import com.android.launcher3.R; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppComponent; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.SimpleBroadcastReceiver; -import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.system.PackageManagerWrapper; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import java.util.function.Consumer; +import java.util.concurrent.CopyOnWriteArrayList; + +import javax.inject.Inject; /** * Class to keep track of the current overview component based off user preferences and app updates * and provide callers the relevant classes. */ +@LauncherAppSingleton public final class OverviewComponentObserver { private static final String TAG = "OverviewComponentObserver"; - private final SimpleBroadcastReceiver mUserPreferenceChangeReceiver = - new SimpleBroadcastReceiver(this::updateOverviewTargets); - private final SimpleBroadcastReceiver mOtherHomeAppUpdateReceiver = - new SimpleBroadcastReceiver(this::updateOverviewTargets); + public static final DaggerSingletonObject INSTANCE = + new DaggerSingletonObject<>(LauncherAppComponent::getOverviewComponentObserver); - private final Context mContext; - private final RecentsAnimationDeviceState mDeviceState; - private final Intent mCurrentHomeIntent; - private final Intent mMyHomeIntent; + // We register broadcast receivers on main thread to avoid missing updates. + private final SimpleBroadcastReceiver mUserPreferenceChangeReceiver; + private final SimpleBroadcastReceiver mOtherHomeAppUpdateReceiver; + + private final PerDisplayRepository mRecentsWindowManagerRepository; + + private final Intent mCurrentPrimaryHomeIntent; + private final Intent mMyPrimaryHomeIntent; private final Intent mFallbackIntent; private final SparseIntArray mConfigChangesMap = new SparseIntArray(); private final String mSetupWizardPkg; - private Consumer mOverviewChangeListener = b -> { }; + private final List mOverviewChangeListeners = + new CopyOnWriteArrayList<>(); + private final Context mContext; + private Intent mLazySecondaryHomeIntent; private String mUpdateRegisteredPackage; - private BaseActivityInterface mActivityInterface; + private BaseContainerInterface mDefaultDisplayContainerInterface; private Intent mOverviewIntent; private boolean mIsHomeAndOverviewSame; private boolean mIsDefaultHome; private boolean mIsHomeDisabled; - - public OverviewComponentObserver(Context context, RecentsAnimationDeviceState deviceState) { + @Inject + public OverviewComponentObserver( + @ApplicationContext Context context, + PerDisplayRepository recentsWindowManagerRepository, + DaggerSingletonTracker lifecycleTracker) { mContext = context; - mDeviceState = deviceState; - mCurrentHomeIntent = createHomeIntent(); - mMyHomeIntent = new Intent(mCurrentHomeIntent).setPackage(mContext.getPackageName()); - ResolveInfo info = context.getPackageManager().resolveActivity(mMyHomeIntent, 0); + mUserPreferenceChangeReceiver = + new SimpleBroadcastReceiver(context, MAIN_EXECUTOR, this::updateOverviewTargets); + mOtherHomeAppUpdateReceiver = + new SimpleBroadcastReceiver(context, MAIN_EXECUTOR, this::updateOverviewTargets); + mRecentsWindowManagerRepository = recentsWindowManagerRepository; + // Set up primary intents + mCurrentPrimaryHomeIntent = createHomeIntent(); + mMyPrimaryHomeIntent = new Intent(mCurrentPrimaryHomeIntent).setPackage( + context.getPackageName()); + ResolveInfo info = context.getPackageManager().resolveActivity(mMyPrimaryHomeIntent, 0); ComponentName myHomeComponent = new ComponentName(context.getPackageName(), info.activityInfo.name); - mMyHomeIntent.setComponent(myHomeComponent); + mMyPrimaryHomeIntent.setComponent(myHomeComponent); + mConfigChangesMap.append(myHomeComponent.hashCode(), info.activityInfo.configChanges); mSetupWizardPkg = context.getString(R.string.setup_wizard_pkg); - ComponentName fallbackComponent = new ComponentName(mContext, RecentsActivity.class); + ComponentName fallbackComponent = new ComponentName(context, RecentsActivity.class); mFallbackIntent = new Intent(Intent.ACTION_MAIN) .addCategory(Intent.CATEGORY_DEFAULT) .setComponent(fallbackComponent) @@ -101,21 +135,50 @@ public OverviewComponentObserver(Context context, RecentsAnimationDeviceState de mConfigChangesMap.append(fallbackComponent.hashCode(), fallbackInfo.configChanges); } catch (PackageManager.NameNotFoundException ignored) { /* Impossible */ } - mUserPreferenceChangeReceiver.register(mContext, ACTION_PREFERRED_ACTIVITY_CHANGED); + mUserPreferenceChangeReceiver.register(actionsFilter(ACTION_PREFERRED_ACTIVITY_CHANGED)); updateOverviewTargets(); + + lifecycleTracker.addCloseable(this::onDestroy); } - /** - * Sets a listener for changes in {@link #isHomeAndOverviewSame()} - */ - public void setOverviewChangeListener(Consumer overviewChangeListener) { - // TODO(b/337861962): This method should be able to support multiple listeners instead of - // one so that we can reuse the same instance of this class across multiple places - mOverviewChangeListener = overviewChangeListener; + private Intent getSecondaryHomeIntent() { + synchronized (this) { + if (mLazySecondaryHomeIntent == null) { + // Set up secondary home intent + mLazySecondaryHomeIntent = createSecondaryHomeIntent().setPackage( + mContext.getPackageName()); + ResolveInfo secondaryInfo = mContext.getPackageManager().resolveActivity( + mLazySecondaryHomeIntent, 0); + if (secondaryInfo != null) { + ComponentName secondaryComponent = new ComponentName(mContext, + secondaryInfo.activityInfo.name); + mLazySecondaryHomeIntent.setComponent(secondaryComponent); + } else { + Log.w(TAG, "Secondary home info not available to construct Intent"); + mLazySecondaryHomeIntent.setComponent(mMyPrimaryHomeIntent.getComponent()); + } + } + return mLazySecondaryHomeIntent; + } + } + + /** Adds a listener for changes in {@link #isHomeAndOverviewSame()} */ + public void addOverviewChangeListener(OverviewChangeListener overviewChangeListener) { + mOverviewChangeListeners.add(overviewChangeListener); + } + + /** Removes a previously added listener */ + public void removeOverviewChangeListener(OverviewChangeListener overviewChangeListener) { + mOverviewChangeListeners.remove(overviewChangeListener); } - public void onSystemUiStateChanged() { - if (mDeviceState.isHomeDisabled() != mIsHomeDisabled) { + /** + * Called to set home enabled/disabled state via systemUI + * @param isHomeDisabled + */ + public void setHomeDisabled(boolean isHomeDisabled) { + if (isHomeDisabled != mIsHomeDisabled) { + mIsHomeDisabled = isHomeDisabled; updateOverviewTargets(); } } @@ -128,6 +191,7 @@ private void updateOverviewTargets(Intent unused) { * Update overview intent and {@link BaseActivityInterface} based off the current launcher home * component. */ + @UiThread private void updateOverviewTargets() { ComponentName defaultHome = PackageManagerWrapper.getInstance() .getHomeActivities(new ArrayList<>()); @@ -138,20 +202,19 @@ private void updateOverviewTargets() { defaultHome = null; } - mIsHomeDisabled = mDeviceState.isHomeDisabled(); - mIsDefaultHome = Objects.equals(mMyHomeIntent.getComponent(), defaultHome); + mIsDefaultHome = Objects.equals(mMyPrimaryHomeIntent.getComponent(), defaultHome); // Set assistant visibility to 0 from launcher's perspective, ensures any elements that // launcher made invisible become visible again before the new activity control helper // becomes active. - if (mActivityInterface != null) { - mActivityInterface.onAssistantVisibilityChanged(0.f); + if (mDefaultDisplayContainerInterface != null) { + mDefaultDisplayContainerInterface.onAssistantVisibilityChanged(0.f); } if (SEPARATE_RECENTS_ACTIVITY.get()) { mIsDefaultHome = false; if (defaultHome == null) { - defaultHome = mMyHomeIntent.getComponent(); + defaultHome = mMyPrimaryHomeIntent.getComponent(); } } @@ -161,21 +224,36 @@ private void updateOverviewTargets() { + ", mIsDefaultHome=" + mIsDefaultHome); if (!mIsHomeDisabled && (defaultHome == null || mIsDefaultHome)) { - // User default home is same as out home app. Use Overview integrated in Launcher. - mActivityInterface = LauncherActivityInterface.INSTANCE; + // User default home is same as our home app. Use Overview integrated in Launcher. + if (enableLauncherOverviewInWindow) { + RecentsWindowManager recentsWindowManager = mRecentsWindowManagerRepository.get( + DEFAULT_DISPLAY); + mDefaultDisplayContainerInterface = + recentsWindowManager != null ? recentsWindowManager.getContainerInterface() + : null; + } else { + mDefaultDisplayContainerInterface = LauncherActivityInterface.INSTANCE; + } mIsHomeAndOverviewSame = true; - mOverviewIntent = mMyHomeIntent; - mCurrentHomeIntent.setComponent(mMyHomeIntent.getComponent()); + mOverviewIntent = mMyPrimaryHomeIntent; + mCurrentPrimaryHomeIntent.setComponent(mMyPrimaryHomeIntent.getComponent()); // Remove any update listener as we don't care about other packages. unregisterOtherHomeAppUpdateReceiver(); } else { // The default home app is a different launcher. Use the fallback Overview instead. - - mActivityInterface = FallbackActivityInterface.INSTANCE; + if (enableFallbackOverviewInWindow) { + RecentsWindowManager recentsWindowManager = mRecentsWindowManagerRepository.get( + DEFAULT_DISPLAY); + mDefaultDisplayContainerInterface = + recentsWindowManager != null ? recentsWindowManager.getContainerInterface() + : null; + } else { + mDefaultDisplayContainerInterface = FallbackActivityInterface.INSTANCE; + } mIsHomeAndOverviewSame = false; mOverviewIntent = mFallbackIntent; - mCurrentHomeIntent.setComponent(defaultHome); + mCurrentPrimaryHomeIntent.setComponent(defaultHome); // User's default home app can change as a result of package updates of this app (such // as uninstalling the app or removing the "Launcher" feature in an update). @@ -187,24 +265,24 @@ private void updateOverviewTargets() { unregisterOtherHomeAppUpdateReceiver(); mUpdateRegisteredPackage = defaultHome.getPackageName(); - mOtherHomeAppUpdateReceiver.registerPkgActions(mContext, mUpdateRegisteredPackage, - ACTION_PACKAGE_ADDED, ACTION_PACKAGE_CHANGED, ACTION_PACKAGE_REMOVED); + mOtherHomeAppUpdateReceiver.register(packageFilter(mUpdateRegisteredPackage, + ACTION_PACKAGE_ADDED, ACTION_PACKAGE_CHANGED, ACTION_PACKAGE_REMOVED)); } } - mOverviewChangeListener.accept(mIsHomeAndOverviewSame); + mOverviewChangeListeners.forEach(l -> l.onOverviewTargetChange(mIsHomeAndOverviewSame)); } /** * Clean up any registered receivers. */ - public void onDestroy() { - mContext.unregisterReceiver(mUserPreferenceChangeReceiver); + private void onDestroy() { + mUserPreferenceChangeReceiver.close(); unregisterOtherHomeAppUpdateReceiver(); } private void unregisterOtherHomeAppUpdateReceiver() { if (mUpdateRegisteredPackage != null) { - mContext.unregisterReceiver(mOtherHomeAppUpdateReceiver); + mOtherHomeAppUpdateReceiver.close(); mUpdateRegisteredPackage = null; } } @@ -231,8 +309,8 @@ boolean canHandleConfigChanges(ComponentName component, int changes) { * * @return the overview intent */ - Intent getOverviewIntentIgnoreSysUiState() { - return mIsDefaultHome ? mMyHomeIntent : mOverviewIntent; + public Intent getOverviewIntentIgnoreSysUiState() { + return mIsDefaultHome ? mMyPrimaryHomeIntent : mOverviewIntent; } /** @@ -247,24 +325,38 @@ public Intent getOverviewIntent() { /** * Get the current intent for going to the home activity. */ - public Intent getHomeIntent() { - return mCurrentHomeIntent; + public Intent getHomeIntent(int displayId) { + if (displayId == DEFAULT_DISPLAY) { + return mCurrentPrimaryHomeIntent; + } else { + return getSecondaryHomeIntent(); + } } /** - * Returns true if home and overview are same activity. + * Returns true if home and overview are same process. */ public boolean isHomeAndOverviewSame() { return mIsHomeAndOverviewSame; } /** - * Get the current activity control helper for managing interactions to the overview activity. + * Get the current control helper for managing interactions to the overview container for + * the given displayId. * - * @return the current activity control helper + * @param displayId The display id + * @return the control helper for the given display */ - public BaseActivityInterface getActivityInterface() { - return mActivityInterface; + @Nullable + public BaseContainerInterface getContainerInterface(int displayId) { + if (enableOverviewOnConnectedDisplays() && displayId != DEFAULT_DISPLAY) { + RecentsWindowManager recentsWindowManager = mRecentsWindowManagerRepository.get( + displayId); + return recentsWindowManager != null ? recentsWindowManager.getContainerInterface() + : null; + } else { + return mDefaultDisplayContainerInterface; + } } public void dump(PrintWriter pw) { @@ -273,19 +365,16 @@ public void dump(PrintWriter pw) { pw.println(" isHomeDisabled=" + mIsHomeDisabled); pw.println(" homeAndOverviewSame=" + mIsHomeAndOverviewSame); pw.println(" overviewIntent=" + mOverviewIntent); - pw.println(" homeIntent=" + mCurrentHomeIntent); + pw.println(" homeIntent=" + mCurrentPrimaryHomeIntent); + pw.println(" secondaryHomeIntent=" + getSecondaryHomeIntent()); } /** * Starts the intent for the current home activity. */ public static void startHomeIntentSafely(@NonNull Context context, @Nullable Bundle options, - @NonNull String reason) { - RecentsAnimationDeviceState deviceState = new RecentsAnimationDeviceState(context); - OverviewComponentObserver observer = new OverviewComponentObserver(context, deviceState); - Intent intent = observer.getHomeIntent(); - observer.onDestroy(); - deviceState.destroy(); + @NonNull String reason, int displayId) { + Intent intent = OverviewComponentObserver.INSTANCE.get(context).getHomeIntent(displayId); startHomeIntentSafely(context, intent, options, reason); } @@ -293,10 +382,11 @@ public static void startHomeIntentSafely(@NonNull Context context, @Nullable Bun * Starts the intent for the current home activity. */ public static void startHomeIntentSafely( - @NonNull Context context, @NonNull Intent homeIntent, @Nullable Bundle options, + @NonNull Context context, + @NonNull Intent homeIntent, + @Nullable Bundle options, @NonNull String reason) { - ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( - "OverviewComponentObserver.startHomeIntent: ").append(reason)); + ActiveGestureProtoLogProxy.logStartHomeIntent(reason); try { context.startActivity(homeIntent, options); } catch (NullPointerException | ActivityNotFoundException | SecurityException e) { @@ -304,9 +394,25 @@ public static void startHomeIntentSafely( } } + /** + * Interface for listening to overview changes + */ + public interface OverviewChangeListener { + + /** + * Called when the overview target changes + */ + void onOverviewTargetChange(boolean isHomeAndOverviewSame); + } + private static Intent createHomeIntent() { return new Intent(Intent.ACTION_MAIN) .addCategory(Intent.CATEGORY_HOME) .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); } + private static Intent createSecondaryHomeIntent() { + return new Intent(Intent.ACTION_MAIN) + .addCategory(Intent.CATEGORY_SECONDARY_HOME) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + } } diff --git a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java index 787633afda6..ff62a0148f8 100644 --- a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java +++ b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java @@ -25,48 +25,83 @@ import com.android.launcher3.BuildConfig; import com.android.launcher3.MainProcessInitializer; +import com.android.quickstep.util.QuickstepProtoLogGroup; import com.android.launcher3.Utilities; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; +import java.util.Set; + +import javax.inject.Inject; + @SuppressWarnings("unused") public class QuickstepProcessInitializer extends MainProcessInitializer { - private static final String TAG = "QuickstepProcessInitializer"; - private static final int SETUP_DELAY_MILLIS = 5000; + private static final String TAG = "QuickstepProcessInitializer"; + private static final int SETUP_DELAY_MILLIS = 5000; - public QuickstepProcessInitializer(Context context) { - // Fake call to create an instance of InteractionJankMonitor to avoid binder - // calls during - // its initialization during transitions. - InteractionJankMonitorWrapper.cancel(-1); - } + @Inject + public QuickstepProcessInitializer() { + // Fake call to create an instance of InteractionJankMonitor to avoid binder calls during + // its initialization during transitions. + InteractionJankMonitorWrapper.cancel(-1); + } - @Override - protected void init(Context context) { - // Workaround for b/120550382, an external app can cause the launcher process to - // start for - // a work profile user which we do not support. Disable the application - // immediately when we - // detect this to be the case. - UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); - if (um.isManagedProfile()) { - PackageManager pm = context.getPackageManager(); - pm.setApplicationEnabledSetting(context.getPackageName(), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0 /* flags */); - Log.w(TAG, "Disabling " + BuildConfig.APPLICATION_ID - + ", unable to run in a managed profile"); - return; - } + @Override + protected void init(Context context) { + // Workaround for b/120550382, an external app can cause the launcher process to start for + // a work profile user which we do not support. Disable the application immediately when we + // detect this to be the case. + UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); + if (um.isManagedProfile()) { + PackageManager pm = context.getPackageManager(); + pm.setApplicationEnabledSetting(context.getPackageName(), + PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0 /* flags */); + Log.w(TAG, "Disabling " + BuildConfig.APPLICATION_ID + + ", unable to run in a managed profile"); + return; + } - super.init(context); + super.init(context); - // Elevate GPU priority for Quickstep and Remote animations. - try { - if (!Utilities.ATLEAST_Q) return; - ThreadedRenderer.setContextPriority( - ThreadedRenderer.EGL_CONTEXT_PRIORITY_HIGH_IMG); - } catch (Exception e) { - Log.e(TAG, "init: " + e); - } + // Elevate GPU priority for Quickstep and Remote animations. + // LC: https://github.com/LawnchairLauncher/lawnchair/pull/4331 + try { + if (!Utilities.ATLEAST_Q) return; + ThreadedRenderer.setContextPriority( + ThreadedRenderer.EGL_CONTEXT_PRIORITY_HIGH_IMG); + } catch (Exception e) { + Log.e(TAG, "init: " + e); } + + // Enable Looper trace points. + // This allows us to see Handler callbacks on traces. +// Looper.getMainLooper().setTraceTag(Trace.TRACE_TAG_APP); + +// if (BuildConfig.IS_STUDIO_BUILD) { +// Set allowedTargets = Set.of( +// "android.view.IWindowManager", +// "android.app.IActivityManager", +// "android.app.IActivityTaskManager", +// "android.app.IActivityClientController", +// "android.hardware.input.IInputManager", +// "android.content.IContentService", +// "android.hardware.display.IDisplayManager", +// "android.app.IUiModeManager", +// "android.app.trust.ITrustManager", +// "android.content.IContentProvider", +// "com.android.internal.appwidget.IAppWidgetService", +// "android.content.pm.IPackageManager", +// " android.view.accessibility.IAccessibilityManager" +// ); +// BinderTracker.startTracking(call -> { +// if (!allowedTargets.contains(call.descriptor)) { +// Log.e("BinderCall", +// call.descriptor + " called on main thread under " + call.activeTrace +// + " stackTrace: " + call.stackTrace); +// } +// }); +// } + +// QuickstepProtoLogGroup.initProtoLog(); + } } diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java new file mode 100644 index 00000000000..f18ba5cbab1 --- /dev/null +++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java @@ -0,0 +1,391 @@ +package com.android.quickstep; + +import static android.view.Display.DEFAULT_DISPLAY; + +import static com.android.launcher3.taskbar.TaskbarThresholdUtils.getFromNavThreshold; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; + +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Rect; +import android.os.Bundle; +import android.view.WindowInsets; + +import androidx.annotation.Nullable; + +import com.android.launcher3.LauncherPrefs; +import com.android.launcher3.R; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.statehandlers.DesktopVisibilityController; +import com.android.launcher3.taskbar.TaskbarActivityContext; +import com.android.launcher3.testing.TestInformationHandler; +import com.android.launcher3.testing.shared.TestProtocol; +import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.LayoutUtils; +import com.android.quickstep.util.TISBindHelper; +import com.android.quickstep.views.DesktopTaskView; +import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.views.TaskView; +import com.android.systemui.shared.recents.model.Task; +import com.android.wm.shell.shared.bubbles.DeviceConfig; +import com.android.wm.shell.shared.desktopmode.DesktopState; + +import java.util.ArrayList; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Function; + +import javax.inject.Inject; + +public class QuickstepTestInformationHandler extends TestInformationHandler { + + protected final Context mContext; + private final RecentsModel mRecentsModel; + private final SystemUiProxy mSystemUiProxy; + private final OverviewComponentObserver mOverviewComponentObserver; + private final DesktopVisibilityController mDesktopVisibilityController; + + + @Inject + public QuickstepTestInformationHandler(@ApplicationContext Context context, + RecentsModel recentsModel, + SystemUiProxy systemUiProxy, + OverviewComponentObserver overviewComponentObserver, + DesktopVisibilityController desktopVisibilityController) { + mContext = context; + mRecentsModel = recentsModel; + mSystemUiProxy = systemUiProxy; + mOverviewComponentObserver = overviewComponentObserver; + mDesktopVisibilityController = desktopVisibilityController; + } + + @Override + public Bundle call(String method, String arg, @Nullable Bundle extras) { + final Bundle response = new Bundle(); + switch (method) { + case TestProtocol.REQUEST_RECENT_TASKS_LIST: { + ArrayList taskBaseIntentComponents = new ArrayList<>(); + CountDownLatch latch = new CountDownLatch(1); + mRecentsModel.getTasks((taskGroups) -> { + for (GroupTask group : taskGroups) { + for (Task t : group.getTasks()) { + taskBaseIntentComponents.add( + t.key.baseIntent.getComponent().flattenToString()); + } + } + latch.countDown(); + }); + try { + latch.await(2, TimeUnit.SECONDS); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + response.putStringArrayList(TestProtocol.TEST_INFO_RESPONSE_FIELD, + taskBaseIntentComponents); + return response; + } + + case TestProtocol.REQUEST_HOME_TO_OVERVIEW_SWIPE_HEIGHT: { + final float swipeHeight = + LayoutUtils.getDefaultSwipeHeight(mContext, mDeviceProfile); + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, (int) swipeHeight); + return response; + } + + case TestProtocol.REQUEST_BACKGROUND_TO_OVERVIEW_SWIPE_HEIGHT: { + final float swipeHeight = mDeviceProfile.getDeviceProperties().getHeightPx() / 2f; + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, (int) swipeHeight); + return response; + } + + case TestProtocol.REQUEST_GET_OVERVIEW_TASK_SIZE: { + return getUIProperty(Bundle::putParcelable, + recentsViewContainer -> + recentsViewContainer.>getOverviewPanel() + .getLastComputedTaskSize(), + this::getRecentsViewContainer); + } + + case TestProtocol.REQUEST_GET_OVERVIEW_GRID_TASK_SIZE: { + return getUIProperty(Bundle::putParcelable, + recentsViewContainer -> + recentsViewContainer.>getOverviewPanel() + .getLastComputedGridTaskSize(), + this::getRecentsViewContainer); + } + + case TestProtocol.REQUEST_GET_OVERVIEW_PAGE_SPACING: { + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + mDeviceProfile.getOverviewProfile().getPageSpacing()); + return response; + } + + case TestProtocol.REQUEST_GET_BUBBLE_BAR_DROP_TARGET_SIZE: { + int dimenResId = DeviceConfig.isSmallTablet(mContext) + ? com.android.wm.shell.shared.R.dimen.drag_zone_bubble_fold : com.android.wm.shell.shared.R.dimen.drag_zone_bubble_tablet; + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + mContext.getResources().getDimensionPixelSize(dimenResId)); + return response; + } + + case TestProtocol.REQUEST_GET_OVERVIEW_CURRENT_PAGE_INDEX: { + return getLauncherUIProperty(Bundle::putInt, + launcher -> launcher.getOverviewPanel().getCurrentPage()); + } + + case TestProtocol.REQUEST_GET_OVERVIEW_FIRST_TASKVIEW_INDEX: { + return getLauncherUIProperty(Bundle::putInt, + launcher -> + launcher.>getOverviewPanel() + .getFirstTaskViewIndex()); + } + + case TestProtocol.REQUEST_HAS_TIS: { + response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, true); + return response; + } + + case TestProtocol.REQUEST_UNSTASH_TASKBAR_IF_STASHED: + runOnTISBinder(tisBinder -> { + // Allow null-pointer to catch illegal states. + tisBinder.getTaskbarManager().getCurrentActivityContext() + .unstashTaskbarIfStashed(); + }); + return response; + + case TestProtocol.REQUEST_COLLAPSE_BUBBLE_BAR: + runOnTISBinder(tisBinder -> { + // Allow null-pointer to catch illegal states. + tisBinder.getTaskbarManager().getCurrentActivityContext().removeAllBubbles(); + }); + return response; + + case TestProtocol.REQUEST_TASKBAR_FROM_NAV_THRESHOLD: { + final Resources resources = mContext.getResources(); + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + getFromNavThreshold(resources, mDeviceProfile)); + return response; + } + + case TestProtocol.REQUEST_STASHED_TASKBAR_SCALE: { + runOnTISBinder(tisBinder -> { + response.putFloat(TestProtocol.TEST_INFO_RESPONSE_FIELD, + tisBinder.getTaskbarManager() + .getCurrentActivityContext() + .getStashedTaskbarScale()); + }); + return response; + } + + case TestProtocol.REQUEST_TASKBAR_ALL_APPS_TOP_PADDING: { + return getTISBinderUIProperty(Bundle::putInt, tisBinder -> + tisBinder.getTaskbarManager() + .getCurrentActivityContext() + .getTaskbarAllAppsTopPadding()); + } + + case TestProtocol.REQUEST_TASKBAR_APPS_LIST_SCROLL_Y: { + return getTISBinderUIProperty(Bundle::putInt, tisBinder -> + tisBinder.getTaskbarManager() + .getCurrentActivityContext() + .getTaskbarAllAppsScroll()); + } + + case TestProtocol.REQUEST_LIMIT_MAX_TASKBAR_ICON_NUMBER: { + runOnTISBinder(tisBinder -> + tisBinder.getTaskbarManager() + .getCurrentActivityContext() + .limitMaxTaskbarIconsNum(Integer.parseInt(arg))); + return response; + } + + case TestProtocol.REQUEST_ENABLE_BLOCK_TIMEOUT: + runOnTISBinder(tisBinder -> { + enableBlockingTimeout(tisBinder, true); + }); + return response; + + case TestProtocol.REQUEST_DISABLE_BLOCK_TIMEOUT: + runOnTISBinder(tisBinder -> { + enableBlockingTimeout(tisBinder, false); + }); + return response; + + case TestProtocol.REQUEST_ENABLE_TRANSIENT_TASKBAR: + enableTransientTaskbar(true); + return response; + + case TestProtocol.REQUEST_DISABLE_TRANSIENT_TASKBAR: + enableTransientTaskbar(false); + return response; + + case TestProtocol.REQUEST_SHELL_DRAG_READY: + response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, + mSystemUiProxy.isDragAndDropReady()); + return response; + + case TestProtocol.REQUEST_REFRESH_OVERVIEW_TARGET: + runOnTISBinder(TouchInteractionService.TISBinder::refreshOverviewTargetForTest); + return response; + + case TestProtocol.REQUEST_RECREATE_TASKBAR: + // Allow null-pointer to catch illegal states. + runOnTISBinder(tisBinder -> tisBinder.getTaskbarManager().recreateTaskbars()); + return response; + case TestProtocol.REQUEST_TASKBAR_IME_DOCKED: + return getTISBinderUIProperty(Bundle::putBoolean, tisBinder -> + tisBinder.getTaskbarManager() + .getCurrentActivityContext().isImeDocked()); + case TestProtocol.REQUEST_UNSTASH_BUBBLE_BAR_IF_STASHED: + runOnTISBinder(tisBinder -> { + // Allow null-pointer to catch illegal states. + tisBinder.getTaskbarManager().getCurrentActivityContext() + .unstashBubbleBarIfStashed(); + }); + return response; + case TestProtocol.REQUEST_REMOVE_ALL_BUBBLES: + runOnTISBinder(tisBinder -> { + // Allow null-pointer to catch illegal states. + Context context = tisBinder.getTaskbarManager().getCurrentActivityContext(); + SystemUiProxy.INSTANCE.get(context).removeAllBubbles(); + }); + return response; + case TestProtocol.REQUEST_INJECT_FAKE_TRACKPAD: + runOnTISBinder(tisBinder -> tisBinder.injectFakeTrackpadForTesting()); + return response; + case TestProtocol.REQUEST_EJECT_FAKE_TRACKPAD: + runOnTISBinder(tisBinder -> tisBinder.ejectFakeTrackpadForTesting()); + return response; + + case TestProtocol.REQUEST_DISMISS_MAGNETIC_DETACH_THRESHOLD: { + final Resources resources = mContext.getResources(); + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + resources.getDimensionPixelSize(R.dimen.task_dismiss_detach_threshold)); + return response; + } + + case TestProtocol.REQUEST_TASKBAR_ACTION_CORNER_PADDING: { + final Resources resources = mContext.getResources(); + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + resources.getDimensionPixelSize( + R.dimen.transient_taskbar_action_corner_padding)); + return response; + } + case TestProtocol.REQUEST_TASKBAR_UNSTASHED_INPUT_AREA: { + final Resources resources = mContext.getResources(); + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + resources.getDimensionPixelSize( + R.dimen.taskbar_unstash_input_area)); + return response; + } + case TestProtocol.REQUEST_IS_TRANSIENT_TASKBAR: + return getTISBinderUIProperty(Bundle::putBoolean, tisBinder -> + tisBinder.getTaskbarManager() + .getCurrentActivityContext() + .getTaskbarFeatureEvaluator().isTransient()); + case TestProtocol.REQUEST_FLAG_ENABLE_MULTIPLE_DESKTOPS: { + response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, + DesktopState.fromContext(mContext) + .isMultipleDesktopFrontendEnabledOnDisplay( + Integer.parseInt(arg))); + return response; + } + case TestProtocol.REQUEST_GET_ACTIVE_DESK_ID: { + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + mDesktopVisibilityController.getActiveDeskId(Integer.parseInt(arg))); + return response; + } + case TestProtocol.REQUEST_GET_DESK_ID: { + final Rect taskBounds = extras.getParcelable(TestProtocol.TEST_INFO_RESPONSE_FIELD); + return getUIProperty(Bundle::putInt, + recentsViewContainer -> { + RecentsView recentsView = recentsViewContainer.getOverviewPanel(); + for (TaskView taskView : recentsView.getTaskViews()) { + Rect bounds = new Rect(); + taskView.getGlobalVisibleRect(bounds); + if (bounds.equals(taskBounds) + && taskView instanceof DesktopTaskView) { + return ((DesktopTaskView) taskView).getDeskId(); + } + } + return -1; + }, + this::getRecentsViewContainer); + } + } + + return super.call(method, arg, extras); + } + + @Override + protected WindowInsets getWindowInsets() { + RecentsViewContainer container = getRecentsViewContainer(); + WindowInsets insets = container == null || container.getRootView() == null + ? null : container.getRootView().getRootWindowInsets(); + return insets == null ? super.getWindowInsets() : insets; + } + + @Nullable + private RecentsViewContainer getRecentsViewContainer() { + // TODO (b/400647896): support per-display container in e2e tests + BaseContainerInterface containerInterface = + mOverviewComponentObserver.getContainerInterface(DEFAULT_DISPLAY); + if (containerInterface != null) { + return containerInterface.getCreatedContainer(); + } else { + return null; + } + } + + @Override + protected boolean isLauncherInitialized() { + return super.isLauncherInitialized() && mSystemUiProxy.isActive(); + } + + private void enableBlockingTimeout( + TouchInteractionService.TISBinder tisBinder, boolean enable) { + TaskbarActivityContext context = tisBinder.getTaskbarManager().getCurrentActivityContext(); + if (context == null) { + return; + } + context.enableBlockingTimeoutDuringTests(enable); + } + + private void enableTransientTaskbar(boolean enable) { + LauncherPrefs.get(mContext).put(LauncherPrefs.TASKBAR_PINNING, !enable); + } + + /** + * Runs the given command on the UI thread, after ensuring we are connected to + * TouchInteractionService. + */ + protected void runOnTISBinder(Consumer connectionCallback) { + try { + CountDownLatch countDownLatch = new CountDownLatch(1); + TISBindHelper helper = MAIN_EXECUTOR.submit(() -> + new TISBindHelper(mContext, tisBinder -> { + connectionCallback.accept(tisBinder); + countDownLatch.countDown(); + })).get(); + countDownLatch.await(); + MAIN_EXECUTOR.execute(helper::onDestroy); + } catch (ExecutionException | InterruptedException e) { + throw new RuntimeException(e); + } + } + + private Bundle getTISBinderUIProperty( + BundleSetter bundleSetter, Function provider) { + Bundle response = new Bundle(); + + runOnTISBinder(tisBinder -> bundleSetter.set( + response, + TestProtocol.TEST_INFO_RESPONSE_FIELD, + provider.apply(tisBinder))); + + return response; + } +} diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java index ac067f157db..90b65837504 100644 --- a/quickstep/src/com/android/quickstep/RecentTasksList.java +++ b/quickstep/src/com/android/quickstep/RecentTasksList.java @@ -18,38 +18,56 @@ import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; +import static com.android.launcher3.Flags.enableLaterIsLockedCheck; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; -import static com.android.quickstep.util.SplitScreenUtils.convertShellSplitBoundsToLauncher; -import static com.android.window.flags2.Flags.enableDesktopWindowingMode; -import static com.android.wm.shell.util.GroupedRecentTaskInfo.TYPE_FREEFORM; +import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_DESK; +import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_SPLIT; -import android.app.ActivityManager; +import android.app.ActivityManager.RunningTaskInfo; import android.app.KeyguardManager; import android.app.TaskInfo; +import android.companion.virtual.VirtualDeviceManager; import android.content.ComponentName; +import android.content.Context; import android.content.pm.ParceledListSlice; import android.os.Process; import android.os.RemoteException; +import android.util.Log; import android.util.SparseBooleanArray; +import android.view.Display; +import android.window.DesktopExperienceFlags; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import com.android.launcher3.statehandlers.DesktopVisibilityController; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.Utilities; import com.android.launcher3.util.LooperExecutor; -import com.android.launcher3.util.SplitConfigurationOptions; import com.android.quickstep.util.DesktopTask; +import com.android.quickstep.util.ExternalDisplaysKt; import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.SingleTask; +import com.android.quickstep.util.SplitTask; import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.system.TaskStackChangeListener; -import com.android.systemui.shared.system.TaskStackChangeListeners; +import com.android.wm.shell.Flags; import com.android.wm.shell.recents.IRecentTasksListener; -import com.android.wm.shell.util.GroupedRecentTaskInfo; +import com.android.wm.shell.shared.GroupedTaskInfo; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; + +import kotlin.collections.ArraysKt; +import kotlin.collections.CollectionsKt; +import kotlin.collections.MapsKt; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -64,105 +82,111 @@ public class RecentTasksList { private static final TaskLoadResult INVALID_RESULT = new TaskLoadResult(-1, false, 0); + private final Context mContext; private final KeyguardManager mKeyguardManager; + private final VirtualDeviceManager mVirtualDeviceManager; private final LooperExecutor mMainThreadExecutor; private final SystemUiProxy mSysUiProxy; // The list change id, increments as the task list changes in the system private int mChangeId; - // Whether we are currently updating the tasks in the background (up to when the - // result is + // Whether we are currently updating the tasks in the background (up to when the result is // posted back on the main thread) private boolean mLoadingTasksInBackground; private TaskLoadResult mResultsBg = INVALID_RESULT; private TaskLoadResult mResultsUi = INVALID_RESULT; - private RecentsModel.RunningTasksListener mRunningTasksListener; - // Tasks are stored in order of least recently launched to most recently - // launched. - private ArrayList mRunningTasks; - - public RecentTasksList(LooperExecutor mainThreadExecutor, KeyguardManager keyguardManager, - SystemUiProxy sysUiProxy, TopTaskTracker topTaskTracker) { + private @Nullable RecentsModel.RunningTasksListener mRunningTasksListener; + private @Nullable RecentsModel.RecentTasksChangedListener mRecentTasksChangedListener; + // Tasks are stored in order of least recently launched to most recently launched. + private ArrayList mRunningTasks; + + // Track displays that belong to virtual devices. Tasks on such displays are treated as if + // they are running on the default display. + // TODO(b/443015666): Move this logic upstream to WM Shell or WM Core. + private final SparseBooleanArray mVirtualDeviceDisplays = new SparseBooleanArray() { + @Override + public boolean get(int displayId) { + if (indexOfKey(displayId) < 0) { + final boolean isVirtualDeviceDisplay = + mVirtualDeviceManager != null + && mVirtualDeviceManager.getDeviceIdForDisplayId(displayId) + != Context.DEVICE_ID_DEFAULT; + put(displayId, isVirtualDeviceDisplay); + } + return super.get(displayId); + } + }; + + public RecentTasksList(Context context, LooperExecutor mainThreadExecutor, + KeyguardManager keyguardManager, VirtualDeviceManager virtualDeviceManager, + SystemUiProxy sysUiProxy, + TopTaskTracker topTaskTracker, + DaggerSingletonTracker tracker) { + mContext = context; mMainThreadExecutor = mainThreadExecutor; mKeyguardManager = keyguardManager; + mVirtualDeviceManager = virtualDeviceManager; mChangeId = 1; mSysUiProxy = sysUiProxy; - if (LawnchairApp.isRecentsEnabled()) { - if (LawnchairQuickstepCompat.ATLEAST_U) { - sysUiProxy.registerRecentTasksListener(new IRecentTasksListener.Stub() { - @Override - public void onRecentTasksChanged() throws RemoteException { - mMainThreadExecutor.execute(RecentTasksList.this::onRecentTasksChanged); - } - - @Override - public void onRunningTaskAppeared(ActivityManager.RunningTaskInfo taskInfo) { - mMainThreadExecutor.execute(() -> { - RecentTasksList.this.onRunningTaskAppeared(taskInfo); - }); - } - - @Override - public void onRunningTaskVanished(ActivityManager.RunningTaskInfo taskInfo) { - mMainThreadExecutor.execute(() -> { - RecentTasksList.this.onRunningTaskVanished(taskInfo); - }); - } + final IRecentTasksListener recentTasksListener = new IRecentTasksListener.Stub() { + @Override + public void onRecentTasksChanged() throws RemoteException { + mMainThreadExecutor.execute(RecentTasksList.this::onRecentTasksChanged); + } - @Override - public void onRunningTaskChanged(ActivityManager.RunningTaskInfo taskInfo){ - mMainThreadExecutor.execute(() -> { - RecentTasksList.this.onRunningTaskChanged(taskInfo); - }); - } + @Override + public void onRunningTaskAppeared(RunningTaskInfo taskInfo) { + mMainThreadExecutor.execute(() -> { + RecentTasksList.this.onRunningTaskAppeared(taskInfo); + }); + } - @Override - public void onTaskMovedToFront(ActivityManager.RunningTaskInfo taskInfo){ - mMainThreadExecutor.execute(() -> { - RecentTasksList.this.onRunningTaskAppeared(taskInfo); - }); - } - }); - } else if (LawnchairQuickstepCompat.ATLEAST_Q) { - TaskStackChangeListeners.getInstance().registerTaskStackListener(new TaskStackChangeListener() { - @Override - public void onTaskStackChanged() { - onRecentTasksChanged(); - } + @Override + public void onRunningTaskVanished(RunningTaskInfo taskInfo) { + mMainThreadExecutor.execute(() -> { + RecentTasksList.this.onRunningTaskVanished(taskInfo); + }); + } - @Override - public void onRecentTaskListUpdated() { - onRecentTasksChanged(); - } + @Override + public void onRunningTaskChanged(RunningTaskInfo taskInfo) { + mMainThreadExecutor.execute(() -> { + RecentTasksList.this.onRunningTaskChanged(taskInfo); + }); + } - @Override - public void onTaskRemoved(int taskId) { - onRecentTasksChanged(); - } + @Override + public void onTaskMovedToFront(GroupedTaskInfo taskToFront) { + mMainThreadExecutor.execute(() -> { + topTaskTracker.handleTaskMovedToFront( + taskToFront.getBaseGroupedTask().getTaskInfo1()); + }); + } - @Override - public void onActivityPinned(String packageName, int userId, int taskId, int stackId) { - onRecentTasksChanged(); - } + @Override + public void onTaskInfoChanged(RunningTaskInfo taskInfo) { + mMainThreadExecutor.execute(() -> topTaskTracker.onTaskChanged(taskInfo)); + } - @Override - public void onActivityUnpinned() { - onRecentTasksChanged(); - } - }); - } + @Override + public void onVisibleTasksChanged(GroupedTaskInfo[] visibleTasks) { + mMainThreadExecutor.execute(() -> { + topTaskTracker.onVisibleTasksChanged(visibleTasks); + }); + } + }; + mSysUiProxy.registerRecentTasksListener(recentTasksListener); + tracker.addCloseable( + () -> mSysUiProxy.unregisterRecentTasksListener(recentTasksListener)); } - // We may receive onRunningTaskAppeared events later for tasks which have - // already been - // included in the list returned by mSysUiProxy.getRunningTasks(), or may - // receive - // onRunningTaskVanished for tasks not included in the returned list. These - // cases will be + // We may receive onRunningTaskAppeared events later for tasks which have already been + // included in the list returned by mSysUiProxy.getRunningTasks(), or may receive + // onRunningTaskVanished for tasks not included in the returned list. These cases will be // addressed when the tasks are added to/removed from mRunningTasks. initRunningTasks(mSysUiProxy.getRunningTasks(Integer.MAX_VALUE)); } @@ -185,18 +209,36 @@ public void getTaskKeys(int numTasks, Consumer> callback) { } /** - * Asynchronously fetches the list of recent tasks, reusing cached list if - * available. + * Asynchronously fetches the list of recent tasks, reusing cached list if available. + * + * @param loadKeysOnly Whether to load other associated task data, or just the key + * @param callback The callback to receive the list of recent tasks + * @return The change id of the current task list + */ + public synchronized int getTasks( + boolean loadKeysOnly, + @Nullable Consumer> callback, + Predicate filter) { + return getTasks( + loadKeysOnly, + callback == null ? null : (tasks, requestId) -> callback.accept(tasks), + filter); + } + + /** + * Asynchronously fetches the list of recent tasks, reusing cached list if available. * - * @param loadKeysOnly Whether to load other associated task data, or just the - * key + * @param loadKeysOnly Whether to load other associated task data, or just the key * @param callback The callback to receive the list of recent tasks * @return The change id of the current task list */ - public synchronized int getTasks(boolean loadKeysOnly, - @Nullable Consumer> callback, Predicate filter) { + public synchronized int getTasks( + boolean loadKeysOnly, + @Nullable BiConsumer, Integer> callback, + Predicate filter) { final int requestLoadId = mChangeId; if (mResultsUi.isValidForRequest(requestLoadId, loadKeysOnly)) { + Log.d("b/417220811", "getTasks - mResultsUi still valid: " + mResultsUi.mRequestId); // The list is up to date, send the callback on the next frame, // so that requestID can be returned first. if (callback != null) { @@ -207,7 +249,7 @@ public synchronized int getTasks(boolean loadKeysOnly, .collect(Collectors.toCollection(ArrayList::new)); mMainThreadExecutor.post(() -> { - callback.accept(result); + callback.accept(result, requestLoadId); }); } @@ -219,18 +261,20 @@ public synchronized int getTasks(boolean loadKeysOnly, UI_HELPER_EXECUTOR.execute(() -> { if (!mResultsBg.isValidForRequest(requestLoadId, loadKeysOnly)) { mResultsBg = loadTasksInBackground(Integer.MAX_VALUE, requestLoadId, loadKeysOnly); + Log.d("b/417220811", "getTasks - loadTasksInBackground: " + mResultsBg.mRequestId); } TaskLoadResult loadResult = mResultsBg; mMainThreadExecutor.execute(() -> { mLoadingTasksInBackground = false; mResultsUi = loadResult; + Log.d("b/417220811", "getTasks - updating mResultsUi: " + mResultsUi.mRequestId); if (callback != null) { // filter the tasks if needed before passing them into the callback ArrayList result = mResultsUi.stream().filter(filter) .map(GroupTask::copy) .collect(Collectors.toCollection(ArrayList::new)); - callback.accept(result); + callback.accept(result, requestLoadId); } }); }); @@ -239,8 +283,7 @@ public synchronized int getTasks(boolean loadKeysOnly, } /** - * @return Whether the provided {@param changeId} is the latest recent tasks - * list id. + * @return Whether the provided {@param changeId} is the latest recent tasks list id. */ public synchronized boolean isTaskListValid(int changeId) { return mChangeId == changeId; @@ -248,9 +291,14 @@ public synchronized boolean isTaskListValid(int changeId) { public void onRecentTasksChanged() { invalidateLoadedTasks(); + if (mRecentTasksChangedListener != null) { + mRecentTasksChangedListener.onRecentTasksChanged(); + } } private synchronized void invalidateLoadedTasks() { + Log.d("b/417220811", + "invalidateLoadedTasks - previous requestLoadId: " + mResultsBg.mRequestId); UI_HELPER_EXECUTOR.execute(() -> mResultsBg = INVALID_RESULT); mResultsUi = INVALID_RESULT; mChangeId++; @@ -270,9 +318,23 @@ public void unregisterRunningTasksListener() { mRunningTasksListener = null; } - private void initRunningTasks(ArrayList runningTasks) { - // Tasks are retrieved in order of most recently launched/used to least recently - // launched. + /** + * Registers a listener for running tasks + */ + public void registerRecentTasksChangedListener( + RecentsModel.RecentTasksChangedListener listener) { + mRecentTasksChangedListener = listener; + } + + /** + * Removes the previously registered running tasks listener + */ + public void unregisterRecentTasksChangedListener() { + mRecentTasksChangedListener = null; + } + + private void initRunningTasks(List runningTasks) { + // Tasks are retrieved in order of most recently launched/used to least recently launched. mRunningTasks = new ArrayList<>(runningTasks); Collections.reverse(mRunningTasks); } @@ -280,13 +342,13 @@ private void initRunningTasks(ArrayList running /** * Gets the set of running tasks. */ - public ArrayList getRunningTasks() { + public ArrayList getRunningTasks() { return mRunningTasks; } - private void onRunningTaskAppeared(ActivityManager.RunningTaskInfo taskInfo) { + private void onRunningTaskAppeared(RunningTaskInfo taskInfo) { // Make sure this task is not already in the list - for (ActivityManager.RunningTaskInfo existingTask : mRunningTasks) { + for (RunningTaskInfo existingTask : mRunningTasks) { if (taskInfo.taskId == existingTask.taskId) { return; } @@ -297,11 +359,10 @@ private void onRunningTaskAppeared(ActivityManager.RunningTaskInfo taskInfo) { } } - private void onRunningTaskVanished(ActivityManager.RunningTaskInfo taskInfo) { + private void onRunningTaskVanished(RunningTaskInfo taskInfo) { // Find the task from the list of running tasks, if it exists - for (ActivityManager.RunningTaskInfo existingTask : mRunningTasks) { - if (existingTask.taskId != taskInfo.taskId) - continue; + for (RunningTaskInfo existingTask : mRunningTasks) { + if (existingTask.taskId != taskInfo.taskId) continue; mRunningTasks.remove(existingTask); if (mRunningTasksListener != null) { @@ -311,11 +372,10 @@ private void onRunningTaskVanished(ActivityManager.RunningTaskInfo taskInfo) { } } - private void onRunningTaskChanged(ActivityManager.RunningTaskInfo taskInfo) { + private void onRunningTaskChanged(RunningTaskInfo taskInfo) { // Find the task from the list of running tasks, if it exists - for (ActivityManager.RunningTaskInfo existingTask : mRunningTasks) { - if (existingTask.taskId != taskInfo.taskId) - continue; + for (RunningTaskInfo existingTask : mRunningTasks) { + if (existingTask.taskId != taskInfo.taskId) continue; mRunningTasks.remove(existingTask); mRunningTasks.add(taskInfo); @@ -332,74 +392,157 @@ private void onRunningTaskChanged(ActivityManager.RunningTaskInfo taskInfo) { @VisibleForTesting TaskLoadResult loadTasksInBackground(int numTasks, int requestId, boolean loadKeysOnly) { int currentUserId = Process.myUserHandle().getIdentifier(); - List recentTasks; - + ArrayList rawTasks; try { - ParceledListSlice parceledList = - ActivityManager.getService().getRecentTasks( - numTasks, ActivityManager.RECENT_IGNORE_UNAVAILABLE, currentUserId - ); - recentTasks = (parceledList != null) ? parceledList.getList() : new ArrayList<>(); - } catch (RemoteException e) { - return new TaskLoadResult(requestId, loadKeysOnly, 0); + rawTasks = mSysUiProxy.getRecentTasks(numTasks, currentUserId); + } catch (SystemUiProxy.GetRecentTasksException e) { + return INVALID_RESULT; } + // The raw tasks are given in most-recent to least-recent order, we need to reverse it + Collections.reverse(rawTasks); - Collections.reverse(recentTasks); SparseBooleanArray tmpLockedUsers = new SparseBooleanArray() { @Override public boolean get(int key) { - if (indexOfKey(key) < 0) { + if (!enableLaterIsLockedCheck() && indexOfKey(key) < 0) { // Fill the cached locked state as we fetch put(key, mKeyguardManager.isDeviceLocked(key)); + Log.d("b/417220811", + "loadTasksInBackground - isDeviceLocked(" + key + "): " + get(key)); } return super.get(key); } }; - TaskLoadResult allTasks = new TaskLoadResult(requestId, loadKeysOnly, recentTasks.size()); - int numVisibleTasks = 0; - - for (ActivityManager.RecentTaskInfo taskInfo : recentTasks) { - Task.TaskKey taskKey = new Task.TaskKey(taskInfo); - Task task = loadKeysOnly - ? new Task(taskKey) - : Task.from(taskKey, taskInfo, tmpLockedUsers.get(taskKey.userId)); - task.setLastSnapshotData(taskInfo); + TaskLoadResult allTasks = new TaskLoadResult(requestId, loadKeysOnly, rawTasks.size()); + + boolean isFirstVisibleTaskFound = false; + for (GroupedTaskInfo rawTask : rawTasks) { + if (rawTask.isBaseType(TYPE_DESK)) { + // TYPE_DESK tasks is only created when desktop mode can be entered, + // leftover TYPE_DESK tasks created when flag was on should be ignored. + if (DesktopModeStatus.canEnterDesktopMode(mContext)) { + List desktopTasks = createDesktopTasks( + rawTask.getBaseGroupedTask()); + allTasks.addAll(desktopTasks); + + // If any task in desktop group task is visible, set isFirstVisibleTaskFound to + // true. This way if there is a transparent task in the list later on, it does + // not get its own tile in Overview. + if (rawTask.getBaseGroupedTask().getTaskInfoList().stream().anyMatch( + taskInfo -> taskInfo.isVisible)) { + isFirstVisibleTaskFound = true; + } + } + continue; + } - if (Utilities.ATLEAST_S) { - if (taskInfo.isVisible) { - numVisibleTasks++; + // [getTaskInfo1] will not be null for types below beside [TYPE_DESK]. + if (Flags.enableShellTopTaskTracking()) { + final TaskInfo taskInfo1 = rawTask.getBaseGroupedTask().getTaskInfo1(); + final Task.TaskKey task1Key = createTaskKey(taskInfo1); + final Task task1 = Task.from(task1Key, taskInfo1, + tmpLockedUsers.get(task1Key.userId) /* isLocked */); + + if (rawTask.isBaseType(TYPE_SPLIT)) { + final TaskInfo taskInfo2 = rawTask.getBaseGroupedTask().getTaskInfo2(); + final Task.TaskKey task2Key = createTaskKey(taskInfo2); + final Task task2 = Task.from(task2Key, taskInfo2, + tmpLockedUsers.get(task2Key.userId) /* isLocked */); + allTasks.add(new SplitTask(task1, task2, + rawTask.getBaseGroupedTask().getSplitBounds())); + } else { + allTasks.add(new SingleTask(task1)); + } + } else { + TaskInfo taskInfo1 = rawTask.getTaskInfo1(); + TaskInfo taskInfo2 = rawTask.getTaskInfo2(); + Task.TaskKey task1Key = createTaskKey(taskInfo1); + Task task1 = loadKeysOnly + ? new Task(task1Key) + : Task.from(task1Key, taskInfo1, + tmpLockedUsers.get(task1Key.userId) /* isLocked */); + Task task2 = null; + if (taskInfo2 != null) { + // Is split task + Task.TaskKey task2Key = createTaskKey(taskInfo2); + task2 = loadKeysOnly + ? new Task(task2Key) + : Task.from(task2Key, taskInfo2, + tmpLockedUsers.get(task2Key.userId) /* isLocked */); + } else { + // Is fullscreen task + if (isFirstVisibleTaskFound) { + boolean isExcluded = (taskInfo1.baseIntent.getFlags() + & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0; + if (taskInfo1.isTopActivityTransparent && isExcluded) { + // If there are already visible tasks, then ignore the excluded tasks + // and don't add them to the returned list + continue; + } + } + } + if (taskInfo1.isVisible) { + isFirstVisibleTaskFound = true; } - if (numVisibleTasks > 0 && (taskInfo.baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0) { - continue; + if (task2 != null) { + Objects.requireNonNull(rawTask.getSplitBounds()); + allTasks.add(new SplitTask(task1, task2, rawTask.getSplitBounds())); + } else { + allTasks.add(new SingleTask(task1)); } } - - allTasks.add(new GroupTask(task, null, null)); } return allTasks; } - private DesktopTask createDesktopTask(GroupedRecentTaskInfo recentTaskInfo) { - ArrayList tasks = new ArrayList<>(recentTaskInfo.getTaskInfoList().size()); - for (ActivityManager.RecentTaskInfo taskInfo : recentTaskInfo.getTaskInfoList()) { - Task.TaskKey key = new Task.TaskKey(taskInfo); - Task task = Task.from(key, taskInfo, false); - task.setLastSnapshotData(taskInfo); - task.positionInParent = taskInfo.positionInParent; - task.appBounds = taskInfo.configuration.windowConfiguration.getAppBounds(); - tasks.add(task); - } - return new DesktopTask(tasks); + private Task createTask(TaskInfo taskInfo, Set minimizedTaskIds) { + Task.TaskKey key = createTaskKey(taskInfo); + Task task = Task.from(key, taskInfo, false); + task.positionInParent = taskInfo.positionInParent; + task.appBounds = taskInfo.configuration.windowConfiguration.getAppBounds(); + task.isVisible = taskInfo.isVisible; + task.isMinimized = minimizedTaskIds.contains(taskInfo.taskId); + return task; + } + + private Task.TaskKey createTaskKey(TaskInfo taskInfo) { + final int displayId = mVirtualDeviceDisplays.get(taskInfo.displayId) + ? Display.DEFAULT_DISPLAY + : taskInfo.displayId; + return new Task.TaskKey(taskInfo, displayId); } - private ArrayList copyOf(ArrayList tasks) { - ArrayList newTasks = new ArrayList<>(); - for (int i = 0; i < tasks.size(); i++) { - newTasks.add(tasks.get(i).copy()); + private List createDesktopTasks(GroupedTaskInfo recentTaskInfo) { + int[] minimizedTaskIdArray = recentTaskInfo.getMinimizedTaskIds(); + Set minimizedTaskIds = minimizedTaskIdArray != null + ? CollectionsKt.toSet(ArraysKt.asIterable(minimizedTaskIdArray)) + : Collections.emptySet(); + if (!DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue()) { + // This code is not needed when the multiple desktop feature is enabled, since Shell + // will send a single `GroupedTaskInfo` for each desk with a unique `deskId` across + // all displays. + Map> perDisplayTasks = new HashMap<>(); + for (TaskInfo taskInfo : recentTaskInfo.getTaskInfoList()) { + Task task = createTask(taskInfo, minimizedTaskIds); + List tasks = perDisplayTasks.computeIfAbsent( + ExternalDisplaysKt.getSafeDisplayId(task), + k -> new ArrayList<>()); + tasks.add(task); + } + // When the multiple desktop feature is disabled, there can only be up to a single desk + // on each display, The desk ID doesn't matter and should not be used. + return MapsKt.map(perDisplayTasks, + it -> new DesktopTask(DesktopVisibilityController.INACTIVE_DESK_ID, it.getKey(), + it.getValue())); + } else { + final int deskId = recentTaskInfo.getDeskId(); + final int displayId = recentTaskInfo.getDeskDisplayId(); + List tasks = CollectionsKt.map(recentTaskInfo.getTaskInfoList(), + it -> createTask(it, minimizedTaskIds)); + return List.of(new DesktopTask(deskId, displayId, tasks)); } - return newTasks; } public void dump(String prefix, PrintWriter writer) { @@ -407,28 +550,24 @@ public void dump(String prefix, PrintWriter writer) { writer.println(prefix + " mChangeId=" + mChangeId); writer.println(prefix + " mResultsUi=[id=" + mResultsUi.mRequestId + ", tasks="); for (GroupTask task : mResultsUi) { - Task task1 = task.task1; - Task task2 = task.task2; - ComponentName cn1 = task1.getTopComponent(); - ComponentName cn2 = task2 != null ? task2.getTopComponent() : null; - writer.println(prefix + " t1: (id=" + task1.key.id - + "; package=" + (cn1 != null ? cn1.getPackageName() + ")" : "no package)") - + " t2: (id=" + (task2 != null ? task2.key.id : "-1") - + "; package=" + (cn2 != null ? cn2.getPackageName() + ")" : "no package)")); + int count = 0; + for (Task t : task.getTasks()) { + ComponentName cn = t.getTopComponent(); + writer.println(prefix + " t" + (++count) + ": (id=" + t.key.id + + "; package=" + (cn != null ? cn.getPackageName() + ")" : "no package)")); + } } writer.println(prefix + " ]"); int currentUserId = Process.myUserHandle().getIdentifier(); - ArrayList rawTasks = mSysUiProxy.getRecentTasks(Integer.MAX_VALUE, currentUserId); + ArrayList rawTasks; + try { + rawTasks = mSysUiProxy.getRecentTasks(Integer.MAX_VALUE, currentUserId); + } catch (SystemUiProxy.GetRecentTasksException e) { + rawTasks = new ArrayList<>(); + } writer.println(prefix + " rawTasks=["); - for (GroupedRecentTaskInfo task : rawTasks) { - TaskInfo taskInfo1 = task.getTaskInfo1(); - TaskInfo taskInfo2 = task.getTaskInfo2(); - ComponentName cn1 = taskInfo1.topActivity; - ComponentName cn2 = taskInfo2 != null ? taskInfo2.topActivity : null; - writer.println(prefix + " t1: (id=" + taskInfo1.taskId - + "; package=" + (cn1 != null ? cn1.getPackageName() + ")" : "no package)") - + " t2: (id=" + (taskInfo2 != null ? taskInfo2.taskId : "-1") - + "; package=" + (cn2 != null ? cn2.getPackageName() + ")" : "no package)")); + for (GroupedTaskInfo task : rawTasks) { + writer.println(prefix + task); } writer.println(prefix + " ]"); } @@ -438,7 +577,7 @@ static class TaskLoadResult extends ArrayList { final int mRequestId; - // If the result was loaded with keysOnly = true + // If the result was loaded with keysOnly = true final boolean mKeysOnly; TaskLoadResult(int requestId, boolean keysOnly, int size) { diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java index 1be610f5831..cd13fe998dd 100644 --- a/quickstep/src/com/android/quickstep/RecentsActivity.java +++ b/quickstep/src/com/android/quickstep/RecentsActivity.java @@ -15,33 +15,38 @@ */ package com.android.quickstep; +import static android.app.ActivityTaskManager.INVALID_TASK_ID; + import static android.view.RemoteAnimationTarget.MODE_CLOSING; import static android.view.RemoteAnimationTarget.MODE_OPENING; +import static com.android.launcher3.LauncherConstants.SavedInstanceKeys.RUNTIME_STATE; +import static com.android.launcher3.LauncherConstants.SavedInstanceKeys.RUNTIME_STATE_RECREATE_TO_UPDATE_THEME; import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION; import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_DURATION; import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_PRE_DELAY; import static com.android.launcher3.testing.shared.TestProtocol.LAUNCHER_ACTIVITY_STOPPED_MESSAGE; import static com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_STATE_ORDINAL; +import static com.android.launcher3.util.WallpaperThemeManager.setWallpaperDependentTheme; import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely; import static com.android.quickstep.TaskUtils.taskIsATargetWithMode; import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator; -import static com.android.window.flags2.Flags.enableDesktopWindowingMode; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.app.ActivityOptions; import android.content.Intent; -import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; import android.os.Looper; +import android.os.Trace; import android.view.Display; import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationTarget; import android.view.SurfaceControl.Transaction; import android.view.View; +import android.window.RemoteTransition; import android.window.SplashScreen; import androidx.annotation.NonNull; @@ -66,10 +71,10 @@ import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory; import com.android.launcher3.statemanager.StateManager.StateHandler; import com.android.launcher3.statemanager.StatefulActivity; -import com.android.launcher3.taskbar.FallbackTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.taskbar.TaskbarManager; import com.android.launcher3.util.ActivityOptionsWrapper; -import com.android.launcher3.util.ActivityTracker; +import com.android.launcher3.util.ContextTracker; import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.SystemUiController; import com.android.launcher3.util.Themes; @@ -86,6 +91,8 @@ import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; import com.android.quickstep.views.TaskView; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.desktopmode.DesktopState; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -94,15 +101,15 @@ import app.lawnchair.compat.LawnchairQuickstepCompat; /** - * A recents activity that shows the recently launched tasks as swipable task - * cards. + * A recents activity that shows the recently launched tasks as swipable task cards. * See {@link com.android.quickstep.views.RecentsView}. */ public final class RecentsActivity extends StatefulActivity implements - RecentsViewContainer { + RecentsViewContainer, InvariantDeviceProfile.OnIDPChangeListener { private static final String TAG = "RecentsActivity"; - public static final ActivityTracker ACTIVITY_TRACKER = new ActivityTracker<>(); + public static final ContextTracker.ActivityTracker ACTIVITY_TRACKER = + new ContextTracker.ActivityTracker<>(); private Handler mUiHandler = new Handler(Looper.getMainLooper()); @@ -114,17 +121,13 @@ public final class RecentsActivity extends StatefulActivity implem private FallbackRecentsView mFallbackRecentsView; private OverviewActionsView mActionsView; private TISBindHelper mTISBindHelper; - private @Nullable FallbackTaskbarUIController mTaskbarUIController; + private @Nullable TaskbarInteractor mTaskbarInteractor; private StateManager mStateManager; // Strong refs to runners which are cleared when the activity is destroyed private RemoteAnimationFactory mActivityLaunchAnimationRunner; - // For handling degenerate cases where starting an activity doesn't actually - // trigger the remote - // animation callback - private final Handler mHandler = new Handler(); private final Runnable mAnimationStartTimeoutRunnable = this::onAnimationStartTimeout; private SplitSelectStateController mSplitSelectStateController; @Nullable @@ -134,12 +137,14 @@ public final class RecentsActivity extends StatefulActivity implem * Init drag layer and overview panel views. */ protected void setupViews() { + getTheme().applyStyle(getOverviewBlurStyleResId(), true); SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(this); // SplitSelectStateController needs to be created before setContentView() - mSplitSelectStateController = new SplitSelectStateController(this, mHandler, getStateManager(), - null /* depthController */, getStatsLogManager(), - systemUiProxy, RecentsModel.INSTANCE.get(this), - null /* activityBackCallback */); + mSplitSelectStateController = + new SplitSelectStateController(this, getStateManager(), + null /* depthController */, getStatsLogManager(), + systemUiProxy, RecentsModel.INSTANCE.get(this), + null /*activityBackCallback*/); // Setup root and child views inflateRootView(R.layout.fallback_recents_activity); LauncherRootView rootView = getRootView(); @@ -148,10 +153,10 @@ protected void setupViews() { mFallbackRecentsView = rootView.findViewById(R.id.overview_panel); mActionsView = rootView.findViewById(R.id.overview_actions_view); - if (enableDesktopWindowingMode()) { + if (DesktopModeStatus.canEnterDesktopMode(this)) { mDesktopRecentsTransitionController = new DesktopRecentsTransitionController( - getStateManager(), systemUiProxy, this.getIApplicationThread(), - null /* depthController */ + getStateManager(), systemUiProxy, getIApplicationThread(), + null /* depthController */, DesktopState.getInstance(this) ); } mFallbackRecentsView.init(mActionsView, mSplitSelectStateController, @@ -176,18 +181,15 @@ public void runOnBindToTouchInteractionService(Runnable r) { mTISBindHelper.runOnBindToTouchInteractionService(r); } - public void setTaskbarUIController(FallbackTaskbarUIController taskbarUIController) { - mTaskbarUIController = taskbarUIController; - } - - public FallbackTaskbarUIController getTaskbarUIController() { - return mTaskbarUIController; + @Override + public void setTaskbarInteractor(@Nullable TaskbarInteractor taskbarInteractor) { + mTaskbarInteractor = taskbarInteractor; } + @Nullable @Override - public void onMultiWindowModeChanged(boolean isInMultiWindowMode, Configuration newConfig) { - onHandleConfigurationChanged(); - super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig); + public TaskbarInteractor getTaskbarInteractor() { + return mTaskbarInteractor; } @Override @@ -197,7 +199,8 @@ protected void onNewIntent(Intent intent) { } @Override - protected void onHandleConfigurationChanged() { + public void onHandleConfigurationChanged() { + Trace.instant(Trace.TRACE_TAG_APP, "recentsActivity_onHandleConfigurationChanged"); initDeviceProfile(); AbstractFloatingView.closeOpenViews(this, true, @@ -210,18 +213,14 @@ protected void onHandleConfigurationChanged() { /** * Generate the device profile to use in this activity. - * * @return device profile */ protected DeviceProfile createDeviceProfile() { DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(this).getDeviceProfile(this); - // In case we are reusing IDP, create a copy so that we don't conflict with - // Launcher + // In case we are reusing IDP, create a copy so that we don't conflict with Launcher // activity. - return (mDragLayer != null) && isInMultiWindowMode() - ? dp.getMultiWindowProfile(this, getMultiWindowDisplaySize()) - : dp.copy(this); + return dp.copy(); } @Override @@ -233,6 +232,21 @@ public ScrimView getScrimView() { return mScrimView; } + @Override + public FallbackActivityInterface getContainerInterface() { + return FallbackActivityInterface.INSTANCE; + } + + @Override + public SplitSelectStateController getSplitSelectStateController() { + return mSplitSelectStateController; + } + + @Override + public void goToRecentsState(RecentsState recentsState, boolean animated) { + getStateManager().goToState(recentsState, animated); + } + @Override public FallbackRecentsView getOverviewPanel() { return mFallbackRecentsView; @@ -245,13 +259,11 @@ public OverviewActionsView getActionsView() { @Override public void returnToHomescreen() { - super.returnToHomescreen(); // TODO(b/137318995) This should go home, but doing so removes freeform windows } /** - * Called if the remote animation callback from #getActivityLaunchOptions() - * hasn't called back + * Called if the remote animation callback from #getActivityLaunchOptions() hasn't called back * in a reasonable time due to a conflict with the recents animation. */ private void onAnimationStartTimeout() { @@ -260,6 +272,7 @@ private void onAnimationStartTimeout() { } } + @NonNull @Override public ActivityOptionsWrapper getActivityLaunchOptions(final View v, @Nullable ItemInfo item) { if (!(v instanceof TaskView)) { @@ -330,11 +343,11 @@ private AnimatorSet composeRecentsLaunchAnimator( boolean activityClosing = taskIsATargetWithMode(appTargets, getTaskId(), MODE_CLOSING); PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION); createRecentsWindowAnimator(recentsView, taskView, !activityClosing, appTargets, - wallpaperTargets, nonAppTargets, null /* depthController */, pa); + wallpaperTargets, nonAppTargets, /* depthController= */ null, + /* transitionInfo= */ null, /* appearedTaskId= */ INVALID_TASK_ID, pa); target.play(pa.buildAnim()); - // Found a visible recents task that matches the opening app, lets launch the - // app from there + // Found a visible recents task that matches the opening app, lets launch the app from there if (activityClosing) { Animator adjacentAnimation = mFallbackRecentsView .createAdjacentPageAnimForTaskLaunch(taskView); @@ -358,7 +371,6 @@ protected void onStart() { @Override protected void onStop() { super.onStop(); - // Workaround for b/78520668, explicitly trim memory once UI is hidden onTrimMemory(TRIM_MEMORY_UI_HIDDEN); mFallbackRecentsView.updateLocusId(); @@ -375,10 +387,11 @@ protected void onResume() { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + setWallpaperDependentTheme(this); mStateManager = new StateManager<>(this, RecentsState.BG_LAUNCHER); initDeviceProfile(); + InvariantDeviceProfile.INSTANCE.get(this).addOnChangeListener(this); setupViews(); getSystemUiController().updateUiState(SystemUiController.UI_STATE_BASE_WINDOW, @@ -387,6 +400,32 @@ protected void onCreate(Bundle savedInstanceState) { // Set screen title for Talkback setTitle(R.string.accessibility_recent_apps); + + restoreState(savedInstanceState); + } + + @Override + protected void onSaveInstanceState(@NonNull Bundle outState) { + outState.putInt(RUNTIME_STATE, mStateManager.getState().ordinal); + super.onSaveInstanceState(outState); + } + + /** + * Restores the previous state, if it exists. + * + * @param savedState The previous state. + */ + private void restoreState(Bundle savedState) { + if (savedState == null) { + return; + } + + if (savedState.getBoolean(RUNTIME_STATE_RECREATE_TO_UPDATE_THEME)) { + // RecentsState is only restored after theme changes. + int stateOrdinal = savedState.getInt(RUNTIME_STATE, RecentsState.DEFAULT.ordinal); + RecentsState recentsState = RecentsState.stateFromOrdinal(stateOrdinal); + mStateManager.goToState(recentsState, /*animated=*/false); + } } @Override @@ -409,16 +448,13 @@ public boolean shouldAnimateStateChange() { */ private void initDeviceProfile() { mDeviceProfile = createDeviceProfile(); - onDeviceProfileInitiated(); } @Override public void onEnterAnimationComplete() { super.onEnterAnimationComplete(); - // After the transition to home, enable the high-res thumbnail loader if it - // wasn't enabled - // as a part of quickstep, so that high-res thumbnails can load the next time we - // enter + // After the transition to home, enable the high-res thumbnail loader if it wasn't enabled + // as a part of quickstep, so that high-res thumbnails can load the next time we enter // overview RecentsModel.INSTANCE.get(this).getThumbnailCache() .getHighResLoadingState().setVisible(true); @@ -432,56 +468,67 @@ public void onTrimMemory(int level) { @Override protected void onDestroy() { + RecentsView recentsView = getOverviewPanel(); + if (recentsView != null) { + recentsView.destroy(); + } super.onDestroy(); - ACTIVITY_TRACKER.onActivityDestroyed(this); + ACTIVITY_TRACKER.onContextDestroyed(this); mActivityLaunchAnimationRunner = null; mSplitSelectStateController.onDestroy(); mTISBindHelper.onDestroy(); + InvariantDeviceProfile.INSTANCE.get(this).removeOnChangeListener(this); } @Override public void onBackPressed() { - // TODO: Launch the task we came from - startHome(); + getStateManager().getState().onBackInvoked(this); } - public void startHome() { + @Override + public void startHome(boolean animated, @Nullable Runnable onHomeAnimationComplete) { RecentsView recentsView = getOverviewPanel(); recentsView.switchToScreenshot(() -> recentsView.finishRecentsAnimation(true, - this::startHomeInternal)); - } + () -> startHomeInternal(onHomeAnimationComplete))); + } + + private void startHomeInternal(@Nullable Runnable onHomeAnimationComplete) { + RemoteAnimationFactory animationToHomeFactory = + (transit, appTargets, wallpaperTargets, nonAppTargets, result) -> { + AnimatorPlaybackController controller = + getStateManager().createAnimationToNewWorkspace( + RecentsState.BG_LAUNCHER, HOME_APPEAR_DURATION); + controller.dispatchOnStart(); + + RemoteAnimationTargets targets = new RemoteAnimationTargets( + appTargets, wallpaperTargets, nonAppTargets, MODE_OPENING); + for (RemoteAnimationTarget app : targets.apps) { + new Transaction().setAlpha(app.leash, 1).apply(); + } + AnimatorSet anim = new AnimatorSet(); + anim.play(controller.getAnimationPlayer()); + anim.setDuration(HOME_APPEAR_DURATION); + result.setAnimation(anim, RecentsActivity.this, + () -> { + getStateManager().goToState(RecentsState.HOME, false); + if (onHomeAnimationComplete != null) { + onHomeAnimationComplete.run(); + } + }, + true /* skipFirstFrame */); + }; - private void startHomeInternal() { LauncherAnimationRunner runner = new LauncherAnimationRunner( - getMainThreadHandler(), mAnimationToHomeFactory, true); + getMainThreadHandler(), animationToHomeFactory, true); ActivityOptions options = LawnchairQuickstepCompat.getActivityOptionsCompat().makeRemoteAnimation( - new RemoteAnimationAdapter(runner, HOME_APPEAR_DURATION, 0), - LawnchairQuickstepCompat.getRemoteTransitionCompat().getRemoteTransition(runner.toRemoteTransition(), - this.getIApplicationThread(), - "StartHomeFromRecents"), - "Lawnchair"); - startHomeIntentSafely(this, options.toBundle(), TAG); + new RemoteAnimationAdapter(runner, HOME_APPEAR_DURATION, 0), + LawnchairQuickstepCompat.getRemoteTransitionCompat().getRemoteTransition(runner.toRemoteTransition(), + this.getIApplicationThread(), + "StartHomeFromRecents"), + "Lawnchair"); + startHomeIntentSafely(this, options.toBundle(), TAG, getDisplayId()); } - private final RemoteAnimationFactory mAnimationToHomeFactory = (transit, appTargets, wallpaperTargets, - nonAppTargets, result) -> { - AnimatorPlaybackController controller = getStateManager().createAnimationToNewWorkspace( - RecentsState.BG_LAUNCHER, HOME_APPEAR_DURATION); - controller.dispatchOnStart(); - - RemoteAnimationTargets targets = new RemoteAnimationTargets( - appTargets, wallpaperTargets, nonAppTargets, MODE_OPENING); - for (RemoteAnimationTarget app : targets.apps) { - new Transaction().setAlpha(app.leash, 1).apply(); - } - AnimatorSet anim = new AnimatorSet(); - anim.play(controller.getAnimationPlayer()); - anim.setDuration(HOME_APPEAR_DURATION); - result.setAnimation(anim, RecentsActivity.this, - () -> getStateManager().goToState(RecentsState.HOME, false), - true /* skipFirstFrame */); - }; - @Override public void collectStateHandlers(List> out) { out.add(new FallbackRecentsStateController(this)); @@ -524,13 +571,18 @@ public boolean canStartHomeSafely() { return overviewCommandHelper == null || overviewCommandHelper.canStartHomeSafely(); } - @NonNull - public TISBindHelper getTISBindHelper() { - return mTISBindHelper; - } - @Override public boolean isRecentsViewVisible() { return getStateManager().getState().isRecentsViewVisible(); } + + @Override + public void onIdpChanged(boolean modelPropertiesChanged) { + onHandleConfigurationChanged(); + } + + @Override + public int getOverviewBlurStyleResId() { + return R.style.OverviewBlurFallbackStyle; + } } diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java index 6bad0391d61..b2d9d366a5b 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java @@ -15,14 +15,15 @@ */ package com.android.quickstep; +import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.view.RemoteAnimationTarget.MODE_CLOSING; +import static android.view.RemoteAnimationTarget.MODE_OPENING; import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_CANCEL_RECENTS_ANIMATION; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_FINISH_RECENTS_ANIMATION; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_START_RECENTS_ANIMATION; +import static com.android.wm.shell.shared.TransitionUtil.TYPE_SPLIT_SCREEN_DIM_LAYER; +import android.annotation.Nullable; import android.graphics.Rect; import android.os.Bundle; import android.util.ArraySet; @@ -36,8 +37,10 @@ import com.android.launcher3.Utilities; import com.android.launcher3.util.Preconditions; -import com.android.quickstep.util.ActiveGestureErrorDetector; import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.RecentsAnimationControllerCompat; @@ -57,18 +60,15 @@ public class RecentsAnimationCallbacks implements com.android.systemui.shared.system.RecentsAnimationListener { private final Set mListeners = new ArraySet<>(); - private final SystemUiProxy mSystemUiProxy; - private final boolean mAllowMinimizeSplitScreen; + private final boolean mIsContainerRecentsWindowManager; // TODO(141886704): Remove these references when they are no longer needed private RecentsAnimationController mController; private boolean mCancelled; - public RecentsAnimationCallbacks(SystemUiProxy systemUiProxy, - boolean allowMinimizeSplitScreen) { - mSystemUiProxy = systemUiProxy; - mAllowMinimizeSplitScreen = allowMinimizeSplitScreen; + public RecentsAnimationCallbacks(RecentsViewContainer container) { + mIsContainerRecentsWindowManager = container instanceof RecentsWindowManager; } @UiThread @@ -101,7 +101,7 @@ public final void onAnimationStart(RecentsAnimationControllerCompat controller, RemoteAnimationTarget[] appTargets, Rect homeContentInsets, Rect minimizedHomeBounds, Bundle extras) { onAnimationStart(controller, appTargets, new RemoteAnimationTarget[0], - homeContentInsets, minimizedHomeBounds, extras); + homeContentInsets, extras, /* transitionInfo= */ null); } // Introduced in NothingOS 2.5.5, needed in 2.6 @@ -113,7 +113,7 @@ public final void onAnimationStart(RecentsAnimationControllerCompat controller, if (transaction != null) { transaction.apply(); } -// onAnimationStart(controller, apps, wallpapers, homeContentInsets, minimizedHomeBounds); + onAnimationStart(controller, apps, wallpapers, homeContentInsets, null /* extras */, transitionInfo); } // Called only in R+ platform @@ -121,16 +121,19 @@ public final void onAnimationStart(RecentsAnimationControllerCompat controller, public final void onAnimationStart(RecentsAnimationControllerCompat animationController, RemoteAnimationTarget[] appTargets, RemoteAnimationTarget[] wallpaperTargets, - Rect homeContentInsets, Rect minimizedHomeBounds, Bundle extras) { + Rect homeContentInsets, + Bundle extras, + @Nullable TransitionInfo transitionInfo) { long appCount = Arrays.stream(appTargets) .filter(app -> app.mode == MODE_CLOSING) .count(); - if (appCount == 0) { + + boolean isOpeningHome = Arrays.stream(appTargets).filter(app -> app.mode == MODE_OPENING + && app.windowConfiguration.getActivityType() == ACTIVITY_TYPE_HOME) + .count() > 0; + if (appCount == 0 && (!mIsContainerRecentsWindowManager || isOpeningHome)) { + ActiveGestureProtoLogProxy.logOnRecentsAnimationStartCancelled(); // Edge case, if there are no closing app targets, then Launcher has nothing to handle - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "RecentsAnimationCallbacks.onAnimationStart (canceled)", - /* extras= */ 0, - /* gestureEvent= */ ON_START_RECENTS_ANIMATION); notifyAnimationCanceled(); animationController.finish(false /* toHome */, false /* sendUserLeaveHint */, null /* finishCb */); @@ -138,35 +141,29 @@ public final void onAnimationStart(RecentsAnimationControllerCompat animationCon } mController = new RecentsAnimationController(animationController, - mAllowMinimizeSplitScreen, this::onAnimationFinished); + this::onAnimationFinished); if (mCancelled) { - Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), - mController::finishAnimationToApp); + Utilities.postAsyncCallback( + MAIN_EXECUTOR.getHandler(), + () -> mController.finishAnimationToApp(new ActiveGestureLog.CompoundString( + "RecentsAnimationCallback.onAnimationStart: mCancelled=true"))); } else { RemoteAnimationTarget[] nonAppTargets; - if (!TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) { - nonAppTargets = LawnchairQuickstepCompat.ATLEAST_T ? mSystemUiProxy.onGoingToRecentsLegacy(appTargets) : null; - } else { - final ArrayList apps = new ArrayList<>(); - final ArrayList nonApps = new ArrayList<>(); - classifyTargets(appTargets, apps, nonApps); - appTargets = apps.toArray(new RemoteAnimationTarget[apps.size()]); - nonAppTargets = nonApps.toArray(new RemoteAnimationTarget[nonApps.size()]); - } + final ArrayList apps = new ArrayList<>(); + final ArrayList nonApps = new ArrayList<>(); + classifyTargets(appTargets, apps, nonApps); + appTargets = apps.toArray(new RemoteAnimationTarget[apps.size()]); + nonAppTargets = nonApps.toArray(new RemoteAnimationTarget[nonApps.size()]); if (nonAppTargets == null) { nonAppTargets = new RemoteAnimationTarget[0]; } final RecentsAnimationTargets targets = new RecentsAnimationTargets(appTargets, - wallpaperTargets, nonAppTargets, homeContentInsets, minimizedHomeBounds, - extras); + wallpaperTargets, nonAppTargets, homeContentInsets, extras); Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> { - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "RecentsAnimationCallbacks.onAnimationStart", - /* extras= */ targets.apps.length, - /* gestureEvent= */ ON_START_RECENTS_ANIMATION); + ActiveGestureProtoLogProxy.logOnRecentsAnimationStart(targets.apps.length); for (RecentsAnimationListener listener : getListeners()) { - listener.onRecentsAnimationStart(mController, targets); + listener.onRecentsAnimationStart(mController, targets, transitionInfo); } }); } @@ -176,9 +173,7 @@ public final void onAnimationStart(RecentsAnimationControllerCompat animationCon @Override public final void onAnimationCanceled(HashMap thumbnailDatas) { Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> { - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "RecentsAnimationCallbacks.onAnimationCanceled", - /* gestureEvent= */ ON_CANCEL_RECENTS_ANIMATION); + ActiveGestureProtoLogProxy.logRecentsAnimationCallbacksOnAnimationCancelled(); for (RecentsAnimationListener listener : getListeners()) { listener.onRecentsAnimationCanceled(thumbnailDatas); } @@ -187,33 +182,19 @@ public final void onAnimationCanceled(HashMap thumbnailD @BinderThread @Override - public void onTasksAppeared(RemoteAnimationTarget[] apps) { + public void onTasksAppeared( + RemoteAnimationTarget[] apps, @Nullable TransitionInfo transitionInfo) { Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> { - ActiveGestureLog.INSTANCE.addLog("RecentsAnimationCallbacks.onTasksAppeared", - ActiveGestureErrorDetector.GestureEvent.TASK_APPEARED); + ActiveGestureProtoLogProxy.logRecentsAnimationCallbacksOnTasksAppeared(); for (RecentsAnimationListener listener : getListeners()) { - listener.onTasksAppeared(apps); + listener.onTasksAppeared(apps, transitionInfo); } }); } - @BinderThread - @Override - public boolean onSwitchToScreenshot(Runnable onFinished) { + private void onAnimationFinished(RecentsAnimationController controller) { Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> { - for (RecentsAnimationListener listener : getListeners()) { - if (listener.onSwitchToScreenshot(onFinished)) return; - } - onFinished.run(); - }); - return true; - } - - private final void onAnimationFinished(RecentsAnimationController controller) { - Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> { - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "RecentsAnimationCallbacks.onAnimationFinished", - ON_FINISH_RECENTS_ANIMATION); + ActiveGestureProtoLogProxy.logAbsSwipeUpHandlerOnRecentsAnimationFinished(); for (RecentsAnimationListener listener : getListeners()) { listener.onRecentsAnimationFinished(controller); } @@ -228,7 +209,8 @@ private void classifyTargets(RemoteAnimationTarget[] appTargets, ArrayList apps, ArrayList nonApps) { for (int i = 0; i < appTargets.length; i++) { RemoteAnimationTarget target = appTargets[i]; - if (target.windowType == TYPE_DOCK_DIVIDER) { + if (target.windowType == TYPE_DOCK_DIVIDER + || target.windowType == TYPE_SPLIT_SCREEN_DIM_LAYER) { nonApps.add(target); } else { apps.add(target); @@ -239,7 +221,6 @@ private void classifyTargets(RemoteAnimationTarget[] appTargets, public void dump(String prefix, PrintWriter pw) { pw.println(prefix + "RecentsAnimationCallbacks:"); - pw.println(prefix + "\tmAllowMinimizeSplitScreen=" + mAllowMinimizeSplitScreen); pw.println(prefix + "\tmCancelled=" + mCancelled); } @@ -248,7 +229,7 @@ public void dump(String prefix, PrintWriter pw) { */ public interface RecentsAnimationListener { default void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) {} + RecentsAnimationTargets targets, @Nullable TransitionInfo transitionInfo) {} /** * Callback from the system when the recents animation is canceled. {@param thumbnailData} @@ -265,13 +246,7 @@ default void onRecentsAnimationFinished(@NonNull RecentsAnimationController cont /** * Callback made when a task started from the recents is ready for an app transition. */ - default void onTasksAppeared(@NonNull RemoteAnimationTarget[] appearedTaskTarget) {} - - /** - * @return whether this will call onFinished or not (onFinished should only be called once). - */ - default boolean onSwitchToScreenshot(Runnable onFinished) { - return false; - } + default void onTasksAppeared(@NonNull RemoteAnimationTarget[] appearedTaskTarget, + @Nullable TransitionInfo transitionInfo) {} } } diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java index 1b05e284bee..ca50fbe1ba9 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java @@ -17,29 +17,30 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; -import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.FINISH_RECENTS_ANIMATION; -import android.content.Context; import android.os.Bundle; import android.os.RemoteException; import android.util.Log; -import android.view.IRecentsAnimationController; +import android.view.RemoteAnimationTarget; import android.view.SurfaceControl; import android.view.WindowManagerGlobal; import android.window.PictureInPictureSurfaceTransaction; +import android.window.WindowAnimationState; +import androidx.annotation.NonNull; import androidx.annotation.UiThread; import com.android.internal.jank.Cuj; import com.android.internal.os.IResultReceiver; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.RunnableList; -import com.android.quickstep.util.ActiveGestureErrorDetector; import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; import com.android.systemui.shared.recents.model.ThumbnailData; +import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import com.android.systemui.shared.system.RecentsAnimationControllerCompat; +import com.android.wm.shell.recents.IRecentsAnimationController; import java.io.PrintWriter; import java.util.function.Consumer; @@ -52,21 +53,17 @@ public class RecentsAnimationController { private static final String TAG = "RecentsAnimationController"; private final RecentsAnimationControllerCompat mController; private final Consumer mOnFinishedListener; - private final boolean mAllowMinimizeSplitScreen; private boolean mUseLauncherSysBarFlags = false; - private boolean mSplitScreenMinimized = false; private boolean mFinishRequested = false; // Only valid when mFinishRequested == true. private boolean mFinishTargetIsLauncher; private RunnableList mPendingFinishCallbacks = new RunnableList(); public RecentsAnimationController(RecentsAnimationControllerCompat controller, - boolean allowMinimizeSplitScreen, Consumer onFinishedListener) { mController = controller; mOnFinishedListener = onFinishedListener; - mAllowMinimizeSplitScreen = allowMinimizeSplitScreen; } /** @@ -74,7 +71,7 @@ public RecentsAnimationController(RecentsAnimationControllerCompat controller, * currently being animated. */ public ThumbnailData screenshotTask(int taskId) { - return mController.screenshotTask(taskId); + return ActivityManagerWrapper.getInstance().takeTaskThumbnail(taskId); } /** @@ -85,56 +82,33 @@ public void setUseLauncherSystemBarFlags(boolean useLauncherSysBarFlags) { if (mUseLauncherSysBarFlags != useLauncherSysBarFlags) { mUseLauncherSysBarFlags = useLauncherSysBarFlags; UI_HELPER_EXECUTOR.execute(() -> { - if (!ENABLE_SHELL_TRANSITIONS) { - mController.setAnimationTargetsBehindSystemBars(!useLauncherSysBarFlags); - } else { - try { - WindowManagerGlobal.getWindowManagerService().setRecentsAppBehindSystemBars( - useLauncherSysBarFlags); - } catch (RemoteException e) { - Log.e(TAG, "Unable to reach window manager", e); - } + try { + WindowManagerGlobal.getWindowManagerService().setRecentsAppBehindSystemBars( + useLauncherSysBarFlags); + } catch (RemoteException e) { + Log.e(TAG, "Unable to reach window manager", e); } }); } } - /** - * Indicates that the gesture has crossed the window boundary threshold and we should minimize - * if we are in splitscreen. - */ - public void setSplitScreenMinimized(Context context, boolean splitScreenMinimized) { - if (!mAllowMinimizeSplitScreen) { - return; - } - if (mSplitScreenMinimized != splitScreenMinimized) { - mSplitScreenMinimized = splitScreenMinimized; - } - } - - /** - * Remove task remote animation target from - * {@link RecentsAnimationCallbacks#onTasksAppeared}}. - */ - @UiThread - public void removeTaskTarget(int targetTaskId) { - UI_HELPER_EXECUTOR.execute(() -> mController.removeTask(targetTaskId)); - } - @UiThread - public void finishAnimationToHome() { - finishController(true /* toRecents */, null, false /* sendUserLeaveHint */); + public void handOffAnimation(RemoteAnimationTarget[] targets, WindowAnimationState[] states) { + UI_HELPER_EXECUTOR.execute(() -> mController.handOffAnimation(targets, states)); } @UiThread - public void finishAnimationToApp() { - finishController(false /* toRecents */, null, false /* sendUserLeaveHint */); + public void finishAnimationToApp(@NonNull ActiveGestureLog.CompoundString reason) { + finishController(/* toHome= */ false, null, /* sendUserLeaveHint= */ false, reason); } - /** See {@link #finish(boolean, Runnable, boolean)} */ + /** See {@link #finish(boolean, Runnable, boolean, ActiveGestureLog.CompoundString)} */ @UiThread - public void finish(boolean toRecents, Runnable onFinishComplete) { - finish(toRecents, onFinishComplete, false /* sendUserLeaveHint */); + public void finish( + boolean toHome, + Runnable onFinishComplete, + @NonNull ActiveGestureLog.CompoundString reason) { + finish(toHome, onFinishComplete, /* sendUserLeaveHint= */ false, reason); } /** @@ -145,19 +119,31 @@ public void finish(boolean toRecents, Runnable onFinishComplete) { * picture-in-picture mode upon being paused. */ @UiThread - public void finish(boolean toRecents, Runnable onFinishComplete, boolean sendUserLeaveHint) { + public void finish( + boolean toHome, + Runnable onFinishComplete, + boolean sendUserLeaveHint, + @NonNull ActiveGestureLog.CompoundString reason) { Preconditions.assertUIThread(); - finishController(toRecents, onFinishComplete, sendUserLeaveHint); + finishController(toHome, onFinishComplete, sendUserLeaveHint, reason); } @UiThread - public void finishController(boolean toRecents, Runnable callback, boolean sendUserLeaveHint) { - finishController(toRecents, callback, sendUserLeaveHint, false /* forceFinish */); + public void finishController( + boolean toHome, + Runnable callback, + boolean sendUserLeaveHint, + @NonNull ActiveGestureLog.CompoundString reason) { + finishController(toHome, callback, sendUserLeaveHint, /* forceFinish= */ false, reason); } @UiThread - public void finishController(boolean toRecents, Runnable callback, boolean sendUserLeaveHint, - boolean forceFinish) { + public void finishController( + boolean toHome, + Runnable callback, + boolean sendUserLeaveHint, + boolean forceFinish, + @NonNull ActiveGestureLog.CompoundString reason) { mPendingFinishCallbacks.add(callback); if (!forceFinish && mFinishRequested) { // If finish has already been requested, then add the callback to the pending list. @@ -165,22 +151,17 @@ public void finishController(boolean toRecents, Runnable callback, boolean sendU // trigger the callback to be called immediately return; } - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "finishRecentsAnimation", - /* extras= */ toRecents, - /* gestureEvent= */ FINISH_RECENTS_ANIMATION); + ActiveGestureProtoLogProxy.logFinishRecentsAnimation(toHome, reason); // Finish not yet requested mFinishRequested = true; - mFinishTargetIsLauncher = toRecents; + mFinishTargetIsLauncher = toHome; mOnFinishedListener.accept(this); Runnable finishCb = () -> { - mController.finish(toRecents, sendUserLeaveHint, new IResultReceiver.Stub() { + mController.finish(toHome, sendUserLeaveHint, new IResultReceiver.Stub() { @Override public void send(int i, Bundle bundle) throws RemoteException { - ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation-callback"); - MAIN_EXECUTOR.execute(() -> { - mPendingFinishCallbacks.executeAllAndDestroy(); - }); + ActiveGestureProtoLogProxy.logFinishRecentsAnimationCallback(); + MAIN_EXECUTOR.execute(mPendingFinishCallbacks::executeAllAndDestroy); } }); InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_QUICK_SWITCH); @@ -194,19 +175,6 @@ public void send(int i, Bundle bundle) throws RemoteException { } } - /** - * @see IRecentsAnimationController#cleanupScreenshot() - */ - @UiThread - public void cleanupScreenshot() { - UI_HELPER_EXECUTOR.execute(() -> { - ActiveGestureLog.INSTANCE.addLog( - "cleanupScreenshot", - ActiveGestureErrorDetector.GestureEvent.CLEANUP_SCREENSHOT); - mController.cleanupScreenshot(); - }); - } - /** * @see RecentsAnimationControllerCompat#detachNavigationBarFromApp */ @@ -215,14 +183,6 @@ public void detachNavigationBarFromApp(boolean moveHomeToTop) { UI_HELPER_EXECUTOR.execute(() -> mController.detachNavigationBarFromApp(moveHomeToTop)); } - /** - * @see IRecentsAnimationController#animateNavigationBarToApp(long) - */ - @UiThread - public void animateNavigationBarToApp(long duration) { - UI_HELPER_EXECUTOR.execute(() -> mController.animateNavigationBarToApp(duration)); - } - /** * @see IRecentsAnimationController#setWillFinishToHome(boolean) */ @@ -272,9 +232,7 @@ public boolean getFinishTargetIsLauncher() { public void dump(String prefix, PrintWriter pw) { pw.println(prefix + "RecentsAnimationController:"); - pw.println(prefix + "\tmAllowMinimizeSplitScreen=" + mAllowMinimizeSplitScreen); pw.println(prefix + "\tmUseLauncherSysBarFlags=" + mUseLauncherSysBarFlags); - pw.println(prefix + "\tmSplitScreenMinimized=" + mSplitScreenMinimized); pw.println(prefix + "\tmFinishRequested=" + mFinishRequested); pw.println(prefix + "\tmFinishTargetIsLauncher=" + mFinishTargetIsLauncher); } diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index 402b514ae46..8646ab93f8a 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -15,10 +15,11 @@ */ package com.android.quickstep; +import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; -import static android.view.Display.DEFAULT_DISPLAY; +import static com.android.launcher3.MotionEventsUtils.isTrackpadScroll; import static com.android.launcher3.util.DisplayController.CHANGE_ALL; import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE; import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION; @@ -33,9 +34,10 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DIALOG_SHOWING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_VISIBLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_MAGNIFICATION_OVERLAP; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; @@ -50,7 +52,6 @@ import android.app.ActivityTaskManager; import android.content.Context; import android.graphics.Region; -import android.inputmethodservice.InputMethodService; import android.net.Uri; import android.os.RemoteException; import android.os.SystemProperties; @@ -60,28 +61,36 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; import com.android.launcher3.Utilities; +import com.android.app.displaylib.PerDisplayRepository; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener; import com.android.launcher3.util.DisplayController.Info; import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.SettingsCache; import com.android.quickstep.TopTaskTracker.CachedTaskInfo; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; import com.android.quickstep.util.ActiveGestureLog; -import com.android.quickstep.util.AssistStateManager; +import com.android.quickstep.util.ContextualSearchStateManager; import com.android.quickstep.util.GestureExclusionManager; import com.android.quickstep.util.GestureExclusionManager.ExclusionListener; import com.android.quickstep.util.NavBarPosition; +import com.android.systemui.shared.Flags; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; + import java.io.PrintWriter; -import java.util.ArrayList; import app.lawnchair.LawnchairApp; @@ -90,7 +99,7 @@ */ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, ExclusionListener { - private static final String TAG = "RecentsAnimationDeviceState"; + public static final int RESET_TO_DEFAULT_GESTURAL_HEIGHT = -1; static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode"; @@ -98,18 +107,28 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E private static final float QUICKSTEP_TOUCH_SLOP_RATIO_TWO_BUTTON = 3f; private static final float QUICKSTEP_TOUCH_SLOP_RATIO_GESTURAL = 1.414f; + public static final DaggerSingletonObject> + REPOSITORY_INSTANCE = new DaggerSingletonObject<>( + QuickstepBaseAppComponent::getRecentsAnimationDeviceStateRepository); + + /** The SysUI state ignores trackpad, touch gestures, and keyboard shortcuts. */ + private static final long GESTURE_OR_KB_SHORTCUT_DISABLING_STATES = + SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED + | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING + | SYSUI_STATE_QUICK_SETTINGS_EXPANDED + | SYSUI_STATE_MAGNIFICATION_OVERLAP + | SYSUI_STATE_DEVICE_DREAMING + | SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION + | SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING; + private final Context mContext; private final DisplayController mDisplayController; private final GestureExclusionManager mExclusionManager; - private final AssistStateManager mAssistStateManager; + private final ContextualSearchStateManager mContextualSearchStateManager; private final RotationTouchHelper mRotationTouchHelper; private final TaskStackChangeListener mPipListener; - // Cache for better performance since it doesn't change at runtime. - private final boolean mCanImeRenderGesturalNavButtons = isImeRenderingNavButtons(); - - private final ArrayList mOnDestroyActions = new ArrayList<>(); private @SystemUiStateFlags long mSystemUiStateFlags = QuickStepContract.SYSUI_STATE_AWAKE; private NavigationMode mMode = THREE_BUTTONS; @@ -128,82 +147,73 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E private int mGestureBlockingTaskId = -1; private @NonNull Region mExclusionRegion = GestureExclusionManager.EMPTY_REGION; private boolean mExclusionListenerRegistered; + private final int mDisplayId; - public RecentsAnimationDeviceState(Context context) { - this(context, false, GestureExclusionManager.INSTANCE); - } - - public RecentsAnimationDeviceState(Context context, boolean isInstanceForTouches) { - this(context, isInstanceForTouches, GestureExclusionManager.INSTANCE); - } - - @VisibleForTesting - RecentsAnimationDeviceState(Context context, GestureExclusionManager exclusionManager) { - this(context, false, exclusionManager); - } - - /** - * @param isInstanceForTouches {@code true} if this is the persistent instance - * being used for - * gesture touch handling - */ + @AssistedInject RecentsAnimationDeviceState( - Context context, boolean isInstanceForTouches, - GestureExclusionManager exclusionManager) { + @ApplicationContext Context context, + @Assisted int displayId, + @Assisted RotationTouchHelper rotationTouchHelper, + GestureExclusionManager exclusionManager, + DisplayController displayController, + ContextualSearchStateManager contextualSearchStateManager, + SettingsCache settingsCache, + DaggerSingletonTracker lifeCycle) { mContext = context; - mDisplayController = DisplayController.INSTANCE.get(context); + mDisplayId = displayId; + mDisplayController = displayController; mExclusionManager = exclusionManager; - mAssistStateManager = AssistStateManager.INSTANCE.get(context); - mIsOneHandedModeSupported = LawnchairApp.isRecentsEnabled() && SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false); - mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context); - if (isInstanceForTouches) { - // rotationTouchHelper doesn't get initialized after being destroyed, so only - // destroy - // if primary TouchInteractionService instance needs to be destroyed. - mRotationTouchHelper.init(); - runOnDestroy(mRotationTouchHelper::destroy); - } + mContextualSearchStateManager = contextualSearchStateManager; + mRotationTouchHelper = rotationTouchHelper; + mIsOneHandedModeSupported = + LawnchairApp.isRecentsEnabled() && SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, + false); if (Utilities.ATLEAST_Q) { // Register for exclusion updates - runOnDestroy(() -> unregisterExclusionListener()); + lifeCycle.addCloseable(this::unregisterExclusionListener); } // Register for display changes changes mDisplayController.addChangeListener(this); - onDisplayInfoChanged(context, mDisplayController.getInfo(), CHANGE_ALL); - runOnDestroy(() -> mDisplayController.removeChangeListener(this)); + Info displayInfo = mDisplayController.getInfoForDisplay(mDisplayId); + if (displayInfo != null) { + onDisplayInfoChanged(context, displayInfo, CHANGE_ALL); + } + lifeCycle.addCloseable(() -> mDisplayController.removeChangeListener(this)); - SettingsCache settingsCache = SettingsCache.INSTANCE.get(mContext); if (mIsOneHandedModeSupported) { Uri oneHandedUri = Settings.Secure.getUriFor(ONE_HANDED_ENABLED); - SettingsCache.OnChangeListener onChangeListener = enabled -> mIsOneHandedModeEnabled = enabled; + SettingsCache.OnChangeListener onChangeListener = + enabled -> mIsOneHandedModeEnabled = enabled; settingsCache.register(oneHandedUri, onChangeListener); mIsOneHandedModeEnabled = LawnchairApp.isRecentsEnabled() && settingsCache.getValue(oneHandedUri); - runOnDestroy(() -> settingsCache.unregister(oneHandedUri, onChangeListener)); + lifeCycle.addCloseable(() -> settingsCache.unregister(oneHandedUri, onChangeListener)); } else { mIsOneHandedModeEnabled = false; } - Uri swipeBottomNotificationUri = Settings.Secure.getUriFor(ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED); - SettingsCache.OnChangeListener onChangeListener = enabled -> mIsSwipeToNotificationEnabled = enabled; + Uri swipeBottomNotificationUri = + Settings.Secure.getUriFor(ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED); + SettingsCache.OnChangeListener onChangeListener = + enabled -> mIsSwipeToNotificationEnabled = enabled; settingsCache.register(swipeBottomNotificationUri, onChangeListener); - mIsSwipeToNotificationEnabled = LawnchairApp.isRecentsEnabled() - && settingsCache.getValue(swipeBottomNotificationUri); - runOnDestroy(() -> settingsCache.unregister(swipeBottomNotificationUri, onChangeListener)); + mIsSwipeToNotificationEnabled = LawnchairApp.isRecentsEnabled() && settingsCache.getValue(swipeBottomNotificationUri); + lifeCycle.addCloseable( + () -> settingsCache.unregister(swipeBottomNotificationUri, onChangeListener)); Uri setupCompleteUri = Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE); - mIsUserSetupComplete = LawnchairApp.isRecentsEnabled() && settingsCache.getValue(setupCompleteUri, 0); + mIsUserSetupComplete = LawnchairApp.isRecentsEnabled() && settingsCache.getValue(setupCompleteUri); if (!mIsUserSetupComplete) { SettingsCache.OnChangeListener userSetupChangeListener = e -> mIsUserSetupComplete = e; settingsCache.register(setupCompleteUri, userSetupChangeListener); - runOnDestroy(() -> settingsCache.unregister(setupCompleteUri, userSetupChangeListener)); + lifeCycle.addCloseable( + () -> settingsCache.unregister(setupCompleteUri, userSetupChangeListener)); } try { - mPipIsActive = LawnchairApp.isRecentsEnabled() && Utilities.ATLEAST_S - && ActivityTaskManager.getService().getRootTaskInfo( - WINDOWING_MODE_PINNED, ACTIVITY_TYPE_UNDEFINED) != null; + mPipIsActive = LawnchairApp.isRecentsEnabled() && Utilities.ATLEAST_S && ActivityTaskManager.getService().getRootTaskInfo( + WINDOWING_MODE_PINNED, ACTIVITY_TYPE_UNDEFINED) != null; } catch (RemoteException e) { // Do nothing } @@ -220,37 +230,37 @@ public void onActivityUnpinned() { }; if (Utilities.ATLEAST_Q) { TaskStackChangeListeners.getInstance().registerTaskStackListener(mPipListener); - runOnDestroy(() -> TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mPipListener)); + lifeCycle.addCloseable(() -> + TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mPipListener)); } } - private void runOnDestroy(Runnable action) { - mOnDestroyActions.add(action); - } - /** - * Cleans up all the registered listeners and receivers. - */ - public void destroy() { - for (Runnable r : mOnDestroyActions) { - r.run(); - } - } - - /** - * Adds a listener for the nav mode change, guaranteed to be called after the - * device state's + * Adds a listener for the change flag, guaranteed to be called after the device state's * mode has changed. + * + * @return Added {@link DisplayInfoChangeListener} so that caller is + * responsible for removing the listener from {@link DisplayController} to avoid memory leak. */ - public void addNavigationModeChangedCallback(Runnable callback) { + public DisplayController.DisplayInfoChangeListener addDisplayInfoChangeCallback( + int changeFlag, Runnable callback) { DisplayController.DisplayInfoChangeListener listener = (context, info, flags) -> { - if ((flags & CHANGE_NAVIGATION_MODE) != 0) { + if ((flags & changeFlag) != 0) { callback.run(); } }; mDisplayController.addChangeListener(listener); callback.run(); - runOnDestroy(() -> mDisplayController.removeChangeListener(listener)); + return listener; + } + + /** + * Remove the {DisplayController.DisplayInfoChangeListener} added from + * {@link #addDisplayInfoChangeCallback} when {@link TouchInteractionService} is destroyed. + */ + public void removeDisplayInfoChangeListener( + DisplayController.DisplayInfoChangeListener listener) { + mDisplayController.removeChangeListener(listener); } @Override @@ -272,8 +282,7 @@ public void onDisplayInfoChanged(Context context, Info info, int flags) { public void onGestureExclusionChanged(@Nullable Region exclusionRegion, @Nullable Region unrestrictedOrNull) { mExclusionRegion = exclusionRegion != null - ? exclusionRegion - : GestureExclusionManager.EMPTY_REGION; + ? exclusionRegion : GestureExclusionManager.EMPTY_REGION; } /** @@ -298,18 +307,25 @@ public void unregisterExclusionListener() { mExclusionListenerRegistered = false; } - public void onOneHandedModeChanged(int newGesturalHeight) { + /** + * Touches within this number of pixels from the bottom of the screen can get intercepted to + * handle gesture navigation. Passing a value less than 0 will revert to a default value. + */ + public void setGesturalHeight(int newGesturalHeight) { mRotationTouchHelper.setGesturalHeight(newGesturalHeight); } /** - * @return the nav bar position for the current nav bar mode and display - * rotation. + * @return the nav bar position for the current nav bar mode and display rotation. */ public NavBarPosition getNavBarPosition() { return mNavBarPosition; } + public NavigationMode getMode() { + return mMode; + } + /** * @return whether the current nav mode is fully gestural. */ @@ -318,8 +334,7 @@ public boolean isFullyGesturalNavMode() { } /** - * @return whether the current nav mode has some gestures (either 2 or 0 button - * mode). + * @return whether the current nav mode has some gestures (either 2 or 0 button mode). */ public boolean isGesturalNavMode() { return mMode.hasGestures; @@ -332,13 +347,6 @@ public boolean isButtonNavMode() { return mMode == THREE_BUTTONS; } - /** - * @return the display id for the display that Launcher is running on. - */ - public int getDisplayId() { - return DEFAULT_DISPLAY; - } - /** * @return whether the user has completed setup wizard */ @@ -357,28 +365,44 @@ public void setGestureBlockingTaskId(int taskId) { * @return whether the given running task info matches the gesture-blocked task. */ public boolean isGestureBlockedTask(CachedTaskInfo taskInfo) { - return taskInfo != null && taskInfo.getTaskId() == mGestureBlockingTaskId; + if (mGestureBlockingTaskId == INVALID_TASK_ID) { + return false; + } + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + return taskInfo != null && taskInfo.topGroupedTaskContainsTask(mGestureBlockingTaskId); + } else { + return taskInfo != null && taskInfo.getTaskId() == mGestureBlockingTaskId; + } } /** - * Updates the system ui state flags from SystemUI. + * Updates the system ui state flags from SystemUI for a specific display. + * + * @param stateFlags the current {@link SystemUiStateFlags} for the display. */ - public void setSystemUiFlags(@SystemUiStateFlags long stateFlags) { + public void setSysUIStateFlags(@SystemUiStateFlags long stateFlags) { mSystemUiStateFlags = stateFlags; } /** - * @return the system ui state flags. + * Clears the system ui state flags for a specific display. This is called when the display is + * destroyed. + * + */ + public void clearSysUIStateFlags() { + mSystemUiStateFlags = QuickStepContract.SYSUI_STATE_AWAKE; + } + + /** + * @return the system ui state flags for this display. */ - // TODO(141886704): See if we can remove this @SystemUiStateFlags - public long getSystemUiStateFlags() { + public long getSysuiStateFlags() { return mSystemUiStateFlags; } /** - * Sets the flag that indicates whether a predictive back-to-home animation is - * in progress + * Sets the flag that indicates whether a predictive back-to-home animation is in progress */ public void setPredictiveBackToHomeInProgress(boolean isInProgress) { mIsPredictiveBackToHomeInProgress = isInProgress; @@ -395,74 +419,76 @@ public boolean isPredictiveBackToHomeInProgress() { * @return whether SystemUI is in a state where we can start a system gesture. */ public boolean canStartSystemGesture() { - boolean canStartWithNavHidden = (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 - || (mSystemUiStateFlags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0 + boolean canStartWithNavHidden = (getSysuiStateFlags() & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 + || (getSysuiStateFlags() & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0 || mRotationTouchHelper.isTaskListFrozen(); return canStartWithNavHidden && canStartAnyGesture(); } /** - * @return whether SystemUI is in a state where we can start a system gesture - * from the trackpad. - * Trackpad gestures can start even when the nav bar / task bar is - * hidden in sticky immersive - * mode. + * @return whether SystemUI is in a state where we can start a system gesture from the trackpad. + * Trackpad gestures can start even when the nav bar / task bar is hidden in sticky immersive + * mode. */ public boolean canStartTrackpadGesture() { - boolean trackpadGesturesEnabled = (mSystemUiStateFlags & SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED) == 0; + boolean trackpadGesturesEnabled = + (getSysuiStateFlags() & SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED) == 0; return trackpadGesturesEnabled && canStartAnyGesture(); } + /** + * @return whether SystemUI is in a state that allows the overview command from being started. + */ + public boolean canStartOverviewCommand() { + final long sysUiStateFlags = getSysuiStateFlags(); + final boolean overviewEnabled = !isOverviewDisabled(); + return overviewEnabled && (sysUiStateFlags & GESTURE_OR_KB_SHORTCUT_DISABLING_STATES) == 0; + } + /** * Common logic to determine if either trackpad or finger gesture can be started */ private boolean canStartAnyGesture() { - boolean homeOrOverviewEnabled = (mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0 - || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0; - long gestureDisablingStates = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED - | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING - | SYSUI_STATE_QUICK_SETTINGS_EXPANDED - | SYSUI_STATE_MAGNIFICATION_OVERLAP - | SYSUI_STATE_DEVICE_DREAMING - | SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION; - return (gestureDisablingStates & mSystemUiStateFlags) == 0 && homeOrOverviewEnabled; + boolean homeOrOverviewEnabled = (getSysuiStateFlags() & SYSUI_STATE_HOME_DISABLED) == 0 + || (getSysuiStateFlags() & SYSUI_STATE_OVERVIEW_DISABLED) == 0; + return (GESTURE_OR_KB_SHORTCUT_DISABLING_STATES & getSysuiStateFlags()) == 0 + && homeOrOverviewEnabled; } /** - * @return whether the keyguard is showing and is occluded by an app showing - * above the keyguard + * @return whether the keyguard is showing and is occluded by an app showing above the keyguard * (like camera or maps) */ public boolean isKeyguardShowingOccluded() { - return (mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0; } /** * @return whether screen pinning is enabled and active */ public boolean isScreenPinningActive() { - return (mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_SCREEN_PINNING) != 0; } /** * @return whether assistant gesture is constraint */ public boolean isAssistantGestureIsConstrained() { - return (mSystemUiStateFlags & SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED) != 0; } /** * @return whether the bubble stack is expanded */ public boolean isBubblesExpanded() { - return (mSystemUiStateFlags & SYSUI_STATE_BUBBLES_EXPANDED) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_BUBBLES_EXPANDED) != 0; } /** * @return whether the global actions dialog is showing */ public boolean isSystemUiDialogShowing() { - return (mSystemUiStateFlags & SYSUI_STATE_DIALOG_SHOWING) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_DIALOG_SHOWING) != 0; } /** @@ -476,40 +502,39 @@ public boolean isLockToAppActive() { * @return whether the accessibility menu is available. */ public boolean isAccessibilityMenuAvailable() { - return (mSystemUiStateFlags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0; } /** * @return whether the accessibility menu shortcut is available. */ public boolean isAccessibilityMenuShortcutAvailable() { - return (mSystemUiStateFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0; } /** * @return whether home is disabled (either by SUW/SysUI/device policy) */ public boolean isHomeDisabled() { - return (mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_HOME_DISABLED) != 0; } /** * @return whether overview is disabled (either by SUW/SysUI/device policy) */ public boolean isOverviewDisabled() { - return (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_OVERVIEW_DISABLED) != 0; } /** * @return whether one-handed mode is enabled and active */ public boolean isOneHandedModeActive() { - return (mSystemUiStateFlags & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0; + return (getSysuiStateFlags() & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0; } /** - * Sets the region in screen space where the gestures should be deferred (ie. - * due to specific + * Sets the region in screen space where the gestures should be deferred (ie. due to specific * nav bar ui). */ public void setDeferredGestureRegion(Region deferredGestureRegion) { @@ -517,10 +542,8 @@ public void setDeferredGestureRegion(Region deferredGestureRegion) { } /** - * @return whether the given {@param event} is in the deferred gesture region - * indicating that - * the Launcher should not immediately start the recents animation until - * the gesture + * @return whether the given {@param event} is in the deferred gesture region indicating that + * the Launcher should not immediately start the recents animation until the gesture * passes a certain threshold. */ public boolean isInDeferredGestureRegion(MotionEvent event) { @@ -528,8 +551,7 @@ public boolean isInDeferredGestureRegion(MotionEvent event) { } /** - * @return whether the given {@param event} is in the app-requested - * gesture-exclusion region. + * @return whether the given {@param event} is in the app-requested gesture-exclusion region. * This is only used for quickswitch, and not swipe up. */ public boolean isInExclusionRegion(MotionEvent event) { @@ -558,21 +580,27 @@ public float getAssistantVisibility() { return mAssistantVisibility; } + /** + * @return whether the Assistant gesture can be used in 3 button navigation mode. + */ + public boolean supportsAssistantGestureInButtonNav() { + return Flags.threeButtonCornerSwipe(); + } + /** * @param ev An ACTION_DOWN motion event - * @return whether the given motion event can trigger the assistant over the - * current task. + * @return whether the given motion event can trigger the assistant over the current task. */ public boolean canTriggerAssistantAction(MotionEvent ev) { return mAssistantAvailable - && !QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags) + && !QuickStepContract.isAssistantGestureDisabled(getSysuiStateFlags()) && mRotationTouchHelper.touchInAssistantRegion(ev) + && !isTrackpadScroll(ev) && !isLockToAppActive(); } /** - * One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS, and - * portrait mode + * One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS, and portrait mode * * @param ev The touch screen motion event. * @return whether the given motion event can trigger the one handed mode. @@ -583,9 +611,10 @@ public boolean canTriggerOneHandedAction(MotionEvent ev) { } if (mIsOneHandedModeEnabled) { - final Info displayInfo = mDisplayController.getInfo(); + final Info displayInfo = mDisplayController.getInfoForDisplay(mDisplayId); return (mRotationTouchHelper.touchInOneHandedModeRegion(ev) - && (displayInfo.currentSize.x < displayInfo.currentSize.y)); + && (displayInfo != null + && displayInfo.currentSize.x < displayInfo.currentSize.y)); } return false; } @@ -602,21 +631,13 @@ public boolean isPipActive() { return mPipIsActive; } - public RotationTouchHelper getRotationTouchHelper() { - return mRotationTouchHelper; - } - - /** - * Returns whether IME is rendering nav buttons, and IME is currently showing. - */ + /** Returns whether IME is rendering nav buttons, and IME is currently showing. */ public boolean isImeRenderingNavButtons() { - return mCanImeRenderGesturalNavButtons && mMode == NO_BUTTON - && ((mSystemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0); + return mMode == NO_BUTTON && ((getSysuiStateFlags() & SYSUI_STATE_IME_VISIBLE) != 0); } /** - * Returns the touch slop for {@link InputConsumer}s to compare against before - * pilfering + * Returns the touch slop for {@link InputConsumer}s to compare against before pilfering * pointers. */ public float getTouchSlop() { @@ -625,8 +646,9 @@ public float getTouchSlop() { : QUICKSTEP_TOUCH_SLOP_RATIO_TWO_BUTTON; float touchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop(); - if (mAssistStateManager.getLPNHCustomSlopMultiplier().isPresent()) { - float customSlopMultiplier = mAssistStateManager.getLPNHCustomSlopMultiplier().get(); + if (mContextualSearchStateManager.getLPNHCustomSlopMultiplier().isPresent()) { + float customSlopMultiplier = + mContextualSearchStateManager.getLPNHCustomSlopMultiplier().get(); return customSlopMultiplier * slopMultiplier * touchSlop; } else { return slopMultiplier * touchSlop; @@ -634,35 +656,52 @@ public float getTouchSlop() { } /** - * Returns the squared touch slop for {@link InputConsumer}s to compare against - * before pilfering + * Returns the squared touch slop for {@link InputConsumer}s to compare against before pilfering * pointers. Note that this is squared because it expects to be compared against - * {@link com.android.launcher3.Utilities#squaredHypot} (to avoid square root on - * each event). + * {@link com.android.launcher3.Utilities#squaredHypot} (to avoid square root on each event). */ public float getSquaredTouchSlop() { float touchSlop = getTouchSlop(); return touchSlop * touchSlop; } + /** Returns a string representation of the system ui state flags for the default display. */ public String getSystemUiStateString() { - return QuickStepContract.getSystemUiStateString(mSystemUiStateFlags); + return getSystemUiStateString(getSysuiStateFlags()); + } + + /** Returns a string representation of the system ui state flags. */ + public String getSystemUiStateString(long flags) { + return QuickStepContract.getSystemUiStateString(flags); } public void dump(PrintWriter pw) { pw.println("DeviceState:"); pw.println(" canStartSystemGesture=" + canStartSystemGesture()); - pw.println(" systemUiFlags=" + mSystemUiStateFlags); + pw.println(" systemUiFlagsForDefaultDisplay=" + getSysuiStateFlags()); pw.println(" systemUiFlagsDesc=" + getSystemUiStateString()); pw.println(" assistantAvailable=" + mAssistantAvailable); pw.println(" assistantDisabled=" - + QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)); + + QuickStepContract.isAssistantGestureDisabled(getSysuiStateFlags())); pw.println(" isOneHandedModeEnabled=" + mIsOneHandedModeEnabled); pw.println(" isSwipeToNotificationEnabled=" + mIsSwipeToNotificationEnabled); pw.println(" deferredGestureRegion=" + mDeferredGestureRegion.getBounds()); pw.println(" exclusionRegion=" + mExclusionRegion.getBounds()); pw.println(" pipIsActive=" + mPipIsActive); pw.println(" predictiveBackToHomeInProgress=" + mIsPredictiveBackToHomeInProgress); + pw.println(" RotationTouchHelper:"); mRotationTouchHelper.dump(pw); } + + public int getDisplayId() { + return mDisplayId; + } + + @AssistedFactory + public interface Factory { + /** Creates a new instance of [RecentsAnimationDeviceState] for a given [displayId] and + * [rotationTouchHelper]. */ + RecentsAnimationDeviceState create(int displayId, RotationTouchHelper rotationTouchHelper); + } + } diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java index b1a7ed3aa32..fa4b5543112 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java @@ -18,13 +18,14 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.view.RemoteAnimationTarget.MODE_CLOSING; -import static com.android.window.flags2.Flags.enableDesktopWindowingMode; - import android.app.WindowConfiguration; +import android.content.Context; import android.graphics.Rect; import android.os.Bundle; import android.view.RemoteAnimationTarget; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; + import java.io.PrintWriter; /** @@ -34,14 +35,12 @@ public class RecentsAnimationTargets extends RemoteAnimationTargets { public final Rect homeContentInsets; - public final Rect minimizedHomeBounds; public RecentsAnimationTargets(RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps, - Rect homeContentInsets, Rect minimizedHomeBounds, Bundle extras) { + Rect homeContentInsets, Bundle extras) { super(apps, wallpapers, nonApps, MODE_CLOSING, extras); this.homeContentInsets = homeContentInsets; - this.minimizedHomeBounds = minimizedHomeBounds; } public boolean hasTargets() { @@ -54,8 +53,9 @@ public boolean hasTargets() { * * @return {@code true} if at least one target app is a desktop task */ - public boolean hasDesktopTasks() { - if (!enableDesktopWindowingMode()) { + // TODO: b/362720309 - Remove this function once multi-desks is fully launched. + public boolean hasDesktopTasks(Context context) { + if (!DesktopModeStatus.canEnterDesktopMode(context)) { return false; } for (RemoteAnimationTarget target : apps) { @@ -73,6 +73,5 @@ public void dump(String prefix, PrintWriter pw) { pw.println(prefix + "RecentsAnimationTargets:"); pw.println(prefix + "\thomeContentInsets=" + homeContentInsets); - pw.println(prefix + "\tminimizedHomeBounds=" + minimizedHomeBounds); } } diff --git a/quickstep/src/com/android/quickstep/RecentsFilterState.java b/quickstep/src/com/android/quickstep/RecentsFilterState.java index ff6951d33f9..99c9b5729fa 100644 --- a/quickstep/src/com/android/quickstep/RecentsFilterState.java +++ b/quickstep/src/com/android/quickstep/RecentsFilterState.java @@ -16,9 +16,14 @@ package com.android.quickstep; +import static com.android.quickstep.window.RecentsWindowFlags.enableOverviewOnConnectedDisplays; + import androidx.annotation.Nullable; +import com.android.quickstep.util.DesksUtils; import com.android.quickstep.util.GroupTask; +import com.android.quickstep.views.TaskViewType; +import com.android.systemui.shared.recents.model.Task; import java.util.HashMap; import java.util.List; @@ -37,7 +42,7 @@ public class RecentsFilterState { public static final int MIN_FILTERING_TASK_COUNT = 2; // default filter that returns true for any input - public static final Predicate DEFAULT_FILTER = (groupTask -> true); + public static final Predicate EMPTY_FILTER = (groupTask -> true); // the package name to filter recent tasks by @Nullable @@ -115,16 +120,46 @@ public Map getInstanceCountMap() { * Returns a predicate for filtering out GroupTasks by package name. * * @param packageName package name to filter GroupTasks by - * if null, Predicate always returns true. + * if null, Predicate filters out desktop tasks with no non-minimized tasks, + * unless the multiple desks feature is enabled, which allows empty desks. + * @param displayId filter out tasks not on this display + */ + public static Predicate getFilter(@Nullable String packageName, int displayId) { + Predicate filter = getDesktopTaskFilter(); + if (packageName != null) { + filter = filter.and(groupTask -> groupTask.containsPackage(packageName)); + } + if (enableOverviewOnConnectedDisplays()) { + filter = filter.and(groupTask -> groupTask.matchesDisplayId(displayId)); + } + return filter; + } + + /** + * Returns a predicate that filters out desk tasks that contain no non-minimized desktop tasks, + * unless the multiple desks feature is enabled, which allows empty desks. + */ + public static Predicate getDesktopTaskFilter() { + return RecentsFilterState::shouldKeepGroupTask; + } + + /** + * Returns true if the given `groupTask` should be kept, and false if it should be filtered out. + * Desks will be filtered out if they are empty unless the multiple desks feature is enabled. + * + * @param groupTask The group task to check. */ - public static Predicate getFilter(@Nullable String packageName) { - if (packageName == null) { - return DEFAULT_FILTER; + private static boolean shouldKeepGroupTask(GroupTask groupTask) { + if (groupTask.taskViewType != TaskViewType.DESKTOP) { + return true; } - return (groupTask) -> (groupTask.task2 != null - && groupTask.task2.key.getPackageName().equals(packageName)) - || groupTask.task1.key.getPackageName().equals(packageName); + if (DesksUtils.areMultiDesksFlagsEnabled()) { + return true; + } + + return groupTask.getTasks().stream() + .anyMatch(task -> !task.isMinimized); } /** @@ -136,17 +171,9 @@ public static Map getInstanceCountMap(List groupTask Map instanceCountMap = new HashMap<>(); for (GroupTask groupTask : groupTasks) { - final String firstTaskPkgName = groupTask.task1.key.getPackageName(); - final String secondTaskPkgName = - groupTask.task2 == null ? null : groupTask.task2.key.getPackageName(); - - // increment the instance count for the first task's base activity package name - incrementOrAddIfNotExists(instanceCountMap, firstTaskPkgName); - - // check if second task is non existent - if (secondTaskPkgName != null) { - // increment the instance count for the second task's base activity package name - incrementOrAddIfNotExists(instanceCountMap, secondTaskPkgName); + for (Task t : groupTask.getTasks()) { + final String taskPkgName = t.key.getPackageName(); + incrementOrAddIfNotExists(instanceCountMap, taskPkgName); } } diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java index 0325eaa42d7..9fbf0bc6d58 100644 --- a/quickstep/src/com/android/quickstep/RecentsModel.java +++ b/quickstep/src/com/android/quickstep/RecentsModel.java @@ -17,13 +17,15 @@ import static android.os.Process.THREAD_PRIORITY_BACKGROUND; -import static com.android.launcher3.Flags.enableGridOnlyOverview; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.Flags.enableRefactorTaskThumbnail; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId; +import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.ActivityManager; import android.app.KeyguardManager; +import android.companion.virtual.VirtualDeviceManager; import android.content.ComponentCallbacks; import android.content.ComponentCallbacks2; import android.content.Context; @@ -36,12 +38,25 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import com.android.launcher3.concurrent.annotations.Ui; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.graphics.ThemeManager; +import com.android.launcher3.graphics.ThemeManager.ThemeChangeListener; +import com.android.launcher3.icons.IconChangeTracker; import com.android.launcher3.icons.IconProvider; -import com.android.launcher3.icons.IconProvider.IconChangeListener; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; +import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.Executors.SimpleThreadFactory; -import com.android.launcher3.util.MainThreadInitializedObject; +import com.android.launcher3.util.LockedUserState; +import com.android.launcher3.util.LooperExecutor; import com.android.launcher3.util.SafeCloseable; +import com.android.launcher3.util.coroutines.DispatcherProvider; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; import com.android.quickstep.recents.data.RecentTasksDataSource; +import com.android.quickstep.recents.data.TaskVisualsChangeNotifier; +import com.android.quickstep.util.DesktopTask; import com.android.quickstep.util.GroupTask; import com.android.quickstep.util.TaskVisualsChangeListener; import com.android.systemui.shared.recents.model.Task; @@ -50,14 +65,20 @@ import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; +import dagger.Lazy; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executor; import java.util.concurrent.Executors; +import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Predicate; +import javax.inject.Inject; + import app.lawnchair.LawnchairApp; import app.lawnchair.compat.LawnchairQuickstepCompat; @@ -65,53 +86,106 @@ * Singleton class to load and manage recents model. */ @TargetApi(Build.VERSION_CODES.O) -public class RecentsModel implements RecentTasksDataSource, IconChangeListener, - TaskStackChangeListener, TaskVisualsChangeListener, SafeCloseable { +@LauncherAppSingleton +public class RecentsModel implements RecentTasksDataSource, TaskStackChangeListener, + TaskVisualsChangeListener, TaskVisualsChangeNotifier, + ThemeChangeListener { // We do not need any synchronization for this variable as its only written on UI thread. - public static final MainThreadInitializedObject INSTANCE = - new MainThreadInitializedObject<>(RecentsModel::new); + public static final DaggerSingletonObject INSTANCE = + new DaggerSingletonObject<>(QuickstepBaseAppComponent::getRecentsModel); private static final Executor RECENTS_MODEL_EXECUTOR = Executors.newSingleThreadExecutor( new SimpleThreadFactory("TaskThumbnailIconCache-", THREAD_PRIORITY_BACKGROUND)); - private final List mThumbnailChangeListeners = new ArrayList<>(); - private final Context mContext; + private final ConcurrentLinkedQueue mThumbnailChangeListeners = + new ConcurrentLinkedQueue<>(); + private final ConcurrentLinkedQueue mRecentTasksChangedListeners = + new ConcurrentLinkedQueue<>(); + private final RecentTasksChangedListener mRecentTasksListObserver = + new RecentTasksChangedListener() { + @Override + public void onRecentTasksChanged() { + mRecentTasksChangedListeners.forEach( + RecentTasksChangedListener::onRecentTasksChanged); + } + }; + private final Context mContext; private final RecentTasksList mTaskList; private final TaskIconCache mIconCache; private final TaskThumbnailCache mThumbnailCache; - private final ComponentCallbacks mCallbacks; - - private final TaskStackChangeListeners mTaskStackChangeListeners; - - private RecentsModel(Context context) { - this(context, new IconProvider(context)); + private final LooperExecutor mUiExecutor; + + @Inject + public RecentsModel(@ApplicationContext Context context, + SystemUiProxy systemUiProxy, + TopTaskTracker topTaskTracker, + DisplayController displayController, + LockedUserState lockedUserState, + Lazy themeManagerLazy, + DaggerSingletonTracker tracker, + DispatcherProvider dispatcherProvider, + @Ui LooperExecutor uiExecutor, + IconChangeTracker iconChangeTracker + ) { + // Lazily inject the ThemeManager and access themeManager once the device is + // unlocked. See b/393248495 for details. + this(context, new IconProvider(context), systemUiProxy, topTaskTracker, + displayController, lockedUserState, themeManagerLazy, tracker, dispatcherProvider, + uiExecutor, iconChangeTracker); } - private RecentsModel(Context context, IconProvider iconProvider) { + @SuppressLint("VisibleForTests") + private RecentsModel(@ApplicationContext Context context, + IconProvider iconProvider, + SystemUiProxy systemUiProxy, + TopTaskTracker topTaskTracker, + DisplayController displayController, + LockedUserState lockedUserState, + Lazy themeManagerLazy, + DaggerSingletonTracker tracker, + DispatcherProvider dispatcherProvider, + @Ui LooperExecutor uiExecutor, + IconChangeTracker iconChangeTracker) { this(context, - new RecentTasksList(MAIN_EXECUTOR, + new RecentTasksList( + context, + uiExecutor, context.getSystemService(KeyguardManager.class), - SystemUiProxy.INSTANCE.get(context), - TopTaskTracker.INSTANCE.get(context)), - new TaskIconCache(context, RECENTS_MODEL_EXECUTOR, iconProvider), - new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR), - iconProvider, - TaskStackChangeListeners.getInstance()); + context.getSystemService(VirtualDeviceManager.class), + systemUiProxy, + topTaskTracker, tracker), + new TaskIconCache(context, RECENTS_MODEL_EXECUTOR, iconProvider, displayController, + dispatcherProvider), + new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR, dispatcherProvider), + TaskStackChangeListeners.getInstance(), + lockedUserState, + themeManagerLazy, + tracker, + uiExecutor, iconChangeTracker); } @VisibleForTesting - RecentsModel(Context context, RecentTasksList taskList, TaskIconCache iconCache, - TaskThumbnailCache thumbnailCache, IconProvider iconProvider, - TaskStackChangeListeners taskStackChangeListeners) { + RecentsModel(@ApplicationContext Context context, + RecentTasksList taskList, + TaskIconCache iconCache, + TaskThumbnailCache thumbnailCache, + TaskStackChangeListeners taskStackChangeListeners, + LockedUserState lockedUserState, + Lazy themeManagerLazy, + DaggerSingletonTracker tracker, + @Ui LooperExecutor uiExecutor, + IconChangeTracker iconChangeTracker) { mContext = context; mTaskList = taskList; + mTaskList.registerRecentTasksChangedListener(mRecentTasksListObserver); mIconCache = iconCache; mIconCache.registerTaskVisualsChangeListener(this); mThumbnailCache = thumbnailCache; - if (enableGridOnlyOverview()) { - mCallbacks = new ComponentCallbacks() { + mUiExecutor = uiExecutor; + if (isCachePreloadingEnabled()) { + ComponentCallbacks componentCallbacks = new ComponentCallbacks() { @Override public void onConfigurationChanged(Configuration configuration) { updateCacheSizeAndPreloadIfNeeded(); @@ -121,16 +195,35 @@ public void onConfigurationChanged(Configuration configuration) { public void onLowMemory() { } }; - context.registerComponentCallbacks(mCallbacks); - } else { - mCallbacks = null; + context.registerComponentCallbacks(componentCallbacks); + tracker.addCloseable(() -> context.unregisterComponentCallbacks(componentCallbacks)); } - mTaskStackChangeListeners = taskStackChangeListeners; if (LawnchairApp.isRecentsEnabled()) { TaskStackChangeListeners.getInstance().registerTaskStackListener(this); } - iconProvider.registerIconChangeListener(this, MAIN_EXECUTOR.getHandler()); + SafeCloseable iconChangeCloseable = iconChangeTracker.getChanges().forEach( + mUiExecutor, it -> { + onAppIconChanged(it.mPackageName, it.mUser); + return null; + }); + + Runnable unlockCallback = () -> themeManagerLazy.get().addChangeListener(this); + lockedUserState.runOnUserUnlocked(unlockCallback); + + tracker.addCloseable(() -> { + if (LawnchairApp.isRecentsEnabled()) { + TaskStackChangeListeners.getInstance().unregisterTaskStackListener(this); + mTaskList.unregisterRecentTasksChangedListener(); + } + iconChangeCloseable.close(); + mIconCache.removeTaskVisualsChangeListener(); + if (lockedUserState.isUserUnlocked()) { + themeManagerLazy.get().removeChangeListener(this); + } else { + lockedUserState.removeOnUserUnlockedRunnable(unlockCallback); + } + }); } public TaskIconCache getIconCache() { @@ -143,7 +236,7 @@ public TaskThumbnailCache getThumbnailCache() { /** * Fetches the list of recent tasks. Tasks are ordered by recency, with the latest active tasks - * at the end of the list. + * at the end of the list. Filters out desktop tasks that contain no non-minimized tasks. * * @param callback The callback to receive the task plan once its complete or null. This is * always called on the UI thread. @@ -152,20 +245,34 @@ public TaskThumbnailCache getThumbnailCache() { @Override public int getTasks(@Nullable Consumer> callback) { return mTaskList.getTasks(false /* loadKeysOnly */, callback, - RecentsFilterState.DEFAULT_FILTER); + RecentsFilterState.getDesktopTaskFilter()); } /** * Fetches the list of recent tasks, based on a filter * + * @param filter Returns true if a GroupTask should be included into the list passed into + * callback. * @param callback The callback to receive the task plan once its complete or null. This is - * always called on the UI thread. + * always called on the UI thread. + * @return the request id associated with this call. + */ + public int getTasks(Predicate filter, @Nullable Consumer> callback) { + return mTaskList.getTasks(false /* loadKeysOnly */, callback, filter); + } + + /** + * Fetches the list of recent tasks, based on a filter + * + * @param callback The callback to receive the task plan and request ID once its complete or + * null. This is always called on the UI thread. * @param filter Returns true if a GroupTask should be included into the list passed into * callback. * @return the request id associated with this call. */ - public int getTasks(@Nullable Consumer> callback, Predicate filter) { - return mTaskList.getTasks(false /* loadKeysOnly */, callback, filter); + public int getTasks( + @Nullable BiConsumer, Integer> callback, Predicate filter) { + return mTaskList.getTasks(/* loadKeysOnly= */ false, callback, filter); } /** @@ -228,8 +335,8 @@ public void onTaskStackChangedBackground() { // time the user next enters overview continue; } - mThumbnailCache.updateThumbnailInCache(group.task1, /* lowResolution= */ true); - mThumbnailCache.updateThumbnailInCache(group.task2, /* lowResolution= */ true); + group.getTasks().forEach( + t -> mThumbnailCache.updateThumbnailInCache(t, /* lowResolution= */ true)); } }); } @@ -238,8 +345,8 @@ public void onTaskStackChangedBackground() { public boolean onTaskSnapshotChanged(int taskId, ThumbnailData snapshot) { mThumbnailCache.updateTaskSnapShot(taskId, snapshot); - for (int i = mThumbnailChangeListeners.size() - 1; i >= 0; i--) { - Task task = mThumbnailChangeListeners.get(i).onTaskThumbnailChanged(taskId, snapshot); + for (TaskVisualsChangeListener listener : mThumbnailChangeListeners) { + Task task = listener.onTaskThumbnailChanged(taskId, snapshot); if (task != null) { task.thumbnail = snapshot; } @@ -247,8 +354,17 @@ public boolean onTaskSnapshotChanged(int taskId, ThumbnailData snapshot) { return true; } + @Override + public void onRecentTaskRemovedForAddTask(int taskId) { + removeTask(taskId); + } + @Override public void onTaskRemoved(int taskId) { + removeTask(taskId); + } + + private void removeTask(int taskId) { Task.TaskKey stubKey = new Task.TaskKey(taskId, 0, new Intent(), null, 0, 0); mThumbnailCache.remove(stubKey); mIconCache.onTaskRemoved(stubKey); @@ -265,11 +381,10 @@ public void onTrimMemory(int level) { } } - @Override - public void onAppIconChanged(String packageName, UserHandle user) { + private void onAppIconChanged(String packageName, UserHandle user) { mIconCache.invalidateCacheEntries(packageName, user); - for (int i = mThumbnailChangeListeners.size() - 1; i >= 0; i--) { - mThumbnailChangeListeners.get(i).onTaskIconChanged(packageName, user); + for (TaskVisualsChangeListener listener : mThumbnailChangeListeners) { + listener.onTaskIconChanged(packageName, user); } } @@ -281,13 +396,14 @@ public void onTaskIconChanged(int taskId) { } @Override - public void onSystemIconStateChanged(String iconState) { + public void onThemeChanged() { mIconCache.clearCache(); } /** * Adds a listener for visuals changes */ + @Override public void addThumbnailChangeListener(TaskVisualsChangeListener listener) { mThumbnailChangeListeners.add(listener); } @@ -295,6 +411,7 @@ public void addThumbnailChangeListener(TaskVisualsChangeListener listener) { /** * Removes a previously added listener */ + @Override public void removeThumbnailChangeListener(TaskVisualsChangeListener listener) { mThumbnailChangeListeners.remove(listener); } @@ -306,6 +423,8 @@ public void dump(String prefix, PrintWriter writer) { /** * Registers a listener for running tasks + * TODO(b/343292503): Should we remove RunningTasksListener entirely if it's not needed? + * (Note that Desktop mode gets the running tasks by checking {@link DesktopTask#tasks} */ public void registerRunningTasksListener(RunningTasksListener listener) { mTaskList.registerRunningTasksListener(listener); @@ -318,6 +437,20 @@ public void unregisterRunningTasksListener() { mTaskList.unregisterRunningTasksListener(); } + /** + * Registers a listener for recent tasks + */ + public void registerRecentTasksChangedListener(RecentTasksChangedListener listener) { + mRecentTasksChangedListeners.add(listener); + } + + /** + * Removes the previously registered running tasks listener + */ + public void unregisterRecentTasksChangedListener(RecentTasksChangedListener listener) { + mRecentTasksChangedListeners.remove(listener); + } + /** * Gets the set of running tasks. */ @@ -330,7 +463,7 @@ public ArrayList getRunningTasks() { * highResLoadingState is enabled */ public void preloadCacheIfNeeded() { - if (!enableGridOnlyOverview()) { + if (!isCachePreloadingEnabled()) { return; } @@ -346,8 +479,8 @@ public void preloadCacheIfNeeded() { mTaskList.getTaskKeys(mThumbnailCache.getCacheSize(), taskGroups -> { for (GroupTask group : taskGroups) { - mThumbnailCache.updateThumbnailInCache(group.task1, /* lowResolution= */ false); - mThumbnailCache.updateThumbnailInCache(group.task2, /* lowResolution= */ false); + group.getTasks().forEach( + t -> mThumbnailCache.updateThumbnailInCache(t, /* lowResolution= */ false)); } }); } @@ -356,7 +489,7 @@ public void preloadCacheIfNeeded() { * Updates cache size and preloads more tasks if cache size increases */ public void updateCacheSizeAndPreloadIfNeeded() { - if (!enableGridOnlyOverview()) { + if (!isCachePreloadingEnabled()) { return; } @@ -366,13 +499,8 @@ public void updateCacheSizeAndPreloadIfNeeded() { } } - @Override - public void close() { - if (mCallbacks != null) { - mContext.unregisterComponentCallbacks(mCallbacks); - } - mIconCache.removeTaskVisualsChangeListener(); - mTaskStackChangeListeners.unregisterTaskStackListener(this); + private boolean isCachePreloadingEnabled() { + return enableGridOnlyOverview() || enableRefactorTaskThumbnail(); } /** @@ -384,4 +512,14 @@ public interface RunningTasksListener { */ void onRunningTasksChanged(); } -} \ No newline at end of file + + /** + * Listener for receiving recent tasks changes + */ + public interface RecentTasksChangedListener { + /** + * Called when there's a change to recent tasks + */ + void onRecentTasksChanged(); + } +} diff --git a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java index 0bb825f3176..60b1ff3e4d5 100644 --- a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java +++ b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java @@ -20,10 +20,12 @@ import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; import android.os.Bundle; +import android.util.Log; import android.view.RemoteAnimationTarget; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; import java.util.concurrent.CopyOnWriteArrayList; /** @@ -31,6 +33,8 @@ */ public class RemoteAnimationTargets { + private static final String TAG = "RemoteAnimationTargets"; + private final CopyOnWriteArrayList mReleaseChecks = new CopyOnWriteArrayList<>(); public final RemoteAnimationTarget[] unfilteredApps; @@ -79,6 +83,8 @@ public RemoteAnimationTarget findTask(int taskId) { return target; } } + Log.e(TAG, "taskId: " + taskId + " not found. apps contains: " + + Arrays.stream(apps).map(target -> target.taskId).toList()); return null; } diff --git a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java index 7cb1ab400fb..fe5c5fe329d 100644 --- a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java +++ b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java @@ -16,26 +16,28 @@ package com.android.quickstep; -import static com.android.quickstep.util.SplitScreenUtils.convertShellSplitBoundsToLauncher; -import static com.android.wm.shell.util.SplitBounds.KEY_EXTRA_SPLIT_BOUNDS; +import static com.android.wm.shell.shared.desktopmode.DesktopModeStatus.enableMultipleDesktops; +import static com.android.wm.shell.shared.split.SplitBounds.KEY_EXTRA_SPLIT_BOUNDS; import static java.util.stream.Collectors.toList; import android.app.WindowConfiguration; import android.content.Context; -import android.graphics.Rect; import android.util.Log; import android.view.RemoteAnimationTarget; +import android.window.TransitionInfo; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.statehandlers.DesktopVisibilityController; -import com.android.launcher3.util.SplitConfigurationOptions; import com.android.quickstep.util.AnimatorControllerWithResistance; import com.android.quickstep.util.TaskViewSimulator; import com.android.quickstep.util.TransformParams; -import com.android.wm.shell.util.SplitBounds; +import com.android.wm.shell.shared.GroupedTaskInfo; +import com.android.wm.shell.shared.split.SplitBounds; + +import kotlin.collections.CollectionsKt; import java.util.ArrayList; import java.util.Arrays; @@ -51,58 +53,75 @@ public class RemoteTargetGluer { // This is the default number of handles to create when we don't know how many tasks are running // (e.g. if we're in split screen). Allocate extra for potential tasks overlaid, like volume. - private static final int DEFAULT_NUM_HANDLES = 4; - + private static final int DEFAULT_NUM_HANDLES = 10; private RemoteTargetHandle[] mRemoteTargetHandles; - private SplitConfigurationOptions.SplitBounds mSplitBounds; + private SplitBounds mSplitBounds; /** * Use this constructor if remote targets are split-screen independent */ public RemoteTargetGluer(Context context, BaseContainerInterface sizingStrategy, RemoteAnimationTargets targets, boolean forDesktop) { - init(context, sizingStrategy, targets.apps.length, forDesktop); + mRemoteTargetHandles = createHandles(context, sizingStrategy, forDesktop, + targets.apps.length); } /** * Use this constructor if you want the number of handles created to match the number of active * running tasks */ - public RemoteTargetGluer(Context context, BaseContainerInterface sizingStrategy) { - DesktopVisibilityController desktopVisibilityController = - LauncherActivityInterface.INSTANCE.getDesktopVisibilityController(); - if (desktopVisibilityController != null) { - int visibleTasksCount = desktopVisibilityController.getVisibleDesktopTasksCount(); + public RemoteTargetGluer(Context context, BaseContainerInterface sizingStrategy, + @Nullable GroupedTaskInfo groupedTaskInfo) { + if (enableMultipleDesktops(context)) { + if (groupedTaskInfo != null && groupedTaskInfo.isBaseType(GroupedTaskInfo.TYPE_DESK)) { + // Allocate +1 to account for the DesktopWallpaperActivity added to the desk. + int numHandles = groupedTaskInfo.getTaskInfoList().size() + 1; + mRemoteTargetHandles = createHandles(context, sizingStrategy, + /* forDesktop = */ true, numHandles); + return; + } + } else { + int visibleTasksCount = DesktopVisibilityController.INSTANCE.get(context) + .getVisibleDesktopTasksCountDeprecated(); if (visibleTasksCount > 0) { - // Allocate +1 to account for a new task added to the desktop mode + // Allocate +1 to account for the DesktopWallpaperActivity added to the desk. int numHandles = visibleTasksCount + 1; - init(context, sizingStrategy, numHandles, true /* forDesktop */); + mRemoteTargetHandles = createHandles(context, sizingStrategy, + /* forDesktop = */ true, numHandles); return; } } // Assume 2 handles needed for split, scale down as needed later on when we actually // get remote targets - init(context, sizingStrategy, DEFAULT_NUM_HANDLES, false /* forDesktop */); + mRemoteTargetHandles = createHandles(context, sizingStrategy, /* forDesktop = */ false, + DEFAULT_NUM_HANDLES); } - private void init(Context context, BaseContainerInterface sizingStrategy, int numHandles, - boolean forDesktop) { - mRemoteTargetHandles = createHandles(context, sizingStrategy, numHandles, forDesktop); + /* + * Use this constructor if you have an existing array of RemoteTargetHandles you want to glue. + */ + public RemoteTargetGluer(RemoteTargetHandle[] handles) { + mRemoteTargetHandles = handles; } private RemoteTargetHandle[] createHandles(Context context, - BaseContainerInterface sizingStrategy, int numHandles, boolean forDesktop) { + BaseContainerInterface sizingStrategy, boolean forDesktop, int numHandles) { RemoteTargetHandle[] handles = new RemoteTargetHandle[numHandles]; for (int i = 0; i < numHandles; i++) { - TaskViewSimulator tvs = new TaskViewSimulator(context, sizingStrategy); - tvs.setIsDesktopTask(forDesktop); - TransformParams transformParams = new TransformParams(); - handles[i] = new RemoteTargetHandle(tvs, transformParams); + handles[i] = createHandle(context, sizingStrategy, forDesktop, i); } return handles; } + private RemoteTargetHandle createHandle(Context context, + BaseContainerInterface sizingStrategy, boolean forDesktop, int taskIndex) { + TaskViewSimulator tvs = new TaskViewSimulator( + context, sizingStrategy, forDesktop , taskIndex); + TransformParams transformParams = new TransformParams(); + return new RemoteTargetHandle(tvs, transformParams); + } + /** * Pairs together {@link TaskViewSimulator}s and {@link TransformParams} into a * {@link RemoteTargetHandle} @@ -127,7 +146,7 @@ public RemoteTargetHandle[] assignTargets(RemoteAnimationTargets targets) { * information specified. */ public RemoteTargetHandle[] assignTargetsForSplitScreen(RemoteAnimationTargets targets, - SplitConfigurationOptions.SplitBounds splitBounds) { + SplitBounds splitBounds) { mSplitBounds = splitBounds; return assignTargetsForSplitScreen(targets); } @@ -138,17 +157,13 @@ public RemoteTargetHandle[] assignTargetsForSplitScreen(RemoteAnimationTargets t * the left/top task, index 1 right/bottom. */ public RemoteTargetHandle[] assignTargetsForSplitScreen(RemoteAnimationTargets targets) { - resizeRemoteTargetHandles(targets); - // If we are in a true split screen case (2 apps running on screen), either: // a) mSplitBounds was already set (from the clicked GroupedTaskView) // b) A SplitBounds was passed up from shell (via AbsSwipeUpHandler) // If both of these are null, we are in a 1-app or 1-app-plus-assistant case. if (mSplitBounds == null && targets.extras != null && targets.extras.containsKey(KEY_EXTRA_SPLIT_BOUNDS)) { - SplitBounds shellSplitBounds = targets.extras.getParcelable(KEY_EXTRA_SPLIT_BOUNDS, - SplitBounds.class); - mSplitBounds = convertShellSplitBoundsToLauncher(shellSplitBounds); + mSplitBounds = targets.extras.getParcelable(KEY_EXTRA_SPLIT_BOUNDS, SplitBounds.class); } boolean containsSplitTargets = mSplitBounds != null; @@ -156,103 +171,192 @@ public RemoteTargetHandle[] assignTargetsForSplitScreen(RemoteAnimationTargets t mRemoteTargetHandles.length + " appsLength: " + targets.apps.length); if (mRemoteTargetHandles.length == 1) { + resizeRemoteTargetHandles(targets); // Single fullscreen app // If we're not in split screen, the splitIds count doesn't really matter since we // should always hit this case. - mRemoteTargetHandles[0].mTransformParams.setTargetSet(targets); - if (targets.apps.length > 0) { - // Unclear why/when target.apps length == 0, but it sure does happen :( - mRemoteTargetHandles[0].mTaskViewSimulator.setPreview(targets.apps[0], null); - } + setRemoteTargetHandle(mRemoteTargetHandles[0], + targets, + targets.apps.length > 0 ? targets.apps[0] : null, + /* targetsToExclude = */ null, /* transitionInfo = */ null, + /* splitBounds = */ null); } else if (!containsSplitTargets) { + resizeRemoteTargetHandles(targets); // Single App + Assistant for (int i = 0; i < mRemoteTargetHandles.length; i++) { - mRemoteTargetHandles[i].mTransformParams.setTargetSet(targets); - mRemoteTargetHandles[i].mTaskViewSimulator.setPreview(targets.apps[i], null); + setRemoteTargetHandle(mRemoteTargetHandles[i], + targets, targets.apps[i], /* targetsToExclude = */ null, + /* transitionInfo = */ null, /* splitBounds = */ null); } - } else { - // Split apps (+ maybe assistant) - RemoteAnimationTarget topLeftTarget = targets.findTask(mSplitBounds.leftTopTaskId); - RemoteAnimationTarget bottomRightTarget = targets.findTask( - mSplitBounds.rightBottomTaskId); - List overlayTargets = Arrays.stream(targets.apps).filter( - target -> target.windowConfiguration.getWindowingMode() - != WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW).collect(toList()); - - // remoteTargetHandle[0] denotes topLeft task, so we pass in the bottomRight to exclude, - // vice versa - mRemoteTargetHandles[0].mTransformParams.setTargetSet( - createRemoteAnimationTargetsForTarget(targets, - Collections.singletonList(bottomRightTarget))); - mRemoteTargetHandles[0].mTaskViewSimulator.setPreview(topLeftTarget, mSplitBounds); - - mRemoteTargetHandles[1].mTransformParams.setTargetSet( - createRemoteAnimationTargetsForTarget(targets, - Collections.singletonList(topLeftTarget))); - mRemoteTargetHandles[1].mTaskViewSimulator.setPreview(bottomRightTarget, mSplitBounds); - - // Set the remaining overlay tasks to be their own TaskViewSimulator as fullscreen tasks - if (!overlayTargets.isEmpty()) { - ArrayList targetsToExclude = new ArrayList<>(); - targetsToExclude.add(topLeftTarget); - targetsToExclude.add(bottomRightTarget); - // Start i at 2 to account for top/left and bottom/right split handles already made - for (int i = 2; i < targets.apps.length; i++) { - if (i >= mRemoteTargetHandles.length) { - Log.e(TAG, String.format("Attempting to animate an untracked target" - + " (%d handles allocated, but %d want to animate)", - mRemoteTargetHandles.length, targets.apps.length)); - break; - } - mRemoteTargetHandles[i].mTransformParams.setTargetSet( - createRemoteAnimationTargetsForTarget(targets, targetsToExclude)); - mRemoteTargetHandles[i].mTaskViewSimulator.setPreview( - overlayTargets.get(i - 2)); - } + } else if (mSplitBounds != null) { + setSplitRemoteTargetHandles(targets); + } + return mRemoteTargetHandles; + } + + private void setSplitRemoteTargetHandles(RemoteAnimationTargets targets) { + // Split apps (+ maybe assistant) + final List leftTopTargetIds = mSplitBounds.leftTopTaskIds; + final List rightBottomTargetIds = mSplitBounds.rightBottomTaskIds; + if (leftTopTargetIds.isEmpty() || rightBottomTargetIds.isEmpty()) { + throw new IllegalStateException("The target ids is invalid: mSplitBounds = " + + mSplitBounds); + } + final List leftTopTargets = + CollectionsKt.mapNotNull(leftTopTargetIds, targets::findTask); + final List rightBottomTargets = + CollectionsKt.mapNotNull(rightBottomTargetIds, targets::findTask); + + final List overlayTargets = Arrays.stream(targets.apps).filter( + target -> isOverlayTarget(target, leftTopTargets, + rightBottomTargets)).toList(); + final int handleCount = leftTopTargets.size() + rightBottomTargets.size() + + overlayTargets.size(); + if (handleCount > targets.apps.length) { + throw new IllegalStateException("Attempting to animate app count:" + handleCount + + "but the total app count: " + targets.apps.length); + } + if (handleCount > mRemoteTargetHandles.length) { + throw new IllegalStateException("Attempting to animate app count:" + handleCount + + "but the max handle count: " + mRemoteTargetHandles.length); + } + if (handleCount < mRemoteTargetHandles.length) { + reduceRemoteTargetHandles(handleCount); + } + int taskIndex = 0; + for (final RemoteAnimationTarget target : leftTopTargets) { + setRemoteTargetHandle(mRemoteTargetHandles[taskIndex++], targets, target, + rightBottomTargets, /* transitionInfo = */ null, mSplitBounds); + } + for (final RemoteAnimationTarget target : rightBottomTargets) { + setRemoteTargetHandle(mRemoteTargetHandles[taskIndex++], targets, target, + leftTopTargets, /* transitionInfo = */ null, mSplitBounds); + } + // Set the remaining overlay tasks to be their own TaskViewSimulator as fullscreen tasks + if (!overlayTargets.isEmpty()) { + List targetsToExclude = new ArrayList<>(leftTopTargets); + targetsToExclude.addAll(rightBottomTargets); + for (final RemoteAnimationTarget target : overlayTargets) { + setRemoteTargetHandle(mRemoteTargetHandles[taskIndex++], targets, target, + targetsToExclude, /* transitionInfo = */ null, /* splitBounds = */ null); } } - return mRemoteTargetHandles; } /** * Similar to {@link #assignTargets(RemoteAnimationTargets)}, except this creates distinct * transform params per app in {@code targets.apps} list. */ - public RemoteTargetHandle[] assignTargetsForDesktop(RemoteAnimationTargets targets) { + public RemoteTargetHandle[] assignTargetsForDesktop( + RemoteAnimationTargets targets, @Nullable TransitionInfo transitionInfo) { resizeRemoteTargetHandles(targets); for (int i = 0; i < mRemoteTargetHandles.length; i++) { - RemoteAnimationTarget primaryTaskTarget = targets.apps[i]; - List excludeTargets = Arrays.stream(targets.apps) - .filter(target -> target.taskId != primaryTaskTarget.taskId).collect(toList()); - mRemoteTargetHandles[i].mTransformParams.setTargetSet( - createRemoteAnimationTargetsForTarget(targets, excludeTargets)); - mRemoteTargetHandles[i].mTaskViewSimulator.setPreview(primaryTaskTarget, null); + assignTargetsToHandleForDesktop(mRemoteTargetHandles[i], i, targets, transitionInfo); + } + return mRemoteTargetHandles; + } + + /** + * Creates a new RemoteTargetHandle for each app in {@code targets}, assigns targets to each + * one, then prepends them to mRemoteTargetHandles, similar to + * {@link #assignTargetsForDesktop(RemoteAnimationTargets, TransitionInfo)}. + */ + public RemoteTargetHandle[] insertNewHandlesInFrontAndAssignTargetsForDesktop( + Context context, + BaseContainerInterface sizingStrategy, + RemoteAnimationTargets targets, + @Nullable TransitionInfo transitionInfo + ) { + // Create a new array with space for the new handles. + RemoteTargetHandle[] tempArray = + new RemoteTargetHandle[mRemoteTargetHandles.length + targets.apps.length]; + + // Copy the existing handles to the end of the new array. + System.arraycopy(mRemoteTargetHandles, 0, tempArray, targets.apps.length, + mRemoteTargetHandles.length); + + for (int i = 0; i < targets.apps.length; i++) { + tempArray[i] = createHandle(context, sizingStrategy, true, i); + assignTargetsToHandleForDesktop(tempArray[i], i, targets, transitionInfo); } + + mRemoteTargetHandles = tempArray; return mRemoteTargetHandles; } + private void assignTargetsToHandleForDesktop( + RemoteTargetHandle handle, + int handleIndex, + RemoteAnimationTargets targets, + @Nullable TransitionInfo transitionInfo) { + RemoteAnimationTarget primaryTaskTarget = targets.apps[handleIndex]; + List excludeTargets = Arrays.stream(targets.apps) + .filter(target -> target.taskId != primaryTaskTarget.taskId).collect(toList()); + setRemoteTargetHandle(handle, targets, primaryTaskTarget, + excludeTargets, transitionInfo, /* splitBounds = */ null); + } + + private boolean isOverlayTarget(@NonNull RemoteAnimationTarget target, + @NonNull List leftTopTargets, + @NonNull List rightBottomTargets) { + return target.windowConfiguration.getWindowingMode() + != WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW + && !leftTopTargets.contains(target) + && !rightBottomTargets.contains(target); + } + /** * Resize the `mRemoteTargetHandles` array since we assumed initial size, but * `targets.apps` is the ultimate source of truth here */ private void resizeRemoteTargetHandles(RemoteAnimationTargets targets) { - long appCount = Arrays.stream(targets.apps) + int handleCount = (int) Arrays.stream(targets.apps) .filter(app -> app.mode == targets.targetMode) .count(); - Log.d(TAG, "appCount: " + appCount + " handleLength: " + mRemoteTargetHandles.length); - if (appCount < mRemoteTargetHandles.length) { - Log.d(TAG, "resizing handles"); - RemoteTargetHandle[] newHandles = new RemoteTargetHandle[(int) appCount]; - System.arraycopy(mRemoteTargetHandles, 0/*src*/, newHandles, 0/*dst*/, (int) appCount); - mRemoteTargetHandles = newHandles; + Log.d(TAG, "appCount: " + handleCount + " handleLength: " + mRemoteTargetHandles.length); + if (handleCount < mRemoteTargetHandles.length) { + reduceRemoteTargetHandles(handleCount); } } - private Rect getStartBounds(RemoteAnimationTarget target) { - return target.startBounds == null ? target.screenSpaceBounds : target.startBounds; + /** + * Reduces the number of remote target handles to a specified count. + * The caller is responsible for ensuring that the target {@code handleCount} + * is always less than the current number of remote target handles + * ({@link #mRemoteTargetHandles}'s current size). + * + * @param handleCount The desired number of remote target handles after reduction. + * This value should be non-negative and less than the current size of the handle list. + */ + private void reduceRemoteTargetHandles(int handleCount) { + Log.d(TAG, "Reduce handles, count: " + handleCount); + RemoteTargetHandle[] newHandles = new RemoteTargetHandle[(int) handleCount]; + System.arraycopy(mRemoteTargetHandles, 0/*src*/, newHandles, 0/*dst*/, (int) handleCount); + mRemoteTargetHandles = newHandles; + } + + private void setRemoteTargetHandle( + @NonNull RemoteTargetHandle handle, + @NonNull RemoteAnimationTargets targets, + @Nullable RemoteAnimationTarget target, + @Nullable List targetsToExclude, + @Nullable TransitionInfo transitionInfo, + @Nullable SplitBounds splitBounds) { + if (targetsToExclude != null) { + handle.mTransformParams.setTargetSet( + createRemoteAnimationTargetsForTarget(targets, targetsToExclude)); + } else { + handle.mTransformParams.setTargetSet(targets); + } + if (transitionInfo != null) { + handle.mTransformParams.setTransitionInfo(transitionInfo); + } + if (target != null) { + handle.mTaskViewSimulator.setPreview(target, splitBounds); + } } /** @@ -306,7 +410,7 @@ public RemoteTargetHandle[] getRemoteTargetHandles() { return mRemoteTargetHandles; } - public SplitConfigurationOptions.SplitBounds getSplitBounds() { + public SplitBounds getSplitBounds() { return mSplitBounds; } diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java index ddeb6668af3..eb1e4af566b 100644 --- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java +++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java @@ -15,7 +15,6 @@ */ package com.android.quickstep; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Surface.ROTATION_0; import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe; @@ -25,49 +24,64 @@ import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE; import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION; import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.NavigationMode.THREE_BUTTONS; +import android.annotation.NonNull; import android.content.Context; import android.content.res.Resources; +import android.util.Log; import android.view.MotionEvent; import android.view.OrientationEventListener; +import com.android.app.displaylib.PerDisplayRepository; +import com.android.launcher3.dagger.WindowContext; import com.android.launcher3.testing.shared.TestProtocol; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener; +import com.android.launcher3.concurrent.annotations.LightweightBackground; +import static com.android.launcher3.concurrent.annotations.LightweightBackgroundPriority.UI; import com.android.launcher3.util.DisplayController.Info; -import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.NavigationMode; -import com.android.launcher3.util.SafeCloseable; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; import com.android.quickstep.util.RecentsOrientedState; +import com.android.systemui.shared.Flags; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; + import java.io.PrintWriter; -import java.util.ArrayList; +import java.util.concurrent.Executor; + +import javax.inject.Inject; import app.lawnchair.util.LawnchairUtilsKt; /** * Helper class for transforming touch events */ -public class RotationTouchHelper implements DisplayInfoChangeListener, SafeCloseable { - - public static final MainThreadInitializedObject INSTANCE = new MainThreadInitializedObject<>( - RotationTouchHelper::new); - - private OrientationTouchTransformer mOrientationTouchTransformer; - private DisplayController mDisplayController; - private int mDisplayId; +public class RotationTouchHelper implements DisplayInfoChangeListener { + + public static final DaggerSingletonObject> + REPOSITORY_INSTANCE = new DaggerSingletonObject<>( + QuickstepBaseAppComponent::getRotationTouchHelperRepository); + private static final String TAG = "RotationTouchHelper"; + + private final OrientationTouchTransformer mOrientationTouchTransformer; + private final DisplayController mDisplayController; + private final SystemUiProxy mSystemUiProxy; + private final int mDisplayId; + private final Executor mLightweightBackgroundExecutor; private int mDisplayRotation; - private final ArrayList mOnDestroyActions = new ArrayList<>(); - private NavigationMode mMode = THREE_BUTTONS; - private TaskStackChangeListener mFrozenTaskListener = new TaskStackChangeListener() { + private final TaskStackChangeListener mFrozenTaskListener = new TaskStackChangeListener() { @Override public void onRecentTaskListFrozenChanged(boolean frozen) { mTaskListFrozen = frozen; @@ -79,10 +93,8 @@ public void onRecentTaskListFrozenChanged(boolean frozen) { @Override public void onActivityRotation(int displayId) { - // This always gets called before onDisplayInfoChanged() so we know how to - // process - // the rotation in that method. This is done to avoid having a race condition - // between + // This always gets called before onDisplayInfoChanged() so we know how to process + // the rotation in that method. This is done to avoid having a race condition between // the sensor readings and onDisplayInfoChanged() call if (displayId != mDisplayId) { return; @@ -96,7 +108,7 @@ public void onActivityRotation(int displayId) { } }; - private Runnable mExitOverviewRunnable = new Runnable() { + private final Runnable mExitOverviewRunnable = new Runnable() { @Override public void run() { mInOverview = false; @@ -105,77 +117,62 @@ public void run() { }; /** - * Used to listen for when the device rotates into the orientation of the - * current foreground - * app. For example, if a user quickswitches from a portrait to a fixed - * landscape app and then - * rotates rotates the device to match that orientation, this triggers calls to - * sysui to adjust + * Used to listen for when the device rotates into the orientation of the current foreground + * app. For example, if a user quickswitches from a portrait to a fixed landscape app and then + * rotates rotates the device to match that orientation, this triggers calls to sysui to adjust * the navbar. */ - private OrientationEventListener mOrientationListener; + private final OrientationEventListener mOrientationListener; private int mSensorRotation = ROTATION_0; /** - * This is the configuration of the foreground app or the app that will be in - * the foreground + * This is the configuration of the foreground app or the app that will be in the foreground * once a quickstep gesture finishes. */ private int mCurrentAppRotation = -1; /** - * This flag is set to true when the device physically changes orientations. - * When true, we will - * always report the current rotation of the foreground app whenever the display - * changes, as it + * This flag is set to true when the device physically changes orientations. When true, we will + * always report the current rotation of the foreground app whenever the display changes, as it * would indicate the user's intention to rotate the foreground app. */ private boolean mPrioritizeDeviceRotation = false; - private Runnable mOnDestroyFrozenTaskRunnable; /** - * Set to true when user swipes to recents. In recents, we ignore the state of - * the recents - * task list being frozen or not to allow the user to keep interacting with nav - * bar rotation - * they went into recents with as opposed to defaulting to the default display - * rotation. + * Set to true when user swipes to recents. In recents, we ignore the state of the recents + * task list being frozen or not to allow the user to keep interacting with nav bar rotation + * they went into recents with as opposed to defaulting to the default display rotation. * TODO: (b/156984037) For when user rotates after entering overview */ private boolean mInOverview; private boolean mTaskListFrozen; - private final Context mContext; - - /** - * Keeps track of whether destroy has been called for this instance. Mainly used - * for TAPL tests - * where multiple instances of RotationTouchHelper are being created. - * b/177316094 - */ - private boolean mNeedsInit = true; - - private RotationTouchHelper(Context context) { - mContext = context; - if (mNeedsInit) { - init(); - } - } - - public void init() { - if (!mNeedsInit) { - return; - } - mDisplayController = DisplayController.INSTANCE.get(mContext); - Resources resources = mContext.getResources(); - mDisplayId = DEFAULT_DISPLAY; - + private final Context mWindowContext; + + @AssistedInject + RotationTouchHelper( + @Assisted Context windowContext, + DisplayController displayController, + SystemUiProxy systemUiProxy, + DaggerSingletonTracker lifeCycle, + @LightweightBackground(priority = UI) Executor lightweightBackgroundExecutor + ) { + mWindowContext = windowContext; + mDisplayId = windowContext.getDisplayId(); + mDisplayController = displayController; + mSystemUiProxy = systemUiProxy; + mLightweightBackgroundExecutor = lightweightBackgroundExecutor; + + Resources resources = mWindowContext.getResources(); mOrientationTouchTransformer = new OrientationTouchTransformer(resources, mMode, - () -> LawnchairUtilsKt.getWindowCornerRadius(mContext)); + () -> LawnchairUtilsKt.getWindowCornerRadius(mWindowContext)); - // Register for navigation mode changes - mDisplayController.addChangeListener(this); - DisplayController.Info info = mDisplayController.getInfo(); - onDisplayInfoChangedInternal(info, CHANGE_ALL, info.getNavigationMode().hasGestures); - runOnDestroy(() -> mDisplayController.removeChangeListener(this)); + // Register for navigation mode and rotation changes + mDisplayController.addChangeListenerForDisplay(this, mDisplayId); + DisplayController.Info info = mDisplayController.getInfoForDisplay(mDisplayId); + if (info != null) { + onDisplayInfoChanged(mWindowContext, info, CHANGE_ALL); + } else { + Log.w(TAG, "Info null for display " + mDisplayId); + } - mOrientationListener = new OrientationEventListener(mContext) { + mOrientationListener = new OrientationEventListener(mWindowContext) { @Override public void onOrientationChanged(int degrees) { int newRotation = RecentsOrientedState.getRotationForUserDegreesRotated(degrees, @@ -194,44 +191,13 @@ public void onOrientationChanged(int degrees) { } } }; - mNeedsInit = false; - } - - void onUserUnlocked() { - // We can't load custom window radius before the user had unlocked, - // so we just fallback to system values and then reload it here. - // onNavigationModeChanged(mSysUiNavMode.getMode()); - } - - private void setupOrientationSwipeHandler() { - TaskStackChangeListeners.getInstance().registerTaskStackListener(mFrozenTaskListener); - mOnDestroyFrozenTaskRunnable = () -> TaskStackChangeListeners.getInstance() - .unregisterTaskStackListener(mFrozenTaskListener); - runOnDestroy(mOnDestroyFrozenTaskRunnable); - } - private void destroyOrientationSwipeHandlerCallback() { - TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mFrozenTaskListener); - mOnDestroyActions.remove(mOnDestroyFrozenTaskRunnable); - } - - private void runOnDestroy(Runnable action) { - mOnDestroyActions.add(action); - } - - @Override - public void close() { - destroy(); - } - - /** - * Cleans up all the registered listeners and receivers. - */ - public void destroy() { - for (Runnable r : mOnDestroyActions) { - r.run(); - } - mNeedsInit = true; + lifeCycle.addCloseable(() -> { + mDisplayController.removeChangeListenerForDisplay(this, mDisplayId); + mOrientationListener.disable(); + TaskStackChangeListeners.getInstance() + .unregisterTaskStackListener(mFrozenTaskListener); + }); } public boolean isTaskListFrozen() { @@ -247,28 +213,31 @@ public boolean touchInOneHandedModeRegion(MotionEvent ev) { } /** - * Updates the regions for detecting the swipe up/quickswitch and assistant - * gestures. + * Updates the regions for detecting the swipe up/quickswitch and assistant gestures. */ public void updateGestureTouchRegions() { - if (!mMode.hasGestures) { + if (!hasGestures(mMode)) { return; } - mOrientationTouchTransformer.createOrAddTouchRegion(mDisplayController.getInfo()); + DisplayController.Info info = mDisplayController.getInfoForDisplay(mDisplayId); + if (info != null) { + mOrientationTouchTransformer.createOrAddTouchRegion(info, + "RTH.updateGestureTouchRegions"); + } else { + Log.w(TAG, "Info null for display " + mDisplayId); + } } /** - * @return whether the coordinates of the {@param event} is in the swipe up - * gesture region. + * @return whether the coordinates of the {@param event} is in the swipe up gesture region. */ public boolean isInSwipeUpTouchRegion(MotionEvent event) { return isInSwipeUpTouchRegion(event, 0); } /** - * @return whether the coordinates of the {@param event} with the given - * {@param pointerIndex} + * @return whether the coordinates of the {@param event} with the given {@param pointerIndex} * is in the swipe up gesture region. */ public boolean isInSwipeUpTouchRegion(MotionEvent event, int pointerIndex) { @@ -283,26 +252,22 @@ public boolean isInSwipeUpTouchRegion(MotionEvent event, int pointerIndex) { } @Override - public void onDisplayInfoChanged(Context context, Info info, int flags) { - onDisplayInfoChangedInternal(info, flags, false); - } - - private void onDisplayInfoChangedInternal(Info info, int flags, boolean forceRegister) { + public void onDisplayInfoChanged(Context context, @NonNull Info displayInfo, int flags) { if ((flags & (CHANGE_ROTATION | CHANGE_ACTIVE_SCREEN | CHANGE_NAVIGATION_MODE | CHANGE_SUPPORTED_BOUNDS)) != 0) { - mDisplayRotation = info.rotation; + mDisplayRotation = displayInfo.rotation; - if (mMode.hasGestures) { + if (hasGestures(mMode)) { updateGestureTouchRegions(); - mOrientationTouchTransformer.createOrAddTouchRegion(info); + mOrientationTouchTransformer.createOrAddTouchRegion(displayInfo, + "RTH.onDisplayInfoChanged"); mCurrentAppRotation = mDisplayRotation; - /* - * Update nav bars on the following: + /* Update nav bars on the following: * a) if this is coming from an activity rotation OR - * aa) we launch an app in the orientation that user is already in + * aa) we launch an app in the orientation that user is already in * b) We're not in overview, since overview will always be portrait (w/o home - * rotation) + * rotation) * c) We're actively in quickswitch mode */ if ((mPrioritizeDeviceRotation @@ -316,16 +281,16 @@ private void onDisplayInfoChangedInternal(Info info, int flags, boolean forceReg } if ((flags & CHANGE_NAVIGATION_MODE) != 0) { - NavigationMode newMode = info.getNavigationMode(); - mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayController.getInfo(), - mContext.getResources()); - - if (forceRegister || (!mMode.hasGestures && newMode.hasGestures)) { - setupOrientationSwipeHandler(); - } else if (mMode.hasGestures && !newMode.hasGestures) { - destroyOrientationSwipeHandlerCallback(); + NavigationMode newMode = displayInfo.getNavigationMode(); + mOrientationTouchTransformer.setNavigationMode(newMode, displayInfo, + mWindowContext.getResources()); + + TaskStackChangeListeners.getInstance() + .unregisterTaskStackListener(mFrozenTaskListener); + if (hasGestures(newMode)) { + TaskStackChangeListeners.getInstance() + .registerTaskStackListener(mFrozenTaskListener); } - mMode = newMode; } } @@ -335,16 +300,19 @@ public int getDisplayRotation() { } /** - * Sets the gestural height. + * Touches within this number of pixels from the bottom of the screen can get intercepted to + * handle gesture navigation. Passing a value less than 0 will revert to a default value. */ void setGesturalHeight(int newGesturalHeight) { - mOrientationTouchTransformer.setGesturalHeight( - newGesturalHeight, mDisplayController.getInfo(), mContext.getResources()); + Info displayInfo = mDisplayController.getInfoForDisplay(mDisplayId); + if (displayInfo != null) { + mOrientationTouchTransformer.setGesturalHeight( + newGesturalHeight, displayInfo, mWindowContext.getResources()); + } } /** - * *May* apply a transform on the motion event if it lies in the nav bar region - * for another + * *May* apply a transform on the motion event if it lies in the nav bar region for another * orientation that is currently being tracked as a part of quickstep */ void setOrientationTransformIfNeeded(MotionEvent event) { @@ -356,14 +324,17 @@ void setOrientationTransformIfNeeded(MotionEvent event) { } private void enableMultipleRegions(boolean enable) { - mOrientationTouchTransformer.enableMultipleRegions(enable, mDisplayController.getInfo()); + Info displayInfo = mDisplayController.getInfoForDisplay(mDisplayId); + if (displayInfo != null) { + mOrientationTouchTransformer.enableMultipleRegions(enable, displayInfo); + } notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getQuickStepStartingRotation()); if (enable && !mInOverview && !TestProtocol.sDisableSensorRotation) { // Clear any previous state from sensor manager mSensorRotation = mCurrentAppRotation; - UI_HELPER_EXECUTOR.execute(mOrientationListener::enable); + mLightweightBackgroundExecutor.execute(mOrientationListener::enable); } else { - UI_HELPER_EXECUTOR.execute(mOrientationListener::disable); + mLightweightBackgroundExecutor.execute(mOrientationListener::disable); } } @@ -384,7 +355,7 @@ void onEndTargetCalculated(GestureState.GestureEndTarget endTarget, // If we're in landscape w/o ever quickswitching, show the navbar in landscape enableMultipleRegions(true); } - containerInterface.onExitOverview(this, mExitOverviewRunnable); + containerInterface.onExitOverview(mExitOverviewRunnable); } else if (endTarget == GestureState.GestureEndTarget.HOME || endTarget == GestureState.GestureEndTarget.ALL_APPS) { enableMultipleRegions(false); @@ -398,8 +369,7 @@ void onEndTargetCalculated(GestureState.GestureEndTarget endTarget, } // A new gesture is starting, reset the current device rotation - // This is done under the assumption that the user won't rotate the phone and - // then + // This is done under the assumption that the user won't rotate the phone and then // quickswitch in the old orientation. mPrioritizeDeviceRotation = false; } else if (endTarget == GestureState.GestureEndTarget.LAST_TASK) { @@ -412,22 +382,26 @@ void onEndTargetCalculated(GestureState.GestureEndTarget endTarget, } private void notifySysuiOfCurrentRotation(int rotation) { - UI_HELPER_EXECUTOR.execute(() -> SystemUiProxy.INSTANCE.get(mContext) - .notifyPrioritizedRotation(rotation)); + mLightweightBackgroundExecutor.execute( + () -> mSystemUiProxy.notifyPrioritizedRotation(rotation)); } /** - * Disables/Enables multiple nav bars on {@link OrientationTouchTransformer} and - * then + * Disables/Enables multiple nav bars on {@link OrientationTouchTransformer} and then * notifies system UI of the primary rotation the user is interacting with */ private void toggleSecondaryNavBarsForRotation() { - mOrientationTouchTransformer.setSingleActiveRegion(mDisplayController.getInfo()); + Info displayInfo = mDisplayController.getInfoForDisplay(mDisplayId); + if (displayInfo != null) { + mOrientationTouchTransformer.setSingleActiveRegion(displayInfo); + } else { + Log.w(TAG, "Info null for display " + mDisplayId); + } notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getCurrentActiveRotation()); } public int getCurrentActiveRotation() { - if (!mMode.hasGestures) { + if (!hasGestures(mMode)) { // touch rotation should always match that of display for 3 button return mDisplayRotation; } @@ -441,7 +415,13 @@ public void dump(PrintWriter pw) { mOrientationTouchTransformer.dump(pw); } - public OrientationTouchTransformer getOrientationTouchTransformer() { - return mOrientationTouchTransformer; + private boolean hasGestures(NavigationMode mode) { + return mode.hasGestures || (mode == THREE_BUTTONS && Flags.threeButtonCornerSwipe()); + } + + @AssistedFactory + public interface Factory { + /** Creates a new instance of [RotationTouchHelper] for a given [context]. */ + RotationTouchHelper create(@WindowContext Context context); } } diff --git a/quickstep/src/com/android/quickstep/SimpleOrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/SimpleOrientationTouchTransformer.java index 29a57fcfc15..036c797c079 100644 --- a/quickstep/src/com/android/quickstep/SimpleOrientationTouchTransformer.java +++ b/quickstep/src/com/android/quickstep/SimpleOrientationTouchTransformer.java @@ -15,6 +15,8 @@ */ package com.android.quickstep; +import static android.view.Display.DEFAULT_DISPLAY; + import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN; import static com.android.launcher3.util.DisplayController.CHANGE_ALL; import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION; @@ -22,29 +24,43 @@ import android.content.Context; import android.view.MotionEvent; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.MainThreadInitializedObject; -import com.android.launcher3.util.SafeCloseable; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; + +import javax.inject.Inject; +@LauncherAppSingleton public class SimpleOrientationTouchTransformer implements - DisplayController.DisplayInfoChangeListener, SafeCloseable { + DisplayController.DisplayInfoChangeListener { - public static final MainThreadInitializedObject INSTANCE = - new MainThreadInitializedObject<>(SimpleOrientationTouchTransformer::new); + public static final DaggerSingletonObject INSTANCE = + new DaggerSingletonObject<>( + QuickstepBaseAppComponent::getSimpleOrientationTouchTransformer); - private final Context mContext; private OrientationRectF mOrientationRectF; + private OrientationRectF mTouchingOrientationRectF; + private int mViewRotation; + private final int mDisplayId; - public SimpleOrientationTouchTransformer(Context context) { - mContext = context; - DisplayController.INSTANCE.get(context).addChangeListener(this); - onDisplayInfoChanged(context, DisplayController.INSTANCE.get(context).getInfo(), - CHANGE_ALL); - } + @Inject + public SimpleOrientationTouchTransformer(@ApplicationContext Context context, + DisplayController displayController, + DaggerSingletonTracker tracker) { + // TODO (b/398195845): make sure non-default displays don't get affected by default display + // changes. + mDisplayId = DEFAULT_DISPLAY; + displayController.addChangeListenerForDisplay(this, mDisplayId); + tracker.addCloseable( + () -> displayController.removeChangeListenerForDisplay(this, mDisplayId)); - @Override - public void close() { - DisplayController.INSTANCE.get(mContext).removeChangeListener(this); + DisplayController.Info displayInfo = displayController.getInfoForDisplay(mDisplayId); + if (displayInfo != null) { + onDisplayInfoChanged(context, displayInfo, CHANGE_ALL); + } } @Override @@ -56,7 +72,29 @@ public void onDisplayInfoChanged(Context context, DisplayController.Info info, i info.rotation); } + /** + * Called when the touch is started. This preserves the touching orientation until the touch is + * done (i.e. ACTION_CANCEL or ACTION_UP). So the transform won't produce inconsistent position + * if display is changed during the touch. + */ + public void updateTouchingOrientation(int viewRotation) { + mViewRotation = viewRotation; + mTouchingOrientationRectF = new OrientationRectF(mOrientationRectF.left, + mOrientationRectF.top, mOrientationRectF.right, mOrientationRectF.bottom, + mOrientationRectF.getRotation()); + } + + /** Called when the touch is finished. */ + public void clearTouchingOrientation() { + mTouchingOrientationRectF = null; + } + public void transform(MotionEvent ev, int rotation) { + if (mTouchingOrientationRectF != null) { + mTouchingOrientationRectF.applyTransformToRotation(ev, mViewRotation, + true /* forceTransform */); + return; + } mOrientationRectF.applyTransformToRotation(ev, rotation, true /* forceTransform */); } } diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java index 79df19f2597..f845f01c70e 100644 --- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java +++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java @@ -17,7 +17,6 @@ import static com.android.app.animation.Interpolators.ACCELERATE_1_5; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; import static com.android.launcher3.PagedView.INVALID_PAGE; import android.animation.Animator; @@ -26,7 +25,6 @@ import android.graphics.Matrix.ScaleToFit; import android.graphics.Rect; import android.graphics.RectF; -import android.util.Log; import android.view.RemoteAnimationTarget; import androidx.annotation.NonNull; @@ -39,6 +37,7 @@ import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.logging.FileLog; import com.android.launcher3.touch.PagedOrientationHandler; import com.android.launcher3.views.ClipIconView; import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle; @@ -53,12 +52,13 @@ import com.android.quickstep.util.TransformParams.BuilderProxy; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; +import com.android.wm.shell.shared.GroupedTaskInfo; import java.util.Arrays; import java.util.function.Consumer; public abstract class SwipeUpAnimationLogic implements - RecentsAnimationCallbacks.RecentsAnimationListener{ + RecentsAnimationCallbacks.RecentsAnimationListener { protected static final Rect TEMP_RECT = new Rect(); protected final RemoteTargetGluer mTargetGluer; @@ -66,7 +66,6 @@ public abstract class SwipeUpAnimationLogic implements protected DeviceProfile mDp; protected final Context mContext; - protected final RecentsAnimationDeviceState mDeviceState; protected final GestureState mGestureState; protected RemoteTargetHandle[] mRemoteTargetHandles; @@ -85,20 +84,26 @@ public abstract class SwipeUpAnimationLogic implements protected boolean mIsSwipeForSplit; - public SwipeUpAnimationLogic(Context context, RecentsAnimationDeviceState deviceState, - GestureState gestureState) { + public SwipeUpAnimationLogic(Context context, GestureState gestureState, + RotationTouchHelper rotationTouchHelper) { mContext = context; - mDeviceState = deviceState; mGestureState = gestureState; updateIsGestureForSplit(TopTaskTracker.INSTANCE.get(context) .getRunningSplitTaskIds().length); - mTargetGluer = new RemoteTargetGluer(mContext, mGestureState.getContainerInterface()); + GroupedTaskInfo groupedTaskInfo = null; + if (mGestureState.getRunningTask() != null) { + groupedTaskInfo = + mGestureState.getRunningTask().getPlaceholderGroupedTaskInfo( + /* splitTaskIds = */ null); + } + mTargetGluer = new RemoteTargetGluer(mContext, mGestureState.getContainerInterface(), + groupedTaskInfo); mRemoteTargetHandles = mTargetGluer.getRemoteTargetHandles(); runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator().getOrientationState().update( - mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(), - mDeviceState.getRotationTouchHelper().getDisplayRotation() + rotationTouchHelper.getCurrentActiveRotation(), + rotationTouchHelper.getDisplayRotation() )); } @@ -108,13 +113,14 @@ protected void initTransitionEndpoints(DeviceProfile dp) { .getSwipeUpDestinationAndLength(dp, mContext, TEMP_RECT, mRemoteTargetHandles[0].getTaskViewSimulator().getOrientationState() .getOrientationHandler()); - mDragLengthFactor = (float) dp.heightPx / mTransitionDragLength; + mDragLengthFactor = (float) dp.getDeviceProperties().getHeightPx() / mTransitionDragLength; for (RemoteTargetHandle remoteHandle : mRemoteTargetHandles) { PendingAnimation pendingAnimation = new PendingAnimation(mTransitionDragLength * 2); TaskViewSimulator taskViewSimulator = remoteHandle.getTaskViewSimulator(); taskViewSimulator.setDp(dp); - taskViewSimulator.addAppToOverviewAnim(pendingAnimation, LINEAR); + taskViewSimulator.addAppToCarouselAnim(pendingAnimation, LINEAR, + mGestureState.isHandlingAtomicEvent()); AnimatorPlaybackController playbackController = pendingAnimation.createPlaybackController(); @@ -179,11 +185,15 @@ public boolean isInHotseat() { public @NonNull RectF getWindowTargetRect() { PagedOrientationHandler orientationHandler = getOrientationHandler(); DeviceProfile dp = mDp; - final int halfIconSize = dp.iconSizePx / 2; - float primaryDimension = orientationHandler - .getPrimaryValue(dp.availableWidthPx, dp.availableHeightPx); - float secondaryDimension = orientationHandler - .getSecondaryValue(dp.availableWidthPx, dp.availableHeightPx); + final int halfIconSize = dp.getWorkspaceIconProfile().getIconSizePx() / 2; + float primaryDimension = orientationHandler.getPrimaryValue( + dp.getDeviceProperties().getAvailableWidthPx(), + dp.getDeviceProperties().getAvailableHeightPx() + ); + float secondaryDimension = orientationHandler.getSecondaryValue( + dp.getDeviceProperties().getAvailableWidthPx(), + dp.getDeviceProperties().getAvailableHeightPx() + ); final float targetX = primaryDimension / 2f; final float targetY = secondaryDimension - dp.hotseatBarSizePx; // Fallback to animate to center of screen. @@ -254,7 +264,7 @@ public boolean isRtl() { } public boolean isPortrait() { - return !mDp.isLandscape && !mDp.isSeascape(); + return !mDp.getDeviceProperties().isLandscape() && !mDp.isSeascape(); } } @@ -268,7 +278,7 @@ protected RectF[] updateProgressForStartRect(Matrix[] outMatrix, float startProg mCurrentShift.updateValue(startProgress); RectF[] startRects = new RectF[mRemoteTargetHandles.length]; for (int i = 0, mRemoteTargetHandlesLength = mRemoteTargetHandles.length; - i < mRemoteTargetHandlesLength; i++) { + i < mRemoteTargetHandlesLength; i++) { RemoteTargetHandle remoteHandle = mRemoteTargetHandles[i]; TaskViewSimulator tvs = remoteHandle.getTaskViewSimulator(); tvs.apply(remoteHandle.getTransformParams().setProgress(startProgress)); @@ -301,14 +311,14 @@ protected TaskViewSimulator[] getRemoteTaskViewSimulators() { * @param homeAnimationFactory The home animation factory. */ protected RectFSpringAnim[] createWindowAnimationToHome(float startProgress, - HomeAnimationFactory homeAnimationFactory) { + HomeAnimationFactory homeAnimationFactory) { // TODO(b/195473584) compute separate end targets for different staged split final RectF targetRect = homeAnimationFactory.getWindowTargetRect(); RectFSpringAnim[] out = new RectFSpringAnim[mRemoteTargetHandles.length]; Matrix[] homeToWindowPositionMap = new Matrix[mRemoteTargetHandles.length]; RectF[] startRects = updateProgressForStartRect(homeToWindowPositionMap, startProgress); for (int i = 0, mRemoteTargetHandlesLength = mRemoteTargetHandles.length; - i < mRemoteTargetHandlesLength; i++) { + i < mRemoteTargetHandlesLength; i++) { RemoteTargetHandle remoteHandle = mRemoteTargetHandles[i]; out[i] = getWindowAnimationToHomeInternal( homeAnimationFactory, @@ -444,7 +454,7 @@ protected class SpringAnimationRunner extends AnimationSuccessListener // to end up offscreen. mRunningTaskViewScrollOffset = factory.isRtl() ? (Math.min(0, -invariantStartRect.right)) - : (Math.max(0, mDp.widthPx - invariantStartRect.left)); + : (Math.max(0, mDp.getDeviceProperties().getWidthPx() - invariantStartRect.left)); } @Override @@ -453,7 +463,7 @@ public void onUpdate(RectF currentRect, float progress) { float alpha = mAnimationFactory.getWindowAlpha(progress); mHomeAnim.setPlayFraction(progress); - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { mHomeToWindowPositionMap.mapRect(mWindowCurrentRect, currentRect); mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL); mLocalTransformParams @@ -473,10 +483,9 @@ public void onUpdate(RectF currentRect, float progress) { currentRect, progress, mMatrix.mapRadius(cornerRadius), - !enableAdditionalHomeAnimations() || mTargetTaskView == null - ? 0 : (int) (alpha * 255)); + mTargetTaskView == null ? 0 : (int) (alpha * 255)); - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { return; } if (mAnimationFactory.isAnimatingIntoIcon() && mAnimationFactory.isAnimationReady()) { @@ -495,7 +504,7 @@ public void onUpdate(RectF currentRect, float progress) { if (isStartWidthValid && isStartHeightValid) { scale = Math.min(currentWidth, currentHeight) / Math.min(startWidth, startHeight); } else { - Log.e(TAG, "TaskView starting bounds are invalid: " + mThumbnailStartBounds); + FileLog.e(TAG, "TaskView starting bounds are invalid: " + mThumbnailStartBounds); if (isStartWidthValid) { scale = currentWidth / startWidth; } else if (isStartHeightValid) { @@ -505,6 +514,12 @@ public void onUpdate(RectF currentRect, float progress) { } } + if (Float.isNaN(scale)) { + FileLog.e(TAG, "Scale is NaN: starting dimensions=[" + startWidth + ", " + + startHeight + "], current dimensions=[" + currentWidth + ", " + + currentHeight + "]"); + } + mTargetTaskView.setScaleX(scale); mTargetTaskView.setScaleY(scale); mTargetTaskView.setTranslationX( @@ -515,7 +530,7 @@ public void onUpdate(RectF currentRect, float progress) { @Override public void onBuildTargetParams(SurfaceProperties builder, RemoteAnimationTarget app, - TransformParams params) { + TransformParams params) { builder.setMatrix(mMatrix) .setWindowCrop(mCropRect) .setCornerRadius(params.getCornerRadius()); @@ -531,7 +546,7 @@ public void onCancel() { public void onAnimationStart(Animator animation) { setUp(); mHomeAnim.dispatchOnStart(); - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { return; } Rect thumbnailBounds = new Rect(); @@ -546,7 +561,7 @@ public void onAnimationStart(Animator animation) { } private void setUp() { - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { return; } RecentsView recentsView = mTargetTaskView.getRecentsView(); @@ -567,7 +582,7 @@ private void setUp() { } private void cleanUp() { - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { return; } RecentsView recentsView = mTargetTaskView.getRecentsView(); @@ -625,4 +640,4 @@ public void cancel() { }; } } -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/quickstep/SystemDecorationChangeObserver.kt b/quickstep/src/com/android/quickstep/SystemDecorationChangeObserver.kt new file mode 100644 index 00000000000..b6be2f2a853 --- /dev/null +++ b/quickstep/src/com/android/quickstep/SystemDecorationChangeObserver.kt @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.content.Context +import android.util.Log +import com.android.app.displaylib.DisplayDecorationListener +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.DaggerSingletonObject +import com.android.launcher3.concurrent.annotations.Ui +import com.android.quickstep.dagger.QuickstepBaseAppComponent +import java.util.concurrent.Executor +import javax.inject.Inject + +@LauncherAppSingleton +class SystemDecorationChangeObserver @Inject constructor( + @ApplicationContext context: Context, + @Ui private val uiExecutor: Executor +) { + companion object { + private const val TAG = "SystemDecorationChangeObserver" + private const val DEBUG = false + + @JvmStatic + val INSTANCE: DaggerSingletonObject = + DaggerSingletonObject( + QuickstepBaseAppComponent::getSystemDecorationChangeObserver + ) + } + + fun notifyAddSystemDecorations(displayId: Int) { + if (DEBUG) Log.d(TAG, "SystemDecorationAdded: $displayId") + for (listener in mDisplayDecorationListeners) { + uiExecutor.execute { listener.onDisplayAddSystemDecorations(displayId) } + } + } + + fun notifyOnDisplayRemoved(displayId: Int) { + if (DEBUG) Log.d(TAG, "displayRemoved: $displayId") + for (listener in mDisplayDecorationListeners) { + uiExecutor.execute { listener.onDisplayRemoved(displayId) } + } + } + + fun notifyDisplayRemoveSystemDecorations(displayId: Int) { + if (DEBUG) Log.d(TAG, "SystemDecorationRemoved: $displayId") + for (listener in mDisplayDecorationListeners) { + uiExecutor.execute { listener.onDisplayRemoveSystemDecorations(displayId) } + } + } + + private val mDisplayDecorationListeners = ArrayList() + + fun registerDisplayDecorationListener(listener: DisplayDecorationListener) { + if (DEBUG) Log.d(TAG, "registerDisplayDecorationListener") + mDisplayDecorationListeners.add(listener) + } + + fun unregisterDisplayDecorationListener(listener: DisplayDecorationListener) { + if (DEBUG) Log.d(TAG, "unregisterDisplayDecorationListener") + mDisplayDecorationListeners.remove(listener) + } +} diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index edbdda29c68..e69de29bb2d 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -1,1655 +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.quickstep; - -import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE; - -import static com.android.launcher3.Flags.enableUnfoldStateAnimation; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; -import static com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.RECENT_TASKS_MISSING; -import static com.android.quickstep.util.LogUtils.splitFailureMessage; -import static com.android.window.flags2.Flags.enableDesktopWindowingMode; -import static com.android.window.flags2.Flags.enableDesktopWindowingTaskbarRunningApps; - -import android.app.ActivityManager; -import android.app.ActivityOptions; -import android.app.PendingIntent; -import android.app.PictureInPictureParams; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.content.pm.ShortcutInfo; -import android.graphics.Point; -import android.graphics.Rect; -import android.os.Bundle; -import android.os.Handler; -import android.os.IBinder; -import android.os.IBinder.DeathRecipient; -import android.os.Message; -import android.os.RemoteException; -import android.os.UserHandle; -import android.util.Log; -import android.view.IRecentsAnimationController; -import android.view.IRecentsAnimationRunner; -import android.view.IRemoteAnimationRunner; -import android.view.MotionEvent; -import android.view.RemoteAnimationAdapter; -import android.view.RemoteAnimationTarget; -import android.view.SurfaceControl; -import android.window.IOnBackInvokedCallback; -import android.window.RemoteTransition; -import android.window.TaskSnapshot; -import android.window.TransitionFilter; - -import androidx.annotation.MainThread; -import androidx.annotation.Nullable; -import androidx.annotation.WorkerThread; - -import com.android.internal.logging.InstanceId; -import com.android.internal.util.ScreenshotRequest; -import com.android.internal.view.AppearanceRegion; -import com.android.launcher3.Utilities; -import com.android.launcher3.util.MainThreadInitializedObject; -import com.android.launcher3.util.Preconditions; -import com.android.launcher3.util.SafeCloseable; -import com.android.quickstep.util.ActiveGestureLog; -import com.android.quickstep.util.AssistUtils; -import com.android.quickstep.util.unfold.ProxyUnfoldTransitionProvider; -import com.android.systemui.shared.recents.ISystemUiProxy; -import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; -import com.android.systemui.shared.system.RecentsAnimationControllerCompat; -import com.android.systemui.shared.system.RecentsAnimationListener; -import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController; -import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController; -import com.android.systemui.shared.system.smartspace.SmartspaceState; -import com.android.systemui.unfold.config.ResourceUnfoldTransitionConfig; -import com.android.systemui.unfold.progress.IUnfoldAnimation; -import com.android.systemui.unfold.progress.IUnfoldTransitionListener; -import com.android.wm.shell.back.IBackAnimation; -import com.android.wm.shell.bubbles.IBubbles; -import com.android.wm.shell.bubbles.IBubblesListener; -import com.android.wm.shell.common.bubbles.BubbleBarLocation; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; -import com.android.wm.shell.common.pip.IPip; -import com.android.wm.shell.common.pip.IPipAnimationListener; -import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition; -import com.android.wm.shell.desktopmode.IDesktopMode; -import com.android.wm.shell.desktopmode.IDesktopTaskListener; -import com.android.wm.shell.draganddrop.IDragAndDrop; -import com.android.wm.shell.onehanded.IOneHanded; -import com.android.wm.shell.recents.IRecentTasks; -import com.android.wm.shell.recents.IRecentTasksListener; -import com.android.wm.shell.shared.IShellTransitions; -import com.android.wm.shell.splitscreen.ISplitScreen; -import com.android.wm.shell.splitscreen.ISplitScreenListener; -import com.android.wm.shell.splitscreen.ISplitSelectListener; -import com.android.wm.shell.startingsurface.IStartingWindow; -import com.android.wm.shell.startingsurface.IStartingWindowListener; -import com.android.wm.shell.util.GroupedRecentTaskInfo; - -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; - -import app.lawnchair.compat.LawnchairQuickstepCompat; - -/** - * Holds the reference to SystemUI. - */ -public class SystemUiProxy implements ISystemUiProxy, NavHandle, SafeCloseable { - private static final String TAG = "SystemUiProxy"; - - public static final MainThreadInitializedObject INSTANCE = - new MainThreadInitializedObject<>(SystemUiProxy::new); - - private static final int MSG_SET_SHELF_HEIGHT = 1; - private static final int MSG_SET_LAUNCHER_KEEP_CLEAR_AREA_HEIGHT = 2; - - private ISystemUiProxy mSystemUiProxy; - private IPip mPip; - private IBubbles mBubbles; - private ISysuiUnlockAnimationController mSysuiUnlockAnimationController; - private ISplitScreen mSplitScreen; - private IOneHanded mOneHanded; - private IShellTransitions mShellTransitions; - private IStartingWindow mStartingWindow; - private IRecentTasks mRecentTasks; - private IBackAnimation mBackAnimation; - private IDesktopMode mDesktopMode; - private IUnfoldAnimation mUnfoldAnimation; - private final DeathRecipient mSystemUiProxyDeathRecipient = () -> { - MAIN_EXECUTOR.execute(() -> clearProxy()); - }; - - // Save the listeners passed into the proxy since OverviewProxyService may not have been bound - // yet, and we'll need to set/register these listeners with SysUI when they do. Note that it is - // up to the caller to clear the listeners to prevent leaks as these can be held indefinitely - // in case SysUI needs to rebind. - private IPipAnimationListener mPipAnimationListener; - private IBubblesListener mBubblesListener; - private ISplitScreenListener mSplitScreenListener; - private ISplitSelectListener mSplitSelectListener; - private IStartingWindowListener mStartingWindowListener; - private ILauncherUnlockAnimationController mLauncherUnlockAnimationController; - private String mLauncherActivityClass; - private IRecentTasksListener mRecentTasksListener; - private IUnfoldTransitionListener mUnfoldAnimationListener; - private IDesktopTaskListener mDesktopTaskListener; - private final LinkedHashMap mRemoteTransitions = - new LinkedHashMap<>(); - - private final List mStateChangeCallbacks = new ArrayList<>(); - - private IBinder mOriginalTransactionToken = null; - private IOnBackInvokedCallback mBackToLauncherCallback; - private IRemoteAnimationRunner mBackToLauncherRunner; - private IDragAndDrop mDragAndDrop; - private final HomeVisibilityState mHomeVisibilityState = new HomeVisibilityState(); - - // Used to dedupe calls to SystemUI - private int mLastShelfHeight; - private boolean mLastShelfVisible; - - // Used to dedupe calls to SystemUI - private int mLastLauncherKeepClearAreaHeight; - private boolean mLastLauncherKeepClearAreaHeightVisible; - - private final Context mContext; - private final Handler mAsyncHandler; - - // TODO(141886704): Find a way to remove this - @SystemUiStateFlags - private long mLastSystemUiStateFlags; - - /** - * This is a singleton pending intent that is used to start recents via Shell (which is a - * different process). It is bare-bones, so it's expected that the component and options will - * be provided via fill-in intent. - */ - private PendingIntent mRecentsPendingIntent; - - @Nullable - private ProxyUnfoldTransitionProvider mUnfoldTransitionProvider; - - private SystemUiProxy(Context context) { - mContext = context; - mAsyncHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(), this::handleMessageAsync); - final Intent baseIntent = new Intent().setPackage(mContext.getPackageName()); - if (Utilities.ATLEAST_Q) { - - final ActivityOptions options = ActivityOptions.makeBasic(); - if (Utilities.ATLEAST_U) { - options.setPendingIntentCreatorBackgroundActivityStartMode( - ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED); - } - - mRecentsPendingIntent = LawnchairQuickstepCompat.ATLEAST_V ? PendingIntent.getActivity(mContext, 0, baseIntent, - PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT - | Intent.FILL_IN_COMPONENT, options.toBundle()) : PendingIntent.getActivity(mContext, 0, baseIntent, - PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT - | Intent.FILL_IN_COMPONENT) ; - - mUnfoldTransitionProvider = - (enableUnfoldStateAnimation() && new ResourceUnfoldTransitionConfig().isEnabled()) - ? new ProxyUnfoldTransitionProvider() : null; - } - - } - - @Override - public void close() { } - - @Override - public void onBackPressed() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.onBackPressed(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onBackPressed", e); - } - } - } - - @Override - public void onImeSwitcherPressed() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.onImeSwitcherPressed(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onImeSwitcherPressed", e); - } - } - } - - @Override - public void setHomeRotationEnabled(boolean enabled) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.setHomeRotationEnabled(enabled); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onBackPressed", e); - } - } - } - - @Override - public IBinder asBinder() { - // Do nothing - return null; - } - - /** - * Sets proxy state, including death linkage, various listeners, and other configuration objects - */ - @MainThread - public void setProxy(ISystemUiProxy proxy, IPip pip, IBubbles bubbles, ISplitScreen splitScreen, - IOneHanded oneHanded, IShellTransitions shellTransitions, - IStartingWindow startingWindow, IRecentTasks recentTasks, - ISysuiUnlockAnimationController sysuiUnlockAnimationController, - IBackAnimation backAnimation, IDesktopMode desktopMode, - IUnfoldAnimation unfoldAnimation, IDragAndDrop dragAndDrop) { - Preconditions.assertUIThread(); - unlinkToDeath(); - mSystemUiProxy = proxy; - mPip = pip; - mBubbles = bubbles; - mSplitScreen = splitScreen; - mOneHanded = oneHanded; - mShellTransitions = shellTransitions; - mStartingWindow = startingWindow; - mSysuiUnlockAnimationController = sysuiUnlockAnimationController; - mRecentTasks = recentTasks; - mBackAnimation = backAnimation; - mDesktopMode = desktopMode; - mUnfoldAnimation = enableUnfoldStateAnimation() ? null : unfoldAnimation; - mDragAndDrop = dragAndDrop; - linkToDeath(); - // re-attach the listeners once missing due to setProxy has not been initialized yet. - setPipAnimationListener(mPipAnimationListener); - setBubblesListener(mBubblesListener); - registerSplitScreenListener(mSplitScreenListener); - registerSplitSelectListener(mSplitSelectListener); - mHomeVisibilityState.init(mShellTransitions); - setStartingWindowListener(mStartingWindowListener); - setLauncherUnlockAnimationController( - mLauncherActivityClass, mLauncherUnlockAnimationController); - new LinkedHashMap<>(mRemoteTransitions).forEach(this::registerRemoteTransition); - setupTransactionQueue(); - registerRecentTasksListener(mRecentTasksListener); - setBackToLauncherCallback(mBackToLauncherCallback, mBackToLauncherRunner); - setUnfoldAnimationListener(mUnfoldAnimationListener); - setDesktopTaskListener(mDesktopTaskListener); - setAssistantOverridesRequested( - AssistUtils.newInstance(mContext).getSysUiAssistOverrideInvocationTypes()); - mStateChangeCallbacks.forEach(Runnable::run); - - if (mUnfoldTransitionProvider != null) { - if (unfoldAnimation != null) { - try { - unfoldAnimation.setListener(mUnfoldTransitionProvider); - mUnfoldTransitionProvider.setActive(true); - } catch (RemoteException e) { - // Ignore - } - } else { - mUnfoldTransitionProvider.setActive(false); - } - } - } - - /** - * Clear the proxy to release held resources and turn the majority of its operations into no-ops - */ - @MainThread - public void clearProxy() { - setProxy(null, null, null, null, null, null, null, null, null, null, null, null, null); - } - - /** - * Adds a callback to be notified whenever the active state changes - */ - public void addOnStateChangeListener(Runnable callback) { - mStateChangeCallbacks.add(callback); - } - - /** - * Removes a previously added state change callback - */ - public void removeOnStateChangeListener(Runnable callback) { - mStateChangeCallbacks.remove(callback); - } - - // TODO(141886704): Find a way to remove this - public void setLastSystemUiStateFlags(@SystemUiStateFlags long stateFlags) { - mLastSystemUiStateFlags = stateFlags; - } - - // TODO(141886704): Find a way to remove this - @SystemUiStateFlags - public long getLastSystemUiStateFlags() { - return mLastSystemUiStateFlags; - } - - public boolean isActive() { - return mSystemUiProxy != null; - } - - private void linkToDeath() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.asBinder().linkToDeath(mSystemUiProxyDeathRecipient, 0 /* flags */); - } catch (RemoteException e) { - Log.e(TAG, "Failed to link sysui proxy death recipient"); - } - } - } - - private void unlinkToDeath() { - if (mSystemUiProxy != null) { - mSystemUiProxy.asBinder().unlinkToDeath(mSystemUiProxyDeathRecipient, 0 /* flags */); - } - } - - @Override - public void startScreenPinning(int taskId) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.startScreenPinning(taskId); - } catch (RemoteException e) { - Log.w(TAG, "Failed call startScreenPinning", e); - } - } - } - - @Override - public void onOverviewShown(boolean fromHome) { - onOverviewShown(fromHome, TAG); - } - - public void onOverviewShown(boolean fromHome, String tag) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.onOverviewShown(fromHome); - } catch (RemoteException e) { - Log.w(tag, "Failed call onOverviewShown from: " + (fromHome ? "home" : "app"), e); - } - } - } - - @MainThread - @Override - public void onStatusBarTouchEvent(MotionEvent event) { - Preconditions.assertUIThread(); - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.onStatusBarTouchEvent(event); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onStatusBarTouchEvent with arg: " + event, e); - } - } - } - - @Override - public void onStatusBarTrackpadEvent(MotionEvent event) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.onStatusBarTrackpadEvent(event); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onStatusBarTrackpadEvent with arg: " + event, e); - } - } - } - - @Override - public void onAssistantProgress(float progress) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.onAssistantProgress(progress); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onAssistantProgress with progress: " + progress, e); - } - } - } - - @Override - public void onAssistantGestureCompletion(float velocity) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.onAssistantGestureCompletion(velocity); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onAssistantGestureCompletion", e); - } - } - } - - @Override - public void startAssistant(Bundle args) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.startAssistant(args); - } catch (RemoteException e) { - Log.w(TAG, "Failed call startAssistant", e); - } - } - } - - @Override - public void setAssistantOverridesRequested(int[] invocationTypes) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.setAssistantOverridesRequested(invocationTypes); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setAssistantOverridesRequested", e); - } - } - } - - @Override - public void animateNavBarLongPress(boolean isTouchDown, boolean shrink, long durationMs) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.animateNavBarLongPress(isTouchDown, shrink, durationMs); - } catch (RemoteException e) { - Log.w(TAG, "Failed call animateNavBarLongPress", e); - } - } - } - - @Override - public void setOverrideHomeButtonLongPress(long duration, float slopMultiplier, - boolean haptic) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.setOverrideHomeButtonLongPress(duration, slopMultiplier, haptic); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setOverrideHomeButtonLongPress", e); - } - } - } - - @Override - public void notifyAccessibilityButtonClicked(int displayId) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.notifyAccessibilityButtonClicked(displayId); - } catch (RemoteException e) { - Log.w(TAG, "Failed call notifyAccessibilityButtonClicked", e); - } - } - } - - @Override - public void notifyAccessibilityButtonLongClicked() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.notifyAccessibilityButtonLongClicked(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call notifyAccessibilityButtonLongClicked", e); - } - } - } - - @Override - public void stopScreenPinning() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.stopScreenPinning(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call stopScreenPinning", e); - } - } - } - - @Override - public void notifyPrioritizedRotation(int rotation) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.notifyPrioritizedRotation(rotation); - } catch (RemoteException e) { - Log.w(TAG, "Failed call notifyPrioritizedRotation with arg: " + rotation, e); - } - } - } - - @Override - public void notifyTaskbarStatus(boolean visible, boolean stashed) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.notifyTaskbarStatus(visible, stashed); - } catch (RemoteException e) { - Log.w(TAG, "Failed call notifyTaskbarStatus with arg: " + - visible + ", " + stashed, e); - } - } - } - - /** - * NOTE: If called to suspend, caller MUST call this method to also un-suspend - * @param suspend should be true to stop auto-hide, false to resume normal behavior - */ - @Override - public void notifyTaskbarAutohideSuspend(boolean suspend) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.notifyTaskbarAutohideSuspend(suspend); - } catch (RemoteException e) { - Log.w(TAG, "Failed call notifyTaskbarAutohideSuspend with arg: " + - suspend, e); - } - } - } - - @Override - public void takeScreenshot(ScreenshotRequest request) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.takeScreenshot(request); - } catch (RemoteException e) { - Log.w(TAG, "Failed call takeScreenshot"); - } - } - } - - @Override - public void expandNotificationPanel() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.expandNotificationPanel(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call expandNotificationPanel", e); - } - } - } - - @Override - public void toggleNotificationPanel() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.toggleNotificationPanel(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call toggleNotificationPanel", e); - } - } - } - - @Override - public void toggleQuickSettingsPanel() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.toggleQuickSettingsPanel(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call toggleQuickSettingsPanel", e); - } - } - } - - // - // Pip - // - - /** - * Sets the shelf height. - */ - public void setShelfHeight(boolean visible, int shelfHeight) { - Message.obtain(mAsyncHandler, MSG_SET_SHELF_HEIGHT, - visible ? 1 : 0 , shelfHeight).sendToTarget(); - } - - @WorkerThread - private void setShelfHeightAsync(int visibleInt, int shelfHeight) { - boolean visible = visibleInt != 0; - boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight; - IPip pip = mPip; - if (pip != null && changed) { - mLastShelfVisible = visible; - mLastShelfHeight = shelfHeight; - try { - pip.setShelfHeight(visible, shelfHeight); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setShelfHeight visible: " + visible - + " height: " + shelfHeight, e); - } - } - } - - /** - * Sets the height of the keep clear area that is going to be reported by - * the Launcher for the Hotseat. - */ - public void setLauncherKeepClearAreaHeight(boolean visible, int height) { - Message.obtain(mAsyncHandler, MSG_SET_LAUNCHER_KEEP_CLEAR_AREA_HEIGHT, - visible ? 1 : 0 , height).sendToTarget(); - } - - @WorkerThread - private void setLauncherKeepClearAreaHeight(int visibleInt, int height) { - boolean visible = visibleInt != 0; - boolean changed = visible != mLastLauncherKeepClearAreaHeightVisible - || height != mLastLauncherKeepClearAreaHeight; - IPip pip = mPip; - if (pip != null && changed) { - mLastLauncherKeepClearAreaHeightVisible = visible; - mLastLauncherKeepClearAreaHeight = height; - try { - pip.setLauncherKeepClearAreaHeight(visible, height); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setLauncherKeepClearAreaHeight visible: " + visible - + " height: " + height, e); - } - } - } - - /** - * Sets listener to get pip animation callbacks. - */ - public void setPipAnimationListener(IPipAnimationListener listener) { - if (mPip != null) { - try { - mPip.setPipAnimationListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setPinnedStackAnimationListener", e); - } - } - mPipAnimationListener = listener; - } - - /** - * @return Destination bounds of auto-pip animation, {@code null} if the animation is not ready. - */ - @Nullable - public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo, - PictureInPictureParams pictureInPictureParams, int launcherRotation, - Rect hotseatKeepClearArea) { - if (mPip != null) { - try { - return mPip.startSwipePipToHome(componentName, activityInfo, - pictureInPictureParams, launcherRotation, hotseatKeepClearArea); - } catch (RemoteException e) { - Log.w(TAG, "Failed call startSwipePipToHome", e); - } - } - return null; - } - - /** - * Notifies WM Shell that launcher has finished the preparation of the animation for swipe to - * home. WM Shell can choose to fade out the overlay when entering PIP is finished, and WM Shell - * should be responsible for cleaning up the overlay. - */ - public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds, - SurfaceControl overlay, Rect appBounds, Rect sourceRectHint) { - if (mPip != null) { - try { - mPip.stopSwipePipToHome(taskId, componentName, destinationBounds, overlay, - appBounds, sourceRectHint); - } catch (RemoteException e) { - Log.w(TAG, "Failed call stopSwipePipToHome"); - } - } - } - - /** - * Notifies WM Shell that launcher has aborted all the animation for swipe to home. WM Shell - * can use this callback to clean up its internal states. - */ - public void abortSwipePipToHome(int taskId, ComponentName componentName) { - if (mPip != null) { - try { - mPip.abortSwipePipToHome(taskId, componentName); - } catch (RemoteException e) { - Log.w(TAG, "Failed call abortSwipePipToHome"); - } - } - } - - /** - * Sets the next pip animation type to be the alpha animation. - */ - public void setPipAnimationTypeToAlpha() { - if (mPip != null) { - try { - mPip.setPipAnimationTypeToAlpha(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setPipAnimationTypeToAlpha", e); - } - } - } - - /** - * Sets the app icon size in pixel used by Launcher all apps. - */ - public void setLauncherAppIconSize(int iconSizePx) { - if (mPip != null) { - try { - mPip.setLauncherAppIconSize(iconSizePx); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setLauncherAppIconSize", e); - } - } - } - - // - // Bubbles - // - - /** - * Sets the listener to be notified of bubble state changes. - */ - public void setBubblesListener(IBubblesListener listener) { - if (mBubbles != null) { - try { - if (mBubblesListener != null) { - // Clear out any previous listener - mBubbles.unregisterBubbleListener(mBubblesListener); - } - if (listener != null) { - mBubbles.registerBubbleListener(listener); - } - } catch (RemoteException e) { - Log.w(TAG, "Failed call registerBubblesListener"); - } - } - mBubblesListener = listener; - } - - /** - * Tells SysUI to show the bubble with the provided key. - * @param key the key of the bubble to show. - * @param top top coordinate of bubble bar on screen - */ - public void showBubble(String key, int top) { - if (mBubbles != null) { - try { - mBubbles.showBubble(key, top); - } catch (RemoteException e) { - Log.w(TAG, "Failed call showBubble"); - } - } - } - - /** - * Tells SysUI to remove all bubbles. - */ - public void removeAllBubbles() { - if (mBubbles == null) return; - try { - mBubbles.removeAllBubbles(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call removeAllBubbles"); - } - } - - /** - * Tells SysUI to collapse the bubbles. - */ - public void collapseBubbles() { - if (mBubbles != null) { - try { - mBubbles.collapseBubbles(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call collapseBubbles"); - } - } - } - - /** - * Tells SysUI when the bubble is being dragged. - * Should be called only when the bubble bar is expanded. - * @param bubbleKey key of the bubble being dragged - */ - public void startBubbleDrag(@Nullable String bubbleKey) { - if (mBubbles == null) return; - try { - mBubbles.startBubbleDrag(bubbleKey); - } catch (RemoteException e) { - Log.w(TAG, "Failed call startBubbleDrag"); - } - } - - /** - * Tells SysUI when the bubble stops being dragged. - * Should be called only when the bubble bar is expanded. - * - * @param location location of the bubble bar - * @param top new top coordinate for bubble bar on screen - */ - public void stopBubbleDrag(BubbleBarLocation location, int top) { - if (mBubbles == null) return; - try { - mBubbles.stopBubbleDrag(location, top); - } catch (RemoteException e) { - Log.w(TAG, "Failed call stopBubbleDrag"); - } - } - - /** - * Tells SysUI to dismiss the bubble with the provided key. - * @param key the key of the bubble to dismiss. - */ - public void dragBubbleToDismiss(String key) { - if (mBubbles == null) return; - try { - mBubbles.dragBubbleToDismiss(key); - } catch (RemoteException e) { - Log.w(TAG, "Failed call dragBubbleToDismiss"); - } - } - - /** - * Tells SysUI to show user education relative to the reference point provided. - * @param position the bubble bar top center position in Screen coordinates. - */ - public void showUserEducation(Point position) { - try { - mBubbles.showUserEducation(position.x, position.y); - } catch (RemoteException e) { - Log.w(TAG, "Failed call showUserEducation"); - } - } - - /** - * Tells SysUI to update the bubble bar location to the new location. - * @param location new location for the bubble bar - */ - public void setBubbleBarLocation(BubbleBarLocation location) { - try { - mBubbles.setBubbleBarLocation(location); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setBubbleBarLocation"); - } - } - - /** - * Tells SysUI the top coordinate of bubble bar on screen - * - * @param topOnScreen top coordinate for bubble bar on screen - */ - public void updateBubbleBarTopOnScreen(int topOnScreen) { - try { - if (mBubbles != null) { - mBubbles.updateBubbleBarTopOnScreen(topOnScreen); - } - } catch (RemoteException e) { - Log.w(TAG, "Failed call updateBubbleBarTopOnScreen"); - } - } - - // - // Splitscreen - // - - public void registerSplitScreenListener(ISplitScreenListener listener) { - if (mSplitScreen != null) { - try { - mSplitScreen.registerSplitScreenListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call registerSplitScreenListener"); - } - } - mSplitScreenListener = listener; - } - - public void unregisterSplitScreenListener(ISplitScreenListener listener) { - if (mSplitScreen != null) { - try { - mSplitScreen.unregisterSplitScreenListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call unregisterSplitScreenListener"); - } - } - mSplitScreenListener = null; - } - - public void registerSplitSelectListener(ISplitSelectListener listener) { - if (mSplitScreen != null) { - try { - mSplitScreen.registerSplitSelectListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call registerSplitSelectListener"); - } - } - mSplitSelectListener = listener; - } - - public void unregisterSplitSelectListener(ISplitSelectListener listener) { - if (mSplitScreen != null) { - try { - mSplitScreen.unregisterSplitSelectListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call unregisterSplitSelectListener"); - } - } - mSplitSelectListener = null; - } - - /** Start multiple tasks in split-screen simultaneously. */ - public void startTasks(int taskId1, Bundle options1, int taskId2, Bundle options2, - @StagePosition int splitPosition, @PersistentSnapPosition int snapPosition, - RemoteTransition remoteTransition, InstanceId instanceId) { - if (mSystemUiProxy != null) { - try { - mSplitScreen.startTasks(taskId1, options1, taskId2, options2, splitPosition, - snapPosition, remoteTransition, instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage("startTasks", "RemoteException"), e); - } - } - } - - public void startIntentAndTask(PendingIntent pendingIntent, int userId1, Bundle options1, - int taskId, Bundle options2, @StagePosition int splitPosition, - @PersistentSnapPosition int snapPosition, RemoteTransition remoteTransition, - InstanceId instanceId) { - if (mSystemUiProxy != null) { - try { - mSplitScreen.startIntentAndTask(pendingIntent, userId1, options1, taskId, options2, - splitPosition, snapPosition, remoteTransition, instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage("startIntentAndTask", "RemoteException"), e); - } - } - } - - public void startIntents(PendingIntent pendingIntent1, int userId1, - @Nullable ShortcutInfo shortcutInfo1, Bundle options1, PendingIntent pendingIntent2, - int userId2, @Nullable ShortcutInfo shortcutInfo2, Bundle options2, - @StagePosition int splitPosition, @PersistentSnapPosition int snapPosition, - RemoteTransition remoteTransition, InstanceId instanceId) { - if (mSystemUiProxy != null) { - try { - mSplitScreen.startIntents(pendingIntent1, userId1, shortcutInfo1, options1, - pendingIntent2, userId2, shortcutInfo2, options2, splitPosition, - snapPosition, remoteTransition, instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage("startIntents", "RemoteException"), e); - } - } - } - - public void startShortcutAndTask(ShortcutInfo shortcutInfo, Bundle options1, int taskId, - Bundle options2, @StagePosition int splitPosition, - @PersistentSnapPosition int snapPosition, RemoteTransition remoteTransition, - InstanceId instanceId) { - if (mSystemUiProxy != null) { - try { - mSplitScreen.startShortcutAndTask(shortcutInfo, options1, taskId, options2, - splitPosition, snapPosition, remoteTransition, instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage("startShortcutAndTask", "RemoteException"), e); - } - } - } - - /** - * Start multiple tasks in split-screen simultaneously. - */ - public void startTasksWithLegacyTransition(int taskId1, Bundle options1, int taskId2, - Bundle options2, @StagePosition int splitPosition, - @PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter, - InstanceId instanceId) { - if (mSystemUiProxy != null) { - try { - mSplitScreen.startTasksWithLegacyTransition(taskId1, options1, taskId2, options2, - splitPosition, snapPosition, adapter, instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage( - "startTasksWithLegacyTransition", "RemoteException"), e); - } - } - } - - public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, int userId1, - Bundle options1, int taskId, Bundle options2, @StagePosition int splitPosition, - @PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter, - InstanceId instanceId) { - if (mSystemUiProxy != null) { - try { - mSplitScreen.startIntentAndTaskWithLegacyTransition(pendingIntent, userId1, - options1, taskId, options2, splitPosition, snapPosition, adapter, - instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage( - "startIntentAndTaskWithLegacyTransition", "RemoteException"), e); - } - } - } - - public void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo, Bundle options1, - int taskId, Bundle options2, @StagePosition int splitPosition, - @PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter, - InstanceId instanceId) { - if (mSystemUiProxy != null) { - try { - mSplitScreen.startShortcutAndTaskWithLegacyTransition(shortcutInfo, options1, - taskId, options2, splitPosition, snapPosition, adapter, instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage( - "startShortcutAndTaskWithLegacyTransition", "RemoteException"), e); - } - } - } - - /** - * Starts a pair of intents or shortcuts in split-screen using legacy transition. Passing a - * non-null shortcut info means to start the app as a shortcut. - */ - public void startIntentsWithLegacyTransition(PendingIntent pendingIntent1, int userId1, - @Nullable ShortcutInfo shortcutInfo1, @Nullable Bundle options1, - PendingIntent pendingIntent2, int userId2, @Nullable ShortcutInfo shortcutInfo2, - @Nullable Bundle options2, @StagePosition int sidePosition, - @PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter, - InstanceId instanceId) { - if (mSystemUiProxy != null) { - try { - mSplitScreen.startIntentsWithLegacyTransition(pendingIntent1, userId1, - shortcutInfo1, options1, pendingIntent2, userId2, shortcutInfo2, options2, - sidePosition, snapPosition, adapter, instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage( - "startIntentsWithLegacyTransition", "RemoteException"), e); - } - } - } - - public void startShortcut(String packageName, String shortcutId, int position, - Bundle options, UserHandle user, InstanceId instanceId) { - if (mSplitScreen != null) { - try { - mSplitScreen.startShortcut(packageName, shortcutId, position, options, - user, instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage("startShortcut", "RemoteException"), e); - } - } - } - - public void startIntent(PendingIntent intent, int userId, Intent fillInIntent, int position, - Bundle options, InstanceId instanceId) { - if (mSplitScreen != null) { - try { - mSplitScreen.startIntent(intent, userId, fillInIntent, position, options, - instanceId); - } catch (RemoteException e) { - Log.w(TAG, splitFailureMessage("startIntent", "RemoteException"), e); - } - } - } - - public void removeFromSideStage(int taskId) { - if (mSplitScreen != null) { - try { - mSplitScreen.removeFromSideStage(taskId); - } catch (RemoteException e) { - Log.w(TAG, "Failed call removeFromSideStage"); - } - } - } - - /** - * Call this when going to recents so that shell can set-up and provide appropriate leashes - * for animation (eg. DividerBar). - * - * @return RemoteAnimationTargets of windows that need to animate but only exist in shell. - */ - @Nullable - public RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) { - if (!TaskAnimationManager.ENABLE_SHELL_TRANSITIONS && mSplitScreen != null) { - try { - return mSplitScreen.onGoingToRecentsLegacy(apps); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onGoingToRecentsLegacy"); - } - } - return null; - } - - @Nullable - public RemoteAnimationTarget[] onStartingSplitLegacy(RemoteAnimationTarget[] apps) { - if (mSplitScreen != null) { - try { - return mSplitScreen.onStartingSplitLegacy(apps); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onStartingSplitLegacy"); - } - } - return null; - } - - // - // One handed - // - - public void startOneHandedMode() { - if (mOneHanded != null) { - try { - mOneHanded.startOneHanded(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call startOneHandedMode", e); - } - } - } - - public void stopOneHandedMode() { - if (mOneHanded != null) { - try { - mOneHanded.stopOneHanded(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call stopOneHandedMode", e); - } - } - } - - // - // Remote transitions - // - - public void registerRemoteTransition( - RemoteTransition remoteTransition, TransitionFilter filter) { - if (mShellTransitions != null) { - try { - mShellTransitions.registerRemote(filter, remoteTransition); - } catch (RemoteException e) { - Log.w(TAG, "Failed call registerRemoteTransition"); - } - } - if (!mRemoteTransitions.containsKey(remoteTransition)) { - mRemoteTransitions.put(remoteTransition, filter); - } - } - - public void unregisterRemoteTransition(RemoteTransition remoteTransition) { - if (mShellTransitions != null) { - try { - mShellTransitions.unregisterRemote(remoteTransition); - } catch (RemoteException e) { - Log.w(TAG, "Failed call registerRemoteTransition"); - } - } - mRemoteTransitions.remove(remoteTransition); - } - - public HomeVisibilityState getHomeVisibilityState() { - return mHomeVisibilityState; - } - - /** - * Returns a surface which can be used to attach overlays to home task or null if - * the task doesn't exist or sysui is not connected - */ - @Nullable - public SurfaceControl getHomeTaskOverlayContainer() { - // Use a local reference as this method can be called on a worker thread, which can lead - // to NullPointer exceptions if mShellTransitions is modified on the main thread. - IShellTransitions shellTransitions = mShellTransitions; - if (shellTransitions != null) { - try { - return mShellTransitions.getHomeTaskOverlayContainer(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call getOverlayContainerForTask", e); - } - } - return null; - } - - /** - * Use SystemUI's transaction-queue instead of Launcher's independent one. This is necessary - * if Launcher and SystemUI need to coordinate transactions (eg. for shell transitions). - */ - public void shareTransactionQueue() { - if (!LawnchairQuickstepCompat.ATLEAST_V) return; - if (mOriginalTransactionToken == null) { - mOriginalTransactionToken = SurfaceControl.Transaction.getDefaultApplyToken(); - } - setupTransactionQueue(); - } - - /** - * Switch back to using Launcher's independent transaction queue. - */ - public void unshareTransactionQueue() { - if (!LawnchairQuickstepCompat.ATLEAST_V) return; - if (mOriginalTransactionToken == null) { - return; - } - SurfaceControl.Transaction.setDefaultApplyToken(mOriginalTransactionToken); - mOriginalTransactionToken = null; - } - - private void setupTransactionQueue() { - if (!LawnchairQuickstepCompat.ATLEAST_V) return; - if (mOriginalTransactionToken == null) { - return; - } - if (mShellTransitions == null) { - SurfaceControl.Transaction.setDefaultApplyToken(mOriginalTransactionToken); - return; - } - final IBinder shellApplyToken; - try { - shellApplyToken = mShellTransitions.getShellApplyToken(); - } catch (RemoteException e) { - Log.e(TAG, "Error getting Shell's apply token", e); - return; - } - if (shellApplyToken == null) { - Log.e(TAG, "Didn't receive apply token from Shell"); - return; - } - SurfaceControl.Transaction.setDefaultApplyToken(shellApplyToken); - } - - // - // Starting window - // - - /** - * Sets listener to get callbacks when launching a task. - */ - public void setStartingWindowListener(IStartingWindowListener listener) { - if (mStartingWindow != null) { - try { - mStartingWindow.setStartingWindowListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setStartingWindowListener", e); - } - } - mStartingWindowListener = listener; - } - - // - // SmartSpace transitions - // - - /** - * Sets the instance of {@link ILauncherUnlockAnimationController} that System UI should use to - * control the launcher side of the unlock animation. This will also cause us to dispatch the - * current state of the smartspace to System UI (this will subsequently happen if the state - * changes). - */ - public void setLauncherUnlockAnimationController( - String activityClass, ILauncherUnlockAnimationController controller) { - if (mSysuiUnlockAnimationController != null) { - try { - mSysuiUnlockAnimationController.setLauncherUnlockController( - activityClass, controller); - if (controller != null) { - controller.dispatchSmartspaceStateToSysui(); - } - } catch (RemoteException e) { - Log.w(TAG, "Failed call setLauncherUnlockAnimationController", e); - } - } - mLauncherActivityClass = activityClass; - mLauncherUnlockAnimationController = controller; - } - - /** - * Tells System UI that the Launcher's smartspace state has been updated, so that it can prepare - * the unlock animation accordingly. - */ - public void notifySysuiSmartspaceStateUpdated(SmartspaceState state) { - if (mSysuiUnlockAnimationController != null) { - try { - mSysuiUnlockAnimationController.onLauncherSmartspaceStateUpdated(state); - } catch (RemoteException e) { - Log.w(TAG, "Failed call notifySysuiSmartspaceStateUpdated", e); - e.printStackTrace(); - } - } - } - - // - // Recents - // - - public void registerRecentTasksListener(IRecentTasksListener listener) { - if (mRecentTasks != null) { - try { - mRecentTasks.registerRecentTasksListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call registerRecentTasksListener", e); - } - } - mRecentTasksListener = listener; - } - - public void unregisterRecentTasksListener(IRecentTasksListener listener) { - if (mRecentTasks != null) { - try { - mRecentTasks.unregisterRecentTasksListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call unregisterRecentTasksListener"); - } - } - mRecentTasksListener = null; - } - - // - // Back navigation transitions - // - - /** Sets the launcher {@link android.window.IOnBackInvokedCallback} to shell */ - public void setBackToLauncherCallback(IOnBackInvokedCallback callback, - IRemoteAnimationRunner runner) { - mBackToLauncherCallback = callback; - mBackToLauncherRunner = runner; - if (mBackAnimation == null || mBackToLauncherCallback == null) { - return; - } - try { - mBackAnimation.setBackToLauncherCallback(callback, runner); - } catch (RemoteException | SecurityException e) { - Log.e(TAG, "Failed call setBackToLauncherCallback", e); - } - } - - /** Clears the previously registered {@link IOnBackInvokedCallback}. - * - * @param callback The previously registered callback instance. - */ - public void clearBackToLauncherCallback(IOnBackInvokedCallback callback) { - if (mBackToLauncherCallback != callback) { - return; - } - mBackToLauncherCallback = null; - mBackToLauncherRunner = null; - if (mBackAnimation == null) { - return; - } - try { - mBackAnimation.clearBackToLauncherCallback(); - } catch (RemoteException e) { - Log.e(TAG, "Failed call clearBackToLauncherCallback", e); - } - } - - /** - * Called when the status bar color needs to be customized when back navigation. - */ - public void customizeStatusBarAppearance(AppearanceRegion appearance) { - if (mBackAnimation == null) { - return; - } - try { - mBackAnimation.customizeStatusBarAppearance(appearance); - } catch (RemoteException e) { - Log.e(TAG, "Failed call useLauncherSysBarFlags", e); - } - } - - public ArrayList getRecentTasks(int numTasks, int userId) { - if (mRecentTasks == null) { - Log.w(TAG, "getRecentTasks() failed due to null mRecentTasks"); - return new ArrayList<>(); - } - try { - final GroupedRecentTaskInfo[] rawTasks = mRecentTasks.getRecentTasks(numTasks, - RECENT_IGNORE_UNAVAILABLE, userId); - if (rawTasks == null) { - return new ArrayList<>(); - } - return new ArrayList<>(Arrays.asList(rawTasks)); - } catch (RemoteException e) { - Log.w(TAG, "Failed call getRecentTasks", e); - return new ArrayList<>(); - } - } - - /** - * Gets the set of running tasks. - */ - public ArrayList getRunningTasks(int numTasks) { - if (mRecentTasks != null && shouldEnableRunningTasksForDesktopMode()) { - try { - return new ArrayList<>(Arrays.asList(mRecentTasks.getRunningTasks(numTasks))); - } catch (RemoteException e) { - Log.w(TAG, "Failed call getRunningTasks", e); - } - } - return new ArrayList<>(); - } - - private boolean shouldEnableRunningTasksForDesktopMode() { - // TODO(b/335401172): unify DesktopMode checks in Launcher - return enableDesktopWindowingMode() && enableDesktopWindowingTaskbarRunningApps(); - } - - private boolean handleMessageAsync(Message msg) { - switch (msg.what) { - case MSG_SET_SHELF_HEIGHT: - setShelfHeightAsync(msg.arg1, msg.arg2); - return true; - case MSG_SET_LAUNCHER_KEEP_CLEAR_AREA_HEIGHT: - setLauncherKeepClearAreaHeight(msg.arg1, msg.arg2); - return true; - } - - return false; - } - - // - // Desktop Mode - // - - /** Call shell to show all apps active on the desktop */ - public void showDesktopApps(int displayId, @Nullable RemoteTransition transition) { - if (mDesktopMode != null) { - try { - mDesktopMode.showDesktopApps(displayId, transition); - } catch (RemoteException e) { - Log.w(TAG, "Failed call showDesktopApps", e); - } - } - } - - /** - * If task with the given id is on the desktop, bring it to front - */ - public void showDesktopApp(int taskId) { - if (mDesktopMode != null) { - try { - mDesktopMode.showDesktopApp(taskId); - } catch (RemoteException e) { - Log.w(TAG, "Failed call showDesktopApp", e); - } - } - } - - /** Call shell to get number of visible freeform tasks */ - public int getVisibleDesktopTaskCount(int displayId) { - if (mDesktopMode != null) { - try { - return mDesktopMode.getVisibleTaskCount(displayId); - } catch (RemoteException e) { - Log.w(TAG, "Failed call getVisibleDesktopTaskCount", e); - } - } - return 0; - } - - /** Set a listener on shell to get updates about desktop task state */ - public void setDesktopTaskListener(@Nullable IDesktopTaskListener listener) { - mDesktopTaskListener = listener; - if (mDesktopMode != null) { - try { - mDesktopMode.setTaskListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setDesktopTaskListener", e); - } - } - } - - /** Perform cleanup transactions after animation to split select is complete */ - public void onDesktopSplitSelectAnimComplete(ActivityManager.RunningTaskInfo taskInfo) { - if (mDesktopMode != null) { - try { - mDesktopMode.onDesktopSplitSelectAnimComplete(taskInfo); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onDesktopSplitSelectAnimComplete", e); - } - } - } - - /** Call shell to move a task with given `taskId` to desktop */ - public void moveToDesktop(int taskId, DesktopModeTransitionSource transitionSource) { - if (mDesktopMode != null) { - try { - mDesktopMode.moveToDesktop(taskId, transitionSource); - } catch (RemoteException e) { - Log.w(TAG, "Failed call moveToDesktop", e); - } - } - } - - // - // Unfold transition - // - - /** Sets the unfold animation lister to sysui. */ - public void setUnfoldAnimationListener(IUnfoldTransitionListener callback) { - mUnfoldAnimationListener = callback; - if (mUnfoldAnimation == null) { - return; - } - try { - Log.d(TAG, "Registering unfold animation receiver"); - mUnfoldAnimation.setListener(callback); - } catch (RemoteException e) { - Log.e(TAG, "Failed call setUnfoldAnimationListener", e); - } - } - - @Nullable - public ProxyUnfoldTransitionProvider getUnfoldTransitionProvider() { - return mUnfoldTransitionProvider; - } - - // - // Recents - // - - /** - * Starts the recents activity. The caller should manage the thread on which this is called. - */ - public boolean startRecentsActivity(Intent intent, ActivityOptions options, - RecentsAnimationListener listener) { - if (mRecentTasks == null) { - ActiveGestureLog.INSTANCE.addLog("Null mRecentTasks", RECENT_TASKS_MISSING); - return false; - } - final IRecentsAnimationRunner runner = new IRecentsAnimationRunner.Stub() { - @Override - public void onAnimationStart(IRecentsAnimationController controller, - RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers, - Rect homeContentInsets, Rect minimizedHomeBounds, Bundle extras) { - // Aidl bundles need to explicitly set class loader - // https://developer.android.com/guide/components/aidl#Bundles - if (extras != null) { - extras.setClassLoader(getClass().getClassLoader()); - } - listener.onAnimationStart(new RecentsAnimationControllerCompat(controller), apps, - wallpapers, homeContentInsets, minimizedHomeBounds, extras); - } - - // Support for Android 13 and below - public void onAnimationStart(IRecentsAnimationController controller, - RemoteAnimationTarget[] apps, RemoteAnimationTarget[] nonAppTargets, - Rect homeContentInsets, Rect minimizedHomeBounds) { - // Chain the call to the newer 6-argument version, passing null for the 'extras' bundle. - onAnimationStart(controller, apps, nonAppTargets, homeContentInsets, - minimizedHomeBounds, null); - } - - - @Override - public void onAnimationCanceled(int[] taskIds, TaskSnapshot[] taskSnapshots) { - listener.onAnimationCanceled( - ThumbnailData.wrap(taskIds, taskSnapshots)); - } - - @Override - public void onTasksAppeared(RemoteAnimationTarget[] apps) { - listener.onTasksAppeared(apps); - } - }; - final Bundle optsBundle = options.toBundle(); - try { - mRecentTasks.startRecentsTransition(mRecentsPendingIntent, intent, optsBundle, - mContext.getIApplicationThread(), runner); - return true; - } catch (RemoteException e) { - Log.e(TAG, "Error starting recents via shell", e); - return false; - } - } - - // - // Drag and drop - // - - /** - * For testing purposes. Returns `true` only if the shell drop target has shown and - * drawn and is ready to handle drag events and the subsequent drop. - */ - public boolean isDragAndDropReady() { - if (mDragAndDrop == null) { - return false; - } - try { - return mDragAndDrop.isReadyToHandleDrag(); - } catch (RemoteException e) { - Log.e(TAG, "Error querying drag state", e); - return false; - } - } - - public void dump(PrintWriter pw) { - pw.println(TAG + ":"); - - pw.println("\tmSystemUiProxy=" + mSystemUiProxy); - pw.println("\tmPip=" + mPip); - pw.println("\tmPipAnimationListener=" + mPipAnimationListener); - pw.println("\tmBubbles=" + mBubbles); - pw.println("\tmBubblesListener=" + mBubblesListener); - pw.println("\tmSplitScreen=" + mSplitScreen); - pw.println("\tmSplitScreenListener=" + mSplitScreenListener); - pw.println("\tmSplitSelectListener=" + mSplitSelectListener); - pw.println("\tmOneHanded=" + mOneHanded); - pw.println("\tmShellTransitions=" + mShellTransitions); - pw.println("\tmHomeVisibilityState=" + mHomeVisibilityState); - pw.println("\tmStartingWindow=" + mStartingWindow); - pw.println("\tmStartingWindowListener=" + mStartingWindowListener); - pw.println("\tmSysuiUnlockAnimationController=" + mSysuiUnlockAnimationController); - pw.println("\tmLauncherActivityClass=" + mLauncherActivityClass); - pw.println("\tmLauncherUnlockAnimationController=" + mLauncherUnlockAnimationController); - pw.println("\tmRecentTasks=" + mRecentTasks); - pw.println("\tmRecentTasksListener=" + mRecentTasksListener); - pw.println("\tmBackAnimation=" + mBackAnimation); - pw.println("\tmBackToLauncherCallback=" + mBackToLauncherCallback); - pw.println("\tmBackToLauncherRunner=" + mBackToLauncherRunner); - pw.println("\tmDesktopMode=" + mDesktopMode); - pw.println("\tmDesktopTaskListener=" + mDesktopTaskListener); - pw.println("\tmUnfoldAnimation=" + mUnfoldAnimation); - pw.println("\tmUnfoldAnimationListener=" + mUnfoldAnimationListener); - pw.println("\tmDragAndDrop=" + mDragAndDrop); - } -} diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.kt b/quickstep/src/com/android/quickstep/SystemUiProxy.kt new file mode 100644 index 00000000000..ac96e10d06d --- /dev/null +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.kt @@ -0,0 +1,1528 @@ +/* + * 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.quickstep + +import android.app.ActivityManager +import android.app.ActivityManager.RunningTaskInfo +import android.app.ActivityOptions +import android.app.ActivityTaskManager.INVALID_TASK_ID +import android.app.PendingIntent +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.pm.ShortcutInfo +import android.graphics.Point +import android.graphics.Rect +import android.os.Bundle +import android.os.Handler +import android.os.IBinder +import android.os.Message +import android.os.RemoteException +import android.os.Trace +import android.os.Trace.traceBegin +import android.os.Trace.traceEnd +import android.os.UserHandle +import android.util.Log +import android.view.IRemoteAnimationRunner +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.RemoteAnimationTarget +import android.view.SurfaceControl +import android.view.SurfaceControl.Transaction +import android.window.DesktopExperienceFlags +import android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS +import android.window.IOnBackInvokedCallback +import android.window.RemoteTransition +import android.window.TaskSnapshot +import android.window.TransitionFilter +import android.window.TransitionInfo +import android.window.WindowContainerTransaction +import androidx.annotation.MainThread +import androidx.annotation.VisibleForTesting +import androidx.annotation.WorkerThread +//import app.lawnchair.gestures.type.GestureType +import com.android.internal.logging.InstanceId +import com.android.internal.util.ScreenshotRequest +import com.android.internal.view.AppearanceRegion +import com.android.launcher3.Flags +import com.android.launcher3.Utilities.ATLEAST_BAKLAVA +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.taskbar.bubbles.BubbleActivityStarter +import com.android.launcher3.util.DaggerSingletonObject +import com.android.launcher3.concurrent.annotations.LightweightBackground +import com.android.launcher3.concurrent.annotations.Ui +import com.android.launcher3.concurrent.annotations.LightweightBackgroundPriority.UI +import com.android.launcher3.util.LooperExecutor +import com.android.launcher3.util.Preconditions +import com.android.launcher3.util.SplitConfigurationOptions.StagePosition +import com.android.quickstep.util.ActiveGestureProtoLogProxy +import com.android.quickstep.util.ContextualSearchInvoker +import com.android.quickstep.util.unfold.ProxyUnfoldTransitionProvider +import com.android.systemui.contextualeducation.GestureType +import com.android.systemui.shared.recents.ISystemUiProxy +import com.android.systemui.shared.recents.model.ThumbnailData.Companion.wrap +import com.android.systemui.shared.system.QuickStepContract +import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags +import com.android.systemui.shared.system.RecentsAnimationControllerCompat +import com.android.systemui.shared.system.RecentsAnimationListener +import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController +import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController +import com.android.systemui.shared.system.smartspace.SmartspaceState +import com.android.systemui.unfold.config.ResourceUnfoldTransitionConfig +import com.android.systemui.unfold.progress.IUnfoldAnimation +import com.android.systemui.unfold.progress.IUnfoldTransitionListener +import com.android.wm.shell.back.IBackAnimation +import com.android.wm.shell.bubbles.IBubbles +import com.android.wm.shell.bubbles.IBubblesListener +import com.android.wm.shell.common.pip.IPip +import com.android.wm.shell.common.pip.IPipAnimationListener +import com.android.wm.shell.desktopmode.IDesktopMode +import com.android.wm.shell.desktopmode.IDesktopTaskListener +import com.android.wm.shell.desktopmode.IMoveToDesktopCallback +import com.android.wm.shell.draganddrop.IDragAndDrop +import com.android.wm.shell.onehanded.IOneHanded +import com.android.wm.shell.recents.IRecentTasks +import com.android.wm.shell.recents.IRecentTasksListener +import com.android.wm.shell.recents.IRecentsAnimationController +import com.android.wm.shell.recents.IRecentsAnimationRunner +import com.android.wm.shell.shared.GroupedTaskInfo +import com.android.wm.shell.shared.IShellTransitions +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import com.android.wm.shell.shared.bubbles.BubbleBarLocation.UpdateSource +import com.android.wm.shell.shared.bubbles.logging.EntryPoint +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource +import com.android.wm.shell.shared.desktopmode.DesktopTaskToFrontReason +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants.PersistentSnapPosition +import com.android.wm.shell.splitscreen.ISplitScreen +import com.android.wm.shell.splitscreen.ISplitScreenListener +import com.android.wm.shell.splitscreen.ISplitSelectListener +import com.android.wm.shell.startingsurface.IStartingWindow +import com.android.wm.shell.startingsurface.IStartingWindowListener +import java.io.PrintWriter +import java.util.concurrent.Executor +import javax.inject.Inject + +/** Holds the reference to SystemUI. */ +@LauncherAppSingleton +class SystemUiProxy @Inject constructor( + @ApplicationContext private val context: Context, + @Ui private val uiExecutor: Executor, + @LightweightBackground(priority = UI) private val lightweightBackgroundExecutor: LooperExecutor +) : NavHandle { + + private var systemUiProxy: ISystemUiProxy? = null + private var pip: IPip? = null + private var bubbles: IBubbles? = null + private var sysuiUnlockAnimationController: ISysuiUnlockAnimationController? = null + private var splitScreen: ISplitScreen? = null + private var oneHanded: IOneHanded? = null + private var shellTransitions: IShellTransitions? = null + private var startingWindow: IStartingWindow? = null + private var recentTasks: IRecentTasks? = null + private var backAnimation: IBackAnimation? = null + private var desktopMode: IDesktopMode? = null + private var unfoldAnimation: IUnfoldAnimation? = null + + private val systemUiProxyDeathRecipient = + IBinder.DeathRecipient { uiExecutor.execute { clearProxy() } } + + // Save the listeners passed into the proxy since LauncherProxyService may not have been bound + // yet, and we'll need to set/register these listeners with SysUI when they do. Note that it is + // up to the caller to clear the listeners to prevent leaks as these can be held indefinitely + // in case SysUI needs to rebind. + private var pipAnimationListener: IPipAnimationListener? = null + private var bubblesListener: IBubblesListener? = null + private var splitScreenListener: ISplitScreenListener? = null + private var splitSelectListener: ISplitSelectListener? = null + private val splitSelectListeners = HashSet() + private val splitSelectListenerTracker: ISplitSelectListener = + object : ISplitSelectListener.Stub() { + override fun onRequestSplitSelect( + taskInfo: RunningTaskInfo?, + splitPosition: Int, + taskBounds: Rect?, + startRecents: Boolean, + withRecentsWct: WindowContainerTransaction?, + ): Boolean { + uiExecutor.execute { + for (listener in splitSelectListeners) { + if ( + listener.onRequestSplitSelect( + taskInfo, + splitPosition, + taskBounds, + startRecents, + withRecentsWct, + ) + ) { + break + } + } + } + // Always return true to shell to signal that SystemUiProxy received the request. + return true + } + } + private var startingWindowListener: IStartingWindowListener? = null + private var launcherUnlockAnimationController: ILauncherUnlockAnimationController? = null + private var launcherActivityClass: String? = null + private var recentTasksListener: IRecentTasksListener? = null + private var unfoldAnimationListener: IUnfoldTransitionListener? = null + private var desktopTaskListener: IDesktopTaskListener? = null + private val remoteTransitions = LinkedHashMap() + + // Save bubble bar state in case service is not bound yet when it is updated. SysUI relies on + // this to suppress the floating bubbles UI. + private var hasBubbleBar = false + + private val stateChangeCallbacks: MutableList = ArrayList() + + private var originalTransactionToken: IBinder? = null + private var backToLauncherCallback: IOnBackInvokedCallback? = null + private var backToLauncherRunner: IRemoteAnimationRunner? = null + private var dragAndDrop: IDragAndDrop? = null + val homeVisibilityState = HomeVisibilityState() + val focusState = FocusState() + + // Used to dedupe calls to SystemUI + private var lastShelfHeight = 0 + private var lastShelfVisible = false + + // Used to dedupe calls to SystemUI + private var lastLauncherKeepClearAreaHeight = 0 + private var lastLauncherKeepClearAreaHeightVisible = false + + private val asyncHandler = + Handler(lightweightBackgroundExecutor.looper) { handleMessageAsync(it) } + + // TODO(141886704): Find a way to remove this + @SystemUiStateFlags var lastSystemUiStateFlags: Long = 0 + + private val pendingIntentCache = mutableMapOf() + + /** + * This returns a pending intent that is used to start recents via Shell (which is a different + * process). It is bare-bones, so it's expected that the component and options will be provided + * via fill-in intent. + */ + private fun getRecentsPendingIntent(displayId: Int) = + pendingIntentCache.computeIfAbsent(displayId) { + PendingIntent.getActivity( + context, + 0, + Intent().setPackage(context.packageName), + PendingIntent.FLAG_MUTABLE or + PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT or + Intent.FILL_IN_COMPONENT or + PendingIntent.FLAG_CANCEL_CURRENT, + ActivityOptions.makeBasic() + .setPendingIntentCreatorBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED + ) + .setLaunchDisplayId(displayId) + .toBundle(), + ) + } + + val unfoldTransitionProvider: ProxyUnfoldTransitionProvider? = + if ((Flags.enableUnfoldStateAnimation() && ResourceUnfoldTransitionConfig().isEnabled)) + ProxyUnfoldTransitionProvider() + else null + + private inline fun executeWithErrorLog( + errorMsg: () -> String, + tag: String = TAG, + callback: () -> Any?, + ) { + try { + callback.invoke() + } catch (e: RemoteException) { + Log.w(tag, errorMsg.invoke(), e) + } + } + + fun onBackEvent(backEvent: KeyEvent?, displayId: Int) = + executeWithErrorLog({ "Failed call onBackPressed" }) { + systemUiProxy?.onBackEvent(backEvent, displayId) + } + + /** SystemUI will run ACTION_DOWN and ACTION_UP KeyEvents for the given keycode. */ + fun onKeyEvent(keycode: Int, displayId: Int) = + executeWithErrorLog({ "Failed call onKeyEvent ${KeyEvent.keyCodeToString(keycode)}" }) { + systemUiProxy?.onKeyEvent(keycode, displayId) + } + + fun onImeSwitcherPressed() = + executeWithErrorLog({ "Failed call onImeSwitcherPressed" }) { + systemUiProxy?.onImeSwitcherPressed() + } + + fun onImeSwitcherLongPress() = + executeWithErrorLog({ "Failed call onImeSwitcherLongPress" }) { + systemUiProxy?.onImeSwitcherLongPress() + } + + fun updateContextualEduStats(isTrackpadGesture: Boolean, gestureType: GestureType) = + executeWithErrorLog({ "Failed call updateContextualEduStats" }) { + systemUiProxy?.updateContextualEduStats(isTrackpadGesture, gestureType.name) + } + + fun setHomeRotationEnabled(enabled: Boolean) = + executeWithErrorLog({ "Failed call setHomeRotationEnabled" }) { + systemUiProxy?.setHomeRotationEnabled(enabled) + } + + /** + * Sets proxy state, including death linkage, various listeners, and other configuration objects + */ + @MainThread + fun setProxy( + proxy: ISystemUiProxy?, + pip: IPip?, + bubbles: IBubbles?, + splitScreen: ISplitScreen?, + oneHanded: IOneHanded?, + shellTransitions: IShellTransitions?, + startingWindow: IStartingWindow?, + recentTasks: IRecentTasks?, + sysuiUnlockAnimationController: ISysuiUnlockAnimationController?, + backAnimation: IBackAnimation?, + desktopMode: IDesktopMode?, + unfoldAnimation: IUnfoldAnimation?, + dragAndDrop: IDragAndDrop?, + ) { + Preconditions.assertUIThread() + unlinkToDeath() + systemUiProxy = proxy + this.pip = pip + this.bubbles = bubbles + this.splitScreen = splitScreen + this.oneHanded = oneHanded + this.shellTransitions = shellTransitions + this.startingWindow = startingWindow + this.sysuiUnlockAnimationController = sysuiUnlockAnimationController + this.recentTasks = recentTasks + this.backAnimation = backAnimation + this.desktopMode = desktopMode + this.unfoldAnimation = if (Flags.enableUnfoldStateAnimation()) null else unfoldAnimation + this.dragAndDrop = dragAndDrop + linkToDeath() + setHasBubbleBar(hasBubbleBar) + // re-attach the listeners once missing due to setProxy has not been initialized yet. + setPipAnimationListener(pipAnimationListener) + setBubblesListener(bubblesListener) + registerSplitScreenListener(splitScreenListener) + if (DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX.isTrue) { + executeWithErrorLog({ "Failed call registerSplitSelectListener" }) { + splitScreen?.registerSplitSelectListener(splitSelectListenerTracker) + } + } else { + registerSplitSelectListener(splitSelectListener) + } + homeVisibilityState.init(this.shellTransitions) + focusState.init(this.shellTransitions) + setStartingWindowListener(startingWindowListener) + setLauncherUnlockAnimationController( + launcherActivityClass, + launcherUnlockAnimationController, + ) + LinkedHashMap(remoteTransitions).forEach { (remoteTransition, filter) -> + registerRemoteTransition(remoteTransition, filter) + } + setupTransactionQueue() + registerRecentTasksListener(recentTasksListener) + setBackToLauncherCallback(backToLauncherCallback, backToLauncherRunner) + setUnfoldAnimationListener(unfoldAnimationListener) + setDesktopTaskListener(desktopTaskListener) + setAssistantOverridesRequested( + ContextualSearchInvoker(context).getSysUiAssistOverrideInvocationTypes() + ) + stateChangeCallbacks.forEach { it.run() } + + if (unfoldTransitionProvider != null) { + if (unfoldAnimation != null) { + try { + unfoldAnimation.setListener(unfoldTransitionProvider) + unfoldTransitionProvider.isActive = true + } catch (e: RemoteException) { + // Ignore + } + } else { + unfoldTransitionProvider.isActive = false + } + } + } + + /** + * Clear the proxy to release held resources and turn the majority of its operations into no-ops + */ + @MainThread + fun clearProxy() = + setProxy(null, null, null, null, null, null, null, null, null, null, null, null, null) + + /** Adds a callback to be notified whenever the active state changes */ + fun addOnStateChangeListener(callback: Runnable) = stateChangeCallbacks.add(callback) + + /** Removes a previously added state change callback */ + fun removeOnStateChangeListener(callback: Runnable) = stateChangeCallbacks.remove(callback) + + fun isActive() = systemUiProxy != null + + private fun linkToDeath() = + executeWithErrorLog({ "Failed to link sysui proxy death recipient" }) { + systemUiProxy?.asBinder()?.linkToDeath(systemUiProxyDeathRecipient, 0 /* flags */) + } + + private fun unlinkToDeath() = + systemUiProxy?.asBinder()?.unlinkToDeath(systemUiProxyDeathRecipient, 0 /* flags */) + + fun startScreenPinning(taskId: Int) = + executeWithErrorLog({ "Failed call startScreenPinning" }) { + systemUiProxy?.startScreenPinning(taskId) + } + + fun onOverviewShown(fromHome: Boolean, tag: String = TAG) = + executeWithErrorLog( + { "Failed call onOverviewShown from: ${(if (fromHome) "home" else "app")}" }, + tag = tag, + ) { + systemUiProxy?.onOverviewShown(fromHome) + } + + @MainThread + fun onStatusBarTouchEvent(event: MotionEvent) { + Preconditions.assertUIThread() + executeWithErrorLog({ "Failed call onStatusBarTouchEvent with arg: $event" }) { + systemUiProxy?.onStatusBarTouchEvent(event) + } + } + + fun onStatusBarTrackpadEvent(event: MotionEvent) = + executeWithErrorLog({ "Failed call onStatusBarTrackpadEvent with arg: $event" }) { + systemUiProxy?.onStatusBarTrackpadEvent(event) + } + + fun onAssistantProgress(progress: Float) = + executeWithErrorLog({ "Failed call onAssistantProgress with progress: $progress" }) { + systemUiProxy?.onAssistantProgress(progress) + } + + fun onAssistantGestureCompletion(velocity: Float) = + executeWithErrorLog({ "Failed call onAssistantGestureCompletion" }) { + systemUiProxy?.onAssistantGestureCompletion(velocity) + } + + fun startAssistant(args: Bundle) = + executeWithErrorLog({ "Failed call startAssistant" }) { + systemUiProxy?.startAssistant(args) + } + + fun setAssistantOverridesRequested(invocationTypes: IntArray) = + executeWithErrorLog({ "Failed call setAssistantOverridesRequested" }) { + systemUiProxy?.setAssistantOverridesRequested(invocationTypes) + } + + override fun animateNavBarLongPress(isTouchDown: Boolean, shrink: Boolean, durationMs: Long) = + executeWithErrorLog({ "Failed call animateNavBarLongPress" }) { + systemUiProxy?.animateNavBarLongPress(isTouchDown, shrink, durationMs) + } + + fun setOverrideHomeButtonLongPress(duration: Long, slopMultiplier: Float, haptic: Boolean) = + executeWithErrorLog({ "Failed call setOverrideHomeButtonLongPress" }) { + systemUiProxy?.setOverrideHomeButtonLongPress(duration, slopMultiplier, haptic) + } + + fun notifyAccessibilityButtonClicked(displayId: Int) = + executeWithErrorLog({ "Failed call notifyAccessibilityButtonClicked" }) { + systemUiProxy?.notifyAccessibilityButtonClicked(displayId) + } + + fun notifyAccessibilityButtonLongClicked() = + executeWithErrorLog({ "Failed call notifyAccessibilityButtonLongClicked" }) { + systemUiProxy?.notifyAccessibilityButtonLongClicked() + } + + fun stopScreenPinning() = + executeWithErrorLog({ "Failed call stopScreenPinning" }) { + systemUiProxy?.stopScreenPinning() + } + + fun notifyPrioritizedRotation(rotation: Int) = + executeWithErrorLog({ "Failed call notifyPrioritizedRotation with arg: $rotation" }) { + systemUiProxy?.notifyPrioritizedRotation(rotation) + } + + fun notifyTaskbarStatus(visible: Boolean, stashed: Boolean) = + executeWithErrorLog({ "Failed call notifyTaskbarStatus with arg: $visible, $stashed" }) { + systemUiProxy?.notifyTaskbarStatus(visible, stashed) + } + + /** + * NOTE: If called to suspend, caller MUST call this method to also un-suspend. [suspend] should + * be `true` to stop auto-hide, `false` to resume normal behavior + */ + fun notifyTaskbarAutohideSuspend(suspend: Boolean) = + executeWithErrorLog({ "Failed call notifyTaskbarAutohideSuspend with arg: $suspend" }) { + // LC-Ignored + //systemUiProxy?.notifyTaskbarAutohideSuspend(suspend) + } + + fun notifyRecentsButtonPositionChanged(bounds: Rect) { + executeWithErrorLog({ + "Failed call notifyRecentsButtonPositionChanged with arg: $bounds" + }) { + systemUiProxy?.notifyRecentsButtonPositionChanged(bounds) + } + } + + fun takeScreenshot(request: ScreenshotRequest) = + executeWithErrorLog({ "Failed call takeScreenshot" }) { + // LC-Ignored + //systemUiProxy?.takeScreenshot(request) + } + + fun expandNotificationPanel() = + executeWithErrorLog({ "Failed call expandNotificationPanel" }) { + // LC-Ignored + //systemUiProxy?.expandNotificationPanel() + } + + fun toggleNotificationPanel() = + executeWithErrorLog({ "Failed call toggleNotificationPanel" }) { + // LC-Ignored + //systemUiProxy?.toggleNotificationPanel() + } + + fun toggleQuickSettingsPanel() = + executeWithErrorLog({ "Failed call toggleQuickSettingsPanel" }) { + // LC-Ignored + //systemUiProxy?.toggleQuickSettingsPanel() + } + + // + // Pip + // + /** Sets the shelf height. */ + fun setShelfHeight(visible: Boolean, shelfHeight: Int) = + Message.obtain(asyncHandler, MSG_SET_SHELF_HEIGHT, if (visible) 1 else 0, shelfHeight) + .sendToTarget() + + @WorkerThread + private fun setShelfHeightAsync(visibleInt: Int, shelfHeight: Int) { + val visible = visibleInt != 0 + val changed = visible != lastShelfVisible || shelfHeight != lastShelfHeight + val pip = pip + if (pip != null && changed) { + lastShelfVisible = visible + lastShelfHeight = shelfHeight + executeWithErrorLog({ + "Failed call setShelfHeight visible: $visible height: $shelfHeight" + }) { + pip.setShelfHeight(visible, shelfHeight) + } + } + } + + /** + * Sets the height of the keep clear area that is going to be reported by the Launcher for the + * Hotseat. + */ + fun setLauncherKeepClearAreaHeight(visible: Boolean, height: Int) = + Message.obtain( + asyncHandler, + MSG_SET_LAUNCHER_KEEP_CLEAR_AREA_HEIGHT, + if (visible) 1 else 0, + height, + ) + .sendToTarget() + + @WorkerThread + private fun setLauncherKeepClearAreaHeight(visibleInt: Int, height: Int) { + val visible = visibleInt != 0 + val changed = + visible != lastLauncherKeepClearAreaHeightVisible || + height != lastLauncherKeepClearAreaHeight + val pip = pip + if (pip != null && changed) { + lastLauncherKeepClearAreaHeightVisible = visible + lastLauncherKeepClearAreaHeight = height + executeWithErrorLog({ + "Failed call setLauncherKeepClearAreaHeight visible: $visible height: $height" + }) { + pip.setLauncherKeepClearAreaHeight(visible, height) + } + } + } + + /** Sets listener to get pip animation callbacks. */ + fun setPipAnimationListener(listener: IPipAnimationListener?) { + executeWithErrorLog({ "Failed call setPinnedStackAnimationListener" }) { + pip?.setPipAnimationListener(listener) + } + pipAnimationListener = listener + } + + /** @return Destination bounds of auto-pip animation, `null` if the animation is not ready. */ + fun startSwipePipToHome( + taskInfo: RunningTaskInfo, + launcherRotation: Int, + hotseatKeepClearArea: Rect?, + ): Rect? { + executeWithErrorLog({ "Failed call startSwipePipToHome" }) { + return pip?.startSwipePipToHome(taskInfo, launcherRotation, hotseatKeepClearArea) + } + return null + } + + /** + * Notifies WM Shell that launcher has finished the preparation of the animation for swipe to + * home. WM Shell can choose to fade out the overlay when entering PIP is finished, and WM Shell + * should be responsible for cleaning up the overlay. + */ + fun stopSwipePipToHome( + taskId: Int, + componentName: ComponentName?, + destinationBounds: Rect?, + overlay: SurfaceControl?, + appBounds: Rect?, + sourceRectHint: Rect?, + ) = + executeWithErrorLog({ "Failed call stopSwipePipToHome" }) { + pip?.stopSwipePipToHome( + taskId, + componentName, + destinationBounds, + overlay, + appBounds, + sourceRectHint, + ) + } + + /** + * Notifies WM Shell that launcher has aborted all the animation for swipe to home. WM Shell can + * use this callback to clean up its internal states. + */ + fun abortSwipePipToHome(taskId: Int, componentName: ComponentName?) = + executeWithErrorLog({ "Failed call abortSwipePipToHome" }) { + pip?.abortSwipePipToHome(taskId, componentName) + } + + /** Sets the next pip animation type to be the alpha animation. */ + fun setPipAnimationTypeToAlpha() = + executeWithErrorLog({ "Failed call setPipAnimationTypeToAlpha" }) { + pip?.setPipAnimationTypeToAlpha() + } + + /** Sets the app icon size in pixel used by Launcher all apps. */ + fun setLauncherAppIconSize(iconSizePx: Int) = + executeWithErrorLog({ "Failed call setLauncherAppIconSize" }) { + pip?.setLauncherAppIconSize(iconSizePx) + } + + // + // Bubbles + // + /** Tells SysUI whether bubble bar is used or not. */ + fun setHasBubbleBar(hasBubbleBar: Boolean) { + executeWithErrorLog({ "Failed call setHasBubbleBar" }) { + bubbles?.setHasBubbleBar(hasBubbleBar) + } + this.hasBubbleBar = hasBubbleBar + } + + /** Sets the listener to be notified of bubble state changes. */ + fun setBubblesListener(listener: IBubblesListener?) { + executeWithErrorLog({ "Failed call registerBubblesListener" }) { + bubbles?.apply { + bubblesListener?.let { unregisterBubbleListener(it) } + listener?.let { registerBubbleListener(it) } + } + } + bubblesListener = listener + } + + /** + * Tells SysUI to show the bubble with the provided key. + * + * @param key the key of the bubble to show. + * @param bubbleBarTopToScreenBottom distance between the top coordinate of bubble bar and the + * bottom of the screen + */ + fun showBubble(key: String?, bubbleBarTopToScreenBottom: Int) = + executeWithErrorLog({ "Failed call showBubble" }) { + bubbles?.showBubble(key, bubbleBarTopToScreenBottom) + } + + /** Tells SysUI to remove all bubbles. */ + fun removeAllBubbles() = + executeWithErrorLog({ "Failed call removeAllBubbles" }) { bubbles?.removeAllBubbles() } + + /** Tells SysUI to collapse the bubbles. */ + fun collapseBubbles() = + executeWithErrorLog({ "Failed call collapseBubbles" }) { bubbles?.collapseBubbles() } + + /** + * Tells SysUI when the bubble is being dragged. Should be called only when the bubble bar is + * expanded. + * + * @param bubbleKey key of the bubble being dragged + */ + fun startBubbleDrag(bubbleKey: String?) = + executeWithErrorLog({ "Failed call startBubbleDrag" }) { + bubbles?.startBubbleDrag(bubbleKey) + } + + /** + * Tells SysUI when the bubble stops being dragged. Should be called only when the bubble bar is + * expanded. + * + * @param location location of the bubble bar + * @param bubbleBarTopToScreenBottom distance between the new top coordinate for bubble bar and + * the bottom of the screen + */ + fun stopBubbleDrag(location: BubbleBarLocation?, bubbleBarTopToScreenBottom: Int) = + executeWithErrorLog({ "Failed call stopBubbleDrag" }) { + bubbles?.stopBubbleDrag(location, bubbleBarTopToScreenBottom) + } + + /** + * Tells SysUI to dismiss the bubble with the provided key. + * + * @param key the key of the bubble to dismiss. + * @param timestamp the timestamp when the removal happened. + */ + fun dragBubbleToDismiss(key: String?, timestamp: Long) = + executeWithErrorLog({ "Failed call dragBubbleToDismiss" }) { + bubbles?.dragBubbleToDismiss(key, timestamp) + } + + /** + * Tells SysUI to show user education relative to the reference point provided. + * + * @param position the bubble bar top center position in Screen coordinates. + */ + fun showUserEducation(position: Point) = + executeWithErrorLog({ "Failed call showUserEducation" }) { + bubbles?.showUserEducation(position.x, position.y) + } + + /** + * Tells SysUI to update the bubble bar location to the new location. + * + * @param location new location for the bubble bar + * @param source what triggered the location update + */ + fun setBubbleBarLocation(location: BubbleBarLocation?, @UpdateSource source: Int) = + executeWithErrorLog({ "Failed call setBubbleBarLocation" }) { + bubbles?.setBubbleBarLocation(location, source) + } + + /** + * Tells SysUI the distance between the top coordinate of the bubble bar and the bottom of the + * screen + */ + fun updateBubbleBarTopToScreenBottom(bubbleBarTopToScreenBottom: Int) = + executeWithErrorLog({ "Failed call updateBubbleBarTopToScreenBottom" }) { + bubbles?.updateBubbleBarTopToScreenBottom(bubbleBarTopToScreenBottom) + } + + /** + * Tells SysUI to show a shortcut bubble. + * + * This method should NOT be used directly. Please use + * [BubbleActivityStarter.showShortcutBubble] instead. + * + * @param info the shortcut info used to create or identify the bubble. + * @param entryPoint indicates how the bubble was created. + * @param bubbleBarLocation the optional location of the bubble bar. + */ + @JvmOverloads + fun showShortcutBubble( + info: ShortcutInfo?, + entryPoint: EntryPoint, + bubbleBarLocation: BubbleBarLocation? = null, + ) = + executeWithErrorLog({ "Failed call showShortcutBubble" }) { + bubbles?.showShortcutBubble(info, entryPoint, bubbleBarLocation) + } + + /** + * Tells SysUI to show a bubble of an app. + * + * This method should NOT be used directly. Please use [BubbleActivityStarter.showAppBubble] + * instead. + * + * @param intent the intent used to create the bubble. + * @param entryPoint indicates how the bubble was created. + * @param bubbleBarLocation the optional location of the bubble bar. + */ + @JvmOverloads + fun showAppBubble( + intent: Intent?, + user: UserHandle, + entryPoint: EntryPoint, + bubbleBarLocation: BubbleBarLocation? = null, + ) = + executeWithErrorLog({ "Failed call showAppBubble" }) { + bubbles?.showAppBubble(intent, user, entryPoint, bubbleBarLocation) + } + + /** Tells SysUI to show the expanded view. */ + fun showExpandedView() = + executeWithErrorLog({ "Failed call showExpandedView" }) { bubbles?.showExpandedView() } + + /** Tells SysUI to move the dragged bubble to full screen. */ + fun moveDraggedBubbleToFullscreen(key: String, dropLocation: Point) { + executeWithErrorLog({ "Failed to call moveDraggedBubbleToFullscreen" }) { + bubbles?.moveDraggedBubbleToFullscreen(key, dropLocation) + } + } + + // + // Splitscreen + // + fun registerSplitScreenListener(listener: ISplitScreenListener?) { + executeWithErrorLog({ "Failed call registerSplitScreenListener" }) { + splitScreen?.registerSplitScreenListener(listener) + } + splitScreenListener = listener + } + + fun unregisterSplitScreenListener(listener: ISplitScreenListener?) { + executeWithErrorLog({ "Failed call unregisterSplitScreenListener" }) { + splitScreen?.unregisterSplitScreenListener(listener) + } + splitScreenListener = null + } + + fun registerSplitSelectListener(listener: ISplitSelectListener?) { + if ( + DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX.isTrue && + listener != null + ) { + if (splitSelectListeners.isEmpty()) { + executeWithErrorLog({ "Failed call registerSplitSelectListener" }) { + splitScreen?.registerSplitSelectListener(splitSelectListenerTracker) + } + } + splitSelectListeners.add(listener) + return + } + + executeWithErrorLog({ "Failed call registerSplitSelectListener" }) { + splitScreen?.registerSplitSelectListener(listener) + } + splitSelectListener = listener + } + + fun unregisterSplitSelectListener(listener: ISplitSelectListener?) { + if ( + DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX.isTrue && + listener != null + ) { + splitSelectListeners.remove(listener) + if (splitSelectListeners.isEmpty()) { + executeWithErrorLog({ "Failed call unregisterSplitSelectListener" }) { + splitScreen?.unregisterSplitSelectListener(splitSelectListenerTracker) + } + } + return + } + + executeWithErrorLog({ "Failed call unregisterSplitSelectListener" }) { + splitScreen?.unregisterSplitSelectListener(listener) + } + splitSelectListener = null + } + + /** Start multiple tasks in split-screen simultaneously. */ + fun startTasks( + taskId1: Int, + options1: Bundle?, + taskId2: Int, + options2: Bundle?, + @StagePosition splitPosition: Int, + @PersistentSnapPosition snapPosition: Int, + remoteTransition: RemoteTransition?, + instanceId: InstanceId?, + ) = + executeWithErrorLog({ "Failed call startTasks" }) { + splitScreen?.startTasks( + taskId1, + options1, + taskId2, + options2, + splitPosition, + snapPosition, + remoteTransition, + instanceId, + ) + } + + fun startIntentAndTask( + pendingIntent: PendingIntent?, + userId1: Int, + options1: Bundle?, + taskId: Int, + options2: Bundle?, + @StagePosition splitPosition: Int, + @PersistentSnapPosition snapPosition: Int, + remoteTransition: RemoteTransition?, + instanceId: InstanceId?, + ) = + executeWithErrorLog({ "Failed call startIntentAndTask" }) { + splitScreen?.startIntentAndTask( + pendingIntent, + userId1, + options1, + taskId, + options2, + splitPosition, + snapPosition, + remoteTransition, + instanceId, + ) + } + + fun startIntents( + pendingIntent1: PendingIntent?, + userId1: Int, + shortcutInfo1: ShortcutInfo?, + options1: Bundle?, + pendingIntent2: PendingIntent?, + userId2: Int, + shortcutInfo2: ShortcutInfo?, + options2: Bundle?, + @StagePosition splitPosition: Int, + @PersistentSnapPosition snapPosition: Int, + remoteTransition: RemoteTransition?, + instanceId: InstanceId?, + ) = + executeWithErrorLog({ "Failed call startIntents" }) { + splitScreen?.startIntents( + pendingIntent1, + userId1, + shortcutInfo1, + options1, + pendingIntent2, + userId2, + shortcutInfo2, + options2, + splitPosition, + snapPosition, + remoteTransition, + instanceId, + ) + } + + fun startShortcutAndTask( + shortcutInfo: ShortcutInfo?, + options1: Bundle?, + taskId: Int, + options2: Bundle?, + @StagePosition splitPosition: Int, + @PersistentSnapPosition snapPosition: Int, + remoteTransition: RemoteTransition?, + instanceId: InstanceId?, + ) = + executeWithErrorLog({ "Failed call startShortcutAndTask" }) { + splitScreen?.startShortcutAndTask( + shortcutInfo, + options1, + taskId, + options2, + splitPosition, + snapPosition, + remoteTransition, + instanceId, + ) + } + + fun startShortcut( + packageName: String?, + shortcutId: String?, + position: Int, + options: Bundle?, + user: UserHandle?, + instanceId: InstanceId?, + ) = + executeWithErrorLog({ "Failed call startShortcut" }) { + splitScreen?.startShortcut(packageName, shortcutId, position, options, user, instanceId) + } + + fun startIntent( + intent: PendingIntent?, + userId: Int, + fillInIntent: Intent?, + position: Int, + options: Bundle?, + instanceId: InstanceId?, + ) = + executeWithErrorLog({ "Failed call startIntent" }) { + splitScreen?.startIntent(intent, userId, fillInIntent, position, options, instanceId) + } + + /** + * Call the desktop mode interface to start a TRANSIT_OPEN transition when launching an intent + * from the taskbar so that it can be handled in desktop mode. + */ + fun startLaunchIntentTransition(intent: Intent, options: Bundle, displayId: Int) = + executeWithErrorLog({ "Failed call startLaunchIntentTransition" }) { + desktopMode?.startLaunchIntentTransition(intent, options, displayId) + } + + // + // One handed + // + fun startOneHandedMode() = + executeWithErrorLog({ "Failed call startOneHandedMode" }) { oneHanded?.startOneHanded() } + + fun stopOneHandedMode() = + executeWithErrorLog({ "Failed call stopOneHandedMode" }) { oneHanded?.stopOneHanded() } + + // + // Remote transitions + // + fun registerRemoteTransition(remoteTransition: RemoteTransition?, filter: TransitionFilter) { + remoteTransition ?: return + executeWithErrorLog({ "Failed call registerRemoteTransition" }) { + shellTransitions?.registerRemote(filter, remoteTransition) + } + remoteTransitions.putIfAbsent(remoteTransition, filter) + } + + fun unregisterRemoteTransition(remoteTransition: RemoteTransition?) { + executeWithErrorLog({ "Failed call unregisterRemoteTransition" }) { + shellTransitions?.unregisterRemote(remoteTransition) + } + remoteTransitions.remove(remoteTransition) + } + + /** + * Returns a surface which can be used to attach overlays to home task or null if the task + * doesn't exist or sysui is not connected + */ + fun getHomeTaskOverlayContainer(): SurfaceControl? { + executeWithErrorLog({ "Failed call getHomeTaskOverlayContainer" }) { + return shellTransitions?.getHomeTaskOverlayContainer() + } + return null + } + + /** + * Returns a surface which can be used to attach overlays to home task or null if the task + * doesn't exist or sysui is not connected + */ + fun getOverviewOverlayContainer(displayId: Int): SurfaceControl? { + executeWithErrorLog({ "Failed call getOverviewOverlayContainer" }) { + return shellTransitions?.getOverviewOverlayContainer(displayId) + } + return null + } + + /** + * Use SystemUI's transaction-queue instead of Launcher's independent one. This is necessary if + * Launcher and SystemUI need to coordinate transactions (eg. for shell transitions). + */ + fun shareTransactionQueue() { + if (originalTransactionToken == null) { + originalTransactionToken = Transaction.getDefaultApplyToken() + } + setupTransactionQueue() + } + + /** Switch back to using Launcher's independent transaction queue. */ + fun unshareTransactionQueue() { + if (originalTransactionToken == null) { + return + } + Transaction.setDefaultApplyToken(originalTransactionToken) + originalTransactionToken = null + } + + private fun setupTransactionQueue() = + executeWithErrorLog({ "Error getting Shell's apply token" }) { + val token: IBinder = + shellTransitions?.shellApplyToken ?: originalTransactionToken ?: return + Transaction.setDefaultApplyToken(token) + } + + // + // Starting window + // + /** Sets listener to get callbacks when launching a task. */ + fun setStartingWindowListener(listener: IStartingWindowListener?) { + executeWithErrorLog({ "Failed call setStartingWindowListener" }) { + startingWindow?.setStartingWindowListener(listener) + } + startingWindowListener = listener + } + + // + // SmartSpace transitions + // + /** + * Sets the instance of [ILauncherUnlockAnimationController] that System UI should use to + * control the launcher side of the unlock animation. This will also cause us to dispatch the + * current state of the smartspace to System UI (this will subsequently happen if the state + * changes). + */ + fun setLauncherUnlockAnimationController( + activityClass: String?, + controller: ILauncherUnlockAnimationController?, + ) { + executeWithErrorLog({ "Failed call setLauncherUnlockAnimationController" }) { + // LC-Ignored +// sysuiUnlockAnimationController?.apply { +// setLauncherUnlockController(activityClass, controller) +// controller?.dispatchSmartspaceStateToSysui() +// } + } + launcherActivityClass = activityClass + launcherUnlockAnimationController = controller + } + + /** + * Tells System UI that the Launcher's smartspace state has been updated, so that it can prepare + * the unlock animation accordingly. + */ + fun notifySysuiSmartspaceStateUpdated(state: SmartspaceState?) = + executeWithErrorLog({ "Failed call notifySysuiSmartspaceStateUpdated" }) { + // LC-Ignored + //sysuiUnlockAnimationController?.onLauncherSmartspaceStateUpdated(state) + } + + // + // Recents + // + fun registerRecentTasksListener(listener: IRecentTasksListener?) { + executeWithErrorLog({ "Failed call registerRecentTasksListener" }) { + recentTasks?.registerRecentTasksListener(listener) + } + recentTasksListener = listener + } + + fun unregisterRecentTasksListener(listener: IRecentTasksListener?) { + executeWithErrorLog({ "Failed call unregisterRecentTasksListener" }) { + recentTasks?.unregisterRecentTasksListener(listener) + } + recentTasksListener = null + } + + // + // Back navigation transitions + // + /** Sets the launcher [android.window.IOnBackInvokedCallback] to shell */ + fun setBackToLauncherCallback( + callback: IOnBackInvokedCallback?, + runner: IRemoteAnimationRunner?, + ) { + backToLauncherCallback = callback + backToLauncherRunner = runner + if (callback == null) return + try { + backAnimation?.setBackToLauncherCallback(callback, runner) + } catch (e: RemoteException) { + Log.e(TAG, "Failed call setBackToLauncherCallback", e) + } catch (e: SecurityException) { + Log.e(TAG, "Failed call setBackToLauncherCallback", e) + } + } + + /** + * Clears the previously registered [IOnBackInvokedCallback]. + * + * @param callback The previously registered callback instance. + */ + fun clearBackToLauncherCallback(callback: IOnBackInvokedCallback) { + if (backToLauncherCallback !== callback) { + return + } + backToLauncherCallback = null + backToLauncherRunner = null + executeWithErrorLog({ "Failed call clearBackToLauncherCallback" }) { + backAnimation?.clearBackToLauncherCallback() + } + } + + /** Called when the status bar color needs to be customized when back navigation. */ + fun customizeStatusBarAppearance(appearance: AppearanceRegion?) = + executeWithErrorLog({ "Failed call customizeStatusBarAppearance" }) { + backAnimation?.customizeStatusBarAppearance(appearance) + } + + class GetRecentTasksException : Exception { + constructor(message: String?) : super(message) + + constructor(message: String?, cause: Throwable?) : super(message, cause) + } + + /** + * Retrieves a list of Recent tasks from ActivityManager. + * + * @throws GetRecentTasksException if IRecentTasks is not initialized, or when we get + * RemoteException from server side + */ + @Throws(GetRecentTasksException::class) + fun getRecentTasks(numTasks: Int, userId: Int): ArrayList { + if (recentTasks == null) { + Log.e(TAG, "getRecentTasks() failed due to null mRecentTasks") + throw GetRecentTasksException("null mRecentTasks") + } + try { + traceBegin(Trace.TRACE_TAG_APP, "getRecentTasks") + val rawTasks = + recentTasks?.getRecentTasks( + numTasks, + ActivityManager.RECENT_IGNORE_UNAVAILABLE, + userId, + ) ?: return ArrayList() + return ArrayList(rawTasks.asList()) + } catch (e: RemoteException) { + Log.e(TAG, "Failed call getRecentTasks", e) + throw GetRecentTasksException("Failed call getRecentTasks", e) + } finally { + traceEnd(Trace.TRACE_TAG_APP) + } + } + + /** Gets the set of running tasks. */ + fun getRunningTasks(numTasks: Int): List { + if (!shouldEnableRunningTasksForDesktopMode()) return emptyList() + executeWithErrorLog({ "Failed call getRunningTasks" }) { + return recentTasks?.getRunningTasks(numTasks)?.asList() ?: emptyList() + } + return emptyList() + } + + private fun shouldEnableRunningTasksForDesktopMode(): Boolean = + DesktopModeStatus.canEnterDesktopMode(context) && + if (ATLEAST_BAKLAVA) { + ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS.isTrue + } else { + false + } + + private fun handleMessageAsync(msg: Message): Boolean { + return when (msg.what) { + MSG_SET_SHELF_HEIGHT -> { + setShelfHeightAsync(msg.arg1, msg.arg2) + true + } + + MSG_SET_LAUNCHER_KEEP_CLEAR_AREA_HEIGHT -> { + setLauncherKeepClearAreaHeight(msg.arg1, msg.arg2) + true + } + + else -> false + } + } + + // + // Desktop Mode + // + /** Calls shell to create a new desk (if possible) on the display whose ID is `displayId`. */ + fun createDesk(displayId: Int) = + executeWithErrorLog({ "Failed call createDesk" }) { desktopMode?.createDesk(displayId) } + + /** + * Calls shell to activate the desk whose ID is `deskId` on whatever display it exists on. This + * will show all tasks on this desk and bring [taskIdToReorderToFront] to the front if it's + * provided and already on the given desk. If the provided [taskIdToReorderToFront]'s value is + * null, do not change the windows' activation on the desk. + */ + @JvmOverloads + fun activateDesk( + deskId: Int, + transition: RemoteTransition?, + taskIdToReorderToFront: Int? = null, + transitionSource: DesktopModeTransitionSource, + ) = + executeWithErrorLog({ "Failed call activateDesk" }) { + desktopMode?.activateDesk( + deskId, + transition, + taskIdToReorderToFront ?: INVALID_TASK_ID, + transitionSource, + ) + } + + /** Calls shell to remove the desk whose ID is `deskId`. */ + fun removeDesk(deskId: Int, transitionSource: DesktopModeTransitionSource) = + executeWithErrorLog({ "Failed call removeDesk" }) { + desktopMode?.removeDesk(deskId, transitionSource) + } + + /** Calls shell to remove all the available desks on all displays. */ + fun removeAllDesks(transitionSource: DesktopModeTransitionSource) = + executeWithErrorLog({ "Failed call removeAllDesks" }) { + desktopMode?.removeAllDesks(transitionSource) + } + + /** + * Call shell to show all apps active on the desktop and bring [taskIdToReorderToFront] to front + * if it's valid on the default desk on the given display. If the provided + * [taskIdToReorderToFront]'s value is null, do not change the windows' activation on the desk. + */ + @JvmOverloads + fun showDesktopApps( + displayId: Int, + transition: RemoteTransition? = null, + taskIdToReorderToFront: Int? = null, + transitionSource: DesktopModeTransitionSource, + ) = + executeWithErrorLog({ "Failed call showDesktopApps" }) { + desktopMode?.showDesktopApps( + displayId, + transition, + taskIdToReorderToFront ?: INVALID_TASK_ID, + transitionSource, + ) + } + + /** If task with the given id is on the desktop, bring it to front */ + fun showDesktopApp( + taskId: Int, + transition: RemoteTransition?, + toFrontReason: DesktopTaskToFrontReason, + ) = + executeWithErrorLog({ "Failed call showDesktopApp" }) { + desktopMode?.showDesktopApp(taskId, transition, toFrontReason) + } + + /** Call shell to move to an existing fullscreen task (given by [taskId]) from desktop. */ + @JvmOverloads + fun moveToFullscreen( + taskId: Int, + desktopModeTransitionSource: DesktopModeTransitionSource, + remoteTransition: RemoteTransition? = null, + ) = + executeWithErrorLog({ "Failed call moveToFullscreen" }) { + desktopMode?.moveToFullscreen(taskId, desktopModeTransitionSource, remoteTransition) + } + + /** Set a listener on shell to get updates about desktop task state */ + fun setDesktopTaskListener(listener: IDesktopTaskListener?) { + desktopTaskListener = listener + executeWithErrorLog({ "Failed call setDesktopTaskListener" }) { + desktopMode?.setTaskListener(listener) + } + } + + /** + * Perform cleanup transactions after choosing either the second app or the floating task view's + * app icon in a desktop split-select transition. + */ + fun onDesktopSplitSelectChoice(taskInfo: RunningTaskInfo?) = + executeWithErrorLog({ "Failed call onDesktopSplitSelectChoice" }) { + desktopMode?.onDesktopSplitSelectChoice(taskInfo) + } + + /** Call shell to move a task with given `taskId` to desktop */ + fun moveToDesktop( + taskId: Int, + transitionSource: DesktopModeTransitionSource?, + transition: RemoteTransition?, + successCallback: Runnable, + ) = + executeWithErrorLog({ "Failed call moveToDesktop" }) { + desktopMode?.moveToDesktop( + taskId, + transitionSource, + transition, + object : IMoveToDesktopCallback.Stub() { + override fun onTaskMovedToDesktop() { + successCallback.run() + } + }, + ) + } + + /** Call shell to remove the desktop that is on given `displayId` */ + fun removeDefaultDeskInDisplay(displayId: Int, transitionSource: DesktopModeTransitionSource) = + executeWithErrorLog({ "Failed call removeDefaultDeskInDisplay" }) { + desktopMode?.removeDefaultDeskInDisplay(displayId, transitionSource) + } + + /** Call shell to move a task with given `taskId` to external display. */ + fun moveToExternalDisplay(taskId: Int, transitionSource: DesktopModeTransitionSource) = + executeWithErrorLog({ "Failed call moveToExternalDisplay" }) { + desktopMode?.moveToExternalDisplay(taskId, transitionSource) + } + + // + // Unfold transition + // + /** Sets the unfold animation lister to sysui. */ + fun setUnfoldAnimationListener(callback: IUnfoldTransitionListener?) { + unfoldAnimationListener = callback + executeWithErrorLog({ "Failed call setUnfoldAnimationListener" }) { + unfoldAnimation?.setListener(callback) + } + } + + // + // Recents + // + /** + * Starts the recents animation. The caller should manage the thread on which this is called. + */ + fun startRecentsTransition( + intent: Intent?, + options: ActivityOptions, + listener: RecentsAnimationListener, + useSyntheticRecentsTransition: Boolean, + wct: WindowContainerTransaction? = null, + displayId: Int, + ): Boolean { + executeWithErrorLog({ "Error starting recents via shell" }) { + recentTasks?.startRecentsTransition( + getRecentsPendingIntent(displayId), + intent, + options.toBundle().apply { + if (useSyntheticRecentsTransition) { + putBoolean("is_synthetic_recents_transition", true) + } + }, + wct, + context.iApplicationThread, + RecentsAnimationListenerStub(listener), + ) + ?: run { + // LC-Ignored + //ActiveGestureProtoLogProxy.logRecentTasksMissing() + return false + } + return true + } + return false + } + + private class RecentsAnimationListenerStub(val listener: RecentsAnimationListener) : + IRecentsAnimationRunner.Stub() { + override fun onAnimationStart( + controller: IRecentsAnimationController, + apps: Array?, + wallpapers: Array?, + homeContentInsets: Rect?, + extras: Bundle?, + transitionInfo: TransitionInfo?, + ) = + listener.onAnimationStart( + RecentsAnimationControllerCompat(controller), + apps, + wallpapers, + homeContentInsets, + extras?.apply { + // Aidl bundles need to explicitly set class loader + // https://developer.android.com/guide/components/aidl#Bundles + classLoader = SplitBounds::class.java.classLoader + }, + transitionInfo, + ) + + override fun onAnimationCanceled(taskIds: IntArray?, taskSnapshots: Array?) { + listener.onAnimationCanceled(wrap(taskIds, taskSnapshots)) + } + + override fun onTasksAppeared( + apps: Array?, + transitionInfo: TransitionInfo?, + ) { + listener.onTasksAppeared(apps, transitionInfo) + } + } + + // + // Drag and drop + // + /** + * For testing purposes. Returns `true` only if the shell drop target has shown and drawn and is + * ready to handle drag events and the subsequent drop. + */ + fun isDragAndDropReady(): Boolean { + executeWithErrorLog({ "Error querying drag state" }) { + return dragAndDrop?.isReadyToHandleDrag ?: false + } + return false + } + + fun dump(pw: PrintWriter) { + pw.println("$TAG:") + + pw.println("\tmSystemUiProxy=$systemUiProxy") + pw.println("\tmPip=$pip") + pw.println("\tmPipAnimationListener=$pipAnimationListener") + pw.println("\tmBubbles=$bubbles") + pw.println("\tmBubblesListener=$bubblesListener") + pw.println("\tmSplitScreen=$splitScreen") + pw.println("\tmSplitScreenListener=$splitScreenListener") + pw.println("\tmSplitSelectListener=$splitSelectListener") + pw.println("\tmSplitSelectListeners=$splitSelectListeners") + pw.println("\tmSplitSelectListenerTracker=$splitSelectListenerTracker") + pw.println("\tmOneHanded=$oneHanded") + pw.println("\tmShellTransitions=$shellTransitions") + pw.println("\tmHomeVisibilityState=" + homeVisibilityState) + pw.println("\tmFocusState=" + focusState) + pw.println("\tmStartingWindow=$startingWindow") + pw.println("\tmStartingWindowListener=$startingWindowListener") + pw.println("\tmSysuiUnlockAnimationController=$sysuiUnlockAnimationController") + pw.println("\tmLauncherActivityClass=$launcherActivityClass") + pw.println("\tmLauncherUnlockAnimationController=$launcherUnlockAnimationController") + pw.println("\tmRecentTasks=$recentTasks") + pw.println("\tmRecentTasksListener=$recentTasksListener") + pw.println("\tmBackAnimation=$backAnimation") + pw.println("\tmBackToLauncherCallback=$backToLauncherCallback") + pw.println("\tmBackToLauncherRunner=$backToLauncherRunner") + pw.println("\tmDesktopMode=$desktopMode") + pw.println("\tmDesktopTaskListener=$desktopTaskListener") + pw.println("\tmUnfoldAnimation=$unfoldAnimation") + pw.println("\tmUnfoldAnimationListener=$unfoldAnimationListener") + pw.println("\tmDragAndDrop=$dragAndDrop") + } + + /** Adds all interfaces held by this proxy to the bundle */ + @VisibleForTesting + fun addAllInterfaces(out: Bundle) { + QuickStepContract.addInterface(systemUiProxy, out) + QuickStepContract.addInterface(pip, out) + QuickStepContract.addInterface(bubbles, out) + QuickStepContract.addInterface(sysuiUnlockAnimationController, out) + QuickStepContract.addInterface(splitScreen, out) + QuickStepContract.addInterface(oneHanded, out) + QuickStepContract.addInterface(shellTransitions, out) + QuickStepContract.addInterface(startingWindow, out) + QuickStepContract.addInterface(recentTasks, out) + QuickStepContract.addInterface(backAnimation, out) + QuickStepContract.addInterface(desktopMode, out) + QuickStepContract.addInterface(unfoldAnimation, out) + QuickStepContract.addInterface(dragAndDrop, out) + } + + companion object { + private const val TAG = "SystemUiProxy" + + @JvmField val INSTANCE = DaggerSingletonObject(LauncherAppComponent::getSystemUiProxy) + + private const val MSG_SET_SHELF_HEIGHT = 1 + private const val MSG_SET_LAUNCHER_KEEP_CLEAR_AREA_HEIGHT = 2 + } +} diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index d7aa6449730..1bdd9bb1df5 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -16,16 +16,14 @@ package com.android.quickstep; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; +import static android.view.Display.DEFAULT_DISPLAY; -import static com.android.launcher3.Flags.enableHandleDelayedGestureCallbacks; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.NavigationMode.NO_BUTTON; import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS; import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINISHED; import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED; import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; @@ -36,36 +34,59 @@ import android.os.SystemProperties; import android.util.Log; import android.view.RemoteAnimationTarget; +import android.window.TransitionInfo; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; +import com.android.app.displaylib.PerDisplayRepository; import com.android.internal.util.ArrayUtils; import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.taskbar.TaskbarInteractor; +import com.android.launcher3.util.DaggerSingletonObject; import com.android.launcher3.util.DisplayController; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; import com.android.quickstep.util.SystemUiFlagUtils; import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; + import java.io.PrintWriter; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.concurrent.atomic.AtomicInteger; public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener { - public static final boolean ENABLE_SHELL_TRANSITIONS = true; - public static final boolean SHELL_TRANSITIONS_ROTATION = ENABLE_SHELL_TRANSITIONS - && SystemProperties.getBoolean("persist.wm.debug.shell_transit_rotate", false); + private static final String TAG = "TaskAnimationManager"; + + @VisibleForTesting + public static final long RECENTS_ANIMATION_START_TIMEOUT_MS = 5000L; + public static final boolean SHELL_TRANSITIONS_ROTATION = + SystemProperties.getBoolean("persist.wm.debug.shell_transit_rotate", false); private final Context mCtx; + private final DisplayController mDisplayController; private RecentsAnimationController mController; private RecentsAnimationCallbacks mCallbacks; private RecentsAnimationTargets mTargets; + private TransitionInfo mTransitionInfo; + // Temporary until we can hook into gesture state events private GestureState mLastGestureState; private RemoteAnimationTarget[] mLastAppearedTaskTargets; @@ -73,18 +94,29 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn private boolean mRecentsAnimationStartPending = false; private boolean mShouldIgnoreMotionEvents = false; + private final int mDisplayId; + + private boolean mLauncherDestroyCallbackSet = false; + + public static final DaggerSingletonObject> + REPOSITORY_INSTANCE = new DaggerSingletonObject<>( + QuickstepBaseAppComponent::getTaskAnimationManagerRepository); + + private final PerDisplayRepository mPerDisplayRepository; private final TaskStackChangeListener mLiveTileRestartListener = new TaskStackChangeListener() { @Override public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task, - boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) { + boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) { if (mLastGestureState == null) { TaskStackChangeListeners.getInstance().unregisterTaskStackListener( mLiveTileRestartListener); return; } BaseContainerInterface containerInterface = mLastGestureState.getContainerInterface(); - if (containerInterface.isInLiveTileMode() + Log.d(TAG, "onActivityRestartAttempt - displayId: " + mDisplayId + ", task: " + task); + if (mDisplayId == task.displayId + && containerInterface.isInLiveTileMode() && containerInterface.getCreatedContainer() != null) { RecentsView recentsView = containerInterface.getCreatedContainer() .getOverviewPanel(); @@ -97,15 +129,20 @@ public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task, } }; - TaskAnimationManager(Context ctx) { + @AssistedInject + public TaskAnimationManager( + @ApplicationContext Context ctx, + @Assisted int displayId, + DisplayController displayController, + PerDisplayRepository perDisplayRepository) { mCtx = ctx; + mDisplayId = displayId; + mDisplayController = displayController; + mPerDisplayRepository = perDisplayRepository; } - /** - * Preloads the recents animation. - */ - public void preloadRecentsAnimation(Intent intent) { - // Pass null animation handler to indicate this start is for preloading - UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance().preloadRecentsActivity(intent)); + + SystemUiProxy getSystemUiProxy() { + return SystemUiProxy.INSTANCE.get(mCtx); } boolean shouldIgnoreMotionEvents() { @@ -125,44 +162,131 @@ void notifyNewGestureStart() { */ @UiThread public RecentsAnimationCallbacks startRecentsAnimation(@NonNull GestureState gestureState, - Intent intent, RecentsAnimationCallbacks.RecentsAnimationListener listener) { - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "startRecentsAnimation", - /* gestureEvent= */ START_RECENTS_ANIMATION); + Intent intent, RecentsAnimationCallbacks.RecentsAnimationListener listener) { + ActiveGestureProtoLogProxy.logStartRecentsAnimation(); + // Check displayId + if (mDisplayId != gestureState.getDisplayId()) { + String msg = String.format(Locale.ENGLISH, + "Constructor displayId %d does not equal gestureState display id %d", + mDisplayId, gestureState.getDisplayId()); + if (FeatureFlags.IS_STUDIO_BUILD) { + throw new IllegalArgumentException(msg); + } else { + Log.e(TAG, msg, new Exception()); + } + } + + final BaseContainerInterface containerInterface = gestureState.getContainerInterface(); + RecentsAnimationCallbacks newCallbacks = new RecentsAnimationCallbacks( + containerInterface.getCreatedContainer()); + // Notify if recents animation is still running if (mController != null) { String msg = "New recents animation started before old animation completed"; if (FeatureFlags.IS_STUDIO_BUILD) { throw new IllegalArgumentException(msg); } else { - Log.e("TaskAnimationManager", msg, new Exception()); + Log.e(TAG, msg, new Exception()); } } - // But force-finish it anyways - finishRunningRecentsAnimation(false /* toHome */, true /* forceFinish */, - null /* forceFinishCb */); - if (mCallbacks != null) { - // If mCallbacks still != null, that means we are getting this startRecentsAnimation() - // before the previous one got onRecentsAnimationStart(). In that case, cleanup the - // previous animation so it doesn't mess up/listen to state changes in this animation. - cleanUpRecentsAnimation(mCallbacks); + List runningTaskAnimationManagers = new ArrayList<>(); + mPerDisplayRepository.forEach(false, taskAnimationManager -> { + if (taskAnimationManager.isRecentsAnimationRunning()) { + runningTaskAnimationManagers.add(taskAnimationManager); + } + }); + + Runnable onRunningRecentsAnimationFinished = () -> startRecentsAnimationInternal( + gestureState, intent, listener, newCallbacks); + + AtomicInteger runningAnimationCount = new AtomicInteger( + runningTaskAnimationManagers.size()); + Log.d(TAG, "startRecentsAnimation - running TaskAnimationMnaager count: " + + runningAnimationCount.get()); + if (runningAnimationCount.get() == 0) { + onRunningRecentsAnimationFinished.run(); + return newCallbacks; + } + for (TaskAnimationManager taskAnimationManager : runningTaskAnimationManagers) { + Log.d(TAG, "startRecentsAnimation - finishRunningRecentsAnimation for display " + + taskAnimationManager.mDisplayId); + BaseContainerInterface baseContainerInterface; + RecentsViewContainer container; + RecentsView recentsView; + if (taskAnimationManager.mLastGestureState != null + && (baseContainerInterface = + taskAnimationManager.mLastGestureState.getContainerInterface()) != null + && (container = baseContainerInterface.getCreatedContainer()) != null + && (recentsView = container.getOverviewPanel()) != null + && baseContainerInterface.isInLiveTileMode() + && recentsView.getRecentsAnimationController() != null) { + recentsView.switchToScreenshot(/* thumbnailDatas= */ null, + /* onFinishRunnable= */ () -> recentsView.finishRecentsAnimation( + /* toHome= */ true, + /* shouldPip= */ false, + /* onFinishComplete= */ () -> { + Log.d(TAG, "startRecentsAnimation - finished Recents " + + "animation via RecentsView for display " + + taskAnimationManager.mDisplayId); + if (runningAnimationCount.decrementAndGet() == 0) { + onRunningRecentsAnimationFinished.run(); + } + })); + } else { + taskAnimationManager.finishRunningRecentsAnimation( + /* toHome= */ false , + /* forceFinish= */ true, + /* forceFinishCb= */ () -> { + Log.d(TAG, "startRecentsAnimation - finishRunningRecentsAnimation " + + "for display " + taskAnimationManager.mDisplayId); + if (runningAnimationCount.decrementAndGet() == 0) { + onRunningRecentsAnimationFinished.run(); + } + }, + /* reason= */ new ActiveGestureLog.CompoundString( + "TaskAnimationManager.startRecentsAnimation: " + + "force finishing previous animation on display %d", + taskAnimationManager.mDisplayId)); + } + + if (taskAnimationManager.mCallbacks != null) { + // If mCallbacks still != null, that means we are getting this + // startRecentsAnimation() before the previous one got + // onRecentsAnimationStart(). In that case, cleanup the previous animation so it + // doesn't mess up/listen to state changes in this animation. + taskAnimationManager.cleanUpRecentsAnimation(taskAnimationManager.mCallbacks); + } } + return newCallbacks; + } + private void startRecentsAnimationInternal( + @NonNull GestureState gestureState, Intent intent, + RecentsAnimationCallbacks.RecentsAnimationListener listener, + RecentsAnimationCallbacks newCallbacks) { final BaseContainerInterface containerInterface = gestureState.getContainerInterface(); mLastGestureState = gestureState; - RecentsAnimationCallbacks newCallbacks = new RecentsAnimationCallbacks( - SystemUiProxy.INSTANCE.get(mCtx), containerInterface.allowMinimizeSplitScreen()); mCallbacks = newCallbacks; + mLauncherDestroyCallbackSet = false; + final Runnable recentsAnimationStartTimeoutCallback = () -> { + if (!mRecentsAnimationStartPending) return; + mRecentsAnimationStartPending = false; + Log.wtf(TAG, "Recents animation start has been pending for over " + + RECENTS_ANIMATION_START_TIMEOUT_MS + "ms"); + ActiveGestureProtoLogProxy.logRecentsAnimationStartTimedOut(); + cleanUpRecentsAnimation(newCallbacks); + }; mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { - if (enableHandleDelayedGestureCallbacks() && mRecentsAnimationStartPending) { - ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( - "TaskAnimationManager.startRecentsAnimation(onRecentsAnimationStart): ") - .append("Setting mRecentsAnimationStartPending = false")); + RecentsAnimationTargets targets, @Nullable TransitionInfo transitionInfo) { + if (mRecentsAnimationStartPending) { + ActiveGestureProtoLogProxy.logStartRecentsAnimationCallback( + "onRecentsAnimationStart"); mRecentsAnimationStartPending = false; + MAIN_EXECUTOR.getHandler().removeCallbacks( + recentsAnimationStartTimeoutCallback); } if (mCallbacks == null) { // It's possible for the recents animation to have finished and be cleaned up @@ -172,6 +296,7 @@ public void onRecentsAnimationStart(RecentsAnimationController controller, } mController = controller; mTargets = targets; + mTransitionInfo = transitionInfo; // TODO(b/236226779): We can probably get away w/ setting mLastAppearedTaskTargets // to all appeared targets directly vs just looking at running ones int[] runningTaskIds = mLastGestureState.getRunningTaskIds(targets.apps.length > 1); @@ -182,7 +307,7 @@ public void onRecentsAnimationStart(RecentsAnimationController controller, } mLastGestureState.updateLastAppearedTaskTargets(mLastAppearedTaskTargets); - if (ENABLE_SHELL_TRANSITIONS && mTargets.hasRecents + if (mTargets.hasRecents // The filtered (MODE_CLOSING) targets only contain 1 home activity. && mTargets.apps.length == 1 && mTargets.apps[0].windowConfiguration.getActivityType() @@ -195,8 +320,11 @@ public void onRecentsAnimationStart(RecentsAnimationController controller, // Only finish if the end target is RECENTS. Otherwise, if the target is // NEW_TASK, startActivityFromRecents will be skipped. if (mLastGestureState.getEndTarget() == RECENTS) { - finishRunningRecentsAnimation(false /* toHome */, - true /* forceFinish */, null /* forceFinishCb */); + finishRunningRecentsAnimation( + /* toHome= */ false, + /* reason= */ new ActiveGestureLog.CompoundString( + "TaskAnimationManager.startRecentsAnimation: launching " + + "RecentsActivity on top of 3P launcher")); } }); } @@ -204,24 +332,24 @@ public void onRecentsAnimationStart(RecentsAnimationController controller, @Override public void onRecentsAnimationCanceled(HashMap thumbnailDatas) { - if (enableHandleDelayedGestureCallbacks() && mRecentsAnimationStartPending) { - ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( - "TaskAnimationManager.startRecentsAnimation") - .append("(onRecentsAnimationCanceled): ") - .append("Setting mRecentsAnimationStartPending = false")); + if (mRecentsAnimationStartPending) { + ActiveGestureProtoLogProxy.logStartRecentsAnimationCallback( + "onRecentsAnimationCanceled"); mRecentsAnimationStartPending = false; + MAIN_EXECUTOR.getHandler().removeCallbacks( + recentsAnimationStartTimeoutCallback); } cleanUpRecentsAnimation(newCallbacks); } @Override public void onRecentsAnimationFinished(RecentsAnimationController controller) { - if (enableHandleDelayedGestureCallbacks() && mRecentsAnimationStartPending) { - ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( - "TaskAnimationManager.startRecentsAnimation") - .append("(onRecentsAnimationFinished): ") - .append("Setting mRecentsAnimationStartPending = false")); + if (mRecentsAnimationStartPending) { + ActiveGestureProtoLogProxy.logStartRecentsAnimationCallback( + "onRecentsAnimationFinished"); mRecentsAnimationStartPending = false; + MAIN_EXECUTOR.getHandler().removeCallbacks( + recentsAnimationStartTimeoutCallback); } cleanUpRecentsAnimation(newCallbacks); } @@ -233,19 +361,22 @@ private boolean isNonRecentsStartedTasksAppeared( // (e.g. in Y's onResume). The case will be: lastStartedTask=Y and appearedTask=X. return mLastGestureState.getEndTarget() == GestureState.GestureEndTarget.NEW_TASK && ArrayUtils.find(appearedTaskTargets, - mLastGestureState.mLastStartedTaskIdPredicate) == null; + mLastGestureState.getLastStartedTaskIdPredicate()) == null; } @Override - public void onTasksAppeared(RemoteAnimationTarget[] appearedTaskTargets) { + public void onTasksAppeared(RemoteAnimationTarget[] appearedTaskTargets, + @Nullable TransitionInfo transitionInfo) { RemoteAnimationTarget appearedTaskTarget = appearedTaskTargets[0]; BaseContainerInterface containerInterface = mLastGestureState.getContainerInterface(); - + DisplayController.Info displayInfo = mDisplayController.getInfoForDisplay( + mDisplayId); for (RemoteAnimationTarget compat : appearedTaskTargets) { if (compat.windowConfiguration.getActivityType() == ACTIVITY_TYPE_HOME && containerInterface.getCreatedContainer() instanceof RecentsActivity - && DisplayController.getNavigationMode(mCtx) != NO_BUTTON) { + && displayInfo != null + && displayInfo.getNavigationMode() != NO_BUTTON) { // The only time we get onTasksAppeared() in button navigation with a // 3p launcher is if the user goes to overview first, and in this case we // can immediately finish the transition @@ -258,115 +389,91 @@ public void onTasksAppeared(RemoteAnimationTarget[] appearedTaskTargets) { } } - RemoteAnimationTarget[] nonAppTargets = ENABLE_SHELL_TRANSITIONS - ? null : SystemUiProxy.INSTANCE.get(mCtx).onStartingSplitLegacy( - appearedTaskTargets); - if (nonAppTargets == null) { - nonAppTargets = new RemoteAnimationTarget[0]; - } + RemoteAnimationTarget[] nonAppTargets = new RemoteAnimationTarget[0]; if ((containerInterface.isInLiveTileMode() - || mLastGestureState.getEndTarget() == RECENTS - || isNonRecentsStartedTasksAppeared(appearedTaskTargets)) + || mLastGestureState.getEndTarget() == RECENTS + || isNonRecentsStartedTasksAppeared(appearedTaskTargets)) && containerInterface.getCreatedContainer() != null) { RecentsView recentsView = containerInterface.getCreatedContainer().getOverviewPanel(); if (recentsView != null) { - ActiveGestureLog.INSTANCE.addLog( - new ActiveGestureLog.CompoundString("Launching side task id=") - .append(appearedTaskTarget.taskId)); + ActiveGestureProtoLogProxy.logLaunchingSideTask(appearedTaskTarget.taskId); recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, appearedTaskTargets, new RemoteAnimationTarget[0] /* wallpaper */, - nonAppTargets /* nonApps */); + nonAppTargets /* nonApps */, + transitionInfo); return; } else { - ActiveGestureLog.INSTANCE.addLog("Unable to launch side task (no recents)"); + ActiveGestureProtoLogProxy.logLaunchingSideTaskFailed(); } } else if (nonAppTargets.length > 0) { TaskViewUtils.createSplitAuxiliarySurfacesAnimator(nonAppTargets /* nonApps */, true /*shown*/, null /* animatorHandler */); } if (mController != null) { - if (mLastAppearedTaskTargets != null) { - for (RemoteAnimationTarget lastTarget : mLastAppearedTaskTargets) { - for (RemoteAnimationTarget appearedTarget : appearedTaskTargets) { - if (lastTarget != null && - appearedTarget.taskId != lastTarget.taskId) { - mController.removeTaskTarget(lastTarget.taskId); - } - } - } - } mLastAppearedTaskTargets = appearedTaskTargets; mLastGestureState.updateLastAppearedTaskTargets(mLastAppearedTaskTargets); } } - - @Override - public boolean onSwitchToScreenshot(Runnable onFinished) { - if (!containerInterface.isInLiveTileMode() - || containerInterface.getCreatedContainer() == null) { - // No need to switch since tile is already a screenshot. - onFinished.run(); - } else { - final RecentsView recentsView = - containerInterface.getCreatedContainer().getOverviewPanel(); - if (recentsView != null) { - recentsView.switchToScreenshot(onFinished); - } else { - onFinished.run(); - } - } - return true; - } }); final long eventTime = gestureState.getSwipeUpStartTimeMs(); mCallbacks.addListener(gestureState); mCallbacks.addListener(listener); - if (ENABLE_SHELL_TRANSITIONS) { - final ActivityOptions options = ActivityOptions.makeBasic(); - // Use regular (non-transient) launch for all apps page to control IME. - if (!containerInterface.allowAllAppsFromOverview()) { - options.setTransientLaunch(); - } - options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_RECENTS_ANIMATION, eventTime); - mRecentsAnimationStartPending = SystemUiProxy.INSTANCE.get(mCtx) - .startRecentsActivity(intent, options, mCallbacks); - if (enableHandleDelayedGestureCallbacks()) { - ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( - "TaskAnimationManager.startRecentsAnimation(shell transition path): ") - .append("Setting mRecentsAnimationStartPending = ") - .append(mRecentsAnimationStartPending)); - } + final ActivityOptions options = ActivityOptions.makeBasic(); + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS); + options.setTransientLaunch(); + options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_RECENTS_ANIMATION, eventTime); + options.setLaunchDisplayId(mDisplayId); + + // Notify taskbar that we should skip reacting to launcher visibility change to + // avoid a jumping taskbar. + TaskbarInteractor taskbarInteractor = containerInterface.getTaskbarInteractor(); + if (taskbarInteractor != null) { + taskbarInteractor.setSkipLauncherVisibilityChange(true); + + mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { + @Override + public void onRecentsAnimationCanceled( + @NonNull HashMap thumbnailDatas) { + taskbarInteractor.setSkipLauncherVisibilityChange(false); + } + + @Override + public void onRecentsAnimationFinished( + @NonNull RecentsAnimationController controller) { + taskbarInteractor.setSkipLauncherVisibilityChange(false); + } + }); + } + + if (containerInterface.getCreatedContainer() + instanceof RecentsWindowManager recentsWindowManager) { + mRecentsAnimationStartPending = getSystemUiProxy().startRecentsTransition(intent, + options, mCallbacks, gestureState.useSyntheticRecentsTransition(), null, + mDisplayId); + recentsWindowManager.showRecentsWindow(mCallbacks); } else { - UI_HELPER_EXECUTOR.execute( - () -> ActivityManagerWrapper.getInstance().startRecentsActivity( - intent, - eventTime, - mCallbacks, - result -> { - if (enableHandleDelayedGestureCallbacks()) { - ActiveGestureLog.INSTANCE.addLog( - new ActiveGestureLog.CompoundString( - "TaskAnimationManager.startRecentsAnimation") - .append("(legacy path): Setting ") - .append("mRecentsAnimationStartPending = ") - .append(result)); - } - mRecentsAnimationStartPending = result; - }, - MAIN_EXECUTOR.getHandler())); + mRecentsAnimationStartPending = getSystemUiProxy().startRecentsTransition(intent, + options, mCallbacks, false /* useSyntheticRecentsTransition */, null, + mDisplayId); + } + if (mRecentsAnimationStartPending) { + MAIN_EXECUTOR.getHandler().postDelayed( + recentsAnimationStartTimeoutCallback, RECENTS_ANIMATION_START_TIMEOUT_MS); } + ActiveGestureProtoLogProxy.logSettingRecentsAnimationStartPending( + mRecentsAnimationStartPending); gestureState.setState(STATE_RECENTS_ANIMATION_INITIALIZED); - return mCallbacks; } /** * Continues the existing running recents animation for a new gesture. */ public RecentsAnimationCallbacks continueRecentsAnimation(GestureState gestureState) { - ActiveGestureLog.INSTANCE.addLog(/* event= */ "continueRecentsAnimation"); + ActiveGestureProtoLogProxy.logContinueRecentsAnimation(); mCallbacks.removeListener(mLastGestureState); mLastGestureState = gestureState; mCallbacks.addListener(gestureState); @@ -377,7 +484,7 @@ public RecentsAnimationCallbacks continueRecentsAnimation(GestureState gestureSt } public void onSystemUiFlagsChanged(@QuickStepContract.SystemUiStateFlags long lastSysUIFlags, - @QuickStepContract.SystemUiStateFlags long newSysUIFlags) { + @QuickStepContract.SystemUiStateFlags long newSysUIFlags) { long isShadeExpandedFlagMask = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED | SYSUI_STATE_QUICK_SETTINGS_EXPANDED; boolean wasExpanded = hasAnyFlag(lastSysUIFlags, isShadeExpandedFlagMask); @@ -395,7 +502,11 @@ public void onSystemUiFlagsChanged(@QuickStepContract.SystemUiStateFlags long la if (wasLocked != isLocked && isLocked) { // Finish the running recents animation when locking the device. finishRunningRecentsAnimation( - mController != null && mController.getFinishTargetIsLauncher()); + /* toHome= */(mController != null && mController.getFinishTargetIsLauncher()) + || mDisplayId != DEFAULT_DISPLAY, + /* reason= */ new ActiveGestureLog.CompoundString( + "TaskAnimationManager.onSystemUiFlagsChanged: " + + "force finishing recents animation of device locked")); } } @@ -422,7 +533,7 @@ public boolean endLiveTile() { return false; } recentsView.switchToScreenshot(null, () -> recentsView.finishRecentsAnimation( - true /* toRecents */, false /* shouldPip */, null)); + true /* toHome */, false /* shouldPip */, null)); return true; } @@ -437,26 +548,49 @@ public void enableLiveTileRestartListener() { /** * Finishes the running recents animation. */ - public void finishRunningRecentsAnimation(boolean toHome) { - finishRunningRecentsAnimation(toHome, false /* forceFinish */, null /* forceFinishCb */); + public void finishRunningRecentsAnimation( + boolean toHome, @NonNull ActiveGestureLog.CompoundString reason) { + finishRunningRecentsAnimation( + toHome, /* forceFinish= */ false, /* forceFinishCb= */ null, reason); + } + public void finishRunningRecentsAnimation( + boolean toHome, + boolean forceFinish, + Runnable forceFinishCb, + @NonNull ActiveGestureLog.CompoundString reason) { + finishRunningRecentsAnimation(toHome, forceFinish, forceFinishCb, mController, reason); } /** * Finishes the running recents animation. * @param forceFinish will synchronously finish the controller */ - public void finishRunningRecentsAnimation(boolean toHome, boolean forceFinish, - Runnable forceFinishCb) { - if (mController != null) { - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "finishRunningRecentsAnimation", toHome); + public void finishRunningRecentsAnimation( + boolean toHome, + boolean forceFinish, + @Nullable Runnable forceFinishCb, + @Nullable RecentsAnimationController controller, + @NonNull ActiveGestureLog.CompoundString reason) { + if (controller != null) { + ActiveGestureProtoLogProxy.logFinishRunningRecentsAnimation(toHome, reason); + ActiveGestureLog.CompoundString reasonString = new ActiveGestureLog.CompoundString( + "TaskAnimationManager.finishRunningRecentsAnimation: ") + .append(reason); if (forceFinish) { - mController.finishController(toHome, forceFinishCb, false /* sendUserLeaveHint */, - true /* forceFinish */); + controller.finishController( + toHome, + forceFinishCb, + /* sendUserLeaveHint= */ false, + /* forceFinish= */ true, + reasonString); } else { - Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), toHome - ? mController::finishAnimationToHome - : mController::finishAnimationToApp); + Utilities.postAsyncCallback( + MAIN_EXECUTOR.getHandler(), + () -> controller.finishController( + toHome, + /* callback= */ null, + /* sendUserLeaveHint= */ false, + reasonString)); } } } @@ -469,7 +603,7 @@ public void finishRunningRecentsAnimation(boolean toHome, boolean forceFinish, public void notifyRecentsAnimationState( RecentsAnimationCallbacks.RecentsAnimationListener listener) { if (isRecentsAnimationRunning()) { - listener.onRecentsAnimationStart(mController, mTargets); + listener.onRecentsAnimationStart(mController, mTargets, mTransitionInfo); } // TODO: Do we actually need to report canceled/finished? } @@ -481,16 +615,45 @@ public boolean isRecentsAnimationRunning() { return mController != null; } + void onLauncherDestroyed() { + if (!mRecentsAnimationStartPending) { + return; + } + if (mCallbacks == null) { + return; + } + if (mLauncherDestroyCallbackSet) { + return; + } + ActiveGestureProtoLogProxy.logQueuingForceFinishRecentsAnimation(); + mLauncherDestroyCallbackSet = true; + mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { + @Override + public void onRecentsAnimationStart( + RecentsAnimationController controller, + RecentsAnimationTargets targets, + @Nullable TransitionInfo transitionInfo) { + finishRunningRecentsAnimation( + /* toHome= */ false, + /* forceFinish= */ true, + /* forceFinishCb= */ null, + controller, + /* reason= */ new ActiveGestureLog.CompoundString( + "TaskAnimationManager.onLauncherDestroyed")); + mLauncherDestroyCallbackSet = false; + } + }); + } + /** * Cleans up the recents animation entirely. */ private void cleanUpRecentsAnimation(RecentsAnimationCallbacks targetCallbacks) { if (mCallbacks != targetCallbacks) { - ActiveGestureLog.INSTANCE.addLog( - /* event= */ "cleanUpRecentsAnimation skipped due to wrong callbacks"); + ActiveGestureProtoLogProxy.logCleanUpRecentsAnimationSkipped(); return; } - ActiveGestureLog.INSTANCE.addLog(/* event= */ "cleanUpRecentsAnimation"); + ActiveGestureProtoLogProxy.logCleanUpRecentsAnimation(); if (mLiveTileCleanUpHandler != null) { mLiveTileCleanUpHandler.run(); mLiveTileCleanUpHandler = null; @@ -509,7 +672,9 @@ private void cleanUpRecentsAnimation(RecentsAnimationCallbacks targetCallbacks) mController = null; mCallbacks = null; + mLauncherDestroyCallbackSet = false; mTargets = null; + mTransitionInfo = null; mLastGestureState = null; mLastAppearedTaskTargets = null; } @@ -521,11 +686,10 @@ public RecentsAnimationCallbacks getCurrentCallbacks() { public void dump(String prefix, PrintWriter pw) { pw.println(prefix + "TaskAnimationManager:"); + pw.println(prefix + "\tmDisplayId=" + mDisplayId); - if (enableHandleDelayedGestureCallbacks()) { - pw.println(prefix + "\tmRecentsAnimationStartPending=" + mRecentsAnimationStartPending); - pw.println(prefix + "\tmShouldIgnoreUpcomingGestures=" + mShouldIgnoreMotionEvents); - } + pw.println(prefix + "\tmRecentsAnimationStartPending=" + mRecentsAnimationStartPending); + pw.println(prefix + "\tmShouldIgnoreUpcomingGestures=" + mShouldIgnoreMotionEvents); if (mController != null) { mController.dump(prefix + '\t', pw); } @@ -539,4 +703,11 @@ public void dump(String prefix, PrintWriter pw) { mLastGestureState.dump(prefix + '\t', pw); } } -} \ No newline at end of file + + @AssistedFactory + public interface Factory { + /** Creates a new instance of [TaskAnimationManager] for a given [displayId]. */ + TaskAnimationManager create(int displayId); + } + +} diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java deleted file mode 100644 index f45bacb33b7..00000000000 --- a/quickstep/src/com/android/quickstep/TaskIconCache.java +++ /dev/null @@ -1,296 +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.quickstep; - -import static com.android.launcher3.Flags.enableOverviewIconMenu; -import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; - -import android.annotation.Nullable; -import android.app.ActivityManager; -import android.app.ActivityManager.TaskDescription; -import android.content.Context; -import android.content.pm.ActivityInfo; -import android.content.pm.PackageManager; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.os.UserHandle; -import android.text.TextUtils; -import android.util.SparseArray; - -import androidx.annotation.WorkerThread; - -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.icons.BaseIconFactory; -import com.android.launcher3.icons.BaseIconFactory.IconOptions; -import com.android.launcher3.icons.BitmapInfo; -import com.android.launcher3.icons.IconProvider; -import com.android.launcher3.pm.UserCache; -import com.android.launcher3.util.CancellableTask; -import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener; -import com.android.launcher3.util.DisplayController.Info; -import com.android.launcher3.util.FlagOp; -import com.android.launcher3.util.Preconditions; -import com.android.quickstep.util.TaskKeyLruCache; -import com.android.quickstep.util.TaskVisualsChangeListener; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskKey; -import com.android.systemui.shared.system.PackageManagerWrapper; - -import java.util.concurrent.Executor; -import java.util.function.Consumer; - -/** - * Manages the caching of task icons and related data. - */ -public class TaskIconCache implements DisplayInfoChangeListener { - - private final Executor mBgExecutor; - - private final Context mContext; - private final TaskKeyLruCache mIconCache; - private final SparseArray mDefaultIcons = new SparseArray<>(); - private BitmapInfo mDefaultIconBase = null; - - private final IconProvider mIconProvider; - - private BaseIconFactory mIconFactory; - - @Nullable - public TaskVisualsChangeListener mTaskVisualsChangeListener = null; - - public TaskIconCache(Context context, Executor bgExecutor, IconProvider iconProvider) { - mContext = context; - mBgExecutor = bgExecutor; - mIconProvider = iconProvider; - - Resources res = context.getResources(); - int cacheSize = res.getInteger(R.integer.recentsIconCacheSize); - - mIconCache = new TaskKeyLruCache<>(cacheSize); - - DisplayController.INSTANCE.get(mContext).addChangeListener(this); - } - - @Override - public void onDisplayInfoChanged(Context context, Info info, int flags) { - if ((flags & CHANGE_DENSITY) != 0) { - clearCache(); - } - } - - /** - * Asynchronously fetches the icon and other task data. - * - * @param task The task to fetch the data for - * @param callback The callback to receive the task after its data has been populated. - * @return A cancelable handle to the request - */ - public CancellableTask updateIconInBackground(Task task, Consumer callback) { - Preconditions.assertUIThread(); - if (task.icon != null) { - // Nothing to load, the icon is already loaded - callback.accept(task); - return null; - } - CancellableTask request = new CancellableTask<>( - () -> getCacheEntry(task), - MAIN_EXECUTOR, - result -> { - task.icon = result.icon; - task.titleDescription = result.contentDescription; - task.title = result.title; - callback.accept(task); - dispatchIconUpdate(task.key.id); - } - ); - mBgExecutor.execute(request); - return request; - } - - /** - * Clears the icon cache - */ - public void clearCache() { - mBgExecutor.execute(this::resetFactory); - } - - void onTaskRemoved(TaskKey taskKey) { - mIconCache.remove(taskKey); - } - - void invalidateCacheEntries(String pkg, UserHandle handle) { - mBgExecutor.execute(() -> mIconCache.removeAll(key -> - pkg.equals(key.getPackageName()) && handle.getIdentifier() == key.userId)); - } - - @WorkerThread - private TaskCacheEntry getCacheEntry(Task task) { - TaskCacheEntry entry = mIconCache.getAndInvalidateIfModified(task.key); - if (entry != null) { - return entry; - } - - TaskDescription desc = task.taskDescription; - TaskKey key = task.key; - ActivityInfo activityInfo = null; - - // Create new cache entry - entry = new TaskCacheEntry(); - - // Load icon - // TODO: Load icon resource (b/143363444) - Bitmap icon = getIcon(desc, key.userId); - if (icon != null) { - entry.icon = getBitmapInfo( - new BitmapDrawable(mContext.getResources(), icon), - key.userId, - desc.getPrimaryColor(), - false /* isInstantApp */).newIcon(mContext); - } else { - activityInfo = PackageManagerWrapper.getInstance().getActivityInfo( - key.getComponent(), key.userId); - if (activityInfo != null) { - BitmapInfo bitmapInfo = getBitmapInfo( - mIconProvider.getIcon(activityInfo), - key.userId, - desc.getPrimaryColor(), - activityInfo.applicationInfo.isInstantApp()); - entry.icon = bitmapInfo.newIcon(mContext); - } else { - entry.icon = getDefaultIcon(key.userId); - } - } - - // Skip loading the content description if the activity no longer exists - if (activityInfo == null) { - activityInfo = PackageManagerWrapper.getInstance().getActivityInfo( - key.getComponent(), key.userId); - } - if (activityInfo != null) { - entry.contentDescription = getBadgedContentDescription( - activityInfo, task.key.userId, task.taskDescription); - if (enableOverviewIconMenu()) { - entry.title = Utilities.trim(activityInfo.loadLabel(mContext.getPackageManager())); - } - } - - mIconCache.put(task.key, entry); - return entry; - } - - private Bitmap getIcon(ActivityManager.TaskDescription desc, int userId) { - if (desc.getInMemoryIcon() != null) { - return desc.getInMemoryIcon(); - } - return ActivityManager.TaskDescription.loadTaskDescriptionIcon( - desc.getIconFilename(), userId); - } - - private String getBadgedContentDescription(ActivityInfo info, int userId, TaskDescription td) { - PackageManager pm = mContext.getPackageManager(); - String taskLabel = td == null ? null : Utilities.trim(td.getLabel()); - if (TextUtils.isEmpty(taskLabel)) { - taskLabel = Utilities.trim(info.loadLabel(pm)); - } - - String applicationLabel = Utilities.trim(info.applicationInfo.loadLabel(pm)); - String badgedApplicationLabel = userId != UserHandle.myUserId() - ? pm.getUserBadgedLabel(applicationLabel, UserHandle.of(userId)).toString() - : applicationLabel; - return applicationLabel.equals(taskLabel) - ? badgedApplicationLabel : badgedApplicationLabel + " " + taskLabel; - } - - @WorkerThread - private Drawable getDefaultIcon(int userId) { - synchronized (mDefaultIcons) { - if (mDefaultIconBase == null) { - try (BaseIconFactory bif = getIconFactory()) { - mDefaultIconBase = bif.makeDefaultIcon(); - } - } - - int index; - if ((index = mDefaultIcons.indexOfKey(userId)) >= 0) { - return mDefaultIcons.valueAt(index).newIcon(mContext); - } else { - BitmapInfo info = mDefaultIconBase.withFlags( - UserCache.INSTANCE.get(mContext).getUserInfo(UserHandle.of(userId)) - .applyBitmapInfoFlags(FlagOp.NO_OP)); - mDefaultIcons.put(userId, info); - return info.newIcon(mContext); - } - } - } - - @WorkerThread - private BitmapInfo getBitmapInfo(Drawable drawable, int userId, - int primaryColor, boolean isInstantApp) { - try (BaseIconFactory bif = getIconFactory()) { - bif.setWrapperBackgroundColor(primaryColor); - - // User version code O, so that the icon is always wrapped in an adaptive icon container - return bif.createBadgedIconBitmap(drawable, - new IconOptions() - .setUser(UserCache.INSTANCE.get(mContext) - .getUserInfo(UserHandle.of(userId))) - .setInstantApp(isInstantApp) - .setExtractedColor(0)); - } - } - - @WorkerThread - private BaseIconFactory getIconFactory() { - if (mIconFactory == null) { - mIconFactory = new BaseIconFactory(mContext, - DisplayController.INSTANCE.get(mContext).getInfo().getDensityDpi(), - mContext.getResources().getDimensionPixelSize( - R.dimen.task_icon_cache_default_icon_size)); - } - return mIconFactory; - } - - @WorkerThread - private void resetFactory() { - mIconFactory = null; - mIconCache.evictAll(); - } - - private static class TaskCacheEntry { - public Drawable icon; - public String contentDescription = ""; - public String title = ""; - } - - void registerTaskVisualsChangeListener(TaskVisualsChangeListener newListener) { - mTaskVisualsChangeListener = newListener; - } - - void removeTaskVisualsChangeListener() { - mTaskVisualsChangeListener = null; - } - - void dispatchIconUpdate(int taskId) { - if (mTaskVisualsChangeListener != null) { - mTaskVisualsChangeListener.onTaskIconChanged(taskId); - } - } -} \ No newline at end of file diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.kt b/quickstep/src/com/android/quickstep/TaskIconCache.kt new file mode 100644 index 00000000000..10346ef7a3f --- /dev/null +++ b/quickstep/src/com/android/quickstep/TaskIconCache.kt @@ -0,0 +1,441 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.app.ActivityManager +import android.content.Context +import android.graphics.Bitmap +import android.graphics.drawable.Drawable +import android.os.UserHandle +import android.util.SparseArray +import androidx.annotation.WorkerThread +import androidx.core.graphics.drawable.toDrawable +import com.android.launcher3.Flags.enableRefactorTaskThumbnail +import com.android.launcher3.Flags.enableTaskbarRecentsThemedIcons +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.icons.BaseIconFactory +import com.android.launcher3.icons.BaseIconFactory.IconOptions +import com.android.launcher3.icons.BitmapInfo +import com.android.launcher3.icons.IconProvider +import com.android.launcher3.icons.LauncherIcons +import com.android.launcher3.pm.UserCache +import com.android.launcher3.util.CancellableTask +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener +import com.android.launcher3.util.Executors +import com.android.launcher3.util.FlagOp +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu +import com.android.launcher3.util.Preconditions +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.task.thumbnail.data.TaskIconDataSource +import com.android.quickstep.util.IconLabelUtil.getBadgedContentDescription +import com.android.quickstep.util.TaskKeyLruCache +import com.android.quickstep.util.TaskVisualsChangeListener +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.Task.TaskKey +import com.android.systemui.shared.system.PackageManagerWrapper +import java.util.concurrent.Executor +import kotlinx.coroutines.withContext + +/** Manages the caching of task icons and related data. */ +class TaskIconCache( + private val context: Context, + private val bgExecutor: Executor, + private val iconProvider: IconProvider, + displayController: DisplayController, + val dispatcherProvider: DispatcherProvider, +) : TaskIconDataSource, DisplayInfoChangeListener { + private val recentsIconCacheSize = context.resources.getInteger(R.integer.recentsIconCacheSize) + private var iconCache: TaskKeyLruCache? = null + // TODO: b/431811298 - Make non-null when flag is cleaned up. + private var bitmapInfoCache: TaskKeyLruCache? = null + + private val defaultIcons = SparseArray() + private var defaultIconBase: BitmapInfo? = null + + private var _iconFactory: BaseIconFactory? = null + @get:WorkerThread + private val iconFactory: BaseIconFactory + get() = + if (enableTaskbarRecentsThemedIcons()) LauncherIcons.obtain(context) + else if (enableRefactorTaskThumbnail()) createIconFactory() + else _iconFactory ?: createIconFactory().also { _iconFactory = it } + + var taskVisualsChangeListener: TaskVisualsChangeListener? = null + + init { + if (enableTaskbarRecentsThemedIcons()) { + bitmapInfoCache = TaskKeyLruCache(recentsIconCacheSize) + } else { + iconCache = TaskKeyLruCache(recentsIconCacheSize) + } + // TODO (b/397205964): this will need to be updated when we support caches for different + // displays. + displayController.addChangeListener(this) + } + + override fun onDisplayInfoChanged(context: Context, info: DisplayController.Info, flags: Int) { + if ((flags and DisplayController.CHANGE_DENSITY) != 0) { + clearCache() + } + } + + // TODO(b/387496731): Add ensureActive() calls if they show performance benefit + override suspend fun getIcon(task: Task): TaskCacheEntry { + task.icon?.let { icon -> + // Nothing to load, the icon is already loaded + return TaskCacheEntry(icon, task.titleDescription ?: "", task.title ?: "") + } + + // Return from cache if present + bitmapInfoCache?.getAndInvalidateIfModified(task.key)?.let { + return it.toTaskCacheEntry(context) + } + iconCache?.getAndInvalidateIfModified(task.key)?.let { + return it + } + + return withContext(dispatcherProvider.ioBackground) { + val entry = + if (enableTaskbarRecentsThemedIcons()) { + getBitmapInfoCacheEntry(task) + .apply { + task.icon = bitmapInfo.newIcon(context) + task.titleDescription = contentDescription + task.title = title + } + .toTaskCacheEntry(context) + } else { + getCacheEntry(task).apply { + task.icon = icon + task.titleDescription = contentDescription + task.title = title + } + } + dispatchIconUpdate(task.key.id) + return@withContext entry + } + } + + /** + * Asynchronously fetches the icon and other [task] data, returned through [callback]. + * + * Returns a [CancellableTask] to cancel the request. + */ + fun getIconInBackground(task: Task, callback: GetTaskIconCallback): CancellableTask<*>? { + Preconditions.assertUIThread() + task.icon?.let { + // Nothing to load, the icon is already loaded + callback.onTaskIconReceived(it, task.titleDescription ?: "", task.title ?: "") + return null + } + + if (enableTaskbarRecentsThemedIcons()) { + return getBitmapInfoInBackground(task) { bitmapInfo, title, contentDescription -> + val icon = bitmapInfo.newIcon(context) + task.icon = icon + callback.onTaskIconReceived(icon, title, contentDescription) + } + } + + iconCache?.getAndInvalidateIfModified(task.key)?.let { + task.icon = it.icon + task.titleDescription = it.contentDescription + task.title = it.title + + callback.onTaskIconReceived(it.icon, it.contentDescription, it.title) + return null + } + val request = + CancellableTask( + { getCacheEntry(task) }, + Executors.MAIN_EXECUTOR, + { result: TaskCacheEntry -> + task.icon = result.icon + task.titleDescription = result.contentDescription + task.title = result.title + + callback.onTaskIconReceived( + result.icon, + result.contentDescription, + result.title, + ) + dispatchIconUpdate(task.key.id) + }, + ) + bgExecutor.execute(request) + return request + } + + /** + * Asynchronously fetches the icon [BitmapInfo] and other [task] data, returned through + * [callback]. + * + * Returns a [CancellableTask] to cancel the request. + */ + fun getBitmapInfoInBackground( + task: Task, + callback: GetTaskBitmapInfoCallback, + ): CancellableTask<*>? { + Preconditions.assertUIThread() + + bitmapInfoCache?.getAndInvalidateIfModified(task.key)?.let { + task.titleDescription = it.contentDescription + task.title = it.title + callback.onBitmapInfoReceived(it.bitmapInfo, it.contentDescription, it.title) + return null + } + + val request = + CancellableTask( + { getBitmapInfoCacheEntry(task) }, + Executors.MAIN_EXECUTOR, + { result: TaskBitmapInfoCacheEntry -> + task.titleDescription = result.contentDescription + task.title = result.title + callback.onBitmapInfoReceived( + result.bitmapInfo, + result.contentDescription, + result.title, + ) + dispatchIconUpdate(task.key.id) + }, + ) + bgExecutor.execute(request) + return request + } + + /** Clears the icon cache */ + fun clearCache() { + // Clear on caller and background thread. The cache clears are synchronized. + resetFactory() + bgExecutor.execute { resetFactory() } + } + + fun onTaskRemoved(taskKey: TaskKey) { + bitmapInfoCache?.remove(taskKey) + iconCache?.remove(taskKey) + } + + fun invalidateCacheEntries(pkg: String, handle: UserHandle) { + bgExecutor.execute { + val keyCheck = { key: TaskKey -> + pkg == key.packageName && handle.identifier == key.userId + } + bitmapInfoCache?.removeAll(keyCheck) + iconCache?.removeAll(keyCheck) + } + } + + @WorkerThread + private fun createIconFactory() = + BaseIconFactory( + context, + DisplayController.INSTANCE.get(context).info.densityDpi, + context.resources.getDimensionPixelSize(R.dimen.task_icon_cache_default_icon_size), + ) + + @WorkerThread + private fun getCacheEntry(task: Task): TaskCacheEntry { + val key = task.key + val activityInfo = + PackageManagerWrapper.getInstance().getActivityInfo(key.component, key.userId) + val entryIcon = getBitmapInfo(task).newIcon(context) + + return when { + // Skip loading the content description if the activity no longer exists + activityInfo == null -> TaskCacheEntry(entryIcon) + enableOverviewIconMenu() -> + TaskCacheEntry( + entryIcon, + getBadgedContentDescription( + context, + activityInfo, + task.key.userId, + task.taskDescription, + ), + Utilities.trim(activityInfo.loadLabel(context.packageManager)), + ) + else -> + TaskCacheEntry( + entryIcon, + getBadgedContentDescription( + context, + activityInfo, + task.key.userId, + task.taskDescription, + ), + ) + }.also { iconCache?.put(task.key, it) } + } + + @WorkerThread + private fun getBitmapInfoCacheEntry(task: Task): TaskBitmapInfoCacheEntry { + val key = task.key + val activityInfo = + PackageManagerWrapper.getInstance().getActivityInfo(key.component, key.userId) + val bitmapInfo = getBitmapInfo(task) + + return when { + // Skip loading the content description if the activity no longer exists + activityInfo == null -> TaskBitmapInfoCacheEntry(bitmapInfo) + enableOverviewIconMenu() -> + TaskBitmapInfoCacheEntry( + bitmapInfo, + getBadgedContentDescription( + context, + activityInfo, + task.key.userId, + task.taskDescription, + ), + Utilities.trim(activityInfo.loadLabel(context.packageManager)), + ) + else -> + TaskBitmapInfoCacheEntry( + bitmapInfo, + getBadgedContentDescription( + context, + activityInfo, + task.key.userId, + task.taskDescription, + ), + ) + }.also { bitmapInfoCache?.put(task.key, it) } + } + + private fun getIcon(desc: ActivityManager.TaskDescription, userId: Int): Bitmap? = + desc.inMemoryIcon + ?: ActivityManager.TaskDescription.loadTaskDescriptionIcon(desc.iconFilename, userId) + + @WorkerThread + private fun getBitmapInfo(task: Task): BitmapInfo { + val desc = task.taskDescription + val key = task.key + + // Load icon + val icon = getIcon(desc, key.userId) + return if (icon != null) { + getBitmapInfo( + icon.toDrawable(context.resources), + key.userId, + desc.primaryColor, + false, /* isInstantApp */ + ) + } else { + val activityInfo = + PackageManagerWrapper.getInstance().getActivityInfo(key.component, key.userId) + if (activityInfo != null) { + getBitmapInfo( + iconProvider.getIcon(activityInfo), + key.userId, + desc.primaryColor, + activityInfo.applicationInfo.isInstantApp, + ) + } else { + getDefaultBitmapInfo(key.userId) + } + } + } + + @WorkerThread + private fun getDefaultBitmapInfo(userId: Int): BitmapInfo { + synchronized(defaultIcons) { + val defaultIconBase = + defaultIconBase ?: iconFactory.use { it.makeDefaultIcon(iconProvider) } + val index: Int = defaultIcons.indexOfKey(userId) + return if (index >= 0) { + defaultIcons.valueAt(index) + } else { + val info = + defaultIconBase.withFlags( + UserCache.INSTANCE.get(context) + .getUserInfo(UserHandle.of(userId)) + .applyBitmapInfoFlags(FlagOp.NO_OP) + ) + defaultIcons[userId] = info + info + } + } + } + + @WorkerThread + private fun getBitmapInfo( + drawable: Drawable, + userId: Int, + primaryColor: Int, + isInstantApp: Boolean, + ): BitmapInfo { + iconFactory.use { iconFactory -> + // User version code O, so that the icon is always wrapped in an adaptive icon container + return iconFactory.createBadgedIconBitmap( + drawable, + IconOptions() + .setUser(UserCache.INSTANCE.get(context).getUserInfo(UserHandle.of(userId))) + .setInstantApp(isInstantApp) + .setExtractedColor(0) + .setWrapperBackgroundColor(primaryColor), + ) + } + } + + @WorkerThread + private fun resetFactory() { + _iconFactory = null + bitmapInfoCache?.evictAll() + iconCache?.evictAll() + } + + data class TaskCacheEntry( + val icon: Drawable, + val contentDescription: String = "", + val title: String = "", + ) + + private data class TaskBitmapInfoCacheEntry( + val bitmapInfo: BitmapInfo, + val contentDescription: String = "", + val title: String = "", + ) { + fun toTaskCacheEntry(context: Context): TaskCacheEntry { + return TaskCacheEntry(bitmapInfo.newIcon(context), contentDescription, title) + } + } + + /** Callback used when retrieving app icons from cache. */ + fun interface GetTaskIconCallback { + /** Called when task icon is retrieved. */ + fun onTaskIconReceived(icon: Drawable, contentDescription: String, title: String) + } + + /** Callback used when retrieving app [BitmapInfo] instances from cache. */ + fun interface GetTaskBitmapInfoCallback { + /** Called when task [BitmapInfo] is retrieved. */ + fun onBitmapInfoReceived(bitmapInfo: BitmapInfo, contentDescription: String, title: String) + } + + fun registerTaskVisualsChangeListener(newListener: TaskVisualsChangeListener?) { + taskVisualsChangeListener = newListener + } + + fun removeTaskVisualsChangeListener() { + taskVisualsChangeListener = null + } + + private fun dispatchIconUpdate(taskId: Int) { + taskVisualsChangeListener?.onTaskIconChanged(taskId) + } +} diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java index 03183d02ad9..e0586c5de3d 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -16,116 +16,124 @@ package com.android.quickstep; +import static com.android.launcher3.Flags.enableRefactorTaskThumbnail; import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL; import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED; +import static com.android.quickstep.views.RecentsViewContainer.containerFromContext; import android.annotation.SuppressLint; import android.content.Context; +import android.graphics.Bitmap; import android.graphics.Insets; import android.graphics.Matrix; import android.graphics.Rect; +import android.graphics.RectF; import android.os.Build; import android.view.View; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import com.android.launcher3.BaseActivity; import com.android.launcher3.R; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.popup.SystemShortcut; -import com.android.launcher3.util.ResourceBasedOverride; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.Snackbar; +import com.android.quickstep.recents.domain.usecase.ThumbnailPosition; import com.android.quickstep.util.RecentsOrientedState; import com.android.quickstep.views.DesktopTaskView; import com.android.quickstep.views.GroupedTaskView; import com.android.quickstep.views.OverviewActionsView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; -import com.android.quickstep.views.TaskThumbnailViewDeprecated; +import com.android.quickstep.views.TaskContainer; import com.android.quickstep.views.TaskView; -import com.android.quickstep.views.TaskView.TaskContainer; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.ThumbnailData; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** * Factory class to create and add an overlays on the TaskView */ -public class TaskOverlayFactory implements ResourceBasedOverride { +public class TaskOverlayFactory { + + @Inject + public TaskOverlayFactory() { + } + /** + * Returns menu options associated with TaskContainer. + */ public static List getEnabledShortcuts(TaskView taskView, - TaskContainer taskContainer) { + @Nullable TaskContainer taskContainer) { + final RecentsViewContainer container = containerFromContext(taskView.getContext()); final ArrayList shortcuts = new ArrayList<>(); - final RecentsViewContainer container = RecentsViewContainer.containerFromContext(taskView.getContext()); - for (TaskShortcutFactory menuOption : MENU_OPTIONS) { - if (taskView instanceof GroupedTaskView && !menuOption.showForGroupedTask()) { - continue; - } - if (taskView instanceof DesktopTaskView && !menuOption.showForDesktopTask()) { - continue; + if (taskContainer != null) { + for (TaskShortcutFactory menuOption : PER_TASK_MENU_OPTIONS) { + if (taskView instanceof GroupedTaskView && !menuOption.showForGroupedTask()) { + continue; + } + if (taskView instanceof DesktopTaskView && !menuOption.showForDesktopTask()) { + continue; + } + + List menuShortcuts = menuOption.getShortcuts(container, + taskContainer); + if (menuShortcuts == null) { + continue; + } + shortcuts.addAll(menuShortcuts); } - - List menuShortcuts = menuOption.getShortcuts(container, taskContainer); - if (menuShortcuts == null) { - continue; - } - shortcuts.addAll(menuShortcuts); } + shortcuts.addAll(TaskViewShortFactory.Companion.getEnabledShortcuts(taskView)); return shortcuts; } - /** - * Creates a {@link TaskOverlay} associated with the provide - * {@link TaskContainer}. - */ + /** Creates a {@link TaskOverlay} associated with the provide {@link TaskContainer}. */ public TaskOverlay createOverlay(TaskContainer taskContainer) { return new TaskOverlay<>(taskContainer); } /** - * Subclasses can attach any system listeners in this method, must be paired - * with + * Subclasses can attach any system listeners in this method, must be paired with * {@link #removeListeners()} */ public void initListeners() { } /** - * Subclasses should remove any system listeners in this method, must be paired - * with + * Subclasses should remove any system listeners in this method, must be paired with * {@link #initListeners()} */ public void removeListeners() { } /** - * Clears any active state outside of the TaskOverlay lifecycle which might have - * built + * Clears any active state outside of the TaskOverlay lifecycle which might have built * up over time */ - public void clearAllActiveState() { - } + public void clearAllActiveState() { } - /** - * Note that these will be shown in order from top to bottom, if available for - * the task. - */ - private static final TaskShortcutFactory[] MENU_OPTIONS = new TaskShortcutFactory[] { + /** Note that these will be shown in order from top to bottom, if available for the task. */ + private static final TaskShortcutFactory[] PER_TASK_MENU_OPTIONS = new TaskShortcutFactory[]{ TaskShortcutFactory.APP_INFO, TaskShortcutFactory.SPLIT_SELECT, TaskShortcutFactory.PIN, TaskShortcutFactory.INSTALL, TaskShortcutFactory.FREE_FORM, DesktopSystemShortcut.Companion.createFactory(), + ExternalDisplaySystemShortcut.Companion.createFactory(), + AspectRatioSystemShortcut.Companion.createFactory(), TaskShortcutFactory.WELLBEING, TaskShortcutFactory.SAVE_APP_PAIR, TaskShortcutFactory.SCREENSHOT, - TaskShortcutFactory.MODAL + TaskShortcutFactory.MODAL, }; /** @@ -138,38 +146,86 @@ public static class TaskOverlay { private T mActionsView; protected ImageActionsApi mImageApi; + private ThumbnailData mThumbnailData = null; protected TaskOverlay(TaskContainer taskContainer) { mApplicationContext = taskContainer.getTaskView().getContext().getApplicationContext(); mTaskContainer = taskContainer; - mImageApi = new ImageActionsApi( - mApplicationContext, mTaskContainer.getThumbnailViewDeprecated()::getThumbnail); + mImageApi = new ImageActionsApi(mApplicationContext, this::getThumbnail); + } + + public void setThumbnailState(@Nullable ThumbnailData thumbnailData) { + mThumbnailData = thumbnailData; + } + + protected @Nullable Bitmap getThumbnail() { + if (enableRefactorTaskThumbnail()) { + return mThumbnailData == null ? null : mThumbnailData.getThumbnail(); + } else { + return mTaskContainer.getThumbnailViewDeprecated().getThumbnail(); + } + } + /** + * Returns whether the snapshot is real. If the device is locked for the user of the task, + * the snapshot used will be an app-theme generated snapshot instead of a real snapshot. + */ + protected boolean isRealSnapshot() { + if (enableRefactorTaskThumbnail()) { + if (mThumbnailData == null) return false; + + return mThumbnailData.isRealSnapshot && !mTaskContainer.getTask().isLocked; + } else { + return mTaskContainer.getThumbnailViewDeprecated().isRealSnapshot(); + } + } + + /** + * Returns whether the snapshot is rotated compared to the current task orientation. + */ + public boolean isThumbnailRotationDifferentFromTask() { + if (enableRefactorTaskThumbnail()) { + ThumbnailPosition thumbnailPosition = mTaskContainer.getThumbnailPosition(); + return thumbnailPosition != null && thumbnailPosition.isRotated(); + } + + return mTaskContainer.getThumbnailViewDeprecated() + .isThumbnailRotationDifferentFromTask(); } protected T getActionsView() { if (mActionsView == null) { - mActionsView = BaseActivity.fromContext( - mTaskContainer.getThumbnailViewDeprecated().getContext()).findViewById( - R.id.overview_actions_view); + mActionsView = (T) containerFromContext( + mTaskContainer.getTaskView().getContext()).getActionsView(); } return mActionsView; } - public TaskThumbnailViewDeprecated getThumbnailView() { - return mTaskContainer.getThumbnailViewDeprecated(); + public TaskContainer getTaskContainer() { + return mTaskContainer; + } + + public TaskView getTaskView() { + return mTaskContainer.getTaskView(); + } + + public View getSnapshotView() { + return mTaskContainer.getSnapshotView(); } /** * Called when the current task is interactive for the user */ - public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix, + public void initOverlay(Task task, @Nullable Bitmap thumbnail, Matrix matrix, boolean rotated) { - getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null); + if (!enableRefactorTaskThumbnail()) { + getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null); + } if (thumbnail != null) { - getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated); - boolean isAllowedByPolicy = mTaskContainer.getThumbnailViewDeprecated().isRealSnapshot(); - getActionsView().setCallbacks(new OverlayUICallbacksImpl(isAllowedByPolicy, task)); + if (!enableRefactorTaskThumbnail()) { + getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated); + } + getActionsView().setCallbacks(new OverlayUICallbacksImpl(isRealSnapshot(), task)); } } @@ -179,12 +235,12 @@ public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix, * @param callback callback to run, after switching to screenshot */ public void endLiveTileMode(@NonNull Runnable callback) { - RecentsView recentsView = mTaskContainer.getThumbnailViewDeprecated().getTaskView().getRecentsView(); + RecentsView recentsView = + mTaskContainer.getTaskView().getRecentsView(); // Task has already been dismissed - if (recentsView == null) - return; + if (recentsView == null) return; recentsView.switchToScreenshot( - () -> recentsView.finishRecentsAnimation(true /* toRecents */, + () -> recentsView.finishRecentsAnimation(true /* toHome */, false /* shouldPip */, callback)); } @@ -193,8 +249,8 @@ public void endLiveTileMode(@NonNull Runnable callback) { */ @SuppressLint("NewApi") protected void saveScreenshot(Task task) { - if (mTaskContainer.getThumbnailViewDeprecated().isRealSnapshot()) { - mImageApi.saveScreenshot(mTaskContainer.getThumbnailViewDeprecated().getThumbnail(), + if (isRealSnapshot()) { + mImageApi.saveScreenshot(getThumbnail(), getTaskSnapshotBounds(), getTaskSnapshotInsets(), task.key); } else { showBlockedByPolicyMessage(); @@ -202,16 +258,14 @@ protected void saveScreenshot(Task task) { } protected void enterSplitSelect() { - RecentsView overviewPanel = mTaskContainer.getThumbnailViewDeprecated().getTaskView().getRecentsView(); + RecentsView overviewPanel = mTaskContainer.getTaskView().getRecentsView(); // Task has already been dismissed - if (overviewPanel == null) - return; - overviewPanel.initiateSplitSelect( - mTaskContainer.getThumbnailViewDeprecated().getTaskView()); + if (overviewPanel == null) return; + overviewPanel.initiateSplitSelect(mTaskContainer); } protected void saveAppPair() { - GroupedTaskView taskView = (GroupedTaskView) mTaskContainer.getThumbnailViewDeprecated().getTaskView(); + GroupedTaskView taskView = (GroupedTaskView) mTaskContainer.getTaskView(); taskView.getRecentsView().getSplitSelectController().getAppPairsController() .saveAppPair(taskView); } @@ -220,6 +274,7 @@ protected void saveAppPair() { * Called when the overlay is no longer used. */ public void reset() { + setThumbnailState(null); } /** @@ -228,6 +283,11 @@ public void reset() { public void resetModalVisuals() { } + /** + * Called when Recents wants to reset the share UI in Overview. + */ + public void resetShareUI() {} + /** * Gets the modal state system shortcut. */ @@ -243,8 +303,7 @@ public void setFullscreenProgress(float progress) { } /** - * Gets the system shortcut for the screenshot that will be added to the task - * menu. + * Gets the system shortcut for the screenshot that will be added to the task menu. */ public SystemShortcut getScreenshotShortcut(RecentsViewContainer container, ItemInfo iteminfo, View originalView) { @@ -258,11 +317,11 @@ public SystemShortcut getScreenshotShortcut(RecentsViewContainer container, */ public Rect getTaskSnapshotBounds() { int[] location = new int[2]; - mTaskContainer.getThumbnailViewDeprecated().getLocationOnScreen(location); + mTaskContainer.getSnapshotView().getLocationOnScreen(location); return new Rect(location[0], location[1], - mTaskContainer.getThumbnailViewDeprecated().getWidth() + location[0], - mTaskContainer.getThumbnailViewDeprecated().getHeight() + location[1]); + mTaskContainer.getSnapshotView().getWidth() + location[0], + mTaskContainer.getSnapshotView().getHeight() + location[1]); } /** @@ -272,7 +331,43 @@ public Rect getTaskSnapshotBounds() { */ @RequiresApi(api = Build.VERSION_CODES.Q) public Insets getTaskSnapshotInsets() { - return mTaskContainer.getThumbnailViewDeprecated().getScaledInsets(); + Bitmap thumbnail = getThumbnail(); + if (thumbnail == null) { + return Insets.NONE; + } + + RectF bitmapRect = new RectF( + 0, + 0, + thumbnail.getWidth(), + thumbnail.getHeight()); + View snapshotView = mTaskContainer.getSnapshotView(); + RectF viewRect = new RectF(0, 0, snapshotView.getMeasuredWidth(), + snapshotView.getMeasuredHeight()); + + // The position helper matrix tells us how to transform the bitmap to fit the view, the + // inverse tells us where the view would be in the bitmaps coordinates. The insets are + // the difference between the bitmap bounds and the projected view bounds. + Matrix boundsToBitmapSpace = new Matrix(); + Matrix thumbnailMatrix; + if (enableRefactorTaskThumbnail()) { + if (mTaskContainer.getThumbnailPosition() != null) { + thumbnailMatrix = mTaskContainer.getThumbnailPosition().getMatrix(); + } else { + thumbnailMatrix = Matrix.IDENTITY_MATRIX; + } + } else { + thumbnailMatrix = mTaskContainer.getThumbnailViewDeprecated().getThumbnailMatrix(); + } + thumbnailMatrix.invert(boundsToBitmapSpace); + RectF boundsInBitmapSpace = new RectF(); + boundsToBitmapSpace.mapRect(boundsInBitmapSpace, viewRect); + + RecentsViewContainer container = containerFromContext( + getTaskView().getContext()); + int bottomInset = container.getDeviceProfile().getDeviceProperties().isTablet() + ? Math.round(bitmapRect.bottom - boundsInBitmapSpace.bottom) : 0; + return Insets.of(0, 0, 0, bottomInset); } /** @@ -283,39 +378,38 @@ public void updateOrientationState(RecentsOrientedState state) { protected void showBlockedByPolicyMessage() { ActivityContext activityContext = ActivityContext.lookupContext( - mTaskContainer.getThumbnailViewDeprecated().getContext()); + mTaskContainer.getTaskView().getContext()); String message = activityContext.getStringCache() != null ? activityContext.getStringCache().disabledByAdminMessage - : mTaskContainer.getThumbnailViewDeprecated().getContext().getString( + : mTaskContainer.getTaskView().getContext().getString( R.string.blocked_by_policy); - Snackbar.show(BaseActivity.fromContext( - mTaskContainer.getThumbnailViewDeprecated().getContext()), message, null); + Snackbar.show(containerFromContext( + mTaskContainer.getTaskView().getContext()), message, null); } /** Called when the snapshot has updated its full screen drawing parameters. */ - public void setFullscreenParams(TaskView.FullscreenDrawParams fullscreenParams) { - } + public void setFullscreenParams(FullscreenDrawParams fullscreenParams) {} - /** Sets visibility for the overlay associated elements. */ - public void setVisibility(int visibility) { + /** Returns the suggest view if it exists. */ + public @Nullable View getSuggestView() { + return null; } - private class ScreenshotSystemShortcut extends SystemShortcut { + /** See {@link View#addChildrenForAccessibility(ArrayList)} */ + public void addChildForAccessibility(ArrayList outChildren) {} - private final RecentsViewContainer mContainer; + private class ScreenshotSystemShortcut extends SystemShortcut { ScreenshotSystemShortcut(RecentsViewContainer container, ItemInfo itemInfo, View originalView) { super(R.drawable.ic_screenshot, R.string.action_screenshot, container, itemInfo, originalView); - mContainer = container; } @Override public void onClick(View view) { - saveScreenshot( - mTaskContainer.getThumbnailViewDeprecated().getTaskView().getFirstTask()); + saveScreenshot(mTaskContainer.getTask()); dismissTaskMenuView(); } } @@ -345,8 +439,7 @@ public void onSaveAppPair() { } /** - * Callbacks the Ui can generate. This is the only way for a Ui to call methods - * on the + * Callbacks the Ui can generate. This is the only way for a Ui to call methods on the * controller. */ public interface OverlayUICallbacks { diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index c1a9c7ef68b..3c5633eaa1d 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -18,11 +18,12 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; -import static android.view.Surface.ROTATION_0; +import static android.view.Display.DEFAULT_DISPLAY; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; +import static com.android.launcher3.Flags.enableRefactorTaskThumbnail; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; -import static com.android.window.flags2.Flags.enableDesktopWindowingMode; import android.app.ActivityOptions; import android.graphics.Bitmap; @@ -36,33 +37,33 @@ import android.view.View; import android.view.WindowInsets; import android.view.WindowManagerGlobal; +import android.window.DesktopExperienceFlags; import android.window.SplashScreen; import androidx.annotation.Nullable; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Flags; import com.android.launcher3.R; import com.android.launcher3.logging.StatsLogManager.LauncherEvent; import com.android.launcher3.model.WellbeingModel; import com.android.launcher3.popup.SystemShortcut; import com.android.launcher3.popup.SystemShortcut.AppInfo; import com.android.launcher3.util.InstantAppResolver; +import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.views.ActivityContext; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.RecentsOrientedState; import com.android.quickstep.views.GroupedTaskView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; -import com.android.quickstep.views.TaskThumbnailViewDeprecated; +import com.android.quickstep.views.TaskContainer; import com.android.quickstep.views.TaskView; -import com.android.quickstep.views.TaskView.TaskContainer; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecCompat; import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecsFuture; import com.android.systemui.shared.recents.view.RecentsTransition; import com.android.systemui.shared.system.ActivityManagerWrapper; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import java.util.Collections; import java.util.List; @@ -76,7 +77,7 @@ public interface TaskShortcutFactory { @Nullable default List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { + TaskContainer taskContainer) { return null; } @@ -106,7 +107,7 @@ default List createSingletonShortcutList(@Nullable SystemShortcu TaskShortcutFactory APP_INFO = new TaskShortcutFactory() { @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { + TaskContainer taskContainer) { TaskView taskView = taskContainer.getTaskView(); int actionId = taskContainer.getStagePosition() == STAGE_POSITION_BOTTOM_OR_RIGHT ? R.id.action_app_info_bottom_right @@ -128,20 +129,28 @@ public boolean showForGroupedTask() { }; class SplitSelectSystemShortcut extends SystemShortcut { - private final TaskView mTaskView; + private final TaskContainer mTaskContainer; private final SplitPositionOption mSplitPositionOption; - public SplitSelectSystemShortcut(RecentsViewContainer container, TaskView taskView, - SplitPositionOption option) { - super(option.iconResId, option.textResId, container, taskView.getFirstItemInfo(), + public SplitSelectSystemShortcut(RecentsViewContainer container, + TaskContainer taskContainer, TaskView taskView, + SplitPositionOption option) { + super(option.iconResId, option.textResId, container, taskContainer.getItemInfo(), taskView); - mTaskView = taskView; + mTaskContainer = taskContainer; mSplitPositionOption = option; } @Override public void onClick(View view) { - mTaskView.initiateSplitSelect(mSplitPositionOption); + RecentsView recentsView = mTaskContainer.getTaskView().getRecentsView(); + if (recentsView != null) { + recentsView.initiateSplitSelect( + mTaskContainer, + mSplitPositionOption.stagePosition, + SplitConfigurationOptions.getLogEventForPosition( + mSplitPositionOption.stagePosition)); + } } } @@ -152,11 +161,9 @@ public void onClick(View view) { class SaveAppPairSystemShortcut extends SystemShortcut { private final GroupedTaskView mTaskView; - public SaveAppPairSystemShortcut(RecentsViewContainer container, GroupedTaskView taskView, - int iconResId) { - super(iconResId, R.string.save_app_pair, container, taskView.getFirstItemInfo(), - taskView); + int iconResId) { + super(iconResId, R.string.save_app_pair, container, taskView.getItemInfo(), taskView); mTaskView = taskView; } @@ -174,19 +181,19 @@ class FreeformSystemShortcut extends SystemShortcut { private Handler mHandler; private final RecentsView mRecentsView; - private final TaskThumbnailViewDeprecated mThumbnailView; + private final TaskContainer mTaskContainer; private final TaskView mTaskView; private final LauncherEvent mLauncherEvent; public FreeformSystemShortcut(int iconRes, int textRes, RecentsViewContainer container, - TaskContainer taskContainer, LauncherEvent launcherEvent) { + TaskContainer taskContainer, LauncherEvent launcherEvent) { super(iconRes, textRes, container, taskContainer.getItemInfo(), taskContainer.getTaskView()); mLauncherEvent = launcherEvent; mHandler = new Handler(Looper.getMainLooper()); mTaskView = taskContainer.getTaskView(); mRecentsView = container.getOverviewPanel(); - mThumbnailView = taskContainer.getThumbnailViewDeprecated(); + mTaskContainer = taskContainer; } @Override @@ -194,7 +201,7 @@ public void onClick(View view) { dismissTaskMenuView(); RecentsView rv = mTarget.getOverviewPanel(); rv.switchToScreenshot(() -> { - rv.finishRecentsAnimation(true /* toRecents */, false /* shouldPip */, () -> { + rv.finishRecentsAnimation(true /* toHome */, false /* shouldPip */, () -> { mTarget.returnToHomescreen(); rv.getHandler().post(this::startActivity); }); @@ -202,14 +209,14 @@ public void onClick(View view) { } private void startActivity() { - final Task.TaskKey taskKey = mTaskView.getFirstTask().key; - final int taskId = taskKey.id; final ActivityOptions options = makeLaunchOptions(mTarget); - if (options != null) { - options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON); + if (options == null) { + return; } - if (options != null - && ActivityManagerWrapper.getInstance().startActivityFromRecents(taskId, + final Task.TaskKey taskKey = mTaskContainer.getTask().key; + final int taskId = taskKey.id; + options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON); + if (ActivityManagerWrapper.getInstance().startActivityFromRecents(taskId, options)) { final Runnable animStartedListener = () -> { // Hide the task view and wait for the window to be resized @@ -220,19 +227,24 @@ private void startActivity() { }; final int[] position = new int[2]; - mThumbnailView.getLocationOnScreen(position); - final int width = (int) (mThumbnailView.getWidth() * mTaskView.getScaleX()); - final int height = (int) (mThumbnailView.getHeight() * mTaskView.getScaleY()); + View snapShotView = mTaskContainer.getSnapshotView(); + snapShotView.getLocationOnScreen(position); + final int width = (int) (snapShotView.getWidth() * mTaskView.getScaleX()); + final int height = (int) (snapShotView.getHeight() * mTaskView.getScaleY()); final Rect taskBounds = new Rect(position[0], position[1], position[0] + width, position[1] + height); // Take the thumbnail of the task without a scrim and apply it back after - float alpha = mThumbnailView.getDimAlpha(); - mThumbnailView.setDimAlpha(0); - Bitmap thumbnail = RecentsTransition.drawViewIntoHardwareBitmap( - taskBounds.width(), taskBounds.height(), mThumbnailView, 1f, - Color.BLACK); - mThumbnailView.setDimAlpha(alpha); + Bitmap thumbnail; + if (enableRefactorTaskThumbnail()) { + thumbnail = mTaskContainer.getThumbnail(); + } else { + float alpha = mTaskContainer.getThumbnailViewDeprecated().getDimAlpha(); + mTaskContainer.getThumbnailViewDeprecated().setDimAlpha(0); + thumbnail = RecentsTransition.drawViewIntoHardwareBitmap( + taskBounds.width(), taskBounds.height(), snapShotView, 1f, Color.BLACK); + mTaskContainer.getThumbnailViewDeprecated().setDimAlpha(alpha); + } AppTransitionAnimationSpecsFuture future = new AppTransitionAnimationSpecsFuture(mHandler) { @@ -246,8 +258,8 @@ public List composeSpecs() { overridePendingAppTransitionMultiThumbFuture( future, animStartedListener, mHandler, true /* scaleUp */, taskKey.displayId); - mTarget.getStatsLogManager().logger().withItemInfo(mTaskView.getFirstItemInfo()) - .log(mLauncherEvent); + mTarget.getStatsLogManager().logger().withItemInfo(mTaskContainer.getItemInfo()) + .log(mLauncherEvent); } } @@ -287,15 +299,14 @@ private ActivityOptions makeLaunchOptions(RecentsViewContainer container) { * Does NOT add split options in the following scenarios: * * 1. Taskbar is not present AND aren't at least 2 tasks in overview to show split options for * * 2. Split isn't supported by the task itself (non resizable activity) - * * 3. We aren't currently in multi-window - * * 4. The taskView to show split options for is the focused task AND we haven't started + * * 3. The taskView to show split options for is the focused task AND we haven't started * * scrolling in overview (if we haven't scrolled, there's a split overview action button so * * we don't need this menu option) */ TaskShortcutFactory SPLIT_SELECT = new TaskShortcutFactory() { @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { + TaskContainer taskContainer) { DeviceProfile deviceProfile = container.getDeviceProfile(); final Task task = taskContainer.getTask(); final int intentFlags = task.key.baseIntent.getFlags(); @@ -308,20 +319,21 @@ public List getShortcuts(RecentsViewContainer container, !deviceProfile.isTaskbarPresent && recentsView.getTaskViewCount() < 2; boolean isTaskSplitNotSupported = !task.isDockable || (intentFlags & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0; - boolean hideForExistingMultiWindow = container.getDeviceProfile().isMultiWindowMode; - boolean isFocusedTask = deviceProfile.isTablet && taskView.isFocusedTask(); - boolean isTaskInExpectedScrollPosition = - recentsView.isTaskInExpectedScrollPosition(recentsView.indexOfChild(taskView)); - if (notEnoughTasksToSplit || isTaskSplitNotSupported || hideForExistingMultiWindow - || (isFocusedTask && isTaskInExpectedScrollPosition)) { + if (notEnoughTasksToSplit || isTaskSplitNotSupported) { + return null; + } + + if (container.asContext().getDisplayId() != DEFAULT_DISPLAY + && !DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX.isTrue()) { return null; } return orientationHandler.getSplitPositionOptions(deviceProfile) .stream() .map((Function) option -> - new SplitSelectSystemShortcut(container, taskView, option)) + new SplitSelectSystemShortcut(container, taskContainer, taskView, + option)) .collect(Collectors.toList()); } }; @@ -330,24 +342,25 @@ public List getShortcuts(RecentsViewContainer container, @Nullable @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { + TaskContainer taskContainer) { DeviceProfile deviceProfile = container.getDeviceProfile(); final TaskView taskView = taskContainer.getTaskView(); final RecentsView recentsView = taskView.getRecentsView(); - boolean isLargeTileFocusedTask = deviceProfile.isTablet && taskView.isFocusedTask(); + boolean isLargeTile = deviceProfile.getDeviceProperties().isTablet() && taskView.isLargeTile(); boolean isInExpectedScrollPosition = - recentsView.isTaskInExpectedScrollPosition(recentsView.indexOfChild(taskView)); + recentsView.isTaskInExpectedScrollPosition(taskView); boolean shouldShowActionsButtonInstead = - isLargeTileFocusedTask && isInExpectedScrollPosition; + isLargeTile && isInExpectedScrollPosition; // No "save app pair" menu item if: // - we are in 3p launcher // - the Overview Actions Button should be visible // - the task view is not a valid save-able split pair - if (!recentsView.supportsAppPairs() + if (!OverviewComponentObserver.INSTANCE.get(container.asContext()) + .isHomeAndOverviewSame() || shouldShowActionsButtonInstead || !recentsView.getSplitSelectController().getAppPairsController() - .canSaveAppPair(taskView)) { + .canSaveAppPair(taskView)) { return null; } @@ -369,7 +382,7 @@ public boolean showForGroupedTask() { TaskShortcutFactory FREE_FORM = new TaskShortcutFactory() { @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { + TaskContainer taskContainer) { final Task task = taskContainer.getTask(); if (!task.isDockable) { return null; @@ -388,14 +401,14 @@ private boolean isAvailable(RecentsViewContainer container) { return Settings.Global.getInt( container.asContext().getContentResolver(), Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, 0) != 0 - && !enableDesktopWindowingMode(); + && !DesktopModeStatus.canEnterDesktopMode(container.asContext()); } }; TaskShortcutFactory PIN = new TaskShortcutFactory() { @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { + TaskContainer taskContainer) { if (!SystemUiProxy.INSTANCE.get(container.asContext()).isActive()) { return null; } @@ -414,31 +427,31 @@ class PinSystemShortcut extends SystemShortcut { private static final String TAG = "PinSystemShortcut"; - private final TaskView mTaskView; + private final TaskContainer mTaskContainer; public PinSystemShortcut(RecentsViewContainer target, - TaskContainer taskContainer) { + TaskContainer taskContainer) { super(R.drawable.ic_pin, R.string.recent_task_option_pin, target, taskContainer.getItemInfo(), taskContainer.getTaskView()); - mTaskView = taskContainer.getTaskView(); + mTaskContainer = taskContainer; } @Override public void onClick(View view) { - if (mTaskView.launchTaskAnimated() != null) { + if (mTaskContainer.getTaskView().launchAsStaticTile() != null) { SystemUiProxy.INSTANCE.get(mTarget.asContext()).startScreenPinning( - mTaskView.getFirstTask().key.id); + mTaskContainer.getTask().key.id); } dismissTaskMenuView(); - mTarget.getStatsLogManager().logger().withItemInfo(mTaskView.getFirstItemInfo()) - .log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_PIN_TAP); + mTarget.getStatsLogManager().logger().withItemInfo(mTaskContainer.getItemInfo()) + .log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_PIN_TAP); } } TaskShortcutFactory INSTALL = new TaskShortcutFactory() { @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { + TaskContainer taskContainer) { Task t = taskContainer.getTask(); return InstantAppResolver.newInstance(container.asContext()).isInstantApp( t.getTopComponent().getPackageName(), t.getKey().userId) @@ -451,7 +464,7 @@ public List getShortcuts(RecentsViewContainer container, TaskShortcutFactory WELLBEING = new TaskShortcutFactory() { @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { + TaskContainer taskContainer) { SystemShortcut wellbeingShortcut = WellbeingModel.SHORTCUT_FACTORY.getShortcut(container, taskContainer.getItemInfo(), taskContainer.getTaskView()); @@ -462,17 +475,9 @@ public List getShortcuts(RecentsViewContainer container, TaskShortcutFactory SCREENSHOT = new TaskShortcutFactory() { @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { - boolean isTablet = container.getDeviceProfile().isTablet; - boolean isGridOnlyOverview = isTablet && Flags.enableGridOnlyOverview(); - // Extra conditions if it's not grid-only overview - if (!isGridOnlyOverview) { - RecentsOrientedState orientedState = taskContainer.getTaskView().getOrientedState(); - boolean isFakeLandscape = !orientedState.isRecentsActivityRotationAllowed() - && orientedState.getTouchRotation() != ROTATION_0; - if (!isFakeLandscape) { - return null; - } + TaskContainer taskContainer) { + if (!taskContainer.getOverlay().isRealSnapshot()) { + return null; } SystemShortcut screenshotShortcut = taskContainer.getOverlay().getScreenshotShortcut( @@ -489,10 +494,31 @@ public boolean showForDesktopTask() { TaskShortcutFactory MODAL = new TaskShortcutFactory() { @Override public List getShortcuts(RecentsViewContainer container, - TaskContainer taskContainer) { - boolean isTablet = container.getDeviceProfile().isTablet; - boolean isGridOnlyOverview = isTablet && Flags.enableGridOnlyOverview(); - if (!isGridOnlyOverview) { + TaskContainer taskContainer) { + if (!taskContainer.getOverlay().isRealSnapshot()) { + return null; + } + + // Modal only works with grid size tiles with enableGridOnlyOverview enabled on + // tablets / foldables. With enableGridOnlyOverview off, for large tiles it works, + // but the tile needs to be in the center of Recents / Overview. + boolean isTablet = container.getDeviceProfile().getDeviceProperties().isTablet(); + RecentsView recentsView = container.getOverviewPanel(); + boolean isLargeTileInCenterOfOverview = taskContainer.getTaskView().isLargeTile() + && recentsView.isFocusedTaskInExpectedScrollPosition(); + if (isTablet + && !isLargeTileInCenterOfOverview + && !enableGridOnlyOverview()) { + return null; + } + + boolean isFakeLandscape = !taskContainer.getTaskView().getPagedOrientationHandler() + .isLayoutNaturalToLauncher(); + if (isFakeLandscape) { + return null; + } + + if (taskContainer.getOverlay().isThumbnailRotationDifferentFromTask()) { return null; } @@ -502,4 +528,4 @@ public List getShortcuts(RecentsViewContainer container, return createSingletonShortcutList(modalStateSystemShortcut); } }; -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java deleted file mode 100644 index 38e927f95f8..00000000000 --- a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java +++ /dev/null @@ -1,279 +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.quickstep; - -import static com.android.launcher3.Flags.enableGridOnlyOverview; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; - -import android.content.Context; -import android.content.res.Resources; - -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - -import com.android.launcher3.R; -import com.android.launcher3.util.CancellableTask; -import com.android.launcher3.util.Preconditions; -import com.android.quickstep.task.thumbnail.data.TaskThumbnailDataSource; -import com.android.quickstep.util.TaskKeyByLastActiveTimeCache; -import com.android.quickstep.util.TaskKeyCache; -import com.android.quickstep.util.TaskKeyLruCache; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskKey; -import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.ActivityManagerWrapper; - -import java.util.ArrayList; -import java.util.concurrent.Executor; -import java.util.function.Consumer; - -public class TaskThumbnailCache implements TaskThumbnailDataSource { - - private final Executor mBgExecutor; - private final TaskKeyCache mCache; - private final HighResLoadingState mHighResLoadingState; - private final boolean mEnableTaskSnapshotPreloading; - private final Context mContext; - - public static class HighResLoadingState { - private boolean mForceHighResThumbnails; - private boolean mVisible; - private boolean mFlingingFast; - private boolean mHighResLoadingEnabled; - private ArrayList mCallbacks = new ArrayList<>(); - - public interface HighResLoadingStateChangedCallback { - void onHighResLoadingStateChanged(boolean enabled); - } - - private HighResLoadingState(Context context) { - // If the device does not support low-res thumbnails, only attempt to load high-res - // thumbnails - mForceHighResThumbnails = !supportsLowResThumbnails(); - } - - public void addCallback(HighResLoadingStateChangedCallback callback) { - mCallbacks.add(callback); - } - - public void removeCallback(HighResLoadingStateChangedCallback callback) { - mCallbacks.remove(callback); - } - - public void setVisible(boolean visible) { - mVisible = visible; - updateState(); - } - - public void setFlingingFast(boolean flingingFast) { - mFlingingFast = flingingFast; - updateState(); - } - - public boolean isEnabled() { - return mHighResLoadingEnabled; - } - - private void updateState() { - boolean prevState = mHighResLoadingEnabled; - mHighResLoadingEnabled = mForceHighResThumbnails || (mVisible && !mFlingingFast); - if (prevState != mHighResLoadingEnabled) { - for (int i = mCallbacks.size() - 1; i >= 0; i--) { - mCallbacks.get(i).onHighResLoadingStateChanged(mHighResLoadingEnabled); - } - } - } - } - - public TaskThumbnailCache(Context context, Executor bgExecutor) { - this(context, bgExecutor, - context.getResources().getInteger(R.integer.recentsThumbnailCacheSize)); - } - - private TaskThumbnailCache(Context context, Executor bgExecutor, int cacheSize) { - this(context, bgExecutor, - enableGridOnlyOverview() ? new TaskKeyByLastActiveTimeCache<>(cacheSize) - : new TaskKeyLruCache<>(cacheSize)); - } - - @VisibleForTesting - TaskThumbnailCache(Context context, Executor bgExecutor, TaskKeyCache cache) { - mBgExecutor = bgExecutor; - mHighResLoadingState = new HighResLoadingState(context); - mContext = context; - - Resources res = context.getResources(); - mEnableTaskSnapshotPreloading = res.getBoolean(R.bool.config_enableTaskSnapshotPreloading); - mCache = cache; - } - - /** - * Synchronously fetches the thumbnail for the given task at the specified resolution level, and - * puts it in the cache. - */ - public void updateThumbnailInCache(Task task, boolean lowResolution) { - if (task == null) { - return; - } - Preconditions.assertUIThread(); - // Fetch the thumbnail for this task and put it in the cache - if (task.thumbnail == null) { - updateThumbnailInBackground(task.key, lowResolution, - t -> task.thumbnail = t); - } - } - - /** - * Synchronously updates the thumbnail in the cache if it is already there. - */ - public void updateTaskSnapShot(int taskId, ThumbnailData thumbnail) { - Preconditions.assertUIThread(); - mCache.updateIfAlreadyInCache(taskId, thumbnail); - } - - /** - * Asynchronously fetches the icon and other task data for the given {@param task}. - * - * @param callback The callback to receive the task after its data has been populated. - * @return A cancelable handle to the request - */ - @Override - public CancellableTask updateThumbnailInBackground( - Task task, @NonNull Consumer callback) { - Preconditions.assertUIThread(); - - boolean lowResolution = !mHighResLoadingState.isEnabled(); - if (task.thumbnail != null && task.thumbnail.getThumbnail() != null - && (!task.thumbnail.reducedResolution || lowResolution)) { - // Nothing to load, the thumbnail is already high-resolution or matches what the - // request, so just callback - callback.accept(task.thumbnail); - return null; - } - - return updateThumbnailInBackground(task.key, !mHighResLoadingState.isEnabled(), t -> { - task.thumbnail = t; - callback.accept(t); - }); - } - - /** - * Updates cache size and remove excess entries if current size is more than new cache size. - * - * @return whether cache size has increased - */ - public boolean updateCacheSizeAndRemoveExcess() { - int newSize = mContext.getResources().getInteger(R.integer.recentsThumbnailCacheSize); - int oldSize = mCache.getMaxSize(); - if (newSize == oldSize) { - // Return if no change in size - return false; - } - - mCache.updateCacheSizeAndRemoveExcess(newSize); - return newSize > oldSize; - } - - private CancellableTask updateThumbnailInBackground(TaskKey key, - boolean lowResolution, Consumer callback) { - Preconditions.assertUIThread(); - - ThumbnailData cachedThumbnail = mCache.getAndInvalidateIfModified(key); - if (cachedThumbnail != null && cachedThumbnail.getThumbnail() != null - && (!cachedThumbnail.reducedResolution || lowResolution)) { - // Already cached, lets use that thumbnail - callback.accept(cachedThumbnail); - return null; - } - - CancellableTask request = new CancellableTask<>( - () -> { - ThumbnailData thumbnailData = ActivityManagerWrapper.getInstance() - .getTaskThumbnail(key.id, lowResolution); - return thumbnailData.getThumbnail() != null ? thumbnailData - : ActivityManagerWrapper.getInstance().takeTaskThumbnail(key.id); - }, - MAIN_EXECUTOR, - result -> { - // Avoid an async timing issue that a low res entry replaces an existing high - // res entry in high res enabled state, so we check before putting it to cache - if (enableGridOnlyOverview() && result.reducedResolution - && getHighResLoadingState().isEnabled()) { - ThumbnailData newCachedThumbnail = mCache.getAndInvalidateIfModified(key); - if (newCachedThumbnail != null && newCachedThumbnail.getThumbnail() != null - && !newCachedThumbnail.reducedResolution) { - return; - } - } - mCache.put(key, result); - callback.accept(result); - } - ); - mBgExecutor.execute(request); - return request; - } - - /** - * Clears the cache. - */ - public void clear() { - mCache.evictAll(); - } - - /** - * Removes the cached thumbnail for the given task. - */ - public void remove(Task.TaskKey key) { - mCache.remove(key); - } - - /** - * @return The cache size. - */ - public int getCacheSize() { - return mCache.getMaxSize(); - } - - /** - * @return The mutable high-res loading state. - */ - public HighResLoadingState getHighResLoadingState() { - return mHighResLoadingState; - } - - /** - * @return Whether to enable background preloading of task thumbnails. - */ - public boolean isPreloadingEnabled() { - return mEnableTaskSnapshotPreloading && mHighResLoadingState.mVisible; - } - - /** - * @return Whether device supports low-res thumbnails. Low-res files are an optimization - * for faster load times of snapshots. Devices can optionally disable low-res files so that - * they only store snapshots at high-res scale. The actual scale can be configured in - * frameworks/base config overlay. - */ - private static boolean supportsLowResThumbnails() { - Resources res = Resources.getSystem(); - int resId = res.getIdentifier("config_lowResTaskSnapshotScale", "dimen", "android"); - if (resId != 0) { - return 0 < res.getFloat(resId); - } - return true; - } - -} diff --git a/quickstep/src/com/android/quickstep/TaskThumbnailCache.kt b/quickstep/src/com/android/quickstep/TaskThumbnailCache.kt new file mode 100644 index 00000000000..50440208dda --- /dev/null +++ b/quickstep/src/com/android/quickstep/TaskThumbnailCache.kt @@ -0,0 +1,244 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.content.Context +import androidx.annotation.VisibleForTesting +import androidx.annotation.WorkerThread +import com.android.launcher3.R +import com.android.launcher3.util.CancellableTask +import com.android.launcher3.util.Executors +import com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview +import com.android.launcher3.util.Preconditions +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.task.thumbnail.data.TaskThumbnailDataSource +import com.android.quickstep.util.TaskKeyByLastActiveTimeCache +import com.android.quickstep.util.TaskKeyCache +import com.android.quickstep.util.TaskKeyLruCache +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.Task.TaskKey +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.systemui.shared.system.ActivityManagerWrapper +import java.util.concurrent.Executor +import java.util.function.Consumer +import kotlinx.coroutines.withContext + +class TaskThumbnailCache +@VisibleForTesting +internal constructor( + private val context: Context, + private val bgExecutor: Executor, + private val cache: TaskKeyCache, + val dispatcherProvider: DispatcherProvider, +) : TaskThumbnailDataSource { + val highResLoadingState = HighResLoadingState() + private val enableTaskSnapshotPreloading = + context.resources.getBoolean(R.bool.config_enableTaskSnapshotPreloading) + + @JvmOverloads + constructor( + context: Context, + bgExecutor: Executor, + cacheSize: Int = context.resources.getInteger(R.integer.recentsThumbnailCacheSize), + dispatcherProvider: DispatcherProvider, + ) : this( + context, + bgExecutor, + if (enableGridOnlyOverview()) TaskKeyByLastActiveTimeCache(cacheSize) + else TaskKeyLruCache(cacheSize), + dispatcherProvider, + ) + + /** + * Synchronously fetches the thumbnail for the given task at the specified resolution level, and + * puts it in the cache. + */ + fun updateThumbnailInCache(task: Task?, lowResolution: Boolean) { + task ?: return + + Preconditions.assertUIThread() + // Fetch the thumbnail for this task and put it in the cache + if (task.thumbnail == null) { + getThumbnailInBackground(task.key, lowResolution) { t: ThumbnailData? -> + task.thumbnail = t + } + } + } + + /** Synchronously updates the thumbnail in the cache if it is already there. */ + fun updateTaskSnapShot(taskId: Int, thumbnail: ThumbnailData?) { + Preconditions.assertUIThread() + cache.updateIfAlreadyInCache(taskId, thumbnail) + } + + // TODO(b/387496731): Add ensureActive() calls if they show performance benefit + /** + * Retrieves a thumbnail for the provided `task` on the current thread. This should not be + * called from the main thread. + */ + @WorkerThread + override suspend fun getThumbnail(task: Task): ThumbnailData? { + val lowResolution: Boolean = !highResLoadingState.isEnabled + // Check task for thumbnail + val taskThumbnail: ThumbnailData? = task.thumbnail + if ( + taskThumbnail?.thumbnail != null && (!taskThumbnail.reducedResolution || lowResolution) + ) { + return taskThumbnail + } + + // Check cache for thumbnail + val cachedThumbnail: ThumbnailData? = cache.getAndInvalidateIfModified(task.key) + if ( + cachedThumbnail?.thumbnail != null && + (!cachedThumbnail.reducedResolution || lowResolution) + ) { + return cachedThumbnail + } + + return withContext(dispatcherProvider.ioBackground) { + // Get thumbnail from system + var thumbnailData = + ActivityManagerWrapper.getInstance().getTaskThumbnail(task.key.id, lowResolution) + + // Avoid an async timing issue that a low res entry replaces an existing high + // res entry in high res enabled state, so we check before putting it to cache + if ( + enableGridOnlyOverview() && + thumbnailData.reducedResolution && + highResLoadingState.isEnabled + ) { + val newCachedThumbnail = cache.getAndInvalidateIfModified(task.key) + if ( + newCachedThumbnail?.thumbnail != null && !newCachedThumbnail.reducedResolution + ) { + return@withContext newCachedThumbnail + } + } + cache.put(task.key, thumbnailData) + return@withContext thumbnailData + } + } + + /** + * Asynchronously fetches the thumbnail for the given `task`. + * + * @param callback The callback to receive the task after its data has been populated. + * @return a cancelable handle to the request + */ + fun getThumbnailInBackground( + task: Task, + callback: Consumer, + ): CancellableTask? { + Preconditions.assertUIThread() + + val lowResolution = !highResLoadingState.isEnabled + val taskThumbnail = task.thumbnail + if ( + taskThumbnail?.thumbnail != null && (!taskThumbnail.reducedResolution || lowResolution) + ) { + // Nothing to load, the thumbnail is already high-resolution or matches what the + // request, so just callback + callback.accept(taskThumbnail) + return null + } + + return getThumbnailInBackground(task.key, !highResLoadingState.isEnabled, callback) + } + + /** + * Updates cache size and remove excess entries if current size is more than new cache size. + * + * @return whether cache size has increased + */ + fun updateCacheSizeAndRemoveExcess(): Boolean { + val newSize = context.resources.getInteger(R.integer.recentsThumbnailCacheSize) + val oldSize = cache.maxSize + if (newSize == oldSize) { + // Return if no change in size + return false + } + + cache.updateCacheSizeAndRemoveExcess(newSize) + return newSize > oldSize + } + + private fun getThumbnailInBackground( + key: TaskKey, + lowResolution: Boolean, + callback: Consumer, + ): CancellableTask? { + Preconditions.assertUIThread() + + val cachedThumbnail = cache.getAndInvalidateIfModified(key) + if ( + cachedThumbnail?.thumbnail != null && + (!cachedThumbnail.reducedResolution || lowResolution) + ) { + // Already cached, lets use that thumbnail + callback.accept(cachedThumbnail) + return null + } + + val request = + CancellableTask( + { + val thumbnailData = + ActivityManagerWrapper.getInstance().getTaskThumbnail(key.id, lowResolution) + if (thumbnailData.thumbnail != null) thumbnailData + else ActivityManagerWrapper.getInstance().takeTaskThumbnail(key.id) + }, + Executors.MAIN_EXECUTOR, + Consumer { result: ThumbnailData -> + // Avoid an async timing issue that a low res entry replaces an existing high + // res entry in high res enabled state, so we check before putting it to cache + if ( + enableGridOnlyOverview() && + result.reducedResolution && + highResLoadingState.isEnabled + ) { + val newCachedThumbnail = cache.getAndInvalidateIfModified(key) + if ( + newCachedThumbnail?.thumbnail != null && + !newCachedThumbnail.reducedResolution + ) { + return@Consumer + } + } + cache.put(key, result) + callback.accept(result) + }, + ) + bgExecutor.execute(request) + return request + } + + /** Clears the cache. */ + fun clear() { + cache.evictAll() + } + + /** Removes the cached thumbnail for the given task. */ + fun remove(key: TaskKey) { + cache.remove(key) + } + + /** Returns The cache size. */ + fun getCacheSize() = cache.maxSize + + /** Returns Whether to enable background preloading of task thumbnails. */ + fun isPreloadingEnabled() = enableTaskSnapshotPreloading && highResLoadingState.visible +} diff --git a/quickstep/src/com/android/quickstep/TaskUtils.java b/quickstep/src/com/android/quickstep/TaskUtils.java index 03bbc262c4a..5da1fb844c3 100644 --- a/quickstep/src/com/android/quickstep/TaskUtils.java +++ b/quickstep/src/com/android/quickstep/TaskUtils.java @@ -31,8 +31,8 @@ import androidx.annotation.Nullable; import com.android.launcher3.pm.UserCache; +import com.android.launcher3.util.ApplicationInfoWrapper; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.TraceHelper; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.ActivityManagerWrapper; @@ -72,8 +72,8 @@ public static CharSequence getTitle( return ""; } UserHandle user = UserHandle.of(userId); - ApplicationInfo applicationInfo = PackageManagerHelper.INSTANCE.get(context) - .getApplicationInfo(packageName, user, 0); + ApplicationInfo applicationInfo = + new ApplicationInfoWrapper(context, packageName, user).getInfo(); if (applicationInfo == null) { Log.e(TAG, "Failed to get title for userId=" + userId + ", packageName=" + packageName); return ""; diff --git a/quickstep/src/com/android/quickstep/TaskViewShortFactory.kt b/quickstep/src/com/android/quickstep/TaskViewShortFactory.kt new file mode 100644 index 00000000000..fed21e5e27a --- /dev/null +++ b/quickstep/src/com/android/quickstep/TaskViewShortFactory.kt @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.view.View +import com.android.launcher3.R +import com.android.launcher3.logging.StatsLogManager.LauncherEvent +import com.android.launcher3.popup.SystemShortcut +import com.android.launcher3.views.ActivityContext +import com.android.quickstep.views.DesktopTaskView +import com.android.quickstep.views.GroupedTaskView +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.RecentsViewContainer.containerFromContext +import com.android.quickstep.views.TaskView + +/** + * Represents a system shortcut that can be shown for a [TaskView]. Appears as a single entry in the + * dropdown menu that shows up when you tap the app chip in Overview. + */ +interface TaskViewShortFactory { + + fun getShortcuts( + container: RecentsViewContainer, + taskView: TaskView, + ): List> + + fun showForGroupedTask() = false + + fun showForDesktopTask() = false + + class RemoveTaskSystemShortcut( + iconResId: Int, + textResId: Int, + container: RecentsViewContainer, + private val taskView: TaskView, + ) : + SystemShortcut( + iconResId, + textResId, + container, + taskView.itemInfo, + taskView, + ) { + override fun onClick(view: View) { + val recentsView = taskView.recentsView ?: return + dismissTaskMenuView() + recentsView.dismissTaskView(taskView, true, true) + mTarget.statsLogManager + .logger() + .withItemInfo(taskView.itemInfo) + .log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_CLOSE_APP_TAP) + } + } + + companion object { + /** Returns menu options associated with TaskView. */ + fun getEnabledShortcuts(taskView: TaskView) = + TASK_VIEW_MENU_OPTIONS.filter { + taskView !is GroupedTaskView || it.showForGroupedTask() + } + .filter { taskView !is DesktopTaskView || it.showForDesktopTask() } + .flatMap { it.getShortcuts(containerFromContext(taskView.context), taskView) } + + private val REMOVE_TASK: TaskViewShortFactory = + object : TaskViewShortFactory { + override fun getShortcuts( + container: RecentsViewContainer, + taskView: TaskView, + ): List> { + val recentsView = taskView.recentsView ?: return emptyList() + if (!recentsView.canRemoveTaskView(taskView)) { + return emptyList() + } + return listOf>( + RemoveTaskSystemShortcut( + R.drawable.ic_remove_task_option, + R.string.recent_task_option_remove_task, + container, + taskView, + ) + ) + } + + override fun showForGroupedTask() = true + + override fun showForDesktopTask() = true + } + + private val TASK_VIEW_MENU_OPTIONS: Array = arrayOf(REMOVE_TASK) + } +} diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java index 6fb0f69416f..fa19124f781 100644 --- a/quickstep/src/com/android/quickstep/TaskViewUtils.java +++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java @@ -15,6 +15,7 @@ */ package com.android.quickstep; +import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.view.RemoteAnimationTarget.MODE_CLOSING; import static android.view.RemoteAnimationTarget.MODE_OPENING; import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; @@ -22,6 +23,7 @@ import static com.android.app.animation.Interpolators.LINEAR; import static com.android.app.animation.Interpolators.TOUCH_RESPONSE; import static com.android.app.animation.Interpolators.clampToProgress; +import static com.android.launcher3.Flags.enableDesktopExplodedView; import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y; @@ -37,7 +39,11 @@ import static com.android.launcher3.QuickstepTransitionManager.SPLIT_LAUNCH_DURATION; import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; +import static com.android.quickstep.BaseContainerInterface.getTaskDimension; import static com.android.quickstep.util.AnimUtils.clampToDuration; +import static com.android.wm.shell.shared.TransitionUtil.TYPE_SPLIT_SCREEN_DIM_LAYER; +import static com.android.wm.shell.shared.split.SplitScreenConstants.DEFAULT_OFFSCREEN_DIM; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -47,20 +53,25 @@ import android.content.Context; import android.graphics.Matrix; import android.graphics.Matrix.ScaleToFit; +import android.graphics.PointF; import android.graphics.Rect; import android.graphics.RectF; +import android.util.Log; +import android.util.Pair; import android.view.RemoteAnimationTarget; +import android.view.Surface; import android.view.SurfaceControl; import android.view.View; import android.window.TransitionInfo; +import android.window.WindowAnimationState; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.app.animation.Interpolators; import com.android.internal.jank.Cuj; -import com.android.launcher3.BaseActivity; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; @@ -68,10 +79,12 @@ import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.statehandlers.DepthController; import com.android.launcher3.statemanager.StateManager; -import com.android.launcher3.taskbar.TaskbarUIController; +import com.android.launcher3.statemanager.StatefulContainer; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.util.DisplayController; import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle; import com.android.quickstep.util.MultiValueUpdateListener; +import com.android.quickstep.util.RemoteTargetHandleUtilKt; import com.android.quickstep.util.SurfaceTransaction; import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; import com.android.quickstep.util.SurfaceTransactionApplier; @@ -80,13 +93,14 @@ import com.android.quickstep.views.DesktopTaskView; import com.android.quickstep.views.GroupedTaskView; import com.android.quickstep.views.RecentsView; -import com.android.quickstep.views.TaskThumbnailViewDeprecated; +import com.android.quickstep.views.RecentsViewContainer; import com.android.quickstep.views.TaskView; import com.android.systemui.animation.RemoteAnimationTargetCompat; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.function.Consumer; @@ -97,6 +111,12 @@ public final class TaskViewUtils { private TaskViewUtils() {} + private static final Rect TEMP_THUMBNAIL_BOUNDS = new Rect(); + private static final Rect TEMP_FULLSCREEN_BOUNDS = new Rect(); + private static final PointF TEMP_TASK_DIMENSION = new PointF(); + private static final PointF TEMP_PIVOT = new PointF(); + private static final String TAG = "TaskViewUtils"; + /** * Try to find a TaskView that corresponds with the component of the launched view. * @@ -105,7 +125,7 @@ private TaskViewUtils() {} * opening remote target (which we don't get until onAnimationStart) will resolve to a TaskView. */ public static TaskView findTaskViewToLaunch( - RecentsView recentsView, View v, RemoteAnimationTarget[] targets) { + RecentsView recentsView, View v, RemoteAnimationTarget[] targets) { if (v instanceof TaskView) { TaskView taskView = (TaskView) v; return recentsView.isTaskViewVisible(taskView) ? taskView : null; @@ -118,10 +138,10 @@ public static TaskView findTaskViewToLaunch( ComponentName componentName = itemInfo.getTargetComponent(); int userId = itemInfo.user.getIdentifier(); if (componentName != null) { - for (int i = 0; i < recentsView.getTaskViewCount(); i++) { - TaskView taskView = recentsView.getTaskViewAt(i); - if (recentsView.isTaskViewVisible(taskView)) { - Task.TaskKey key = taskView.getFirstTask().key; + for (TaskView taskView : recentsView.getTaskViews()) { + Task firstTask = taskView.getFirstTask(); + if (firstTask != null && recentsView.isTaskViewVisible(taskView)) { + Task.TaskKey key = firstTask.key; if (componentName.equals(key.getComponent()) && userId == key.userId) { return taskView; } @@ -156,40 +176,88 @@ public static TaskView findTaskViewToLaunch( return taskView; } - public static void createRecentsWindowAnimator( - @NonNull RecentsView recentsView, - @NonNull TaskView v, + public static > + void createRecentsWindowAnimator( + @NonNull RecentsView recentsView, + @NonNull TaskView taskView, boolean skipViewChanges, @NonNull RemoteAnimationTarget[] appTargets, @NonNull RemoteAnimationTarget[] wallpaperTargets, @NonNull RemoteAnimationTarget[] nonAppTargets, @Nullable DepthController depthController, + @Nullable TransitionInfo transitionInfo, + int appearedTaskId, PendingAnimation out) { - boolean isQuickSwitch = v.isEndQuickSwitchCuj(); - v.setEndQuickSwitchCuj(false); + boolean isQuickSwitch = taskView.isEndQuickSwitchCuj(); + taskView.setEndQuickSwitchCuj(false); final RemoteAnimationTargets targets = new RemoteAnimationTargets(appTargets, wallpaperTargets, nonAppTargets, MODE_OPENING); final RemoteAnimationTarget navBarTarget = targets.getNavBarRemoteAnimationTarget(); - SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v); + SurfaceTransactionApplier applier = new SurfaceTransactionApplier(taskView); targets.addReleaseCheck(applier); + Context context = taskView.getContext(); + T container = RecentsViewContainer.containerFromContext(context); + DeviceProfile dp = container.getDeviceProfile(); + RemoteTargetHandle[] remoteTargetHandles; RemoteTargetHandle[] recentsViewHandles = recentsView.getRemoteTargetHandles(); - if (v.isRunningTask() && recentsViewHandles != null) { + if (taskView.isRunningTask() && recentsViewHandles != null) { + // If we have a valid task ID to reorder to front, we need to check if its + // RemoteTargetHandle exists for animations. + if (appearedTaskId != INVALID_TASK_ID && taskView instanceof DesktopTaskView + && enableDesktopExplodedView()) { + // First, get the first (or null) RemoteTargetHandle associated with the ID. + RemoteTargetHandle activatedMinimizedHandle = + RemoteTargetHandleUtilKt.getRemoteTargetHandle( + recentsViewHandles, appearedTaskId); + + // If we don't have a valid RemoteTargetHandle (expected when activating a + // minimized task), make and initialize one. + if (activatedMinimizedHandle == null) { + RemoteTargetGluer gluer = new RemoteTargetGluer(recentsViewHandles); + recentsViewHandles = gluer.insertNewHandlesInFrontAndAssignTargetsForDesktop( + context, + recentsView.getContainerInterface(), + targets, + transitionInfo); + + // Init the new TaskViewSimulator at the front of recentsViewHandles before we + // set the recents rotation to ensure we have the proper orientation. + initTaskViewSimulatorsForRemoteTargetHandles( + List.of(recentsViewHandles[0]), dp, recentsView, taskView, out); + + ((DesktopTaskView) taskView).setRemoteTargetHandles(recentsViewHandles); + } + + RemoteTargetHandle reorderToFrontHandle = + RemoteTargetHandleUtilKt.getRemoteTargetHandle( + recentsViewHandles, appearedTaskId); + if (reorderToFrontHandle != null) { + // The layer swapping is only applied after [createRecentsWindowAnimator] + // starts, which will bring the [remoteTargetHandles] above Recents, therefore + // this call won't affect the base surface in [DepthController]. + reorderToFrontHandle.getTaskViewSimulator().setDrawsAboveOtherApps(true); + } + } + // Re-use existing handles remoteTargetHandles = recentsViewHandles; } else { - boolean forDesktop = v instanceof DesktopTaskView; - RemoteTargetGluer gluer = new RemoteTargetGluer(v.getContext(), - recentsView.getSizeStrategy(), targets, forDesktop); + boolean forDesktop = taskView instanceof DesktopTaskView; + RemoteTargetGluer gluer = new RemoteTargetGluer(taskView.getContext(), + recentsView.getContainerInterface(), targets, forDesktop); if (forDesktop) { - remoteTargetHandles = gluer.assignTargetsForDesktop(targets); - } else if (v.containsMultipleTasks()) { + remoteTargetHandles = gluer.assignTargetsForDesktop(targets, transitionInfo); + if (enableDesktopExplodedView()) { + ((DesktopTaskView) taskView).setRemoteTargetHandles(remoteTargetHandles); + } + } else if (taskView.containsMultipleTasks()) { remoteTargetHandles = gluer.assignTargetsForSplitScreen(targets, - ((GroupedTaskView) v).getSplitBoundsConfig()); + ((GroupedTaskView) taskView).getSplitBoundsConfig()); } else { remoteTargetHandles = gluer.assignTargets(targets); } @@ -203,40 +271,12 @@ public static void createRecentsWindowAnimator( remoteTargetHandle.getTransformParams().setSyncTransactionApplier(applier); } - int taskIndex = recentsView.indexOfChild(v); - Context context = v.getContext(); - BaseActivity baseActivity = BaseActivity.fromContext(context); - DeviceProfile dp = baseActivity.getDeviceProfile(); - boolean showAsGrid = dp.isTablet; - boolean parallaxCenterAndAdjacentTask = - !showAsGrid && taskIndex != recentsView.getCurrentPage(); - int taskRectTranslationPrimary = recentsView.getScrollOffset(taskIndex); - int taskRectTranslationSecondary = showAsGrid ? (int) v.getGridTranslationY() : 0; - RemoteTargetHandle[] topMostSimulators = null; - if (!v.isRunningTask()) { - // TVSs already initialized from the running task, no need to re-init - for (RemoteTargetHandle targetHandle : remoteTargetHandles) { - TaskViewSimulator tvsLocal = targetHandle.getTaskViewSimulator(); - tvsLocal.setDp(dp); - - // RecentsView never updates the display rotation until swipe-up so the value may - // be stale. Use the display value instead. - int displayRotation = DisplayController.INSTANCE.get(context).getInfo().rotation; - tvsLocal.getOrientationState().update(displayRotation, displayRotation); - - tvsLocal.fullScreenProgress.value = 0; - tvsLocal.recentsViewScale.value = 1; - tvsLocal.setIsGridTask(v.isGridTask()); - tvsLocal.getOrientationState().getOrientationHandler().set(tvsLocal, - TaskViewSimulator::setTaskRectTranslation, taskRectTranslationPrimary, - taskRectTranslationSecondary); - - // Fade in the task during the initial 20% of the animation - out.addFloat(targetHandle.getTransformParams(), TransformParams.TARGET_ALPHA, 0, 1, - clampToProgress(LINEAR, 0, 0.2f)); - } + // TVSs already initialized from the running task, no need to re-init + if (!taskView.isRunningTask()) { + initTaskViewSimulatorsForRemoteTargetHandles( + Arrays.asList(remoteTargetHandles), dp, recentsView, taskView, out); } for (RemoteTargetHandle targetHandle : remoteTargetHandles) { @@ -246,8 +286,11 @@ public static void createRecentsWindowAnimator( out.setFloat(tvsLocal.recentsViewScale, AnimatedFloat.VALUE, tvsLocal.getFullScreenScale(), TOUCH_RESPONSE); - out.setFloat(tvsLocal.recentsViewScroll, AnimatedFloat.VALUE, 0, - TOUCH_RESPONSE); + if (!enableGridOnlyOverview()) { + out.setFloat(tvsLocal.recentsViewScroll, AnimatedFloat.VALUE, 0, + TOUCH_RESPONSE); + } + out.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { @@ -257,6 +300,18 @@ public void onAnimationStart(Animator animation) { showTransaction.getTransaction().show(targets.apps[i].leash); } applier.scheduleApply(showTransaction); + + if (enableGridOnlyOverview()) { + taskView.getThumbnailBounds(TEMP_THUMBNAIL_BOUNDS, /*relativeToDragLayer=*/ + true); + getTaskDimension(container.getDeviceProfile(), + TEMP_TASK_DIMENSION); + TEMP_FULLSCREEN_BOUNDS.set(0, 0, (int) TEMP_TASK_DIMENSION.x, + (int) TEMP_TASK_DIMENSION.y); + Utilities.getPivotsForScalingRectToRect(TEMP_THUMBNAIL_BOUNDS, + TEMP_FULLSCREEN_BOUNDS, TEMP_PIVOT); + tvsLocal.setPivotOverride(TEMP_PIVOT); + } } }); out.addOnFrameCallback(() -> { @@ -301,21 +356,16 @@ public void onUpdate(float percent, boolean initOnly) { } } }); - } else { - // There is no transition animation for app launch from recent in live tile mode so - // we have to trigger the navigation bar animation from system here. - final RecentsAnimationController controller = - recentsView.getRecentsAnimationController(); - if (controller != null) { - controller.animateNavigationBarToApp(RECENTS_LAUNCH_DURATION); - } } topMostSimulators = remoteTargetHandles; } + int taskIndex = recentsView.indexOfChild(taskView); + boolean parallaxCenterAndAdjacentTask = + !dp.getDeviceProperties().isTablet() && taskIndex != recentsView.getCurrentPage(); if (!skipViewChanges && parallaxCenterAndAdjacentTask && topMostSimulators != null && topMostSimulators.length > 0) { - out.addFloat(v, VIEW_ALPHA, 1, 0, clampToProgress(LINEAR, 0.2f, 0.4f)); + out.addFloat(taskView, VIEW_ALPHA, 1, 0, clampToProgress(LINEAR, 0.2f, 0.4f)); RemoteTargetHandle[] simulatorCopies = topMostSimulators; for (RemoteTargetHandle handle : simulatorCopies) { @@ -334,7 +384,7 @@ public void onUpdate(float percent, boolean initOnly) { // During animation we apply transformation on the thumbnailView (and not the rootView) // to follow the TaskViewSimulator. So the final matrix applied on the thumbnailView is: // Mt K(0)` K(t) Mt` - TaskThumbnailViewDeprecated[] thumbnails = v.getThumbnailViews(); + View[] thumbnails = taskView.getSnapshotViews(); // In case simulator copies and thumbnail size do no match, ensure we get the lesser. // This ensures we do not create arrays with empty elements or attempt to references @@ -344,7 +394,7 @@ public void onUpdate(float percent, boolean initOnly) { Matrix[] mt = new Matrix[matrixSize]; Matrix[] mti = new Matrix[matrixSize]; for (int i = 0; i < matrixSize; i++) { - TaskThumbnailViewDeprecated ttv = thumbnails[i]; + View ttv = thumbnails[i]; RectF localBounds = new RectF(0, 0, ttv.getWidth(), ttv.getHeight()); float[] tvBoundsMapped = new float[]{0, 0, ttv.getWidth(), ttv.getHeight()}; getDescendantCoordRelativeToAncestor(ttv, ttv.getRootView(), tvBoundsMapped, false); @@ -368,7 +418,7 @@ public void onUpdate(float percent, boolean initOnly) { out.addFloat(ttv, VIEW_TRANSLATE_Y, translationY, translationY / fullScreenScale, TOUCH_RESPONSE); out.addFloat(ttv, VIEW_TRANSLATE_X, translationX, - translationX / fullScreenScale, TOUCH_RESPONSE); + translationX / fullScreenScale, TOUCH_RESPONSE); } Matrix[] k0i = new Matrix[matrixSize]; @@ -391,7 +441,7 @@ public void onUpdate(float percent, boolean initOnly) { out.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - for (TaskThumbnailViewDeprecated ttv : thumbnails) { + for (View ttv : thumbnails) { ttv.setAnimationMatrix(null); } } @@ -401,9 +451,7 @@ public void onAnimationEnd(Animator animation) { out.addListener(new AnimationSuccessListener() { @Override public void onAnimationStart(Animator animation) { - for (RemoteTargetHandle remoteTargetHandle : remoteTargetHandles) { - remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(false); - } + recentsView.setDrawAboveRecents(remoteTargetHandles); } @Override @@ -422,7 +470,8 @@ public void onAnimationEnd(Animator animation) { if (depthController != null) { out.setFloat(depthController.stateDepth, MULTI_PROPERTY_VALUE, - BACKGROUND_APP.getDepth(baseActivity), TOUCH_RESPONSE); + BACKGROUND_APP.getDepth(container), + TOUCH_RESPONSE); } } @@ -434,9 +483,9 @@ public void onAnimationEnd(Animator animation) { * it's a single task or multiple tasks results in different entry-points. */ public static void composeRecentsSplitLaunchAnimator(GroupedTaskView launchingTaskView, - @NonNull StateManager stateManager, @Nullable DepthController depthController, - @NonNull TransitionInfo transitionInfo, SurfaceControl.Transaction t, - @NonNull Runnable finishCallback) { + @NonNull StateManager stateManager, @Nullable DepthController depthController, + @NonNull TransitionInfo transitionInfo, SurfaceControl.Transaction t, + @NonNull Runnable finishCallback) { AnimatorSet animatorSet = new AnimatorSet(); animatorSet.addListener(new AnimatorListenerAdapter() { @Override @@ -456,7 +505,7 @@ public void onAnimationEnd(Animator animation) { final RecentsView recentsView = launchingTaskView.getRecentsView(); composeRecentsLaunchAnimator(animatorSet, launchingTaskView, appTargets, wallpaperTargets, nonAppTargets, /* launcherClosing */ true, stateManager, recentsView, - depthController); + depthController, /* transitionInfo= */ null, /* appearedTaskId= */ INVALID_TASK_ID); t.apply(); animatorSet.start(); @@ -495,7 +544,8 @@ public void onAnimationEnd(Animator animation) { composeRecentsLaunchAnimator(animatorSet, launchingTaskView, appTargets, wallpaperTargets, nonAppTargets, true, stateManager, - recentsView, depthController); + recentsView, depthController, /* transitionInfo= */ null, + /* appearedTaskId= */ INVALID_TASK_ID); animatorSet.start(); return; } @@ -559,12 +609,12 @@ public void onAnimationEnd(Animator animation) { /** * Start recents to desktop animation */ - public static void composeRecentsDesktopLaunchAnimator( - @NonNull DesktopTaskView launchingTaskView, + public static AnimatorSet composeRecentsDesktopLaunchAnimator( + @NonNull TaskView launchingTaskView, @NonNull StateManager stateManager, @Nullable DepthController depthController, - @NonNull TransitionInfo transitionInfo, - SurfaceControl.Transaction t, @NonNull Runnable finishCallback) { - + @NonNull TransitionInfo transitionInfo, SurfaceControl.Transaction t, + @NonNull Runnable finishCallback + ) { AnimatorSet animatorSet = new AnimatorSet(); animatorSet.addListener(new AnimatorListenerAdapter() { @Override @@ -587,23 +637,29 @@ public void onAnimationEnd(Animator animation) { composeRecentsLaunchAnimator(animatorSet, launchingTaskView, apps, wallpaper, nonApps, true /* launcherClosing */, stateManager, launchingTaskView.getRecentsView(), - depthController); + depthController, transitionInfo, /* appearedTaskId= */ INVALID_TASK_ID); - animatorSet.start(); + return animatorSet; } public static void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v, - @NonNull RemoteAnimationTarget[] appTargets, - @NonNull RemoteAnimationTarget[] wallpaperTargets, - @NonNull RemoteAnimationTarget[] nonAppTargets, boolean launcherClosing, - @NonNull StateManager stateManager, @NonNull RecentsView recentsView, - @Nullable DepthController depthController) { + @NonNull RemoteAnimationTarget[] appTargets, + @NonNull RemoteAnimationTarget[] wallpaperTargets, + @NonNull RemoteAnimationTarget[] nonAppTargets, boolean launcherClosing, + @NonNull StateManager stateManager, @NonNull RecentsView recentsView, + @Nullable DepthController depthController, @Nullable TransitionInfo transitionInfo, + int appearedTaskId) { boolean skipLauncherChanges = !launcherClosing; TaskView taskView = findTaskViewToLaunch(recentsView, v, appTargets); + if (taskView == null) { + Log.w(TAG, "composeRecentsLaunchAnimator - no TaskView to launch"); + return; + } PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION); createRecentsWindowAnimator(recentsView, taskView, skipLauncherChanges, appTargets, - wallpaperTargets, nonAppTargets, depthController, pa); + wallpaperTargets, nonAppTargets, depthController, transitionInfo, + appearedTaskId, pa); if (launcherClosing) { // TODO(b/182592057): differentiate between "restore split" vs "launch fullscreen app" TaskViewUtils.createSplitAuxiliarySurfacesAnimator(nonAppTargets, true /*shown*/, @@ -647,7 +703,7 @@ public void onAnimationStart(Animator animation) { // interfere with a rapid swipe up to home in the live tile + running task case. @Override public void onAnimationSuccess(Animator animation) { - recentsView.finishRecentsAnimation(false /* toRecents */, () -> { + recentsView.finishRecentsAnimation(false /* toHome */, () -> { recentsView.post(() -> { stateManager.moveToRestState(); stateManager.reapplyState(); @@ -655,15 +711,17 @@ public void onAnimationSuccess(Animator animation) { // We may have notified launcher is not visible so that taskbar can // stash immediately. Now that the animation is over, we can update // that launcher is still visible. - TaskbarUIController controller = recentsView.getSizeStrategy() - .getTaskbarController(); - if (controller != null) { + TaskbarInteractor interactor = recentsView.getContainerInterface() + .getTaskbarInteractor(); + // If we're launching the desktop tile in Overview, no need to change + // the launcher visibility and taskbar visibility below. + if (interactor != null && !(v instanceof DesktopTaskView)) { boolean launcherVisible = true; for (RemoteAnimationTarget target : appTargets) { launcherVisible &= target.isTranslucent; } if (launcherVisible) { - controller.onLauncherVisibilityChanged(true); + interactor.onLauncherVisibilityChanged(true); } } }); @@ -691,7 +749,7 @@ public void onAnimationEnd(Animator animation) { windowAnimEndListener = new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - recentsView.finishRecentsAnimation(false /* toRecents */, + recentsView.finishRecentsAnimation(false /* toHome */, () -> stateManager.goToState(NORMAL, false)); } }; @@ -723,13 +781,23 @@ public static ValueAnimator createSplitAuxiliarySurfacesAnimator( return null; } + // Since dim layers need to animate to a different alpha, we separate them out here. + List dividerSurfaces = new ArrayList<>(); + List dimLayerSurfaces = new ArrayList<>(); + // For convenience, we also keep a pointer to all the divider + dim layer leashes together. List auxiliarySurfaces = new ArrayList<>(); for (RemoteAnimationTarget target : nonApps) { final SurfaceControl leash = target.leash; - if (target.windowType == TYPE_DOCK_DIVIDER && leash != null && leash.isValid()) { + if (leash != null && leash.isValid()) { + if (target.windowType == TYPE_DOCK_DIVIDER) { + dividerSurfaces.add(leash); + } else if (target.windowType == TYPE_SPLIT_SCREEN_DIM_LAYER) { + dimLayerSurfaces.add(leash); + } auxiliarySurfaces.add(leash); } } + if (auxiliarySurfaces.isEmpty()) { return null; } @@ -748,11 +816,16 @@ public static ValueAnimator createSplitAuxiliarySurfacesAnimator( ValueAnimator dockFadeAnimator = ValueAnimator.ofFloat(0f, 1f); dockFadeAnimator.addUpdateListener(valueAnimator -> { float progress = valueAnimator.getAnimatedFraction(); - for (SurfaceControl leash : auxiliarySurfaces) { + for (SurfaceControl leash : dividerSurfaces) { if (leash != null && leash.isValid()) { t.setAlpha(leash, shown ? progress : 1 - progress); } } + for (SurfaceControl leash : dimLayerSurfaces) { + if (leash != null && leash.isValid()) { + t.setAlpha(leash, (shown ? progress : 1 - progress) * DEFAULT_OFFSCREEN_DIM); + } + } t.apply(); }); dockFadeAnimator.addListener(new AnimatorListenerAdapter() { @@ -785,4 +858,94 @@ public void onAnimationEnd(Animator animation) { animatorHandler.accept(dockFadeAnimator); return dockFadeAnimator; } -} \ No newline at end of file + + /** + * Creates an array of {@link RemoteAnimationTarget}s and a matching array of + * {@link WindowAnimationState}s from the provided handles. + * Important: the ordering of the two arrays is the same, so the state at each index of the + * second applies to the target in the same index of the first. + * + * @param handles The handles wrapping each target. + * @param timestamp The start time of the current frame. + * @param velocityPxPerMs The current velocity of the target animations. + */ + @NonNull + public static Pair extractTargetsAndStates( + @NonNull RemoteTargetHandle[] handles, long timestamp, + @NonNull PointF velocityPxPerMs) { + RemoteAnimationTarget[] targets = new RemoteAnimationTarget[handles.length]; + WindowAnimationState[] animationStates = new WindowAnimationState[handles.length]; + + for (int i = 0; i < handles.length; i++) { + targets[i] = handles[i].getTransformParams().getTargetSet().apps[i]; + + TaskViewSimulator taskViewSimulator = handles[i].getTaskViewSimulator(); + RectF startRect = taskViewSimulator.getCurrentRect(); + float cornerRadius = taskViewSimulator.getCurrentCornerRadius(); + + WindowAnimationState state = new WindowAnimationState(); + state.timestamp = timestamp; + state.bounds = new RectF( + startRect.left, startRect.top, startRect.right, startRect.bottom); + state.topLeftRadius = cornerRadius; + state.topRightRadius = cornerRadius; + state.bottomRightRadius = cornerRadius; + state.bottomLeftRadius = cornerRadius; + state.velocityPxPerMs = velocityPxPerMs; + + animationStates[i] = state; + } + + return new Pair<>(targets, animationStates); + } + + private static void initTaskViewSimulatorsForRemoteTargetHandles( + List handleList, + DeviceProfile deviceProfile, + RecentsView recentsView, + TaskView taskView, + PendingAnimation out) { + // RecentsView never updates the display rotation until swipe-up so the value may + // be stale. Use the display value instead. + int displayId = taskView.getDisplayId(); + DisplayController.Info infoForDisplay = + DisplayController.INSTANCE.get(taskView.getContext()).getInfoForDisplay(displayId); + final int displayRotation; + if (infoForDisplay != null) { + displayRotation = infoForDisplay.rotation; + } else { + // Fallback to portrait orientation if we don't have info for the display. + // This should never happen - we get displayId from the taskView being launched. + Log.e(TAG, "Could not get info for displayId " + displayId, new Exception()); + displayRotation = Surface.ROTATION_0; + } + int scrollOffset = recentsView.getScrollOffset( + recentsView.indexOfChild(taskView)); + int gridTranslationY = deviceProfile.getDeviceProperties().isTablet() + ? (int) taskView.getGridTranslationY() : 0; + + for (RemoteTargetHandle handle : handleList) { + TaskViewSimulator tvsLocal = handle.getTaskViewSimulator(); + tvsLocal.setDp(deviceProfile); + + tvsLocal.getOrientationState().update(displayRotation, displayRotation); + tvsLocal.calculateTaskSize(); + + tvsLocal.fullScreenProgress.value = 0; + tvsLocal.recentsViewScale.value = 1; + if (!enableGridOnlyOverview()) { + tvsLocal.setIsGridTask(taskView.isGridTask()); + } + tvsLocal.recentsViewScroll.value = scrollOffset; + tvsLocal.taskSecondaryTranslation.value = gridTranslationY; + + if (taskView instanceof DesktopTaskView) { + handle.getTransformParams().setTargetAlpha(1f); + } else { + // Fade in the task during the initial 20% of the animation + out.addFloat(handle.getTransformParams(), TransformParams.TARGET_ALPHA, 0, + 1, clampToProgress(LINEAR, 0, 0.2f)); + } + } + } +} diff --git a/quickstep/src/com/android/quickstep/TopTaskTracker.java b/quickstep/src/com/android/quickstep/TopTaskTracker.java index f04ef97f160..31853e39501 100644 --- a/quickstep/src/com/android/quickstep/TopTaskTracker.java +++ b/quickstep/src/com/android/quickstep/TopTaskTracker.java @@ -19,109 +19,187 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; +import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.content.Intent.ACTION_CHOOSER; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.Display.INVALID_DISPLAY; +import static com.android.quickstep.window.RecentsWindowFlags.enableOverviewOnConnectedDisplays; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; +import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_A; +import static com.android.wm.shell.Flags.enableShellTopTaskTracking; +import static com.android.wm.shell.Flags.enableFlexibleSplit; +import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_DESK; +import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_SPLIT; +import static com.android.launcher3.statehandlers.DesktopVisibilityController.INACTIVE_DESK_ID; +import static com.android.wm.shell.shared.desktopmode.DesktopModeStatus.canEnterDesktopMode; +import static com.android.wm.shell.shared.desktopmode.DesktopModeStatus.enableMultipleDesktops; -import android.annotation.UserIdInt; import android.app.ActivityManager.RunningTaskInfo; +import android.app.TaskInfo; +import android.app.WindowConfiguration; import android.content.Context; +import android.util.ArrayMap; +import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; -import com.android.launcher3.util.MainThreadInitializedObject; -import com.android.launcher3.util.SafeCloseable; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.statehandlers.DesktopVisibilityController; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitStageInfo; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; import com.android.launcher3.util.SplitConfigurationOptions.StageType; import com.android.launcher3.util.TraceHelper; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskKey; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; +import com.android.quickstep.util.DesksUtils; +import com.android.quickstep.util.ExternalDisplaysKt; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; +import com.android.wm.shell.shared.GroupedTaskInfo; import com.android.wm.shell.splitscreen.ISplitScreenListener; -import java.util.ArrayList; +import java.io.PrintWriter; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.stream.Stream; import java.util.stream.Collectors; +import javax.inject.Inject; + +import kotlin.collections.CollectionsKt; + import app.lawnchair.compat.LawnchairQuickstepCompat; /** * This class tracked the top-most task and some 'approximate' task history to allow faster * system state estimation during touch interaction */ -public class TopTaskTracker extends ISplitScreenListener.Stub - implements TaskStackChangeListener, SafeCloseable { - - public static MainThreadInitializedObject INSTANCE = - new MainThreadInitializedObject<>(TopTaskTracker::new); +@LauncherAppSingleton +public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskStackChangeListener { + private static final String TAG = "TopTaskTracker"; + public static DaggerSingletonObject INSTANCE = + new DaggerSingletonObject<>(QuickstepBaseAppComponent::getTopTaskTracker); - private static final int HISTORY_SIZE = 5; + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + static final int HISTORY_SIZE = 5; + // Only used when Flags.enableShellTopTaskTracking() is disabled // Ordered list with first item being the most recent task. - private final LinkedList mOrderedTaskList = new LinkedList<>(); - - private final Context mContext; + private final LinkedList mOrderedTaskList = new LinkedList<>(); private final SplitStageInfo mMainStagePosition = new SplitStageInfo(); private final SplitStageInfo mSideStagePosition = new SplitStageInfo(); private int mPinnedTaskId = INVALID_TASK_ID; - private TopTaskTracker(Context context) { - mContext = context; - mMainStagePosition.stageType = SplitConfigurationOptions.STAGE_TYPE_MAIN; - mSideStagePosition.stageType = SplitConfigurationOptions.STAGE_TYPE_SIDE; + // Only used when Flags.enableShellTopTaskTracking() is enabled + // Mapping of display id to visible tasks. Visible tasks are ordered from top most to bottom + // most. + private ArrayMap mVisibleTasks = new ArrayMap<>(); - TaskStackChangeListeners.getInstance().registerTaskStackListener(this); - SystemUiProxy.INSTANCE.get(context).registerSplitScreenListener(this); - } + private final Context mContext; + private final DesktopVisibilityController mDesktopVisibilityController; - @Override - public void close() { - TaskStackChangeListeners.getInstance().unregisterTaskStackListener(this); - SystemUiProxy.INSTANCE.get(mContext).unregisterSplitScreenListener(this); + @Inject + public TopTaskTracker(@ApplicationContext Context context, DaggerSingletonTracker tracker, + SystemUiProxy systemUiProxy, DesktopVisibilityController desktopVisibilityController) { + if (!enableShellTopTaskTracking()) { + mMainStagePosition.stageType = SplitConfigurationOptions.STAGE_TYPE_MAIN; + mSideStagePosition.stageType = SplitConfigurationOptions.STAGE_TYPE_SIDE; + + TaskStackChangeListeners.getInstance().registerTaskStackListener(this); + systemUiProxy.registerSplitScreenListener(this); + } + + tracker.addCloseable(() -> { + if (enableShellTopTaskTracking()) { + return; + } + + TaskStackChangeListeners.getInstance().unregisterTaskStackListener(this); + systemUiProxy.unregisterSplitScreenListener(this); + }); + + mContext = context; + mDesktopVisibilityController = desktopVisibilityController; } @Override public void onTaskRemoved(int taskId) { + if (enableShellTopTaskTracking()) { + return; + } + mOrderedTaskList.removeIf(rto -> rto.taskId == taskId); } @Override public void onTaskMovedToFront(RunningTaskInfo taskInfo) { + handleTaskMovedToFront(taskInfo); + } + + void handleTaskMovedToFront(TaskInfo taskInfo) { + if (enableShellTopTaskTracking()) { + return; + } + mOrderedTaskList.removeIf(rto -> rto.taskId == taskInfo.taskId); mOrderedTaskList.addFirst(taskInfo); - // Keep the home display's top running task in the first while adding a non-home - // display's task to the list, to avoid showing non-home display's task upon going to - // Recents animation. - if (taskInfo.displayId != DEFAULT_DISPLAY) { - final RunningTaskInfo topTaskOnHomeDisplay = mOrderedTaskList.stream() - .filter(rto -> rto.displayId == DEFAULT_DISPLAY).findFirst().orElse(null); - if (topTaskOnHomeDisplay != null) { - mOrderedTaskList.removeIf(rto -> rto.taskId == topTaskOnHomeDisplay.taskId); - mOrderedTaskList.addFirst(topTaskOnHomeDisplay); + // Workaround for b/372067617, b/390564114, if the home task or any fullscreen occluding + // task is brought to front, then mark other tasks behind as not-visible + if (taskInfo.getActivityType() == ACTIVITY_TYPE_HOME + || (taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN + && !taskInfo.isActivityStackTransparent)) { + // We've moved the task to the front of the list above, so only iterate the tasks after + for (int i = 1; i < mOrderedTaskList.size(); i++) { + final TaskInfo info = mOrderedTaskList.get(i); + if (info.displayId != taskInfo.displayId) { + // Only fall through to reset visibility for tasks on the same display as the + // home task being brought forward + continue; + } + info.isVisible = false; + info.isVisibleRequested = false; + } + } + + if (!enableOverviewOnConnectedDisplays()) { + // Keep the home display's top running task in the first while adding a non-home + // display's task to the list, to avoid showing non-home display's task upon going to + // Recents animation. + if (taskInfo.displayId != DEFAULT_DISPLAY) { + final TaskInfo topTaskOnHomeDisplay = mOrderedTaskList.stream() + .filter(rto -> rto.displayId == DEFAULT_DISPLAY).findFirst().orElse(null); + if (topTaskOnHomeDisplay != null) { + mOrderedTaskList.removeIf(rto -> rto.taskId == topTaskOnHomeDisplay.taskId); + mOrderedTaskList.addFirst(topTaskOnHomeDisplay); + } } } - if (mOrderedTaskList.size() >= HISTORY_SIZE) { + if (CollectionsKt.count(mOrderedTaskList, + task -> task.getWindowingMode() != WINDOWING_MODE_FREEFORM) + > HISTORY_SIZE) { // If we grow in size, remove the last taskInfo which is not part of the split task. - Iterator itr = mOrderedTaskList.descendingIterator(); + Iterator itr = mOrderedTaskList.descendingIterator(); while (itr.hasNext()) { - RunningTaskInfo info = itr.next(); + TaskInfo info = itr.next(); if (info.taskId != taskInfo.taskId && info.taskId != mMainStagePosition.taskId - && info.taskId != mSideStagePosition.taskId) { + && info.taskId != mSideStagePosition.taskId + && info.getWindowingMode() != WINDOWING_MODE_FREEFORM) { itr.remove(); return; } @@ -129,8 +207,38 @@ public void onTaskMovedToFront(RunningTaskInfo taskInfo) { } } + /** + * Called when the set of visible tasks have changed. + */ + public void onVisibleTasksChanged(GroupedTaskInfo[] visibleTasks) { + if (!enableShellTopTaskTracking()) { + return; + } + + // Clear existing tasks for each display + mVisibleTasks.clear(); + + // Update the visible tasks on each display + Log.d(TAG, "onVisibleTasksChanged:"); + for (GroupedTaskInfo groupedTask : visibleTasks) { + Log.d(TAG, "\t" + groupedTask); + GroupedTaskInfo baseGroupedTask = groupedTask.getBaseGroupedTask(); + int displayId; + if (enableMultipleDesktops(mContext) && baseGroupedTask.isBaseType(TYPE_DESK)) { + displayId = baseGroupedTask.getDeskDisplayId(); + } else { + displayId = baseGroupedTask.getTaskInfo1().getDisplayId(); + } + mVisibleTasks.put(displayId, groupedTask); + } + } + @Override public void onStagePositionChanged(@StageType int stage, @StagePosition int position) { + if (enableShellTopTaskTracking()) { + return; + } + if (stage == SplitConfigurationOptions.STAGE_TYPE_MAIN) { mMainStagePosition.stagePosition = position; } else { @@ -138,8 +246,25 @@ public void onStagePositionChanged(@StageType int stage, @StagePosition int posi } } + public void onTaskChanged(RunningTaskInfo taskInfo) { + if (enableShellTopTaskTracking()) { + return; + } + + for (int i = 0; i < mOrderedTaskList.size(); i++) { + if (mOrderedTaskList.get(i).taskId == taskInfo.taskId) { + mOrderedTaskList.set(i, taskInfo); + break; + } + } + } + @Override public void onTaskStageChanged(int taskId, @StageType int stage, boolean visible) { + if (enableShellTopTaskTracking()) { + return; + } + // If a task is not visible anymore or has been moved to undefined, stop tracking it. if (!visible || stage == SplitConfigurationOptions.STAGE_TYPE_UNDEFINED) { if (mMainStagePosition.taskId == taskId) { @@ -150,7 +275,8 @@ public void onTaskStageChanged(int taskId, @StageType int stage, boolean visible return; } - if (stage == SplitConfigurationOptions.STAGE_TYPE_MAIN) { + if (stage == SplitConfigurationOptions.STAGE_TYPE_MAIN + || (enableFlexibleSplit() && stage == STAGE_TYPE_A)) { mMainStagePosition.taskId = taskId; } else { mSideStagePosition.taskId = taskId; @@ -159,60 +285,150 @@ public void onTaskStageChanged(int taskId, @StageType int stage, boolean visible @Override public void onActivityPinned(String packageName, int userId, int taskId, int stackId) { + if (enableShellTopTaskTracking()) { + return; + } + mPinnedTaskId = taskId; } @Override public void onActivityUnpinned() { + if (enableShellTopTaskTracking()) { + return; + } + mPinnedTaskId = INVALID_TASK_ID; } /** - * @return index 0 will be task in left/top position, index 1 in right/bottom position. - * Will return empty array if device is not in staged split + * Return the running split task ids. Index 0 will be task in left/top position, index 1 in + * right/bottom position, or and empty array if device is not in splitscreen. */ public int[] getRunningSplitTaskIds() { - if (mMainStagePosition.taskId == INVALID_TASK_ID - || mSideStagePosition.taskId == INVALID_TASK_ID) { - return new int[]{}; - } - int[] out = new int[2]; - if (mMainStagePosition.stagePosition == STAGE_POSITION_TOP_OR_LEFT) { - out[0] = mMainStagePosition.taskId; - out[1] = mSideStagePosition.taskId; + if (enableShellTopTaskTracking()) { + // TODO(346588978): This assumes default display as splitscreen is only currently there + final GroupedTaskInfo visibleTasks = mVisibleTasks.get(DEFAULT_DISPLAY); + final GroupedTaskInfo splitTaskInfo = + visibleTasks != null && visibleTasks.isBaseType(TYPE_SPLIT) + ? visibleTasks.getBaseGroupedTask() + : null; + if (splitTaskInfo != null && splitTaskInfo.getSplitBounds() != null) { + return new int[] { + splitTaskInfo.getSplitBounds().leftTopTaskId, + splitTaskInfo.getSplitBounds().rightBottomTaskId + }; + } + return new int[0]; } else { - out[1] = mMainStagePosition.taskId; - out[0] = mSideStagePosition.taskId; + if (mMainStagePosition.taskId == INVALID_TASK_ID + || mSideStagePosition.taskId == INVALID_TASK_ID) { + return new int[]{}; + } + int[] out = new int[2]; + if (mMainStagePosition.stagePosition == STAGE_POSITION_TOP_OR_LEFT) { + out[0] = mMainStagePosition.taskId; + out[1] = mSideStagePosition.taskId; + } else { + out[1] = mMainStagePosition.taskId; + out[0] = mSideStagePosition.taskId; + } + return out; } - return out; } + /** + * Dumps the list of tasks in top task tracker. + */ + public void dump(PrintWriter pw) { + if (!enableShellTopTaskTracking()) { + return; + } + + pw.println("TopTaskTracker:"); + mVisibleTasks.forEach((displayId, tasks) -> + pw.println(" visibleTasks(" + displayId + "): " + tasks)); + } /** * Returns the CachedTaskInfo for the top most task */ @NonNull @UiThread - public CachedTaskInfo getCachedTopTask(boolean filterOnlyVisibleRecents) { - if (filterOnlyVisibleRecents) { - // Since we only know about the top most task, any filtering may not be applied on the - // cache. The second to top task may change while the top task is still the same. - RunningTaskInfo[] tasks = TraceHelper.allowIpcs("getCachedTopTask.true", () -> - ActivityManagerWrapper.getInstance().getRunningTasks(true)); - return new CachedTaskInfo(Arrays.asList(tasks)); - } - - if (mOrderedTaskList.isEmpty()) { - RunningTaskInfo[] tasks = TraceHelper.allowIpcs("getCachedTopTask.false", () -> - ActivityManagerWrapper.getInstance().getRunningTasks( - false /* filterOnlyVisibleRecents */)); - Collections.addAll(mOrderedTaskList, tasks); - } - - // Strip the pinned task - ArrayList tasks = new ArrayList<>(mOrderedTaskList); - tasks.removeIf(t -> t.taskId == mPinnedTaskId); - return new CachedTaskInfo(tasks); + public CachedTaskInfo getCachedTopTask(boolean filterOnlyVisibleRecents, int displayId) { + if (enableShellTopTaskTracking()) { + // TODO(346588978): Currently ignore filterOnlyVisibleRecents, but perhaps make this an + // explicit filter For things to ignore (ie. PIP/Bubbles/Assistant/etc/so that this is + // explicit) + return new CachedTaskInfo(mVisibleTasks.get(displayId)); + } else { + int activeDeskId = mDesktopVisibilityController.getActiveDeskId(displayId); + if (filterOnlyVisibleRecents) { + // Since we only know about the top most task, any filtering may not be applied on + // the cache. The second to top task may change while the top task is still the + // same. + TaskInfo[] tasks = TraceHelper.allowIpcs("getCachedTopTask.true", () -> + ActivityManagerWrapper.getInstance().getRunningTasks(true)); + + // `tasks` ends up as null in launcher robo tests, so fixing the symptom here for + // now instead of introducing a mock / stub. + // TODO: b/441128304 - Fix this through changes in non-prod code. + if (tasks == null) { + tasks = new TaskInfo[0]; + } + + if (enableOverviewOnConnectedDisplays()) { + return new CachedTaskInfo(Arrays.stream(tasks).filter( + info -> ExternalDisplaysKt.getSafeDisplayId(info) + == displayId).toList(), mContext, displayId, activeDeskId); + } else { + return new CachedTaskInfo(Arrays.asList(tasks), mContext, + displayId, activeDeskId); + } + } + + if (mOrderedTaskList.isEmpty()) { + RunningTaskInfo[] tasks = TraceHelper.allowIpcs("getCachedTopTask.false", () -> + ActivityManagerWrapper.getInstance().getRunningTasks( + false /* filterOnlyVisibleRecents */)); + Collections.addAll(mOrderedTaskList, tasks); + } + + Stream taskStream = mOrderedTaskList.stream() + // Strip the pinned task and recents task. + .filter(t -> t.taskId != mPinnedTaskId && !isRecentsTask(t)); + if (enableOverviewOnConnectedDisplays()) { + taskStream = taskStream.filter( + info -> ExternalDisplaysKt.getSafeDisplayId(info) == displayId); + } + if (enableMultipleDesktops(mContext)) { + taskStream = taskStream.takeWhile( + taskInfo -> !DesksUtils.isDesktopWallpaperTask(taskInfo)); + } else { + taskStream = taskStream.filter( + taskInfo -> !DesksUtils.isDesktopWallpaperTask(taskInfo)); + } + taskStream = taskStream.filter(taskInfo -> !isBubbleTask(taskInfo)); + + return new CachedTaskInfo(taskStream.toList(), mContext, displayId, activeDeskId); + } + } + + private static boolean isHomeTask(TaskInfo task) { + return task != null && task.configuration.windowConfiguration + .getActivityType() == ACTIVITY_TYPE_HOME; + } + + private static boolean isRecentsTask(TaskInfo task) { + return task != null && task.configuration.windowConfiguration + .getActivityType() == ACTIVITY_TYPE_RECENTS; + } + + private static boolean isBubbleTask(TaskInfo task) { + if (task == null) return false; + if (task.isAppBubble) return true; + return task.getWindowingMode() == WINDOWING_MODE_MULTI_WINDOW + && task.configuration.windowConfiguration.isAlwaysOnTop(); } /** @@ -220,111 +436,231 @@ public CachedTaskInfo getCachedTopTask(boolean filterOnlyVisibleRecents) { * during the lifecycle of the task. */ public static class CachedTaskInfo { + // Only used when enableShellTopTaskTracking() is disabled. + private int mDisplayId = INVALID_DISPLAY; + // Only used when enableShellTopTaskTracking() is disabled + @Nullable + private final TaskInfo mTopTask; + @Nullable + public final List mAllCachedTasks; + // Only used when enableShellTopTaskTracking() is enabled @Nullable - private final RunningTaskInfo mTopTask; - public final List mAllCachedTasks; + private final GroupedTaskInfo mVisibleTasks; + + private Context mContext; + private final int mActiveDeskId; - CachedTaskInfo(List allCachedTasks) { + // Only used when enableShellTopTaskTracking() is enabled + CachedTaskInfo(@Nullable GroupedTaskInfo visibleTasks) { + mAllCachedTasks = null; + mTopTask = null; + mVisibleTasks = visibleTasks; + mActiveDeskId = INACTIVE_DESK_ID; + } + + // Only used when enableShellTopTaskTracking() is disabled + CachedTaskInfo(@NonNull List allCachedTasks, Context context, + int displayId, int activeDeskId) { + mDisplayId = displayId; + mVisibleTasks = null; mAllCachedTasks = allCachedTasks; mTopTask = allCachedTasks.isEmpty() ? null : allCachedTasks.get(0); + mContext = context; + mActiveDeskId = activeDeskId; } + /** + * Returns the "base" task that is used the as the representative running task of the set + * of tasks initially provided. + * + * Not for general use, as in other windowing modes (ie. split/desktop) the caller should + * not make assumptions about there being a single base task. + * TODO(346588978): Try to remove all usage of this if possible + */ + @Nullable + public TaskInfo getLegacyBaseTask() { + if (enableShellTopTaskTracking()) { + return mVisibleTasks != null + ? mVisibleTasks.getBaseGroupedTask().getTaskInfo1() + : null; + } else { + return mTopTask; + } + } + + /** + * Returns the top task id. + */ public int getTaskId() { - return mTopTask == null ? INVALID_TASK_ID : mTopTask.taskId; + if (enableShellTopTaskTracking()) { + // Callers should use topGroupedTaskContainsTask() instead + return INVALID_TASK_ID; + } else { + return mTopTask != null ? mTopTask.taskId : INVALID_TASK_ID; + } } /** - * Returns true if the root of the task chooser activity + * Returns the top grouped task ids if Flags.enableShellTopTaskTracking() is true, otherwise + * an empty array. */ - public boolean isRootChooseActivity() { - return mTopTask != null && ACTION_CHOOSER.equals(mTopTask.baseIntent.getAction()); + public int[] topGroupedTaskIds() { + if (enableShellTopTaskTracking()) { + if (mVisibleTasks == null) { + return new int[0]; + } + List groupedTasks = mVisibleTasks.getTaskInfoList(); + return groupedTasks.stream().mapToInt( + groupedTask -> groupedTask.taskId).toArray(); + } else { + // Not used + return new int[0]; + } } /** - * If the given task holds an activity that is excluded from recents, and there - * is another running task that is not excluded from recents, returns that underlying task. + * Returns whether the top grouped task contains the given {@param taskId} if + * Flags.enableShellTopTaskTracking() is true, otherwise it checks the top task as reported + * from TaskStackListener. */ - public @Nullable CachedTaskInfo getVisibleNonExcludedTask() { - if (mTopTask == null - || (mTopTask.baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) == 0) { - // Not an excluded task. - return null; + public boolean topGroupedTaskContainsTask(int taskId) { + if (enableShellTopTaskTracking()) { + return mVisibleTasks != null && mVisibleTasks.containsTask(taskId); + } else { + return mTopTask != null && mTopTask.taskId == taskId; } - List visibleNonExcludedTasks = mAllCachedTasks.stream() - .filter(t -> LawnchairQuickstepCompat.ATLEAST_S && t.isVisible - && (t.baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) == 0 - && t.getActivityType() != ACTIVITY_TYPE_HOME - && t.getActivityType() != ACTIVITY_TYPE_RECENTS) - .collect(Collectors.toList()); - return visibleNonExcludedTasks.isEmpty() ? null - : new CachedTaskInfo(visibleNonExcludedTasks); } /** - * Returns true if this represents the HOME task + * Returns true if this represents the task chooser activity */ - public boolean isHomeTask() { - return mTopTask != null && mTopTask.configuration.windowConfiguration - .getActivityType() == ACTIVITY_TYPE_HOME; + public boolean isRootChooseActivity() { + final TaskInfo baseTask = getLegacyBaseTask(); + return baseTask != null && ACTION_CHOOSER.equals(baseTask.baseIntent.getAction()); } - public boolean isRecentsTask() { - return mTopTask != null && mTopTask.configuration.windowConfiguration - .getActivityType() == ACTIVITY_TYPE_RECENTS; + /** + * Returns true if this represents the HOME activity type task + */ + public boolean isHomeTask() { + final TaskInfo baseTask = getLegacyBaseTask(); + return baseTask != null && TopTaskTracker.isHomeTask(baseTask); } /** - * Returns {@code true} if this task windowing mode is set to {@link - * android.app.WindowConfiguration#WINDOWING_MODE_FREEFORM} + * Returns true if this represents the RECENTS activity type task */ - public boolean isFreeformTask() { - return mTopTask != null && mTopTask.configuration.windowConfiguration.getWindowingMode() - == WINDOWING_MODE_FREEFORM; + public boolean isRecentsTask() { + final TaskInfo baseTask = getLegacyBaseTask(); + return baseTask != null && TopTaskTracker.isRecentsTask(baseTask); } /** - * Returns {@link Task} array which can be used as a placeholder until the true object - * is loaded by the model + * If the given task holds an activity that is excluded from recents, and there + * is another running task that is not excluded from recents, returns that underlying task. */ - public Task[] getPlaceholderTasks() { - return mTopTask == null ? new Task[0] - : new Task[]{Task.from(new TaskKey(mTopTask), mTopTask, false)}; + public @Nullable CachedTaskInfo getVisibleNonExcludedTask() { + if (enableShellTopTaskTracking()) { + // Callers should not need this when the full set of visible tasks are provided + return null; + } + if (mTopTask == null + || (mTopTask.baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) == 0) { + // Not an excluded task. + return null; + } + List visibleNonExcludedTasks = mAllCachedTasks.stream() + .filter(t -> LawnchairQuickstepCompat.ATLEAST_S && t.isVisible + && (t.baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) == 0 + && t.getActivityType() != ACTIVITY_TYPE_HOME + && t.getActivityType() != ACTIVITY_TYPE_RECENTS) + .toList(); + return visibleNonExcludedTasks.isEmpty() ? null + : new CachedTaskInfo(visibleNonExcludedTasks, mContext, mDisplayId, + mActiveDeskId); } /** - * Returns {@link Task} array corresponding to the provided task ids which can be used as a - * placeholder until the true object is loaded by the model + * Returns {@link TaskInfo} array corresponding to the provided task ids which can be + * used as a placeholder until the true object is loaded by the model. Only used when + * enableShellTopTaskTracking() is disabled. */ - public Task[] getPlaceholderTasks(int[] taskIds) { + private TaskInfo[] getSplitPlaceholderTasksInfo(int[] splitTaskIds) { if (mTopTask == null) { - return new Task[0]; + return new TaskInfo[0]; } - Task[] result = new Task[taskIds.length]; - for (int i = 0; i < taskIds.length; i++) { + TaskInfo[] result = new TaskInfo[splitTaskIds.length]; + for (int i = 0; i < splitTaskIds.length; i++) { final int index = i; - int taskId = taskIds[i]; + int taskId = splitTaskIds[i]; mAllCachedTasks.forEach(rti -> { if (rti.taskId == taskId) { - result[index] = Task.from(new TaskKey(rti), rti, false); + result[index] = rti; } }); } return result; } - @UserIdInt - @Nullable - public Integer getUserId() { - return mTopTask == null ? null : mTopTask.userId; + private boolean isDesktopTask(@Nullable TaskInfo taskInfo) { + return taskInfo != null && canEnterDesktopMode(mContext) + && taskInfo.configuration.windowConfiguration.getWindowingMode() + == WindowConfiguration.WINDOWING_MODE_FREEFORM; + } + + // TODO(346588978): Update this to return more than a single task once the callers + // are refactored. + /** + * Returns a {@link GroupedTaskInfo} which can be used as a placeholder until the true + * object is loaded by the model. + * + * @param splitTaskIds provide if it is for split, which represents the task ids of the + * paired tasks. Otherwise, provide null. + */ + public @Nullable GroupedTaskInfo getPlaceholderGroupedTaskInfo( + @Nullable int[] splitTaskIds) { + if (enableShellTopTaskTracking()) { + if (mVisibleTasks == null) { + return null; + } + return mVisibleTasks.getBaseGroupedTask(); + } else { + if (splitTaskIds != null && splitTaskIds.length >= 2) { + TaskInfo[] splitTasksInfo = getSplitPlaceholderTasksInfo(splitTaskIds); + if (splitTasksInfo[0] == null || splitTasksInfo[1] == null) { + return null; + } + return GroupedTaskInfo.forSplitTasks(splitTasksInfo[0], + splitTasksInfo[1], /* splitBounds = */ null); + } else { + final TaskInfo baseTaskInfo = getLegacyBaseTask(); + if (enableMultipleDesktops(mContext)) { + if (mActiveDeskId != INACTIVE_DESK_ID) { + return GroupedTaskInfo.forDeskTasks( + mActiveDeskId, mDisplayId, mAllCachedTasks, + /* minimizedFreeformTaskIds = */ Collections.emptySet()); + } + } else if (isDesktopTask(baseTaskInfo)) { + return GroupedTaskInfo.forDeskTasks(INACTIVE_DESK_ID, mDisplayId, + Collections.singletonList( + baseTaskInfo), /* minimizedFreeformTaskIds = */ + Collections.emptySet()); + } + return baseTaskInfo == null + ? null + : GroupedTaskInfo.forFullscreenTasks(baseTaskInfo); + } + } } @Nullable public String getPackageName() { - if (mTopTask == null || mTopTask.baseActivity == null) { + final TaskInfo baseTask = getLegacyBaseTask(); + if (baseTask == null || baseTask.baseActivity == null) { return null; } - return mTopTask.baseActivity.getPackageName(); + return baseTask.baseActivity.getPackageName(); } } -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 1485172f4c4..1cebd811f9d 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -15,7 +15,8 @@ */ package com.android.quickstep; -import static android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS; +import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; +import static android.view.Display.DEFAULT_DISPLAY; import static android.view.MotionEvent.ACTION_CANCEL; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_MOVE; @@ -23,14 +24,15 @@ import static android.view.MotionEvent.ACTION_POINTER_UP; import static android.view.MotionEvent.ACTION_UP; -import static com.android.launcher3.Flags.enableCursorHoverStates; -import static com.android.launcher3.Flags.enableHandleDelayedGestureCallbacks; -import static com.android.launcher3.Flags.useActivityOverlay; -import static com.android.launcher3.Launcher.INTENT_ACTION_ALL_APPS_TOGGLE; +import static com.android.launcher3.Flags.enableMetaTabToggleInOverview; +import static com.android.launcher3.Flags.enableTaskbarForDirectBoot; import static com.android.launcher3.LauncherPrefs.backedUpItem; import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent; import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe; -import static com.android.launcher3.config.FeatureFlags.ENABLE_TRACKPAD_GESTURE; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsOnConnectedDisplays; +import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAutoStashConnectedDisplayTaskbar; +import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE; +import static com.android.launcher3.util.DisplayController.CHANGE_NIGHT_MODE; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_SEEN; @@ -38,46 +40,34 @@ import static com.android.quickstep.GestureState.DEFAULT_STATE; import static com.android.quickstep.GestureState.TrackpadGestureType.getTrackpadGestureType; import static com.android.quickstep.InputConsumer.TYPE_CURSOR_HOVER; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_DOWN; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_MOVE; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_UP; -import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.RECENTS_ANIMATION_START_PENDING; +import static com.android.quickstep.InputConsumer.createNoOpInputConsumer; +import static com.android.quickstep.InputConsumerUtils.newConsumer; +import static com.android.quickstep.InputConsumerUtils.tryCreateAssistantInputConsumer; +import static com.android.quickstep.RecentsAnimationDeviceState.RESET_TO_DEFAULT_GESTURAL_HEIGHT; +import static com.android.quickstep.window.RecentsWindowFlags.enableOverviewOnConnectedDisplays; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; -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.wm.shell.Flags.enableBubblesLongPressNavHandle; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BACK_ANIMATION; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BUBBLES; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_DESKTOP_MODE; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_DRAG_AND_DROP; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_ONE_HANDED; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_PIP; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_RECENT_TASKS; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_SHELL_TRANSITIONS; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_SPLIT_SCREEN; -import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_STARTING_WINDOW; - -import android.app.PendingIntent; + +import android.app.ActivityManager; import android.app.Service; -import android.content.IIntentReceiver; -import android.content.IIntentSender; +import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.graphics.Region; -import android.hardware.input.InputManager; import android.os.Bundle; import android.os.IBinder; +import android.os.IRemoteCallback; import android.os.Looper; +import android.os.RemoteException; import android.os.SystemClock; -import android.os.Trace; -import android.util.ArraySet; import android.util.Log; +import android.util.SparseArray; import android.view.Choreographer; +import android.view.Display; import android.view.InputDevice; import android.view.InputEvent; import android.view.MotionEvent; +import android.window.DesktopExperienceFlags; +import android.window.DesktopExperienceFlags.DesktopExperienceFlag; import androidx.annotation.BinderThread; import androidx.annotation.NonNull; @@ -85,53 +75,64 @@ import androidx.annotation.UiThread; import androidx.annotation.VisibleForTesting; -import com.android.launcher3.BaseDraggingActivity; +import com.android.app.displaylib.DisplayRepository; +import com.android.app.displaylib.DisplaysWithDecorationsRepositoryCompat; +import com.android.app.displaylib.PerDisplayRepository; import com.android.launcher3.ConstantItem; import com.android.launcher3.EncryptionType; +import com.android.launcher3.Flags; +import com.android.launcher3.Launcher; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.anim.AnimatedFloat; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.provider.RestoreDbTask; +import com.android.launcher3.dagger.LauncherComponentProvider; +import com.android.launcher3.desktop.DesktopAppLaunchTransitionManager; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.StatefulActivity; import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarManager; +import com.android.launcher3.taskbar.TaskbarManagerImpl; +import com.android.launcher3.taskbar.TaskbarManagerImplWrapper; import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks; import com.android.launcher3.taskbar.bubbles.BubbleControllers; import com.android.launcher3.testing.TestLogging; -import com.android.launcher3.testing.shared.ResourceUtils; import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.LockedUserState; +import com.android.launcher3.util.MSDLPlayerWrapper; +import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.PluginManagerWrapper; import com.android.launcher3.util.SafeCloseable; import com.android.launcher3.util.ScreenOnTracker; import com.android.launcher3.util.TraceHelper; -import com.android.quickstep.inputconsumers.AccessibilityInputConsumer; -import com.android.quickstep.inputconsumers.AssistantInputConsumer; -import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer; -import com.android.quickstep.inputconsumers.NavHandleLongPressInputConsumer; +import com.android.launcher3.util.coroutines.ProductionDispatchers; +import com.android.quickstep.OverviewCommandHelper.CommandType; +import com.android.quickstep.OverviewComponentObserver.OverviewChangeListener; +import com.android.quickstep.actioncorner.ActionCornerHandler; +import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.input.QuickstepKeyGestureEventsManager; +import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler; +import com.android.quickstep.inputconsumers.BubbleBarInputConsumer; import com.android.quickstep.inputconsumers.OneHandedModeInputConsumer; -import com.android.quickstep.inputconsumers.OtherActivityInputConsumer; -import com.android.quickstep.inputconsumers.OverviewInputConsumer; -import com.android.quickstep.inputconsumers.OverviewWithoutFocusInputConsumer; -import com.android.quickstep.inputconsumers.ProgressDelegateInputConsumer; -import com.android.quickstep.inputconsumers.ResetGestureInputConsumer; -import com.android.quickstep.inputconsumers.ScreenPinnedInputConsumer; -import com.android.quickstep.inputconsumers.SysUiOverlayInputConsumer; -import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer; -import com.android.quickstep.inputconsumers.TrackpadStatusBarInputConsumer; import com.android.quickstep.util.ActiveGestureLog; import com.android.quickstep.util.ActiveGestureLog.CompoundString; -import com.android.quickstep.util.AssistStateManager; -import com.android.quickstep.util.AssistUtils; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; +import com.android.quickstep.util.ActiveTrackpadList; +import com.android.quickstep.util.ActivityPreloadUtil; +import com.android.quickstep.util.ContextualSearchInvoker; +import com.android.quickstep.util.ContextualSearchStateManager; import com.android.quickstep.views.RecentsViewContainer; -import com.android.systemui.shared.recents.IOverviewProxy; +import com.android.quickstep.window.RecentsWindowFlags; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.quickstep.window.RecentsWindowSwipeHandler; +import com.android.systemui.shared.recents.ILauncherProxy; import com.android.systemui.shared.recents.ISystemUiProxy; -import com.android.systemui.shared.system.ActivityManagerWrapper; +import com.android.systemui.shared.statusbar.phone.BarTransitions; import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver; import com.android.systemui.shared.system.InputConsumerController; import com.android.systemui.shared.system.InputMonitorCompat; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.systemui.shared.system.TaskStackChangeListener; +import com.android.systemui.shared.system.TaskStackChangeListeners; import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController; import com.android.systemui.unfold.progress.IUnfoldAnimation; import com.android.wm.shell.back.IBackAnimation; @@ -142,13 +143,16 @@ import com.android.wm.shell.onehanded.IOneHanded; import com.android.wm.shell.recents.IRecentTasks; import com.android.wm.shell.shared.IShellTransitions; +import com.android.wm.shell.shared.desktopmode.DesktopState; import com.android.wm.shell.splitscreen.ISplitScreen; import com.android.wm.shell.startingsurface.IStartingWindow; +import kotlinx.coroutines.CoroutineDispatcher; + import java.io.FileDescriptor; import java.io.PrintWriter; import java.lang.ref.WeakReference; -import java.util.Set; +import java.util.Locale; import java.util.function.Consumer; import java.util.function.Function; @@ -158,24 +162,25 @@ public class TouchInteractionService extends Service { private static final String SUBSTRING_PREFIX = "; "; - private static final String NEWLINE_PREFIX = "\n\t\t\t-> "; private static final String TAG = "TouchInteractionService"; private static final ConstantItem HAS_ENABLED_QUICKSTEP_ONCE = backedUpItem( - "launcher.has_enabled_quickstep_once", true, EncryptionType.ENCRYPTED); + "launcher.has_enabled_quickstep_once", false, EncryptionType.ENCRYPTED); + + private static final DesktopExperienceFlag ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS = + new DesktopExperienceFlag(Flags::enableGestureNavOnConnectedDisplays, true, + Flags.FLAG_ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS); private final TISBinder mTISBinder = new TISBinder(this); /** - * Local IOverviewProxy implementation with some methods for local components + * Local ILauncherProxy implementation with some methods for local components */ - public static class TISBinder extends IOverviewProxy.Stub { + public static class TISBinder extends ILauncherProxy.Stub { private final WeakReference mTis; - @Nullable private Runnable mOnOverviewTargetChangeListener = null; - private TISBinder(TouchInteractionService tis) { mTis = new WeakReference<>(tis); } @@ -183,45 +188,43 @@ private TISBinder(TouchInteractionService tis) { @BinderThread public void onInitialize(Bundle bundle) { ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_SYSUI_PROXY)); - IPip pip = IPip.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_PIP)); - IBubbles bubbles = IBubbles.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_BUBBLES)); + bundle.getBinder(ISystemUiProxy.DESCRIPTOR)); + IPip pip = IPip.Stub.asInterface(bundle.getBinder(IPip.DESCRIPTOR)); + IBubbles bubbles = IBubbles.Stub.asInterface(bundle.getBinder(IBubbles.DESCRIPTOR)); ISplitScreen splitscreen = ISplitScreen.Stub.asInterface(bundle.getBinder( - KEY_EXTRA_SHELL_SPLIT_SCREEN)); + ISplitScreen.DESCRIPTOR)); IOneHanded onehanded = IOneHanded.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_SHELL_ONE_HANDED)); + bundle.getBinder(IOneHanded.DESCRIPTOR)); IShellTransitions shellTransitions = IShellTransitions.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_SHELL_SHELL_TRANSITIONS)); + bundle.getBinder(IShellTransitions.DESCRIPTOR)); IStartingWindow startingWindow = IStartingWindow.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_SHELL_STARTING_WINDOW)); + bundle.getBinder(IStartingWindow.DESCRIPTOR)); ISysuiUnlockAnimationController launcherUnlockAnimationController = ISysuiUnlockAnimationController.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER)); + bundle.getBinder(ISysuiUnlockAnimationController.DESCRIPTOR)); IRecentTasks recentTasks = IRecentTasks.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_SHELL_RECENT_TASKS)); + bundle.getBinder(IRecentTasks.DESCRIPTOR)); IBackAnimation backAnimation = IBackAnimation.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_SHELL_BACK_ANIMATION)); + bundle.getBinder(IBackAnimation.DESCRIPTOR)); IDesktopMode desktopMode = IDesktopMode.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_SHELL_DESKTOP_MODE)); + bundle.getBinder(IDesktopMode.DESCRIPTOR)); IUnfoldAnimation unfoldTransition = IUnfoldAnimation.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER)); + bundle.getBinder(IUnfoldAnimation.DESCRIPTOR)); IDragAndDrop dragAndDrop = IDragAndDrop.Stub.asInterface( - bundle.getBinder(KEY_EXTRA_SHELL_DRAG_AND_DROP)); + bundle.getBinder(IDragAndDrop.DESCRIPTOR)); MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> { SystemUiProxy.INSTANCE.get(tis).setProxy(proxy, pip, bubbles, splitscreen, onehanded, shellTransitions, startingWindow, recentTasks, launcherUnlockAnimationController, backAnimation, desktopMode, unfoldTransition, dragAndDrop); tis.initInputMonitor("TISBinder#onInitialize()"); - tis.preloadOverview(true /* fromInit */); + ActivityPreloadUtil.preloadOverviewForTIS(tis, true /* fromInit */); })); - sIsInitialized = true; } @BinderThread @Override public void onTaskbarToggled() { - if (!FeatureFlags.ENABLE_KEYBOARD_TASKBAR_TOGGLE.get()) return; MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> { TaskbarActivityContext activityContext = tis.mTaskbarManager.getCurrentActivityContext(); @@ -236,12 +239,21 @@ public void onTaskbarToggled() { public void onOverviewToggle() { TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onOverviewToggle"); executeForTouchInteractionService(tis -> { - // If currently screen pinning, do not enter overview - if (tis.mDeviceState.isScreenPinningActive()) { - return; + int displayId = tis.focusedDisplayIdForOverviewOnConnectedDisplays(); + RecentsAnimationDeviceState deviceState = tis.mDeviceStateRepository.get( + displayId); + if (deviceState != null) { + if (deviceState.isScreenPinningActive()) { + return; + } + if (!deviceState.canStartOverviewCommand()) { + Log.d(TAG, "onOverviewShown ignored for display " + displayId + + " because the command is blocked"); + return; + } } TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS); - tis.mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_TOGGLE); + tis.mOverviewCommandHelper.addCommand(CommandType.TOGGLE, displayId); }); } @@ -249,12 +261,27 @@ public void onOverviewToggle() { @Override public void onOverviewShown(boolean triggeredFromAltTab) { executeForTouchInteractionService(tis -> { + final int displayId = + triggeredFromAltTab + ? tis.focusedDisplayIdForAltTabKqsOnConnectedDisplays() + : tis.focusedDisplayIdForOverviewOnConnectedDisplays(); + RecentsAnimationDeviceState deviceState = tis.mDeviceStateRepository.get( + displayId); + if (deviceState != null && !deviceState.canStartOverviewCommand()) { + Log.d(TAG, "onOverviewShown ignored for display " + displayId + + " because the command is blocked"); + return; + } + if (triggeredFromAltTab) { TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS); - tis.mOverviewCommandHelper.addCommand( - OverviewCommandHelper.TYPE_KEYBOARD_INPUT); + tis.mOverviewCommandHelper.addCommand(CommandType.SHOW_ALT_TAB, displayId); } else { - tis.mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_SHOW); + tis.mOverviewCommandHelper.addCommand( + enableMetaTabToggleInOverview() + ? CommandType.TOGGLE_WITH_FOCUS + : CommandType.SHOW_WITH_FOCUS, + displayId); } }); } @@ -265,7 +292,15 @@ public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromH executeForTouchInteractionService(tis -> { if (triggeredFromAltTab && !triggeredFromHomeKey) { // onOverviewShownFromAltTab hides the overview and ends at the target app - tis.mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_HIDE); + int displayId = tis.focusedDisplayIdForAltTabKqsOnConnectedDisplays(); + RecentsAnimationDeviceState deviceState = tis.mDeviceStateRepository.get( + displayId); + if (deviceState != null && !deviceState.canStartOverviewCommand()) { + Log.d(TAG, "onOverviewHidden ignored for display " + displayId + + " because the command is blocked"); + return; + } + tis.mOverviewCommandHelper.addCommand(CommandType.HIDE_ALT_TAB, displayId); } }); } @@ -274,7 +309,9 @@ public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromH @Override public void onAssistantAvailable(boolean available, boolean longPressHomeEnabled) { MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> { - tis.mDeviceState.setAssistantAvailable(available); + tis.mDeviceStateRepository.forEach(/* createIfAbsent= */ true, deviceState -> + deviceState.setAssistantAvailable(available) + ); tis.onAssistantVisibilityChanged(); executeForTaskbarManager(taskbarManager -> taskbarManager .onLongPressHomeEnabled(longPressHomeEnabled)); @@ -285,7 +322,9 @@ public void onAssistantAvailable(boolean available, boolean longPressHomeEnabled @Override public void onAssistantVisibilityChanged(float visibility) { MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> { - tis.mDeviceState.setAssistantVisibility(visibility); + tis.mDeviceStateRepository.forEach(/* createIfAbsent= */ true, deviceState -> + deviceState.setAssistantVisibility( + visibility)); tis.onAssistantVisibilityChanged(); })); } @@ -298,47 +337,115 @@ public void onAssistantVisibilityChanged(float visibility) { @Override public void onAssistantOverrideInvoked(int invocationType) { executeForTouchInteractionService(tis -> { - if (!AssistUtils.newInstance(tis).tryStartAssistOverride(invocationType)) { + if (!new ContextualSearchInvoker(tis).tryStartAssistOverride(invocationType)) { Log.w(TAG, "Failed to invoke Assist override"); } }); } @BinderThread - public void onSystemUiStateChanged(@SystemUiStateFlags long stateFlags) { + public void onSystemUiStateChanged(@SystemUiStateFlags long stateFlags, int displayId) { + if (!enableOverviewOnConnectedDisplays() && displayId != DEFAULT_DISPLAY) return; MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> { - long lastFlags = tis.mDeviceState.getSystemUiStateFlags(); - tis.mDeviceState.setSystemUiFlags(stateFlags); - tis.onSystemUiFlagsChanged(lastFlags); + // Last flags is only used for the default display case. + RecentsAnimationDeviceState deviceState = tis.mDeviceStateRepository.get(displayId); + if (deviceState != null) { + long lastFlags = deviceState.getSysuiStateFlags(); + deviceState.setSysUIStateFlags(stateFlags); + tis.onSystemUiFlagsChanged(lastFlags, displayId); + } })); } @BinderThread public void onActiveNavBarRegionChanges(Region region) { MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService( - tis -> tis.mDeviceState.setDeferredGestureRegion(region))); + tis -> + tis.mDeviceStateRepository.forEach(/* createIfAbsent= */ true, + deviceState -> + deviceState.setDeferredGestureRegion(region)) + )); } @BinderThread @Override - public void enterStageSplitFromRunningApp(boolean leftOrTop) { + public void enterStageSplitFromRunningApp(int displayId, boolean leftOrTop) { executeForTouchInteractionService(tis -> { - StatefulActivity activity = - tis.mOverviewComponentObserver.getActivityInterface().getCreatedContainer(); - if (activity != null) { - activity.enterStageSplitFromRunningApp(leftOrTop); + BaseContainerInterface containerInterface = tis.mOverviewComponentObserver + .getContainerInterface(displayId); + if (containerInterface != null) { + RecentsViewContainer container = containerInterface.getCreatedContainer(); + if (container != null) { + container.enterStageSplitFromRunningApp(leftOrTop, displayId); + } } }); } - /** - * Preloads the Overview activity. - *

- * This method should only be used when the All Set page of the SUW is reached to safely - * preload the Launcher for the SUW first reveal. - */ - public void preloadOverviewForSUWAllSet() { - executeForTouchInteractionService(tis -> tis.preloadOverview(false, true)); + @BinderThread + @Override + public void onDisplayAddSystemDecorations(int displayId) { + executeForTouchInteractionService(tis -> + tis.mSystemDecorationChangeObserver.notifyAddSystemDecorations(displayId)); + } + + @BinderThread + @Override + public void onDisplayRemoved(int displayId) { + executeForTouchInteractionService(tis -> { + tis.mSystemDecorationChangeObserver.notifyOnDisplayRemoved(displayId); + }); + } + + @BinderThread + @Override + public void onDisplayRemoveSystemDecorations(int displayId) { + executeForTouchInteractionService(tis -> { + tis.mSystemDecorationChangeObserver.notifyDisplayRemoveSystemDecorations(displayId); + }); + } + + @BinderThread + @Override + public void updateWallpaperVisibility(int displayId, boolean visible) { + executeForTaskbarManager(taskbarManager -> + taskbarManager.setWallpaperVisible(displayId, visible)); + } + + @BinderThread + @Override + public void checkNavBarModes(int displayId) { + executeForTaskbarManager(taskbarManager -> + taskbarManager.checkNavBarModes(displayId)); + } + + @BinderThread + @Override + public void finishBarAnimations(int displayId) { + executeForTaskbarManager(taskbarManager -> + taskbarManager.finishBarAnimations(displayId)); + } + + @BinderThread + @Override + public void touchAutoDim(int displayId, boolean reset) { + executeForTaskbarManager(taskbarManager -> + taskbarManager.touchAutoDim(displayId, reset)); + } + + @BinderThread + @Override + public void transitionTo(int displayId, @BarTransitions.TransitionMode int barMode, + boolean animate) { + executeForTaskbarManager(taskbarManager -> + taskbarManager.transitionTo(displayId, barMode, animate)); + } + + @BinderThread + @Override + public void appTransitionPending(boolean pending) { + executeForTaskbarManager(taskbarManager -> + taskbarManager.appTransitionPending(pending)); } @Override @@ -359,6 +466,12 @@ public void onSystemBarAttributesChanged(int displayId, int behavior) { taskbarManager.onSystemBarAttributesChanged(displayId, behavior)); } + @Override + public void onTransitionModeUpdated(int barMode, boolean checkBarModes) { + executeForTaskbarManager(taskbarManager -> + taskbarManager.onTransitionModeUpdated(barMode, checkBarModes)); + } + @Override public void onNavButtonsDarkIntensityChanged(float darkIntensity) { executeForTaskbarManager(taskbarManager -> @@ -371,6 +484,31 @@ public void onNavigationBarLumaSamplingEnabled(int displayId, boolean enable) { taskbarManager.onNavigationBarLumaSamplingEnabled(displayId, enable)); } + @Override + public void onUnbind(IRemoteCallback reply) { + // Run everything in the same main thread block to ensure the cleanup happens before + // sending the reply. + MAIN_EXECUTOR.execute(() -> { + executeForTaskbarManager(TaskbarManager::destroy); + try { + reply.sendResult(null); + } catch (RemoteException e) { + Log.w(TAG, "onUnbind: Failed to reply to LauncherProxyService", e); + } + }); + } + + @Override + public void onActionCornerActivated(int action, int displayId) { + MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> { + ActionCornerHandler actionCornerHandler = tis.mActionCornerHandler; + if (actionCornerHandler == null) { + return; + } + actionCornerHandler.handleAction(action, displayId); + })); + } + private void executeForTouchInteractionService( @NonNull Consumer tisConsumer) { TouchInteractionService tis = mTis.get(); @@ -423,7 +561,8 @@ public void ejectFakeTrackpadForTesting() { */ public void setPredictiveBackToHomeInProgress(boolean isInProgress) { executeForTouchInteractionService(tis -> - tis.mDeviceState.setPredictiveBackToHomeInProgress(isInProgress)); + tis.mDeviceStateRepository.forEach(/* createIfAbsent= */ true, deviceState -> + deviceState.setPredictiveBackToHomeInProgress(isInProgress))); } /** @@ -446,166 +585,260 @@ public void setSwipeUpProxy(Function proxy) { tis -> tis.mSwipeUpProxyProvider = proxy != null ? proxy : (i -> null)); } + /** + * Touches within this number of pixels from the bottom of the screen can get intercepted to + * handle gesture navigation. Passing a value less than 0 will revert to a default value. + */ + public void setGesturalHeight(int gesturalHeight) { + executeForTouchInteractionService(tis -> tis.setGesturalHeight(gesturalHeight)); + } + /** * Sets the task id where gestures should be blocked */ public void setGestureBlockedTaskId(int taskId) { executeForTouchInteractionService( - tis -> tis.mDeviceState.setGestureBlockingTaskId(taskId)); - } - - /** Sets a listener to be run on Overview Target updates. */ - public void setOverviewTargetChangeListener(@Nullable Runnable listener) { - mOnOverviewTargetChangeListener = listener; - } - - protected void onOverviewTargetChange() { - if (mOnOverviewTargetChangeListener != null) { - mOnOverviewTargetChangeListener.run(); - mOnOverviewTargetChangeListener = null; - } + tis -> + tis.mDeviceStateRepository.forEach(/* createIfAbsent= */ true, + deviceState -> + deviceState.setGestureBlockingTaskId(taskId)) + ); } /** Refreshes the current overview target. */ - public void refreshOverviewTarget() { + @VisibleForTesting + public void refreshOverviewTargetForTest() { executeForTouchInteractionService(tis -> { tis.mAllAppsActionManager.onDestroy(); - tis.onOverviewTargetChange(tis.mOverviewComponentObserver.isHomeAndOverviewSame()); - }); - } - } - - private final InputManager.InputDeviceListener mInputDeviceListener = - new InputManager.InputDeviceListener() { - @Override - public void onInputDeviceAdded(int deviceId) { - if (isTrackpadDevice(deviceId)) { - boolean wasEmpty = mTrackpadsConnected.isEmpty(); - mTrackpadsConnected.add(deviceId); - if (wasEmpty) { - update(); - } - } - } - - @Override - public void onInputDeviceChanged(int deviceId) { - } - - @Override - public void onInputDeviceRemoved(int deviceId) { - mTrackpadsConnected.remove(deviceId); - if (mTrackpadsConnected.isEmpty()) { - update(); - } - } - - private void update() { - if (mInputMonitorCompat != null && !mTrackpadsConnected.isEmpty()) { - // Don't destroy and reinitialize input monitor due to trackpad - // connecting when it's already set up. - return; - } - initInputMonitor("onTrackpadConnected()"); - } - - private boolean isTrackpadDevice(int deviceId) { - InputDevice inputDevice = mInputManager.getInputDevice(deviceId); - if (inputDevice == null) { - return false; + tis.onOverviewTargetChanged(tis.mOverviewComponentObserver.isHomeAndOverviewSame()); + if (RecentsWindowFlags.getEnableOverviewInWindow()) { + Launcher launcher = Launcher.ACTIVITY_TRACKER.getCreatedContext(); + if (launcher != null) { + tis.mTaskbarManager.setActivity(launcher); } - return inputDevice.getSources() == (InputDevice.SOURCE_MOUSE - | InputDevice.SOURCE_TOUCHPAD); } - }; - - private static boolean sConnected = false; - private static boolean sIsInitialized = false; - private RotationTouchHelper mRotationTouchHelper; - - public static boolean isConnected() { - return sConnected; + }); + } } - public static boolean isInitialized() { - return sIsInitialized; - } + private PerDisplayRepository mRotationTouchHelperRepository; private final AbsSwipeUpHandler.Factory mLauncherSwipeHandlerFactory = this::createLauncherSwipeHandler; private final AbsSwipeUpHandler.Factory mFallbackSwipeHandlerFactory = this::createFallbackSwipeHandler; + private final AbsSwipeUpHandler.Factory mRecentsWindowSwipeHandlerFactory = + this::createRecentsWindowSwipeHandler; + // This needs to be a member to be queued and potentially removed later if the service is + // destroyed before the user is unlocked + private final Runnable mUserUnlockedRunnable = this::onUserUnlocked; private final ScreenOnTracker.ScreenOnListener mScreenOnListener = this::onScreenOnChanged; + private final OverviewChangeListener mOverviewChangeListener = this::onOverviewTargetChanged; private final TaskbarNavButtonCallbacks mNavCallbacks = new TaskbarNavButtonCallbacks() { @Override - public void onNavigateHome() { - mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_HOME); + public void onNavigateHome(int displayId) { + if (enableOverviewOnConnectedDisplays()) { + mOverviewCommandHelper.addCommand(CommandType.HOME, displayId); + } else { + mOverviewCommandHelper.addCommand(CommandType.HOME, DEFAULT_DISPLAY); + } + } + + @Override + public void onToggleOverview(int displayId) { + if (enableOverviewOnConnectedDisplays()) { + mOverviewCommandHelper.addCommand(CommandType.TOGGLE, displayId); + } else { + mOverviewCommandHelper.addCommand(CommandType.TOGGLE, DEFAULT_DISPLAY); + } } @Override - public void onToggleOverview() { - mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_TOGGLE); + public void onHideOverview(int displayId) { + if (enableOverviewOnConnectedDisplays()) { + mOverviewCommandHelper.addCommand(CommandType.HIDE_ALT_TAB, displayId); + } else { + mOverviewCommandHelper.addCommand(CommandType.HIDE_ALT_TAB, DEFAULT_DISPLAY); + } } }; - private ActivityManagerWrapper mAM; + // We should clean up the recents window on the primary display on home intent start, however we + // have no other way of listening to this event in the 3P launcher case. + private final TaskStackChangeListener mHomeIntentStartedListener = + new TaskStackChangeListener() { + @Override + public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task, + boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) { + TaskStackChangeListener.super.onActivityRestartAttempt(task, homeTaskVisible, + clearedTask, wasVisible); + if (task.configuration.windowConfiguration.getActivityType() + != ACTIVITY_TYPE_HOME + || task.displayId != DEFAULT_DISPLAY) { + // We only want to handle home intent starts, and only on the primary + // display. + return; + } + if (mGestureState != DEFAULT_STATE) { + // If there's an ongoing gesture, we shouldn't clean up the recents window + // since gestures will clean up the recents window when needed. + return; + } + BaseContainerInterface defaultContainerInterface = + OverviewComponentObserver.INSTANCE.get( + TouchInteractionService.this).getContainerInterface( + DEFAULT_DISPLAY); + if (defaultContainerInterface != null + && defaultContainerInterface.getCreatedContainer() + instanceof RecentsWindowManager recentsWindowManager) { + TaskAnimationManager taskAnimationManager = + mTaskAnimationManagerRepository.get(DEFAULT_DISPLAY); + if (taskAnimationManager == null) { + return; + } + if (taskAnimationManager.isRecentsAnimationRunning()) { + RecentsState recentsState = + recentsWindowManager.getStateManager().getState(); + if (!recentsState.isRecentsViewVisible()) { + // If we're in a state where the recents view is visible, we can + // ignore the recents animation running check, otherwise we should + // wait for the recents animation to end. + return; + } + } + if (recentsWindowManager.isStarted()) { + recentsWindowManager.getStateManager().goToState(RecentsState.HOME, + true); + } + } + } + }; + private OverviewCommandHelper mOverviewCommandHelper; private OverviewComponentObserver mOverviewComponentObserver; private InputConsumerController mInputConsumer; - private RecentsAnimationDeviceState mDeviceState; - private TaskAnimationManager mTaskAnimationManager; + private PerDisplayRepository mDeviceStateRepository; + private PerDisplayRepository mTaskAnimationManagerRepository; - private @NonNull InputConsumer mUncheckedConsumer = InputConsumer.NO_OP; - private @NonNull InputConsumer mConsumer = InputConsumer.NO_OP; + private @NonNull InputConsumer mUncheckedConsumer = InputConsumer.DEFAULT_NO_OP; + + private @NonNull InputConsumer mConsumer = InputConsumer.DEFAULT_NO_OP; private Choreographer mMainChoreographer; - private @Nullable ResetGestureInputConsumer mResetGestureInputConsumer; + private boolean mUserUnlocked = false; private GestureState mGestureState = DEFAULT_STATE; + private InputMonitorDisplayModel mInputMonitorDisplayModel; private InputMonitorCompat mInputMonitorCompat; private InputEventReceiver mInputEventReceiver; private TaskbarManager mTaskbarManager; + private ActionCornerHandler mActionCornerHandler; private Function mSwipeUpProxyProvider = i -> null; private AllAppsActionManager mAllAppsActionManager; - private InputManager mInputManager; - private final Set mTrackpadsConnected = new ArraySet<>(); + private ActiveTrackpadList mTrackpadsConnected; + + private final SparseArray mGestureStartNavMode = new SparseArray<>(); + + private DesktopAppLaunchTransitionManager mDesktopAppLaunchTransitionManager; + + private DisplayController.DisplayInfoChangeListener mNavigationModeChangeListener; + private DisplayController.DisplayInfoChangeListener mNightModeChangeListener; + + PerDisplayRepository mRecentsWindowManagerRepository; + + private SystemDecorationChangeObserver mSystemDecorationChangeObserver; + + private DisplayRepository mDisplayRepository; + + private QuickstepKeyGestureEventsManager mQuickstepKeyGestureEventsHandler; + private DisplaysWithDecorationsRepositoryCompat mDisplaysWithDecorationsRepositoryCompat; + private CoroutineDispatcher mCoroutineDispatcher; + private DesktopState mDesktopState; @Override public void onCreate() { super.onCreate(); + Log.d(TAG, "onCreate: user=" + getUserId() + + " instance=" + System.identityHashCode(this)); // Initialize anything here that is needed in direct boot mode. // Everything else should be initialized in onUserUnlocked() below. + mDisplayRepository = LauncherDisplayRepository.getINSTANCE().get(this); + mDeviceStateRepository = RecentsAnimationDeviceState.REPOSITORY_INSTANCE.get(this); + mTaskAnimationManagerRepository = TaskAnimationManager.REPOSITORY_INSTANCE.get(this); mMainChoreographer = Choreographer.getInstance(); - mAM = ActivityManagerWrapper.getInstance(); - mDeviceState = new RecentsAnimationDeviceState(this, true); - mRotationTouchHelper = mDeviceState.getRotationTouchHelper(); - mAllAppsActionManager = new AllAppsActionManager( - this, UI_HELPER_EXECUTOR, this::createAllAppsPendingIntent); - mInputManager = getSystemService(InputManager.class); - if (ENABLE_TRACKPAD_GESTURE.get()) { - mInputManager.registerInputDeviceListener(mInputDeviceListener, - UI_HELPER_EXECUTOR.getHandler()); - int [] inputDevices = mInputManager.getInputDeviceIds(); - for (int inputDeviceId : inputDevices) { - mInputDeviceListener.onInputDeviceAdded(inputDeviceId); + mRotationTouchHelperRepository = RotationTouchHelper.REPOSITORY_INSTANCE.get(this); + mRecentsWindowManagerRepository = RecentsWindowManager.REPOSITORY_INSTANCE.get(this); + mSystemDecorationChangeObserver = SystemDecorationChangeObserver.getINSTANCE().get(this); + mQuickstepKeyGestureEventsHandler = + QuickstepKeyGestureEventsManager.getINSTANCE().get(this); + mCoroutineDispatcher = ProductionDispatchers.INSTANCE.getMain(); + mDisplaysWithDecorationsRepositoryCompat = + LauncherDisplaysWithDecorationsRepositoryCompat.getINSTANCE().get(this); + mDesktopState = DesktopState.getInstance(this); + mAllAppsActionManager = new AllAppsActionManager(this, UI_HELPER_EXECUTOR, + mQuickstepKeyGestureEventsHandler, + () -> mTaskbarManager.createAllAppsPendingIntent()); + mTrackpadsConnected = new ActiveTrackpadList(this, () -> { + if (isInputMonitorInitialized() && !mTrackpadsConnected.isEmpty()) { + // Don't destroy and reinitialize input monitor due to trackpad + // connecting when it's already set up. + return; } - } - mTaskbarManager = new TaskbarManager(this, mAllAppsActionManager, mNavCallbacks); + initInputMonitor("onTrackpadConnected()"); + }); + + mTaskbarManager = new TaskbarManagerImplWrapper( + new TaskbarManagerImpl(this, mAllAppsActionManager, mNavCallbacks, + mRecentsWindowManagerRepository, mDisplaysWithDecorationsRepositoryCompat, + mCoroutineDispatcher)); + mDesktopAppLaunchTransitionManager = + new DesktopAppLaunchTransitionManager(this, SystemUiProxy.INSTANCE.get(this), + DisplayController.INSTANCE.get(this)); + mDesktopAppLaunchTransitionManager.registerTransitions(); mInputConsumer = InputConsumerController.getRecentsAnimationInputConsumer(); // Call runOnUserUnlocked() before any other callbacks to ensure everything is initialized. - LockedUserState.get(this).runOnUserUnlocked(this::onUserUnlocked); - LockedUserState.get(this).runOnUserUnlocked(mTaskbarManager::onUserUnlocked); - mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged); - sConnected = true; - + LockedUserState.get(this).runOnUserUnlocked(mUserUnlockedRunnable); + // Assume that the navigation mode changes for all displays at once. + mNavigationModeChangeListener = + mDeviceStateRepository.get(DEFAULT_DISPLAY).addDisplayInfoChangeCallback( + CHANGE_NAVIGATION_MODE, this::onNavigationModeChanged); + // Assume that the night mode changes for all displays at once. + mNightModeChangeListener = + mDeviceStateRepository.get(DEFAULT_DISPLAY).addDisplayInfoChangeCallback( + CHANGE_NIGHT_MODE, this::onNightModeChanged); ScreenOnTracker.INSTANCE.get(this).addListener(mScreenOnListener); } + @Nullable + private InputEventReceiver getInputEventReceiver(int displayId) { + if (ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS.isTrue()) { + InputMonitorResource inputMonitorResource = mInputMonitorDisplayModel == null + ? null : mInputMonitorDisplayModel.getDisplayResource(displayId); + return inputMonitorResource == null ? null : inputMonitorResource.inputEventReceiver; + } + return mInputEventReceiver; + } + + @Nullable + private InputMonitorCompat getInputMonitorCompat(int displayId) { + if (ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS.isTrue()) { + InputMonitorResource inputMonitorResource = mInputMonitorDisplayModel == null + ? null : mInputMonitorDisplayModel.getDisplayResource(displayId); + return inputMonitorResource == null ? null : inputMonitorResource.inputMonitorCompat; + } + return mInputMonitorCompat; + } + private void disposeEventHandlers(String reason) { - Log.d(TAG, "disposeEventHandlers: Reason: " + reason); + Log.d(TAG, "disposeEventHandlers: Reason: " + reason + + " instance=" + System.identityHashCode(this)); + if (mInputMonitorDisplayModel != null) { + mInputMonitorDisplayModel.destroy(); + mInputMonitorDisplayModel = null; + } if (mInputEventReceiver != null) { mInputEventReceiver.dispose(); mInputEventReceiver = null; @@ -618,17 +851,28 @@ private void disposeEventHandlers(String reason) { private void initInputMonitor(String reason) { disposeEventHandlers("Initializing input monitor due to: " + reason); - - if (mDeviceState.isButtonNavMode() && (!ENABLE_TRACKPAD_GESTURE.get() - || mTrackpadsConnected.isEmpty())) { + RecentsAnimationDeviceState deviceState = mDeviceStateRepository.get(DEFAULT_DISPLAY); + if (deviceState.isButtonNavMode() + && !deviceState.supportsAssistantGestureInButtonNav() + && (mTrackpadsConnected.isEmpty())) { return; } + if (ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS.isTrue()) { + mInputMonitorDisplayModel = new InputMonitorDisplayModel( + this, mSystemDecorationChangeObserver); + } else { + mInputMonitorCompat = new InputMonitorCompat("swipe-up", DEFAULT_DISPLAY); + mInputEventReceiver = mInputMonitorCompat.getInputReceiver(Looper.getMainLooper(), + mMainChoreographer, this::onInputEvent); + } - mInputMonitorCompat = new InputMonitorCompat("swipe-up", mDeviceState.getDisplayId()); - mInputEventReceiver = mInputMonitorCompat.getInputReceiver(Looper.getMainLooper(), - mMainChoreographer, this::onInputEvent); + mRotationTouchHelperRepository.get(DEFAULT_DISPLAY).updateGestureTouchRegions(); + } - mRotationTouchHelper.updateGestureTouchRegions(); + private boolean isInputMonitorInitialized() { + return ENABLE_GESTURE_NAV_ON_CONNECTED_DISPLAYS.isTrue() + ? mInputMonitorDisplayModel != null + : mInputMonitorCompat != null; } /** @@ -638,18 +882,25 @@ private void onNavigationModeChanged() { initInputMonitor("onNavigationModeChanged()"); resetHomeBounceSeenOnQuickstepEnabledFirstTime(); } + private void onNightModeChanged() { + ActivityPreloadUtil.preloadOverviewForTIS(this, false /* fromInit */); + } @UiThread public void onUserUnlocked() { - Log.d(TAG, "onUserUnlocked: userId=" + getUserId()); - mTaskAnimationManager = new TaskAnimationManager(this); - mOverviewComponentObserver = new OverviewComponentObserver(this, mDeviceState); - mOverviewCommandHelper = new OverviewCommandHelper(this, - mOverviewComponentObserver, mTaskAnimationManager); - mResetGestureInputConsumer = new ResetGestureInputConsumer( - mTaskAnimationManager, mTaskbarManager::getCurrentActivityContext); + Log.d(TAG, "onUserUnlocked: userId=" + getUserId() + + " instance=" + System.identityHashCode(this)); + mOverviewComponentObserver = OverviewComponentObserver.INSTANCE.get(this); + mOverviewCommandHelper = LauncherComponentProvider.get( + this).getOverviewCommandHelperFactory().create(this, mTaskbarManager, + SystemUiProxy.INSTANCE.get(this)); + mActionCornerHandler = LauncherComponentProvider.get( + this).getActionCornerHandlerFactory().create(mOverviewCommandHelper); + mUserUnlocked = true; mInputConsumer.registerInputConsumer(); - onSystemUiFlagsChanged(mDeviceState.getSystemUiStateFlags()); + mDeviceStateRepository.forEach(/* createIfAbsent= */ true, deviceState -> + onSystemUiFlagsChanged(deviceState.getSysuiStateFlags(), + deviceState.getDisplayId())); onAssistantVisibilityChanged(); // Initialize the task tracker @@ -659,8 +910,17 @@ public void onUserUnlocked() { // new ModelPreload().start(this); resetHomeBounceSeenOnQuickstepEnabledFirstTime(); - mOverviewComponentObserver.setOverviewChangeListener(this::onOverviewTargetChange); - onOverviewTargetChange(mOverviewComponentObserver.isHomeAndOverviewSame()); + mOverviewComponentObserver.addOverviewChangeListener(mOverviewChangeListener); + onOverviewTargetChanged(mOverviewComponentObserver.isHomeAndOverviewSame()); + + mTaskbarManager.onUserUnlocked(); + mAllAppsActionManager.onUserUnlocked(); + mQuickstepKeyGestureEventsHandler.registerOverviewKeyGestureEvent( + createOverviewGestureHandler()); + if (DesktopExperienceFlags.ENABLE_LAUNCHER_HANDLE_GO_HOME_KEYBOARD_SHORTCUT.isTrue()) { + mQuickstepKeyGestureEventsHandler.registerHomeKeyGestureEvent( + getOverviewCommandHelper()); + } } public OverviewCommandHelper getOverviewCommandHelper() { @@ -668,7 +928,8 @@ public OverviewCommandHelper getOverviewCommandHelper() { } private void resetHomeBounceSeenOnQuickstepEnabledFirstTime() { - if (!LockedUserState.get(this).isUserUnlocked() || mDeviceState.isButtonNavMode()) { + if (!LockedUserState.get(this).isUserUnlocked() || mDeviceStateRepository.get( + DEFAULT_DISPLAY).isButtonNavMode()) { // Skip if not yet unlocked (can't read user shared prefs) or if the current navigation // mode doesn't have gestures return; @@ -683,83 +944,102 @@ private void resetHomeBounceSeenOnQuickstepEnabledFirstTime() { } } - private void onOverviewTargetChange(boolean isHomeAndOverviewSame) { + private void onOverviewTargetChanged(boolean isHomeAndOverviewSame) { mAllAppsActionManager.setHomeAndOverviewSame(isHomeAndOverviewSame); - - StatefulActivity newOverviewActivity = mOverviewComponentObserver.getActivityInterface() - .getCreatedContainer(); - if (newOverviewActivity != null) { - mTaskbarManager.setActivity(newOverviewActivity); + RecentsViewContainer newOverviewContainer = + mOverviewComponentObserver.getContainerInterface( + DEFAULT_DISPLAY).getCreatedContainer(); + if (newOverviewContainer != null) { + if (newOverviewContainer instanceof StatefulActivity activity) { + // This will also call setRecentsViewContainer() internally. + mTaskbarManager.setActivity(activity); + } else { + mTaskbarManager.setRecentsViewContainer(newOverviewContainer); + } } - mTISBinder.onOverviewTargetChange(); - } - - private PendingIntent createAllAppsPendingIntent() { - if (FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get()) { - return new PendingIntent(new IIntentSender.Stub() { - @Override - public void send(int code, Intent intent, String resolvedType, - IBinder allowlistToken, IIntentReceiver finishedReceiver, - String requiredPermission, Bundle options) { - MAIN_EXECUTOR.execute(() -> mTaskbarManager.toggleAllApps()); - } - }); - } else { - return PendingIntent.getActivity( - this, - GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS, - new Intent(mOverviewComponentObserver.getHomeIntent()) - .setAction(INTENT_ACTION_ALL_APPS_TOGGLE), - PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + if (RecentsWindowFlags.getEnableOverviewInWindow()) { + mRecentsWindowManagerRepository.forEach( + /* createIfAbsent= */ false, RecentsWindowManager::hideRecentsWindow); + if (isHomeAndOverviewSame) { + TaskStackChangeListeners.getInstance().unregisterTaskStackListener( + mHomeIntentStartedListener); + } else { + TaskStackChangeListeners.getInstance().registerTaskStackListener( + mHomeIntentStartedListener); + } } } @UiThread - private void onSystemUiFlagsChanged(@SystemUiStateFlags long lastSysUIFlags) { + private void onSystemUiFlagsChanged(@SystemUiStateFlags long lastSysUIFlags, int displayId) { + RecentsAnimationDeviceState deviceState = mDeviceStateRepository.get(displayId); if (LockedUserState.get(this).isUserUnlocked()) { - long systemUiStateFlags = mDeviceState.getSystemUiStateFlags(); - SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags); - mOverviewComponentObserver.onSystemUiStateChanged(); - mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags); - mTaskAnimationManager.onSystemUiFlagsChanged(lastSysUIFlags, systemUiStateFlags); + TaskAnimationManager taskAnimationManager = mTaskAnimationManagerRepository.get( + displayId); + if (deviceState != null && taskAnimationManager != null) { + long systemUiStateFlags = deviceState.getSysuiStateFlags(); + mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags, displayId); + if (displayId == DEFAULT_DISPLAY) { + // The following don't care about non-default displays, at least for now. If + // they + // ever will, they should be taken care of. + SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags); + mOverviewComponentObserver.setHomeDisabled(deviceState.isHomeDisabled()); + } + taskAnimationManager.onSystemUiFlagsChanged(lastSysUIFlags, systemUiStateFlags); + } + } else if (enableTaskbarForDirectBoot() && deviceState != null) { + mTaskbarManager.onSystemUiFlagsChanged(deviceState.getSysuiStateFlags(), displayId); } } @UiThread private void onAssistantVisibilityChanged() { if (LockedUserState.get(this).isUserUnlocked()) { - mOverviewComponentObserver.getActivityInterface().onAssistantVisibilityChanged( - mDeviceState.getAssistantVisibility()); + mOverviewComponentObserver.getContainerInterface( + DEFAULT_DISPLAY).onAssistantVisibilityChanged( + mDeviceStateRepository.get(DEFAULT_DISPLAY).getAssistantVisibility()); } } @Override public void onDestroy() { - Log.d(TAG, "Touch service destroyed: user=" + getUserId()); - sIsInitialized = false; + Log.d(TAG, "onDestroy: user=" + getUserId() + + " instance=" + System.identityHashCode(this)); if (LockedUserState.get(this).isUserUnlocked()) { mInputConsumer.unregisterInputConsumer(); - mOverviewComponentObserver.onDestroy(); + mQuickstepKeyGestureEventsHandler.onDestroy(); + mOverviewComponentObserver.setHomeDisabled(false); + mOverviewComponentObserver.removeOverviewChangeListener(mOverviewChangeListener); } disposeEventHandlers("TouchInteractionService onDestroy()"); - mDeviceState.destroy(); SystemUiProxy.INSTANCE.get(this).clearProxy(); mAllAppsActionManager.onDestroy(); - mInputManager.unregisterInputDeviceListener(mInputDeviceListener); - mTrackpadsConnected.clear(); - + mTrackpadsConnected.destroy(); mTaskbarManager.destroy(); - sConnected = false; - + if (mDesktopAppLaunchTransitionManager != null) { + mDesktopAppLaunchTransitionManager.unregisterTransitions(); + } + mDesktopAppLaunchTransitionManager = null; + mDeviceStateRepository.get(DEFAULT_DISPLAY).removeDisplayInfoChangeListener( + mNavigationModeChangeListener); + mDeviceStateRepository.get(DEFAULT_DISPLAY).removeDisplayInfoChangeListener( + mNightModeChangeListener); + LockedUserState.get(this).removeOnUserUnlockedRunnable(mUserUnlockedRunnable); ScreenOnTracker.INSTANCE.get(this).removeListener(mScreenOnListener); + if (RecentsWindowFlags.getEnableOverviewInWindow()) { + TaskStackChangeListeners.getInstance().unregisterTaskStackListener( + mHomeIntentStartedListener); + } super.onDestroy(); } @Override public IBinder onBind(Intent intent) { - Log.d(TAG, "Touch service connected: user=" + getUserId()); + Log.d(TAG, "onBind: user=" + getUserId() + + " instance=" + System.identityHashCode(this)); return mTISBinder; } @@ -775,10 +1055,9 @@ protected void onScreenOnChanged(boolean isOn) { } private void onInputEvent(InputEvent ev) { + int displayId = ev.getDisplayId(); if (!(ev instanceof MotionEvent)) { - ActiveGestureLog.INSTANCE.addLog(new CompoundString("TIS.onInputEvent: ") - .append("Cannot process input event: received unknown event ") - .append(ev.toString())); + ActiveGestureProtoLogProxy.logUnknownInputEvent(displayId, ev.toString()); return; } MotionEvent event = (MotionEvent) ev; @@ -786,142 +1065,203 @@ private void onInputEvent(InputEvent ev) { TestLogging.recordMotionEvent( TestProtocol.SEQUENCE_TIS, "TouchInteractionService.onInputEvent", event); - boolean isUserUnlocked = LockedUserState.get(this).isUserUnlocked(); - if (!isUserUnlocked || (mDeviceState.isButtonNavMode() - && !isTrackpadMotionEvent(event))) { - ActiveGestureLog.INSTANCE.addLog(new CompoundString("TIS.onInputEvent: ") - .append("Cannot process input event: ") - .append(!isUserUnlocked - ? "user is locked" - : "using 3-button nav and event is not a trackpad event")); + if (!LockedUserState.get(this).isUserUnlocked()) { + ActiveGestureProtoLogProxy.logOnInputEventUserLocked(displayId); + return; + } + + RecentsAnimationDeviceState deviceState = mDeviceStateRepository.get(displayId); + if (deviceState == null) { + Log.d(TAG, "RecentsAnimationDeviceState not available for displayId " + displayId); + return; + } + + RotationTouchHelper rotationTouchHelper = mRotationTouchHelperRepository.get(displayId); + if (rotationTouchHelper == null) { + Log.d(TAG, "RotationTouchHelper not available for displayId " + displayId); + return; + } + + NavigationMode currentNavMode = deviceState.getMode(); + NavigationMode gestureStartNavMode = mGestureStartNavMode.get(displayId); + + // On CD, only consume input event if flag is on and taskbar is stashed. + TaskbarActivityContext tac = mTaskbarManager.getTaskbarForDisplay(displayId); + boolean shouldConnectedDisplayConsumeEvent = + displayId != DEFAULT_DISPLAY + && enableAutoStashConnectedDisplayTaskbar.isTrue() + && tac != null && tac.isTaskbarStashed(); + if (gestureStartNavMode != null && gestureStartNavMode != currentNavMode) { + ActiveGestureProtoLogProxy.logOnInputEventNavModeSwitched( + displayId, gestureStartNavMode.name(), currentNavMode.name()); + event.setAction(ACTION_CANCEL); + } else if (deviceState.isButtonNavMode() + && !deviceState.supportsAssistantGestureInButtonNav() + && !isTrackpadMotionEvent(event) + && !shouldConnectedDisplayConsumeEvent) { + ActiveGestureProtoLogProxy.logOnInputEventThreeButtonNav(displayId); return; } final int action = event.getActionMasked(); // Note this will create a new consumer every mouse click, as after ACTION_UP from the click // an ACTION_HOVER_ENTER will fire as well. - boolean isHoverActionWithoutConsumer = enableCursorHoverStates() - && isHoverActionWithoutConsumer(event); + boolean isHoverActionWithoutConsumer = isHoverActionWithoutConsumer(event); - if (enableHandleDelayedGestureCallbacks()) { + TaskAnimationManager taskAnimationManager = mTaskAnimationManagerRepository.get(displayId); + if (taskAnimationManager == null) { + Log.e(TAG, "TaskAnimationManager not available for displayId " + displayId); + ActiveGestureProtoLogProxy.logOnTaskAnimationManagerNotAvailable(displayId); + return; + } + if (action == ACTION_DOWN || isHoverActionWithoutConsumer) { + taskAnimationManager.notifyNewGestureStart(); + } + if (taskAnimationManager.shouldIgnoreMotionEvents()) { if (action == ACTION_DOWN || isHoverActionWithoutConsumer) { - mTaskAnimationManager.notifyNewGestureStart(); - } - if (mTaskAnimationManager.shouldIgnoreMotionEvents()) { - if (action == ACTION_DOWN || isHoverActionWithoutConsumer) { - ActiveGestureLog.INSTANCE.addLog( - new CompoundString("TIS.onMotionEvent: A new gesture has been ") - .append("started, but a previously-requested recents ") - .append("animation hasn't started. Ignoring all following ") - .append("motion events."), - RECENTS_ANIMATION_START_PENDING); - } - return; + ActiveGestureProtoLogProxy.logOnInputIgnoringFollowingEvents(displayId); } + return; + } + + InputMonitorCompat inputMonitorCompat = getInputMonitorCompat(displayId); + InputEventReceiver inputEventReceiver = getInputEventReceiver(displayId); + + if (action == ACTION_DOWN || isHoverActionWithoutConsumer) { + mGestureStartNavMode.set(displayId, currentNavMode); + } else if (action == ACTION_UP || action == ACTION_CANCEL) { + mGestureStartNavMode.delete(displayId); } SafeCloseable traceToken = TraceHelper.INSTANCE.allowIpcs("TIS.onInputEvent"); CompoundString reasonString = action == ACTION_DOWN - ? new CompoundString("TIS.onMotionEvent: ") : CompoundString.NO_OP; + ? CompoundString.newEmptyString() : CompoundString.NO_OP; if (action == ACTION_DOWN || isHoverActionWithoutConsumer) { - mRotationTouchHelper.setOrientationTransformIfNeeded(event); - - boolean isOneHandedModeActive = mDeviceState.isOneHandedModeActive(); - boolean isInSwipeUpTouchRegion = mRotationTouchHelper.isInSwipeUpTouchRegion(event); - TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext(); - if (isInSwipeUpTouchRegion && tac != null) { - tac.closeKeyboardQuickSwitchView(); - } - if ((!isOneHandedModeActive && isInSwipeUpTouchRegion) - || isHoverActionWithoutConsumer) { + rotationTouchHelper.setOrientationTransformIfNeeded(event); + + boolean isOneHandedModeActive = deviceState.isOneHandedModeActive(); + boolean isInSwipeUpTouchRegion = rotationTouchHelper.isInSwipeUpTouchRegion(event); + BubbleControllers bubbleControllers = tac != null ? tac.getBubbleControllers() : null; + boolean isOnBubbles = bubbleControllers != null + && BubbleBarInputConsumer.isEventOnBubbles(tac, event); + if (deviceState.isButtonNavMode() + && deviceState.supportsAssistantGestureInButtonNav()) { + reasonString.append("in three button mode which supports Assistant gesture"); + // Consume gesture event for Assistant (all other gestures should do nothing). + if (deviceState.canTriggerAssistantAction(event)) { + reasonString.append(" and event can trigger assistant action, " + + "consuming gesture for assistant action"); + mGestureState = createGestureState( + displayId, mGestureState, getTrackpadGestureType(event)); + mUncheckedConsumer = tryCreateAssistantInputConsumer( + this, + deviceState, + inputMonitorCompat, + mGestureState, + event); + } else { + reasonString.append(" but event cannot trigger Assistant, " + + "consuming gesture as no-op"); + mUncheckedConsumer = createNoOpInputConsumer(displayId); + } + } else if ((!isOneHandedModeActive && isInSwipeUpTouchRegion) + || isHoverActionWithoutConsumer || isOnBubbles) { reasonString.append(!isOneHandedModeActive && isInSwipeUpTouchRegion - ? "one handed mode is not active and event is in swipe up region" - : "isHoverActionWithoutConsumer == true") - .append(", creating new input consumer"); + ? "one handed mode is not active and event is in swipe up region, " + + "creating new input consumer" + : "isHoverActionWithoutConsumer == true, creating new input consumer"); // Clone the previous gesture state since onConsumerAboutToBeSwitched might trigger // onConsumerInactive and wipe the previous gesture state GestureState prevGestureState = new GestureState(mGestureState); - GestureState newGestureState = createGestureState(mGestureState, - getTrackpadGestureType(event)); + GestureState newGestureState = createGestureState( + displayId, mGestureState, getTrackpadGestureType(event)); mConsumer.onConsumerAboutToBeSwitched(); mGestureState = newGestureState; - mConsumer = newConsumer(prevGestureState, mGestureState, event); + mConsumer = newConsumer( + this, + mUserUnlocked, + mOverviewComponentObserver, + deviceState, + prevGestureState, + mGestureState, + taskAnimationManager, + inputMonitorCompat, + getSwipeUpHandlerFactory(displayId), + this::onConsumerInactive, + inputEventReceiver, + mTaskbarManager, + mSwipeUpProxyProvider, + mOverviewCommandHelper, + event, + rotationTouchHelper, + mDesktopState); mUncheckedConsumer = mConsumer; - } else if ((mDeviceState.isFullyGesturalNavMode() || isTrackpadMultiFingerSwipe(event)) - && mDeviceState.canTriggerAssistantAction(event)) { - reasonString.append(mDeviceState.isFullyGesturalNavMode() - ? "using fully gestural nav" - : "event is a trackpad multi-finger swipe") - .append(" and event can trigger assistant action") - .append(", consuming gesture for assistant action"); - mGestureState = createGestureState(mGestureState, - getTrackpadGestureType(event)); + } else if ((deviceState.isFullyGesturalNavMode() || isTrackpadMultiFingerSwipe(event)) + && deviceState.canTriggerAssistantAction(event)) { + reasonString.append(deviceState.isFullyGesturalNavMode() + ? "using fully gestural nav and event can trigger assistant action, " + + "consuming gesture for assistant action" + : "event is a trackpad multi-finger swipe and event can trigger assistant " + + "action, consuming gesture for assistant action"); + mGestureState = createGestureState( + displayId, mGestureState, getTrackpadGestureType(event)); // Do not change mConsumer as if there is an ongoing QuickSwitch gesture, we // should not interrupt it. QuickSwitch assumes that interruption can only // happen if the next gesture is also quick switch. - mUncheckedConsumer = tryCreateAssistantInputConsumer(mGestureState, event); - } else if (mDeviceState.canTriggerOneHandedAction(event)) { - reasonString.append("event can trigger one-handed action") - .append(", consuming gesture for one-handed action"); + mUncheckedConsumer = tryCreateAssistantInputConsumer( + this, deviceState, inputMonitorCompat, mGestureState, event); + } else if (deviceState.canTriggerOneHandedAction(event)) { + reasonString.append("event can trigger one-handed action, " + + "consuming gesture for one-handed action"); // Consume gesture event for triggering one handed feature. - mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState, - InputConsumer.NO_OP, mInputMonitorCompat); + mUncheckedConsumer = new OneHandedModeInputConsumer( + this, + displayId, + deviceState, + InputConsumer.createNoOpInputConsumer(displayId), inputMonitorCompat); } else { - mUncheckedConsumer = InputConsumer.NO_OP; + mUncheckedConsumer = InputConsumer.createNoOpInputConsumer(displayId); } } else { // Other events - if (mUncheckedConsumer != InputConsumer.NO_OP) { + if (mUncheckedConsumer.getType() != InputConsumer.TYPE_NO_OP) { // Only transform the event if we are handling it in a proper consumer - mRotationTouchHelper.setOrientationTransformIfNeeded(event); + rotationTouchHelper.setOrientationTransformIfNeeded(event); } } - if (mUncheckedConsumer != InputConsumer.NO_OP) { + if (mUncheckedConsumer.getType() != InputConsumer.TYPE_NO_OP) { switch (action) { case ACTION_DOWN: - ActiveGestureLog.INSTANCE.addLog(reasonString); + ActiveGestureProtoLogProxy.logOnInputEventActionDown(displayId, reasonString); // fall through case ACTION_UP: - ActiveGestureLog.INSTANCE.addLog( - new CompoundString("onMotionEvent(") - .append((int) event.getRawX()) - .append(", ") - .append((int) event.getRawY()) - .append("): ") - .append(MotionEvent.actionToString(action)) - .append(", ") - .append(MotionEvent.classificationToString( - event.getClassification())), - /* gestureEvent= */ action == ACTION_DOWN - ? MOTION_DOWN - : MOTION_UP); + ActiveGestureProtoLogProxy.logOnInputEventActionUp( + (int) event.getRawX(), + (int) event.getRawY(), + action, + MotionEvent.classificationToString(event.getClassification()), + displayId); break; case ACTION_MOVE: - ActiveGestureLog.INSTANCE.addLog( - new CompoundString("onMotionEvent: ") - .append(MotionEvent.actionToString(action)) - .append(",") - .append(MotionEvent.classificationToString( - event.getClassification())) - .append(", pointerCount: ") - .append(event.getPointerCount()), - MOTION_MOVE); + ActiveGestureProtoLogProxy.logOnInputEventActionMove( + MotionEvent.actionToString(action), + MotionEvent.classificationToString(event.getClassification()), + event.getPointerCount(), + displayId); break; default: { - ActiveGestureLog.INSTANCE.addLog( - new CompoundString("onMotionEvent: ") - .append(MotionEvent.actionToString(action)) - .append(",") - .append(MotionEvent.classificationToString( - event.getClassification()))); + ActiveGestureProtoLogProxy.logOnInputEventGenericAction( + MotionEvent.actionToString(action), + MotionEvent.classificationToString(event.getClassification()), + displayId); } } } boolean cancelGesture = mGestureState.getContainerInterface() != null - && mGestureState.getContainerInterface().shouldCancelCurrentGesture(); + && mGestureState.getContainerInterface().shouldCancelCurrentGesture(displayId); boolean cleanUpConsumer = (action == ACTION_UP || action == ACTION_CANCEL || cancelGesture) && mConsumer != null && !mConsumer.getActiveConsumerInHierarchy().isConsumerDetachedFromGesture(); @@ -939,14 +1279,15 @@ private void onInputEvent(InputEvent ev) { } if (cleanUpConsumer) { - reset(); + reset(displayId); } traceToken.close(); } private boolean isHoverActionWithoutConsumer(MotionEvent event) { // Only process these events when taskbar is present. - TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext(); + int displayId = event.getDisplayId(); + TaskbarActivityContext tac = mTaskbarManager.getTaskbarForDisplay(displayId); boolean isTaskbarPresent = tac != null && tac.getDeviceProfile().isTaskbarPresent && !tac.isPhoneMode(); return event.isHoverEvent() && (mUncheckedConsumer.getType() & TYPE_CURSOR_HOVER) == 0 @@ -958,441 +1299,57 @@ private boolean isCursorHoverEvent(MotionEvent event) { return event.isHoverEvent() && event.getSource() == InputDevice.SOURCE_MOUSE; } - private InputConsumer tryCreateAssistantInputConsumer( - GestureState gestureState, MotionEvent motionEvent) { - return tryCreateAssistantInputConsumer( - InputConsumer.NO_OP, gestureState, motionEvent, CompoundString.NO_OP); - } - - private InputConsumer tryCreateAssistantInputConsumer( - InputConsumer base, - GestureState gestureState, - MotionEvent motionEvent, - CompoundString reasonString) { - if (mDeviceState.isGestureBlockedTask(gestureState.getRunningTask())) { - reasonString.append(SUBSTRING_PREFIX) - .append("is gesture-blocked task, using base input consumer"); - return base; - } else { - reasonString.append(SUBSTRING_PREFIX).append("using AssistantInputConsumer"); - return new AssistantInputConsumer( - this, gestureState, base, mInputMonitorCompat, mDeviceState, motionEvent); - } - } - - public GestureState createGestureState(GestureState previousGestureState, - GestureState.TrackpadGestureType trackpadGestureType) { + public GestureState createGestureState( + int displayId, + GestureState previousGestureState, + GestureState.TrackpadGestureType trackpadGestureType) { final GestureState gestureState; TopTaskTracker.CachedTaskInfo taskInfo; - if (mTaskAnimationManager.isRecentsAnimationRunning()) { - gestureState = new GestureState(mOverviewComponentObserver, - ActiveGestureLog.INSTANCE.getLogId()); + TaskAnimationManager taskAnimationManager = mTaskAnimationManagerRepository.get(displayId); + if (taskAnimationManager != null && taskAnimationManager.isRecentsAnimationRunning()) { + gestureState = new GestureState( + mOverviewComponentObserver, displayId, ActiveGestureLog.INSTANCE.getLogId()); TopTaskTracker.CachedTaskInfo previousTaskInfo = previousGestureState.getRunningTask(); // previousTaskInfo can be null iff previousGestureState == GestureState.DEFAULT_STATE taskInfo = previousTaskInfo != null ? previousTaskInfo - : TopTaskTracker.INSTANCE.get(this).getCachedTopTask(false); + : TopTaskTracker.INSTANCE.get(this).getCachedTopTask(false, displayId); gestureState.updateRunningTask(taskInfo); gestureState.updateLastStartedTaskIds(previousGestureState.getLastStartedTaskIds()); gestureState.updatePreviouslyAppearedTaskIds( previousGestureState.getPreviouslyAppearedTaskIds()); } else { - gestureState = new GestureState(mOverviewComponentObserver, + gestureState = new GestureState( + mOverviewComponentObserver, + displayId, ActiveGestureLog.INSTANCE.incrementLogId()); - taskInfo = TopTaskTracker.INSTANCE.get(this).getCachedTopTask(false); + taskInfo = TopTaskTracker.INSTANCE.get(this).getCachedTopTask(false, displayId); gestureState.updateRunningTask(taskInfo); } gestureState.setTrackpadGestureType(trackpadGestureType); // Log initial state for the gesture. - ActiveGestureLog.INSTANCE.addLog(new CompoundString("Current running task package name=") - .append(taskInfo.getPackageName())); - ActiveGestureLog.INSTANCE.addLog(new CompoundString("Current SystemUi state flags=") - .append(mDeviceState.getSystemUiStateString())); - return gestureState; - } - - private InputConsumer newConsumer( - GestureState previousGestureState, GestureState newGestureState, MotionEvent event) { - TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext(); - AnimatedFloat progressProxy = mSwipeUpProxyProvider.apply(mGestureState); - if (progressProxy != null) { - InputConsumer consumer = new ProgressDelegateInputConsumer( - this, mTaskAnimationManager, mGestureState, mInputMonitorCompat, progressProxy); - - logInputConsumerSelectionReason(consumer, newCompoundString( - "mSwipeUpProxyProvider has been set, using ProgressDelegateInputConsumer")); - - return consumer; - } - - boolean canStartSystemGesture = - mGestureState.isTrackpadGesture() ? mDeviceState.canStartTrackpadGesture() - : mDeviceState.canStartSystemGesture(); - - if (!LockedUserState.get(this).isUserUnlocked()) { - CompoundString reasonString = newCompoundString("device locked"); - InputConsumer consumer; - if (canStartSystemGesture) { - // This handles apps launched in direct boot mode (e.g. dialer) as well as apps - // launched while device is locked even after exiting direct boot mode (e.g. camera). - consumer = createDeviceLockedInputConsumer( - newGestureState, reasonString.append(SUBSTRING_PREFIX) - .append("can start system gesture")); - } else { - consumer = getDefaultInputConsumer( - reasonString.append(SUBSTRING_PREFIX) - .append("cannot start system gesture")); - } - logInputConsumerSelectionReason(consumer, reasonString); - return consumer; - } - - CompoundString reasonString; - InputConsumer base; - // When there is an existing recents animation running, bypass systemState check as this is - // a followup gesture and the first gesture started in a valid system state. - if (canStartSystemGesture || previousGestureState.isRecentsAnimationRunning()) { - reasonString = newCompoundString(canStartSystemGesture - ? "can start system gesture" : "recents animation was running") - .append(", trying to use base consumer"); - base = newBaseConsumer(previousGestureState, newGestureState, event, reasonString); - } else { - reasonString = newCompoundString( - "cannot start system gesture and recents animation was not running") - .append(", trying to use default input consumer"); - base = getDefaultInputConsumer(reasonString); - } - if (mDeviceState.isGesturalNavMode() || newGestureState.isTrackpadGesture()) { - handleOrientationSetup(base); - } - if (mDeviceState.isFullyGesturalNavMode() || newGestureState.isTrackpadGesture()) { - String reasonPrefix = - "device is in gesture navigation mode or 3-button mode with a trackpad gesture"; - if (mDeviceState.canTriggerAssistantAction(event)) { - reasonString.append(NEWLINE_PREFIX) - .append(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("gesture can trigger the assistant") - .append(", trying to use assistant input consumer"); - base = tryCreateAssistantInputConsumer(base, newGestureState, event, reasonString); - } - - // If Taskbar is present, we listen for swipe or cursor hover events to unstash it. - if (tac != null && !(base instanceof AssistantInputConsumer)) { - // Present always on large screen or on small screen w/ flag - boolean useTaskbarConsumer = tac.getDeviceProfile().isTaskbarPresent - && !tac.isPhoneMode() - && !tac.isInStashedLauncherState(); - if (canStartSystemGesture && useTaskbarConsumer) { - reasonString.append(NEWLINE_PREFIX) - .append(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("TaskbarActivityContext != null, ") - .append("using TaskbarUnstashInputConsumer"); - base = new TaskbarUnstashInputConsumer(this, base, mInputMonitorCompat, tac, - mOverviewCommandHelper, mGestureState); - } - } - if (enableBubblesLongPressNavHandle()) { - // Create bubbles input consumer before NavHandleLongPressInputConsumer. - // This allows for nav handle to fall back to bubbles. - if (mDeviceState.isBubblesExpanded()) { - reasonString = newCompoundString(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("bubbles expanded, trying to use default input consumer"); - // Bubbles can handle home gesture itself. - base = getDefaultInputConsumer(reasonString); - } - } - - NavHandle navHandle = tac != null ? tac.getNavHandle() - : SystemUiProxy.INSTANCE.get(this); - if (canStartSystemGesture && !previousGestureState.isRecentsAnimationRunning() - && navHandle.canNavHandleBeLongPressed() - && !ignoreThreeFingerTrackpadForNavHandleLongPress(mGestureState)) { - reasonString.append(NEWLINE_PREFIX) - .append(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("Not running recents animation, "); - if (tac != null && tac.getNavHandle().canNavHandleBeLongPressed()) { - reasonString.append("stashed handle is long-pressable, "); - } - reasonString.append("using NavHandleLongPressInputConsumer"); - base = new NavHandleLongPressInputConsumer(this, base, mInputMonitorCompat, - mDeviceState, navHandle, mGestureState); - } - - if (!enableBubblesLongPressNavHandle()) { - // Continue overriding nav handle input consumer with bubbles - if (mDeviceState.isBubblesExpanded()) { - reasonString = newCompoundString(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("bubbles expanded, trying to use default input consumer"); - // Bubbles can handle home gesture itself. - base = getDefaultInputConsumer(reasonString); - } - } - - if (mDeviceState.isSystemUiDialogShowing()) { - reasonString = newCompoundString(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("system dialog is showing, using SysUiOverlayInputConsumer"); - base = new SysUiOverlayInputConsumer( - getBaseContext(), mDeviceState, mInputMonitorCompat); - } - - if (mGestureState.isTrackpadGesture() - && canStartSystemGesture && !previousGestureState.isRecentsAnimationRunning()) { - reasonString = newCompoundString(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("Trackpad 3-finger gesture, using TrackpadStatusBarInputConsumer"); - base = new TrackpadStatusBarInputConsumer(getBaseContext(), base, - mInputMonitorCompat); - } - - if (mDeviceState.isScreenPinningActive()) { - reasonString = newCompoundString(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("screen pinning is active, using ScreenPinnedInputConsumer"); - // Note: we only allow accessibility to wrap this, and it replaces the previous - // base input consumer (which should be NO_OP anyway since topTaskLocked == true). - base = new ScreenPinnedInputConsumer(this, newGestureState); - } - - if (mDeviceState.canTriggerOneHandedAction(event)) { - reasonString.append(NEWLINE_PREFIX) - .append(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("gesture can trigger one handed mode") - .append(", using OneHandedModeInputConsumer"); - base = new OneHandedModeInputConsumer( - this, mDeviceState, base, mInputMonitorCompat); - } - - if (mDeviceState.isAccessibilityMenuAvailable()) { - reasonString.append(NEWLINE_PREFIX) - .append(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("accessibility menu is available") - .append(", using AccessibilityInputConsumer"); - base = new AccessibilityInputConsumer( - this, mDeviceState, mGestureState, base, mInputMonitorCompat); - } - } else { - String reasonPrefix = "device is not in gesture navigation mode"; - if (mDeviceState.isScreenPinningActive()) { - reasonString = newCompoundString(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("screen pinning is active, trying to use default input consumer"); - base = getDefaultInputConsumer(reasonString); - } - - if (mDeviceState.canTriggerOneHandedAction(event)) { - reasonString.append(NEWLINE_PREFIX) - .append(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("gesture can trigger one handed mode") - .append(", using OneHandedModeInputConsumer"); - base = new OneHandedModeInputConsumer( - this, mDeviceState, base, mInputMonitorCompat); - } - } - logInputConsumerSelectionReason(base, reasonString); - return base; - } - - private CompoundString newCompoundString(String substring) { - return new CompoundString(NEWLINE_PREFIX).append(substring); - } - - private boolean ignoreThreeFingerTrackpadForNavHandleLongPress(GestureState gestureState) { - return gestureState.isThreeFingerTrackpadGesture(); - } - - private void logInputConsumerSelectionReason( - InputConsumer consumer, CompoundString reasonString) { - ActiveGestureLog.INSTANCE.addLog(new CompoundString("setInputConsumer: ") - .append(consumer.getName()) - .append(". reason(s):") - .append(reasonString)); - if ((consumer.getType() & InputConsumer.TYPE_OTHER_ACTIVITY) != 0) { - ActiveGestureLog.INSTANCE.trackEvent(FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER); - } - } - - private void handleOrientationSetup(InputConsumer baseInputConsumer) { - baseInputConsumer.notifyOrientationSetup(); - } - - private InputConsumer newBaseConsumer( - GestureState previousGestureState, - GestureState gestureState, - MotionEvent event, - CompoundString reasonString) { - if (mDeviceState.isKeyguardShowingOccluded()) { - // This handles apps showing over the lockscreen (e.g. camera) - return createDeviceLockedInputConsumer( - gestureState, - reasonString.append(SUBSTRING_PREFIX) - .append("keyguard is showing occluded") - .append(", trying to use device locked input consumer")); - } - - reasonString.append(SUBSTRING_PREFIX).append("keyguard is not showing occluded"); - - TopTaskTracker.CachedTaskInfo runningTask = gestureState.getRunningTask(); - // Use overview input consumer for sharesheets on top of home. - boolean forceOverviewInputConsumer = gestureState.getContainerInterface().isStarted() - && runningTask != null - && runningTask.isRootChooseActivity(); - - // In the case where we are in an excluded, translucent overlay, ignore it and treat the - // running activity as the task behind the overlay. - TopTaskTracker.CachedTaskInfo otherVisibleTask = runningTask == null - ? null - : runningTask.getVisibleNonExcludedTask(); - if (otherVisibleTask != null) { - ActiveGestureLog.INSTANCE.addLog(new CompoundString("Changing active task to ") - .append(otherVisibleTask.getPackageName()) - .append(" because the previous task running on top of this one (") - .append(runningTask.getPackageName()) - .append(") was excluded from recents")); - gestureState.updateRunningTask(otherVisibleTask); - } - - boolean previousGestureAnimatedToLauncher = - previousGestureState.isRunningAnimationToLauncher() - || mDeviceState.isPredictiveBackToHomeInProgress(); - // with shell-transitions, home is resumed during recents animation, so - // explicitly check against recents animation too. - boolean launcherResumedThroughShellTransition = - gestureState.getContainerInterface().isResumed() - && !previousGestureState.isRecentsAnimationRunning(); - // If a task fragment within Launcher is resumed - boolean launcherChildActivityResumed = useActivityOverlay() - && runningTask != null - && runningTask.isHomeTask() - && mOverviewComponentObserver.isHomeAndOverviewSame() - && !launcherResumedThroughShellTransition - && !previousGestureState.isRecentsAnimationRunning(); - - if (gestureState.getContainerInterface().isInLiveTileMode()) { - return createOverviewInputConsumer( - previousGestureState, - gestureState, - event, - forceOverviewInputConsumer, - reasonString.append(SUBSTRING_PREFIX) - .append("is in live tile mode, trying to use overview input consumer")); - } else if (runningTask == null) { - return getDefaultInputConsumer(reasonString.append(SUBSTRING_PREFIX) - .append("running task == null")); - } else if (previousGestureAnimatedToLauncher - || launcherResumedThroughShellTransition - || forceOverviewInputConsumer) { - return createOverviewInputConsumer( - previousGestureState, - gestureState, - event, - forceOverviewInputConsumer, - reasonString.append(SUBSTRING_PREFIX) - .append(previousGestureAnimatedToLauncher - ? "previous gesture animated to launcher" - : (launcherResumedThroughShellTransition - ? "launcher resumed through a shell transition" - : "forceOverviewInputConsumer == true")) - .append(", trying to use overview input consumer")); - } else if (mDeviceState.isGestureBlockedTask(runningTask) || launcherChildActivityResumed) { - return getDefaultInputConsumer(reasonString.append(SUBSTRING_PREFIX) - .append(launcherChildActivityResumed - ? "is launcher child-task, trying to use default input consumer" - : "is gesture-blocked task, trying to use default input consumer")); - } else { - reasonString.append(SUBSTRING_PREFIX) - .append("using OtherActivityInputConsumer"); - return createOtherActivityInputConsumer(gestureState, event); - } - } - - public AbsSwipeUpHandler.Factory getSwipeUpHandlerFactory() { - return !mOverviewComponentObserver.isHomeAndOverviewSame() - ? mFallbackSwipeHandlerFactory : mLauncherSwipeHandlerFactory; - } - - private InputConsumer createOtherActivityInputConsumer(GestureState gestureState, - MotionEvent event) { - - final AbsSwipeUpHandler.Factory factory = getSwipeUpHandlerFactory(); - final boolean shouldDefer = !mOverviewComponentObserver.isHomeAndOverviewSame() - || gestureState.getContainerInterface().deferStartingActivity(mDeviceState, event); - final boolean disableHorizontalSwipe = mDeviceState.isInExclusionRegion(event); - return new OtherActivityInputConsumer(this, mDeviceState, mTaskAnimationManager, - gestureState, shouldDefer, this::onConsumerInactive, - mInputMonitorCompat, mInputEventReceiver, disableHorizontalSwipe, factory); - } - - private InputConsumer createDeviceLockedInputConsumer( - GestureState gestureState, CompoundString reasonString) { - if ((mDeviceState.isFullyGesturalNavMode() || gestureState.isTrackpadGesture()) - && gestureState.getRunningTask() != null) { - reasonString.append(SUBSTRING_PREFIX) - .append("device is in gesture nav mode or 3-button mode with a trackpad") - .append(" gesture and running task != null") - .append(", using DeviceLockedInputConsumer"); - return new DeviceLockedInputConsumer( - this, mDeviceState, mTaskAnimationManager, gestureState, mInputMonitorCompat); - } else { - return getDefaultInputConsumer(reasonString - .append(SUBSTRING_PREFIX) - .append((mDeviceState.isFullyGesturalNavMode() - || gestureState.isTrackpadGesture()) - ? "running task == null" - : "device is not in gesture nav mode and it's not a trackpad gesture") - .append(", trying to use default input consumer")); + ActiveGestureProtoLogProxy.logRunningTaskPackage(taskInfo.getPackageName()); + RecentsAnimationDeviceState deviceState = mDeviceStateRepository.get(displayId); + if (deviceState != null) { + ActiveGestureProtoLogProxy.logSysuiStateFlags(deviceState.getSystemUiStateString()); } + return gestureState; } - public InputConsumer createOverviewInputConsumer( - GestureState previousGestureState, - GestureState gestureState, - MotionEvent event, - boolean forceOverviewInputConsumer, - CompoundString reasonString) { - RecentsViewContainer container = gestureState.getContainerInterface().getCreatedContainer(); - if (container == null) { - return getDefaultInputConsumer( - reasonString.append(SUBSTRING_PREFIX) - .append("activity == null, trying to use default input consumer")); - } - - boolean hasWindowFocus = container.getRootView().hasWindowFocus(); - boolean isPreviousGestureAnimatingToLauncher = - previousGestureState.isRunningAnimationToLauncher() - || mDeviceState.isPredictiveBackToHomeInProgress(); - boolean isInLiveTileMode = gestureState.getContainerInterface().isInLiveTileMode(); - - reasonString.append(SUBSTRING_PREFIX) - .append(hasWindowFocus - ? "activity has window focus" - : (isPreviousGestureAnimatingToLauncher - ? "previous gesture is still animating to launcher" - : isInLiveTileMode - ? "device is in live mode" - : "all overview focus conditions failed")); - if (hasWindowFocus - || isPreviousGestureAnimatingToLauncher - || isInLiveTileMode) { - reasonString.append(SUBSTRING_PREFIX) - .append("overview should have focus, using OverviewInputConsumer"); - return new OverviewInputConsumer(gestureState, container, mInputMonitorCompat, - false /* startingInActivityBounds */); + /** + * Returns a AbsSwipeUpHandler.Factory, used to instantiate AbsSwipeUpHandler later. + * @param displayId The displayId of the display this handler will be used on. + */ + public AbsSwipeUpHandler.Factory getSwipeUpHandlerFactory(int displayId) { + BaseContainerInterface containerInterface = + mOverviewComponentObserver.getContainerInterface(displayId); + if (containerInterface instanceof FallbackWindowInterface) { + return mRecentsWindowSwipeHandlerFactory; + } else if (containerInterface instanceof LauncherActivityInterface) { + return mLauncherSwipeHandlerFactory; } else { - reasonString.append(SUBSTRING_PREFIX).append( - "overview shouldn't have focus, using OverviewWithoutFocusInputConsumer"); - final boolean disableHorizontalSwipe = mDeviceState.isInExclusionRegion(event); - return new OverviewWithoutFocusInputConsumer(container.asContext(), mDeviceState, - gestureState, mInputMonitorCompat, disableHorizontalSwipe); + return mFallbackSwipeHandlerFactory; } } @@ -1403,81 +1360,24 @@ public InputConsumer createOverviewInputConsumer( */ private void onConsumerInactive(InputConsumer caller) { if (mConsumer != null && mConsumer.getActiveConsumerInHierarchy() == caller) { - reset(); + reset(caller.getDisplayId()); } } - private void reset() { - mConsumer = mUncheckedConsumer = getDefaultInputConsumer(); + private void reset(int displayId) { + mConsumer = mUncheckedConsumer = InputConsumerUtils.getDefaultInputConsumer( + displayId, + mUserUnlocked, + mTaskAnimationManagerRepository.get(displayId), + mTaskbarManager, + CompoundString.NO_OP); mGestureState = DEFAULT_STATE; // By default, use batching of the input events, but check receiver before using in the rare // case that the monitor was disposed before the swipe settled - if (mInputEventReceiver != null) { - mInputEventReceiver.setBatchingEnabled(true); - } - } - - private @NonNull InputConsumer getDefaultInputConsumer() { - return getDefaultInputConsumer(CompoundString.NO_OP); - } - - /** - * Returns the {@link ResetGestureInputConsumer} if user is unlocked, else NO_OP. - */ - private @NonNull InputConsumer getDefaultInputConsumer(@NonNull CompoundString reasonString) { - if (mResetGestureInputConsumer != null) { - reasonString.append(SUBSTRING_PREFIX).append( - "mResetGestureInputConsumer initialized, using ResetGestureInputConsumer"); - return mResetGestureInputConsumer; - } else { - reasonString.append(SUBSTRING_PREFIX).append( - "mResetGestureInputConsumer not initialized, using no-op input consumer"); - // mResetGestureInputConsumer isn't initialized until onUserUnlocked(), so reset to - // NO_OP until then (we never want these to be null). - return InputConsumer.NO_OP; - } - } - - private void preloadOverview(boolean fromInit) { - Trace.beginSection("preloadOverview(fromInit=" + fromInit + ")"); - preloadOverview(fromInit, false); - Trace.endSection(); - } - - private void preloadOverview(boolean fromInit, boolean forSUWAllSet) { - if (!LockedUserState.get(this).isUserUnlocked()) { - return; - } - - if (mDeviceState.isButtonNavMode() && !mOverviewComponentObserver.isHomeAndOverviewSame()) { - // Prevent the overview from being started before the real home on first boot. - return; - } - - if ((RestoreDbTask.isPending(this) && !forSUWAllSet) - || !mDeviceState.isUserSetupComplete()) { - // Preloading while a restore is pending may cause launcher to start the restore - // too early. - return; + InputEventReceiver inputEventReceiver = getInputEventReceiver(displayId); + if (inputEventReceiver != null) { + inputEventReceiver.setBatchingEnabled(true); } - - final BaseActivityInterface activityInterface = - mOverviewComponentObserver.getActivityInterface(); - final Intent overviewIntent = new Intent( - mOverviewComponentObserver.getOverviewIntentIgnoreSysUiState()); - if (activityInterface.getCreatedContainer() != null && fromInit) { - // The activity has been created before the initialization of overview service. It is - // usually happens when booting or launcher is the top activity, so we should already - // have the latest state. - return; - } - - // TODO(b/258022658): Remove temporary logging. - Log.i(TAG, "preloadOverview: forSUWAllSet=" + forSUWAllSet - + ", isHomeAndOverviewSame=" + mOverviewComponentObserver.isHomeAndOverviewSame()); - - ActiveGestureLog.INSTANCE.addLog("preloadRecentsAnimation"); - mTaskAnimationManager.preloadRecentsAnimation(overviewIntent); } @Override @@ -1485,29 +1385,37 @@ public void onConfigurationChanged(Configuration newConfig) { if (!LockedUserState.get(this).isUserUnlocked()) { return; } - final BaseActivityInterface activityInterface = - mOverviewComponentObserver.getActivityInterface(); - final BaseDraggingActivity activity = activityInterface.getCreatedContainer(); - if (activity == null || activity.isStarted()) { + // TODO (b/399094853): handle config updates for all connected displays (relevant only for + // gestures on external displays) + final BaseContainerInterface containerInterface = + mOverviewComponentObserver.getContainerInterface(DEFAULT_DISPLAY); + final RecentsViewContainer container = containerInterface.getCreatedContainer(); + if (container == null || container.isStarted()) { // We only care about the existing background activity. return; } - Configuration oldConfig = activity.getResources().getConfiguration(); + Configuration oldConfig = container.asContext().getResources().getConfiguration(); boolean isFoldUnfold = isTablet(oldConfig) != isTablet(newConfig); if (!isFoldUnfold && mOverviewComponentObserver.canHandleConfigChanges( - activity.getComponentName(), - activity.getResources().getConfiguration().diff(newConfig))) { + container.getComponentName(), + container.asContext().getResources().getConfiguration().diff(newConfig))) { // Since navBar gestural height are different between portrait and landscape, // can handle orientation changes and refresh navigation gestural region through // onOneHandedModeChanged() - int newGesturalHeight = ResourceUtils.getNavbarSize( - ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, - getApplicationContext().getResources()); - mDeviceState.onOneHandedModeChanged(newGesturalHeight); + setGesturalHeight(RESET_TO_DEFAULT_GESTURAL_HEIGHT); return; } - preloadOverview(false /* fromInit */); + ActivityPreloadUtil.preloadOverviewForTIS(this, false /* fromInit */); + } + + /** + * Touches within this number of pixels from the bottom of the screen can get intercepted to + * handle gesture navigation. Passing a value less than 0 will revert to a default value. + */ + public void setGesturalHeight(int newGesturalHeight) { + mDeviceStateRepository.forEach(/* createIfAbsent= */ true, deviceState -> + deviceState.setGesturalHeight(newGesturalHeight)); } private static boolean isTablet(Configuration config) { @@ -1520,7 +1428,6 @@ protected void dump(FileDescriptor fd, PrintWriter pw, String[] rawArgs) { if (LockedUserState.get(this).isUserUnlocked()) { PluginManagerWrapper.INSTANCE.get(getBaseContext()).dump(pw); } - mDeviceState.dump(pw); if (mOverviewComponentObserver != null) { mOverviewComponentObserver.dump(pw); } @@ -1533,41 +1440,177 @@ protected void dump(FileDescriptor fd, PrintWriter pw, String[] rawArgs) { pw.println("Input state:"); pw.println("\tmInputMonitorCompat=" + mInputMonitorCompat); pw.println("\tmInputEventReceiver=" + mInputEventReceiver); + if (mInputMonitorDisplayModel == null) { + pw.println("\tmInputMonitorDisplayModel=null"); + } else { + mInputMonitorDisplayModel.dump("\t", pw); + } DisplayController.INSTANCE.get(this).dump(pw); - pw.println("TouchState:"); - BaseDraggingActivity createdOverviewActivity = mOverviewComponentObserver == null ? null - : mOverviewComponentObserver.getActivityInterface().getCreatedContainer(); - boolean resumed = mOverviewComponentObserver != null - && mOverviewComponentObserver.getActivityInterface().isResumed(); - pw.println("\tcreatedOverviewActivity=" + createdOverviewActivity); - pw.println("\tresumed=" + resumed); + mDisplayRepository.getDisplayIds().getValue().forEach(displayId -> { + pw.println(String.format(Locale.ENGLISH, "TouchState (displayId %d):", displayId)); + RecentsAnimationDeviceState deviceState = mDeviceStateRepository.get(displayId); + if (deviceState != null) { + deviceState.dump(pw); + } + BaseContainerInterface containerInterface = + mOverviewComponentObserver == null ? null + : mOverviewComponentObserver.getContainerInterface( + displayId); + RecentsViewContainer createdOverviewContainer = containerInterface == null ? null : + containerInterface.getCreatedContainer(); + boolean resumed = containerInterface != null && containerInterface.isResumed(); + pw.println("\tcreatedOverviewActivity=" + createdOverviewContainer); + pw.println("\tresumed=" + resumed); + if (createdOverviewContainer != null) { + createdOverviewContainer.getDeviceProfile().dump(this, "", pw); + } + TaskAnimationManager taskAnimationManager = mTaskAnimationManagerRepository.get( + displayId); + if (taskAnimationManager != null) { + taskAnimationManager.dump("\t", pw); + } + }); pw.println("\tmConsumer=" + mConsumer.getName()); ActiveGestureLog.INSTANCE.dump("", pw); RecentsModel.INSTANCE.get(this).dump("", pw); - if (mTaskAnimationManager != null) { - mTaskAnimationManager.dump("", pw); - } - if (createdOverviewActivity != null) { - createdOverviewActivity.getDeviceProfile().dump(this, "", pw); - } mTaskbarManager.dumpLogs("", pw); - pw.println("AssistStateManager:"); - AssistStateManager.INSTANCE.get(this).dump("\t", pw); + DesktopVisibilityController.INSTANCE.get(this).dumpLogs("", pw); + pw.println("ContextualSearchStateManager:"); + ContextualSearchStateManager.INSTANCE.get(this).dump("\t", pw); SystemUiProxy.INSTANCE.get(this).dump(pw); DeviceConfigWrapper.get().dump(" ", pw); + TopTaskTracker.INSTANCE.get(this).dump(pw); + mAllAppsActionManager.dump(pw); + } + + private @Nullable AbsSwipeUpHandler createLauncherSwipeHandler( + GestureState gestureState, long touchTimeMs) { + int displayId = gestureState.getDisplayId(); + TaskAnimationManager taskAnimationManager = mTaskAnimationManagerRepository.get(displayId); + RecentsAnimationDeviceState deviceState = mDeviceStateRepository.get(displayId); + RotationTouchHelper rotationTouchHelper = mRotationTouchHelperRepository.get(displayId); + if (taskAnimationManager == null || deviceState == null || rotationTouchHelper == null) { + Log.d(TAG, "displayId " + displayId + " not valid"); + return null; + } + return new LauncherSwipeHandlerV2(this, taskAnimationManager, deviceState, + rotationTouchHelper, gestureState, touchTimeMs, + taskAnimationManager.isRecentsAnimationRunning(), + mInputConsumer, MSDLPlayerWrapper.INSTANCE.get(this)); } - private AbsSwipeUpHandler createLauncherSwipeHandler( + private @Nullable AbsSwipeUpHandler createFallbackSwipeHandler( GestureState gestureState, long touchTimeMs) { - return new LauncherSwipeHandlerV2(this, mDeviceState, mTaskAnimationManager, - gestureState, touchTimeMs, mTaskAnimationManager.isRecentsAnimationRunning(), - mInputConsumer); + int displayId = gestureState.getDisplayId(); + TaskAnimationManager taskAnimationManager = mTaskAnimationManagerRepository.get(displayId); + RecentsAnimationDeviceState deviceState = mDeviceStateRepository.get(displayId); + RotationTouchHelper rotationTouchHelper = mRotationTouchHelperRepository.get(displayId); + if (taskAnimationManager == null || deviceState == null || rotationTouchHelper == null) { + Log.d(TAG, "displayId " + displayId + " not valid"); + return null; + } + return new FallbackSwipeHandler(this, taskAnimationManager, deviceState, + rotationTouchHelper, gestureState, touchTimeMs, + taskAnimationManager.isRecentsAnimationRunning(), + mInputConsumer, MSDLPlayerWrapper.INSTANCE.get(this)); } - private AbsSwipeUpHandler createFallbackSwipeHandler( + private @Nullable AbsSwipeUpHandler createRecentsWindowSwipeHandler( GestureState gestureState, long touchTimeMs) { - return new FallbackSwipeHandler(this, mDeviceState, mTaskAnimationManager, - gestureState, touchTimeMs, mTaskAnimationManager.isRecentsAnimationRunning(), - mInputConsumer); + int displayId = gestureState.getDisplayId(); + TaskAnimationManager taskAnimationManager = mTaskAnimationManagerRepository.get(displayId); + RecentsAnimationDeviceState deviceState = mDeviceStateRepository.get(displayId); + RotationTouchHelper rotationTouchHelper = mRotationTouchHelperRepository.get(displayId); + RecentsWindowManager recentsWindowManager = mRecentsWindowManagerRepository.get(displayId); + if (taskAnimationManager == null || deviceState == null || rotationTouchHelper == null + || recentsWindowManager == null) { + Log.d(TAG, "displayId " + displayId + " not valid"); + return null; + } + return new RecentsWindowSwipeHandler(recentsWindowManager, + taskAnimationManager, deviceState, + rotationTouchHelper, recentsWindowManager, gestureState, touchTimeMs, + taskAnimationManager.isRecentsAnimationRunning(), + mInputConsumer, MSDLPlayerWrapper.INSTANCE.get(this)); + } + + private int focusedDisplayIdForOverviewOnConnectedDisplays() { + return enableOverviewOnConnectedDisplays() + ? SystemUiProxy.INSTANCE.get(this).getFocusState().getFocusedDisplayId() + : DEFAULT_DISPLAY; + } + + private int focusedDisplayIdForAltTabKqsOnConnectedDisplays() { + return enableAltTabKqsOnConnectedDisplays.isTrue() + ? SystemUiProxy.INSTANCE.get(this).getFocusState().getFocusedDisplayId() + : DEFAULT_DISPLAY; + } + + + private OverviewGestureHandler createOverviewGestureHandler() { + return new OverviewGestureHandler() { + @Override + public void showOverview(@NonNull OverviewType type) { + mTISBinder.onOverviewShown(/* triggeredFromAltTab= */ type == OverviewType.ALT_TAB); + } + + @Override + public void hideOverview(@NonNull OverviewType type) { + mTISBinder.onOverviewHidden( + /* triggeredFromAltTab= */ type == OverviewType.ALT_TAB, + /* triggeredFromHomeKey= */ type == OverviewType.HOME); + } + }; + } + + /** + * Helper class that keeps track of external displays and prepares input monitors for each. + */ + private class InputMonitorDisplayModel extends DisplayModel { + + private InputMonitorDisplayModel( + Context context, SystemDecorationChangeObserver systemDecorationChangeObserver) { + super(context, systemDecorationChangeObserver, mDisplaysWithDecorationsRepositoryCompat, + mCoroutineDispatcher); + initializeDisplays(); + } + + @NonNull + @Override + public InputMonitorResource createDisplayResource(@NonNull Display display) { + return new InputMonitorResource(display.getDisplayId()); + } + } + + private class InputMonitorResource extends DisplayModel.DisplayResource { + + private final int displayId; + + private final InputMonitorCompat inputMonitorCompat; + private final InputEventReceiver inputEventReceiver; + + private InputMonitorResource(int displayId) { + this.displayId = displayId; + inputMonitorCompat = new InputMonitorCompat("swipe-up", displayId); + inputEventReceiver = inputMonitorCompat.getInputReceiver( + Looper.getMainLooper(), + TouchInteractionService.this.mMainChoreographer, + TouchInteractionService.this::onInputEvent); + } + + @Override + public void cleanup() { + inputEventReceiver.dispose(); + inputMonitorCompat.dispose(); + } + + @Override + public void dump(String prefix , PrintWriter writer) { + writer.println(prefix + "InputMonitorResource:"); + + writer.println(prefix + "\tdisplayId=" + displayId); + writer.println(prefix + "\tinputMonitorCompat=" + inputMonitorCompat); + writer.println(prefix + "\tinputEventReceiver=" + inputEventReceiver); + } } } diff --git a/quickstep/src/com/android/quickstep/ViewUtils.java b/quickstep/src/com/android/quickstep/ViewUtils.java index e65511b77d9..a88b3c20a54 100644 --- a/quickstep/src/com/android/quickstep/ViewUtils.java +++ b/quickstep/src/com/android/quickstep/ViewUtils.java @@ -23,6 +23,7 @@ import com.android.launcher3.Utilities; +import java.util.ArrayList; import java.util.function.BooleanSupplier; import app.lawnchair.compat.LawnchairQuickstepCompat; @@ -45,9 +46,6 @@ public static boolean postFrameDrawn(View view, Runnable onFinishRunnable) { */ public static boolean postFrameDrawn( View view, Runnable onFinishRunnable, BooleanSupplier canceled) { - if (!LawnchairQuickstepCompat.ATLEAST_U) { - return new FrameHandlerVR(view, onFinishRunnable, canceled).schedule(); - } return new FrameHandler(view, onFinishRunnable, canceled).schedule(); } @@ -135,50 +133,17 @@ private void finish() { } } - private static class FrameHandlerVR implements HardwareRenderer.FrameDrawingCallback { - - final ViewRootImpl mViewRoot; - final Runnable mFinishCallback; - final BooleanSupplier mCancelled; - final Handler mHandler; - - int mDeferFrameCount = 1; - - FrameHandlerVR(View view, Runnable finishCallback, BooleanSupplier cancelled) { - mViewRoot = view.getViewRootImpl(); - mFinishCallback = finishCallback; - mCancelled = cancelled; - mHandler = new Handler(); - } - - @Override - public void onFrameDraw(long frame) { - Utilities.postAsyncCallback(mHandler, this::onFrame); - } - - private void onFrame() { - if (mCancelled.getAsBoolean()) { - return; - } - - if (mDeferFrameCount > 0) { - mDeferFrameCount--; - schedule(); - return; - } - - if (mFinishCallback != null) { - mFinishCallback.run(); - } - } - - private boolean schedule() { - if (mViewRoot != null && mViewRoot.getView() != null) { - mViewRoot.registerRtFrameCallback(this); - mViewRoot.getView().invalidate(); - return true; - } - return false; + /** + * Adds the view to the list of accessible children. + * + * @param view The view to add. + * @param outChildren The list of accessible children. + */ + public static void addAccessibleChildToList(View view, ArrayList outChildren) { + if (view.includeForAccessibility()) { + outChildren.add(view); + } else { + view.addChildrenForAccessibility(outChildren); } } } diff --git a/quickstep/src/com/android/quickstep/actioncorner/ActionCornerHandler.kt b/quickstep/src/com/android/quickstep/actioncorner/ActionCornerHandler.kt new file mode 100644 index 00000000000..8237885c317 --- /dev/null +++ b/quickstep/src/com/android/quickstep/actioncorner/ActionCornerHandler.kt @@ -0,0 +1,216 @@ +/* + * Copyright 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.actioncorner + +import android.app.ActivityOptions +import android.content.Context +import android.view.Display.DEFAULT_DISPLAY +import android.window.SplashScreen +import com.android.launcher3.Flags.enableReversibleHomeActionCorner +import com.android.launcher3.concurrent.annotations.LightweightBackground +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.util.ActivityOptionsWrapper +import com.android.launcher3.util.RunnableList +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.quickstep.OverviewCommandHelper +import com.android.quickstep.OverviewCommandHelper.CommandType +import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE_OVERVIEW_PREVIOUS +import com.android.quickstep.OverviewComponentObserver +import com.android.quickstep.RecentsModel +import com.android.quickstep.TopTaskTracker +import com.android.quickstep.util.AnimUtils +import com.android.quickstep.util.GroupTask +import com.android.quickstep.util.SingleTask +import com.android.quickstep.util.SplitTask +import com.android.quickstep.views.RecentsViewContainer +import com.android.systemui.shared.system.ActivityManagerWrapper +import com.android.systemui.shared.system.actioncorner.ActionCornerConstants.Action +import com.android.systemui.shared.system.actioncorner.ActionCornerConstants.HOME +import com.android.systemui.shared.system.actioncorner.ActionCornerConstants.OVERVIEW +import com.android.wm.shell.shared.GroupedTaskInfo +import com.android.wm.shell.shared.desktopmode.DesktopState +import com.android.wm.shell.shared.split.SplitScreenConstants +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import java.util.concurrent.Executor +import java.util.function.Predicate + +/** + * Handles actions triggered from action corners that are mapped to specific functionalities. + * Launcher supports both overview and home actions. + */ +class ActionCornerHandler +@AssistedInject +constructor( + @ApplicationContext private val context: Context, + private val overviewComponentObserver: OverviewComponentObserver, + private val topTaskTracker: TopTaskTracker, + private val recentsModel: RecentsModel, + private val activityManagerWrapper: ActivityManagerWrapper, + private val desktopState: DesktopState, + @LightweightBackground private val executor: Executor, + @Assisted private val overviewCommandHelper: OverviewCommandHelper, +) { + @AssistedFactory + interface Factory { + fun create(overviewCommandHelper: OverviewCommandHelper): ActionCornerHandler + } + + private val displayToPreviousScreenMap = HashMap() + + fun handleAction(@Action action: Int, displayId: Int) { + when (action) { + OVERVIEW -> + if (desktopState.isProjectedMode()) { + overviewCommandHelper.addCommandsForDisplaysExcept( + TOGGLE_OVERVIEW_PREVIOUS, + DEFAULT_DISPLAY, + ) + } else { + overviewCommandHelper.addCommandsForAllDisplays(TOGGLE_OVERVIEW_PREVIOUS) + } + HOME -> + if (enableReversibleHomeActionCorner()) { + handleHomeAction(displayId) + } else { + overviewCommandHelper.addCommand(CommandType.HOME, displayId) + } + else -> {} + } + } + + private fun handleHomeAction(displayId: Int) { + val topTask = + topTaskTracker.getCachedTopTask(/* filterOnlyVisibleRecents= */ false, displayId) + val groupTask = + topTask.getPlaceholderGroupedTaskInfo(topTaskTracker.runningSplitTaskIds) ?: return + if (!groupTask.isBaseType(GroupedTaskInfo.TYPE_DESK)) { + if ( + topTask.isHomeTask && + getRecentsViewContainer(displayId)?.isRecentsViewVisible == false + ) { + goToPreviousScreen(displayId) + } else { + storeCurrentScreen(displayId, groupTask) + overviewCommandHelper.addCommand(CommandType.HOME, displayId) + } + } else { + // TODO(b/416664984): handle reversible home action for desktop mode + } + } + + private fun goToPreviousScreen(displayId: Int) { + val previousScreen = displayToPreviousScreenMap[displayId] + if (previousScreen is PreviousScreen.OverviewScreen) { + overviewCommandHelper.addCommand(CommandType.TOGGLE, displayId) + displayToPreviousScreenMap.remove(displayId) + } else { + // Get it from recentsModel so we have the latest split bound for split task. It also + // checks if the stored task is valid, it would not go to previous screen if the stored + // task is not the latest task. + recentsModel.getTasks(Predicate { it.displayId == displayId }) { + val latestTask = it.last() + val isSameAsStoredTask = + when (previousScreen) { + is PreviousScreen.SingleTaskScreen -> { + latestTask is SingleTask && + latestTask.task.key.id == previousScreen.taskId + } + + is PreviousScreen.SplitTaskScreen -> { + latestTask is SplitTask && + latestTask.topLeftTask.key.id == previousScreen.taskId1 && + latestTask.bottomRightTask.key.id == previousScreen.taskId2 + } + + else -> { + false + } + } + if (isSameAsStoredTask) { + launchGroupTask(latestTask, displayId) + } else { + // Remove the stored task as it is outdated. + displayToPreviousScreenMap.remove(displayId) + } + } + } + } + + private fun storeCurrentScreen(displayId: Int, groupTask: GroupedTaskInfo) { + if (getRecentsViewContainer(displayId)?.isRecentsViewVisible == true) { + displayToPreviousScreenMap[displayId] = PreviousScreen.OverviewScreen + } else { + if (groupTask.isBaseType(GroupedTaskInfo.TYPE_SPLIT)) { + displayToPreviousScreenMap[displayId] = + PreviousScreen.SplitTaskScreen( + groupTask.taskInfo1!!.taskId, + groupTask.taskInfo2!!.taskId, + ) + } else if (groupTask.isBaseType(GroupedTaskInfo.TYPE_FULLSCREEN)) { + displayToPreviousScreenMap[displayId] = + PreviousScreen.SingleTaskScreen(groupTask.taskInfo1!!.taskId) + } + } + } + + private fun launchGroupTask(task: GroupTask, displayId: Int) { + when (task) { + is SingleTask -> + executor.execute { + val activityOptions: ActivityOptions = + makeDefaultActivityOptions(displayId) ?: return@execute + activityManagerWrapper.startActivityFromRecents( + task.task.key.id, + activityOptions, + ) + } + is SplitTask -> { + val splitSelectStateController = + getRecentsViewContainer(displayId)?.splitSelectStateController + splitSelectStateController?.launchExistingSplitPair( + /* groupedTaskView= */ null, + task.topLeftTask.key.id, + task.bottomRightTask.key.id, + SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT, + /* callback= */ { splitSelectStateController.resetState() }, + /* freezeTaskList= */ false, + task.splitBounds?.snapPosition ?: SplitScreenConstants.SNAP_TO_2_50_50, + ) + } + } + } + + private fun getRecentsViewContainer(displayId: Int): RecentsViewContainer? = + overviewComponentObserver.getContainerInterface(displayId)?.getCreatedContainer() + + private fun makeDefaultActivityOptions(displayId: Int): ActivityOptions? { + val callbacks = RunnableList() + val options = ActivityOptions.makeCustomAnimation(context, 0, 0) + options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_UNDEFINED) + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS + ) + + val recentsViewContainer = getRecentsViewContainer(displayId) ?: return null + val endCallback = AnimUtils.completeRunnableListCallback(callbacks, recentsViewContainer) + options.setOnAnimationAbortListener(endCallback) + options.setOnAnimationFinishedListener(endCallback) + return ActivityOptionsWrapper(options, callbacks).options + } +} diff --git a/quickstep/src/com/android/quickstep/actioncorner/PreviousScreen.kt b/quickstep/src/com/android/quickstep/actioncorner/PreviousScreen.kt new file mode 100644 index 00000000000..8a72553a9c4 --- /dev/null +++ b/quickstep/src/com/android/quickstep/actioncorner/PreviousScreen.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.actioncorner + +/** Stores the screen before going home or overview for action corner. */ +sealed class PreviousScreen { + + data class SingleTaskScreen(val taskId: Int) : PreviousScreen() + + data class SplitTaskScreen(val taskId1: Int, val taskId2: Int) : PreviousScreen() + + data object OverviewScreen : PreviousScreen() +} diff --git a/quickstep/src/com/android/quickstep/dagger/QuickstepBaseActivityComponent.kt b/quickstep/src/com/android/quickstep/dagger/QuickstepBaseActivityComponent.kt new file mode 100644 index 00000000000..c09b9763669 --- /dev/null +++ b/quickstep/src/com/android/quickstep/dagger/QuickstepBaseActivityComponent.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.dagger + +import com.android.launcher3.dagger.BaseActivityContextComponent +import com.android.launcher3.taskbar.TaskbarEduTooltipController +import com.android.launcher3.taskbar.allapps.TaskbarSearchSessionController + +/** Activity Quickstep base component for Dagger injection. */ +interface QuickstepBaseActivityComponent : BaseActivityContextComponent { + + fun createTaskbarSearchSessionController(): TaskbarSearchSessionController + + fun createTaskbarEduTooltipController(): TaskbarEduTooltipController +} diff --git a/quickstep/src/com/android/quickstep/dagger/QuickstepBaseAppComponent.java b/quickstep/src/com/android/quickstep/dagger/QuickstepBaseAppComponent.java new file mode 100644 index 00000000000..078392d1658 --- /dev/null +++ b/quickstep/src/com/android/quickstep/dagger/QuickstepBaseAppComponent.java @@ -0,0 +1,132 @@ +/* + * 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.quickstep.dagger; + +import com.android.app.displaylib.DisplayRepository; +import com.android.app.displaylib.DisplaysWithDecorationsRepositoryCompat; +import com.android.app.displaylib.PerDisplayRepository; +import com.android.launcher3.LifecycleTracker; +import com.android.launcher3.dagger.LauncherAppComponent; +import com.android.launcher3.dagger.LauncherBaseAppComponent; +import com.android.launcher3.model.WellbeingModel; +import com.android.launcher3.statehandlers.DesktopVisibilityController; +import com.android.launcher3.taskbar.TaskbarModelCallbacksFactory; +import com.android.launcher3.taskbar.TaskbarUiStateMonitor; +import com.android.launcher3.taskbar.TaskbarViewCallbacksFactory; +import com.android.launcher3.taskbar.bubbles.BubbleActivityStarter; +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator; +import com.android.launcher3.taskbar.overlay.TaskbarOverlayContextFactory; +import com.android.quickstep.FallbackWindowInterface; +import com.android.quickstep.OverviewCommandHelper; +import com.android.quickstep.OverviewComponentObserver; +import com.android.quickstep.RecentsAnimationDeviceState; +import com.android.quickstep.RecentsModel; +import com.android.quickstep.RotationTouchHelper; +import com.android.quickstep.SimpleOrientationTouchTransformer; +import com.android.quickstep.SystemDecorationChangeObserver; +import com.android.quickstep.SystemUiProxy; +import com.android.quickstep.TaskAnimationManager; +import com.android.quickstep.TaskOverlayFactory; +import com.android.quickstep.TopTaskTracker; +import com.android.quickstep.actioncorner.ActionCornerHandler; +import com.android.quickstep.input.QuickstepKeyGestureEventsManager; +import com.android.quickstep.inputconsumers.NavHandleLongPressHandler; +import com.android.quickstep.logging.SettingsChangeLogger; +import com.android.quickstep.util.AsyncClockEventDelegate; +import com.android.quickstep.util.ContextualSearchHapticManager; +import com.android.quickstep.util.ContextualSearchStateManager; +import com.android.quickstep.views.RecentsDismissUtils; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.quickstep.window.RecentsWindowTracker; + +import java.util.Set; + +/** + * Launcher Quickstep base component for Dagger injection. + * + * This class is not actually annotated as a Dagger component, since it is not used directly as one. + * Doing so generates unnecessary code bloat. + * + * See {@link LauncherAppComponent} for the one actually used. + */ +public interface QuickstepBaseAppComponent extends LauncherBaseAppComponent { + + WellbeingModel getWellbeingModel(); + + AsyncClockEventDelegate getAsyncClockEventDelegate(); + + SystemUiProxy getSystemUiProxy(); + + BubbleActivityStarter getBubbleActivityStarter(); + + OverviewComponentObserver getOverviewComponentObserver(); + + DesktopVisibilityController getDesktopVisibilityController(); + + TopTaskTracker getTopTaskTracker(); + + ContextualSearchHapticManager getContextualSearchHapticManager(); + + ContextualSearchStateManager getContextualSearchStateManager(); + + PerDisplayRepository getRecentsAnimationDeviceStateRepository(); + + PerDisplayRepository getTaskAnimationManagerRepository(); + + PerDisplayRepository getRotationTouchHelperRepository(); + + PerDisplayRepository getRecentsWindowManagerRepository(); + + PerDisplayRepository getRecentsWindowTrackerRepository(); + + PerDisplayRepository getFallbackWindowInterfaceRepository(); + + RecentsModel getRecentsModel(); + + RecentsDismissUtils.Factory getRecentsDismissUtilsFactory(); + + SettingsChangeLogger getSettingsChangeLogger(); + + SimpleOrientationTouchTransformer getSimpleOrientationTouchTransformer(); + + SystemDecorationChangeObserver getSystemDecorationChangeObserver(); + + DisplayRepository getDisplayRepository(); + NavHandleLongPressHandler getNavHandleLongPressHandler(); + + ActionCornerHandler.Factory getActionCornerHandlerFactory(); + + OverviewCommandHelper.Factory getOverviewCommandHelperFactory(); + + DisplaysWithDecorationsRepositoryCompat getDisplaysWithDecorationsRepositoryCompat(); + + TaskbarModelCallbacksFactory getTaskbarModelCallbacksFactory(); + + TaskbarViewCallbacksFactory getTaskbarViewCallbacksFactory(); + + TaskbarOverlayContextFactory getTaskbarOverlayContextFactory(); + + TaskOverlayFactory getTaskOverlayFactory(); + + TaskbarUiStateMonitor getTaskbarUiStateMonitor(); + + TaskbarFeatureEvaluator getTaskbarFeatureEvaluator(); + + Set getLifecycleTrackers(); + + QuickstepKeyGestureEventsManager getQuickstepKeyGestureEventsManager(); +} diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java index 94764a58cc2..d2f76464a0b 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java @@ -18,6 +18,8 @@ import static com.android.app.animation.Interpolators.FINAL_FRAME; import static com.android.app.animation.Interpolators.INSTANT; import static com.android.app.animation.Interpolators.LINEAR; +import static com.android.launcher3.Flags.enableDesktopExplodedView; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X; @@ -26,6 +28,7 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; import static com.android.quickstep.fallback.RecentsState.OVERVIEW_SPLIT_SELECT; import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET; +import static com.android.quickstep.views.RecentsView.DESKTOP_CAROUSEL_DETACH_PROGRESS; import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS; import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS; import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; @@ -34,6 +37,7 @@ import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION; import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; import static com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA; +import static com.android.quickstep.views.RecentsViewUtils.DESK_EXPLODE_PROGRESS; import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL; import android.util.FloatProperty; @@ -47,9 +51,10 @@ import com.android.launcher3.anim.PropertySetter; import com.android.launcher3.statemanager.StateManager.StateHandler; import com.android.launcher3.states.StateAnimationConfig; -import com.android.quickstep.RecentsActivity; +import com.android.quickstep.views.AddDesktopButton; import com.android.quickstep.views.ClearAllButton; import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; /** * State controller for fallback recents activity @@ -57,12 +62,12 @@ public class FallbackRecentsStateController implements StateHandler { private final StateAnimationConfig mNoConfig = new StateAnimationConfig(); - private final RecentsActivity mActivity; + private final RecentsViewContainer mRecentsViewContainer; private final FallbackRecentsView mRecentsView; - public FallbackRecentsStateController(RecentsActivity activity) { - mActivity = activity; - mRecentsView = activity.getOverviewPanel(); + public FallbackRecentsStateController(RecentsViewContainer container) { + mRecentsViewContainer = container; + mRecentsView = container.getOverviewPanel(); } @Override @@ -81,7 +86,7 @@ public void setStateWithAnimation(RecentsState toState, StateAnimationConfig con // While animating into recents, update the visible task data as needed setter.addOnFrameCallback(() -> mRecentsView.loadVisibleTaskData(FLAG_UPDATE_ALL)); setter.addEndListener(success -> { - if (!success) { + if (!success && !toState.isRecentsViewVisible()) { mRecentsView.reset(); } }); @@ -93,13 +98,18 @@ public void setStateWithAnimation(RecentsState toState, StateAnimationConfig con private void setProperties(RecentsState state, StateAnimationConfig config, PropertySetter setter) { float clearAllButtonAlpha = state.hasClearAllButton() ? 1 : 0; - setter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA, - clearAllButtonAlpha, LINEAR); + setter.setFloat(mRecentsView.getClearAllButton(), + ClearAllButton.VISIBILITY_ALPHA, clearAllButtonAlpha, LINEAR); + if (mRecentsView.getAddDeskButton() != null) { + float addDeskButtonAlpha = state.hasAddDeskButton() ? 1 : 0; + setter.setFloat(mRecentsView.getAddDeskButton(), AddDesktopButton.VISIBILITY_ALPHA, + addDeskButtonAlpha, LINEAR); + } float overviewButtonAlpha = state.hasOverviewActions() ? 1 : 0; - setter.setFloat(mActivity.getActionsView().getVisibilityAlpha(), + setter.setFloat(mRecentsViewContainer.getActionsView().getVisibilityAlpha(), AnimatedFloat.VALUE, overviewButtonAlpha, LINEAR); - float[] scaleAndOffset = state.getOverviewScaleAndOffset(mActivity); + float[] scaleAndOffset = state.getOverviewScaleAndOffset(mRecentsViewContainer); setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0], config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR)); setter.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1], @@ -108,28 +118,39 @@ private void setProperties(RecentsState state, StateAnimationConfig config, config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR)); setter.setFloat(mRecentsView, TASK_MODALNESS, state.getOverviewModalness(), - config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR)); + config.getInterpolator(ANIM_OVERVIEW_MODAL, + enableGridOnlyOverview() && !state.isRecentsViewVisible() ? FINAL_FRAME + : LINEAR)); setter.setFloat(mRecentsView, FULLSCREEN_PROGRESS, state.isFullScreen() ? 1 : 0, LINEAR); - boolean showAsGrid = state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile()); + boolean showAsGrid = + state.displayOverviewTasksAsGrid(mRecentsViewContainer.getDeviceProfile()); setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, showAsGrid ? 1f : 0f, getOverviewInterpolator(state)); setter.setFloat(mRecentsView, TASK_THUMBNAIL_SPLASH_ALPHA, state.showTaskThumbnailSplash() ? 1f : 0f, getOverviewInterpolator(state)); + setter.setFloat(mRecentsView, DESKTOP_CAROUSEL_DETACH_PROGRESS, + state.detachDesktopCarousel() ? 1f : 0f, getOverviewInterpolator(state)); + if (enableDesktopExplodedView()) { + setter.setFloat(mRecentsView, DESK_EXPLODE_PROGRESS, + state.showExplodedDesktopView() ? 1f : 0f, + getOverviewInterpolator(state)); + } - setter.setViewBackgroundColor(mActivity.getScrimView(), state.getScrimColor(mActivity), + setter.setScrimColors(mRecentsViewContainer.getScrimView(), + state.getScrimColor(mRecentsViewContainer.asContext()), config.getInterpolator(ANIM_SCRIM_FADE, LINEAR)); if (isSplitSelectionState(state)) { - int duration = state.getTransitionDuration(mActivity, true /* isToState */); + int duration = state.getTransitionDuration(mRecentsViewContainer, true); // TODO (b/246851887): Pass in setter as a NO_ANIM PendingAnimation instead PendingAnimation pa = new PendingAnimation(duration); mRecentsView.createSplitSelectInitAnimation(pa, duration); setter.add(pa.buildAnim()); } - Pair, FloatProperty> taskViewsFloat = + Pair>, FloatProperty>> taskViewsFloat = mRecentsView.getPagedOrientationHandler().getSplitSelectTaskOffset( TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION, - mActivity.getDeviceProfile()); + mRecentsViewContainer.getDeviceProfile()); setter.setFloat(mRecentsView, taskViewsFloat.first, isSplitSelectionState(state) ? mRecentsView.getSplitSelectTranslation() : 0, LINEAR); setter.setFloat(mRecentsView, taskViewsFloat.second, 0, LINEAR); diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java index f4a2738fefa..9caef911d3d 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java @@ -17,9 +17,9 @@ import static android.app.ActivityTaskManager.INVALID_TASK_ID; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS; import static com.android.quickstep.fallback.RecentsState.DEFAULT; -import static com.android.quickstep.fallback.RecentsState.HOME; import static com.android.quickstep.fallback.RecentsState.MODAL_TASK; import static com.android.quickstep.fallback.RecentsState.OVERVIEW_SPLIT_SELECT; @@ -30,33 +30,36 @@ import androidx.annotation.Nullable; -import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.desktop.DesktopRecentsTransitionController; import com.android.launcher3.logging.StatsLogManager; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.StateManager; import com.android.launcher3.statemanager.StateManager.StateListener; +import com.android.launcher3.statemanager.StatefulContainer; import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource; -import com.android.quickstep.FallbackActivityInterface; import com.android.quickstep.GestureState; -import com.android.quickstep.RecentsActivity; -import com.android.quickstep.RotationTouchHelper; +import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle; import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.SingleTask; import com.android.quickstep.util.SplitSelectStateController; -import com.android.quickstep.util.TaskViewSimulator; import com.android.quickstep.views.OverviewActionsView; import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.views.TaskContainer; import com.android.quickstep.views.TaskView; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.recents.model.Task; +import com.android.wm.shell.shared.GroupedTaskInfo; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class FallbackRecentsView extends RecentsView +public class FallbackRecentsView> extends RecentsView implements StateListener { private static final int TASK_DISMISS_DURATION = 150; @@ -69,7 +72,7 @@ public FallbackRecentsView(Context context, AttributeSet attrs) { } public FallbackRecentsView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr, FallbackActivityInterface.INSTANCE); + super(context, attrs, defStyleAttr); mContainer.getStateManager().addStateListener(this); } @@ -77,23 +80,21 @@ public FallbackRecentsView(Context context, AttributeSet attrs, int defStyleAttr public void init(OverviewActionsView actionsView, SplitSelectStateController splitController, @Nullable DesktopRecentsTransitionController desktopRecentsTransitionController) { super.init(actionsView, splitController, desktopRecentsTransitionController); + if (mContainer instanceof RecentsWindowManager) { + // These will be set during the state transition to DEFAULT + return; + } setOverviewStateEnabled(true); setOverlayEnabled(true); } - @Override - protected void handleStartHome(boolean animated) { - mContainer.startHome(); - AbstractFloatingView.closeAllOpenViews(mContainer, mContainer.isStarted()); - } - @Override protected boolean canStartHomeSafely() { return mContainer.canStartHomeSafely(); } @Override - public StateManager getStateManager() { + public StateManager getStateManager() { return mContainer.getStateManager(); } @@ -102,12 +103,13 @@ public StateManager getStateManager() { * to the home task. This allows us to handle quick-switch similarly to a quick-switching * from a foreground task. */ - public void onGestureAnimationStartOnHome(Task[] homeTask, - RotationTouchHelper rotationTouchHelper) { + public void onGestureAnimationStartOnHome(GroupedTaskInfo homeTaskInfo) { // TODO(b/195607777) General fallback love, but this might be correct // Home task should be defined as the front-most task info I think? - mHomeTask = homeTask.length > 0 ? homeTask[0] : null; - onGestureAnimationStart(homeTask, rotationTouchHelper); + if (homeTaskInfo != null) { + mHomeTask = Task.from(homeTaskInfo.getTaskInfo1()); + } + onGestureAnimationStart(homeTaskInfo); } /** @@ -117,17 +119,19 @@ public void onGestureAnimationStartOnHome(Task[] homeTask, */ @Override public void onPrepareGestureEndAnimation( - @Nullable AnimatorSet animatorSet, GestureState.GestureEndTarget endTarget, - TaskViewSimulator[] taskViewSimulators) { - super.onPrepareGestureEndAnimation(animatorSet, endTarget, taskViewSimulators); - if (mHomeTask != null && endTarget == RECENTS && animatorSet != null) { - TaskView tv = getTaskViewByTaskId(mHomeTask.key.id); - if (tv != null) { - PendingAnimation pa = new PendingAnimation(TASK_DISMISS_DURATION); - createTaskDismissAnimation(pa, tv, true, false, - TASK_DISMISS_DURATION, false /* dismissingForSplitSelection*/); - pa.addEndListener(e -> setCurrentTask(-1)); - AnimatorPlaybackController controller = pa.createPlaybackController(); + AnimatorSet animatorSet, GestureState.GestureEndTarget endTarget, + RemoteTargetHandle[] remoteTargetHandles, boolean isHandlingAtomicEvent) { + super.onPrepareGestureEndAnimation(animatorSet, endTarget, remoteTargetHandles, + isHandlingAtomicEvent); + if (mHomeTask != null && endTarget == RECENTS) { + TaskView homeTaskView = getTaskViewByTaskId(mHomeTask.key.id); + if (homeTaskView != null) { + PendingAnimation pendingAnimation = new PendingAnimation(TASK_DISMISS_DURATION); + createTaskDismissAnimation(pendingAnimation, homeTaskView, true, false, + TASK_DISMISS_DURATION, false /* dismissingForSplitSelection*/, + null /* gridEndData */); + pendingAnimation.addEndListener(e -> setCurrentTask(-1)); + AnimatorPlaybackController controller = pendingAnimation.createPlaybackController(); controller.dispatchOnStart(); animatorSet.play(controller.getAnimationPlayer()); } @@ -161,26 +165,24 @@ protected TaskView getHomeTaskView() { } @Override - protected boolean shouldAddStubTaskView(Task[] runningTasks) { - if (runningTasks.length > 1) { + protected boolean shouldAvoidAddingStubTaskView(GroupedTaskInfo groupedTaskInfo) { + if (!groupedTaskInfo.isBaseType(GroupedTaskInfo.TYPE_FULLSCREEN)) { // can't be in split screen w/ home task - return super.shouldAddStubTaskView(runningTasks); + return super.shouldAvoidAddingStubTaskView(groupedTaskInfo); } - Task runningTask = runningTasks[0]; - if (mHomeTask != null && runningTask != null - && mHomeTask.key.id == runningTask.key.id - && getTaskViewCount() == 0 && mLoadPlanEverApplied) { + if (mHomeTask != null && groupedTaskInfo.containsTask(mHomeTask.key.id) && !hasTaskViews() + && mLoadPlanEverApplied) { // Do not add a stub task if we are running over home with empty recents, so that we // show the empty recents message instead of showing a stub task and later removing it. - // Ignore empty task signal if applyLoadPlan has never run. - return false; + // Ignore empty task signal if [applyLoadPlan] has never run. + return true; } - return super.shouldAddStubTaskView(runningTasks); + return super.shouldAvoidAddingStubTaskView(groupedTaskInfo); } @Override - protected void applyLoadPlan(List taskGroups) { + protected void applyLoadPlan(List taskGroups, int taskListChangeId) { // When quick-switching on 3p-launcher, we add a "stub" tile corresponding to Launcher // as well. This tile is never shown as we have setCurrentTaskHidden, but allows use to // track the index of the next task appropriately, as if we are switching on any other app. @@ -200,11 +202,11 @@ protected void applyLoadPlan(List taskGroups) { if (!found) { ArrayList newList = new ArrayList<>(taskGroups.size() + 1); newList.addAll(taskGroups); - newList.add(new GroupTask(mHomeTask, null, null)); + newList.add(new SingleTask(mHomeTask)); taskGroups = newList; } } - super.applyLoadPlan(taskGroups); + super.applyLoadPlan(taskGroups, taskListChangeId); } @Override @@ -229,17 +231,24 @@ public void setModalStateEnabled(int taskId, boolean animate) { } @Override - public void initiateSplitSelect(TaskView taskView, + public void initiateSplitSelect(TaskContainer taskContainer, @SplitConfigurationOptions.StagePosition int stagePosition, StatsLogManager.EventEnum splitEvent) { - super.initiateSplitSelect(taskView, stagePosition, splitEvent); + super.initiateSplitSelect(taskContainer, stagePosition, splitEvent); mContainer.getStateManager().goToState(OVERVIEW_SPLIT_SELECT); } @Override public void onStateTransitionStart(RecentsState toState) { - setOverviewStateEnabled(true); - setOverviewGridEnabled(toState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())); + setOverviewStateEnabled(toState.isRecentsViewVisible()); + if (enableGridOnlyOverview()) { + if (toState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())) { + setOverviewGridEnabled(true); + } + } else { + setOverviewGridEnabled( + toState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())); + } setOverviewFullscreenEnabled(toState.isFullScreen()); if (toState == MODAL_TASK) { setOverviewSelectEnabled(true); @@ -247,8 +256,11 @@ public void onStateTransitionStart(RecentsState toState) { resetModalVisuals(); } - // Set border after select mode changes to avoid showing border during state transition - if (!toState.isRecentsViewVisible() || toState == MODAL_TASK) { + resetShareUIState(); + + // Set border state changes to avoid showing border during state transitions + if (!toState.isRecentsViewVisible() || toState == MODAL_TASK + || toState == OVERVIEW_SPLIT_SELECT) { setTaskBorderEnabled(false); } @@ -257,7 +269,14 @@ public void onStateTransitionStart(RecentsState toState) { @Override public void onStateTransitionComplete(RecentsState finalState) { - if (finalState == HOME) { + DesktopVisibilityController.INSTANCE.get(mContainer).onLauncherStateChanged( + mContainer.getDisplayId(), finalState); + if (enableGridOnlyOverview()) { + if (!finalState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())) { + setOverviewGridEnabled(false); + } + } + if (!finalState.isRecentsViewVisible()) { // Clean-up logic that occurs when recents is no longer in use/visible. reset(); } @@ -273,16 +292,12 @@ public void onStateTransitionComplete(RecentsState finalState) { } if (finalState != OVERVIEW_SPLIT_SELECT) { - if (FeatureFlags.enableSplitContextually()) { - mSplitSelectStateController.resetState(); - } else { - resetFromSplitSelectionState(); - } + mSplitSelectStateController.resetState(); } + // disabling this so app icons aren't drawn on top of recent tasks. if (isOverlayEnabled) { - runActionOnRemoteHandles(remoteTargetHandle -> - remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(true)); + mBlurUtils.setDrawLiveTileBelowRecents(true); } } @@ -309,13 +324,12 @@ public void initiateSplitSelect(SplitSelectSource splitSelectSource) { } @Override - protected boolean canLaunchFullscreenTask() { + public boolean canLaunchFullscreenTask() { + // On external displays, the container is RecentsWindowManager and its state can be stale. + // Query `isSplitSelectionActive` directly for the current split selection status. + if (mContainer instanceof RecentsWindowManager) { + return !isSplitSelectionActive(); + } return !mContainer.isInState(OVERVIEW_SPLIT_SELECT); } - - /** Returns if app pairs are supported in this launcher. */ - @Override - public boolean supportsAppPairs() { - return false; - } } diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java b/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java index 29c3dc81da1..4239d57c848 100644 --- a/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java +++ b/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java @@ -15,17 +15,40 @@ */ package com.android.quickstep.fallback; +import static com.android.launcher3.Flags.enableExpressiveDismissTaskMotion; +import static com.android.quickstep.fallback.RecentsState.MODAL_TASK; + import android.content.Context; import android.util.AttributeSet; +import com.android.launcher3.statemanager.StatefulContainer; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewDismissTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewLaunchTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewRecentsTouchContext; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchControllerDeprecated; import com.android.launcher3.util.TouchController; import com.android.launcher3.views.BaseDragLayer; -import com.android.quickstep.RecentsActivity; +import com.android.quickstep.views.RecentsViewContainer; /** * Drag layer for fallback recents activity */ -public class RecentsDragLayer extends BaseDragLayer { +public class RecentsDragLayer> extends BaseDragLayer { + + private final TaskViewRecentsTouchContext mTaskViewRecentsTouchContext = + new TaskViewRecentsTouchContext() { + @Override + public boolean isRecentsInteractive() { + return mContainer.getRootView().hasWindowFocus() + || mContainer.getStateManager().getState().hasLiveTile(); + } + + @Override + public boolean isRecentsModal() { + return mContainer.isInState(MODAL_TASK); + } + }; public RecentsDragLayer(Context context, AttributeSet attrs) { super(context, attrs, 1 /* alphaChannelCount */); @@ -33,9 +56,19 @@ public RecentsDragLayer(Context context, AttributeSet attrs) { @Override public void recreateControllers() { - mControllers = new TouchController[] { - new RecentsTaskController(mActivity), - new FallbackNavBarTouchController(mActivity), - }; + super.recreateControllers(); + mControllers = enableExpressiveDismissTaskMotion() + ? new TouchController[]{ + new TaskViewLaunchTouchController<>(mContainer, + mTaskViewRecentsTouchContext), + new TaskViewDismissTouchController<>(mContainer, + mTaskViewRecentsTouchContext), + new FallbackNavBarTouchController(mContainer) + } + : new TouchController[]{ + new TaskViewTouchControllerDeprecated<>(mContainer, + mTaskViewRecentsTouchContext), + new FallbackNavBarTouchController(mContainer) + }; } } diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java index a47c6e4c70c..e69de29bb2d 100644 --- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java +++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java @@ -1,193 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.fallback; - -import static com.android.launcher3.LauncherState.FLAG_CLOSE_POPUPS; -import static com.android.launcher3.uioverrides.states.BackgroundAppState.getOverviewScaleAndOffsetForBackgroundState; -import static com.android.launcher3.uioverrides.states.OverviewModalTaskState.getOverviewScaleAndOffsetForModalState; - -import android.content.Context; -import android.graphics.Color; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.statemanager.BaseState; -import com.android.quickstep.RecentsActivity; -import com.android.launcher3.util.Themes; -import com.android.quickstep.views.RecentsViewContainer; - -import app.lawnchair.theme.color.tokens.ColorTokens; - -/** - * State definition for Fallback recents - */ -public class RecentsState implements BaseState { - - private static final int FLAG_MODAL = BaseState.getFlag(0); - private static final int FLAG_CLEAR_ALL_BUTTON = BaseState.getFlag(1); - private static final int FLAG_FULL_SCREEN = BaseState.getFlag(2); - private static final int FLAG_OVERVIEW_ACTIONS = BaseState.getFlag(3); - private static final int FLAG_SHOW_AS_GRID = BaseState.getFlag(4); - private static final int FLAG_SCRIM = BaseState.getFlag(5); - private static final int FLAG_LIVE_TILE = BaseState.getFlag(6); - private static final int FLAG_RECENTS_VIEW_VISIBLE = BaseState.getFlag(7); - private static final int FLAG_TASK_THUMBNAIL_SPLASH = BaseState.getFlag(8); - - public static final RecentsState DEFAULT = new RecentsState(0, - FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID - | FLAG_SCRIM | FLAG_LIVE_TILE | FLAG_RECENTS_VIEW_VISIBLE); - public static final RecentsState MODAL_TASK = new ModalState(1, - FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL - | FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_LIVE_TILE | FLAG_RECENTS_VIEW_VISIBLE); - public static final RecentsState BACKGROUND_APP = new BackgroundAppState(2, - FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN - | FLAG_RECENTS_VIEW_VISIBLE - | FLAG_TASK_THUMBNAIL_SPLASH); - public static final RecentsState HOME = new RecentsState(3, 0); - public static final RecentsState BG_LAUNCHER = new LauncherState(4, 0); - public static final RecentsState OVERVIEW_SPLIT_SELECT = new RecentsState(5, - FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_RECENTS_VIEW_VISIBLE | FLAG_CLOSE_POPUPS - | FLAG_DISABLE_RESTORE); - - public final int ordinal; - private final int mFlags; - - private static final float NO_OFFSET = 0; - private static final float NO_SCALE = 1; - - public RecentsState(int id, int flags) { - this.ordinal = id; - this.mFlags = flags; - } - - @Override - public String toString() { - return "Ordinal-" + ordinal; - } - - @Override - public final boolean hasFlag(int mask) { - return (mFlags & mask) != 0; - } - - @Override - public int getTransitionDuration(Context context, boolean isToState) { - return 250; - } - - @Override - public RecentsState getHistoryForState(RecentsState previousState) { - return DEFAULT; - } - - /** - * For this state, how modal should over view been shown. 0 modalness means all - * tasks drawn, - * 1 modalness means the current task is show on its own. - */ - public float getOverviewModalness() { - return hasFlag(FLAG_MODAL) ? 1 : 0; - } - - public boolean isFullScreen() { - return hasFlag(FLAG_FULL_SCREEN); - } - - /** - * For this state, whether clear all button should be shown. - */ - public boolean hasClearAllButton() { - return hasFlag(FLAG_CLEAR_ALL_BUTTON); - } - - /** - * For this state, whether overview actions should be shown. - */ - public boolean hasOverviewActions() { - return hasFlag(FLAG_OVERVIEW_ACTIONS); - } - - /** - * For this state, whether live tile should be shown. - */ - public boolean hasLiveTile() { - return hasFlag(FLAG_LIVE_TILE); - } - - /** - * For this state, what color scrim should be drawn behind overview. - */ - public int getScrimColor(RecentsActivity activity) { - return hasFlag(FLAG_SCRIM) ? ColorTokens.OverviewScrim.resolveColor(activity) - : Color.TRANSPARENT; - } - - public float[] getOverviewScaleAndOffset(RecentsViewContainer container) { - return new float[] { NO_SCALE, NO_OFFSET }; - } - - /** - * For this state, whether tasks should layout as a grid rather than a list. - */ - public boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) { - return hasFlag(FLAG_SHOW_AS_GRID) && deviceProfile.isTablet; - } - - @Override - public boolean showTaskThumbnailSplash() { - return hasFlag(FLAG_TASK_THUMBNAIL_SPLASH); - } - - /** - * True if the state has overview panel visible. - */ - public boolean isRecentsViewVisible() { - return hasFlag(FLAG_RECENTS_VIEW_VISIBLE); - } - - private static class ModalState extends RecentsState { - - public ModalState(int id, int flags) { - super(id, flags); - } - - @Override - public float[] getOverviewScaleAndOffset(RecentsViewContainer container) { - return getOverviewScaleAndOffsetForModalState(container.getOverviewPanel()); - } - } - - private static class BackgroundAppState extends RecentsState { - public BackgroundAppState(int id, int flags) { - super(id, flags); - } - - @Override - public float[] getOverviewScaleAndOffset(RecentsViewContainer container) { - return getOverviewScaleAndOffsetForBackgroundState(container.getOverviewPanel()); - } - } - - private static class LauncherState extends RecentsState { - LauncherState(int id, int flags) { - super(id, flags); - } - - @Override - public float[] getOverviewScaleAndOffset(RecentsViewContainer container) { - return new float[] { NO_SCALE, 1 }; - } - } -} diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.kt b/quickstep/src/com/android/quickstep/fallback/RecentsState.kt new file mode 100644 index 00000000000..51008c24f69 --- /dev/null +++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.kt @@ -0,0 +1,329 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.fallback + +import android.content.Context +import android.graphics.Color +import android.graphics.Rect +import androidx.annotation.FloatRange +import com.android.app.animation.Interpolators +import com.android.launcher3.DeviceProfile +import com.android.launcher3.Flags +import com.android.launcher3.LauncherState +import com.android.launcher3.LauncherState.FLAG_CLOSE_POPUPS +import com.android.launcher3.R +import com.android.launcher3.anim.AnimatorPlaybackController +import com.android.launcher3.anim.PendingAnimation +import com.android.launcher3.statemanager.BaseState +import com.android.launcher3.statemanager.BaseState.FLAG_DISABLE_RESTORE +import com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview +import com.android.launcher3.util.Themes +import com.android.launcher3.views.ActivityContext +import com.android.launcher3.views.ScrimColors +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsViewContainer +import kotlin.math.min + +/** State definition for Fallback recents */ +open class RecentsState(@JvmField val ordinal: Int, private val mFlags: Int) : + BaseState { + init { + sAllStates[ordinal] = this + } + + protected var backAnimationController: AnimatorPlaybackController? = null + + override fun toString() = + when (ordinal) { + DEFAULT_STATE_ORDINAL -> "RECENTS_DEFAULT" + MODAL_TASK_ORDINAL -> "RECENTS_MODAL_TASK" + BACKGROUND_APP_ORDINAL -> "RECENTS_BACKGROUND_APP" + HOME_STATE_ORDINAL -> "RECENTS_HOME" + BG_LAUNCHER_ORDINAL -> "RECENTS_BG_LAUNCHER" + OVERVIEW_SPLIT_SELECT_ORDINAL -> "RECENTS_SPLIT_SELECT" + else -> "RECENTS Unknown Ordinal-$ordinal" + } + + override fun hasFlag(mask: Int) = (mFlags and mask) != 0 + + override fun getTransitionDuration(context: ActivityContext, isToState: Boolean) = 250 + + override fun getHistoryForState(previousState: RecentsState) = DEFAULT + + /** + * For this state, how modal should over view been shown. 0 modalness means all tasks drawn, 1 + * modalness means the current task is show on its own. + */ + fun getOverviewModalness() = if (hasFlag(FLAG_MODAL)) 1f else 0f + + fun isFullScreen() = hasFlag(FLAG_FULL_SCREEN) + + /** For this state, whether clear all button should be shown. */ + fun hasClearAllButton() = hasFlag(FLAG_CLEAR_ALL_BUTTON) + + /** For this state, whether add desk button should be shown. */ + fun hasAddDeskButton() = hasFlag(FLAG_ADD_DESK_BUTTON) + + /** For this state, whether overview actions should be shown. */ + fun hasOverviewActions() = hasFlag(FLAG_OVERVIEW_ACTIONS) + + /** For this state, whether live tile should be shown. */ + fun hasLiveTile() = hasFlag(FLAG_LIVE_TILE) + + /** For this state, what color scrim should be drawn behind overview. */ + fun getScrimColor(context: Context) = + ScrimColors( + /* backgroundColor= */ if (hasFlag(FLAG_SCRIM)) + Themes.getAttrColor(context, R.attr.overviewScrimColor) + else Color.TRANSPARENT, + /* foregroundColor= */ Color.TRANSPARENT, + ) + + open fun getOverviewScaleAndOffset(container: RecentsViewContainer) = + floatArrayOf(NO_SCALE, NO_OFFSET) + + /** For this state, whether tasks should layout as a grid rather than a list. */ + override fun displayOverviewTasksAsGrid(deviceProfile: DeviceProfile) = + hasFlag(FLAG_SHOW_AS_GRID) && deviceProfile.deviceProperties.isTablet + + override fun showTaskThumbnailSplash() = hasFlag(FLAG_TASK_THUMBNAIL_SPLASH) + + override fun showExplodedDesktopView() = + hasFlag(FLAG_SHOW_EXPLODED_DESKTOP_VIEW) && Flags.enableDesktopExplodedView() + + /** True if the state has overview panel visible. */ + fun isRecentsViewVisible() = hasFlag(FLAG_RECENTS_VIEW_VISIBLE) + + /** + * Handles the back invocation. If a live task is present and visible, launch it; if present but + * not fully visible, snap scroll to it; otherwise, return home. + * + *

Ignore the invocation if a state transition is still in progress. + * + * @param container The RecentsViewContainer. + */ + open fun onBackInvoked(container: RecentsViewContainer) { + val recentsView = container.getOverviewPanel>() + val runningTaskView = recentsView.runningTaskView + when { + recentsView.stateManager.isInTransition -> {} // NO-OP. + runningTaskView == null || runningTaskView.isBeingDismissed -> recentsView.startHome() + recentsView.isTaskViewFullyVisible(runningTaskView) -> + runningTaskView.launchWithAnimation() + else -> { + backAnimationController?.reverse() + recentsView.snapToPage(recentsView.indexOfChild(runningTaskView)) + } + } + } + + /** + * Creates the back animation. + * + * @param container The RecentsViewContainer. + */ + open fun onBackStarted(container: RecentsViewContainer) { + val recentsView = container.getOverviewPanel>() + val runningTaskView = recentsView.runningTaskView + + val targetScale: Float = + when { + runningTaskView == null -> PREDICTIVE_BACK_MIN_RECENTS_SCALE_HOME + recentsView.isTaskViewFullyVisible(runningTaskView) -> + PREDICTIVE_BACK_MAX_RECENTS_SCALE_LAUNCH + else -> PREDICTIVE_BACK_MIN_RECENTS_SCALE_SCROLL + } + backAnimationController = + PendingAnimation(PREDICTIVE_BACK_DURATION) + .apply { + addFloat( + recentsView, + RecentsView.RECENTS_SCALE_PROPERTY, + 1f, + targetScale, + Interpolators.LINEAR, + ) + addFloat( + recentsView, + RecentsView.FULLSCREEN_PROGRESS, + 0f, + PREDICTIVE_BACK_MAX_FULLSCREEN_PROGRESS_LAUNCH, + Interpolators.LINEAR, + ) + } + .createPlaybackController() + } + + /** + * Updates the back animation progress. + * + * @param container The RecentsViewContainer. + * @param backProgress The current back progress (0.0 to 1.0). + */ + open fun onBackProgressed( + container: RecentsViewContainer?, + @FloatRange(from = 0.0, to = 1.0) backProgress: Float, + ) { + backAnimationController?.setPlayFraction(backProgress) + } + + private class ModalState(id: Int, flags: Int) : RecentsState(id, flags) { + override fun getOverviewScaleAndOffset(container: RecentsViewContainer): FloatArray = + if (enableGridOnlyOverview()) { + super.getOverviewScaleAndOffset(container) + } else getOverviewScaleAndOffsetForModalState(container.getOverviewPanel()) + + private fun getOverviewScaleAndOffsetForModalState( + recentsView: RecentsView<*, *> + ): FloatArray { + val taskSize = recentsView.selectedTaskBounds + val modalTaskSize = Rect().apply { recentsView.getModalTaskSize(this) } + val scale = + min( + modalTaskSize.height().toFloat() / taskSize.height(), + modalTaskSize.width().toFloat() / taskSize.width(), + ) + return floatArrayOf(scale, LauncherState.NO_OFFSET) + } + + override fun onBackInvoked(container: RecentsViewContainer) { + container.goToRecentsState(DEFAULT, true) + } + + override fun onBackStarted(container: RecentsViewContainer) { + val recentsView = container.getOverviewPanel>() + backAnimationController = + PendingAnimation(PREDICTIVE_BACK_DURATION) + .apply { + addFloat( + recentsView, + RecentsView.TASK_MODALNESS, + 1f, + PREDICTIVE_BACK_MIN_TASK_MODALNESS, + Interpolators.LINEAR, + ) + } + .createPlaybackController() + } + } + + private class BackgroundAppState(id: Int, flags: Int) : RecentsState(id, flags) { + override fun getOverviewScaleAndOffset(container: RecentsViewContainer) = + floatArrayOf( + container.getOverviewPanel>().maxScaleForFullScreen, + LauncherState.NO_OFFSET, + ) + } + + private class BgLauncherState(id: Int, flags: Int) : RecentsState(id, flags) { + override fun getOverviewScaleAndOffset(container: RecentsViewContainer) = + floatArrayOf(NO_SCALE, 1f) + } + + override fun equals(other: Any?) = + when (other) { + is RecentsState -> other === this + is LauncherState -> other === this.toLauncherState() + else -> false + } + + companion object { + private val FLAG_MODAL = BaseState.getFlag(0) + private val FLAG_CLEAR_ALL_BUTTON = BaseState.getFlag(1) + private val FLAG_FULL_SCREEN = BaseState.getFlag(2) + private val FLAG_OVERVIEW_ACTIONS = BaseState.getFlag(3) + private val FLAG_SHOW_AS_GRID = BaseState.getFlag(4) + private val FLAG_SCRIM = BaseState.getFlag(5) + private val FLAG_LIVE_TILE = BaseState.getFlag(6) + private val FLAG_RECENTS_VIEW_VISIBLE = BaseState.getFlag(7) + private val FLAG_TASK_THUMBNAIL_SPLASH = BaseState.getFlag(8) + private val FLAG_ADD_DESK_BUTTON = BaseState.getFlag(9) + private val FLAG_SHOW_EXPLODED_DESKTOP_VIEW = BaseState.getFlag(10) + + private const val PREDICTIVE_BACK_DURATION = 1000L + private const val PREDICTIVE_BACK_MAX_RECENTS_SCALE_LAUNCH = 1.1f + private const val PREDICTIVE_BACK_MIN_RECENTS_SCALE_HOME = 0.9f + private const val PREDICTIVE_BACK_MAX_FULLSCREEN_PROGRESS_LAUNCH = 0.1f + private const val PREDICTIVE_BACK_MIN_RECENTS_SCALE_SCROLL = 0.95f + private const val PREDICTIVE_BACK_MIN_TASK_MODALNESS = 0.8f + + const val DEFAULT_STATE_ORDINAL = 0 + const val MODAL_TASK_ORDINAL = 1 + const val BACKGROUND_APP_ORDINAL = 2 + const val HOME_STATE_ORDINAL = 3 + const val BG_LAUNCHER_ORDINAL = 4 + const val OVERVIEW_SPLIT_SELECT_ORDINAL = 5 + + private val sAllStates = arrayOfNulls(6) + + @JvmField + val DEFAULT: RecentsState = + RecentsState( + DEFAULT_STATE_ORDINAL, + (FLAG_DISABLE_RESTORE or + FLAG_CLEAR_ALL_BUTTON or + FLAG_OVERVIEW_ACTIONS or + FLAG_SHOW_AS_GRID or + FLAG_SCRIM or + FLAG_LIVE_TILE or + FLAG_RECENTS_VIEW_VISIBLE or + FLAG_ADD_DESK_BUTTON or + FLAG_SHOW_EXPLODED_DESKTOP_VIEW), + ) + @JvmField + val MODAL_TASK: RecentsState = + ModalState( + MODAL_TASK_ORDINAL, + (FLAG_DISABLE_RESTORE or + FLAG_OVERVIEW_ACTIONS or + FLAG_MODAL or + FLAG_SHOW_AS_GRID or + FLAG_SCRIM or + FLAG_LIVE_TILE or + FLAG_RECENTS_VIEW_VISIBLE or + FLAG_SHOW_EXPLODED_DESKTOP_VIEW), + ) + @JvmField + val BACKGROUND_APP: RecentsState = + BackgroundAppState( + BACKGROUND_APP_ORDINAL, + (FLAG_DISABLE_RESTORE or + BaseState.FLAG_NON_INTERACTIVE or + FLAG_FULL_SCREEN or + FLAG_RECENTS_VIEW_VISIBLE or + FLAG_TASK_THUMBNAIL_SPLASH), + ) + @JvmField val HOME: RecentsState = RecentsState(HOME_STATE_ORDINAL, 0) + @JvmField val BG_LAUNCHER: RecentsState = BgLauncherState(BG_LAUNCHER_ORDINAL, 0) + @JvmField + val OVERVIEW_SPLIT_SELECT: RecentsState = + RecentsState( + OVERVIEW_SPLIT_SELECT_ORDINAL, + (FLAG_SHOW_AS_GRID or + FLAG_SCRIM or + FLAG_RECENTS_VIEW_VISIBLE or + FLAG_CLOSE_POPUPS or + FLAG_DISABLE_RESTORE or + FLAG_SHOW_EXPLODED_DESKTOP_VIEW), + ) + + /** Returns the corresponding RecentsState from ordinal provided */ + @JvmStatic fun stateFromOrdinal(ordinal: Int) = sAllStates[ordinal]!! + + private const val NO_OFFSET = 0f + private const val NO_SCALE = 1f + } +} diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsStateUtils.kt b/quickstep/src/com/android/quickstep/fallback/RecentsStateUtils.kt new file mode 100644 index 00000000000..39ec0834ffb --- /dev/null +++ b/quickstep/src/com/android/quickstep/fallback/RecentsStateUtils.kt @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.fallback + +import com.android.launcher3.LauncherState +import com.android.launcher3.testing.shared.TestProtocol + +fun RecentsState.toLauncherState(): LauncherState { + return when (ordinal) { + RecentsState.DEFAULT_STATE_ORDINAL -> LauncherState.OVERVIEW + RecentsState.MODAL_TASK_ORDINAL -> LauncherState.OVERVIEW_MODAL_TASK + RecentsState.BACKGROUND_APP_ORDINAL -> LauncherState.BACKGROUND_APP + RecentsState.HOME_STATE_ORDINAL -> LauncherState.NORMAL + RecentsState.BG_LAUNCHER_ORDINAL -> LauncherState.NORMAL + RecentsState.OVERVIEW_SPLIT_SELECT_ORDINAL -> LauncherState.OVERVIEW_SPLIT_SELECT + else -> LauncherState.NORMAL + } +} + +fun LauncherState.toRecentsState(): RecentsState { + return when (ordinal) { + TestProtocol.OVERVIEW_STATE_ORDINAL -> RecentsState.DEFAULT + TestProtocol.OVERVIEW_MODAL_TASK_STATE_ORDINAL -> RecentsState.MODAL_TASK + TestProtocol.BACKGROUND_APP_STATE_ORDINAL -> RecentsState.BACKGROUND_APP + TestProtocol.NORMAL_STATE_ORDINAL -> RecentsState.HOME + TestProtocol.OVERVIEW_SPLIT_SELECT_ORDINAL -> RecentsState.OVERVIEW_SPLIT_SELECT + else -> RecentsState.BG_LAUNCHER + } +} + +fun LauncherState.hasEquivalentRecentsState(): Boolean { + return when (this) { + LauncherState.OVERVIEW, + LauncherState.OVERVIEW_MODAL_TASK, + LauncherState.BACKGROUND_APP, + LauncherState.NORMAL, + LauncherState.OVERVIEW_SPLIT_SELECT -> true + else -> false + } +} + +fun RecentsState.toLauncherStateOrdinal(): Int = toLauncherState().ordinal diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java b/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java deleted file mode 100644 index 2cb398cfff6..00000000000 --- a/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java +++ /dev/null @@ -1,36 +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.quickstep.fallback; - -import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController; -import com.android.quickstep.RecentsActivity; - -public class RecentsTaskController extends TaskViewTouchController { - - public RecentsTaskController(RecentsActivity activity) { - super(activity); - } - - @Override - protected boolean isRecentsInteractive() { - return mContainer.hasWindowFocus() || mContainer.getStateManager().getState().hasLiveTile(); - } - - @Override - protected boolean isRecentsModal() { - return false; - } -} diff --git a/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt b/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt new file mode 100644 index 00000000000..d56869d1988 --- /dev/null +++ b/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt @@ -0,0 +1,280 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.input + +import android.Manifest.permission.MANAGE_KEY_GESTURES +import android.app.PendingIntent +import android.content.Context +import android.content.pm.PackageManager.PERMISSION_GRANTED +import android.hardware.input.InputManager +import android.hardware.input.InputManager.KeyGestureEventHandler +import android.hardware.input.KeyGestureEvent +import android.hardware.input.KeyGestureEvent.ACTION_GESTURE_COMPLETE +import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS +import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS +import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER +import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY +import android.net.Uri +import android.os.IBinder +import android.provider.Settings +import android.provider.Settings.Secure.USER_SETUP_COMPLETE +import android.util.Log +import androidx.annotation.VisibleForTesting +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.DaggerSingletonObject +import com.android.launcher3.util.SettingsCache +import com.android.launcher3.util.SettingsCache.OnChangeListener +import com.android.quickstep.OverviewCommandHelper +import com.android.quickstep.dagger.QuickstepBaseAppComponent +import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType.ALT_TAB +import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType.UNDEFINED +import com.android.window.flags2.Flags +import javax.inject.Inject + +/** + * Manages subscription and unsubscription to launcher's key gesture events, e.g. all apps and + * recents (incl. alt + tab). + */ +@LauncherAppSingleton +class QuickstepKeyGestureEventsManager +@Inject +constructor( + @ApplicationContext private val context: Context, + private val settingsCache: SettingsCache, +) { + @VisibleForTesting + val onUserSetupCompleteListener = OnChangeListener { isUserSetupCompleted = it } + private val inputManager = requireNotNull(context.getSystemService(InputManager::class.java)) + private var allAppsPendingIntent: PendingIntent? = null + private var overviewGestureHandler: OverviewGestureHandler? = null + private var overviewCommandHelper: OverviewCommandHelper? = null + private var isUserSetupCompleted: Boolean = settingsCache.getValue(USER_SETUP_COMPLETE_URI) + + init { + settingsCache.register(USER_SETUP_COMPLETE_URI, onUserSetupCompleteListener) + } + + @VisibleForTesting + val allAppsKeyGestureEventHandler = + object : KeyGestureEventHandler { + override fun handleKeyGestureEvent(event: KeyGestureEvent, focusedToken: IBinder?) { + if (!isManageKeyGesturesGrantedToRecents()) { + return + } + if (!isUserSetupCompleted) { + return + } + + if (event.keyGestureType != KEY_GESTURE_TYPE_ALL_APPS) { + Log.e(TAG, "Ignore unsupported key gesture event type: ${event.keyGestureType}") + return + } + + // Ignore the display ID from the KeyGestureEvent as we will use the focus display + // from the SysUi proxy as the source of truth. + allAppsPendingIntent?.send() + } + } + + @VisibleForTesting + val overviewKeyGestureEventHandler = + object : KeyGestureEventHandler { + override fun handleKeyGestureEvent(event: KeyGestureEvent, focusedToken: IBinder?) { + if (!isManageKeyGesturesGrantedToRecents()) { + return + } + if (!isUserSetupCompleted) { + return + } + + val handler = overviewGestureHandler ?: return + when (event.keyGestureType) { + KEY_GESTURE_TYPE_RECENT_APPS -> { + if (event.action == ACTION_GESTURE_COMPLETE && !event.isCancelled) { + handler.showOverview(UNDEFINED) + } + } + KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER -> { + if (event.action == KeyGestureEvent.ACTION_GESTURE_START) { + handler.showOverview(ALT_TAB) + } else { + handler.hideOverview(ALT_TAB) + } + } + else -> { + Log.e( + TAG, + "Ignore unsupported overview key gesture event type: " + + event.keyGestureType, + ) + } + } + } + } + + @VisibleForTesting + val homeKeyGestureEventHandler = + object : KeyGestureEventHandler { + override fun handleKeyGestureEvent(event: KeyGestureEvent, focusedToken: IBinder?) { + if (!isManageKeyGesturesGrantedToRecents()) { + return + } + if (!isUserSetupCompleted) { + return + } + + if (event.keyGestureType != KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY) { + Log.e(TAG, "Ignore unsupported key gesture event type: ${event.keyGestureType}") + return + } + + overviewCommandHelper?.addCommand( + OverviewCommandHelper.CommandType.HOME, + event.displayId, + ) + } + } + + /** + * Registers the all apps key gesture events. + * + * Subsequent registrations are ignored until [unregisterAllAppsKeyGestureEvent] is called. + */ + fun registerAllAppsKeyGestureEvent(allAppsPendingIntent: PendingIntent) { + if (isManageKeyGesturesGrantedToRecents()) { + synchronized(this) { + if (this.allAppsPendingIntent != null) { + Log.w(TAG, "All apps key gesture has already been registered. Ignored.") + return + } + this.allAppsPendingIntent = allAppsPendingIntent + inputManager.registerKeyGestureEventHandler( + listOf(KEY_GESTURE_TYPE_ALL_APPS), + allAppsKeyGestureEventHandler, + ) + } + } + } + + /** Unregisters the all apps key gesture events. */ + fun unregisterAllAppsKeyGestureEvent() { + if (isManageKeyGesturesGrantedToRecents()) { + synchronized(this) { + inputManager.unregisterKeyGestureEventHandler(allAppsKeyGestureEventHandler) + this.allAppsPendingIntent = null + } + } + } + + /** + * Registers the overview key gesture events. + * + * Subsequent registrations are ignored until [unregisterOverviewKeyGestureEvent] is called. + */ + fun registerOverviewKeyGestureEvent(overviewGestureHandler: OverviewGestureHandler) { + if (isManageKeyGesturesGrantedToRecents()) { + synchronized(this) { + if (this.overviewGestureHandler != null) { + Log.w(TAG, "Overview key gesture has already been registered. Ignored.") + return + } + this.overviewGestureHandler = overviewGestureHandler + inputManager.registerKeyGestureEventHandler( + listOf(KEY_GESTURE_TYPE_RECENT_APPS, KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER), + overviewKeyGestureEventHandler, + ) + } + } + } + + /** Unregisters the overview key gesture events. */ + fun unregisterOverviewKeyGestureEvent() { + if (isManageKeyGesturesGrantedToRecents()) { + synchronized(this) { + inputManager.unregisterKeyGestureEventHandler(overviewKeyGestureEventHandler) + this.overviewGestureHandler = null + } + } + } + + fun registerHomeKeyGestureEvent(overviewCommandHelper: OverviewCommandHelper) { + if (!isManageKeyGesturesGrantedToRecents()) { + return + } + synchronized(this) { + if (this.overviewCommandHelper != null) { + Log.w(TAG, "Overview command helper has already been registered. Ignored.") + return + } + this.overviewCommandHelper = overviewCommandHelper + inputManager.registerKeyGestureEventHandler( + listOf(KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY), + homeKeyGestureEventHandler, + ) + } + } + + /** Unregisters the home key gesture events. */ + @VisibleForTesting + fun unregisterHomeKeyGestureEvent() { + if (!isManageKeyGesturesGrantedToRecents()) { + return + } + synchronized(this) { + inputManager.unregisterKeyGestureEventHandler(homeKeyGestureEventHandler) + this.overviewCommandHelper = null + } + } + + fun onDestroy() { + settingsCache.unregister(USER_SETUP_COMPLETE_URI, onUserSetupCompleteListener) + unregisterOverviewKeyGestureEvent() + unregisterAllAppsKeyGestureEvent() + unregisterHomeKeyGestureEvent() + } + + private fun isManageKeyGesturesGrantedToRecents(): Boolean = + Flags.grantManageKeyGesturesToRecents() && + context.checkSelfPermission(MANAGE_KEY_GESTURES) == PERMISSION_GRANTED + + /** Callbacks for overview events, including alt + tab. */ + interface OverviewGestureHandler { + enum class OverviewType { + UNDEFINED, + ALT_TAB, + HOME, + } + + /** Shows the overview UI with [type]. */ + fun showOverview(type: OverviewType) + + /** Hides the overview UI with [type]. */ + fun hideOverview(type: OverviewType) + } + + private companion object { + const val TAG = "KeyGestureEventsHandler" + val USER_SETUP_COMPLETE_URI: Uri = Settings.Secure.getUriFor(USER_SETUP_COMPLETE) + + @JvmStatic + val INSTANCE: DaggerSingletonObject = + DaggerSingletonObject( + QuickstepBaseAppComponent::getQuickstepKeyGestureEventsManager + ) + } +} diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java index ec6efcb440f..91435d92fd7 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java @@ -29,9 +29,9 @@ import android.view.ViewConfiguration; import com.android.launcher3.R; -import com.android.quickstep.GestureState; import com.android.quickstep.InputConsumer; import com.android.quickstep.RecentsAnimationDeviceState; +import com.android.quickstep.RotationTouchHelper; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.util.MotionPauseDetector; import com.android.systemui.shared.system.InputMonitorCompat; @@ -47,7 +47,7 @@ public class AccessibilityInputConsumer extends DelegateInputConsumer { private final VelocityTracker mVelocityTracker; private final MotionPauseDetector mMotionPauseDetector; private final RecentsAnimationDeviceState mDeviceState; - private final GestureState mGestureState; + private final RotationTouchHelper mRotationHelper; private final float mMinGestureDistance; private final float mMinFlingVelocity; @@ -56,16 +56,21 @@ public class AccessibilityInputConsumer extends DelegateInputConsumer { private float mDownY; private float mTotalY; - public AccessibilityInputConsumer(Context context, RecentsAnimationDeviceState deviceState, - GestureState gestureState, InputConsumer delegate, InputMonitorCompat inputMonitor) { - super(delegate, inputMonitor); + public AccessibilityInputConsumer( + Context context, + int displayId, + RecentsAnimationDeviceState deviceState, + InputConsumer delegate, + InputMonitorCompat inputMonitor, + RotationTouchHelper rotationTouchHelper) { + super(displayId, delegate, inputMonitor); mContext = context; mVelocityTracker = VelocityTracker.obtain(); mMinGestureDistance = context.getResources() .getDimension(R.dimen.accessibility_gesture_min_swipe_distance); mMinFlingVelocity = ViewConfiguration.get(context).getScaledMinimumFlingVelocity(); mDeviceState = deviceState; - mGestureState = gestureState; + mRotationHelper = rotationTouchHelper; mMotionPauseDetector = new MotionPauseDetector(context); } @@ -102,8 +107,8 @@ public void onMotionEvent(MotionEvent ev) { case ACTION_POINTER_DOWN: { if (mState == STATE_INACTIVE) { int pointerIndex = ev.getActionIndex(); - if (mDeviceState.getRotationTouchHelper().isInSwipeUpTouchRegion(ev, - pointerIndex) && mDelegate.allowInterceptByParent()) { + if (mRotationHelper.isInSwipeUpTouchRegion(ev, pointerIndex) + && mDelegate.allowInterceptByParent()) { setActive(ev); mActivePointerId = ev.getPointerId(pointerIndex); diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java index 222ccd3dd1f..365014d3312 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java @@ -95,7 +95,7 @@ public AssistantInputConsumer( InputMonitorCompat inputMonitor, RecentsAnimationDeviceState deviceState, MotionEvent startEvent) { - super(delegate, inputMonitor); + super(gestureState.getDisplayId(), delegate, inputMonitor); final Resources res = context.getResources(); mContext = context; mDragDistThreshold = res.getDimension(R.dimen.gestures_assistant_drag_threshold); diff --git a/quickstep/src/com/android/quickstep/inputconsumers/BubbleBarInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/BubbleBarInputConsumer.java new file mode 100644 index 00000000000..37594a4beac --- /dev/null +++ b/quickstep/src/com/android/quickstep/inputconsumers/BubbleBarInputConsumer.java @@ -0,0 +1,210 @@ +/* + * 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.quickstep.inputconsumers; + +import static android.view.MotionEvent.INVALID_POINTER_ID; + +import android.content.Context; +import android.graphics.PointF; +import android.util.Log; +import android.view.MotionEvent; +import android.view.ViewConfiguration; + +import androidx.annotation.Nullable; + +import com.android.launcher3.taskbar.NavbarButtonsViewController; +import com.android.launcher3.taskbar.TaskbarActivityContext; +import com.android.launcher3.taskbar.bubbles.BubbleBarSwipeController; +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController; +import com.android.launcher3.taskbar.bubbles.BubbleControllers; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController; +import com.android.launcher3.testing.TestLogging; +import com.android.launcher3.testing.shared.TestProtocol; +import com.android.quickstep.InputConsumer; +import com.android.systemui.shared.system.InputMonitorCompat; +import com.android.wm.shell.Flags; + +/** + * Listens for touch events on the bubble bar. + */ +// TODO(b/385928447): remove debug logs with Log.d +public class BubbleBarInputConsumer implements InputConsumer { + + private static final String TAG = "BubbleBarInputConsumer"; + + private final BubbleStashController mBubbleStashController; + private final BubbleBarViewController mBubbleBarViewController; + @Nullable + private final BubbleBarSwipeController mBubbleBarSwipeController; + private final InputMonitorCompat mInputMonitorCompat; + + private boolean mPilfered; + private boolean mPassedTouchSlop; + private boolean mStashedOrCollapsedOnDown; + + private final int mTouchSlop; + private final PointF mDownPos = new PointF(); + private final PointF mLastPos = new PointF(); + + private final int mDisplayId; + + private long mDownTime; + private final long mTimeForLongPress; + private int mActivePointerId = INVALID_POINTER_ID; + + public BubbleBarInputConsumer( + Context context, + int displayId, + BubbleControllers bubbleControllers, + InputMonitorCompat inputMonitorCompat) { + mDisplayId = displayId; + mBubbleStashController = bubbleControllers.bubbleStashController; + mBubbleBarViewController = bubbleControllers.bubbleBarViewController; + mBubbleBarSwipeController = bubbleControllers.bubbleBarSwipeController.orElse(null); + + mInputMonitorCompat = inputMonitorCompat; + mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop(); + mTimeForLongPress = ViewConfiguration.getLongPressTimeout(); + } + + @Override + public int getType() { + return TYPE_BUBBLE_BAR; + } + + @Override + public int getDisplayId() { + return mDisplayId; + } + + @Override + public void onMotionEvent(MotionEvent ev) { + final int action = ev.getAction(); + switch (action) { + case MotionEvent.ACTION_DOWN: + mDownTime = System.currentTimeMillis(); + mActivePointerId = ev.getPointerId(0); + mDownPos.set(ev.getX(), ev.getY()); + mLastPos.set(mDownPos); + mStashedOrCollapsedOnDown = mBubbleStashController.isStashed() || isCollapsed(); + Log.d(TAG, + "ACTION_DOWN stashedOrCollapsed=" + mStashedOrCollapsedOnDown + " downPos=" + + mDownPos); + if (mBubbleBarSwipeController != null) { + mBubbleBarSwipeController.start(); + } + break; + case MotionEvent.ACTION_MOVE: + int pointerIndex = ev.findPointerIndex(mActivePointerId); + if (pointerIndex == INVALID_POINTER_ID) { + Log.d(TAG, "ACTION_MOVE skip, invalid pointer id"); + break; + } + mLastPos.set(ev.getX(pointerIndex), ev.getY(pointerIndex)); + + float dX = mLastPos.x - mDownPos.x; + float dY = mLastPos.y - mDownPos.y; + if (!mPassedTouchSlop) { + mPassedTouchSlop = Math.abs(dY) > mTouchSlop || Math.abs(dX) > mTouchSlop; + if (mPassedTouchSlop) { + Log.d(TAG, "ACTION_MOVE passed touch slop pos=" + mLastPos); + } + } + if (mBubbleBarSwipeController != null) { + mBubbleBarSwipeController.swipeTo(dY); + if (!mPilfered && mBubbleBarSwipeController.isSwipeGesture()) { + Log.d(TAG, "ACTION_MOVE swipe gesture, pilfering"); + mPilfered = true; + // Bubbles is handling the swipe so make sure no one else gets it. + TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); + mInputMonitorCompat.pilferPointers(); + } + } + break; + case MotionEvent.ACTION_UP: + long tapTime = System.currentTimeMillis() - mDownTime; + boolean swipeUpOnBubbleHandle = mBubbleBarSwipeController != null + && mBubbleBarSwipeController.isSwipeGesture(); + // Anything less than a long-press is a tap + boolean isWithinTapTime = tapTime <= mTimeForLongPress; + Log.d(TAG, "ACTION_UP swipeUp=" + swipeUpOnBubbleHandle + " isInTapTime=" + + isWithinTapTime + " tapTime=" + tapTime + " passedTouchSlop=" + + mPassedTouchSlop + " stashedOrCollapsedOnDown=" + + mStashedOrCollapsedOnDown); + if (isWithinTapTime && !swipeUpOnBubbleHandle && !mPassedTouchSlop + && mStashedOrCollapsedOnDown) { + Log.d(TAG, "ACTION_UP showing bubble bar"); + // Taps on the handle / collapsed state should open the bar + mBubbleStashController.showBubbleBar( + /* expandBubbles= */ true, /* bubbleBarGesture= */ true); + } else { + Log.d(TAG, "ACTION_UP nothing to do"); + } + break; + case MotionEvent.ACTION_CANCEL: + Log.d(TAG, "ACTION_CANCEL"); + break; + } + if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { + cleanupAfterMotionEvent(); + } + } + + private void cleanupAfterMotionEvent() { + Log.d(TAG, "cleaning up passedSlop=" + mPassedTouchSlop + " pilfered=" + mPilfered); + if (mBubbleBarSwipeController != null) { + mBubbleBarSwipeController.finish(); + } + mPassedTouchSlop = false; + mPilfered = false; + mDownTime = 0; + } + + private boolean isCollapsed() { + return mBubbleStashController.isBubbleBarVisible() + && !mBubbleBarViewController.isExpanded(); + } + + /** + * Returns whether the event is occurring on a visible bubble bar or the bar handle. + */ + public static boolean isEventOnBubbles(TaskbarActivityContext tac, MotionEvent ev) { + if (tac == null || !tac.isBubbleBarEnabled()) { + return false; + } + BubbleControllers controllers = tac.getBubbleControllers(); + if (controllers == null || !controllers.bubbleBarViewController.hasBubbles()) { + return false; + } + if (controllers.bubbleStashController.isStashed() + && controllers.bubbleStashedHandleViewController.isPresent()) { + return controllers.bubbleStashedHandleViewController.get().isEventOverHandle(ev); + } else if (controllers.bubbleBarViewController.isBubbleBarVisible()) { + if (Flags.bugRotationButtonCoverBubble()) { + NavbarButtonsViewController navbarButtonsViewController = + tac.getNavBarButtonsViewController(); + boolean isBlockedByRotationButton = navbarButtonsViewController != null + && navbarButtonsViewController.isEventOverAnyItem(ev); + return !isBlockedByRotationButton + && controllers.bubbleBarViewController.isEventOverBubbleBar(ev); + } else { + return controllers.bubbleBarViewController.isEventOverBubbleBar(ev); + } + } + return false; + } +} diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java index 5557639b1cb..0b1a6c46402 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java @@ -5,7 +5,7 @@ import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; import com.android.quickstep.InputConsumer; -import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; import com.android.systemui.shared.system.InputMonitorCompat; public abstract class DelegateInputConsumer implements InputConsumer { @@ -17,14 +17,23 @@ public abstract class DelegateInputConsumer implements InputConsumer { protected final InputConsumer mDelegate; protected final InputMonitorCompat mInputMonitor; + private final int mDisplayId; + protected int mState; - public DelegateInputConsumer(InputConsumer delegate, InputMonitorCompat inputMonitor) { + public DelegateInputConsumer( + int displayId, InputConsumer delegate, InputMonitorCompat inputMonitor) { + mDisplayId = displayId; mDelegate = delegate; mInputMonitor = inputMonitor; mState = STATE_INACTIVE; } + @Override + public int getDisplayId() { + return mDisplayId; + } + @Override public InputConsumer getActiveConsumerInHierarchy() { if (mState == STATE_ACTIVE) { @@ -57,8 +66,7 @@ public T getInputConsumerOfClass(Class c) { } protected void setActive(MotionEvent ev) { - ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString(getDelegatorName()) - .append(" became active")); + ActiveGestureProtoLogProxy.logInputConsumerBecameActive(getDelegatorName()); mState = STATE_ACTIVE; TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java index f2643641e02..f6dc611f49c 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java @@ -24,7 +24,6 @@ import static com.android.quickstep.AbsSwipeUpHandler.MIN_PROGRESS_FOR_OVERVIEW; import static com.android.quickstep.MultiStateCallback.DEBUG_STATES; import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely; -import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS; import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID; import android.animation.Animator; @@ -38,6 +37,7 @@ import android.view.MotionEvent; import android.view.RemoteAnimationTarget; import android.view.VelocityTracker; +import android.window.TransitionInfo; import com.android.app.animation.Interpolators; import com.android.launcher3.R; @@ -53,12 +53,13 @@ import com.android.quickstep.RecentsAnimationDeviceState; import com.android.quickstep.RecentsAnimationTargets; import com.android.quickstep.RemoteAnimationTargets; +import com.android.quickstep.RotationTouchHelper; import com.android.quickstep.TaskAnimationManager; +import com.android.quickstep.util.ActiveGestureLog; import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; import com.android.quickstep.util.TransformParams; import com.android.quickstep.util.TransformParams.BuilderProxy; import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.InputMonitorCompat; import java.util.HashMap; @@ -84,7 +85,7 @@ private static int getFlagForIndex(int index, String name) { getFlagForIndex(1, "STATE_HANDLER_INVALIDATED"); private final Context mContext; - private final RecentsAnimationDeviceState mDeviceState; + private final RotationTouchHelper mRotationTouchHelper; private final TaskAnimationManager mTaskAnimationManager; private final GestureState mGestureState; private final float mTouchSlopSquared; @@ -108,18 +109,22 @@ private static int getFlagForIndex(int index, String name) { private RecentsAnimationController mRecentsAnimationController; - public DeviceLockedInputConsumer(Context context, RecentsAnimationDeviceState deviceState, - TaskAnimationManager taskAnimationManager, GestureState gestureState, - InputMonitorCompat inputMonitorCompat) { + public DeviceLockedInputConsumer( + Context context, + RecentsAnimationDeviceState deviceState, + TaskAnimationManager taskAnimationManager, + GestureState gestureState, + InputMonitorCompat inputMonitorCompat, + RotationTouchHelper rotationTouchHelper) { mContext = context; - mDeviceState = deviceState; mTaskAnimationManager = taskAnimationManager; mGestureState = gestureState; - mTouchSlopSquared = mDeviceState.getSquaredTouchSlop(); + mTouchSlopSquared = deviceState.getSquaredTouchSlop(); mTransformParams = new TransformParams(); mInputMonitorCompat = inputMonitorCompat; mMaxTranslationY = context.getResources().getDimensionPixelSize( R.dimen.device_locked_y_offset); + mRotationTouchHelper = rotationTouchHelper; // Do not use DeviceProfile as the user data might be locked mDisplaySize = DisplayController.INSTANCE.get(context).getInfo().currentSize; @@ -137,6 +142,11 @@ public int getType() { return TYPE_DEVICE_LOCKED; } + @Override + public int getDisplayId() { + return mGestureState.getDisplayId(); + } + @Override public void onMotionEvent(MotionEvent ev) { if (mVelocityTracker == null) { @@ -154,7 +164,7 @@ public void onMotionEvent(MotionEvent ev) { if (!mThresholdCrossed) { // Cancel interaction in case of multi-touch interaction int ptrIdx = ev.getActionIndex(); - if (!mDeviceState.getRotationTouchHelper().isInSwipeUpTouchRegion(ev, ptrIdx)) { + if (!mRotationTouchHelper.isInSwipeUpTouchRegion(ev, ptrIdx)) { int action = ev.getAction(); ev.setAction(ACTION_CANCEL); finishTouchTracking(ev); @@ -213,15 +223,13 @@ public void onAnimationEnd(Animator animation) { // This will come back and cancel the interaction. startHomeIntentSafely(mContext, mGestureState.getHomeIntent(), null, TAG); mHomeLaunched = true; - } else if (ENABLE_SHELL_TRANSITIONS) { - if (mTaskAnimationManager.getCurrentCallbacks() != null) { - if (mRecentsAnimationController != null) { - finishRecentsAnimationForShell(dismissTask); - } else { - // the transition of recents animation hasn't started, wait for it - mCancelWhenRecentsStart = true; - mDismissTask = dismissTask; - } + } else if (mTaskAnimationManager.getCurrentCallbacks() != null) { + if (mRecentsAnimationController != null) { + finishRecentsAnimationForShell(dismissTask); + } else { + // the transition of recents animation hasn't started, wait for it + mCancelWhenRecentsStart = true; + mDismissTask = dismissTask; } } mStateCallback.setState(STATE_HANDLER_INVALIDATED); @@ -252,7 +260,7 @@ private void startRecentsTransition() { @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { + RecentsAnimationTargets targets, TransitionInfo transitionInfo) { mRecentsAnimationController = controller; mTransformParams.setTargetSet(targets); applyTransform(); @@ -271,18 +279,23 @@ public void onRecentsAnimationCanceled(HashMap thumbnail private void finishRecentsAnimationForShell(boolean dismissTask) { mCancelWhenRecentsStart = false; - mTaskAnimationManager.finishRunningRecentsAnimation(dismissTask /* toHome */); + mTaskAnimationManager.finishRunningRecentsAnimation( + /* toHome= */ dismissTask, + /* reason= */ new ActiveGestureLog.CompoundString( + "DeviceLockedInputConsumer.finishRecentsAnimationForShell")); if (dismissTask) { mHomeLaunched = true; } } private void endRemoteAnimation() { - if (mHomeLaunched) { - ActivityManagerWrapper.getInstance().cancelRecentsAnimation(false); - } else if (mRecentsAnimationController != null) { + if (!mHomeLaunched && mRecentsAnimationController != null) { mRecentsAnimationController.finishController( - false /* toRecents */, null /* callback */, false /* sendUserLeaveHint */); + /* toHome= */ false, + /* callback= */ null, + /* sendUserLeaveHint= */ false, + /* reason= */ new ActiveGestureLog.CompoundString( + "DeviceLockedInputConsumer.endRemoteAnimation")); } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/LauncherInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/LauncherInputConsumer.java new file mode 100644 index 00000000000..65704625a88 --- /dev/null +++ b/quickstep/src/com/android/quickstep/inputconsumers/LauncherInputConsumer.java @@ -0,0 +1,184 @@ +/* + * 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.quickstep.inputconsumers; + +import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; + +import android.media.AudioManager; +import android.media.session.MediaSessionManager; +import android.view.KeyEvent; +import android.view.MotionEvent; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.launcher3.Utilities; +import com.android.launcher3.statemanager.BaseState; +import com.android.launcher3.statemanager.StatefulContainer; +import com.android.launcher3.testing.TestLogging; +import com.android.launcher3.testing.shared.TestProtocol; +import com.android.launcher3.views.BaseDragLayer; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.GestureState; +import com.android.quickstep.InputConsumer; +import com.android.quickstep.TaskUtils; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.systemui.shared.system.InputMonitorCompat; + +/** + * Input consumer for handling touch on the recents/Launcher activity. + * @param The state type of the container + * @param The container type + */ +public class LauncherInputConsumer, + T extends RecentsViewContainer & StatefulContainer> + implements InputConsumer { + + private final T mContainer; + private final BaseContainerInterface mContainerInterface; + private final BaseDragLayer mTarget; + private final InputMonitorCompat mInputMonitor; + private final GestureState mGestureState; + + private final int[] mLocationOnScreen = new int[2]; + + private final boolean mStartingInActivityBounds; + + private boolean mTargetHandledTouch; + private boolean mIsWaitingForAttachToWindow; + + public LauncherInputConsumer( + GestureState gestureState, + T container, + @Nullable InputMonitorCompat inputMonitor, + boolean startingInActivityBounds) { + mContainer = container; + mInputMonitor = inputMonitor; + mStartingInActivityBounds = startingInActivityBounds; + mContainerInterface = gestureState.getContainerInterface(); + mGestureState = gestureState; + + mTarget = container.getDragLayer(); + mTarget.getLocationOnScreen(mLocationOnScreen); + } + + @Override + public int getType() { + return TYPE_LAUNCHER; + } + + @Override + public int getDisplayId() { + return mGestureState.getDisplayId(); + } + + @Override + public boolean allowInterceptByParent() { + return !mTargetHandledTouch; + } + + @Override + public void onMotionEvent(MotionEvent ev) { + int flags = ev.getEdgeFlags(); + if (!mStartingInActivityBounds) { + ev.setEdgeFlags(flags | Utilities.EDGE_NAV_BAR); + } + ev.offsetLocation(-mLocationOnScreen[0], -mLocationOnScreen[1]); + boolean handled = false; + if (mGestureState == null || !mGestureState.isInExtendedSlopRegion()) { + handled = mTarget.proxyTouchEvent(ev, mStartingInActivityBounds); + } + ev.offsetLocation(mLocationOnScreen[0], mLocationOnScreen[1]); + ev.setEdgeFlags(flags); + + if (!mTargetHandledTouch && handled) { + mTargetHandledTouch = true; + if (!mStartingInActivityBounds) { + mContainerInterface.closeOverlay(); + TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS); + } + if (mInputMonitor != null) { + TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); + mInputMonitor.pilferPointers(); + } + } + } + + @Override + public void onHoverEvent(MotionEvent ev) { + mContainer.dispatchGenericMotionEvent(ev); + } + + @Override + public void onKeyEvent(KeyEvent ev) { + switch (ev.getKeyCode()) { + case KeyEvent.KEYCODE_VOLUME_DOWN: + case KeyEvent.KEYCODE_VOLUME_UP: + case KeyEvent.KEYCODE_VOLUME_MUTE: + MediaSessionManager mgr = mContainer.asContext() + .getSystemService(MediaSessionManager.class); + mgr.dispatchVolumeKeyEventAsSystemService(ev, + AudioManager.USE_DEFAULT_STREAM_TYPE); + break; + case KeyEvent.KEYCODE_DPAD_LEFT: + case KeyEvent.KEYCODE_DPAD_RIGHT: + case KeyEvent.KEYCODE_DPAD_UP: + case KeyEvent.KEYCODE_DPAD_DOWN: + case KeyEvent.KEYCODE_TAB: + View viewRoot = mContainer.getRootView(); + if (viewRoot.isAttachedToWindow()) { + if (!viewRoot.getViewRootImpl().getView().isInTouchMode()) { + break; + } + setTouchModeChanged(viewRoot); + break; + } + if (mIsWaitingForAttachToWindow) { + break; + } + mIsWaitingForAttachToWindow = true; + viewRoot.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View view) { + view.removeOnAttachStateChangeListener(this); + mIsWaitingForAttachToWindow = false; + setTouchModeChanged(viewRoot); + } + + @Override + public void onViewDetachedFromWindow(View view) { + // Do nothing + } + }); + break; + default: + break; + } + mContainer.dispatchKeyEvent(ev); + } + + private void setTouchModeChanged(@NonNull View viewRoot) { + // When Overview is launched via meta+tab or swipe up from an app, the touch + // mode somehow is not changed to false by the Android framework. The + // subsequent key events (e.g. DPAD_LEFT, DPAD_RIGHT) can only be dispatched + // to focused views, while focus can only be requested in + // {@link View#requestFocusNoSearch(int, Rect)} when touch mode is false. To + // note, here we launch overview with live tile. + viewRoot.getViewRootImpl().touchModeChanged(false); + } +} + diff --git a/quickstep/src/com/android/quickstep/inputconsumers/LauncherWithoutFocusInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/LauncherWithoutFocusInputConsumer.java new file mode 100644 index 00000000000..011247ffaf8 --- /dev/null +++ b/quickstep/src/com/android/quickstep/inputconsumers/LauncherWithoutFocusInputConsumer.java @@ -0,0 +1,113 @@ +/* + * 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.quickstep.inputconsumers; + +import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND; +import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE; +import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely; + +import android.content.Context; +import android.graphics.PointF; +import android.view.MotionEvent; + +import com.android.launcher3.logger.LauncherAtom; +import com.android.launcher3.testing.TestLogging; +import com.android.launcher3.testing.shared.TestProtocol; +import com.android.launcher3.views.ActivityContext; +import com.android.quickstep.GestureState; +import com.android.quickstep.InputConsumer; +import com.android.quickstep.RecentsAnimationDeviceState; +import com.android.quickstep.TaskAnimationManager; +import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.TriggerSwipeUpTouchTracker; +import com.android.systemui.shared.system.InputMonitorCompat; + +public class LauncherWithoutFocusInputConsumer implements InputConsumer, + TriggerSwipeUpTouchTracker.OnSwipeUpListener { + private static final String TAG = "LauncherWithoutFocusInputConsumer"; + + private final Context mContext; + private final InputMonitorCompat mInputMonitor; + private final TriggerSwipeUpTouchTracker mTriggerSwipeUpTracker; + private final GestureState mGestureState; + private final TaskAnimationManager mTaskAnimationManager; + + public LauncherWithoutFocusInputConsumer( + Context context, + RecentsAnimationDeviceState deviceState, + GestureState gestureState, + InputMonitorCompat inputMonitor, + TaskAnimationManager taskAnimationManager, + boolean disableHorizontalSwipe) { + mContext = context; + mGestureState = gestureState; + mInputMonitor = inputMonitor; + mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(context, disableHorizontalSwipe, + deviceState.getNavBarPosition(), this); + mTaskAnimationManager = taskAnimationManager; + } + + @Override + public int getType() { + return TYPE_LAUNCHER_WITHOUT_FOCUS; + } + + @Override + public int getDisplayId() { + return mGestureState.getDisplayId(); + } + + @Override + public boolean allowInterceptByParent() { + return !mTriggerSwipeUpTracker.interceptedTouch(); + } + + @Override + public void onMotionEvent(MotionEvent ev) { + mTriggerSwipeUpTracker.onMotionEvent(ev); + } + + @Override + public void onSwipeUpTouchIntercepted() { + if (mInputMonitor != null) { + TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); + mInputMonitor.pilferPointers(); + } + } + + @Override + public void onSwipeUp(boolean wasFling, PointF finalVelocity) { + startHomeIntentSafely(mContext, mGestureState.getHomeIntent(), null, TAG); + mTaskAnimationManager.finishRunningRecentsAnimation( + /* toHome= */ true, + /* reason= */ new ActiveGestureLog.CompoundString( + "LauncherWithoutFocusInputConsumer: finish recents animation onSwipeUp")); + ActivityContext activity = ActivityContext.lookupContext(mContext); + int state = (mGestureState != null && mGestureState.getEndTarget() != null) + ? mGestureState.getEndTarget().containerType + : LAUNCHER_STATE_HOME; + activity.getStatsLogManager().logger() + .withSrcState(LAUNCHER_STATE_BACKGROUND) + .withDstState(state) + .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder() + .setWorkspace( + LauncherAtom.WorkspaceContainer.newBuilder() + .setPageIndex(-1)) + .build()) + .log(LAUNCHER_HOME_GESTURE); + } +} diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandler.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandler.java index 1d00e533f5c..88a3c32b108 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandler.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandler.java @@ -16,23 +16,73 @@ package com.android.quickstep.inputconsumers; +import static android.app.contextualsearch.ContextualSearchManager.ENTRYPOINT_LONG_PRESS_NAV_HANDLE; + +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_ASSISTANT_SUCCESSFUL_NAV_HANDLE; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OMNI_GET_LONG_PRESS_RUNNABLE; +import static com.android.launcher3.logging.StatsLogManager.LauncherLatencyEvent.LAUNCHER_LATENCY_OMNI_RUNNABLE; + +import android.app.contextualsearch.ContextualSearchConfig; import android.content.Context; +import android.os.SystemClock; +import android.util.Log; +import android.view.ViewConfiguration; import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; -import com.android.launcher3.R; -import com.android.launcher3.util.ResourceBasedOverride; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherComponentProvider; +import com.android.launcher3.logging.InstanceId; +import com.android.launcher3.logging.InstanceIdSequence; +import com.android.launcher3.logging.StatsLogManager; +import com.android.launcher3.util.VibratorWrapper; +import com.android.quickstep.DeviceConfigWrapper; import com.android.quickstep.NavHandle; +import com.android.quickstep.TopTaskTracker; +import com.android.quickstep.util.ContextualSearchHapticManager; +import com.android.quickstep.util.ContextualSearchInvoker; +import com.android.quickstep.util.ContextualSearchStateManager; + +import javax.inject.Inject; /** * Class for extending nav handle long press behavior */ -public class NavHandleLongPressHandler implements ResourceBasedOverride { +public class NavHandleLongPressHandler { + + private static final String TAG = "NavHandleLongPressHandler"; + protected final VibratorWrapper mVibratorWrapper; + protected final ContextualSearchHapticManager mContextualSearchHapticManager; + protected final ContextualSearchInvoker mContextualSearchInvoker; + protected final StatsLogManager mStatsLogManager; + private boolean mPendingInvocation; + protected final TopTaskTracker mTopTaskTracker; + private final ContextualSearchStateManager mContextualSearchStateManager; + + @Inject + public NavHandleLongPressHandler(@ApplicationContext Context context, + VibratorWrapper vibratorWrapper, + ContextualSearchHapticManager hapticManager, + TopTaskTracker topTaskTracker, + StatsLogManager.StatsLogManagerFactory logManagerFactory, + ContextualSearchStateManager contextualSearchStateManager, + ContextualSearchInvoker contextualSearchInvoker) { + mStatsLogManager = logManagerFactory.create(context); + mVibratorWrapper = vibratorWrapper; + mContextualSearchHapticManager = hapticManager; + mContextualSearchInvoker = contextualSearchInvoker; + mTopTaskTracker = topTaskTracker; + mContextualSearchStateManager = contextualSearchStateManager; + } /** Creates NavHandleLongPressHandler as specified by overrides */ public static NavHandleLongPressHandler newInstance(Context context) { - return Overrides.getObject(NavHandleLongPressHandler.class, context, - R.string.nav_handle_long_press_handler_class); + return LauncherComponentProvider.get(context).getNavHandleLongPressHandler(); + } + + protected boolean isContextualSearchEntrypointEnabled(NavHandle navHandle) { + return DeviceConfigWrapper.get().getEnableLongPressNavHandle(); } /** @@ -46,8 +96,51 @@ public static NavHandleLongPressHandler newInstance(Context context) { * * @param navHandle to handle this long press */ - public @Nullable Runnable getLongPressRunnable(NavHandle navHandle) { - return null; + @Nullable + @VisibleForTesting + final Runnable getLongPressRunnable(NavHandle navHandle, int displayId) { + if (!isContextualSearchEntrypointEnabled(navHandle)) { + Log.i(TAG, "Contextual Search invocation failed: entry point disabled"); + mVibratorWrapper.cancelVibrate(); + return null; + } + + if (!mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()) { + Log.i(TAG, "Contextual Search invocation failed: precondition not satisfied"); + mVibratorWrapper.cancelVibrate(); + return null; + } + + mPendingInvocation = true; + Log.i(TAG, "Contextual Search invocation: invocation runnable created"); + InstanceId instanceId = new InstanceIdSequence().newInstanceId(); + mStatsLogManager.logger().withInstanceId(instanceId).log( + LAUNCHER_OMNI_GET_LONG_PRESS_RUNNABLE); + long startTimeMillis = SystemClock.elapsedRealtime(); + return () -> { + mStatsLogManager.latencyLogger().withInstanceId(instanceId).withLatency( + SystemClock.elapsedRealtime() - startTimeMillis).log( + LAUNCHER_LATENCY_OMNI_RUNNABLE); + ContextualSearchConfig config = new ContextualSearchConfig.Builder() + .setSourceBounds(navHandle.getBoundsOnScreen()).setDisplayId(displayId).build(); + + if (mContextualSearchInvoker.invokeContextualSearchUncheckedWithHaptic( + ENTRYPOINT_LONG_PRESS_NAV_HANDLE, config)) { + Log.i(TAG, "Contextual Search invocation successful"); + + String runningPackage = mTopTaskTracker.getCachedTopTask( + /* filterOnlyVisibleRecents */ true, displayId).getPackageName(); + mStatsLogManager.logger().withPackageName(runningPackage) + .log(LAUNCHER_LAUNCH_ASSISTANT_SUCCESSFUL_NAV_HANDLE); + } else { + mVibratorWrapper.cancelVibrate(); + if (DeviceConfigWrapper.get().getAnimateLpnh() + && !DeviceConfigWrapper.get().getShrinkNavHandleOnPress()) { + navHandle.animateNavBarLongPress( + /*isTouchDown*/false, /*shrink*/ false, /*durationMs*/160); + } + } + }; } /** @@ -55,7 +148,15 @@ public static NavHandleLongPressHandler newInstance(Context context) { * * @param navHandle to handle the animation for this touch */ - public void onTouchStarted(NavHandle navHandle) {} + @VisibleForTesting + final void onTouchStarted(NavHandle navHandle) { + mPendingInvocation = false; + if (isContextualSearchEntrypointEnabled(navHandle) + && mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()) { + Log.i(TAG, "Contextual Search invocation: touch started"); + startNavBarAnimation(navHandle); + } + } /** * Called when nav handle gesture is finished by the user lifting their finger or the system @@ -64,5 +165,44 @@ public void onTouchStarted(NavHandle navHandle) {} * @param navHandle to handle the animation for this touch * @param reason why the touch ended */ - public void onTouchFinished(NavHandle navHandle, String reason) {} + @VisibleForTesting + final void onTouchFinished(NavHandle navHandle, String reason) { + Log.i(TAG, "Contextual Search invocation: touch finished with reason: " + reason); + + if (!DeviceConfigWrapper.get().getShrinkNavHandleOnPress() || !mPendingInvocation) { + mVibratorWrapper.cancelVibrate(); + } + + if (DeviceConfigWrapper.get().getAnimateLpnh()) { + if (DeviceConfigWrapper.get().getShrinkNavHandleOnPress()) { + navHandle.animateNavBarLongPress( + /*isTouchDown*/false, /*shrink*/ true, /*durationMs*/200); + } else { + navHandle.animateNavBarLongPress( + /*isTouchDown*/false, /*shrink*/ false, /*durationMs*/ 160); + } + } + } + + @VisibleForTesting + final void startNavBarAnimation(NavHandle navHandle) { + mContextualSearchHapticManager.vibrateForSearchHint(); + + if (DeviceConfigWrapper.get().getAnimateLpnh()) { + if (DeviceConfigWrapper.get().getShrinkNavHandleOnPress()) { + navHandle.animateNavBarLongPress( + /*isTouchDown*/ true, /*shrink*/true, /*durationMs*/200); + } else { + long longPressTimeout; + if (mContextualSearchStateManager.getLPNHDurationMillis().isPresent()) { + longPressTimeout = + mContextualSearchStateManager.getLPNHDurationMillis().get().intValue(); + } else { + longPressTimeout = ViewConfiguration.getLongPressTimeout(); + } + navHandle.animateNavBarLongPress( + /*isTouchDown*/ true, /*shrink*/ false, /*durationMs*/ longPressTimeout); + } + } + } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java index 848a43afb19..50f52b8c708 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java @@ -19,6 +19,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DEEP_PRESS_STASHED_TASKBAR; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LONG_PRESS_NAVBAR; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LONG_PRESS_STASHED_TASKBAR; +import static com.android.launcher3.logging.StatsLogManager.LauncherLatencyEvent.LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.LogConfig.NAV_HANDLE_LONG_PRESS; @@ -27,7 +28,10 @@ import android.view.MotionEvent; import android.view.ViewConfiguration; +import androidx.annotation.VisibleForTesting; + import com.android.launcher3.Utilities; +import com.android.launcher3.logging.InstanceIdSequence; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.util.DisplayController; import com.android.quickstep.DeviceConfigWrapper; @@ -36,7 +40,7 @@ import com.android.quickstep.NavHandle; import com.android.quickstep.RecentsAnimationDeviceState; import com.android.quickstep.TopTaskTracker; -import com.android.quickstep.util.AssistStateManager; +import com.android.quickstep.util.ContextualSearchStateManager; import com.android.systemui.shared.system.InputMonitorCompat; /** @@ -48,7 +52,17 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { private static final boolean DEBUG_NAV_HANDLE = Utilities.isPropertyEnabled( NAV_HANDLE_LONG_PRESS); - private final NavHandleLongPressHandler mNavHandleLongPressHandler; + @VisibleForTesting static final String CANCEL_REASON_INTERCEPT_DISALLOWED = + "intercept disallowed by child input consumer"; + @VisibleForTesting static final String CANCEL_REASON_TOUCH_UP = "touch action up"; + @VisibleForTesting static final String CANCEL_REASON_TOUCH_CANCEL = "touch action cancel"; + @VisibleForTesting static final String CANCEL_REASON_TOUCH_SLOP_PASSED = "touch slop passed"; + @VisibleForTesting static final String CANCEL_REASON_INPUT_CONSUMER_SWITCHED = + "input consumer switched"; + // Minimum time between touch down and abandon to log. + @VisibleForTesting static final long MIN_TIME_TO_LOG_ABANDON_MS = 200; + + private NavHandleLongPressHandler mNavHandleLongPressHandler; private final float mNavHandleWidth; private final float mScreenWidth; @@ -60,30 +74,52 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { private final int mOuterLongPressTimeout; private final boolean mDeepPressEnabled; private final NavHandle mNavHandle; - private final StatsLogManager mStatsLogManager; + private StatsLogManager mStatsLogManager; private final TopTaskTracker mTopTaskTracker; private final GestureState mGestureState; - private MotionEvent mCurrentDownEvent; + private MotionEvent mCurrentDownEvent; // Down event that started the current gesture. + private MotionEvent mCurrentMotionEvent; // Most recent motion event. private boolean mDeepPressLogged; // Whether deep press has been logged for the current touch. - public NavHandleLongPressInputConsumer(Context context, InputConsumer delegate, - InputMonitorCompat inputMonitor, RecentsAnimationDeviceState deviceState, - NavHandle navHandle, GestureState gestureState) { - super(delegate, inputMonitor); + public NavHandleLongPressInputConsumer( + Context context, + InputConsumer delegate, + InputMonitorCompat inputMonitor, + RecentsAnimationDeviceState deviceState, + NavHandle navHandle, + GestureState gestureState) { + super(gestureState.getDisplayId(), delegate, inputMonitor); mScreenWidth = DisplayController.INSTANCE.get(context).getInfo().currentSize.x; mDeepPressEnabled = DeviceConfigWrapper.get().getEnableLpnhDeepPress(); - int twoStageMultiplier = DeviceConfigWrapper.get().getTwoStageMultiplier(); - AssistStateManager assistStateManager = AssistStateManager.INSTANCE.get(context); - if (assistStateManager.getLPNHDurationMillis().isPresent()) { - mLongPressTimeout = assistStateManager.getLPNHDurationMillis().get().intValue(); + ContextualSearchStateManager contextualSearchStateManager = + ContextualSearchStateManager.INSTANCE.get(context); + if (contextualSearchStateManager.getLPNHDurationMillis().isPresent()) { + mLongPressTimeout = + contextualSearchStateManager.getLPNHDurationMillis().get().intValue(); } else { mLongPressTimeout = ViewConfiguration.getLongPressTimeout(); } - mOuterLongPressTimeout = mLongPressTimeout * twoStageMultiplier; - mTouchSlopSquaredOriginal = deviceState.getSquaredTouchSlop(); - mTouchSlopSquared = mTouchSlopSquaredOriginal; - mOuterTouchSlopSquared = mTouchSlopSquared * (twoStageMultiplier * twoStageMultiplier); + float twoStageDurationMultiplier = + (DeviceConfigWrapper.get().getTwoStageDurationPercentage() / 100f); + mOuterLongPressTimeout = (int) (mLongPressTimeout * twoStageDurationMultiplier); + + float gestureNavTouchSlopSquared = deviceState.getSquaredTouchSlop(); + float twoStageSlopMultiplier = + (DeviceConfigWrapper.get().getTwoStageSlopPercentage() / 100f); + float twoStageSlopMultiplierSquared = twoStageSlopMultiplier * twoStageSlopMultiplier; + if (DeviceConfigWrapper.get().getEnableLpnhTwoStages()) { + // For 2 stages, the outer touch slop should match gesture nav. + mTouchSlopSquared = gestureNavTouchSlopSquared * twoStageSlopMultiplierSquared; + mOuterTouchSlopSquared = gestureNavTouchSlopSquared; + } else { + // For single stage, the touch slop should match gesture nav. + mTouchSlopSquared = gestureNavTouchSlopSquared; + // Note: This outer slop is not actually used for single-stage (flag disabled). + mOuterTouchSlopSquared = gestureNavTouchSlopSquared; + } + mTouchSlopSquaredOriginal = mTouchSlopSquared; + mGestureState = gestureState; mGestureState.setIsInExtendedSlopRegion(false); if (DEBUG_NAV_HANDLE) { @@ -106,10 +142,14 @@ public int getType() { @Override public void onMotionEvent(MotionEvent ev) { + if (mCurrentMotionEvent != null) { + mCurrentMotionEvent.recycle(); + } + mCurrentMotionEvent = MotionEvent.obtain(ev); if (mDelegate.allowInterceptByParent()) { handleMotionEvent(ev); } else if (MAIN_EXECUTOR.getHandler().hasCallbacks(mTriggerLongPress)) { - cancelLongPress("intercept disallowed by child input consumer"); + cancelLongPress(CANCEL_REASON_INTERCEPT_DISALLOWED); } if (mState != STATE_ACTIVE) { @@ -122,6 +162,14 @@ public void onHoverEvent(MotionEvent ev) { mDelegate.onHoverEvent(ev); } + @Override + public void onConsumerAboutToBeSwitched() { + super.onConsumerAboutToBeSwitched(); + if (MAIN_EXECUTOR.getHandler().hasCallbacks(mTriggerLongPress)) { + cancelLongPress(CANCEL_REASON_INPUT_CONSUMER_SWITCHED); + } + } + private void handleMotionEvent(MotionEvent ev) { switch (ev.getAction()) { case MotionEvent.ACTION_DOWN -> { @@ -169,11 +217,11 @@ private void handleMotionEvent(MotionEvent ev) { if (DEBUG_NAV_HANDLE) { Log.d(TAG, "Touch slop out. mTouchSlopSquared=" + mTouchSlopSquared); } - cancelLongPress("touch slop passed"); + cancelLongPress(CANCEL_REASON_TOUCH_SLOP_PASSED); } } - case MotionEvent.ACTION_UP -> cancelLongPress("touch action up"); - case MotionEvent.ACTION_CANCEL -> cancelLongPress("touch action cancel"); + case MotionEvent.ACTION_UP -> cancelLongPress(CANCEL_REASON_TOUCH_UP); + case MotionEvent.ACTION_CANCEL -> cancelLongPress(CANCEL_REASON_TOUCH_CANCEL); } // If the gesture is deep press then trigger long press asap @@ -182,7 +230,7 @@ private void handleMotionEvent(MotionEvent ev) { && !mDeepPressLogged) { // Log deep press even if feature is disabled. String runningPackage = mTopTaskTracker.getCachedTopTask( - /* filterOnlyVisibleRecents */ true).getPackageName(); + /* filterOnlyVisibleRecents */ true, getDisplayId()).getPackageName(); mStatsLogManager.logger().withPackageName(runningPackage).log( mNavHandle.isNavHandleStashedTaskbar() ? LAUNCHER_DEEP_PRESS_STASHED_TASKBAR : LAUNCHER_DEEP_PRESS_NAVBAR); @@ -201,12 +249,13 @@ private void triggerLongPress() { Log.d(TAG, "triggerLongPress"); } String runningPackage = mTopTaskTracker.getCachedTopTask( - /* filterOnlyVisibleRecents */ true).getPackageName(); + /* filterOnlyVisibleRecents */ true, getDisplayId()).getPackageName(); mStatsLogManager.logger().withPackageName(runningPackage).log( mNavHandle.isNavHandleStashedTaskbar() ? LAUNCHER_LONG_PRESS_STASHED_TASKBAR : LAUNCHER_LONG_PRESS_NAVBAR); - Runnable longPressRunnable = mNavHandleLongPressHandler.getLongPressRunnable(mNavHandle); + Runnable longPressRunnable = mNavHandleLongPressHandler.getLongPressRunnable(mNavHandle, + getDisplayId()); if (longPressRunnable == null) { return; } @@ -223,7 +272,18 @@ private void triggerLongPress() { private void cancelLongPress(String reason) { if (DEBUG_NAV_HANDLE) { - Log.d(TAG, "cancelLongPress"); + Log.d(TAG, "cancelLongPress: " + reason); + } + // Log LPNH abandon latency if we didn't trigger but were still prepared to. + if (mCurrentMotionEvent != null && mCurrentDownEvent != null) { + long latencyMs = mCurrentMotionEvent.getEventTime() - mCurrentDownEvent.getEventTime(); + if (mState != STATE_ACTIVE && MAIN_EXECUTOR.getHandler().hasCallbacks(mTriggerLongPress) + && latencyMs >= MIN_TIME_TO_LOG_ABANDON_MS) { + mStatsLogManager.latencyLogger() + .withInstanceId(new InstanceIdSequence().newInstanceId()) + .withLatency(latencyMs) + .log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } } mGestureState.setIsInExtendedSlopRegion(false); MAIN_EXECUTOR.getHandler().removeCallbacks(mTriggerLongPress); @@ -250,4 +310,14 @@ private boolean isInNavBarHorizontalArea(float x) { protected String getDelegatorName() { return "NavHandleLongPressInputConsumer"; } + + @VisibleForTesting + void setNavHandleLongPressHandler(NavHandleLongPressHandler navHandleLongPressHandler) { + mNavHandleLongPressHandler = navHandleLongPressHandler; + } + + @VisibleForTesting + void setStatsLogManager(StatsLogManager statsLogManager) { + mStatsLogManager = statsLogManager; + } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java index 2db7f8da08e..0cd072ba0e1 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java @@ -62,9 +62,13 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer { private boolean mPassedSlop; private boolean mIsStopGesture; - public OneHandedModeInputConsumer(Context context, RecentsAnimationDeviceState deviceState, - InputConsumer delegate, InputMonitorCompat inputMonitor) { - super(delegate, inputMonitor); + public OneHandedModeInputConsumer( + Context context, + int displayId, + RecentsAnimationDeviceState deviceState, + InputConsumer delegate, + InputMonitorCompat inputMonitor) { + super(displayId, delegate, inputMonitor); mContext = context; mDeviceState = deviceState; mDragDistThreshold = context.getResources().getDimensionPixelSize( diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index 0d450c6b15e..65a76e501ad 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -38,11 +38,13 @@ import android.util.Log; import android.view.MotionEvent; import android.view.VelocityTracker; +import android.window.TransitionInfo; import androidx.annotation.UiThread; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.util.Preconditions; @@ -57,6 +59,8 @@ import com.android.quickstep.RecentsAnimationTargets; import com.android.quickstep.RotationTouchHelper; import com.android.quickstep.TaskAnimationManager; +import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; import com.android.quickstep.util.CachedEventDispatcher; import com.android.quickstep.util.MotionPauseDetector; import com.android.quickstep.util.NavBarPosition; @@ -70,6 +74,9 @@ */ public class OtherActivityInputConsumer extends ContextWrapper implements InputConsumer { + private static final String TAG = "OtherActivityInputConsumer"; + private static final boolean DEBUG = true; + public static final String DOWN_EVT = "OtherActivityInputConsumer.DOWN"; private static final String UP_EVT = "OtherActivityInputConsumer.UP"; @@ -97,6 +104,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC private final FinishImmediatelyHandler mCleanupHandler = new FinishImmediatelyHandler(); private final boolean mIsDeferredDownTarget; + private final boolean mIsDeferredDownDevice; private final PointF mDownPos = new PointF(); private final PointF mLastPos = new PointF(); private int mActivePointerId = INVALID_POINTER_ID; @@ -121,11 +129,18 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC // The callback called upon finishing the recents transition if it was force-canceled private Runnable mForceFinishRecentsTransitionCallback; - public OtherActivityInputConsumer(Context base, RecentsAnimationDeviceState deviceState, - TaskAnimationManager taskAnimationManager, GestureState gestureState, - boolean isDeferredDownTarget, Consumer onCompleteCallback, - InputMonitorCompat inputMonitorCompat, InputEventReceiver inputEventReceiver, - boolean disableHorizontalSwipe, Factory handlerFactory) { + public OtherActivityInputConsumer( + Context base, + RecentsAnimationDeviceState deviceState, + TaskAnimationManager taskAnimationManager, + GestureState gestureState, + boolean isDeferredDownTarget, + Consumer onCompleteCallback, + InputMonitorCompat inputMonitorCompat, + InputEventReceiver inputEventReceiver, + boolean disableHorizontalSwipe, + Factory handlerFactory, + RotationTouchHelper rotationTouchHelper) { super(base); mDeviceState = deviceState; mNavBarPosition = mDeviceState.getNavBarPosition(); @@ -145,6 +160,11 @@ public OtherActivityInputConsumer(Context base, RecentsAnimationDeviceState devi boolean continuingPreviousGesture = mTaskAnimationManager.isRecentsAnimationRunning(); mIsDeferredDownTarget = !continuingPreviousGesture && isDeferredDownTarget; + // TODO: 432133436 - Remove mIsDeferredDownDevice when a proper fix is merged. + final DesktopVisibilityController desktopVisibilityController = + DesktopVisibilityController.INSTANCE.get(base); + mIsDeferredDownDevice = desktopVisibilityController.isInDesktopMode( + mDeviceState.getDisplayId()); mTouchSlop = mDeviceState.getTouchSlop(); mSquaredTouchSlop = mDeviceState.getSquaredTouchSlop(); @@ -152,7 +172,7 @@ public OtherActivityInputConsumer(Context base, RecentsAnimationDeviceState devi mPassedPilferInputSlop = mPassedWindowMoveSlop = continuingPreviousGesture; mStartDisplacement = continuingPreviousGesture ? 0 : -mTouchSlop; mDisableHorizontalSwipe = !mPassedPilferInputSlop && disableHorizontalSwipe; - mRotationTouchHelper = mDeviceState.getRotationTouchHelper(); + mRotationTouchHelper = rotationTouchHelper; } @Override @@ -160,6 +180,11 @@ public int getType() { return TYPE_OTHER_ACTIVITY; } + @Override + public int getDisplayId() { + return mGestureState.getDisplayId(); + } + @Override public boolean isConsumerDetachedFromGesture() { return true; @@ -230,7 +255,10 @@ public void onMotionEvent(MotionEvent ev) { // Start the window animation on down to give more time for launcher to draw if the // user didn't start the gesture over the back button - if (!mIsDeferredDownTarget) { + if (DEBUG) { + Log.d(TAG, "ACTION_DOWN: mIsDeferredDownTarget=" + mIsDeferredDownTarget); + } + if (!needDeferDown()) { startTouchTrackingForWindowAnimation(ev.getEventTime()); } @@ -271,7 +299,7 @@ public void onMotionEvent(MotionEvent ev) { float displacementY = mLastPos.y - mDownPos.y; if (!mPassedWindowMoveSlop) { - if (!mIsDeferredDownTarget) { + if (!needDeferDown()) { // Normal gesture, ensure we pass the drag slop before we start tracking // the gesture if (mGestureState.isTrackpadGesture() || Math.abs(displacement) @@ -284,9 +312,18 @@ public void onMotionEvent(MotionEvent ev) { float horizontalDist = Math.abs(displacementX); float upDist = -displacement; - boolean passedSlop = mGestureState.isTrackpadGesture() - || (squaredHypot(displacementX, displacementY) >= mSquaredTouchSlop - && !mGestureState.isInExtendedSlopRegion()); + boolean isTrackpadGesture = mGestureState.isTrackpadGesture(); + float squaredHypot = squaredHypot(displacementX, displacementY); + boolean isInExtendedSlopRegion = mGestureState.isInExtendedSlopRegion(); + boolean passedSlop = isTrackpadGesture + || (squaredHypot >= mSquaredTouchSlop + && !isInExtendedSlopRegion); + if (DEBUG) { + Log.d(TAG, "ACTION_MOVE: passedSlop=" + passedSlop + + " ( " + isTrackpadGesture + + " || (" + squaredHypot + " >= " + mSquaredTouchSlop + + " && " + !isInExtendedSlopRegion + " ))"); + } if (!mPassedSlopOnThisGesture && passedSlop) { mPassedSlopOnThisGesture = true; @@ -298,14 +335,27 @@ public void onMotionEvent(MotionEvent ev) { !mPassedSlopOnThisGesture && mPassedPilferInputSlop; double degrees = Math.toDegrees(Math.atan(upDist / horizontalDist)); - // Regarding degrees >= -OVERVIEW_MIN_DEGREES - Trackpad gestures can start anywhere - // on the screen, allowing downward swipes. We want to impose the same angle in that - // scenario. - boolean swipeWithinQuickSwitchRange = degrees <= OVERVIEW_MIN_DEGREES - && (!mGestureState.isTrackpadGesture() || degrees >= -OVERVIEW_MIN_DEGREES); + boolean swipeWithinQuickSwitchRange = degrees <= OVERVIEW_MIN_DEGREES; boolean isLikelyToStartNewTask = haveNotPassedSlopOnContinuedGesture || swipeWithinQuickSwitchRange; + if (DEBUG) { + Log.d(TAG, "ACTION_MOVE: mPassedPilferInputSlop=" + mPassedPilferInputSlop); + } + + // Downwards three finger swipe gesture on trackpad will have degrees == -90. + boolean isDownwardsThreeFingerTrackpadGesture = + mGestureState.isThreeFingerTrackpadGesture() + && degrees < -OVERVIEW_MIN_DEGREES; + if (isDownwardsThreeFingerTrackpadGesture) { + if (DEBUG) { + Log.d(TAG, + "early break to prevent blocking downwards three finger trackpad " + + "gesture"); + } + break; + } + if (!mPassedPilferInputSlop) { if (passedSlop) { // Horizontal gesture is not allowed in this region @@ -327,7 +377,7 @@ public void onMotionEvent(MotionEvent ev) { mPassedPilferInputSlop = true; - if (mIsDeferredDownTarget) { + if (needDeferDown()) { // Deferred gesture, start the animation and gesture tracking once // we pass the actual touch slop startTouchTrackingForWindowAnimation(ev.getEventTime()); @@ -389,11 +439,25 @@ private void notifyGestureStarted(boolean isLikelyToStartNewTask) { private void startTouchTrackingForWindowAnimation(long touchTimeMs) { mInteractionHandler = mHandlerFactory.newHandler(mGestureState, touchTimeMs); + if (mInteractionHandler == null) { + // Can happen e.g. when a display is disconnected, so try to handle gracefully. + Log.d(TAG, "AbsSwipeUpHandler not available for displayId=$focusedDisplayId"); + ActiveGestureProtoLogProxy.logOnAbsSwipeUpHandlerNotAvailable( + mGestureState.getDisplayId()); + return; + } mInteractionHandler.setGestureEndCallback(this::onInteractionGestureFinished); mMotionPauseDetector.setOnMotionPauseListener(mInteractionHandler.getMotionPauseListener()); + mMotionPauseDetector.setIsTrackpadGesture(mGestureState.isTrackpadGesture()); mInteractionHandler.initWhenReady( "OtherActivityInputConsumer.startTouchTrackingForWindowAnimation"); + ActiveGestureProtoLogProxy.logGestureStartSwipeHandler( + mInteractionHandler.getClass().getSimpleName()); + if (DEBUG) { + Log.d(TAG, "startTouchTrackingForWindowAnimation: isRecentsAnimationRunning=" + + mTaskAnimationManager.isRecentsAnimationRunning()); + } if (mTaskAnimationManager.isRecentsAnimationRunning()) { mActiveCallbacks = mTaskAnimationManager.continueRecentsAnimation(mGestureState); mActiveCallbacks.removeListener(mCleanupHandler); @@ -422,6 +486,11 @@ public boolean hasStartedTouchTracking() { */ private void finishTouchTracking(MotionEvent ev) { TraceHelper.INSTANCE.beginSection(UP_EVT); + if (DEBUG) { + Log.d(TAG, "finishTouchTracking: mPassedWindowMoveSlop=" + mPassedWindowMoveSlop); + Log.d(TAG, "finishTouchTracking: mInteractionHandler=" + mInteractionHandler); + Log.d(TAG, "finishTouchTracking: ev=" + ev); + } boolean isCanceled = ev.getActionMasked() == ACTION_CANCEL; if (mPassedWindowMoveSlop && mInteractionHandler != null) { @@ -438,19 +507,33 @@ private void finishTouchTracking(MotionEvent ev) { : velocityYPxPerMs; mInteractionHandler.updateDisplacement(getDisplacement(ev) - mStartDisplacement); mInteractionHandler.onGestureEnded(velocityPxPerMs, - new PointF(velocityXPxPerMs, velocityYPxPerMs)); + new PointF(velocityXPxPerMs, velocityYPxPerMs), + Math.abs(mDownPos.x - mLastPos.x) > mTouchSlop); } } else { // Since we start touch tracking on DOWN, we may reach this state without actually // starting the gesture. In that case, we need to clean-up an unfinished or un-started // animation. + if (DEBUG) { + Log.d(TAG, "finishTouchTracking: mActiveCallbacks=" + mActiveCallbacks); + } if (mActiveCallbacks != null && mInteractionHandler != null) { + if (DEBUG) { + Log.d(TAG, "finishTouchTracking: isRecentsAnimationRunning=" + + mTaskAnimationManager.isRecentsAnimationRunning()); + } if (mTaskAnimationManager.isRecentsAnimationRunning()) { // The animation started, but with no movement, in this case, there will be no // animateToProgress so we have to manually finish here. In the case of // ACTION_CANCEL, someone else may be doing something so finish synchronously. - mTaskAnimationManager.finishRunningRecentsAnimation(false /* toHome */, - isCanceled /* forceFinish */, mForceFinishRecentsTransitionCallback); + mTaskAnimationManager.finishRunningRecentsAnimation( + /* toHome= */ false, + /* forceFinish= */ isCanceled, + mForceFinishRecentsTransitionCallback, + /* reason= */ new ActiveGestureLog.CompoundString( + "OtherActivityInputConsumer.finishTouchTracking: " + + "recents animation started, but window move touch " + + "slop not passed")); } else { // The animation hasn't started yet, so insert a replacement handler into the // callbacks which immediately finishes the animation after it starts. @@ -470,6 +553,8 @@ private void cleanupAfterGesture() { mVelocityTracker = null; } mMotionPauseDetector.clear(); + // Clear ref to recents view and launcher activity on action up or cancel to avoid leak + mRecentsViewDispatcher.clearConsumer(); } @Override @@ -518,6 +603,10 @@ public boolean allowInterceptByParent() { return !mPassedPilferInputSlop; } + private boolean needDeferDown() { + return mIsDeferredDownTarget || mIsDeferredDownDevice; + } + /** * Sets a callback to be called when the recents transition is force-canceled by another input * consumer being made active. @@ -533,10 +622,21 @@ public void setForceFinishRecentsTransitionCallback(Runnable r) { private static class FinishImmediatelyHandler implements RecentsAnimationCallbacks.RecentsAnimationListener { + @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { + RecentsAnimationTargets targets, TransitionInfo transitionInfo) { + if (DEBUG) { + Log.d(TAG, "FinishImmediatelyHandler: queuing callback"); + } Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> { - controller.finish(false /* toRecents */, null); + if (DEBUG) { + Log.d(TAG, "FinishImmediatelyHandler: running callback"); + } + controller.finish( + /* toHome= */ false, + /* onFinishComplete= */ null, + /* reason= */ new ActiveGestureLog.CompoundString( + "OtherActivityInputConsumer.FinishImmediatelyHandler")); }); } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java deleted file mode 100644 index c61f71d3302..00000000000 --- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java +++ /dev/null @@ -1,173 +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.quickstep.inputconsumers; - -import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; - -import android.media.AudioManager; -import android.media.session.MediaSessionManager; -import android.view.KeyEvent; -import android.view.MotionEvent; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.launcher3.Utilities; -import com.android.launcher3.statemanager.BaseState; -import com.android.launcher3.testing.TestLogging; -import com.android.launcher3.testing.shared.TestProtocol; -import com.android.launcher3.views.BaseDragLayer; -import com.android.quickstep.BaseContainerInterface; -import com.android.quickstep.GestureState; -import com.android.quickstep.InputConsumer; -import com.android.quickstep.TaskUtils; -import com.android.quickstep.views.RecentsViewContainer; -import com.android.systemui.shared.system.InputMonitorCompat; - -/** - * Input consumer for handling touch on the recents/Launcher activity. - */ -public class OverviewInputConsumer, T extends RecentsViewContainer> - implements InputConsumer { - - private final T mContainer; - private final BaseContainerInterface mContainerInterface; - private final BaseDragLayer mTarget; - private final InputMonitorCompat mInputMonitor; - private final GestureState mGestureState; - - private final int[] mLocationOnScreen = new int[2]; - - private final boolean mStartingInActivityBounds; - private boolean mTargetHandledTouch; - private boolean mHasSetTouchModeForFirstDPadEvent; - private boolean mIsWaitingForAttachToWindow; - - public OverviewInputConsumer(GestureState gestureState, T container, - @Nullable InputMonitorCompat inputMonitor, boolean startingInActivityBounds) { - mContainer = container; - mInputMonitor = inputMonitor; - mStartingInActivityBounds = startingInActivityBounds; - mContainerInterface = gestureState.getContainerInterface(); - mGestureState = gestureState; - - mTarget = container.getDragLayer(); - mTarget.getLocationOnScreen(mLocationOnScreen); - } - - @Override - public int getType() { - return TYPE_OVERVIEW; - } - - @Override - public boolean allowInterceptByParent() { - return !mTargetHandledTouch; - } - - @Override - public void onMotionEvent(MotionEvent ev) { - int flags = ev.getEdgeFlags(); - if (!mStartingInActivityBounds) { - ev.setEdgeFlags(flags | Utilities.EDGE_NAV_BAR); - } - ev.offsetLocation(-mLocationOnScreen[0], -mLocationOnScreen[1]); - boolean handled = false; - if (mGestureState == null || !mGestureState.isInExtendedSlopRegion()) { - handled = mTarget.proxyTouchEvent(ev, mStartingInActivityBounds); - } - ev.offsetLocation(mLocationOnScreen[0], mLocationOnScreen[1]); - ev.setEdgeFlags(flags); - - if (!mTargetHandledTouch && handled) { - mTargetHandledTouch = true; - if (!mStartingInActivityBounds) { - mContainerInterface.closeOverlay(); - TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS); - } - if (mInputMonitor != null) { - TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); - mInputMonitor.pilferPointers(); - } - } - if (mHasSetTouchModeForFirstDPadEvent) { - mContainer.getRootView().clearFocus(); - } - } - - @Override - public void onHoverEvent(MotionEvent ev) { - mContainer.dispatchGenericMotionEvent(ev); - } - - @Override - public void onKeyEvent(KeyEvent ev) { - switch (ev.getKeyCode()) { - case KeyEvent.KEYCODE_VOLUME_DOWN: - case KeyEvent.KEYCODE_VOLUME_UP: - case KeyEvent.KEYCODE_VOLUME_MUTE: - MediaSessionManager mgr = mContainer.asContext() - .getSystemService(MediaSessionManager.class); - mgr.dispatchVolumeKeyEventAsSystemService(ev, - AudioManager.USE_DEFAULT_STREAM_TYPE); - break; - case KeyEvent.KEYCODE_DPAD_LEFT: - case KeyEvent.KEYCODE_DPAD_RIGHT: - if (mHasSetTouchModeForFirstDPadEvent) { - break; - } - View viewRoot = mContainer.getRootView(); - if (viewRoot.isAttachedToWindow()) { - setTouchModeChanged(viewRoot); - break; - } - if (mIsWaitingForAttachToWindow) { - break; - } - mIsWaitingForAttachToWindow = true; - viewRoot.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { - @Override - public void onViewAttachedToWindow(View view) { - view.removeOnAttachStateChangeListener(this); - mIsWaitingForAttachToWindow = false; - setTouchModeChanged(viewRoot); - } - - @Override - public void onViewDetachedFromWindow(View view) { - // Do nothing - } - }); - break; - default: - break; - } - mContainer.dispatchKeyEvent(ev); - } - - private void setTouchModeChanged(@NonNull View viewRoot) { - // When Overview is launched via meta+tab or swipe up from an app, the touch - // mode somehow is not changed to false by the Android framework. The - // subsequent key events (e.g. DPAD_LEFT, DPAD_RIGHT) can only be dispatched - // to focused views, while focus can only be requested in - // {@link View#requestFocusNoSearch(int, Rect)} when touch mode is false. To - // note, here we launch overview with live tile. - mHasSetTouchModeForFirstDPadEvent = true; - viewRoot.getViewRootImpl().touchModeChanged(false); - } -} - diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java deleted file mode 100644 index 42e8694f6a1..00000000000 --- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java +++ /dev/null @@ -1,97 +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.quickstep.inputconsumers; - -import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND; -import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE; -import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely; - -import android.content.Context; -import android.graphics.PointF; -import android.view.MotionEvent; - -import com.android.launcher3.BaseActivity; -import com.android.launcher3.BaseDraggingActivity; -import com.android.launcher3.logger.LauncherAtom; -import com.android.launcher3.testing.TestLogging; -import com.android.launcher3.testing.shared.TestProtocol; -import com.android.quickstep.GestureState; -import com.android.quickstep.InputConsumer; -import com.android.quickstep.RecentsAnimationDeviceState; -import com.android.quickstep.util.TriggerSwipeUpTouchTracker; -import com.android.systemui.shared.system.InputMonitorCompat; - -public class OverviewWithoutFocusInputConsumer implements InputConsumer, - TriggerSwipeUpTouchTracker.OnSwipeUpListener { - private static final String TAG = "OverviewWithoutFocusInputConsumer"; - - private final Context mContext; - private final InputMonitorCompat mInputMonitor; - private final TriggerSwipeUpTouchTracker mTriggerSwipeUpTracker; - private final GestureState mGestureState; - - public OverviewWithoutFocusInputConsumer(Context context, - RecentsAnimationDeviceState deviceState, GestureState gestureState, - InputMonitorCompat inputMonitor, boolean disableHorizontalSwipe) { - mContext = context; - mGestureState = gestureState; - mInputMonitor = inputMonitor; - mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(context, disableHorizontalSwipe, - deviceState.getNavBarPosition(), this); - } - - @Override - public int getType() { - return TYPE_OVERVIEW_WITHOUT_FOCUS; - } - - @Override - public boolean allowInterceptByParent() { - return !mTriggerSwipeUpTracker.interceptedTouch(); - } - - @Override - public void onMotionEvent(MotionEvent ev) { - mTriggerSwipeUpTracker.onMotionEvent(ev); - } - - @Override - public void onSwipeUpTouchIntercepted() { - if (mInputMonitor != null) { - TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); - mInputMonitor.pilferPointers(); - } - } - - @Override - public void onSwipeUp(boolean wasFling, PointF finalVelocity) { - startHomeIntentSafely(mContext, mGestureState.getHomeIntent(), null, TAG); - BaseActivity activity = BaseDraggingActivity.fromContext(mContext); - int state = (mGestureState != null && mGestureState.getEndTarget() != null) - ? mGestureState.getEndTarget().containerType - : LAUNCHER_STATE_HOME; - activity.getStatsLogManager().logger() - .withSrcState(LAUNCHER_STATE_BACKGROUND) - .withDstState(state) - .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder() - .setWorkspace( - LauncherAtom.WorkspaceContainer.newBuilder() - .setPageIndex(-1)) - .build()) - .log(LAUNCHER_HOME_GESTURE); - } -} diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java index 6dcb7bceffd..2d0f26bd1fd 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java @@ -16,6 +16,9 @@ package com.android.quickstep.inputconsumers; import static com.android.app.animation.Interpolators.scrollInterpolatorForVelocity; +import static com.android.launcher3.taskbar.navbutton.SetupNavLayoutterKt.GLIF_EXPRESSIVE_LIGHT_THEME; +import static com.android.launcher3.taskbar.navbutton.SetupNavLayoutterKt.GLIF_EXPRESSIVE_THEME; +import static com.android.launcher3.taskbar.navbutton.SetupNavLayoutterKt.SUW_THEME_SYSTEM_PROPERTY; import static com.android.launcher3.touch.BaseSwipeDetector.calculateDuration; import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_POSITIVE; import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL; @@ -24,11 +27,18 @@ import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID; import android.animation.ObjectAnimator; +import android.animation.ValueAnimator; import android.content.Context; import android.content.Intent; import android.graphics.Point; +import android.os.SystemProperties; import android.view.MotionEvent; +import android.view.RemoteAnimationTarget; +import android.window.TransitionInfo; +import com.android.app.animation.Interpolators; +import com.android.launcher3.Flags; +import com.android.launcher3.R; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.AnimatorListeners; import com.android.launcher3.testing.TestLogging; @@ -42,6 +52,9 @@ import com.android.quickstep.RecentsAnimationController; import com.android.quickstep.RecentsAnimationTargets; import com.android.quickstep.TaskAnimationManager; +import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.SurfaceTransaction; +import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.InputMonitorCompat; @@ -56,6 +69,7 @@ public class ProgressDelegateInputConsumer implements InputConsumer, private static final String TAG = "ProgressDelegateInputConsumer"; private static final float SWIPE_DISTANCE_THRESHOLD = 0.2f; + private static final float AUTO_END_SWIPE_DISTANCE_THRESHOLD = 0.5f; private static final String[] STATE_NAMES = DEBUG_STATES ? new String[3] : null; private static int getFlagForIndex(int index, String name) { @@ -88,9 +102,17 @@ private static int getFlagForIndex(int index, String name) { private RecentsAnimationController mRecentsAnimationController; private Boolean mFlingEndsOnHome; - public ProgressDelegateInputConsumer(Context context, - TaskAnimationManager taskAnimationManager, GestureState gestureState, - InputMonitorCompat inputMonitorCompat, AnimatedFloat progress) { + private boolean mIsNewExpressiveThemeAnimation = false; + private RemoteAnimationTarget[] mRemoteAnimationTargets; + private final float mBaseReleaseVelocity; + private boolean mAutoEndDrag = false; + + public ProgressDelegateInputConsumer( + Context context, + TaskAnimationManager taskAnimationManager, + GestureState gestureState, + InputMonitorCompat inputMonitorCompat, + AnimatedFloat progress) { mContext = context; mTaskAnimationManager = taskAnimationManager; mGestureState = gestureState; @@ -109,6 +131,14 @@ public ProgressDelegateInputConsumer(Context context, mSwipeDetector = new SingleAxisSwipeDetector(mContext, this, VERTICAL); mSwipeDetector.setDetectableScrollConditions(DIRECTION_POSITIVE, false); + + mBaseReleaseVelocity = mContext.getResources() + .getDimensionPixelSize(R.dimen.base_swift_detector_fling_release_velocity); + + String SUWTheme = SystemProperties.get(SUW_THEME_SYSTEM_PROPERTY, ""); + mIsNewExpressiveThemeAnimation = (SUWTheme.equals(GLIF_EXPRESSIVE_THEME) + || SUWTheme.equals(GLIF_EXPRESSIVE_LIGHT_THEME)) + && Flags.enableNewAllSetAnimation(); } @Override @@ -116,6 +146,11 @@ public int getType() { return TYPE_PROGRESS_DELEGATE; } + @Override + public int getDisplayId() { + return mGestureState.getDisplayId(); + } + @Override public void onMotionEvent(MotionEvent ev) { if (mFlingEndsOnHome == null) { @@ -135,51 +170,106 @@ public void onDragStart(boolean start, float startDisplacement) { @Override public boolean onDrag(float displacement) { + if (mAutoEndDrag) { + return true; + } if (mDisplaySize.y > 0) { - mProgress.updateValue(displacement / -mDisplaySize.y); + float progress = Math.min(0, displacement) / -mDisplaySize.y; + mProgress.updateValue(progress); + + if (mIsNewExpressiveThemeAnimation) { + setClosingTargetAlpha(progress); + + if (progress >= AUTO_END_SWIPE_DISTANCE_THRESHOLD) { + mAutoEndDrag = true; + onDragEnd(mBaseReleaseVelocity, true); + } + } } return true; } + /** Fades out the closing window during the swipe gesture. */ + private void setClosingTargetAlpha(float progress) { + if (mIsNewExpressiveThemeAnimation && mRemoteAnimationTargets != null) { + for (RemoteAnimationTarget t : mRemoteAnimationTargets) { + if (t.mode == RemoteAnimationTarget.MODE_CLOSING) { + SurfaceTransaction transaction = new SurfaceTransaction(); + SurfaceProperties builder = transaction.forSurface(t.leash); + float alphaProgress = Interpolators.clampToProgress(progress, 0.6f, 1f); + builder.setAlpha(1f - alphaProgress); + transaction.getTransaction().apply(); + } + } + } + } + @Override public void onDragEnd(float velocity) { + if (mAutoEndDrag) { + return; + } final boolean willExit; if (mSwipeDetector.isFling(velocity)) { willExit = velocity < 0; } else { - willExit = mProgress.value > SWIPE_DISTANCE_THRESHOLD; + willExit = mProgress.value > (mIsNewExpressiveThemeAnimation + ? AUTO_END_SWIPE_DISTANCE_THRESHOLD + : SWIPE_DISTANCE_THRESHOLD); } + onDragEnd(velocity, willExit); + } + + private void onDragEnd(float velocity, boolean willExit) { float endValue = willExit ? 1 : 0; long duration = calculateDuration(velocity, endValue - mProgress.value); mFlingEndsOnHome = willExit; ObjectAnimator anim = mProgress.animateToValue(endValue); anim.setDuration(duration).setInterpolator(scrollInterpolatorForVelocity(velocity)); + anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator valueAnimator) { + setClosingTargetAlpha((float) valueAnimator.getAnimatedValue()); + } + }); anim.addListener(AnimatorListeners.forSuccessCallback( () -> mStateCallback.setState(STATE_FLING_FINISHED))); anim.start(); } private void onFlingFinished() { - boolean endToRecents = mFlingEndsOnHome == null ? true : mFlingEndsOnHome; + boolean endToHome = mFlingEndsOnHome == null ? true : mFlingEndsOnHome; if (mRecentsAnimationController != null) { - mRecentsAnimationController.finishController(endToRecents /* toRecents */, - null /* callback */, false /* sendUserLeaveHint */); - } else if (endToRecents) { - startHomeIntentSafely(mContext, null, TAG); + mRecentsAnimationController.finishController( + /* toHome= */ endToHome, + /* callback= */ null, + /* sendUserLeaveHint= */ false, + /* reason= */ new ActiveGestureLog.CompoundString( + "ProgressDelegateInputConsumer.onFlingFinished")); + } else if (endToHome) { + startHomeIntentSafely(mContext, null, TAG, getDisplayId()); } + reset(); } @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { + RecentsAnimationTargets targets, TransitionInfo transitionInfo) { + mRemoteAnimationTargets = targets.unfilteredApps; mRecentsAnimationController = controller; mStateCallback.setState(STATE_TARGET_RECEIVED); } @Override public void onRecentsAnimationCanceled(HashMap thumbnailDatas) { + reset(); + } + + private void reset() { + mRemoteAnimationTargets = null; mRecentsAnimationController = null; + mAutoEndDrag = false; } private void endRemoteAnimation() { diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java deleted file mode 100644 index 349f4d2f2f4..00000000000 --- a/quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java +++ /dev/null @@ -1,55 +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.quickstep.inputconsumers; - -import android.view.MotionEvent; - -import com.android.launcher3.taskbar.TaskbarActivityContext; -import com.android.quickstep.InputConsumer; -import com.android.quickstep.TaskAnimationManager; - -import java.util.function.Supplier; - -/** - * A NO_OP input consumer which also resets any pending gesture - */ -public class ResetGestureInputConsumer implements InputConsumer { - - private final TaskAnimationManager mTaskAnimationManager; - private final Supplier mActivityContextSupplier; - - public ResetGestureInputConsumer( - TaskAnimationManager taskAnimationManager, - Supplier activityContextSupplier) { - mTaskAnimationManager = taskAnimationManager; - mActivityContextSupplier = activityContextSupplier; - } - - @Override - public int getType() { - return TYPE_RESET_GESTURE; - } - - @Override - public void onMotionEvent(MotionEvent ev) { - if (ev.getAction() == MotionEvent.ACTION_DOWN - && mTaskAnimationManager.isRecentsAnimationRunning()) { - TaskbarActivityContext tac = mActivityContextSupplier.get(); - mTaskAnimationManager.finishRunningRecentsAnimation( - /* toHome= */ tac != null && !tac.isInApp()); - } - } -} diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.kt b/quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.kt new file mode 100644 index 00000000000..c3b25b296d4 --- /dev/null +++ b/quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.kt @@ -0,0 +1,48 @@ +/* + * 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.quickstep.inputconsumers + +import android.view.MotionEvent +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.quickstep.InputConsumer +import com.android.quickstep.TaskAnimationManager +import com.android.quickstep.util.ActiveGestureLog +import java.util.function.Supplier + +/** A NO_OP input consumer which also resets any pending gesture */ +class ResetGestureInputConsumer( + private val displayId: Int, + private val taskAnimationManager: TaskAnimationManager, + private val activityContextSupplier: Supplier, +) : InputConsumer { + override fun getType() = InputConsumer.TYPE_RESET_GESTURE + + override fun getDisplayId() = displayId + + override fun onMotionEvent(ev: MotionEvent) { + if ( + ev.action == MotionEvent.ACTION_DOWN && taskAnimationManager.isRecentsAnimationRunning + ) { + val tac = activityContextSupplier.get() + taskAnimationManager.finishRunningRecentsAnimation( + /* toHome= */ tac != null && !tac.isInApp, + /* reason= */ ActiveGestureLog.CompoundString( + "ResetGestureInputConsumer: recents animation started" + ), + ) + } + } +} diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java index d73c23ff513..9dc27de5f6a 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java @@ -36,9 +36,12 @@ public class ScreenPinnedInputConsumer implements InputConsumer { private final float mMotionPauseMinDisplacement; private final MotionPauseDetector mMotionPauseDetector; + private final int mDisplayId; + private float mTouchDownY; public ScreenPinnedInputConsumer(Context context, GestureState gestureState) { + mDisplayId = gestureState.getDisplayId(); mMotionPauseMinDisplacement = context.getResources().getDimension( R.dimen.motion_pause_detector_min_displacement_from_app); mMotionPauseDetector = new MotionPauseDetector(context, true /* makePauseHarderToTrigger*/); @@ -60,6 +63,11 @@ public int getType() { return TYPE_SCREEN_PINNED; } + @Override + public int getDisplayId() { + return mDisplayId; + } + @Override public void onMotionEvent(MotionEvent ev) { float y = ev.getY(); diff --git a/quickstep/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java index 871d0759c5b..89f7968e1a1 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java @@ -24,6 +24,7 @@ import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; +import com.android.launcher3.util.Executors; import com.android.quickstep.InputConsumer; import com.android.quickstep.RecentsAnimationDeviceState; import com.android.quickstep.util.TriggerSwipeUpTouchTracker; @@ -47,11 +48,15 @@ public class SysUiOverlayInputConsumer implements InputConsumer, private final InputMonitorCompat mInputMonitor; private final TriggerSwipeUpTouchTracker mTriggerSwipeUpTracker; + private final int mDisplayId; + public SysUiOverlayInputConsumer( Context context, + int displayId, RecentsAnimationDeviceState deviceState, InputMonitorCompat inputMonitor) { mContext = context; + mDisplayId = displayId; mInputMonitor = inputMonitor; mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(context, true, deviceState.getNavBarPosition(), this); @@ -62,6 +67,11 @@ public int getType() { return TYPE_SYSUI_OVERLAY; } + @Override + public int getDisplayId() { + return mDisplayId; + } + @Override public boolean allowInterceptByParent() { return !mTriggerSwipeUpTracker.interceptedTouch(); @@ -83,10 +93,12 @@ public void onSwipeUpTouchIntercepted() { @Override public void onSwipeUp(boolean wasFling, PointF finalVelocity) { // Close system dialogs when a swipe up is detected. - try { - ActivityManager.getService().closeSystemDialogs(SYSTEM_DIALOG_REASON_GESTURE_NAV); - } catch (RemoteException e) { - Log.e(TAG, "Exception calling closeSystemDialogs " + e.getMessage()); - } + Executors.UI_HELPER_EXECUTOR.execute(() -> { + try { + ActivityManager.getService().closeSystemDialogs(SYSTEM_DIALOG_REASON_GESTURE_NAV); + } catch (RemoteException e) { + Log.e(TAG, "Exception calling closeSystemDialogs " + e.getMessage()); + } + }); } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java index 95295b0eb9c..cc1c66909ca 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java @@ -15,24 +15,25 @@ */ package com.android.quickstep.inputconsumers; -import static android.view.MotionEvent.ACTION_CANCEL; import static android.view.MotionEvent.ACTION_MOVE; -import static android.view.MotionEvent.ACTION_UP; import static android.view.MotionEvent.INVALID_POINTER_ID; +import static android.view.RoundedCorner.POSITION_BOTTOM_LEFT; +import static android.view.RoundedCorner.POSITION_BOTTOM_RIGHT; -import static com.android.launcher3.Flags.enableCursorHoverStates; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent; import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TOUCHING; +import static com.android.systemui.shared.Flags.cursorHotCorner; -import android.content.Context; import android.content.res.Resources; import android.graphics.PointF; import android.graphics.Rect; +import android.hardware.display.DisplayManager; import android.os.Handler; import android.os.Looper; +import android.view.Display; import android.view.InputDevice; import android.view.MotionEvent; +import android.view.RoundedCorner; import android.view.VelocityTracker; import android.view.ViewConfiguration; @@ -43,12 +44,11 @@ import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarThresholdUtils; import com.android.launcher3.taskbar.TaskbarTranslationController.TransitionCallback; -import com.android.launcher3.taskbar.bubbles.BubbleControllers; import com.android.launcher3.touch.OverScroll; -import com.android.launcher3.util.DisplayController; import com.android.quickstep.GestureState; import com.android.quickstep.InputConsumer; import com.android.quickstep.OverviewCommandHelper; +import com.android.quickstep.OverviewCommandHelper.CommandType; import com.android.systemui.shared.system.InputMonitorCompat; /** @@ -64,14 +64,13 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer { private final TaskbarActivityContext mTaskbarActivityContext; private final OverviewCommandHelper mOverviewCommandHelper; + private final DisplayManager mDisplayManager; private final float mUnstashArea; + private final int mActionCornerPadding; private final int mTaskbarNavThreshold; private final int mTaskbarNavThresholdY; private final boolean mIsTaskbarAllAppsOpen; private boolean mHasPassedTaskbarNavThreshold; - private boolean mIsInBubbleBarArea; - private boolean mIsVerticalGestureOverBubbleBar; - private boolean mIsPassedBubbleBarSlop; private final int mTouchSlop; private final PointF mDownPos = new PointF(); @@ -94,23 +93,36 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer { // Velocity defined as dp per s private float mTaskbarSlowVelocityYThreshold; - public TaskbarUnstashInputConsumer(Context context, InputConsumer delegate, - InputMonitorCompat inputMonitor, TaskbarActivityContext taskbarActivityContext, - OverviewCommandHelper overviewCommandHelper, GestureState gestureState) { - super(delegate, inputMonitor); + public TaskbarUnstashInputConsumer( + InputConsumer delegate, + InputMonitorCompat inputMonitor, + TaskbarActivityContext taskbarActivityContext, + OverviewCommandHelper overviewCommandHelper, + GestureState gestureState) { + super(gestureState.getDisplayId(), delegate, inputMonitor); mTaskbarActivityContext = taskbarActivityContext; + mIsTransientTaskbar = taskbarActivityContext.getTaskbarFeatureEvaluator().isTransient(); mOverviewCommandHelper = overviewCommandHelper; - mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop(); + mDisplayManager = taskbarActivityContext.getSystemService(DisplayManager.class); + mTouchSlop = ViewConfiguration.get(taskbarActivityContext).getScaledTouchSlop(); - Resources res = context.getResources(); + Resources res = taskbarActivityContext.getResources(); mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area); - mTaskbarNavThreshold = TaskbarThresholdUtils.getFromNavThreshold(res, - taskbarActivityContext.getDeviceProfile()); - mTaskbarNavThresholdY = taskbarActivityContext.getDeviceProfile().heightPx - - mTaskbarNavThreshold; + mActionCornerPadding = res.getDimensionPixelSize( + R.dimen.transient_taskbar_action_corner_padding); + + boolean pinnedTaskbarWithAutoStashing = + mTaskbarActivityContext.shouldAllowTaskbarToAutoStash() && !mIsTransientTaskbar; + + mTaskbarNavThreshold = + pinnedTaskbarWithAutoStashing ? 0 : TaskbarThresholdUtils.getFromNavThreshold(res, + taskbarActivityContext.getDeviceProfile()); + + mTaskbarNavThresholdY = + taskbarActivityContext.getDeviceProfile().getDeviceProperties().getHeightPx() + - mTaskbarNavThreshold; mIsTaskbarAllAppsOpen = mTaskbarActivityContext.isTaskbarAllAppsOpen(); - mIsTransientTaskbar = DisplayController.isTransientTaskbar(context); mTaskbarSlowVelocityYThreshold = res.getDimensionPixelSize(R.dimen.taskbar_slow_velocity_y_threshold); @@ -137,7 +149,7 @@ public boolean allowInterceptByParent() { @Override public void onMotionEvent(MotionEvent ev) { - if (enableScalingRevealHomeAnimation() && mIsTransientTaskbar) { + if (mIsTransientTaskbar) { checkVelocityForTaskbarBackground(ev); } if (mState != STATE_ACTIVE) { @@ -159,9 +171,6 @@ public void onMotionEvent(MotionEvent ev) { if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) { mTransitionCallback.onActionDown(); } - if (mIsTransientTaskbar && isInBubbleBarArea(x)) { - mIsInBubbleBarArea = true; - } break; case MotionEvent.ACTION_POINTER_UP: int ptrIdx = ev.getActionIndex(); @@ -185,32 +194,16 @@ public void onMotionEvent(MotionEvent ev) { float dX = mLastPos.x - mDownPos.x; float dY = mLastPos.y - mDownPos.y; - if (!mIsPassedBubbleBarSlop && mIsInBubbleBarArea) { - boolean passedSlop = - Math.abs(dY) > mTouchSlop || Math.abs(dX) > mTouchSlop; - if (passedSlop) { - mIsPassedBubbleBarSlop = true; - mIsVerticalGestureOverBubbleBar = Math.abs(dY) > Math.abs(dX); - if (mIsVerticalGestureOverBubbleBar) { - setActive(ev); - } - } - } - - if (mIsTransientTaskbar) { + if (mTaskbarActivityContext.shouldAllowTaskbarToAutoStash()) { boolean passedTaskbarNavThreshold = dY < 0 && Math.abs(dY) >= mTaskbarNavThreshold; + // we only care about nav thresholds when we are transient taskbar if (!mHasPassedTaskbarNavThreshold && passedTaskbarNavThreshold && !mGestureState.isInExtendedSlopRegion()) { mHasPassedTaskbarNavThreshold = true; - if (mIsInBubbleBarArea && mIsVerticalGestureOverBubbleBar) { - mTaskbarActivityContext.onSwipeToOpenBubblebar(); - } else { - mTaskbarActivityContext.onSwipeToUnstashTaskbar(); - } + mTaskbarActivityContext.onSwipeToUnstashTaskbar(true); } - if (dY < 0) { dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThresholdY); if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) { @@ -225,46 +218,13 @@ public void onMotionEvent(MotionEvent ev) { break; case MotionEvent.ACTION_BUTTON_RELEASE: if (isStashedTaskbarHovered) { - mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_HOME); + mOverviewCommandHelper.addCommand(CommandType.HOME); } break; } } - boolean isMovingInBubbleBarArea = mIsInBubbleBarArea && ev.getAction() == ACTION_MOVE; if (!isStashedTaskbarHovered) { - // if we're moving in the bubble bar area but we haven't passed the slop yet, don't - // propagate to the delegate, until we can determine the direction of the gesture. - if (!isMovingInBubbleBarArea || mIsPassedBubbleBarSlop) { - mDelegate.onMotionEvent(ev); - } - } - } else if (mIsVerticalGestureOverBubbleBar) { - // if we get here then this gesture is a vertical swipe over the bubble bar. - // we're also active and there's no need to delegate any additional motion events. the - // rest of the gesture will be handled here. - switch (ev.getAction()) { - case ACTION_MOVE: - int pointerIndex = ev.findPointerIndex(mActivePointerId); - if (pointerIndex == INVALID_POINTER_ID) { - break; - } - mLastPos.set(ev.getX(pointerIndex), ev.getY(pointerIndex)); - - float dY = mLastPos.y - mDownPos.y; - - // bubble bar swipe gesture uses the same threshold as the taskbar. - boolean passedTaskbarNavThreshold = dY < 0 - && Math.abs(dY) >= mTaskbarNavThreshold; - - if (!mHasPassedTaskbarNavThreshold && passedTaskbarNavThreshold) { - mHasPassedTaskbarNavThreshold = true; - mTaskbarActivityContext.onSwipeToOpenBubblebar(); - } - break; - case ACTION_UP: - case ACTION_CANCEL: - cleanupAfterMotionEvent(); - break; + mDelegate.onMotionEvent(ev); } } } @@ -285,10 +245,13 @@ private void checkVelocityForTaskbarBackground(MotionEvent ev) { } float velocityYPxPerS = mVelocityTracker.getYVelocity(); + float dY = Math.abs(mLastPos.y - mDownPos.y); if (mCanPlayTaskbarBgAlphaAnimation && mMotionMoveCount >= NUM_MOTION_MOVE_THRESHOLD // Arbitrary value && velocityYPxPerS != 0 // Ignore these - && velocityYPxPerS >= mTaskbarSlowVelocityYThreshold) { + && velocityYPxPerS >= mTaskbarSlowVelocityYThreshold + && dY != 0 + && dY > mTouchSlop) { mTaskbarActivityContext.playTaskbarBackgroundAlphaAnimation(); mCanPlayTaskbarBgAlphaAnimation = false; } @@ -301,9 +264,6 @@ private void cleanupAfterMotionEvent() { mTransitionCallback.onActionEnd(); } mHasPassedTaskbarNavThreshold = false; - mIsInBubbleBarArea = false; - mIsVerticalGestureOverBubbleBar = false; - mIsPassedBubbleBarSlop = false; if (mVelocityTracker != null) { mVelocityTracker.recycle(); @@ -313,22 +273,6 @@ private void cleanupAfterMotionEvent() { mMotionMoveCount = 0; } - private boolean isInBubbleBarArea(float x) { - if (mTaskbarActivityContext == null || !mIsTransientTaskbar) { - return false; - } - BubbleControllers controllers = mTaskbarActivityContext.getBubbleControllers(); - if (controllers == null) { - return false; - } - if (controllers.bubbleStashController.isStashed()) { - return controllers.bubbleStashedHandleViewController.containsX((int) x); - } else { - Rect bubbleBarBounds = controllers.bubbleBarViewController.getBubbleBarBounds(); - return x >= bubbleBarBounds.left && x <= bubbleBarBounds.right; - } - } - /** * Listen for hover events for the stashed taskbar. * @@ -339,7 +283,7 @@ private boolean isInBubbleBarArea(float x) { */ @Override public void onHoverEvent(MotionEvent ev) { - if (!enableCursorHoverStates() || mTaskbarActivityContext == null + if (mTaskbarActivityContext == null || !mTaskbarActivityContext.isTaskbarStashed()) { return; } @@ -347,23 +291,23 @@ public void onHoverEvent(MotionEvent ev) { if (mIsStashedTaskbarHovered) { updateHoveredTaskbarState((int) ev.getX(), (int) ev.getY()); } else { - updateUnhoveredTaskbarState((int) ev.getX(), (int) ev.getY()); + updateUnhoveredTaskbarState((int) ev.getX(), (int) ev.getY(), ev.getDisplayId()); } } private void updateHoveredTaskbarState(int x, int y) { DeviceProfile dp = mTaskbarActivityContext.getDeviceProfile(); mBottomEdgeBounds.set( - (dp.widthPx - (int) mUnstashArea) / 2, - dp.heightPx - mStashedTaskbarBottomEdge, - (int) (((dp.widthPx - mUnstashArea) / 2) + mUnstashArea), - dp.heightPx); + (dp.getDeviceProperties().getWidthPx() - (int) mUnstashArea) / 2, + dp.getDeviceProperties().getHeightPx() - mStashedTaskbarBottomEdge, + (int) (((dp.getDeviceProperties().getWidthPx() - mUnstashArea) / 2) + mUnstashArea), + dp.getDeviceProperties().getHeightPx()); if (mBottomEdgeBounds.contains(x, y)) { // start a single unstash timeout if hovering bottom edge under the hinted taskbar. if (!sUnstashHandler.hasMessagesOrCallbacks()) { sUnstashHandler.postDelayed(() -> { - mTaskbarActivityContext.onSwipeToUnstashTaskbar(); + mTaskbarActivityContext.onSwipeToUnstashTaskbar(false); mIsStashedTaskbarHovered = false; }, HOVER_TASKBAR_UNSTASH_TIMEOUT); } @@ -376,22 +320,37 @@ private void updateHoveredTaskbarState(int x, int y) { } } - private void updateUnhoveredTaskbarState(int x, int y) { + private void updateUnhoveredTaskbarState(int x, int y, int displayId) { sUnstashHandler.removeCallbacksAndMessages(null); DeviceProfile dp = mTaskbarActivityContext.getDeviceProfile(); mBottomEdgeBounds.set( 0, - dp.heightPx - mBottomScreenEdge, - dp.widthPx, - dp.heightPx); + dp.getDeviceProperties().getHeightPx() - mBottomScreenEdge, + dp.getDeviceProperties().getWidthPx(), + dp.getDeviceProperties().getHeightPx()); + + if (cursorHotCorner() && mDisplayManager != null) { + Display display = mDisplayManager.getDisplay(displayId); + if (display != null) { + RoundedCorner leftBottomCorner = display.getRoundedCorner(POSITION_BOTTOM_LEFT); + int leftCornerRadius = + leftBottomCorner == null ? 0 : leftBottomCorner.getRadius(); + RoundedCorner rightBottomCorner = display.getRoundedCorner( + POSITION_BOTTOM_RIGHT); + int rightCornerRadius = + rightBottomCorner == null ? 0 : rightBottomCorner.getRadius(); + mBottomEdgeBounds.inset(leftCornerRadius + mActionCornerPadding, 0, + rightCornerRadius + mActionCornerPadding, 0); + } + } if (isStashedTaskbarHovered(x, y)) { // If enter hovering stashed taskbar, start hint. startStashedTaskbarHover(/* isHovered = */ true); } else if (mBottomEdgeBounds.contains(x, y)) { // If hover screen's bottom edge not below the stashed taskbar, unstash it. - mTaskbarActivityContext.onSwipeToUnstashTaskbar(); + mTaskbarActivityContext.onSwipeToUnstashTaskbar(false); } } @@ -402,16 +361,16 @@ private void startStashedTaskbarHover(boolean isHovered) { private boolean isStashedTaskbarHovered(int x, int y) { if (!mTaskbarActivityContext.isTaskbarStashed() - || mTaskbarActivityContext.isTaskbarAllAppsOpen() - || !enableCursorHoverStates()) { + || mTaskbarActivityContext.isTaskbarAllAppsOpen()) { return false; } DeviceProfile dp = mTaskbarActivityContext.getDeviceProfile(); mStashedTaskbarHandleBounds.set( - (dp.widthPx - (int) mUnstashArea) / 2, - dp.heightPx - dp.stashedTaskbarHeight, - (int) (((dp.widthPx - mUnstashArea) / 2) + mUnstashArea), - dp.heightPx); + (dp.getDeviceProperties().getWidthPx() - (int) mUnstashArea) / 2, + dp.getDeviceProperties().getHeightPx() + - dp.getTaskbarProfile().getStashedTaskbarHeight(), + (int) (((dp.getDeviceProperties().getWidthPx() - mUnstashArea) / 2) + mUnstashArea), + dp.getDeviceProperties().getHeightPx()); return mStashedTaskbarHandleBounds.contains(x, y); } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java index f3e21e1399d..a53a39524b4 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java @@ -35,9 +35,12 @@ public class TrackpadStatusBarInputConsumer extends DelegateInputConsumer { private final PointF mDown = new PointF(); private boolean mHasPassedTouchSlop; - public TrackpadStatusBarInputConsumer(Context context, InputConsumer delegate, + public TrackpadStatusBarInputConsumer( + Context context, + int displayId, + InputConsumer delegate, InputMonitorCompat inputMonitor) { - super(delegate, inputMonitor); + super(displayId, delegate, inputMonitor); mSystemUiProxy = SystemUiProxy.INSTANCE.get(context); mTouchSlop = 2 * ViewConfiguration.get(context).getScaledTouchSlop(); diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java index 5b3afbb4796..60aa330fef4 100644 --- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java +++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java @@ -15,21 +15,31 @@ */ package com.android.quickstep.interaction; +import static android.view.View.GONE; +import static android.view.View.VISIBLE; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS; +import static com.android.app.animation.Interpolators.ACCELERATE; import static com.android.app.animation.Interpolators.FAST_OUT_SLOW_IN; import static com.android.app.animation.Interpolators.LINEAR; +import static com.android.app.animation.Interpolators.clampToProgress; import static com.android.launcher3.Utilities.mapBoundToRange; import static com.android.launcher3.Utilities.mapRange; +import static com.android.launcher3.Utilities.mapToRange; +import static com.android.launcher3.taskbar.StashedHandleViewController.ALPHA_INDEX_ALL_SET_TRANSITION; import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely; +import static com.android.quickstep.RecentsAnimationDeviceState.RESET_TO_DEFAULT_GESTURAL_HEIGHT; +import static com.android.quickstep.views.WallpaperScreenshotClipView.CLIP_ANIM_DURATION; import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; +import android.animation.ValueAnimator; import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; -import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; @@ -42,14 +52,18 @@ import android.graphics.RadialGradient; import android.graphics.Rect; import android.graphics.Shader.TileMode; +import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.os.SystemProperties; import android.os.VibrationEffect; import android.os.Vibrator; import android.text.TextUtils; import android.util.Log; import android.view.View; import android.view.View.AccessibilityDelegate; +import android.view.ViewTreeObserver; +import android.view.ViewTreeObserver.OnWindowVisibilityChangeListener; import android.view.Window; import android.view.WindowInsetsController; import android.view.accessibility.AccessibilityNodeInfo; @@ -61,17 +75,29 @@ import androidx.core.graphics.ColorUtils; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; +import com.android.launcher3.RemoveAnimationSettingsTracker; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.AnimatorPlaybackController; +import com.android.launcher3.taskbar.StashedHandleViewController; +import com.android.launcher3.taskbar.TaskbarActivityContext; +import com.android.launcher3.taskbar.TaskbarActivityContext.UIControllerChangeListener; import com.android.launcher3.taskbar.TaskbarManager; +import com.android.launcher3.taskbar.TaskbarUIController; import com.android.launcher3.util.Executors; import com.android.quickstep.GestureState; +import com.android.quickstep.OverviewComponentObserver; +import com.android.quickstep.OverviewComponentObserver.OverviewChangeListener; import com.android.quickstep.TouchInteractionService.TISBinder; +import com.android.quickstep.util.ActivityPreloadUtil; import com.android.quickstep.util.LottieAnimationColorUtils; import com.android.quickstep.util.TISBindHelper; +import com.android.quickstep.views.WallpaperScreenshotClipView; +import com.android.wm.shell.shared.TypefaceUtils.FontFamily; import com.airbnb.lottie.LottieAnimationView; @@ -79,15 +105,24 @@ import java.util.Map; /** - * A page shows after SUW flow to hint users to swipe up from the bottom of the - * screen to go home + * A page shows after SUW flow to hint users to swipe up from the bottom of the screen to go home * for the gestural system navigation. */ -public class AllSetActivity extends Activity { +public class AllSetActivity extends Activity implements UIControllerChangeListener { + + public static final float ALL_SET_SWIPE_THRESHOLD_FOR_WORKSPACE_ANIM = 0.95f; + // The fade-out happens in the last 65% of the animation. + private static final float CONTENT_FADE_OUT_START_PROGRESS = 0.35f; + // We allow the swipe up to start in the bottom third of the screen. + private static final float GESTURE_HEIGHT_RATIO_OF_WINDOW_HEIGHT = 0.33f; + private static final String TAG = "AllSetActivity"; private static final String LOG_TAG = "AllSetActivity"; - private static final String URI_SYSTEM_NAVIGATION_SETTING = "#Intent;action=com.android.settings.SEARCH_RESULT_TRAMPOLINE;S.:settings:fragment_args_key=gesture_system_navigation_input_summary;S.:settings:show_fragment=com.android.settings.gestures.SystemNavigationGestureSettings;end"; + private static final String URI_SYSTEM_NAVIGATION_SETTING = + "#Intent;action=com.android.settings.SEARCH_RESULT_TRAMPOLINE;S.:settings:fragment_args_key=gesture_system_navigation_input_summary;S.:settings:show_fragment=com.android.settings.gestures.SystemNavigationGestureSettings;end"; + private static final String INTENT_ACTION_ACTIVITY_CLOSED = + "com.android.quickstep.interaction.ACTION_ALL_SET_ACTIVITY_CLOSED"; private static final String EXTRA_ACCENT_COLOR_DARK_MODE = "suwColorAccentDark"; private static final String EXTRA_ACCENT_COLOR_LIGHT_MODE = "suwColorAccentLight"; private static final String EXTRA_DEVICE_NAME = "suwDeviceName"; @@ -95,97 +130,144 @@ public class AllSetActivity extends Activity { private static final String LOTTIE_PRIMARY_COLOR_TOKEN = ".primary"; private static final String LOTTIE_TERTIARY_COLOR_TOKEN = ".tertiary"; + private static final String SUW_THEME_SYSTEM_PROPERTY = "setupwizard.theme"; + private static final String GLIF_EXPRESSIVE_THEME = "glif_expressive"; + private static final String GLIF_EXPRESSIVE_LIGHT_THEME = "glif_expressive_light"; + + private boolean mIsExpressiveThemeEnabledInSUW = false; + private static final float HINT_BOTTOM_FACTOR = 1 - .94f; private static final int MAX_SWIPE_DURATION = 350; + private static final int WALLPAPER_BLUR_RADIUS = 30; + private static final float ANIMATION_PAUSE_ALPHA_THRESHOLD = 0.1f; + private static final String KEY_BACKGROUND_ANIMATION_TOGGLED_ON = + "background_animation_toggled_on"; + + private boolean mIsTablet; + private final AnimatedFloat mSwipeProgress = new AnimatedFloat(this::onSwipeProgressUpdate); + private final InvariantDeviceProfile.OnIDPChangeListener mOnIDPChangeListener = + modelPropertiesChanged -> updateTextForNavigationMode(); + private TISBindHelper mTISBindHelper; private BgDrawable mBackground; private View mRootView; private float mSwipeUpShift; - @Nullable - private Vibrator mVibrator; + @Nullable private Vibrator mVibrator; private LottieAnimationView mAnimatedBackground; private Animator.AnimatorListener mBackgroundAnimatorListener; private AnimatorPlaybackController mLauncherStartAnim = null; + // Auto play background animation by default + private boolean mBackgroundAnimationToggledOn = true; + + private TextView mHintView; + private final OverviewChangeListener mOverviewChangeListener = this::onOverviewTargetChange; + + @Nullable private AnimatorSet mExpressiveAnimSet; + @Nullable private WallpaperScreenshotClipView mWallpaperClipPath; + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + String SUWTheme = SystemProperties.get(SUW_THEME_SYSTEM_PROPERTY, ""); + mIsExpressiveThemeEnabledInSUW = SUWTheme.equals(GLIF_EXPRESSIVE_THEME) + || SUWTheme.equals(GLIF_EXPRESSIVE_LIGHT_THEME); + if (mIsExpressiveThemeEnabledInSUW) setTheme(R.style.AllSetTheme_Expressive); + super.onCreate(savedInstanceState); - setContentView(R.layout.activity_allset); - mRootView = findViewById(R.id.root_view); - mRootView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); + mIsTablet = getDP().getDeviceProperties().isTablet() + && !getDP().getDeviceProperties().isTwoPanels(); + boolean isDarkTheme = + (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) + == Configuration.UI_MODE_NIGHT_YES; + if (mIsExpressiveThemeEnabledInSUW) { + setupExpressiveTheme(); + } else { + setupDefaultTheme(savedInstanceState, isDarkTheme); + } + initializeCommonViewsAndListeners(); + configureSystemUI(isDarkTheme); - Resources resources = getResources(); - int mode = resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - boolean isDarkTheme = mode == Configuration.UI_MODE_NIGHT_YES; + mTISBindHelper = new TISBindHelper(this, this::onTISConnected); + mVibrator = getSystemService(Vibrator.class); + getIDP().addOnChangeListener(mOnIDPChangeListener); + OverviewComponentObserver.INSTANCE.get(this) + .addOverviewChangeListener(mOverviewChangeListener); + ActivityPreloadUtil.preloadOverviewForSUWAllSet(this); + } + private void configureSystemUI(boolean isDarkTheme) { int systemBarsMask = APPEARANCE_LIGHT_STATUS_BARS | APPEARANCE_LIGHT_NAVIGATION_BARS; int systemBarsAppearance = isDarkTheme ? 0 : systemBarsMask; Window window = getWindow(); WindowInsetsController insetsController = window == null ? null : window.getInsetsController(); + if (insetsController != null) { insetsController.setSystemBarsAppearance(systemBarsAppearance, systemBarsMask); } + if (mIsExpressiveThemeEnabledInSUW && window != null) { + window.setBackgroundBlurRadius(WALLPAPER_BLUR_RADIUS); + } + mRootView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); + } - Intent intent = getIntent(); - int accentColor = intent.getIntExtra( - isDarkTheme ? EXTRA_ACCENT_COLOR_DARK_MODE : EXTRA_ACCENT_COLOR_LIGHT_MODE, - isDarkTheme ? Color.WHITE : Color.BLACK); - - ((ImageView) findViewById(R.id.icon)).getDrawable().mutate().setTint(accentColor); + private void initializeCommonViewsAndListeners() { + mHintView = findViewById(R.id.hint); + mHintView.setAccessibilityDelegate(new SkipButtonAccessibilityDelegate()); + updateTextForNavigationMode(); - mBackground = new BgDrawable(this); - mRootView.setBackground(mBackground); - mSwipeUpShift = resources.getDimension(R.dimen.allset_swipe_up_shift); + mSwipeUpShift = getResources().getDimension(R.dimen.allset_swipe_up_shift); - TextView subtitle = findViewById(R.id.subtitle); - String suwDeviceName = intent.getStringExtra(EXTRA_DEVICE_NAME); - subtitle.setText(getString( - R.string.allset_description_generic, - !TextUtils.isEmpty(suwDeviceName) - ? suwDeviceName - : getString(R.string.default_device_name))); - - TextView settings = findViewById(R.id.navigation_settings); - settings.setTextColor(accentColor); - settings.setOnClickListener(v -> { + View navigationSettings = findViewById(R.id.navigation_settings); + navigationSettings.setOnClickListener(v -> { try { + // This is the action that starts the system navigation settings page startActivityForResult( Intent.parseUri(URI_SYSTEM_NAVIGATION_SETTING, 0), 0); } catch (URISyntaxException e) { Log.e(LOG_TAG, "Failed to parse system nav settings intent", e); } }); + } - TextView hint = findViewById(R.id.hint); - DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(this).getDeviceProfile(this); - if (!dp.isGestureMode) { - hint.setText(R.string.allset_button_hint); - } - hint.setAccessibilityDelegate(new SkipButtonAccessibilityDelegate()); + private void setupDefaultTheme(@Nullable Bundle savedInstanceState, boolean isDarkTheme) { + setContentView(R.layout.activity_allset); + mRootView = findViewById(R.id.root_view); - mTISBindHelper = new TISBindHelper(this, this::onTISConnected); + mBackground = new BgDrawable(this); + mRootView.setBackground(mBackground); + + int accentColor = getIntent().getIntExtra( + isDarkTheme ? EXTRA_ACCENT_COLOR_DARK_MODE : EXTRA_ACCENT_COLOR_LIGHT_MODE, + isDarkTheme ? Color.WHITE : Color.BLACK); + + ((ImageView) findViewById(R.id.icon)).getDrawable().mutate().setTint(accentColor); + TextView navigationSettings = findViewById(R.id.navigation_settings); + navigationSettings.setTextColor(accentColor); + + String suwDeviceName = getIntent().getStringExtra(EXTRA_DEVICE_NAME); + TextView subtitle = findViewById(R.id.subtitle); + subtitle.setText(TextUtils.isEmpty(suwDeviceName) + ? getString(R.string.allset_description_fallback) + : getString(R.string.allset_description_generic, suwDeviceName)); - mVibrator = getSystemService(Vibrator.class); mAnimatedBackground = findViewById(R.id.animated_background); - // There's a bug in the currently used external Lottie library (v5.2.0), and it - // doesn't load - // the correct animation from the raw resources when configuration changes, so - // we need to + // There's a bug in the currently used external Lottie library (v5.2.0), and it doesn't load + // the correct animation from the raw resources when configuration changes, so we need to // manually load the resource and pass it to Lottie. - mAnimatedBackground.setAnimation(resources.openRawResource(R.raw.all_set_page_bg), + mAnimatedBackground.setAnimation(getResources().openRawResource(R.raw.all_set_page_bg), null); LottieAnimationColorUtils.updateToColorResources( @@ -193,8 +275,213 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { Map.of(LOTTIE_PRIMARY_COLOR_TOKEN, R.color.all_set_bg_primary, LOTTIE_TERTIARY_COLOR_TOKEN, R.color.all_set_bg_tertiary), getTheme()); + mAnimatedBackground.setScaleX(Utilities.isRtl(getResources()) ? -1f : 1f); + + mBackgroundAnimationToggledOn = savedInstanceState == null + || savedInstanceState.getBoolean(KEY_BACKGROUND_ANIMATION_TOGGLED_ON, true); + // The animated background is behind a scroll view, which intercepts all input. + // However, the content view also covers the full screen + requireViewById(R.id.content).setOnClickListener(v -> { + mBackgroundAnimationToggledOn = !mBackgroundAnimationToggledOn; + maybeResumeOrPauseBackgroundAnimation(); + }); + setUpBackgroundAnimation(getDP().getDeviceProperties().isTablet()); + } + + private void setupExpressiveTheme() { + setContentView(R.layout.activity_allset_expressive); + mRootView = findViewById(R.id.root_view); + + TextView title = findViewById(R.id.title); + TextView subtitle = findViewById(R.id.subtitle); + mHintView = findViewById(R.id.hint); + TextView navigationSettings = findViewById(R.id.navigation_settings); + title.setText(R.string.allset_title_expressive_fixed); + title.setTypeface( + Typeface.create(FontFamily.GSF_HEADLINE_LARGE_EMPHASIZED.getValue(), + Typeface.NORMAL)); + subtitle.setTypeface( + Typeface.create(FontFamily.GSF_BODY_MEDIUM.getValue(), Typeface.NORMAL)); + mHintView.setTypeface( + Typeface.create(FontFamily.GSF_HEADLINE_SMALL_EMPHASIZED.getValue(), + Typeface.NORMAL)); + navigationSettings.setTypeface( + Typeface.create(FontFamily.GSF_HEADLINE_SMALL_EMPHASIZED.getValue(), + Typeface.NORMAL)); + + if (mIsExpressiveThemeEnabledInSUW && Flags.enableNewAllSetAnimation()) { + mWallpaperClipPath = findViewById(R.id.wallpaper_clip_path); + mWallpaperClipPath.setVisibility(VISIBLE); + + // Attempt to pre-load screenshot. + ViewTreeObserver observer = mWallpaperClipPath.getViewTreeObserver(); + observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + mWallpaperClipPath.getViewTreeObserver().removeOnGlobalLayoutListener( + this); + + tryCaptureWallpaperScreenshot(); + } + }); + + // If wallpaper is not ready for pre-load, we try one more time. + observer.addOnWindowVisibilityChangeListener(new OnWindowVisibilityChangeListener() { + @Override + public void onWindowVisibilityChanged(int visibility) { + if (visibility != VISIBLE) { + return; + } + mWallpaperClipPath.getViewTreeObserver() + .removeOnWindowVisibilityChangeListener(this); + tryCaptureWallpaperScreenshot(); + + } + }); + mExpressiveAnimSet = buildExpressiveAnimatorSet(); + } + } - startBackgroundAnimation(dp.isTablet); + private void tryCaptureWallpaperScreenshot() { + if (mWallpaperClipPath != null) { + View wallpaperScrim = findViewById(R.id.wallpaper_scrim); + wallpaperScrim.setVisibility(GONE); + Runnable resetScrim = () -> { + wallpaperScrim.setVisibility(VISIBLE); + }; + mWallpaperClipPath.tryCaptureWallpaperScreenshot( + getWindow(), getDisplayId(), mRootView, WALLPAPER_BLUR_RADIUS, resetScrim); + } + } + + private AnimatorSet buildExpressiveAnimatorSet() { + if (!mIsExpressiveThemeEnabledInSUW || !Flags.enableNewAllSetAnimation()) { + return null; + } + + View content = findViewById(R.id.content); + int height = getWindowManager().getCurrentWindowMetrics().getBounds().height(); + + ValueAnimator transYAnimator = ValueAnimator.ofFloat(0, -height); + transYAnimator.setDuration(CLIP_ANIM_DURATION); + transYAnimator.setInterpolator(LINEAR); + transYAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + float transY = (float) animation.getAnimatedValue(); + mWallpaperClipPath.setClipTranslationY(transY, animation.getAnimatedFraction()); + StashedHandleViewController controller = getStashedHandleViewController(); + if (controller != null) { + controller.setTranslationYForSwipe(transY); + } + } + }); + + ValueAnimator contentAlpha = ValueAnimator.ofFloat(1, 0); + contentAlpha.setInterpolator(LINEAR); + contentAlpha.setDuration(CLIP_ANIM_DURATION); + contentAlpha.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator valueAnimator) { + float progress = valueAnimator.getAnimatedFraction(); + float alpha = 1f - clampToProgress(progress, CONTENT_FADE_OUT_START_PROGRESS, 1f); + content.setAlpha(alpha); + } + }); + + ValueAnimator hintAndHandleAlpha = ValueAnimator.ofFloat(1, 0); + hintAndHandleAlpha.setDuration(CLIP_ANIM_DURATION / 10); + hintAndHandleAlpha.setInterpolator(LINEAR); + hintAndHandleAlpha.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator valueAnimator) { + float alpha = (float) valueAnimator.getAnimatedValue(); + mHintView.setAlpha(alpha); + StashedHandleViewController controller = getStashedHandleViewController(); + if (controller != null) { + controller.getStashedHandleAlpha() + .get(ALPHA_INDEX_ALL_SET_TRANSITION) + .setValue(alpha); + } + } + }); + + AnimatorSet as = new AnimatorSet(); + mWallpaperClipPath.addClipAnimation(as); + as.play(transYAnimator); + as.play(contentAlpha); + as.play(hintAndHandleAlpha); + as.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + StashedHandleViewController controller = getStashedHandleViewController(); + if (controller != null) { + controller.setTranslationYForSwipe(0); + controller.getStashedHandleAlpha() + .get(ALPHA_INDEX_ALL_SET_TRANSITION) + .setValue(1f); + } + } + }); + return as; + } + + private @Nullable StashedHandleViewController getStashedHandleViewController() { + if (mTISBindHelper != null) { + TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); + if (taskbarManager != null) { + return taskbarManager.getCurrentActivityContext() + .getControllers().stashedHandleViewController; + } + } + return null; + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + if (!mIsExpressiveThemeEnabledInSUW) { + outState.putBoolean(KEY_BACKGROUND_ANIMATION_TOGGLED_ON, mBackgroundAnimationToggledOn); + } + } + + private InvariantDeviceProfile getIDP() { + return LauncherAppState.getInstance(this).getInvariantDeviceProfile(); + } + + private DeviceProfile getDP() { + return getIDP().getDeviceProfile(this); + } + + private void updateTextForNavigationMode() { + boolean isGestureMode = getDP().getDeviceProperties().isGestureMode(); + int hintTextResId; + String subtitleText = null; + + if (mIsExpressiveThemeEnabledInSUW) { + hintTextResId = isGestureMode + ? R.string.allset_hint_expressive + : R.string.allset_button_hint_expressive; + String deviceName = getString(mIsTablet + ? R.string.allset_device_type_tablet + : R.string.allset_device_type_phone); + int subtitleFormatResId = isGestureMode + ? R.string.allset_subtitle_expressive_gesture_navigation + : R.string.allset_subtitle_expressive_button_navigation; + + subtitleText = getString(subtitleFormatResId, deviceName); + } else { + hintTextResId = isGestureMode + ? R.string.allset_hint + : R.string.allset_button_hint; + } + + mHintView.setText(hintTextResId); + + TextView subtitle = findViewById(R.id.subtitle); + if (subtitleText != null) { + subtitle.setText(subtitleText); + } } private void runOnUiHelperThread(Runnable runnable) { @@ -205,8 +492,8 @@ private void runOnUiHelperThread(Runnable runnable) { Executors.UI_HELPER_EXECUTOR.execute(runnable); } - private void startBackgroundAnimation(boolean forTablet) { - if (!Utilities.ATLEAST_S || mVibrator == null) { + private void setUpBackgroundAnimation(boolean forTablet) { + if (mVibrator == null || mIsExpressiveThemeEnabledInSUW) { return; } boolean supportsThud = mVibrator.areAllPrimitivesSupported( @@ -219,42 +506,41 @@ private void startBackgroundAnimation(boolean forTablet) { if (mBackgroundAnimatorListener == null) { VibrationEffect vibrationEffect = VibrationEffect.startComposition() .addPrimitive(supportsThud - ? VibrationEffect.Composition.PRIMITIVE_THUD - : VibrationEffect.Composition.PRIMITIVE_TICK, + ? VibrationEffect.Composition.PRIMITIVE_THUD + : VibrationEffect.Composition.PRIMITIVE_TICK, /* scale= */ forTablet ? 1.0f : 0.3f, /* delay= */ 50) .compose(); - mBackgroundAnimatorListener = new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - runOnUiHelperThread(() -> mVibrator.vibrate(vibrationEffect)); - } - - @Override - public void onAnimationRepeat(Animator animation) { - runOnUiHelperThread(() -> mVibrator.vibrate(vibrationEffect)); - } - - @Override - public void onAnimationEnd(Animator animation) { - runOnUiHelperThread(mVibrator::cancel); - } - - @Override - public void onAnimationCancel(Animator animation) { - runOnUiHelperThread(mVibrator::cancel); - } - }; + mBackgroundAnimatorListener = + new Animator.AnimatorListener() { + @Override + public void onAnimationStart(Animator animation) { + runOnUiHelperThread(() -> mVibrator.vibrate(vibrationEffect)); + } + + @Override + public void onAnimationRepeat(Animator animation) { + runOnUiHelperThread(() -> mVibrator.vibrate(vibrationEffect)); + } + + @Override + public void onAnimationEnd(Animator animation) { + runOnUiHelperThread(mVibrator::cancel); + } + + @Override + public void onAnimationCancel(Animator animation) { + runOnUiHelperThread(mVibrator::cancel); + } + }; } mAnimatedBackground.addAnimatorListener(mBackgroundAnimatorListener); - mAnimatedBackground.playAnimation(); } private void setSetupUIVisible(boolean visible) { TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); - if (taskbarManager == null) - return; + if (taskbarManager == null) return; taskbarManager.setSetupUIVisible(visible); } @@ -267,19 +553,59 @@ protected void onResume() { setSetupUIVisible(true); binder.setSwipeUpProxy(this::createSwipeUpProxy); } + if (mIsExpressiveThemeEnabledInSUW) { + getWindow().setBackgroundBlurRadius(WALLPAPER_BLUR_RADIUS); + if (Flags.enableNewAllSetAnimation() && binder != null) { + int height = getWindowManager().getCurrentWindowMetrics().getBounds().height(); + binder.setGesturalHeight((int) (height * GESTURE_HEIGHT_RATIO_OF_WINDOW_HEIGHT)); + } + } + setUIControllerChangeListener(this); } private void onTISConnected(TISBinder binder) { setSetupUIVisible(isResumed()); binder.setSwipeUpProxy(isResumed() ? this::createSwipeUpProxy : null); - binder.setOverviewTargetChangeListener(binder::preloadOverviewForSUWAllSet); - binder.preloadOverviewForSUWAllSet(); - TaskbarManager taskbarManager = binder.getTaskbarManager(); + if (mIsExpressiveThemeEnabledInSUW && Flags.enableNewAllSetAnimation() && isResumed()) { + int height = getWindowManager().getCurrentWindowMetrics().getBounds().height(); + binder.setGesturalHeight((int) (height * GESTURE_HEIGHT_RATIO_OF_WINDOW_HEIGHT)); + } + + setUIControllerChangeListener(this); + TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); + if (taskbarManager != null) { + // Initial call + onUIControllerChanged( + taskbarManager.getUIControllerForDisplay(taskbarManager.getPrimaryDisplayId())); + } + } + + private void setUIControllerChangeListener(UIControllerChangeListener listener) { + TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); + if (taskbarManager != null) { + TaskbarActivityContext context = taskbarManager.getCurrentActivityContext(); + if (context != null) { + context.setUIControllerChangeListener(listener); + } + } + } + + @Override + public void onUIControllerChanged(TaskbarUIController uiController) { + TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); if (taskbarManager != null) { mLauncherStartAnim = taskbarManager.createLauncherStartFromSuwAnim(MAX_SWIPE_DURATION); + if (mWallpaperClipPath != null) { + mWallpaperClipPath.setForceFallbackAnimation( + taskbarManager.shouldForceAllSetFallbackAnimation()); + } } } + private void onOverviewTargetChange(boolean isHomeAndOverviewSame) { + ActivityPreloadUtil.preloadOverviewForSUWAllSet(this); + } + @Override protected void onPause() { super.onPause(); @@ -289,6 +615,7 @@ protected void onPause() { finishAndRemoveTask(); dispatchLauncherAnimStartEnd(); } + setUIControllerChangeListener(null); } private void clearBinderOverride() { @@ -296,27 +623,30 @@ private void clearBinderOverride() { if (binder != null) { setSetupUIVisible(false); binder.setSwipeUpProxy(null); - binder.setOverviewTargetChangeListener(null); + if (mIsExpressiveThemeEnabledInSUW && Flags.enableNewAllSetAnimation()) { + binder.setGesturalHeight(RESET_TO_DEFAULT_GESTURAL_HEIGHT); + } } } /** - * Should be called when we have successfully reached Launcher, so we dispatch - * to animation - * listeners to ensure the state matches the visual animation that just - * occurred. - */ + * Should be called when we have successfully reached Launcher, so we dispatch to animation + * listeners to ensure the state matches the visual animation that just occurred. + */ private void dispatchLauncherAnimStartEnd() { if (mLauncherStartAnim != null) { mLauncherStartAnim.dispatchOnStart(); mLauncherStartAnim.dispatchOnEnd(); mLauncherStartAnim = null; } + sendBroadcast(new Intent(INTENT_ACTION_ACTIVITY_CLOSED)); } @Override protected void onDestroy() { super.onDestroy(); + getIDP().removeOnChangeListener(mOnIDPChangeListener); + setUIControllerChangeListener(null); mTISBindHelper.onDestroy(); clearBinderOverride(); if (mBackgroundAnimatorListener != null) { @@ -325,6 +655,8 @@ protected void onDestroy() { if (!isChangingConfigurations()) { dispatchLauncherAnimStartEnd(); } + OverviewComponentObserver.INSTANCE.get(this) + .removeOverviewChangeListener(mOverviewChangeListener); } private AnimatedFloat createSwipeUpProxy(GestureState state) { @@ -341,8 +673,14 @@ private float getContentViewAlphaForSwipeProgress() { } private void maybeResumeOrPauseBackgroundAnimation() { - boolean shouldPlayAnimation = getContentViewAlphaForSwipeProgress() > ANIMATION_PAUSE_ALPHA_THRESHOLD - && isResumed(); + if (mIsExpressiveThemeEnabledInSUW) { + return; + } + boolean shouldPlayAnimation = + !RemoveAnimationSettingsTracker.INSTANCE.get(this).isRemoveAnimationEnabled() + && getContentViewAlphaForSwipeProgress() > ANIMATION_PAUSE_ALPHA_THRESHOLD + && isResumed() + && mBackgroundAnimationToggledOn; if (mAnimatedBackground.isAnimating() && !shouldPlayAnimation) { mAnimatedBackground.pauseAnimation(); } else if (!mAnimatedBackground.isAnimating() && shouldPlayAnimation) { @@ -351,11 +689,22 @@ private void maybeResumeOrPauseBackgroundAnimation() { } private void onSwipeProgressUpdate() { - mBackground.setProgress(mSwipeProgress.value); - float alpha = getContentViewAlphaForSwipeProgress(); - mRootView.setAlpha(alpha); - mRootView.setTranslationY((alpha - 1) * mSwipeUpShift); + if (mIsExpressiveThemeEnabledInSUW) { + getWindow().setBackgroundBlurRadius((int) mapBoundToRange( + mSwipeProgress.value, 0, HINT_BOTTOM_FACTOR, WALLPAPER_BLUR_RADIUS, 0, + ACCELERATE)); + if (mExpressiveAnimSet != null) { + long progress = (long) mapToRange( + mSwipeProgress.value, 0, 1, 0, CLIP_ANIM_DURATION, LINEAR); + mExpressiveAnimSet.setCurrentPlayTime(Math.min(CLIP_ANIM_DURATION, progress)); + } + } else { + mBackground.setProgress(mSwipeProgress.value); + float alpha = getContentViewAlphaForSwipeProgress(); + mRootView.setAlpha(alpha); + mRootView.setTranslationY((alpha - 1) * mSwipeUpShift); + } if (mLauncherStartAnim != null) { mLauncherStartAnim.setPlayFraction( FAST_OUT_SLOW_IN.getInterpolation(mSwipeProgress.value)); @@ -380,7 +729,7 @@ public AccessibilityNodeInfo createAccessibilityNodeInfo(View host) { @Override public boolean performAccessibilityAction(View host, int action, Bundle args) { if (action == AccessibilityAction.ACTION_CLICK.getId()) { - startHomeIntentSafely(AllSetActivity.this, null, TAG); + startHomeIntentSafely(AllSetActivity.this, null, TAG, getDisplayId()); finish(); return true; } @@ -399,7 +748,8 @@ private static class BgDrawable extends Drawable { private final Matrix mMatrix = new Matrix(); private final ColorMatrix mColorMatrix = new ColorMatrix(); - private final ColorMatrixColorFilter mColorFilter = new ColorMatrixColorFilter(mColorMatrix); + private final ColorMatrixColorFilter mColorFilter = + new ColorMatrixColorFilter(mColorMatrix); private final int mColor; private float mProgress = 0; @@ -407,8 +757,8 @@ private static class BgDrawable extends Drawable { BgDrawable(Context context) { mColor = context.getColor(R.color.all_set_page_background); mMaskGrad = new RadialGradient(0, 0, 1, - new int[] { ColorUtils.setAlphaComponent(mColor, 0), mColor }, - new float[] { 0, 1 }, TileMode.CLAMP); + new int[] {ColorUtils.setAlphaComponent(mColor, 0), mColor}, + new float[]{0, 1}, TileMode.CLAMP); mPaint.setShader(mMaskGrad); mPaint.setColorFilter(mColorFilter); @@ -430,7 +780,7 @@ public void draw(Canvas canvas) { float size = PointF.length(x, height); float radius = size * mapRange(progress, START_SIZE_FACTOR, END_SIZE_FACTOR); - float y = mapRange(progress, height + radius, height / 2); + float y = mapRange(progress, height + radius , height / 2); mMatrix.setTranslate(x, y); mMatrix.postScale(radius, radius, x, y); mMaskGrad.setLocalMatrix(mMatrix); @@ -456,11 +806,9 @@ public int getOpacity() { } @Override - public void setAlpha(int i) { - } + public void setAlpha(int i) { } @Override - public void setColorFilter(ColorFilter colorFilter) { - } + public void setColorFilter(ColorFilter colorFilter) { } } } diff --git a/quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java b/quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java index 742b0fc7e86..7a86db37c73 100644 --- a/quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java +++ b/quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java @@ -15,8 +15,6 @@ */ package com.android.quickstep.interaction; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL; - import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; @@ -175,11 +173,8 @@ void setToMultiRowLayout() { void setFakeTaskViewFillColor(@ColorInt int colorResId) { mFullTaskView.setBackgroundColor(colorResId); - - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()){ - mTopTaskView.getBackground().setTint(colorResId); - mBottomTaskView.getBackground().setTint(colorResId); - } + mTopTaskView.getBackground().setTint(colorResId); + mBottomTaskView.getBackground().setTint(colorResId); } @Override diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java index 6669da5b0e7..f4dfd4b774e 100644 --- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java @@ -15,7 +15,6 @@ */ package com.android.quickstep.interaction; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL; import static com.android.quickstep.interaction.TutorialController.TutorialType.BACK_NAVIGATION; import static com.android.quickstep.interaction.TutorialController.TutorialType.BACK_NAVIGATION_COMPLETE; @@ -39,41 +38,29 @@ final class BackGestureTutorialController extends TutorialController { BackGestureTutorialController(BackGestureTutorialFragment fragment, TutorialType tutorialType) { super(fragment, tutorialType); + // Set the Lottie animation colors specifically for the Back gesture - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - LottieAnimationColorUtils.updateToArgbColors( - mAnimatedGestureDemonstration, - Map.of(".onSurfaceBack", fragment.mRootView.mColorOnSurfaceBack, - ".surfaceBack", fragment.mRootView.mColorSurfaceBack, - ".secondaryBack", fragment.mRootView.mColorSecondaryBack)); - - LottieAnimationColorUtils.updateToArgbColors( - mCheckmarkAnimation, - Map.of(".checkmark", - Utilities.isDarkTheme(mContext) - ? fragment.mRootView.mColorOnSurfaceBack - : fragment.mRootView.mColorSecondaryBack, - ".checkmarkBackground", fragment.mRootView.mColorSurfaceBack)); - } + LottieAnimationColorUtils.updateToArgbColors( + mAnimatedGestureDemonstration, + Map.of(".tertiaryContainer", fragment.mRootView.mColorContainerBack, + ".onTertiaryContainer", fragment.mRootView.mColorOnContainerBack)); + + mAnimatedGestureDemonstration.setBackgroundColor(fragment.mRootView.mColorContainerBack); + + LottieAnimationColorUtils.updateToArgbColors( + mCheckmarkAnimation, + Map.of(".onCheckmarkContainer", fragment.mRootView.mColorContainerBack, + ".checkmarkContainer", fragment.mRootView.mColorOnContainerBack)); } @Override public int getIntroductionTitle() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.back_gesture_tutorial_title - : R.string.back_gesture_intro_title; + return R.string.back_gesture_tutorial_title; } @Override public int getIntroductionSubtitle() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.back_gesture_tutorial_subtitle - : R.string.back_gesture_intro_subtitle; - } - - @Override - public int getSpokenIntroductionSubtitle() { - return R.string.back_gesture_spoken_intro_subtitle; + return R.string.back_gesture_tutorial_subtitle; } @Override @@ -85,9 +72,7 @@ public int getSuccessFeedbackTitle() { public int getSuccessFeedbackSubtitle() { return mTutorialFragment.isAtFinalStep() ? R.string.back_gesture_feedback_complete_without_follow_up - : ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.back_gesture_feedback_complete_with_follow_up - : R.string.back_gesture_feedback_complete_with_overview_follow_up; + : R.string.back_gesture_feedback_complete_with_follow_up; } @Override @@ -100,16 +85,24 @@ public int getSuccessTitleTextAppearance() { return R.style.TextAppearance_GestureTutorial_MainTitle_Success_Back; } + @Override + public int getSubtitleTextAppearance() { + return R.style.TextAppearance_GestureTutorial_Subtitle_Back; + } + @Override public int getDoneButtonTextAppearance() { return R.style.TextAppearance_GestureTutorial_ButtonLabel_Back; } + @Override + public int getSuccessSubtitleTextAppearance() { + return R.style.TextAppearance_GestureTutorial_Subtitle_Success_Back; + } + @Override public int getDoneButtonColor() { - return Utilities.isDarkTheme(mContext) - ? mTutorialFragment.mRootView.mColorOnSurfaceBack - : mTutorialFragment.mRootView.mColorSecondaryBack; + return mTutorialFragment.mRootView.mColorOnContainerBack; } @Override @@ -128,20 +121,12 @@ protected int getGestureLottieAnimationId() { @LayoutRes int getMockAppTaskCurrentPageLayoutResId() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.layout.back_gesture_tutorial_background - : mTutorialFragment.isLargeScreen() - ? R.layout.gesture_tutorial_tablet_mock_conversation - : R.layout.gesture_tutorial_mock_conversation; + return R.layout.back_gesture_tutorial_background; } @LayoutRes int getMockAppTaskPreviousPageLayoutResId() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.layout.back_gesture_tutorial_background - : mTutorialFragment.isLargeScreen() - ? R.layout.gesture_tutorial_tablet_mock_conversation_list - : R.layout.gesture_tutorial_mock_conversation_list; + return R.layout.back_gesture_tutorial_background; } @Override @@ -151,12 +136,12 @@ protected int getFakeLauncherColor() { @Override protected int getExitingAppColor() { - return mTutorialFragment.mRootView.mColorSurfaceBack; + return mTutorialFragment.mRootView.mColorContainerBack; } @Override public void onBackGestureAttempted(BackGestureResult result) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } switch (mTutorialType) { @@ -174,7 +159,7 @@ public void onBackGestureAttempted(BackGestureResult result) { @Override public void onBackGestureProgress(float diffx, float diffy, boolean isLeftGesture) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } @@ -214,17 +199,13 @@ public void onBackGestureProgress(float diffx, float diffy, boolean isLeftGestur } private void handleBackAttempt(BackGestureResult result) { - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - resetViewsForBackGesture(); - } + resetViewsForBackGesture(); switch (result) { case BACK_COMPLETED_FROM_LEFT: case BACK_COMPLETED_FROM_RIGHT: mTutorialFragment.releaseFeedbackAnimation(); - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mExitingAppView.setVisibility(View.GONE); - } + mExitingAppView.setVisibility(View.GONE); updateFakeAppTaskViewLayout(getMockAppTaskPreviousPageLayoutResId()); showSuccessFeedback(); break; @@ -243,7 +224,7 @@ private void handleBackAttempt(BackGestureResult result) { @Override public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } if (mTutorialType == BACK_NAVIGATION_COMPLETE) { diff --git a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java index 1b12be85df6..dda80285cd3 100644 --- a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java +++ b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java @@ -15,8 +15,6 @@ */ package com.android.quickstep.interaction; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL; - import android.content.Context; import android.content.res.Resources; import android.graphics.Point; @@ -31,9 +29,9 @@ import androidx.annotation.Nullable; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.Utilities; import com.android.launcher3.testing.shared.ResourceUtils; -import com.android.launcher3.util.DisplayController; /** * Utility class to handle edge swipes for back gestures. @@ -47,6 +45,7 @@ public class EdgeBackGestureHandler implements OnTouchListener { "gestures.back_timeout", 250); private final Context mContext; + private final DeviceProfile mDeviceProfile; private final Point mDisplaySize = new Point(); @@ -91,9 +90,10 @@ public void cancelBack() { } }; - EdgeBackGestureHandler(Context context) { + EdgeBackGestureHandler(Context context, DeviceProfile deviceProfile) { final Resources res = context.getResources(); mContext = context; + mDeviceProfile = deviceProfile; mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop(); mLongPressTimeout = Math.min(MAX_LONG_PRESS_TIMEOUT, @@ -118,8 +118,7 @@ void setViewGroupParent(@Nullable ViewGroup parent) { // Add a nav bar panel window. mEdgeBackPanel = new EdgeBackGesturePanel(mContext, parent, createLayoutParams()); mEdgeBackPanel.setBackCallback(mBackCallback); - Point currentSize = DisplayController.INSTANCE.get(mContext).getInfo().currentSize; - mDisplaySize.set(currentSize.x, currentSize.y); + mDisplaySize.set(mDeviceProfile.getDeviceProperties().getWidthPx(), mDeviceProfile.getDeviceProperties().getHeightPx()); mEdgeBackPanel.setDisplaySize(mDisplaySize); } } @@ -211,10 +210,8 @@ private void onMotionEvent(MotionEvent ev) { } } - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mGestureCallback.onBackGestureProgress(ev.getX() - mDownPoint.x, - ev.getY() - mDownPoint.y, mEdgeBackPanel.getIsLeftPanel()); - } + mGestureCallback.onBackGestureProgress(ev.getX() - mDownPoint.x, + ev.getY() - mDownPoint.y, mEdgeBackPanel.getIsLeftPanel()); // forward touch mEdgeBackPanel.onMotionEvent(ev); diff --git a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java index 36ea9269b41..e6206d01b2d 100644 --- a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java +++ b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java @@ -37,10 +37,10 @@ import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.R; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logging.StatsLogManager; import com.android.quickstep.TouchInteractionService.TISBinder; import com.android.quickstep.interaction.TutorialController.TutorialType; +import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.util.TISBindHelper; import java.util.ArrayList; @@ -54,8 +54,6 @@ public class GestureSandboxActivity extends FragmentActivity { static final String KEY_TUTORIAL_TYPE = "tutorial_type"; static final String KEY_GESTURE_COMPLETE = "gesture_complete"; static final String KEY_USE_TUTORIAL_MENU = "use_tutorial_menu"; - public static final double SQUARE_ASPECT_RATIO_BOTTOM_BOUND = 0.95; - public static final double SQUARE_ASPECT_RATIO_UPPER_BOUND = 1.05; @Nullable private TutorialType[] mTutorialSteps; private GestureSandboxFragment mCurrentFragment; @@ -80,9 +78,7 @@ protected void onCreate(Bundle savedInstanceState) { Bundle args = savedInstanceState == null ? getIntent().getExtras() : savedInstanceState; boolean gestureComplete = args != null && args.getBoolean(KEY_GESTURE_COMPLETE, false); - if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - && args != null - && args.getBoolean(KEY_USE_TUTORIAL_MENU, false)) { + if (args != null && args.getBoolean(KEY_USE_TUTORIAL_MENU, false)) { mTutorialSteps = null; TutorialType tutorialTypeOverride = (TutorialType) args.get(KEY_TUTORIAL_TYPE); mCurrentFragment = tutorialTypeOverride == null @@ -102,9 +98,7 @@ protected void onCreate(Bundle savedInstanceState) { .add(R.id.gesture_tutorial_fragment_container, mCurrentFragment) .commit(); - if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - correctUserOrientation(); - } + correctUserOrientation(); mTISBindHelper = new TISBindHelper(this, this::onTISConnected); initWindowInsets(); @@ -116,29 +110,18 @@ public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); // Ensure the prompt to rotate the screen is updated - if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - correctUserOrientation(); - } + correctUserOrientation(); } private void initWindowInsets() { View root = findViewById(android.R.id.content); - root.addOnLayoutChangeListener(new View.OnLayoutChangeListener() { - @Override - public void onLayoutChange(View v, int left, int top, int right, int bottom, - int oldLeft, int oldTop, int oldRight, int oldBottom) { - updateExclusionRects(root); - } - }); + root.addOnLayoutChangeListener( + (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> + updateExclusionRects(root)); // Return CONSUMED if you don't want want the window insets to keep being // passed down to descendant views. - root.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() { - @Override - public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) { - return WindowInsets.CONSUMED; - } - }); + root.setOnApplyWindowInsetsListener((v, insets) -> WindowInsets.CONSUMED); } private void updateExclusionRects(View rootView) { @@ -168,12 +151,9 @@ private void updateExclusionRects(View rootView) { private void correctUserOrientation() { DeviceProfile deviceProfile = InvariantDeviceProfile.INSTANCE.get( getApplicationContext()).getDeviceProfile(this); - if (deviceProfile.isTablet) { + if (deviceProfile.getDeviceProperties().isTablet()) { // The tutorial will work in either orientation if the height and width are similar - boolean isAspectRatioSquare = - deviceProfile.aspectRatio > SQUARE_ASPECT_RATIO_BOTTOM_BOUND - && deviceProfile.aspectRatio < SQUARE_ASPECT_RATIO_UPPER_BOUND; - boolean showRotationPrompt = !isAspectRatioSquare + boolean showRotationPrompt = !LayoutUtils.isAspectRatioSquare(deviceProfile.getDeviceProperties().getAspectRatio()) && getResources().getConfiguration().orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java index 679e926a9ad..3a19be99158 100644 --- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java @@ -15,12 +15,9 @@ */ package com.android.quickstep.interaction; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL; - import android.graphics.PointF; import com.android.launcher3.R; -import com.android.launcher3.Utilities; import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult; import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult; import com.android.quickstep.util.LottieAnimationColorUtils; @@ -34,47 +31,32 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll super(fragment, tutorialType); // Set the Lottie animation colors specifically for the Home gesture - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - LottieAnimationColorUtils.updateToArgbColors( - mAnimatedGestureDemonstration, - Map.of(".onSurfaceHome", fragment.mRootView.mColorOnSurfaceHome, - ".surfaceHome", fragment.mRootView.mColorSurfaceHome, - ".secondaryHome", fragment.mRootView.mColorSecondaryHome)); - - LottieAnimationColorUtils.updateToArgbColors( - mCheckmarkAnimation, - Map.of(".checkmark", - Utilities.isDarkTheme(mContext) - ? fragment.mRootView.mColorOnSurfaceHome - : fragment.mRootView.mColorSecondaryHome, - ".checkmarkBackground", fragment.mRootView.mColorSurfaceHome)); - } + LottieAnimationColorUtils.updateToArgbColors( + mAnimatedGestureDemonstration, + Map.of(".primaryContainer", fragment.mRootView.mColorContainerHome, + ".onPrimaryContainer", fragment.mRootView.mColorOnContainerHome)); + + mAnimatedGestureDemonstration.setBackgroundColor(fragment.mRootView.mColorContainerHome); + + LottieAnimationColorUtils.updateToArgbColors( + mCheckmarkAnimation, + Map.of(".onCheckmarkContainer", fragment.mRootView.mColorContainerHome, + ".checkmarkContainer", fragment.mRootView.mColorOnContainerHome)); } @Override public int getIntroductionTitle() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.home_gesture_tutorial_title - : R.string.home_gesture_intro_title; + return R.string.home_gesture_tutorial_title; } @Override public int getIntroductionSubtitle() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.home_gesture_tutorial_subtitle - : R.string.home_gesture_intro_subtitle; - } - - @Override - public int getSpokenIntroductionSubtitle() { - return R.string.home_gesture_spoken_intro_subtitle; + return R.string.home_gesture_tutorial_subtitle; } @Override public int getSuccessFeedbackTitle() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.home_gesture_tutorial_success - : R.string.gesture_tutorial_nice; + return R.string.home_gesture_tutorial_success; } @Override @@ -94,6 +76,16 @@ public int getSuccessTitleTextAppearance() { return R.style.TextAppearance_GestureTutorial_MainTitle_Success_Home; } + @Override + public int getSubtitleTextAppearance() { + return R.style.TextAppearance_GestureTutorial_Subtitle_Home; + } + + @Override + public int getSuccessSubtitleTextAppearance() { + return R.style.TextAppearance_GestureTutorial_Subtitle_Success_Home; + } + @Override public int getDoneButtonTextAppearance() { return R.style.TextAppearance_GestureTutorial_ButtonLabel_Home; @@ -101,9 +93,7 @@ public int getDoneButtonTextAppearance() { @Override public int getDoneButtonColor() { - return Utilities.isDarkTheme(mContext) - ? mTutorialFragment.mRootView.mColorOnSurfaceHome - : mTutorialFragment.mRootView.mColorSecondaryHome; + return mTutorialFragment.mRootView.mColorOnContainerHome; } @Override @@ -134,7 +124,7 @@ protected int getFakeLauncherColor() { @Override protected int getExitingAppColor() { - return mTutorialFragment.mRootView.mColorSurfaceHome; + return mTutorialFragment.mRootView.mColorContainerHome; } @Override @@ -144,7 +134,7 @@ protected int getHotseatIconColor() { @Override public void onBackGestureAttempted(BackGestureResult result) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } switch (mTutorialType) { @@ -171,7 +161,7 @@ public void onBackGestureAttempted(BackGestureResult result) { @Override public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } switch (mTutorialType) { diff --git a/quickstep/src/com/android/quickstep/interaction/MenuFragment.java b/quickstep/src/com/android/quickstep/interaction/MenuFragment.java index 8ead3dd8bd6..37f516f8055 100644 --- a/quickstep/src/com/android/quickstep/interaction/MenuFragment.java +++ b/quickstep/src/com/android/quickstep/interaction/MenuFragment.java @@ -23,11 +23,14 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.ViewTreeObserver; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.R; +import com.android.wm.shell.shared.TypefaceUtils; /** Displays the gesture nav tutorial menu. */ public final class MenuFragment extends GestureSandboxFragment { @@ -58,9 +61,66 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c root.findViewById(R.id.gesture_tutorial_menu_done_button).setOnClickListener( v -> close()); + setPaddings( + root, + root.findViewById(R.id.gesture_tutorial_menu_home_button_text), + root.findViewById(R.id.gesture_tutorial_home_step_shape), + /* setVerticalMargins= */ true); + setPaddings( + root, + root.findViewById(R.id.gesture_tutorial_menu_back_button_text), + root.findViewById(R.id.gesture_tutorial_back_step_shape), + /* setVerticalMargins= */ false); + setPaddings( + root, + root.findViewById(R.id.gesture_tutorial_menu_overview_button_text), + root.findViewById(R.id.gesture_tutorial_overview_step_shape), + /* setVerticalMargins= */ true); + + TypefaceUtils.setTypeface( + root.findViewById(R.id.gesture_tutorial_menu_home_button_text), + TypefaceUtils.FontFamily.GSF_DISPLAY_SMALL_EMPHASIZED); + TypefaceUtils.setTypeface( + root.findViewById(R.id.gesture_tutorial_menu_back_button_text), + TypefaceUtils.FontFamily.GSF_DISPLAY_SMALL_EMPHASIZED); + TypefaceUtils.setTypeface( + root.findViewById(R.id.gesture_tutorial_menu_overview_button_text), + TypefaceUtils.FontFamily.GSF_DISPLAY_SMALL_EMPHASIZED); + TypefaceUtils.setTypeface( + root.findViewById(R.id.gesture_tutorial_menu_done_button), + TypefaceUtils.FontFamily.GSF_LABEL_LARGE); + return root; } + private void setPaddings( + @NonNull View root, + @NonNull TextView textView, + @NonNull View shapeImage, + boolean setVerticalPaddings) { + if (!root.isAttachedToWindow()) { + root.getViewTreeObserver().addOnGlobalLayoutListener( + new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + root.getViewTreeObserver().removeOnGlobalLayoutListener(this); + setPaddings(root, textView, shapeImage, setVerticalPaddings); + } + }); + return; + } + if (setVerticalPaddings) { + if (textView.getLineCount() <= 1) { + return; + } + // Don't set top padding to allow room for long strings + textView.setPadding(0, 0, 0, shapeImage.getHeight()); + } else { + // set both left and right paddings to keep it horizontally-aligned + textView.setPadding(shapeImage.getWidth(), 0, shapeImage.getWidth(), 0); + } + } + @Override boolean shouldDisableSystemGestures() { return false; diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java index e4c3a7e6ec5..33230b08b5b 100644 --- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java +++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java @@ -33,6 +33,7 @@ import androidx.annotation.Nullable; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.testing.shared.ResourceUtils; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.NavigationMode; @@ -58,15 +59,16 @@ public class NavBarGestureHandler implements OnTouchListener, @Nullable private NavBarGestureAttemptCallback mGestureCallback; - NavBarGestureHandler(Context context) { + NavBarGestureHandler(Context context, DeviceProfile deviceProfile) { mContext = context; - DisplayController.Info displayInfo = DisplayController.INSTANCE.get(mContext).getInfo(); - Point currentSize = displayInfo.currentSize; - mDisplaySize.set(currentSize.x, currentSize.y); - mSwipeUpTouchTracker = - new TriggerSwipeUpTouchTracker(context, true /*disableHorizontalSwipe*/, - new NavBarPosition(NavigationMode.NO_BUTTON, displayInfo), - this); + mDisplaySize.set(deviceProfile.getDeviceProperties().getWidthPx(), deviceProfile.getDeviceProperties().getHeightPx()); + mSwipeUpTouchTracker = new TriggerSwipeUpTouchTracker( + context, + /* disableHorizontalSwipe= */ true, + new NavBarPosition( + NavigationMode.NO_BUTTON, + DisplayController.INSTANCE.get(mContext).getInfo()), + /* onSwipeUp= */ this); mMotionPauseDetector = new MotionPauseDetector(context); final Resources resources = context.getResources(); diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java index 05d32cc88c2..cf43a0efa39 100644 --- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java @@ -16,7 +16,6 @@ package com.android.quickstep.interaction; import static com.android.app.animation.Interpolators.ACCELERATE; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -49,46 +48,36 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont super(fragment, tutorialType); // Set the Lottie animation colors specifically for the Overview gesture - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - LottieAnimationColorUtils.updateToArgbColors( - mAnimatedGestureDemonstration, - Map.of(".onSurfaceOverview", fragment.mRootView.mColorOnSurfaceOverview, - ".surfaceOverview", fragment.mRootView.mColorSurfaceOverview, - ".secondaryOverview", fragment.mRootView.mColorSecondaryOverview)); - - LottieAnimationColorUtils.updateToArgbColors( - mCheckmarkAnimation, - Map.of(".checkmark", - Utilities.isDarkTheme(mContext) - ? fragment.mRootView.mColorOnSurfaceOverview - : fragment.mRootView.mColorSecondaryOverview, - ".checkmarkBackground", fragment.mRootView.mColorSurfaceOverview)); - } + LottieAnimationColorUtils.updateToArgbColors( + mAnimatedGestureDemonstration, + Map.of(".secondaryContainer", fragment.mRootView.mColorContainerOverview, + ".onSecondaryContainer", fragment.mRootView.mColorOnContainerOverview)); + + mAnimatedGestureDemonstration.setBackgroundColor( + fragment.mRootView.mColorContainerOverview); + + LottieAnimationColorUtils.updateToArgbColors( + mCheckmarkAnimation, + Map.of(".onCheckmarkContainer", Utilities.isDarkTheme(mContext) + ? fragment.mRootView.mColorOnContainerOverview + : fragment.mRootView.mColorContainerOverview, + ".checkmarkContainer", Utilities.isDarkTheme(mContext) + ? fragment.mRootView.mColorContainerOverview + : fragment.mRootView.mColorOnContainerOverview)); } @Override public int getIntroductionTitle() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.overview_gesture_tutorial_title - : R.string.overview_gesture_intro_title; + return R.string.overview_gesture_tutorial_title; } @Override public int getIntroductionSubtitle() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.overview_gesture_tutorial_subtitle - : R.string.overview_gesture_intro_subtitle; - } - - @Override - public int getSpokenIntroductionSubtitle() { - return R.string.overview_gesture_spoken_intro_subtitle; + return R.string.overview_gesture_tutorial_subtitle; } @Override public int getSuccessFeedbackTitle() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.string.overview_gesture_tutorial_success - : R.string.gesture_tutorial_nice; + return R.string.overview_gesture_tutorial_success; } @Override @@ -108,16 +97,26 @@ public int getSuccessTitleTextAppearance() { return R.style.TextAppearance_GestureTutorial_MainTitle_Success_Overview; } + @Override + public int getSubtitleTextAppearance() { + return R.style.TextAppearance_GestureTutorial_Subtitle_Overview; + } + @Override public int getDoneButtonTextAppearance() { return R.style.TextAppearance_GestureTutorial_ButtonLabel_Overview; } + @Override + public int getSuccessSubtitleTextAppearance() { + return R.style.TextAppearance_GestureTutorial_Subtitle_Success_Overview; + } + @Override public int getDoneButtonColor() { return Utilities.isDarkTheme(mContext) - ? mTutorialFragment.mRootView.mColorOnSurfaceOverview - : mTutorialFragment.mRootView.mColorSecondaryOverview; + ? mTutorialFragment.mRootView.mColorContainerOverview + : mTutorialFragment.mRootView.mColorOnContainerOverview; } @Override @@ -138,7 +137,7 @@ protected int getGestureLottieAnimationId() { @ColorInt private int getFakeTaskViewStartColor() { - return mTutorialFragment.mRootView.mColorSurfaceOverview; + return mTutorialFragment.mRootView.mColorContainerOverview; } @ColorInt @@ -157,26 +156,25 @@ protected int getFakeTaskViewColor() { protected int getFakeLauncherColor() { return ColorUtils.blendARGB( mTutorialFragment.mRootView.mColorSurfaceContainer, - mTutorialFragment.mRootView.mColorOnSurfaceOverview, + mTutorialFragment.mRootView.mColorOnContainerOverview, LAUNCHER_COLOR_BLENDING_RATIO); } @Override protected int getHotseatIconColor() { - return mTutorialFragment.mRootView.mColorOnSurfaceOverview; + return Utilities.isDarkTheme(mContext) + ? mTutorialFragment.mRootView.mColorContainerOverview + : mTutorialFragment.mRootView.mColorOnContainerOverview; } @Override protected int getMockPreviousAppTaskThumbnailColor() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? mTutorialFragment.mRootView.mColorSurfaceContainer - : mContext.getResources().getColor( - R.color.gesture_tutorial_fake_previous_task_view_color); + return mTutorialFragment.mRootView.mColorSurfaceContainer; } @Override public void onBackGestureAttempted(BackGestureResult result) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } switch (mTutorialType) { @@ -203,7 +201,7 @@ public void onBackGestureAttempted(BackGestureResult result) { @Override public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } switch (mTutorialType) { @@ -224,11 +222,8 @@ public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVel case OVERVIEW_GESTURE_COMPLETED: setGestureCompleted(); mTutorialFragment.releaseFeedbackAnimation(); - animateTaskViewToOverview(ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()); + animateTaskViewToOverview(true); onMotionPaused(true /*arbitrary value*/); - if (!ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - showSuccessFeedback(); - } break; case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION: case HOME_OR_OVERVIEW_CANCELLED: diff --git a/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java index affedb94970..367a6f50a98 100644 --- a/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java +++ b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java @@ -15,16 +15,12 @@ */ package com.android.quickstep.interaction; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL; - import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.Insets; -import android.graphics.Rect; import android.util.AttributeSet; import android.view.MotionEvent; -import android.view.View; import android.view.WindowInsets; import android.widget.RelativeLayout; @@ -39,25 +35,13 @@ /** Root layout that TutorialFragment uses to intercept motion events. */ public class RootSandboxLayout extends RelativeLayout { - private final Rect mTempStepIndicatorBounds = new Rect(); - private final Rect mTempInclusionBounds = new Rect(); - private final Rect mTempExclusionBounds = new Rect(); - @ColorInt final int mColorSurfaceContainer; - @ColorInt final int mColorOnSurfaceHome; - @ColorInt final int mColorSurfaceHome; - @ColorInt final int mColorSecondaryHome; - @ColorInt final int mColorOnSurfaceBack; - @ColorInt final int mColorSurfaceBack; - @ColorInt final int mColorSecondaryBack; - @ColorInt final int mColorOnSurfaceOverview; - @ColorInt final int mColorSurfaceOverview; - @ColorInt final int mColorSecondaryOverview; - - private View mFeedbackView; - private View mTutorialStepView; - private View mSkipButton; - private View mDoneButton; + @ColorInt final int mColorOnContainerHome; + @ColorInt final int mColorContainerHome; + @ColorInt final int mColorOnContainerBack; + @ColorInt final int mColorContainerBack; + @ColorInt final int mColorOnContainerOverview; + @ColorInt final int mColorContainerOverview; public RootSandboxLayout(Context context) { this(context, null); @@ -85,26 +69,21 @@ public RootSandboxLayout( boolean isDarkTheme = Utilities.isDarkTheme(context); int colorSurface = isDarkTheme ? Color.BLACK : Color.WHITE; int colorOnSurface = isDarkTheme ? Color.WHITE : Color.BLACK; - int colorSecondary = Color.GRAY; mColorSurfaceContainer = ta.getColor( R.styleable.RootSandboxLayout_surfaceContainer, colorSurface); - mColorOnSurfaceHome = ta.getColor( - R.styleable.RootSandboxLayout_onSurfaceHome, colorOnSurface); - mColorSurfaceHome = ta.getColor(R.styleable.RootSandboxLayout_surfaceHome, colorSurface); - mColorSecondaryHome = ta.getColor( - R.styleable.RootSandboxLayout_secondaryHome, colorSecondary); - mColorOnSurfaceBack = ta.getColor( - R.styleable.RootSandboxLayout_onSurfaceBack, colorOnSurface); - mColorSurfaceBack = ta.getColor(R.styleable.RootSandboxLayout_surfaceBack, colorSurface); - mColorSecondaryBack = ta.getColor( - R.styleable.RootSandboxLayout_secondaryBack, colorSecondary); - mColorOnSurfaceOverview = ta.getColor( - R.styleable.RootSandboxLayout_onSurfaceOverview, colorOnSurface); - mColorSurfaceOverview = ta.getColor( - R.styleable.RootSandboxLayout_surfaceOverview, colorSurface); - mColorSecondaryOverview = ta.getColor( - R.styleable.RootSandboxLayout_secondaryOverview, colorSecondary); + mColorContainerHome = ta.getColor( + R.styleable.RootSandboxLayout_containerHome, colorSurface); + mColorOnContainerHome = ta.getColor( + R.styleable.RootSandboxLayout_onContainerHome, colorOnSurface); + mColorContainerBack = ta.getColor( + R.styleable.RootSandboxLayout_containerBack, colorSurface); + mColorOnContainerBack = ta.getColor( + R.styleable.RootSandboxLayout_onContainerBack, colorOnSurface); + mColorContainerOverview = ta.getColor( + R.styleable.RootSandboxLayout_containerOverview, colorSurface); + mColorOnContainerOverview = ta.getColor( + R.styleable.RootSandboxLayout_onContainerOverview, colorOnSurface); ta.recycle(); } @@ -123,56 +102,4 @@ public int getFullscreenHeight() { return getHeight() + insets.top + insets.bottom; } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - return; - } - mFeedbackView = findViewById(R.id.gesture_tutorial_fragment_feedback_view); - mTutorialStepView = - mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_tutorial_step); - mSkipButton = mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_close_button); - mDoneButton = mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_action_button); - - mFeedbackView.addOnLayoutChangeListener( - (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { - if (mSkipButton.getVisibility() != VISIBLE - && mDoneButton.getVisibility() != VISIBLE) { - return; - } - // Either the skip or the done button is ever shown at once, never both. - boolean showingSkipButton = mSkipButton.getVisibility() == VISIBLE; - boolean isRTL = Utilities.isRtl(getContext().getResources()); - updateTutorialStepViewTranslation( - showingSkipButton ? mSkipButton : mDoneButton, - // Translate the step indicator away from whichever button is being - // shown. The skip button in on the left in LTR or on the right in RTL. - // The done button is on the right in LTR or left in RTL. - (showingSkipButton && !isRTL) || (!showingSkipButton && isRTL)); - }); - } - - private void updateTutorialStepViewTranslation( - @NonNull View anchorView, boolean translateToRight) { - mTempStepIndicatorBounds.set( - mTutorialStepView.getLeft(), - mTutorialStepView.getTop(), - mTutorialStepView.getRight(), - mTutorialStepView.getBottom()); - mTempInclusionBounds.set(0, 0, mFeedbackView.getWidth(), mFeedbackView.getHeight()); - mTempExclusionBounds.set( - anchorView.getLeft(), - anchorView.getTop(), - anchorView.getRight(), - anchorView.getBottom()); - - Utilities.translateOverlappingView( - mTutorialStepView, - mTempStepIndicatorBounds, - mTempInclusionBounds, - mTempExclusionBounds, - translateToRight ? Utilities.TRANSLATE_RIGHT : Utilities.TRANSLATE_LEFT); - } } diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java index db98457b683..c444ec4c90b 100644 --- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java @@ -34,6 +34,7 @@ import android.graphics.PointF; import android.graphics.Rect; import android.graphics.RectF; +import android.view.Display; import android.view.View; import android.view.ViewOutlineProvider; @@ -48,11 +49,10 @@ import com.android.launcher3.anim.AnimatorListeners; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.config.FeatureFlags; import com.android.quickstep.GestureState; import com.android.quickstep.OverviewComponentObserver; -import com.android.quickstep.RecentsAnimationDeviceState; import com.android.quickstep.RemoteTargetGluer; +import com.android.quickstep.RotationTouchHelper; import com.android.quickstep.SwipeUpAnimationLogic; import com.android.quickstep.SwipeUpAnimationLogic.RunningWindowAnim; import com.android.quickstep.util.RecordingSurfaceTransaction; @@ -86,16 +86,13 @@ public void onAnimationEnd(Animator animation) { SwipeUpGestureTutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) { super(tutorialFragment, tutorialType); - RecentsAnimationDeviceState deviceState = new RecentsAnimationDeviceState(mContext); - OverviewComponentObserver observer = new OverviewComponentObserver(mContext, deviceState); - mTaskViewSwipeUpAnimation = new ViewSwipeUpAnimation(mContext, deviceState, - new GestureState(observer, -1)); - observer.onDestroy(); - deviceState.destroy(); + mTaskViewSwipeUpAnimation = new ViewSwipeUpAnimation(mContext, new GestureState( + OverviewComponentObserver.INSTANCE.get(mContext), Display.DEFAULT_DISPLAY, -1), + RotationTouchHelper.REPOSITORY_INSTANCE.get(mContext).get(Display.DEFAULT_DISPLAY)); DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext) .getDeviceProfile(mContext) - .copy(mContext); + .copy(); mTaskViewSwipeUpAnimation.initDp(dp); int height = mTutorialFragment.getRootView().getFullscreenHeight(); @@ -127,9 +124,7 @@ private void cancelRunningAnimation() { void resetTaskViews() { mFakeHotseatView.setVisibility(View.INVISIBLE); mFakeIconView.setVisibility(View.INVISIBLE); - if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mFakeIconView.getBackground().setTint(getFakeTaskViewColor()); - } + mFakeIconView.getBackground().setTint(getFakeTaskViewColor()); if (mTutorialFragment.getActivity() != null) { int height = mTutorialFragment.getRootView().getFullscreenHeight(); int width = mTutorialFragment.getRootView().getWidth(); @@ -138,9 +133,7 @@ void resetTaskViews() { mFakeTaskViewRadius = 0; mFakeTaskView.invalidateOutline(); mFakeTaskView.setVisibility(View.VISIBLE); - if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mFakeTaskView.setBackgroundColor(getFakeTaskViewColor()); - } + mFakeTaskView.setBackgroundColor(getFakeTaskViewColor()); mFakeTaskView.setAlpha(1); mFakePreviousTaskView.setVisibility(View.INVISIBLE); mFakePreviousTaskView.setAlpha(1); @@ -149,7 +142,6 @@ void resetTaskViews() { mShowPreviousTasks = false; mRunningWindowAnim = null; } - void fadeOutFakeTaskView(boolean toOverviewFirst, @Nullable Runnable onEndRunnable) { fadeOutFakeTaskView( toOverviewFirst, @@ -173,7 +165,8 @@ void fadeOutFakeTaskView(boolean toOverviewFirst, anim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation, boolean isReverse) { - PendingAnimation fadeAnim = new PendingAnimation(TASK_VIEW_END_ANIMATION_DURATION_MILLIS); + PendingAnimation fadeAnim = + new PendingAnimation(TASK_VIEW_END_ANIMATION_DURATION_MILLIS); fadeAnim.setFloat(mTaskViewSwipeUpAnimation .getCurrentShift(), AnimatedFloat.VALUE, 0, ACCELERATE); if (resetViews) { @@ -192,7 +185,8 @@ public void onAnimationEnd(Animator animation, boolean isReverse) { @Override public void onAnimationStart(Animator animation) { super.onAnimationStart(animation); - Animator multiRowAnimation = mFakePreviousTaskView.createAnimationToMultiRowLayout(); + Animator multiRowAnimation = + mFakePreviousTaskView.createAnimationToMultiRowLayout(); if (multiRowAnimation != null) { multiRowAnimation.setDuration( @@ -252,7 +246,8 @@ void animateFakeTaskViewHome(PointF finalVelocity, @Nullable Runnable onEndRunna mFakePreviousTaskView.setVisibility(View.INVISIBLE); mFakeHotseatView.setVisibility(View.VISIBLE); mShowPreviousTasks = false; - RectFSpringAnim rectAnim = mTaskViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity); + RectFSpringAnim rectAnim = + mTaskViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity); // After home animation finishes, fade out and run onEndRunnable. PendingAnimation fadeAnim = new PendingAnimation(300); fadeAnim.setViewAlpha(mFakeIconView, 0, ACCELERATE); @@ -277,7 +272,7 @@ public void onAnimationStart(Animator animation) { @Override public void setNavBarGestureProgress(@Nullable Float displacement) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } if (mTutorialType == HOME_NAVIGATION_COMPLETE @@ -298,7 +293,7 @@ public void setNavBarGestureProgress(@Nullable Float displacement) { @Override public void onMotionPaused(boolean unused) { - if (skipGestureAttempt()) { + if (isGestureCompleted()) { return; } if (mShowTasks) { @@ -306,9 +301,9 @@ public void onMotionPaused(boolean unused) { mFakePreviousTaskView.setTranslationX( -(2 * mFakePreviousTaskView.getWidth() + FAKE_PREVIOUS_TASK_MARGIN)); mFakePreviousTaskView.animate() - .setDuration(300) - .translationX(-(mFakePreviousTaskView.getWidth() + FAKE_PREVIOUS_TASK_MARGIN)) - .start(); + .setDuration(300) + .translationX(-(mFakePreviousTaskView.getWidth() + FAKE_PREVIOUS_TASK_MARGIN)) + .start(); } mShowPreviousTasks = true; } @@ -316,13 +311,14 @@ public void onMotionPaused(boolean unused) { class ViewSwipeUpAnimation extends SwipeUpAnimationLogic { - ViewSwipeUpAnimation(Context context, RecentsAnimationDeviceState deviceState, - GestureState gestureState) { - super(context, deviceState, gestureState); + ViewSwipeUpAnimation(Context context, GestureState gestureState, + RotationTouchHelper rotationTouchHelper) { + super(context, gestureState, rotationTouchHelper); mRemoteTargetHandles[0] = new RemoteTargetGluer.RemoteTargetHandle( mRemoteTargetHandles[0].getTaskViewSimulator(), new FakeTransformParams()); - for (RemoteTargetGluer.RemoteTargetHandle handle : mTargetGluer.getRemoteTargetHandles()) { + for (RemoteTargetGluer.RemoteTargetHandle handle + : mTargetGluer.getRemoteTargetHandles()) { // Override home screen rotation preference so that home and overview animations // work properly handle.getTaskViewSimulator() @@ -334,7 +330,7 @@ class ViewSwipeUpAnimation extends SwipeUpAnimationLogic { void initDp(DeviceProfile dp) { initTransitionEndpoints(dp); mRemoteTargetHandles[0].getTaskViewSimulator().setPreviewBounds( - new Rect(0, 0, dp.widthPx, dp.heightPx), dp.getInsets()); + new Rect(0, 0, dp.getDeviceProperties().getWidthPx(), dp.getDeviceProperties().getHeightPx()), dp.getInsets()); } @Override @@ -387,12 +383,10 @@ public void update(RectF rect, float progress, float radius, int overlayAlpha) { false, /* isOpening */ mFakeIconView, mDp); mFakeIconView.setAlpha(1); - if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - int iconColor = ColorUtils.blendARGB( - getFakeTaskViewColor(), getHotseatIconColor(), progress); - mFakeIconView.getBackground().setTint(iconColor); - mFakeTaskView.setBackgroundColor(iconColor); - } + int iconColor = ColorUtils.blendARGB( + getFakeTaskViewColor(), getHotseatIconColor(), progress); + mFakeIconView.getBackground().setTint(iconColor); + mFakeTaskView.setBackgroundColor(iconColor); mFakeTaskView.setAlpha(getWindowAlpha(progress)); mFakePreviousTaskView.setAlpha(getWindowAlpha(progress)); } @@ -437,18 +431,20 @@ protected Animator createFingerDotOverviewSwipeAnimator(float fingerDotStartTran public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); mFakePreviousTaskView.setVisibility(View.VISIBLE); - onMotionPaused(true /* arbitrary value */); + onMotionPaused(true /*arbitrary value*/); } }); return overviewSwipeAnimator; } + private Animator createFingerDotSwipeUpAnimator(float fingerDotStartTranslationY) { ValueAnimator swipeAnimator = ValueAnimator.ofFloat(0f, 1f); swipeAnimator.addUpdateListener(valueAnimator -> { - float gestureProgress = -fingerDotStartTranslationY * valueAnimator.getAnimatedFraction(); + float gestureProgress = + -fingerDotStartTranslationY * valueAnimator.getAnimatedFraction(); setNavBarGestureProgress(gestureProgress); mFingerDotView.setTranslationY(fingerDotStartTranslationY + gestureProgress); }); diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java index b0a21c2b3eb..3b64d2bb349 100644 --- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java @@ -19,28 +19,25 @@ import static android.view.View.NO_ID; import static android.view.View.inflate; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL; - import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.annotation.RawRes; import android.content.Context; -import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.Matrix; import android.graphics.Outline; import android.graphics.Rect; -import android.graphics.drawable.AnimatedVectorDrawable; -import android.graphics.drawable.ColorDrawable; +import android.graphics.Typeface; import android.graphics.drawable.RippleDrawable; +import android.os.SystemProperties; +import android.provider.Settings; +import android.provider.Settings.Secure; import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.ViewOutlineProvider; -import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.widget.Button; import android.widget.FrameLayout; @@ -52,21 +49,20 @@ import androidx.annotation.ColorInt; import androidx.annotation.DrawableRes; import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.annotation.StyleRes; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.content.res.AppCompatResources; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; -import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorListeners; +import com.android.launcher3.util.SettingsCache; import com.android.launcher3.views.ClipIconView; import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureAttemptCallback; import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttemptCallback; import com.android.systemui.shared.system.QuickStepContract; +import com.android.wm.shell.Flags; +import com.android.wm.shell.shared.TypefaceUtils.FontFamily; import com.airbnb.lottie.LottieAnimationView; import com.airbnb.lottie.LottieComposition; @@ -82,12 +78,13 @@ abstract class TutorialController implements BackGestureAttemptCallback, private static final float FINGER_DOT_SMALL_SCALE = 0.7f; private static final int FINGER_DOT_ANIMATION_DURATION_MILLIS = 500; - private static final String PIXEL_TIPS_APP_PACKAGE_NAME = "com.google.android.apps.tips"; - private static final CharSequence DEFAULT_PIXEL_TIPS_APP_NAME = "Pixel Tips"; + private static final String SUW_THEME_SYSTEM_PROPERTY = "setupwizard.theme"; + private static final String GLIF_EXPRESSIVE_THEME = "glif_expressive"; + private static final String GLIF_EXPRESSIVE_LIGHT_THEME = "glif_expressive_light"; private static final int FEEDBACK_ANIMATION_MS = 133; - private static final int RIPPLE_VISIBLE_MS = 300; - private static final int GESTURE_ANIMATION_DELAY_MS = 1500; + private static final int SUBTITLE_ANNOUNCE_DELAY_MS = 3000; + private static final int DONE_BUTTON_ANNOUNCE_DELAY_MS = 4000; private static final int ADVANCE_TUTORIAL_TIMEOUT_MS = 3000; private static final long GESTURE_ANIMATION_PAUSE_DURATION_MILLIS = 1000; protected float mExitingAppEndingCornerRadius; @@ -100,7 +97,6 @@ abstract class TutorialController implements BackGestureAttemptCallback, TutorialType mTutorialType; final Context mContext; - final TextView mSkipButton; final Button mDoneButton; final ViewGroup mFeedbackView; final TextView mFeedbackTitleView; @@ -108,37 +104,29 @@ abstract class TutorialController implements BackGestureAttemptCallback, final ImageView mEdgeGestureVideoView; final RelativeLayout mFakeLauncherView; final FrameLayout mFakeHotseatView; - @Nullable - View mHotseatIconView; + @Nullable View mHotseatIconView; final ClipIconView mFakeIconView; final FrameLayout mFakeTaskView; - @Nullable - final AnimatedTaskbarView mFakeTaskbarView; + @Nullable final AnimatedTaskbarView mFakeTaskbarView; final AnimatedTaskView mFakePreviousTaskView; final View mRippleView; final RippleDrawable mRippleDrawable; - final TutorialStepIndicator mTutorialStepView; final ImageView mFingerDotView; private final Rect mExitingAppRect = new Rect(); protected View mExitingAppView; protected int mExitingAppRadius; - private final AlertDialog mSkipTutorialDialog; + private final boolean mIsExpressiveThemeEnabledInSUW; private boolean mGestureCompleted = false; protected LottieAnimationView mAnimatedGestureDemonstration; protected LottieAnimationView mCheckmarkAnimation; private RelativeLayout mFullGestureDemonstration; - // These runnables should be used when posting callbacks to their views and - // cleared from their + // These runnables should be used when posting callbacks to their views and cleared from their // views before posting new callbacks. - private final Runnable mTitleViewCallback; - @Nullable - private Runnable mFeedbackViewCallback; - @Nullable - private Runnable mFakeTaskViewCallback; - @Nullable - private Runnable mFakeTaskbarViewCallback; + @Nullable private Runnable mFeedbackViewCallback; + @Nullable private Runnable mFakeTaskViewCallback; + @Nullable private Runnable mFakeTaskbarViewCallback; private final Runnable mShowFeedbackRunnable; TutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) { @@ -147,8 +135,6 @@ abstract class TutorialController implements BackGestureAttemptCallback, mContext = mTutorialFragment.getContext(); RootSandboxLayout rootView = tutorialFragment.getRootView(); - mSkipButton = rootView.findViewById(R.id.gesture_tutorial_fragment_close_button); - mSkipButton.setOnClickListener(button -> showSkipTutorialDialog()); mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view); mFeedbackTitleView = mFeedbackView.findViewById( R.id.gesture_tutorial_fragment_feedback_title); @@ -159,46 +145,44 @@ abstract class TutorialController implements BackGestureAttemptCallback, mFakeHotseatView = rootView.findViewById(R.id.gesture_tutorial_fake_hotseat_view); mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view); mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view); - mFakeTaskbarView = ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? null - : rootView.findViewById(R.id.gesture_tutorial_fake_taskbar_view); - mFakePreviousTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_previous_task_view); + mFakeTaskbarView = null; + mFakePreviousTaskView = + rootView.findViewById(R.id.gesture_tutorial_fake_previous_task_view); mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view); mRippleDrawable = (RippleDrawable) mRippleView.getBackground(); mDoneButton = rootView.findViewById(R.id.gesture_tutorial_fragment_action_button); - mTutorialStepView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_tutorial_step); mFingerDotView = rootView.findViewById(R.id.gesture_tutorial_finger_dot); - mSkipTutorialDialog = createSkipTutorialDialog(); - - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mFullGestureDemonstration = rootView.findViewById(R.id.full_gesture_demonstration); - mCheckmarkAnimation = rootView.findViewById(R.id.checkmark_animation); - mAnimatedGestureDemonstration = rootView.findViewById( - R.id.gesture_demonstration_animations); - mExitingAppView = rootView.findViewById(R.id.exiting_app_back); - mScreenWidth = mTutorialFragment.getDeviceProfile().widthPx; - mScreenHeight = mTutorialFragment.getDeviceProfile().heightPx; - mExitingAppMargin = mContext.getResources().getDimensionPixelSize( - R.dimen.gesture_tutorial_back_gesture_exiting_app_margin); - mExitingAppStartingCornerRadius = QuickStepContract.getWindowCornerRadius(mContext); - mExitingAppEndingCornerRadius = mContext.getResources().getDimensionPixelSize( - R.dimen.gesture_tutorial_back_gesture_end_corner_radius); - mAnimatedGestureDemonstration.addLottieOnCompositionLoadedListener( - this::createScalingMatrix); - - mFeedbackTitleView.setText(getIntroductionTitle()); - mFeedbackSubtitleView.setText(getIntroductionSubtitle()); - mExitingAppView.setClipToOutline(true); - mExitingAppView.setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - outline.setRoundRect(mExitingAppRect, mExitingAppRadius); - } - }); - } - mTitleViewCallback = () -> mFeedbackTitleView.sendAccessibilityEvent( - AccessibilityEvent.TYPE_VIEW_FOCUSED); + mFullGestureDemonstration = rootView.findViewById(R.id.full_gesture_demonstration); + mCheckmarkAnimation = rootView.findViewById(R.id.checkmark_animation); + mAnimatedGestureDemonstration = rootView.findViewById( + R.id.gesture_demonstration_animations); + mExitingAppView = rootView.findViewById(R.id.exiting_app_back); + mScreenWidth = mTutorialFragment.getDeviceProfile().getDeviceProperties().getWidthPx(); + mScreenHeight = mTutorialFragment.getDeviceProfile().getDeviceProperties().getHeightPx(); + mExitingAppMargin = mContext.getResources().getDimensionPixelSize( + R.dimen.gesture_tutorial_back_gesture_exiting_app_margin); + mExitingAppStartingCornerRadius = QuickStepContract.getWindowCornerRadius(mContext); + mExitingAppEndingCornerRadius = mContext.getResources().getDimensionPixelSize( + R.dimen.gesture_tutorial_back_gesture_end_corner_radius); + mAnimatedGestureDemonstration.addLottieOnCompositionLoadedListener( + this::createScalingMatrix); + + mFeedbackTitleView.setText(getIntroductionTitle()); + mFeedbackSubtitleView.setText(getIntroductionSubtitle()); + + String SUWTheme = SystemProperties.get(SUW_THEME_SYSTEM_PROPERTY, ""); + mIsExpressiveThemeEnabledInSUW = SUWTheme.equals(GLIF_EXPRESSIVE_THEME) || SUWTheme.equals( + GLIF_EXPRESSIVE_LIGHT_THEME); + maybeSetTitleTypefaces(); + + mExitingAppView.setClipToOutline(true); + mExitingAppView.setOutlineProvider(new ViewOutlineProvider() { + @Override + public void getOutline(View view, Outline outline) { + outline.setRoundRect(mExitingAppRect, mExitingAppRadius); + } + }); mShowFeedbackRunnable = () -> { mFeedbackView.setAlpha(0f); mFeedbackView.setScaleX(0.95f); @@ -220,18 +204,15 @@ public void getOutline(View view, Outline outline) { AccessibilityManager.getInstance(mContext) .getRecommendedTimeoutMillis( ADVANCE_TUTORIAL_TIMEOUT_MS, - AccessibilityManager.FLAG_CONTENT_TEXT)); + AccessibilityManager.FLAG_CONTENT_TEXT + | AccessibilityManager.FLAG_CONTENT_CONTROLS)); } }) .start(); - mFeedbackTitleView.postDelayed(mTitleViewCallback, FEEDBACK_ANIMATION_MS); }; } - /** - * Scale the Lottie gesture animation to fit the device based on device - * dimensions - */ + /** Scale the Lottie gesture animation to fit the device based on device dimensions */ private void createScalingMatrix(LottieComposition composition) { Rect animationBoundsRect = composition.getBounds(); if (animationBoundsRect == null) { @@ -247,22 +228,14 @@ private void createScalingMatrix(LottieComposition composition) { mAnimatedGestureDemonstration.setImageMatrix(scaleMatrix); } - private void showSkipTutorialDialog() { - if (mSkipTutorialDialog != null) { - mSkipTutorialDialog.show(); - } - } - public int getHotseatIconTop() { return mHotseatIconView == null - ? 0 - : mFakeHotseatView.getTop() + mHotseatIconView.getTop(); + ? 0 : mFakeHotseatView.getTop() + mHotseatIconView.getTop(); } public int getHotseatIconLeft() { return mHotseatIconView == null - ? 0 - : mFakeHotseatView.getLeft() + mHotseatIconView.getLeft(); + ? 0 : mFakeHotseatView.getLeft() + mHotseatIconView.getLeft(); } void setTutorialType(TutorialType tutorialType) { @@ -271,19 +244,11 @@ void setTutorialType(TutorialType tutorialType) { @LayoutRes protected int getMockHotseatResId() { - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - return mTutorialFragment.isLargeScreen() - ? mTutorialFragment.isFoldable() - ? R.layout.redesigned_gesture_tutorial_foldable_mock_hotseat - : R.layout.redesigned_gesture_tutorial_tablet_mock_hotseat - : R.layout.redesigned_gesture_tutorial_mock_hotseat; - } else { - return mTutorialFragment.isLargeScreen() - ? mTutorialFragment.isFoldable() - ? R.layout.gesture_tutorial_foldable_mock_hotseat - : R.layout.gesture_tutorial_tablet_mock_hotseat - : R.layout.gesture_tutorial_mock_hotseat; - } + return mTutorialFragment.isLargeScreen() + ? mTutorialFragment.isFoldable() + ? R.layout.redesigned_gesture_tutorial_foldable_mock_hotseat + : R.layout.redesigned_gesture_tutorial_tablet_mock_hotseat + : R.layout.redesigned_gesture_tutorial_mock_hotseat; } @LayoutRes @@ -322,9 +287,7 @@ protected int getHotseatIconColor() { @DrawableRes public int getMockAppIconResId() { - return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.drawable.redesigned_hotseat_icon - : R.drawable.default_sandbox_app_icon; + return R.drawable.redesigned_hotseat_icon; } @DrawableRes @@ -346,11 +309,6 @@ public int getIntroductionSubtitle() { return NO_ID; } - @StringRes - public int getSpokenIntroductionSubtitle() { - return NO_ID; - } - @StringRes public int getSuccessFeedbackSubtitle() { return NO_ID; @@ -371,6 +329,16 @@ public int getSuccessTitleTextAppearance() { return NO_ID; } + @StyleRes + public int getSubtitleTextAppearance() { + return NO_ID; + } + + @StyleRes + public int getSuccessSubtitleTextAppearance() { + return NO_ID; + } + @StyleRes public int getDoneButtonTextAppearance() { return NO_ID; @@ -384,16 +352,11 @@ void showFeedback() { mFeedbackView.setTranslationY(0); return; } - Animator gestureAnimation = mTutorialFragment.getGestureAnimation(); - AnimatedVectorDrawable edgeAnimation = mTutorialFragment.getEdgeAnimation(); - if (gestureAnimation != null && edgeAnimation != null) { - playFeedbackAnimation(gestureAnimation, edgeAnimation, mShowFeedbackRunnable, true); - } + playFeedbackAnimation(); } /** - * Only use this when a gesture is completed, but the feedback shouldn't be - * shown immediately. + * Only use this when a gesture is completed, but the feedback shouldn't be shown immediately. * In that case, call this method immediately instead. */ public void setGestureCompleted() { @@ -406,8 +369,7 @@ public void setGestureCompleted() { void showSuccessFeedback() { int successSubtitleResId = getSuccessFeedbackSubtitle(); if (successSubtitleResId == NO_ID) { - // Allow crash since this should never be reached with a tutorial controller - // used in + // Allow crash since this should never be reached with a tutorial controller used in // production. Log.e(LOG_TAG, "Cannot show success feedback for tutorial step: " + mTutorialType @@ -429,41 +391,42 @@ void showFeedback(int subtitleResId) { /** * Show feedback reflecting the result of a gesture attempt. * - * @param isGestureSuccessful Whether the tutorial feedback's action button - * should be shown. + * @param isGestureSuccessful Whether the tutorial feedback's action button should be shown. **/ void showFeedback(int subtitleResId, boolean isGestureSuccessful) { showFeedback( isGestureSuccessful - ? getSuccessFeedbackTitle() - : R.string.gesture_tutorial_try_again, + ? getSuccessFeedbackTitle() : R.string.gesture_tutorial_try_again, subtitleResId, - NO_ID, - isGestureSuccessful, - false); + isGestureSuccessful); } void showFeedback( int titleResId, int subtitleResId, - int spokenSubtitleResId, - boolean isGestureSuccessful, - boolean useGestureAnimationDelay) { - mFeedbackTitleView.removeCallbacks(mTitleViewCallback); + boolean isGestureSuccessful) { if (mFeedbackViewCallback != null) { mFeedbackView.removeCallbacks(mFeedbackViewCallback); mFeedbackViewCallback = null; } mFeedbackTitleView.setText(titleResId); - mFeedbackSubtitleView.setText( - ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() || spokenSubtitleResId == NO_ID - ? mContext.getText(subtitleResId) - : Utilities.wrapForTts( - mContext.getText(subtitleResId), - mContext.getString(spokenSubtitleResId))); + mFeedbackSubtitleView.setText(subtitleResId); + + boolean isUserSetupComplete = SettingsCache.INSTANCE.get(mContext).getValue( + Settings.Secure.getUriFor(Secure.USER_SETUP_COMPLETE)); + boolean userSetupNotCompleteAndExpressiveThemeEnabled = + !isUserSetupComplete && mIsExpressiveThemeEnabledInSUW; + boolean userSetupCompleteAndNewFontsEnabled = isUserSetupComplete && Flags.enableGsf(); + if (isGestureSuccessful) { if (mTutorialFragment.isAtFinalStep()) { + if (userSetupCompleteAndNewFontsEnabled + || userSetupNotCompleteAndExpressiveThemeEnabled) { + mDoneButton.setTypeface( + Typeface.create(FontFamily.GSF_LABEL_LARGE.getValue(), + Typeface.NORMAL)); + } showActionButton(); } @@ -472,44 +435,31 @@ void showFeedback( mFakeTaskViewCallback = null; } - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - showSuccessPage(); - } + showSuccessPage(); } mGestureCompleted = isGestureSuccessful; - - Animator gestureAnimation = mTutorialFragment.getGestureAnimation(); - AnimatedVectorDrawable edgeAnimation = mTutorialFragment.getEdgeAnimation(); - if (!isGestureSuccessful && gestureAnimation != null && edgeAnimation != null) { - playFeedbackAnimation( - gestureAnimation, - edgeAnimation, - mShowFeedbackRunnable, - useGestureAnimationDelay); - return; + if (!isGestureSuccessful) { + playFeedbackAnimation(); } else { mTutorialFragment.releaseFeedbackAnimation(); + mFeedbackViewCallback = mShowFeedbackRunnable; + mFeedbackView.post(mFeedbackViewCallback); } - mFeedbackViewCallback = mShowFeedbackRunnable; - - mFeedbackView.post(mFeedbackViewCallback); } private void showSuccessPage() { pauseAndHideLottieAnimation(); mCheckmarkAnimation.setVisibility(View.VISIBLE); mCheckmarkAnimation.playAnimation(); - mFeedbackTitleView.setTextAppearance(mContext, getSuccessTitleTextAppearance()); + mFeedbackTitleView.setTextAppearance(getSuccessTitleTextAppearance()); + mFeedbackSubtitleView.setTextAppearance(getSuccessSubtitleTextAppearance()); + maybeSetTitleTypefaces(); } public boolean isGestureCompleted() { return mGestureCompleted; } - public boolean skipGestureAttempt() { - return isGestureCompleted() || mTutorialFragment.isRotationPromptShowing(); - } - void hideFeedback() { if (mFeedbackView.getVisibility() != View.VISIBLE) { return; @@ -532,111 +482,41 @@ void cancelQueuedGestureAnimation() { mFakeTaskbarView.removeCallbacks(mFakeTaskbarViewCallback); mFakeTaskbarViewCallback = null; } - mFeedbackTitleView.removeCallbacks(mTitleViewCallback); } - private void playFeedbackAnimation( - @NonNull Animator gestureAnimation, - @NonNull AnimatedVectorDrawable edgeAnimation, - @NonNull Runnable onStartRunnable, - boolean useGestureAnimationDelay) { - - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mFeedbackView.setVisibility(View.VISIBLE); - mAnimatedGestureDemonstration.setVisibility(View.VISIBLE); - mFullGestureDemonstration.setVisibility(View.VISIBLE); - mAnimatedGestureDemonstration.playAnimation(); - return; - } - - if (gestureAnimation.isRunning()) { - gestureAnimation.cancel(); - } - if (edgeAnimation.isRunning()) { - edgeAnimation.reset(); - } - gestureAnimation.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); - - mEdgeGestureVideoView.setVisibility(GONE); - if (edgeAnimation.isRunning()) { - edgeAnimation.stop(); - } - - if (!useGestureAnimationDelay) { - onStartRunnable.run(); - } - } - - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); - - mEdgeGestureVideoView.setVisibility(View.VISIBLE); - edgeAnimation.start(); - - gestureAnimation.removeListener(this); - } - }); - - cancelQueuedGestureAnimation(); - if (useGestureAnimationDelay) { - mFeedbackViewCallback = onStartRunnable; - mFakeTaskViewCallback = gestureAnimation::start; - - mFeedbackView.post(mFeedbackViewCallback); - mFakeTaskView.postDelayed(mFakeTaskViewCallback, GESTURE_ANIMATION_DELAY_MS); - } else { - gestureAnimation.start(); - } + private void playFeedbackAnimation() { + mFeedbackView.setVisibility(View.VISIBLE); + mAnimatedGestureDemonstration.setVisibility(View.VISIBLE); + mFullGestureDemonstration.setVisibility(View.VISIBLE); + mAnimatedGestureDemonstration.playAnimation(); } void setRippleHotspot(float x, float y) { mRippleDrawable.setHotspot(x, y); } - void showRippleEffect(@Nullable Runnable onCompleteRunnable) { - mRippleDrawable.setState( - new int[] { android.R.attr.state_pressed, android.R.attr.state_enabled }); - mRippleView.postDelayed(() -> { - mRippleDrawable.setState(new int[] {}); - if (onCompleteRunnable != null) { - onCompleteRunnable.run(); - } - }, RIPPLE_VISIBLE_MS); - } - void onActionButtonClicked(View button) { mTutorialFragment.continueTutorial(); } @CallSuper void transitToController() { - updateCloseButton(); - updateSubtext(); updateDrawables(); updateLayout(); - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mFeedbackTitleView.setTextAppearance(mContext, getTitleTextAppearance()); - mDoneButton.setTextAppearance(mContext, getDoneButtonTextAppearance()); - mDoneButton.getBackground().setTint(getDoneButtonColor()); - mCheckmarkAnimation.setAnimation(mTutorialFragment.isAtFinalStep() - ? R.raw.checkmark_animation_end - : R.raw.checkmark_animation_in_progress); - if (!isGestureCompleted()) { - mCheckmarkAnimation.setVisibility(GONE); - startGestureAnimation(); - if (mTutorialType == TutorialType.BACK_NAVIGATION) { - resetViewsForBackGesture(); - } - + mFeedbackTitleView.setTextAppearance(getTitleTextAppearance()); + mFeedbackSubtitleView.setTextAppearance(getSubtitleTextAppearance()); + mDoneButton.setTextAppearance(getDoneButtonTextAppearance()); + + maybeSetTitleTypefaces(); + mDoneButton.getBackground().setTint(getDoneButtonColor()); + mCheckmarkAnimation.setAnimation(R.raw.checkmark_animation); + if (!isGestureCompleted()) { + mCheckmarkAnimation.setVisibility(GONE); + startGestureAnimation(); + if (mTutorialType == TutorialType.BACK_NAVIGATION) { + resetViewsForBackGesture(); } - } else { - hideFeedback(); - hideActionButton(); } mGestureCompleted = false; @@ -645,6 +525,20 @@ void transitToController() { } } + /** + * Apply expressive typefaces to the feedback title and subtitle views. + */ + private void maybeSetTitleTypefaces() { + if (mIsExpressiveThemeEnabledInSUW || Flags.enableGsf()) { + mFeedbackTitleView.setTypeface(Typeface.create(mTutorialFragment.isLargeScreen() + ? FontFamily.GSF_DISPLAY_MEDIUM_EMPHASIZED.getValue() + : FontFamily.GSF_DISPLAY_SMALL_EMPHASIZED.getValue(), + Typeface.NORMAL)); + mFeedbackSubtitleView.setTypeface( + Typeface.create(FontFamily.GSF_BODY_LARGE.getValue(), Typeface.NORMAL)); + } + } + protected void resetViewsForBackGesture() { mFakeTaskView.setVisibility(View.VISIBLE); mFakeTaskView.setBackgroundColor(getFakeTaskViewColor()); @@ -666,21 +560,7 @@ private void startGestureAnimation() { mAnimatedGestureDemonstration.playAnimation(); } - void updateCloseButton() { - mSkipButton.setTextAppearance(Utilities.isDarkTheme(mContext) - ? R.style.TextAppearance_GestureTutorial_Feedback_Subtext - : R.style.TextAppearance_GestureTutorial_Feedback_Subtext_Dark); - } - - void hideActionButton() { - mSkipButton.setVisibility(View.VISIBLE); - // Invisible to maintain the layout. - mDoneButton.setVisibility(View.INVISIBLE); - mDoneButton.setOnClickListener(null); - } - void showActionButton() { - mSkipButton.setVisibility(GONE); mDoneButton.setVisibility(View.VISIBLE); mDoneButton.setOnClickListener(this::onActionButtonClicked); } @@ -693,7 +573,8 @@ void hideFakeTaskbar(boolean animateToHotseat) { mFakeTaskbarView.removeCallbacks(mFakeTaskbarViewCallback); } if (animateToHotseat) { - mFakeTaskbarViewCallback = () -> mFakeTaskbarView.animateDisappearanceToHotseat(mFakeHotseatView); + mFakeTaskbarViewCallback = () -> + mFakeTaskbarView.animateDisappearanceToHotseat(mFakeHotseatView); } mFakeTaskbarView.post(mFakeTaskbarViewCallback); } @@ -706,7 +587,8 @@ void showFakeTaskbar(boolean animateFromHotseat) { mFakeTaskbarView.removeCallbacks(mFakeTaskbarViewCallback); } if (animateFromHotseat) { - mFakeTaskbarViewCallback = () -> mFakeTaskbarView.animateAppearanceFromHotseat(mFakeHotseatView); + mFakeTaskbarViewCallback = () -> + mFakeTaskbarView.animateAppearanceFromHotseat(mFakeHotseatView); } mFakeTaskbarView.post(mFakeTaskbarViewCallback); } @@ -726,48 +608,32 @@ void updateFakeViewLayout(ViewGroup view, @LayoutRes int mockLayoutResId) { } } - private void updateSubtext() { - if (!ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mTutorialStepView.setTutorialProgress( - mTutorialFragment.getCurrentStep(), mTutorialFragment.getNumSteps()); - } - } - private void updateHotseatChildViewColor(@Nullable View child) { - if (child == null) - return; + if (child == null) return; child.getBackground().setTint(getHotseatIconColor()); } private void updateDrawables() { if (mContext != null) { - mTutorialFragment.getRootView().setBackground(AppCompatResources.getDrawable( - mContext, getMockWallpaperResId())); + mTutorialFragment.getRootView() + .setBackground(mContext.getDrawable(getMockWallpaperResId())); mTutorialFragment.updateFeedbackAnimation(); - mFakeLauncherView.setBackgroundColor(ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? getFakeLauncherColor() - : mContext.getColor(R.color.gesture_tutorial_fake_wallpaper_color)); + mFakeLauncherView.setBackgroundColor(getFakeLauncherColor()); updateFakeViewLayout(mFakeHotseatView, getMockHotseatResId()); mHotseatIconView = mFakeHotseatView.findViewById(R.id.hotseat_icon_1); mFakeTaskView.animate().alpha(1).setListener( AnimatorListeners.forSuccessCallback(() -> mFakeTaskView.animate().cancel())); mFakePreviousTaskView.setFakeTaskViewFillColor(getMockPreviousAppTaskThumbnailColor()); - mFakeIconView.setBackground(AppCompatResources.getDrawable( - mContext, getMockAppIconResId())); - - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mExitingAppView.setBackgroundColor(getExitingAppColor()); - mFakeTaskView.setBackgroundColor(getFakeTaskViewColor()); - updateHotseatChildViewColor(mHotseatIconView); - updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_2)); - updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_3)); - updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_4)); - updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_5)); - updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_6)); - updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_search_bar)); - } else { - updateFakeViewLayout(mFakeTaskView, getMockAppTaskLayoutResId()); - } + mFakeIconView.setBackground(mContext.getDrawable(getMockAppIconResId())); + mExitingAppView.setBackgroundColor(getExitingAppColor()); + mFakeTaskView.setBackgroundColor(getFakeTaskViewColor()); + updateHotseatChildViewColor(mHotseatIconView); + updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_2)); + updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_3)); + updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_4)); + updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_5)); + updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_6)); + updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_search_bar)); } } @@ -775,8 +641,8 @@ private void updateLayout() { if (mContext == null) { return; } - RelativeLayout.LayoutParams feedbackLayoutParams = (RelativeLayout.LayoutParams) mFeedbackView - .getLayoutParams(); + RelativeLayout.LayoutParams feedbackLayoutParams = + (RelativeLayout.LayoutParams) mFeedbackView.getLayoutParams(); feedbackLayoutParams.setMarginStart(mContext.getResources().getDimensionPixelSize( mTutorialFragment.isLargeScreen() ? R.dimen.gesture_tutorial_tablet_feedback_margin_start_end @@ -795,13 +661,12 @@ private void updateLayout() { mTutorialFragment.isLargeScreen() ? View.VISIBLE : GONE); } - RelativeLayout.LayoutParams hotseatLayoutParams = (RelativeLayout.LayoutParams) mFakeHotseatView - .getLayoutParams(); + RelativeLayout.LayoutParams hotseatLayoutParams = + (RelativeLayout.LayoutParams) mFakeHotseatView.getLayoutParams(); if (!mTutorialFragment.isLargeScreen()) { DeviceProfile dp = mTutorialFragment.getDeviceProfile(); - dp.updateIsSeascape(mContext); - hotseatLayoutParams.addRule(dp.isLandscape + hotseatLayoutParams.addRule(dp.getDeviceProperties().isLandscape() ? (dp.isSeascape() ? RelativeLayout.ALIGN_PARENT_START : RelativeLayout.ALIGN_PARENT_END) @@ -816,68 +681,6 @@ private void updateLayout() { mFakeHotseatView.setLayoutParams(hotseatLayoutParams); } - private AlertDialog createSkipTutorialDialog() { - if (!(mContext instanceof GestureSandboxActivity)) { - return null; - } - GestureSandboxActivity sandboxActivity = (GestureSandboxActivity) mContext; - View contentView = View.inflate( - sandboxActivity, R.layout.gesture_tutorial_dialog, null); - AlertDialog tutorialDialog = new AlertDialog.Builder(sandboxActivity, - androidx.appcompat.R.style.Base_Theme_AppCompat_Dialog) - .setView(contentView) - .create(); - - PackageManager packageManager = mContext.getPackageManager(); - CharSequence tipsAppName = DEFAULT_PIXEL_TIPS_APP_NAME; - - try { - tipsAppName = packageManager.getApplicationLabel( - packageManager.getApplicationInfo( - PIXEL_TIPS_APP_PACKAGE_NAME, PackageManager.GET_META_DATA)); - } catch (PackageManager.NameNotFoundException e) { - Log.e(LOG_TAG, - "Could not find app label for package name: " - + PIXEL_TIPS_APP_PACKAGE_NAME - + ". Defaulting to 'Pixel Tips.'", - e); - } - - TextView subtitleTextView = (TextView) contentView.findViewById( - R.id.gesture_tutorial_dialog_subtitle); - if (subtitleTextView != null) { - subtitleTextView.setText( - mContext.getString(R.string.skip_tutorial_dialog_subtitle, tipsAppName)); - } else { - Log.w(LOG_TAG, "No subtitle view in the skip tutorial dialog to update."); - } - - Button cancelButton = (Button) contentView.findViewById( - R.id.gesture_tutorial_dialog_cancel_button); - if (cancelButton != null) { - cancelButton.setOnClickListener( - v -> tutorialDialog.dismiss()); - } else { - Log.w(LOG_TAG, "No cancel button in the skip tutorial dialog to update."); - } - - Button confirmButton = contentView.findViewById( - R.id.gesture_tutorial_dialog_confirm_button); - if (confirmButton != null) { - confirmButton.setOnClickListener(v -> { - mTutorialFragment.closeTutorialStep(true); - tutorialDialog.dismiss(); - }); - } else { - Log.w(LOG_TAG, "No confirm button in the skip tutorial dialog to update."); - } - - tutorialDialog.getWindow().setBackgroundDrawable( - new ColorDrawable(sandboxActivity.getColor(android.R.color.transparent))); - - return tutorialDialog; - } - protected AnimatorSet createFingerDotAppearanceAnimatorSet() { ObjectAnimator alphaAnimator = ObjectAnimator.ofFloat( mFingerDotView, View.ALPHA, 0f, FINGER_DOT_VISIBLE_ALPHA); diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java index 9dc4e3968c7..a6c46ddd64f 100644 --- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java +++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java @@ -17,7 +17,6 @@ import static android.view.View.NO_ID; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL; import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_GESTURE_COMPLETE; import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_TUTORIAL_TYPE; import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_USE_TUTORIAL_MENU; @@ -49,6 +48,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; import com.android.launcher3.logging.StatsLogManager; import com.android.quickstep.interaction.TutorialController.TutorialType; @@ -176,13 +176,15 @@ public void onCreate(Bundle savedInstanceState) { Bundle args = savedInstanceState != null ? savedInstanceState : getArguments(); mTutorialType = (TutorialType) args.getSerializable(KEY_TUTORIAL_TYPE); mGestureComplete = args.getBoolean(KEY_GESTURE_COMPLETE, false); - mEdgeBackGestureHandler = new EdgeBackGestureHandler(getContext()); - mNavBarGestureHandler = new NavBarGestureHandler(getContext()); + DeviceProfile deviceProfile = LauncherAppState.getInstance(getContext()) + .getInvariantDeviceProfile().getDeviceProfile(getContext()); + mEdgeBackGestureHandler = new EdgeBackGestureHandler(getContext(), deviceProfile); + mNavBarGestureHandler = new NavBarGestureHandler(getContext(), deviceProfile); mDeviceProfile = InvariantDeviceProfile.INSTANCE.get(getContext()) .getDeviceProfile(getContext()); - mIsLargeScreen = mDeviceProfile.isTablet; - mIsFoldable = mDeviceProfile.isTwoPanels; + mIsLargeScreen = mDeviceProfile.getDeviceProperties().isTablet(); + mIsFoldable = mDeviceProfile.getDeviceProperties().isTwoPanels(); if (mOnAttachedToWindowPendingCreate) { mOnAttachedToWindowPendingCreate = false; @@ -213,11 +215,8 @@ public void onDestroy() { public View onCreateView( @NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); - mRootView = (RootSandboxLayout) inflater.inflate( - ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() - ? R.layout.redesigned_gesture_tutorial_fragment - : R.layout.gesture_tutorial_fragment, + R.layout.redesigned_gesture_tutorial_fragment, container, false); @@ -271,9 +270,7 @@ void initializeFeedbackVideoView() { mTutorialController.showFeedback( introTitleResId, introSubtitleResId, - mTutorialController.getSpokenIntroductionSubtitle(), - false, - true); + /* isGestureSuccessful= */ false); mIntroductionShown = true; } } @@ -383,10 +380,7 @@ public boolean onTouch(View view, MotionEvent motionEvent) { if (mTutorialController != null && !isGestureComplete()) { mTutorialController.hideFeedback(); } - - if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) { - mTutorialController.pauseAndHideLottieAnimation(); - } + mTutorialController.pauseAndHideLottieAnimation(); // Note: Using logical-or to ensure both functions get called. return mEdgeBackGestureHandler.onTouch(view, motionEvent) diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java b/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java deleted file mode 100644 index ae0e725aad6..00000000000 --- a/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.interaction; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.util.Log; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.appcompat.content.res.AppCompatResources; - -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.icons.GraphicsUtils; - -/** Indicator displaying the current progress through the gesture navigation tutorial. */ -public class TutorialStepIndicator extends LinearLayout { - - private static final String LOG_TAG = "TutorialStepIndicator"; - - private int mCurrentStep = -1; - private int mTotalSteps = -1; - - public TutorialStepIndicator(Context context) { - super(context); - } - - public TutorialStepIndicator(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public TutorialStepIndicator(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public TutorialStepIndicator(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - /** - * Updates this indicator to display totalSteps indicator pills, with the first currentStep - * pills highlighted. - */ - public void setTutorialProgress(int currentStep, int totalSteps) { - if (currentStep <= 0) { - Log.w(LOG_TAG, "Current step number invalid: " + currentStep + ". Assuming step 1."); - currentStep = 1; - } - if (totalSteps <= 0) { - Log.w(LOG_TAG, "Total number of steps invalid: " + totalSteps + ". Assuming 1 step."); - totalSteps = 1; - } - if (currentStep > totalSteps) { - Log.w(LOG_TAG, "Current step number greater than the total number of steps. Assuming" - + " final step."); - currentStep = totalSteps; - } - if (totalSteps < 2) { - setVisibility(GONE); - return; - } - setVisibility(VISIBLE); - mCurrentStep = currentStep; - mTotalSteps = totalSteps; - - initializeStepIndicators(); - } - - private void initializeStepIndicators() { - for (int i = mTotalSteps; i < getChildCount(); i++) { - removeViewAt(i); - } - int activeStepIndicatorColor = GraphicsUtils.getAttrColor( - getContext(), android.R.attr.textColorPrimary); - int inactiveStepIndicatorColor = GraphicsUtils.getAttrColor( - getContext(), android.R.attr.textColorSecondaryInverse); - for (int i = 0; i < mTotalSteps; i++) { - Drawable pageIndicatorPillDrawable = AppCompatResources.getDrawable( - getContext(), R.drawable.tutorial_step_indicator_pill); - - if (i >= getChildCount()) { - ImageView pageIndicatorPill = new ImageView(getContext()); - pageIndicatorPill.setImageDrawable(pageIndicatorPillDrawable); - - LinearLayout.LayoutParams lp = new LayoutParams( - LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); - - lp.setMarginStart(Utilities.dpToPx(3)); - lp.setMarginEnd(Utilities.dpToPx(3)); - - addView(pageIndicatorPill, lp); - } - if (pageIndicatorPillDrawable != null) { - if (i < mCurrentStep) { - pageIndicatorPillDrawable.setTint(activeStepIndicatorColor); - } else { - pageIndicatorPillDrawable.setTint(inactiveStepIndicatorColor); - } - } - } - } -} diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java index 5ac04da0acb..68ff5182724 100644 --- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java +++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java @@ -16,20 +16,28 @@ package com.android.quickstep.logging; -import static com.android.launcher3.LauncherPrefs.THEMED_ICONS; -import static com.android.launcher3.LauncherPrefs.getDevicePrefs; -import static com.android.launcher3.LauncherPrefs.getPrefs; +import static com.android.launcher3.graphics.ThemeManager.ICON_FACTORY_DAGGER_KEY; +import static com.android.launcher3.graphics.ThemeManager.PREF_ICON_SHAPE; +import static com.android.launcher3.graphics.theme.ThemePreference.MONO_THEME_VALUE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_DISABLED; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ICON_SHAPE_ARCH; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ICON_SHAPE_CIRCLE; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ICON_SHAPE_FOUR_SIDED_COOKIE; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ICON_SHAPE_SEVEN_SIDED_COOKIE; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ICON_SHAPE_SQUARE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_DISABLED; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_ENABLED; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_THEMED_ICON_DISABLED; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_THEMED_ICON_ENABLED; -import static com.android.launcher3.model.DeviceGridState.KEY_WORKSPACE_SIZE; import static com.android.launcher3.model.PredictionUpdateTask.LAST_PREDICTION_ENABLED; +import static com.android.launcher3.shapes.ShapesProvider.ARCH_KEY; +import static com.android.launcher3.shapes.ShapesProvider.CIRCLE_KEY; +import static com.android.launcher3.shapes.ShapesProvider.FOUR_SIDED_COOKIE_KEY; +import static com.android.launcher3.shapes.ShapesProvider.SEVEN_SIDED_COOKIE_KEY; +import static com.android.launcher3.shapes.ShapesProvider.SQUARE_KEY; import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE; import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI; -import static com.android.launcher3.util.Themes.KEY_THEMED_ICONS; import android.content.Context; import android.content.SharedPreferences; @@ -39,65 +47,107 @@ import android.util.Log; import android.util.Xml; -import com.android.launcher3.AutoInstallsLayout; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + +import com.android.launcher3.Flags; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.R; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.graphics.ThemeManager; +import com.android.launcher3.graphics.ThemeManager.ThemeChangeListener; +import com.android.launcher3.graphics.theme.IconThemeFactory; +import com.android.launcher3.graphics.theme.ThemePreference; +import com.android.launcher3.graphics.theme.ThemePreference.ThemeValue; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.StatsLogManager; +import com.android.launcher3.logging.StatsLogManager.LauncherEvent; import com.android.launcher3.logging.StatsLogManager.StatsLogger; import com.android.launcher3.model.DeviceGridState; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.DisplayController.Info; -import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.NavigationMode; -import com.android.launcher3.util.SafeCloseable; import com.android.launcher3.util.SettingsCache; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import java.util.Map; import java.util.Optional; +import javax.inject.Inject; +import javax.inject.Named; + /** * Utility class to log launcher settings changes */ +@LauncherAppSingleton public class SettingsChangeLogger implements - DisplayController.DisplayInfoChangeListener, OnSharedPreferenceChangeListener, - SafeCloseable { + DisplayController.DisplayInfoChangeListener, OnSharedPreferenceChangeListener { /** * Singleton instance */ - public static MainThreadInitializedObject INSTANCE = - new MainThreadInitializedObject<>(SettingsChangeLogger::new); + public static DaggerSingletonObject INSTANCE = + new DaggerSingletonObject<>(QuickstepBaseAppComponent::getSettingsChangeLogger); private static final String TAG = "SettingsChangeLogger"; - private static final String ROOT_TAG = "androidx.preference.PreferenceScreen"; private static final String BOOLEAN_PREF = "SwitchPreference"; private final Context mContext; private final ArrayMap mLoggablePrefs; private final StatsLogManager mStatsLogManager; + private final LauncherPrefs mLauncherPrefs; + + private final ThemePreference mThemePreference; + private final Map mThemeFactoryMap; + @NonNull private NavigationMode mNavMode; - private StatsLogManager.LauncherEvent mNotificationDotsEvent; - private StatsLogManager.LauncherEvent mHomeScreenSuggestionEvent; + private LauncherEvent mNotificationDotsEvent; - private SettingsChangeLogger(Context context) { + private final SettingsCache.OnChangeListener mListener = this::onNotificationDotsChanged; + + @Inject + SettingsChangeLogger(@ApplicationContext Context context, + DaggerSingletonTracker tracker, + DisplayController displayController, + SettingsCache settingsCache, + LauncherPrefs launcherPrefs, + StatsLogManager.StatsLogManagerFactory factory, + ThemePreference themePreference, + @Named(ICON_FACTORY_DAGGER_KEY) Map themeFactoryMap, + ThemeManager themeManager) { mContext = context; - mStatsLogManager = StatsLogManager.newInstance(mContext); + mLauncherPrefs = launcherPrefs; + mStatsLogManager = factory.create(context); mLoggablePrefs = loadPrefKeys(context); - DisplayController.INSTANCE.get(context).addChangeListener(this); - mNavMode = DisplayController.getNavigationMode(context); + mThemePreference = themePreference; + mThemeFactoryMap = themeFactoryMap; + + displayController.addChangeListener(this); + mNavMode = displayController.getInfo().getNavigationMode(); + tracker.addCloseable(() -> displayController.removeChangeListener(this)); - getPrefs(context).registerOnSharedPreferenceChangeListener(this); - getDevicePrefs(context).registerOnSharedPreferenceChangeListener(this); + mLauncherPrefs.getBackedUpPrefs().registerOnSharedPreferenceChangeListener(this); + mLauncherPrefs.getDevicePrefs().registerOnSharedPreferenceChangeListener(this); + tracker.addCloseable(() -> { + mLauncherPrefs.getBackedUpPrefs().unregisterOnSharedPreferenceChangeListener(this); + mLauncherPrefs.getDevicePrefs().unregisterOnSharedPreferenceChangeListener(this); + }); - SettingsCache mSettingsCache = SettingsCache.INSTANCE.get(context); - mSettingsCache.register(NOTIFICATION_BADGING_URI, - this::onNotificationDotsChanged); - onNotificationDotsChanged(mSettingsCache.getValue(NOTIFICATION_BADGING_URI)); + settingsCache.register(NOTIFICATION_BADGING_URI, mListener); + onNotificationDotsChanged(settingsCache.getValue(NOTIFICATION_BADGING_URI)); + tracker.addCloseable(() -> settingsCache.unregister(NOTIFICATION_BADGING_URI, mListener)); + + ThemeChangeListener themeChangeListener = () -> logThemeEvent(mStatsLogManager.logger()); + themeManager.addChangeListener(themeChangeListener); + tracker.addCloseable(() -> themeManager.removeChangeListener(themeChangeListener)); } private static ArrayMap loadPrefKeys(Context context) { @@ -105,7 +155,13 @@ private static ArrayMap loadPrefKeys(Context context) { ArrayMap result = new ArrayMap<>(); try { - AutoInstallsLayout.beginDocument(parser, ROOT_TAG); + // Move cursor to first tag because it could be + // androidx.preference.PreferenceScreen or PreferenceScreen + int eventType = parser.getEventType(); + while (eventType != XmlPullParser.START_TAG + && eventType != XmlPullParser.END_DOCUMENT) { + eventType = parser.next(); + } final int depth = parser.getDepth(); int type; while (((type = parser.next()) != XmlPullParser.END_TAG @@ -134,7 +190,7 @@ private static ArrayMap loadPrefKeys(Context context) { } private void onNotificationDotsChanged(boolean isDotsEnabled) { - StatsLogManager.LauncherEvent mEvent = + LauncherEvent mEvent = isDotsEnabled ? LAUNCHER_NOTIFICATION_DOT_ENABLED : LAUNCHER_NOTIFICATION_DOT_DISABLED; @@ -155,19 +211,22 @@ public void onDisplayInfoChanged(Context context, Info info, int flags) { @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { - if (LAST_PREDICTION_ENABLED.getSharedPrefKey().equals(key) - || KEY_WORKSPACE_SIZE.equals(key) - || KEY_THEMED_ICONS.equals(key) - || mLoggablePrefs.containsKey(key)) { - - mHomeScreenSuggestionEvent = LauncherPrefs.get(mContext).get(LAST_PREDICTION_ENABLED) - ? LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED - : LAUNCHER_HOME_SCREEN_SUGGESTIONS_DISABLED; - - mStatsLogManager.logger().log(mHomeScreenSuggestionEvent); + LoggablePref loggablePref; + if (LAST_PREDICTION_ENABLED.getSharedPrefKey().equals(key)) { + logHomeScreenSuggestionEvent(mStatsLogManager.logger()); + } else if ((loggablePref = mLoggablePrefs.get(key)) != null) { + int eventId = prefs.getBoolean(key, loggablePref.defaultValue) + ? loggablePref.eventIdOn : loggablePref.eventIdOff; + mStatsLogManager.logger().log(() -> eventId); } } + private void logHomeScreenSuggestionEvent(StatsLogger logger) { + logger.log(LauncherPrefs.get(mContext).get(LAST_PREDICTION_ENABLED) + ? LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED + : LAUNCHER_HOME_SCREEN_SUGGESTIONS_DISABLED); + } + /** * Takes snapshot of all eligible launcher settings and log them with the provided instance ID. */ @@ -175,27 +234,54 @@ public void logSnapshot(InstanceId snapshotInstanceId) { StatsLogger logger = mStatsLogManager.logger().withInstanceId(snapshotInstanceId); Optional.ofNullable(mNotificationDotsEvent).ifPresent(logger::log); - Optional.ofNullable(mNavMode).map(mode -> mode.launcherEvent).ifPresent(logger::log); - Optional.ofNullable(mHomeScreenSuggestionEvent).ifPresent(logger::log); + logger.log(mNavMode.launcherEvent); + logHomeScreenSuggestionEvent(logger); Optional.ofNullable(new DeviceGridState(mContext).getWorkspaceSizeEvent()).ifPresent( logger::log); + logThemeEvent(logger); - SharedPreferences prefs = getPrefs(mContext); - logger.log(LauncherPrefs.get(mContext).get(THEMED_ICONS) + logger.log( + MONO_THEME_VALUE.equals(mThemePreference.getValue()) ? LAUNCHER_THEMED_ICON_ENABLED : LAUNCHER_THEMED_ICON_DISABLED); + if (Flags.enableLauncherIconShapes()) { + Optional.ofNullable( + switch (LauncherPrefs.get(mContext).get(PREF_ICON_SHAPE)) { + case CIRCLE_KEY -> LAUNCHER_ICON_SHAPE_CIRCLE; + case SQUARE_KEY -> LAUNCHER_ICON_SHAPE_SQUARE; + case FOUR_SIDED_COOKIE_KEY -> LAUNCHER_ICON_SHAPE_FOUR_SIDED_COOKIE; + case SEVEN_SIDED_COOKIE_KEY -> LAUNCHER_ICON_SHAPE_SEVEN_SIDED_COOKIE; + case ARCH_KEY -> LAUNCHER_ICON_SHAPE_ARCH; + default -> null; + } + ).ifPresent(logger::log); + } + + SharedPreferences prefs = mLauncherPrefs.getBackedUpPrefs(); mLoggablePrefs.forEach((key, lp) -> logger.log(() -> prefs.getBoolean(key, lp.defaultValue) ? lp.eventIdOn : lp.eventIdOff)); } - @Override - public void close() { - getPrefs(mContext).unregisterOnSharedPreferenceChangeListener(this); - getDevicePrefs(mContext).unregisterOnSharedPreferenceChangeListener(this); + private void logThemeEvent(StatsLogger logger) { + ThemeValue themeValue = mThemePreference.getValue(); + IconThemeFactory factory = themeValue != null + ? mThemeFactoryMap.get(themeValue.getFactoryId()) + : null; + if (factory != null) { + factory.logThemeEvent(themeValue.getThemeId(), logger); + } else { + logger.log(LAUNCHER_THEMED_ICON_DISABLED); + } + } + + @VisibleForTesting + ArrayMap getLoggingPrefs() { + return mLoggablePrefs; } - private static class LoggablePref { + @VisibleForTesting + static class LoggablePref { public boolean defaultValue; public int eventIdOn; public int eventIdOff; diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index 4225516e77d..e69de29bb2d 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -1,918 +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.quickstep.logging; - -import static android.view.Surface.ROTATION_180; -import static android.view.Surface.ROTATION_270; -import static android.view.Surface.ROTATION_90; - -import static androidx.core.util.Preconditions.checkNotNull; -import static androidx.core.util.Preconditions.checkState; - -import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_NON_ACTIONABLE; -import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.ALL_APPS_CONTAINER; -import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS; -import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.FOLDER; -import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SEARCH_RESULT_CONTAINER; -import static com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORKSPACE_SNAPSHOT; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_0; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_90; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_180; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_270; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__ALLAPPS; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__BACKGROUND; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__HOME; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__OVERVIEW; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__PORTRAIT; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__LANDSCAPE; -import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__SEASCAPE; - -import android.content.Context; -import android.text.TextUtils; -import android.util.Log; -import android.util.StatsEvent; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.WorkerThread; -import androidx.slice.SliceItem; - -import com.android.internal.jank.Cuj; -import com.android.launcher3.LauncherAppState; -import com.android.launcher3.Utilities; -import com.android.launcher3.logger.LauncherAtom; -import com.android.launcher3.logger.LauncherAtom.Attribute; -import com.android.launcher3.logger.LauncherAtom.ContainerInfo; -import com.android.launcher3.logger.LauncherAtom.FolderContainer.ParentContainerCase; -import com.android.launcher3.logger.LauncherAtom.FolderIcon; -import com.android.launcher3.logger.LauncherAtom.FromState; -import com.android.launcher3.logger.LauncherAtom.LauncherAttributes; -import com.android.launcher3.logger.LauncherAtom.ToState; -import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer; -import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer.SearchAttributes; -import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers; -import com.android.launcher3.logging.InstanceId; -import com.android.launcher3.logging.StatsLogManager; -import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.Executors; -import com.android.launcher3.util.LogConfig; -import com.android.launcher3.views.ActivityContext; -import com.android.systemui.shared.system.InteractionJankMonitorWrapper; -import com.android.systemui.shared.system.SysUiStatsLog; - -import java.util.Optional; -import java.util.OptionalInt; -import java.util.concurrent.CopyOnWriteArrayList; - -/** - * This class calls StatsLog compile time generated methods. - * - * To see if the logs are properly sent to statsd, execute following command. - *

    - * $ wwdebug (to turn on the logcat printout) - * $ wwlogcat (see logcat with grep filter on) - * $ statsd_testdrive (see how ww is writing the proto to statsd buffer) - *
- */ -public class StatsLogCompatManager extends StatsLogManager { - - private static final String TAG = "StatsLog"; - private static final String LATENCY_TAG = "StatsLatencyLog"; - private static final String IMPRESSION_TAG = "StatsImpressionLog"; - private static final boolean IS_VERBOSE = Utilities.isPropertyEnabled(LogConfig.STATSLOG); - private static final boolean DEBUG = !Utilities.isRunningInTestHarness(); - private static final InstanceId DEFAULT_INSTANCE_ID = InstanceId.fakeInstanceId(0); - // LauncherAtom.ItemInfo.getDefaultInstance() should be used but until launcher - // proto migrates - // from nano to lite, bake constant to prevent robo test failure. - private static final int DEFAULT_PAGE_INDEX = -2; - private static final int FOLDER_HIERARCHY_OFFSET = 100; - private static final int SEARCH_RESULT_HIERARCHY_OFFSET = 200; - private static final int EXTENDED_CONTAINERS_HIERARCHY_OFFSET = 300; - private static final int ALL_APPS_HIERARCHY_OFFSET = 400; - - /** - * Flags for converting SearchAttribute to integer value. - */ - private static final int SEARCH_ATTRIBUTES_CORRECTED_QUERY = 1 << 0; - private static final int SEARCH_ATTRIBUTES_DIRECT_MATCH = 1 << 1; - private static final int SEARCH_ATTRIBUTES_ENTRY_STATE_ALL_APPS = 1 << 2; - private static final int SEARCH_ATTRIBUTES_ENTRY_STATE_QSB = 1 << 3; - private static final int SEARCH_ATTRIBUTES_ENTRY_STATE_OVERVIEW = 1 << 4; - private static final int SEARCH_ATTRIBUTES_ENTRY_STATE_TASKBAR = 1 << 5; - - public static final CopyOnWriteArrayList LOGS_CONSUMER = new CopyOnWriteArrayList<>(); - - public StatsLogCompatManager(Context context) { - super(context); - } - - @Override - protected StatsLogger createLogger() { - return new StatsCompatLogger(mContext, mActivityContext); - } - - @Override - protected StatsLatencyLogger createLatencyLogger() { - return new StatsCompatLatencyLogger(); - } - - @Override - protected StatsImpressionLogger createImpressionLogger() { - return new StatsCompatImpressionLogger(); - } - - /** - * Synchronously writes an itemInfo to stats log - */ - @WorkerThread - public static void writeSnapshot(LauncherAtom.ItemInfo info, InstanceId instanceId) { - if (IS_VERBOSE) { - Log.d(TAG, String.format("\nwriteSnapshot(%d):\n%s", instanceId.getId(), info)); - } - if (Utilities.isRunningInTestHarness() || !Utilities.ATLEAST_R) { - return; - } - SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_SNAPSHOT, - LAUNCHER_WORKSPACE_SNAPSHOT.getId() /* event_id */, - info.getItemCase().getNumber() /* target_id */, - instanceId.getId() /* instance_id */, - 0 /* uid */, - getPackageName(info) /* package_name */, - getComponentName(info) /* component_name */, - getGridX(info, false) /* grid_x */, - getGridY(info, false) /* grid_y */, - getPageId(info) /* page_id */, - getGridX(info, true) /* grid_x_parent */, - getGridY(info, true) /* grid_y_parent */, - getParentPageId(info) /* page_id_parent */, - getHierarchy(info) /* hierarchy */, - info.getIsWork() /* is_work_profile */, - 0 /* origin */, - getCardinality(info) /* cardinality */, - info.getWidget().getSpanX(), - info.getWidget().getSpanY(), - getFeatures(info), - getAttributes(info) /* attributes */ - ); - } - - private static byte[] getAttributes(LauncherAtom.ItemInfo itemInfo) { - LauncherAttributes.Builder responseBuilder = LauncherAttributes.newBuilder(); - itemInfo.getItemAttributesList().stream().map(Attribute::getNumber).forEach( - responseBuilder::addItemAttributes); - return responseBuilder.build().toByteArray(); - } - - /** - * Builds {@link StatsEvent} from {@link LauncherAtom.ItemInfo}. Used for pulled - * atom callback - * implementation. - */ - public static StatsEvent buildStatsEvent(LauncherAtom.ItemInfo info, - @Nullable InstanceId instanceId) { - return SysUiStatsLog.buildStatsEvent( - SysUiStatsLog.LAUNCHER_LAYOUT_SNAPSHOT, // atom ID, - LAUNCHER_WORKSPACE_SNAPSHOT.getId(), // event_id = 1; - info.getItemCase().getNumber(), // item_id = 2; - instanceId == null ? 0 : instanceId.getId(), // instance_id = 3; - 0, // uid = 4 [(is_uid) = true]; - getPackageName(info), // package_name = 5; - getComponentName(info), // component_name = 6; - getGridX(info, false), // grid_x = 7 [default = -1]; - getGridY(info, false), // grid_y = 8 [default = -1]; - getPageId(info), // page_id = 9 [default = -2]; - getGridX(info, true), // grid_x_parent = 10 [default = -1]; - getGridY(info, true), // grid_y_parent = 11 [default = -1]; - getParentPageId(info), // page_id_parent = 12 [default = -2]; - getHierarchy(info), // container_id = 13; - info.getIsWork(), // is_work_profile = 14; - 0, // attribute_id = 15; - getCardinality(info), // cardinality = 16; - info.getWidget().getSpanX(), // span_x = 17 [default = 1]; - info.getWidget().getSpanY(), // span_y = 18 [default = 1]; - getAttributes(info) /* attributes = 19 [(log_mode) = MODE_BYTES] */, - info.getIsKidsMode() /* is_kids_mode = 20 */ - ); - } - - /** - * Helps to construct and write statsd compatible log message. - */ - private static class StatsCompatLogger implements StatsLogger { - - private static final ItemInfo DEFAULT_ITEM_INFO = new ItemInfo(); - static { - DEFAULT_ITEM_INFO.itemType = ITEM_TYPE_NON_ACTIONABLE; - } - private final Context mContext; - private final Optional mActivityContext; - private ItemInfo mItemInfo = DEFAULT_ITEM_INFO; - private InstanceId mInstanceId = DEFAULT_INSTANCE_ID; - private OptionalInt mRank = OptionalInt.empty(); - private Optional mContainerInfo = Optional.empty(); - private int mSrcState = LAUNCHER_STATE_UNSPECIFIED; - private int mDstState = LAUNCHER_STATE_UNSPECIFIED; - private Optional mFromState = Optional.empty(); - private Optional mToState = Optional.empty(); - private Optional mEditText = Optional.empty(); - private SliceItem mSliceItem; - private LauncherAtom.Slice mSlice; - private Optional mCardinality = Optional.empty(); - private int mInputType = SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__UNKNOWN; - private Optional mFeatures = Optional.empty(); - private Optional mPackageName = Optional.empty(); - /** - * Indicates the current rotation of the display. Uses {@link android.view.Surface values.} - */ - private final int mDisplayRotation; - - StatsCompatLogger(Context context, ActivityContext activityContext) { - mContext = context; - mActivityContext = Optional.ofNullable(activityContext); - mDisplayRotation = DisplayController.INSTANCE.get(mContext).getInfo().rotation; - } - - @Override - public StatsLogger withItemInfo(ItemInfo itemInfo) { - if (mContainerInfo.isPresent()) { - throw new IllegalArgumentException( - "ItemInfo and ContainerInfo are mutual exclusive; cannot log both."); - } - this.mItemInfo = itemInfo; - return this; - } - - @Override - public StatsLogger withInstanceId(InstanceId instanceId) { - this.mInstanceId = instanceId; - return this; - } - - @Override - public StatsLogger withRank(int rank) { - this.mRank = OptionalInt.of(rank); - return this; - } - - @Override - public StatsLogger withSrcState(int srcState) { - this.mSrcState = srcState; - return this; - } - - @Override - public StatsLogger withDstState(int dstState) { - this.mDstState = dstState; - return this; - } - - @Override - public StatsLogger withContainerInfo(ContainerInfo containerInfo) { - checkState(mItemInfo == DEFAULT_ITEM_INFO, - "ItemInfo and ContainerInfo are mutual exclusive; cannot log both."); - this.mContainerInfo = Optional.of(containerInfo); - return this; - } - - @Override - public StatsLogger withFromState(FromState fromState) { - this.mFromState = Optional.of(fromState); - return this; - } - - @Override - public StatsLogger withToState(ToState toState) { - this.mToState = Optional.of(toState); - return this; - } - - @Override - public StatsLogger withEditText(String editText) { - this.mEditText = Optional.of(editText); - return this; - } - - @Override - public StatsLogger withSliceItem(@NonNull SliceItem sliceItem) { - checkState(mItemInfo == DEFAULT_ITEM_INFO && mSlice == null, - "ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one" - + " of them."); - this.mSliceItem = checkNotNull(sliceItem, "expected valid sliceItem but received null"); - return this; - } - - @Override - public StatsLogger withSlice(LauncherAtom.Slice slice) { - checkState(mItemInfo == DEFAULT_ITEM_INFO && mSliceItem == null, - "ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one" - + " of them."); - checkNotNull(slice, "expected valid slice but received null"); - checkNotNull(slice.getUri(), "expected valid slice uri but received null"); - this.mSlice = slice; - return this; - } - - @Override - public StatsLogger withCardinality(int cardinality) { - this.mCardinality = Optional.of(cardinality); - return this; - } - - @Override - public StatsLogger withInputType(int inputType) { - this.mInputType = inputType; - return this; - } - - @Override - public StatsLogger withFeatures(int feature) { - this.mFeatures = Optional.of(feature); - return this; - } - - @Override - public StatsLogger withPackageName(@Nullable String packageName) { - mPackageName = Optional.ofNullable(packageName); - return this; - } - - @Override - public void log(EventEnum event) { - if (DEBUG) { - String name = (event instanceof Enum) ? ((Enum) event).name() : event.getId() + ""; - Log.d(TAG, name); - } - - if (mSlice == null && mSliceItem != null) { - mSlice = LauncherAtom.Slice.newBuilder().setUri( - mSliceItem.getSlice().getUri().toString()).build(); - } - - if (mSlice != null) { - Executors.MODEL_EXECUTOR.execute( - () -> { - LauncherAtom.ItemInfo.Builder itemInfoBuilder = LauncherAtom.ItemInfo.newBuilder() - .setSlice(mSlice); - mContainerInfo.ifPresent(itemInfoBuilder::setContainerInfo); - write(event, applyOverwrites(itemInfoBuilder.build())); - }); - return; - } - - if (mItemInfo == null) { - return; - } - - if (mItemInfo.container < 0 || !LauncherAppState.INSTANCE.executeIfCreated(app -> { - // Item is inside a collection, fetch collection info in a BG thread - // and then write to StatsLog. - app.getModel().enqueueModelUpdateTask((taskController, dataModel, apps) -> - write(event, applyOverwrites(mItemInfo.buildProto( - dataModel.collections.get(mItemInfo.container))))); - })) { - // Write log on the model thread so that logs do not go out of order - // (for eg: drop comes after drag) - Executors.MODEL_EXECUTOR.execute( - () -> write(event, applyOverwrites(mItemInfo.buildProto()))); - } - } - - @Override - public void sendToInteractionJankMonitor(EventEnum event, View view) { - if (!(event instanceof LauncherEvent)) { - return; - } - switch ((LauncherEvent) event) { - case LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN: - InteractionJankMonitorWrapper.begin( - view, - Cuj.CUJ_LAUNCHER_ALL_APPS_SCROLL); - break; - case LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END: - InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_ALL_APPS_SCROLL); - break; - case LAUNCHER_PRIVATE_SPACE_LOCK_ANIMATION_BEGIN: - InteractionJankMonitorWrapper.begin(view, Cuj.CUJ_LAUNCHER_PRIVATE_SPACE_LOCK); - break; - case LAUNCHER_PRIVATE_SPACE_LOCK_ANIMATION_END: - InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_PRIVATE_SPACE_LOCK); - break; - case LAUNCHER_PRIVATE_SPACE_UNLOCK_ANIMATION_BEGIN: - InteractionJankMonitorWrapper.begin( - view, - Cuj.CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK); - break; - case LAUNCHER_PRIVATE_SPACE_UNLOCK_ANIMATION_END: - InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK); - break; - default: - break; - } - } - - private LauncherAtom.ItemInfo applyOverwrites(LauncherAtom.ItemInfo atomInfo) { - LauncherAtom.ItemInfo.Builder itemInfoBuilder = atomInfo.toBuilder(); - - mRank.ifPresent(itemInfoBuilder::setRank); - mContainerInfo.ifPresent(itemInfoBuilder::setContainerInfo); - - mActivityContext.ifPresent(activityContext -> activityContext.applyOverwritesToLogItem(itemInfoBuilder)); - - if (mFromState.isPresent() || mToState.isPresent() || mEditText.isPresent()) { - FolderIcon.Builder folderIconBuilder = itemInfoBuilder - .getFolderIcon() - .toBuilder(); - mFromState.ifPresent(folderIconBuilder::setFromLabelState); - mToState.ifPresent(folderIconBuilder::setToLabelState); - mEditText.ifPresent(folderIconBuilder::setLabelInfo); - itemInfoBuilder.setFolderIcon(folderIconBuilder); - } - return itemInfoBuilder.build(); - } - - @WorkerThread - private void write(EventEnum event, LauncherAtom.ItemInfo atomInfo) { - InstanceId instanceId = mInstanceId; - int srcState = mSrcState; - int dstState = mDstState; - int inputType = mInputType; - String packageName = mPackageName.orElseGet(() -> getPackageName(atomInfo)); - if (IS_VERBOSE) { - String name = (event instanceof Enum) ? ((Enum) event).name() : event.getId() + ""; - StringBuilder logStringBuilder = new StringBuilder("\n"); - if (instanceId != DEFAULT_INSTANCE_ID) { - logStringBuilder.append(String.format("InstanceId:%s ", instanceId)); - } - logStringBuilder.append(name); - if (srcState != LAUNCHER_STATE_UNSPECIFIED - || dstState != LAUNCHER_STATE_UNSPECIFIED) { - logStringBuilder.append( - String.format("(State:%s->%s)", getStateString(srcState), - getStateString(dstState))); - } - if (atomInfo.hasContainerInfo()) { - logStringBuilder.append("\n").append(atomInfo); - } - if (!TextUtils.isEmpty(packageName)) { - logStringBuilder.append(String.format("\nPackage name: %s", packageName)); - } - Log.d(TAG, logStringBuilder.toString()); - } - - for (StatsLogConsumer consumer : LOGS_CONSUMER) { - consumer.consume(event, atomInfo); - } - - // TODO: remove this when b/231648228 is fixed. - if (Utilities.isRunningInTestHarness() || !Utilities.ATLEAST_R) { - return; - } - int cardinality = mCardinality.orElseGet(() -> getCardinality(atomInfo)); - int features = mFeatures.orElseGet(() -> getFeatures(atomInfo)); - SysUiStatsLog.write( - SysUiStatsLog.LAUNCHER_EVENT, - SysUiStatsLog.LAUNCHER_UICHANGED__ACTION__DEFAULT_ACTION /* deprecated */, - srcState, - dstState, - null /* launcher extensions, deprecated */, - false /* quickstep_enabled, deprecated */, - event.getId() /* event_id */, - atomInfo.getItemCase().getNumber() /* target_id */, - instanceId.getId() /* instance_id TODO */, - 0 /* uid TODO */, - packageName /* package_name */, - getComponentName(atomInfo) /* component_name */, - getGridX(atomInfo, false) /* grid_x */, - getGridY(atomInfo, false) /* grid_y */, - getPageId(atomInfo) /* page_id */, - getGridX(atomInfo, true) /* grid_x_parent */, - getGridY(atomInfo, true) /* grid_y_parent */, - getParentPageId(atomInfo) /* page_id_parent */, - getHierarchy(atomInfo) /* hierarchy */, - false /* is_work_profile, deprecated */, - atomInfo.getRank() /* rank */, - atomInfo.getFolderIcon().getFromLabelState().getNumber() /* fromState */, - atomInfo.getFolderIcon().getToLabelState().getNumber() /* toState */, - atomInfo.getFolderIcon().getLabelInfo() /* edittext */, - cardinality /* cardinality */, - features /* features */, - getSearchAttributes(atomInfo) /* searchAttributes */, - getAttributes(atomInfo) /* attributes */, - inputType /* input_type */, - atomInfo.getUserType() /* user_type */, - getDisplayRotation() /* display_rotation */, - getRecentsOrientationHandler(atomInfo) /* recents_orientation_handler */); - } - - private int getDisplayRotation() { - return switch (mDisplayRotation) { - case ROTATION_90 -> LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_90; - case ROTATION_180 -> LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_180; - case ROTATION_270 -> LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_270; - default -> LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_0; - }; - } - - private int getRecentsOrientationHandler(LauncherAtom.ItemInfo itemInfo) { - var orientationHandler = - itemInfo.getContainerInfo().getTaskSwitcherContainer().getOrientationHandler(); - return switch (orientationHandler) { - case PORTRAIT -> LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__PORTRAIT; - case LANDSCAPE -> LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__LANDSCAPE; - case SEASCAPE -> LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__SEASCAPE; - }; - } - } - - /** - * Helps to construct and log statsd compatible latency events. - */ - private static class StatsCompatLatencyLogger implements StatsLatencyLogger { - private InstanceId mInstanceId = DEFAULT_INSTANCE_ID; - private LatencyType mType = LatencyType.UNKNOWN; - private int mPackageId = 0; - private long mLatencyInMillis; - private int mQueryLength = -1; - private int mSubEventType = 0; - private int mCardinality = -1; - - @Override - public StatsLatencyLogger withInstanceId(InstanceId instanceId) { - this.mInstanceId = instanceId; - return this; - } - - @Override - public StatsLatencyLogger withType(LatencyType type) { - this.mType = type; - return this; - } - - @Override - public StatsLatencyLogger withPackageId(int packageId) { - this.mPackageId = packageId; - return this; - } - - @Override - public StatsLatencyLogger withLatency(long latencyInMillis) { - this.mLatencyInMillis = latencyInMillis; - return this; - } - - @Override - public StatsLatencyLogger withQueryLength(int queryLength) { - this.mQueryLength = queryLength; - return this; - } - - @Override - public StatsLatencyLogger withSubEventType(int type) { - this.mSubEventType = type; - return this; - } - - @Override - public StatsLatencyLogger withCardinality(int cardinality) { - this.mCardinality = cardinality; - return this; - } - - @Override - public void log(EventEnum event) { - if (IS_VERBOSE) { - String name = (event instanceof Enum) ? ((Enum) event).name() : event.getId() + ""; - StringBuilder logStringBuilder = new StringBuilder("\n"); - logStringBuilder.append(String.format("InstanceId:%s ", mInstanceId)); - logStringBuilder.append(String.format("%s=%sms", name, mLatencyInMillis)); - Log.d(LATENCY_TAG, logStringBuilder.toString()); - } - - SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_LATENCY, - event.getId(), // event_id - mInstanceId.getId(), // instance_id - mPackageId, // package_id - mLatencyInMillis, // latency_in_millis - mType.getId(), // type - mQueryLength, // query_length - mSubEventType, // sub_event_type - mCardinality // cardinality - ); - } - } - - /** - * Helps to construct and log statsd compatible impression events. - */ - private static class StatsCompatImpressionLogger implements StatsImpressionLogger { - private InstanceId mInstanceId = DEFAULT_INSTANCE_ID; - private State mLauncherState = State.UNKNOWN; - private int mQueryLength = -1; - - // Fields used for Impression Logging V2. - private int mResultType; - private boolean mAboveKeyboard = false; - private int mUid; - private int mResultSource; - - @Override - public StatsImpressionLogger withInstanceId(InstanceId instanceId) { - this.mInstanceId = instanceId; - return this; - } - - @Override - public StatsImpressionLogger withState(State state) { - this.mLauncherState = state; - return this; - } - - @Override - public StatsImpressionLogger withQueryLength(int queryLength) { - this.mQueryLength = queryLength; - return this; - } - - @Override - public StatsImpressionLogger withResultType(int resultType) { - mResultType = resultType; - return this; - } - - @Override - public StatsImpressionLogger withAboveKeyboard(boolean aboveKeyboard) { - mAboveKeyboard = aboveKeyboard; - return this; - } - - @Override - public StatsImpressionLogger withUid(int uid) { - mUid = uid; - return this; - } - - @Override - public StatsImpressionLogger withResultSource(int resultSource) { - mResultSource = resultSource; - return this; - } - - @Override - public void log(EventEnum event) { - if (IS_VERBOSE) { - String name = (event instanceof Enum) ? ((Enum) event).name() : event.getId() + ""; - StringBuilder logStringBuilder = new StringBuilder("\n"); - logStringBuilder.append(String.format("InstanceId:%s ", mInstanceId)); - logStringBuilder.append(String.format("ImpressionEvent:%s ", name)); - logStringBuilder.append(String.format("\n\tLauncherState = %s ", mLauncherState)); - logStringBuilder.append(String.format("\tQueryLength = %s ", mQueryLength)); - logStringBuilder.append(String.format( - "\n\t ResultType = %s is_above_keyboard = %s" - + " uid = %s result_source = %s", - mResultType, - mAboveKeyboard, mUid, mResultSource)); - - Log.d(IMPRESSION_TAG, logStringBuilder.toString()); - } - - SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_IMPRESSION_EVENT_V2, - event.getId(), // event_id - mInstanceId.getId(), // instance_id - mLauncherState.getLauncherState(), // state - mQueryLength, // query_length - mResultType, // result type - mAboveKeyboard, // above keyboard - mUid, // uid - mResultSource // result source - - ); - } - } - - private static int getCardinality(LauncherAtom.ItemInfo info) { - if (Utilities.isRunningInTestHarness()) { - return 0; - } - switch (info.getContainerInfo().getContainerCase()) { - case PREDICTED_HOTSEAT_CONTAINER: - return info.getContainerInfo().getPredictedHotseatContainer().getCardinality(); - case TASK_BAR_CONTAINER: - return info.getContainerInfo().getTaskBarContainer().getCardinality(); - case SEARCH_RESULT_CONTAINER: - return info.getContainerInfo().getSearchResultContainer().getQueryLength(); - case EXTENDED_CONTAINERS: - ExtendedContainers extendedCont = info.getContainerInfo().getExtendedContainers(); - if (extendedCont.getContainerCase() == DEVICE_SEARCH_RESULT_CONTAINER) { - DeviceSearchResultContainer deviceSearchResultCont = extendedCont - .getDeviceSearchResultContainer(); - return deviceSearchResultCont.hasQueryLength() ? deviceSearchResultCont - .getQueryLength() : -1; - } - default: - return info.getFolderIcon().getCardinality(); - } - } - - private static String getPackageName(LauncherAtom.ItemInfo info) { - switch (info.getItemCase()) { - case APPLICATION: - return info.getApplication().getPackageName(); - case SHORTCUT: - return info.getShortcut().getShortcutName(); - case WIDGET: - return info.getWidget().getPackageName(); - case TASK: - return info.getTask().getPackageName(); - case SEARCH_ACTION_ITEM: - return info.getSearchActionItem().getPackageName(); - default: - return null; - } - } - - private static String getComponentName(LauncherAtom.ItemInfo info) { - switch (info.getItemCase()) { - case APPLICATION: - return info.getApplication().getComponentName(); - case SHORTCUT: - return info.getShortcut().getShortcutName(); - case WIDGET: - return info.getWidget().getComponentName(); - case TASK: - return info.getTask().getComponentName(); - case SEARCH_ACTION_ITEM: - return info.getSearchActionItem().getTitle(); - case SLICE: - return info.getSlice().getUri(); - default: - return null; - } - } - - private static int getGridX(LauncherAtom.ItemInfo info, boolean parent) { - LauncherAtom.ContainerInfo containerInfo = info.getContainerInfo(); - if (containerInfo.getContainerCase() == FOLDER) { - if (parent) { - return containerInfo.getFolder().getWorkspace().getGridX(); - } else { - return containerInfo.getFolder().getGridX(); - } - } else if (containerInfo.getContainerCase() == EXTENDED_CONTAINERS) { - return containerInfo.getExtendedContainers() - .getDeviceSearchResultContainer().getGridX(); - } else { - return containerInfo.getWorkspace().getGridX(); - } - } - - private static int getGridY(LauncherAtom.ItemInfo info, boolean parent) { - if (info.getContainerInfo().getContainerCase() == FOLDER) { - if (parent) { - return info.getContainerInfo().getFolder().getWorkspace().getGridY(); - } else { - return info.getContainerInfo().getFolder().getGridY(); - } - } else { - return info.getContainerInfo().getWorkspace().getGridY(); - } - } - - private static int getPageId(LauncherAtom.ItemInfo info) { - if (info.hasTask()) { - return info.getTask().getIndex(); - } - switch (info.getContainerInfo().getContainerCase()) { - case FOLDER: - return info.getContainerInfo().getFolder().getPageIndex(); - case HOTSEAT: - return info.getContainerInfo().getHotseat().getIndex(); - case PREDICTED_HOTSEAT_CONTAINER: - return info.getContainerInfo().getPredictedHotseatContainer().getIndex(); - case TASK_BAR_CONTAINER: - return info.getContainerInfo().getTaskBarContainer().getIndex(); - default: - return info.getContainerInfo().getWorkspace().getPageIndex(); - } - } - - private static int getParentPageId(LauncherAtom.ItemInfo info) { - switch (info.getContainerInfo().getContainerCase()) { - case FOLDER: - if (info.getContainerInfo().getFolder().getParentContainerCase() == ParentContainerCase.HOTSEAT) { - return info.getContainerInfo().getFolder().getHotseat().getIndex(); - } - return info.getContainerInfo().getFolder().getWorkspace().getPageIndex(); - case SEARCH_RESULT_CONTAINER: - return info.getContainerInfo().getSearchResultContainer().getWorkspace() - .getPageIndex(); - default: - return info.getContainerInfo().getWorkspace().getPageIndex(); - } - } - - private static int getHierarchy(LauncherAtom.ItemInfo info) { - if (Utilities.isRunningInTestHarness()) { - return 0; - } - if (info.getContainerInfo().getContainerCase() == FOLDER) { - return info.getContainerInfo().getFolder().getParentContainerCase().getNumber() - + FOLDER_HIERARCHY_OFFSET; - } else if (info.getContainerInfo().getContainerCase() == SEARCH_RESULT_CONTAINER) { - return info.getContainerInfo().getSearchResultContainer().getParentContainerCase() - .getNumber() + SEARCH_RESULT_HIERARCHY_OFFSET; - } else if (info.getContainerInfo().getContainerCase() == EXTENDED_CONTAINERS) { - return info.getContainerInfo().getExtendedContainers().getContainerCase().getNumber() - + EXTENDED_CONTAINERS_HIERARCHY_OFFSET; - } else if (info.getContainerInfo().getContainerCase() == ALL_APPS_CONTAINER) { - return info.getContainerInfo().getAllAppsContainer().getParentContainerCase() - .getNumber() + ALL_APPS_HIERARCHY_OFFSET; - } else { - return info.getContainerInfo().getContainerCase().getNumber(); - } - } - - private static String getStateString(int state) { - switch (state) { - case LAUNCHER_UICHANGED__DST_STATE__BACKGROUND: - return "BACKGROUND"; - case LAUNCHER_UICHANGED__DST_STATE__HOME: - return "HOME"; - case LAUNCHER_UICHANGED__DST_STATE__OVERVIEW: - return "OVERVIEW"; - case LAUNCHER_UICHANGED__DST_STATE__ALLAPPS: - return "ALLAPPS"; - default: - return "INVALID"; - } - } - - private static int getFeatures(LauncherAtom.ItemInfo info) { - if (info.getItemCase().equals(LauncherAtom.ItemInfo.ItemCase.WIDGET)) { - return info.getWidget().getWidgetFeatures(); - } - return 0; - } - - private static int getSearchAttributes(LauncherAtom.ItemInfo info) { - if (Utilities.isRunningInTestHarness()) { - return 0; - } - ContainerInfo containerInfo = info.getContainerInfo(); - if (containerInfo.getContainerCase() == EXTENDED_CONTAINERS - && containerInfo.getExtendedContainers().getContainerCase() == DEVICE_SEARCH_RESULT_CONTAINER - && containerInfo.getExtendedContainers() - .getDeviceSearchResultContainer().hasSearchAttributes()) { - return searchAttributesToInt(containerInfo.getExtendedContainers() - .getDeviceSearchResultContainer().getSearchAttributes()); - } - return 0; - } - - private static int searchAttributesToInt(SearchAttributes searchAttributes) { - int response = 0; - if (searchAttributes.getCorrectedQuery()) { - response = response | SEARCH_ATTRIBUTES_CORRECTED_QUERY; - } - if (searchAttributes.getDirectMatch()) { - response = response | SEARCH_ATTRIBUTES_DIRECT_MATCH; - } - if (searchAttributes.getEntryState() == SearchAttributes.EntryState.ALL_APPS) { - response = response | SEARCH_ATTRIBUTES_ENTRY_STATE_ALL_APPS; - } else if (searchAttributes.getEntryState() == SearchAttributes.EntryState.QSB) { - response = response | SEARCH_ATTRIBUTES_ENTRY_STATE_QSB; - } else if (searchAttributes.getEntryState() == SearchAttributes.EntryState.OVERVIEW) { - response = response | SEARCH_ATTRIBUTES_ENTRY_STATE_OVERVIEW; - } else if (searchAttributes.getEntryState() == SearchAttributes.EntryState.TASKBAR) { - response = response | SEARCH_ATTRIBUTES_ENTRY_STATE_TASKBAR; - } - - return response; - } - - /** - * Interface to get stats log while it is dispatched to the system - */ - public interface StatsLogConsumer { - - @WorkerThread - void consume(EventEnum event, LauncherAtom.ItemInfo atomInfo); - } -} diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.kt b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.kt new file mode 100644 index 00000000000..df3469e9b0a --- /dev/null +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.kt @@ -0,0 +1,818 @@ +/* + * 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.quickstep.logging + +import android.content.Context +import android.util.Log +import android.util.StatsEvent +import android.view.Surface +import android.view.View +import androidx.annotation.WorkerThread +import androidx.slice.SliceItem +import com.android.internal.jank.Cuj +import com.android.launcher3.LauncherAppState +import com.android.launcher3.LauncherSettings.Favorites +import com.android.launcher3.Utilities +import com.android.launcher3.logger.LauncherAtom +import com.android.launcher3.logger.LauncherAtom.ContainerInfo +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.ALL_APPS_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.FOLDER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.HOTSEAT +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.PREDICTED_HOTSEAT_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SEARCH_RESULT_CONTAINER +import com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.TASK_BAR_CONTAINER +import com.android.launcher3.logger.LauncherAtom.FolderContainer.ParentContainerCase +import com.android.launcher3.logger.LauncherAtom.FromState +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.APPLICATION +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.FOLDER_ICON +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.SEARCH_ACTION_ITEM +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.SHORTCUT +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.SLICE +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.TASK +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.TASK_VIEW +import com.android.launcher3.logger.LauncherAtom.ItemInfo.ItemCase.WIDGET +import com.android.launcher3.logger.LauncherAtom.LauncherAttributes +import com.android.launcher3.logger.LauncherAtom.Slice +import com.android.launcher3.logger.LauncherAtom.TaskSwitcherContainer.OrientationHandler.LANDSCAPE +import com.android.launcher3.logger.LauncherAtom.TaskSwitcherContainer.OrientationHandler.PORTRAIT +import com.android.launcher3.logger.LauncherAtom.TaskSwitcherContainer.OrientationHandler.SEASCAPE +import com.android.launcher3.logger.LauncherAtom.ToState +import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer.SearchAttributes +import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer.SearchAttributes.EntryState.ALL_APPS +import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer.SearchAttributes.EntryState.OVERVIEW +import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer.SearchAttributes.EntryState.QSB +import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer.SearchAttributes.EntryState.TASKBAR +import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER +import com.android.launcher3.logging.InstanceId +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_PRIVATE_SPACE_LOCK_ANIMATION_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_PRIVATE_SPACE_LOCK_ANIMATION_END +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_PRIVATE_SPACE_UNLOCK_ANIMATION_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_PRIVATE_SPACE_UNLOCK_ANIMATION_END +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_PICKER_APP_EXPAND_ANIMATION_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_PICKER_APP_EXPAND_ANIMATION_END +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_PICKER_OPEN_ANIMATION_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_PICKER_OPEN_ANIMATION_END +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORKSPACE_SNAPSHOT +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORK_UTILITY_VIEW_EXPAND_ANIMATION_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORK_UTILITY_VIEW_EXPAND_ANIMATION_END +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORK_UTILITY_VIEW_SHRINK_ANIMATION_BEGIN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORK_UTILITY_VIEW_SHRINK_ANIMATION_END +import com.android.launcher3.logging.StatsLogManager.StatsImpressionLogger.State +import com.android.launcher3.logging.StatsLogManager.StatsLatencyLogger.LatencyType +import com.android.launcher3.logging.StatsLogManager.StatsLatencyLogger.LatencyType.UNKNOWN +import com.android.launcher3.model.data.CollectionInfo +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.Executors +import com.android.launcher3.util.LogConfig +import com.android.launcher3.views.ActivityContext +import com.android.systemui.shared.system.InteractionJankMonitorWrapper +import com.android.systemui.shared.system.SysUiStatsLog +import java.util.concurrent.CopyOnWriteArrayList +import javax.inject.Inject + +/** + * This class calls StatsLog compile time generated methods. + * + * To see if the logs are properly sent to statsd, execute following command. + * + * $ wwdebug (to turn on the logcat printout) $ wwlogcat (see logcat with grep filter on) $ + * statsd_testdrive (see how ww is writing the proto to statsd buffer) + */ +class StatsLogCompatManager private constructor(context: Context) : StatsLogManager(context) { + /** + * This class is purely used to support dagger bindings to be overridden in launcher variants. + * Very similar to [dagger.assisted.AssistedFactory]. But [dagger.assisted.AssistedFactory] + * cannot be overridden and this makes dagger binding difficult. + */ + class StatsLogCompatManagerFactory @Inject internal constructor() : StatsLogManagerFactory() { + override fun create(context: Context): StatsLogManager { + return StatsLogCompatManager(context) + } + } + + override fun createLogger(): StatsLogger { + return StatsCompatLogger(mContext, mActivityContext) + } + + override fun createLatencyLogger(): StatsLatencyLogger { + return StatsCompatLatencyLogger() + } + + override fun createImpressionLogger(): StatsImpressionLogger { + return StatsCompatImpressionLogger() + } + + /** Helps to construct and write statsd compatible log message. */ + private class StatsCompatLogger( + private val context: Context, + private val activityContext: ActivityContext?, + ) : StatsLogger { + + private var mItemInfo: ItemInfo? = DEFAULT_ITEM_INFO + private var mInstanceId: InstanceId? = DEFAULT_INSTANCE_ID + private var mRank: Int? = null + private var mContainerInfo: ContainerInfo? = null + private var mSrcState = LAUNCHER_STATE_UNSPECIFIED + private var mDstState = LAUNCHER_STATE_UNSPECIFIED + private var mFromState: FromState? = null + private var mToState: ToState? = null + private var mEditText: String? = null + private var mSliceItem: SliceItem? = null + private var mSlice: Slice? = null + private var mCardinality: Int? = null + private var mInputType = SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__UNKNOWN + private var mFeatures: Int? = null + private var mPackageName: String? = null + + /** Indicates the current rotation of the display. Uses [values.][android.view.Surface] */ + private val mDisplayRotation = DisplayController.INSTANCE[context].info.rotation + + override fun withItemInfo(itemInfo: ItemInfo?) = apply { + require(mContainerInfo == null) { + "ItemInfo and ContainerInfo are mutual exclusive; cannot log both." + } + mItemInfo = itemInfo + } + + override fun withInstanceId(instanceId: InstanceId?) = apply { mInstanceId = instanceId } + + override fun withRank(rank: Int) = apply { mRank = rank } + + override fun withSrcState(srcState: Int) = apply { mSrcState = srcState } + + override fun withDstState(dstState: Int) = apply { mDstState = dstState } + + override fun withContainerInfo(containerInfo: ContainerInfo?) = apply { + require(mItemInfo === DEFAULT_ITEM_INFO) { + "ItemInfo and ContainerInfo are mutual exclusive; cannot log both." + } + this.mContainerInfo = containerInfo + } + + override fun withFromState(fromState: FromState?) = apply { this.mFromState = fromState } + + override fun withToState(toState: ToState?) = apply { this.mToState = toState } + + override fun withEditText(editText: String?) = apply { this.mEditText = editText } + + override fun withSliceItem(sliceItem: SliceItem) = apply { + require(mItemInfo === DEFAULT_ITEM_INFO && mSlice == null) { + "ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one of them." + } + this.mSliceItem = sliceItem + } + + override fun withSlice(slice: Slice) = apply { + require(mItemInfo === DEFAULT_ITEM_INFO && mSliceItem == null) { + "ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one of them." + } + this.mSlice = slice + } + + override fun withCardinality(cardinality: Int) = apply { this.mCardinality = cardinality } + + override fun withInputType(inputType: Int) = apply { this.mInputType = inputType } + + override fun withFeatures(feature: Int) = apply { this.mFeatures = feature } + + override fun withPackageName(packageName: String?) = apply { mPackageName = packageName } + + override fun log(event: EventEnum) { + if (DEBUG) { + val name = if (event is Enum<*>) event.name else event.id.toString() + "" + Log.d(TAG, name) + } + + if (mSlice == null && mSliceItem != null) + mSlice = Slice.newBuilder().setUri(mSliceItem!!.slice!!.uri.toString()).build() + + if (mSlice != null) { + Executors.MODEL_EXECUTOR.execute { + val itemInfoBuilder = LauncherAtom.ItemInfo.newBuilder().setSlice(mSlice) + mContainerInfo?.let { itemInfoBuilder.setContainerInfo(it) } + write(event, applyOverwrites(itemInfoBuilder.build())) + } + return + } + + val info = mItemInfo ?: return + + // If the item is inside a collection, fetch collection info in a BG thread + // and then write to StatsLog. + LauncherAppState.INSTANCE[context].model.enqueueModelUpdateTask { _, dataModel, _ -> + write( + event, + applyOverwrites( + info.buildProto( + dataModel.itemsIdMap[info.container] as CollectionInfo?, + context, + ) + ), + ) + } + } + + override fun sendToInteractionJankMonitor(event: EventEnum?, view: View?) { + if (event !is LauncherEvent) return + when (event) { + LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN -> + InteractionJankMonitorWrapper.begin(view, Cuj.CUJ_LAUNCHER_ALL_APPS_SCROLL) + + LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END -> + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_ALL_APPS_SCROLL) + LAUNCHER_PRIVATE_SPACE_LOCK_ANIMATION_BEGIN -> + InteractionJankMonitorWrapper.begin(view, Cuj.CUJ_LAUNCHER_PRIVATE_SPACE_LOCK) + + LAUNCHER_PRIVATE_SPACE_LOCK_ANIMATION_END -> + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_PRIVATE_SPACE_LOCK) + LAUNCHER_PRIVATE_SPACE_UNLOCK_ANIMATION_BEGIN -> + InteractionJankMonitorWrapper.begin(view, Cuj.CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK) + + LAUNCHER_PRIVATE_SPACE_UNLOCK_ANIMATION_END -> + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK) + LAUNCHER_WORK_UTILITY_VIEW_EXPAND_ANIMATION_BEGIN -> + InteractionJankMonitorWrapper.begin( + view, + Cuj.CUJ_LAUNCHER_WORK_UTILITY_VIEW_EXPAND, + ) + + LAUNCHER_WORK_UTILITY_VIEW_EXPAND_ANIMATION_END -> + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_WORK_UTILITY_VIEW_EXPAND) + + LAUNCHER_WORK_UTILITY_VIEW_SHRINK_ANIMATION_BEGIN -> + InteractionJankMonitorWrapper.begin( + view, + Cuj.CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK, + ) + + LAUNCHER_WORK_UTILITY_VIEW_SHRINK_ANIMATION_END -> + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK) + + LAUNCHER_WIDGET_PICKER_OPEN_ANIMATION_BEGIN -> + InteractionJankMonitorWrapper.begin( + view, + Cuj.CUJ_LAUNCHER_WIDGET_PICKER_OPEN, + ) + LAUNCHER_WIDGET_PICKER_OPEN_ANIMATION_END -> + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_WIDGET_PICKER_OPEN) + + LAUNCHER_WIDGET_PICKER_APP_EXPAND_ANIMATION_BEGIN -> + InteractionJankMonitorWrapper.begin( + view, + Cuj.CUJ_LAUNCHER_WIDGET_PICKER_APP_EXPAND, + ) + LAUNCHER_WIDGET_PICKER_APP_EXPAND_ANIMATION_END -> + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_WIDGET_PICKER_APP_EXPAND) + + else -> {} + } + } + + fun applyOverwrites(atomInfo: LauncherAtom.ItemInfo): LauncherAtom.ItemInfo = + atomInfo + .toBuilder() + .apply { + mRank?.let { setRank(it) } + mContainerInfo?.let { setContainerInfo(it) } + activityContext?.applyOverwritesToLogItem(this) + + if (mFromState != null || mToState != null || mEditText != null) { + val folderIconBuilder = folderIcon.toBuilder() + mFromState?.let { folderIconBuilder.setFromLabelState(it) } + mToState?.let { folderIconBuilder.setToLabelState(it) } + mEditText?.let { folderIconBuilder.setLabelInfo(it) } + + setFolderIcon(folderIconBuilder) + } + } + .build() + + @WorkerThread + fun write(event: EventEnum, atomInfo: LauncherAtom.ItemInfo) { + val instanceId = mInstanceId + val srcState = mSrcState + val dstState = mDstState + val inputType = mInputType + val packageName = mPackageName ?: getPackageName(atomInfo) + + if (IS_VERBOSE) { + val name = + if (event is Enum<*>) (event as Enum<*>).name else event.id.toString() + "" + val logStringBuilder = StringBuilder("\n") + if (instanceId !== DEFAULT_INSTANCE_ID) + logStringBuilder.append("InstanceId:$instanceId") + + logStringBuilder.append(name) + + if ( + srcState != LAUNCHER_STATE_UNSPECIFIED || dstState != LAUNCHER_STATE_UNSPECIFIED + ) { + logStringBuilder.append( + "(State:${getStateString(srcState)}->${getStateString(dstState)})" + ) + } + + if (atomInfo.hasContainerInfo()) logStringBuilder.append("\n$atomInfo") + packageName?.let { logStringBuilder.append("\nPackage name: $it") } + + Log.d(TAG, logStringBuilder.toString()) + } + + for (consumer in LOGS_CONSUMER) { + consumer.consume(event, atomInfo) + } + + // TODO: remove this when b/231648228 is fixed. + if (Utilities.isRunningInTestHarness()) { + return + } + val cardinality = mCardinality ?: getCardinality(atomInfo) + + val features = mFeatures ?: getFeatures(atomInfo) + + SysUiStatsLog.write( + SysUiStatsLog.LAUNCHER_EVENT, + SysUiStatsLog.LAUNCHER_UICHANGED__ACTION__DEFAULT_ACTION, /* deprecated */ + srcState, + dstState, + null, /* launcher extensions, deprecated */ + false, /* quickstep_enabled, deprecated */ + event.id, /* event_id */ + atomInfo.itemCase.number, /* target_id */ + instanceId!!.id, /* instance_id TODO */ + 0, /* uid TODO */ + packageName, /* package_name */ + getComponentName(atomInfo), /* component_name */ + getGridX(atomInfo, false), /* grid_x */ + getGridY(atomInfo, false), /* grid_y */ + getPageId(atomInfo), /* page_id */ + getGridX(atomInfo, true), /* grid_x_parent */ + getGridY(atomInfo, true), /* grid_y_parent */ + getParentPageId(atomInfo), /* page_id_parent */ + getHierarchy(atomInfo), /* hierarchy */ + false, /* is_work_profile, deprecated */ + atomInfo.rank, /* rank */ + atomInfo.folderIcon.fromLabelState.number, /* fromState */ + atomInfo.folderIcon.toLabelState.number, /* toState */ + atomInfo.folderIcon.labelInfo, /* edittext */ + cardinality, /* cardinality */ + features, /* features */ + getSearchAttributes(atomInfo), /* searchAttributes */ + getAttributes(atomInfo), /* attributes */ + inputType, /* input_type */ + atomInfo.userType, /* user_type */ + displayRotation, /* display_rotation */ + getRecentsOrientationHandler(atomInfo), /* recents_orientation_handler */ + ) + } + + val displayRotation: Int + get() = + when (mDisplayRotation) { + Surface.ROTATION_90 -> + SysUiStatsLog.LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_90 + Surface.ROTATION_180 -> + SysUiStatsLog.LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_180 + Surface.ROTATION_270 -> + SysUiStatsLog.LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_270 + else -> SysUiStatsLog.LAUNCHER_UICHANGED__DISPLAY_ROTATION__ROTATION_0 + } + + fun getRecentsOrientationHandler(itemInfo: LauncherAtom.ItemInfo): Int { + val orientationHandler = itemInfo.containerInfo.taskSwitcherContainer.orientationHandler + return when (orientationHandler) { + PORTRAIT -> SysUiStatsLog.LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__PORTRAIT + LANDSCAPE -> + SysUiStatsLog.LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__LANDSCAPE + SEASCAPE -> SysUiStatsLog.LAUNCHER_UICHANGED__RECENTS_ORIENTATION_HANDLER__SEASCAPE + } + } + + companion object { + private val DEFAULT_ITEM_INFO = ItemInfo() + + init { + DEFAULT_ITEM_INFO.itemType = Favorites.ITEM_TYPE_NON_ACTIONABLE + } + } + } + + /** Helps to construct and log statsd compatible latency events. */ + private class StatsCompatLatencyLogger : StatsLatencyLogger { + private var mInstanceId: InstanceId? = DEFAULT_INSTANCE_ID + private var mType: LatencyType? = UNKNOWN + private var mPackageId = 0 + private var mLatencyInMillis: Long = 0 + private var mQueryLength = -1 + private var mSubEventType = 0 + private var mCardinality = -1 + + override fun withInstanceId(instanceId: InstanceId?) = apply { + this.mInstanceId = instanceId + } + + override fun withType(type: LatencyType?) = apply { this.mType = type } + + override fun withPackageId(packageId: Int) = apply { this.mPackageId = packageId } + + override fun withLatency(latencyInMillis: Long) = apply { + this.mLatencyInMillis = latencyInMillis + } + + override fun withQueryLength(queryLength: Int) = apply { this.mQueryLength = queryLength } + + override fun withSubEventType(type: Int) = apply { this.mSubEventType = type } + + override fun withCardinality(cardinality: Int) = apply { this.mCardinality = cardinality } + + override fun log(event: EventEnum) { + if (IS_VERBOSE) { + val name = + if (event is Enum<*>) (event as Enum<*>).name else event.id.toString() + "" + Log.d(LATENCY_TAG, "InstanceId=$mInstanceId $name=${mLatencyInMillis}ms") + } + + SysUiStatsLog.write( + SysUiStatsLog.LAUNCHER_LATENCY, + event.id, // event_id + mInstanceId!!.id, // instance_id + mPackageId, // package_id + mLatencyInMillis, // latency_in_millis + mType!!.id, // type + mQueryLength, // query_length + mSubEventType, // sub_event_type + mCardinality, // cardinality + ) + } + } + + /** Helps to construct and log statsd compatible impression events. */ + private class StatsCompatImpressionLogger : StatsImpressionLogger { + private var mInstanceId: InstanceId? = DEFAULT_INSTANCE_ID + private var mLauncherState: State? = State.UNKNOWN + private var mQueryLength = -1 + + // Fields used for Impression Logging V2. + private var mResultType = 0 + private var mAboveKeyboard = false + private var mUid = 0 + private var mResultSource = 0 + + override fun withInstanceId(instanceId: InstanceId?) = apply { + this.mInstanceId = instanceId + } + + override fun withState(state: State?) = apply { this.mLauncherState = state } + + override fun withQueryLength(queryLength: Int) = apply { this.mQueryLength = queryLength } + + override fun withResultType(resultType: Int) = apply { mResultType = resultType } + + override fun withAboveKeyboard(aboveKeyboard: Boolean) = apply { + mAboveKeyboard = aboveKeyboard + } + + override fun withUid(uid: Int) = apply { mUid = uid } + + override fun withResultSource(resultSource: Int) = apply { mResultSource = resultSource } + + override fun log(event: EventEnum) { + if (IS_VERBOSE) { + val name = + if (event is Enum<*>) (event as Enum<*>).name else event.id.toString() + "" + Log.d( + IMPRESSION_TAG, + """" + |InstanceId:$mInstanceId + |ImpressionEvent:$name + | LauncherState = $mLauncherState + | QueryLength = $mQueryLength + | ResultType=$mResultType is_above_keyboard=$mAboveKeyboard mUid=$mUid + | result_source=$mResultSource + |""" + .trimMargin(), + ) + } + + SysUiStatsLog.write( + SysUiStatsLog.LAUNCHER_IMPRESSION_EVENT_V2, + event.id, // event_id + mInstanceId!!.id, // instance_id + mLauncherState!!.launcherState, // state + mQueryLength, // query_length + mResultType, // result type + mAboveKeyboard, // above keyboard + mUid, // uid + mResultSource, // result source + ) + } + } + + /** Interface to get stats log while it is dispatched to the system */ + interface StatsLogConsumer { + @WorkerThread fun consume(event: EventEnum?, atomInfo: LauncherAtom.ItemInfo?) + } + + companion object { + private const val TAG = "StatsLog" + private const val LATENCY_TAG = "StatsLatencyLog" + private const val IMPRESSION_TAG = "StatsImpressionLog" + private val IS_VERBOSE = Utilities.isPropertyEnabled(LogConfig.STATSLOG) + private val DEBUG = !Utilities.isRunningInTestHarness() + private val DEFAULT_INSTANCE_ID: InstanceId = InstanceId.fakeInstanceId(0) + + // LauncherAtom.ItemInfo.getDefaultInstance() should be used but until launcher proto + // migrates + // from nano to lite, bake constant to prevent robo test failure. + private const val DEFAULT_PAGE_INDEX = -2 + private const val FOLDER_HIERARCHY_OFFSET = 100 + private const val SEARCH_RESULT_HIERARCHY_OFFSET = 200 + private const val EXTENDED_CONTAINERS_HIERARCHY_OFFSET = 300 + private const val ALL_APPS_HIERARCHY_OFFSET = 400 + + /** Flags for converting SearchAttribute to integer value. */ + private const val SEARCH_ATTRIBUTES_CORRECTED_QUERY = 1 shl 0 + private const val SEARCH_ATTRIBUTES_DIRECT_MATCH = 1 shl 1 + private const val SEARCH_ATTRIBUTES_ENTRY_STATE_ALL_APPS = 1 shl 2 + private const val SEARCH_ATTRIBUTES_ENTRY_STATE_QSB = 1 shl 3 + private const val SEARCH_ATTRIBUTES_ENTRY_STATE_OVERVIEW = 1 shl 4 + private const val SEARCH_ATTRIBUTES_ENTRY_STATE_TASKBAR = 1 shl 5 + + @JvmField val LOGS_CONSUMER: CopyOnWriteArrayList = CopyOnWriteArrayList() + + /** Synchronously writes an itemInfo to stats log */ + @WorkerThread + @JvmStatic + fun writeSnapshot(info: LauncherAtom.ItemInfo, instanceId: InstanceId) { + if (IS_VERBOSE) { + Log.d(TAG, String.format("\nwriteSnapshot(%d):\n%s", instanceId.id, info)) + } + if (Utilities.isRunningInTestHarness()) { + return + } + SysUiStatsLog.write( + SysUiStatsLog.LAUNCHER_SNAPSHOT, + LAUNCHER_WORKSPACE_SNAPSHOT.id, /* event_id */ + info.itemCase.number, /* target_id */ + instanceId.id, /* instance_id */ + 0, /* uid */ + getPackageName(info), /* package_name */ + getComponentName(info), /* component_name */ + getGridX(info, false), /* grid_x */ + getGridY(info, false), /* grid_y */ + getPageId(info), /* page_id */ + getGridX(info, true), /* grid_x_parent */ + getGridY(info, true), /* grid_y_parent */ + getParentPageId(info), /* page_id_parent */ + getHierarchy(info), /* hierarchy */ + info.isWork, /* is_work_profile */ + 0, /* origin */ + getCardinality(info), /* cardinality */ + info.widget.spanX, + info.widget.spanY, + getFeatures(info), + getAttributes(info), /* attributes */ + ) + } + + private fun getAttributes(itemInfo: LauncherAtom.ItemInfo): ByteArray = + LauncherAttributes.newBuilder() + .apply { itemInfo.itemAttributesList.forEach { addItemAttributes(it.number) } } + .build() + .toByteArray() + + /** + * Builds [StatsEvent] from [LauncherAtom.ItemInfo]. Used for pulled atom callback + * implementation. + */ + @JvmStatic + fun buildStatsEvent(info: LauncherAtom.ItemInfo, instanceId: InstanceId?): StatsEvent { + return SysUiStatsLog.buildStatsEvent( + SysUiStatsLog.LAUNCHER_LAYOUT_SNAPSHOT, // atom ID, + LAUNCHER_WORKSPACE_SNAPSHOT.id, // event_id = 1; + info.itemCase.number, // item_id = 2; + instanceId?.id ?: 0, // instance_id = 3; + 0, // uid = 4 [(is_uid) = true]; + getPackageName(info), // package_name = 5; + getComponentName(info), // component_name = 6; + getGridX(info, false), // grid_x = 7 [default = -1]; + getGridY(info, false), // grid_y = 8 [default = -1]; + getPageId(info), // page_id = 9 [default = -2]; + getGridX(info, true), // grid_x_parent = 10 [default = -1]; + getGridY(info, true), // grid_y_parent = 11 [default = -1]; + getParentPageId(info), // page_id_parent = 12 [default = -2]; + getHierarchy(info), // container_id = 13; + info.isWork, // is_work_profile = 14; + 0, // attribute_id = 15; + getCardinality(info), // cardinality = 16; + info.widget.spanX, // span_x = 17 [default = 1]; + info.widget.spanY, // span_y = 18 [default = 1]; + getAttributes(info), /* attributes = 19 [(log_mode) = MODE_BYTES] */ + info.isKidsMode, /* is_kids_mode = 20 */ + ) + } + + private fun getCardinality(info: LauncherAtom.ItemInfo): Int { + if (Utilities.isRunningInTestHarness()) return 0 + + when (info.containerInfo.containerCase) { + PREDICTED_HOTSEAT_CONTAINER -> + return info.containerInfo.predictedHotseatContainer.cardinality + TASK_BAR_CONTAINER -> return info.containerInfo.taskBarContainer.cardinality + SEARCH_RESULT_CONTAINER -> + return info.containerInfo.searchResultContainer.queryLength + EXTENDED_CONTAINERS -> { + val extendedCont = info.containerInfo.extendedContainers + if (extendedCont.containerCase == DEVICE_SEARCH_RESULT_CONTAINER) { + val deviceSearchResultCont = extendedCont.deviceSearchResultContainer + return if (deviceSearchResultCont.hasQueryLength()) + deviceSearchResultCont.queryLength + else -1 + } + return when (info.itemCase) { + FOLDER_ICON -> info.folderIcon.cardinality + TASK_VIEW -> info.taskView.cardinality + else -> 0 + } + } + + else -> + return when (info.itemCase) { + FOLDER_ICON -> info.folderIcon.cardinality + TASK_VIEW -> info.taskView.cardinality + else -> 0 + } + } + } + + private fun getPackageName(info: LauncherAtom.ItemInfo): String? = + when (info.itemCase) { + APPLICATION -> info.application.packageName + SHORTCUT -> info.shortcut.shortcutName + WIDGET -> info.widget.packageName + TASK -> info.task.packageName + SEARCH_ACTION_ITEM -> info.searchActionItem.packageName + else -> null + } + + private fun getComponentName(info: LauncherAtom.ItemInfo): String? = + when (info.itemCase) { + APPLICATION -> info.application.componentName + SHORTCUT -> info.shortcut.shortcutName + WIDGET -> info.widget.componentName + TASK -> info.task.componentName + TASK_VIEW -> info.taskView.componentName + SEARCH_ACTION_ITEM -> info.searchActionItem.title + SLICE -> info.slice.uri + else -> null + } + + private fun getGridX(info: LauncherAtom.ItemInfo, parent: Boolean): Int { + val containerInfo = info.containerInfo + return if (containerInfo.containerCase == FOLDER) { + if (parent) { + containerInfo.folder.workspace.gridX + } else { + containerInfo.folder.gridX + } + } else if (containerInfo.containerCase == EXTENDED_CONTAINERS) { + containerInfo.extendedContainers.deviceSearchResultContainer.gridX + } else { + containerInfo.workspace.gridX + } + } + + private fun getGridY(info: LauncherAtom.ItemInfo, parent: Boolean): Int = + if (info.containerInfo.containerCase == FOLDER) { + if (parent) { + info.containerInfo.folder.workspace.gridY + } else { + info.containerInfo.folder.gridY + } + } else { + info.containerInfo.workspace.gridY + } + + private fun getPageId(info: LauncherAtom.ItemInfo): Int = + when (info.itemCase) { + TASK -> info.task.index + TASK_VIEW -> info.taskView.index + else -> getPageIdFromContainerInfo(info.containerInfo) + } + + private fun getPageIdFromContainerInfo(containerInfo: ContainerInfo): Int = + when (containerInfo.containerCase) { + FOLDER -> containerInfo.folder.pageIndex + HOTSEAT -> containerInfo.hotseat.index + PREDICTED_HOTSEAT_CONTAINER -> containerInfo.predictedHotseatContainer.index + TASK_BAR_CONTAINER -> containerInfo.taskBarContainer.index + else -> containerInfo.workspace.pageIndex + } + + private fun getParentPageId(info: LauncherAtom.ItemInfo): Int = + info.containerInfo.run { + when { + containerCase == FOLDER && + folder.parentContainerCase == ParentContainerCase.HOTSEAT -> + folder.hotseat.index + + containerCase == FOLDER -> folder.workspace.pageIndex + containerCase == SEARCH_RESULT_CONTAINER -> + searchResultContainer.workspace.pageIndex + + else -> workspace.pageIndex + } + } + + private fun getHierarchy(info: LauncherAtom.ItemInfo): Int { + if (Utilities.isRunningInTestHarness()) return 0 + + return info.containerInfo.run { + when (containerCase) { + FOLDER -> folder.parentContainerCase.number + FOLDER_HIERARCHY_OFFSET + SEARCH_RESULT_CONTAINER -> + searchResultContainer.parentContainerCase.number + + SEARCH_RESULT_HIERARCHY_OFFSET + EXTENDED_CONTAINERS -> + extendedContainers.containerCase.number + + EXTENDED_CONTAINERS_HIERARCHY_OFFSET + ALL_APPS_CONTAINER -> + allAppsContainer.parentContainerCase.number + ALL_APPS_HIERARCHY_OFFSET + else -> containerCase.number + } + } + } + + private fun getStateString(state: Int): String = + when (state) { + SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__BACKGROUND -> "BACKGROUND" + SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__HOME -> "HOME" + SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__OVERVIEW -> "OVERVIEW" + SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__ALLAPPS -> "ALLAPPS" + else -> "INVALID" + } + + private fun getFeatures(info: LauncherAtom.ItemInfo): Int = + when (info.itemCase) { + WIDGET -> info.widget.widgetFeatures + TASK_VIEW -> info.taskView.type + else -> 0 + } + + private fun getSearchAttributes(info: LauncherAtom.ItemInfo): Int { + if (Utilities.isRunningInTestHarness()) return 0 + + val containerInfo = info.containerInfo + if ( + containerInfo.containerCase == EXTENDED_CONTAINERS && + (containerInfo.extendedContainers.containerCase == + DEVICE_SEARCH_RESULT_CONTAINER) && + containerInfo.extendedContainers.deviceSearchResultContainer + .hasSearchAttributes() + ) { + return searchAttributesToInt( + containerInfo.extendedContainers.deviceSearchResultContainer.searchAttributes + ) + } + return 0 + } + + private fun searchAttributesToInt(searchAttributes: SearchAttributes): Int { + var response = 0 + if (searchAttributes.correctedQuery) + response = response or SEARCH_ATTRIBUTES_CORRECTED_QUERY + + if (searchAttributes.directMatch) response = response or SEARCH_ATTRIBUTES_DIRECT_MATCH + + response = + response or + when (searchAttributes.entryState) { + ALL_APPS -> SEARCH_ATTRIBUTES_ENTRY_STATE_ALL_APPS + QSB -> SEARCH_ATTRIBUTES_ENTRY_STATE_QSB + OVERVIEW -> SEARCH_ATTRIBUTES_ENTRY_STATE_OVERVIEW + TASKBAR -> SEARCH_ATTRIBUTES_ENTRY_STATE_TASKBAR + else -> 0 + } + + return response + } + } +} diff --git a/quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt b/quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt index ec04cb767d7..becdbead82f 100644 --- a/quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt +++ b/quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt @@ -37,8 +37,8 @@ import android.widget.LinearLayout import androidx.annotation.VisibleForTesting import androidx.core.util.component1 import androidx.core.util.component2 +import androidx.core.view.updateLayoutParams import com.android.launcher3.DeviceProfile -import com.android.launcher3.Flags import com.android.launcher3.LauncherAnimUtils import com.android.launcher3.R import com.android.launcher3.Utilities @@ -47,15 +47,16 @@ import com.android.launcher3.touch.PagedOrientationHandler.ChildBounds import com.android.launcher3.touch.PagedOrientationHandler.Float2DAction import com.android.launcher3.touch.PagedOrientationHandler.Int2DAction import com.android.launcher3.touch.SingleAxisSwipeDetector +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED import com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption import com.android.launcher3.util.SplitConfigurationOptions.StagePosition import com.android.launcher3.views.BaseDragLayer import com.android.quickstep.views.IconAppChipView +import com.android.wm.shell.shared.split.SplitBounds import kotlin.math.max open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { @@ -82,9 +83,9 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun fixBoundsForHomeAnimStartRect(outStartRect: RectF, deviceProfile: DeviceProfile) { // We don't need to check the "top" value here because the startRect is in the orientation // of the app, not of the fixed portrait launcher. - if (outStartRect.left > deviceProfile.heightPx) { + if (outStartRect.left > deviceProfile.deviceProperties.heightPx) { outStartRect.offsetTo(0f, outStartRect.top) - } else if (outStartRect.left < -deviceProfile.heightPx) { + } else if (outStartRect.left < -deviceProfile.deviceProperties.heightPx) { outStartRect.offsetTo(0f, outStartRect.top) } } @@ -102,7 +103,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { target: T, action: Int2DAction, primaryParam: Int, - secondaryParam: Int + secondaryParam: Int, ) = action.call(target, secondaryParam, primaryParam) override fun getPrimaryDirection(event: MotionEvent, pointerIndex: Int): Float = @@ -117,6 +118,8 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun getPrimarySize(rect: RectF): Float = rect.height() + override fun getSecondarySize(rect: RectF): Float = rect.width() + override fun getStart(rect: RectF): Float = rect.top override fun getEnd(rect: RectF): Float = rect.bottom @@ -170,7 +173,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun getSplitTranslationDirectionFactor( stagePosition: Int, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Int = if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) -1 else 1 override fun getTaskMenuX( @@ -178,8 +181,13 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { thumbnailView: View, deviceProfile: DeviceProfile, taskInsetMargin: Float, - taskViewIcon: View - ): Float = thumbnailView.measuredWidth + x - taskInsetMargin + taskViewIcon: View, + ): Float = + if (enableOverviewIconMenu()) { + x + (taskViewIcon as IconAppChipView).menuToCollapsedChipGap + } else { + thumbnailView.measuredWidth + x - taskInsetMargin + } override fun getTaskMenuY( y: Float, @@ -187,8 +195,13 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { stagePosition: Int, taskMenuView: View, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float { + if (enableOverviewIconMenu()) { + val marginStart = (taskViewIcon as IconAppChipView).backgroundMarginTopStart + return if (taskMenuView.isLayoutRtl) y - marginStart else y + marginStart + } + val layoutParams = taskMenuView.layoutParams as BaseDragLayer.LayoutParams var taskMenuY = y + taskInsetMargin @@ -199,13 +212,19 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { return taskMenuY } + override fun getAppChipMenuMarginX(appChipView: IconAppChipView, isRtl: Boolean): Int = + appChipView.menuToCollapsedChipGap + + override fun getAppChipMenuMarginY(appChipView: IconAppChipView, isRtl: Boolean): Int = + if (isRtl) appChipView.backgroundMarginTopStart else -appChipView.backgroundMarginTopStart + override fun getTaskMenuWidth( thumbnailView: View, deviceProfile: DeviceProfile, - @StagePosition stagePosition: Int + @StagePosition stagePosition: Int, ): Int = when { - Flags.enableOverviewIconMenu() -> + enableOverviewIconMenu() -> thumbnailView.resources.getDimensionPixelSize( R.dimen.task_thumbnail_icon_menu_expanded_width ) @@ -217,14 +236,14 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { taskInsetMargin: Float, deviceProfile: DeviceProfile, taskMenuX: Float, - taskMenuY: Float + taskMenuY: Float, ): Int = (taskMenuX - taskInsetMargin).toInt() override fun setTaskOptionsMenuLayoutOrientation( deviceProfile: DeviceProfile, taskMenuLayout: LinearLayout, dividerSpacing: Int, - dividerDrawable: ShapeDrawable + dividerDrawable: ShapeDrawable, ) { taskMenuLayout.orientation = LinearLayout.VERTICAL dividerDrawable.intrinsicHeight = dividerSpacing @@ -234,7 +253,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun setLayoutParamsForTaskMenuOptionItem( lp: LinearLayout.LayoutParams, viewGroup: LinearLayout, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ) { // Phone fake landscape viewGroup.orientation = LinearLayout.HORIZONTAL @@ -242,49 +261,54 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { lp.height = ViewGroup.LayoutParams.WRAP_CONTENT } - override fun getDwbLayoutTranslations( + override fun updateDwbBannerLayout( taskViewWidth: Int, taskViewHeight: Int, - splitBounds: SplitBounds?, + isGroupedTaskView: Boolean, deviceProfile: DeviceProfile, - thumbnailViews: Array, - desiredTaskId: Int, - banner: View - ): Pair { - val snapshotParams = thumbnailViews[0].layoutParams as FrameLayout.LayoutParams - val isRtl = banner.layoutDirection == View.LAYOUT_DIRECTION_RTL - val translationX = banner.height.toFloat() - - val bannerParams = banner.layoutParams as FrameLayout.LayoutParams - bannerParams.gravity = Gravity.TOP or if (isRtl) Gravity.END else Gravity.START + snapshotViewWidth: Int, + snapshotViewHeight: Int, + banner: View, + ) { banner.pivotX = 0f banner.pivotY = 0f banner.rotation = degreesRotated - - if (splitBounds == null) { - // Single, fullscreen case - bannerParams.width = taskViewHeight - snapshotParams.topMargin - return Pair(translationX, snapshotParams.topMargin.toFloat()) + banner.updateLayoutParams { + gravity = Gravity.TOP or if (banner.isLayoutRtl) Gravity.END else Gravity.START + width = + if (isGroupedTaskView) { + snapshotViewHeight + } else { + taskViewHeight - deviceProfile.overviewProfile.taskThumbnailTopMarginPx + } } + } - // Set correct width and translations + override fun getDwbBannerTranslations( + taskViewWidth: Int, + taskViewHeight: Int, + splitBounds: SplitBounds?, + deviceProfile: DeviceProfile, + thumbnailViews: Array, + desiredTaskId: Int, + banner: View, + ): Pair { + val snapshotParams = thumbnailViews[0].layoutParams as ViewGroup.MarginLayoutParams + val translationX = banner.height.toFloat() val translationY: Float - if (desiredTaskId == splitBounds.leftTopTaskId) { - bannerParams.width = thumbnailViews[0].measuredHeight + if (splitBounds == null) { translationY = snapshotParams.topMargin.toFloat() } else { - bannerParams.width = thumbnailViews[1].measuredHeight - val topLeftTaskPlusDividerPercent = - if (splitBounds.appsStackedVertically) { - splitBounds.topTaskPercent + splitBounds.dividerHeightPercent - } else { - splitBounds.leftTaskPercent + splitBounds.dividerWidthPercent - } - translationY = - snapshotParams.topMargin + - (taskViewHeight - snapshotParams.topMargin) * topLeftTaskPlusDividerPercent + if (desiredTaskId == splitBounds.leftTopTaskId) { + translationY = snapshotParams.topMargin.toFloat() + } else { + val topLeftTaskPlusDividerPercent = + splitBounds.leftTopTaskPercent + splitBounds.dividerPercent + translationY = + snapshotParams.topMargin + + (taskViewHeight - snapshotParams.topMargin) * topLeftTaskPlusDividerPercent + } } - return Pair(translationX, translationY) } @@ -296,17 +320,46 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { if (isRtl) SingleAxisSwipeDetector.DIRECTION_NEGATIVE else SingleAxisSwipeDetector.DIRECTION_POSITIVE + override fun getDownDirection(isRtl: Boolean): Int = + if (isRtl) SingleAxisSwipeDetector.DIRECTION_POSITIVE + else SingleAxisSwipeDetector.DIRECTION_NEGATIVE + override fun isGoingUp(displacement: Float, isRtl: Boolean): Boolean = if (isRtl) displacement < 0 else displacement > 0 override fun getTaskDragDisplacementFactor(isRtl: Boolean): Int = if (isRtl) 1 else -1 + + override fun getTaskDismissVerticalDirection(): Int = 1 + + override fun getTaskDismissLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + secondaryDimension - taskThumbnailBounds.left + + override fun getTaskLaunchLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + taskThumbnailBounds.left + + override fun extendRectForPrimaryTranslation(rect: Rect, translation: Int) { + if (translation < 0) { + rect.top += translation + } else { + rect.bottom += translation + } + } + + override fun extendRectForSecondaryTranslation(rect: Rect, translation: Int) { + if (translation < 0) { + rect.left += translation + } else { + rect.right += translation + } + } + /* -------------------- */ override fun getChildBounds( child: View, childStart: Int, pageCenter: Int, - layoutChild: Boolean + layoutChild: Boolean, ): ChildBounds { val childHeight = child.measuredHeight val childWidth = child.measuredWidth @@ -327,7 +380,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, STAGE_POSITION_TOP_OR_LEFT, - STAGE_TYPE_MAIN + STAGE_TYPE_MAIN, ) ) @@ -336,19 +389,19 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { placeholderInset: Int, dp: DeviceProfile, @StagePosition stagePosition: Int, - out: Rect + out: Rect, ) { // In fake land/seascape, the placeholder always needs to go to the "top" of the device, // which is the same bounds as 0 rotation. - val width = dp.widthPx + val width = dp.deviceProperties.widthPx val insetSizeAdjustment = getPlaceholderSizeAdjustment(dp) out.set(0, 0, width, placeholderHeight + insetSizeAdjustment) out.inset(placeholderInset, 0) // Adjust the top to account for content off screen. This will help to animate the view in // with rounded corners. - val screenWidth = dp.widthPx - val screenHeight = dp.heightPx + val screenWidth = dp.deviceProperties.widthPx + val screenHeight = dp.deviceProperties.heightPx val totalHeight = (1.0f * screenHeight / 2 * (screenWidth - 2 * placeholderInset) / screenWidth).toInt() out.top -= totalHeight - placeholderHeight @@ -363,7 +416,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { drawableWidth: Int, drawableHeight: Int, dp: DeviceProfile, - @StagePosition stagePosition: Int + @StagePosition stagePosition: Int, ) { val insetAdjustment = getPlaceholderSizeAdjustment(dp) / 2f out.x = (onScreenRectCenterX / fullscreenScaleX - 1.0f * drawableWidth / 2) @@ -382,7 +435,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { out: View, dp: DeviceProfile, splitInstructionsHeight: Int, - splitInstructionsWidth: Int + splitInstructionsWidth: Int, ) { out.pivotX = 0f out.pivotY = splitInstructionsHeight.toFloat() @@ -410,11 +463,11 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { dp: DeviceProfile, @StagePosition stagePosition: Int, out1: Rect, - out2: Rect + out2: Rect, ) { // In fake land/seascape, the window bounds are always top and bottom half - val screenHeight = dp.heightPx - val screenWidth = dp.widthPx + val screenHeight = dp.deviceProperties.heightPx + val screenWidth = dp.deviceProperties.widthPx out1.set(0, 0, screenWidth, screenHeight / 2 - splitDividerSize) out2.set(0, screenHeight / 2 + splitDividerSize, screenWidth, screenHeight) } @@ -423,17 +476,10 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { dp: DeviceProfile, outRect: Rect, splitInfo: SplitBounds, - desiredStagePosition: Int + desiredStagePosition: Int, ) { - val topLeftTaskPercent: Float - val dividerBarPercent: Float - if (splitInfo.appsStackedVertically) { - topLeftTaskPercent = splitInfo.topTaskPercent - dividerBarPercent = splitInfo.dividerHeightPercent - } else { - topLeftTaskPercent = splitInfo.leftTaskPercent - dividerBarPercent = splitInfo.dividerWidthPercent - } + val topLeftTaskPercent = splitInfo.leftTopTaskPercent + val dividerBarPercent = splitInfo.dividerPercent if (desiredStagePosition == STAGE_POSITION_TOP_OR_LEFT) { outRect.bottom = outRect.top + (outRect.height() * topLeftTaskPercent).toInt() @@ -442,6 +488,10 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { } } + /** + * @param inSplitSelection Whether user currently has a task from this task group staged for + * split screen. Currently this state is not reachable in fake landscape. + */ override fun measureGroupedTaskViewThumbnailBounds( primarySnapshot: View, secondarySnapshot: View, @@ -449,18 +499,19 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { parentHeight: Int, splitBoundsConfig: SplitBounds, dp: DeviceProfile, - isRtl: Boolean + isRtl: Boolean, + inSplitSelection: Boolean, ) { val primaryParams = primarySnapshot.layoutParams as FrameLayout.LayoutParams val secondaryParams = secondarySnapshot.layoutParams as FrameLayout.LayoutParams // Swap the margins that are set in TaskView#setRecentsOrientedState() - secondaryParams.topMargin = dp.overviewTaskThumbnailTopMarginPx + secondaryParams.topMargin = dp.overviewProfile.taskThumbnailTopMarginPx primaryParams.topMargin = 0 // Measure and layout the thumbnails bottom up, since the primary is on the visual left // (portrait bottom) and secondary is on the right (portrait top) - val spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx + val spaceAboveSnapshot = dp.overviewProfile.taskThumbnailTopMarginPx val totalThumbnailHeight = parentHeight - spaceAboveSnapshot val dividerBar = getDividerBarSize(totalThumbnailHeight, splitBoundsConfig) @@ -470,13 +521,13 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { primarySnapshot.translationY = spaceAboveSnapshot.toFloat() primarySnapshot.measure( MeasureSpec.makeMeasureSpec(taskViewFirst.x, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(taskViewFirst.y, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(taskViewFirst.y, MeasureSpec.EXACTLY), ) val translationY = taskViewFirst.y + spaceAboveSnapshot + dividerBar secondarySnapshot.translationY = (translationY - spaceAboveSnapshot).toFloat() secondarySnapshot.measure( MeasureSpec.makeMeasureSpec(taskViewSecond.x, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(taskViewSecond.y, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(taskViewSecond.y, MeasureSpec.EXACTLY), ) } @@ -484,18 +535,13 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { dp: DeviceProfile, splitBoundsConfig: SplitBounds, parentWidth: Int, - parentHeight: Int + parentHeight: Int, ): Pair { - val spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx + val spaceAboveSnapshot = dp.overviewProfile.taskThumbnailTopMarginPx val totalThumbnailHeight = parentHeight - spaceAboveSnapshot val dividerBar = getDividerBarSize(totalThumbnailHeight, splitBoundsConfig) - val taskPercent = - if (splitBoundsConfig.appsStackedVertically) { - splitBoundsConfig.topTaskPercent - } else { - splitBoundsConfig.leftTaskPercent - } + val taskPercent = splitBoundsConfig.leftTopTaskPercent val firstTaskViewSize = Point(parentWidth, (totalThumbnailHeight * taskPercent).toInt()) val secondTaskViewSize = Point(parentWidth, totalThumbnailHeight - firstTaskViewSize.y - dividerBar) @@ -507,7 +553,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { taskIconMargin: Int, taskIconHeight: Int, thumbnailTopMargin: Int, - isRtl: Boolean + isRtl: Boolean, ) { iconParams.gravity = if (isRtl) { @@ -523,7 +569,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun setIconAppChipChildrenParams( iconParams: FrameLayout.LayoutParams, - chipChildMarginStart: Int + chipChildMarginStart: Int, ) { iconParams.gravity = Gravity.START or Gravity.CENTER_VERTICAL iconParams.marginStart = chipChildMarginStart @@ -534,7 +580,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { iconAppChipView: IconAppChipView, iconMenuParams: FrameLayout.LayoutParams, iconMenuMargin: Int, - thumbnailTopMargin: Int + thumbnailTopMargin: Int, ) { val isRtl = iconAppChipView.layoutDirection == View.LAYOUT_DIRECTION_RTL @@ -558,6 +604,10 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { iconAppChipView.setRotation(degreesRotated) } + /** + * @param inSplitSelection Whether user currently has a task from this task group staged for + * split screen. Currently this state is not reachable in fake landscape. + */ override fun setSplitIconParams( primaryIconView: View, secondaryIconView: View, @@ -568,9 +618,11 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { groupedTaskViewWidth: Int, isRtl: Boolean, deviceProfile: DeviceProfile, - splitConfig: SplitBounds + splitConfig: SplitBounds, + inSplitSelection: Boolean, + oneIconHiddenDueToSmallWidth: Boolean, ) { - val spaceAboveSnapshot = deviceProfile.overviewTaskThumbnailTopMarginPx + val spaceAboveSnapshot = deviceProfile.overviewProfile.taskThumbnailTopMarginPx val totalThumbnailHeight = groupedTaskViewHeight - spaceAboveSnapshot val dividerBar: Int = getDividerBarSize(totalThumbnailHeight, splitConfig) @@ -580,8 +632,9 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { primarySnapshotHeight, totalThumbnailHeight, isRtl, - deviceProfile.overviewTaskMarginPx, - dividerBar + deviceProfile.overviewProfile.taskMarginPx, + dividerBar, + oneIconHiddenDueToSmallWidth, ) updateSplitIconsPosition(primaryIconView, topLeftY, isRtl) @@ -595,20 +648,20 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun getSplitSelectTaskOffset( primary: FloatProperty, secondary: FloatProperty, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Pair, FloatProperty> = Pair(primary, secondary) override fun getFloatingTaskOffscreenTranslationTarget( floatingTask: View, onScreenRect: RectF, @StagePosition stagePosition: Int, - dp: DeviceProfile + dp: DeviceProfile, ): Float = floatingTask.translationY - onScreenRect.height() override fun setFloatingTaskPrimaryTranslation( floatingTask: View, translation: Float, - dp: DeviceProfile + dp: DeviceProfile, ) { floatingTask.translationY = translation } @@ -638,19 +691,29 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { isRtl: Boolean, overviewTaskMarginPx: Int, dividerSize: Int, + oneIconHiddenDueToSmallWidth: Boolean, ): SplitIconPositions { - return if (Flags.enableOverviewIconMenu()) { + return if (enableOverviewIconMenu()) { if (isRtl) { - SplitIconPositions(0, -(totalThumbnailHeight - primarySnapshotHeight)) + SplitIconPositions(-(totalThumbnailHeight - primarySnapshotHeight), 0) } else { SplitIconPositions(0, primarySnapshotHeight + dividerSize) } } else { - val topLeftY = primarySnapshotHeight + overviewTaskMarginPx - SplitIconPositions( - topLeftY = topLeftY, - bottomRightY = topLeftY + dividerSize + taskIconHeight - ) + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerY = + primarySnapshotHeight + + overviewTaskMarginPx + + ((taskIconHeight + dividerSize) / 2) + SplitIconPositions(topLeftY = centerY, bottomRightY = centerY) + } else { + val topLeftY = primarySnapshotHeight + overviewTaskMarginPx + SplitIconPositions( + topLeftY = topLeftY, + bottomRightY = topLeftY + dividerSize + taskIconHeight, + ) + } } } @@ -666,7 +729,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { open fun updateSplitIconsPosition(iconView: View, translationY: Int, isRtl: Boolean) { val layoutParams = iconView.layoutParams as FrameLayout.LayoutParams - if (Flags.enableOverviewIconMenu()) { + if (enableOverviewIconMenu()) { val appChipView = iconView as IconAppChipView layoutParams.gravity = if (isRtl) Gravity.BOTTOM or Gravity.START else Gravity.TOP or Gravity.END @@ -690,11 +753,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { * @return The divider size for the group task view. */ protected fun getDividerBarSize(totalThumbnailHeight: Int, splitConfig: SplitBounds): Int { - return Math.round( - totalThumbnailHeight * - if (splitConfig.appsStackedVertically) splitConfig.dividerHeightPercent - else splitConfig.dividerWidthPercent - ) + return Math.round(totalThumbnailHeight * splitConfig.dividerPercent) } /** diff --git a/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.java b/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.java deleted file mode 100644 index eeacee1cf61..00000000000 --- a/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.java +++ /dev/null @@ -1,820 +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.quickstep.orientation; - -import static android.view.Gravity.BOTTOM; -import static android.view.Gravity.CENTER_HORIZONTAL; -import static android.view.Gravity.END; -import static android.view.Gravity.START; -import static android.view.Gravity.TOP; -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; -import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; - -import static com.android.launcher3.Flags.enableOverviewIconMenu; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y; -import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN; - -import android.graphics.Matrix; -import android.graphics.Point; -import android.graphics.PointF; -import android.graphics.Rect; -import android.graphics.RectF; -import android.graphics.drawable.ShapeDrawable; -import android.util.FloatProperty; -import android.util.Pair; -import android.view.Gravity; -import android.view.Surface; -import android.view.View; -import android.widget.FrameLayout; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.logger.LauncherAtom; -import com.android.launcher3.touch.DefaultPagedViewHandler; -import com.android.launcher3.touch.SingleAxisSwipeDetector; -import com.android.launcher3.util.SplitConfigurationOptions; -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; -import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; -import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import com.android.quickstep.views.IconAppChipView; - -import java.util.ArrayList; -import java.util.List; - -public class PortraitPagedViewHandler extends DefaultPagedViewHandler implements - RecentsPagedOrientationHandler { - - private final Matrix mTmpMatrix = new Matrix(); - private final RectF mTmpRectF = new RectF(); - - @Override - public T getPrimaryValue(T x, T y) { - return x; - } - - @Override - public T getSecondaryValue(T x, T y) { - return y; - } - - @Override - public boolean isLayoutNaturalToLauncher() { - return true; - } - - @Override - public void adjustFloatingIconStartVelocity(PointF velocity) { - //no-op - } - - @Override - public void fixBoundsForHomeAnimStartRect(RectF outStartRect, DeviceProfile deviceProfile) { - if (outStartRect.left > deviceProfile.widthPx) { - outStartRect.offsetTo(0, outStartRect.top); - } else if (outStartRect.left < -deviceProfile.widthPx) { - outStartRect.offsetTo(0, outStartRect.top); - } - } - - @Override - public void setSecondary(T target, Float2DAction action, float param) { - action.call(target, 0, param); - } - - @Override - public void set(T target, Int2DAction action, int primaryParam, - int secondaryParam) { - action.call(target, primaryParam, secondaryParam); - } - - @Override - public int getPrimarySize(View view) { - return view.getWidth(); - } - - @Override - public float getPrimarySize(RectF rect) { - return rect.width(); - } - - @Override - public float getStart(RectF rect) { - return rect.left; - } - - @Override - public float getEnd(RectF rect) { - return rect.right; - } - - @Override - public void rotateInsets(@NonNull Rect insets, @NonNull Rect outInsets) { - outInsets.set(insets); - } - - @Override - public int getClearAllSidePadding(View view, boolean isRtl) { - return (isRtl ? view.getPaddingRight() : - view.getPaddingLeft()) / 2; - } - - @Override - public int getSecondaryDimension(View view) { - return view.getHeight(); - } - - @Override - public FloatProperty getPrimaryViewTranslate() { - return VIEW_TRANSLATE_X; - } - - @Override - public FloatProperty getSecondaryViewTranslate() { - return VIEW_TRANSLATE_Y; - } - - @Override - public float getDegreesRotated() { - return 0; - } - - @Override - public int getRotation() { - return Surface.ROTATION_0; - } - - @Override - public void setPrimaryScale(View view, float scale) { - view.setScaleX(scale); - } - - @Override - public void setSecondaryScale(View view, float scale) { - view.setScaleY(scale); - } - - public int getSecondaryTranslationDirectionFactor() { - return -1; - } - - @Override - public int getSplitTranslationDirectionFactor(int stagePosition, DeviceProfile deviceProfile) { - if (deviceProfile.isLeftRightSplit && stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) { - return -1; - } else { - return 1; - } - } - - @Override - public float getTaskMenuX(float x, View thumbnailView, - DeviceProfile deviceProfile, float taskInsetMargin, View taskViewIcon) { - if (deviceProfile.isLandscape) { - return x + taskInsetMargin - + (thumbnailView.getMeasuredWidth() - thumbnailView.getMeasuredHeight()) / 2f; - } else { - return x + taskInsetMargin; - } - } - - @Override - public float getTaskMenuY(float y, View thumbnailView, int stagePosition, - View taskMenuView, float taskInsetMargin, View taskViewIcon) { - return y + taskInsetMargin; - } - - @Override - public int getTaskMenuWidth(View thumbnailView, DeviceProfile deviceProfile, - @StagePosition int stagePosition) { - if (enableOverviewIconMenu()) { - return thumbnailView.getResources().getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_expanded_width); - } - int padding = thumbnailView.getResources() - .getDimensionPixelSize(R.dimen.task_menu_edge_padding); - return (deviceProfile.isLandscape && !deviceProfile.isTablet - ? thumbnailView.getMeasuredHeight() - : thumbnailView.getMeasuredWidth()) - (2 * padding); - } - - @Override - public int getTaskMenuHeight(float taskInsetMargin, DeviceProfile deviceProfile, - float taskMenuX, float taskMenuY) { - return (int) (deviceProfile.heightPx - deviceProfile.getInsets().top - taskMenuY - - deviceProfile.getOverviewActionsClaimedSpaceBelow()); - } - - @Override - public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile, - LinearLayout taskMenuLayout, int dividerSpacing, - ShapeDrawable dividerDrawable) { - taskMenuLayout.setOrientation(LinearLayout.VERTICAL); - dividerDrawable.setIntrinsicHeight(dividerSpacing); - taskMenuLayout.setDividerDrawable(dividerDrawable); - } - - @Override - public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp, - LinearLayout viewGroup, DeviceProfile deviceProfile) { - viewGroup.setOrientation(LinearLayout.HORIZONTAL); - lp.width = LinearLayout.LayoutParams.MATCH_PARENT; - lp.height = WRAP_CONTENT; - } - - @Override - public Pair getDwbLayoutTranslations(int taskViewWidth, - int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile, - View[] thumbnailViews, int desiredTaskId, View banner) { - float translationX = 0; - float translationY = 0; - FrameLayout.LayoutParams bannerParams = (FrameLayout.LayoutParams) banner.getLayoutParams(); - banner.setPivotX(0); - banner.setPivotY(0); - banner.setRotation(getDegreesRotated()); - if (splitBounds == null) { - // Single, fullscreen case - bannerParams.width = MATCH_PARENT; - bannerParams.gravity = BOTTOM | CENTER_HORIZONTAL; - return new Pair<>(translationX, translationY); - } - - bannerParams.gravity = - BOTTOM | (deviceProfile.isLeftRightSplit ? START : CENTER_HORIZONTAL); - - // Set correct width - if (desiredTaskId == splitBounds.leftTopTaskId) { - bannerParams.width = thumbnailViews[0].getMeasuredWidth(); - } else { - bannerParams.width = thumbnailViews[1].getMeasuredWidth(); - } - - // Set translations - if (deviceProfile.isLeftRightSplit) { - if (desiredTaskId == splitBounds.rightBottomTaskId) { - float leftTopTaskPercent = splitBounds.appsStackedVertically - ? splitBounds.topTaskPercent - : splitBounds.leftTaskPercent; - float dividerThicknessPercent = splitBounds.appsStackedVertically - ? splitBounds.dividerHeightPercent - : splitBounds.dividerWidthPercent; - translationX = ((taskViewWidth * leftTopTaskPercent) - + (taskViewWidth * dividerThicknessPercent)); - } - } else { - if (desiredTaskId == splitBounds.leftTopTaskId) { - FrameLayout.LayoutParams snapshotParams = - (FrameLayout.LayoutParams) thumbnailViews[0] - .getLayoutParams(); - float bottomRightTaskPlusDividerPercent = splitBounds.appsStackedVertically - ? (1f - splitBounds.topTaskPercent) - : (1f - splitBounds.leftTaskPercent); - translationY = -((taskViewHeight - snapshotParams.topMargin) - * bottomRightTaskPlusDividerPercent); - } - } - return new Pair<>(translationX, translationY); - } - - /* ---------- The following are only used by TaskViewTouchHandler. ---------- */ - - @Override - public SingleAxisSwipeDetector.Direction getUpDownSwipeDirection() { - return VERTICAL; - } - - @Override - public int getUpDirection(boolean isRtl) { - // Ignore rtl since it only affects X value displacement, Y displacement doesn't change - return SingleAxisSwipeDetector.DIRECTION_POSITIVE; - } - - @Override - public boolean isGoingUp(float displacement, boolean isRtl) { - // Ignore rtl since it only affects X value displacement, Y displacement doesn't change - return displacement < 0; - } - - @Override - public int getTaskDragDisplacementFactor(boolean isRtl) { - // Ignore rtl since it only affects X value displacement, Y displacement doesn't change - return 1; - } - - /* -------------------- */ - @Override - public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) { - return dp.heightPx - rect.bottom; - } - - @Override - public List getSplitPositionOptions(DeviceProfile dp) { - if (dp.isTablet) { - return Utilities.getSplitPositionOptions(dp); - } - - List options = new ArrayList<>(); - if (dp.isSeascape()) { - options.add(new SplitPositionOption( - R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, - STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN)); - } else if (dp.isLeftRightSplit) { - options.add(new SplitPositionOption( - R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, - STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); - } else { - // Only add top option - options.add(new SplitPositionOption( - R.drawable.ic_split_vertical, R.string.recent_task_option_split_screen, - STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); - } - return options; - } - - @Override - public void getInitialSplitPlaceholderBounds(int placeholderHeight, int placeholderInset, - DeviceProfile dp, @StagePosition int stagePosition, Rect out) { - int screenWidth = dp.widthPx; - int screenHeight = dp.heightPx; - boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT; - int insetSizeAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight); - - out.set(0, 0, screenWidth, placeholderHeight + insetSizeAdjustment); - if (!dp.isLeftRightSplit) { - // portrait, phone or tablet - spans width of screen, nothing else to do - out.inset(placeholderInset, 0); - - // Adjust the top to account for content off screen. This will help to animate the view - // in with rounded corners. - int totalHeight = (int) (1.0f * screenHeight / 2 * (screenWidth - 2 * placeholderInset) - / screenWidth); - out.top -= (totalHeight - placeholderHeight); - return; - } - - // Now we rotate the portrait rect depending on what side we want pinned - - float postRotateScale = (float) screenHeight / screenWidth; - mTmpMatrix.reset(); - mTmpMatrix.postRotate(pinToRight ? 90 : 270); - mTmpMatrix.postTranslate(pinToRight ? screenWidth : 0, pinToRight ? 0 : screenWidth); - // The placeholder height stays constant after rotation, so we don't change width scale - mTmpMatrix.postScale(1, postRotateScale); - - mTmpRectF.set(out); - mTmpMatrix.mapRect(mTmpRectF); - mTmpRectF.inset(0, placeholderInset); - mTmpRectF.roundOut(out); - - // Adjust the top to account for content off screen. This will help to animate the view in - // with rounded corners. - int totalWidth = (int) (1.0f * screenWidth / 2 * (screenHeight - 2 * placeholderInset) - / screenHeight); - int width = out.width(); - if (pinToRight) { - out.right += totalWidth - width; - } else { - out.left -= totalWidth - width; - } - } - - @Override - public void updateSplitIconParams(View out, float onScreenRectCenterX, - float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY, - int drawableWidth, int drawableHeight, DeviceProfile dp, - @StagePosition int stagePosition) { - boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT; - float insetAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight) / 2f; - if (!dp.isLeftRightSplit) { - out.setX(onScreenRectCenterX / fullscreenScaleX - - 1.0f * drawableWidth / 2); - out.setY((onScreenRectCenterY + insetAdjustment) / fullscreenScaleY - - 1.0f * drawableHeight / 2); - } else { - if (pinToRight) { - out.setX((onScreenRectCenterX - insetAdjustment) / fullscreenScaleX - - 1.0f * drawableWidth / 2); - } else { - out.setX((onScreenRectCenterX + insetAdjustment) / fullscreenScaleX - - 1.0f * drawableWidth / 2); - } - out.setY(onScreenRectCenterY / fullscreenScaleY - - 1.0f * drawableHeight / 2); - } - } - - /** - * The split placeholder comes with a default inset to buffer the icon from the top of the - * screen. But if the device already has a large inset (from cutouts etc), use that instead. - */ - private int getPlaceholderSizeAdjustment(DeviceProfile dp, boolean pinToRight) { - int insetThickness; - if (!dp.isLandscape) { - insetThickness = dp.getInsets().top; - } else { - insetThickness = pinToRight ? dp.getInsets().right : dp.getInsets().left; - } - return Math.max(insetThickness - dp.splitPlaceholderInset, 0); - } - - @Override - public void setSplitInstructionsParams(View out, DeviceProfile dp, int splitInstructionsHeight, - int splitInstructionsWidth) { - out.setPivotX(0); - out.setPivotY(splitInstructionsHeight); - out.setRotation(getDegreesRotated()); - int distanceToEdge; - if (dp.isPhone) { - if (dp.isLandscape) { - distanceToEdge = out.getResources().getDimensionPixelSize( - R.dimen.split_instructions_bottom_margin_phone_landscape); - } else { - distanceToEdge = out.getResources().getDimensionPixelSize( - R.dimen.split_instructions_bottom_margin_phone_portrait); - } - } else { - distanceToEdge = dp.getOverviewActionsClaimedSpaceBelow(); - } - - // Center the view in case of unbalanced insets on left or right of screen - int insetCorrectionX = (dp.getInsets().right - dp.getInsets().left) / 2; - // Adjust for any insets on the bottom edge - int insetCorrectionY = dp.getInsets().bottom; - out.setTranslationX(insetCorrectionX); - out.setTranslationY(-distanceToEdge + insetCorrectionY); - FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) out.getLayoutParams(); - lp.gravity = CENTER_HORIZONTAL | BOTTOM; - out.setLayoutParams(lp); - } - - @Override - public void getFinalSplitPlaceholderBounds(int splitDividerSize, DeviceProfile dp, - @StagePosition int stagePosition, Rect out1, Rect out2) { - int screenHeight = dp.heightPx; - int screenWidth = dp.widthPx; - out1.set(0, 0, screenWidth, screenHeight / 2 - splitDividerSize); - out2.set(0, screenHeight / 2 + splitDividerSize, screenWidth, screenHeight); - if (!dp.isLeftRightSplit) { - // Portrait - the window bounds are always top and bottom half - return; - } - - // Now we rotate the portrait rect depending on what side we want pinned - boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT; - float postRotateScale = (float) screenHeight / screenWidth; - - mTmpMatrix.reset(); - mTmpMatrix.postRotate(pinToRight ? 90 : 270); - mTmpMatrix.postTranslate(pinToRight ? screenHeight : 0, pinToRight ? 0 : screenWidth); - mTmpMatrix.postScale(1 / postRotateScale, postRotateScale); - - mTmpRectF.set(out1); - mTmpMatrix.mapRect(mTmpRectF); - mTmpRectF.roundOut(out1); - - mTmpRectF.set(out2); - mTmpMatrix.mapRect(mTmpRectF); - mTmpRectF.roundOut(out2); - } - - @Override - public void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect, - SplitBounds splitInfo, int desiredStagePosition) { - float topLeftTaskPercent = splitInfo.appsStackedVertically - ? splitInfo.topTaskPercent - : splitInfo.leftTaskPercent; - float dividerBarPercent = splitInfo.appsStackedVertically - ? splitInfo.dividerHeightPercent - : splitInfo.dividerWidthPercent; - - int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight; - float scale = (float) outRect.height() / (dp.availableHeightPx - taskbarHeight); - float topTaskHeight = dp.availableHeightPx * topLeftTaskPercent; - float scaledTopTaskHeight = topTaskHeight * scale; - float dividerHeight = dp.availableHeightPx * dividerBarPercent; - float scaledDividerHeight = dividerHeight * scale; - - if (desiredStagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) { - if (dp.isLeftRightSplit) { - outRect.right = outRect.left + Math.round(outRect.width() * topLeftTaskPercent); - } else { - outRect.bottom = Math.round(outRect.top + scaledTopTaskHeight); - } - } else { - if (dp.isLeftRightSplit) { - outRect.left += Math.round(outRect.width() - * (topLeftTaskPercent + dividerBarPercent)); - } else { - outRect.top += Math.round(scaledTopTaskHeight + scaledDividerHeight); - } - } - } - - @Override - public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot, - int parentWidth, int parentHeight, SplitBounds splitBoundsConfig, - DeviceProfile dp, boolean isRtl) { - int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx; - int totalThumbnailHeight = parentHeight - spaceAboveSnapshot; - float dividerScale = splitBoundsConfig.appsStackedVertically - ? splitBoundsConfig.dividerHeightPercent - : splitBoundsConfig.dividerWidthPercent; - Pair taskViewSizes = - getGroupedTaskViewSizes(dp, splitBoundsConfig, parentWidth, parentHeight); - if (dp.isLeftRightSplit) { - int scaledDividerBar = Math.round(parentWidth * dividerScale); - if (isRtl) { - int translationX = taskViewSizes.second.x + scaledDividerBar; - primarySnapshot.setTranslationX(-translationX); - secondarySnapshot.setTranslationX(0); - } else { - int translationX = taskViewSizes.first.x + scaledDividerBar; - secondarySnapshot.setTranslationX(translationX); - primarySnapshot.setTranslationX(0); - } - secondarySnapshot.setTranslationY(spaceAboveSnapshot); - - // Reset unused translations - primarySnapshot.setTranslationY(0); - } else { - float finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale); - float translationY = taskViewSizes.first.y + spaceAboveSnapshot + finalDividerHeight; - secondarySnapshot.setTranslationY(translationY); - - FrameLayout.LayoutParams primaryParams = - (FrameLayout.LayoutParams) primarySnapshot.getLayoutParams(); - FrameLayout.LayoutParams secondaryParams = - (FrameLayout.LayoutParams) secondarySnapshot.getLayoutParams(); - secondaryParams.topMargin = 0; - primaryParams.topMargin = spaceAboveSnapshot; - - // Reset unused translations - primarySnapshot.setTranslationY(0); - secondarySnapshot.setTranslationX(0); - primarySnapshot.setTranslationX(0); - } - primarySnapshot.measure( - View.MeasureSpec.makeMeasureSpec(taskViewSizes.first.x, View.MeasureSpec.EXACTLY), - View.MeasureSpec.makeMeasureSpec(taskViewSizes.first.y, View.MeasureSpec.EXACTLY)); - secondarySnapshot.measure( - View.MeasureSpec.makeMeasureSpec(taskViewSizes.second.x, View.MeasureSpec.EXACTLY), - View.MeasureSpec.makeMeasureSpec(taskViewSizes.second.y, - View.MeasureSpec.EXACTLY)); - primarySnapshot.setScaleX(1); - secondarySnapshot.setScaleX(1); - primarySnapshot.setScaleY(1); - secondarySnapshot.setScaleY(1); - } - - @Override - public Pair getGroupedTaskViewSizes( - DeviceProfile dp, - SplitBounds splitBoundsConfig, - int parentWidth, - int parentHeight) { - int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx; - int totalThumbnailHeight = parentHeight - spaceAboveSnapshot; - float dividerScale = splitBoundsConfig.appsStackedVertically - ? splitBoundsConfig.dividerHeightPercent - : splitBoundsConfig.dividerWidthPercent; - float taskPercent = splitBoundsConfig.appsStackedVertically - ? splitBoundsConfig.topTaskPercent - : splitBoundsConfig.leftTaskPercent; - - Point firstTaskViewSize = new Point(); - Point secondTaskViewSize = new Point(); - - if (dp.isLeftRightSplit) { - int scaledDividerBar = Math.round(parentWidth * dividerScale); - firstTaskViewSize.x = Math.round(parentWidth * taskPercent); - firstTaskViewSize.y = totalThumbnailHeight; - - secondTaskViewSize.x = parentWidth - firstTaskViewSize.x - scaledDividerBar; - secondTaskViewSize.y = totalThumbnailHeight; - } else { - int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight; - float scale = (float) totalThumbnailHeight / (dp.availableHeightPx - taskbarHeight); - float topTaskHeight = dp.availableHeightPx * taskPercent; - float finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale); - float scaledTopTaskHeight = topTaskHeight * scale; - firstTaskViewSize.x = parentWidth; - firstTaskViewSize.y = Math.round(scaledTopTaskHeight); - - secondTaskViewSize.x = parentWidth; - secondTaskViewSize.y = Math.round(totalThumbnailHeight - firstTaskViewSize.y - - finalDividerHeight); - } - - return new Pair<>(firstTaskViewSize, secondTaskViewSize); - } - - @Override - public void setTaskIconParams(FrameLayout.LayoutParams iconParams, int taskIconMargin, - int taskIconHeight, int thumbnailTopMargin, boolean isRtl) { - iconParams.gravity = TOP | CENTER_HORIZONTAL; - // Reset margins, since they may have been set on rotation - iconParams.leftMargin = iconParams.rightMargin = 0; - iconParams.topMargin = iconParams.bottomMargin = 0; - } - - @Override - public void setIconAppChipChildrenParams(FrameLayout.LayoutParams iconParams, - int chipChildMarginStart) { - iconParams.setMarginStart(chipChildMarginStart); - iconParams.gravity = Gravity.START | Gravity.CENTER_VERTICAL; - iconParams.topMargin = 0; - } - - @Override - public void setIconAppChipMenuParams(IconAppChipView iconAppChipView, - FrameLayout.LayoutParams iconMenuParams, int iconMenuMargin, int thumbnailTopMargin) { - iconMenuParams.gravity = TOP | START; - iconMenuParams.setMarginStart(iconMenuMargin); - iconMenuParams.topMargin = thumbnailTopMargin; - iconMenuParams.bottomMargin = 0; - iconMenuParams.setMarginEnd(0); - - iconAppChipView.setPivotX(0); - iconAppChipView.setPivotY(0); - iconAppChipView.setSplitTranslationY(0); - iconAppChipView.setRotation(getDegreesRotated()); - } - - @Override - public void setSplitIconParams(View primaryIconView, View secondaryIconView, - int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight, - int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl, - DeviceProfile deviceProfile, SplitBounds splitConfig) { - FrameLayout.LayoutParams primaryIconParams = - (FrameLayout.LayoutParams) primaryIconView.getLayoutParams(); - FrameLayout.LayoutParams secondaryIconParams = enableOverviewIconMenu() - ? (FrameLayout.LayoutParams) secondaryIconView.getLayoutParams() - : new FrameLayout.LayoutParams(primaryIconParams); - - if (enableOverviewIconMenu()) { - IconAppChipView primaryAppChipView = (IconAppChipView) primaryIconView; - IconAppChipView secondaryAppChipView = (IconAppChipView) secondaryIconView; - primaryIconParams.gravity = TOP | START; - secondaryIconParams.gravity = TOP | START; - secondaryIconParams.topMargin = primaryIconParams.topMargin; - secondaryIconParams.setMarginStart(primaryIconParams.getMarginStart()); - if (deviceProfile.isLeftRightSplit) { - if (isRtl) { - int secondarySnapshotWidth = groupedTaskViewWidth - primarySnapshotWidth; - primaryAppChipView.setSplitTranslationX(-secondarySnapshotWidth); - } else { - secondaryAppChipView.setSplitTranslationX(primarySnapshotWidth); - } - } else { - primaryAppChipView.setSplitTranslationX(0); - secondaryAppChipView.setSplitTranslationX(0); - int dividerThickness = Math.min(splitConfig.visualDividerBounds.width(), - splitConfig.visualDividerBounds.height()); - secondaryAppChipView.setSplitTranslationY( - primarySnapshotHeight + (deviceProfile.isTablet ? 0 : dividerThickness)); - } - } else if (deviceProfile.isLeftRightSplit) { - // We calculate the "midpoint" of the thumbnail area, and place the icons there. - // This is the place where the thumbnail area splits by default, in a near-50/50 split. - // It is usually not exactly 50/50, due to insets/screen cutouts. - int fullscreenInsetThickness = deviceProfile.isSeascape() - ? deviceProfile.getInsets().right - : deviceProfile.getInsets().left; - int fullscreenMidpointFromBottom = ((deviceProfile.widthPx - - fullscreenInsetThickness) / 2); - float midpointFromEndPct = (float) fullscreenMidpointFromBottom - / deviceProfile.widthPx; - float insetPct = (float) fullscreenInsetThickness / deviceProfile.widthPx; - int spaceAboveSnapshots = 0; - int overviewThumbnailAreaThickness = groupedTaskViewWidth - spaceAboveSnapshots; - int bottomToMidpointOffset = (int) (overviewThumbnailAreaThickness - * midpointFromEndPct); - int insetOffset = (int) (overviewThumbnailAreaThickness * insetPct); - - if (deviceProfile.isSeascape()) { - primaryIconParams.gravity = TOP | (isRtl ? END : START); - secondaryIconParams.gravity = TOP | (isRtl ? END : START); - if (splitConfig.initiatedFromSeascape) { - // if the split was initiated from seascape, - // the task on the right (secondary) is slightly larger - primaryIconView.setTranslationX(bottomToMidpointOffset - taskIconHeight); - secondaryIconView.setTranslationX(bottomToMidpointOffset); - } else { - // if not, - // the task on the left (primary) is slightly larger - primaryIconView.setTranslationX(bottomToMidpointOffset + insetOffset - - taskIconHeight); - secondaryIconView.setTranslationX(bottomToMidpointOffset + insetOffset); - } - } else { - primaryIconParams.gravity = TOP | (isRtl ? START : END); - secondaryIconParams.gravity = TOP | (isRtl ? START : END); - if (!splitConfig.initiatedFromSeascape) { - // if the split was initiated from landscape, - // the task on the left (primary) is slightly larger - primaryIconView.setTranslationX(-bottomToMidpointOffset); - secondaryIconView.setTranslationX(-bottomToMidpointOffset + taskIconHeight); - } else { - // if not, - // the task on the right (secondary) is slightly larger - primaryIconView.setTranslationX(-bottomToMidpointOffset - insetOffset); - secondaryIconView.setTranslationX(-bottomToMidpointOffset - insetOffset - + taskIconHeight); - } - } - } else { - primaryIconParams.gravity = TOP | CENTER_HORIZONTAL; - // shifts icon half a width left (height is used here since icons are square) - primaryIconView.setTranslationX(-(taskIconHeight / 2f)); - secondaryIconParams.gravity = TOP | CENTER_HORIZONTAL; - secondaryIconView.setTranslationX(taskIconHeight / 2f); - } - if (!enableOverviewIconMenu()) { - primaryIconView.setTranslationY(0); - secondaryIconView.setTranslationY(0); - } - - primaryIconView.setLayoutParams(primaryIconParams); - secondaryIconView.setLayoutParams(secondaryIconParams); - } - - @Override - public int getDefaultSplitPosition(DeviceProfile deviceProfile) { - if (!deviceProfile.isTablet) { - throw new IllegalStateException("Default position available only for large screens"); - } - if (deviceProfile.isLeftRightSplit) { - return STAGE_POSITION_BOTTOM_OR_RIGHT; - } else { - return STAGE_POSITION_TOP_OR_LEFT; - } - } - - @Override - public Pair getSplitSelectTaskOffset(FloatProperty primary, - FloatProperty secondary, DeviceProfile deviceProfile) { - if (deviceProfile.isLeftRightSplit) { // or seascape - return new Pair<>(primary, secondary); - } else { - return new Pair<>(secondary, primary); - } - } - - @Override - public float getFloatingTaskOffscreenTranslationTarget(View floatingTask, RectF onScreenRect, - @StagePosition int stagePosition, DeviceProfile dp) { - if (dp.isLeftRightSplit) { - float currentTranslationX = floatingTask.getTranslationX(); - return stagePosition == STAGE_POSITION_TOP_OR_LEFT - ? currentTranslationX - onScreenRect.width() - : currentTranslationX + onScreenRect.width(); - } else { - float currentTranslationY = floatingTask.getTranslationY(); - return currentTranslationY - onScreenRect.height(); - } - } - - @Override - public void setFloatingTaskPrimaryTranslation(View floatingTask, float translation, - DeviceProfile dp) { - if (dp.isLeftRightSplit) { - floatingTask.setTranslationX(translation); - } else { - floatingTask.setTranslationY(translation); - } - - } - - @Override - public float getFloatingTaskPrimaryTranslation(View floatingTask, DeviceProfile dp) { - return dp.isLeftRightSplit - ? floatingTask.getTranslationX() - : floatingTask.getTranslationY(); - } - - @NonNull - @Override - public LauncherAtom.TaskSwitcherContainer.OrientationHandler getHandlerTypeForLogging() { - return LauncherAtom.TaskSwitcherContainer.OrientationHandler.PORTRAIT; - } -} diff --git a/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.kt b/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.kt new file mode 100644 index 00000000000..a51beead061 --- /dev/null +++ b/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.kt @@ -0,0 +1,962 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.orientation + +import android.graphics.Matrix +import android.graphics.Point +import android.graphics.PointF +import android.graphics.Rect +import android.graphics.RectF +import android.graphics.drawable.ShapeDrawable +import android.util.FloatProperty +import android.util.Pair +import android.view.Gravity +import android.view.Surface +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import android.widget.LinearLayout +import androidx.core.view.updateLayoutParams +import com.android.launcher3.DeviceProfile +import com.android.launcher3.LauncherAnimUtils +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.logger.LauncherAtom +import com.android.launcher3.touch.DefaultPagedViewHandler +import com.android.launcher3.touch.PagedOrientationHandler.Float2DAction +import com.android.launcher3.touch.PagedOrientationHandler.Int2DAction +import com.android.launcher3.touch.SingleAxisSwipeDetector +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption +import com.android.launcher3.util.SplitConfigurationOptions.StagePosition +import com.android.quickstep.views.IconAppChipView +import com.android.wm.shell.shared.split.SplitBounds +import kotlin.math.max +import kotlin.math.min + +class PortraitPagedViewHandler : DefaultPagedViewHandler(), RecentsPagedOrientationHandler { + private val tmpMatrix = Matrix() + private val tmpRectF = RectF() + + override fun getPrimaryValue(x: T, y: T): T = x + + override fun getSecondaryValue(x: T, y: T): T = y + + override val isLayoutNaturalToLauncher: Boolean = true + + override fun adjustFloatingIconStartVelocity(velocity: PointF) { + // no-op + } + + override fun fixBoundsForHomeAnimStartRect(outStartRect: RectF, deviceProfile: DeviceProfile) { + if (outStartRect.left > deviceProfile.deviceProperties.widthPx) { + outStartRect.offsetTo(0f, outStartRect.top) + } else if (outStartRect.left < -deviceProfile.deviceProperties.widthPx) { + outStartRect.offsetTo(0f, outStartRect.top) + } + } + + override fun setSecondary(target: T, action: Float2DAction, param: Float) = + action.call(target, 0f, param) + + override fun set( + target: T, + action: Int2DAction, + primaryParam: Int, + secondaryParam: Int, + ) = action.call(target, primaryParam, secondaryParam) + + override fun getPrimarySize(view: View): Int = view.width + + override fun getPrimarySize(rect: RectF): Float = rect.width() + + override fun getSecondarySize(rect: RectF): Float = rect.height() + + override fun getStart(rect: RectF): Float = rect.left + + override fun getEnd(rect: RectF): Float = rect.right + + override fun rotateInsets(insets: Rect, outInsets: Rect) = outInsets.set(insets) + + override fun getClearAllSidePadding(view: View, isRtl: Boolean): Int = + (if (isRtl) view.paddingRight else -view.paddingLeft) / 2 + + override fun getSecondaryDimension(view: View): Int = view.height + + override val primaryViewTranslate: FloatProperty = LauncherAnimUtils.VIEW_TRANSLATE_X + + override val secondaryViewTranslate: FloatProperty = LauncherAnimUtils.VIEW_TRANSLATE_Y + + override val degreesRotated: Float = 0f + + override val rotation: Int = Surface.ROTATION_0 + + override fun setPrimaryScale(view: View, scale: Float) { + view.scaleX = scale + } + + override fun setSecondaryScale(view: View, scale: Float) { + view.scaleY = scale + } + + override val secondaryTranslationDirectionFactor: Int + get() = -1 + + override fun getSplitTranslationDirectionFactor( + stagePosition: Int, + deviceProfile: DeviceProfile, + ): Int = + if ( + deviceProfile.isLeftRightSplit && + stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + ) { + -1 + } else { + 1 + } + + override fun getTaskMenuX( + x: Float, + thumbnailView: View, + deviceProfile: DeviceProfile, + taskInsetMargin: Float, + taskViewIcon: View, + ): Float = + if (enableOverviewIconMenu()) { + x + } else { + if (deviceProfile.deviceProperties.isLandscape) { + (x + + taskInsetMargin + + (thumbnailView.measuredWidth - thumbnailView.measuredHeight) / 2f) + } else { + x + taskInsetMargin + } + } + + override fun getTaskMenuY( + y: Float, + thumbnailView: View, + stagePosition: Int, + taskMenuView: View, + taskInsetMargin: Float, + taskViewIcon: View, + ): Float = + if (enableOverviewIconMenu()) { + taskViewIcon as IconAppChipView + y - taskViewIcon.menuToCollapsedChipGap + } else { + y + taskInsetMargin + } + + override fun getAppChipMenuMarginX(appChipView: IconAppChipView, isRtl: Boolean): Int = + if (isRtl) -appChipView.backgroundMarginTopStart else appChipView.backgroundMarginTopStart + + override fun getAppChipMenuMarginY(appChipView: IconAppChipView, isRtl: Boolean): Int = + appChipView.menuToCollapsedChipGap + + override fun getTaskMenuWidth( + thumbnailView: View, + deviceProfile: DeviceProfile, + @StagePosition stagePosition: Int, + ): Int = + when { + enableOverviewIconMenu() -> { + thumbnailView.resources.getDimensionPixelSize( + R.dimen.task_thumbnail_icon_menu_expanded_width + ) + } + + (deviceProfile.deviceProperties.isLandscape && + !deviceProfile.deviceProperties.isTablet) -> { + val padding = + thumbnailView.resources.getDimensionPixelSize(R.dimen.task_menu_edge_padding) + thumbnailView.measuredHeight - (2 * padding) + } + + else -> { + val padding = + thumbnailView.resources.getDimensionPixelSize(R.dimen.task_menu_edge_padding) + thumbnailView.measuredWidth - (2 * padding) + } + } + + override fun getTaskMenuHeight( + taskInsetMargin: Float, + deviceProfile: DeviceProfile, + taskMenuX: Float, + taskMenuY: Float, + ): Int = + deviceProfile.deviceProperties.heightPx - + deviceProfile.insets.top - + taskMenuY.toInt() - + deviceProfile.overviewActionsClaimedSpaceBelow + + override fun setTaskOptionsMenuLayoutOrientation( + deviceProfile: DeviceProfile, + taskMenuLayout: LinearLayout, + dividerSpacing: Int, + dividerDrawable: ShapeDrawable, + ) { + taskMenuLayout.orientation = LinearLayout.VERTICAL + dividerDrawable.intrinsicHeight = dividerSpacing + taskMenuLayout.dividerDrawable = dividerDrawable + } + + override fun setLayoutParamsForTaskMenuOptionItem( + lp: LinearLayout.LayoutParams, + viewGroup: LinearLayout, + deviceProfile: DeviceProfile, + ) { + viewGroup.orientation = LinearLayout.HORIZONTAL + lp.width = LinearLayout.LayoutParams.MATCH_PARENT + lp.height = ViewGroup.LayoutParams.WRAP_CONTENT + } + + override fun updateDwbBannerLayout( + taskViewWidth: Int, + taskViewHeight: Int, + isGroupedTaskView: Boolean, + deviceProfile: DeviceProfile, + snapshotViewWidth: Int, + snapshotViewHeight: Int, + banner: View, + ) { + banner.pivotX = 0f + banner.pivotY = 0f + banner.rotation = degreesRotated + banner.updateLayoutParams { + if (isGroupedTaskView) { + gravity = + Gravity.BOTTOM or + (if (deviceProfile.isLeftRightSplit) Gravity.START + else Gravity.CENTER_HORIZONTAL) + width = snapshotViewWidth + } else { + width = ViewGroup.LayoutParams.MATCH_PARENT + gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL + } + } + } + + override fun getDwbBannerTranslations( + taskViewWidth: Int, + taskViewHeight: Int, + splitBounds: SplitBounds?, + deviceProfile: DeviceProfile, + thumbnailViews: Array, + desiredTaskId: Int, + banner: View, + ): Pair { + var translationX = 0f + var translationY = 0f + if (splitBounds != null) { + if (deviceProfile.isLeftRightSplit) { + if (desiredTaskId == splitBounds.rightBottomTaskId) { + val leftTopTaskPercent = splitBounds.leftTopTaskPercent + val dividerThicknessPercent = splitBounds.dividerPercent + translationX = + ((taskViewWidth * leftTopTaskPercent) + + (taskViewWidth * dividerThicknessPercent)) + } + } else { + if (desiredTaskId == splitBounds.leftTopTaskId) { + val snapshotParams = + thumbnailViews[0].layoutParams as ViewGroup.MarginLayoutParams + val bottomRightTaskPlusDividerPercent = + (splitBounds.rightBottomTaskPercent + splitBounds.dividerPercent) + translationY = + -((taskViewHeight - snapshotParams.topMargin) * + bottomRightTaskPlusDividerPercent) + } + } + } + return Pair(translationX, translationY) + } + + /* ---------- The following are only used by TaskViewTouchHandler. ---------- */ + + override val upDownSwipeDirection: SingleAxisSwipeDetector.Direction = + SingleAxisSwipeDetector.VERTICAL + + // Ignore rtl since it only affects X value displacement, Y displacement doesn't change + override fun getUpDirection(isRtl: Boolean): Int = SingleAxisSwipeDetector.DIRECTION_POSITIVE + + // Ignore rtl since it only affects X value displacement, Y displacement doesn't change + override fun getDownDirection(isRtl: Boolean): Int = SingleAxisSwipeDetector.DIRECTION_NEGATIVE + + // Ignore rtl since it only affects X value displacement, Y displacement doesn't change + override fun isGoingUp(displacement: Float, isRtl: Boolean): Boolean = displacement < 0 + + // Ignore rtl since it only affects X value displacement, Y displacement doesn't change + override fun getTaskDragDisplacementFactor(isRtl: Boolean): Int = 1 + + override fun getTaskDismissVerticalDirection(): Int = -1 + + override fun getTaskDismissLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + taskThumbnailBounds.bottom + + override fun getTaskLaunchLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + secondaryDimension - taskThumbnailBounds.bottom + + override fun extendRectForPrimaryTranslation(rect: Rect, translation: Int) { + if (translation < 0) { + rect.left += translation + } else { + rect.right += translation + } + } + + override fun extendRectForSecondaryTranslation(rect: Rect, translation: Int) { + if (translation < 0) { + rect.top += translation + } else { + rect.bottom += translation + } + } + + /* -------------------- */ + + override fun getDistanceToBottomOfRect(dp: DeviceProfile, rect: Rect): Int = + dp.deviceProperties.heightPx - rect.bottom + + override fun getSplitPositionOptions(dp: DeviceProfile): List = + when { + dp.deviceProperties.isTablet -> { + Utilities.getSplitPositionOptions(dp) + } + + dp.isSeascape -> { + listOf( + SplitPositionOption( + R.drawable.ic_split_horizontal, + R.string.recent_task_option_split_screen, + SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT, + SplitConfigurationOptions.STAGE_TYPE_MAIN, + ) + ) + } + + dp.isLeftRightSplit -> { + listOf( + SplitPositionOption( + R.drawable.ic_split_horizontal, + R.string.recent_task_option_split_screen, + SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT, + SplitConfigurationOptions.STAGE_TYPE_MAIN, + ) + ) + } + + else -> { + // Only add top option + listOf( + SplitPositionOption( + R.drawable.ic_split_vertical, + R.string.recent_task_option_split_screen, + SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT, + SplitConfigurationOptions.STAGE_TYPE_MAIN, + ) + ) + } + } + + override fun getInitialSplitPlaceholderBounds( + placeholderHeight: Int, + placeholderInset: Int, + dp: DeviceProfile, + @StagePosition stagePosition: Int, + out: Rect, + ) { + val screenWidth = dp.deviceProperties.widthPx + val screenHeight = dp.deviceProperties.heightPx + val pinToRight = stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + val insetSizeAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight) + + out.set(0, 0, screenWidth, placeholderHeight + insetSizeAdjustment) + if (!dp.isLeftRightSplit) { + // portrait, phone or tablet - spans width of screen, nothing else to do + out.inset(placeholderInset, 0) + + // Adjust the top to account for content off screen. This will help to animate the view + // in with rounded corners. + val totalHeight = + (1.0f * screenHeight / 2 * (screenWidth - 2 * placeholderInset) / screenWidth) + .toInt() + out.top -= (totalHeight - placeholderHeight) + return + } + + // Now we rotate the portrait rect depending on what side we want pinned + val postRotateScale = screenHeight.toFloat() / screenWidth + tmpMatrix.reset() + tmpMatrix.postRotate(if (pinToRight) 90f else 270f) + tmpMatrix.postTranslate( + (if (pinToRight) screenWidth else 0).toFloat(), + (if (pinToRight) 0 else screenWidth).toFloat(), + ) + // The placeholder height stays constant after rotation, so we don't change width scale + tmpMatrix.postScale(1f, postRotateScale) + + tmpRectF.set(out) + tmpMatrix.mapRect(tmpRectF) + tmpRectF.inset(0f, placeholderInset.toFloat()) + tmpRectF.roundOut(out) + + // Adjust the top to account for content off screen. This will help to animate the view in + // with rounded corners. + val totalWidth = + (1.0f * screenWidth / 2 * (screenHeight - 2 * placeholderInset) / screenHeight).toInt() + val width = out.width() + if (pinToRight) { + out.right += totalWidth - width + } else { + out.left -= totalWidth - width + } + } + + override fun updateSplitIconParams( + out: View, + onScreenRectCenterX: Float, + onScreenRectCenterY: Float, + fullscreenScaleX: Float, + fullscreenScaleY: Float, + drawableWidth: Int, + drawableHeight: Int, + dp: DeviceProfile, + @StagePosition stagePosition: Int, + ) { + val pinToRight = stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + val insetAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight) / 2f + if (!dp.isLeftRightSplit) { + out.x = (onScreenRectCenterX / fullscreenScaleX - 1.0f * drawableWidth / 2) + out.y = + ((onScreenRectCenterY + insetAdjustment) / fullscreenScaleY - + 1.0f * drawableHeight / 2) + } else { + if (pinToRight) { + out.x = + ((onScreenRectCenterX - insetAdjustment) / fullscreenScaleX - + 1.0f * drawableWidth / 2) + } else { + out.x = + ((onScreenRectCenterX + insetAdjustment) / fullscreenScaleX - + 1.0f * drawableWidth / 2) + } + out.y = (onScreenRectCenterY / fullscreenScaleY - 1.0f * drawableHeight / 2) + } + } + + /** + * The split placeholder comes with a default inset to buffer the icon from the top of the + * screen. But if the device already has a large inset (from cutouts etc), use that instead. + */ + private fun getPlaceholderSizeAdjustment(dp: DeviceProfile, pinToRight: Boolean): Int { + val insetThickness = + if (!dp.deviceProperties.isLandscape) { + dp.insets.top + } else { + if (pinToRight) dp.insets.right else dp.insets.left + } + return max((insetThickness - dp.splitPlaceholderInset).toDouble(), 0.0).toInt() + } + + override fun setSplitInstructionsParams( + out: View, + dp: DeviceProfile, + splitInstructionsHeight: Int, + splitInstructionsWidth: Int, + ) { + out.pivotX = 0f + out.pivotY = splitInstructionsHeight.toFloat() + out.rotation = degreesRotated + val distanceToEdge = + if (dp.deviceProperties.isPhone) { + if (dp.deviceProperties.isLandscape) { + out.resources.getDimensionPixelSize( + R.dimen.split_instructions_bottom_margin_phone_landscape + ) + } else { + out.resources.getDimensionPixelSize( + R.dimen.split_instructions_bottom_margin_phone_portrait + ) + } + } else { + dp.overviewActionsClaimedSpaceBelow + } + + // Center the view in case of unbalanced insets on left or right of screen + val insetCorrectionX = (dp.insets.right - dp.insets.left) / 2 + // Adjust for any insets on the bottom edge + val insetCorrectionY = dp.insets.bottom + out.translationX = insetCorrectionX.toFloat() + out.translationY = (-distanceToEdge + insetCorrectionY).toFloat() + val lp = out.layoutParams as FrameLayout.LayoutParams + lp.gravity = Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM + out.layoutParams = lp + } + + override fun getFinalSplitPlaceholderBounds( + splitDividerSize: Int, + dp: DeviceProfile, + @StagePosition stagePosition: Int, + out1: Rect, + out2: Rect, + ) { + val screenHeight = dp.deviceProperties.heightPx + val screenWidth = dp.deviceProperties.widthPx + out1.set(0, 0, screenWidth, screenHeight / 2 - splitDividerSize) + out2.set(0, screenHeight / 2 + splitDividerSize, screenWidth, screenHeight) + if (!dp.isLeftRightSplit) { + // Portrait - the window bounds are always top and bottom half + return + } + + // Now we rotate the portrait rect depending on what side we want pinned + val pinToRight = stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + val postRotateScale = screenHeight.toFloat() / screenWidth + + tmpMatrix.reset() + tmpMatrix.postRotate(if (pinToRight) 90f else 270f) + tmpMatrix.postTranslate( + (if (pinToRight) screenHeight else 0).toFloat(), + (if (pinToRight) 0 else screenWidth).toFloat(), + ) + tmpMatrix.postScale(1 / postRotateScale, postRotateScale) + + tmpRectF.set(out1) + tmpMatrix.mapRect(tmpRectF) + tmpRectF.roundOut(out1) + + tmpRectF.set(out2) + tmpMatrix.mapRect(tmpRectF) + tmpRectF.roundOut(out2) + } + + override fun setSplitTaskSwipeRect( + dp: DeviceProfile, + outRect: Rect, + splitInfo: SplitBounds, + desiredStagePosition: Int, + ) { + val topLeftTaskPercent = splitInfo.leftTopTaskPercent + val dividerBarPercent = splitInfo.dividerPercent + + val taskbarHeight = + if (dp.taskbarProfile.isTransientTaskbar) 0 else dp.taskbarProfile.height + val scale = + outRect.height().toFloat() / (dp.deviceProperties.availableHeightPx - taskbarHeight) + val topTaskHeight = dp.deviceProperties.availableHeightPx * topLeftTaskPercent + val scaledTopTaskHeight = topTaskHeight * scale + val dividerHeight = dp.deviceProperties.availableHeightPx * dividerBarPercent + val scaledDividerHeight = dividerHeight * scale + + if (desiredStagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) { + if (dp.isLeftRightSplit) { + outRect.right = outRect.left + Math.round(outRect.width() * topLeftTaskPercent) + } else { + outRect.bottom = Math.round(outRect.top + scaledTopTaskHeight) + } + } else { + if (dp.isLeftRightSplit) { + outRect.left += + Math.round(outRect.width() * (topLeftTaskPercent + dividerBarPercent)) + } else { + outRect.top += Math.round(scaledTopTaskHeight + scaledDividerHeight) + } + } + } + + /** + * @param inSplitSelection Whether user currently has a task from this task group staged for + * split screen. If true, we have custom translations/scaling in place for the remaining + * snapshot, so we'll skip setting translation/scale here. + */ + override fun measureGroupedTaskViewThumbnailBounds( + primarySnapshot: View, + secondarySnapshot: View, + parentWidth: Int, + parentHeight: Int, + splitBoundsConfig: SplitBounds, + dp: DeviceProfile, + isRtl: Boolean, + inSplitSelection: Boolean, + ) { + val spaceAboveSnapshot = dp.overviewProfile.taskThumbnailTopMarginPx + + val primaryParams = primarySnapshot.layoutParams as FrameLayout.LayoutParams + val secondaryParams = secondarySnapshot.layoutParams as FrameLayout.LayoutParams + + // Reset margins that aren't used in this method, but are used in other + // `RecentsPagedOrientationHandler` variants. + secondaryParams.topMargin = 0 + primaryParams.topMargin = spaceAboveSnapshot + + val totalThumbnailHeight = parentHeight - spaceAboveSnapshot + val dividerScale = splitBoundsConfig.dividerPercent + val taskViewSizes = + getGroupedTaskViewSizes(dp, splitBoundsConfig, parentWidth, parentHeight) + if (!inSplitSelection) { + // Reset translations that aren't used in this method, but are used in other + // `RecentsPagedOrientationHandler` variants. + primarySnapshot.translationY = 0f + + if (dp.isLeftRightSplit) { + val scaledDividerBar = Math.round(parentWidth * dividerScale) + if (isRtl) { + val translationX = taskViewSizes.second.x + scaledDividerBar + primarySnapshot.translationX = -translationX.toFloat() + secondarySnapshot.translationX = 0f + } else { + val translationX = taskViewSizes.first.x + scaledDividerBar + secondarySnapshot.translationX = translationX.toFloat() + primarySnapshot.translationX = 0f + } + secondarySnapshot.translationY = spaceAboveSnapshot.toFloat() + } else { + val finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale).toFloat() + val translationY = taskViewSizes.first.y + spaceAboveSnapshot + finalDividerHeight + secondarySnapshot.translationY = translationY + + // Reset unused translations. + secondarySnapshot.translationX = 0f + primarySnapshot.translationX = 0f + } + } + + primarySnapshot.measure( + View.MeasureSpec.makeMeasureSpec(taskViewSizes.first.x, View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(taskViewSizes.first.y, View.MeasureSpec.EXACTLY), + ) + secondarySnapshot.measure( + View.MeasureSpec.makeMeasureSpec(taskViewSizes.second.x, View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(taskViewSizes.second.y, View.MeasureSpec.EXACTLY), + ) + } + + override fun getGroupedTaskViewSizes( + dp: DeviceProfile, + splitBoundsConfig: SplitBounds, + parentWidth: Int, + parentHeight: Int, + ): Pair { + val spaceAboveSnapshot = dp.overviewProfile.taskThumbnailTopMarginPx + val totalThumbnailHeight = parentHeight - spaceAboveSnapshot + val dividerScale = splitBoundsConfig.dividerPercent + val taskPercent = splitBoundsConfig.leftTopTaskPercent + + val firstTaskViewSize = Point() + val secondTaskViewSize = Point() + + if (dp.isLeftRightSplit) { + val scaledDividerBar = Math.round(parentWidth * dividerScale) + firstTaskViewSize.x = Math.round(parentWidth * taskPercent) + firstTaskViewSize.y = totalThumbnailHeight + + secondTaskViewSize.x = parentWidth - firstTaskViewSize.x - scaledDividerBar + secondTaskViewSize.y = totalThumbnailHeight + } else { + val taskbarHeight = + if (dp.taskbarProfile.isTransientTaskbar) 0 else dp.taskbarProfile.height + val scale = + totalThumbnailHeight.toFloat() / + (dp.deviceProperties.availableHeightPx - taskbarHeight) + val topTaskHeight = dp.deviceProperties.availableHeightPx * taskPercent + val finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale).toFloat() + val scaledTopTaskHeight = topTaskHeight * scale + firstTaskViewSize.x = parentWidth + firstTaskViewSize.y = Math.round(scaledTopTaskHeight) + + secondTaskViewSize.x = parentWidth + secondTaskViewSize.y = + Math.round((totalThumbnailHeight - firstTaskViewSize.y - finalDividerHeight)) + } + + return Pair(firstTaskViewSize, secondTaskViewSize) + } + + override fun setTaskIconParams( + iconParams: FrameLayout.LayoutParams, + taskIconMargin: Int, + taskIconHeight: Int, + thumbnailTopMargin: Int, + isRtl: Boolean, + ) { + iconParams.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL + // Reset margins, since they may have been set on rotation + iconParams.rightMargin = 0 + iconParams.leftMargin = iconParams.rightMargin + iconParams.bottomMargin = 0 + iconParams.topMargin = iconParams.bottomMargin + } + + override fun setIconAppChipChildrenParams( + iconParams: FrameLayout.LayoutParams, + chipChildMarginStart: Int, + ) { + iconParams.marginStart = chipChildMarginStart + iconParams.gravity = Gravity.START or Gravity.CENTER_VERTICAL + iconParams.topMargin = 0 + } + + override fun setIconAppChipMenuParams( + iconAppChipView: IconAppChipView, + iconMenuParams: FrameLayout.LayoutParams, + iconMenuMargin: Int, + thumbnailTopMargin: Int, + ) { + iconMenuParams.gravity = Gravity.TOP or Gravity.START + iconMenuParams.marginStart = iconMenuMargin + iconMenuParams.topMargin = thumbnailTopMargin + iconMenuParams.bottomMargin = 0 + iconMenuParams.marginEnd = 0 + + iconAppChipView.pivotX = 0f + iconAppChipView.pivotY = 0f + iconAppChipView.setSplitTranslationY(0f) + iconAppChipView.rotation = degreesRotated + } + + /** + * @param inSplitSelection Whether user currently has a task from this task group staged for + * split screen. If true, we have custom translations in place for the remaining icon, so + * we'll skip setting translations here. + */ + override fun setSplitIconParams( + primaryIconView: View, + secondaryIconView: View, + taskIconHeight: Int, + primarySnapshotWidth: Int, + primarySnapshotHeight: Int, + groupedTaskViewHeight: Int, + groupedTaskViewWidth: Int, + isRtl: Boolean, + deviceProfile: DeviceProfile, + splitConfig: SplitBounds, + inSplitSelection: Boolean, + oneIconHiddenDueToSmallWidth: Boolean, + ) { + val primaryIconParams = primaryIconView.layoutParams as FrameLayout.LayoutParams + val secondaryIconParams = + if (enableOverviewIconMenu()) secondaryIconView.layoutParams as FrameLayout.LayoutParams + else FrameLayout.LayoutParams(primaryIconParams) + + if (enableOverviewIconMenu()) { + val primaryAppChipView = primaryIconView as IconAppChipView + val secondaryAppChipView = secondaryIconView as IconAppChipView + primaryIconParams.gravity = Gravity.TOP or Gravity.START + secondaryIconParams.gravity = Gravity.TOP or Gravity.START + secondaryIconParams.topMargin = primaryIconParams.topMargin + secondaryIconParams.marginStart = primaryIconParams.marginStart + if (!inSplitSelection) { + if (deviceProfile.isLeftRightSplit) { + if (isRtl) { + val secondarySnapshotWidth = groupedTaskViewWidth - primarySnapshotWidth + primaryAppChipView.setSplitTranslationX(-secondarySnapshotWidth.toFloat()) + } else { + val dividerSize = + Math.round(groupedTaskViewWidth * splitConfig.dividerPercent) + secondaryAppChipView.setSplitTranslationX( + primarySnapshotWidth.toFloat() + dividerSize + ) + } + } else { + primaryAppChipView.setSplitTranslationX(0f) + secondaryAppChipView.setSplitTranslationX(0f) + val dividerThickness = + min( + splitConfig.visualDividerBounds.width().toDouble(), + splitConfig.visualDividerBounds.height().toDouble(), + ) + .toInt() + secondaryAppChipView.setSplitTranslationY( + (primarySnapshotHeight + + (if (deviceProfile.deviceProperties.isTablet) 0 + else dividerThickness)) + .toFloat() + ) + } + } + } else if (deviceProfile.isLeftRightSplit) { + // We calculate the "midpoint" of the thumbnail area, and place the icons there. + // This is the place where the thumbnail area splits by default, in a near-50/50 split. + // It is usually not exactly 50/50, due to insets/screen cutouts. + val fullscreenInsetThickness = + if (deviceProfile.isSeascape) deviceProfile.insets.right + else deviceProfile.insets.left + val fullscreenMidpointFromBottom = + ((deviceProfile.deviceProperties.widthPx - fullscreenInsetThickness) / 2) + val midpointFromEndPct = + fullscreenMidpointFromBottom.toFloat() / deviceProfile.deviceProperties.widthPx + val insetPct = + fullscreenInsetThickness.toFloat() / deviceProfile.deviceProperties.widthPx + val spaceAboveSnapshots = 0 + val overviewThumbnailAreaThickness = groupedTaskViewWidth - spaceAboveSnapshots + val bottomToMidpointOffset = + (overviewThumbnailAreaThickness * midpointFromEndPct).toInt() + val insetOffset = (overviewThumbnailAreaThickness * insetPct).toInt() + + if (deviceProfile.isSeascape) { + primaryIconParams.gravity = + Gravity.TOP or (if (isRtl) Gravity.END else Gravity.START) + secondaryIconParams.gravity = + Gravity.TOP or (if (isRtl) Gravity.END else Gravity.START) + if (!inSplitSelection) { + if (splitConfig.initiatedFromSeascape) { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerX = bottomToMidpointOffset - (taskIconHeight / 2f) + primaryIconView.translationX = centerX + secondaryIconView.translationX = centerX + } else { + // the task on the right (secondary) is slightly larger + primaryIconView.translationX = + (bottomToMidpointOffset - taskIconHeight).toFloat() + secondaryIconView.translationX = bottomToMidpointOffset.toFloat() + } + } else { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerX = + bottomToMidpointOffset + insetOffset - (taskIconHeight / 2f) + primaryIconView.translationX = centerX + secondaryIconView.translationX = centerX + } else { + // the task on the left (primary) is slightly larger + primaryIconView.translationX = + (bottomToMidpointOffset + insetOffset - taskIconHeight).toFloat() + secondaryIconView.translationX = + (bottomToMidpointOffset + insetOffset).toFloat() + } + } + } + } else { + primaryIconParams.gravity = + Gravity.TOP or (if (isRtl) Gravity.START else Gravity.END) + secondaryIconParams.gravity = + Gravity.TOP or (if (isRtl) Gravity.START else Gravity.END) + if (!inSplitSelection) { + if (!splitConfig.initiatedFromSeascape) { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerX = -bottomToMidpointOffset + (taskIconHeight / 2f) + primaryIconView.translationX = centerX + secondaryIconView.translationX = centerX + } else { + // the task on the left (primary) is slightly larger + primaryIconView.translationX = -bottomToMidpointOffset.toFloat() + secondaryIconView.translationX = + (-bottomToMidpointOffset + taskIconHeight).toFloat() + } + } else { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerX = + -bottomToMidpointOffset - insetOffset + (taskIconHeight / 2f) + primaryIconView.translationX = centerX + secondaryIconView.translationX = centerX + } else { + // the task on the right (secondary) is slightly larger + primaryIconView.translationX = + (-bottomToMidpointOffset - insetOffset).toFloat() + secondaryIconView.translationX = + (-bottomToMidpointOffset - insetOffset + taskIconHeight).toFloat() + } + } + } + } + } else { + primaryIconParams.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL + secondaryIconParams.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL + if (!inSplitSelection) { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + primaryIconView.translationX = 0f + secondaryIconView.translationX = 0f + } else { + // shifts icon half a width left (height is used here since icons are square) + primaryIconView.translationX = -(taskIconHeight / 2f) + secondaryIconView.translationX = taskIconHeight / 2f + } + } + } + if (!enableOverviewIconMenu() && !inSplitSelection) { + primaryIconView.translationY = 0f + secondaryIconView.translationY = 0f + } + + primaryIconView.layoutParams = primaryIconParams + secondaryIconView.layoutParams = secondaryIconParams + } + + override fun getDefaultSplitPosition(deviceProfile: DeviceProfile): Int { + check(deviceProfile.deviceProperties.isTablet) { + "Default position available only for large screens" + } + return if (deviceProfile.isLeftRightSplit) { + SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + } else { + SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT + } + } + + override fun getSplitSelectTaskOffset( + primary: FloatProperty, + secondary: FloatProperty, + deviceProfile: DeviceProfile, + ): Pair, FloatProperty> = + if (deviceProfile.isLeftRightSplit) { // or seascape + Pair(primary, secondary) + } else { + Pair(secondary, primary) + } + + override fun getFloatingTaskOffscreenTranslationTarget( + floatingTask: View, + onScreenRect: RectF, + @StagePosition stagePosition: Int, + dp: DeviceProfile, + ): Float { + if (dp.isLeftRightSplit) { + val currentTranslationX = floatingTask.translationX + return if (stagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) + currentTranslationX - onScreenRect.width() + else currentTranslationX + onScreenRect.width() + } else { + val currentTranslationY = floatingTask.translationY + return currentTranslationY - onScreenRect.height() + } + } + + override fun setFloatingTaskPrimaryTranslation( + floatingTask: View, + translation: Float, + dp: DeviceProfile, + ) { + if (dp.isLeftRightSplit) { + floatingTask.translationX = translation + } else { + floatingTask.translationY = translation + } + } + + override fun getFloatingTaskPrimaryTranslation(floatingTask: View, dp: DeviceProfile): Float = + if (dp.isLeftRightSplit) floatingTask.translationX else floatingTask.translationY + + override fun getHandlerTypeForLogging(): LauncherAtom.TaskSwitcherContainer.OrientationHandler = + LauncherAtom.TaskSwitcherContainer.OrientationHandler.PORTRAIT +} diff --git a/quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.kt b/quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.kt index df4b03038f0..7313eebe8f7 100644 --- a/quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.kt +++ b/quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.kt @@ -31,10 +31,10 @@ import com.android.launcher3.touch.PagedOrientationHandler import com.android.launcher3.touch.PagedOrientationHandler.Float2DAction import com.android.launcher3.touch.PagedOrientationHandler.Int2DAction import com.android.launcher3.touch.SingleAxisSwipeDetector -import com.android.launcher3.util.SplitConfigurationOptions import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption import com.android.launcher3.util.SplitConfigurationOptions.StagePosition import com.android.quickstep.views.IconAppChipView +import com.android.wm.shell.shared.split.SplitBounds /** * Abstraction layer to separate horizontal and vertical specific implementations for @@ -50,6 +50,8 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { fun getPrimarySize(rect: RectF): Float + fun getSecondarySize(rect: RectF): Float + val secondaryTranslationDirectionFactor: Int val degreesRotated: Float @@ -82,13 +84,13 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { fun getSplitTranslationDirectionFactor( @StagePosition stagePosition: Int, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Int fun getSplitSelectTaskOffset( primary: FloatProperty, secondary: FloatProperty, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Pair, FloatProperty> fun getDistanceToBottomOfRect(dp: DeviceProfile, rect: Rect): Int @@ -101,7 +103,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { placeholderInset: Int, dp: DeviceProfile, @StagePosition stagePosition: Int, - out: Rect + out: Rect, ) /** @@ -128,7 +130,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { drawableWidth: Int, drawableHeight: Int, dp: DeviceProfile, - @StagePosition stagePosition: Int + @StagePosition stagePosition: Int, ) /** @@ -143,7 +145,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { out: View, dp: DeviceProfile, splitInstructionsHeight: Int, - splitInstructionsWidth: Int + splitInstructionsWidth: Int, ) /** @@ -159,7 +161,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { dp: DeviceProfile, @StagePosition stagePosition: Int, out1: Rect, - out2: Rect + out2: Rect, ) fun getDefaultSplitPosition(deviceProfile: DeviceProfile): Int @@ -173,8 +175,8 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { fun setSplitTaskSwipeRect( dp: DeviceProfile, outRect: Rect, - splitInfo: SplitConfigurationOptions.SplitBounds, - @StagePosition desiredStagePosition: Int + splitInfo: SplitBounds, + @StagePosition desiredStagePosition: Int, ) fun measureGroupedTaskViewThumbnailBounds( @@ -182,9 +184,10 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { secondarySnapshot: View, parentWidth: Int, parentHeight: Int, - splitBoundsConfig: SplitConfigurationOptions.SplitBounds, + splitBoundsConfig: SplitBounds, dp: DeviceProfile, - isRtl: Boolean + isRtl: Boolean, + inSplitSelection: Boolean, ) /** @@ -195,10 +198,11 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { */ fun getGroupedTaskViewSizes( dp: DeviceProfile, - splitBoundsConfig: SplitConfigurationOptions.SplitBounds, + splitBoundsConfig: SplitBounds, parentWidth: Int, - parentHeight: Int + parentHeight: Int, ): Pair + // Overview TaskMenuView methods /** Sets layout params on a task's app icon. Only use this when app chip is disabled. */ fun setTaskIconParams( @@ -206,7 +210,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { taskIconMargin: Int, taskIconHeight: Int, thumbnailTopMargin: Int, - isRtl: Boolean + isRtl: Boolean, ) /** @@ -214,14 +218,14 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { */ fun setIconAppChipChildrenParams( iconParams: FrameLayout.LayoutParams, - chipChildMarginStart: Int + chipChildMarginStart: Int, ) fun setIconAppChipMenuParams( iconAppChipView: IconAppChipView, iconMenuParams: FrameLayout.LayoutParams, iconMenuMargin: Int, - thumbnailTopMargin: Int + thumbnailTopMargin: Int, ) fun setSplitIconParams( @@ -234,7 +238,9 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { groupedTaskViewWidth: Int, isRtl: Boolean, deviceProfile: DeviceProfile, - splitConfig: SplitConfigurationOptions.SplitBounds + splitConfig: SplitBounds, + inSplitSelection: Boolean, + oneIconHiddenDueToSmallWidth: Boolean, ) /* @@ -248,7 +254,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { thumbnailView: View, deviceProfile: DeviceProfile, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float fun getTaskMenuY( @@ -257,20 +263,24 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { stagePosition: Int, taskMenuView: View, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float + fun getAppChipMenuMarginX(appChipView: IconAppChipView, isRtl: Boolean): Int + + fun getAppChipMenuMarginY(appChipView: IconAppChipView, isRtl: Boolean): Int + fun getTaskMenuWidth( thumbnailView: View, deviceProfile: DeviceProfile, - @StagePosition stagePosition: Int + @StagePosition stagePosition: Int, ): Int fun getTaskMenuHeight( taskInsetMargin: Float, deviceProfile: DeviceProfile, taskMenuX: Float, - taskMenuY: Float + taskMenuY: Float, ): Int /** @@ -281,7 +291,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { deviceProfile: DeviceProfile, taskMenuLayout: LinearLayout, dividerSpacing: Int, - dividerDrawable: ShapeDrawable + dividerDrawable: ShapeDrawable, ) /** @@ -291,24 +301,36 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { fun setLayoutParamsForTaskMenuOptionItem( lp: LinearLayout.LayoutParams, viewGroup: LinearLayout, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, + ) + + /** Layout a Digital Wellbeing Banner on its parent. TaskView. */ + fun updateDwbBannerLayout( + taskViewWidth: Int, + taskViewHeight: Int, + isGroupedTaskView: Boolean, + deviceProfile: DeviceProfile, + snapshotViewWidth: Int, + snapshotViewHeight: Int, + banner: View, ) /** - * Calculates the position where a Digital Wellbeing Banner should be placed on its parent + * Calculates the translations where a Digital Wellbeing Banner should be apply on its parent * TaskView. * * @return A Pair of Floats representing the proper x and y translations. */ - fun getDwbLayoutTranslations( + fun getDwbBannerTranslations( taskViewWidth: Int, taskViewHeight: Int, - splitBounds: SplitConfigurationOptions.SplitBounds?, + splitBounds: SplitBounds?, deviceProfile: DeviceProfile, thumbnailViews: Array, desiredTaskId: Int, - banner: View + banner: View, ): Pair + // The following are only used by TaskViewTouchHandler. /** @return Either VERTICAL or HORIZONTAL. */ @@ -317,12 +339,30 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { /** @return Given [.getUpDownSwipeDirection], whether POSITIVE or NEGATIVE is up. */ fun getUpDirection(isRtl: Boolean): Int + /** @return Given [.getUpDownSwipeDirection], whether POSITIVE or NEGATIVE is down. */ + fun getDownDirection(isRtl: Boolean): Int + /** @return Whether the displacement is going towards the top of the screen. */ fun isGoingUp(displacement: Float, isRtl: Boolean): Boolean /** @return Either 1 or -1, a factor to multiply by so the animation goes the correct way. */ fun getTaskDragDisplacementFactor(isRtl: Boolean): Int + /** @return Either 1 or -1, the direction sign towards task dismiss. */ + fun getTaskDismissVerticalDirection(): Int + + /** @return the length to drag a task off screen for dismiss. */ + fun getTaskDismissLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int + + /** @return the length to drag a task to full screen for launch. */ + fun getTaskLaunchLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int + + /** Extends the provided rect to account for task dismiss primary translation. */ + fun extendRectForPrimaryTranslation(rect: Rect, translation: Int) + + /** Extends the provided rect to account for task dismiss secondary translation. */ + fun extendRectForSecondaryTranslation(rect: Rect, translation: Int) + /** * Maps the velocity from the coordinate plane of the foreground app to that of Launcher's * (which now will always be portrait) @@ -352,7 +392,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { floatingTask: View, onScreenRect: RectF, @StagePosition stagePosition: Int, - dp: DeviceProfile + dp: DeviceProfile, ): Float /** diff --git a/quickstep/src/com/android/quickstep/orientation/SeascapePagedViewHandler.kt b/quickstep/src/com/android/quickstep/orientation/SeascapePagedViewHandler.kt index 333359fdd85..7dc1cfe9fc3 100644 --- a/quickstep/src/com/android/quickstep/orientation/SeascapePagedViewHandler.kt +++ b/quickstep/src/com/android/quickstep/orientation/SeascapePagedViewHandler.kt @@ -25,23 +25,26 @@ import android.view.Gravity import android.view.Surface import android.view.View import android.view.View.MeasureSpec +import android.view.ViewGroup import android.widget.FrameLayout import androidx.core.util.component1 import androidx.core.util.component2 +import androidx.core.view.marginStart +import androidx.core.view.updateLayoutParams import com.android.launcher3.DeviceProfile -import com.android.launcher3.Flags import com.android.launcher3.R import com.android.launcher3.Utilities import com.android.launcher3.logger.LauncherAtom import com.android.launcher3.touch.SingleAxisSwipeDetector +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED import com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption import com.android.launcher3.views.BaseDragLayer import com.android.quickstep.views.IconAppChipView +import com.android.wm.shell.shared.split.SplitBounds class SeascapePagedViewHandler : LandscapePagedViewHandler() { override fun rotateInsets(insets: Rect, outInsets: Rect) { @@ -52,7 +55,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { override fun getSplitTranslationDirectionFactor( stagePosition: Int, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Int = if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) -1 else 1 override fun getRecentsRtlSetting(resources: Resources): Boolean = Utilities.isRtl(resources) @@ -69,8 +72,14 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { thumbnailView: View, deviceProfile: DeviceProfile, taskInsetMargin: Float, - taskViewIcon: View - ): Float = x + taskInsetMargin + taskViewIcon: View, + ): Float = + if (enableOverviewIconMenu()) { + taskViewIcon as IconAppChipView + x - taskViewIcon.menuToCollapsedChipGap + } else { + x + taskInsetMargin + } override fun getTaskMenuY( y: Float, @@ -78,10 +87,11 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { stagePosition: Int, taskMenuView: View, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float { - if (Flags.enableOverviewIconMenu()) { - return y + if (enableOverviewIconMenu()) { + val marginStart = (taskViewIcon as IconAppChipView).backgroundMarginTopStart + return if (taskMenuView.isLayoutRtl) y + marginStart else y - marginStart } val lp = taskMenuView.layoutParams as BaseDragLayer.LayoutParams val taskMenuWidth = lp.width @@ -92,28 +102,27 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { } } + override fun getAppChipMenuMarginX(appChipView: IconAppChipView, isRtl: Boolean): Int = + -appChipView.menuToCollapsedChipGap + + override fun getAppChipMenuMarginY(appChipView: IconAppChipView, isRtl: Boolean): Int = + if (isRtl) -appChipView.backgroundMarginTopStart else appChipView.backgroundMarginTopStart + override fun getTaskMenuHeight( taskInsetMargin: Float, deviceProfile: DeviceProfile, taskMenuX: Float, - taskMenuY: Float - ): Int = (deviceProfile.availableWidthPx - taskInsetMargin - taskMenuX).toInt() + taskMenuY: Float, + ): Int = (deviceProfile.deviceProperties.availableWidthPx - taskInsetMargin - taskMenuX).toInt() override fun setSplitTaskSwipeRect( dp: DeviceProfile, outRect: Rect, splitInfo: SplitBounds, - desiredStagePosition: Int + desiredStagePosition: Int, ) { - val topLeftTaskPercent: Float - val dividerBarPercent: Float - if (splitInfo.appsStackedVertically) { - topLeftTaskPercent = splitInfo.topTaskPercent - dividerBarPercent = splitInfo.dividerHeightPercent - } else { - topLeftTaskPercent = splitInfo.leftTaskPercent - dividerBarPercent = splitInfo.dividerWidthPercent - } + val topLeftTaskPercent = splitInfo.leftTopTaskPercent + val dividerBarPercent = splitInfo.dividerPercent // In seascape, the primary thumbnail is counterintuitively placed at the physical bottom of // the screen. This is to preserve consistency when the user rotates: From the user's POV, @@ -125,54 +134,60 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { } } - override fun getDwbLayoutTranslations( + override fun updateDwbBannerLayout( taskViewWidth: Int, taskViewHeight: Int, - splitBounds: SplitBounds?, + isGroupedTaskView: Boolean, deviceProfile: DeviceProfile, - thumbnailViews: Array, - desiredTaskId: Int, - banner: View - ): Pair { - val snapshotParams = thumbnailViews[0].layoutParams as FrameLayout.LayoutParams - val isRtl = banner.layoutDirection == View.LAYOUT_DIRECTION_RTL - - val bannerParams = banner.layoutParams as FrameLayout.LayoutParams - bannerParams.gravity = Gravity.BOTTOM or if (isRtl) Gravity.END else Gravity.START + snapshotViewWidth: Int, + snapshotViewHeight: Int, + banner: View, + ) { banner.pivotX = 0f banner.pivotY = 0f banner.rotation = degreesRotated - - val translationX: Float = (taskViewWidth - banner.height).toFloat() - if (splitBounds == null) { - // Single, fullscreen case - bannerParams.width = taskViewHeight - snapshotParams.topMargin - return Pair(translationX, banner.height.toFloat()) + banner.updateLayoutParams { + gravity = Gravity.BOTTOM or if (banner.isLayoutRtl) Gravity.END else Gravity.START + width = + if (isGroupedTaskView) { + snapshotViewHeight + } else { + taskViewHeight - deviceProfile.overviewProfile.taskThumbnailTopMarginPx + } } + } - // Set correct width and translations + override fun getDwbBannerTranslations( + taskViewWidth: Int, + taskViewHeight: Int, + splitBounds: SplitBounds?, + deviceProfile: DeviceProfile, + thumbnailViews: Array, + desiredTaskId: Int, + banner: View, + ): Pair { + val snapshotParams = thumbnailViews[0].layoutParams as ViewGroup.MarginLayoutParams + val translationX: Float = (taskViewWidth - banner.height).toFloat() val translationY: Float - if (desiredTaskId == splitBounds.leftTopTaskId) { - bannerParams.width = thumbnailViews[0].measuredHeight - val bottomRightTaskPlusDividerPercent = - if (splitBounds.appsStackedVertically) { - 1f - splitBounds.topTaskPercent - } else { - 1f - splitBounds.leftTaskPercent - } - translationY = - banner.height - - (taskViewHeight - snapshotParams.topMargin) * bottomRightTaskPlusDividerPercent - } else { - bannerParams.width = thumbnailViews[1].measuredHeight + if (splitBounds == null) { translationY = banner.height.toFloat() + } else { + if (desiredTaskId == splitBounds.rightBottomTaskId) { + val bottomRightTaskPlusDividerPercent = + splitBounds.rightBottomTaskPercent + splitBounds.dividerPercent + translationY = + banner.height - + (taskViewHeight - snapshotParams.topMargin) * + bottomRightTaskPlusDividerPercent + } else { + translationY = banner.height.toFloat() + } } - return Pair(translationX, translationY) } override fun getDistanceToBottomOfRect(dp: DeviceProfile, rect: Rect): Int = - dp.widthPx - rect.right + dp.deviceProperties.widthPx - rect.right override fun getSplitPositionOptions(dp: DeviceProfile): List = // Add "right" option which is actually the top @@ -181,7 +196,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, STAGE_POSITION_BOTTOM_OR_RIGHT, - STAGE_TYPE_MAIN + STAGE_TYPE_MAIN, ) ) @@ -189,7 +204,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { out: View, dp: DeviceProfile, splitInstructionsHeight: Int, - splitInstructionsWidth: Int + splitInstructionsWidth: Int, ) { out.pivotX = 0f out.pivotY = splitInstructionsHeight.toFloat() @@ -217,7 +232,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { taskIconMargin: Int, taskIconHeight: Int, thumbnailTopMargin: Int, - isRtl: Boolean + isRtl: Boolean, ) { iconParams.gravity = if (isRtl) { @@ -230,7 +245,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { override fun setIconAppChipChildrenParams( iconParams: FrameLayout.LayoutParams, - chipChildMarginStart: Int + chipChildMarginStart: Int, ) { iconParams.setMargins(0, 0, 0, 0) iconParams.marginStart = chipChildMarginStart @@ -241,20 +256,20 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { iconAppChipView: IconAppChipView, iconMenuParams: FrameLayout.LayoutParams, iconMenuMargin: Int, - thumbnailTopMargin: Int + thumbnailTopMargin: Int, ) { val isRtl = iconAppChipView.layoutDirection == View.LAYOUT_DIRECTION_RTL val iconCenter = iconAppChipView.getHeight() / 2f if (isRtl) { - iconMenuParams.gravity = Gravity.TOP or Gravity.END + iconMenuParams.gravity = Gravity.TOP or Gravity.START iconMenuParams.topMargin = iconMenuMargin iconMenuParams.marginEnd = thumbnailTopMargin // Use half menu height to place the pivot within the X/Y center of icon in the menu. iconAppChipView.pivotX = iconMenuParams.width / 2f iconAppChipView.pivotY = iconMenuParams.width / 2f } else { - iconMenuParams.gravity = Gravity.BOTTOM or Gravity.START + iconMenuParams.gravity = Gravity.BOTTOM or Gravity.END iconMenuParams.topMargin = 0 iconMenuParams.marginEnd = 0 iconAppChipView.pivotX = iconCenter @@ -266,6 +281,10 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { iconAppChipView.setRotation(degreesRotated) } + /** + * @param inSplitSelection Whether user currently has a task from this task group staged for + * split screen. Currently this state is not reachable in fake seascape. + */ override fun measureGroupedTaskViewThumbnailBounds( primarySnapshot: View, secondarySnapshot: View, @@ -273,18 +292,19 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { parentHeight: Int, splitBoundsConfig: SplitBounds, dp: DeviceProfile, - isRtl: Boolean + isRtl: Boolean, + inSplitSelection: Boolean, ) { val primaryParams = primarySnapshot.layoutParams as FrameLayout.LayoutParams val secondaryParams = secondarySnapshot.layoutParams as FrameLayout.LayoutParams // Swap the margins that are set in TaskView#setRecentsOrientedState() - secondaryParams.topMargin = dp.overviewTaskThumbnailTopMarginPx + secondaryParams.topMargin = dp.overviewProfile.taskThumbnailTopMarginPx primaryParams.topMargin = 0 // Measure and layout the thumbnails bottom up, since the primary is on the visual left // (portrait bottom) and secondary is on the right (portrait top) - val spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx + val spaceAboveSnapshot = dp.overviewProfile.taskThumbnailTopMarginPx val totalThumbnailHeight = parentHeight - spaceAboveSnapshot val dividerBar = getDividerBarSize(totalThumbnailHeight, splitBoundsConfig) @@ -295,11 +315,11 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { (taskViewSecond.y + spaceAboveSnapshot + dividerBar).toFloat() primarySnapshot.measure( MeasureSpec.makeMeasureSpec(taskViewFirst.x, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(taskViewFirst.y, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(taskViewFirst.y, MeasureSpec.EXACTLY), ) secondarySnapshot.measure( MeasureSpec.makeMeasureSpec(taskViewSecond.x, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(taskViewSecond.y, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(taskViewSecond.y, MeasureSpec.EXACTLY), ) } @@ -307,20 +327,15 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { dp: DeviceProfile, splitBoundsConfig: SplitBounds, parentWidth: Int, - parentHeight: Int + parentHeight: Int, ): Pair { // Measure and layout the thumbnails bottom up, since the primary is on the visual left // (portrait bottom) and secondary is on the right (portrait top) - val spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx + val spaceAboveSnapshot = dp.overviewProfile.taskThumbnailTopMarginPx val totalThumbnailHeight = parentHeight - spaceAboveSnapshot val dividerBar = getDividerBarSize(totalThumbnailHeight, splitBoundsConfig) - val taskPercent = - if (splitBoundsConfig.appsStackedVertically) { - splitBoundsConfig.topTaskPercent - } else { - splitBoundsConfig.leftTaskPercent - } + val taskPercent = splitBoundsConfig.leftTopTaskPercent val firstTaskViewSize = Point(parentWidth, (totalThumbnailHeight * taskPercent).toInt()) val secondTaskViewSize = Point(parentWidth, totalThumbnailHeight - firstTaskViewSize.y - dividerBar) @@ -335,10 +350,23 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { if (isRtl) SingleAxisSwipeDetector.DIRECTION_POSITIVE else SingleAxisSwipeDetector.DIRECTION_NEGATIVE + override fun getDownDirection(isRtl: Boolean): Int = + if (isRtl) SingleAxisSwipeDetector.DIRECTION_NEGATIVE + else SingleAxisSwipeDetector.DIRECTION_POSITIVE + override fun isGoingUp(displacement: Float, isRtl: Boolean): Boolean = if (isRtl) displacement > 0 else displacement < 0 override fun getTaskDragDisplacementFactor(isRtl: Boolean): Int = if (isRtl) -1 else 1 + + override fun getTaskDismissVerticalDirection(): Int = -1 + + override fun getTaskDismissLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + taskThumbnailBounds.right + + override fun getTaskLaunchLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + secondaryDimension - taskThumbnailBounds.right + /* -------------------- */ override fun getSplitIconsPosition( @@ -348,17 +376,18 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { isRtl: Boolean, overviewTaskMarginPx: Int, dividerSize: Int, + oneIconHiddenDueToSmallWidth: Boolean, ): SplitIconPositions { - return if (Flags.enableOverviewIconMenu()) { + return if (enableOverviewIconMenu()) { if (isRtl) { SplitIconPositions( topLeftY = totalThumbnailHeight - primarySnapshotHeight, - bottomRightY = 0 + bottomRightY = 0, ) } else { SplitIconPositions( topLeftY = 0, - bottomRightY = -(primarySnapshotHeight + dividerSize) + bottomRightY = -(primarySnapshotHeight + dividerSize), ) } } else { @@ -367,10 +396,16 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { // from the bottom to the almost-center of the screen using the bottom margin. // The primary snapshot is placed at the bottom, thus we translate the icons using // the size of the primary snapshot minus the icon size for the top-left icon. - SplitIconPositions( - topLeftY = primarySnapshotHeight - taskIconHeight, - bottomRightY = primarySnapshotHeight + dividerSize - ) + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerY = primarySnapshotHeight + ((dividerSize - taskIconHeight) / 2) + SplitIconPositions(topLeftY = centerY, bottomRightY = centerY) + } else { + SplitIconPositions( + topLeftY = primarySnapshotHeight - taskIconHeight, + bottomRightY = primarySnapshotHeight + dividerSize, + ) + } } } @@ -385,10 +420,10 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { override fun updateSplitIconsPosition(iconView: View, translationY: Int, isRtl: Boolean) { val layoutParams = iconView.layoutParams as FrameLayout.LayoutParams - if (Flags.enableOverviewIconMenu()) { + if (enableOverviewIconMenu()) { val appChipView = iconView as IconAppChipView layoutParams.gravity = - if (isRtl) Gravity.TOP or Gravity.END else Gravity.BOTTOM or Gravity.START + if (isRtl) Gravity.TOP or Gravity.START else Gravity.BOTTOM or Gravity.END appChipView.layoutParams = layoutParams appChipView.setSplitTranslationX(0f) appChipView.setSplitTranslationY(translationY.toFloat()) diff --git a/quickstep/src/com/android/quickstep/recents/data/AppTimersRepository.kt b/quickstep/src/com/android/quickstep/recents/data/AppTimersRepository.kt new file mode 100644 index 00000000000..6932e763fea --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/AppTimersRepository.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.os.UserHandle +import java.time.Duration + +/** Repository of information about the app usage timers. */ +interface AppTimersRepository { + /** Returns the remaining time on the app usage limit timer for a given user. */ + suspend fun getRemainingDuration(packageName: String, userHandle: UserHandle): Duration? +} diff --git a/quickstep/src/com/android/quickstep/recents/data/AppTimersRepositoryImpl.kt b/quickstep/src/com/android/quickstep/recents/data/AppTimersRepositoryImpl.kt new file mode 100644 index 00000000000..930bbe44c61 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/AppTimersRepositoryImpl.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.content.pm.LauncherApps +import android.os.UserHandle +import com.android.launcher3.util.coroutines.DispatcherProvider +import java.time.Duration +import kotlinx.coroutines.withContext + +/** + * An [AppTimersRepository] that uses [LauncherApps] service to get information about app timers. + */ +class AppTimersRepositoryImpl( + private val dataSource: LauncherApps, + private val dispatcherProvider: DispatcherProvider, +) : AppTimersRepository { + + /** Returns the remaining time on the app usage timer set by the user. */ + override suspend fun getRemainingDuration( + packageName: String, + userHandle: UserHandle, + ): Duration? = + withContext(dispatcherProvider.ioBackground) { + val appUsageLimit = + dataSource.getAppUsageLimit(packageName, userHandle) ?: return@withContext null + + Duration.ofMillis(appUsageLimit.usageRemaining) + } +} diff --git a/quickstep/src/com/android/quickstep/recents/data/DesktopTileBackgroundDataSource.kt b/quickstep/src/com/android/quickstep/recents/data/DesktopTileBackgroundDataSource.kt new file mode 100644 index 00000000000..41eb4c38c6b --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/DesktopTileBackgroundDataSource.kt @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.graphics.Bitmap +import android.os.RemoteException +import android.util.Log +import android.view.IWallpaperVisibilityListener +import android.view.IWindowManager +import com.android.quickstep.recents.di.DisplayId +import kotlin.coroutines.resume +import kotlinx.coroutines.suspendCancellableCoroutine + +class DesktopTileBackgroundDataSource( + private val windowManager: IWindowManager?, + private val displayId: DisplayId, +) { + + private var screenshotCache: Bitmap? = null + + suspend fun getWallpaperBackgroundBitmap(forceRefresh: Boolean = false): Bitmap? { + windowManager ?: return null + + if (forceRefresh) { + Log.d(TAG, "Force refresh requested, clearing cache.") + screenshotCache = null + } + + if (isCacheValid()) { + Log.d(TAG, "Returning cached screenshot: $screenshotCache") + return screenshotCache + } else { + Log.d(TAG, "cache invalid") + screenshotCache = null + } + + return suspendCancellableCoroutine { continuation -> + val wallpaperVisibilityListener = + object : IWallpaperVisibilityListener.Stub() { + override fun onWallpaperVisibilityChanged(visible: Boolean, newDisplayId: Int) { + try { + if (visible) { + screenshotCache = windowManager.screenshotWallpaper() + continuation.resume(screenshotCache) + } + } catch (e: RemoteException) { + Log.e(TAG, "RemoteException in onWallpaperVisibilityChanged", e) + screenshotCache = null + continuation.resume(null) + } + } + } + + try { + if ( + windowManager.registerWallpaperVisibilityListener( + wallpaperVisibilityListener, + displayId.displayId, + ) + ) { + Log.d(TAG, "Wallpaper initially visible. Taking screenshot.") + screenshotCache = windowManager.screenshotWallpaper() + continuation.resume(screenshotCache) + } + } catch (e: RemoteException) { + continuation.resume(null) + } + continuation.invokeOnCancellation { + Log.d(TAG, "unRegister: ") + windowManager.unregisterWallpaperVisibilityListener( + wallpaperVisibilityListener, + displayId.displayId, + ) + screenshotCache = null + } + } + } + + private fun isCacheValid() = + screenshotCache?.let { !it.isRecycled && it.width > 0 && it.height > 0 } ?: false + + private companion object { + const val TAG = "DesktopTileBackgroundDataSource" + } +} diff --git a/quickstep/src/com/android/quickstep/recents/data/DesktopTileBackgroundRepository.kt b/quickstep/src/com/android/quickstep/recents/data/DesktopTileBackgroundRepository.kt new file mode 100644 index 00000000000..26a59b06d90 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/DesktopTileBackgroundRepository.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.graphics.Bitmap +import com.android.internal.R + +class DesktopTileBackgroundRepository( + private val desktopTileBackgroundDataSource: DesktopTileBackgroundDataSource +) { + suspend fun getWallpaperBackground(forceRefresh: Boolean = false): DesktopBackgroundResult { + val wallpaperBackground = + desktopTileBackgroundDataSource.getWallpaperBackgroundBitmap(forceRefresh) + return if (wallpaperBackground != null) { + DesktopBackgroundResult.WallpaperBackground(wallpaperBackground) + } else { + DesktopBackgroundResult.FallbackBackground(DESKTOP_BACKGROUND_FALLBACK_COLOR) + } + } + + companion object { + const val DESKTOP_BACKGROUND_FALLBACK_COLOR = R.color.system_neutral2_300 + } +} + +sealed class DesktopBackgroundResult { + data class WallpaperBackground(val background: Bitmap) : DesktopBackgroundResult() + + data class FallbackBackground(val background: Int) : DesktopBackgroundResult() +} diff --git a/quickstep/src/com/android/quickstep/recents/data/HighResLoadingStateNotifier.kt b/quickstep/src/com/android/quickstep/recents/data/HighResLoadingStateNotifier.kt new file mode 100644 index 00000000000..ad2bd253dee --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/HighResLoadingStateNotifier.kt @@ -0,0 +1,28 @@ +/* + * 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.quickstep.recents.data + +import com.android.quickstep.HighResLoadingState.HighResLoadingStateChangedCallback + +/** Notifies added callbacks that high res state has changed */ +interface HighResLoadingStateNotifier { + /** Adds a callback for high res loading state */ + fun addCallback(callback: HighResLoadingStateChangedCallback) + + /** Removes a callback for high res loading state */ + fun removeCallback(callback: HighResLoadingStateChangedCallback) +} diff --git a/quickstep/src/com/android/quickstep/recents/data/InputManagerWrapper.kt b/quickstep/src/com/android/quickstep/recents/data/InputManagerWrapper.kt new file mode 100644 index 00000000000..f6498c8fdef --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/InputManagerWrapper.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.hardware.input.InputManager +import android.view.InputDevice + +interface InputDeviceDataSource { + val inputDeviceIds: IntArray + + fun getInputDevice(deviceId: Int): InputDevice? +} + +class InputManagerWrapper(private val inputManager: InputManager) : InputDeviceDataSource { + override val inputDeviceIds: IntArray + get() = inputManager.inputDeviceIds + + override fun getInputDevice(deviceId: Int): InputDevice? = inputManager.getInputDevice(deviceId) +} diff --git a/quickstep/src/com/android/quickstep/recents/data/PointerRepository.kt b/quickstep/src/com/android/quickstep/recents/data/PointerRepository.kt new file mode 100644 index 00000000000..a1ab8e6b9ce --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/PointerRepository.kt @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.os.Build +import android.view.InputDevice.SOURCE_MOUSE +import android.view.InputDevice.SOURCE_TOUCHPAD +import androidx.annotation.RequiresApi +//import com.android.app.tracing.traceSection + +interface PointerRepository { + fun isAnyPointerDeviceConnected(): Boolean +} + +class PointerRepositoryImpl(private val inputManager: InputDeviceDataSource) : PointerRepository { + @RequiresApi(Build.VERSION_CODES.O_MR1) + override fun isAnyPointerDeviceConnected(): Boolean { + return inputManager.inputDeviceIds.any { isPointerDeviceEnabled(it) } + } + + @RequiresApi(Build.VERSION_CODES.O_MR1) + private fun isPointerDeviceEnabled(deviceId: Int): Boolean { + val device = inputManager.getInputDevice(deviceId) ?: return false + + return device.isEnabled && + (device.supportsSource(SOURCE_MOUSE) || device.supportsSource(SOURCE_TOUCHPAD)) + } +} diff --git a/quickstep/src/com/android/quickstep/recents/data/RecentTasksRepository.kt b/quickstep/src/com/android/quickstep/recents/data/RecentTasksRepository.kt index c1eef0b393e..f7b16744432 100644 --- a/quickstep/src/com/android/quickstep/recents/data/RecentTasksRepository.kt +++ b/quickstep/src/com/android/quickstep/recents/data/RecentTasksRepository.kt @@ -17,21 +17,34 @@ package com.android.quickstep.recents.data import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.ThumbnailData import kotlinx.coroutines.flow.Flow interface RecentTasksRepository { /** Gets all the recent tasks, refreshing from data sources if [forceRefresh] is true. */ - fun getAllTaskData(forceRefresh: Boolean = false): Flow> + fun getAllTaskData(displayId: Int, forceRefresh: Boolean = false): Flow> /** * Gets the data associated with a task that has id [taskId]. Flow will settle on null if the - * task was not found. + * task was not found. [Task.thumbnail] will settle on null if task is invisible. */ fun getTaskDataById(taskId: Int): Flow + /** + * Gets the [ThumbnailData] associated with a task that has id [taskId]. Flow will settle on + * null if the task was not found or is invisible. + */ + fun getThumbnailById(taskId: Int): Flow + + /** + * Gets the [ThumbnailData] associated with a task that has id [taskId]. Flow will settle on + * null if the task was not found or is invisible. + */ + fun getCurrentThumbnailById(taskId: Int): ThumbnailData? + /** * Sets the tasks that are visible, indicating that properties relating to visuals need to be * populated e.g. icons/thumbnails etc. */ - fun setVisibleTasks(visibleTaskIdList: List) + fun setVisibleTasks(displayId: Int, visibleTaskIdList: Set) } diff --git a/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfile.kt b/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfile.kt new file mode 100644 index 00000000000..0ee2bd224cb --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfile.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.recents.data + +/** + * Container to hold [com.android.launcher3.DeviceProfile] related to Recents. + * + * @property isLargeScreen whether the current device posture has a large screen + * @property canEnterDesktopMode whether the current device can enter Desktop UI mode + */ +data class RecentsDeviceProfile(val isLargeScreen: Boolean, val canEnterDesktopMode: Boolean) diff --git a/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfileRepository.kt b/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfileRepository.kt new file mode 100644 index 00000000000..13cf56d5b2f --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfileRepository.kt @@ -0,0 +1,21 @@ +/* + * 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.quickstep.recents.data + +interface RecentsDeviceProfileRepository { + fun getRecentsDeviceProfile(): RecentsDeviceProfile +} diff --git a/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfileRepositoryImpl.kt b/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfileRepositoryImpl.kt new file mode 100644 index 00000000000..5397638ce15 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/RecentsDeviceProfileRepositoryImpl.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.quickstep.recents.data + +import com.android.quickstep.views.RecentsViewContainer +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus + +/** + * Repository for shrink down version of [com.android.launcher3.DeviceProfile] that only contains + * data related to Recents. + */ +class RecentsDeviceProfileRepositoryImpl(private val container: RecentsViewContainer) : + RecentsDeviceProfileRepository { + + override fun getRecentsDeviceProfile() = + with(container.deviceProfile) { + RecentsDeviceProfile( + isLargeScreen = deviceProperties.isTablet, + canEnterDesktopMode = DesktopModeStatus.canEnterDesktopMode(container.asContext()), + ) + } +} diff --git a/quickstep/src/com/android/quickstep/recents/data/RecentsRotationState.kt b/quickstep/src/com/android/quickstep/recents/data/RecentsRotationState.kt new file mode 100644 index 00000000000..2c2a744ed41 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/RecentsRotationState.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.recents.data + +import android.view.Surface + +/** + * Container to hold orientation/rotation related information related to Recents. + * + * @property activityRotation rotation of the activity hosting RecentsView + */ +data class RecentsRotationState( + @Surface.Rotation val activityRotation: Int, + @Surface.Rotation val orientationHandlerRotation: Int, +) diff --git a/quickstep/src/com/android/quickstep/recents/data/RecentsRotationStateRepository.kt b/quickstep/src/com/android/quickstep/recents/data/RecentsRotationStateRepository.kt new file mode 100644 index 00000000000..ed074d2e086 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/RecentsRotationStateRepository.kt @@ -0,0 +1,21 @@ +/* + * 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.quickstep.recents.data + +interface RecentsRotationStateRepository { + fun getRecentsRotationState(): RecentsRotationState +} diff --git a/quickstep/src/com/android/quickstep/recents/data/RecentsRotationStateRepositoryImpl.kt b/quickstep/src/com/android/quickstep/recents/data/RecentsRotationStateRepositoryImpl.kt new file mode 100644 index 00000000000..8417b061df3 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/RecentsRotationStateRepositoryImpl.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.recents.data + +import com.android.quickstep.util.RecentsOrientedState + +/** + * Repository for [RecentsRotationState] which holds orientation/rotation related information + * related to Recents + */ +class RecentsRotationStateRepositoryImpl(private val state: RecentsOrientedState) : + RecentsRotationStateRepository { + override fun getRecentsRotationState() = + with(state) { + RecentsRotationState( + activityRotation = recentsActivityRotation, + orientationHandlerRotation = orientationHandler.rotation + ) + } +} diff --git a/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangeNotifier.kt b/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangeNotifier.kt new file mode 100644 index 00000000000..6e7789d7f83 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangeNotifier.kt @@ -0,0 +1,28 @@ +/* + * 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.quickstep.recents.data + +import com.android.quickstep.util.TaskVisualsChangeListener + +/** Notifies added listeners that task visuals have changed */ +interface TaskVisualsChangeNotifier { + /** Adds a listener for visuals changes */ + fun addThumbnailChangeListener(listener: TaskVisualsChangeListener) + + /** Removes a listener for visuals changes */ + fun removeThumbnailChangeListener(listener: TaskVisualsChangeListener) +} diff --git a/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegate.kt b/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegate.kt new file mode 100644 index 00000000000..12616a8f848 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegate.kt @@ -0,0 +1,151 @@ +/* + * 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.quickstep.recents.data + +import android.os.UserHandle +import android.util.Log +import com.android.quickstep.HighResLoadingState.HighResLoadingStateChangedCallback +import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskIconChangedCallback +import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskThumbnailChangedCallback +import com.android.quickstep.util.TaskVisualsChangeListener +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.ThumbnailData +import java.util.concurrent.ConcurrentHashMap + +/** Delegates the checking of task visuals (thumbnails, high res changes, icons) */ +interface TaskVisualsChangedDelegate : + TaskVisualsChangeListener, HighResLoadingStateChangedCallback { + /** Registers a callback for visuals relating to icons */ + fun registerTaskIconChangedCallback( + taskKey: Task.TaskKey, + taskIconChangedCallback: TaskIconChangedCallback, + ) + + /** Unregisters a callback for visuals relating to icons */ + fun unregisterTaskIconChangedCallback(taskKey: Task.TaskKey) + + /** Registers a callback for visuals relating to thumbnails */ + fun registerTaskThumbnailChangedCallback( + taskKey: Task.TaskKey, + taskThumbnailChangedCallback: TaskThumbnailChangedCallback, + ) + + /** Unregisters a callback for visuals relating to thumbnails */ + fun unregisterTaskThumbnailChangedCallback(taskKey: Task.TaskKey) + + /** A callback for task icon changes */ + interface TaskIconChangedCallback { + /** Informs the listener that the task icon has changed */ + fun onTaskIconChanged() + } + + /** A callback for task thumbnail changes */ + interface TaskThumbnailChangedCallback { + /** Informs the listener that the task thumbnail data has changed to [thumbnailData] */ + fun onTaskThumbnailChanged(thumbnailData: ThumbnailData?) + + /** Informs the listener that the default resolution for loading thumbnails has changed */ + fun onHighResLoadingStateChanged(highResEnabled: Boolean) + } +} + +class TaskVisualsChangedDelegateImpl( + private val taskVisualsChangeNotifier: TaskVisualsChangeNotifier, + private val highResLoadingStateNotifier: HighResLoadingStateNotifier, +) : TaskVisualsChangedDelegate { + private val taskIconChangedCallbacks = + ConcurrentHashMap>() + private val taskThumbnailChangedCallbacks = + ConcurrentHashMap>() + + override fun onTaskIconChanged(taskId: Int) { + taskIconChangedCallbacks[taskId]?.let { (_, callback) -> callback.onTaskIconChanged() } + } + + override fun onTaskIconChanged(pkg: String, user: UserHandle) { + taskIconChangedCallbacks.values + .filter { (taskKey, _) -> + pkg == taskKey.packageName && user.identifier == taskKey.userId + } + .forEach { (_, callback) -> callback.onTaskIconChanged() } + } + + override fun onTaskThumbnailChanged(taskId: Int, thumbnailData: ThumbnailData?): Task? { + taskThumbnailChangedCallbacks[taskId]?.let { (_, callback) -> + callback.onTaskThumbnailChanged(thumbnailData) + } + return null + } + + override fun onHighResLoadingStateChanged(enabled: Boolean) { + Log.d(TAG, "onHighResLoadingStateChanged(enabled = $enabled)") + taskThumbnailChangedCallbacks.values.forEach { (_, callback) -> + callback.onHighResLoadingStateChanged(enabled) + } + } + + override fun registerTaskIconChangedCallback( + taskKey: Task.TaskKey, + taskIconChangedCallback: TaskIconChangedCallback, + ) { + updateCallbacks { + taskIconChangedCallbacks[taskKey.id] = taskKey to taskIconChangedCallback + } + } + + override fun unregisterTaskIconChangedCallback(taskKey: Task.TaskKey) { + updateCallbacks { taskIconChangedCallbacks.remove(taskKey.id) } + } + + override fun registerTaskThumbnailChangedCallback( + taskKey: Task.TaskKey, + taskThumbnailChangedCallback: TaskThumbnailChangedCallback, + ) { + updateCallbacks { + taskThumbnailChangedCallbacks[taskKey.id] = taskKey to taskThumbnailChangedCallback + } + } + + override fun unregisterTaskThumbnailChangedCallback(taskKey: Task.TaskKey) { + updateCallbacks { taskThumbnailChangedCallbacks.remove(taskKey.id) } + } + + @Synchronized + private fun updateCallbacks(callbackModifier: () -> Unit) { + val prevHasCallbacks = + taskIconChangedCallbacks.size + taskThumbnailChangedCallbacks.size > 0 + callbackModifier() + + val currHasCallbacks = + taskIconChangedCallbacks.size + taskThumbnailChangedCallbacks.size > 0 + + when { + prevHasCallbacks && !currHasCallbacks -> { + taskVisualsChangeNotifier.removeThumbnailChangeListener(this) + highResLoadingStateNotifier.removeCallback(this) + } + !prevHasCallbacks && currHasCallbacks -> { + taskVisualsChangeNotifier.addThumbnailChangeListener(this) + highResLoadingStateNotifier.addCallback(this) + } + } + } + + companion object { + const val TAG = "TaskVisualsChangedDelegateImpl" + } +} diff --git a/quickstep/src/com/android/quickstep/recents/data/TasksRepository.kt b/quickstep/src/com/android/quickstep/recents/data/TasksRepository.kt index b21a1b4addf..971c2322e36 100644 --- a/quickstep/src/com/android/quickstep/recents/data/TasksRepository.kt +++ b/quickstep/src/com/android/quickstep/recents/data/TasksRepository.kt @@ -16,99 +16,241 @@ package com.android.quickstep.recents.data -import com.android.quickstep.TaskIconCache +import android.graphics.drawable.Drawable +import android.util.Log +import android.util.SparseArray +import androidx.core.util.valueIterator +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskIconChangedCallback +import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskThumbnailChangedCallback +import com.android.quickstep.task.thumbnail.data.TaskIconDataSource import com.android.quickstep.task.thumbnail.data.TaskThumbnailDataSource -import com.android.quickstep.util.GroupTask import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.ThumbnailData -import kotlin.coroutines.resume -import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.flatMapLatest -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.distinctUntilChangedBy import kotlinx.coroutines.flow.map -import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext -@OptIn(ExperimentalCoroutinesApi::class) class TasksRepository( private val recentsModel: RecentTasksDataSource, private val taskThumbnailDataSource: TaskThumbnailDataSource, - private val taskIconCache: TaskIconCache, + private val taskIconDataSource: TaskIconDataSource, + private val userLockedStateRepository: UserLockedStateRepository, + private val taskVisualsChangedDelegate: TaskVisualsChangedDelegate, + private val recentsCoroutineScope: CoroutineScope, + private val dispatcherProvider: DispatcherProvider, ) : RecentTasksRepository { - private val groupedTaskData = MutableStateFlow(emptyList()) - private val _taskData = - groupedTaskData.map { groupTaskList -> groupTaskList.flatMap { it.tasks } } - private val visibleTaskIds = MutableStateFlow(emptySet()) - - private val taskData: Flow> = - combine(_taskData, getThumbnailQueryResults()) { tasks, results -> - tasks.forEach { task -> - // Add retrieved thumbnails + remove unnecessary thumbnails - task.thumbnail = results[task.key.id] + private val tasks = MutableStateFlow(MapForStateFlow(emptyMap())) + private var visibleTaskIdsPerDisplay = SparseArray>() + private val taskRequests = HashMap>() + + override fun getAllTaskData(displayId: Int, forceRefresh: Boolean): Flow> { + if (!visibleTaskIdsPerDisplay.contains(displayId)) { + visibleTaskIdsPerDisplay.put(displayId, emptySet()) + } + if (forceRefresh) { + recentsModel.getTasks { newTaskList -> + userLockedStateRepository.invalidateCachedValues() + + val recentTasks = + newTaskList.flatMap { groupTask -> groupTask.tasks }.associateBy { it.key.id } + Log.d( + TAG, + "getAllTaskData: oldTasks ${tasks.value.keys}, newTasks: ${recentTasks.keys}", + ) + + tasks.update { oldTaskList -> + // Copy retrieved visuals to new Task objects + recentTasks.forEach { (taskId, task) -> + task.thumbnail = oldTaskList[taskId]?.thumbnail + task.icon = oldTaskList[taskId]?.icon + task.title = oldTaskList[taskId]?.title + task.titleDescription = oldTaskList[taskId]?.titleDescription + } + MapForStateFlow(recentTasks) + } + + updateTaskRequests() } - tasks } + return tasks.map { it.values.filter { it.key.displayId == displayId }.toList() } + } - override fun getAllTaskData(forceRefresh: Boolean): Flow> { - if (forceRefresh) { - recentsModel.getTasks { groupedTaskData.value = it } + override fun getTaskDataById(taskId: Int) = tasks.map { it[taskId] } + + override fun getThumbnailById(taskId: Int) = + getTaskDataById(taskId).map { it?.thumbnail }.distinctUntilChangedBy { it?.snapshotId } + + override fun getCurrentThumbnailById(taskId: Int) = tasks.value[taskId]?.thumbnail + + override fun setVisibleTasks(displayId: Int, visibleTaskIdList: Set) { + if (visibleTaskIdList.isEmpty()) { + visibleTaskIdsPerDisplay.remove(displayId) + } else { + visibleTaskIdsPerDisplay.put(displayId, visibleTaskIdList) } - return taskData + updateTaskRequests() } - override fun getTaskDataById(taskId: Int): Flow = - taskData.map { taskList -> taskList.firstOrNull { it.key.id == taskId } } + @Synchronized + private fun updateTaskRequests() { + val allVisibleTaskIds = + visibleTaskIdsPerDisplay.valueIterator().asSequence().flatMap { it }.toSet() + val requestsNeeded = allVisibleTaskIds.intersect(tasks.value.keys) - override fun setVisibleTasks(visibleTaskIdList: List) { - this.visibleTaskIds.value = visibleTaskIdList.toSet() + val taskRequestIds = taskRequests.keys + val requestsNoLongerNeeded = taskRequestIds.subtract(requestsNeeded) + val newlyRequestedTasks = requestsNeeded.subtract(taskRequestIds) + if (requestsNoLongerNeeded.isNotEmpty() || newlyRequestedTasks.isNotEmpty()) { + Log.d( + TAG, + "updateTaskRequests to: $requestsNeeded, " + + "removed: $requestsNoLongerNeeded, added: $newlyRequestedTasks", + ) + } + + // Remove tasks are no longer visible + removeTasks(requestsNoLongerNeeded) + // Add new tasks to be requested + newlyRequestedTasks.forEach { taskId -> requestTaskData(taskId) } } - /** Flow wrapper for [TaskThumbnailDataSource.updateThumbnailInBackground] api */ - private fun getThumbnailDataRequest(task: Task): ThumbnailDataRequest = - flow { - emit(task.key.id to task.thumbnail) - val thumbnailDataResult: ThumbnailData? = - suspendCancellableCoroutine { continuation -> - val cancellableTask = - taskThumbnailDataSource.updateThumbnailInBackground(task) { - continuation.resume(it) - } - continuation.invokeOnCancellation { cancellableTask?.cancel() } - } - emit(task.key.id to thumbnailDataResult) - } - .distinctUntilChanged() - - /** - * This is a Flow that makes a query for thumbnail data to the [taskThumbnailDataSource] for - * each visible task. It then collects the responses and returns them in a Map as soon as they - * are available. - */ - private fun getThumbnailQueryResults(): Flow> { - val visibleTasks = - combine(_taskData, visibleTaskIds) { tasks, visibleIds -> - tasks.filter { it.key.id in visibleIds } - } - val visibleThumbnailDataRequests: Flow> = - visibleTasks.map { - it.map { visibleTask -> - val taskCopy = Task(visibleTask).apply { thumbnail = visibleTask.thumbnail } - getThumbnailDataRequest(taskCopy) + private fun requestTaskData(taskId: Int) { + val task = tasks.value[taskId] ?: return + Log.i(TAG, "requestTaskData: $taskId") + taskRequests[taskId] = + Pair( + task.key, + recentsCoroutineScope.launch(dispatcherProvider.lightweightBackground) { + val thumbnailFetchDeferred = async { fetchThumbnail(task) } + val iconFetchDeferred = async { fetchIcon(task) } + awaitAll(thumbnailFetchDeferred, iconFetchDeferred) + }, + ) + } + + private fun removeTasks(tasksToRemove: Set) { + if (tasksToRemove.isEmpty()) return + + Log.i(TAG, "removeTasks: $tasksToRemove") + tasks.update { currentTasks -> + tasksToRemove.forEach { taskId -> + val request = taskRequests.remove(taskId) ?: return@forEach + val (taskKey, job) = request + job.cancel() + + // un-registering callbacks + taskVisualsChangedDelegate.unregisterTaskIconChangedCallback(taskKey) + taskVisualsChangedDelegate.unregisterTaskThumbnailChangedCallback(taskKey) + + // Clearing Task to reduce memory footprint + currentTasks[taskId]?.apply { + thumbnail = null + icon = null + title = null + titleDescription = null } } - return visibleThumbnailDataRequests.flatMapLatest { - thumbnailRequestFlows: List -> - if (thumbnailRequestFlows.isEmpty()) { - flowOf(emptyMap()) - } else { - combine(thumbnailRequestFlows) { it.toMap() } + MapForStateFlow(currentTasks) + } + } + + private suspend fun fetchIcon(task: Task) { + updateIcon(task.key.id, getIconFromDataSource(task)) + taskVisualsChangedDelegate.registerTaskIconChangedCallback( + task.key, + object : TaskIconChangedCallback { + override fun onTaskIconChanged() { + recentsCoroutineScope.launch(dispatcherProvider.lightweightBackground) { + updateIcon(task.key.id, getIconFromDataSource(task)) + } + } + }, + ) + } + + private suspend fun fetchThumbnail(task: Task) { + updateThumbnail(task.key.id, getThumbnailFromDataSource(task)) + taskVisualsChangedDelegate.registerTaskThumbnailChangedCallback( + task.key, + object : TaskThumbnailChangedCallback { + override fun onTaskThumbnailChanged(thumbnailData: ThumbnailData?) { + updateThumbnail(task.key.id, thumbnailData) + } + + override fun onHighResLoadingStateChanged(highResEnabled: Boolean) { + val isTaskVisible = taskRequests.containsKey(task.key.id) + if (!isTaskVisible) return + + val isCurrentThumbnailLowRes = + tasks.value[task.key.id]?.thumbnail?.reducedResolution + val isRequestedResHigherThanCurrent = + isCurrentThumbnailLowRes == null || + (isCurrentThumbnailLowRes && highResEnabled) + if (!isRequestedResHigherThanCurrent) return + + recentsCoroutineScope.launch(dispatcherProvider.lightweightBackground) { + updateThumbnail(task.key.id, getThumbnailFromDataSource(task)) + } + } + }, + ) + } + + private fun updateIcon(taskId: Int, iconData: IconData) { + tasks.update { currentTasks -> + currentTasks[taskId]?.apply { + icon = iconData.icon + titleDescription = iconData.contentDescription + title = iconData.title } + MapForStateFlow(currentTasks) } } -} -typealias ThumbnailDataRequest = Flow> + private fun updateThumbnail(taskId: Int, thumbnail: ThumbnailData?) { + tasks.update { currentTasks -> + Log.d( + "b/417220811", + "Current thumbnail: ${currentTasks[taskId]?.thumbnail?.thumbnail}, replacing with ${thumbnail?.thumbnail}", + ) + currentTasks[taskId]?.thumbnail = thumbnail + MapForStateFlow(currentTasks) + } + } + + private suspend fun getThumbnailFromDataSource(task: Task) = + withContext(dispatcherProvider.lightweightBackground) { + taskThumbnailDataSource.getThumbnail(task) + } + + private suspend fun getIconFromDataSource(task: Task) = + withContext(dispatcherProvider.lightweightBackground) { + val iconCacheEntry = taskIconDataSource.getIcon(task) + IconData(iconCacheEntry.icon, iconCacheEntry.contentDescription, iconCacheEntry.title) + } + + companion object { + private const val TAG = "TasksRepository" + } + + /** Helper class to support StateFlow emissions when using a Map with a MutableStateFlow. */ + private data class MapForStateFlow( + private val backingMap: Map, + private val updated: Long = System.nanoTime(), + ) : Map by backingMap + + private data class IconData( + val icon: Drawable, + val contentDescription: String, + val title: String, + ) +} diff --git a/quickstep/src/com/android/quickstep/recents/data/UserLockedRepository.kt b/quickstep/src/com/android/quickstep/recents/data/UserLockedRepository.kt new file mode 100644 index 00000000000..77d9b7e4701 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/UserLockedRepository.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.app.KeyguardManager +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.ConcurrentMap + +class UserLockedRepository(private val keyguardManager: KeyguardManager) : + UserLockedStateRepository { + private val cache: ConcurrentMap = ConcurrentHashMap() + + override fun invalidateCachedValues() { + cache.clear() + } + + override fun getIsUserLocked(userId: Int) = + cache.getOrPut(userId) { keyguardManager.isDeviceLocked(userId) } +} diff --git a/quickstep/src/com/android/quickstep/recents/data/UserLockedStateRepository.kt b/quickstep/src/com/android/quickstep/recents/data/UserLockedStateRepository.kt new file mode 100644 index 00000000000..5a1fea32643 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/data/UserLockedStateRepository.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +interface UserLockedStateRepository { + fun invalidateCachedValues() + + fun getIsUserLocked(userId: Int): Boolean +} diff --git a/quickstep/src/com/android/quickstep/recents/di/RecentsDependencies.kt b/quickstep/src/com/android/quickstep/recents/di/RecentsDependencies.kt new file mode 100644 index 00000000000..59684dda4e9 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/di/RecentsDependencies.kt @@ -0,0 +1,355 @@ +/* + * 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.quickstep.recents.di + +import android.app.KeyguardManager +import android.content.Context +import android.util.Log +import android.view.WindowManagerGlobal +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.RecentsModel +import com.android.quickstep.recents.data.DesktopTileBackgroundDataSource +import com.android.quickstep.recents.data.DesktopTileBackgroundRepository +import com.android.quickstep.recents.data.RecentTasksRepository +import com.android.quickstep.recents.data.TaskVisualsChangedDelegate +import com.android.quickstep.recents.data.TaskVisualsChangedDelegateImpl +import com.android.quickstep.recents.data.TasksRepository +import com.android.quickstep.recents.data.UserLockedRepository +import com.android.quickstep.recents.data.UserLockedStateRepository +import com.android.quickstep.recents.domain.usecase.GetObscuredDesktopTaskIdsUseCase +import com.android.quickstep.recents.domain.usecase.GetRemainingAppTimerDurationUseCase +import com.android.quickstep.recents.domain.usecase.GetSysUiStatusNavFlagsUseCase +import com.android.quickstep.recents.domain.usecase.GetTaskUseCase +import com.android.quickstep.recents.domain.usecase.GetThumbnailPositionUseCase +import com.android.quickstep.recents.domain.usecase.IsPointerConnectedUseCase +import com.android.quickstep.recents.domain.usecase.IsThumbnailValidUseCase +import com.android.quickstep.recents.domain.usecase.OrganizeDesktopTasksUseCase +import com.android.quickstep.recents.viewmodel.RecentsViewData +import com.android.systemui.shared.recents.utilities.PreviewPositionHelper.PreviewPositionHelperFactory +import kotlinx.coroutines.CoroutineName +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob + +internal typealias RecentsScopeId = String + +fun Any.toScopeId(): String = this as? RecentsScopeId ?: this.hashCode().toString() + +class RecentsDependencies +private constructor(appContext: Context, dispatcherProvider: DispatcherProvider) { + private val scopes = mutableMapOf() + + init { + startDefaultScope(appContext, dispatcherProvider) + } + + /** + * This function initialises the default scope with RecentsView dependencies. Some dependencies + * are global while others are per-RecentsView. The scope is used to differentiate between + * RecentsViews. + */ + private fun startDefaultScope(appContext: Context, dispatcherProvider: DispatcherProvider) { + Log.d(TAG, "startDefaultScope") + createScope(DEFAULT_SCOPE_ID).apply { + set(RecentsViewData::class.java.simpleName, RecentsViewData()) + val recentsCoroutineScope = + CoroutineScope( + SupervisorJob() + dispatcherProvider.unconfined + CoroutineName("RecentsView") + ) + set(CoroutineScope::class.java.simpleName, recentsCoroutineScope) + set(DispatcherProvider::class.java.simpleName, dispatcherProvider) + val recentsModel = RecentsModel.INSTANCE.get(appContext) + val taskVisualsChangedDelegate = + TaskVisualsChangedDelegateImpl( + recentsModel, + recentsModel.thumbnailCache.highResLoadingState, + ) + set(TaskVisualsChangedDelegate::class.java.simpleName, taskVisualsChangedDelegate) + val keyguardManager = appContext.getSystemService(KeyguardManager::class.java) + val userLockedRepository = UserLockedRepository(keyguardManager) + set(UserLockedStateRepository::class.java.simpleName, userLockedRepository) + + // Create RecentsTaskRepository singleton + val recentTasksRepository: RecentTasksRepository = + with(recentsModel) { + TasksRepository( + this, + thumbnailCache, + iconCache, + userLockedRepository, + taskVisualsChangedDelegate, + recentsCoroutineScope, + dispatcherProvider, + ) + } + set(RecentTasksRepository::class.java.simpleName, recentTasksRepository) + } + } + + /** + * This function initialises a scope associated with the dependencies of a single RecentsView. + * + * @param viewContext the Context associated with a RecentsView. + * @return the scope id associated with the new RecentsDependenciesScope. + */ + fun createRecentsViewScope(viewContext: Context): String { + val scopeId = viewContext.toScopeId() + Log.d(TAG, "createRecentsViewScope $scopeId") + val scope = + createScope(scopeId).apply { + set(RecentsViewData::class.java.simpleName, RecentsViewData()) + set(DisplayId::class.java.simpleName, DisplayId(viewContext.displayId)) + val dispatcherProvider: DispatcherProvider = + get(DEFAULT_SCOPE_ID) + val recentsCoroutineScope = + CoroutineScope( + SupervisorJob() + + dispatcherProvider.unconfined + + CoroutineName("RecentsView$scopeId") + ) + set(CoroutineScope::class.java.simpleName, recentsCoroutineScope) + } + scope.linkTo(getScope(DEFAULT_SCOPE_ID)) + return scopeId + } + + inline fun inject( + scopeId: RecentsScopeId = "", + extras: RecentsDependenciesExtras = RecentsDependenciesExtras(), + noinline factory: ((extras: RecentsDependenciesExtras) -> T)? = null, + ): T = inject(T::class.java, scopeId = scopeId, extras = extras, factory = factory) + + @Suppress("UNCHECKED_CAST") + @JvmOverloads + fun inject( + modelClass: Class, + scopeId: RecentsScopeId = DEFAULT_SCOPE_ID, + extras: RecentsDependenciesExtras = RecentsDependenciesExtras(), + factory: ((extras: RecentsDependenciesExtras) -> T)? = null, + ): T { + val currentScopeId = scopeId.ifEmpty { DEFAULT_SCOPE_ID } + val scope = scopes[currentScopeId] ?: createScope(currentScopeId) + + log("inject ${modelClass.simpleName} into ${scope.scopeId}", Log.INFO) + var instance: T? + synchronized(this) { + instance = getDependency(scope, modelClass) + log("found instance? $instance", Log.INFO) + if (instance == null) { + instance = + factory?.invoke(extras) as T ?: createDependency(modelClass, scopeId, extras) + scope[modelClass.simpleName] = instance!! + log( + "instance of $modelClass" + + " (${instance.hashCode()}) added to scope ${scope.scopeId}" + ) + } + } + return instance!! + } + + inline fun provide(scopeId: RecentsScopeId = "", noinline factory: () -> T): T = + provide(T::class.java, scopeId = scopeId, factory = factory) + + @JvmOverloads + fun provide( + modelClass: Class, + scopeId: RecentsScopeId = DEFAULT_SCOPE_ID, + factory: () -> T, + ) = inject(modelClass, scopeId, factory = { factory.invoke() }) + + private fun getDependency(scope: RecentsDependenciesScope, modelClass: Class): T? { + var instance: T? = scope[modelClass.simpleName] as T? + if (instance == null) { + instance = + scope.scopeIdsLinked.firstNotNullOfOrNull { scopeId -> + getScope(scopeId)[modelClass.simpleName] + } as T? + } + if (instance != null) log("Found dependency: $instance", Log.INFO) + return instance + } + + fun getScope(scope: Any) = getScope(scope.toScopeId()) + + fun getScope(scopeId: RecentsScopeId): RecentsDependenciesScope = + scopes[scopeId] ?: createScope(scopeId) + + fun removeScope(scope: Any) { + val scopeId = scope.toScopeId() + scopes[scopeId]?.close() + scopes.remove(scopeId) + log("Scope $scopeId removed") + } + + // TODO(b/353912757): Create a factory so we can prevent this method of growing indefinitely. + // Each class should be responsible for providing a factory function to create a new instance. + @Suppress("UNCHECKED_CAST") + private fun createDependency( + modelClass: Class, + scopeId: RecentsScopeId, + extras: RecentsDependenciesExtras, + ): T { + log("createDependency ${modelClass.simpleName} with $scopeId and $extras started", Log.WARN) + log("linked scopes: ${getScope(scopeId).scopeIdsLinked}") + val instance: Any = + when (modelClass) { + IsThumbnailValidUseCase::class.java -> + IsThumbnailValidUseCase(rotationStateRepository = inject(scopeId)) + GetRemainingAppTimerDurationUseCase::class.java -> + GetRemainingAppTimerDurationUseCase(appTimersRepository = inject(scopeId)) + GetTaskUseCase::class.java -> + GetTaskUseCase( + tasksRepository = inject(scopeId), + getRemainingAppTimerDurationUseCase = inject(scopeId), + userLockedStateRepository = inject(scopeId), + ) + GetSysUiStatusNavFlagsUseCase::class.java -> GetSysUiStatusNavFlagsUseCase() + GetThumbnailPositionUseCase::class.java -> + GetThumbnailPositionUseCase( + deviceProfileRepository = inject(scopeId), + rotationStateRepository = inject(scopeId), + previewPositionHelperFactory = PreviewPositionHelperFactory(), + ) + OrganizeDesktopTasksUseCase::class.java -> OrganizeDesktopTasksUseCase() + GetObscuredDesktopTaskIdsUseCase::class.java -> GetObscuredDesktopTaskIdsUseCase() + DesktopTileBackgroundDataSource::class.java -> + DesktopTileBackgroundDataSource( + WindowManagerGlobal.getWindowManagerService(), + inject(scopeId), + ) + DesktopTileBackgroundRepository::class.java -> + DesktopTileBackgroundRepository(inject(scopeId)) + IsPointerConnectedUseCase::class.java -> + IsPointerConnectedUseCase(pointerRepository = inject(scopeId)) + else -> { + log("Factory for ${modelClass.simpleName} not defined!", Log.ERROR) + error("Factory for ${modelClass.simpleName} not defined!") + } + } + return (instance as T).also { + log( + "createDependency ${modelClass.simpleName} with $scopeId and $extras completed", + Log.WARN, + ) + } + } + + private fun createScope(scopeId: RecentsScopeId): RecentsDependenciesScope { + return RecentsDependenciesScope(scopeId).also { scopes[scopeId] = it } + } + + private fun log(message: String, @Log.Level level: Int = Log.DEBUG) { + if (DEBUG) { + when (level) { + Log.WARN -> Log.w(TAG, message) + Log.VERBOSE -> Log.v(TAG, message) + Log.INFO -> Log.i(TAG, message) + Log.ERROR -> Log.e(TAG, message) + else -> Log.d(TAG, message) + } + } + } + + companion object { + const val DEFAULT_SCOPE_ID = "RecentsDependencies::GlobalScope" + private const val TAG = "RecentsDependencies" + private const val DEBUG = false + + @Volatile private var instance: RecentsDependencies? = null + + private fun initialize( + context: Context, + dispatcherProvider: DispatcherProvider, + ): RecentsDependencies { + Log.d(TAG, "initializing") + synchronized(this) { + val newInstance = + RecentsDependencies(context.applicationContext, dispatcherProvider) + instance = newInstance + return newInstance + } + } + + @JvmStatic + fun maybeInitialize( + context: Context, + dispatcherProvider: DispatcherProvider, + ): RecentsDependencies { + return instance ?: initialize(context, dispatcherProvider) + } + + fun getInstance(): RecentsDependencies { + return instance + ?: throw UninitializedPropertyAccessException( + "Recents dependencies are not initialized. " + + "Call `RecentsDependencies.maybeInitialize` before using this container." + ) + } + + @JvmStatic + fun destroy(viewContext: Context) { + synchronized(this) { + val localInstance = instance ?: return + val scopeId = viewContext.toScopeId() + val scope = localInstance.scopes[scopeId] + if (scope == null) { + Log.e( + TAG, + "Trying to destroy an unknown scope. Scopes: ${localInstance.scopes.size}", + ) + return + } + scope.close() + localInstance.scopes.remove(scopeId) + if (DEBUG) { + Log.d(TAG, "destroyed $scopeId", Exception("Printing stack trace")) + } else { + Log.d(TAG, "destroyed $scopeId") + } + if (localInstance.scopes.size == 1) { + // Only the default scope left - destroy this too. + instance = null + Log.d(TAG, "also destroyed default scope") + } + } + } + + fun hasScope(scope: Any) = + synchronized(this) { + val localInstance = instance ?: return false + localInstance.scopes.containsKey(scope.toScopeId()) + } + } +} + +inline fun RecentsDependencies.Companion.get( + scope: Any = "", + extras: RecentsDependenciesExtras = RecentsDependenciesExtras(), + noinline factory: ((extras: RecentsDependenciesExtras) -> T)? = null, +): T { + return getInstance().inject(scope.toScopeId(), extras, factory) +} + +inline fun RecentsDependencies.Companion.get( + scope: Any = "", + vararg extras: Pair, + noinline factory: ((extras: RecentsDependenciesExtras) -> T)? = null, +): T = get(scope, RecentsDependenciesExtras(extras), factory) + +fun RecentsDependencies.Companion.getScope(scopeId: Any) = getInstance().getScope(scopeId) + +@JvmInline value class DisplayId(val displayId: Int) diff --git a/quickstep/src/com/android/quickstep/recents/di/RecentsDependenciesExtras.kt b/quickstep/src/com/android/quickstep/recents/di/RecentsDependenciesExtras.kt new file mode 100644 index 00000000000..753cb6e7c9a --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/di/RecentsDependenciesExtras.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.quickstep.recents.di + +data class RecentsDependenciesExtras(private val data: MutableMap = mutableMapOf()) { + constructor(value: Array>) : this(value.toMap().toMutableMap()) + + operator fun get(key: String) = data[key] + + operator fun set(key: String, value: Any) { + data[key] = value + } +} diff --git a/quickstep/src/com/android/quickstep/recents/di/RecentsDependenciesScope.kt b/quickstep/src/com/android/quickstep/recents/di/RecentsDependenciesScope.kt new file mode 100644 index 00000000000..56bb1edfe98 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/di/RecentsDependenciesScope.kt @@ -0,0 +1,71 @@ +/* + * 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.quickstep.recents.di + +import android.util.Log + +class RecentsDependenciesScope( + val scopeId: RecentsScopeId, + private val dependencies: MutableMap = mutableMapOf(), + private val scopeIds: MutableList = mutableListOf() +) { + val scopeIdsLinked: List + get() = scopeIds.toList() + + operator fun get(identifier: String): Any? { + log("get $identifier") + return dependencies[identifier] + } + + operator fun set(key: String, value: Any) { + synchronized(this) { + log("set $key") + dependencies[key] = value + } + } + + fun remove(key: String): Any? { + synchronized(this) { + log("remove $key") + return dependencies.remove(key) + } + } + + fun linkTo(scope: RecentsDependenciesScope) { + log("linking to ${scope.scopeId}") + scopeIds += scope.scopeId + } + + fun close() { + log("reset") + synchronized(this) { dependencies.clear() } + } + + private fun log(message: String) { + if (DEBUG) Log.d(TAG, "[scopeId=$scopeId] $message") + } + + override fun toString(): String = + "scopeId: $scopeId" + + "\n dependencies: ${dependencies.map { "${it.key}=${it.value}" }.joinToString(", ")}" + + "\n linked to: ${scopeIds.joinToString(", ")}" + + private companion object { + private const val TAG = "RecentsDependenciesScope" + private const val DEBUG = false + } +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/model/DesktopLayoutConfig.kt b/quickstep/src/com/android/quickstep/recents/domain/model/DesktopLayoutConfig.kt new file mode 100644 index 00000000000..cd9ed271eac --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/model/DesktopLayoutConfig.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.model + +import android.graphics.Rect + +/** + * Holds pre-scaled configuration values related to desktop task layout dimensions. These values are + * typically derived from resources and then scaled according to the current view and screen + * dimensions. + * + * @property desktopBounds The rectangular area for layout. + * @property topBottomMarginOneRow Scaled margin for top/bottom when one row is shown. + * @property topMarginMultiRows Scaled top margin when multiple rows are shown. + * @property bottomMarginMultiRows Scaled bottom margin when multiple rows are shown. + * @property leftRightMarginOneRow Scaled margin for left/right when one row is shown. + * @property leftRightMarginMultiRows Scaled margin for left/right when multiple rows are shown. + * @property horizontalPaddingBetweenTasks Scaled horizontal padding between tasks. + * @property verticalPaddingBetweenTasks Scaled vertical padding between tasks. + * @property minTaskWidth Scaled minimum task width in the desktop exploded view layout. + * @property maxRows Maximum rows in the desktop exploded view layout. + */ +data class DesktopLayoutConfig( + val desktopBounds: Rect, + val topBottomMarginOneRow: Int, + val topMarginMultiRows: Int, + val bottomMarginMultiRows: Int, + val leftRightMarginOneRow: Int, + val leftRightMarginMultiRows: Int, + val horizontalPaddingBetweenTasks: Int, + val verticalPaddingBetweenTasks: Int, + val minTaskWidth: Int, + val maxRows: Int, +) diff --git a/quickstep/src/com/android/quickstep/recents/domain/model/DesktopTaskBoundsData.kt b/quickstep/src/com/android/quickstep/recents/domain/model/DesktopTaskBoundsData.kt new file mode 100644 index 00000000000..c95794f235d --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/model/DesktopTaskBoundsData.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.model + +import android.graphics.Rect + +/** + * Represents the layout data for a desktop task in Overview. It can either be a task that is + * rendered with specific bounds, or a task that is considered hidden from the main overview grid + * (e.g., couldn't fit). + */ +sealed class DesktopTaskBoundsData { + /** The ID of the task. */ + abstract val taskId: Int + + /** + * Data for a desktop task that is rendered with calculated bounds in the Overview grid. + * + * @param bounds The calculated bounds for the task in the Overview grid. + */ + data class RenderedDesktopTaskBoundsData(override val taskId: Int, val bounds: Rect) : + DesktopTaskBoundsData() + + /** + * Data for a desktop task that is not rendered in the main Overview grid (e.g., it couldn't fit + * or was otherwise excluded by the layout algorithm). The view layer is responsible for + * deciding how to represent this, if at all (e.g., with a small placeholder). + */ + data class HiddenDesktopTaskBoundsData(override val taskId: Int) : DesktopTaskBoundsData() +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/model/DesktopTaskVisibilityData.kt b/quickstep/src/com/android/quickstep/recents/domain/model/DesktopTaskVisibilityData.kt new file mode 100644 index 00000000000..381331055cc --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/model/DesktopTaskVisibilityData.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.model + +import android.graphics.Rect + +/** + * Data class to represent data for a desktop task in Overview. It contains its obscured state. It + * can either be a task that is rendered with specific bounds, or a task that is considered hidden + * from the main overview grid (e.g., couldn't fit). + */ +sealed class DesktopTaskVisibilityData { + /** + * The state of the window if it is obscured (completely overlapped by windows above it in the + * z-order). + */ + abstract val isObscured: Boolean + + /** + * Data for a desktop task that is rendered with calculated bounds in the Overview grid. + * + * @param bounds The calculated bounds for the task in the Overview grid. + */ + data class RenderedDesktopTaskVisibilityData( + override val isObscured: Boolean, + val bounds: Rect, + ) : DesktopTaskVisibilityData() + + /** + * Data for a desktop task that is not rendered in the main Overview grid (e.g., it couldn't fit + * or was otherwise excluded by the layout algorithm). The view layer is responsible for + * deciding how to represent this, if at all (e.g., with a small placeholder). + */ + data class HiddenDesktopTaskVisibilityData(override val isObscured: Boolean) : + DesktopTaskVisibilityData() +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/model/TaskModel.kt b/quickstep/src/com/android/quickstep/recents/domain/model/TaskModel.kt new file mode 100644 index 00000000000..05959e11385 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/model/TaskModel.kt @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.model + +import android.graphics.drawable.Drawable +import com.android.systemui.shared.recents.model.ThumbnailData +import java.time.Duration + +/** + * Data class representing a task in the application. + * + * This class holds the essential information about a task, including its unique identifier, display + * title, associated icon, optional thumbnail data, and background color. + * + * @property id The unique identifier for this task. Must be an integer. + * @property packageName top activity package for the task's app + * @property title The display title of the task. + * @property titleDescription A content description of the task. + * @property icon An optional drawable resource representing an icon for the task. Can be null if no + * icon is required. + * @property thumbnail An optional [ThumbnailData] object containing thumbnail information. Can be + * null if no thumbnail is needed. + * @property backgroundColor The background color of the task, represented as an integer color + * value. + * @property isLocked Indicates whether the [Task] is locked. + * @property isMinimized Indicates whether the [Task] is minimized. + * @property remainingAppDuration time remaining on the app timer for the application. + */ +data class TaskModel( + val id: TaskId, + val packageName: String, + val title: String?, + val titleDescription: String?, + val icon: Drawable?, + val thumbnail: ThumbnailData?, + val backgroundColor: Int, + val isLocked: Boolean, + val isMinimized: Boolean, + val remainingAppDuration: Duration?, +) + +typealias TaskId = Int diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/DesktopLayoutUtils.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/DesktopLayoutUtils.kt new file mode 100644 index 00000000000..757c2d2badc --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/DesktopLayoutUtils.kt @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Rect +import android.view.Gravity +import com.android.quickstep.recents.domain.model.DesktopLayoutConfig +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.RenderedDesktopTaskBoundsData + +/** Utility functions for desktop layout calculations. */ +object DesktopLayoutUtils { + + /** + * Calculates the minimum height required to display all tasks if they were to be rendered at + * their `layoutConfig.minTaskWidth`, maintaining their original aspect ratios. + * + * This ensures that when tasks are scaled to a minimum width, they are still tall enough to be + * recognizable and interactable, based on their original proportions. + * + * @param taskBounds The list of tasks with their original bounds. + * @param layoutConfig The layout configuration containing minimum task width and padding. + * @return The maximum height calculated across all tasks when scaled to `minTaskWidth`, or + * `layoutConfig.verticalPaddingBetweenTasks` if `minTaskWidth` is not positive or no valid + * task dimensions are found. + */ + fun getRequiredHeightForMinWidth( + taskBounds: List, + layoutConfig: DesktopLayoutConfig, + ): Int { + val defaultMinHeight = layoutConfig.verticalPaddingBetweenTasks + if (layoutConfig.minTaskWidth <= 0) { + return defaultMinHeight + } + + val maxCalculatedHeight = + taskBounds.maxOfOrNull { taskData -> + with(taskData.bounds) { + if (width() > 0 && height() > 0) { + val aspectRatio = height().toFloat() / width().toFloat() + (layoutConfig.minTaskWidth.toFloat() * aspectRatio).toInt() + } else 0 + } + } ?: 0 + + return Math.max(maxCalculatedHeight, defaultMinHeight) + } + + /** + * Creates a small, square placeholder Rect centered within the given + * [layoutConfig.desktopBounds]. The size of the square is determined by + * [layoutConfig.minTaskWidth]. Used for tasks that cannot be laid out due to the size + * constraints. + */ + fun createPlaceholderBounds(layoutConfig: DesktopLayoutConfig): Rect { + val desktopBounds = layoutConfig.desktopBounds + if (desktopBounds.isEmpty) { + // If desktopBounds is empty, we can't really center. Return an empty rect. + return Rect() + } + val size = minOf(layoutConfig.minTaskWidth, desktopBounds.width(), desktopBounds.height()) + return Rect().apply { Gravity.apply(Gravity.CENTER, size, size, desktopBounds, this) } + } + + /** Calculates the maximum possible height for a task window in the desktop tile in Overview. */ + fun getMaxTaskHeight(effectiveLayoutBounds: Rect) = effectiveLayoutBounds.height() + + /** + * Calculates the task height allowed given the constraint of fitting tasks into + * [layoutConfig].maxRows, considering necessary padding. Returns a positive height if possible, + * or verticalPadding if constraints make it impossible. + */ + fun getMinTaskHeightGivenMaxRows( + availableLayoutBounds: Rect, + layoutConfig: DesktopLayoutConfig, + ): Int { + val verticalPadding = layoutConfig.verticalPaddingBetweenTasks + if (layoutConfig.maxRows <= 0) { + return verticalPadding + } + + // The following calculation is to make sure the returned height is the minimum height that + // can't fix all windows in (maxRows +1) row. + val totalPaddingBetweenRows = layoutConfig.maxRows * verticalPadding + val heightForTaskContents = availableLayoutBounds.height() - totalPaddingBetweenRows + if (heightForTaskContents <= 0) { + return verticalPadding + } + return Math.max( + (heightForTaskContents.toFloat() / (layoutConfig.maxRows + 1) + 1).toInt(), + verticalPadding, + ) + } +} + +/** Calculates the effective bounds for layout by applying insets to the raw desktop bounds. */ +fun Rect.getLayoutEffectiveBounds( + singleRow: Boolean, + taskNumber: Int, + layoutConfig: DesktopLayoutConfig, +) = + Rect(this).apply { + val topInset = + if (singleRow) layoutConfig.topBottomMarginOneRow else layoutConfig.topMarginMultiRows + val bottomInset = + if (singleRow) layoutConfig.topBottomMarginOneRow + else layoutConfig.bottomMarginMultiRows + val leftInset = + if (singleRow && taskNumber <= 1) layoutConfig.leftRightMarginOneRow + else layoutConfig.leftRightMarginMultiRows + val rightInset = + if (singleRow && taskNumber <= 1) leftInset + else (leftInset - layoutConfig.horizontalPaddingBetweenTasks) + + inset(leftInset, topInset, rightInset, bottomInset) + } diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/GetObscuredDesktopTaskIdsUseCase.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetObscuredDesktopTaskIdsUseCase.kt new file mode 100644 index 00000000000..95001cc5bee --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetObscuredDesktopTaskIdsUseCase.kt @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Region +import com.android.quickstep.recents.ui.viewmodel.DesktopTaskViewModel.TaskPosition + +/** + * This usecase is responsible for returning the task IDs of all desktop windows that are completely + * obscured (they are completely overlapped by windows above them in the z-order). + */ +class GetObscuredDesktopTaskIdsUseCase { + operator fun invoke(desktopTaskPositions: List): Set { + var obscuredWindowIdSet = mutableSetOf() + val totalOccludedRegion = Region() + + // From top to bottom in the z-order, keep adding the area of each visible window to + // totalOccludedRegion to check if each window is obscured. + desktopTaskPositions.forEach { taskPosition -> + // If window is minimized, it won't occlude our window or be occluded, and we can + // continue. + if (taskPosition.isMinimized) { + return@forEach + } + + // To see if the occluded region completely obscures the current window, check if + // the intersection of the region and the task bounds is the same as the task bounds + // itself. If the window is completely obscured, the intersection should also be a + // single rectangle (not complex) and we can use Region.quickContains() to verify + // they are the same. + val currentOccludedRegion = Region(totalOccludedRegion) + currentOccludedRegion.op(taskPosition.bounds, Region.Op.INTERSECT) + if (currentOccludedRegion.quickContains(taskPosition.bounds)) { + obscuredWindowIdSet.add(taskPosition.taskId) + } else { + // Add the window's bounds to the total occluded region for the next iteration. This + // only needs to be done if the current window isn't occluded, as otherwise its + // bounds are already part of the total. + totalOccludedRegion.op(taskPosition.bounds, Region.Op.UNION) + } + } + + return obscuredWindowIdSet + } +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/GetRemainingAppTimerDurationUseCase.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetRemainingAppTimerDurationUseCase.kt new file mode 100644 index 00000000000..8128d1fe88c --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetRemainingAppTimerDurationUseCase.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.os.UserHandle +import com.android.quickstep.recents.data.AppTimersRepository +import java.time.Duration + +/** + * Use case that provides remaining duration on the app usage limit timer set for the given user. + * + * Responsible for applying business rules around how the remaining time is treated within overview + * module e.g. rounds partial minutes to the next minute. + */ +class GetRemainingAppTimerDurationUseCase(private val appTimersRepository: AppTimersRepository) { + suspend operator fun invoke(packageName: String, userHandle: UserHandle): Duration? { + val totalRemainingDuration = + appTimersRepository.getRemainingDuration(packageName, userHandle) ?: return null + val totalRemainingMs = totalRemainingDuration.toMillis() + + val isLessThanAMinute = totalRemainingMs < MS_IN_A_MINUTE + val isInWholeMinutes = (totalRemainingMs % MS_IN_A_MINUTE) == 0L + return when { + isLessThanAMinute || isInWholeMinutes -> totalRemainingDuration + else -> Duration.ofMinutes(totalRemainingDuration.toMinutes() + 1) + } + } + + companion object { + private const val MS_IN_A_MINUTE: Int = 60000 + } +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/GetSysUiStatusNavFlagsUseCase.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetSysUiStatusNavFlagsUseCase.kt new file mode 100644 index 00000000000..da0e2d10fc8 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetSysUiStatusNavFlagsUseCase.kt @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS +import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS +import com.android.launcher3.util.SystemUiController.FLAG_DARK_NAV +import com.android.launcher3.util.SystemUiController.FLAG_DARK_STATUS +import com.android.launcher3.util.SystemUiController.FLAG_LIGHT_NAV +import com.android.launcher3.util.SystemUiController.FLAG_LIGHT_STATUS +import com.android.systemui.shared.recents.model.ThumbnailData + +/** UseCase to calculate flags for status bar and navigation bar */ +class GetSysUiStatusNavFlagsUseCase { + operator fun invoke(thumbnailData: ThumbnailData?): Int { + if (thumbnailData == null) return 0 + val thumbnailAppearance = thumbnailData.appearance + var flags = 0 + flags = + flags or + if (thumbnailAppearance and APPEARANCE_LIGHT_STATUS_BARS != 0) FLAG_LIGHT_STATUS + else FLAG_DARK_STATUS + flags = + flags or + if (thumbnailAppearance and APPEARANCE_LIGHT_NAVIGATION_BARS != 0) FLAG_LIGHT_NAV + else FLAG_DARK_NAV + return flags + } +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/GetTaskUseCase.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetTaskUseCase.kt new file mode 100644 index 00000000000..4a0b537f374 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetTaskUseCase.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.os.UserHandle +import com.android.launcher3.Flags.enableLaterIsLockedCheck +import com.android.launcher3.Flags.enableRefactorDigitalWellbeingToast +import com.android.quickstep.recents.data.RecentTasksRepository +import com.android.quickstep.recents.data.UserLockedStateRepository +import com.android.quickstep.recents.domain.model.TaskModel +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map + +class GetTaskUseCase( + private val tasksRepository: RecentTasksRepository, + private val getRemainingAppTimerDurationUseCase: GetRemainingAppTimerDurationUseCase, + private val userLockedStateRepository: UserLockedStateRepository, +) { + operator fun invoke(taskId: Int): Flow = + tasksRepository.getTaskDataById(taskId).map { task -> + if (task == null) return@map null + + val packageName = task.topComponent.packageName + + // TODO(b/405359794): If getTask for a single task ends up being called multiple + // times by the UI, explore alternatives of loading the timer info only once. + val remainingDuration = + if (enableRefactorDigitalWellbeingToast()) { + getRemainingAppTimerDurationUseCase( + packageName = packageName, + userHandle = UserHandle(task.key.userId), + ) + } else { + null + } + + val isLocked = + if (enableLaterIsLockedCheck()) + userLockedStateRepository.getIsUserLocked(task.key.userId) + else task.isLocked + + TaskModel( + id = task.key.id, + packageName = packageName, + title = task.title, + titleDescription = task.titleDescription, + icon = task.icon, + thumbnail = task.thumbnail, + backgroundColor = task.colorBackground, + isLocked = isLocked, + isMinimized = task.isMinimized, + remainingAppDuration = remainingDuration, + ) + } +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/GetThumbnailPositionUseCase.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetThumbnailPositionUseCase.kt new file mode 100644 index 00000000000..27ac7381cef --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/GetThumbnailPositionUseCase.kt @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Matrix +import android.graphics.Rect +import com.android.quickstep.recents.data.RecentsDeviceProfileRepository +import com.android.quickstep.recents.data.RecentsRotationStateRepository +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.systemui.shared.recents.utilities.PreviewPositionHelper +import com.android.wm.shell.shared.split.SplitBounds + +/** Use case for retrieving [Matrix] for positioning Thumbnail in a View */ +class GetThumbnailPositionUseCase( + private val deviceProfileRepository: RecentsDeviceProfileRepository, + private val rotationStateRepository: RecentsRotationStateRepository, + private val previewPositionHelperFactory: PreviewPositionHelper.PreviewPositionHelperFactory, +) { + operator fun invoke( + thumbnailData: ThumbnailData?, + width: Int, + height: Int, + isRtl: Boolean, + splitBounds: SplitBounds?, + splitPosition: Int, + densityDpi: Int, + ): ThumbnailPosition { + val thumbnail = + thumbnailData?.thumbnail ?: return ThumbnailPosition(Matrix.IDENTITY_MATRIX, false) + + val previewPositionHelper = previewPositionHelperFactory.create() + previewPositionHelper.setSplitBounds(splitBounds, splitPosition) + previewPositionHelper.updateThumbnailMatrix( + Rect(0, 0, thumbnail.width, thumbnail.height), + thumbnailData, + width, + height, + deviceProfileRepository.getRecentsDeviceProfile().isLargeScreen, + rotationStateRepository.getRecentsRotationState().activityRotation, + isRtl, + densityDpi, + ) + return ThumbnailPosition( + matrix = previewPositionHelper.matrix, + isRotated = previewPositionHelper.isOrientationChanged, + ) + } +} + +data class ThumbnailPosition(val matrix: Matrix, val isRotated: Boolean) diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/IsPointerConnectedUseCase.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/IsPointerConnectedUseCase.kt new file mode 100644 index 00000000000..aad461553a7 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/IsPointerConnectedUseCase.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import com.android.quickstep.recents.data.PointerRepository + +class IsPointerConnectedUseCase(val pointerRepository: PointerRepository) { + fun isAnyPointerDeviceConnected(): Boolean = pointerRepository.isAnyPointerDeviceConnected() +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/IsThumbnailValidUseCase.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/IsThumbnailValidUseCase.kt new file mode 100644 index 00000000000..13254aa72e4 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/IsThumbnailValidUseCase.kt @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Bitmap +import android.view.Surface +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT +import com.android.quickstep.recents.data.RecentsRotationStateRepository +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.systemui.shared.recents.utilities.PreviewPositionHelper +import com.android.systemui.shared.recents.utilities.Utilities +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_10_90 +import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_90_10 + +/** + * Use case responsible for validating the aspect ratio and rotation of a thumbnail against the + * expected values based on the view's dimensions and the current rotation state. + * + * This class checks if the thumbnail's aspect ratio significantly differs from the aspect ratio of + * the view it is intended to be displayed in, and if the thumbnail's rotation is consistent with + * the device's current rotation state. + * + * @property rotationStateRepository Repository providing the current rotation state of the device. + */ +class IsThumbnailValidUseCase(private val rotationStateRepository: RecentsRotationStateRepository) { + operator fun invoke(thumbnailData: ThumbnailData?, viewWidth: Int, viewHeight: Int, + splitBounds: SplitBounds?, stagePosition: Int): Boolean { + val thumbnail = thumbnailData?.thumbnail ?: return false + return !isInaccurateThumbnail(thumbnail, viewWidth, viewHeight, thumbnailData.rotation, + splitBounds, stagePosition) + } + + private fun isInaccurateThumbnail( + thumbnail: Bitmap, + viewWidth: Int, + viewHeight: Int, + rotation: Int, + splitBounds: SplitBounds?, + stagePosition: Int, + ) = isAspectRatioDifferentFromViewAspectRatio( + thumbnail = thumbnail, + width = viewWidth.toFloat(), + height = viewHeight.toFloat(), + splitBounds = splitBounds, + stagePosition = stagePosition + ) || isRotationDifferentFromTask(rotation) + + private fun isAspectRatioDifferentFromViewAspectRatio( + thumbnail: Bitmap, + width: Float, + height: Float, + splitBounds: SplitBounds?, + stagePosition: Int, + ): Boolean { + // TODO(b/428983119): Pass in a rect for visible bounds and compare that instead of the + // thumbnail width/height aspect ratio to avoid special casing flex split checks + if (splitBounds != null) { + val isTopLeft10PercentApp = + (splitBounds.snapPosition == SNAP_TO_2_10_90 && + stagePosition == STAGE_POSITION_TOP_OR_LEFT) + val isBottomRight10PercentApp = + (splitBounds.snapPosition == SNAP_TO_2_90_10 && + stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) + if (isTopLeft10PercentApp || isBottomRight10PercentApp) { + return false + } + } + + return Utilities.isRelativePercentDifferenceGreaterThan( + /* first = */ width / height, + /* second = */ thumbnail.width / thumbnail.height.toFloat(), + /* bound = */ PreviewPositionHelper.MAX_PCT_BEFORE_ASPECT_RATIOS_CONSIDERED_DIFFERENT, + ) + } + + private fun isRotationDifferentFromTask(thumbnailRotation: Int): Boolean { + val rotationState = rotationStateRepository.getRecentsRotationState() + return if (rotationState.orientationHandlerRotation == Surface.ROTATION_0) { + (rotationState.activityRotation - thumbnailRotation) % 2 != 0 + } else { + rotationState.orientationHandlerRotation != thumbnailRotation + } + } +} diff --git a/quickstep/src/com/android/quickstep/recents/domain/usecase/OrganizeDesktopTasksUseCase.kt b/quickstep/src/com/android/quickstep/recents/domain/usecase/OrganizeDesktopTasksUseCase.kt new file mode 100644 index 00000000000..b10080f5007 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/domain/usecase/OrganizeDesktopTasksUseCase.kt @@ -0,0 +1,603 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Rect +import android.graphics.RectF +import androidx.core.graphics.toRect +import com.android.quickstep.recents.domain.model.DesktopLayoutConfig +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.HiddenDesktopTaskBoundsData +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.RenderedDesktopTaskBoundsData + +/** + * This usecase is responsible for organizing desktop windows in a non-overlapping way, and can also + * reflow a layout when a task is dismissed. + */ +class OrganizeDesktopTasksUseCase { + + /** + * Arranges desktop tasks or rebalances layout after a task dismissal. + * + * @param allCurrentOriginalTaskBounds List of all tasks currently considered for layout, with + * their original, unorganized bounds. If a task is being dismissed, it should be included in + * this list. + * @param layoutConfig Configuration for layout (margins, padding, etc.). + * @param taskPositionsHint A hint of the previous task positions, used to decide whether to + * reflow. + * @param dismissedTaskId Optional ID of a task to be dismissed. If provided, the logic may + * choose to reflow the existing layout or perform a full reorganization. + * @return A list of [DesktopTaskBoundsData] representing the new layout. Tasks that are laid + * out are [RenderedDesktopTaskBoundsData]; tasks that are hidden (due to empty original + * bounds or inability to fit) are [HiddenDesktopTaskBoundsData]. + */ + operator fun invoke( + allCurrentOriginalTaskBounds: List, + layoutConfig: DesktopLayoutConfig, + taskPositionsHint: List? = null, + dismissedTaskId: Int? = null, + ): List { + if (dismissedTaskId == null) { + // No task dismissed, perform full organization on all current tasks. + return performFullOrganization(allCurrentOriginalTaskBounds, layoutConfig) + } + + // A task is being dismissed. + val remainingOriginalTaskBounds = + allCurrentOriginalTaskBounds.filterNot { it.taskId == dismissedTaskId } + + if (remainingOriginalTaskBounds.isEmpty() || taskPositionsHint == null) { + // Last task was dismissed or we don't have any previous layout position data, + // performFullOrganization will be performed. + return performFullOrganization(remainingOriginalTaskBounds, layoutConfig) + } + + val remainingPreviousOrganizedTaskPosition = + taskPositionsHint.filterNot { it.taskId == dismissedTaskId } + val dismissedTaskData = taskPositionsHint.find { it.taskId == dismissedTaskId } + // If the dismissed task window was a hidden task window, we can still use the previous + // layout. + if (dismissedTaskData is HiddenDesktopTaskBoundsData) { + return remainingPreviousOrganizedTaskPosition + } + + val hadHiddenTasksInPreviousLayout = + remainingPreviousOrganizedTaskPosition.any { it is HiddenDesktopTaskBoundsData } + if (hadHiddenTasksInPreviousLayout) { + // Now, check whether the new full layout can show/hide different set of task + // windows, if so, use the full layout, otherwise, use the reflow layout. + val tentativeLayoutForRemaining = + performFullOrganization(remainingOriginalTaskBounds, layoutConfig) + + val taskIds1 = + tentativeLayoutForRemaining + .filterIsInstance() + .map { it.taskId } + .toSet() + val taskIds2 = + remainingPreviousOrganizedTaskPosition + .filterIsInstance() + .map { it.taskId } + .toSet() + if (taskIds1 != taskIds2) { + return tentativeLayoutForRemaining + } + } + + val reflowedRenderedTasks = + performReflowRebalance( + currentLayout = + taskPositionsHint.filterIsInstance< + RenderedDesktopTaskBoundsData + >(), // Pass only rendered tasks for reflow logic + taskIdToRemove = dismissedTaskId, + layoutConfig = layoutConfig, + ) + + // Preserve hidden tasks from the previous layout (that were not the dismissed task). + val hiddenTasksToPreserve = + remainingPreviousOrganizedTaskPosition.filterIsInstance() + + return reflowedRenderedTasks + hiddenTasksToPreserve + } + + /** + * Arranges a list of desktop tasks within specified screen bounds for display in Overview. The + * layout process aims to maximize task visibility and create a balanced, non-overlapping + * arrangement. + * + * The layout is performed in several stages: + * 1. Optimal Height Determination: The algorithm bisects for an optimal height for task + * previews to maximize their size while ensuring all valid tasks can fit. + * 2. Row Width Balancing: The available width is iteratively adjusted to balance the widths of + * task rows, minimizing wasted space and preventing overly sparse or dense rows. + * 3. Centering: The successfully arranged tasks are then centered collectively within the + * effective layout area. + * + * Input tasks ([taskBounds]) are provided as [RenderedDesktopTaskBoundsData]. Tasks from this + * list that have empty `bounds` are immediately converted to [HiddenDesktopTaskBoundsData]. For + * the remaining tasks with valid bounds, the algorithm attempts to lay them out. + * + * Constraints such as minimum task width (`layoutConfig.minTaskWidth`) and a maximum number of + * rows (`layoutConfig.maxRows`, which influences minimum task height) are respected for tasks + * that can be rendered. + * + * Tasks that cannot be successfully placed by the layout algorithm (e.g., due to insufficient + * space or exceeding the maximum number of displayable items based on constraints) are also + * returned as [HiddenDesktopTaskBoundsData]. The visual representation of these hidden tasks + * (e.g., as placeholders) is handled by the caller. + * + * For more details on the original layout strategy and goals, see b/421417134. + * + * @param taskBounds A list of [RenderedDesktopTaskBoundsData] representing the tasks to be + * arranged. Each item includes the task's ID and its original bounds. + * @param layoutConfig Configuration parameters for the layout, including margins, padding, + * minimum task dimensions, and maximum row count. + * @return A list of [DesktopTaskBoundsData], with each element corresponding to an input task. + * Elements will be [RenderedDesktopTaskBoundsData] with new, calculated bounds if the task is + * laid out, or [HiddenDesktopTaskBoundsData] if the task was initially empty-bounded or could + * not fit into the layout. + */ + private fun performFullOrganization( + taskBounds: List, + layoutConfig: DesktopLayoutConfig, + ): List { + if (taskBounds.isEmpty()) { + return emptyList() + } + + val validTaskBounds = + taskBounds + .filterNot { it.bounds.isEmpty } + .map { RenderedDesktopTaskBoundsData(taskId = it.taskId, bounds = it.bounds) } + + if (layoutConfig.desktopBounds.isEmpty || validTaskBounds.isEmpty()) { + return taskBounds.map { HiddenDesktopTaskBoundsData(it.taskId) } + } + + // Assuming we can place all windows in one row, do one pass first to check whether all + // windows can fit. + // Use [validTaskBounds] here to calculate the desired effective layout bounds. + var availableLayoutBounds = + layoutConfig.desktopBounds.getLayoutEffectiveBounds( + singleRow = true, + taskNumber = validTaskBounds.size, + layoutConfig, + ) + var resultRects = + findOptimalHeightAndBalancedWidth(availableLayoutBounds, validTaskBounds, layoutConfig) + + // If the windows can't fit in one row, try to fit them in multiple rows. + if (!canFitInOneRow(resultRects)) { + availableLayoutBounds = + layoutConfig.desktopBounds.getLayoutEffectiveBounds( + singleRow = false, + taskNumber = validTaskBounds.size, + layoutConfig, + ) + resultRects = + findOptimalHeightAndBalancedWidth( + availableLayoutBounds, + validTaskBounds, + layoutConfig, + ) + } + + // If there are hidden windows in [resultRects] at the moment, this means the current height + // in [resultRects] might not be the optimal height for the visible windows since the layout + // calculation requires shrinking the height to find a height that can fit all windows until + // it can no longer shrink because of the size constraints, by when we know some windows can + // not fit in Overview and need to be hidden. So here, we should run the layout algorithm + // again to find the optimal height to fit all visible windows, without considering hidden + // windows. + val (visibleResultRects, invisibleResultRects) = + resultRects.withIndex().partition { !it.value.isEmpty } + if (visibleResultRects.isNotEmpty()) { + val visibleTaskBounds = visibleResultRects.map { validTaskBounds[it.index] } + // Re-run the layout logic with just the visible windows to ensure they are + // optimally sized. + val singleRow = canFitInOneRow(resultRects) + availableLayoutBounds = + layoutConfig.desktopBounds.getLayoutEffectiveBounds( + singleRow = singleRow, + taskNumber = visibleTaskBounds.size, + layoutConfig, + ) + val newLaidOutRects = + findOptimalHeightAndBalancedWidth( + availableLayoutBounds, + visibleTaskBounds, + layoutConfig, + ) + resultRects = newLaidOutRects + invisibleResultRects.map { it.value } + } + + val successfullyLaidOutRectFs = resultRects.filter { !it.isEmpty } + if (successfullyLaidOutRectFs.isNotEmpty()) { + val maxBottom = successfullyLaidOutRectFs.maxOfOrNull { it.bottom } ?: 0f + centerTaskWindows( + availableLayoutBounds, + maxBottom.toInt(), + successfullyLaidOutRectFs, + layoutConfig, + ) + } + + val laidOutBoundsMap = mutableMapOf() + validTaskBounds.forEachIndexed { index, taskData -> + val rectF = resultRects.getOrNull(index) + if (rectF != null && !rectF.isEmpty) { + laidOutBoundsMap[taskData.taskId] = rectF + } + } + + return taskBounds.map { originalInputTask -> + val taskId = originalInputTask.taskId + val laidOutRectF = laidOutBoundsMap[taskId] + if (laidOutRectF != null) { // Successfully laid out + RenderedDesktopTaskBoundsData(taskId = taskId, bounds = laidOutRectF.toRect()) + } else { + HiddenDesktopTaskBoundsData(taskId) + } + } + } + + /** + * @param currentLayout The list of [RenderedDesktopTaskBoundsData] representing the current + * layout. + * @param taskIdToRemove The ID of the task to remove. + * @return A new list of [RenderedDesktopTaskBoundsData] with the task removed and layout + * rebalanced. + */ + private fun performReflowRebalance( + currentLayout: List, + taskIdToRemove: Int, + layoutConfig: DesktopLayoutConfig, + ): List { + val taskToRemoveData = + currentLayout.find { it.taskId == taskIdToRemove } + ?: return currentLayout // Task not found, return original layout + + val remainingTasks = currentLayout.filterNot { it.taskId == taskIdToRemove } + if (remainingTasks.isEmpty()) { + return emptyList() + } + + // Get the overall bounds of the current tasks. + val overallBounds = + currentLayout.fold(Rect()) { acc, taskData -> acc.apply { union(taskData.bounds) } } + + val remainingRows = remainingTasks.groupBy { it.bounds.top }.toSortedMap() + + val newLayout = mutableListOf() + // Check if the removed task was on its own row. + if (currentLayout.count { it.bounds.top == taskToRemoveData.bounds.top } == 1) { + val layoutCenterY = overallBounds.centerY().toFloat() + val totalHeight = + remainingRows.entries.sumOf { (_, tasks) -> tasks.maxOf { it.bounds.height() } } + + (remainingRows.size - 1) * layoutConfig.verticalPaddingBetweenTasks + + var currentY = layoutCenterY - totalHeight / 2f + for ((_, tasks) in remainingRows.entries) { + for (taskData in tasks) { + val newBounds = Rect(taskData.bounds) + newBounds.offsetTo(newBounds.left, currentY.toInt()) + newLayout.add(RenderedDesktopTaskBoundsData(taskData.taskId, newBounds)) + } + currentY += + tasks.maxOf { it.bounds.height() } + layoutConfig.verticalPaddingBetweenTasks + } + } else { + for ((rowY, tasks) in remainingRows.entries) { + // Re-center tasks that were on the same row as the removed task. + if (rowY != taskToRemoveData.bounds.top) { + // This row is not affected, add tasks with their original bounds + newLayout.addAll(tasks) + continue + } + + val layoutCenterX = overallBounds.centerX().toFloat() + + // This is the affected row, re-calculate X positions. + val totalWidth = + tasks.sumOf { it.bounds.width() } + + (tasks.size - 1) * layoutConfig.horizontalPaddingBetweenTasks + var currentX = layoutCenterX - totalWidth.toFloat() / 2f + for (taskData in tasks) { + val newBounds = Rect(taskData.bounds) + newBounds.offsetTo(currentX.toInt(), rowY) + newLayout.add(RenderedDesktopTaskBoundsData(taskData.taskId, newBounds)) + currentX += + taskData.bounds.width() + + layoutConfig.horizontalPaddingBetweenTasks.toFloat() + } + } + } + + return newLayout + } + + /** + * Determines the optimal height for task windows and balances the row widths to minimize wasted + * space. Returns the bounds for each task window after layout. + */ + private fun findOptimalHeightAndBalancedWidth( + availableLayoutBounds: Rect, + validTaskBounds: List, + layoutConfig: DesktopLayoutConfig, + ): List { + // Right bound of the narrowest row. + var minRight: Int + // Right bound of the widest row. + var maxRight: Int + + // Keep track of the difference between the narrowest and the widest row. + // Initially this is set to the worst it can ever be assuming the windows fit. + var widthDiff = availableLayoutBounds.width() + + // Initially allow the windows to occupy all available width. Shrink this available space + // horizontally to find the breakdown into rows that achieves the minimal [widthDiff]. + var rightBound = availableLayoutBounds.right + + // Determine the optimal height bisecting between [lowHeight] and [highHeight]. Once this + // optimal height is known, [heightFixed] is set to `true` and the rows are balanced by + // repeatedly squeezing the widest row to cause windows to overflow to the subsequent rows. + var lowHeight = + maxOf( + DesktopLayoutUtils.getMinTaskHeightGivenMaxRows( + availableLayoutBounds, + layoutConfig, + ), + DesktopLayoutUtils.getRequiredHeightForMinWidth(validTaskBounds, layoutConfig), + ) + var highHeight = maxOf(lowHeight, availableLayoutBounds.height() + 1) + var optimalHeight = 0.5f * (lowHeight + highHeight) + var heightFixed = false + + // Repeatedly try to fit the windows [resultRects] within [rightBound]. If a maximum + // [optimalHeight] is found such that all window [resultRects] fit, this fitting continues + // while shrinking the [rightBound] in order to balance the rows. If the windows fit the + // [rightBound] would have been decremented at least once so it needs to be incremented once + // before getting out of this loop and one additional pass made to actually fit the + // [resultRects]. If the [resultRects] cannot fit (e.g. there are too many windows) the + // bisection will still finish and we might increment the [rightBound] one pixel extra + // which is acceptable since there is an unused margin on the right. + var makeLastAdjustment = false + var resultRects: List + + while (true) { + val fitWindowResult = + fitWindowRectsInBounds( + Rect(availableLayoutBounds).apply { right = rightBound }, + validTaskBounds, + minOf( + DesktopLayoutUtils.getMaxTaskHeight(availableLayoutBounds), + optimalHeight.toInt(), + ), + layoutConfig, + ) + val allWindowsFit = fitWindowResult.allWindowsFit + resultRects = fitWindowResult.calculatedBounds + minRight = fitWindowResult.minRight + maxRight = fitWindowResult.maxRight + + if (heightFixed) { + if (!allWindowsFit) { + // Revert the previous change to [rightBound] and do one last pass. + rightBound++ + makeLastAdjustment = true + break + } + // Break if all the windows are zero-width at the current scale. + if (maxRight <= availableLayoutBounds.left) { + break + } + } else { + // Find the optimal row height bisecting between [lowHeight] and [highHeight]. + if (allWindowsFit) { + lowHeight = optimalHeight.toInt() + } else { + highHeight = optimalHeight.toInt() + } + optimalHeight = 0.5f * (lowHeight + highHeight) + // When height can no longer be improved, start balancing the rows. + if (optimalHeight.toInt() == lowHeight) { + heightFixed = true + } + } + + if (allWindowsFit && heightFixed) { + if (maxRight - minRight <= widthDiff) { + // Row alignment is getting better. Try to shrink the [rightBound] in order to + // squeeze the widest row. + rightBound = maxRight - 1 + widthDiff = maxRight - minRight + } else { + // Row alignment is getting worse. + // Revert the previous change to [rightBound] and do one last pass. + rightBound++ + makeLastAdjustment = true + break + } + } + } + + // Once the windows no longer fit, the change to [rightBound] was reverted. Perform one last + // pass to position the [resultRects]. + if (makeLastAdjustment) { + val fitWindowResult = + fitWindowRectsInBounds( + Rect(availableLayoutBounds).apply { right = rightBound }, + validTaskBounds, + minOf( + DesktopLayoutUtils.getMaxTaskHeight(availableLayoutBounds), + optimalHeight.toInt(), + ), + layoutConfig, + ) + resultRects = fitWindowResult.calculatedBounds + } + + return resultRects + } + + /** + * Data structure to hold the returned result of [fitWindowRectsInBounds] function. + * [allWindowsFit] specifies whether all windows can be fit into the provided layout bounds. + * [calculatedBounds] specifies the output bounds for all provided task windows. [minRight] + * specifies the right bound of the narrowest row. [maxRight] specifies the right bound of the + * widest rows. + */ + data class FitWindowResult( + val allWindowsFit: Boolean, + val calculatedBounds: List, + val minRight: Int, + val maxRight: Int, + ) + + /** + * Attempts to fit all [taskBounds] inside [layoutBounds]. The method ensures that the returned + * output bounds list has appropriate size and populates it with the values placing task windows + * next to each other left-to-right in rows of equal [optimalWindowHeight]. + */ + private fun fitWindowRectsInBounds( + layoutBounds: Rect, + taskBounds: List, + optimalWindowHeight: Int, + layoutConfig: DesktopLayoutConfig, + ): FitWindowResult { + val numTasks = taskBounds.size + val outRects = MutableList(numTasks) { RectF() } + + val verticalPadding = layoutConfig.verticalPaddingBetweenTasks + val horizontalPadding = layoutConfig.horizontalPaddingBetweenTasks + + // Start in the top-left corner of [layoutBounds]. + var left = layoutBounds.left + var top = layoutBounds.top + + // Right bound of the narrowest row. + var minRight = layoutBounds.right + // Right bound of the widest row. + var maxRight = layoutBounds.left + + var allWindowsFit = true + for (i in 0 until numTasks) { + val taskBounds = taskBounds[i].bounds + + // Use the height to calculate the width + val scale = optimalWindowHeight / taskBounds.height().toFloat() + val width = (taskBounds.width() * scale).toInt() + val optimalRowHeight = optimalWindowHeight + verticalPadding + + if (left + width + horizontalPadding > layoutBounds.right) { + // Move to the next row if possible. + minRight = minOf(minRight, left) + maxRight = maxOf(maxRight, left) + top += optimalRowHeight + + // Check if the new row reaches the bottom or if the first item in the new + // row does not fit within the available width. + if ( + (top + optimalRowHeight) > layoutBounds.bottom || + layoutBounds.left + width + horizontalPadding > layoutBounds.right + ) { + allWindowsFit = false + break + } + left = layoutBounds.left + } + + // Position the current rect. + outRects[i] = + RectF( + left.toFloat(), + top.toFloat(), + (left + width).toFloat(), + (top + optimalWindowHeight).toFloat(), + ) + + // Increment horizontal position. + left += (width + horizontalPadding) + } + + // Update the narrowest and widest row width for the last row. + minRight = minOf(minRight, left) + maxRight = maxOf(maxRight, left) + + return FitWindowResult(allWindowsFit, outRects, minRight, maxRight) + } + + /** Centers task windows in the center of Overview. */ + private fun centerTaskWindows( + layoutBounds: Rect, + maxBottom: Int, + outWindowRects: List, + layoutConfig: DesktopLayoutConfig, + ) { + if (outWindowRects.isEmpty()) { + return + } + + val currentRowUnionRange = RectF(outWindowRects[0]) + var currentRowY = outWindowRects[0].top + var currentRowFirstItemIndex = 0 + val offsetY = (layoutBounds.bottom - maxBottom) / 2f + val horizontal_padding = + if (outWindowRects.size == 1) 0 else layoutConfig.horizontalPaddingBetweenTasks + + // Batch process to center overview desktop task windows within the same row. + fun batchCenterDesktopTaskWindows(endIndex: Int) { + // Calculate the shift amount required to center the desktop task items. + val rangeCenterX = + (currentRowUnionRange.left + currentRowUnionRange.right + horizontal_padding) / 2f + val currentDiffX = (layoutBounds.centerX() - rangeCenterX).coerceAtLeast(0f) + for (j in currentRowFirstItemIndex until endIndex) { + outWindowRects[j].offset(currentDiffX, offsetY) + } + } + + outWindowRects.forEachIndexed { index, rect -> + if (rect.top != currentRowY) { + // As a new row begins processing, batch-shift the previous row's rects + // and reset its parameters. + batchCenterDesktopTaskWindows(index) + currentRowUnionRange.set(rect) + currentRowY = rect.top + currentRowFirstItemIndex = index + } + + // Extend the range by adding the [rect]'s width and extra in-between items + // spacing. + currentRowUnionRange.right = rect.right + } + + // Post-processing rects in the last row. + batchCenterDesktopTaskWindows(outWindowRects.size) + } + + /** Returns true if all task windows can fit in one row. */ + private fun canFitInOneRow(resultRect: List): Boolean { + val visibleRects = resultRect.filter { !it.isEmpty } + if (visibleRects.isEmpty()) { + return true + } + + val firstTop = visibleRects.first().top + return visibleRects.all { it.top == firstTop } + } +} diff --git a/quickstep/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapper.kt b/quickstep/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapper.kt new file mode 100644 index 00000000000..47427c25ded --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapper.kt @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.ui.mapper + +import android.util.Log +import android.view.View.OnClickListener +import com.android.launcher3.Flags.enableDesktopExplodedView +import com.android.launcher3.Flags.showCloseButtonOnTaskviewHover +import com.android.launcher3.R +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT +import com.android.quickstep.recents.ui.viewmodel.TaskData +import com.android.quickstep.task.TaskDismissButtonState +import com.android.quickstep.task.apptimer.TaskAppTimerUiState +import com.android.quickstep.task.thumbnail.TaskHeaderUiState +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.LiveTile +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Snapshot +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.SnapshotSplash +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Uninitialized + +object TaskUiStateMapper { + + /** + * Converts a [TaskData] object into a [TaskHeaderUiState] for display in the UI. + * + * This function handles different types of [TaskData] and determines the appropriate UI state + * based on the data and provided flags. + * + * @param taskData The [TaskData] to convert. Can be null or a specific subclass. + * @param hasHeader A flag indicating whether the UI should display a header. + * @param clickCloseListener A callback when the close button in the UI is clicked. + * @return A [TaskHeaderUiState] representing the UI state for the given task data. + */ + fun toTaskHeaderState( + taskData: TaskData?, + hasHeader: Boolean, + clickCloseListener: OnClickListener?, + ): TaskHeaderUiState = + when { + taskData is TaskData.Data && + hasHeader && + enableDesktopExplodedView() && + clickCloseListener != null -> { + TaskHeaderUiState.ShowHeader( + TaskHeaderUiState.ThumbnailHeader( + taskData.icon, + taskData.titleDescription, + clickCloseListener, + ) + ) + } + else -> TaskHeaderUiState.HideHeader + } + + /** + * Converts a [TaskData] object into the appropriate [TaskThumbnailUiState] for the UI. + * + * @param taskData The [TaskData] to convert. Can be null or a specific subclass. + * @return A [TaskThumbnailUiState] representing the UI state for the given task data. + */ + fun toTaskThumbnailUiState(taskData: TaskData?): TaskThumbnailUiState = + when { + taskData !is TaskData.Data -> Uninitialized + taskData.isLiveTile -> LiveTile + taskData.isLocked || taskData.thumbnailData?.thumbnail == null -> + BackgroundOnly(taskData.backgroundColor).also { + Log.d( + "b/417220811", + "Task id: ${taskData.taskId}, thumbnailData: ${taskData.thumbnailData}, isLocked: ${taskData.isLocked}", + ) + } + else -> + SnapshotSplash( + Snapshot( + taskData.thumbnailData.thumbnail!!, + taskData.thumbnailData.rotation, + taskData.backgroundColor, + ), + taskData.icon, + ) + } + + /** + * Converts a [TaskData] object into a [TaskAppTimerUiState] for displaying an app timer toast + * + * @property taskData The [TaskData] to convert. Can be null or a specific sub-class. + * @property stagePosition the position of this task when shown as a group + * @return a [TaskAppTimerUiState] representing state for the information displayed in the app + * timer toast. + */ + fun toTaskAppTimerUiState( + canShowAppTimer: Boolean, + stagePosition: Int, + taskData: TaskData?, + ): TaskAppTimerUiState = + when { + taskData !is TaskData.Data -> TaskAppTimerUiState.Uninitialized + + !canShowAppTimer || taskData.remainingAppTimerDuration == null -> + TaskAppTimerUiState.NoTimer(taskDescription = taskData.titleDescription) + + else -> + TaskAppTimerUiState.Timer( + taskDescription = taskData.titleDescription, + timeRemaining = taskData.remainingAppTimerDuration, + taskPackageName = taskData.packageName, + accessibilityActionId = + if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) { + R.id.action_digital_wellbeing_bottom_right + } else { + R.id.action_digital_wellbeing_top_left + }, + ) + } + + fun toTaskDismissButtonState(isDesktopTaskView: Boolean, clickCloseListener: OnClickListener) = + if (showCloseButtonOnTaskviewHover() && !isDesktopTaskView) { + TaskDismissButtonState.Enabled(clickCloseListener) + } else TaskDismissButtonState.Disabled +} diff --git a/quickstep/src/com/android/quickstep/recents/ui/viewmodel/DesktopTaskViewModel.kt b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/DesktopTaskViewModel.kt new file mode 100644 index 00000000000..0852a9ec676 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/DesktopTaskViewModel.kt @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.ui.viewmodel + +import android.graphics.Rect +import androidx.annotation.VisibleForTesting +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.recents.data.DesktopBackgroundResult +import com.android.quickstep.recents.data.DesktopTileBackgroundRepository +import com.android.quickstep.recents.domain.model.DesktopLayoutConfig +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.HiddenDesktopTaskBoundsData +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.RenderedDesktopTaskBoundsData +import com.android.quickstep.recents.domain.model.DesktopTaskVisibilityData +import com.android.quickstep.recents.domain.model.DesktopTaskVisibilityData.HiddenDesktopTaskVisibilityData +import com.android.quickstep.recents.domain.model.DesktopTaskVisibilityData.RenderedDesktopTaskVisibilityData +import com.android.quickstep.recents.domain.usecase.GetObscuredDesktopTaskIdsUseCase +import com.android.quickstep.recents.domain.usecase.OrganizeDesktopTasksUseCase +import com.android.quickstep.util.DesktopTask +import kotlinx.coroutines.withContext + +/** ViewModel used for [com.android.quickstep.views.DesktopTaskView]. */ +class DesktopTaskViewModel( + private val organizeDesktopTasksUseCase: OrganizeDesktopTasksUseCase, + private val getObscuredDesktopTaskIdsUseCase: GetObscuredDesktopTaskIdsUseCase, + private val desktopTileBackgroundRepository: DesktopTileBackgroundRepository, + private val dispatcherProvider: DispatcherProvider, +) { + data class TaskPosition(val taskId: Int, val isMinimized: Boolean, val bounds: Rect) + + /** Map of desktop task IDs to positions and obscurity states. */ + var organizedDesktopTaskVisibilityDataMap = emptyMap() + @VisibleForTesting set + + private var desktopTask: DesktopTask? = null + + /** Holds the default (user placed) positions of task windows. */ + var fullscreenTaskPositions: List = emptyList() + private set + + fun bind(desktopTask: DesktopTask?) { + this.desktopTask = desktopTask + fullscreenTaskPositions = + desktopTask?.tasks?.mapNotNull { task -> + task.appBounds?.let { appBounds -> + TaskPosition( + taskId = task.key.id, + isMinimized = task.isMinimized, + bounds = appBounds, + ) + } + } ?: emptyList() + } + + /** + * Computes new task positions using [organizeDesktopTasksUseCase] and obscured states using + * [getObscuredDesktopTaskIdsUseCase]. The result is stored in + * [organizedDesktopTaskVisibilityDataMap]. This is used for the exploded desktop view where the + * use case will scale and translate tasks so that they don't overlap. + * + * @param layoutConfig the pre-scaled dimension configuration for the desktop layout. + * @param dismissedTaskId Optional ID of a task being dismissed. If provided, the use case will + * decide whether to reflow or fully reorganize. + */ + fun organizeDesktopTasks(layoutConfig: DesktopLayoutConfig, dismissedTaskId: Int? = null) { + val transparentTaskIds = + desktopTask + ?.tasks + ?.filter { it.key.isTopActivityTransparent && it.key.isActivityStackTransparent } + ?.map { it.key.id } ?: emptyList() + val defaultPositions = fullscreenTaskPositions.filterNot { it.taskId in transparentTaskIds } + val obscuredWindowIds = + getObscuredDesktopTaskIdsUseCase( + defaultPositions.filterNot { it.taskId == dismissedTaskId } + ) + + // Map task IDs and DesktopTaskVisibilityData to DesktopTaskBoundsData, as the + // organizeDesktopTasksUseCase does not need the obscured state information. + val oldOrganizedDesktopTaskBoundsData = + organizedDesktopTaskVisibilityDataMap.toDesktopTaskBoundsData() + + val newOrganizedDesktopTaskBoundsData = + organizeDesktopTasksUseCase( + allCurrentOriginalTaskBounds = + defaultPositions.map { RenderedDesktopTaskBoundsData(it.taskId, it.bounds) }, + layoutConfig = layoutConfig, + taskPositionsHint = oldOrganizedDesktopTaskBoundsData, + dismissedTaskId = dismissedTaskId, + ) + transparentTaskIds.map { HiddenDesktopTaskBoundsData(taskId = it) } + + // Convert DesktopTaskBoundsData back to pairs of task IDs and DesktopTaskVisibilityData by + // adding the new obscured state information to the new task bounds data. + organizedDesktopTaskVisibilityDataMap = + newOrganizedDesktopTaskBoundsData.toDesktopTaskVisibilityDataMap(obscuredWindowIds) + } + + suspend fun getWallpaperBackground(forceRefresh: Boolean): DesktopBackgroundResult = + withContext(dispatcherProvider.ioBackground) { + desktopTileBackgroundRepository.getWallpaperBackground(forceRefresh) + } + + private fun Map.toDesktopTaskBoundsData(): + List = map { + when (val visibilityData = it.value) { + is RenderedDesktopTaskVisibilityData -> + RenderedDesktopTaskBoundsData(taskId = it.key, bounds = visibilityData.bounds) + is HiddenDesktopTaskVisibilityData -> HiddenDesktopTaskBoundsData(it.key) + } + } + + private fun List.toDesktopTaskVisibilityDataMap( + obscuredWindowIds: Set + ): Map = associate { + it.taskId to + when (it) { + is RenderedDesktopTaskBoundsData -> + RenderedDesktopTaskVisibilityData( + isObscured = obscuredWindowIds.contains(it.taskId), + bounds = it.bounds, + ) + is HiddenDesktopTaskBoundsData -> + HiddenDesktopTaskVisibilityData( + isObscured = obscuredWindowIds.contains(it.taskId) + ) + } + } +} diff --git a/quickstep/src/com/android/quickstep/recents/ui/viewmodel/GroupedTaskViewModel.kt b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/GroupedTaskViewModel.kt new file mode 100644 index 00000000000..b2ccc144da7 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/GroupedTaskViewModel.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.ui.viewmodel + +import com.android.quickstep.recents.domain.usecase.IsPointerConnectedUseCase + +class GroupedTaskViewModel(private val isPointerConnectedUseCase: IsPointerConnectedUseCase) { + fun showTaskDismissButton(): Boolean = isPointerConnectedUseCase.isAnyPointerDeviceConnected() +} diff --git a/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskTileUiState.kt b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskTileUiState.kt new file mode 100644 index 00000000000..ad6024a1cfd --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskTileUiState.kt @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.ui.viewmodel + +import android.graphics.drawable.Drawable +import com.android.systemui.shared.recents.model.ThumbnailData +import java.time.Duration + +/** + * This class represents the UI state to be consumed by TaskView, GroupTaskView and DesktopTaskView. + * Data class representing the state of a list of tasks. + * + * This class encapsulates a list of [TaskTileUiState] objects, along with a flag indicating whether + * the data is being used for a live tile display. + * + * @property tasks The list of [TaskTileUiState] objects representing the individual tasks. + * @property isLiveTile Indicates whether this data is intended for a live tile. If `true`, the + * running app will be displayed instead of the thumbnail. + * @property sysUiStatusNavFlags Flags for status bar and navigation bar + */ +data class TaskTileUiState( + val tasks: List, + val hasHeader: Boolean, + val sysUiStatusNavFlags: Int, + val taskOverlayEnabled: Boolean, + val isCentralTask: Boolean, +) + +sealed class TaskData { + abstract val taskId: Int + + /** When no data was found for the TaskId provided */ + data class NoData(override val taskId: Int) : TaskData() + + /** + * This class provides UI information related to a Task (App) to be displayed within a TaskView. + * + * @property taskId Identifier of the task + * @property packageName package name for the task + * @property title App title + * @property titleDescription App content description + * @property icon App icon + * @property thumbnailData Information related to the last snapshot retrieved from the app + * @property backgroundColor The background color of the task. + * @property isLocked Indicates whether the task is locked or not. + * @property isLiveTile Indicates whether the task is shown with a live tile or not. + * @property remainingAppTimerDuration time remaining on the app timer for the application. + */ + data class Data( + override val taskId: Int, + val packageName: String, + val title: String?, + val titleDescription: String?, + val icon: Drawable?, + val thumbnailData: ThumbnailData?, + val backgroundColor: Int, + val isLocked: Boolean, + val isLiveTile: Boolean, + val remainingAppTimerDuration: Duration?, + ) : TaskData() +} diff --git a/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModel.kt b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModel.kt new file mode 100644 index 00000000000..f574d4a881a --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModel.kt @@ -0,0 +1,193 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.ui.viewmodel + +import android.annotation.ColorInt +import android.util.Log +import androidx.core.graphics.ColorUtils +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.recents.domain.model.TaskId +import com.android.quickstep.recents.domain.model.TaskModel +import com.android.quickstep.recents.domain.usecase.GetSysUiStatusNavFlagsUseCase +import com.android.quickstep.recents.domain.usecase.GetTaskUseCase +import com.android.quickstep.recents.domain.usecase.GetThumbnailPositionUseCase +import com.android.quickstep.recents.domain.usecase.IsThumbnailValidUseCase +import com.android.quickstep.recents.domain.usecase.ThumbnailPosition +import com.android.quickstep.recents.viewmodel.RecentsViewData +import com.android.quickstep.views.TaskViewType +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.wm.shell.shared.split.SplitBounds +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map + +/** + * ViewModel used for [com.android.quickstep.views.TaskView], + * [com.android.quickstep.views.DesktopTaskView] and [com.android.quickstep.views.GroupedTaskView]. + */ +@OptIn(ExperimentalCoroutinesApi::class) +class TaskViewModel( + recentsViewData: RecentsViewData, + private val getTaskUseCase: GetTaskUseCase, + private val getSysUiStatusNavFlagsUseCase: GetSysUiStatusNavFlagsUseCase, + private val isThumbnailValidUseCase: IsThumbnailValidUseCase, + private val getThumbnailPositionUseCase: GetThumbnailPositionUseCase, + dispatcherProvider: DispatcherProvider, +) { + private lateinit var taskViewType: TaskViewType + private val taskIds = MutableStateFlow(emptySet()) + + private val taskModels = + taskIds.flatMapLatest { ids -> + // Combine Tasks requests + val taskFlows = + ids.map { id -> + getTaskUseCase(id).distinctUntilChanged().map { taskModel -> id to taskModel } + } + combine(taskFlows) { taskArray -> taskArray } + } + + val state: Flow = + com.android.launcher3.util.coroutines + .combine( + taskModels, + recentsViewData.runningTaskIds, + recentsViewData.runningTaskShowScreenshot, + recentsViewData.overlayEnabled, + recentsViewData.settledFullyVisibleTaskIds, + recentsViewData.centralTaskIds, + ) { + taskModels: Array>, + runningTaskIds: Set, + runningTaskShowScreenshot: Boolean, + isOverlayEnabled: Boolean, + settledFullyVisibleTaskIds: Set, + centralTaskIds: Set -> + val taskIds = taskModels.map { it.first }.toSet() + val isCentralTask = taskIds == centralTaskIds + val overlayEnabled = + when (taskViewType) { + TaskViewType.SINGLE -> { + isOverlayEnabled && settledFullyVisibleTaskIds.any { it in taskIds } + } + else -> false + } + val isLiveTile = runningTaskIds == taskIds && !runningTaskShowScreenshot + val taskData = mapToTaskData(taskModels, isLiveTile) + + mapToTaskTile(taskData, overlayEnabled, isCentralTask) + } + .distinctUntilChanged() + .debounce { state -> + // Debouncing only when thumbnails are not present gives the best results. + // This is because thumbnail loading is a decent predictor of there being no more + // emissions to come as they are typically the last emission for a TaskView. + if (state.tasks.any { (it as? TaskData.Data)?.thumbnailData?.thumbnail == null }) { + DEBOUNCE_DELAY_MS + } else { + 0 + } + } + .flowOn(dispatcherProvider.lightweightBackground) + + fun bind(taskViewType: TaskViewType, vararg taskId: TaskId) { + this.taskViewType = taskViewType + taskIds.value = taskId.toSet() + .also { Log.d(TAG, "bind $this as $taskViewType to taskIds: $it") } + } + + fun unbind() { + taskIds.value = emptySet() + Log.d(TAG, "unbind $this") + } + + fun isThumbnailValid( + thumbnail: ThumbnailData?, + width: Int, + height: Int, + splitBounds: SplitBounds?, + stagePosition: Int, + ): Boolean = isThumbnailValidUseCase(thumbnail, width, height, splitBounds, stagePosition) + + fun getThumbnailPosition( + thumbnail: ThumbnailData?, + width: Int, + height: Int, + isRtl: Boolean, + splitBounds: SplitBounds?, + splitPosition: Int, + densityDpi: Int, + ): ThumbnailPosition = + getThumbnailPositionUseCase( + thumbnailData = thumbnail, + width = width, + height = height, + isRtl = isRtl, + splitBounds, + splitPosition, + densityDpi, + ) + + private fun mapToTaskTile( + tasks: List, + overlayEnabled: Boolean, + isCentralTask: Boolean, + ): TaskTileUiState { + val firstThumbnailData = (tasks.firstOrNull() as? TaskData.Data)?.thumbnailData + return TaskTileUiState( + tasks = tasks, + hasHeader = taskViewType == TaskViewType.DESKTOP, + sysUiStatusNavFlags = getSysUiStatusNavFlagsUseCase(firstThumbnailData), + taskOverlayEnabled = overlayEnabled, + isCentralTask = isCentralTask, + ) + } + + private fun mapToTaskData( + result: Array>, + isLiveTile: Boolean, + ): List = result.map { mapToTaskData(it.first, it.second, isLiveTile) } + + private fun mapToTaskData(taskId: TaskId, result: TaskModel?, isLiveTile: Boolean): TaskData = + result?.let { + TaskData.Data( + taskId = taskId, + packageName = result.packageName, + title = result.title, + titleDescription = result.titleDescription, + icon = result.icon, + thumbnailData = result.thumbnail, + backgroundColor = result.backgroundColor.removeAlpha(), + isLocked = result.isLocked, + isLiveTile = isLiveTile && !result.isMinimized, + remainingAppTimerDuration = result.remainingAppDuration, + ) + } ?: TaskData.NoData(taskId) + + @ColorInt private fun Int.removeAlpha(): Int = ColorUtils.setAlphaComponent(this, 0xff) + + private companion object { + const val TAG = "TaskViewModel" + const val DEBOUNCE_DELAY_MS = 16L + } +} diff --git a/quickstep/src/com/android/quickstep/recents/viewmodel/RecentsViewData.kt b/quickstep/src/com/android/quickstep/recents/viewmodel/RecentsViewData.kt index 28212cf3a57..803fb354ff9 100644 --- a/quickstep/src/com/android/quickstep/recents/viewmodel/RecentsViewData.kt +++ b/quickstep/src/com/android/quickstep/recents/viewmodel/RecentsViewData.kt @@ -20,8 +20,19 @@ import kotlinx.coroutines.flow.MutableStateFlow // This is far from complete but serves the purpose of enabling refactoring in other areas class RecentsViewData { - val fullscreenProgress = MutableStateFlow(1f) + // Whether the current RecentsView state supports task overlays. + // TODO(b/331753115): Derive from RecentsView state flow once migrated to MVVM. + val overlayEnabled = MutableStateFlow(false) - // This is typically a View concern but it is used to invalidate rendering in other Views - val scale = MutableStateFlow(1f) + // The settled set of visible taskIds that is updated after RecentsView scroll settles. + val settledFullyVisibleTaskIds = MutableStateFlow(emptySet()) + + // The id for the task ids in the TaskView that controls the Actions View + val centralTaskIds = MutableStateFlow(emptySet()) + + // A list of taskIds that are associated with a RecentsAnimationController. */ + val runningTaskIds = MutableStateFlow(emptySet()) + + // Whether we should use static screenshot instead of live tile for taskIds in [runningTaskIds] + val runningTaskShowScreenshot = MutableStateFlow(false) } diff --git a/quickstep/src/com/android/quickstep/recents/viewmodel/RecentsViewModel.kt b/quickstep/src/com/android/quickstep/recents/viewmodel/RecentsViewModel.kt new file mode 100644 index 00000000000..ec8736a6ef7 --- /dev/null +++ b/quickstep/src/com/android/quickstep/recents/viewmodel/RecentsViewModel.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.quickstep.recents.viewmodel + +import com.android.quickstep.recents.data.RecentTasksRepository +import com.android.systemui.shared.recents.model.ThumbnailData +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.first + +class RecentsViewModel( + private val recentsTasksRepository: RecentTasksRepository, + private val recentsViewData: RecentsViewData, + private val displayId: Int, +) { + private var visibleTaskIds = emptySet() + + fun refreshAllTaskData() { + recentsTasksRepository.getAllTaskData(displayId, true) + } + + fun updateVisibleTasks(visibleTaskIdList: List) { + visibleTaskIds = visibleTaskIdList.toSet() + recentsTasksRepository.setVisibleTasks(displayId, visibleTaskIds) + } + + fun updateTasksFullyVisible(taskIds: Set) { + recentsViewData.settledFullyVisibleTaskIds.value = taskIds + } + + fun updateCentralTaskIds(taskIds: Set) { + recentsViewData.centralTaskIds.value = taskIds + } + + fun setOverlayEnabled(isOverlayEnabled: Boolean) { + recentsViewData.overlayEnabled.value = isOverlayEnabled + } + + suspend fun waitForThumbnailsToUpdate(updatedThumbnails: Map?) { + val visibleThumbnails = updatedThumbnails?.filterKeys { it in visibleTaskIds } + if (visibleThumbnails.isNullOrEmpty()) return + combine( + visibleThumbnails.map { + recentsTasksRepository.getThumbnailById(it.key).filter { thumbnailData -> + thumbnailData?.snapshotId == it.value.snapshotId + } + } + ) {} + .first() + } + + suspend fun waitForRunningTaskShowScreenshotToUpdate() { + recentsViewData.runningTaskShowScreenshot.filter { it }.first() + } + + fun onReset() { + updateVisibleTasks(emptyList()) + } + + fun updateRunningTask(taskIds: Set) { + recentsViewData.runningTaskIds.value = taskIds + } + + fun setRunningTaskShowScreenshot(showScreenshot: Boolean) { + recentsViewData.runningTaskShowScreenshot.value = showScreenshot + } +} diff --git a/quickstep/src/com/android/quickstep/task/TaskDismissButtonState.kt b/quickstep/src/com/android/quickstep/task/TaskDismissButtonState.kt new file mode 100644 index 00000000000..045377962ad --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/TaskDismissButtonState.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task + +import android.view.View + +sealed class TaskDismissButtonState { + data class Enabled(val clickCloseListener: View.OnClickListener) : TaskDismissButtonState() + + data object Disabled : TaskDismissButtonState() +} diff --git a/quickstep/src/com/android/quickstep/task/apptimer/DurationFormatter.kt b/quickstep/src/com/android/quickstep/task/apptimer/DurationFormatter.kt new file mode 100644 index 00000000000..0c4a4d83318 --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/apptimer/DurationFormatter.kt @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.apptimer + +import android.content.Context +import android.icu.text.MeasureFormat +import android.icu.util.Measure +import android.icu.util.MeasureUnit +import androidx.annotation.StringRes +import java.time.Duration +import java.util.Locale + +/** Formats the given duration as a user friendly text. */ +object DurationFormatter { + fun format( + context: Context, + duration: Duration, + @StringRes durationLessThanOneMinuteStringId: Int, + ): String { + val hours = Math.toIntExact(duration.toHours()) + val minutes = Math.toIntExact(duration.minusHours(hours.toLong()).toMinutes()) + return when { + // Apply FormatWidth.NARROW if both the hour part and the minute part are non-zero. + hours > 0 && minutes > 0 -> + MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.NARROW) + .formatMeasures( + Measure(hours, MeasureUnit.HOUR), + Measure(minutes, MeasureUnit.MINUTE), + ) + // Apply FormatWidth.WIDE if only the hour part is non-zero (unless forced). + hours > 0 -> + MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.WIDE) + .formatMeasures(Measure(hours, MeasureUnit.HOUR)) + // Apply FormatWidth.WIDE if only the minute part is non-zero (unless forced). + minutes > 0 -> + MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.WIDE) + .formatMeasures(Measure(minutes, MeasureUnit.MINUTE)) + // Use a specific string for usage less than one minute but non-zero. + duration > Duration.ZERO -> context.getString(durationLessThanOneMinuteStringId) + // Otherwise, return 0-minute string. + else -> + MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.WIDE) + .formatMeasures(Measure(0, MeasureUnit.MINUTE)) + } + } +} diff --git a/quickstep/src/com/android/quickstep/task/apptimer/TaskAppTimerUiState.kt b/quickstep/src/com/android/quickstep/task/apptimer/TaskAppTimerUiState.kt new file mode 100644 index 00000000000..3ae387bdfb2 --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/apptimer/TaskAppTimerUiState.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.apptimer + +import android.app.ActivityOptions +import android.content.Context +import androidx.annotation.IdRes +import java.time.Duration + +/** + * UI state of the digital wellbeing app timer toast + * + * @property taskDescription description of the task for which the timer is being displayed. + */ +sealed class TaskAppTimerUiState(open val taskDescription: String?) { + /** Timer information not available in UI. */ + data object Uninitialized : TaskAppTimerUiState(null) + + /** No timer information to display */ + data class NoTimer(override val taskDescription: String?) : + TaskAppTimerUiState(taskDescription) + + /** + * Represents the UI state necessary to show an app timer on a task + * + * @property timeRemaining time remaining on the app timer for the application. + * @property taskDescription description of the task for which the timer is being displayed. + * @property taskPackageName package name for of the top component for the task's app. + * @property accessibilityActionId action id to use for tap like accessibility actions on this + * timer. + */ + data class Timer( + val timeRemaining: Duration, + override val taskDescription: String?, + val taskPackageName: String, + @IdRes val accessibilityActionId: Int, + val onClick: ((ActivityOptions, Context) -> Unit)? = null, + ) : TaskAppTimerUiState(taskDescription) +} diff --git a/quickstep/src/com/android/quickstep/task/apptimer/TaskAppTimerViewModel.kt b/quickstep/src/com/android/quickstep/task/apptimer/TaskAppTimerViewModel.kt new file mode 100644 index 00000000000..67f40762bfb --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/apptimer/TaskAppTimerViewModel.kt @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.apptimer + +import android.app.ActivityOptions +import android.content.ActivityNotFoundException +import android.content.Context +import android.content.Intent +import android.provider.Settings +import android.util.Log +import androidx.compose.runtime.State +import androidx.compose.runtime.mutableStateOf +import com.android.launcher3.R +import java.time.Duration + +interface ViewModel { + val uiState: State + + fun getFormattedDuration(duration: Duration, context: Context): String + + fun startActivityWithScaleUpAnimation( + activityOptions: ActivityOptions, + context: Context, + taskPackage: String, + taskDescription: String?, + ) +} + +class TaskAppTimerViewModel : ViewModel { + private var _uiState = mutableStateOf(TaskAppTimerUiState.Uninitialized) + + override val uiState = _uiState + + override fun getFormattedDuration(duration: Duration, context: Context) = + DurationFormatter.format(context, duration, R.string.shorter_duration_less_than_one_minute) + + override fun startActivityWithScaleUpAnimation( + activityOptions: ActivityOptions, + context: Context, + taskPackage: String, + taskDescription: String?, + ) { + try { + context.startActivity(appUsageSettingsIntent(taskPackage), activityOptions.toBundle()) + } catch (e: ActivityNotFoundException) { + Log.e(TAG, "Failed to open $taskDescription ", e) + } + } + + fun setState(uiState: TaskAppTimerUiState) { + _uiState.value = uiState + } + + private fun appUsageSettingsIntent(packageName: String) = + Intent(Settings.ACTION_APP_USAGE_SETTINGS) + .putExtra(Intent.EXTRA_PACKAGE_NAME, packageName) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + + private companion object { + const val TAG = "TaskAppTimerViewModel" + } +} diff --git a/quickstep/src/com/android/quickstep/task/apptimer/TimerTextHelper.kt b/quickstep/src/com/android/quickstep/task/apptimer/TimerTextHelper.kt new file mode 100644 index 00000000000..e8d1226d560 --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/apptimer/TimerTextHelper.kt @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.apptimer + +import android.content.Context +import com.android.launcher3.R +import com.android.launcher3.Utilities +import java.time.Duration + +/** A helper class that is responsible for building the digital wellbeing timer text. */ +class TimerTextHelper(private val context: Context, timeLeft: Duration) { + private val formattedDuration = + DurationFormatter.format(context, timeLeft, R.string.shorter_duration_less_than_one_minute) + + /** Provides the time left as a user friendly text that fits in the [availableWidth]. */ + fun getTextThatFits(availableWidth: Int, textPaint: android.text.TextPaint): CharSequence { + val iconOnlyText = Utilities.prefixTextWithIcon(context, R.drawable.ic_hourglass_top, "") + + if (availableWidth == 0) { + return iconOnlyText + } + + // "$icon $formattedDuration left today" + val fullText = + Utilities.prefixTextWithIcon( + context, + R.drawable.ic_hourglass_top, + context.getString(R.string.time_left_for_app, formattedDuration), + ) + + val textWidth = textPaint.measureText(fullText, /* start= */ 0, /* end= */ fullText.length) + val textToWidthRatio = textWidth / availableWidth + return when { + textToWidthRatio > ICON_ONLY_WIDTH_RATIO_THRESHOLD -> + // "$icon" + iconOnlyText + + textToWidthRatio > ICON_SHORT_TEXT_WIDTH_RATIO_THRESHOLD -> + // "$icon $formattedDuration" + Utilities.prefixTextWithIcon( + context, + R.drawable.ic_hourglass_top, + formattedDuration, + ) + + else -> fullText + } + } + + companion object { + // If the full text ("$icon $formattedDuration left today") takes a lot more space than is + // available, it is likely short text won't fit either. So, we fallback to just an icon. + private const val ICON_ONLY_WIDTH_RATIO_THRESHOLD = 1.2f + + // If the full text fits but leaves very little space, use short text instead for + // comfortable viewing. + private const val ICON_SHORT_TEXT_WIDTH_RATIO_THRESHOLD = 0.8f + } +} diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/LiveTileView.kt b/quickstep/src/com/android/quickstep/task/thumbnail/LiveTileView.kt new file mode 100644 index 00000000000..45b368709a7 --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/thumbnail/LiveTileView.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.quickstep.task.thumbnail + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.PorterDuff +import android.graphics.PorterDuffXfermode +import android.util.AttributeSet +import android.view.View + +class LiveTileView : View { + constructor(context: Context) : super(context) + + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + + constructor( + context: Context, + attrs: AttributeSet?, + defStyleAttr: Int, + ) : super(context, attrs, defStyleAttr) + + override fun onDraw(canvas: Canvas) { + canvas.drawRect(0f, 0f, measuredWidth.toFloat(), measuredHeight.toFloat(), CLEAR_PAINT) + } + + companion object { + private val CLEAR_PAINT = + Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR) } + } +} diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskContentView.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskContentView.kt new file mode 100644 index 00000000000..dabb20b92d2 --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/thumbnail/TaskContentView.kt @@ -0,0 +1,507 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.thumbnail + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.content.Context +import android.content.Intent +import android.graphics.Canvas +import android.graphics.Outline +import android.graphics.Path +import android.graphics.Rect +import android.os.Bundle +import android.provider.Settings +import android.util.AttributeSet +import android.util.FloatProperty +import android.view.MotionEvent +import android.view.View +import android.view.ViewGroup.LayoutParams.MATCH_PARENT +import android.view.ViewGroup.LayoutParams.WRAP_CONTENT +import android.view.ViewOutlineProvider +import android.view.ViewStub +import android.view.accessibility.AccessibilityNodeInfo +import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction +import android.widget.TextView +import androidx.annotation.IdRes +import androidx.annotation.VisibleForTesting +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.PARENT_ID +import androidx.core.view.isInvisible +import androidx.core.view.isVisible +import com.android.launcher3.Flags.enableRefactorDigitalWellbeingToast +import com.android.launcher3.R +import com.android.launcher3.util.KFloatProperty +import com.android.launcher3.util.MultiPropertyDelegate +import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.ViewPool +import com.android.quickstep.DesktopFullscreenDrawParams.Companion.computeCornerRadius +import com.android.quickstep.compose.QuickstepComposeFacade +import com.android.quickstep.task.apptimer.TaskAppTimerUiState +import com.android.quickstep.task.apptimer.TaskAppTimerUiState.Uninitialized +import com.android.quickstep.task.apptimer.TaskAppTimerViewModel +import com.android.quickstep.task.apptimer.TimerTextHelper +import com.android.quickstep.util.BorderAnimator +import com.android.quickstep.util.BorderAnimator.Companion.DEFAULT_BORDER_COLOR +import com.android.quickstep.util.BorderAnimator.Companion.DEFAULT_INTERPOLATOR +import com.android.quickstep.util.BorderAnimator.Companion.createSimpleBorderAnimator +import com.android.quickstep.util.setActivityStarterClickListener +import com.android.quickstep.views.TaskHeaderView +import kotlin.math.max + +/** + * TaskContentView is a wrapper around the TaskHeaderView, TaskThumbnailView and Digital wellbeing + * app timer toast. It is a sibling to AiAi (TaskOverlay). + * + * When enableRefactorDigitalWellbeingToast is off, it is sibling to digital wellbeing toast unlike + * when the flag is on. + */ +class TaskContentView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : + ConstraintLayout(context, attrs), ViewPool.Reusable { + + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + var taskHeaderView: TaskHeaderView? = null + private set + + private var taskThumbnailView: TaskThumbnailView? = null + private val useComposeTaskAppTimer + get() = QuickstepComposeFacade.isComposeAvailable() && enableRefactorDigitalWellbeingToast() + + @Deprecated("This toast is getting replaced by the compose version taskAppTimerToastCompose") + private var taskAppTimerToast: TextView? = null + + private var taskAppTimerToastCompose: View? = null + private val taskAppTimerViewModel by lazy { TaskAppTimerViewModel() } + + private var timerTextHelper: TimerTextHelper? = null + private var timerUiState: TaskAppTimerUiState = Uninitialized + private var timerUsageAccessibilityAction: AccessibilityAction? = null + private val timerToastHeight = + context.resources.getDimensionPixelSize(R.dimen.digital_wellbeing_toast_height) + + private var onSizeChanged: ((width: Int, height: Int) -> Unit)? = null + private val outlinePath = Path() + + private val borderWidthPx: Int by lazy { + context.resources.getDimensionPixelSize(R.dimen.keyboard_quick_switch_border_width) + } + + private var activeFocusAnimator: AnimatorSet? = null + private var activeHoverAnimator: AnimatorSet? = null + + private val focusBorderColor: Int + private val hoverBorderColor: Int + + private val focusBorderAnimator: BorderAnimator by lazy { + createSimpleBorderAnimator( + borderRadiusPx = computeCornerRadius(context).toInt(), + borderWidthPx = borderWidthPx, + boundsBuilder = { it.set(0, 0, width, height) }, + targetView = this, + borderColor = focusBorderColor, + ) + } + + private val hoverBorderAnimator: BorderAnimator by lazy { + createSimpleBorderAnimator( + borderRadiusPx = computeCornerRadius(context).toInt(), + borderWidthPx = borderWidthPx, + boundsBuilder = { it.set(0, 0, width, height) }, + targetView = this, + borderColor = hoverBorderColor, + ) + } + + private var hoverBorderVisible = false + set(value) { + if (field == value) { + return + } + + field = value + + activeHoverAnimator?.cancel() + activeHoverAnimator = animateBorder(OUTLINE_EXPANSION_HOVER, hoverBorderAnimator, value) + } + + /** + * Sets the outline bounds of the view. Default to use view's bound as outline when set to null. + */ + var outlineBounds: Rect? = null + set(value) { + field = value + invalidateOutline() + } + + private val bounds = Rect() + + var cornerRadius: Float = 0f + set(value) { + field = value + invalidateOutline() + } + + private var outlineExpansion = 0.0f + set(value) { + field = value + invalidateOutline() + } + + private val outlineExpansionFactory: MultiPropertyFactory = + MultiPropertyFactory(this, OUTLINE_EXPANSION, OutlineExpansion.entries.size) { + a: Float, + b: Float -> + max(a, b) + } + private var outlineExpansionFocus by + MultiPropertyDelegate(outlineExpansionFactory, OutlineExpansion.FOCUS) + private var outlineExpansionHover by + MultiPropertyDelegate(outlineExpansionFactory, OutlineExpansion.HOVER) + + var isHoverable: Boolean = false + + init { + setWillNotDraw(false) + context.obtainStyledAttributes(attrs, R.styleable.TaskContentView).use { + focusBorderColor = + it.getColor(R.styleable.TaskContentView_focusBorderColor, DEFAULT_BORDER_COLOR) + hoverBorderColor = + it.getColor(R.styleable.TaskContentView_hoverBorderColor, DEFAULT_BORDER_COLOR) + } + } + + override fun onFinishInflate() { + super.onFinishInflate() + createTaskThumbnailView() + } + + override fun setScaleX(scaleX: Float) { + super.setScaleX(scaleX) + taskThumbnailView?.parentScaleXUpdated(scaleX) + } + + override fun setScaleY(scaleY: Float) { + super.setScaleY(scaleY) + taskThumbnailView?.parentScaleYUpdated(scaleY) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + clipToOutline = true + outlineProvider = + object : ViewOutlineProvider() { + override fun getOutline(view: View, outline: Outline) { + val outlineRect = outlineBounds ?: bounds + val expansion = outlineExpansion.toInt() + outlinePath.apply { + rewind() + addRoundRect( + outlineRect.left.toFloat() - expansion, + outlineRect.top.toFloat() - expansion, + outlineRect.right.toFloat() + expansion, + outlineRect.bottom.toFloat() + expansion, + (cornerRadius + expansion) / scaleX, + (cornerRadius + expansion) / scaleY, + Path.Direction.CW, + ) + } + outline.setPath(outlinePath) + } + } + } + + override fun onRecycle() { + taskHeaderView?.isInvisible = true + taskHeaderView?.alpha = 1.0f + onSizeChanged = null + outlineBounds = null + alpha = 1.0f + taskThumbnailView?.onRecycle() + taskAppTimerToast?.isInvisible = true + timerUiState = Uninitialized + taskAppTimerViewModel.setState(Uninitialized) + timerTextHelper = null + timerUsageAccessibilityAction = null + outlineExpansionHover = 0f + outlineExpansionFocus = 0f + hoverBorderVisible = false + importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO + } + + fun doOnSizeChange(action: (width: Int, height: Int) -> Unit) { + onSizeChanged = action + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + onSizeChanged?.invoke(width, height) + bounds.set(0, 0, w, h) + updateTimerText(w) + invalidateOutline() + } + + override fun draw(canvas: Canvas) { + super.draw(canvas) + if (isFocusable()) { + focusBorderAnimator.drawBorder(canvas) + } + if (isHoverable) { + hoverBorderAnimator.drawBorder(canvas) + } + } + + public override fun onFocusChanged( + gainFocus: Boolean, + direction: Int, + previouslyFocusedRect: Rect?, + ) { + super.onFocusChanged(gainFocus, direction, previouslyFocusedRect) + + activeFocusAnimator?.cancel() + activeFocusAnimator = animateBorder(OUTLINE_EXPANSION_FOCUS, focusBorderAnimator, gainFocus) + } + + override fun onHoverEvent(event: MotionEvent): Boolean { + if (!isHoverable) return false + when (event.action) { + MotionEvent.ACTION_HOVER_ENTER -> { + hoverBorderVisible = true + } + MotionEvent.ACTION_HOVER_EXIT -> { + hoverBorderVisible = false + } + } + return true + } + + override fun onInitializeAccessibilityNodeInfo(info: AccessibilityNodeInfo) { + super.onInitializeAccessibilityNodeInfo(info) + with(info) { taskHeaderView?.getSupportedAccessibilityActions()?.forEach(::addAction) } + } + + fun onParentAnimationProgress(progress: Float) { + taskAppTimerToast?.apply { translationY = timerToastHeight * (1f - progress) } + } + + /** Returns accessibility actions supported by items in the task content view. */ + fun getSupportedAccessibilityActions(): List { + return listOfNotNull(timerUsageAccessibilityAction) + } + + fun handleAccessibilityAction(action: Int): Boolean { + timerUsageAccessibilityAction?.let { + if (action == it.id) { + return taskAppTimerToast?.callOnClick() ?: false + } + } + return false + } + + fun getTaskAppTimerToastHeight() = + (if (useComposeTaskAppTimer) taskAppTimerToastCompose else taskAppTimerToast)?.height ?: 0 + + override fun performAccessibilityAction(action: Int, arguments: Bundle?): Boolean { + taskHeaderView?.let { + if (it.handleAccessibilityAction(action)) { + return true + } + } + return super.performAccessibilityAction(action, arguments) + } + + private fun createHeaderView(taskHeaderState: TaskHeaderUiState) { + if (taskHeaderView == null && taskHeaderState is TaskHeaderUiState.ShowHeader) { + taskHeaderView = + findViewById(R.id.task_header_view) + .apply { layoutResource = R.layout.task_header_view } + .inflate() as TaskHeaderView + } + } + + private fun createTaskThumbnailView() { + if (taskThumbnailView == null) { + taskThumbnailView = + findViewById(R.id.snapshot) + .apply { layoutResource = R.layout.task_thumbnail } + .inflate() as TaskThumbnailView + } + } + + private fun createAppTimerToastView(taskAppTimerUiState: TaskAppTimerUiState) { + if (taskAppTimerUiState is TaskAppTimerUiState.Timer) { + when { + useComposeTaskAppTimer && taskAppTimerToastCompose == null -> { + taskAppTimerToastCompose = + QuickstepComposeFacade.initComposeView(context).let { + QuickstepComposeFacade.startTaskAppTimerToast( + view = it, + taskAppTimerViewModel, + ) + } + addAppTimerToastToLayout() + } + + !useComposeTaskAppTimer && taskAppTimerToast == null -> { + taskAppTimerToast = + findViewById(R.id.task_app_timer_toast) + .apply { layoutResource = R.layout.task_app_timer_toast } + .inflate() as TextView + } + } + } + } + + private fun addAppTimerToastToLayout() { + val params = + LayoutParams(MATCH_PARENT, WRAP_CONTENT).apply { + startToStart = PARENT_ID + endToEnd = PARENT_ID + bottomToBottom = R.id.snapshot + } + addView(taskAppTimerToastCompose, params) + } + + fun setState( + taskHeaderState: TaskHeaderUiState, + taskThumbnailUiState: TaskThumbnailUiState, + taskAppTimerUiState: TaskAppTimerUiState, + taskId: Int?, + ) { + createHeaderView(taskHeaderState) + taskHeaderView?.setState(taskHeaderState) + taskThumbnailView?.setState(taskThumbnailUiState, taskId) + createAppTimerToastView(taskAppTimerUiState) + + if (enableRefactorDigitalWellbeingToast() && timerUiState != taskAppTimerUiState) { + setAppTimerToastState(taskAppTimerUiState) + updateContentDescriptionWithTimer(taskAppTimerUiState) + } + } + + fun setTaskHeaderAlpha(alpha: Float) { + taskHeaderView?.alpha = alpha + } + + private fun updateContentDescriptionWithTimer(state: TaskAppTimerUiState) { + taskThumbnailView?.contentDescription = + when (state) { + is Uninitialized -> return + is TaskAppTimerUiState.NoTimer -> state.taskDescription + is TaskAppTimerUiState.Timer -> + context.getString( + R.string.task_contents_description_with_remaining_time, + state.taskDescription, + context.getString( + R.string.time_left_for_app, + taskAppTimerViewModel.getFormattedDuration(state.timeRemaining, context), + ), + ) + } + } + + private fun setAppTimerToastState(state: TaskAppTimerUiState) { + if (useComposeTaskAppTimer) { + taskAppTimerViewModel.setState(state) + return + } + + timerUiState = state + + taskAppTimerToast?.apply { + when (state) { + is Uninitialized -> isInvisible = true + is TaskAppTimerUiState.NoTimer -> isInvisible = true + is TaskAppTimerUiState.Timer -> { + timerTextHelper = TimerTextHelper(context, state.timeRemaining) + isInvisible = false + updateTimerText(width) + + // TODO: add WW logging on the app usage settings click. + setActivityStarterClickListener( + appUsageSettingsIntent(state.taskPackageName), + "app usage settings for task ${state.taskDescription}", + ) + + timerUsageAccessibilityAction = + createAppUsageSettingsAccessibilityAction( + context, + state.accessibilityActionId, + state.taskDescription, + ) + } + } + } + } + + private fun updateTimerText(width: Int) { + taskAppTimerToast?.apply { + val helper = timerTextHelper + + if (isVisible && helper != null) { + text = helper.getTextThatFits(width, paint) + } + } + } + + private fun animateBorder( + outlineProperty: FloatProperty, + borderAnimator: BorderAnimator, + show: Boolean, + ): AnimatorSet? { + val targetOutlineExpansion = if (show) borderWidthPx.toFloat() else 0f + val outlineExpansionAnimator = + ObjectAnimator.ofFloat(this, outlineProperty, targetOutlineExpansion) + val borderEffectAnimator = borderAnimator.buildAnimator(show) + return AnimatorSet().apply { + playTogether(outlineExpansionAnimator, borderEffectAnimator) + duration = borderEffectAnimator.duration + interpolator = DEFAULT_INTERPOLATOR + start() + } + } + + companion object { + const val TAG = "TaskContentView" + + private fun appUsageSettingsIntent(packageName: String) = + Intent(Intent(Settings.ACTION_APP_USAGE_SETTINGS)) + .putExtra(Intent.EXTRA_PACKAGE_NAME, packageName) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + + private fun createAppUsageSettingsAccessibilityAction( + context: Context, + @IdRes actionId: Int, + taskDescription: String?, + ) = + AccessibilityAction( + actionId, + context.getString(R.string.split_app_usage_settings, taskDescription), + ) + + private enum class OutlineExpansion { + FOCUS, + HOVER, + } + + private val OUTLINE_EXPANSION: FloatProperty = + KFloatProperty(TaskContentView::outlineExpansion) + private val OUTLINE_EXPANSION_FOCUS: FloatProperty = + KFloatProperty(TaskContentView::outlineExpansionFocus) + private val OUTLINE_EXPANSION_HOVER: FloatProperty = + KFloatProperty(TaskContentView::outlineExpansionHover) + } +} diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskHeaderUiState.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskHeaderUiState.kt new file mode 100644 index 00000000000..b42a25f53a5 --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/thumbnail/TaskHeaderUiState.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.thumbnail + +import android.graphics.drawable.Drawable +import android.view.View + +sealed class TaskHeaderUiState { + data class ShowHeader(val header: ThumbnailHeader) : TaskHeaderUiState() + + data object HideHeader : TaskHeaderUiState() + + data class ThumbnailHeader( + val icon: Drawable?, + val title: String?, + val clickCloseListener: View.OnClickListener, + ) +} diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailUiState.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailUiState.kt index 40f9b28eec6..a5c9ac032f4 100644 --- a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailUiState.kt +++ b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailUiState.kt @@ -17,18 +17,23 @@ package com.android.quickstep.task.thumbnail import android.graphics.Bitmap -import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.view.Surface import androidx.annotation.ColorInt sealed class TaskThumbnailUiState { data object Uninitialized : TaskThumbnailUiState() - data object LiveTile : TaskThumbnailUiState() + data class BackgroundOnly(@ColorInt val backgroundColor: Int) : TaskThumbnailUiState() + + data object LiveTile : TaskThumbnailUiState() + + data class SnapshotSplash(val snapshot: Snapshot, val splash: Drawable?) : + TaskThumbnailUiState() + data class Snapshot( val bitmap: Bitmap, - val drawnRect: Rect, - @ColorInt val backgroundColor: Int - ) : TaskThumbnailUiState() + @Surface.Rotation val thumbnailRotation: Int, + @ColorInt val backgroundColor: Int, + ) } - -data class TaskThumbnail(val taskId: Int, val isRunning: Boolean) diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt index 2836c892c6e..b6928ae67b1 100644 --- a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt +++ b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt @@ -17,133 +17,239 @@ package com.android.quickstep.task.thumbnail import android.content.Context -import android.content.res.Configuration -import android.graphics.Canvas import android.graphics.Color +import android.graphics.Matrix import android.graphics.Outline -import android.graphics.Paint -import android.graphics.PorterDuff -import android.graphics.PorterDuffXfermode +import android.graphics.Path import android.graphics.Rect +import android.graphics.drawable.ShapeDrawable import android.util.AttributeSet +import android.util.Log import android.view.View import android.view.ViewOutlineProvider +import android.widget.FrameLayout import androidx.annotation.ColorInt -import com.android.launcher3.Utilities +import androidx.core.view.isInvisible +import com.android.launcher3.Flags.enableRefactorTaskContentView +import com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA +import com.android.launcher3.R +import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.ViewPool import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.LiveTile import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Snapshot +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.SnapshotSplash import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Uninitialized -import com.android.quickstep.util.TaskCornerRadius -import com.android.quickstep.views.RecentsView -import com.android.quickstep.views.RecentsViewContainer -import com.android.quickstep.views.TaskView -import com.android.systemui.shared.system.QuickStepContract -import kotlinx.coroutines.MainScope -import kotlinx.coroutines.launch - -class TaskThumbnailView : View { - // TODO(b/335649589): Ideally create and obtain this from DI. This ViewModel should be scoped - // to [TaskView], and also shared between [TaskView] and [TaskThumbnailView] - // This is using a lazy for now because the dependencies cannot be obtained without DI. - val viewModel by lazy { - val recentsView = - RecentsViewContainer.containerFromContext(context) - .getOverviewPanel>() - TaskThumbnailViewModel( - recentsView.mRecentsViewData, - (parent as TaskView).taskViewData, - recentsView.mTasksRepository, - ) +import com.android.quickstep.views.FixedSizeImageView + +class TaskThumbnailView : FrameLayout, ViewPool.Reusable { + private val scrimView: View by lazy { findViewById(R.id.task_thumbnail_scrim) } + private val liveTileView: LiveTileView by lazy { findViewById(R.id.task_thumbnail_live_tile) } + private val thumbnailView: FixedSizeImageView by lazy { findViewById(R.id.task_thumbnail) } + private val splashBackground: View by lazy { findViewById(R.id.splash_background) } + private val splashIcon: FixedSizeImageView by lazy { findViewById(R.id.splash_icon) } + private val dimAlpha: MultiPropertyFactory by lazy { + MultiPropertyFactory(scrimView, VIEW_ALPHA, ScrimViewAlpha.entries.size, ::maxOf) } + private val outlinePath = Path() + private var onSizeChanged: ((width: Int, height: Int) -> Unit)? = null private var uiState: TaskThumbnailUiState = Uninitialized - private var inheritedScale: Float = 1f - - private val backgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG) - private val _measuredBounds = Rect() - private val measuredBounds: Rect - get() { - _measuredBounds.set(0, 0, measuredWidth, measuredHeight) - return _measuredBounds + + /** + * Sets the outline bounds of the view. Default to use view's bound as outline when set to null. + */ + var outlineBounds: Rect? = null + set(value) { + field = value + invalidateOutline() + } + + private val bounds = Rect() + + var cornerRadius: Float = 0f + set(value) { + field = value + invalidateOutline() } - private var cornerRadius: Float = TaskCornerRadius.get(context) - private var fullscreenCornerRadius: Float = QuickStepContract.getWindowCornerRadius(context) - constructor(context: Context?) : super(context) - constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) + constructor(context: Context) : super(context) + + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + constructor( - context: Context?, + context: Context, attrs: AttributeSet?, defStyleAttr: Int, ) : super(context, attrs, defStyleAttr) override fun onAttachedToWindow() { super.onAttachedToWindow() - // TODO(b/335396935) replace MainScope with shorter lifecycle. - MainScope().launch { - viewModel.uiState.collect { viewModelUiState -> - uiState = viewModelUiState - invalidate() - } - } - MainScope().launch { viewModel.recentsFullscreenProgress.collect { invalidateOutline() } } - MainScope().launch { - viewModel.inheritedScale.collect { viewModelInheritedScale -> - inheritedScale = viewModelInheritedScale - invalidateOutline() - } + if (enableRefactorTaskContentView()) { + return } - clipToOutline = true outlineProvider = object : ViewOutlineProvider() { override fun getOutline(view: View, outline: Outline) { - outline.setRoundRect(measuredBounds, getCurrentCornerRadius()) + val outlineRect = outlineBounds ?: bounds + outlinePath.apply { + rewind() + addRoundRect( + outlineRect.left.toFloat(), + outlineRect.top.toFloat(), + outlineRect.right.toFloat(), + outlineRect.bottom.toFloat(), + cornerRadius / scaleX, + cornerRadius / scaleY, + Path.Direction.CW, + ) + } + outline.setPath(outlinePath) } } } - override fun onDraw(canvas: Canvas) { - when (val uiStateVal = uiState) { - is Uninitialized -> drawBackgroundOnly(canvas, Color.BLACK) - is LiveTile -> drawTransparentUiState(canvas) - is Snapshot -> drawSnapshotState(canvas, uiStateVal) - is BackgroundOnly -> drawBackgroundOnly(canvas, uiStateVal.backgroundColor) + override fun onRecycle() { + uiState = Uninitialized + if (!enableRefactorTaskContentView()) { + onSizeChanged = null + outlineBounds = null + } + resetViews() + } + + fun setState(state: TaskThumbnailUiState, taskId: Int? = null) { + if (uiState == state) return + logDebug("taskId: $taskId - uiState changed from: $uiState to: $state") + uiState = state + resetViews() + when (state) { + is Uninitialized -> {} + is LiveTile -> drawLiveWindow() + is SnapshotSplash -> drawSnapshotSplash(state) + is BackgroundOnly -> drawBackground(state.backgroundColor) } } - private fun drawBackgroundOnly(canvas: Canvas, @ColorInt backgroundColor: Int) { - backgroundPaint.color = backgroundColor - canvas.drawRect(measuredBounds, backgroundPaint) + /** + * Updates the alpha of the dim layer on top of this view. If dimAlpha is 0, no dimming is + * applied; if dimAlpha is 1, the thumbnail will be the extracted background color. + * + * @param tintAmount The amount of alpha that will be applied to the dim layer. + */ + fun updateTintAmount(tintAmount: Float) { + dimAlpha[ScrimViewAlpha.TintAmount.ordinal].value = tintAmount + } + + fun updateMenuOpenProgress(progress: Float) { + dimAlpha[ScrimViewAlpha.MenuProgress.ordinal].value = progress * MAX_SCRIM_ALPHA } - override fun onConfigurationChanged(newConfig: Configuration?) { - super.onConfigurationChanged(newConfig) + fun updateSplashAlpha(value: Float) { + splashBackground.alpha = value + splashIcon.alpha = value + } - cornerRadius = TaskCornerRadius.get(context) - fullscreenCornerRadius = QuickStepContract.getWindowCornerRadius(context) + fun doOnSizeChange(action: (width: Int, height: Int) -> Unit) { + if (enableRefactorTaskContentView()) { + return + } + onSizeChanged = action + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + if (enableRefactorTaskContentView()) { + return + } + super.onSizeChanged(w, h, oldw, oldh) + onSizeChanged?.invoke(width, height) + bounds.set(0, 0, w, h) invalidateOutline() } - private fun drawTransparentUiState(canvas: Canvas) { - canvas.drawRect(measuredBounds, CLEAR_PAINT) + override fun setScaleX(scaleX: Float) { + if (enableRefactorTaskContentView()) { + return + } + super.setScaleX(scaleX) + // Splash icon should ignore scale on TTV + splashIcon.scaleX = 1 / scaleX } - private fun drawSnapshotState(canvas: Canvas, snapshot: Snapshot) { - drawBackgroundOnly(canvas, snapshot.backgroundColor) - canvas.drawBitmap(snapshot.bitmap, snapshot.drawnRect, measuredBounds, null) + override fun setScaleY(scaleY: Float) { + if (enableRefactorTaskContentView()) { + return + } + super.setScaleY(scaleY) + // Splash icon should ignore scale on TTV + splashIcon.scaleY = 1 / scaleY } - private fun getCurrentCornerRadius() = - Utilities.mapRange( - viewModel.recentsFullscreenProgress.value, - cornerRadius, - fullscreenCornerRadius - ) / inheritedScale + fun parentScaleXUpdated(scaleX: Float) { + // Splash icon should ignore scale on TTV + splashIcon.scaleX = 1 / scaleX + } + + fun parentScaleYUpdated(scaleY: Float) { + // Splash icon should ignore scale on TTV + splashIcon.scaleY = 1 / scaleY + } - companion object { - private val CLEAR_PAINT = - Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR) } + private fun resetViews() { + liveTileView.isInvisible = true + thumbnailView.isInvisible = true + thumbnailView.setImageBitmap(null) + splashBackground.alpha = 0f + splashBackground.setBackgroundColor(Color.TRANSPARENT) + splashIcon.alpha = 0f + splashIcon.setImageDrawable(null) + scrimView.alpha = 0f + alpha = 1.0f + setBackgroundColor(Color.TRANSPARENT) + } + + private fun drawBackground(@ColorInt background: Int) { + setBackgroundColor(background) + } + + private fun drawLiveWindow() { + liveTileView.isInvisible = false + } + + private fun drawSnapshotSplash(snapshotSplash: SnapshotSplash) { + drawSnapshot(snapshotSplash.snapshot) + + splashBackground.setBackgroundColor(snapshotSplash.snapshot.backgroundColor) + val icon = snapshotSplash.splash?.constantState?.newDrawable()?.mutate() ?: ShapeDrawable() + splashIcon.setImageDrawable(icon) + } + + private fun drawSnapshot(snapshot: Snapshot) { + // Always draw the background since the snapshots might be translucent or partially empty + // E.g. reparented tasks from drag-to-dismiss split screen. + drawBackground(snapshot.backgroundColor) + thumbnailView.setImageBitmap(snapshot.bitmap) + thumbnailView.isInvisible = false + } + + fun setImageMatrix(matrix: Matrix) { + if (uiState is SnapshotSplash) { + thumbnailView.imageMatrix = matrix + } + } + + private fun logDebug(message: String) { + Log.d(TAG, "[TaskThumbnailView@${Integer.toHexString(hashCode())}] $message") + } + + private companion object { + const val TAG = "TaskThumbnailView" + private const val MAX_SCRIM_ALPHA = 0.4f + + enum class ScrimViewAlpha { + MenuProgress, + TintAmount, + } } } diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewModel.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewModel.kt deleted file mode 100644 index 4511ea714ce..00000000000 --- a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewModel.kt +++ /dev/null @@ -1,91 +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.quickstep.task.thumbnail - -import android.annotation.ColorInt -import android.graphics.Rect -import androidx.core.graphics.ColorUtils -import com.android.quickstep.recents.data.RecentTasksRepository -import com.android.quickstep.recents.viewmodel.RecentsViewData -import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly -import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.LiveTile -import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Snapshot -import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Uninitialized -import com.android.quickstep.task.viewmodel.TaskViewData -import com.android.systemui.shared.recents.model.Task -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.flatMapLatest -import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.flow.map - -@OptIn(ExperimentalCoroutinesApi::class) -class TaskThumbnailViewModel( - recentsViewData: RecentsViewData, - taskViewData: TaskViewData, - private val tasksRepository: RecentTasksRepository, -) { - private val task = MutableStateFlow>(flowOf(null)) - private var boundTaskIsRunning = false - - val recentsFullscreenProgress = recentsViewData.fullscreenProgress - val inheritedScale = - combine(recentsViewData.scale, taskViewData.scale) { recentsScale, taskScale -> - recentsScale * taskScale - } - val uiState: Flow = - task - .flatMapLatest { taskFlow -> - taskFlow.map { taskVal -> - when { - taskVal == null -> Uninitialized - boundTaskIsRunning -> LiveTile - isBackgroundOnly(taskVal) -> - BackgroundOnly(taskVal.colorBackground.removeAlpha()) - isSnapshotState(taskVal) -> { - val bitmap = taskVal.thumbnail?.thumbnail!! - Snapshot( - bitmap, - Rect(0, 0, bitmap.width, bitmap.height), - taskVal.colorBackground.removeAlpha() - ) - } - else -> Uninitialized - } - } - } - .distinctUntilChanged() - - fun bind(taskThumbnail: TaskThumbnail) { - boundTaskIsRunning = taskThumbnail.isRunning - task.value = tasksRepository.getTaskDataById(taskThumbnail.taskId) - } - - private fun isBackgroundOnly(task: Task): Boolean = task.isLocked || task.thumbnail == null - - private fun isSnapshotState(task: Task): Boolean { - val thumbnailPresent = task.thumbnail?.thumbnail != null - val taskLocked = task.isLocked - - return thumbnailPresent && !taskLocked - } - - @ColorInt private fun Int.removeAlpha(): Int = ColorUtils.setAlphaComponent(this, 0xff) -} diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/data/TaskIconDataSource.kt b/quickstep/src/com/android/quickstep/task/thumbnail/data/TaskIconDataSource.kt new file mode 100644 index 00000000000..c45458c74ea --- /dev/null +++ b/quickstep/src/com/android/quickstep/task/thumbnail/data/TaskIconDataSource.kt @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.task.thumbnail.data + +import com.android.quickstep.TaskIconCache +import com.android.systemui.shared.recents.model.Task + +interface TaskIconDataSource { + suspend fun getIcon(task: Task): TaskIconCache.TaskCacheEntry +} diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/data/TaskThumbnailDataSource.kt b/quickstep/src/com/android/quickstep/task/thumbnail/data/TaskThumbnailDataSource.kt index 55598f0a2d2..6e63ea90d5b 100644 --- a/quickstep/src/com/android/quickstep/task/thumbnail/data/TaskThumbnailDataSource.kt +++ b/quickstep/src/com/android/quickstep/task/thumbnail/data/TaskThumbnailDataSource.kt @@ -16,14 +16,9 @@ package com.android.quickstep.task.thumbnail.data -import com.android.launcher3.util.CancellableTask import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.ThumbnailData -import java.util.function.Consumer interface TaskThumbnailDataSource { - fun updateThumbnailInBackground( - task: Task, - callback: Consumer - ): CancellableTask? + suspend fun getThumbnail(task: Task): ThumbnailData? } diff --git a/quickstep/src/com/android/quickstep/task/viewmodel/TaskViewData.kt b/quickstep/src/com/android/quickstep/task/viewmodel/TaskViewData.kt deleted file mode 100644 index a8b5112860d..00000000000 --- a/quickstep/src/com/android/quickstep/task/viewmodel/TaskViewData.kt +++ /dev/null @@ -1,24 +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.quickstep.task.viewmodel - -import kotlinx.coroutines.flow.MutableStateFlow - -class TaskViewData { - // This is typically a View concern but it is used to invalidate rendering in other Views - val scale = MutableStateFlow(1f) -} diff --git a/quickstep/src/com/android/quickstep/util/ActiveTrackpadList.kt b/quickstep/src/com/android/quickstep/util/ActiveTrackpadList.kt new file mode 100644 index 00000000000..98c47b60289 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ActiveTrackpadList.kt @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.util + +import android.content.Context +import android.hardware.input.InputManager +import android.view.InputDevice +import com.android.launcher3.util.Executors +import com.android.launcher3.util.IntSet + +/** Utility class to maintain a list of actively connected trackpad devices */ +class ActiveTrackpadList(ctx: Context, private val updateCallback: Runnable) : + IntSet(), InputManager.InputDeviceListener { + + private val inputManager = ctx.getSystemService(InputManager::class.java)!! + + init { + inputManager.registerInputDeviceListener(this, Executors.UI_HELPER_EXECUTOR.handler) + inputManager.inputDeviceIds.filter(this::isTrackpadDevice).forEach(this::add) + } + + override fun onInputDeviceAdded(deviceId: Int) { + if (isTrackpadDevice(deviceId)) { + // This updates internal TIS state so it needs to also run on the main + // thread. + Executors.MAIN_EXECUTOR.execute { + val wasEmpty = isEmpty + add(deviceId) + if (wasEmpty) update() + } + } + } + + override fun onInputDeviceChanged(deviceId: Int) {} + + override fun onInputDeviceRemoved(deviceId: Int) { + if (isTrackpadDevice(deviceId)) { + // This updates internal TIS state so it needs to also run on the main thread. + Executors.MAIN_EXECUTOR.execute { + remove(deviceId) + if (isEmpty) update() + } + } + } + + private fun update() { + updateCallback.run() + } + + fun destroy() { + inputManager.unregisterInputDeviceListener(this) + clear() + } + + /** This is a blocking binder call that should run on a bg thread. */ + private fun isTrackpadDevice(deviceId: Int) = + inputManager.getInputDevice(deviceId)?.sources == + (InputDevice.SOURCE_MOUSE or InputDevice.SOURCE_TOUCHPAD) +} diff --git a/quickstep/src/com/android/quickstep/util/ActivityInitListener.java b/quickstep/src/com/android/quickstep/util/ActivityInitListener.java deleted file mode 100644 index 5efbb4074a9..00000000000 --- a/quickstep/src/com/android/quickstep/util/ActivityInitListener.java +++ /dev/null @@ -1,73 +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.quickstep.util; - -import com.android.launcher3.BaseActivity; -import com.android.launcher3.util.ActivityTracker; -import com.android.launcher3.util.ActivityTracker.SchedulerCallback; - -import java.util.function.BiPredicate; - -public class ActivityInitListener implements - SchedulerCallback { - - private BiPredicate mOnInitListener; - private final ActivityTracker mActivityTracker; - - private boolean mIsRegistered = false; - - /** - * @param onInitListener a callback made when the activity is initialized. The callback should - * return true to continue receiving callbacks (ie. for if the activity is - * recreated). - */ - public ActivityInitListener(BiPredicate onInitListener, - ActivityTracker tracker) { - mOnInitListener = onInitListener; - mActivityTracker = tracker; - } - - @Override - public final boolean init(T activity, boolean alreadyOnHome) { - if (!mIsRegistered) { - // Don't receive any more updates - return false; - } - return handleInit(activity, alreadyOnHome); - } - - protected boolean handleInit(T activity, boolean alreadyOnHome) { - return mOnInitListener.test(activity, alreadyOnHome); - } - - /** - * Registers the activity-created listener. If the activity is already created, then the - * callback provided in the constructor will be called synchronously. - */ - public void register(String reasonString) { - mIsRegistered = true; - mActivityTracker.registerCallback(this, reasonString); - } - - /** - * After calling this, we won't {@link #init} even when the activity is ready. - */ - public void unregister(String reasonString) { - mActivityTracker.unregisterCallback(this, reasonString); - mIsRegistered = false; - mOnInitListener = null; - } -} diff --git a/quickstep/src/com/android/quickstep/util/ActivityPreloadUtil.kt b/quickstep/src/com/android/quickstep/util/ActivityPreloadUtil.kt new file mode 100644 index 00000000000..239230c1239 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ActivityPreloadUtil.kt @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.content.Context +import android.content.Intent +import android.os.Trace +import android.view.Display.DEFAULT_DISPLAY +import com.android.launcher3.provider.RestoreDbTask +import com.android.launcher3.util.Executors +import com.android.launcher3.util.LockedUserState +import com.android.quickstep.OverviewComponentObserver +import com.android.quickstep.RecentsAnimationDeviceState +import com.android.systemui.shared.system.ActivityManagerWrapper + +/** Utility class for preloading overview */ +object ActivityPreloadUtil { + + @JvmStatic + fun preloadOverviewForSUWAllSet(ctx: Context) { + preloadOverview(ctx, fromInit = false, forSUWAllSet = true) + } + + @JvmStatic + fun preloadOverviewForTIS(ctx: Context, fromInit: Boolean) { + preloadOverview(ctx, fromInit = fromInit, forSUWAllSet = false) + } + + private fun preloadOverview(ctx: Context, fromInit: Boolean, forSUWAllSet: Boolean) { + Trace.beginSection("preloadOverview(fromInit=$fromInit, forSUWAllSet=$forSUWAllSet)") + + try { + if (!LockedUserState.get(ctx).isUserUnlocked) return + + val deviceState = + RecentsAnimationDeviceState.REPOSITORY_INSTANCE.get(ctx)[ctx.displayId] ?: return + val overviewCompObserver = OverviewComponentObserver.INSTANCE[ctx] + + // Prevent the overview from being started before the real home on first boot + if (deviceState.isButtonNavMode && !overviewCompObserver.isHomeAndOverviewSame) return + + // Preloading while a restore is pending may cause launcher to start the restore too + // early + if ((RestoreDbTask.isPending(ctx) && !forSUWAllSet) || !deviceState.isUserSetupComplete) + return + + // The activity has been created before the initialization of overview service. It is + // usually happens when booting or launcher is the top activity, so we should already + // have the latest state. + if ( + fromInit && + overviewCompObserver.getContainerInterface(DEFAULT_DISPLAY)?.createdContainer != + null + ) + return + + //ActiveGestureProtoLogProxy.logPreloadRecentsAnimation() + val overviewIntent = Intent(overviewCompObserver.overviewIntentIgnoreSysUiState) + Executors.UI_HELPER_EXECUTOR.execute { + ActivityManagerWrapper.getInstance().preloadRecentsActivity(overviewIntent) + } + } finally { + Trace.endSection() + } + } +} diff --git a/quickstep/src/com/android/quickstep/util/AnimUtils.java b/quickstep/src/com/android/quickstep/util/AnimUtils.java index 8e3d44f8d80..99449043286 100644 --- a/quickstep/src/com/android/quickstep/util/AnimUtils.java +++ b/quickstep/src/com/android/quickstep/util/AnimUtils.java @@ -17,18 +17,37 @@ package com.android.quickstep.util; import static com.android.app.animation.Interpolators.clampToProgress; +import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; +import android.os.BinderUtils; import android.os.Bundle; +import android.os.IBinder; import android.os.IRemoteCallback; import android.view.animation.Interpolator; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.DefaultLifecycleObserver; +import androidx.lifecycle.LifecycleOwner; + +import com.android.launcher3.logging.StatsLogManager; +import com.android.launcher3.statemanager.BaseState; +import com.android.launcher3.statemanager.StateManager; +import com.android.launcher3.states.StateAnimationConfig; import com.android.launcher3.util.RunnableList; +import com.android.launcher3.views.ActivityContext; +import com.android.quickstep.views.RecentsViewContainer; /** * Utility class containing methods to help manage animations, interpolators, and timings. */ public class AnimUtils { + private static final int DURATION_DEFAULT_SPLIT_DISMISS = 350; + /** * Fetches device-specific timings for the Overview > Split animation * (splitscreen initiated from Overview). @@ -59,14 +78,65 @@ public static SplitAnimationTimings getDeviceAppPairLaunchTimings(boolean isTabl } /** - * Returns a IRemoteCallback which completes the provided list as a result + * Synchronizes the timing for the split dismiss animation to the current transition to + * NORMAL (launcher home/workspace) */ - public static IRemoteCallback completeRunnableListCallback(RunnableList list) { + public static void goToNormalStateWithSplitDismissal(@NonNull StateManager stateManager, + @NonNull RecentsViewContainer container, + @NonNull StatsLogManager.LauncherEvent exitReason, + @NonNull SplitAnimationController animationController, + @Nullable Runnable onEndCallback) { + StateAnimationConfig config = new StateAnimationConfig(); + BaseState startState = stateManager.getState(); + long duration = startState.getTransitionDuration(container, false /*isToState*/); + if (duration == 0) { + // Case where we're in contextual on workspace (NORMAL), which by default has 0 + // transition duration + duration = DURATION_DEFAULT_SPLIT_DISMISS; + } + config.duration = duration; + AnimatorSet stateAnim = stateManager.createAtomicAnimation( + startState, stateManager.getRestState(), config); + AnimatorSet dismissAnim = animationController + .createPlaceholderDismissAnim(container, exitReason, duration); + stateAnim.play(dismissAnim); + if (onEndCallback != null) { + stateAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + onEndCallback.run(); + } + }); + } + stateManager.setCurrentAnimation(stateAnim, stateManager.getRestState()); + stateAnim.start(); + } + + /** + * Returns a IRemoteCallback which completes the provided list as a result or when the owner + * is destroyed + */ + public static IRemoteCallback completeRunnableListCallback( + RunnableList list, ActivityContext owner) { + DefaultLifecycleObserver destroyObserver = new DefaultLifecycleObserver() { + @Override + public void onDestroy(@NonNull LifecycleOwner owner) { + list.executeAllAndClear(); + } + }; + MAIN_EXECUTOR.execute(() -> owner.getLifecycle().addObserver(destroyObserver)); + list.add(() -> owner.getLifecycle().removeObserver(destroyObserver)); + return new IRemoteCallback.Stub() { @Override public void sendResult(Bundle bundle) { MAIN_EXECUTOR.execute(list::executeAllAndDestroy); } + + @Override + public IBinder asBinder() { + return BinderUtils.wrapLifecycle(this, owner.getOwnerCleanupSet()); + } }; } diff --git a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java index c7c04ed91c0..a2e0628da83 100644 --- a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java +++ b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java @@ -17,11 +17,9 @@ import static com.android.app.animation.Interpolators.DECELERATE; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.Flags.enableGridOnlyOverview; import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; -import android.animation.AnimatorSet; import android.animation.TimeInterpolator; import android.content.Context; import android.graphics.Matrix; @@ -34,18 +32,11 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherState; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.statemanager.StateManager; -import com.android.launcher3.statemanager.StatefulActivity; -import com.android.launcher3.states.StateAnimationConfig; -import com.android.launcher3.touch.AllAppsSwipeController; -import com.android.quickstep.DeviceConfigWrapper; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; import com.android.quickstep.views.RecentsView; -import com.android.quickstep.views.RecentsViewContainer; /** * Controls an animation that can go beyond progress = 1, at which point resistance should be @@ -57,10 +48,7 @@ public class AnimatorControllerWithResistance { private enum RecentsResistanceParams { FROM_APP(0.75f, 0.5f, 1f, false), - FROM_APP_TO_ALL_APPS(1f, 0.6f, 0.8f, false), FROM_APP_TABLET(1f, 0.7f, 1f, true), - FROM_APP_TABLET_GRID_ONLY(1f, 1f, 1f, true), - FROM_APP_TO_ALL_APPS_TABLET(1f, 0.5f, 0.5f, false), FROM_OVERVIEW(1f, 0.75f, 0.5f, false); RecentsResistanceParams(float scaleStartResist, float scaleMaxResist, @@ -157,46 +145,10 @@ public static AnimatorControllerWithResistance createForRec RecentsParams params = new RecentsParams(context, recentsOrientedState, dp, scaleTarget, scaleProperty, translationTarget, translationProperty); PendingAnimation resistAnim = createRecentsResistanceAnim(params); - - // Apply All Apps animation during the resistance animation. - if (recentsOrientedState.getContainerInterface().allowAllAppsFromOverview()) { - RecentsViewContainer container = - recentsOrientedState.getContainerInterface().getCreatedContainer(); - if (container != null) { - RecentsView recentsView = container.getOverviewPanel(); - StateManager> stateManager = - recentsView.getStateManager(); - if (stateManager.isInStableState(LauncherState.BACKGROUND_APP) - && stateManager.isInTransition()) { - - // Calculate the resistance progress threshold where All Apps will trigger. - float threshold = getAllAppsThreshold(context, recentsOrientedState, dp); - - StateAnimationConfig config = new StateAnimationConfig(); - AllAppsSwipeController.applyOverviewToAllAppsAnimConfig(dp, config, threshold); - AnimatorSet allAppsAnimator = stateManager.createAnimationToNewWorkspace( - LauncherState.ALL_APPS, config).getTarget(); - resistAnim.add(allAppsAnimator); - } - } - } - AnimatorPlaybackController resistanceController = resistAnim.createPlaybackController(); return new AnimatorControllerWithResistance(normalController, resistanceController); } - private static float getAllAppsThreshold(Context context, - RecentsOrientedState recentsOrientedState, DeviceProfile dp) { - int transitionDragLength = - recentsOrientedState.getContainerInterface().getSwipeUpDestinationAndLength( - dp, context, TEMP_RECT, - recentsOrientedState.getOrientationHandler()); - float dragLengthFactor = (float) dp.heightPx / transitionDragLength; - // -1s are because 0-1 is reserved for the normal transition. - float threshold = DeviceConfigWrapper.get().getAllAppsOverviewThreshold() / 100f; - return (threshold - 1) / (dragLengthFactor - 1); - } - /** * Creates the resistance animation for {@link #createForRecents}, or can be used separately * when starting from recents, i.e. {@link #createRecentsResistanceFromOverviewAnim}. @@ -231,7 +183,7 @@ public static PendingAnimation createRecentsResistanceAnim( params.startTranslation, endTranslation, RECENTS_TRANSLATE_RESIST_INTERPOLATOR); float prevScaleRate = (fullscreenScale - params.startScale) - / (params.dp.heightPx - startRect.bottom); + / (params.dp.getDeviceProperties().getHeightPx() - startRect.bottom); // This is what the scale would be at the end of the drag if we didn't apply resistance. float endScale = params.startScale - prevScaleRate * distanceToCover; // Create an interpolator that resists the scale so the scale doesn't get smaller than @@ -304,18 +256,10 @@ private RecentsParams(Context context, RecentsOrientedState recentsOrientedState this.scaleProperty = scaleProperty; this.translationTarget = translationTarget; this.translationProperty = translationProperty; - if (dp.isTablet) { - resistanceParams = - recentsOrientedState.getContainerInterface().allowAllAppsFromOverview() - ? RecentsResistanceParams.FROM_APP_TO_ALL_APPS_TABLET - : enableGridOnlyOverview() - ? RecentsResistanceParams.FROM_APP_TABLET_GRID_ONLY - : RecentsResistanceParams.FROM_APP_TABLET; + if (dp.getDeviceProperties().isTablet()) { + resistanceParams = RecentsResistanceParams.FROM_APP_TABLET; } else { - resistanceParams = - recentsOrientedState.getContainerInterface().allowAllAppsFromOverview() - ? RecentsResistanceParams.FROM_APP_TO_ALL_APPS - : RecentsResistanceParams.FROM_APP; + resistanceParams = RecentsResistanceParams.FROM_APP; } } diff --git a/quickstep/src/com/android/quickstep/util/AppPairsController.java b/quickstep/src/com/android/quickstep/util/AppPairsController.java index e8782101641..5a642df610f 100644 --- a/quickstep/src/com/android/quickstep/util/AppPairsController.java +++ b/quickstep/src/com/android/quickstep/util/AppPairsController.java @@ -22,16 +22,15 @@ import static com.android.internal.jank.Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_PAIR_LAUNCH; import static com.android.launcher3.model.data.AppInfo.PACKAGE_KEY_COMPARATOR; -import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_SUPPORTS_MULTI_INSTANCE; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; -import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50; -import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_NONE; -import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; -import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; -import static com.android.wm.shell.common.split.SplitScreenConstants.isPersistentSnapPosition; +import static com.android.systemui.shared.recents.utilities.Utilities.isFreeformTask; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_NONE; +import static com.android.wm.shell.shared.split.SplitScreenConstants.getIndex; +import static com.android.wm.shell.shared.split.SplitScreenConstants.isPersistentSnapPosition; import static java.util.stream.Collectors.toList; @@ -46,13 +45,11 @@ import androidx.annotation.VisibleForTesting; import com.android.internal.jank.Cuj; +import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherSettings; -import com.android.launcher3.R; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; import com.android.launcher3.allapps.AllAppsStore; import com.android.launcher3.apppairs.AppPairIcon; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.IconCache; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.StatsLogManager; @@ -60,24 +57,33 @@ import com.android.launcher3.model.data.AppPairInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.ItemInfoWithIcon; +import com.android.launcher3.model.data.ResolvedTargetInfo; +import com.android.launcher3.model.data.TaskViewItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.taskbar.TaskbarActivityContext; -import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; import com.android.launcher3.views.ActivityContext; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TaskUtils; import com.android.quickstep.TopTaskTracker; import com.android.quickstep.views.GroupedTaskView; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.views.TaskContainer; import com.android.quickstep.views.TaskView; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; -import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.split.SplitScreenConstants.PersistentSnapPosition; import java.util.Arrays; import java.util.List; +import java.util.Objects; +import java.util.function.Consumer; /** * Controller class that handles app pair interactions: saving, modifying, deleting, etc. @@ -94,10 +100,10 @@ public class AppPairsController { private static final int BITMASK_SIZE = 16; private static final int BITMASK_FOR_SNAP_POSITION = (1 << BITMASK_SIZE) - 1; - private Context mContext; + private ActivityContext mContext; private final SplitSelectStateController mSplitSelectStateController; private final StatsLogManager mStatsLogManager; - public AppPairsController(Context context, + public AppPairsController(ActivityContext context, SplitSelectStateController splitSelectStateController, StatsLogManager statsLogManager) { mContext = context; @@ -109,6 +115,12 @@ void onDestroy() { mContext = null; } + private Launcher getLauncher() { + return mContext == null || !OverviewComponentObserver.INSTANCE.get(mContext.asContext()) + .isHomeAndOverviewSame() + ? null : Launcher.ACTIVITY_TRACKER.getCreatedContext(); + } + /** * Returns whether the specified GroupedTaskView can be saved as an app pair. */ @@ -129,29 +141,27 @@ public boolean canSaveAppPair(TaskView taskView) { .anyMatch(att -> att != null && att.getItemInfo() != null && ((att.getItemInfo().runtimeStatusFlags & ItemInfoWithIcon.FLAG_NOT_PINNABLE) != 0)); - if (!FeatureFlags.enableAppPairs() - || !taskView.containsMultipleTasks() + if (!taskView.containsMultipleTasks() || hasUnpinnableApp - || !(taskView instanceof GroupedTaskView)) { + || !(taskView instanceof GroupedTaskView groupedTaskView)) { return false; } - GroupedTaskView gtv = (GroupedTaskView) taskView; - List containers = gtv.getTaskContainers(); - ComponentKey taskKey1 = TaskUtils.getLaunchComponentKeyForTask( - containers.get(0).getTask().key); - ComponentKey taskKey2 = TaskUtils.getLaunchComponentKeyForTask( - containers.get(1).getTask().key); - AppInfo app1 = resolveAppInfoByComponent(taskKey1); - AppInfo app2 = resolveAppInfoByComponent(taskKey2); + ComponentKey leftTopComponentKey = TaskUtils.getLaunchComponentKeyForTask( + groupedTaskView.getLeftTopTaskContainer().getTask().key); + ComponentKey rightBottomComponentKey = TaskUtils.getLaunchComponentKeyForTask( + groupedTaskView.getRightBottomTaskContainer().getTask().key); + AppInfo leftTopAppInfo = resolveAppInfoByComponent(leftTopComponentKey); + AppInfo rightBottomAppInfo = resolveAppInfoByComponent(rightBottomComponentKey); - if (app1 == null || app2 == null) { + if (leftTopAppInfo == null || rightBottomAppInfo == null) { // Disallow saving app pairs for apps that don't have a front-door in Launcher return false; } - if (PackageManagerHelper.isSameAppForMultiInstance(app1, app2)) { - if (!app1.supportsMultiInstance() || !app2.supportsMultiInstance()) { + if (PackageManagerHelper.isSameAppForMultiInstance(leftTopAppInfo, rightBottomAppInfo)) { + if (!leftTopAppInfo.supportsMultiInstance() + || !rightBottomAppInfo.supportsMultiInstance()) { return false; } } @@ -174,25 +184,11 @@ public boolean canSaveAppPair(TaskView taskView) { */ public void saveAppPair(GroupedTaskView gtv) { InteractionJankMonitorWrapper.begin(gtv, Cuj.CUJ_LAUNCHER_SAVE_APP_PAIR); - List containers = gtv.getTaskContainers(); - WorkspaceItemInfo recentsInfo1 = containers.get(0).getItemInfo(); - WorkspaceItemInfo recentsInfo2 = containers.get(1).getItemInfo(); - WorkspaceItemInfo app1 = resolveAppPairWorkspaceInfo(recentsInfo1); - WorkspaceItemInfo app2 = resolveAppPairWorkspaceInfo(recentsInfo2); - - if (app1 == null || app2 == null) { - // This shouldn't happen if canSaveAppPair() is called above, but log an error and do - // not create the app pair if the workspace items can't be resolved - Log.w(TAG, "Failed to save app pair due to invalid apps (" - + "app1=" + recentsInfo1.getComponentKey().componentName - + " app2=" + recentsInfo2.getComponentKey().componentName + ")"); - return; - } @PersistentSnapPosition int snapPosition = gtv.getSnapPosition(); if (snapPosition == SNAP_TO_NONE) { // Free snap mode is enabled, just save it as 50/50 split. - snapPosition = SNAP_TO_50_50; + snapPosition = SNAP_TO_2_50_50; } if (!isPersistentSnapPosition(snapPosition)) { // If we received an illegal snap position, log an error and do not create the app pair @@ -201,31 +197,62 @@ public void saveAppPair(GroupedTaskView gtv) { return; } - app1.rank = encodeRank(SPLIT_POSITION_TOP_OR_LEFT, snapPosition); - app2.rank = encodeRank(SPLIT_POSITION_BOTTOM_OR_RIGHT, snapPosition); - AppPairInfo newAppPair = new AppPairInfo(app1, app2); + List recentsInfos = + gtv.getTaskContainers().stream().map(TaskContainer::getItemInfo).toList(); + List apps = + recentsInfos.stream().map(this::resolveAppPairWorkspaceInfo).toList(); - IconCache iconCache = LauncherAppState.getInstance(mContext).getIconCache(); + if (apps.stream().anyMatch(Objects::isNull)) { + // This shouldn't happen if canSaveAppPair() is called above, but log an error and do + // not create the app pair if the workspace items can't be resolved + StringBuilder error = + new StringBuilder("Failed to save app pair due to invalid apps ("); + for (int i = 0; i < recentsInfos.size(); i++) { + error.append("app").append(i).append("=") + .append(recentsInfos.get(i).getComponentKey().componentName).append(" "); + } + error.append(")"); + Log.w(TAG, error.toString()); + return; + } + + for (int i = 0; i < apps.size(); i++) { + apps.get(i).rank = encodeRank(getIndex(i), snapPosition); + } + AppPairInfo newAppPair = new AppPairInfo(apps); + + IconCache iconCache = LauncherAppState.getInstance(mContext.asContext()).getIconCache(); MODEL_EXECUTOR.execute(() -> { newAppPair.getAppContents().forEach(member -> { member.title = ""; member.bitmap = iconCache.getDefaultIcon(newAppPair.user); - iconCache.getTitleAndIcon(member, member.usingLowResIcon()); + iconCache.getTitleAndIcon(member, member.getMatchingLookupFlag()); }); MAIN_EXECUTOR.execute(() -> { - LauncherAccessibilityDelegate delegate = - QuickstepLauncher.getLauncher(mContext).getAccessibilityDelegate(); - if (delegate != null) { - delegate.addToWorkspace(newAppPair, true, (success) -> { - if (success) { - InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_SAVE_APP_PAIR); - } else { - InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_SAVE_APP_PAIR); - } - }); - mStatsLogManager.logger().withItemInfo(newAppPair) - .log(StatsLogManager.LauncherEvent.LAUNCHER_APP_PAIR_SAVE); + Launcher launcher = getLauncher(); + LauncherAccessibilityDelegate delegate = launcher == null + ? null : launcher.getAccessibilityDelegate(); + if (delegate == null) { + return; + } + BaseContainerInterface containerInterface = + OverviewComponentObserver.INSTANCE.get( + mContext.asContext()).getContainerInterface(gtv.getDisplayId()); + if (containerInterface != null) { + RecentsViewContainer container = containerInterface.getCreatedContainer(); + if (container instanceof RecentsWindowManager recentsWindowManager) { + recentsWindowManager.getStateManager().moveToRestState(); + } } + delegate.addToWorkspace(newAppPair, true, (success) -> { + if (success) { + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_SAVE_APP_PAIR); + } else { + InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_SAVE_APP_PAIR); + } + }); + mStatsLogManager.logger().withItemInfo(newAppPair) + .log(StatsLogManager.LauncherEvent.LAUNCHER_APP_PAIR_SAVE); }); }); } @@ -236,17 +263,19 @@ public void saveAppPair(GroupedTaskView gtv) { * * @param cuj Should be an integer from {@link Cuj} or -1 if no CUJ needs to be logged for jank * monitoring + * @param callback Called after the app pair launch finishes animating, or null if no method is + * to be called */ - public void launchAppPair(AppPairIcon appPairIcon, int cuj) { - WorkspaceItemInfo app1 = appPairIcon.getInfo().getFirstApp(); - WorkspaceItemInfo app2 = appPairIcon.getInfo().getSecondApp(); - ComponentKey app1Key = new ComponentKey(app1.getTargetComponent(), app1.user); - ComponentKey app2Key = new ComponentKey(app2.getTargetComponent(), app2.user); - mSplitSelectStateController.setLaunchingCuj(cuj); - InteractionJankMonitorWrapper.begin(appPairIcon, cuj); + public void launchAppPair(AppPairIcon appPairIcon, int cuj, + @Nullable Consumer callback) { + final WorkspaceItemInfo app1 = appPairIcon.getInfo().getFirstApp(); + final WorkspaceItemInfo app2 = appPairIcon.getInfo().getSecondApp(); + final ResolvedTargetInfo resolvedTargetInfo1 = app1.getResolvedTargetInfo(); + final ResolvedTargetInfo resolvedTargetInfo2 = app2.getResolvedTargetInfo(); + mSplitSelectStateController.setLaunchingCuj(appPairIcon, cuj); mSplitSelectStateController.findLastActiveTasksAndRunCallback( - Arrays.asList(app1Key, app2Key), + Arrays.asList(resolvedTargetInfo1, resolvedTargetInfo2), false /* findExactPairMatch */, foundTasks -> { @Nullable Task foundTask1 = foundTasks[0]; @@ -277,19 +306,29 @@ public void launchAppPair(AppPairIcon appPairIcon, int cuj) { mSplitSelectStateController.setLaunchingIconView(appPairIcon); mSplitSelectStateController.launchSplitTasks( - AppPairsController.convertRankToSnapPosition(app1.rank)); + AppPairsController.convertRankToSnapPosition(app1.rank), callback); } ); } + /** + * Launches an app pair but does not specify a callback + */ + public void launchAppPair(AppPairIcon appPairIcon, int cuj) { + launchAppPair(appPairIcon, cuj, null); + } + /** * Returns an AppInfo associated with the app for the given ComponentKey, or null if no such * package exists in the AllAppsStore. */ @Nullable private AppInfo resolveAppInfoByComponent(@NonNull ComponentKey key) { - AllAppsStore appsStore = ActivityContext.lookupContext(mContext) - .getAppsView().getAppsStore(); + Launcher launcher = getLauncher(); + if (launcher == null) { + return null; + } + AllAppsStore appsStore = launcher.getAppsView().getAppsStore(); // First look up the app info in order of: // - The exact activity for the recent task @@ -314,7 +353,7 @@ private WorkspaceItemInfo resolveAppPairWorkspaceInfo( if (appInfo == null) { return null; } - return appInfo.makeWorkspaceItem(mContext); + return appInfo.makeWorkspaceItem(mContext.asContext()); } /** @@ -327,19 +366,21 @@ private WorkspaceItemInfo resolveAppPairWorkspaceInfo( * c) App B is on-screen, but App A isn't. * d) Neither is on-screen. * - * If the user tapped an app pair while inside a single app, there are 3 cases: - * a) The on-screen app is App A of the app pair. - * b) The on-screen app is App B of the app pair. - * c) It is neither. + * If the user tapped an app pair while a fullscreen or freeform app is visible on screen, + * there are 4 cases: + * a) At least one of the apps in the app pair is in freeform windowing mode. + * b) The on-screen app is App A of the app pair. + * c) The on-screen app is App B of the app pair. + * d) It is neither. * * For each case, we call the appropriate animation and split launch type. */ public void handleAppPairLaunchInApp(AppPairIcon launchingIconView, List itemInfos) { TaskbarActivityContext context = (TaskbarActivityContext) launchingIconView.getContext(); - List componentKeys = - itemInfos.stream().map(ItemInfo::getComponentKey).collect(toList()); - + List resolvedTargetInfos = itemInfos.stream() + .map(itemInfo -> itemInfo.getResolvedTargetInfo()) + .toList(); // Use TopTaskTracker to find the currently running app (or apps) TopTaskTracker topTaskTracker = getTopTaskTracker(); @@ -352,7 +393,7 @@ public void handleAppPairLaunchInApp(AppPairIcon launchingIconView, int runningTaskId2 = runningSplitTasks[1]; mSplitSelectStateController.findLastActiveTasksAndRunCallback( - componentKeys, + resolvedTargetInfos, false /* findExactPairMatch */, foundTasks -> { // If our clicked app pair has already-running Tasks, we grab the @@ -364,7 +405,7 @@ public void handleAppPairLaunchInApp(AppPairIcon launchingIconView, } else { return INVALID_TASK_ID; } - }).collect(toList()); + }).toList(); if (lastActiveTasksOfAppPair.contains(runningTaskId1) && lastActiveTasksOfAppPair.contains(runningTaskId2)) { @@ -403,19 +444,38 @@ public void handleAppPairLaunchInApp(AppPairIcon launchingIconView, ); } else { // Tapped an app pair while in a single app - int runningTaskId = topTaskTracker - .getCachedTopTask(false /* filterOnlyVisibleRecents */).getTaskId(); + final TopTaskTracker.CachedTaskInfo runningTask = topTaskTracker + .getCachedTopTask(false /* filterOnlyVisibleRecents */, context.getDisplayId()); mSplitSelectStateController.findLastActiveTasksAndRunCallback( - componentKeys, + resolvedTargetInfos, false /* findExactPairMatch */, foundTasks -> { Task foundTask1 = foundTasks[0]; Task foundTask2 = foundTasks[1]; - boolean task1IsOnScreen = - foundTask1 != null && foundTask1.getKey().getId() == runningTaskId; - boolean task2IsOnScreen = - foundTask2 != null && foundTask2.getKey().getId() == runningTaskId; + + if (DesktopModeStatus.canEnterDesktopMode(context) && (isFreeformTask( + foundTask1) || isFreeformTask(foundTask2))) { + launchAppPair(launchingIconView, + CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR); + return; + } + + boolean task1IsOnScreen; + boolean task2IsOnScreen; + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + task1IsOnScreen = foundTask1 != null + && runningTask.topGroupedTaskContainsTask( + foundTask1.getKey().getId()); + task2IsOnScreen = foundTask2 != null + && runningTask.topGroupedTaskContainsTask( + foundTask2.getKey().getId()); + } else { + task1IsOnScreen = foundTask1 != null && foundTask1.getKey().getId() + == runningTask.getTaskId(); + task2IsOnScreen = foundTask2 != null && foundTask2.getKey().getId() + == runningTask.getTaskId(); + } if (!task1IsOnScreen && !task2IsOnScreen) { // Neither App A nor App B are on-screen, launch the app pair normally. @@ -515,6 +575,6 @@ public static int convertRankToSnapPosition(int rank) { */ @VisibleForTesting public TopTaskTracker getTopTaskTracker() { - return TopTaskTracker.INSTANCE.get(mContext); + return TopTaskTracker.INSTANCE.get(mContext.asContext()); } } diff --git a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java index 0ce54ad2e68..2e3dee6e094 100644 --- a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java +++ b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java @@ -81,7 +81,7 @@ public void requestAssistContent(final int taskId, final Callback callback) { try { mActivityTaskManager.requestAssistDataForTask( new AssistDataReceiver(callback, this), taskId, mPackageName, - mAttributionTag); + mAttributionTag, false /* fetchStructure */); } catch (RemoteException e) { Log.e(TAG, "Requesting assist content failed for task: " + taskId, e); } diff --git a/quickstep/src/com/android/quickstep/util/AssistStateManager.java b/quickstep/src/com/android/quickstep/util/AssistStateManager.java deleted file mode 100644 index 7acb28da11a..00000000000 --- a/quickstep/src/com/android/quickstep/util/AssistStateManager.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.util; - -import static com.android.launcher3.util.MainThreadInitializedObject.forOverride; - -import com.android.launcher3.R; -import com.android.launcher3.util.MainThreadInitializedObject; -import com.android.launcher3.util.ResourceBasedOverride; -import com.android.launcher3.util.SafeCloseable; - -import java.io.PrintWriter; -import java.util.Optional; - -/** Class to manage Assistant states. */ -public class AssistStateManager implements ResourceBasedOverride, SafeCloseable { - - public static final MainThreadInitializedObject INSTANCE = - forOverride(AssistStateManager.class, R.string.assist_state_manager_class); - - public AssistStateManager() {} - - /** Return {@code true} if the Settings toggle is enabled. */ - public boolean isSettingsAllEntrypointsEnabled() { - return false; - } - - /** Whether search supports showing on the lockscreen. */ - public boolean supportsShowWhenLocked() { - return false; - } - - /** Whether ContextualSearchService invocation path is available. */ - public boolean isContextualSearchServiceAvailable() { - return false; - } - - /** Get the Launcher overridden long press nav handle duration to trigger Assistant. */ - public Optional getLPNHDurationMillis() { - return Optional.empty(); - } - - /** - * Get the Launcher overridden long press nav handle touch slop multiplier to trigger Assistant. - */ - public Optional getLPNHCustomSlopMultiplier() { - return Optional.empty(); - } - - /** Get the Launcher overridden long press home duration to trigger Assistant. */ - public Optional getLPHDurationMillis() { - return Optional.empty(); - } - - /** Get the Launcher overridden long press home touch slop multiplier to trigger Assistant. */ - public Optional getLPHCustomSlopMultiplier() { - return Optional.empty(); - } - - /** Get the long press duration data source. */ - public int getDurationDataSource() { - return 0; - } - - /** Get the long press touch slop multiplier data source. */ - public int getSlopDataSource() { - return 0; - } - - /** Get the haptic bit overridden by AGSA. */ - public Optional getShouldPlayHapticOverride() { - return Optional.empty(); - } - - /** Dump states. */ - public void dump(String prefix, PrintWriter writer) {} - - @Override - public void close() {} -} diff --git a/quickstep/src/com/android/quickstep/util/AssistUtils.java b/quickstep/src/com/android/quickstep/util/AssistUtils.java deleted file mode 100644 index 11b6ea7d213..00000000000 --- a/quickstep/src/com/android/quickstep/util/AssistUtils.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.util; - -import android.content.Context; - -import com.android.launcher3.R; -import com.android.launcher3.util.ResourceBasedOverride; - -/** Utilities to work with Assistant functionality. */ -public class AssistUtils implements ResourceBasedOverride { - - public AssistUtils() {} - - /** Creates AssistUtils as specified by overrides */ - public static AssistUtils newInstance(Context context) { - return Overrides.getObject(AssistUtils.class, context, R.string.assist_utils_class); - } - - /** @return Array of AssistUtils.INVOCATION_TYPE_* that we want to handle instead of SysUI. */ - public int[] getSysUiAssistOverrideInvocationTypes() { - return new int[0]; - } - - /** - * @return {@code true} if the override was handled, i.e. an assist surface was shown or the - * request should be ignored. {@code false} means the caller should start assist another way. - */ - public boolean tryStartAssistOverride(int invocationType) { - return false; - } -} diff --git a/quickstep/src/com/android/quickstep/util/AsyncClockEventDelegate.java b/quickstep/src/com/android/quickstep/util/AsyncClockEventDelegate.java new file mode 100644 index 00000000000..50d2c7b6262 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/AsyncClockEventDelegate.java @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.util; + +import static android.content.Intent.ACTION_TIMEZONE_CHANGED; +import static android.content.Intent.ACTION_TIME_CHANGED; + +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; +import static com.android.launcher3.util.SimpleBroadcastReceiver.actionsFilter; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.database.ContentObserver; +import android.net.Uri; +import android.os.Handler; +import android.provider.Settings; +import android.util.ArrayMap; +import android.widget.TextClock.ClockEventDelegate; + +import androidx.annotation.WorkerThread; + +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; +import com.android.launcher3.util.SafeCloseable; +import com.android.launcher3.util.SettingsCache; +import com.android.launcher3.util.SettingsCache.OnChangeListener; +import com.android.launcher3.util.SimpleBroadcastReceiver; +import com.android.quickstep.dagger.QuickstepBaseAppComponent; + +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + +/** + * Extension of {@link ClockEventDelegate} to support async event registration + */ +@LauncherAppSingleton +public class AsyncClockEventDelegate extends ClockEventDelegate + implements OnChangeListener, SafeCloseable { + + public static final DaggerSingletonObject INSTANCE = + new DaggerSingletonObject<>(QuickstepBaseAppComponent::getAsyncClockEventDelegate); + + private final Context mContext; + private final SettingsCache mSettingsCache; + private final SimpleBroadcastReceiver mReceiver; + + private final ArrayMap mTimeEventReceivers = new ArrayMap<>(); + private final List mFormatObservers = new ArrayList<>(); + private final Uri mFormatUri = Settings.System.getUriFor(Settings.System.TIME_12_24); + + private boolean mFormatRegistered = false; + private boolean mDestroyed = false; + + @Inject + AsyncClockEventDelegate(@ApplicationContext Context context, + DaggerSingletonTracker tracker, + SettingsCache settingsCache) { + super(context); + mContext = context; + mSettingsCache = settingsCache; + mReceiver = new SimpleBroadcastReceiver( + context, UI_HELPER_EXECUTOR, MAIN_EXECUTOR, this::onClockEventReceived); + mReceiver.register(actionsFilter(ACTION_TIME_CHANGED, ACTION_TIMEZONE_CHANGED)); + tracker.addCloseable(this); + } + + @Override + public void registerTimeChangeReceiver(BroadcastReceiver receiver, Handler handler) { + synchronized (mTimeEventReceivers) { + mTimeEventReceivers.put(receiver, handler == null ? new Handler() : handler); + } + } + + @Override + public void unregisterTimeChangeReceiver(BroadcastReceiver receiver) { + synchronized (mTimeEventReceivers) { + mTimeEventReceivers.remove(receiver); + } + } + + @Override + public void registerFormatChangeObserver(ContentObserver observer, int userHandle) { + if (mDestroyed) { + return; + } + synchronized (mFormatObservers) { + if (!mFormatRegistered && !mDestroyed) { + mSettingsCache.register(mFormatUri, this); + mFormatRegistered = true; + } + mFormatObservers.add(observer); + } + } + + @Override + public void unregisterFormatChangeObserver(ContentObserver observer) { + synchronized (mFormatObservers) { + mFormatObservers.remove(observer); + } + } + + @Override + public void onSettingsChanged(boolean isEnabled) { + if (mDestroyed) { + return; + } + synchronized (mFormatObservers) { + mFormatObservers.forEach(o -> o.dispatchChange(false, mFormatUri)); + } + } + @WorkerThread + private void onClockEventReceived(Intent intent) { + if (mDestroyed) { + return; + } + synchronized (mReceiver) { + mTimeEventReceivers.forEach((r, h) -> h.post(() -> r.onReceive(mContext, intent))); + } + } + + @Override + public void close() { + mDestroyed = true; + mSettingsCache.unregister(mFormatUri, this); + mReceiver.close(); + } +} diff --git a/quickstep/src/com/android/quickstep/util/BackAnimState.kt b/quickstep/src/com/android/quickstep/util/BackAnimState.kt new file mode 100644 index 00000000000..fddb24d8aa2 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/BackAnimState.kt @@ -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 com.android.quickstep.util + +import android.animation.AnimatorSet +import android.content.Context +import com.android.launcher3.Launcher +import com.android.launcher3.LauncherAnimationRunner.AnimationResult +import com.android.launcher3.LauncherState +import com.android.launcher3.anim.AnimatorListeners.forEndCallback +import com.android.launcher3.statemanager.StateManager +import com.android.launcher3.util.RunnableList + +/** Interface to represent animation for back to Launcher transition */ +interface BackAnimState { + + fun addOnAnimCompleteCallback(r: Runnable) + + fun applyToAnimationResult(result: AnimationResult, c: Context) + + fun start(stateManager: StateManager) +} + +class AnimatorBackState(private val springAnim: RectFSpringAnim?, private val anim: AnimatorSet?) : + BackAnimState { + + override fun addOnAnimCompleteCallback(r: Runnable) { + val animWait = RunnableList() + springAnim?.addAnimatorListener(forEndCallback(animWait::executeAllAndDestroy)) + ?: anim?.addListener(forEndCallback(animWait::executeAllAndDestroy)) + ?: animWait.executeAllAndDestroy() + animWait.add(r) + } + + override fun applyToAnimationResult(result: AnimationResult, c: Context) { + result.setAnimation(anim, c) + } + + override fun start(stateManager: StateManager) { + if (anim != null) { + stateManager.setCurrentAnimation(anim) + } + anim?.start() + } +} + +class AlreadyStartedBackAnimState(private val onEndCallback: RunnableList) : BackAnimState { + + override fun addOnAnimCompleteCallback(r: Runnable) { + onEndCallback.add(r) + } + + override fun applyToAnimationResult(result: AnimationResult, c: Context) { + addOnAnimCompleteCallback(result::onAnimationFinished) + } + + override fun start(stateManager: StateManager) {} +} diff --git a/quickstep/src/com/android/quickstep/util/BaseDepthController.java b/quickstep/src/com/android/quickstep/util/BaseDepthController.java index 24403e588cb..461a1b70026 100644 --- a/quickstep/src/com/android/quickstep/util/BaseDepthController.java +++ b/quickstep/src/com/android/quickstep/util/BaseDepthController.java @@ -15,18 +15,35 @@ */ package com.android.quickstep.util; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; +import static android.os.Trace.TRACE_TAG_APP; + +import static com.android.launcher3.Flags.enableOverviewBackgroundWallpaperBlur; import android.app.WallpaperManager; +import android.graphics.RenderEffect; +import android.graphics.Shader; +import android.gui.EarlyWakeupInfo; +import android.os.Binder; import android.os.IBinder; +import android.os.Trace; import android.util.FloatProperty; import android.util.Log; -import android.view.AttachedSurfaceControl; +import android.view.CrossWindowBlurListeners; import android.view.SurfaceControl; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import com.android.app.animation.Interpolators; +import com.android.launcher3.Flags; import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherState; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.statemanager.StateManager; +import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; import com.android.systemui.shared.system.BlurUtils; @@ -39,17 +56,18 @@ public class BaseDepthController { public static final float DEPTH_60_PERCENT = 0.6f; public static final float DEPTH_70_PERCENT = 0.7f; - private static final FloatProperty DEPTH = new FloatProperty("depth") { - @Override - public void setValue(BaseDepthController depthController, float depth) { - depthController.setDepth(depth); - } + private static final FloatProperty DEPTH = + new FloatProperty("depth") { + @Override + public void setValue(BaseDepthController depthController, float depth) { + depthController.setDepth(depth); + } - @Override - public Float get(BaseDepthController depthController) { - return depthController.mDepth; - } - }; + @Override + public Float get(BaseDepthController depthController) { + return depthController.mDepth; + } + }; private static final int DEPTH_INDEX_STATE_TRANSITION = 0; private static final int DEPTH_INDEX_WIDGET = 1; @@ -58,7 +76,7 @@ public Float get(BaseDepthController depthController) { // b/291401432 private static final String TAG = "BaseDepthController"; - protected final Launcher mLauncher; + protected final QuickstepLauncher mLauncher; /** Property to set the depth for state transition. */ public final MultiProperty stateDepth; /** Property to set the depth for widget picker. */ @@ -73,27 +91,27 @@ public Float get(BaseDepthController depthController) { /** * Ratio from 0 to 1, where 0 is fully zoomed out, and 1 is zoomed in. - * + * * @see android.service.wallpaper.WallpaperService.Engine#onZoomChanged(float) */ private float mDepth; - protected SurfaceControl mSurface; + protected SurfaceControl mBaseSurface; + protected SurfaceControl mBaseSurfaceOverride; + // May be temporarily null while the Launcher is being created, in which case all blur + // requests will be applied immediately rather than synced to the RenderThread. This shouldn't + // really happen in practice since we won't apply blur until the Launcher is interactive. + @Nullable protected SurfaceTransactionApplier mSurfaceTransactionApplier; - // Hints that there is potentially content behind Launcher and that we shouldn't - // optimize by - // marking the launcher surface as opaque. Only used in certain Launcher states. + // Hints that there is potentially content behind Launcher and that we shouldn't optimize by + // marking the launcher surface as opaque. Only used in certain Launcher states. private boolean mHasContentBehindLauncher; - /** - * Pause blur but allow transparent, can be used when launch something behind - * the Launcher. - */ + /** Pause blur but allow transparent, can be used when launch something behind the Launcher. */ protected boolean mPauseBlurs; /** * Last blur value, in pixels, that was applied. - * For debugging purposes. */ protected int mCurrentBlur; /** @@ -103,19 +121,63 @@ public Float get(BaseDepthController depthController) { protected boolean mWaitingOnSurfaceValidity; - public BaseDepthController(Launcher activity) { + private SurfaceControl mBlurSurface = null; + /** + * Info for early wakeup requests to SurfaceFlinger. + */ +// private EarlyWakeupInfo mEarlyWakeupInfo = new EarlyWakeupInfo(); + + public BaseDepthController(QuickstepLauncher activity) { mLauncher = activity; - mMaxBlurRadius = activity.getResources().getInteger(R.integer.max_depth_blur_radius); + if (Flags.allAppsBlur() || enableOverviewBackgroundWallpaperBlur()) { + if (Utilities.ATLEAST_S) { + try { + mCrossWindowBlursEnabled = + CrossWindowBlurListeners.getInstance().isCrossWindowBlurEnabled(); + } catch (NoSuchMethodError e) { + mCrossWindowBlursEnabled = BlurUtils.supportsBlursOnWindows(activity.getApplicationContext()); + } + } else { + mCrossWindowBlursEnabled = false; + } + mMaxBlurRadius = activity.getResources().getDimensionPixelSize( + R.dimen.max_depth_blur_radius_enhanced); + } else { + mMaxBlurRadius = activity.getResources().getInteger(R.integer.max_depth_blur_radius); + } mWallpaperManager = activity.getSystemService(WallpaperManager.class); - MultiPropertyFactory depthProperty = new MultiPropertyFactory<>(this, DEPTH, - DEPTH_INDEX_COUNT, Float::max); + MultiPropertyFactory depthProperty = + new MultiPropertyFactory<>(this, DEPTH, DEPTH_INDEX_COUNT, Float::max); stateDepth = depthProperty.get(DEPTH_INDEX_STATE_TRANSITION); widgetDepth = depthProperty.get(DEPTH_INDEX_WIDGET); +// mEarlyWakeupInfo.token = new Binder(); +// mEarlyWakeupInfo.trace = BaseDepthController.class.getName(); + } + + /** + * Sets the applier to use for syncing surface transactions to the RenderThread. + * + * @param rootView The root view of the surface to apply the surface transactions to. + */ + public void setSurfaceTransactionApplier(View rootView) { + mSurfaceTransactionApplier = new SurfaceTransactionApplier(rootView); + } + + /** + * Returns if cross window blurs are enabled. In other words, whether launcher should use blurs + * style UI or fallback style UI. + */ + public boolean isCrossWindowBlursEnabled() { + return mCrossWindowBlursEnabled; } protected void setCrossWindowBlursEnabled(boolean isEnabled) { + if (mCrossWindowBlursEnabled == isEnabled) { + return; + } mCrossWindowBlursEnabled = isEnabled; + mLauncher.updateBlurStyle(); applyDepthAndBlur(); } @@ -124,38 +186,42 @@ public void setHasContentBehindLauncher(boolean hasContentBehindLauncher) { } public void pauseBlursOnWindows(boolean pause) { - if (pause != mPauseBlurs) { - mPauseBlurs = pause; - applyDepthAndBlur(); + if (mPauseBlurs == pause) { + return; } + mPauseBlurs = pause; + applyDepthAndBlur(); } - protected void onInvalidSurface() { - } + protected void onInvalidSurface() { } protected void applyDepthAndBlur() { + applyDepthAndBlur(null, /* applyImmediately */ false, /* skipSimilarBlur */ true); + } + + /** + * Applies depth and blur to the launcher. + * + * @param surfaceTransaction optional SurfaceTransaction to apply the blur to. + * @param applyImmediately whether to apply the blur immediately or defer to the next frame. + * @param skipSimilarBlur whether to skip applying blur if the change is minimal. + */ + private void applyDepthAndBlur(@Nullable SurfaceTransaction surfaceTransaction, + boolean applyImmediately, boolean skipSimilarBlur) { float depth = mDepth; IBinder windowToken = mLauncher.getRootView().getWindowToken(); if (windowToken != null) { - if (enableScalingRevealHomeAnimation()) { - mWallpaperManager.setWallpaperZoomOut(windowToken, depth); - } else { - // The API's full zoom-out is three times larger than the zoom-out we apply to - // the - // icons. To keep the two consistent throughout the animation while keeping - // Launcher's concept of full depth unchanged, we divide the depth by 3 here. - mWallpaperManager.setWallpaperZoomOut(windowToken, depth / 3); - } + mWallpaperManager.setWallpaperZoomOut(windowToken, depth); } - if (!BlurUtils.supportsBlursOnWindows()) { + if (!BlurUtils.supportsBlursOnWindows(mLauncher.getApplicationContext())) { return; } - if (mSurface == null) { + if (mBaseSurface == null) { Log.d(TAG, "mSurface is null and mCurrentBlur is: " + mCurrentBlur); return; } - if (!mSurface.isValid()) { + if (!mBaseSurface.isValid()) { Log.d(TAG, "mSurface is not valid"); mWaitingOnSurfaceValidity = true; onInvalidSurface(); @@ -165,43 +231,128 @@ protected void applyDepthAndBlur() { boolean hasOpaqueBg = mLauncher.getScrimView().isFullyOpaque(); boolean isSurfaceOpaque = !mHasContentBehindLauncher && hasOpaqueBg && !mPauseBlurs; - float blurAmount; - if (enableScalingRevealHomeAnimation()) { - blurAmount = mapDepthToBlur(depth); - } else { - blurAmount = depth; + float blurAmount = mapDepthToBlur(depth); + SurfaceControl blurSurface = + enableOverviewBackgroundWallpaperBlur() && mBlurSurface != null ? mBlurSurface + : mBaseSurface; + + int previousBlur = mCurrentBlur; + int newBlur = mCrossWindowBlursEnabled && !hasOpaqueBg && !mPauseBlurs ? (int) (blurAmount + * mMaxBlurRadius) : 0; + int delta = Math.abs(newBlur - previousBlur); + if (skipSimilarBlur && delta < Utilities.dpToPx(1) && newBlur != 0 && previousBlur != 0 + && blurAmount != 1f) { + Log.d(TAG, "Skipping small blur delta. newBlur: " + newBlur + " previousBlur: " + + previousBlur + " delta: " + delta + " surface: " + blurSurface); + return; } - mCurrentBlur = !mCrossWindowBlursEnabled || hasOpaqueBg || mPauseBlurs - ? 0 - : (int) (blurAmount * mMaxBlurRadius); + mCurrentBlur = newBlur; + Log.v(TAG, "Applying blur: " + mCurrentBlur + " to " + blurSurface + " applyImmediately: " + + applyImmediately); - SurfaceControl.Transaction transaction = new SurfaceControl.Transaction() - .setBackgroundBlurRadius(mSurface, mCurrentBlur) - .setOpaque(mSurface, isSurfaceOpaque); + if (surfaceTransaction == null) { + surfaceTransaction = new SurfaceTransaction(); + } - // Set early wake-up flags when we know we're executing an expensive operation, - // this way + surfaceTransaction.forSurface(blurSurface) + .setBackgroundBlurRadius(mCurrentBlur) + .setOpaque(isSurfaceOpaque); + // Set early wake-up flags when we know we're executing an expensive operation, this way // SurfaceFlinger will adjust its internal offsets to avoid jank. - boolean wantsEarlyWakeUp = depth > 0 && depth < 1; + boolean wantsEarlyWakeUp = blurAmount > 0 && blurAmount < 1; if (wantsEarlyWakeUp && !mInEarlyWakeUp) { - transaction.setEarlyWakeupStart(); - mInEarlyWakeUp = true; + setEarlyWakeup(surfaceTransaction.getTransaction(), true); } else if (!wantsEarlyWakeUp && mInEarlyWakeUp) { - transaction.setEarlyWakeupEnd(); - mInEarlyWakeUp = false; + setEarlyWakeup(surfaceTransaction.getTransaction(), false); } - AttachedSurfaceControl rootSurfaceControl = mLauncher.getRootView().getRootSurfaceControl(); - if (rootSurfaceControl != null) { - rootSurfaceControl.applyTransactionOnDraw(transaction); + if (applyImmediately || mSurfaceTransactionApplier == null) { + Log.d(TAG, "Applying blur immediately, mSurfaceTransactionApplier is null? " + + (mSurfaceTransactionApplier == null)); + surfaceTransaction.getTransaction().apply(); + } else { + mSurfaceTransactionApplier.scheduleApply(surfaceTransaction); + } + + blurWorkspaceDepthTargets(); + } + + /** + * Sets the early wakeup state. + * + * @param inEarlyWakeUp whether SurfaceFlinger's early wakeup timing should be active. + */ + public void setEarlyWakeup(boolean inEarlyWakeUp) { + if (mInEarlyWakeUp == inEarlyWakeUp) { + return; + } + try (SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()) { + setEarlyWakeup(transaction, inEarlyWakeUp); + transaction.apply(); } } + /** + * Sets the early wakeup state. + * + * @param transaction transaction to apply to. + * @param start whether to start or end the early wakeup. + */ + protected void setEarlyWakeup(@NonNull SurfaceControl.Transaction transaction, boolean start) { + if (mInEarlyWakeUp == start) { + return; + } + Log.d(TAG, "setEarlyWakeup: " + start); + if (start) { +// Trace.instantForTrack(TRACE_TAG_APP, TAG, "notifyRendererForGpuLoadUp"); +// mLauncher.getRootView().getViewRootImpl().notifyRendererForGpuLoadUp("applyBlur"); +// transaction.setEarlyWakeupStart(mEarlyWakeupInfo); + } else { +// transaction.setEarlyWakeupEnd(mEarlyWakeupInfo); + } + mInEarlyWakeUp = start; + } + + /** @return {@code true} if the workspace should be blurred. */ + @VisibleForTesting + public boolean blurWorkspaceDepthTargets() { + if (!Flags.allAppsBlur()) { + return false; + } + StateManager stateManager = mLauncher.getStateManager(); + LauncherState targetState = stateManager.getTargetState() != null + ? stateManager.getTargetState() : stateManager.getState(); + // Only blur workspace if the current state wants to blur based on the target state. + boolean shouldBlurWorkspace = + stateManager.getCurrentStableState().shouldBlurWorkspace(targetState); + + RenderEffect blurEffect = shouldBlurWorkspace && mCurrentBlur > 0 + ? RenderEffect.createBlurEffect(mCurrentBlur, mCurrentBlur, Shader.TileMode.DECAL) + // If blur is not desired, clear the blur effect from the depth targets. + : null; + Log.d(TAG, "shouldBlurWorkspace: " + shouldBlurWorkspace + + " targetState: " + targetState + + " currentStableState: " + stateManager.getCurrentStableState() + + " mCurrentBlur: " + mCurrentBlur + + " mLauncher.getDepthBlurTargets(): " + mLauncher.getDepthBlurTargets()); + mLauncher.getDepthBlurTargets().forEach(target -> target.setRenderEffect(blurEffect)); + return shouldBlurWorkspace; + } + private void setDepth(float depth) { depth = Utilities.boundToRange(depth, 0, 1); - // Round out the depth to dedupe frequent, non-perceptable updates - int depthI = (int) (depth * 256); - float depthF = depthI / 256f; + // Depth of the Launcher state we are in or transitioning to. + float targetStateDepth = mLauncher.getStateManager().getState().getDepth(mLauncher); + + float depthF; + if (depth == targetStateDepth) { + // Always apply the target state depth. + depthF = depth; + } else { + // Round out the depth to dedupe frequent, non-perceptable updates + int depthI = (int) (depth * 256); + depthF = depthI / 256f; + } if (Float.compare(mDepth, depthF) == 0) { return; } @@ -209,15 +360,66 @@ private void setDepth(float depth) { applyDepthAndBlur(); } + /** + * Sets the lowest surface that should not be blurred. + *

+ * Blur is applied to below {@link #mBaseSurfaceOverride}. When set to {@code null}, blur is + * applied to below {@link #mBaseSurface}. + *

+ */ + public void setBaseSurfaceOverride(@Nullable SurfaceControl baseSurfaceOverride, + boolean applyOnDraw) { + if (mBaseSurfaceOverride != baseSurfaceOverride) { + boolean applyImmediately = mBaseSurfaceOverride != null && baseSurfaceOverride == null + && !applyOnDraw; + mBaseSurfaceOverride = baseSurfaceOverride; + Log.d(TAG, "setBaseSurfaceOverride: applying blur behind leash " + baseSurfaceOverride); + SurfaceTransaction transaction = setupBlurSurface(); + applyDepthAndBlur(transaction, applyImmediately, /* skipSimilarBlur */ false); + } + } + + private @Nullable SurfaceTransaction setupBlurSurface() { + SurfaceTransaction surfaceTransaction = null; + + if (mBaseSurface != null && mBaseSurfaceOverride != null) { + surfaceTransaction = new SurfaceTransaction(); + surfaceTransaction.forSurface(mBaseSurface).setBackgroundBlurRadius(0).setOpaque(false); + if (mBlurSurface == null) { + mBlurSurface = new SurfaceControl.Builder() + .setName("Overview Blur") + .setHidden(false) + .build(); + Log.d(TAG, + "setupBlurSurface: creating Overview Blur surface " + mBlurSurface); + surfaceTransaction.forSurface(mBlurSurface).reparent(mBaseSurface); + Log.d(TAG, "setupBlurSurface: reparenting " + mBlurSurface + " to " + mBaseSurface); + } + surfaceTransaction.forSurface(mBlurSurface).setRelativeLayer(mBaseSurfaceOverride, -1); + Log.d(TAG, "setupBlurSurface: relayering to leash " + mBaseSurfaceOverride); + } else if (mBlurSurface != null) { + Log.d(TAG, "setupBlurSurface: removing blur surface " + mBlurSurface); + surfaceTransaction = new SurfaceTransaction(); + surfaceTransaction.forSurface(mBlurSurface).setRemove(); + mBlurSurface = null; + } + return surfaceTransaction; + } + /** * Sets the specified app target surface to apply the blur to. */ - protected void setSurface(SurfaceControl surface) { - if (mSurface != surface || mWaitingOnSurfaceValidity) { - mSurface = surface; + protected void setBaseSurface(SurfaceControl baseSurface) { + if (mBaseSurface != baseSurface || mWaitingOnSurfaceValidity) { + mBaseSurface = baseSurface; Log.d(TAG, "setSurface:\n\tmWaitingOnSurfaceValidity: " + mWaitingOnSurfaceValidity - + "\n\tmSurface: " + mSurface); - applyDepthAndBlur(); + + "\n\tmBaseSurface: " + mBaseSurface); + SurfaceTransaction transaction = null; + if (enableOverviewBackgroundWallpaperBlur()) { + transaction = setupBlurSurface(); + } + applyDepthAndBlur(transaction, /* applyImmediately */ false, + /* skipSimilarBlur */ false); } } @@ -226,6 +428,6 @@ protected void setSurface(SurfaceControl surface) { * The blur percentage grows linearly with depth, and maxes out at 30% depth. */ private static float mapDepthToBlur(float depth) { - return Math.min(3 * depth, 1f); + return Interpolators.clampToProgress(depth, 0, 0.3f); } } diff --git a/quickstep/src/com/android/quickstep/util/BorderAnimator.kt b/quickstep/src/com/android/quickstep/util/BorderAnimator.kt index 7e51fcfedca..8336d076c01 100644 --- a/quickstep/src/com/android/quickstep/util/BorderAnimator.kt +++ b/quickstep/src/com/android/quickstep/util/BorderAnimator.kt @@ -16,11 +16,13 @@ package com.android.quickstep.util import android.animation.Animator +import android.animation.ObjectAnimator import android.annotation.ColorInt import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.graphics.Rect +import android.util.IntProperty import android.view.View import android.view.View.OnLayoutChangeListener import android.view.animation.Interpolator @@ -58,12 +60,26 @@ private constructor( alpha = 0 } private var runningBorderAnimation: Animator? = null + private var runningColorAnimation: Animator? = null companion object { const val DEFAULT_BORDER_COLOR = Color.WHITE - private const val DEFAULT_APPEARANCE_ANIMATION_DURATION_MS = 300L - private const val DEFAULT_DISAPPEARANCE_ANIMATION_DURATION_MS = 133L - private val DEFAULT_INTERPOLATOR = Interpolators.EMPHASIZED_DECELERATE + const val DEFAULT_APPEARANCE_ANIMATION_DURATION_MS = 300L + const val DEFAULT_DISAPPEARANCE_ANIMATION_DURATION_MS = 133L + val DEFAULT_INTERPOLATOR = Interpolators.EMPHASIZED_DECELERATE + + /** Property used to animate the border color change in `setBorderColor()`. */ + private val BORDER_COLOR_PROPERTY: IntProperty = + object : IntProperty("color") { + override fun setValue(animator: BorderAnimator, color: Int) { + animator.borderPaint.color = color + animator.updateOutline() + } + + override fun get(animator: BorderAnimator): Int { + return animator.borderPaint.color + } + } /** * Creates a BorderAnimator that simply draws the border outside the bound of the target @@ -114,6 +130,8 @@ private constructor( * * @param borderRadiusPx the radius of the border's corners, in pixels * @param borderWidthPx the width of the border, in pixels + * @param borderStrokePx the stroke width used to paint the border, in pixels. If smaller + * than border width, it gets drawn at the outside edge of the border. * @param boundsBuilder callback to update the border bounds * @param targetView the view that will be drawing the border * @param contentView the view around which the border will be drawn. this view will be @@ -128,6 +146,7 @@ private constructor( fun createScalingBorderAnimator( @Px borderRadiusPx: Int, @Px borderWidthPx: Int, + @Px borderStrokePx: Int, boundsBuilder: (rect: Rect?) -> Unit, targetView: View, contentView: View, @@ -139,7 +158,13 @@ private constructor( return BorderAnimator( borderRadiusPx, borderColor, - ScalingParams(borderWidthPx, boundsBuilder, targetView, contentView), + ScalingParams( + borderWidthPx, + borderStrokePx, + boundsBuilder, + targetView, + contentView, + ), appearanceDurationMs, disappearanceDurationMs, interpolator, @@ -151,7 +176,7 @@ private constructor( val interpolatedProgress = interpolator.getInterpolation(borderAnimationProgress.value) borderAnimationParams.animationProgress = interpolatedProgress borderPaint.alpha = (255 * interpolatedProgress).roundToInt() - borderPaint.strokeWidth = borderAnimationParams.borderWidth + borderPaint.strokeWidth = borderAnimationParams.borderStroke borderAnimationParams.targetView.invalidate() } @@ -170,7 +195,7 @@ private constructor( /* bottom= */ borderBounds.bottom - alignmentAdjustment, /* rx= */ radius, /* ry= */ radius, - /* paint= */ borderPaint + /* paint= */ borderPaint, ) } } @@ -188,6 +213,10 @@ private constructor( runningBorderAnimation = null if (!isAppearing) { borderAnimationParams.onHideBorder() + + // End the color border color animation immediately if the border is no longer + // visible. + runningColorAnimation?.end() } } } @@ -206,12 +235,43 @@ private constructor( borderAnimationProgress.updateValue(if (visible) 1f else 0f) if (!visible) { borderAnimationParams.onHideBorder() + runningColorAnimation?.end() + } + } + + /** + * Updates the color to be used to draw the border controller by this animator. The color update + * is animated. + */ + fun setBorderColor(@ColorInt borderColor: Int) { + if (borderPaint.color == borderColor) { + return + } + + // If the border is hidden, just update the border paint color - the new color will be used + // once the border becomes visible. + if (borderAnimationParams.animationProgress == 0f) { + borderPaint.color = borderColor + return + } + + // Animate the color change. + ObjectAnimator.ofArgb(this, BORDER_COLOR_PROPERTY, borderColor).apply { + duration = appearanceDurationMs + interpolator = this@BorderAnimator.interpolator + doOnStart { + runningColorAnimation?.cancel() + runningColorAnimation = this + } + doOnEnd { runningColorAnimation = null } + start() } } /** Params for handling different target view layout situations. */ private abstract class BorderAnimationParams( @field:Px @param:Px val borderWidthPx: Int, + @field:Px @param:Px val borderStrokePx: Int, private val boundsBuilder: (rect: Rect) -> Unit, val targetView: View, ) { @@ -222,12 +282,12 @@ private constructor( abstract val alignmentAdjustmentInset: Int abstract val radiusAdjustment: Float - val borderWidth: Float - get() = borderWidthPx * animationProgress + val borderStroke: Float + get() = borderStrokePx * animationProgress val alignmentAdjustment: Float // Outset the border by half the width to create an outwards-growth animation - get() = -borderWidth / 2f + alignmentAdjustmentInset + get() = -borderStroke / 2f + alignmentAdjustmentInset open fun onShowBorder() { if (layoutChangeListener == null) { @@ -253,7 +313,7 @@ private constructor( @Px borderWidthPx: Int, boundsBuilder: (Rect) -> Unit, targetView: View, - ) : BorderAnimationParams(borderWidthPx, boundsBuilder, targetView) { + ) : BorderAnimationParams(borderWidthPx, borderWidthPx, boundsBuilder, targetView) { override val alignmentAdjustmentInset = 0 override val radiusAdjustment: Float get() = -alignmentAdjustment @@ -265,12 +325,13 @@ private constructor( */ private class ScalingParams( @Px borderWidthPx: Int, + @Px borderStrokePx: Int, boundsBuilder: (rect: Rect?) -> Unit, targetView: View, private val contentView: View, - ) : BorderAnimationParams(borderWidthPx, boundsBuilder, targetView) { + ) : BorderAnimationParams(borderWidthPx, borderStrokePx, boundsBuilder, targetView) { // Inset the border since we are scaling the container up - override val alignmentAdjustmentInset = borderWidthPx + override val alignmentAdjustmentInset = borderStrokePx override val radiusAdjustment: Float // Increase the radius since we are scaling the container up get() = alignmentAdjustment diff --git a/quickstep/src/com/android/quickstep/util/CachedEventDispatcher.java b/quickstep/src/com/android/quickstep/util/CachedEventDispatcher.java index 194c7d4f41e..6b00a1d5c13 100644 --- a/quickstep/src/com/android/quickstep/util/CachedEventDispatcher.java +++ b/quickstep/src/com/android/quickstep/util/CachedEventDispatcher.java @@ -63,6 +63,11 @@ public void setConsumer(Consumer consumer) { mLastEvent = null; } + /** Clear the consumer. */ + public void clearConsumer() { + mConsumer = null; + } + public boolean hasConsumer() { return mConsumer != null; } diff --git a/quickstep/src/com/android/quickstep/util/ChoreographerFrameRateTracker.kt b/quickstep/src/com/android/quickstep/util/ChoreographerFrameRateTracker.kt new file mode 100644 index 00000000000..1b61a6af6bd --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ChoreographerFrameRateTracker.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.util.TimeUtils +import android.view.Choreographer +import com.android.launcher3.util.window.RefreshRateTracker + +/** [RefreshRateTracker] using main thread [Choreographer] */ +object ChoreographerFrameRateTracker : RefreshRateTracker { + + override val singleFrameMs: Int + get() = + Choreographer.getMainThreadInstance()?.let { + (it.frameIntervalNanos / TimeUtils.NANOS_PER_MS).toInt().coerceAtLeast(1) + } ?: 1 +} diff --git a/quickstep/src/com/android/quickstep/util/ClickListeners.kt b/quickstep/src/com/android/quickstep/util/ClickListeners.kt new file mode 100644 index 00000000000..e827e9fe9bc --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ClickListeners.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.app.ActivityOptions +import android.content.ActivityNotFoundException +import android.content.Intent +import android.util.Log +import android.view.View +import com.android.quickstep.task.thumbnail.TaskContentView + +/** + * Sets a click listener on the view that launches an activity using the provided [intent] + * + * Performs scale up animation. + * + * @property intent the intent to use for launching the activity + * @property targetDescription a short text describing the target activity beings opened that can be + * used for logging (e.g. usage settings for task A). + */ +fun View.setActivityStarterClickListener(intent: Intent, targetDescription: String) { + setOnClickListener { view -> + try { + val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height) + context.startActivity(intent, options.toBundle()) + } catch (e: ActivityNotFoundException) { + Log.e(TaskContentView.TAG, "Failed to open $targetDescription ", e) + } + } +} diff --git a/quickstep/src/com/android/quickstep/util/ContextInitListener.java b/quickstep/src/com/android/quickstep/util/ContextInitListener.java new file mode 100644 index 00000000000..49f1463c9d7 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ContextInitListener.java @@ -0,0 +1,73 @@ +/* + * 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.quickstep.util; + +import com.android.launcher3.util.ContextTracker; +import com.android.launcher3.util.ContextTracker.SchedulerCallback; +import com.android.launcher3.views.ActivityContext; + +import java.util.function.BiPredicate; + +public class ContextInitListener implements + SchedulerCallback { + + private BiPredicate mOnInitListener; + private final ContextTracker mContextTracker; + + private boolean mIsRegistered = false; + + /** + * @param onInitListener a callback made when the activity is initialized. The callback should + * return true to continue receiving callbacks (ie. for if the activity is + * recreated). + */ + public ContextInitListener(BiPredicate onInitListener, + ContextTracker tracker) { + mOnInitListener = onInitListener; + mContextTracker = tracker; + } + + @Override + public final boolean init(CONTEXT activity, boolean isHomeStarted) { + if (!mIsRegistered) { + // Don't receive any more updates + return false; + } + return handleInit(activity, isHomeStarted); + } + + protected boolean handleInit(CONTEXT activity, boolean isHomeStarted) { + return mOnInitListener.test(activity, isHomeStarted); + } + + /** + * Registers the activity-created listener. If the activity is already created, then the + * callback provided in the constructor will be called synchronously. + */ + public void register(String reasonString) { + mIsRegistered = true; + mContextTracker.registerCallback(this, reasonString); + } + + /** + * After calling this, we won't {@link #init} even when the activity is ready. + */ + public void unregister(String reasonString) { + mContextTracker.unregisterCallback(this, reasonString); + mIsRegistered = false; + mOnInitListener = null; + } +} diff --git a/quickstep/src/com/android/quickstep/util/ContextualSearchHapticManager.kt b/quickstep/src/com/android/quickstep/util/ContextualSearchHapticManager.kt new file mode 100644 index 00000000000..7ec605d2a3d --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ContextualSearchHapticManager.kt @@ -0,0 +1,112 @@ +/* + * 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.quickstep.util + +import android.content.Context +import android.os.VibrationEffect +import android.os.VibrationEffect.Composition +import android.os.Vibrator +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.DaggerSingletonObject +import com.android.launcher3.util.VibratorWrapper +import com.android.quickstep.DeviceConfigWrapper.Companion.get +import com.android.quickstep.dagger.QuickstepBaseAppComponent +import javax.inject.Inject +import kotlin.math.pow + +/** Manages haptics relating to Contextual Search invocations. */ +@LauncherAppSingleton +class ContextualSearchHapticManager +@Inject +internal constructor( + @ApplicationContext private val context: Context, + private val contextualSearchStateManager: ContextualSearchStateManager, + private val vibratorWrapper: VibratorWrapper, +) { + + private var searchEffect = createSearchEffect() + + private fun createSearchEffect() = + if ( + context + .getSystemService(Vibrator::class.java)!! + .areAllPrimitivesSupported(Composition.PRIMITIVE_TICK) + ) { + VibrationEffect.startComposition() + .addPrimitive(Composition.PRIMITIVE_TICK, 1f) + .compose() + } else { + // fallback for devices without composition support + VibrationEffect.createPredefined(VibrationEffect.EFFECT_HEAVY_CLICK) + } + + /** Indicates that search has been invoked. */ + fun vibrateForSearch() { + searchEffect.let { vibratorWrapper.vibrate(it) } + } + + /** Indicates that search will be invoked if the current gesture is maintained. */ + fun vibrateForSearchHint() { + val navbarConfig = get() + // Whether we should play the hint (ramp up) haptic + val shouldVibrate: Boolean = + if ( + context + .getSystemService(Vibrator::class.java)!! + .areAllPrimitivesSupported(Composition.PRIMITIVE_LOW_TICK) + ) { + if (contextualSearchStateManager.shouldPlayHapticOverride.isPresent) { + contextualSearchStateManager.shouldPlayHapticOverride.get() + } else { + navbarConfig.enableSearchHapticHint + } + } else { + false + } + + if (shouldVibrate) { + val startScale = navbarConfig.lpnhHapticHintStartScalePercent / 100f + val endScale = navbarConfig.lpnhHapticHintEndScalePercent / 100f + val scaleExponent = navbarConfig.lpnhHapticHintScaleExponent + val iterations = navbarConfig.lpnhHapticHintIterations + val delayMs = navbarConfig.lpnhHapticHintDelay + val composition = VibrationEffect.startComposition() + for (i in 0 until iterations) { + val t = i / (iterations - 1f) + val scale = + ((1 - t) * startScale + t * endScale) + .toDouble() + .pow(scaleExponent.toDouble()) + .toFloat() + if (i == 0) { + // Adds a delay before the ramp starts + composition.addPrimitive(Composition.PRIMITIVE_LOW_TICK, scale, delayMs) + } else { + composition.addPrimitive(Composition.PRIMITIVE_LOW_TICK, scale) + } + } + vibratorWrapper.vibrate(composition.compose()) + } + } + + companion object { + @JvmField + val INSTANCE = + DaggerSingletonObject(QuickstepBaseAppComponent::getContextualSearchHapticManager) + } +} diff --git a/quickstep/src/com/android/quickstep/util/ContextualSearchInvoker.kt b/quickstep/src/com/android/quickstep/util/ContextualSearchInvoker.kt new file mode 100644 index 00000000000..74bb9943814 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ContextualSearchInvoker.kt @@ -0,0 +1,286 @@ +/* + * 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.quickstep.util + +import android.app.contextualsearch.ContextualSearchConfig +import android.app.contextualsearch.ContextualSearchManager +import android.app.contextualsearch.ContextualSearchManager.ENTRYPOINT_LONG_PRESS_HOME +import android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH +import android.content.Context +import android.util.Log +import android.view.Display.DEFAULT_DISPLAY +import androidx.annotation.VisibleForTesting +import com.android.internal.app.AssistUtils +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_ASSISTANT_FAILED_SERVICE_ERROR +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_ATTEMPTED_OVER_KEYGUARD +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_ATTEMPTED_OVER_NOTIFICATION_SHADE +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_ATTEMPTED_SPLITSCREEN +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_FAILED_NOT_AVAILABLE +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_FAILED_SETTING_DISABLED +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_SUCCESSFUL_HOME +import com.android.quickstep.BaseContainerInterface +import com.android.quickstep.DeviceConfigWrapper +import com.android.quickstep.OverviewComponentObserver +import com.android.quickstep.SystemUiProxy +import com.android.quickstep.TopTaskTracker +import com.android.quickstep.views.RecentsView +import com.android.systemui.shared.system.QuickStepContract +import javax.inject.Inject + +/** Handles invocations and checks for Contextual Search. */ +class ContextualSearchInvoker +internal constructor( + private val context: Context, + private val contextualSearchStateManager: ContextualSearchStateManager, + private val topTaskTracker: TopTaskTracker, + private val systemUiProxy: SystemUiProxy, + private val statsLogManager: StatsLogManager, + private val contextualSearchHapticManager: ContextualSearchHapticManager, + private val contextualSearchManager: ContextualSearchManager?, +) { + constructor( + context: Context + ) : this( + context, + ContextualSearchStateManager.INSTANCE[context], + TopTaskTracker.INSTANCE[context], + SystemUiProxy.INSTANCE[context], + StatsLogManager.newInstance(context), + ContextualSearchHapticManager.INSTANCE[context], + context.getSystemService(ContextualSearchManager::class.java), + ) + + @Inject + constructor( + @ApplicationContext context: Context, + contextualSearchStateManager: ContextualSearchStateManager, + topTaskTracker: TopTaskTracker, + systemUiProxy: SystemUiProxy, + logManagerFactory: StatsLogManager.StatsLogManagerFactory, + hapticManager: ContextualSearchHapticManager, + ) : this( + context, + contextualSearchStateManager, + topTaskTracker, + systemUiProxy, + logManagerFactory.create(context), + hapticManager, + context.getSystemService(ContextualSearchManager::class.java), + ) + + /** @return Array of AssistUtils.INVOCATION_TYPE_* that we want to handle instead of SysUI. */ + fun getSysUiAssistOverrideInvocationTypes(): IntArray { + val overrideInvocationTypes = com.android.launcher3.util.IntArray() + if (context.packageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) { + overrideInvocationTypes.add(AssistUtils.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS) + } + return overrideInvocationTypes.toArray() + } + + /** + * @return `true` if the override was handled, i.e. an assist surface was shown or the request + * should be ignored. `false` means the caller should start assist another way. + */ + @JvmOverloads + fun tryStartAssistOverride( + invocationType: Int, + config: ContextualSearchConfig? = null, + ): Boolean { + if (invocationType == AssistUtils.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS) { + if (!context.packageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) { + // When Contextual Search is disabled, fall back to Assistant. + return false + } + + val success = show(ENTRYPOINT_LONG_PRESS_HOME, config) + if (success) { + val displayId = config?.displayId ?: DEFAULT_DISPLAY + val runningPackage = + TopTaskTracker.INSTANCE[context].getCachedTopTask( + /* filterOnlyVisibleRecents */ true, + displayId, + ) + .getPackageName() + statsLogManager + .logger() + .withPackageName(runningPackage) + .log(LAUNCHER_LAUNCH_OMNI_SUCCESSFUL_HOME) + } + + // Regardless of success, do not fall back to other assistant. + return true + } + return false + } + + /** + * Invoke Contextual Search via ContextualSearchService if availability checks are successful + * + * @param entryPoint one of the ENTRY_POINT_* constants defined in this class + * @return true if invocation was successful, false otherwise + */ + @JvmOverloads + fun show(entryPoint: Int, config: ContextualSearchConfig? = null): Boolean { + return if (!runContextualSearchInvocationChecksAndLogFailures()) false + else invokeContextualSearchUnchecked(entryPoint, config = config) + } + + /** + * Run availability checks and log errors to WW. If successful the caller is expected to call + * {@link invokeContextualSearchUnchecked} + * + * @return true if availability checks were successful, false otherwise. + */ + fun runContextualSearchInvocationChecksAndLogFailures(): Boolean { + if ( + contextualSearchManager == null || + !context.packageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH) + ) { + Log.i(TAG, "Contextual Search invocation failed: no ContextualSearchManager") + statsLogManager.logger().log(LAUNCHER_LAUNCH_ASSISTANT_FAILED_SERVICE_ERROR) + return false + } + if (!contextualSearchStateManager.isContextualSearchSettingEnabled) { + Log.i(TAG, "Contextual Search invocation failed: setting disabled") + statsLogManager.logger().log(LAUNCHER_LAUNCH_OMNI_FAILED_SETTING_DISABLED) + return false + } + if (isNotificationShadeShowing()) { + Log.i(TAG, "Contextual Search invocation failed: notification shade") + statsLogManager.logger().log(LAUNCHER_LAUNCH_OMNI_ATTEMPTED_OVER_NOTIFICATION_SHADE) + return false + } + if (isKeyguardShowing()) { + Log.i(TAG, "Contextual Search invocation attempted: keyguard") + statsLogManager.logger().log(LAUNCHER_LAUNCH_OMNI_ATTEMPTED_OVER_KEYGUARD) + if (!contextualSearchStateManager.isInvocationAllowedOnKeyguard) { + Log.i(TAG, "Contextual Search invocation failed: keyguard not allowed") + return false + } else if (!contextualSearchStateManager.supportsShowWhenLocked()) { + Log.i(TAG, "Contextual Search invocation failed: AGA doesn't support keyguard") + return false + } + } + if (isInSplitscreen()) { + Log.i(TAG, "Contextual Search invocation attempted: splitscreen") + statsLogManager.logger().log(LAUNCHER_LAUNCH_OMNI_ATTEMPTED_SPLITSCREEN) + if (!contextualSearchStateManager.isInvocationAllowedInSplitscreen) { + Log.i(TAG, "Contextual Search invocation failed: splitscreen not allowed") + return false + } + } + if (!contextualSearchStateManager.isContextualSearchIntentAvailable) { + Log.i(TAG, "Contextual Search invocation failed: no matching CSS intent filter") + statsLogManager.logger().log(LAUNCHER_LAUNCH_OMNI_FAILED_NOT_AVAILABLE) + return false + } + + return true + } + + /** + * Invoke Contextual Search via ContextualSearchService and do haptic + * + * @param entryPoint Entry point identifier, passed to ContextualSearchService. + * @return true if invocation was successful, false otherwise + */ + @JvmOverloads + fun invokeContextualSearchUncheckedWithHaptic( + entryPoint: Int, + config: ContextualSearchConfig? = null, + ): Boolean { + return invokeContextualSearchUnchecked(entryPoint, withHaptic = true, config) + } + + private fun invokeContextualSearchUnchecked( + entryPoint: Int, + withHaptic: Boolean = false, + config: ContextualSearchConfig? = null, + ): Boolean { + if (withHaptic && DeviceConfigWrapper.get().enableSearchHapticCommit) { + contextualSearchHapticManager.vibrateForSearch() + } + if (contextualSearchManager == null) { + return false + } + val recentsContainerInterface = getRecentsContainerInterface() + if (recentsContainerInterface?.isInLiveTileMode() == true) { + Log.i(TAG, "Contextual Search invocation attempted: live tile") + endLiveTileMode(recentsContainerInterface) { + contextualSearchManager.startContextualSearch(entryPoint, config) + } + } else { + contextualSearchManager.startContextualSearch(entryPoint, config) + } + return true + } + + private fun isInSplitscreen(): Boolean { + return topTaskTracker.getRunningSplitTaskIds().isNotEmpty() + } + + private fun isNotificationShadeShowing(): Boolean { + return systemUiProxy.lastSystemUiStateFlags and SHADE_EXPANDED_SYSUI_FLAGS != 0L + } + + private fun isKeyguardShowing(): Boolean { + return systemUiProxy.lastSystemUiStateFlags and KEYGUARD_SHOWING_SYSUI_FLAGS != 0L + } + + @VisibleForTesting + fun getRecentsContainerInterface(): BaseContainerInterface<*, *>? { + return OverviewComponentObserver.INSTANCE.get(context) + .getContainerInterface(DEFAULT_DISPLAY) + } + + /** + * End the live tile mode. + * + * @param onCompleteRunnable Runnable to run when the live tile is paused. May run immediately. + */ + private fun endLiveTileMode( + recentsContainerInterface: BaseContainerInterface<*, *>?, + onCompleteRunnable: Runnable, + ) { + val recentsViewContainer = recentsContainerInterface?.createdContainer + if (recentsViewContainer == null) { + onCompleteRunnable.run() + return + } + val recentsView: RecentsView<*, *> = recentsViewContainer.getOverviewPanel() + recentsView.switchToScreenshot { + recentsView.finishRecentsAnimation( + true, /* toHome */ + false, /* shouldPip */ + onCompleteRunnable, + ) + } + } + + companion object { + private const val TAG = "ContextualSearchInvoker" + const val SHADE_EXPANDED_SYSUI_FLAGS = + QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED or + QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED + const val KEYGUARD_SHOWING_SYSUI_FLAGS = + (QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING or + QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING or + QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) + } +} diff --git a/quickstep/src/com/android/quickstep/util/ContextualSearchStateManager.java b/quickstep/src/com/android/quickstep/util/ContextualSearchStateManager.java new file mode 100644 index 00000000000..7b7ba6161e5 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ContextualSearchStateManager.java @@ -0,0 +1,291 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.util; + +import static android.app.contextualsearch.ContextualSearchManager.ACTION_LAUNCH_CONTEXTUAL_SEARCH; +import static android.app.contextualsearch.ContextualSearchManager.ENTRYPOINT_SYSTEM_ACTION; +import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH; +import static android.view.Display.DEFAULT_DISPLAY; + +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_SUCCESSFUL_SYSTEM_ACTION; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; +import static com.android.launcher3.util.SimpleBroadcastReceiver.packageFilter; +import static com.android.quickstep.util.SystemActionConstants.SYSTEM_ACTION_ID_SEARCH_SCREEN; + +import android.app.PendingIntent; +import android.app.RemoteAction; +import android.content.Context; +import android.content.IIntentReceiver; +import android.content.IIntentSender; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.graphics.drawable.Icon; +import android.net.Uri; +import android.os.Bundle; +import android.os.IBinder; +import android.os.RemoteException; +import android.provider.Settings; +import android.util.Log; +import android.view.accessibility.AccessibilityManager; + +import androidx.annotation.CallSuper; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; + +import com.android.launcher3.R; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppComponent; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.logging.StatsLogManager; +import com.android.launcher3.util.DaggerSingletonObject; +import com.android.launcher3.util.DaggerSingletonTracker; +import com.android.launcher3.util.EventLogArray; +import com.android.launcher3.util.SettingsCache; +import com.android.launcher3.util.SimpleBroadcastReceiver; +import com.android.quickstep.DeviceConfigWrapper; +import com.android.quickstep.SystemUiProxy; +import com.android.quickstep.TopTaskTracker; + +import java.io.PrintWriter; +import java.util.Optional; + +import javax.inject.Inject; + +/** Long-lived class to manage Contextual Search states like the user setting and availability. */ +@LauncherAppSingleton +public class ContextualSearchStateManager { + + public static final DaggerSingletonObject INSTANCE = + new DaggerSingletonObject<>(LauncherAppComponent::getContextualSearchStateManager); + + private static final String TAG = "ContextualSearchStMgr"; + private static final int MAX_DEBUG_EVENT_SIZE = 20; + public static final Uri SEARCH_ALL_ENTRYPOINTS_ENABLED_URI = + Settings.Secure.getUriFor(Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED); + + private final Runnable mSysUiStateChangeListener = this::updateOverridesToSysUi; + private final SimpleBroadcastReceiver mContextualSearchPackageReceiver; + protected final EventLogArray mEventLogArray = new EventLogArray(TAG, MAX_DEBUG_EVENT_SIZE); + + // Cached value whether the ContextualSearch intent filter matched any enabled components. + private boolean mIsContextualSearchIntentAvailable; + private boolean mIsContextualSearchSettingEnabled; + + protected final Context mContext; + protected final String mContextualSearchPackage; + protected final SystemUiProxy mSystemUiProxy; + protected final TopTaskTracker mTopTaskTracker; + + @Inject + public ContextualSearchStateManager( + @ApplicationContext Context context, + SettingsCache settingsCache, + SystemUiProxy systemUiProxy, + TopTaskTracker topTaskTracker, + DaggerSingletonTracker lifeCycle) { + mContext = context; + mContextualSearchPackageReceiver = + new SimpleBroadcastReceiver(context, UI_HELPER_EXECUTOR, + (unused) -> requestUpdateProperties()); + mContextualSearchPackage = mContext.getResources().getString( + com.android.internal.R.string.config_defaultContextualSearchPackageName); + mSystemUiProxy = systemUiProxy; + mTopTaskTracker = topTaskTracker; + + if (areAllContextualSearchFlagsDisabled() + || !context.getPackageManager().hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)) { + // If we had previously registered a SystemAction which is no longer valid, we need to + // unregister it here. + unregisterSearchScreenSystemAction(); + // Don't listen for stuff we aren't gonna use. + return; + } + + UI_HELPER_EXECUTOR.execute(this::requestUpdateProperties); + registerSearchScreenSystemAction(); + mContextualSearchPackageReceiver.register(packageFilter(mContextualSearchPackage, + Intent.ACTION_PACKAGE_ADDED, + Intent.ACTION_PACKAGE_CHANGED, + Intent.ACTION_PACKAGE_REMOVED)); + + SettingsCache.OnChangeListener settingChangedListener = + isEnabled -> mIsContextualSearchSettingEnabled = isEnabled; + settingsCache.register(SEARCH_ALL_ENTRYPOINTS_ENABLED_URI, settingChangedListener); + mIsContextualSearchSettingEnabled = + settingsCache.getValue(SEARCH_ALL_ENTRYPOINTS_ENABLED_URI); + + systemUiProxy.addOnStateChangeListener(mSysUiStateChangeListener); + + lifeCycle.addCloseable(() -> { + mContextualSearchPackageReceiver.close(); + unregisterSearchScreenSystemAction(); + settingsCache.unregister(SEARCH_ALL_ENTRYPOINTS_ENABLED_URI, settingChangedListener); + systemUiProxy.removeOnStateChangeListener(mSysUiStateChangeListener); + }); + } + + /** Return {@code true} if the Settings toggle is enabled. */ + public final boolean isContextualSearchSettingEnabled() { + return mIsContextualSearchSettingEnabled; + } + + /** Whether search supports showing on the lockscreen. */ + protected boolean supportsShowWhenLocked() { + return false; + } + + /** Whether ContextualSearchService invocation path is available. */ + @VisibleForTesting + protected final boolean isContextualSearchIntentAvailable() { + return mIsContextualSearchIntentAvailable; + } + + /** Get the Launcher overridden long press nav handle duration to trigger Assistant. */ + public Optional getLPNHDurationMillis() { + return Optional.empty(); + } + + /** + * Get the Launcher overridden long press nav handle touch slop multiplier to trigger Assistant. + */ + public Optional getLPNHCustomSlopMultiplier() { + return Optional.empty(); + } + + /** Get the Launcher overridden long press home duration to trigger Assistant. */ + public Optional getLPHDurationMillis() { + return Optional.empty(); + } + + /** Get the Launcher overridden long press home touch slop multiplier to trigger Assistant. */ + public Optional getLPHCustomSlopMultiplier() { + return Optional.empty(); + } + + /** Get the long press duration data source. */ + public int getDurationDataSource() { + return 0; + } + + /** Get the long press touch slop multiplier data source. */ + public int getSlopDataSource() { + return 0; + } + + /** + * Get the User group based on the behavior to trigger Assistant. + */ + public Optional getLPUserGroup() { + return Optional.empty(); + } + + /** Get the haptic bit overridden by AGSA. */ + public Optional getShouldPlayHapticOverride() { + return Optional.empty(); + } + + protected boolean isInvocationAllowedOnKeyguard() { + return false; + } + + protected boolean isInvocationAllowedInSplitscreen() { + return true; + } + + @CallSuper + protected boolean areAllContextualSearchFlagsDisabled() { + return !DeviceConfigWrapper.get().getEnableLongPressNavHandle(); + } + + @CallSuper + @WorkerThread + protected void requestUpdateProperties() { + // Check that Contextual Search intent filters are enabled. + Intent csIntent = new Intent(ACTION_LAUNCH_CONTEXTUAL_SEARCH).setPackage( + mContextualSearchPackage); + mIsContextualSearchIntentAvailable = + !mContext.getPackageManager().queryIntentActivities(csIntent, + PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE).isEmpty(); + + addEventLog("Updated isContextualSearchIntentAvailable", + mIsContextualSearchIntentAvailable); + } + + protected final void updateOverridesToSysUi() { + // LPH commit haptic is always enabled + mSystemUiProxy.setOverrideHomeButtonLongPress( + getLPHDurationMillis().orElse(0L), getLPHCustomSlopMultiplier().orElse(0f), true); + Log.i(TAG, "Sent LPH override to sysui: " + getLPHDurationMillis().orElse(0L) + ";" + + getLPHCustomSlopMultiplier().orElse(0f)); + } + + private void registerSearchScreenSystemAction() { + PendingIntent searchScreenPendingIntent = new PendingIntent(new IIntentSender.Stub() { + @Override + public void send(int i, Intent intent, String s, IBinder iBinder, + IIntentReceiver iIntentReceiver, String s1, Bundle bundle) + throws RemoteException { + // Delayed slightly to minimize chance of capturing the System Actions dialog. + UI_HELPER_EXECUTOR.getHandler().postDelayed( + () -> { + boolean contextualSearchInvoked = + new ContextualSearchInvoker(mContext).show( + ENTRYPOINT_SYSTEM_ACTION); + if (contextualSearchInvoked) { + String runningPackage = mTopTaskTracker.getCachedTopTask( + /* filterOnlyVisibleRecents */ true, + DEFAULT_DISPLAY).getPackageName(); + StatsLogManager.newInstance(mContext).logger() + .withPackageName(runningPackage) + .log(LAUNCHER_LAUNCH_OMNI_SUCCESSFUL_SYSTEM_ACTION); + } + }, 200); + } + }); + + mContext.getSystemService(AccessibilityManager.class).registerSystemAction(new RemoteAction( + Icon.createWithResource(mContext, R.drawable.ic_allapps_search), + mContext.getString(R.string.search_gesture_feature_title), + mContext.getString(R.string.search_gesture_feature_title), + searchScreenPendingIntent), + SYSTEM_ACTION_ID_SEARCH_SCREEN); + } + + private void unregisterSearchScreenSystemAction() { + mContext.getSystemService(AccessibilityManager.class).unregisterSystemAction( + SYSTEM_ACTION_ID_SEARCH_SCREEN); + } + + /** Dump states. */ + public final void dump(String prefix, PrintWriter writer) { + synchronized (mEventLogArray) { + mEventLogArray.dump(prefix, writer); + } + } + + protected final void addEventLog(String event) { + synchronized (mEventLogArray) { + mEventLogArray.addLog(event); + } + } + + protected final void addEventLog(String event, boolean extras) { + synchronized (mEventLogArray) { + mEventLogArray.addLog(event, extras); + } + } +} diff --git a/quickstep/src/com/android/quickstep/util/CrossDisplayMoveAnimator.kt b/quickstep/src/com/android/quickstep/util/CrossDisplayMoveAnimator.kt new file mode 100644 index 00000000000..3f350a1ad4a --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/CrossDisplayMoveAnimator.kt @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ValueAnimator +import android.graphics.Rect +import android.os.RemoteException +import android.util.Log +import android.view.SurfaceControl +import android.window.IRemoteTransitionFinishedCallback +import androidx.core.animation.doOnEnd +import com.android.app.animation.Interpolators +import com.android.launcher3.Utilities.scaleRectAboutCenter +import kotlin.math.roundToInt + +/** + * Helper class to create and run the cross-display move animation. + * + * Defines the actual effect used on the task moving between displays. Any other effects are + * expected to be put in mExtraAnimators, which is played in parallel. + * + * @property srcTaskLeash The leash for the moving task screenshot on the source display. + * @property dstTaskLeash The leash for the moving task on the destination display. + * @property srcFinalBounds The final bounds of the moving task on the source display. + * @property dstFinalBounds The final bounds of the moving task on the destination display. + * @property launchingTransitionDurationMs The duration of the launching animation. + * @property unlaunchingTransitionDurationMs The duration of the unlaunching animation. + * @property extraAnimators Any extra animators to play in parallel. + * @property finishCallback The callback to invoke when the full transition is finished. + */ +class CrossDisplayMoveAnimator( + private val srcTaskLeash: SurfaceControl?, + private val dstTaskLeash: SurfaceControl, + private val srcFinalBounds: Rect, + private val dstFinalBounds: Rect, + private val launchingTransitionDurationMs: Long, + private val unlaunchingTransitionDurationMs: Long, + private val extraAnimators: AnimatorSet?, + private val finishCallback: IRemoteTransitionFinishedCallback +) { + companion object { + private const val TAG = "CrossDisplayMoveAnimator" + // Scale from 90% --> 100% (and vice versa) + private const val ANIMATION_SCALE_START = 0.9f + private const val ANIMATION_SCALE_END = 1.0f + private val ANIMATION_SCALE_RANGE = ANIMATION_SCALE_END - ANIMATION_SCALE_START + + /** Applies the unlaunch state (scale-down and fade-out) to a leash. */ + @JvmStatic + fun applyUnlaunchState( + t: SurfaceControl.Transaction, + leash: SurfaceControl, + finalBounds: Rect, + progress: Float + ) { + val scale = ANIMATION_SCALE_END - ANIMATION_SCALE_RANGE * progress + val scaledRect = Rect(finalBounds) + scaleRectAboutCenter(scaledRect, scale) + t.setAlpha(leash, 1f - progress) + t.setPosition(leash, scaledRect.left.toFloat(), scaledRect.top.toFloat()) + t.setScale(leash, scale, scale) + } + + /** Applies the launch state (scale-up and fade-in) to a leash. */ + @JvmStatic + fun applyLaunchState( + t: SurfaceControl.Transaction, + leash: SurfaceControl, + finalBounds: Rect, + progress: Float + ) { + val scale = ANIMATION_SCALE_START + ANIMATION_SCALE_RANGE * progress + val scaledRect = Rect(finalBounds) + scaleRectAboutCenter(scaledRect, scale) + t.setAlpha(leash, progress) + t.setPosition(leash, scaledRect.left.toFloat(), scaledRect.top.toFloat()) + t.setScale(leash, scale, scale) + } + } + + private fun createUnlaunchAnimation( + leash: SurfaceControl, + finalBounds: Rect + ): Animator { + return ValueAnimator.ofFloat(0f, 1f).apply { + duration = unlaunchingTransitionDurationMs + interpolator = Interpolators.EMPHASIZED_DECELERATE + val t = SurfaceControl.Transaction() + addUpdateListener { + applyUnlaunchState(t, leash, finalBounds, it.animatedValue as Float) + t.apply() + } + doOnEnd { + val t = SurfaceControl.Transaction() + t.setAlpha(leash, 0f) + t.setVisibility(leash, false) + t.reparent(leash, null) + t.apply() + } + } + } + + private fun createLaunchAnimation(leash: SurfaceControl, finalBounds: Rect): Animator { + return ValueAnimator.ofFloat(0f, 1f).apply { + duration = launchingTransitionDurationMs + interpolator = Interpolators.EMPHASIZED + val t = SurfaceControl.Transaction() + addUpdateListener { + applyLaunchState(t, leash, finalBounds, it.animatedValue as Float) + t.apply() + } + doOnEnd { + val t = SurfaceControl.Transaction() + t.setAlpha(leash, 1f) + t.setScale(leash, 1f, 1f) + t.setPosition( + leash, + finalBounds.left.toFloat(), + finalBounds.top.toFloat() + ) + t.apply() + } + } + } + + fun start() { + val animators = mutableListOf() + srcTaskLeash?.let { animators.add(createUnlaunchAnimation(it, srcFinalBounds)) } + animators.add(createLaunchAnimation(dstTaskLeash, dstFinalBounds)) + extraAnimators?.let { animators.add(it) } + + val animSet = AnimatorSet() + animSet.playTogether(animators) + animSet.doOnEnd { + try { + finishCallback.onTransitionFinished(null /* wct */, null /* sct */) + } catch (e: RemoteException) { + Log.e(TAG, "Failed to finish transition", e) + } + } + animSet.start() + } +} \ No newline at end of file diff --git a/quickstep/src/com/android/quickstep/util/CrossDisplayMoveTransition.java b/quickstep/src/com/android/quickstep/util/CrossDisplayMoveTransition.java new file mode 100644 index 00000000000..1469f727039 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/CrossDisplayMoveTransition.java @@ -0,0 +1,197 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util; + + +import static android.view.WindowManager.TRANSIT_OPEN; +import static android.view.WindowManager.TRANSIT_TO_FRONT; +import static android.view.WindowManager.TRANSIT_TO_BACK; + +import android.animation.AnimatorSet; +import android.graphics.Rect; +import android.os.RemoteException; +import android.util.Log; +import android.view.SurfaceControl; +import android.window.IRemoteTransitionFinishedCallback; +import android.window.TransitionInfo; + +import androidx.annotation.VisibleForTesting; + +import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.quickstep.util.ScalingWorkspaceRevealAnim; +import com.android.quickstep.util.CrossDisplayMoveTransitionInfo; +import com.android.quickstep.util.CrossDisplayMoveAnimator; + +/** + * Handles the transition for a task moving between displays. + * + * Throughout this implementation: + * - "src" refers to the display the task is moving FROM. + * - "dst" refers to the display the task is moving TO. + */ +public class CrossDisplayMoveTransition { + private static final String TAG = "CrossDisplayMoveTransition"; + private final QuickstepLauncher mLauncher; + private final long mLaunchingTransitionDurationMs; + private final long mUnlaunchingTransitionDurationMs; + + /** + * @param launcher The launcher instance. + * @param launchingTransitionDurationMs The duration of the launching animation. + * @param unlaunchingTransitionDurationMs The duration of the unlaunching animation. + */ + public CrossDisplayMoveTransition(QuickstepLauncher launcher, + long launchingTransitionDurationMs, long unlaunchingTransitionDurationMs) { + mLauncher = launcher; + mLaunchingTransitionDurationMs = launchingTransitionDurationMs; + mUnlaunchingTransitionDurationMs = unlaunchingTransitionDurationMs; + } + + /** + * Returns true if the transition involves a task moving between displays. + */ + public static boolean isCrossDisplayMove(TransitionInfo info) { + return CrossDisplayMoveTransitionInfo.getCrossDisplayMove(info) != null; + } + + /** + * Animates a task moving between displays. + * + *

This works by taking a screenshot of the task on the source display, and using the actual + * task surface on the destination display. It then reparents the screenshot to the source + * display's animation root, and the task surface to the destination's animation root. + * + *

The actual animation is defined by {@link CrossDisplayMoveAnimator}. + * + * @param info The transition info. + * @param t The surface control transaction. + * @param finishCallback The callback to invoke when the transition is finished. + */ + public void startCrossDisplayMoveAnimation(TransitionInfo info, + SurfaceControl.Transaction t, + IRemoteTransitionFinishedCallback finishCallback) { + // 1. Parse the transition info and setup our initial transaction. + + final CrossDisplayMoveTransitionInfo moveInfo = + CrossDisplayMoveTransitionInfo.create(info); + if (moveInfo == null) { + Log.w(TAG, "Failed to parse cross display move transition info"); + try { + finishCallback.onTransitionFinished(null /* wct */, null /* t */); + } catch (RemoteException e) { + Log.e(TAG, "Failed to finish cross display move transition", e); + } + return; + } + setupInitialAnimationState(info, moveInfo, t); + + // 2. Setup the launcher reveal, if needed. + + // We're only going to play the launcher reveal if + // - We have a launcher moving to the front + // - And the launcher is moving so that it ends up on the task SRC display. + // + // (If the launcher is moving on the DST, then it's going to compete with the task launch. + // We'll likely want to add another "playLauncherHide" animation for this case) + final boolean playLauncherReveal = + moveInfo.launcherToFront != null + && moveInfo.launcherToFront.getEndDisplayId() == moveInfo.srcDisplayId; + AnimatorSet launcherRevealAnimators = null; + if (playLauncherReveal) { + launcherRevealAnimators = new ScalingWorkspaceRevealAnim(mLauncher, + /* siblingAnimation= */ null, /* windowTargetRect= */ null, + /* playAlphaReveal= */ true, /* playBlur= */ true).getAnimators(); + } + + // 3. Start the animation + t.apply(); + new CrossDisplayMoveAnimator(moveInfo.srcTaskLeash, moveInfo.dstTaskLeash, + moveInfo.srcBounds, + moveInfo.dstBounds, mLaunchingTransitionDurationMs, + mUnlaunchingTransitionDurationMs, launcherRevealAnimators, finishCallback) + .start(); + } + + private void initializeLeashAsVisible(SurfaceControl.Transaction t, Rect bounds, + SurfaceControl leash) { + t.setAlpha(leash, 1f); + t.setPosition(leash, bounds.left, bounds.top); + t.show(leash); + } + + /** + * Sets up the initial animation state. (Including re-rooting leashes to the correct display.) + */ + @VisibleForTesting + public void setupInitialAnimationState(TransitionInfo info, CrossDisplayMoveTransitionInfo move, + SurfaceControl.Transaction t) { + // Our strategy for animation setup is as follows: + // 1. Set up the state of the animation to match the final state of the transition. + // - This setup is independent of the knowledge of the actual animation implementation + // EG this will end up making DST task alpha 1, though to actually animate we want 0 + // Then + // 2. Set up the state of the animation to match the concrete implementation we expect for + // the effect we're going to produce. This means: + // - Reparent leashes to support a parallel display effect. + // - Apply a frame-0 animation state to each leash, defined by the concrete + // implementation we expect to use. + // + // This does mean that changes in the first step may be overridden in the second step. + // But, in trade we'll be a bit more robust to changes in the underlying animation + // implementation. + + // 1. Set up the state of the animation to match the final state of the transition. + for (TransitionInfo.Change change : info.getChanges()) { + final int mode = change.getMode(); + if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { + initializeLeashAsVisible(t, change.getEndAbsBounds(), change.getLeash()); + } else if (mode == TRANSIT_TO_BACK) { + t.hide(change.getLeash()); + } + } + + // 2. Setup to match the concrete implementation we expect. + // + // - Reparenting special cases + if (move.srcTaskLeash != null) { + if (move.srcRoot != null) { + t.reparent(move.srcTaskLeash, move.srcRoot.getLeash()); + initializeLeashAsVisible(t, move.srcBounds, move.srcTaskLeash); + } else { + // We should be able to always find the srcRoot. But, we don't if src is an + // external display. + // See b/442301974 + // + // As srcScreenshotLeash comes in parented to dst, not having srcRoot means we don't + // have a good way to reparent to the correct display. Given that, reparenting to + // null effectively releases it (our best option). + Log.w(TAG, "No srcRoot found for cross display move; releasing src effect."); + t.reparent(move.srcTaskLeash, null); + } + } + t.reparent(move.dstTaskLeash, move.dstRoot.getLeash()); + initializeLeashAsVisible(t, move.dstBounds, move.dstTaskLeash); + + // - Apply a frame-0 animation state + if (move.srcTaskLeash != null) { + CrossDisplayMoveAnimator.applyUnlaunchState(t, move.srcTaskLeash, + move.srcBounds, /* progress= */ 0f); + } + CrossDisplayMoveAnimator.applyLaunchState(t, move.dstTaskLeash, + move.dstBounds, + /* progress= */ 0f); + } +} \ No newline at end of file diff --git a/quickstep/src/com/android/quickstep/util/CrossDisplayMoveTransitionInfo.kt b/quickstep/src/com/android/quickstep/util/CrossDisplayMoveTransitionInfo.kt new file mode 100644 index 00000000000..d9816f7f728 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/CrossDisplayMoveTransitionInfo.kt @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.app.WindowConfiguration +import android.graphics.Rect +import android.util.Log +import android.view.SurfaceControl +import android.view.WindowManager.TRANSIT_OPEN +import android.view.WindowManager.TRANSIT_TO_FRONT +import android.window.TransitionInfo + +/** A utility class to parse TransitionInfo for a cross-display move. */ +data class CrossDisplayMoveTransitionInfo +internal constructor( + @JvmField val taskMovingBetweenDisplays: TransitionInfo.Change, + @JvmField val srcDisplayId: Int, + @JvmField val dstDisplayId: Int, + + // dstTaskLeash is the leash for the *actual* moving task. + // (As we want re-layouts, etc to be visible on the destination display.) + @JvmField val dstTaskLeash: SurfaceControl, + + // srcTaskLeash is the leash for the *screenshot* of the moving task. + // (As we do not want re-layouts, etc to be visible on the source display.) + // + // if srcRoot is null, srcTaskLeash will also be null + // if srcRoot is not null, srcTaskLeash *may or may not* be null. + @JvmField val srcTaskLeash: SurfaceControl?, + + @JvmField val srcBounds: Rect, + @JvmField val dstBounds: Rect, + @JvmField val srcRoot: TransitionInfo.Root?, + @JvmField val dstRoot: TransitionInfo.Root, + + // This is attached to the default display, which may be either SRC or DST. + @JvmField val launcherToFront: TransitionInfo.Change?, +) { + companion object { + private const val TAG = "CrossDisplayMoveTransitionInfo" + + /** + * Returns the Change object for the task moving between displays, or null if not found. + */ + @JvmStatic + fun getCrossDisplayMove(info: TransitionInfo): TransitionInfo.Change? = + info.changes.find { + it.taskInfo != null && it.startDisplayId != it.endDisplayId + } + + private fun findRoot(info: TransitionInfo, displayId: Int): TransitionInfo.Root? { + for (i in 0 until info.rootCount) { + val root = info.getRoot(i) + if (root.displayId == displayId) { + return root + } + } + return null + } + + private fun findOpeningLauncher( + info: TransitionInfo, + taskToIgnore: TransitionInfo.Change + ): TransitionInfo.Change? = + info.changes.find { + it !== taskToIgnore && + it.taskInfo?.activityType == WindowConfiguration.ACTIVITY_TYPE_HOME && + (it.mode == TRANSIT_OPEN || it.mode == TRANSIT_TO_FRONT) + } + + /** + * Creates a new CrossDisplayMoveTransitionInfo, or returns null if the transition is not a + * valid cross-display move. + */ + @JvmStatic + fun create( + info: TransitionInfo, + ): CrossDisplayMoveTransitionInfo? { + val taskMovingBetweenDisplays = getCrossDisplayMove(info) + if (taskMovingBetweenDisplays == null) { + Log.e(TAG, "Failed to find task moving between displays") + return null + } + val srcDisplayId = taskMovingBetweenDisplays.startDisplayId + val dstDisplayId = taskMovingBetweenDisplays.endDisplayId + val srcRoot = findRoot(info, srcDisplayId) + val dstRoot = findRoot(info, taskMovingBetweenDisplays.endDisplayId) + if (dstRoot == null) { + Log.e(TAG, "Failed to find dstRoot") + return null + } + val srcTaskLeash = if (srcRoot != null) taskMovingBetweenDisplays.snapshot else null + + return CrossDisplayMoveTransitionInfo( + taskMovingBetweenDisplays = taskMovingBetweenDisplays, + srcDisplayId = srcDisplayId, + dstDisplayId = dstDisplayId, + dstTaskLeash = taskMovingBetweenDisplays.leash, + srcTaskLeash = srcTaskLeash, + srcBounds = taskMovingBetweenDisplays.startAbsBounds, + dstBounds = taskMovingBetweenDisplays.endAbsBounds, + srcRoot = srcRoot, + dstRoot = dstRoot, + launcherToFront = findOpeningLauncher(info, taskMovingBetweenDisplays) + ) + } + } +} \ No newline at end of file diff --git a/quickstep/src/com/android/quickstep/util/DesksUtils.kt b/quickstep/src/com/android/quickstep/util/DesksUtils.kt new file mode 100644 index 00000000000..70897886ccb --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/DesksUtils.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.app.TaskInfo +import android.content.ComponentName +import android.content.res.Resources +import android.window.DesktopExperienceFlags +import com.android.systemui.shared.recents.model.Task + +class DesksUtils { + companion object { + val sysUiPackage = + Resources.getSystem().getString(com.android.internal.R.string.config_systemUi) + + @JvmStatic + fun areMultiDesksFlagsEnabled() = + if (false) { + // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17 + DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue && + DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_FRONTEND.isTrue + } else { + false + } + + /** Returns true if this [task] contains the [DesktopWallpaperActivity]. */ + @JvmStatic + fun isDesktopWallpaperTask(task: Task) = + task.key.component?.let(::isDesktopWallpaperComponent) == true + + @JvmStatic + fun isDesktopWallpaperTask(taskInfo: TaskInfo): Boolean { + // TODO: b/403118101 - In some launcher tests, there is a task with baseIntent set to + // null. Remove this check after finding out how that task is created. + if (taskInfo.baseIntent == null) return false + return taskInfo.baseIntent.component?.let(::isDesktopWallpaperComponent) == true + } + + @JvmStatic + fun isDesktopWallpaperComponent(component: ComponentName) = + component.className.contains("DesktopWallpaperActivity") && + component.packageName.contains(sysUiPackage) + } +} diff --git a/quickstep/src/com/android/quickstep/util/DesktopTask.java b/quickstep/src/com/android/quickstep/util/DesktopTask.java deleted file mode 100644 index 8d99069c199..00000000000 --- a/quickstep/src/com/android/quickstep/util/DesktopTask.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.quickstep.util; - -import androidx.annotation.NonNull; - -import com.android.quickstep.views.TaskView; -import com.android.systemui.shared.recents.model.Task; - -import java.util.List; - -/** - * A {@link Task} container that can contain N number of tasks that are part of the desktop in - * recent tasks list. - */ -public class DesktopTask extends GroupTask { - - @NonNull - public final List tasks; - - public DesktopTask(@NonNull List tasks) { - super(tasks.get(0), null, null, TaskView.Type.DESKTOP); - this.tasks = tasks; - } - - @Override - public boolean containsTask(int taskId) { - for (Task task : tasks) { - if (task.key.id == taskId) { - return true; - } - } - return false; - } - - @Override - public boolean hasMultipleTasks() { - return true; - } - - @Override - @NonNull - public List getTasks() { - return tasks; - } - - @Override - public DesktopTask copy() { - return new DesktopTask(tasks); - } - - @Override - public String toString() { - return "type=" + taskViewType + " tasks=" + tasks; - } - -} diff --git a/quickstep/src/com/android/quickstep/util/DesktopTask.kt b/quickstep/src/com/android/quickstep/util/DesktopTask.kt new file mode 100644 index 00000000000..e29c869c16e --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/DesktopTask.kt @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.util + +import com.android.quickstep.views.TaskViewType +import com.android.systemui.shared.recents.model.Task +import java.util.Objects + +/** + * A [Task] container that can contain N number of tasks that are part of the desktop in recent + * tasks list. Note that desktops can be empty with no tasks in them. The [deskId], [displayId] + * makes sense only when the multiple desks feature is enabled. + */ +class DesktopTask(val deskId: Int, desktopDisplayId: Int, tasks: List) : + GroupTask(tasks, desktopDisplayId, TaskViewType.DESKTOP) { + + override fun copy() = DesktopTask(deskId, displayId, tasks) + + override fun toString() = "type=$taskViewType deskId=$deskId displayId=$displayId tasks=$tasks" + + override fun equals(o: Any?): Boolean { + if (this === o) return true + if (o !is DesktopTask) return false + if (deskId != o.deskId) return false + if (displayId != o.displayId) return false + return super.equals(o) + } + + override fun hashCode() = Objects.hash(super.hashCode(), deskId, displayId) +} diff --git a/quickstep/src/com/android/quickstep/util/ExternalDisplays.kt b/quickstep/src/com/android/quickstep/util/ExternalDisplays.kt new file mode 100644 index 00000000000..e60e9f3959b --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/ExternalDisplays.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.app.TaskInfo +import android.view.Display.DEFAULT_DISPLAY +import android.view.Display.INVALID_DISPLAY +import com.android.systemui.shared.recents.model.Task + +/** Whether this displayId belongs to an external display */ +val Int.isExternalDisplay + get() = !isDefaultDisplay + +/** Whether this displayId belongs to the default display */ +val Int.isDefaultDisplay + get() = this == DEFAULT_DISPLAY + +val Int?.safeDisplayId + get() = + this.let { displayId -> + when (displayId) { + null -> DEFAULT_DISPLAY + INVALID_DISPLAY -> DEFAULT_DISPLAY + else -> displayId + } + } + +/** Returns displayId of this [Task], default to [DEFAULT_DISPLAY] */ +val Task?.safeDisplayId + get() = this?.key?.displayId.safeDisplayId + +/** Returns if this task belongs tto [DEFAULT_DISPLAY] */ +val Task?.isExternalDisplay + get() = safeDisplayId.isExternalDisplay + +/** Returns displayId of this [TaskInfo], default to [DEFAULT_DISPLAY] */ +val TaskInfo?.safeDisplayId + get() = this?.displayId.safeDisplayId diff --git a/quickstep/src/com/android/quickstep/util/FloatingIconViewHelper.kt b/quickstep/src/com/android/quickstep/util/FloatingIconViewHelper.kt new file mode 100644 index 00000000000..9460eddaa93 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/FloatingIconViewHelper.kt @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.graphics.RectF +import android.view.View +import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.util.AsyncView +import com.android.launcher3.views.FloatingIconView + +/** + * Helper class for floating icon view instance that encapsulates code that should not be exposed + * for public use. + */ +object FloatingIconViewHelper { + + /** + * Uses [FloatingIconView.getFloatingIconView], but also offsets the [positionOut] for the + * hotseat if hotseat is shrank due to the bubble bar presence. + */ + @JvmStatic + fun getFloatingIconView( + launcher: QuickstepLauncher, + originalView: View, + visibilitySyncView: AsyncView?, + fadeOutView: AsyncView?, + hideOriginal: Boolean, + positionOut: RectF, + isOpening: Boolean, + ): FloatingIconView { + val floatingIconView = + FloatingIconView.getFloatingIconView( + launcher, + originalView, + visibilitySyncView, + fadeOutView, + hideOriginal, + positionOut, + isOpening, + ) + if (!isOpening) { + launcher.offsetBoundsXToHotseatIfApplicable(positionOut, originalView) + } + return floatingIconView + } +} diff --git a/quickstep/src/com/android/quickstep/util/FontUtils.kt b/quickstep/src/com/android/quickstep/util/FontUtils.kt new file mode 100644 index 00000000000..26ad6589e01 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/FontUtils.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.content.res.Configuration +import android.content.res.Resources +import android.graphics.Typeface +import android.util.Log +import com.android.wm.shell.shared.TypefaceUtils + +object FontUtils { + private const val TAG = "FontUtils" + + private val baseTypeface = + Typeface.create(TypefaceUtils.FontFamily.GSF_LABEL_LARGE.value, Typeface.NORMAL) + + @JvmStatic + fun getTypeFace(resources: Resources): Typeface = + Typeface.create(baseTypeface, getFontWeight(resources), /* italic= */ false) + + fun getFontWeight(resources: Resources): Int { + val fontWeightAdjustment: Int = resources.configuration.fontWeightAdjustment + val adjusted = + if (fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED) { + Typeface.Builder.NORMAL_WEIGHT + fontWeightAdjustment + } else { + Typeface.Builder.NORMAL_WEIGHT + } + if (adjusted !in 0..1000) { + Log.w( + TAG, + "Calculated font weight $adjusted is out of bounds (0-1000) " + + "after adjustment: $fontWeightAdjustment.", + ) + } + return adjusted.coerceIn(0, 1000) + } +} diff --git a/quickstep/src/com/android/quickstep/util/GroupTask.java b/quickstep/src/com/android/quickstep/util/GroupTask.java deleted file mode 100644 index 945ffe31f6b..00000000000 --- a/quickstep/src/com/android/quickstep/util/GroupTask.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.quickstep.util; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; -import com.android.quickstep.views.TaskView; -import com.android.systemui.shared.recents.model.Task; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -/** - * A {@link Task} container that can contain one or two tasks, depending on if the two tasks - * are represented as an app-pair in the recents task list. - */ -public class GroupTask { - @NonNull - public final Task task1; - @Nullable - public final Task task2; - @Nullable - public final SplitBounds mSplitBounds; - @TaskView.Type - public final int taskViewType; - - public GroupTask(@NonNull Task task) { - this(task, null, null); - } - - public GroupTask(@NonNull Task t1, @Nullable Task t2, @Nullable SplitBounds splitBounds) { - this(t1, t2, splitBounds, t2 != null ? TaskView.Type.GROUPED : TaskView.Type.SINGLE); - } - - protected GroupTask(@NonNull Task t1, @Nullable Task t2, @Nullable SplitBounds splitBounds, - @TaskView.Type int taskViewType) { - task1 = t1; - task2 = t2; - mSplitBounds = splitBounds; - this.taskViewType = taskViewType; - } - - public boolean containsTask(int taskId) { - return task1.key.id == taskId || (task2 != null && task2.key.id == taskId); - } - - public boolean hasMultipleTasks() { - return task2 != null; - } - - /** - * Returns a List of all the Tasks in this GroupTask - */ - public List getTasks() { - if (task2 == null) { - return Collections.singletonList(task1); - } else { - return Arrays.asList(task1, task2); - } - } - - /** - * Create a copy of this instance - */ - public GroupTask copy() { - return new GroupTask( - new Task(task1), - task2 != null ? new Task(task2) : null, - mSplitBounds); - } - - @Override - public String toString() { - return "type=" + taskViewType + " task1=" + task1 + " task2=" + task2; - } - -} diff --git a/quickstep/src/com/android/quickstep/util/GroupTask.kt b/quickstep/src/com/android/quickstep/util/GroupTask.kt new file mode 100644 index 00000000000..d97f39505db --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/GroupTask.kt @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.util + +import android.os.UserHandle +import com.android.launcher3.icons.BitmapInfo +import com.android.launcher3.model.data.AppPairInfo +import com.android.launcher3.model.data.TaskItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.quickstep.views.TaskViewType +import com.android.systemui.shared.recents.model.Task +import com.android.wm.shell.shared.split.SplitBounds +import java.util.Objects + +/** + * An abstract class for creating [Task] containers that can be [SingleTask]s, [SplitTask]s, or + * [DesktopTask]s in the recent tasks list. + */ +abstract class GroupTask( + val tasks: List, + val displayId: Int, + @JvmField val taskViewType: TaskViewType, +) { + + /** Icons for each of the [tasks]. */ + val bitmapInfos = MutableList(tasks.size) { null } + + fun containsTask(taskId: Int) = tasks.any { it.key.id == taskId } + + /** + * Returns true if a task in this group has a package name that matches the given `packageName`. + */ + fun containsPackage(packageName: String?) = tasks.any { it.key.packageName == packageName } + + /** Returns true if a task in this group has the given displayId. */ + fun matchesDisplayId(displayId: Int) = displayId == this.displayId.safeDisplayId + + /** + * Returns true if a task in this group has a package name that matches the given `packageName`, + * and its user ID matches the given `userId`. + */ + fun containsPackage(packageName: String?, userId: Int) = + tasks.any { it.key.packageName == packageName && it.key.userId == userId } + + fun isEmpty() = tasks.isEmpty() + + /** Creates a copy of this instance */ + abstract fun copy(): GroupTask + + override fun equals(o: Any?): Boolean { + if (this === o) return true + if (o !is GroupTask) return false + return taskViewType == o.taskViewType && tasks == o.tasks + } + + override fun hashCode() = Objects.hash(tasks, taskViewType) +} + +/** A [Task] container that must contain exactly one task in the recent tasks list. */ +class SingleTask(task: Task) : GroupTask(listOf(task), task.key.displayId, TaskViewType.SINGLE) { + + val task: Task + get() = tasks[0] + + override fun copy() = SingleTask(task) + + override fun toString() = "type=$taskViewType task=$task" + + override fun equals(o: Any?): Boolean { + if (this === o) return true + if (o !is SingleTask) return false + return super.equals(o) + } + + companion object { + /** Creates a [TaskItemInfo] using the information of the SingleTask */ + fun createTaskItemInfo(task: SingleTask, wif: WorkspaceItemInfo): TaskItemInfo { + // TODO: b/344657629 - Support GroupTask in addition to SingleTask. + return TaskItemInfo(task.task.key.id, wif) + } + } + + override fun hashCode() = super.hashCode() +} + +/** + * A [Task] container that must contain exactly two tasks and split bounds to represent an app-pair + * in the recent tasks list. + */ +class SplitTask(task1: Task, task2: Task, val splitBounds: SplitBounds?) : + GroupTask(listOf(task1, task2), task1.key.displayId, TaskViewType.GROUPED) { + + val topLeftTask: Task + get() = + when { + splitBounds == null -> tasks[0] + splitBounds.leftTopTaskId == tasks[0].key.id -> tasks[0] + else -> tasks[1] + } + + val bottomRightTask: Task + get() = if (topLeftTask == tasks[0]) tasks[1] else tasks[0] + + override fun copy() = SplitTask(tasks[0], tasks[1], splitBounds) + + override fun toString() = + "type=$taskViewType topLeftTask=$topLeftTask bottomRightTask=$bottomRightTask" + + override fun equals(o: Any?): Boolean { + if (this === o) return true + if (o !is SplitTask) return false + if (splitBounds != o.splitBounds) return false + return super.equals(o) + } + + override fun hashCode() = Objects.hash(super.hashCode(), splitBounds) + + /** + * Converts the task to an [AppPairInfo] instance. + * + * The result is the minimum data needed to utilize `AppPairIcon` for this task. + */ + fun toAppPairInfo(): AppPairInfo { + return AppPairInfo( + tasks.mapIndexed { index, task -> + WorkspaceItemInfo().apply { + intent = task.key.baseIntent + user = UserHandle.of(task.key.userId) + title = task.title + this@SplitTask.bitmapInfos[index]?.let { bitmap = it } + } + } + ) + } +} diff --git a/quickstep/src/com/android/quickstep/util/IconLabelUtil.kt b/quickstep/src/com/android/quickstep/util/IconLabelUtil.kt new file mode 100644 index 00000000000..a876bca9820 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/IconLabelUtil.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.app.ActivityManager +import android.content.Context +import android.content.pm.ActivityInfo +import android.os.UserHandle +import com.android.launcher3.Utilities + +object IconLabelUtil { + @JvmStatic + @JvmOverloads + fun getBadgedContentDescription( + context: Context, + info: ActivityInfo, + userId: Int, + taskDescription: ActivityManager.TaskDescription? = null, + ): String { + val packageManager = context.packageManager + var taskLabel = taskDescription?.let { Utilities.trim(it.label) } + if (taskLabel.isNullOrEmpty()) { + taskLabel = Utilities.trim(info.loadLabel(packageManager)) + } + + val applicationLabel = Utilities.trim(info.applicationInfo.loadLabel(packageManager)) + val badgedApplicationLabel = + if (userId != UserHandle.myUserId()) + packageManager + .getUserBadgedLabel(applicationLabel, UserHandle.of(userId)) + .toString() + else applicationLabel + return if (applicationLabel == taskLabel) badgedApplicationLabel + else "$badgedApplicationLabel $taskLabel" + } +} diff --git a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java index f659e163733..285c7624ae4 100644 --- a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java +++ b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java @@ -54,7 +54,6 @@ import com.android.launcher3.BuildConfig; import com.android.quickstep.SystemUiProxy; import com.android.systemui.shared.recents.model.Task; -import com.topjohnwu.superuser.Shell; import java.io.File; import java.io.FileOutputStream; @@ -62,6 +61,7 @@ import java.util.function.BiFunction; import java.util.function.Supplier; +import com.topjohnwu.superuser.Shell; import app.lawnchair.compatlib.utils.BitmapUtil; /** @@ -83,17 +83,19 @@ public static void saveScreenshot(SystemUiProxy systemUiProxy, Bitmap screenshot Rect screenshotBounds, Insets visibleInsets, Task.TaskKey task) { try { ScreenshotRequest request = - new ScreenshotRequest.Builder(TAKE_SCREENSHOT_PROVIDED_IMAGE, SCREENSHOT_OVERVIEW) - .setTopComponent(task.sourceComponent) - .setTaskId(task.id) - .setUserId(task.userId) - .setBitmap(screenshot) - .setBoundsOnScreen(screenshotBounds) - .setInsets(visibleInsets) - .build(); + new ScreenshotRequest.Builder(TAKE_SCREENSHOT_PROVIDED_IMAGE, SCREENSHOT_OVERVIEW) + .setTopComponent(task.sourceComponent) + .setTaskId(task.id) + .setUserId(task.userId) + .setBitmap(screenshot) + .setBoundsOnScreen(screenshotBounds) + .setInsets(visibleInsets) + .setDisplayId(task.displayId) + .build(); systemUiProxy.takeScreenshot(request); } catch (Throwable t) { try { + // Lawnchair-TODO-Merge: LC disabled this, but no code is in 16r2 // systemUiProxy.handleImageBundleAsScreenshot(BitmapUtil.hardwareBitmapToBundle(screenshot), // screenshotBounds, visibleInsets, task); } catch (Throwable ee) { diff --git a/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java b/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java index cb44a1a0d82..fcf9ab1ad4f 100644 --- a/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java +++ b/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java @@ -108,19 +108,28 @@ private boolean onInputConsumerMotionEvent(MotionEvent ev) { return false; } + final SimpleOrientationTouchTransformer touchTransformer = + SimpleOrientationTouchTransformer.INSTANCE.get(mContext); + final int viewRotation = mRotationSupplier.get(); + final boolean needTransform = viewRotation != ev.getSurfaceRotation(); if (action == ACTION_DOWN) { mTouchInProgress = true; + if (needTransform) { + touchTransformer.updateTouchingOrientation(viewRotation); + } initInputConsumerIfNeeded(/* isFromTouchDown= */ true); } else if (action == ACTION_CANCEL || action == ACTION_UP) { // Finish any pending actions mTouchInProgress = false; + touchTransformer.clearTouchingOrientation(); if (mDestroyPending) { destroy(); } } if (mInputConsumer != null) { - SimpleOrientationTouchTransformer.INSTANCE.get(mContext).transform(ev, - mRotationSupplier.get()); + if (needTransform) { + touchTransformer.transform(ev, viewRotation); + } mInputConsumer.onMotionEvent(ev); } diff --git a/quickstep/src/com/android/quickstep/util/InputProxyHandlerFactory.java b/quickstep/src/com/android/quickstep/util/InputProxyHandlerFactory.java index 843619de781..a86c21b3a56 100644 --- a/quickstep/src/com/android/quickstep/util/InputProxyHandlerFactory.java +++ b/quickstep/src/com/android/quickstep/util/InputProxyHandlerFactory.java @@ -20,7 +20,7 @@ import com.android.quickstep.BaseContainerInterface; import com.android.quickstep.GestureState; import com.android.quickstep.InputConsumer; -import com.android.quickstep.inputconsumers.OverviewInputConsumer; +import com.android.quickstep.inputconsumers.LauncherInputConsumer; import com.android.quickstep.views.RecentsViewContainer; import java.util.function.Supplier; @@ -35,8 +35,8 @@ public class InputProxyHandlerFactory implements Supplier { private final GestureState mGestureState; @UiThread - public InputProxyHandlerFactory(BaseContainerInterface activityInterface, - GestureState gestureState) { + public InputProxyHandlerFactory( + BaseContainerInterface activityInterface, GestureState gestureState) { mContainerInterface = activityInterface; mGestureState = gestureState; } @@ -47,7 +47,8 @@ public InputProxyHandlerFactory(BaseContainerInterface activityInterface, @Override public InputConsumer get() { RecentsViewContainer container = mContainerInterface.getCreatedContainer(); - return container == null ? InputConsumer.NO_OP - : new OverviewInputConsumer(mGestureState, container, null, true); + return container == null + ? InputConsumer.createNoOpInputConsumer(mGestureState.getDisplayId()) + : new LauncherInputConsumer(mGestureState, container, null, true); } } diff --git a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java index 76c729aa243..e197a930939 100644 --- a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java +++ b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java @@ -31,7 +31,6 @@ import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; import com.android.launcher3.Hotseat; import com.android.launcher3.Workspace; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.HorizontalInsettableView; import com.android.quickstep.SystemUiProxy; @@ -80,17 +79,12 @@ public LauncherUnfoldAnimationController( @UnfoldMain RotationChangeProvider rotationChangeProvider) { mLauncher = launcher; - if (FeatureFlags.PREEMPTIVE_UNFOLD_ANIMATION_START.get()) { - mPreemptiveProgressProvider = new PreemptiveUnfoldTransitionProgressProvider( - unfoldTransitionProgressProvider, launcher.getMainThreadHandler()); - mPreemptiveProgressProvider.init(); + mPreemptiveProgressProvider = new PreemptiveUnfoldTransitionProgressProvider( + unfoldTransitionProgressProvider, launcher.getMainThreadHandler()); + mPreemptiveProgressProvider.init(); - mProgressProvider = new ScopedUnfoldTransitionProgressProvider( - mPreemptiveProgressProvider); - } else { - mProgressProvider = new ScopedUnfoldTransitionProgressProvider( - unfoldTransitionProgressProvider); - } + mProgressProvider = new ScopedUnfoldTransitionProgressProvider( + mPreemptiveProgressProvider); unfoldTransitionProgressProvider.addCallback(mExternalTransitionStatusProvider); unfoldTransitionProgressProvider.addCallback( @@ -169,11 +163,7 @@ public void updateRegisteredViewsIfNeeded() { @Override public void onDeviceProfileChanged(DeviceProfile dp) { - if (!FeatureFlags.PREEMPTIVE_UNFOLD_ANIMATION_START.get()) { - return; - } - - if (mIsTablet != null && dp.isTablet != mIsTablet) { + if (mIsTablet != null && dp.getDeviceProperties().isTablet() != mIsTablet) { // We should preemptively start the animation only if: // - We changed to the unfolded screen // - SystemUI IPC connection is alive, so we won't end up in a situation that we won't @@ -183,7 +173,7 @@ public void onDeviceProfileChanged(DeviceProfile dp) { // if Launcher was not open during unfold, in this case we receive the configuration // change only after we went back to home screen and we don't want to start the // animation in this case. - if (dp.isTablet + if (dp.getDeviceProperties().isTablet() && SystemUiProxy.INSTANCE.get(mLauncher).isActive() && !mExternalTransitionStatusProvider.hasRun()) { // Preemptively start the unfold animation to make sure that we have drawn @@ -191,12 +181,12 @@ public void onDeviceProfileChanged(DeviceProfile dp) { preemptivelyStartAnimationOnNextFrame(); } - if (!dp.isTablet) { + if (!dp.getDeviceProperties().isTablet()) { mExternalTransitionStatusProvider.onFolded(); } } - mIsTablet = dp.isTablet; + mIsTablet = dp.getDeviceProperties().isTablet(); } private class QsbAnimationListener implements TransitionProgressListener { diff --git a/quickstep/src/com/android/quickstep/util/LayoutUtils.java b/quickstep/src/com/android/quickstep/util/LayoutUtils.java index ec1eeb1d6b9..70cbd261224 100644 --- a/quickstep/src/com/android/quickstep/util/LayoutUtils.java +++ b/quickstep/src/com/android/quickstep/util/LayoutUtils.java @@ -23,27 +23,33 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.NavigationMode; -import com.android.quickstep.LauncherActivityInterface; +import com.android.quickstep.BaseContainerInterface; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; public class LayoutUtils { + private static final float SQUARE_ASPECT_RATIO_TOLERANCE = 0.05f; + /** * The height for the swipe up motion */ public static float getDefaultSwipeHeight(Context context, DeviceProfile dp) { - float swipeHeight = dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx; + float swipeHeight = dp.getAllAppsProfile().getCellHeightPx() + - dp.getAllAppsProfile().getIconTextSizePx(); if (DisplayController.getNavigationMode(context) == NavigationMode.NO_BUTTON) { swipeHeight -= dp.getInsets().bottom; } return swipeHeight; } - public static int getShelfTrackingDistance(Context context, DeviceProfile dp, - RecentsPagedOrientationHandler orientationHandler) { + public static int getShelfTrackingDistance( + Context context, + DeviceProfile dp, + RecentsPagedOrientationHandler orientationHandler, + BaseContainerInterface baseContainerInterface) { // Track the bottom of the window. Rect taskSize = new Rect(); - LauncherActivityInterface.INSTANCE.calculateTaskSize(context, dp, taskSize, + baseContainerInterface.calculateTaskSize(context, dp, taskSize, orientationHandler); return orientationHandler.getDistanceToBottomOfRect(dp, taskSize); } @@ -61,4 +67,13 @@ public static void setViewEnabled(View view, boolean enabled) { } } } + + /** + * Returns true iff the device's aspect ratio is within + * {@link LayoutUtils#SQUARE_ASPECT_RATIO_TOLERANCE} of 1:1 + */ + public static boolean isAspectRatioSquare(float aspectRatio) { + return Float.compare(aspectRatio, 1f - SQUARE_ASPECT_RATIO_TOLERANCE) >= 0 + && Float.compare(aspectRatio, 1f + SQUARE_ASPECT_RATIO_TOLERANCE) <= 0; + } } diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java index b8bc828ec36..623bc5330b5 100644 --- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java +++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java @@ -39,6 +39,7 @@ public class MotionPauseDetector { // The percentage of the previous speed that determines whether this is a rapid deceleration. // The bigger this number, the easier it is to trigger the first pause. private static final float RAPID_DECELERATION_FACTOR = 0.6f; + private static final float RAPID_DECELERATION_FACTOR_TRACKPAD = 0.85f; /** If no motion is added for this amount of time, assume the motion has paused. */ private static final long FORCE_PAUSE_TIMEOUT = 300; @@ -57,6 +58,7 @@ public class MotionPauseDetector { private final float mSpeedVerySlow; private final float mSpeedSlow; private final float mSpeedSomewhatFast; + private final float mSpeedTrackpadSomewhatFast; private final float mSpeedFast; private final Alarm mForcePauseTimeout; private final boolean mMakePauseHarderToTrigger; @@ -66,6 +68,7 @@ public class MotionPauseDetector { private Float mPreviousVelocity = null; private OnMotionPauseListener mOnMotionPauseListener; + private boolean mIsTrackpadGesture; private boolean mIsPaused; // Bias more for the first pause to make it feel extra responsive. private boolean mHasEverBeenPaused; @@ -94,13 +97,13 @@ public MotionPauseDetector(Context context, boolean makePauseHarderToTrigger, in mSpeedVerySlow = res.getDimension(R.dimen.motion_pause_detector_speed_very_slow); mSpeedSlow = res.getDimension(R.dimen.motion_pause_detector_speed_slow); mSpeedSomewhatFast = res.getDimension(R.dimen.motion_pause_detector_speed_somewhat_fast); + mSpeedTrackpadSomewhatFast = res.getDimension( + R.dimen.motion_pause_detector_speed_trackpad_somewhat_fast); mSpeedFast = res.getDimension(R.dimen.motion_pause_detector_speed_fast); mForcePauseTimeout = new Alarm(); mForcePauseTimeout.setOnAlarmListener(alarm -> { - ActiveGestureLog.CompoundString log = - new ActiveGestureLog.CompoundString("Force pause timeout after ") - .append(alarm.getLastSetTimeout()) - .append("ms"); + ActiveGestureLog.CompoundString log = new ActiveGestureLog.CompoundString( + "Force pause timeout after %dms", alarm.getLastSetTimeout()); addLogs(log); updatePaused(true /* isPaused */, log); }); @@ -115,13 +118,16 @@ public void setOnMotionPauseListener(OnMotionPauseListener listener) { mOnMotionPauseListener = listener; } + public void setIsTrackpadGesture(boolean isTrackpadGesture) { + mIsTrackpadGesture = isTrackpadGesture; + } + /** * @param disallowPause If true, we will not detect any pauses until this is set to false again. */ public void setDisallowPause(boolean disallowPause) { - ActiveGestureLog.CompoundString log = - new ActiveGestureLog.CompoundString("Set disallowPause=") - .append(disallowPause); + ActiveGestureLog.CompoundString log = new ActiveGestureLog.CompoundString( + "Set disallowPause=%b", disallowPause); if (mDisallowPause != disallowPause) { addLogs(log); } @@ -179,11 +185,14 @@ private void checkMotionPaused(float velocity, float prevVelocity, long time) { // We want to be more aggressive about detecting the first pause to ensure it // feels as responsive as possible; getting two very slow speeds back to back // takes too long, so also check for a rapid deceleration. - boolean isRapidDeceleration = speed < previousSpeed * RAPID_DECELERATION_FACTOR; - isPaused = isRapidDeceleration && speed < mSpeedSomewhatFast; + boolean isRapidDeceleration = + speed < previousSpeed * getRapidDecelerationFactor(); + boolean notSuperFast = speed < mSpeedSomewhatFast + || (mIsTrackpadGesture && speed < mSpeedTrackpadSomewhatFast); + isPaused = isRapidDeceleration && notSuperFast; isPausedReason = new ActiveGestureLog.CompoundString( - "Didn't have back to back slow speeds, checking for rapid ") - .append(" deceleration on first pause only"); + "Didn't have back to back slow speeds, checking for rapid " + + " deceleration on first pause only"); } if (mMakePauseHarderToTrigger) { if (speed < mSpeedSlow) { @@ -192,8 +201,8 @@ private void checkMotionPaused(float velocity, float prevVelocity, long time) { } isPaused = time - mSlowStartTime >= HARDER_TRIGGER_TIMEOUT; isPausedReason = new ActiveGestureLog.CompoundString( - "Maintained slow speed for sufficient duration when making") - .append(" pause harder to trigger"); + "Maintained slow speed for sufficient duration when making" + + " pause harder to trigger"); } else { mSlowStartTime = 0; isPaused = false; @@ -209,17 +218,14 @@ private void checkMotionPaused(float velocity, float prevVelocity, long time) { private void updatePaused(boolean isPaused, ActiveGestureLog.CompoundString reason) { if (mDisallowPause) { reason = new ActiveGestureLog.CompoundString( - "Disallow pause; otherwise, would have been ") - .append(isPaused) - .append(" due to reason:") + "Disallow pause; otherwise, would have been %b due to reason: ", isPaused) .append(reason); isPaused = false; } if (mIsPaused != isPaused) { mIsPaused = isPaused; - addLogs(new ActiveGestureLog.CompoundString("onMotionPauseChanged triggered; paused=") - .append(mIsPaused) - .append(", reason=") + addLogs(new ActiveGestureLog.CompoundString( + "onMotionPauseChanged triggered; paused=%b, reason=", mIsPaused) .append(reason)); boolean isFirstDetectedPause = !mHasEverBeenPaused && mIsPaused; if (mIsPaused) { @@ -239,20 +245,20 @@ private void updatePaused(boolean isPaused, ActiveGestureLog.CompoundString reas } } - private void addLogs(ActiveGestureLog.CompoundString compoundString) { - ActiveGestureLog.CompoundString logString = - new ActiveGestureLog.CompoundString("MotionPauseDetector: ") - .append(compoundString); + private void addLogs(ActiveGestureLog.CompoundString event) { if (Utilities.isRunningInTestHarness()) { - Log.d(TAG, logString.toString()); + Log.d(TAG, new ActiveGestureLog.CompoundString("MotionPauseDetector: ") + .append(event) + .toString()); } - ActiveGestureLog.INSTANCE.addLog(logString); + ActiveGestureProtoLogProxy.logMotionPauseDetectorEvent(event); } public void clear() { mVelocityProvider.clear(); mPreviousVelocity = null; setOnMotionPauseListener(null); + mIsTrackpadGesture = false; mIsPaused = mHasEverBeenPaused = false; mSlowStartTime = 0; mForcePauseTimeout.cancelAlarm(); @@ -262,6 +268,13 @@ public boolean isPaused() { return mIsPaused; } + private float getRapidDecelerationFactor() { + return mIsTrackpadGesture ? Float.parseFloat( + Utilities.getSystemProperty("trackpad_in_app_swipe_up_deceleration_factor", + String.valueOf(RAPID_DECELERATION_FACTOR_TRACKPAD))) + : RAPID_DECELERATION_FACTOR; + } + public interface OnMotionPauseListener { /** Called only the first time motion pause is detected. */ void onMotionPauseDetected(); diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java index cfe5b2cd612..a6da2e9e02f 100644 --- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java +++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java @@ -82,7 +82,7 @@ public void onStateTransitionStart(LauncherState toState) { public void onStateTransitionComplete(LauncherState finalState) { HotseatPredictionController client = launcher.getHotseatPredictionController(); if (mFromAllApps && finalState == NORMAL && client.hasPredictions()) { - if (!launcher.getDeviceProfile().isTablet + if (!launcher.getDeviceProfile().getDeviceProperties().isTablet() && HOTSEAT_DISCOVERY_TIP_COUNT.increment(launcher)) { client.showEdu(); stateManager.removeStateListener(this); @@ -106,7 +106,8 @@ public void onStateTransitionStart(LauncherState toState) { return; } mShouldIncreaseCount = toState == HINT_STATE - && launcher.getWorkspace().getNextPage() == Workspace.DEFAULT_PAGE; + && launcher.getWorkspace().getNextPage() == Workspace.DEFAULT_PAGE + && launcher.isCanShowAllAppsEducationView(); } @Override diff --git a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java index 0b05c2e7c1e..e69de29bb2d 100644 --- a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java +++ b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.util; - -import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET; - -import android.animation.Animator; -import android.animation.ObjectAnimator; -import android.content.Context; - -import androidx.dynamicanimation.animation.DynamicAnimation; - -import com.android.launcher3.anim.SpringAnimationBuilder; -import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory; -import com.android.quickstep.views.RecentsView; -import com.android.quickstep.views.RecentsViewContainer; - -public class RecentsAtomicAnimationFactory extends AtomicAnimationFactory { - - public static final int INDEX_RECENTS_FADE_ANIM = AtomicAnimationFactory.NEXT_INDEX + 0; - public static final int INDEX_RECENTS_TRANSLATE_X_ANIM = AtomicAnimationFactory.NEXT_INDEX + 1; - - private static final int MY_ANIM_COUNT = 2; - - protected final CONTAINER mContainer; - - public RecentsAtomicAnimationFactory(CONTAINER container) { - super(MY_ANIM_COUNT); - mContainer = container; - } - - @Override - public Animator createStateElementAnimation(int index, float... values) { - switch (index) { - case INDEX_RECENTS_FADE_ANIM: - ObjectAnimator alpha = ObjectAnimator.ofFloat(mContainer.getOverviewPanel(), - RecentsView.CONTENT_ALPHA, values); - return alpha; - case INDEX_RECENTS_TRANSLATE_X_ANIM: { - RecentsView rv = mContainer.getOverviewPanel(); - return new SpringAnimationBuilder(mContainer) - .setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE) - .setDampingRatio(0.8f) - .setStiffness(250) - .setValues(values) - .build(rv, ADJACENT_PAGE_HORIZONTAL_OFFSET); - } - default: - return super.createStateElementAnimation(index, values); - } - } -} diff --git a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.kt b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.kt new file mode 100644 index 00000000000..7de827e1f5b --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.kt @@ -0,0 +1,296 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.util + +import android.animation.Animator +import android.animation.ObjectAnimator +import android.content.Context +import android.view.View +import androidx.dynamicanimation.animation.DynamicAnimation +import com.android.app.animation.Interpolators.ACCELERATE +import com.android.app.animation.Interpolators.ACCELERATE_DECELERATE +import com.android.app.animation.Interpolators.DECELERATE +import com.android.app.animation.Interpolators.DECELERATE_1_7 +import com.android.app.animation.Interpolators.DECELERATE_3 +import com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE +import com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE +import com.android.app.animation.Interpolators.FAST_OUT_SLOW_IN +import com.android.app.animation.Interpolators.FINAL_FRAME +import com.android.app.animation.Interpolators.INSTANT +import com.android.app.animation.Interpolators.LINEAR +import com.android.app.animation.Interpolators.OVERSHOOT_0_75 +import com.android.app.animation.Interpolators.OVERSHOOT_1_2 +import com.android.app.animation.Interpolators.clampToProgress +import com.android.launcher3.LauncherState.ALL_APPS +import com.android.launcher3.LauncherState.HINT_STATE +import com.android.launcher3.LauncherState.HINT_STATE_TWO_BUTTON +import com.android.launcher3.LauncherState.NORMAL +import com.android.launcher3.LauncherState.OVERVIEW +import com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT +import com.android.launcher3.QuickstepTransitionManager +import com.android.launcher3.anim.SpringAnimationBuilder +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.statemanager.BaseState +import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory +import com.android.launcher3.statemanager.StatefulContainer +import com.android.launcher3.states.StateAnimationConfig +import com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE +import com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SPLIT_SELECT_FLOATING_TASK_TRANSLATE_OFFSCREEN +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X +import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y +import com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE +import com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE +import com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE +import com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.NavigationMode +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsViewContainer +import kotlin.math.max +import kotlin.math.min + +open class RecentsAtomicAnimationFactory>( + protected val container: CONTAINER +) : AtomicAnimationFactory(MY_ANIM_COUNT) where +CONTAINER : Context, +CONTAINER : RecentsViewContainer, +CONTAINER : StatefulContainer { + + override fun createStateElementAnimation(index: Int, vararg values: Float): Animator = + when (index) { + INDEX_RECENTS_FADE_ANIM -> { + ObjectAnimator.ofFloat( + container.getOverviewPanel(), + RecentsView.CONTENT_ALPHA, + *values, + ) + } + INDEX_RECENTS_ATTACHED_ALPHA_ANIM, + INDEX_RECENTS_TRANSLATE_X_ANIM -> { + SpringAnimationBuilder(container) + .setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE) + .setDampingRatio(0.8f) + .setStiffness(250f) + .setValues(*values) + .build( + container.getOverviewPanel(), + if (index == INDEX_RECENTS_ATTACHED_ALPHA_ANIM) + RecentsView.RUNNING_TASK_ATTACH_ALPHA + else RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET, + ) + } + else -> super.createStateElementAnimation(index, *values) + } + + protected open fun applyOverviewToHomeAnimConfig( + fromState: STATE_TYPE, + config: StateAnimationConfig, + overview: RecentsView, + isPinnedTaskbar: Boolean, + isThreeButton: Boolean, + ) { + overview.switchToScreenshot { + overview.finishRecentsAnimation(/* toRecents= */ true, /* onFinishComplete= */ null) + } + + if (fromState == OVERVIEW_SPLIT_SELECT) { + config.setInterpolator( + ANIM_OVERVIEW_SPLIT_SELECT_FLOATING_TASK_TRANSLATE_OFFSCREEN, + clampToProgress(EMPHASIZED_ACCELERATE, 0f, 0.4f), + ) + config.setInterpolator( + ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE, + clampToProgress(LINEAR, 0f, 0.33f), + ) + } + + // We sync the scrim fade with the taskbar animation duration to avoid any flickers for + // taskbar icons disappearing before hotseat icons show up. + val isPersistentTaskbarAndNotInDesktopMode = + (isThreeButton || isPinnedTaskbar) && + !DesktopVisibilityController.INSTANCE.get(container) + .isInDesktopMode(container.displayId) + val scrimUpperBoundFromSplit = + (QuickstepTransitionManager.getTaskbarToHomeDuration( + isPersistentTaskbarAndNotInDesktopMode + ) / config.duration.toFloat()) + .coerceAtMost(1f) + config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(LINEAR, 0f, 0.25f)) + config.setInterpolator( + ANIM_SCRIM_FADE, + if (fromState == OVERVIEW_SPLIT_SELECT) + clampToProgress(LINEAR, 0.33f, scrimUpperBoundFromSplit) + else LINEAR, + ) + config.setInterpolator(ANIM_WORKSPACE_SCALE, DECELERATE) + config.setInterpolator(ANIM_WORKSPACE_FADE, ACCELERATE) + + if (DisplayController.getNavigationMode(container).hasGestures && overview.hasTaskViews()) { + // Overview is going offscreen, so keep it at its current scale and opacity. + config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME) + config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME) + config.setInterpolator( + ANIM_OVERVIEW_TRANSLATE_X, + if (fromState == OVERVIEW_SPLIT_SELECT) EMPHASIZED_DECELERATE + else clampToProgress(FAST_OUT_SLOW_IN, 0f, 0.75f), + ) + config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME) + + // Scroll RecentsView to page 0 as it goes offscreen, if necessary. + val numPagesToScroll = overview.nextPage - DEFAULT_PAGE + val scrollDuration = + min(MAX_PAGE_SCROLL_DURATION, (numPagesToScroll * PER_PAGE_SCROLL_DURATION)) + config.duration = max(config.duration, scrollDuration.toLong()) + + // Sync scroll so that it ends before or at the same time as the taskbar animation. + if (container.deviceProfile.isTaskbarPresent) { + config.duration = + min( + config.duration, + QuickstepTransitionManager.getTaskbarToHomeDuration( + isPersistentTaskbarAndNotInDesktopMode + ) + .toLong(), + ) + } + overview.snapToPage(DEFAULT_PAGE, Math.toIntExact(config.duration)) + } else { + config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCELERATE_DECELERATE) + config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCELERATE, 0f, 0.9f)) + config.setInterpolator(ANIM_OVERVIEW_FADE, DECELERATE_1_7) + } + } + + protected open fun getHintToNormalAnimationDuration(toState: STATE_TYPE) = -1 + + protected open fun applyAllAppsToNormalConfig(config: StateAnimationConfig) {} + + protected open fun applyNormalToAllAppsAnimConfig(config: StateAnimationConfig) {} + + override fun prepareForAtomicAnimation( + fromState: STATE_TYPE, + toState: STATE_TYPE, + config: StateAnimationConfig, + ) { + val overview = container.getOverviewPanel>() + val isPinnedTaskbar = TaskbarFeatureEvaluator.INSTANCE.get(container).isPinned + val isThreeButton = + (DisplayController.getNavigationMode(container) == NavigationMode.THREE_BUTTONS) + if ((fromState == OVERVIEW || fromState == OVERVIEW_SPLIT_SELECT) && toState == NORMAL) { + applyOverviewToHomeAnimConfig( + fromState, + config, + overview, + isPinnedTaskbar, + isThreeButton, + ) + } else if ( + (fromState == NORMAL || + fromState == HINT_STATE || + fromState == HINT_STATE_TWO_BUTTON) && toState == OVERVIEW + ) { + if (DisplayController.getNavigationMode(container).hasGestures) { + config.setInterpolator( + ANIM_WORKSPACE_SCALE, + if (fromState == NORMAL) ACCELERATE else OVERSHOOT_1_2, + ) + config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCELERATE) + + // Scrolling in tasks, so show straight away + config.setInterpolator( + ANIM_OVERVIEW_FADE, + if (overview.hasTaskViews()) INSTANT else OVERSHOOT_1_2, + ) + } else { + config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2) + config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2) + + // Scale up the recents, if it is not coming from the side + if (overview.visibility != View.VISIBLE || overview.contentAlpha == 0f) { + RecentsView.RECENTS_SCALE_PROPERTY[overview] = RECENTS_PREPARE_SCALE + } + } + config.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2) + config.setInterpolator(ANIM_ALL_APPS_FADE, OVERSHOOT_1_2) + config.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2) + config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2) + config.setInterpolator(ANIM_SCRIM_FADE) { t: Float -> + OVERSHOOT_1_2.getInterpolation(t).coerceAtMost(1f) + } + config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_2) + config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_2) + } else if (fromState == HINT_STATE && toState == NORMAL) { + config.setInterpolator(ANIM_DEPTH, DECELERATE_3) + config.duration = + max(config.duration, getHintToNormalAnimationDuration(toState).toLong()) + } else if (fromState == ALL_APPS && toState == NORMAL) { + applyAllAppsToNormalConfig(config) + } else if (fromState == NORMAL && toState == ALL_APPS) { + applyNormalToAllAppsAnimConfig(config) + } else if (fromState == OVERVIEW && toState == OVERVIEW_SPLIT_SELECT) { + val timings = + if (container.deviceProfile.deviceProperties.isTablet) + SplitAnimationTimings.TABLET_OVERVIEW_TO_SPLIT + else SplitAnimationTimings.PHONE_OVERVIEW_TO_SPLIT + config.setInterpolator( + ANIM_OVERVIEW_ACTIONS_FADE, + clampToProgress( + LINEAR, + timings.actionsFadeStartOffset, + timings.actionsFadeEndOffset, + ), + ) + } else if ( + (fromState == NORMAL || fromState == ALL_APPS) && toState == OVERVIEW_SPLIT_SELECT + ) { + // Splitting from Home is currently only available on tablets + val timings = SplitAnimationTimings.TABLET_HOME_TO_SPLIT + config.setInterpolator( + ANIM_SCRIM_FADE, + clampToProgress( + LINEAR, + timings.scrimFadeInStartOffset, + timings.scrimFadeInEndOffset, + ), + ) + config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_0_75) + config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_0_75) + } + } + + companion object { + const val INDEX_RECENTS_FADE_ANIM = NEXT_INDEX + 0 + const val INDEX_RECENTS_TRANSLATE_X_ANIM = NEXT_INDEX + 1 + const val INDEX_RECENTS_ATTACHED_ALPHA_ANIM = NEXT_INDEX + 2 + + private const val MY_ANIM_COUNT = 3 + + // Scale recents takes before animating in + private const val RECENTS_PREPARE_SCALE = 1.33f + + // Constants to specify how to scroll RecentsView to the default page if it's not already + // there. + private const val DEFAULT_PAGE = 0 + private const val PER_PAGE_SCROLL_DURATION = 150 + private const val MAX_PAGE_SCROLL_DURATION = 750 + } +} diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java index 9335e7e475a..980b4cdc6d4 100644 --- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java +++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java @@ -16,6 +16,7 @@ package com.android.quickstep.util; +import static android.view.Display.DEFAULT_DISPLAY; import static android.view.OrientationEventListener.ORIENTATION_UNKNOWN; import static android.view.Surface.ROTATION_0; import static android.view.Surface.ROTATION_180; @@ -23,6 +24,7 @@ import static android.view.Surface.ROTATION_90; import static com.android.launcher3.LauncherPrefs.ALLOW_ROTATION; +import static com.android.launcher3.LauncherPrefs.FIXED_LANDSCAPE_MODE; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.SettingsCache.ROTATION_SETTING_URI; import static com.android.quickstep.BaseActivityInterface.getTaskDimension; @@ -30,7 +32,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; import android.content.Context; -import android.content.SharedPreferences; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.PointF; @@ -44,7 +45,9 @@ import androidx.annotation.NonNull; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.LauncherPrefChangeListener; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.touch.PagedOrientationHandler; @@ -66,8 +69,7 @@ * This class has initial default state assuming the device and foreground app have * no ({@link Surface#ROTATION_0} rotation. */ -public class RecentsOrientedState implements - SharedPreferences.OnSharedPreferenceChangeListener { +public class RecentsOrientedState implements LauncherPrefChangeListener { private static final String TAG = "RecentsOrientedState"; private static final boolean DEBUG = false; @@ -92,8 +94,8 @@ public class RecentsOrientedState implements private static final int FLAG_HOME_ROTATION_ALLOWED_IN_PREFS = 1 << 2; // If the user has enabled system rotation private static final int FLAG_SYSTEM_ROTATION_ALLOWED = 1 << 3; - // Multiple orientation is not supported in multiwindow mode - private static final int FLAG_MULTIWINDOW_ROTATION_ALLOWED = 1 << 4; + // 1 << 4 is deprecated + // private static final int FLAG_MULTIWINDOW_ROTATION_ALLOWED = 1 << 4; // Whether to rotation sensor is supported on the device private static final int FLAG_ROTATION_WATCHER_SUPPORTED = 1 << 5; // Whether to enable rotation watcher when multi-rotation is supported @@ -106,9 +108,12 @@ public class RecentsOrientedState implements // Ignore shared prefs for home rotation rotation, allowing it in if the activity supports it private static final int FLAG_IGNORE_ALLOW_HOME_ROTATION_PREF = 1 << 9; + // Shared prefs for fixed 90 degree rotation, activities should rotate if they support it + private static final int FLAG_HOME_FIXED_LANDSCAPE_PREFS = 1 << 10; + private static final int MASK_MULTIPLE_ORIENTATION_SUPPORTED_BY_DEVICE = FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_ACTIVITY - | FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY; + | FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY; // State for which rotation watcher will be enabled. We skip it when home rotation or // multi-window is enabled as in that case, activity itself rotates. @@ -142,7 +147,7 @@ public RecentsOrientedState(Context context, BaseContainerInterface containerInt IntConsumer rotationChangeListener) { mContext = context; mContainerInterface = containerInterface; - mOrientationListener = new OrientationEventListener(context) { + mOrientationListener = new OrientationEventListener(mContext) { @Override public void onOrientationChanged(int degrees) { int newRotation = getRotationForUserDegreesRotated(degrees, mPreviousRotation); @@ -170,7 +175,7 @@ public BaseContainerInterface getContainerInterface() { */ public void setDeviceProfile(DeviceProfile deviceProfile) { boolean oldMultipleOrientationsSupported = isMultipleOrientationSupportedByDevice(); - setFlag(FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY, !deviceProfile.isTablet); + setFlag(FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY, !deviceProfile.getDeviceProperties().isTablet()); if (mListenersInitialized) { boolean newMultipleOrientationsSupported = isMultipleOrientationSupportedByDevice(); // If isMultipleOrientationSupportedByDevice is changed, init or destroy listeners @@ -194,13 +199,6 @@ public boolean setRecentsRotation(@SurfaceRotation int recentsRotation) { return updateHandler(); } - /** - * Sets if the host is in multi-window mode - */ - public void setMultiWindowMode(boolean isMultiWindow) { - setFlag(FLAG_MULTIWINDOW_ROTATION_ALLOWED, isMultiWindow); - } - /** * Sets if the swipe up gesture is currently running or not */ @@ -226,7 +224,7 @@ public boolean update( private boolean updateHandler() { mRecentsActivityRotation = inferRecentsActivityRotation(mDisplayRotation); - if (mRecentsActivityRotation == mTouchRotation || isRecentsActivityRotationAllowed()) { + if (mRecentsActivityRotation == mTouchRotation || shouldUseRealOrientation()) { mOrientationHandler = RecentsPagedOrientationHandler.PORTRAIT; } else if (mTouchRotation == ROTATION_90) { mOrientationHandler = RecentsPagedOrientationHandler.LANDSCAPE; @@ -248,9 +246,13 @@ private boolean updateHandler() { return mStateId != oldStateId; } + private boolean shouldUseRealOrientation() { + return isRecentsActivityRotationAllowed() || isLauncherFixedLandscape(); + } + @SurfaceRotation private int inferRecentsActivityRotation(@SurfaceRotation int displayRotation) { - if (isRecentsActivityRotationAllowed()) { + if (shouldUseRealOrientation()) { return mRecentsRotation < 0 ? displayRotation : mRecentsRotation; } else { return ROTATION_0; @@ -283,15 +285,26 @@ private boolean setFlag(int mask, boolean enabled) { } @Override - public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) { + public void onPrefChanged(String s) { if (LauncherPrefs.ALLOW_ROTATION.getSharedPrefKey().equals(s)) { updateHomeRotationSetting(); } + if (LauncherPrefs.FIXED_LANDSCAPE_MODE.getSharedPrefKey().equals(s)) { + updateFixedLandscapeSetting(); + } } private void updateAutoRotateSetting() { - setFlag(FLAG_SYSTEM_ROTATION_ALLOWED, - mSettingsCache.getValue(ROTATION_SETTING_URI, 1)); + setFlag(FLAG_SYSTEM_ROTATION_ALLOWED, mSettingsCache.getValue(ROTATION_SETTING_URI)); + } + + private void updateFixedLandscapeSetting() { + if (Flags.oneGridSpecs()) { + setFlag( + FLAG_HOME_FIXED_LANDSCAPE_PREFS, + LauncherPrefs.get(mContext).get(FIXED_LANDSCAPE_MODE) + ); + } } private void updateHomeRotationSetting() { @@ -306,6 +319,7 @@ private void initFlags() { // initialize external flags updateAutoRotateSetting(); updateHomeRotationSetting(); + updateFixedLandscapeSetting(); } private void initMultipleOrientationListeners() { @@ -382,15 +396,32 @@ public void ignoreAllowHomeRotationPreference() { setFlag(FLAG_IGNORE_ALLOW_HOME_ROTATION_PREF, true); } + public boolean isLauncherFixedLandscape() { + return (mFlags & FLAG_HOME_FIXED_LANDSCAPE_PREFS) == FLAG_HOME_FIXED_LANDSCAPE_PREFS; + } + public boolean isRecentsActivityRotationAllowed() { // Activity rotation is allowed if the multi-simulated-rotation is not supported // (fallback recents or tablets) or activity rotation is enabled by various settings. return ((mFlags & MASK_MULTIPLE_ORIENTATION_SUPPORTED_BY_DEVICE) != MASK_MULTIPLE_ORIENTATION_SUPPORTED_BY_DEVICE) || (mFlags & (FLAG_IGNORE_ALLOW_HOME_ROTATION_PREF - | FLAG_HOME_ROTATION_ALLOWED_IN_PREFS - | FLAG_MULTIWINDOW_ROTATION_ALLOWED - | FLAG_HOME_ROTATION_FORCE_ENABLED_FOR_TESTING)) != 0; + | FLAG_HOME_ROTATION_ALLOWED_IN_PREFS + | FLAG_HOME_ROTATION_FORCE_ENABLED_FOR_TESTING)) != 0; + } + + /** + * Returns if we should show the action buttons on the recent view based on the orientation + * state. + */ + public boolean shouldHideActionButtons() { + // In fixed landscape always show the action buttons + return !isLauncherFixedLandscape() + // When not in fixed landscape, do not show actions buttons when using + // fake landscape which happens when the rotation is not ROTATION_0 unless + // rotation is allowed + && (getTouchRotation() != ROTATION_0 || getRecentsActivityRotation() != ROTATION_0) + && !isRecentsActivityRotationAllowed(); } /** @@ -404,7 +435,7 @@ public void setRotationWatcherEnabled(boolean isEnabled) { * Returns the scale and pivot so that the provided taskRect can fit the provided full size */ public float getFullScreenScaleAndPivot(Rect taskView, DeviceProfile dp, PointF outPivot) { - getTaskDimension(mContext, dp, outPivot); + getTaskDimension(dp, outPivot); float scale = Math.min(outPivot.x / taskView.width(), outPivot.y / taskView.height()); if (scale == 1) { outPivot.set(taskView.centerX(), taskView.centerY()); @@ -572,19 +603,24 @@ public String toString() { /** * Returns the device profile based on expected launcher rotation */ - public DeviceProfile getLauncherDeviceProfile() { - InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(mContext); - Point currentSize = DisplayController.INSTANCE.get(mContext).getInfo().currentSize; - - int width, height; - if ((mRecentsActivityRotation == ROTATION_90 || mRecentsActivityRotation == ROTATION_270)) { - width = Math.max(currentSize.x, currentSize.y); - height = Math.min(currentSize.x, currentSize.y); + public DeviceProfile getLauncherDeviceProfile(int displayId) { + if (displayId != DEFAULT_DISPLAY) { + return mContainerInterface.getCreatedContainer().getDeviceProfile(); } else { - width = Math.min(currentSize.x, currentSize.y); - height = Math.max(currentSize.x, currentSize.y); + InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(mContext); + Point currentSize = DisplayController.INSTANCE.get(mContext).getInfo().currentSize; + + int width, height; + if ((mRecentsActivityRotation == ROTATION_90 + || mRecentsActivityRotation == ROTATION_270)) { + width = Math.max(currentSize.x, currentSize.y); + height = Math.min(currentSize.x, currentSize.y); + } else { + width = Math.min(currentSize.x, currentSize.y); + height = Math.max(currentSize.x, currentSize.y); + } + return idp.getBestMatch(width, height, mRecentsActivityRotation); } - return idp.getBestMatch(width, height, mRecentsActivityRotation); } private static String nameAndAddress(Object obj) { diff --git a/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java index 00b40116f7e..993968d4f24 100644 --- a/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java +++ b/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java @@ -15,7 +15,6 @@ */ package com.android.quickstep.util; -import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -35,8 +34,6 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.anim.FlingSpringAnim; -import com.android.launcher3.touch.OverScroll; import com.android.launcher3.util.DynamicResource; import com.android.quickstep.RemoteAnimationTargets.ReleaseCheck; import com.android.systemui.plugins.ResourceProvider; @@ -104,8 +101,6 @@ public void setValue(RectFSpringAnim object, float value) { private float mCurrentY; // If true, tracking the bottom of the rects, else tracking the top. private float mCurrentScaleProgress; - private FlingSpringAnim mRectXAnim; - private FlingSpringAnim mRectYAnim; private SpringAnimation mRectXSpring; private SpringAnimation mRectYSpring; private SpringAnimation mRectScaleAnim; @@ -114,9 +109,6 @@ public void setValue(RectFSpringAnim object, float value) { private boolean mRectYAnimEnded; private boolean mRectScaleAnimEnded; - private float mMinVisChange; - private int mMaxVelocityPxPerS; - /** * Indicates which part of the start & target rects we are interpolating between. */ @@ -143,8 +135,6 @@ public RectFSpringAnim(SpringConfig config) { mTargetRect = config.targetRect; mCurrentCenterX = mStartRect.centerX(); - mMinVisChange = config.minVisChange; - mMaxVelocityPxPerS = config.maxVelocityPxPerS; setCanRelease(true); mTracking = config.tracking; @@ -174,54 +164,28 @@ private float getTrackedYFromRect(RectF rect) { } public void onTargetPositionChanged() { - if (enableScalingRevealHomeAnimation()) { - if (isEnded()) { - return; - } - - if (mRectXSpring != null) { - mRectXSpring.animateToFinalPosition(mTargetRect.centerX()); - mRectXAnimEnded = false; - } + if (isEnded()) { + return; + } - if (mRectYSpring != null) { - switch (mTracking) { - case TRACKING_TOP: - mRectYSpring.animateToFinalPosition(mTargetRect.top); - break; - case TRACKING_BOTTOM: - mRectYSpring.animateToFinalPosition(mTargetRect.bottom); - break; - case TRACKING_CENTER: - mRectYSpring.animateToFinalPosition(mTargetRect.centerY()); - break; - } - mRectYAnimEnded = false; - } - } else { - if (mRectXAnim != null && mRectXAnim.getTargetPosition() != mTargetRect.centerX()) { - mRectXAnim.updatePosition(mCurrentCenterX, mTargetRect.centerX()); - } + if (mRectXSpring != null) { + mRectXSpring.animateToFinalPosition(mTargetRect.centerX()); + mRectXAnimEnded = false; + } - if (mRectYAnim != null) { - switch (mTracking) { - case TRACKING_TOP: - if (mRectYAnim.getTargetPosition() != mTargetRect.top) { - mRectYAnim.updatePosition(mCurrentY, mTargetRect.top); - } - break; - case TRACKING_BOTTOM: - if (mRectYAnim.getTargetPosition() != mTargetRect.bottom) { - mRectYAnim.updatePosition(mCurrentY, mTargetRect.bottom); - } - break; - case TRACKING_CENTER: - if (mRectYAnim.getTargetPosition() != mTargetRect.centerY()) { - mRectYAnim.updatePosition(mCurrentY, mTargetRect.centerY()); - } - break; - } + if (mRectYSpring != null) { + switch (mTracking) { + case TRACKING_TOP: + mRectYSpring.animateToFinalPosition(mTargetRect.top); + break; + case TRACKING_BOTTOM: + mRectYSpring.animateToFinalPosition(mTargetRect.bottom); + break; + case TRACKING_CENTER: + mRectYSpring.animateToFinalPosition(mTargetRect.centerY()); + break; } + mRectYAnimEnded = false; } } @@ -257,118 +221,67 @@ public void start(Context context, @Nullable DeviceProfile profile, PointF veloc float endY = getTrackedYFromRect(mTargetRect); float minVisibleChange = Math.abs(1f / mStartRect.height()); - if (enableScalingRevealHomeAnimation()) { - ResourceProvider rp = DynamicResource.provider(context); - long minVelocityXPxPerS = rp.getInt(R.dimen.swipe_up_min_velocity_x_px_per_s); - long maxVelocityXPxPerS = rp.getInt(R.dimen.swipe_up_max_velocity_x_px_per_s); - long minVelocityYPxPerS = rp.getInt(R.dimen.swipe_up_min_velocity_y_px_per_s); - long maxVelocityYPxPerS = rp.getInt(R.dimen.swipe_up_max_velocity_y_px_per_s); - float fallOffFactor = rp.getFloat(R.dimen.swipe_up_max_velocity_fall_off_factor); - - // We want the actual initial velocity to never dip below the minimum, and to taper off - // once it's above the soft cap so that we can prevent the window from flying off - // screen, while maintaining a natural feel. - xVelocityPxPerS = adjustVelocity( - xVelocityPxPerS, minVelocityXPxPerS, maxVelocityXPxPerS, fallOffFactor); - yVelocityPxPerS = adjustVelocity( - yVelocityPxPerS, minVelocityYPxPerS, maxVelocityYPxPerS, fallOffFactor); - - float stiffnessX = rp.getFloat(R.dimen.swipe_up_rect_x_stiffness); - float dampingX = rp.getFloat(R.dimen.swipe_up_rect_x_damping_ratio); - mRectXSpring = - new SpringAnimation(this, RECT_CENTER_X) - .setSpring( - new SpringForce(endX) - .setStiffness(stiffnessX) - .setDampingRatio(dampingX) - ).setStartValue(startX) - .setStartVelocity(xVelocityPxPerS) - .addEndListener(onXEndListener); - - float stiffnessY = rp.getFloat(R.dimen.swipe_up_rect_y_stiffness); - float dampingY = rp.getFloat(R.dimen.swipe_up_rect_y_damping_ratio); - mRectYSpring = - new SpringAnimation(this, RECT_Y) - .setSpring( - new SpringForce(endY) - .setStiffness(stiffnessY) - .setDampingRatio(dampingY) - ) - .setStartValue(startY) - .setStartVelocity(yVelocityPxPerS) - .addEndListener(onYEndListener); - - float stiffnessZ = rp.getFloat(R.dimen.swipe_up_rect_scale_stiffness_v2); - float dampingZ = rp.getFloat(R.dimen.swipe_up_rect_scale_damping_ratio_v2); - mRectScaleAnim = - new SpringAnimation(this, RECT_SCALE_PROGRESS) - .setSpring( - new SpringForce(1f) - .setStiffness(stiffnessZ) - .setDampingRatio(dampingZ)) - .setStartVelocity(velocityPxPerMs.y * minVisibleChange) - .setMaxValue(1f) - .setMinimumVisibleChange(minVisibleChange) - .addEndListener((animation, canceled, value, velocity) -> { - mRectScaleAnimEnded = true; - maybeOnEnd(); - }); - - setCanRelease(false); - mAnimsStarted = true; - - mRectXSpring.start(); - mRectYSpring.start(); - } else { - // We dampen the user velocity here to keep the natural feeling and to prevent the - // rect from straying too from a linear path. - final float dampedXVelocityPxPerS = OverScroll.dampedScroll( - Math.abs(xVelocityPxPerS), mMaxVelocityPxPerS) * Math.signum(xVelocityPxPerS); - final float dampedYVelocityPxPerS = OverScroll.dampedScroll( - Math.abs(yVelocityPxPerS), mMaxVelocityPxPerS) * Math.signum(yVelocityPxPerS); - - float minXValue = Math.min(startX, endX); - float maxXValue = Math.max(startX, endX); - - mRectXAnim = new FlingSpringAnim(this, context, RECT_CENTER_X, startX, endX, - dampedXVelocityPxPerS, mMinVisChange, minXValue, maxXValue, mDampingX, - mStiffnessX, onXEndListener); - - float minYValue = Math.min(startY, endY); - float maxYValue = Math.max(startY, endY); - mRectYAnim = new FlingSpringAnim(this, context, RECT_Y, startY, endY, - dampedYVelocityPxPerS, mMinVisChange, minYValue, maxYValue, mDampingY, - mStiffnessY, onYEndListener); - - ResourceProvider rp = DynamicResource.provider(context); - float damping = rp.getFloat(R.dimen.swipe_up_rect_scale_damping_ratio); - - // Increase the stiffness for devices where we want the window size to transform - // quicker. - boolean shouldUseHigherStiffness = profile != null - && (profile.isLandscape || profile.isTablet); - float stiffness = shouldUseHigherStiffness - ? rp.getFloat(R.dimen.swipe_up_rect_scale_higher_stiffness) - : rp.getFloat(R.dimen.swipe_up_rect_scale_stiffness); - - mRectScaleAnim = new SpringAnimation(this, RECT_SCALE_PROGRESS) - .setSpring(new SpringForce(1f) - .setDampingRatio(damping) - .setStiffness(stiffness)) - .setStartVelocity(velocityPxPerMs.y * minVisibleChange) - .setMaxValue(1f) - .setMinimumVisibleChange(minVisibleChange) - .addEndListener((animation, canceled, value, velocity) -> { - mRectScaleAnimEnded = true; - maybeOnEnd(); - }); - - setCanRelease(false); - mAnimsStarted = true; - - mRectXAnim.start(); - mRectYAnim.start(); - } + ResourceProvider rp = DynamicResource.provider(context); + long minVelocityXPxPerS = rp.getInt(R.dimen.swipe_up_min_velocity_x_px_per_s); + long maxVelocityXPxPerS = rp.getInt(R.dimen.swipe_up_max_velocity_x_px_per_s); + long minVelocityYPxPerS = rp.getInt(R.dimen.swipe_up_min_velocity_y_px_per_s); + long maxVelocityYPxPerS = rp.getInt(R.dimen.swipe_up_max_velocity_y_px_per_s); + float fallOffFactor = rp.getFloat(R.dimen.swipe_up_max_velocity_fall_off_factor); + + // We want the actual initial velocity to never dip below the minimum, and to taper off + // once it's above the soft cap so that we can prevent the window from flying off + // screen, while maintaining a natural feel. + xVelocityPxPerS = adjustVelocity( + xVelocityPxPerS, minVelocityXPxPerS, maxVelocityXPxPerS, fallOffFactor); + yVelocityPxPerS = adjustVelocity( + yVelocityPxPerS, minVelocityYPxPerS, maxVelocityYPxPerS, fallOffFactor); + + float stiffnessX = rp.getFloat(R.dimen.swipe_up_rect_x_stiffness); + float dampingX = rp.getFloat(R.dimen.swipe_up_rect_x_damping_ratio); + mRectXSpring = + new SpringAnimation(this, RECT_CENTER_X) + .setSpring( + new SpringForce(endX) + .setStiffness(stiffnessX) + .setDampingRatio(dampingX) + ).setStartValue(startX) + .setStartVelocity(xVelocityPxPerS) + .addEndListener(onXEndListener); + + float stiffnessY = rp.getFloat(R.dimen.swipe_up_rect_y_stiffness); + float dampingY = rp.getFloat(R.dimen.swipe_up_rect_y_damping_ratio); + mRectYSpring = + new SpringAnimation(this, RECT_Y) + .setSpring( + new SpringForce(endY) + .setStiffness(stiffnessY) + .setDampingRatio(dampingY) + ) + .setStartValue(startY) + .setStartVelocity(yVelocityPxPerS) + .addEndListener(onYEndListener); + + float stiffnessZ = rp.getFloat(R.dimen.swipe_up_rect_scale_stiffness_v2); + float dampingZ = rp.getFloat(R.dimen.swipe_up_rect_scale_damping_ratio_v2); + mRectScaleAnim = + new SpringAnimation(this, RECT_SCALE_PROGRESS) + .setSpring( + new SpringForce(1f) + .setStiffness(stiffnessZ) + .setDampingRatio(dampingZ)) + .setStartVelocity(velocityPxPerMs.y * minVisibleChange) + .setMaxValue(1f) + .setMinimumVisibleChange(minVisibleChange) + .addEndListener((animation, canceled, value, velocity) -> { + mRectScaleAnimEnded = true; + maybeOnEnd(); + }); + + setCanRelease(false); + mAnimsStarted = true; + + mRectXSpring.start(); + mRectYSpring.start(); mRectScaleAnim.start(); for (Animator.AnimatorListener animatorListener : mAnimatorListeners) { @@ -378,16 +291,11 @@ public void start(Context context, @Nullable DeviceProfile profile, PointF veloc public void end() { if (mAnimsStarted) { - if (enableScalingRevealHomeAnimation()) { - if (mRectXSpring.canSkipToEnd()) { - mRectXSpring.skipToEnd(); - } - if (mRectYSpring.canSkipToEnd()) { - mRectYSpring.skipToEnd(); - } - } else { - mRectXAnim.end(); - mRectYAnim.end(); + if (mRectXSpring.canSkipToEnd()) { + mRectXSpring.skipToEnd(); + } + if (mRectYSpring.canSkipToEnd()) { + mRectYSpring.skipToEnd(); } if (mRectScaleAnim.canSkipToEnd()) { mRectScaleAnim.skipToEnd(); @@ -549,7 +457,7 @@ public DefaultSpringConfig(Context context, DeviceProfile deviceProfile, // Increase the stiffness for devices where we want the window size to transform // quicker. boolean shouldUseHigherStiffness = deviceProfile != null - && (deviceProfile.isLandscape || deviceProfile.isTablet); + && (deviceProfile.getDeviceProperties().isLandscape() || deviceProfile.getDeviceProperties().isTablet()); rectStiffness = shouldUseHigherStiffness ? rp.getFloat(R.dimen.swipe_up_rect_scale_higher_stiffness) : rp.getFloat(R.dimen.swipe_up_rect_scale_stiffness); @@ -562,18 +470,14 @@ public DefaultSpringConfig(Context context, DeviceProfile deviceProfile, ? TRACKING_BOTTOM : TRACKING_TOP; } else { - int heightPx = deviceProfile.heightPx; - Rect padding = deviceProfile.workspacePadding; + int heightPx = deviceProfile.getDeviceProperties().getHeightPx(); + Rect padding = deviceProfile.mWorkspaceProfile.getWorkspacePadding(); final float topThreshold = heightPx / 3f; - final float bottomThreshold = deviceProfile.heightPx - padding.bottom; + final float bottomThreshold = deviceProfile.getDeviceProperties().getHeightPx() - padding.bottom; if (targetRect.bottom > bottomThreshold) { - if (enableScalingRevealHomeAnimation()) { - tracking = TRACKING_CENTER; - } else { - tracking = TRACKING_BOTTOM; - } + tracking = TRACKING_CENTER; } else if (targetRect.top < topThreshold) { tracking = TRACKING_TOP; } else { diff --git a/quickstep/src/com/android/quickstep/util/RemoteTargetHandleUtil.kt b/quickstep/src/com/android/quickstep/util/RemoteTargetHandleUtil.kt new file mode 100644 index 00000000000..9ecf363e738 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/RemoteTargetHandleUtil.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle + +fun Array.getRemoteTargetHandle(taskId: Int): RemoteTargetHandle? = + firstOrNull() { it.transformParams.targetSet.firstAppTargetTaskId == taskId } diff --git a/quickstep/src/com/android/quickstep/util/ScalingWorkspaceRevealAnim.kt b/quickstep/src/com/android/quickstep/util/ScalingWorkspaceRevealAnim.kt index f547a7fba1b..7aec25f9060 100644 --- a/quickstep/src/com/android/quickstep/util/ScalingWorkspaceRevealAnim.kt +++ b/quickstep/src/com/android/quickstep/util/ScalingWorkspaceRevealAnim.kt @@ -16,22 +16,34 @@ package com.android.quickstep.util +import android.animation.Animator +import android.animation.AnimatorListenerAdapter import android.animation.AnimatorSet +import android.animation.ValueAnimator import android.graphics.Matrix import android.graphics.Path import android.graphics.RectF +import android.util.Log +import android.view.SurfaceControl import android.view.View import android.view.animation.PathInterpolator import androidx.core.graphics.transform +import androidx.core.view.isVisible +import com.android.app.animation.Animations import com.android.app.animation.Interpolators +import com.android.app.animation.Interpolators.EMPHASIZED import com.android.app.animation.Interpolators.LINEAR +import com.android.launcher3.Flags import com.android.launcher3.LauncherAnimUtils.HOTSEAT_SCALE_PROPERTY_FACTORY import com.android.launcher3.LauncherAnimUtils.SCALE_INDEX_WORKSPACE_STATE +import com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA import com.android.launcher3.LauncherAnimUtils.WORKSPACE_SCALE_PROPERTY_FACTORY import com.android.launcher3.LauncherState +import com.android.launcher3.R import com.android.launcher3.anim.AnimatorListeners import com.android.launcher3.anim.PendingAnimation import com.android.launcher3.anim.PropertySetter +import com.android.launcher3.statehandlers.DepthController import com.android.launcher3.states.StateAnimationConfig import com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER import com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW @@ -39,28 +51,33 @@ import com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM import com.android.launcher3.uioverrides.QuickstepLauncher import com.android.quickstep.views.RecentsView +const val TAG = "ScalingWorkspaceRevealAnim" + /** * Creates an animation where the workspace and hotseat fade in while revealing from the center of * the screen outwards radially. This is used in conjunction with the swipe up to home animation. */ class ScalingWorkspaceRevealAnim( - launcher: QuickstepLauncher, + private val launcher: QuickstepLauncher, siblingAnimation: RectFSpringAnim?, - windowTargetRect: RectF? + windowTargetRect: RectF?, + playAlphaReveal: Boolean = true, + playBlur: Boolean = true, ) { companion object { private const val FADE_DURATION_MS = 200L private const val SCALE_DURATION_MS = 1000L private const val MAX_ALPHA = 1f private const val MIN_ALPHA = 0f - private const val MAX_SIZE = 1f - private const val MIN_SIZE = 0.85f + internal const val MAX_SIZE = 1f + internal const val MIN_SIZE = 0.85f /** * Custom interpolator for both the home and wallpaper scaling. Necessary because EMPHASIZED * is too aggressive, but EMPHASIZED_DECELERATE is too soft. */ - private val SCALE_INTERPOLATOR = + @JvmField + val SCALE_INTERPOLATOR = PathInterpolator( Path().apply { moveTo(0f, 0f) @@ -68,9 +85,14 @@ class ScalingWorkspaceRevealAnim( cubicTo(0.235f, 0.6855f, 0.235f, 1f, 1f, 1f) } ) + + val BLUR_INTERPOLATOR = Interpolators.clampToProgress(EMPHASIZED, 0f, 0.666f) } private val animation = PendingAnimation(SCALE_DURATION_MS) + private var blurLayer: SurfaceControl? = null + private var surfaceTransactionApplier: SurfaceTransactionApplier = + SurfaceTransactionApplier(launcher.dragLayer) init { // Make sure the starting state is right for the animation. @@ -86,59 +108,109 @@ class ScalingWorkspaceRevealAnim( launcher.workspace.stateTransitionAnimation.setScrim( PropertySetter.NO_ANIM_PROPERTY_SETTER, LauncherState.BACKGROUND_APP, - setupConfig + setupConfig, ) + if (playBlur) { + addBlurLayer() + } val workspace = launcher.workspace val hotseat = launcher.hotseat + // Interrupt the current animation, if any. + Animations.cancelOngoingAnimation(workspace) + Animations.cancelOngoingAnimation(hotseat) + + val fromSize = + if (workspace.scaleX != MAX_SIZE) { + workspace.scaleX + } else { + MIN_SIZE + } + // Scale the Workspace and Hotseat around the same pivot. workspace.setPivotToScaleWithSelf(hotseat) animation.addFloat( workspace, WORKSPACE_SCALE_PROPERTY_FACTORY[SCALE_INDEX_WORKSPACE_STATE], - MIN_SIZE, + fromSize, MAX_SIZE, SCALE_INTERPOLATOR, ) animation.addFloat( hotseat, HOTSEAT_SCALE_PROPERTY_FACTORY[SCALE_INDEX_WORKSPACE_STATE], - MIN_SIZE, + fromSize, MAX_SIZE, SCALE_INTERPOLATOR, ) - // Fade in quickly at the beginning of the animation, so the content doesn't look like it's - // popping into existence out of nowhere. - val fadeClamp = FADE_DURATION_MS.toFloat() / SCALE_DURATION_MS - workspace.alpha = MIN_ALPHA - animation.setViewAlpha( - workspace, - MAX_ALPHA, - Interpolators.clampToProgress(LINEAR, 0f, fadeClamp) - ) - hotseat.alpha = MIN_ALPHA - animation.setViewAlpha( - hotseat, - MAX_ALPHA, - Interpolators.clampToProgress(LINEAR, 0f, fadeClamp) - ) + if (playAlphaReveal) { + // Fade in quickly at the beginning of the animation, so the content doesn't look like + // it's popping into existence out of nowhere. + val fadeClamp = FADE_DURATION_MS.toFloat() / SCALE_DURATION_MS + workspace.alpha = MIN_ALPHA + animation.setFloat( + workspace, + VIEW_ALPHA, + MAX_ALPHA, + Interpolators.clampToProgress(LINEAR, 0f, fadeClamp), + ) + hotseat.alpha = MIN_ALPHA + // This needs to use setViewAlpha instead of setFloat (like workspace). + // This is because hotseat visibility can also be changed based off of alpha in + // WorkspaceRevealAnim which also calls setViewAlpha. + // b/428257480 Ideally we should be settings MultiValueAlpha with 2 channels instead. + animation.setViewAlpha( + hotseat, + MAX_ALPHA, + Interpolators.clampToProgress(LINEAR, 0f, fadeClamp), + ) + } val transitionConfig = StateAnimationConfig() + transitionConfig.duration = SCALE_DURATION_MS - // Match the Wallpaper animation to the rest of the content. - val depthController = (launcher as? QuickstepLauncher)?.depthController - transitionConfig.setInterpolator(StateAnimationConfig.ANIM_DEPTH, SCALE_INTERPOLATOR) - depthController?.setStateWithAnimation(LauncherState.NORMAL, transitionConfig, animation) + var depthController: DepthController? = null + if (playBlur) { + // Match the Wallpaper depth to the rest of the content. + depthController = (launcher as? QuickstepLauncher)?.depthController + transitionConfig.setInterpolator(StateAnimationConfig.ANIM_DEPTH, SCALE_INTERPOLATOR) + depthController?.pauseBlursOnWindows(true) // Blurring is handled by the scrim layer. + depthController?.stateDepth?.value = LauncherState.BACKGROUND_APP.getDepth(launcher) + depthController?.setStateWithAnimation( + LauncherState.NORMAL, + transitionConfig, + animation, + ) - // Make sure that the contrast scrim animates correctly if needed. - transitionConfig.setInterpolator(StateAnimationConfig.ANIM_SCRIM_FADE, SCALE_INTERPOLATOR) - launcher.workspace.stateTransitionAnimation.setScrim( - animation, - LauncherState.NORMAL, - transitionConfig - ) + // Add a blur animation to the scrim layer. + var maxBlurRadius = + launcher.resources.getDimensionPixelSize( + if (Flags.allAppsBlur() || Flags.enableOverviewBackgroundWallpaperBlur()) { + R.dimen.max_depth_blur_radius_enhanced + } else { + R.integer.max_depth_blur_radius + } + ) + val blurAnimator = ValueAnimator.ofFloat(1f, 0f) + blurAnimator.setInterpolator(BLUR_INTERPOLATOR) + blurAnimator.addUpdateListener { + applyBlur(maxBlurRadius * blurAnimator.animatedValue as Float) + } + animation.add(blurAnimator) + + // Make sure that the contrast scrim animates correctly (alongside the blur) if needed. + transitionConfig.setInterpolator( + StateAnimationConfig.ANIM_SCRIM_FADE, + BLUR_INTERPOLATOR, + ) + launcher.workspace.stateTransitionAnimation.setScrim( + animation, + LauncherState.NORMAL, + transitionConfig, + ) + } // To avoid awkward jumps in icon position, we want the sibling animation to always be // targeting the current position. Since we can't easily access this, instead we calculate @@ -164,7 +236,7 @@ class ScalingWorkspaceRevealAnim( 1 / workspace.scaleX, 1 / workspace.scaleY, transformed.centerX(), - transformed.centerY() + transformed.centerY(), ) } ) @@ -178,11 +250,49 @@ class ScalingWorkspaceRevealAnim( // Needed to avoid text artefacts during the scale animation. workspace.setLayerType(View.LAYER_TYPE_HARDWARE, null) hotseat.setLayerType(View.LAYER_TYPE_HARDWARE, null) + animation.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationCancel(animation: Animator) { + super.onAnimationCancel(animation) + Log.d(TAG, "onAnimationCancel") + } + + override fun onAnimationPause(animation: Animator) { + super.onAnimationPause(animation) + Log.d(TAG, "onAnimationPause") + } + } + ) + animation.addListener( AnimatorListeners.forEndCallback( Runnable { + Log.d(TAG, "onAnimationEnd, workspace and hotseat are visible") + // Ensure that the workspace and the hotseat are visible at the end + // of the animation regardless of what happens with this animation + // itself. + workspace.alpha = MAX_ALPHA + hotseat.alpha = MAX_ALPHA + if (!hotseat.isVisible || !workspace.isVisible) { + Log.e( + TAG, + "Unexpected invisibility after animation end:" + + " workspace.isVisible=${workspace.isVisible}" + + ", workspace.alpha=${workspace.alpha}" + + ", hotseat.isVisible=${hotseat.isVisible}" + + ", hotseat.alpha=${hotseat.alpha}", + Exception(), + ) + } + workspace.setLayerType(View.LAYER_TYPE_NONE, null) hotseat.setLayerType(View.LAYER_TYPE_NONE, null) + + // Reset the cached animations. + Animations.setOngoingAnimation(workspace, animation = null) + Animations.setOngoingAnimation(hotseat, animation = null) + removeBlurLayer() + depthController?.pauseBlursOnWindows(false) } ) ) @@ -193,6 +303,62 @@ class ScalingWorkspaceRevealAnim( } fun start() { - getAnimators().start() + val animators = getAnimators() + // Make sure to cache the current animation, so it can be properly interrupted. + // TODO(b/367591368): ideally these animations would be refactored to be controlled + // centrally so each instances doesn't need to care about this coordination. + Animations.setOngoingAnimation(launcher.workspace, animators) + Animations.setOngoingAnimation(launcher.hotseat, animators) + launcher.stateManager.setCurrentAnimation(animators, LauncherState.NORMAL) + animators.start() + } + + private fun addBlurLayer() { + if (!Flags.blurredHomeAnimation()) { + return + } + val parent = launcher.dragLayer.viewRootImpl?.surfaceControl ?: return + if (!parent.isValid) { + Log.e(TAG, "Parent surface is not ready at the moment. Can't apply blur.") + return + } + val blurLayer = + SurfaceControl.Builder() + .setName("Home to launcher blur layer") + .setCallsite("ScalingWorkspaceRevealAnim") + .setParent(parent) + .setOpaque(false) + .setHidden(false) + .build() + + // Schedule the initial setup of the blur layer. + val setupTransaction = SurfaceTransaction() + setupTransaction.forSurface(blurLayer).setAlpha(0f).setShow() + surfaceTransactionApplier.scheduleApply(setupTransaction) + + this.blurLayer = blurLayer + } + + private fun removeBlurLayer() { + blurLayer?.let { + if (it.isValid) { + // Schedule the removal of the blur layer. + val removalTransaction = SurfaceTransaction() + removalTransaction.forSurface(it).setRemove() + surfaceTransactionApplier.scheduleApply(removalTransaction) + } + } + blurLayer = null + } + + private fun applyBlur(blurRadius: Float) { + blurLayer?.let { + if (it.isValid) { + // Schedule the blur update. + val blurUpdateTransaction = SurfaceTransaction() + blurUpdateTransaction.forSurface(it).setBackgroundBlurRadius(blurRadius.toInt()) + surfaceTransactionApplier.scheduleApply(blurUpdateTransaction) + } + } } } diff --git a/quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt b/quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt index dbeedd33f7e..15f59e425f4 100644 --- a/quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt +++ b/quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt @@ -43,7 +43,7 @@ class SlideInRemoteTransition( transition: IBinder, info: TransitionInfo, startT: Transaction, - finishCB: IRemoteTransitionFinishedCallback + finishCB: IRemoteTransitionFinishedCallback, ) { val anim = ValueAnimator.ofFloat(0f, 1f) anim.interpolator = interpolator diff --git a/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt b/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt index 4863a6b2da8..7863dd6ebdb 100644 --- a/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt +++ b/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt @@ -27,39 +27,47 @@ import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN import android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW import android.content.Context import android.graphics.Bitmap +import android.graphics.Color import android.graphics.Rect import android.graphics.RectF +import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Drawable import android.view.RemoteAnimationTarget import android.view.SurfaceControl import android.view.SurfaceControl.Transaction import android.view.View +import android.view.WindowManager.TRANSIT_CHANGE import android.view.WindowManager.TRANSIT_OPEN import android.view.WindowManager.TRANSIT_TO_FRONT import android.window.TransitionInfo import android.window.TransitionInfo.Change import android.window.WindowContainerToken import androidx.annotation.VisibleForTesting +import androidx.core.animation.doOnEnd +import androidx.core.util.component1 +import androidx.core.util.component2 import com.android.app.animation.Interpolators import com.android.launcher3.DeviceProfile -import com.android.launcher3.Flags.enableOverviewIconMenu +import com.android.launcher3.Flags.enableRefactorTaskThumbnail import com.android.launcher3.InsettableFrameLayout import com.android.launcher3.QuickstepTransitionManager import com.android.launcher3.R import com.android.launcher3.Utilities +import com.android.launcher3.anim.AnimatedFloat import com.android.launcher3.anim.PendingAnimation import com.android.launcher3.apppairs.AppPairIcon -import com.android.launcher3.config.FeatureFlags import com.android.launcher3.logging.StatsLogManager.EventEnum import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.statehandlers.DepthController import com.android.launcher3.statemanager.StateManager import com.android.launcher3.taskbar.TaskbarActivityContext -import com.android.launcher3.uioverrides.QuickstepLauncher import com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource +import com.android.launcher3.views.ActivityContext import com.android.launcher3.views.BaseDragLayer import com.android.quickstep.TaskViewUtils +import com.android.quickstep.util.SplitScreenUtils.Companion.extractTopParentAndChildren import com.android.quickstep.views.FloatingAppPairView import com.android.quickstep.views.FloatingTaskView import com.android.quickstep.views.GroupedTaskView @@ -67,9 +75,9 @@ import com.android.quickstep.views.IconAppChipView import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsViewContainer import com.android.quickstep.views.SplitInstructionsView +import com.android.quickstep.views.TaskContainer import com.android.quickstep.views.TaskThumbnailViewDeprecated import com.android.quickstep.views.TaskView -import com.android.quickstep.views.TaskView.TaskContainer import com.android.quickstep.views.TaskViewIcon import com.android.wm.shell.shared.TransitionUtil import java.util.Optional @@ -88,7 +96,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC val iconDrawable: Drawable, val fadeWithThumbnail: Boolean, val isStagedTask: Boolean, - val iconView: View? + val iconView: View?, + val contentDescription: CharSequence?, ) } @@ -98,7 +107,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC */ fun getFirstAnimInitViews( taskViewSupplier: Supplier, - splitSelectSourceSupplier: Supplier + splitSelectSourceSupplier: Supplier, ): SplitAnimInitProps { val splitSelectSource = splitSelectSourceSupplier.get() if (!splitSelectStateController.isAnimateCurrentTaskDismissal) { @@ -109,7 +118,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC splitSelectSource.drawable, fadeWithThumbnail = false, isStagedTask = true, - iconView = null + iconView = null, + splitSelectSource.itemInfo.contentDescription, ) } else if (splitSelectStateController.isDismissingFromSplitPair) { // Initiating split from overview, but on a split pair @@ -118,31 +128,33 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC if (container.task.getKey().getId() == splitSelectStateController.initialTaskId) { val drawable = getDrawable(container.iconView, splitSelectSource) return SplitAnimInitProps( - container.thumbnailViewDeprecated, - container.thumbnailViewDeprecated.thumbnail, - drawable!!, + container.snapshotView, + container.thumbnail, + drawable, fadeWithThumbnail = true, isStagedTask = true, - iconView = container.iconView.asView() + iconView = container.iconView.asView(), + container.task.titleDescription, ) } } throw IllegalStateException( "Attempting to init split from existing split pair " + - "without a valid taskIdAttributeContainer" + "without a valid taskIdAttributeContainer" ) } else { // Initiating split from overview on fullscreen task TaskView val taskView = taskViewSupplier.get() - taskView.taskContainers.first().let { + taskView.firstTaskContainer!!.let { val drawable = getDrawable(it.iconView, splitSelectSource) return SplitAnimInitProps( - it.thumbnailViewDeprecated, - it.thumbnailViewDeprecated.thumbnail, - drawable!!, + it.snapshotView, + it.thumbnail, + drawable, fadeWithThumbnail = true, isStagedTask = true, - iconView = it.iconView.asView() + iconView = it.iconView.asView(), + it.task.titleDescription, ) } } @@ -151,64 +163,90 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC /** * Returns the drawable that's provided in iconView, however if that is null it falls back to * the drawable that's in splitSelectSource. TaskView's icon drawable can be null if the - * TaskView is scrolled far enough off screen + * TaskView is scrolled far enough off screen. * - * @return [Drawable] + * @return the [Drawable] icon, or a translucent drawable if none was found */ - fun getDrawable(iconView: TaskViewIcon, splitSelectSource: SplitSelectSource?): Drawable? { - if (iconView.drawable == null && splitSelectSource != null) { - return splitSelectSource.drawable - } - return iconView.drawable + fun getDrawable(iconView: TaskViewIcon, splitSelectSource: SplitSelectSource?): Drawable { + val drawable = + if (iconView.drawable == null && splitSelectSource != null) splitSelectSource.drawable + else iconView.drawable + return drawable ?: ColorDrawable(Color.TRANSPARENT) } /** * When selecting first app from split pair, second app's thumbnail remains. This animates the * second thumbnail by expanding it to take up the full taskViewWidth/Height and overlaying it - * with [TaskThumbnailViewDeprecated]'s splashView. Adds animations to the provided builder. - * Note: The app that **was not** selected as the first split app should be the container that's - * passed through. + * with [TaskContainer]'s splashView. Adds animations to the provided builder. Note: The app + * that **was not** selected as the first split app should be the container that's passed + * through. * * @param builder Adds animation to this - * @param taskIdAttributeContainer container of the app that **was not** selected + * @param taskContainer container of the app that **was not** selected * @param isPrimaryTaskSplitting if true, task that was split would be top/left in the pair - * (opposite of that representing [taskIdAttributeContainer]) + * (opposite of that representing [taskContainer]) */ fun addInitialSplitFromPair( - taskIdAttributeContainer: TaskContainer, + taskContainer: TaskContainer, builder: PendingAnimation, deviceProfile: DeviceProfile, taskViewWidth: Int, taskViewHeight: Int, - isPrimaryTaskSplitting: Boolean + isPrimaryTaskSplitting: Boolean, ) { - val thumbnail = taskIdAttributeContainer.thumbnailViewDeprecated - val iconView: View = taskIdAttributeContainer.iconView.asView() - builder.add(ObjectAnimator.ofFloat(thumbnail, TaskThumbnailViewDeprecated.SPLASH_ALPHA, 1f)) - thumbnail.setShowSplashForSplitSelection(true) + val taskContentView = taskContainer.taskContentView + val iconView: View = taskContainer.iconView.asView() + if (enableRefactorTaskThumbnail()) { + builder.add( + AnimatedFloat { v -> taskContainer.taskView.splitSplashAlpha = v } + .animateToValue(1f) + ) + } else { + val thumbnailViewDeprecated = taskContainer.thumbnailViewDeprecated + builder.add( + ObjectAnimator.ofFloat( + thumbnailViewDeprecated, + TaskThumbnailViewDeprecated.SPLASH_ALPHA, + 1f, + ) + ) + thumbnailViewDeprecated.setShowSplashForSplitSelection(true) + } // With the new `IconAppChipView`, we always want to keep the chip pinned to the // top left of the task / thumbnail. if (enableOverviewIconMenu()) { builder.add( ObjectAnimator.ofFloat( - (iconView as IconAppChipView).splitTranslationX, + (iconView as IconAppChipView).getSplitTranslationX(), MULTI_PROPERTY_VALUE, - 0f + 0f, ) ) builder.add( - ObjectAnimator.ofFloat(iconView.splitTranslationY, MULTI_PROPERTY_VALUE, 0f) + ObjectAnimator.ofFloat(iconView.getSplitTranslationY(), MULTI_PROPERTY_VALUE, 0f) ) } + + val splitBoundsConfig = + (taskContainer.taskView as? GroupedTaskView)?.splitBoundsConfig ?: return + val (primarySnapshotViewSize, secondarySnapshotViewSize) = + taskContainer.taskView.pagedOrientationHandler.getGroupedTaskViewSizes( + deviceProfile, + splitBoundsConfig, + taskViewWidth, + taskViewHeight, + ) + val snapshotViewSize = + if (isPrimaryTaskSplitting) secondarySnapshotViewSize else primarySnapshotViewSize if (deviceProfile.isLeftRightSplit) { // Center view first so scaling happens uniformly, alternatively we can move pivotX to 0 - val centerThumbnailTranslationX: Float = (taskViewWidth - thumbnail.width) / 2f - val finalScaleX: Float = taskViewWidth.toFloat() / thumbnail.width + val centerThumbnailTranslationX: Float = (taskViewWidth - snapshotViewSize.x) / 2f + val finalScaleX: Float = taskViewWidth.toFloat() / snapshotViewSize.x builder.add( ObjectAnimator.ofFloat( - thumbnail, - TaskThumbnailViewDeprecated.SPLIT_SELECT_TRANSLATE_X, - centerThumbnailTranslationX + taskContentView, + View.TRANSLATION_X, + centerThumbnailTranslationX, ) ) if (!enableOverviewIconMenu()) { @@ -218,23 +256,20 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC ObjectAnimator.ofFloat(iconView, View.TRANSLATION_X, -centerIconTranslationX) ) } - builder.add(ObjectAnimator.ofFloat(thumbnail, View.SCALE_X, finalScaleX)) + builder.add(ObjectAnimator.ofFloat(taskContentView, View.SCALE_X, finalScaleX)) // Reset other dimensions // TODO(b/271468547), can't set Y translate to 0, need to account for top space - thumbnail.scaleY = 1f + taskContentView.scaleY = 1f val translateYResetVal: Float = if (!isPrimaryTaskSplitting) 0f - else deviceProfile.overviewTaskThumbnailTopMarginPx.toFloat() + else deviceProfile.overviewProfile.taskThumbnailTopMarginPx.toFloat() builder.add( - ObjectAnimator.ofFloat( - thumbnail, - TaskThumbnailViewDeprecated.SPLIT_SELECT_TRANSLATE_Y, - translateYResetVal - ) + ObjectAnimator.ofFloat(taskContentView, View.TRANSLATION_Y, translateYResetVal) ) } else { - val thumbnailSize = taskViewHeight - deviceProfile.overviewTaskThumbnailTopMarginPx + val thumbnailSize = + taskViewHeight - deviceProfile.overviewProfile.taskThumbnailTopMarginPx // Center view first so scaling happens uniformly, alternatively we can move pivotY to 0 // primary thumbnail has layout margin above it, so secondary thumbnail needs to take // that into account. We should migrate to only using translations otherwise this @@ -247,18 +282,18 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC // thumbnail needs to take that into account. We should migrate to only using // translations otherwise this asymmetry causes problems.. if (isPrimaryTaskSplitting) { - centerThumbnailTranslationY = (thumbnailSize - thumbnail.height) / 2f + centerThumbnailTranslationY = (thumbnailSize - snapshotViewSize.y) / 2f centerThumbnailTranslationY += - deviceProfile.overviewTaskThumbnailTopMarginPx.toFloat() + deviceProfile.overviewProfile.taskThumbnailTopMarginPx.toFloat() } else { - centerThumbnailTranslationY = (thumbnailSize - thumbnail.height) / 2f + centerThumbnailTranslationY = (thumbnailSize - snapshotViewSize.y) / 2f } - val finalScaleY: Float = thumbnailSize.toFloat() / thumbnail.height + val finalScaleY: Float = thumbnailSize.toFloat() / snapshotViewSize.y builder.add( ObjectAnimator.ofFloat( - thumbnail, - TaskThumbnailViewDeprecated.SPLIT_SELECT_TRANSLATE_Y, - centerThumbnailTranslationY + taskContentView, + View.TRANSLATION_Y, + centerThumbnailTranslationY, ) ) @@ -266,17 +301,11 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC // icons are anchored from Gravity.END, so need to use negative translation builder.add(ObjectAnimator.ofFloat(iconView, View.TRANSLATION_X, 0f)) } - builder.add(ObjectAnimator.ofFloat(thumbnail, View.SCALE_Y, finalScaleY)) + builder.add(ObjectAnimator.ofFloat(taskContentView, View.SCALE_Y, finalScaleY)) // Reset other dimensions - thumbnail.scaleX = 1f - builder.add( - ObjectAnimator.ofFloat( - thumbnail, - TaskThumbnailViewDeprecated.SPLIT_SELECT_TRANSLATE_X, - 0f - ) - ) + taskContentView.scaleX = 1f + builder.add(ObjectAnimator.ofFloat(taskContentView, View.TRANSLATION_X, 0f)) } } @@ -287,7 +316,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC fun addScrimBehindAnim( pendingAnimation: PendingAnimation, container: RecentsViewContainer, - context: Context + context: Context, ): View { val scrim = View(context) val recentsView = container.getOverviewPanel>() @@ -301,34 +330,45 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC // Make the scrim fullscreen val lp = scrim.layoutParams as InsettableFrameLayout.LayoutParams lp.topMargin = 0 - lp.height = dp.heightPx - lp.width = dp.widthPx + lp.height = dp.deviceProperties.heightPx + lp.width = dp.deviceProperties.widthPx scrim.alpha = 0f scrim.setBackgroundColor( container.asContext().resources.getColor(R.color.taskbar_background_dark) ) - val timings = AnimUtils.getDeviceSplitToConfirmTimings(dp.isTablet) as SplitToConfirmTimings + val timings = + AnimUtils.getDeviceSplitToConfirmTimings(dp.deviceProperties.isTablet) + as SplitToConfirmTimings pendingAnimation.setViewAlpha( scrim, 1f, Interpolators.clampToProgress( timings.backingScrimFadeInterpolator, timings.backingScrimFadeInStartOffset, - timings.backingScrimFadeInEndOffset - ) + timings.backingScrimFadeInEndOffset, + ), ) return scrim } /** Does not play any animation if user is not currently in split selection state. */ - fun playPlaceholderDismissAnim(container: RecentsViewContainer, splitDismissEvent: EventEnum) { + @JvmOverloads + fun playPlaceholderDismissAnim( + container: RecentsViewContainer, + splitDismissEvent: EventEnum, + onAnimationEnd: Runnable? = null, + ) { if (!splitSelectStateController.isSplitSelectActive) { return } - val anim = createPlaceholderDismissAnim(container, splitDismissEvent, null /*duration*/) + val anim = + createPlaceholderDismissAnim(container, splitDismissEvent, null /*duration*/).apply { + doOnEnd { onAnimationEnd?.run() } + } + anim.start() } @@ -339,7 +379,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC fun createPlaceholderDismissAnim( container: RecentsViewContainer, splitDismissEvent: EventEnum, - duration: Long? + duration: Long?, ): AnimatorSet { val animatorSet = AnimatorSet() duration?.let { animatorSet.duration = it } @@ -356,7 +396,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC Rect(0, 0, floatingTask.width, floatingTask.height), false, null, - onScreenRectF + onScreenRectF, ) // Get the part of the floatingTask that intersects with the DragLayer (i.e. the // on-screen portion) @@ -364,7 +404,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC dragLayer.left.toFloat(), dragLayer.top.toFloat(), dragLayer.right.toFloat(), - dragLayer.bottom.toFloat() + dragLayer.bottom.toFloat(), ) animatorSet.play( ObjectAnimator.ofFloat( @@ -374,8 +414,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC floatingTask, onScreenRectF, floatingTask.stagePosition, - container.deviceProfile - ) + container.deviceProfile, + ), ) ) animatorSet.addListener( @@ -384,7 +424,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC splitSelectStateController.resetState() safeRemoveViewFromDragLayer( container, - splitSelectStateController.splitInstructionsView + splitSelectStateController.splitInstructionsView, ) } } @@ -401,7 +441,10 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC safeRemoveViewFromDragLayer(container, splitSelectStateController.splitInstructionsView) val splitInstructionsView = SplitInstructionsView.getSplitInstructionsView(container) splitSelectStateController.splitInstructionsView = splitInstructionsView - val timings = AnimUtils.getDeviceOverviewToSplitTimings(container.deviceProfile.isTablet) + val timings = + AnimUtils.getDeviceOverviewToSplitTimings( + container.deviceProfile.deviceProperties.isTablet + ) val anim = PendingAnimation(100 /*duration */) splitInstructionsView.alpha = 0f anim.setViewAlpha( @@ -410,8 +453,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC Interpolators.clampToProgress( Interpolators.LINEAR, timings.instructionsContainerFadeInStartOffset, - timings.instructionsContainerFadeInEndOffset - ) + timings.instructionsContainerFadeInEndOffset, + ), ) anim.addFloat( splitInstructionsView, @@ -421,8 +464,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC Interpolators.clampToProgress( Interpolators.EMPHASIZED_DECELERATE, timings.instructionsUnfoldStartOffset, - timings.instructionsUnfoldEndOffset - ) + timings.instructionsUnfoldEndOffset, + ), ) return anim } @@ -440,11 +483,11 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC fun playAnimPlaceholderToFullscreen( container: RecentsViewContainer, view: View, - resetCallback: Optional + resetCallback: Optional, ) { val stagedTaskView = view as FloatingTaskView - val isTablet: Boolean = container.deviceProfile.isTablet + val isTablet: Boolean = container.deviceProfile.deviceProperties.isTablet val duration = if (isTablet) SplitAnimationTimings.TABLET_CONFIRM_DURATION else SplitAnimationTimings.PHONE_CONFIRM_DURATION @@ -462,16 +505,12 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC RectF(firstTaskStartingBounds), firstTaskEndingBounds, false /* fadeWithThumbnail */, - true /* isStagedTask */ + true, /* isStagedTask */ ) pendingAnimation.addEndListener { splitSelectStateController.launchInitialAppFullscreen { - if (FeatureFlags.enableSplitContextually()) { - splitSelectStateController.resetState() - } else if (resetCallback.isPresent) { - resetCallback.get().run() - } + splitSelectStateController.resetState() } } @@ -495,14 +534,15 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC depthController: DepthController?, info: TransitionInfo?, t: Transaction?, - finishCallback: Runnable + finishCallback: Runnable, + cornerRadius: Float, ) { if (info == null && t == null) { // (Legacy animation) Tapping a split tile in Overview // TODO (b/315490678): Ensure that this works with app pairs flow check(apps != null && wallpapers != null && nonApps != null) { "trying to call composeRecentsSplitLaunchAnimatorLegacy, but encountered an " + - "unexpected null" + "unexpected null" } composeRecentsSplitLaunchAnimatorLegacy( @@ -514,7 +554,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC nonApps, stateManager, depthController, - finishCallback + finishCallback, ) return @@ -532,7 +572,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC depthController, info, t, - finishCallback + finishCallback, ) } else if (launchingIconView != null) { // Tapping an app pair icon @@ -542,24 +582,37 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC val appPairLaunchingAppIndex = hasChangesForBothAppPairs(launchingIconView, info) if (appPairLaunchingAppIndex == -1) { // Launch split app pair animation - composeIconSplitLaunchAnimator(launchingIconView, info, t, finishCallback) + composeIconSplitLaunchAnimator( + launchingIconView, + info, + t, + finishCallback, + cornerRadius, + ) } else { composeFullscreenIconSplitLaunchAnimator( launchingIconView, info, t, finishCallback, - appPairLaunchingAppIndex + appPairLaunchingAppIndex, ) } } else { // Fallback case: simple fade-in animation check(info != null && t != null) { "trying to call composeFadeInSplitLaunchAnimator, but encountered an " + - "unexpected null" + "unexpected null" } - composeFadeInSplitLaunchAnimator(initialTaskId, secondTaskId, info, t, finishCallback) + composeFadeInSplitLaunchAnimator( + initialTaskId, + secondTaskId, + info, + t, + finishCallback, + cornerRadius, + ) } } @@ -574,7 +627,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC depthController: DepthController?, info: TransitionInfo, t: Transaction, - finishCallback: Runnable + finishCallback: Runnable, ) { TaskViewUtils.composeRecentsSplitLaunchAnimator( launchingTaskView, @@ -582,7 +635,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC depthController, info, t, - finishCallback + finishCallback, ) } @@ -600,7 +653,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC nonApps: Array, stateManager: StateManager<*, *>, depthController: DepthController?, - finishCallback: Runnable + finishCallback: Runnable, ) { TaskViewUtils.composeRecentsSplitLaunchAnimatorLegacy( launchingTaskView, @@ -611,7 +664,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC nonApps, stateManager, depthController, - finishCallback + finishCallback, ) } @@ -622,7 +675,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC */ fun hasChangesForBothAppPairs( launchingIconView: AppPairIcon, - transitionInfo: TransitionInfo + transitionInfo: TransitionInfo, ): Int { val intent1 = launchingIconView.info.getFirstApp().intent.component?.packageName val intent2 = launchingIconView.info.getSecondApp().intent.component?.packageName @@ -631,7 +684,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC val taskInfo: RunningTaskInfo = change.taskInfo ?: continue if ( TransitionUtil.isOpeningType(change.mode) && - taskInfo.windowingMode == WINDOWING_MODE_FULLSCREEN + taskInfo.windowingMode == WINDOWING_MODE_FULLSCREEN ) { val baseIntent = taskInfo.baseIntent.component?.packageName if (baseIntent == intent1) { @@ -659,15 +712,15 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC * To find the root shell leash that we want to fade in, we do the following: The Changes we * receive in transitionInfo are structured like this * - * Root (grandparent) + * (0) Root (grandparent) * | - * |--> Split Root 1 (left/top side parent) (WINDOWING_MODE_MULTI_WINDOW) + * |--> (1) Split Root 1 (left/top side parent) (WINDOWING_MODE_MULTI_WINDOW) * | | - * | --> App 1 (left/top side child) (WINDOWING_MODE_MULTI_WINDOW) + * | --> (1a) App 1 (left/top side child) (WINDOWING_MODE_MULTI_WINDOW) * |--> Divider - * |--> Split Root 2 (right/bottom side parent) (WINDOWING_MODE_MULTI_WINDOW) + * |--> (2) Split Root 2 (right/bottom side parent) (WINDOWING_MODE_MULTI_WINDOW) * | - * --> App 2 (right/bottom side child) (WINDOWING_MODE_MULTI_WINDOW) + * --> (2a) App 2 (right/bottom side child) (WINDOWING_MODE_MULTI_WINDOW) * * We want to animate the Root (grandparent) so that it affects both apps and the divider. To do * this, we find one of the nodes with WINDOWING_MODE_MULTI_WINDOW (one of the left-side ones, @@ -682,7 +735,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC launchingIconView: AppPairIcon, transitionInfo: TransitionInfo, t: Transaction, - finishCallback: Runnable + finishCallback: Runnable, + windowRadius: Float, ) { // If launching an app pair from Taskbar inside of an app context (no access to Launcher), // use the scale-up animation @@ -691,66 +745,55 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC transitionInfo, t, finishCallback, - WINDOWING_MODE_MULTI_WINDOW + WINDOWING_MODE_MULTI_WINDOW, ) return } // Else we are in Launcher and can launch with the full icon stretch-and-split animation. - val launcher = QuickstepLauncher.getLauncher(launchingIconView.context) + val launcher: ActivityContext = ActivityContext.lookupContext(launchingIconView.context) val dp = launcher.deviceProfile // Create an AnimatorSet that will run both shell and launcher transitions together val launchAnimation = AnimatorSet() - var rootCandidate: Change? = null - for (change in transitionInfo.changes) { - val taskInfo: RunningTaskInfo = change.taskInfo ?: continue + val splitRoots: Pair>? = extractTopParentAndChildren(transitionInfo) + check(splitRoots != null) { "Could not find split roots" } - // TODO (b/316490565): Replace this logic when SplitBounds is available to - // startAnimation() and we can know the precise taskIds of launching tasks. - // Find a change that has WINDOWING_MODE_MULTI_WINDOW. - if ( - taskInfo.windowingMode == WINDOWING_MODE_MULTI_WINDOW && - (change.mode == TRANSIT_OPEN || change.mode == TRANSIT_TO_FRONT) - ) { - // Check if it is a left/top app. - val isLeftTopApp = - (dp.isLeftRightSplit && change.endAbsBounds.left == 0) || - (!dp.isLeftRightSplit && change.endAbsBounds.top == 0) - if (isLeftTopApp) { - // Found one! - rootCandidate = change - break - } - } - } - - // If we could not find a proper root candidate, something went wrong. - check(rootCandidate != null) { "Could not find a split root candidate" } + // Will point to change (0) in diagram above + val mainRootCandidate = splitRoots.first + // Will contain changes (1) and (2) in diagram above + val leafRoots: List = splitRoots.second + // Don't rely on DP.isLeftRightSplit because if launcher is portrait apps could still + // launch in landscape if system auto-rotate is enabled and phone is held horizontally + val isLeftRightSplit = leafRoots.all { it.endAbsBounds.top == 0 } // Find the place where our left/top app window meets the divider (used for the // launcher side animation) + val leftTopApp = + leafRoots.single { change -> + (isLeftRightSplit && change.endAbsBounds.left <= 0) || + (!isLeftRightSplit && change.endAbsBounds.top <= 0) + } val dividerPos = - if (dp.isLeftRightSplit) rootCandidate.endAbsBounds.right - else rootCandidate.endAbsBounds.bottom - - // Recurse up the tree until parent is null, then we've found our root. - var parentToken: WindowContainerToken? = rootCandidate.parent - while (parentToken != null) { - rootCandidate = transitionInfo.getChange(parentToken) ?: break - parentToken = rootCandidate.parent - } - - // Make sure nothing weird happened, like getChange() returning null. - check(rootCandidate != null) { "Failed to find a root leash" } + if (isLeftRightSplit) leftTopApp.endAbsBounds.right else leftTopApp.endAbsBounds.bottom // Create a new floating view in Launcher, positioned above the launching icon val drawableArea = launchingIconView.iconDrawableArea val appIcon1 = launchingIconView.info.getFirstApp().newIcon(launchingIconView.context) val appIcon2 = launchingIconView.info.getSecondApp().newIcon(launchingIconView.context) - appIcon1.setBounds(0, 0, dp.iconSizePx, dp.iconSizePx) - appIcon2.setBounds(0, 0, dp.iconSizePx, dp.iconSizePx) + appIcon1.setBounds( + 0, + 0, + dp.workspaceIconProfile.iconSizePx, + dp.workspaceIconProfile.iconSizePx, + ) + appIcon2.setBounds( + 0, + 0, + dp.workspaceIconProfile.iconSizePx, + dp.workspaceIconProfile.iconSizePx, + ) val floatingView = FloatingAppPairView.getFloatingAppPairView( @@ -758,13 +801,30 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC drawableArea, appIcon1, appIcon2, - dividerPos + dividerPos, ) floatingView.bringToFront() - launchAnimation.play( - getIconLaunchValueAnimator(t, dp, finishCallback, launcher, floatingView, rootCandidate) + val iconLaunchValueAnimator = + getIconLaunchValueAnimator( + t, + dp, + finishCallback, + launcher, + floatingView, + mainRootCandidate, + ) + iconLaunchValueAnimator.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationStart(animation: Animator, isReverse: Boolean) { + for (c in leafRoots) { + t.setCornerRadius(c.leash, windowRadius) + t.apply() + } + } + } ) + launchAnimation.play(iconLaunchValueAnimator) launchAnimation.start() } @@ -778,7 +838,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC transitionInfo: TransitionInfo, t: Transaction, finishCallback: Runnable, - launchFullscreenIndex: Int + launchFullscreenIndex: Int, ) { // If launching an app pair from Taskbar inside of an app context (no access to Launcher), // use the scale-up animation @@ -787,13 +847,13 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC transitionInfo, t, finishCallback, - WINDOWING_MODE_FULLSCREEN + WINDOWING_MODE_FULLSCREEN, ) return } // Else we are in Launcher and can launch with the full icon stretch-and-split animation. - val launcher = QuickstepLauncher.getLauncher(launchingIconView.context) + val launcher: ActivityContext = ActivityContext.lookupContext(launchingIconView.context) val dp = launcher.deviceProfile // Create an AnimatorSet that will run both shell and launcher transitions together @@ -808,8 +868,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC val baseIntent = taskInfo.baseIntent.component?.packageName if ( TransitionUtil.isOpeningType(change.mode) && - taskInfo.windowingMode == WINDOWING_MODE_FULLSCREEN && - baseIntent == intentToLaunch + taskInfo.windowingMode == WINDOWING_MODE_FULLSCREEN && + baseIntent == intentToLaunch ) { rootCandidate = change } @@ -831,7 +891,12 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC // Create a new floating view in Launcher, positioned above the launching icon val drawableArea = launchingIconView.iconDrawableArea val appIcon = appInfo.newIcon(launchingIconView.context) - appIcon.setBounds(0, 0, dp.iconSizePx, dp.iconSizePx) + appIcon.setBounds( + 0, + 0, + dp.workspaceIconProfile.iconSizePx, + dp.workspaceIconProfile.iconSizePx, + ) val floatingView = FloatingAppPairView.getFloatingAppPairView( @@ -839,7 +904,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC drawableArea, appIcon, null /*appIcon2*/, - 0 /*dividerPos*/ + 0, /*dividerPos*/ ) floatingView.bringToFront() launchAnimation.play( @@ -850,14 +915,14 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC private fun getIconLaunchValueAnimator( t: Transaction, - dp: com.android.launcher3.DeviceProfile, + dp: DeviceProfile, finishCallback: Runnable, - launcher: QuickstepLauncher, + launcher: ActivityContext, floatingView: FloatingAppPairView, - rootCandidate: Change + rootCandidate: Change, ): ValueAnimator { val progressUpdater = ValueAnimator.ofFloat(0f, 1f) - val timings = AnimUtils.getDeviceAppPairLaunchTimings(dp.isTablet) + val timings = AnimUtils.getDeviceAppPairLaunchTimings(dp.deviceProperties.isTablet) progressUpdater.setDuration(timings.getDuration().toLong()) progressUpdater.interpolator = Interpolators.LINEAR @@ -868,7 +933,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC Interpolators.LINEAR, valueAnimator.animatedFraction, timings.appRevealStartOffset, - timings.appRevealEndOffset + timings.appRevealEndOffset, ) // Set the alpha of the shell layer (2 apps + divider) @@ -881,42 +946,44 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC var mDx = FloatProp( floatingView.startingPosition.left, - dp.widthPx / 2f - floatingView.startingPosition.width() / 2f, + dp.deviceProperties.widthPx / 2f - + floatingView.startingPosition.width() / 2f, Interpolators.clampToProgress( timings.getStagedRectXInterpolator(), timings.stagedRectSlideStartOffset, - timings.stagedRectSlideEndOffset - ) + timings.stagedRectSlideEndOffset, + ), ) var mDy = FloatProp( floatingView.startingPosition.top, - dp.heightPx / 2f - floatingView.startingPosition.height() / 2f, + dp.deviceProperties.heightPx / 2f - + floatingView.startingPosition.height() / 2f, Interpolators.clampToProgress( Interpolators.EMPHASIZED, timings.stagedRectSlideStartOffset, - timings.stagedRectSlideEndOffset - ) + timings.stagedRectSlideEndOffset, + ), ) var mScaleX = FloatProp( 1f /* start */, - dp.widthPx / floatingView.startingPosition.width(), + dp.deviceProperties.widthPx / floatingView.startingPosition.width(), Interpolators.clampToProgress( Interpolators.EMPHASIZED, timings.stagedRectSlideStartOffset, - timings.stagedRectSlideEndOffset - ) + timings.stagedRectSlideEndOffset, + ), ) var mScaleY = FloatProp( 1f /* start */, - dp.heightPx / floatingView.startingPosition.height(), + dp.deviceProperties.heightPx / floatingView.startingPosition.height(), Interpolators.clampToProgress( Interpolators.EMPHASIZED, timings.stagedRectSlideStartOffset, - timings.stagedRectSlideEndOffset - ) + timings.stagedRectSlideEndOffset, + ), ) override fun onUpdate(percent: Float, initOnly: Boolean) { @@ -951,42 +1018,25 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC transitionInfo: TransitionInfo, t: Transaction, finishCallback: Runnable, - windowingMode: Int + windowingMode: Int, ) { val launchAnimation = AnimatorSet() val progressUpdater = ValueAnimator.ofFloat(0f, 1f) progressUpdater.setDuration(QuickstepTransitionManager.APP_LAUNCH_DURATION) progressUpdater.interpolator = Interpolators.EMPHASIZED - var rootCandidate: Change? = null - - for (change in transitionInfo.changes) { - val taskInfo: RunningTaskInfo = change.taskInfo ?: continue - - // TODO (b/316490565): Replace this logic when SplitBounds is available to - // startAnimation() and we can know the precise taskIds of launching tasks. - if ( - taskInfo.windowingMode == windowingMode && - (change.mode == TRANSIT_OPEN || change.mode == TRANSIT_TO_FRONT) - ) { - // Found one! - rootCandidate = change - break - } - } - - // If we could not find a proper root candidate, something went wrong. - check(rootCandidate != null) { "Could not find a split root candidate" } - - // Recurse up the tree until parent is null, then we've found our root. - var parentToken: WindowContainerToken? = rootCandidate.parent - while (parentToken != null) { - rootCandidate = transitionInfo.getChange(parentToken) ?: break - parentToken = rootCandidate.parent - } - - // Make sure nothing weird happened, like getChange() returning null. - check(rootCandidate != null) { "Failed to find a root leash" } + val splitTree: Pair>? = extractTopParentAndChildren(transitionInfo) + check(splitTree != null) { "Could not find a split root candidate" } + val rootCandidate = splitTree.first + val stageRootTaskIds: Set = splitTree.second.map { it.taskInfo!!.taskId }.toSet() + val leafTasks: List = + transitionInfo.changes + .filter { + (TransitionUtil.isOpeningMode(it.mode) || it.mode == TRANSIT_CHANGE) && + it.taskInfo != null && + it.taskInfo!!.parentTaskId in stageRootTaskIds + } + .toList() // Starting position is a 34% size tile centered in the middle of the screen. // Ending position is the full device screen. @@ -994,10 +1044,10 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC val startingScale = 0.34f val startX = screenBounds.left + - ((screenBounds.right - screenBounds.left) * ((1 - startingScale) / 2f)) + ((screenBounds.right - screenBounds.left) * ((1 - startingScale) / 2f)) val startY = screenBounds.top + - ((screenBounds.bottom - screenBounds.top) * ((1 - startingScale) / 2f)) + ((screenBounds.bottom - screenBounds.top) * ((1 - startingScale) / 2f)) val endX = screenBounds.left val endY = screenBounds.top @@ -1020,6 +1070,42 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC override fun onAnimationEnd(animation: Animator) { finishCallback.run() } + + override fun onAnimationStart(animation: Animator) { + // Reset leaf and stage root tasks, animation can begin from freeform windows + for (leaf in leafTasks) { + val endAbsBounds = leaf.endAbsBounds + + t.setAlpha(leaf.leash, 1f) + t.setCrop( + leaf.leash, + 0f, + 0f, + endAbsBounds.width().toFloat(), + endAbsBounds.height().toFloat(), + ) + t.setPosition(leaf.leash, 0f, 0f) + } + + for (stageRoot in splitTree.second) { + val endAbsBounds = stageRoot.endAbsBounds + + t.setAlpha(stageRoot.leash, 1f) + t.setCrop( + stageRoot.leash, + 0f, + 0f, + endAbsBounds.width().toFloat(), + endAbsBounds.height().toFloat(), + ) + t.setPosition( + stageRoot.leash, + endAbsBounds.left.toFloat(), + endAbsBounds.top.toFloat(), + ) + } + t.apply() + } } ) @@ -1037,7 +1123,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC secondTaskId: Int, transitionInfo: TransitionInfo, t: Transaction, - finishCallback: Runnable + finishCallback: Runnable, + cornerRadius: Float, ) { var splitRoot1: Change? = null var splitRoot2: Change? = null @@ -1102,7 +1189,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC Interpolators.LINEAR, valueAnimator.animatedFraction, 0.8f, - 1f + 1f, ) for (leash in openingTargets) { animTransaction.setAlpha(leash, progress) @@ -1115,6 +1202,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC override fun onAnimationStart(animation: Animator) { for (leash in openingTargets) { animTransaction.show(leash).setAlpha(leash, 0.0f) + animTransaction.setCornerRadius(leash, cornerRadius) } animTransaction.apply() } @@ -1129,9 +1217,9 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC animator.start() } - private fun safeRemoveViewFromDragLayer(container: RecentsViewContainer, view: View?) { + private fun safeRemoveViewFromDragLayer(container: ActivityContext, view: View?) { if (view != null) { container.dragLayer.removeView(view) } } -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/quickstep/util/SplitAnimationTimings.java b/quickstep/src/com/android/quickstep/util/SplitAnimationTimings.java index b618546576f..3a6d9b027b8 100644 --- a/quickstep/src/com/android/quickstep/util/SplitAnimationTimings.java +++ b/quickstep/src/com/android/quickstep/util/SplitAnimationTimings.java @@ -17,6 +17,7 @@ package com.android.quickstep.util; import static com.android.app.animation.Interpolators.LINEAR; +import static com.android.app.animation.Interpolators.STANDARD; import android.view.animation.Interpolator; @@ -38,6 +39,8 @@ public interface SplitAnimationTimings { int TABLET_APP_PAIR_LAUNCH_DURATION = 998; /** Total duration (ms) for launching an app pair from its icon on phones. */ int PHONE_APP_PAIR_LAUNCH_DURATION = 915; + /** Total duration (ms) for fading out desktop tasks in split mode. */ + int DESKTOP_FADE_OUT_DURATION = 200; // Initialize timing classes so they can be accessed statically SplitAnimationTimings TABLET_OVERVIEW_TO_SPLIT = new TabletOverviewToSplitTimings(); @@ -83,6 +86,10 @@ default float getStagedRectSlideEndOffset() { return (float) getStagedRectSlideEnd() / getDuration(); } + default float getDesktopFadeSplitAnimationEndOffset() { + return (float) DESKTOP_FADE_OUT_DURATION / getDuration(); + } + // DEFAULT VALUES: We define default values here so that SplitAnimationTimings can be used // flexibly in animation-running functions, e.g. a single function that handles 2 types of split // animations. The values are not intended to be used, and can safely be removed if refactoring @@ -105,6 +112,10 @@ default float getStagedRectSlideEndOffset() { default Interpolator getGridSlidePrimaryInterpolator() { return LINEAR; } default Interpolator getGridSlideSecondaryInterpolator() { return LINEAR; } + default Interpolator getDesktopTaskFadeInterpolator() { + return LINEAR; + } + // Defaults for HomeToSplit default float getScrimFadeInStartOffset() { return 0; } default float getScrimFadeInEndOffset() { return 0; } @@ -120,5 +131,9 @@ default float getStagedRectSlideEndOffset() { default float getAppRevealEndOffset() { return 0; } default Interpolator getCellSplitInterpolator() { return LINEAR; } default Interpolator getIconFadeInterpolator() { return LINEAR; } + + default Interpolator getDesktopTaskScaleInterpolator() { + return STANDARD; + } } diff --git a/quickstep/src/com/android/quickstep/util/SplitScreenUtils.kt b/quickstep/src/com/android/quickstep/util/SplitScreenUtils.kt index 38bbe601b65..2eb848216dd 100644 --- a/quickstep/src/com/android/quickstep/util/SplitScreenUtils.kt +++ b/quickstep/src/com/android/quickstep/util/SplitScreenUtils.kt @@ -16,44 +16,70 @@ package com.android.quickstep.util +import android.util.Log +import android.view.WindowManager.TRANSIT_CHANGE +import android.window.TransitionInfo +import android.window.TransitionInfo.Change +import android.window.TransitionInfo.FLAG_FIRST_CUSTOM import com.android.launcher3.util.SplitConfigurationOptions -import com.android.wm.shell.util.SplitBounds +import com.android.wm.shell.shared.TransitionUtil +import com.android.wm.shell.shared.split.SplitBounds class SplitScreenUtils { companion object { - // TODO(b/254378592): Remove these methods when the two classes are reunited - /** Converts the shell version of SplitBounds to the launcher version */ - @JvmStatic - fun convertShellSplitBoundsToLauncher( - shellSplitBounds: SplitBounds? - ): SplitConfigurationOptions.SplitBounds? { - return if (shellSplitBounds == null) { - null - } else { - SplitConfigurationOptions.SplitBounds( - shellSplitBounds.leftTopBounds, shellSplitBounds.rightBottomBounds, - shellSplitBounds.leftTopTaskId, shellSplitBounds.rightBottomTaskId, - shellSplitBounds.snapPosition - ) + private const val TAG = "SplitScreenUtils" + + /** + * Given a TransitionInfo, generates the tree structure for those changes and extracts out + * the top most root and it's two immediate children. Changes can be provided in any order. + * + * @return a [Pair] where first -> top most split root, second -> [List] of 2, + * leftTop/bottomRight stage roots + */ + fun extractTopParentAndChildren( + transitionInfo: TransitionInfo + ): Pair>? { + val parentToChildren = mutableMapOf>() + val hasParent = mutableSetOf() + val taskChanges: List = getNonClosingChanges(transitionInfo) + + // 1. Build Parent-Child Relationships + for (change in taskChanges) { + // TODO (b/316490565): Replace this logic when SplitBounds is available to + // startAnimation() and we can know the precise taskIds of launching tasks. + change.parent?.let { parent -> + parentToChildren + .getOrPut(transitionInfo.getChange(parent)!!) { mutableListOf() } + .add(change) + hasParent.add(change) + } } - } - /** Converts the launcher version of SplitBounds to the shell version */ - @JvmStatic - fun convertLauncherSplitBoundsToShell( - launcherSplitBounds: SplitConfigurationOptions.SplitBounds? - ): SplitBounds? { - return if (launcherSplitBounds == null) { - null + // 2. Find Top Parent + val topParent = taskChanges.firstOrNull { it !in hasParent } + + // 3. Extract Immediate Children + return if (topParent != null) { + val immediateChildren = parentToChildren.getOrDefault(topParent, emptyList()) + if (immediateChildren.size != 2) { + throw IllegalStateException("incorrect split stage root size") + } + Pair(topParent, immediateChildren) } else { - SplitBounds( - launcherSplitBounds.leftTopBounds, - launcherSplitBounds.rightBottomBounds, - launcherSplitBounds.leftTopTaskId, - launcherSplitBounds.rightBottomTaskId, - launcherSplitBounds.snapPosition - ) + Log.w(TAG, "No top parent found") + null } } + + + /** @return includes only opening + [TRANSIT_CHANGE] changes and the divider */ + private fun getNonClosingChanges(transitionInfo: TransitionInfo): List { + return transitionInfo.changes + .filter { change -> + (TransitionUtil.isOpeningMode(change.mode) || change.mode == TRANSIT_CHANGE) + && change.flags < FLAG_FIRST_CUSTOM + } + .toList() + } } } diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt b/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt index 8258ab81af8..6c36df58457 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt +++ b/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt @@ -28,6 +28,8 @@ import android.content.pm.ShortcutInfo import android.os.UserHandle import android.util.Log import com.android.internal.annotations.VisibleForTesting +import com.android.launcher3.LauncherUiState +import com.android.launcher3.SplitSelectTask import com.android.launcher3.logging.StatsLogManager.EventEnum import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.shortcuts.ShortcutKey @@ -70,7 +72,7 @@ class SplitSelectDataHolder(var context: Context?) { SPLIT_SHORTCUT_TASK, SPLIT_SINGLE_TASK_FULLSCREEN, SPLIT_SINGLE_INTENT_FULLSCREEN, - SPLIT_SINGLE_SHORTCUT_FULLSCREEN + SPLIT_SINGLE_SHORTCUT_FULLSCREEN, ) @Retention(AnnotationRetention.SOURCE) annotation class SplitLaunchType @@ -93,15 +95,23 @@ class SplitSelectDataHolder(var context: Context?) { private var secondItemInfo: ItemInfo? = null private var splitEvent: EventEnum? = null - private var initialTaskId: Int = INVALID_TASK_ID - private var secondTaskId: Int = INVALID_TASK_ID - private var initialIntent: Intent? = null - private var secondIntent: Intent? = null + private var launcherUiState: LauncherUiState? = null + + private var initialTask = SplitSelectTask() + set(value) { + field = value + launcherUiState?.setSplitSelectInitialTask(value) + } + + private var secondTask = SplitSelectTask() + set(value) { + field = value + launcherUiState?.setSplitSelectSecondTask(value) + } + private var widgetSecondIntent: Intent? = null private var initialUser: UserHandle? = null private var secondUser: UserHandle? = null - private var initialPendingIntent: PendingIntent? = null - private var secondPendingIntent: PendingIntent? = null private var initialShortcut: ShortcutInfo? = null private var secondShortcut: ShortcutInfo? = null @@ -109,6 +119,10 @@ class SplitSelectDataHolder(var context: Context?) { context = null } + fun setLauncherUiState(launcherUiState: LauncherUiState) { + this.launcherUiState = launcherUiState + } + /** * @param alreadyRunningTask if set to [android.app.ActivityTaskManager.INVALID_TASK_ID] * then @param intent will be used to launch the initial task @@ -119,12 +133,12 @@ class SplitSelectDataHolder(var context: Context?) { @StagePosition stagePosition: Int, itemInfo: ItemInfo?, splitEvent: EventEnum?, - alreadyRunningTask: Int + alreadyRunningTask: Int, ) { if (alreadyRunningTask != INVALID_TASK_ID) { - initialTaskId = alreadyRunningTask + initialTask = initialTask.copy(taskId = alreadyRunningTask) } else { - initialIntent = intent!! + initialTask = initialTask.copy(intent = intent!!) initialUser = itemInfo!!.user } setInitialData(stagePosition, splitEvent, itemInfo) @@ -138,16 +152,16 @@ class SplitSelectDataHolder(var context: Context?) { info: RunningTaskInfo, @StagePosition stagePosition: Int, itemInfo: ItemInfo?, - splitEvent: EventEnum? + splitEvent: EventEnum?, ) { - initialTaskId = info.taskId + initialTask = initialTask.copy(taskId = info.taskId) setInitialData(stagePosition, splitEvent, itemInfo) } private fun setInitialData( @StagePosition stagePosition: Int, event: EventEnum?, - item: ItemInfo? + item: ItemInfo?, ) { itemInfo = item initialStagePosition = stagePosition @@ -160,7 +174,7 @@ class SplitSelectDataHolder(var context: Context?) { * @param taskId The second task that will be launched. */ fun setSecondTask(taskId: Int, itemInfo: ItemInfo) { - secondTaskId = taskId + secondTask = secondTask.copy(taskId = taskId) secondItemInfo = itemInfo } @@ -171,7 +185,7 @@ class SplitSelectDataHolder(var context: Context?) { * @param user The user of that intent. */ fun setSecondTask(intent: Intent, user: UserHandle, itemInfo: ItemInfo) { - secondIntent = intent + secondTask = secondTask.copy(intent = intent) secondUser = user secondItemInfo = itemInfo } @@ -183,7 +197,7 @@ class SplitSelectDataHolder(var context: Context?) { * @param pendingIntent The second PendingIntent that will be launched. */ fun setSecondTask(pendingIntent: PendingIntent, itemInfo: ItemInfo) { - secondPendingIntent = pendingIntent + secondTask = secondTask.copy(pendingIntent = pendingIntent) secondUser = pendingIntent.creatorUserHandle secondItemInfo = itemInfo } @@ -217,7 +231,7 @@ class SplitSelectDataHolder(var context: Context?) { /** Converts intents to pendingIntents, associating the [user] with the intent if provided */ private fun getPendingIntent(intent: Intent?, user: UserHandle?): PendingIntent? { - if (intent != initialIntent && intent != secondIntent) { + if (intent != initialTask.intent && intent != secondTask.intent) { throw IllegalStateException("Invalid intent to convert to PendingIntent") } @@ -230,14 +244,14 @@ class SplitSelectDataHolder(var context: Context?) { intent, PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT, null /* options */, - user + user, ) } else { PendingIntent.getActivity( context, 0, intent, - PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT + PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT, ) } } @@ -274,10 +288,8 @@ class SplitSelectDataHolder(var context: Context?) { private fun generateSplitLaunchData(@SplitLaunchType splitLaunchType: Int): SplitLaunchData { return SplitLaunchData( splitLaunchType, - initialTaskId, - secondTaskId, - initialPendingIntent, - secondPendingIntent, + initialTask, + secondTask, widgetSecondIntent, initialUser?.identifier ?: -1, secondUser?.identifier ?: -1, @@ -285,37 +297,44 @@ class SplitSelectDataHolder(var context: Context?) { secondShortcut, itemInfo, splitEvent, - initialStagePosition + initialStagePosition, ) } /** - * Converts our [initialIntent] and [secondIntent] into shortcuts and pendingIntents, if - * possible. + * Converts our [initialTask.intent] and [secondTask.intent] into shortcuts and pendingIntents, + * if possible. * - * Note that both [initialIntent] and [secondIntent] will be nullified on method return + * Note that both [initialTask.intent] and [secondTask.intent] will be nullified on method + * return * - * One caveat is that if [secondPendingIntent] is set, we will use that and *not* attempt to - * convert [secondIntent]. This also leaves [widgetSecondIntent] untouched. + * One caveat is that if [secondTask.pendingIntent] is set, we will use that and *not* attempt + * to convert [secondTask.intent]. This also leaves [widgetSecondIntent] untouched. */ private fun convertIntentsToFinalTypes() { - initialShortcut = getShortcutInfo(initialIntent, initialUser) - initialPendingIntent = getPendingIntent(initialIntent, initialUser) - initialIntent = null + initialShortcut = getShortcutInfo(initialTask.intent, initialUser) + initialTask = + initialTask.copy( + intent = null, + pendingIntent = getPendingIntent(initialTask.intent, initialUser), + ) // Only one of the two is currently allowed (secondPendingIntent directly set for widgets) - if (secondIntent != null && secondPendingIntent != null) { + if (secondTask.intent != null && secondTask.pendingIntent != null) { throw IllegalStateException("Both secondIntent and secondPendingIntent non-null") } // If secondPendingIntent already set, no need to convert. Prioritize using that - if (secondPendingIntent != null) { - secondIntent = null + if (secondTask.pendingIntent != null) { + secondTask = secondTask.copy(intent = null) return } - secondShortcut = getShortcutInfo(secondIntent, secondUser) - secondPendingIntent = getPendingIntent(secondIntent, secondUser) - secondIntent = null + secondShortcut = getShortcutInfo(secondTask.intent, secondUser) + secondTask = + secondTask.copy( + intent = null, + pendingIntent = getPendingIntent(secondTask.intent, secondUser), + ) } /** @@ -325,35 +344,35 @@ class SplitSelectDataHolder(var context: Context?) { @VisibleForTesting @SplitLaunchType fun getSplitLaunchType(): Int { - if (initialIntent != null || secondIntent != null) { + if (initialTask.intent != null || secondTask.intent != null) { throw IllegalStateException("Intents need to be converted") } // Prioritize task launches first - if (initialTaskId != INVALID_TASK_ID) { - if (secondTaskId != INVALID_TASK_ID) { + if (initialTask.taskId != INVALID_TASK_ID) { + if (secondTask.taskId != INVALID_TASK_ID) { return SPLIT_TASK_TASK } if (secondShortcut != null) { return SPLIT_TASK_SHORTCUT } - if (secondPendingIntent != null) { + if (secondTask.pendingIntent != null) { return SPLIT_TASK_PENDINGINTENT } } - if (secondTaskId != INVALID_TASK_ID) { + if (secondTask.taskId != INVALID_TASK_ID) { if (initialShortcut != null) { return SPLIT_SHORTCUT_TASK } - if (initialPendingIntent != null) { + if (initialTask.pendingIntent != null) { return SPLIT_PENDINGINTENT_TASK } } // All task+shortcut combinations are handled above, only launch left is with multiple // intents (and respective shortcut infos, if necessary) - if (initialPendingIntent != null && secondPendingIntent != null) { + if (initialTask.pendingIntent != null && secondTask.pendingIntent != null) { return SPLIT_PENDINGINTENT_PENDINGINTENT } throw IllegalStateException("Unidentified split launch type") @@ -361,7 +380,7 @@ class SplitSelectDataHolder(var context: Context?) { @SplitLaunchType private fun getFullscreenLaunchType(): Int { - if (initialTaskId != INVALID_TASK_ID) { + if (initialTask.taskId != INVALID_TASK_ID) { return SPLIT_SINGLE_TASK_FULLSCREEN } @@ -369,7 +388,7 @@ class SplitSelectDataHolder(var context: Context?) { return SPLIT_SINGLE_SHORTCUT_FULLSCREEN } - if (initialPendingIntent != null) { + if (initialTask.pendingIntent != null) { return SPLIT_SINGLE_INTENT_FULLSCREEN } throw IllegalStateException("Unidentified fullscreen launch type") @@ -377,10 +396,8 @@ class SplitSelectDataHolder(var context: Context?) { data class SplitLaunchData( @SplitLaunchType val splitLaunchType: Int, - var initialTaskId: Int = INVALID_TASK_ID, - var secondTaskId: Int = INVALID_TASK_ID, - var initialPendingIntent: PendingIntent? = null, - var secondPendingIntent: PendingIntent? = null, + val initialTask: SplitSelectTask = SplitSelectTask(), + val secondTask: SplitSelectTask = SplitSelectTask(), var widgetSecondIntent: Intent? = null, var initialUserId: Int = -1, var secondUserId: Int = -1, @@ -388,14 +405,14 @@ class SplitSelectDataHolder(var context: Context?) { var secondShortcut: ShortcutInfo? = null, var itemInfo: ItemInfo? = null, var splitEvent: EventEnum? = null, - val initialStagePosition: Int = STAGE_POSITION_UNDEFINED + val initialStagePosition: Int = STAGE_POSITION_UNDEFINED, ) /** * @return `true` if first task has been selected and waiting for the second task to be chosen */ fun isSplitSelectActive(): Boolean { - return isInitialTaskIntentSet() && !isSecondTaskIntentSet() + return initialTask.isIntentSet && !secondTask.isIntentSet } /** @@ -403,21 +420,15 @@ class SplitSelectDataHolder(var context: Context?) { * launched */ fun isBothSplitAppsConfirmed(): Boolean { - return isInitialTaskIntentSet() && isSecondTaskIntentSet() - } - - private fun isInitialTaskIntentSet(): Boolean { - return initialTaskId != INVALID_TASK_ID || - initialIntent != null || - initialPendingIntent != null + return initialTask.isIntentSet && secondTask.isIntentSet } fun getInitialTaskId(): Int { - return initialTaskId + return initialTask.taskId } fun getSecondTaskId(): Int { - return secondTaskId + return secondTask.taskId } fun getSplitEvent(): EventEnum? { @@ -436,22 +447,12 @@ class SplitSelectDataHolder(var context: Context?) { return secondItemInfo } - private fun isSecondTaskIntentSet(): Boolean { - return secondTaskId != INVALID_TASK_ID || - secondIntent != null || - secondPendingIntent != null - } - fun resetState() { initialStagePosition = STAGE_POSITION_UNDEFINED - initialTaskId = INVALID_TASK_ID - secondTaskId = INVALID_TASK_ID + initialTask = SplitSelectTask() + secondTask = SplitSelectTask() initialUser = null secondUser = null - initialIntent = null - secondIntent = null - initialPendingIntent = null - secondPendingIntent = null itemInfo = null splitEvent = null initialShortcut = null @@ -461,13 +462,13 @@ class SplitSelectDataHolder(var context: Context?) { fun dump(prefix: String, writer: PrintWriter) { writer.println("$prefix SplitSelectDataHolder") writer.println("$prefix\tinitialStagePosition= $initialStagePosition") - writer.println("$prefix\tinitialTaskId= $initialTaskId") - writer.println("$prefix\tsecondTaskId= $secondTaskId") + writer.println("$prefix\tinitialTaskId= ${initialTask.taskId}") + writer.println("$prefix\tsecondTaskId= ${secondTask.taskId}") writer.println("$prefix\tinitialUser= $initialUser") writer.println("$prefix\tsecondUser= $secondUser") - writer.println("$prefix\tinitialIntent= $initialIntent") - writer.println("$prefix\tsecondIntent= $secondIntent") - writer.println("$prefix\tsecondPendingIntent= $secondPendingIntent") + writer.println("$prefix\tinitialIntent= ${initialTask.intent}") + writer.println("$prefix\tsecondIntent= ${secondTask.intent}") + writer.println("$prefix\tsecondPendingIntent= ${secondTask.pendingIntent}") writer.println("$prefix\titemInfo= $itemInfo") writer.println("$prefix\tsplitEvent= $splitEvent") writer.println("$prefix\tinitialShortcut= $initialShortcut") diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index bcfcd8eb260..683a99583f4 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -16,7 +16,10 @@ package com.android.quickstep.util; -import static com.android.launcher3.Utilities.postAsyncCallback; +import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; +import static android.view.Display.DEFAULT_DISPLAY; + +import static com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_MOVE_TO_SPLIT_SCREEN; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DESKTOP_MODE_SPLIT_LEFT_TOP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DESKTOP_MODE_SPLIT_RIGHT_BOTTOM; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SPLIT_SELECTED_SECOND_APP; @@ -35,82 +38,89 @@ import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_TASK_PENDINGINTENT; import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_TASK_SHORTCUT; import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_TASK_TASK; -import static com.android.wm.shell.common.split.SplitScreenConstants.KEY_EXTRA_WIDGET_INTENT; -import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50; +import static com.android.wm.shell.shared.split.SplitScreenConstants.KEY_EXTRA_WIDGET_INTENT; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; import android.annotation.NonNull; import android.annotation.UiThread; import android.app.ActivityManager; import android.app.ActivityOptions; import android.app.ActivityThread; import android.app.PendingIntent; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ShortcutInfo; +import android.graphics.Bitmap; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; -import android.os.SystemClock; import android.os.UserHandle; import android.util.Log; import android.util.Pair; -import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationTarget; import android.view.SurfaceControl; +import android.view.View; +import android.window.DesktopExperienceFlags; import android.window.IRemoteTransitionFinishedCallback; import android.window.RemoteTransition; import android.window.RemoteTransitionStub; import android.window.TransitionInfo; +import android.window.WindowContainerTransaction; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.internal.logging.InstanceId; +import com.android.launcher3.LauncherUiState; import com.android.launcher3.R; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.apppairs.AppPairIcon; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.IconProvider; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.ResolvedTargetInfo; import com.android.launcher3.statehandlers.DepthController; import com.android.launcher3.statemanager.StateManager; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.BackPressHandler; -import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RecentsAnimationCallbacks; import com.android.quickstep.RecentsAnimationController; import com.android.quickstep.RecentsAnimationTargets; import com.android.quickstep.RecentsModel; +import com.android.quickstep.RemoteAnimationTargets; import com.android.quickstep.SplitSelectionListener; import com.android.quickstep.SystemUiProxy; -import com.android.quickstep.TaskAnimationManager; +import com.android.quickstep.views.FloatingDesktopTaskView; import com.android.quickstep.views.FloatingTaskView; import com.android.quickstep.views.GroupedTaskView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; import com.android.quickstep.views.SplitInstructionsView; -import com.android.systemui.animation.RemoteAnimationRunnerCompat; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; -import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition; +import com.android.systemui.shared.system.QuickStepContract; +import com.android.wm.shell.shared.split.SplitScreenConstants.PersistentSnapPosition; import com.android.wm.shell.splitscreen.ISplitSelectListener; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.function.Consumer; /** @@ -121,7 +131,6 @@ public class SplitSelectStateController { private static final String TAG = "SplitSelectStateCtor"; private RecentsViewContainer mContainer; - private final Handler mHandler; private final RecentsModel mRecentTasksModel; @Nullable private Runnable mActivityBackCallback; @@ -154,9 +163,10 @@ public class SplitSelectStateController { /** * Should be a constant from {@link com.android.internal.jank.Cuj} or -1, does not need to be - * set for all launches. + * set for all launches. Used in conjunction with {@link #mLaunchingViewCuj} below. */ private int mLaunchCuj = -1; + private View mLaunchingViewCuj; private FloatingTaskView mFirstFloatingTaskView; private SplitInstructionsView mSplitInstructionsView; @@ -168,10 +178,14 @@ public class SplitSelectStateController { */ private Pair mSessionInstanceIds; + private boolean mIsDestroyed = false; + + private RecentsWindowManager mRecentsWindowManager; + private final BackPressHandler mSplitBackHandler = new BackPressHandler() { @Override public boolean canHandleBack() { - return FeatureFlags.enableSplitContextually() && isSplitSelectActive(); + return isSplitSelectActive(); } @Override @@ -186,12 +200,11 @@ public void onBackInvoked() { } }; - public SplitSelectStateController(RecentsViewContainer container, Handler handler, - StateManager stateManager, DepthController depthController, - StatsLogManager statsLogManager, SystemUiProxy systemUiProxy, RecentsModel recentsModel, - Runnable activityBackCallback) { + public SplitSelectStateController(RecentsViewContainer container, + StateManager stateManager, DepthController depthController, + StatsLogManager statsLogManager, SystemUiProxy systemUiProxy, RecentsModel recentsModel, + Runnable activityBackCallback) { mContainer = container; - mHandler = handler; mStatsLogManager = statsLogManager; mSystemUiProxy = systemUiProxy; mStateManager = stateManager; @@ -199,12 +212,13 @@ public SplitSelectStateController(RecentsViewContainer container, Handler handle mRecentTasksModel = recentsModel; mActivityBackCallback = activityBackCallback; mSplitAnimationController = new SplitAnimationController(this); - mAppPairsController = new AppPairsController(mContainer.asContext(), this, statsLogManager); + mAppPairsController = new AppPairsController(mContainer, this, statsLogManager); mSplitSelectDataHolder = new SplitSelectDataHolder(mContainer.asContext()); } public void onDestroy() { mContainer = null; + mIsDestroyed = true; mActivityBackCallback = null; mAppPairsController.onDestroy(); mSplitSelectDataHolder.onDestroy(); @@ -219,8 +233,8 @@ public void onDestroy() { * @param intent will be ignored if @param alreadyRunningTask is set */ public void setInitialTaskSelect(@Nullable Intent intent, @StagePosition int stagePosition, - @NonNull ItemInfo itemInfo, StatsLogManager.EventEnum splitEvent, - int alreadyRunningTask) { + @NonNull ItemInfo itemInfo, StatsLogManager.EventEnum splitEvent, + int alreadyRunningTask) { mSplitSelectDataHolder.setInitialTaskSelect(intent, stagePosition, itemInfo, splitEvent, alreadyRunningTask); createAndLogInstanceIdsForSession(); @@ -231,8 +245,8 @@ public void setInitialTaskSelect(@Nullable Intent intent, @StagePosition int sta * running app. */ public void setInitialTaskSelect(ActivityManager.RunningTaskInfo info, - @StagePosition int stagePosition, @NonNull ItemInfo itemInfo, - StatsLogManager.EventEnum splitEvent) { + @StagePosition int stagePosition, @NonNull ItemInfo itemInfo, + StatsLogManager.EventEnum splitEvent) { mSplitSelectDataHolder.setInitialTaskSelect(info, stagePosition, itemInfo, splitEvent); createAndLogInstanceIdsForSession(); } @@ -241,51 +255,59 @@ public void setInitialTaskSelect(ActivityManager.RunningTaskInfo info, * Given a list of task keys, searches through active Tasks in RecentsModel to find the last * active instances of these tasks. Returns an empty array if there is no such running task. * - * @param componentKeys The list of ComponentKeys to search for. + * @param resolvedTargetInfos The list of the target Activity if one is + * explicitly set. Otherwise, the ComponentKey of + * the Activity that the associated Intent. * @param callback The callback that will be executed on the list of found tasks. * @param findExactPairMatch If {@code true}, only finds tasks that contain BOTH of the wanted * tasks (i.e. searching for a running pair of tasks.) */ - public void findLastActiveTasksAndRunCallback(@Nullable List componentKeys, - boolean findExactPairMatch, Consumer callback) { + public void findLastActiveTasksAndRunCallback( + @Nullable List resolvedTargetInfos, + boolean findExactPairMatch, Consumer callback) { mRecentTasksModel.getTasks(taskGroups -> { - if (componentKeys == null || componentKeys.isEmpty()) { + if (resolvedTargetInfos == null + || resolvedTargetInfos.isEmpty()) { callback.accept(new Task[]{}); return; } - Task[] lastActiveTasks = new Task[componentKeys.size()]; + Task[] lastActiveTasks = new Task[resolvedTargetInfos.size()]; if (findExactPairMatch) { + if (resolvedTargetInfos.size() < 2) { + callback.accept(new Task[]{}); + return; + } + + final ResolvedTargetInfo resolvedTargetInfo1 = resolvedTargetInfos.get(0); + final ResolvedTargetInfo resolvedTargetInfo2 = resolvedTargetInfos.get(1); // Loop through tasks in reverse, since they are ordered with most-recent tasks last for (int i = taskGroups.size() - 1; i >= 0; i--) { GroupTask groupTask = taskGroups.get(i); - if (isInstanceOfAppPair( - groupTask, componentKeys.get(0), componentKeys.get(1))) { - lastActiveTasks[0] = groupTask.task1; + if (isInstanceOfAppPair(groupTask, resolvedTargetInfo1, resolvedTargetInfo2)) { + lastActiveTasks[0] = ((SplitTask) groupTask).getTopLeftTask(); break; } } } else { // For each key we are looking for, add to lastActiveTasks with the corresponding // Task (or do nothing if not found). - for (int i = 0; i < componentKeys.size(); i++) { - ComponentKey key = componentKeys.get(i); + for (int i = 0; i < resolvedTargetInfos.size(); i++) { + final ResolvedTargetInfo resolvedTargetInfo = resolvedTargetInfos.get(i); Task lastActiveTask = null; // Loop through tasks in reverse, since they are ordered with recent tasks last for (int j = taskGroups.size() - 1; j >= 0; j--) { GroupTask groupTask = taskGroups.get(j); - Task task1 = groupTask.task1; - // Don't add duplicate Tasks - if (isInstanceOfComponent(task1, key) - && !Arrays.asList(lastActiveTasks).contains(task1)) { - lastActiveTask = task1; - break; + // Account for desktop cases where there can be N tasks in the group + for (Task task : groupTask.getTasks()) { + if (isInstanceOfComponent(task, resolvedTargetInfo) + && !Arrays.asList(lastActiveTasks).contains(task)) { + lastActiveTask = task; + break; + } } - Task task2 = groupTask.task2; - if (isInstanceOfComponent(task2, key) - && !Arrays.asList(lastActiveTasks).contains(task2)) { - lastActiveTask = task2; + if (lastActiveTask != null) { break; } } @@ -302,27 +324,33 @@ public void findLastActiveTasksAndRunCallback(@Nullable List compo * Checks if a given Task is the most recently-active Task of type componentName. Used for * selecting already-running Tasks for splitscreen. */ - public boolean isInstanceOfComponent(@Nullable Task task, @NonNull ComponentKey componentKey) { + public boolean isInstanceOfComponent(@Nullable Task task, + @NonNull ResolvedTargetInfo resolvedTargetInfo) { // Exclude the task that is already staged if (task == null || task.key.id == mSplitSelectDataHolder.getInitialTaskId()) { return false; } - return task.key.baseIntent.getComponent().equals(componentKey.componentName) - && task.key.userId == componentKey.user.getIdentifier(); + return resolvedTargetInfo.matchTaskKey(task.key.baseActivity, task.key.baseIntent, + UserHandle.of(task.key.userId)); } /** * Checks if a given GroupTask is a pair of apps that matches two given ComponentKeys. We check * both permutations because task order is not guaranteed in GroupTasks. */ - public boolean isInstanceOfAppPair(GroupTask groupTask, @NonNull ComponentKey componentKey1, - @NonNull ComponentKey componentKey2) { - return ((isInstanceOfComponent(groupTask.task1, componentKey1) - && isInstanceOfComponent(groupTask.task2, componentKey2)) - || - (isInstanceOfComponent(groupTask.task1, componentKey2) - && isInstanceOfComponent(groupTask.task2, componentKey1))); + public boolean isInstanceOfAppPair(GroupTask groupTask, + @NonNull ResolvedTargetInfo resolvedTargetInfo1, + @NonNull ResolvedTargetInfo resolvedTargetInfo2) { + if (groupTask instanceof SplitTask splitTask) { + return ((isInstanceOfComponent(splitTask.getTopLeftTask(), resolvedTargetInfo1) + && isInstanceOfComponent(splitTask.getBottomRightTask(), resolvedTargetInfo2)) + || + (isInstanceOfComponent(splitTask.getTopLeftTask(), resolvedTargetInfo2) + && isInstanceOfComponent(splitTask.getBottomRightTask(), + resolvedTargetInfo1))); + } + return false; } /** @@ -351,7 +379,7 @@ private void dispatchOnSplitSelectionExit() { * animations are complete. */ public void launchSplitTasks(@PersistentSnapPosition int snapPosition, - @Nullable Consumer callback) { + @Nullable Consumer callback) { launchTasks(callback, false /* freezeTaskList */, snapPosition, mSessionInstanceIds.first); mStatsLogManager.logger() @@ -372,7 +400,7 @@ public void launchSplitTasks(@PersistentSnapPosition int snapPosition) { * A version of {@link #launchSplitTasks(int, Consumer)} that launches with default split ratio. */ public void launchSplitTasks(@Nullable Consumer callback) { - launchSplitTasks(SNAP_TO_50_50, callback); + launchSplitTasks(SNAP_TO_2_50_50, callback); } /** @@ -380,7 +408,7 @@ public void launchSplitTasks(@Nullable Consumer callback) { * ratio and no callback. */ public void launchSplitTasks() { - launchSplitTasks(SNAP_TO_50_50, null); + launchSplitTasks(SNAP_TO_2_50_50, null); } /** @@ -436,7 +464,7 @@ public void setSecondWidget(PendingIntent pendingIntent, Intent widgetIntent) { * foreground (quickswitch, launching previous pairs from overview) */ public void launchTasks(@Nullable Consumer callback, boolean freezeTaskList, - @PersistentSnapPosition int snapPosition, @Nullable InstanceId shellInstanceId) { + @PersistentSnapPosition int snapPosition, @Nullable InstanceId shellInstanceId) { TestLogging.recordEvent( TestProtocol.SEQUENCE_MAIN, "launchSplitTasks"); final ActivityOptions options1 = ActivityOptions.makeBasic(); @@ -446,12 +474,12 @@ public void launchTasks(@Nullable Consumer callback, boolean freezeTask SplitSelectDataHolder.SplitLaunchData launchData = mSplitSelectDataHolder.getSplitLaunchData(); - int firstTaskId = launchData.getInitialTaskId(); - int secondTaskId = launchData.getSecondTaskId(); + int firstTaskId = launchData.getInitialTask().getTaskId(); + int secondTaskId = launchData.getSecondTask().getTaskId(); ShortcutInfo firstShortcut = launchData.getInitialShortcut(); ShortcutInfo secondShortcut = launchData.getSecondShortcut(); - PendingIntent firstPI = launchData.getInitialPendingIntent(); - PendingIntent secondPI = launchData.getSecondPendingIntent(); + PendingIntent firstPI = launchData.getInitialTask().getPendingIntent(); + PendingIntent secondPI = launchData.getSecondTask().getPendingIntent(); Intent widgetIntent = launchData.getWidgetSecondIntent(); int firstUserId = launchData.getInitialUserId(); int secondUserId = launchData.getSecondUserId(); @@ -459,77 +487,49 @@ public void launchTasks(@Nullable Consumer callback, boolean freezeTask Bundle optionsBundle = options1.toBundle(); Bundle extrasBundle = new Bundle(1); extrasBundle.putParcelable(KEY_EXTRA_WIDGET_INTENT, widgetIntent); - if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) { - final RemoteTransition remoteTransition = getShellRemoteTransition(firstTaskId, - secondTaskId, callback, "LaunchSplitPair"); - switch (launchData.getSplitLaunchType()) { - case SPLIT_TASK_TASK -> - mSystemUiProxy.startTasks(firstTaskId, optionsBundle, secondTaskId, - null /* options2 */, initialStagePosition, snapPosition, - remoteTransition, shellInstanceId); - - case SPLIT_TASK_PENDINGINTENT -> - mSystemUiProxy.startIntentAndTask(secondPI, secondUserId, optionsBundle, - firstTaskId, extrasBundle, initialStagePosition, snapPosition, - remoteTransition, shellInstanceId); - - case SPLIT_TASK_SHORTCUT -> - mSystemUiProxy.startShortcutAndTask(secondShortcut, optionsBundle, - firstTaskId, null /*options2*/, initialStagePosition, snapPosition, - remoteTransition, shellInstanceId); - - case SPLIT_PENDINGINTENT_TASK -> - mSystemUiProxy.startIntentAndTask(firstPI, firstUserId, optionsBundle, - secondTaskId, null /*options2*/, initialStagePosition, snapPosition, - remoteTransition, shellInstanceId); - - case SPLIT_PENDINGINTENT_PENDINGINTENT -> - mSystemUiProxy.startIntents(firstPI, firstUserId, firstShortcut, - optionsBundle, secondPI, secondUserId, secondShortcut, extrasBundle, - initialStagePosition, snapPosition, remoteTransition, - shellInstanceId); - - case SPLIT_SHORTCUT_TASK -> - mSystemUiProxy.startShortcutAndTask(firstShortcut, optionsBundle, - secondTaskId, null /*options2*/, initialStagePosition, snapPosition, - remoteTransition, shellInstanceId); - } - } else { - final RemoteAnimationAdapter adapter = getLegacyRemoteAdapter(firstTaskId, secondTaskId, - callback); - switch (launchData.getSplitLaunchType()) { - case SPLIT_TASK_TASK -> - mSystemUiProxy.startTasksWithLegacyTransition(firstTaskId, optionsBundle, - secondTaskId, null /* options2 */, initialStagePosition, - snapPosition, adapter, shellInstanceId); - - case SPLIT_TASK_PENDINGINTENT -> - mSystemUiProxy.startIntentAndTaskWithLegacyTransition(secondPI, - secondUserId, optionsBundle, firstTaskId, null /*options2*/, - initialStagePosition, snapPosition, adapter, shellInstanceId); - - case SPLIT_TASK_SHORTCUT -> - mSystemUiProxy.startShortcutAndTaskWithLegacyTransition(secondShortcut, - optionsBundle, firstTaskId, null /*options2*/, initialStagePosition, - snapPosition, adapter, shellInstanceId); - - case SPLIT_PENDINGINTENT_TASK -> - mSystemUiProxy.startIntentAndTaskWithLegacyTransition(firstPI, firstUserId, - optionsBundle, secondTaskId, null /*options2*/, - initialStagePosition, snapPosition, adapter, shellInstanceId); - - case SPLIT_PENDINGINTENT_PENDINGINTENT -> - mSystemUiProxy.startIntentsWithLegacyTransition(firstPI, firstUserId, - firstShortcut, optionsBundle, secondPI, secondUserId, - secondShortcut, null /*options2*/, initialStagePosition, - snapPosition, adapter, shellInstanceId); - - case SPLIT_SHORTCUT_TASK -> - mSystemUiProxy.startShortcutAndTaskWithLegacyTransition(firstShortcut, - optionsBundle, secondTaskId, null /*options2*/, - initialStagePosition, snapPosition, adapter, shellInstanceId); - } + final RemoteTransition remoteTransition = getRemoteTransition(firstTaskId, + secondTaskId, callback, "LaunchSplitPair"); + if (mSplitFromDesktopController != null + && mSplitFromDesktopController.mTaskInfo != null + ) { + SystemUiProxy.INSTANCE.get(mContainer.asContext()) + .onDesktopSplitSelectChoice( + mSplitFromDesktopController.mTaskInfo + ); } + switch (launchData.getSplitLaunchType()) { + case SPLIT_TASK_TASK -> + mSystemUiProxy.startTasks(firstTaskId, optionsBundle, secondTaskId, + null /* options2 */, initialStagePosition, snapPosition, + remoteTransition, shellInstanceId); + + case SPLIT_TASK_PENDINGINTENT -> + mSystemUiProxy.startIntentAndTask(secondPI, secondUserId, optionsBundle, + firstTaskId, extrasBundle, initialStagePosition, snapPosition, + remoteTransition, shellInstanceId); + + case SPLIT_TASK_SHORTCUT -> + mSystemUiProxy.startShortcutAndTask(secondShortcut, optionsBundle, + firstTaskId, null /*options2*/, initialStagePosition, snapPosition, + remoteTransition, shellInstanceId); + + case SPLIT_PENDINGINTENT_TASK -> + mSystemUiProxy.startIntentAndTask(firstPI, firstUserId, optionsBundle, + secondTaskId, null /*options2*/, initialStagePosition, snapPosition, + remoteTransition, shellInstanceId); + + case SPLIT_PENDINGINTENT_PENDINGINTENT -> + mSystemUiProxy.startIntents(firstPI, firstUserId, firstShortcut, + optionsBundle, secondPI, secondUserId, secondShortcut, extrasBundle, + initialStagePosition, snapPosition, remoteTransition, + shellInstanceId); + + case SPLIT_SHORTCUT_TASK -> + mSystemUiProxy.startShortcutAndTask(firstShortcut, optionsBundle, + secondTaskId, null /*options2*/, initialStagePosition, snapPosition, + remoteTransition, shellInstanceId); + } + } /** @@ -540,9 +540,9 @@ public void launchTasks(@Nullable Consumer callback, boolean freezeTask * GroupedTaskView, int, int, int, Consumer, boolean, int, RemoteTransition)} */ public void launchExistingSplitPair(@Nullable GroupedTaskView groupedTaskView, - int firstTaskId, int secondTaskId, @StagePosition int stagePosition, - Consumer callback, boolean freezeTaskList, - @PersistentSnapPosition int snapPosition) { + int firstTaskId, int secondTaskId, @StagePosition int stagePosition, + Consumer callback, boolean freezeTaskList, + @PersistentSnapPosition int snapPosition) { launchExistingSplitPair( groupedTaskView, firstTaskId, @@ -565,9 +565,9 @@ public void launchExistingSplitPair(@Nullable GroupedTaskView groupedTaskView, * NOTE: This is not to be used to launch AppPairs. */ public void launchExistingSplitPair(@Nullable GroupedTaskView groupedTaskView, - int firstTaskId, int secondTaskId, @StagePosition int stagePosition, - Consumer callback, boolean freezeTaskList, - @PersistentSnapPosition int snapPosition, @Nullable RemoteTransition remoteTransition) { + int firstTaskId, int secondTaskId, @StagePosition int stagePosition, + Consumer callback, boolean freezeTaskList, + @PersistentSnapPosition int snapPosition, @Nullable RemoteTransition remoteTransition) { mLaunchingTaskView = groupedTaskView; final ActivityOptions options1 = ActivityOptions.makeBasic(); if (freezeTaskList) { @@ -575,20 +575,13 @@ public void launchExistingSplitPair(@Nullable GroupedTaskView groupedTaskView, } Bundle optionsBundle = options1.toBundle(); - if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) { - final RemoteTransition transition = remoteTransition == null - ? getShellRemoteTransition( - firstTaskId, secondTaskId, callback, "LaunchExistingPair") - : remoteTransition; - mSystemUiProxy.startTasks(firstTaskId, optionsBundle, secondTaskId, null /* options2 */, - stagePosition, snapPosition, transition, null /*shellInstanceId*/); - } else { - final RemoteAnimationAdapter adapter = getLegacyRemoteAdapter(firstTaskId, - secondTaskId, callback); - mSystemUiProxy.startTasksWithLegacyTransition(firstTaskId, optionsBundle, secondTaskId, - null /* options2 */, stagePosition, snapPosition, adapter, - null /*shellInstanceId*/); - } + final RemoteTransition transition = remoteTransition == null + ? getRemoteTransition( + firstTaskId, secondTaskId, callback, "LaunchExistingPair") + : remoteTransition; + mSystemUiProxy.startTasks(firstTaskId, optionsBundle, secondTaskId, null /* options2 */, + stagePosition, snapPosition, transition, null /*shellInstanceId*/); + } /** @@ -600,9 +593,9 @@ public void launchInitialAppFullscreen(Consumer callback) { final ActivityOptions options1 = ActivityOptions.makeBasic(); SplitSelectDataHolder.SplitLaunchData launchData = mSplitSelectDataHolder.getFullscreenLaunchData(); - int firstTaskId = launchData.getInitialTaskId(); - int secondTaskId = launchData.getSecondTaskId(); - PendingIntent firstPI = launchData.getInitialPendingIntent(); + int firstTaskId = launchData.getInitialTask().getTaskId(); + int secondTaskId = launchData.getSecondTask().getTaskId(); + PendingIntent firstPI = launchData.getInitialTask().getPendingIntent(); int firstUserId = launchData.getInitialUserId(); int initialStagePosition = launchData.getInitialStagePosition(); ShortcutInfo initialShortcut = launchData.getInitialShortcut(); @@ -614,44 +607,29 @@ public void launchInitialAppFullscreen(Consumer callback) { ActivityThread.currentActivityThread().getApplicationThread(), "LaunchAppFullscreen"); InstanceId instanceId = mSessionInstanceIds.first; - if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) { - switch (launchData.getSplitLaunchType()) { - case SPLIT_SINGLE_TASK_FULLSCREEN -> mSystemUiProxy.startTasks(firstTaskId, - optionsBundle, secondTaskId, null /* options2 */, initialStagePosition, - SNAP_TO_50_50, remoteTransition, instanceId); - case SPLIT_SINGLE_INTENT_FULLSCREEN -> mSystemUiProxy.startIntentAndTask(firstPI, - firstUserId, optionsBundle, secondTaskId, null /*options2*/, - initialStagePosition, SNAP_TO_50_50, remoteTransition, instanceId); - case SPLIT_SINGLE_SHORTCUT_FULLSCREEN -> mSystemUiProxy.startShortcutAndTask( - initialShortcut, optionsBundle, firstTaskId, null /* options2 */, - initialStagePosition, SNAP_TO_50_50, remoteTransition, instanceId); - } - } else { - final RemoteAnimationAdapter adapter = getLegacyRemoteAdapter(firstTaskId, - secondTaskId, callback); - switch (launchData.getSplitLaunchType()) { - case SPLIT_SINGLE_TASK_FULLSCREEN -> mSystemUiProxy.startTasksWithLegacyTransition( - firstTaskId, optionsBundle, secondTaskId, null /* options2 */, - initialStagePosition, SNAP_TO_50_50, adapter, instanceId); - case SPLIT_SINGLE_INTENT_FULLSCREEN -> - mSystemUiProxy.startIntentAndTaskWithLegacyTransition(firstPI, firstUserId, - optionsBundle, secondTaskId, null /*options2*/, - initialStagePosition, SNAP_TO_50_50, adapter, instanceId); - case SPLIT_SINGLE_SHORTCUT_FULLSCREEN -> - mSystemUiProxy.startShortcutAndTaskWithLegacyTransition( - initialShortcut, optionsBundle, firstTaskId, null /* options2 */, - initialStagePosition, SNAP_TO_50_50, adapter, instanceId); - } + switch (launchData.getSplitLaunchType()) { + case SPLIT_SINGLE_TASK_FULLSCREEN -> mSystemUiProxy.startTasks(firstTaskId, + optionsBundle, secondTaskId, null /* options2 */, initialStagePosition, + SNAP_TO_2_50_50, remoteTransition, instanceId); + case SPLIT_SINGLE_INTENT_FULLSCREEN -> mSystemUiProxy.startIntentAndTask(firstPI, + firstUserId, optionsBundle, secondTaskId, null /*options2*/, + initialStagePosition, SNAP_TO_2_50_50, remoteTransition, instanceId); + case SPLIT_SINGLE_SHORTCUT_FULLSCREEN -> mSystemUiProxy.startShortcutAndTask( + initialShortcut, optionsBundle, firstTaskId, null /* options2 */, + initialStagePosition, SNAP_TO_2_50_50, remoteTransition, instanceId); } } /** - * Init {@code SplitFromDesktopController} + * Init {@code SplitFromDesktopController} from {@link QuickstepLauncher} or from + * {@link RecentsWindowManager} */ - public void initSplitFromDesktopController(QuickstepLauncher launcher, - OverviewComponentObserver overviewComponentObserver) { - initSplitFromDesktopController( - new SplitFromDesktopController(launcher, overviewComponentObserver)); + public void initSplitFromDesktopController(RecentsViewContainer recentsViewContainer) { + initSplitFromDesktopController(new SplitFromDesktopController(recentsViewContainer)); + } + + public void setLauncherUiState(LauncherUiState launcherUiState) { + mSplitSelectDataHolder.setLauncherUiState(launcherUiState); } @VisibleForTesting @@ -659,22 +637,14 @@ void initSplitFromDesktopController(SplitFromDesktopController controller) { mSplitFromDesktopController = controller; } - private RemoteTransition getShellRemoteTransition(int firstTaskId, int secondTaskId, - @Nullable Consumer callback, String transitionName) { + private RemoteTransition getRemoteTransition(int firstTaskId, int secondTaskId, + @Nullable Consumer callback, String transitionName) { final RemoteSplitLaunchTransitionRunner animationRunner = new RemoteSplitLaunchTransitionRunner(firstTaskId, secondTaskId, callback); return new RemoteTransition(animationRunner, ActivityThread.currentActivityThread().getApplicationThread(), transitionName); } - private RemoteAnimationAdapter getLegacyRemoteAdapter(int firstTaskId, int secondTaskId, - @Nullable Consumer callback) { - final RemoteSplitLaunchAnimationRunner animationRunner = - new RemoteSplitLaunchAnimationRunner(firstTaskId, secondTaskId, callback); - return new RemoteAnimationAdapter(animationRunner, 300, 150, - ActivityThread.currentActivityThread().getApplicationThread()); - } - /** * Will initialize {@link #mSessionInstanceIds} if null and log the first split event from * {@link #mSplitSelectDataHolder} @@ -727,7 +697,12 @@ public SplitAnimationController getSplitAnimationController() { return mSplitAnimationController; } - public void setLaunchingCuj(int launchCuj) { + /** + * Set params to invoke a trace session for the given view and CUJ when we begin animating the + * split launch AFTER we get a response from Shell. + */ + public void setLaunchingCuj(View launchingView, int launchCuj) { + mLaunchingViewCuj = launchingView; mLaunchCuj = launchCuj; } @@ -741,16 +716,16 @@ private class RemoteSplitLaunchTransitionRunner extends RemoteTransitionStub { private Consumer mFinishCallback; RemoteSplitLaunchTransitionRunner(int initialTaskId, int secondTaskId, - @Nullable Consumer callback) { + @Nullable Consumer callback) { mInitialTaskId = initialTaskId; mSecondTaskId = secondTaskId; mFinishCallback = callback; } @Override - public void startAnimation(IBinder transition, TransitionInfo info, - SurfaceControl.Transaction t, - IRemoteTransitionFinishedCallback finishedCallback) { + public void startAnimation(IBinder transition, TransitionInfo transitionInfo, + SurfaceControl.Transaction t, + IRemoteTransitionFinishedCallback finishedCallback) { final Runnable finishAdapter = () -> { try { finishedCallback.onTransitionFinished(null /* wct */, null /* sct */); @@ -765,6 +740,9 @@ public void startAnimation(IBinder transition, TransitionInfo info, && mLaunchingTaskView.getRecentsView() != null && mLaunchingTaskView.getRecentsView().isTaskViewVisible( mLaunchingTaskView); + if (mLaunchingViewCuj != null && mLaunchCuj != -1) { + InteractionJankMonitorWrapper.begin(mLaunchingViewCuj, mLaunchCuj); + } mSplitAnimationController.playSplitLaunchAnimation( shouldLaunchFromTaskView ? mLaunchingTaskView : null, mLaunchingIconView, @@ -775,10 +753,11 @@ public void startAnimation(IBinder transition, TransitionInfo info, null /* nonApps */, mStateManager, mDepthController, - info, t, () -> { + transitionInfo, t, () -> { finishAdapter.run(); cleanup(true /*success*/); - }); + }, + QuickStepContract.getWindowCornerRadius(mContainer.asContext())); }); } @@ -805,60 +784,15 @@ private void cleanup(boolean success) { } /** - * LEGACY - * Remote animation runner for animation to launch an app. - */ - private class RemoteSplitLaunchAnimationRunner extends RemoteAnimationRunnerCompat { - - private final int mInitialTaskId; - private final int mSecondTaskId; - private final Consumer mSuccessCallback; - - RemoteSplitLaunchAnimationRunner(int initialTaskId, int secondTaskId, - @Nullable Consumer successCallback) { - mInitialTaskId = initialTaskId; - mSecondTaskId = secondTaskId; - mSuccessCallback = successCallback; - } - - @Override - public void onAnimationStart(int transit, RemoteAnimationTarget[] apps, - RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps, - Runnable finishedCallback) { - postAsyncCallback(mHandler, - () -> mSplitAnimationController.playSplitLaunchAnimation(mLaunchingTaskView, - mLaunchingIconView, mInitialTaskId, mSecondTaskId, apps, wallpapers, - nonApps, mStateManager, mDepthController, null /* info */, null /* t */, - () -> { - finishedCallback.run(); - if (mSuccessCallback != null) { - mSuccessCallback.accept(true); - } - resetState(); - })); - } - - @Override - public void onAnimationCancelled() { - postAsyncCallback(mHandler, () -> { - if (mSuccessCallback != null) { - // Launching legacy tasks while recents animation is running will always cause - // onAnimationCancelled to be called (should be fixed w/ shell transitions?) - mSuccessCallback.accept(mRecentsAnimationRunning); - } - resetState(); - }); - } - } - - /** - * To be called whenever we exit split selection state. If - * {@link FeatureFlags#enableSplitContextually()} is set, this should be the + * To be called whenever we exit split selection state. This should be the * central way split is getting reset, which should then go through the callbacks to reset * other state. */ public void resetState() { mSplitSelectDataHolder.resetState(); + if (!mIsDestroyed) { + mContainer.getOverviewPanel().resetDesktopTaskFromSplitSelectState(); + } dispatchOnSplitSelectionExit(); mRecentsAnimationRunning = false; mLaunchingTaskView = null; @@ -873,12 +807,14 @@ public void resetState() { InteractionJankMonitorWrapper.end(mLaunchCuj); } mLaunchCuj = -1; + mLaunchingViewCuj = null; if (mSessionInstanceIds != null) { mStatsLogManager.logger() .withInstanceId(mSessionInstanceIds.second) .log(LAUNCHER_SPLIT_SELECTION_COMPLETE); } + if (mSplitFromDesktopController != null) mSplitFromDesktopController.resetState(); mSessionInstanceIds = null; } @@ -951,41 +887,59 @@ public void dump(String prefix, PrintWriter writer) { public class SplitFromDesktopController { private static final String TAG = "SplitFromDesktopController"; - + private static final boolean isBugfixFlagEnabled = + DesktopExperienceFlags.ENABLE_DESKTOP_SPLITSCREEN_TRANSITION_BUGFIX.isTrue(); + private static final boolean SPLIT_SELECT_ON_EXTERNAL_DISPLAY_ENABLED = + DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX.isTrue(); private final QuickstepLauncher mLauncher; private final OverviewComponentObserver mOverviewComponentObserver; private final int mSplitPlaceholderSize; private final int mSplitPlaceholderInset; private ActivityManager.RunningTaskInfo mTaskInfo; - private ISplitSelectListener mSplitSelectListener; + private DesktopSplitSelectListenerImpl mSplitSelectListener; private Drawable mAppIcon; - - public SplitFromDesktopController(QuickstepLauncher launcher, - OverviewComponentObserver overviewComponentObserver) { - mLauncher = launcher; - mOverviewComponentObserver = overviewComponentObserver; - mSplitPlaceholderSize = mLauncher.getResources().getDimensionPixelSize( - R.dimen.split_placeholder_size); - mSplitPlaceholderInset = mLauncher.getResources().getDimensionPixelSize( - R.dimen.split_placeholder_inset); - mSplitSelectListener = new ISplitSelectListener.Stub() { - @Override - public boolean onRequestSplitSelect(ActivityManager.RunningTaskInfo taskInfo, - int splitPosition, Rect taskBounds) { - MAIN_EXECUTOR.execute(() -> enterSplitSelect(taskInfo, splitPosition, - taskBounds)); - return true; - } - }; - SystemUiProxy.INSTANCE.get(mLauncher).registerSplitSelectListener(mSplitSelectListener); + @Nullable + private RecentsAnimationController mRecentsAnimationController; + private final Context mContext; + + public SplitFromDesktopController(RecentsViewContainer recentsViewContainer) { + mContainer = recentsViewContainer; + if (recentsViewContainer instanceof QuickstepLauncher) { + mLauncher = (QuickstepLauncher) recentsViewContainer; + mRecentsWindowManager = null; + } else { + mRecentsWindowManager = (RecentsWindowManager) recentsViewContainer; + mLauncher = null; + } + mContext = mContainer.asContext(); + mOverviewComponentObserver = OverviewComponentObserver.INSTANCE.get(mContext); + mSplitPlaceholderSize = mContext.getResources() + .getDimensionPixelSize(R.dimen.split_placeholder_size); + mSplitPlaceholderInset = mContext.getResources() + .getDimensionPixelSize(R.dimen.split_placeholder_inset); + mSplitSelectListener = new DesktopSplitSelectListenerImpl(this); + SystemUiProxy.INSTANCE.get(mContext) + .registerSplitSelectListener(mSplitSelectListener); } void onDestroy() { - SystemUiProxy.INSTANCE.get(mLauncher).unregisterSplitSelectListener( + SystemUiProxy.INSTANCE.get(mContext).unregisterSplitSelectListener( mSplitSelectListener); + mSplitSelectListener.release(); mSplitSelectListener = null; } + /** + * Return whether this instance of {@link SplitSelectStateController} is capable of running + * the animation for this {@link android.app.ActivityManager.RunningTaskInfo}. Certain + * controllers can only run animations for tasks on selected displays. + */ + public boolean ableToStartSplitSelectAnimation(ActivityManager.RunningTaskInfo taskInfo) { + int displayId = ExternalDisplaysKt.getSafeDisplayId(taskInfo); + return (displayId == DEFAULT_DISPLAY && mLauncher != null) + || (displayId != DEFAULT_DISPLAY && mRecentsWindowManager != null); + } + /** * Enter split select from desktop mode. * @param taskInfo the desktop task to move to split stage @@ -993,86 +947,296 @@ void onDestroy() { * @param taskBounds the bounds of the task, used for {@link FloatingTaskView} animation */ public void enterSplitSelect(ActivityManager.RunningTaskInfo taskInfo, - int splitPosition, Rect taskBounds) { + int splitPosition, Rect taskBounds, boolean startRecents, + @Nullable WindowContainerTransaction withRecentsWct) { + Log.v(TAG, "enterSplitSelect, startRecents=" + startRecents); + mTaskInfo = taskInfo; - String packageName = mTaskInfo.realActivity.getPackageName(); - PackageManager pm = mLauncher.getApplicationContext().getPackageManager(); - IconProvider provider = new IconProvider(mLauncher.getApplicationContext()); + PackageManager pm = mContext.getPackageManager(); + IconProvider provider = new IconProvider(mContext); + int displayId = ExternalDisplaysKt.getSafeDisplayId(taskInfo); + try { mAppIcon = provider.getIcon(pm.getActivityInfo(mTaskInfo.baseActivity, - PackageManager.ComponentInfoFlags.of(0))); + PackageManager.ComponentInfoFlags.of(0))); } catch (PackageManager.NameNotFoundException e) { + final String packageName = + mTaskInfo.realActivity == null + ? "(null)" + : mTaskInfo.realActivity.getPackageName(); Log.w(TAG, "Package not found: " + packageName, e); } - RecentsAnimationCallbacks callbacks = new RecentsAnimationCallbacks( - SystemUiProxy.INSTANCE.get(mLauncher.getApplicationContext()), - false /* allowMinimizeSplitScreen */); - DesktopSplitRecentsAnimationListener listener = - new DesktopSplitRecentsAnimationListener(splitPosition, taskBounds); + final DesktopSplitRecentsAnimation animation = new DesktopSplitRecentsAnimation( + splitPosition, taskBounds); + final TaskbarInteractor taskbarInteractor = mContainer.getTaskbarInteractor(); - MAIN_EXECUTOR.execute(() -> { - callbacks.addListener(listener); - UI_HELPER_EXECUTOR.execute( - // Transition from app to enter stage split in launcher with - // recents animation. - () -> ActivityManagerWrapper.getInstance().startRecentsActivity( - mOverviewComponentObserver.getOverviewIntent(), - SystemClock.uptimeMillis(), callbacks, null, null)); - }); + final Runnable updateTaskbarRunnable = () -> { + if (taskbarInteractor != null) { + taskbarInteractor.updateTaskbarLauncherStateGoingHome(); + } + }; + if (startRecents) { + RecentsAnimationCallbacks callbacks = new RecentsAnimationCallbacks(mContainer); + callbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { + @Override + public void onRecentsAnimationStart(RecentsAnimationController controller, + RecentsAnimationTargets targets, + @Nullable TransitionInfo transitionInfo) { + mRecentsAnimationController = controller; + animation.start(targets, () -> + controller.finish( + /* toHome= */ true, + updateTaskbarRunnable, + /* sendUserLeaveHint= */ false, + /* reason= */ new ActiveGestureLog.CompoundString( + "SplitSelectStateController.enterSplitController"))); + } + }); + + Intent intent = (SPLIT_SELECT_ON_EXTERNAL_DISPLAY_ENABLED + && displayId != DEFAULT_DISPLAY) + ? mOverviewComponentObserver.getHomeIntent(displayId) + : mOverviewComponentObserver.getOverviewIntent(); + + UI_HELPER_EXECUTOR.execute(() -> { + // Transition from app to enter stage split in launcher with recents animation + final ActivityOptions options = ActivityOptions.makeBasic(); + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS); + options.setTransientLaunch(); + options.setLaunchDisplayId(displayId); + SystemUiProxy.INSTANCE.get(mContext) + .startRecentsTransition( + intent, options, + callbacks, false /* useSyntheticRecentsTransition */, + withRecentsWct, + displayId); + }); + + if (SPLIT_SELECT_ON_EXTERNAL_DISPLAY_ENABLED && displayId != DEFAULT_DISPLAY) { + mRecentsWindowManager.showRecentsWindow(callbacks); + } + + } else { + animation.start(/* targets= */null, updateTaskbarRunnable); + } + } + + /** Reset controller state after a split-select transition is finished. */ + public void resetState() { + mTaskInfo = null; + mAppIcon = null; } - private class DesktopSplitRecentsAnimationListener implements - RecentsAnimationCallbacks.RecentsAnimationListener { + private class DesktopSplitRecentsAnimation { private final Rect mTempRect = new Rect(); private final RectF mTaskBounds = new RectF(); private final int mSplitPosition; - DesktopSplitRecentsAnimationListener(int splitPosition, Rect taskBounds) { + DesktopSplitRecentsAnimation(int splitPosition, Rect taskBounds) { mSplitPosition = splitPosition; mTaskBounds.set(taskBounds); } - @Override - public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { - StatsLogManager.LauncherEvent launcherDesktopSplitEvent = - mSplitPosition == STAGE_POSITION_BOTTOM_OR_RIGHT ? - LAUNCHER_DESKTOP_MODE_SPLIT_RIGHT_BOTTOM : - LAUNCHER_DESKTOP_MODE_SPLIT_LEFT_TOP; + void start( + @Nullable RecentsAnimationTargets targets, + @NonNull Runnable finishController) { + final StatsLogManager.LauncherEvent launcherDesktopSplitEvent = + mSplitPosition == STAGE_POSITION_BOTTOM_OR_RIGHT + ? LAUNCHER_DESKTOP_MODE_SPLIT_RIGHT_BOTTOM + : LAUNCHER_DESKTOP_MODE_SPLIT_LEFT_TOP; setInitialTaskSelect(mTaskInfo, mSplitPosition, null, launcherDesktopSplitEvent); - RecentsView recentsView = mLauncher.getOverviewPanel(); + if (mRecentsWindowManager != null) { + mRecentsWindowManager.createWindowView(); + } + + final SurfaceTransactionApplier surfaceApplier = + new SurfaceTransactionApplier(mContainer.getDragLayer()); + + final RecentsView recentsView = mContainer.getOverviewPanel(); recentsView.getPagedOrientationHandler().getInitialSplitPlaceholderBounds( mSplitPlaceholderSize, mSplitPlaceholderInset, - mLauncher.getDeviceProfile(), getActiveSplitStagePosition(), mTempRect); + mContainer.getDeviceProfile(), getActiveSplitStagePosition(), mTempRect); - PendingAnimation anim = new PendingAnimation( + final PendingAnimation anim = new PendingAnimation( SplitAnimationTimings.TABLET_HOME_TO_SPLIT.getDuration()); - final FloatingTaskView floatingTaskView = FloatingTaskView.getFloatingTaskView( - mLauncher, mLauncher.getDragLayer(), - null /* thumbnail */, - mAppIcon, new RectF()); - floatingTaskView.setAlpha(1); - floatingTaskView.addStagingAnimation(anim, mTaskBounds, mTempRect, - false /* fadeWithThumbnail */, true /* isStagedTask */); - setFirstFloatingTaskView(floatingTaskView); + List closingTaskViews = + setUpClosingWindowViews(anim, targets); + final FloatingTaskView floatingTaskView = setUpStagingTaskView(anim); anim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { - controller.finish(true /* toRecents */, null /* onFinishComplete */, - false /* sendUserLeaveHint */); + InteractionJankMonitorWrapper.begin( + floatingTaskView, CUJ_DESKTOP_MODE_MOVE_TO_SPLIT_SCREEN); + if (!isBugfixFlagEnabled) { + finishController.run(); + return; + } + if (targets == null) { + return; + } + + SurfaceTransaction transaction = new SurfaceTransaction(); + // Hide all app targets, to allow Launcher to use views to animate the apps + for (RemoteAnimationTarget target : targets.apps) { + transaction.getTransaction().hide(target.leash); + } + showHomeTarget(transaction, targets); + surfaceApplier.scheduleApply(transaction); } @Override public void onAnimationEnd(Animator animation) { - SystemUiProxy.INSTANCE.get(mLauncher.getApplicationContext()) - .onDesktopSplitSelectAnimComplete(mTaskInfo); + InteractionJankMonitorWrapper.end(CUJ_DESKTOP_MODE_MOVE_TO_SPLIT_SCREEN); + if (isBugfixFlagEnabled) { + for (FloatingDesktopTaskView taskView : closingTaskViews) { + mContainer.getDragLayer().removeView(taskView); + } + finishController.run(); + } + } + @Override + public void onAnimationCancel(Animator animation) { + InteractionJankMonitorWrapper.cancel(CUJ_DESKTOP_MODE_MOVE_TO_SPLIT_SCREEN); + mContainer.getDragLayer().removeView(floatingTaskView); + getSplitAnimationController().removeSplitInstructionsView(mContainer); + if (isBugfixFlagEnabled) { + for (FloatingDesktopTaskView taskView : closingTaskViews) { + mContainer.getDragLayer().removeView(taskView); + } + finishController.run(); + } + resetState(); } }); + anim.add(getSplitAnimationController() + .getShowSplitInstructionsAnim(mContainer).buildAnim()); + if (isBugfixFlagEnabled && (mContainer instanceof QuickstepLauncher)) { + // TODO: b/438065072 - Support createHomeRevealAnimation in non-default display + // when there is no launcher. + anim.add(createHomeRevealAnimation()); + } anim.buildAnim().start(); } + + private List setUpClosingWindowViews( + PendingAnimation anim, RemoteAnimationTargets targets) { + if (targets == null || !isBugfixFlagEnabled) { + return Collections.emptyList(); + } + RemoteAnimationTarget[] appTargets = Arrays.stream(targets.apps) + // Fetch all closing freeform targets, except the staging task + .filter(target -> + target.taskInfo != null + && target.taskInfo.isFreeform() + && target.taskInfo.taskId != mTaskInfo.taskId + && target.mode == RemoteAnimationTarget.MODE_CLOSING) + .toArray(RemoteAnimationTarget[]::new); + List floatingTaskViews = new ArrayList<>(); + // Targets are ordered top-to-bottom, so iterate backwards here to add bottom task + // views first as newly added views are added in front. + for (int i = appTargets.length - 1; i >= 0; i--) { + RemoteAnimationTarget appTarget = appTargets[i]; + RectF startBounds = new RectF(appTarget.localBounds); + final FloatingDesktopTaskView taskView = + FloatingDesktopTaskView.Companion.create( + mContainer, startBounds, getTaskThumbnail(appTarget.taskInfo)); + taskView.setAlpha(1); + taskView.addClosingAnimation(mContainer, anim); + floatingTaskViews.add(taskView); + } + return floatingTaskViews; + } + + private FloatingTaskView setUpStagingTaskView(PendingAnimation anim) { + FloatingTaskView floatingTaskView = FloatingTaskView.getFloatingTaskView( + mContainer, mContainer.getDragLayer(), + getTaskThumbnail(mTaskInfo), + mAppIcon, /* positionOut= */ new RectF()); + floatingTaskView.setOnClickListener(view -> { + InteractionJankMonitorWrapper.cancel(CUJ_DESKTOP_MODE_MOVE_TO_SPLIT_SCREEN); + SystemUiProxy.INSTANCE.get(mContext) + .onDesktopSplitSelectChoice(mTaskInfo); + getSplitAnimationController() + .playAnimPlaceholderToFullscreen(mContainer, view, + Optional.of(() -> resetState())); + }); + if (isBugfixFlagEnabled) { + floatingTaskView.setUseFitXYThumbnailScale(); + } + floatingTaskView.setAlpha(1); + floatingTaskView.addStagingAnimation(anim, mTaskBounds, mTempRect, + isBugfixFlagEnabled /* fadeWithThumbnail */, true /* isStagedTask */); + setFirstFloatingTaskView(floatingTaskView); + return floatingTaskView; + } + + private @Nullable Bitmap getTaskThumbnail(ActivityManager.RunningTaskInfo taskInfo) { + if (taskInfo == null) return null; + if (!isBugfixFlagEnabled) return null; + if (mRecentsAnimationController == null) return null; + return mRecentsAnimationController.screenshotTask(taskInfo.taskId).getThumbnail(); + } + + private AnimatorSet createHomeRevealAnimation() { + return new ScalingWorkspaceRevealAnim(mLauncher, /* siblingAnimation= */ null, + /* windowTargetRect= */ null, true /* playAlphaReveal */, + true /* playBlur */) + .getAnimators(); + } + + private static void showHomeTarget( + SurfaceTransaction transaction, RemoteAnimationTargets targets) { + RemoteAnimationTarget homeTarget = Arrays.stream(targets.unfilteredApps) + .filter(target -> target.taskInfo != null + && target.taskInfo.topActivityType == ACTIVITY_TYPE_HOME) + .findAny() + .orElse(null); + if (homeTarget == null) return; + transaction.getTransaction().setAlpha(homeTarget.leash, 1f); + } + } + } + + /** + * Wrapper for the ISplitSelectListener stub to prevent lingering references to the launcher + * activity via the controller. + */ + private static class DesktopSplitSelectListenerImpl extends ISplitSelectListener.Stub { + + private SplitFromDesktopController mController; + + DesktopSplitSelectListenerImpl(@NonNull SplitFromDesktopController controller) { + mController = controller; + } + + /** + * Clears any references to the controller. + */ + void release() { + mController = null; + } + + @Override + public boolean onRequestSplitSelect(ActivityManager.RunningTaskInfo taskInfo, + int splitPosition, Rect taskBounds, boolean startRecents, + @Nullable WindowContainerTransaction withRecentsWct) { + + if (mController == null || !mController.ableToStartSplitSelectAnimation(taskInfo)) { + Log.v(TAG, "onRequestSplitSelect, controller not able to start " + + "animation for taskId: " + taskInfo.taskId); + return false; + } + MAIN_EXECUTOR.execute(() -> { + if (mController != null) { + mController.enterSplitSelect(taskInfo, splitPosition, taskBounds, + startRecents, withRecentsWct); + } + }); + return true; } } -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java b/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java index 4962367bd2f..d2b6eca2e1c 100644 --- a/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java +++ b/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java @@ -16,6 +16,7 @@ package com.android.quickstep.util; +import static com.android.launcher3.icons.cache.CacheLookupFlag.DEFAULT_LOOKUP_FLAG; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import android.animation.Animator; @@ -38,7 +39,6 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.data.AppPairInfo; @@ -48,8 +48,11 @@ import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.quickstep.views.FloatingTaskView; import com.android.quickstep.views.RecentsView; +import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; +import java.util.Collections; + /** Handles when the stage split lands on the home screen. */ public class SplitToWorkspaceController { @@ -86,7 +89,7 @@ public boolean handleSecondWidgetSelectionForSplit(View view, PendingIntent pend MODEL_EXECUTOR.execute(() -> { PackageItemInfo infoInOut = new PackageItemInfo(pendingIntent.getCreatorPackage(), pendingIntent.getCreatorUserHandle()); - mIconCache.getTitleAndIconForApp(infoInOut, false); + mIconCache.getTitleAndIconForApp(infoInOut, DEFAULT_LOOKUP_FLAG); Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); view.post(() -> { @@ -119,6 +122,12 @@ public boolean handleSecondAppSelectionForSplit(View view) { intent = workspaceItemInfo.intent; user = workspaceItemInfo.user; bitmapInfo = workspaceItemInfo.bitmap; + if (workspaceItemInfo.hasStatusFlag(WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON)) { + // If the app is still in the middle of installation, prompt the user to select + // something else by wiggling the instructions view + mController.getSplitInstructionsView().goBoing(); + return true; + } } else if (tag instanceof com.android.launcher3.model.data.AppInfo) { final com.android.launcher3.model.data.AppInfo appInfo = (com.android.launcher3.model.data.AppInfo) tag; @@ -133,17 +142,27 @@ public boolean handleSecondAppSelectionForSplit(View view) { // Use Launcher's default click handler return false; } - - mController.setSecondTask(intent, user, (ItemInfo) tag); - - startWorkspaceAnimation(view, null /*bitmap*/, bitmapInfo.newIcon(mLauncher)); + // Check for background task matching this tag; if we find one, set second task + // via task instead of intent so the bounds and windowing mode will be corrected. + mController.findLastActiveTasksAndRunCallback( + Collections.singletonList(((ItemInfo) tag).getResolvedTargetInfo()), + false /* findExactPairMatch */, + foundTasks -> { + Task foundTask = foundTasks[0]; + if (foundTask != null) { + mController.setSecondTask(foundTask, (ItemInfo) tag); + } else { + mController.setSecondTask(intent, user, (ItemInfo) tag); + } + startWorkspaceAnimation(view, null /*bitmap*/, bitmapInfo.newIcon(mLauncher)); + }); return true; } private void startWorkspaceAnimation(@NonNull View view, @Nullable Bitmap bitmap, @Nullable Drawable icon) { DeviceProfile dp = mLauncher.getDeviceProfile(); - boolean isTablet = dp.isTablet; + boolean isTablet = dp.getDeviceProperties().isTablet(); SplitAnimationTimings timings = AnimUtils.getDeviceSplitToConfirmTimings(isTablet); PendingAnimation pendingAnimation = new PendingAnimation(timings.getDuration()); @@ -205,6 +224,6 @@ private void cleanUp() { } private boolean shouldIgnoreSecondSplitLaunch() { - return !FeatureFlags.enableSplitContextually() || !mController.isSplitSelectActive(); + return !mController.isSplitSelectActive(); } } diff --git a/quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java b/quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java index 5e42b9001bd..b328c1829f0 100644 --- a/quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java +++ b/quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java @@ -16,7 +16,6 @@ package com.android.quickstep.util; -import static com.android.launcher3.config.FeatureFlags.enableSplitContextually; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_KEYBOARD_SHORTCUT_SPLIT_LEFT_TOP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_KEYBOARD_SHORTCUT_SPLIT_RIGHT_BOTTOM; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; @@ -27,20 +26,21 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.app.ActivityManager; +import android.app.ActivityOptions; import android.graphics.Rect; import android.graphics.RectF; -import android.os.SystemClock; +import android.window.TransitionInfo; import androidx.annotation.BinderThread; import com.android.launcher3.R; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.taskbar.LauncherTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.quickstep.BaseContainerInterface; import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RecentsAnimationCallbacks; import com.android.quickstep.RecentsAnimationController; -import com.android.quickstep.RecentsAnimationDeviceState; import com.android.quickstep.RecentsAnimationTargets; import com.android.quickstep.RecentsModel; import com.android.quickstep.SystemUiProxy; @@ -55,20 +55,16 @@ public class SplitWithKeyboardShortcutController { private final QuickstepLauncher mLauncher; private final SplitSelectStateController mController; - private final RecentsAnimationDeviceState mDeviceState; private final OverviewComponentObserver mOverviewComponentObserver; private final int mSplitPlaceholderSize; private final int mSplitPlaceholderInset; - public SplitWithKeyboardShortcutController(QuickstepLauncher launcher, - SplitSelectStateController controller, - OverviewComponentObserver overviewComponentObserver, - RecentsAnimationDeviceState deviceState) { + public SplitWithKeyboardShortcutController( + QuickstepLauncher launcher, SplitSelectStateController controller) { mLauncher = launcher; mController = controller; - mDeviceState = deviceState; - mOverviewComponentObserver = overviewComponentObserver; + mOverviewComponentObserver = OverviewComponentObserver.INSTANCE.get(launcher); mSplitPlaceholderSize = mLauncher.getResources().getDimensionPixelSize( R.dimen.split_placeholder_size); @@ -77,50 +73,54 @@ public SplitWithKeyboardShortcutController(QuickstepLauncher launcher, } @BinderThread - public void enterStageSplit(boolean leftOrTop) { - if (!enableSplitContextually() || - // Do not enter stage split from keyboard shortcuts if the user is already in split - TopTaskTracker.INSTANCE.get(mLauncher).getRunningSplitTaskIds().length == 2) { + public void enterStageSplit(boolean leftOrTop, int displayId) { + if (TopTaskTracker.INSTANCE.get(mLauncher).getRunningSplitTaskIds().length == 2) { + // Do not enter stage split from keyboard shortcuts if the user is already in split + return; + } + BaseContainerInterface containerInterface = + mOverviewComponentObserver.getContainerInterface(displayId); + if (containerInterface == null) { return; } RecentsAnimationCallbacks callbacks = new RecentsAnimationCallbacks( - SystemUiProxy.INSTANCE.get(mLauncher.getApplicationContext()), - false /* allowMinimizeSplitScreen */); + containerInterface.getCreatedContainer()); SplitWithKeyboardShortcutRecentsAnimationListener listener = new SplitWithKeyboardShortcutRecentsAnimationListener(leftOrTop); MAIN_EXECUTOR.execute(() -> { callbacks.addListener(listener); - UI_HELPER_EXECUTOR.execute( - // Transition from fullscreen app to enter stage split in launcher with - // recents animation. - () -> ActivityManagerWrapper.getInstance().startRecentsActivity( - mOverviewComponentObserver.getOverviewIntent(), - SystemClock.uptimeMillis(), callbacks, null, null)); + UI_HELPER_EXECUTOR.execute(() -> { + // Transition from fullscreen app to enter stage split in launcher with + // recents animation + final ActivityOptions options = ActivityOptions.makeBasic(); + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS); + options.setTransientLaunch(); + SystemUiProxy.INSTANCE.get(mLauncher.getApplicationContext()) + .startRecentsTransition(mOverviewComponentObserver.getOverviewIntent(), + ActivityOptions.makeBasic(), callbacks, + false /* useSyntheticRecentsTransition */, null, displayId); + }); }); } - public void onDestroy() { - mOverviewComponentObserver.onDestroy(); - mDeviceState.destroy(); - } - private class SplitWithKeyboardShortcutRecentsAnimationListener implements RecentsAnimationCallbacks.RecentsAnimationListener { private final boolean mLeftOrTop; private final Rect mTempRect = new Rect(); + private final ActivityManager.RunningTaskInfo mRunningTaskInfo; private SplitWithKeyboardShortcutRecentsAnimationListener(boolean leftOrTop) { mLeftOrTop = leftOrTop; + mRunningTaskInfo = ActivityManagerWrapper.getInstance().getRunningTask(); } @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets) { - ActivityManager.RunningTaskInfo runningTaskInfo = - ActivityManagerWrapper.getInstance().getRunningTask(); - mController.setInitialTaskSelect(runningTaskInfo, + RecentsAnimationTargets targets, TransitionInfo transitionInfo) { + mController.setInitialTaskSelect(mRunningTaskInfo, mLeftOrTop ? STAGE_POSITION_TOP_OR_LEFT : STAGE_POSITION_BOTTOM_OR_RIGHT, null /* itemInfo */, mLeftOrTop ? LAUNCHER_KEYBOARD_SHORTCUT_SPLIT_LEFT_TOP @@ -136,14 +136,15 @@ public void onRecentsAnimationStart(RecentsAnimationController controller, RectF startingTaskRect = new RectF(); final FloatingTaskView floatingTaskView = FloatingTaskView.getFloatingTaskView( mLauncher, mLauncher.getDragLayer(), - controller.screenshotTask(runningTaskInfo.taskId).getThumbnail(), + controller.screenshotTask(mRunningTaskInfo.taskId).getThumbnail(), null /* icon */, startingTaskRect); + Task task = Task.from(new Task.TaskKey(mRunningTaskInfo), mRunningTaskInfo, + false /* isLocked */); RecentsModel.INSTANCE.get(mLauncher.getApplicationContext()) .getIconCache() - .updateIconInBackground( - Task.from(new Task.TaskKey(runningTaskInfo), runningTaskInfo, - false /* isLocked */), - (task) -> floatingTaskView.setIcon(task.icon)); + .getIconInBackground( + task, + (icon, contentDescription, title) -> floatingTaskView.setIcon(icon)); floatingTaskView.setAlpha(1); floatingTaskView.addStagingAnimation(anim, startingTaskRect, mTempRect, false /* fadeWithThumbnail */, true /* isStagedTask */); @@ -153,16 +154,17 @@ public void onRecentsAnimationStart(RecentsAnimationController controller, @Override public void onAnimationStart(Animator animation) { controller.finish( - true /* toRecents */, - () -> { - LauncherTaskbarUIController controller = - mLauncher.getTaskbarUIController(); - if (controller != null) { - controller.updateTaskbarLauncherStateGoingHome(); + /* toHome= */ true, + /* onFinishComplete= */ () -> { + TaskbarInteractor taskbarInteractor = + mLauncher.getTaskbarInteractor(); + if (taskbarInteractor != null) { + taskbarInteractor.updateTaskbarLauncherStateGoingHome(); } - }, - false /* sendUserLeaveHint */); + /* sendUserLeaveHint= */ false, + /* reason= */ new ActiveGestureLog.CompoundString( + "SplitWithKeyboardShortcutRecentsAnimationListener")); } @Override diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java index 997a842dc2e..19db0e8cdf9 100644 --- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java +++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java @@ -24,6 +24,7 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER; import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM; +import static com.android.launcher3.util.NavigationMode.THREE_BUTTONS; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -47,8 +48,11 @@ import com.android.launcher3.anim.SpringAnimationBuilder; import com.android.launcher3.celllayout.CellLayoutLayoutParams; import com.android.launcher3.statehandlers.DepthController; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.states.StateAnimationConfig; +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator; import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.DynamicResource; import com.android.quickstep.views.RecentsView; import com.android.systemui.plugins.ResourceProvider; @@ -63,8 +67,7 @@ public class StaggeredWorkspaceAnim { private static final int APP_CLOSE_ROW_START_DELAY_MS = 10; // Should be used for animations running alongside this StaggeredWorkspaceAnim. public static final int DURATION_MS = 250; - public static final int DURATION_TASKBAR_MS = - QuickstepTransitionManager.getTaskbarToHomeDuration(); + private final int mTaskbarDurationInMs; private static final float MAX_VELOCITY_PX_PER_S = 22f; @@ -81,6 +84,13 @@ public StaggeredWorkspaceAnim(QuickstepLauncher launcher, float velocity, public StaggeredWorkspaceAnim(QuickstepLauncher launcher, float velocity, boolean animateOverviewScrim, @Nullable View ignoredView, boolean staggerWorkspace) { + boolean isPersistentTaskbarAndNotInDesktopMode = + (!TaskbarFeatureEvaluator.INSTANCE.get(launcher).isTransient() + || DisplayController.getNavigationMode(launcher) == THREE_BUTTONS) + && !DesktopVisibilityController.INSTANCE.get(launcher) + .isInDesktopMode(launcher.getDisplayId()); + mTaskbarDurationInMs = QuickstepTransitionManager.getTaskbarToHomeDuration( + isPersistentTaskbarAndNotInDesktopMode); prepareToAnimate(launcher, animateOverviewScrim); mIgnoredView = ignoredView; @@ -93,7 +103,7 @@ public StaggeredWorkspaceAnim(QuickstepLauncher launcher, float velocity, .getDimensionPixelSize(R.dimen.swipe_up_max_workspace_trans_y); DeviceProfile grid = launcher.getDeviceProfile(); - long duration = grid.isTaskbarPresent ? DURATION_TASKBAR_MS : DURATION_MS; + long duration = grid.isTaskbarPresent ? mTaskbarDurationInMs : DURATION_MS; if (staggerWorkspace) { Workspace workspace = launcher.getWorkspace(); Hotseat hotseat = launcher.getHotseat(); diff --git a/quickstep/src/com/android/quickstep/util/SurfaceTransaction.java b/quickstep/src/com/android/quickstep/util/SurfaceTransaction.java index 8006a979367..f69eae48d0a 100644 --- a/quickstep/src/com/android/quickstep/util/SurfaceTransaction.java +++ b/quickstep/src/com/android/quickstep/util/SurfaceTransaction.java @@ -64,6 +64,15 @@ public SurfaceProperties setAlpha(float alpha) { return this; } + /** + * @param opaque Whether the surface is opaque. + * @return this Builder + */ + public SurfaceProperties setOpaque(boolean opaque) { + mTransaction.setOpaque(mSurface, opaque); + return this; + } + /** * @param matrix The matrix to apply to the surface. * @return this Builder @@ -83,11 +92,30 @@ public SurfaceProperties setWindowCrop(Rect windowCrop) { } /** - * @param relativeLayer The relative layer. + * @param z The Z-order of the surface. * @return this Builder */ - public SurfaceProperties setLayer(int relativeLayer) { - mTransaction.setLayer(mSurface, relativeLayer); + public SurfaceProperties setLayer(int z) { + mTransaction.setLayer(mSurface, z); + return this; + } + + /** + * @param relativeTo The surface to apply the Z-order relative to. + * @param z The Z-order to apply to the current surface relative to the relativeTo surface. + * @return this Builder + */ + public SurfaceProperties setRelativeLayer(SurfaceControl relativeTo, int z) { + mTransaction.setRelativeLayer(mSurface, relativeTo, z); + return this; + } + + /** + * @param newParent The new parent for the surface. + * @return this Builder + */ + public SurfaceProperties reparent(SurfaceControl newParent) { + mTransaction.reparent(mSurface, newParent); return this; } @@ -111,6 +139,15 @@ public SurfaceProperties setShadowRadius(float radius) { return this; } + /** + * @param radius The radius for the background blur to apply to the surface. + * @return this Builder + */ + public SurfaceProperties setBackgroundBlurRadius(int radius) { + mTransaction.setBackgroundBlurRadius(mSurface, radius); + return this; + } + /** * Requests to show the given surface. * @return this Builder @@ -119,6 +156,15 @@ public SurfaceProperties setShow() { mTransaction.show(mSurface); return this; } + + /** + * Requests to remove the given surface. + * @return this Builder + */ + public SurfaceProperties setRemove() { + mTransaction.remove(mSurface); + return this; + } } /** @@ -127,10 +173,12 @@ public SurfaceProperties setShow() { public class MockProperties extends SurfaceProperties { public float alpha = -1; + public boolean opaque = false; public Matrix matrix = null; public Rect windowCrop = null; public float cornerRadius = 0; public float shadowRadius = 0; + public int backgroundBlurRadius = 0; protected MockProperties() { super(null); @@ -142,6 +190,12 @@ public SurfaceProperties setAlpha(float alpha) { return this; } + @Override + public SurfaceProperties setOpaque(boolean opaque) { + this.opaque = opaque; + return this; + } + @Override public SurfaceProperties setMatrix(Matrix matrix) { this.matrix = matrix; @@ -155,7 +209,17 @@ public SurfaceProperties setWindowCrop(Rect windowCrop) { } @Override - public SurfaceProperties setLayer(int relativeLayer) { + public SurfaceProperties setLayer(int z) { + return this; + } + + @Override + public SurfaceProperties setRelativeLayer(SurfaceControl relativeTo, int z) { + return this; + } + + @Override + public SurfaceProperties reparent(SurfaceControl newParent) { return this; } @@ -171,9 +235,20 @@ public SurfaceProperties setShadowRadius(float radius) { return this; } + @Override + public SurfaceProperties setBackgroundBlurRadius(int radius) { + this.backgroundBlurRadius = radius; + return this; + } + @Override public SurfaceProperties setShow() { return this; } + + @Override + public SurfaceProperties setRemove() { + return this; + } } } diff --git a/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java index a6db024dc4d..a70c443f8f2 100644 --- a/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java +++ b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java @@ -116,6 +116,8 @@ public void scheduleApply(SurfaceTransaction params) { mTargetViewRootImpl.registerRtFrameCallback(frame -> { if (mBarrierSurfaceControl == null && !Utilities.ATLEAST_Q) return; if (mBarrierSurfaceControl == null || !mBarrierSurfaceControl.isValid()) { + // Won't sync with anything, but we still need to apply the transaction + t.apply(); Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0) .sendToTarget(); return; diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java index c3a7bfeac58..2cd3969e0d4 100644 --- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java +++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java @@ -18,6 +18,7 @@ import android.animation.Animator; import android.animation.RectEvaluator; +import android.app.PictureInPictureParams; import android.content.ComponentName; import android.content.Context; import android.content.pm.ActivityInfo; @@ -25,6 +26,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.util.Log; +import android.util.Rational; import android.view.Surface; import android.view.SurfaceControl; import android.view.View; @@ -39,7 +41,8 @@ import com.android.quickstep.TaskAnimationManager; import com.android.systemui.shared.pip.PipSurfaceTransactionHelper; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; -import com.android.wm.shell.pip.PipContentOverlay; +import com.android.wm.shell.common.pip.IPipAnimationListener.PipResources; +import com.android.wm.shell.shared.pip.PipContentOverlay; /** * Subclass of {@link RectFSpringAnim} that animates an Activity to PiP (picture-in-picture) window @@ -50,8 +53,6 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { private static final float END_PROGRESS = 1.0f; - private static final float PIP_ASPECT_RATIO_MISMATCH_THRESHOLD = 0.01f; - private final int mTaskId; private final ActivityInfo mActivityInfo; private final SurfaceControl mLeash; @@ -121,9 +122,8 @@ private SwipePipToHomeAnimator(@NonNull Context context, @NonNull Rect destinationBounds, @RecentsOrientedState.SurfaceRotation int fromRotation, @NonNull Rect destinationBoundsTransformed, - int cornerRadius, - int shadowRadius, - @NonNull View view) { + @NonNull View view, + PipResources pipRes) { super(new DefaultSpringConfig(context, null, startBounds, new RectF(destinationBoundsTransformed))); mTaskId = taskId; @@ -135,10 +135,15 @@ private SwipePipToHomeAnimator(@NonNull Context context, mDestinationBounds.set(destinationBounds); mFromRotation = fromRotation; mDestinationBoundsTransformed.set(destinationBoundsTransformed); - mSurfaceTransactionHelper = new PipSurfaceTransactionHelper(cornerRadius, shadowRadius); + mSurfaceTransactionHelper = new PipSurfaceTransactionHelper(pipRes); - final float aspectRatio = destinationBounds.width() / (float) destinationBounds.height(); + final Rational aspectRatio = new Rational( + destinationBounds.width(), destinationBounds.height()); String reasonForCreateOverlay = null; // For debugging purpose. + + // Slightly larger app bounds to allow for off by 1 pixel source-rect-hint errors. + Rect overflowAppBounds = new Rect(appBounds.left - 1, appBounds.top - 1, + appBounds.right + 1, appBounds.bottom + 1); if (sourceRectHint.isEmpty()) { reasonForCreateOverlay = "Source rect hint is empty"; } else if (sourceRectHint.width() < destinationBounds.width() @@ -149,40 +154,27 @@ private SwipePipToHomeAnimator(@NonNull Context context, // animation in this case. reasonForCreateOverlay = "Source rect hint is too small " + sourceRectHint; sourceRectHint.setEmpty(); - } else if (!appBounds.contains(sourceRectHint)) { + } else if (!overflowAppBounds.contains(sourceRectHint)) { // This is a situation in which the source hint rect is outside the app bounds, so it is // not a valid rectangle to use for cropping app surface reasonForCreateOverlay = "Source rect hint exceeds display bounds " + sourceRectHint; sourceRectHint.setEmpty(); - } else if (Math.abs( - aspectRatio - (sourceRectHint.width() / (float) sourceRectHint.height())) - > PIP_ASPECT_RATIO_MISMATCH_THRESHOLD) { - // The source rect hint does not aspect ratio - reasonForCreateOverlay = "Source rect hint does not match aspect ratio " - + sourceRectHint + " aspect ratio " + aspectRatio; - sourceRectHint.setEmpty(); + } else { + final Rational srcAspectRatio = new Rational( + sourceRectHint.width(), sourceRectHint.height()); + if (!PictureInPictureParams.isSameAspectRatio(destinationBounds, srcAspectRatio)) { + // The aspect ratio of destination bounds does not match source rect hint. + // We use the aspect ratio of source rect hint to check against destination bounds + // here to avoid upscaling error. + reasonForCreateOverlay = "Source rect hint:" + sourceRectHint + + " does not match destination bounds:" + destinationBounds; + sourceRectHint.setEmpty(); + } } if (sourceRectHint.isEmpty()) { - // Crop a Rect matches the aspect ratio and pivots at the center point. - // To make the animation path simplified. - if ((appBounds.width() / (float) appBounds.height()) > aspectRatio) { - // use the full height. - mSourceRectHint.set(0, 0, - (int) (appBounds.height() * aspectRatio), appBounds.height()); - mSourceRectHint.offset( - (appBounds.width() - mSourceRectHint.width()) / 2, 0); - } else { - // use the full width. - mSourceRectHint.set(0, 0, - appBounds.width(), (int) (appBounds.width() / aspectRatio)); - mSourceRectHint.offset( - 0, (appBounds.height() - mSourceRectHint.height()) / 2); - } - - // Create a new overlay layer. We do not call detach on this instance, it's propagated - // to other classes like PipTaskOrganizer / RecentsAnimationController to complete - // the cleanup. + mSourceRectHint.set( + getEnterPipWithOverlaySrcRectHint(appBounds, aspectRatio.floatValue())); mPipContentOverlay = new PipContentOverlay.PipAppIconOverlay(view.getContext(), mAppBounds, mDestinationBounds, new IconProvider(context).getIcon(mActivityInfo), appIconSizePx); @@ -225,6 +217,26 @@ public void onAnimationEnd(Animator animation) { addOnUpdateListener(this::onAnimationUpdate); } + /** + * Crop a Rect matches the aspect ratio and pivots at the center point. + */ + private Rect getEnterPipWithOverlaySrcRectHint(Rect appBounds, float aspectRatio) { + final float appBoundsAspectRatio = appBounds.width() / (float) appBounds.height(); + final int width, height; + int left = appBounds.left; + int top = appBounds.top; + if (appBoundsAspectRatio < aspectRatio) { + width = appBounds.width(); + height = (int) (width / aspectRatio); + top = appBounds.top + (appBounds.height() - height) / 2; + } else { + height = appBounds.height(); + width = (int) (height * aspectRatio); + left = appBounds.left + (appBounds.width() - width) / 2; + } + return new Rect(left, top, left + width, top + height); + } + private void onAnimationUpdate(RectF currentRect, float progress) { if (mHasAnimationEnded) return; final SurfaceControl.Transaction tx = @@ -347,8 +359,7 @@ public static class Builder { private Matrix mHomeToWindowPositionMap; private RectF mStartBounds; private Rect mDestinationBounds; - private int mCornerRadius; - private int mShadowRadius; + private PipResources mPipRes; private View mAttachedView; private @RecentsOrientedState.SurfaceRotation int mFromRotation = Surface.ROTATION_0; private final Rect mDestinationBoundsTransformed = new Rect(); @@ -403,13 +414,11 @@ public Builder setDestinationBounds(Rect destinationBounds) { return this; } - public Builder setCornerRadius(int cornerRadius) { - mCornerRadius = cornerRadius; - return this; - } - - public Builder setShadowRadius(int shadowRadius) { - mShadowRadius = shadowRadius; + /** + * Sets the {@link PipResources} for the animator. + */ + public Builder setPipResources(PipResources res) { + mPipRes = res; return this; } @@ -441,13 +450,22 @@ public Builder setFromRotation(TaskViewSimulator taskViewSimulator, return this; } + public Builder setDisplayCutoutInsets(@NonNull Rect displayCutoutInsets) { + mDisplayCutoutInsets = new Rect(displayCutoutInsets); + return this; + } + public SwipePipToHomeAnimator build() { if (mDestinationBoundsTransformed.isEmpty()) { mDestinationBoundsTransformed.set(mDestinationBounds); } // adjust the mSourceRectHint / mAppBounds by display cutout if applicable. if (mSourceRectHint != null && mDisplayCutoutInsets != null) { - if (mFromRotation == Surface.ROTATION_90) { + if (mFromRotation == Surface.ROTATION_0) { + // TODO: this is to special case the issues on Foldable device + // with display cutout. + mSourceRectHint.offset(mDisplayCutoutInsets.left, mDisplayCutoutInsets.top); + } else if (mFromRotation == Surface.ROTATION_90) { mSourceRectHint.offset(mDisplayCutoutInsets.left, mDisplayCutoutInsets.top); } else if (mFromRotation == Surface.ROTATION_270) { mAppBounds.inset(mDisplayCutoutInsets); @@ -457,19 +475,10 @@ public SwipePipToHomeAnimator build() { mLeash, mSourceRectHint, mAppBounds, mHomeToWindowPositionMap, mStartBounds, mDestinationBounds, mFromRotation, mDestinationBoundsTransformed, - mCornerRadius, mShadowRadius, mAttachedView); + mAttachedView, mPipRes); } } - private static class RotatedPosition { - private final float degree; - private final float positionX; - private final float positionY; - - private RotatedPosition(float degree, float positionX, float positionY) { - this.degree = degree; - this.positionX = positionX; - this.positionY = positionY; - } + private record RotatedPosition(float degree, float positionX, float positionY) { } } diff --git a/quickstep/src/com/android/quickstep/util/SystemUiFlagUtils.kt b/quickstep/src/com/android/quickstep/util/SystemUiFlagUtils.kt index 5f4388c918c..1ff05dae567 100644 --- a/quickstep/src/com/android/quickstep/util/SystemUiFlagUtils.kt +++ b/quickstep/src/com/android/quickstep/util/SystemUiFlagUtils.kt @@ -47,6 +47,22 @@ object SystemUiFlagUtils { !hasAnyFlag(flags, QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY) } + /** + * Taskbar is hidden whenever the device is dreaming. The dreaming state includes the + * interactive dreams, AoD, screen off. Since the SYSUI_STATE_DEVICE_DREAMING only kicks in when + * the device is asleep, the second condition extends ensures that the transition from and to + * the WAKEFULNESS_ASLEEP state also hide the taskbar, and improves the taskbar hide/reveal + * animation timings. The Taskbar can show when dreaming if the glanceable hub is showing on + * top. + */ + @JvmStatic + fun isTaskbarHidden(@SystemUiStateFlags flags: Long): Boolean { + return ((hasAnyFlag(flags, QuickStepContract.SYSUI_STATE_DEVICE_DREAMING) && + !hasAnyFlag(flags, QuickStepContract.SYSUI_STATE_COMMUNAL_HUB_SHOWING)) || + (flags and QuickStepContract.SYSUI_STATE_WAKEFULNESS_MASK) != + QuickStepContract.WAKEFULNESS_AWAKE) + } + private fun hasAnyFlag(@SystemUiStateFlags flags: Long, flagMask: Long): Boolean { return (flags and flagMask) != 0L } diff --git a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java index 5653d932cd2..50e71ebdcde 100644 --- a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java +++ b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java @@ -15,6 +15,7 @@ */ package com.android.quickstep.util; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.view.Display.DEFAULT_DISPLAY; import android.content.Context; @@ -24,26 +25,47 @@ import android.view.Surface; import android.view.WindowManager; import android.view.WindowMetrics; +import android.window.DesktopExperienceFlags; import com.android.internal.policy.SystemBarUtils; +import com.android.launcher3.dagger.LauncherAppSingleton; import com.android.launcher3.logging.FileLog; import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.util.WindowBounds; import com.android.launcher3.util.window.CachedDisplayInfo; import com.android.launcher3.util.window.WindowManagerProxy; -import com.android.quickstep.LauncherActivityInterface; +import com.android.quickstep.SystemUiProxy; +import com.android.quickstep.window.RecentsWindowFlags; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.desktopmode.DesktopState; +import java.util.Collections; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** - * Extension of {@link WindowManagerProxy} with some assumption for the default - * system Launcher + * Extension of {@link WindowManagerProxy} with some assumption for the default system Launcher */ +@LauncherAppSingleton public class SystemWindowManagerProxy extends WindowManagerProxy { + // LC-Note: This is pretty much unused by Launcher3, see [LawnchairWindowManagerProxy] + + private final DesktopVisibilityController mDesktopVisibilityController; + private final SystemUiProxy mSystemUiProxy; + + private final DesktopState mDesktopState; - public SystemWindowManagerProxy(Context context) { + @Inject + public SystemWindowManagerProxy( + DesktopVisibilityController desktopVisibilityController, + SystemUiProxy systemUiProxy, + DesktopState desktopState) { super(true); + mDesktopVisibilityController = desktopVisibilityController; + mSystemUiProxy = systemUiProxy; + mDesktopState = desktopState; } @Override @@ -53,10 +75,61 @@ public Rect getCurrentBounds(Context displayInfoContext) { } @Override - public boolean isInDesktopMode() { - DesktopVisibilityController desktopController = LauncherActivityInterface.INSTANCE - .getDesktopVisibilityController(); - return desktopController != null && desktopController.areDesktopTasksVisible(); + public void registerDesktopVisibilityListener(DesktopVisibilityListener listener) { + mDesktopVisibilityController.registerDesktopVisibilityListener(listener); + } + + @Override + public void unregisterDesktopVisibilityListener(DesktopVisibilityListener listener) { + mDesktopVisibilityController.unregisterDesktopVisibilityListener(listener); + } + + @Override + public boolean isInDesktopMode(int displayId) { + return mDesktopVisibilityController.isInDesktopMode(displayId); + } + + @Override + public boolean isDisplayDesktopFirst(Context displayInfoContext) { + if (!mDesktopState.canEnterDesktopMode()) { + return false; + } + return displayInfoContext.getResources().getConfiguration() + .windowConfiguration.getWindowingMode() == WINDOWING_MODE_FREEFORM; + } + + @Override + public boolean showLockedTaskbarOnHome(Context displayInfoContext) { + if (!DesktopModeStatus.canEnterDesktopMode(displayInfoContext)) { + return false; + } + if (!DesktopModeStatus.enterDesktopByDefaultOnFreeformDisplay(displayInfoContext)) { + return false; + } + + return isDisplayDesktopFirst(displayInfoContext); + } + + @Override + public boolean showDesktopTaskbarForFreeformDisplay(Context displayInfoContext) { + if (!DesktopModeStatus.canEnterDesktopMode(displayInfoContext)) { + return false; + } + + if (!DesktopModeStatus.enterDesktopByDefaultOnFreeformDisplay(displayInfoContext)) { + return false; + } + + if (!DesktopExperienceFlags.ENABLE_DESKTOP_TASKBAR_ON_FREEFORM_DISPLAYS.isTrue()) { + return false; + } + + return isDisplayDesktopFirst(displayInfoContext); + } + + @Override + public boolean isHomeVisible() { + return mSystemUiProxy.getHomeVisibilityState().isHomeVisible(); } @Override @@ -67,10 +140,8 @@ public int getRotation(Context displayInfoContext) { @Override protected int getStatusBarHeight(Context context, boolean isPortrait, int statusBarInset) { - // See b/264656380, calculate the status bar height manually as the inset in the - // system - // server might not be updated by this point yet causing extra DeviceProfile - // updates + // See b/264656380, calculate the status bar height manually as the inset in the system + // server might not be updated by this point yet causing extra DeviceProfile updates return SystemBarUtils.getStatusBarHeight(context); } @@ -79,9 +150,14 @@ public ArrayMap> estimateInternalDisplayBo Context displayInfoContext) { ArrayMap> result = new ArrayMap<>(); WindowManager windowManager = displayInfoContext.getSystemService(WindowManager.class); - Set possibleMaximumWindowMetrics = windowManager - .getPossibleMaximumWindowMetrics(DEFAULT_DISPLAY); - FileLog.d("b/283944974", "possibleMaximumWindowMetrics: " + possibleMaximumWindowMetrics); + Set possibleMaximumWindowMetrics = + null; + try { + possibleMaximumWindowMetrics = windowManager.getPossibleMaximumWindowMetrics(DEFAULT_DISPLAY); + } catch (Throwable t) { + possibleMaximumWindowMetrics = Collections.singleton( + windowManager.getMaximumWindowMetrics()); + } for (WindowMetrics windowMetrics : possibleMaximumWindowMetrics) { CachedDisplayInfo info = getDisplayInfo(windowMetrics, Surface.ROTATION_0); List bounds = estimateWindowBounds(displayInfoContext, info); @@ -95,4 +171,9 @@ protected DisplayCutout rotateCutout(DisplayCutout original, int startWidth, int int fromRotation, int toRotation) { return original.getRotated(startWidth, startHeight, fromRotation, toRotation); } + + @Override + public boolean enableOverviewOnConnectedDisplays() { + return RecentsWindowFlags.enableOverviewOnConnectedDisplays(); + } } diff --git a/quickstep/src/com/android/quickstep/util/TISBindHelper.java b/quickstep/src/com/android/quickstep/util/TISBindHelper.java index 9a010429d35..027dc083ccf 100644 --- a/quickstep/src/com/android/quickstep/util/TISBindHelper.java +++ b/quickstep/src/com/android/quickstep/util/TISBindHelper.java @@ -21,6 +21,7 @@ import android.content.ServiceConnection; import android.os.Handler; import android.os.IBinder; +import android.os.Looper; import android.util.Log; import androidx.annotation.Nullable; @@ -45,7 +46,7 @@ public class TISBindHelper implements ServiceConnection { // Max backoff caps at 5 mins private static final long MAX_BACKOFF_MILLIS = 10 * 60 * 1000; - private final Handler mHandler = new Handler(); + private final Handler mHandler = new Handler(Looper.getMainLooper()); private final Runnable mConnectionRunnable = this::internalBindToTIS; private final Context mContext; private final Consumer mConnectionCallback; diff --git a/quickstep/src/com/android/quickstep/util/TaskGridNavHelper.java b/quickstep/src/com/android/quickstep/util/TaskGridNavHelper.java deleted file mode 100644 index 98d363ef5c7..00000000000 --- a/quickstep/src/com/android/quickstep/util/TaskGridNavHelper.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.util; - -import static java.lang.annotation.RetentionPolicy.SOURCE; - -import androidx.annotation.IntDef; - -import com.android.launcher3.util.IntArray; - -import java.lang.annotation.Retention; - -/** - * Helper class for navigating RecentsView grid tasks via arrow keys and tab. - */ -public class TaskGridNavHelper { - public static final int CLEAR_ALL_PLACEHOLDER_ID = -1; - public static final int INVALID_FOCUSED_TASK_ID = -1; - - public static final int DIRECTION_UP = 0; - public static final int DIRECTION_DOWN = 1; - public static final int DIRECTION_LEFT = 2; - public static final int DIRECTION_RIGHT = 3; - public static final int DIRECTION_TAB = 4; - - @Retention(SOURCE) - @IntDef({DIRECTION_UP, DIRECTION_DOWN, DIRECTION_LEFT, DIRECTION_RIGHT, DIRECTION_TAB}) - public @interface TASK_NAV_DIRECTION {} - - private final IntArray mOriginalTopRowIds; - private IntArray mTopRowIds; - private IntArray mBottomRowIds; - private final int mFocusedTaskId; - - public TaskGridNavHelper(IntArray topIds, IntArray bottomIds, int focusedTaskId) { - mFocusedTaskId = focusedTaskId; - mOriginalTopRowIds = topIds.clone(); - generateTaskViewIdGrid(topIds, bottomIds); - } - - private void generateTaskViewIdGrid(IntArray topRowIdArray, IntArray bottomRowIdArray) { - boolean hasFocusedTask = mFocusedTaskId != INVALID_FOCUSED_TASK_ID; - int maxSize = - Math.max(topRowIdArray.size(), bottomRowIdArray.size()) + (hasFocusedTask ? 1 : 0); - int minSize = - Math.min(topRowIdArray.size(), bottomRowIdArray.size()) + (hasFocusedTask ? 1 : 0); - - // Add the focused task to the beginning of both arrays if it exists. - if (hasFocusedTask) { - topRowIdArray.add(0, mFocusedTaskId); - bottomRowIdArray.add(0, mFocusedTaskId); - } - - // Fill in the shorter array with the ids from the longer one. - for (int i = minSize; i < maxSize; i++) { - if (i >= topRowIdArray.size()) { - topRowIdArray.add(bottomRowIdArray.get(i)); - } else { - bottomRowIdArray.add(topRowIdArray.get(i)); - } - } - - // Add the clear all button to the end of both arrays - topRowIdArray.add(CLEAR_ALL_PLACEHOLDER_ID); - bottomRowIdArray.add(CLEAR_ALL_PLACEHOLDER_ID); - - mTopRowIds = topRowIdArray; - mBottomRowIds = bottomRowIdArray; - } - - /** - * Returns the id of the next page in the grid or -1 for the clear all button. - */ - public int getNextGridPage(int currentPageTaskViewId, int delta, - @TASK_NAV_DIRECTION int direction, boolean cycle) { - boolean inTop = mTopRowIds.contains(currentPageTaskViewId); - int index = inTop ? mTopRowIds.indexOf(currentPageTaskViewId) - : mBottomRowIds.indexOf(currentPageTaskViewId); - int maxSize = Math.max(mTopRowIds.size(), mBottomRowIds.size()); - int nextIndex = index + delta; - - switch (direction) { - case DIRECTION_UP: - case DIRECTION_DOWN: { - return inTop ? mBottomRowIds.get(index) : mTopRowIds.get(index); - } - case DIRECTION_LEFT: { - int boundedIndex = cycle ? nextIndex % maxSize : Math.min(nextIndex, maxSize - 1); - return inTop ? mTopRowIds.get(boundedIndex) - : mBottomRowIds.get(boundedIndex); - } - case DIRECTION_RIGHT: { - int boundedIndex = - cycle ? (nextIndex < 0 ? maxSize - 1 : nextIndex) : Math.max( - nextIndex, 0); - boolean inOriginalTop = mOriginalTopRowIds.contains(currentPageTaskViewId); - return inOriginalTop ? mTopRowIds.get(boundedIndex) - : mBottomRowIds.get(boundedIndex); - } - case DIRECTION_TAB: { - int boundedIndex = - cycle ? nextIndex < 0 ? maxSize - 1 : nextIndex % maxSize : Math.min( - nextIndex, maxSize - 1); - if (delta >= 0) { - return inTop && mTopRowIds.get(index) != mBottomRowIds.get(index) - ? mBottomRowIds.get(index) - : mTopRowIds.get(boundedIndex); - } else { - if (mTopRowIds.contains(currentPageTaskViewId)) { - return mBottomRowIds.get(boundedIndex); - } else { - // Go up to top if there is task above - return mTopRowIds.get(index) != mBottomRowIds.get(index) - ? mTopRowIds.get(index) - : mBottomRowIds.get(boundedIndex); - } - } - } - default: - return currentPageTaskViewId; - } - } -} diff --git a/quickstep/src/com/android/quickstep/util/TaskGridNavHelper.kt b/quickstep/src/com/android/quickstep/util/TaskGridNavHelper.kt new file mode 100644 index 00000000000..bf60b87b899 --- /dev/null +++ b/quickstep/src/com/android/quickstep/util/TaskGridNavHelper.kt @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import com.android.launcher3.util.IntArray +import kotlin.math.abs +import kotlin.math.max + +/** Helper class for navigating RecentsView grid tasks via arrow keys and tab. */ +class TaskGridNavHelper( + private val topIds: IntArray, + bottomIds: IntArray, + largeTileIds: List, + hasAddDesktopButton: Boolean, +) { + private val topRowIds = mutableListOf() + private val bottomRowIds = mutableListOf() + + init { + // Add AddDesktopButton and lage tiles to both rows. + if (hasAddDesktopButton) { + topRowIds += ADD_DESK_PLACEHOLDER_ID + bottomRowIds += ADD_DESK_PLACEHOLDER_ID + } + topRowIds += largeTileIds + bottomRowIds += largeTileIds + + // Add row ids to their respective rows. + topRowIds += topIds + bottomRowIds += bottomIds + + // Fill in the shorter array with the ids from the longer one. + topRowIds += bottomRowIds.takeLast(max(bottomRowIds.size - topRowIds.size, 0)) + bottomRowIds += topRowIds.takeLast(max(topRowIds.size - bottomRowIds.size, 0)) + + // Add the clear all button to the end of both arrays. + topRowIds += CLEAR_ALL_PLACEHOLDER_ID + bottomRowIds += CLEAR_ALL_PLACEHOLDER_ID + } + + /** Returns the id of the next page in the grid or -1 for the clear all button. */ + fun getNextGridPage( + currentPageTaskViewId: Int, + delta: Int, + direction: TaskNavDirection, + cycle: Boolean, + ): Int { + val inTop = topRowIds.contains(currentPageTaskViewId) + val inBottom = bottomRowIds.contains(currentPageTaskViewId) + if (!inTop && !inBottom) { + return currentPageTaskViewId + } + val index = + if (inTop) topRowIds.indexOf(currentPageTaskViewId) + else bottomRowIds.indexOf(currentPageTaskViewId) + val maxSize = max(topRowIds.size, bottomRowIds.size) + val nextIndex = index + delta + + return when (direction) { + TaskNavDirection.UP, + TaskNavDirection.DOWN -> { + if (inTop) bottomRowIds[index] else topRowIds[index] + } + TaskNavDirection.LEFT -> { + val boundedIndex = + if (cycle) nextIndex % maxSize else nextIndex.coerceAtMost(maxSize - 1) + if (inTop) topRowIds[boundedIndex] else bottomRowIds[boundedIndex] + } + TaskNavDirection.RIGHT -> { + val boundedIndex = + if (cycle) (if (nextIndex < 0) maxSize - 1 else nextIndex) + else nextIndex.coerceAtLeast(0) + val inOriginalTop = topIds.contains(currentPageTaskViewId) + if (inOriginalTop) topRowIds[boundedIndex] else bottomRowIds[boundedIndex] + } + TaskNavDirection.TAB -> { + val boundedIndex = + if (cycle) (if (nextIndex < 0) maxSize - 1 else nextIndex % maxSize) + else nextIndex.coerceAtMost(maxSize - 1) + if (delta >= 0) { + if (inTop && topRowIds[index] != bottomRowIds[index]) bottomRowIds[index] + else topRowIds[boundedIndex] + } else { + if (topRowIds.contains(currentPageTaskViewId)) { + if (boundedIndex < 0) { + // If no cycling, always return the first task. + topRowIds[0] + } else { + bottomRowIds[boundedIndex] + } + } else { + // Go up to top if there is task above + if (topRowIds[index] != bottomRowIds[index]) topRowIds[index] + else bottomRowIds[boundedIndex] + } + } + } + else -> currentPageTaskViewId + } + } + + /** + * Returns a sequence of pairs of (TaskView ID, offset) in the grid, ordered according to tab + * navigation, starting from the initial TaskView ID, towards the start or end of the grid. + * + *

A positive delta moves forward in the tab order towards the end of the grid, while a + * negative value moves backward towards the beginning. The offset is the distance between + * columns the tasks are in. + */ + fun gridTaskViewIdOffsetPairInTabOrderSequence( + initialTaskViewId: Int, + towardsStart: Boolean, + ): Sequence> = sequence { + val draggedTaskViewColumn = getColumn(initialTaskViewId) + var nextTaskViewId: Int = initialTaskViewId + var previousTaskViewId: Int = Int.MIN_VALUE + while (nextTaskViewId != previousTaskViewId && nextTaskViewId >= 0) { + previousTaskViewId = nextTaskViewId + nextTaskViewId = + getNextGridPage( + nextTaskViewId, + if (towardsStart) -1 else 1, + TaskNavDirection.TAB, + cycle = false, + ) + if (nextTaskViewId >= 0 && nextTaskViewId != previousTaskViewId) { + val columnOffset = abs(getColumn(nextTaskViewId) - draggedTaskViewColumn) + yield(Pair(nextTaskViewId, columnOffset)) + } + } + } + + /** Returns the column of a task's id in the grid. */ + private fun getColumn(taskViewId: Int): Int = + if (topRowIds.contains(taskViewId)) topRowIds.indexOf(taskViewId) + else bottomRowIds.indexOf(taskViewId) + + enum class TaskNavDirection { + UP, + DOWN, + LEFT, + RIGHT, + TAB, + } + + companion object { + const val CLEAR_ALL_PLACEHOLDER_ID: Int = -1 + const val ADD_DESK_PLACEHOLDER_ID: Int = -2 + } +} diff --git a/quickstep/src/com/android/quickstep/util/TaskKeyByLastActiveTimeCache.java b/quickstep/src/com/android/quickstep/util/TaskKeyByLastActiveTimeCache.java index 69137cc1b6a..43ef39c2568 100644 --- a/quickstep/src/com/android/quickstep/util/TaskKeyByLastActiveTimeCache.java +++ b/quickstep/src/com/android/quickstep/util/TaskKeyByLastActiveTimeCache.java @@ -17,6 +17,7 @@ import android.util.Log; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.systemui.shared.recents.model.Task; @@ -94,6 +95,7 @@ public synchronized void removeAll(Predicate keyCheck) { * Gets the entry if it is still valid */ @Override + @Nullable public synchronized V getAndInvalidateIfModified(Task.TaskKey key) { Entry entry = mMap.get(key.id); if (entry != null && entry.mKey.windowingMode == key.windowingMode diff --git a/quickstep/src/com/android/quickstep/util/TaskKeyCache.java b/quickstep/src/com/android/quickstep/util/TaskKeyCache.java index 8ee78ab0bab..9df0993a7bd 100644 --- a/quickstep/src/com/android/quickstep/util/TaskKeyCache.java +++ b/quickstep/src/com/android/quickstep/util/TaskKeyCache.java @@ -15,6 +15,8 @@ */ package com.android.quickstep.util; +import androidx.annotation.Nullable; + import com.android.systemui.shared.recents.model.Task; import java.util.function.Predicate; @@ -44,6 +46,7 @@ public interface TaskKeyCache { /** * Gets the entry if it is still valid. */ + @Nullable V getAndInvalidateIfModified(Task.TaskKey key); /** diff --git a/quickstep/src/com/android/quickstep/util/TaskKeyLruCache.java b/quickstep/src/com/android/quickstep/util/TaskKeyLruCache.java index 89f5d41dad7..9fe8cc954db 100644 --- a/quickstep/src/com/android/quickstep/util/TaskKeyLruCache.java +++ b/quickstep/src/com/android/quickstep/util/TaskKeyLruCache.java @@ -17,6 +17,8 @@ import android.util.Log; +import androidx.annotation.Nullable; + import com.android.systemui.shared.recents.model.Task.TaskKey; import java.util.LinkedHashMap; @@ -59,6 +61,7 @@ public synchronized void removeAll(Predicate keyCheck) { /** * Gets the entry if it is still valid */ + @Nullable public synchronized V getAndInvalidateIfModified(TaskKey key) { Entry entry = mMap.get(key.id); diff --git a/quickstep/src/com/android/quickstep/util/TaskRemovedDuringLaunchListener.java b/quickstep/src/com/android/quickstep/util/TaskRemovedDuringLaunchListener.java index e80d2a6d3f8..40a328ccfc8 100644 --- a/quickstep/src/com/android/quickstep/util/TaskRemovedDuringLaunchListener.java +++ b/quickstep/src/com/android/quickstep/util/TaskRemovedDuringLaunchListener.java @@ -98,10 +98,7 @@ private void checkTaskLaunchFailed() { final Runnable taskLaunchFailedCallback = mTaskLaunchFailedCallback; RecentsModel.INSTANCE.get(mContext).isTaskRemoved(mLaunchedTaskId, (taskRemoved) -> { if (taskRemoved) { - ActiveGestureLog.INSTANCE.addLog( - new ActiveGestureLog.CompoundString("Launch failed, task (id=") - .append(launchedTaskId) - .append(") finished mid transition")); + ActiveGestureProtoLogProxy.logTaskLaunchFailed(launchedTaskId); taskLaunchFailedCallback.run(); } }, (task) -> true /* filter */); diff --git a/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java b/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java index 91e83769901..6e2d469d185 100644 --- a/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java +++ b/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java @@ -16,16 +16,11 @@ package com.android.quickstep.util; -import static android.app.ActivityTaskManager.INVALID_TASK_ID; - -import android.app.Activity; import android.app.ActivityManager; import android.util.Log; import androidx.annotation.NonNull; -import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter; -import com.android.quickstep.RecentsModel; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java index fcf303fdd98..f17aad1577e 100644 --- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java +++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java @@ -15,19 +15,18 @@ */ package com.android.quickstep.util; +import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; -import static com.android.launcher3.Flags.enableGridOnlyOverview; import static com.android.launcher3.states.RotationHelper.deltaRotation; import static com.android.launcher3.touch.PagedOrientationHandler.MATRIX_POST_TRANSLATE; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED; -import static com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import static com.android.quickstep.util.RecentsOrientedState.postDisplayRotation; import static com.android.quickstep.util.RecentsOrientedState.preDisplayRotation; -import static com.android.quickstep.util.SplitScreenUtils.convertLauncherSplitBoundsToShell; +import static com.android.wm.shell.Flags.enableFlexibleTwoAppSplit; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED; import android.animation.TimeInterpolator; import android.content.Context; @@ -38,25 +37,28 @@ import android.graphics.RectF; import android.util.Log; import android.view.RemoteAnimationTarget; +import android.view.SurfaceControl; import android.view.animation.Interpolator; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.app.animation.Interpolators; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.util.TraceHelper; import com.android.quickstep.BaseActivityInterface; import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.DesktopFullscreenDrawParams; +import com.android.quickstep.FallbackWindowInterface; +import com.android.quickstep.FullscreenDrawParams; import com.android.quickstep.TaskAnimationManager; import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; -import com.android.quickstep.views.TaskView.FullscreenDrawParams; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.recents.utilities.PreviewPositionHelper; +import com.android.wm.shell.shared.split.SplitBounds; +import com.android.wm.shell.shared.split.SplitScreenConstants; /** * A utility class which emulates the layout behavior of TaskView and RecentsView @@ -83,8 +85,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { private PointF mPivotOverride = null; private final PointF mPivot = new PointF(); private DeviceProfile mDp; - @StagePosition - private int mStagePosition = STAGE_POSITION_UNDEFINED; + @SplitScreenConstants.SplitPosition + private int mSplitPosition = SPLIT_POSITION_UNDEFINED; private final Matrix mMatrix = new Matrix(); private final Matrix mMatrixTmp = new Matrix(); @@ -99,11 +101,11 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { private final FullscreenDrawParams mCurrentFullscreenParams; public final AnimatedFloat taskPrimaryTranslation = new AnimatedFloat(); public final AnimatedFloat taskSecondaryTranslation = new AnimatedFloat(); + public final AnimatedFloat taskGridTranslationX = new AnimatedFloat(); + public final AnimatedFloat taskGridTranslationY = new AnimatedFloat(); // Carousel properties public final AnimatedFloat carouselScale = new AnimatedFloat(); - public final AnimatedFloat carouselPrimaryTranslation = new AnimatedFloat(); - public final AnimatedFloat carouselSecondaryTranslation = new AnimatedFloat(); // RecentsView properties public final AnimatedFloat recentsViewScale = new AnimatedFloat(); @@ -117,20 +119,30 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { private int mOrientationStateId; private SplitBounds mSplitBounds; private Boolean mDrawsBelowRecents = null; + private Boolean mDrawAboveOtherApps = null; private boolean mIsGridTask; - private boolean mIsDesktopTask; - private boolean mScaleToCarouselTaskSize = false; - private int mTaskRectTranslationX; - private int mTaskRectTranslationY; + private final boolean mIsDesktopTask; + private boolean mIsAnimatingToCarousel = false; + private final int mDesktopTaskIndex; - public TaskViewSimulator(Context context, BaseContainerInterface sizeStrategy) { + @Nullable + private Matrix mTaskRectTransform = null; + @Nullable + private Matrix mTaskRectTransformInverse = null; + + public TaskViewSimulator(Context context, BaseContainerInterface sizeStrategy, + boolean isDesktop, int desktopTaskIndex) { mContext = context; mSizeStrategy = sizeStrategy; + mIsDesktopTask = isDesktop; + mDesktopTaskIndex = desktopTaskIndex; mOrientationState = TraceHelper.allowIpcs("TaskViewSimulator.init", () -> new RecentsOrientedState(context, sizeStrategy, i -> { })); mOrientationState.setGestureActive(true); - mCurrentFullscreenParams = new FullscreenDrawParams(context); + mCurrentFullscreenParams = mIsDesktopTask + ? new DesktopFullscreenDrawParams(context) + : new FullscreenDrawParams(context); mOrientationStateId = mOrientationState.getStateId(); Resources resources = context.getResources(); mIsRecentsRtl = mOrientationState.getOrientationHandler().getRecentsRtlSetting(resources); @@ -144,10 +156,16 @@ public void setDp(DeviceProfile dp) { mDp = dp; mLayoutValid = false; mOrientationState.setDeviceProfile(dp); + if (enableGridOnlyOverview()) { + mIsGridTask = dp.getDeviceProperties().isTablet() && !mIsDesktopTask; + } calculateTaskSize(); } - private void calculateTaskSize() { + /** + * Updates the task size. + */ + public void calculateTaskSize() { if (mDp == null) { return; } @@ -155,14 +173,16 @@ private void calculateTaskSize() { if (mIsGridTask) { mSizeStrategy.calculateGridTaskSize(mContext, mDp, mFullTaskSize, mOrientationState.getOrientationHandler()); + if (enableGridOnlyOverview()) { + mSizeStrategy.calculateTaskSize(mContext, mDp, mCarouselTaskSize, + mOrientationState.getOrientationHandler()); + } } else { mSizeStrategy.calculateTaskSize(mContext, mDp, mFullTaskSize, mOrientationState.getOrientationHandler()); - } - - if (enableGridOnlyOverview()) { - mSizeStrategy.calculateCarouselTaskSize(mContext, mDp, mCarouselTaskSize, - mOrientationState.getOrientationHandler()); + if (enableGridOnlyOverview()) { + mCarouselTaskSize.set(mFullTaskSize); + } } if (mSplitBounds != null) { @@ -171,24 +191,31 @@ private void calculateTaskSize() { // sized task space bounds mTaskRect.set(mFullTaskSize); mOrientationState.getOrientationHandler() - .setSplitTaskSwipeRect(mDp, mTaskRect, mSplitBounds, mStagePosition); - mTaskRect.offset(mTaskRectTranslationX, mTaskRectTranslationY); + .setSplitTaskSwipeRect(mDp, mTaskRect, mSplitBounds, mSplitPosition); } else if (mIsDesktopTask) { // For desktop, tasks can take up only part of the screen size. // Full task size represents the whole screen size, but scaled down to fit in recents. // Task rect will represent the scaled down thumbnail position and is placed inside // full task size as it is on the home screen. PointF fullscreenTaskDimension = new PointF(); - BaseActivityInterface.getTaskDimension(mContext, mDp, fullscreenTaskDimension); + BaseActivityInterface.getTaskDimension(mDp, fullscreenTaskDimension); // Calculate the scale down factor used in recents float scale = mFullTaskSize.width() / fullscreenTaskDimension.x; mTaskRect.set(mThumbnailPosition); mTaskRect.scale(scale); // Ensure the task rect is inside the full task rect mTaskRect.offset(mFullTaskSize.left, mFullTaskSize.top); + + Rect taskDimension = new Rect(0, 0, (int) fullscreenTaskDimension.x, + (int) fullscreenTaskDimension.y); + mTmpCropRect.set(mThumbnailPosition); + if (mTmpCropRect.setIntersect(taskDimension, mThumbnailPosition)) { + mTmpCropRect.offset(-mThumbnailPosition.left, -mThumbnailPosition.top); + } else { + mTmpCropRect.setEmpty(); + } } else { mTaskRect.set(mFullTaskSize); - mTaskRect.offset(mTaskRectTranslationX, mTaskRectTranslationY); } } @@ -207,33 +234,14 @@ public float getFullScreenScale() { if (mDp == null) { return 1; } - // Copy mFullTaskSize instead of updating it directly so it could be reused next time - // without recalculating - Rect scaleRect = new Rect(); - if (mScaleToCarouselTaskSize) { - scaleRect.set(mCarouselTaskSize); - } else { - scaleRect.set(mFullTaskSize); - } - scaleRect.offset(mTaskRectTranslationX, mTaskRectTranslationY); - float scale = mOrientationState.getFullScreenScaleAndPivot(scaleRect, mDp, mPivot); + float scale = mOrientationState.getFullScreenScaleAndPivot( + mIsAnimatingToCarousel ? mCarouselTaskSize : mFullTaskSize, mDp, mPivot); if (mPivotOverride != null) { mPivot.set(mPivotOverride); } return scale; } - /** - * Sets the targets which the simulator will control - */ - public void setPreview(RemoteAnimationTarget runningTarget) { - setPreviewBounds( - runningTarget.startBounds == null - ? (Utilities.ATLEAST_R ? runningTarget.screenSpaceBounds : runningTarget.sourceContainerBounds) - : runningTarget.startBounds, - runningTarget.contentInsets); - } - /** * Sets the targets which the simulator will control specifically for targets to animate when * in split screen @@ -241,15 +249,21 @@ public void setPreview(RemoteAnimationTarget runningTarget) { * @param splitInfo set to {@code null} when not in staged split mode */ public void setPreview(RemoteAnimationTarget runningTarget, SplitBounds splitInfo) { - setPreview(runningTarget); mSplitBounds = splitInfo; if (mSplitBounds == null) { - mStagePosition = STAGE_POSITION_UNDEFINED; + setPreviewBounds( + runningTarget.startBounds != null + ? runningTarget.startBounds : runningTarget.screenSpaceBounds, + runningTarget.contentInsets); + mSplitPosition = SPLIT_POSITION_UNDEFINED; } else { - mStagePosition = runningTarget.taskId == splitInfo.leftTopTaskId - ? STAGE_POSITION_TOP_OR_LEFT : STAGE_POSITION_BOTTOM_OR_RIGHT; - mPositionHelper.setSplitBounds(convertLauncherSplitBoundsToShell(mSplitBounds), - mStagePosition); + // Always use the end bounds for split as we may be reparenting the task from fullscreen + setPreviewBounds(runningTarget.screenSpaceBounds, runningTarget.contentInsets); + mSplitPosition = runningTarget.taskId == splitInfo.leftTopTaskId + ? SPLIT_POSITION_TOP_OR_LEFT : SPLIT_POSITION_BOTTOM_OR_RIGHT; + if (enableFlexibleTwoAppSplit()) { + mPositionHelper.setSplitBounds(mSplitBounds, mSplitPosition); + } } calculateTaskSize(); } @@ -277,6 +291,10 @@ public void setDrawsBelowRecents(boolean drawsBelowRecents) { mDrawsBelowRecents = drawsBelowRecents; } + public boolean getDrawsBelowRecents() { + return mDrawsBelowRecents != null ? mDrawsBelowRecents : false; + } + /** * Sets whether the task is part of overview grid and not being focused. */ @@ -285,83 +303,34 @@ public void setIsGridTask(boolean isGridTask) { } /** - * Sets whether this task is part of desktop tasks in overview. + * Sets whether drawing this app above other apps during animation. It's currently used when + * activating an app window from the exploded desktop view which will launch the desktop tile + * and exit Overview. */ - public void setIsDesktopTask(boolean desktop) { - mIsDesktopTask = desktop; + public void setDrawsAboveOtherApps(boolean drawsAboveOtherApps) { + mDrawAboveOtherApps = drawsAboveOtherApps; } /** - * Apply translations on TaskRect's starting location. + * Override the pivot used to apply scale changes. */ - public void setTaskRectTranslation(int taskRectTranslationX, int taskRectTranslationY) { - mTaskRectTranslationX = taskRectTranslationX; - mTaskRectTranslationY = taskRectTranslationY; - // Re-calculate task size after changing translation - calculateTaskSize(); + public void setPivotOverride(PointF pivotOverride) { + mPivotOverride = pivotOverride; + getFullScreenScale(); } /** - * Adds animation for all the components corresponding to transition from an app to overview. + * Adds animation for all the components corresponding to transition from an app to carousel. */ - public void addAppToOverviewAnim(PendingAnimation pa, Interpolator interpolator) { + public void addAppToCarouselAnim(PendingAnimation pa, Interpolator interpolator, + boolean isHandlingAtomicEvent) { pa.addFloat(fullScreenProgress, AnimatedFloat.VALUE, 1, 0, interpolator); - float fullScreenScale; - if (enableGridOnlyOverview() && mDp.isTablet && mDp.isGestureMode) { - // Move pivot to top right edge of the screen, to avoid task scaling down in opposite - // direction of app window movement, otherwise the animation will wiggle left and right. - // Also translate the app window to top right edge of the screen to simplify - // calculations. - taskPrimaryTranslation.value = mIsRecentsRtl - ? mDp.widthPx - mFullTaskSize.right - : -mFullTaskSize.left; - taskSecondaryTranslation.value = -mFullTaskSize.top; - mPivotOverride = new PointF(mIsRecentsRtl ? mDp.widthPx : 0, 0); - - // Scale down to the carousel and use the carousel Rect to calculate fullScreenScale. - mScaleToCarouselTaskSize = true; + if (enableGridOnlyOverview() && mDp.getDeviceProperties().isTablet() && !isHandlingAtomicEvent) { + mIsAnimatingToCarousel = true; carouselScale.value = mCarouselTaskSize.width() / (float) mFullTaskSize.width(); - fullScreenScale = getFullScreenScale(); - - float carouselPrimaryTranslationTarget = mIsRecentsRtl - ? mCarouselTaskSize.right - mDp.widthPx - : mCarouselTaskSize.left; - float carouselSecondaryTranslationTarget = mCarouselTaskSize.top; - - // Expected carousel position's center is in the middle, and invariant of - // recentsViewScale. - float exceptedCarouselCenterX = mCarouselTaskSize.centerX(); - // Animating carousel translations linearly will result in a curved path, therefore - // we'll need to calculate the expected translation at each recentsView scale. Luckily - // primary and secondary follow the same translation, and primary is used here due to - // it being simpler. - Interpolator carouselTranslationInterpolator = t -> { - // recentsViewScale is calculated rather than using recentsViewScale.value, so that - // this interpolator works independently even if recentsViewScale don't animate. - float recentsViewScale = - Utilities.mapToRange(t, 0, 1, fullScreenScale, 1, Interpolators.LINEAR); - // Without the translation, the app window will animate from fullscreen into top - // right corner. - float expectedTaskCenterX = mIsRecentsRtl - ? mDp.widthPx - mCarouselTaskSize.width() * recentsViewScale / 2f - : mCarouselTaskSize.width() * recentsViewScale / 2f; - // Calculate the expected translation, then work back the animatedFraction that - // results in this value. - float carouselPrimaryTranslation = - (exceptedCarouselCenterX - expectedTaskCenterX) / recentsViewScale; - return carouselPrimaryTranslation / carouselPrimaryTranslationTarget; - }; - - // Use addAnimatedFloat so this animation can later be canceled and animate to a - // different value in RecentsView.onPrepareGestureEndAnimation. - pa.addAnimatedFloat(carouselPrimaryTranslation, 0, carouselPrimaryTranslationTarget, - carouselTranslationInterpolator); - pa.addAnimatedFloat(carouselSecondaryTranslation, 0, carouselSecondaryTranslationTarget, - carouselTranslationInterpolator); - } else { - fullScreenScale = getFullScreenScale(); } - pa.addFloat(recentsViewScale, AnimatedFloat.VALUE, fullScreenScale, 1, interpolator); + pa.addFloat(recentsViewScale, AnimatedFloat.VALUE, getFullScreenScale(), 1, + interpolator); } /** @@ -388,7 +357,7 @@ public RectF getCurrentCropRect() { public RectF getCurrentRect() { RectF result = getCurrentCropRect(); mMatrixTmp.set(mMatrix); - preDisplayRotation(mOrientationState.getDisplayRotation(), mDp.widthPx, mDp.heightPx, + preDisplayRotation(mOrientationState.getDisplayRotation(), mDp.getDeviceProperties().getWidthPx(), mDp.getDeviceProperties().getHeightPx(), mMatrixTmp); mMatrixTmp.mapRect(result); return result; @@ -405,16 +374,56 @@ public Matrix getCurrentMatrix() { return mMatrix; } + /** + * Sets a matrix used to transform the position of tasks. If set, this matrix is applied to + * the task rect after the task has been scaled and positioned inside the fulltask, but + * before scaling and translation of the whole recents view is performed. + */ + public void setTaskRectTransform(@Nullable Matrix taskRectTransform) { + mTaskRectTransform = taskRectTransform; + if (mTaskRectTransform != null) { + // The inverse transform is used to adjust the corner radius of tasks. Since not all + // tasks will have a taskRectTransform, we construct it lazily. + if (mTaskRectTransformInverse == null) { + mTaskRectTransformInverse = new Matrix(); + } + mTaskRectTransform.invert(mTaskRectTransformInverse); + } + } + + /** + * Calculates the crop rect for desktop tasks given the current matrix. + */ + private void calculateDesktopTaskCropRect() { + // The approach here is to map a rect that represents the untransformed thumbnail position + // using the current matrix. This will give us a rect that can be intersected with + // [mFullTaskSize]. Using the intersection, we then compute how much of the task window that + // needs to be cropped (which will be nothing if the window is entirely within the desktop). + mTempRectF.set(0, 0, mThumbnailPosition.width(), mThumbnailPosition.height()); + mMatrix.mapRect(mTempRectF); + + float offsetX = mTempRectF.left; + float offsetY = mTempRectF.top; + float scale = mThumbnailPosition.width() / mTempRectF.width(); + + if (mTempRectF.intersect(mFullTaskSize.left, mFullTaskSize.top, mFullTaskSize.right, + mFullTaskSize.bottom)) { + mTempRectF.offset(-offsetX, -offsetY); + mTempRectF.scale(scale); + mTempRectF.round(mTmpCropRect); + } + } + /** * Applies the rotation on the matrix to so that it maps from launcher coordinate space to * window coordinate space. */ public void applyWindowToHomeRotation(Matrix matrix) { - matrix.postTranslate(mDp.windowX, mDp.windowY); + matrix.postTranslate(mDp.getDeviceProperties().getWindowX(), mDp.getDeviceProperties().getWindowY()); postDisplayRotation(deltaRotation( mOrientationState.getRecentsActivityRotation(), mOrientationState.getDisplayRotation()), - mDp.widthPx, mDp.heightPx, matrix); + mDp.getDeviceProperties().getWidthPx(), mDp.getDeviceProperties().getHeightPx(), matrix); } /** @@ -449,7 +458,9 @@ public void apply(TransformParams params, @Nullable SurfaceTransaction surfaceTr boolean isRtlEnabled = !mIsRecentsRtl; mPositionHelper.updateThumbnailMatrix( mThumbnailPosition, mThumbnailData, mTaskRect.width(), mTaskRect.height(), - mDp.isTablet, mOrientationState.getRecentsActivityRotation(), isRtlEnabled); + mDp.getDeviceProperties().isTablet(), + mOrientationState.getRecentsActivityRotation(), isRtlEnabled, + mContext.getResources().getDisplayMetrics().densityDpi); mPositionHelper.getMatrix().invert(mInversePositionMatrix); if (DEBUG) { Log.d(TAG, " taskRect: " + mTaskRect); @@ -466,18 +477,29 @@ public void apply(TransformParams params, @Nullable SurfaceTransaction surfaceTr mMatrix.set(mPositionHelper.getMatrix()); - // Apply TaskView matrix: taskRect, translate + // Apply TaskView matrix: taskRect, optional transform, translate mMatrix.postTranslate(mTaskRect.left, mTaskRect.top); + if (mTaskRectTransform != null) { + mMatrix.postConcat(mTaskRectTransform); + + // Calculate cropping for desktop tasks. The order is important since it uses the + // current matrix. Therefore we calculate it here, after applying the task rect + // transform, but before applying scaling/translation that affects the whole + // recentsview. + if (mIsDesktopTask) { + calculateDesktopTaskCropRect(); + } + } + mOrientationState.getOrientationHandler().setPrimary(mMatrix, MATRIX_POST_TRANSLATE, taskPrimaryTranslation.value); mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE, taskSecondaryTranslation.value); + mMatrix.postTranslate(taskGridTranslationX.value, taskGridTranslationY.value); - mMatrix.postScale(carouselScale.value, carouselScale.value, mPivot.x, mPivot.y); - mOrientationState.getOrientationHandler().setPrimary(mMatrix, MATRIX_POST_TRANSLATE, - carouselPrimaryTranslation.value); - mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE, - carouselSecondaryTranslation.value); + mMatrix.postScale(carouselScale.value, carouselScale.value, + mIsRecentsRtl ? mCarouselTaskSize.right : mCarouselTaskSize.left, + mCarouselTaskSize.top); mOrientationState.getOrientationHandler().setPrimary( mMatrix, MATRIX_POST_TRANSLATE, recentsViewScroll.value); @@ -490,10 +512,12 @@ public void apply(TransformParams params, @Nullable SurfaceTransaction surfaceTr recentsViewPrimaryTranslation.value); applyWindowToHomeRotation(mMatrix); - // Crop rect is the inverse of thumbnail matrix - mTempRectF.set(0, 0, taskWidth, taskHeight); - mInversePositionMatrix.mapRect(mTempRectF); - mTempRectF.roundOut(mTmpCropRect); + if (!mIsDesktopTask) { + // Crop rect is the inverse of thumbnail matrix + mTempRectF.set(0, 0, taskWidth, taskHeight); + mInversePositionMatrix.mapRect(mTempRectF); + mTempRectF.roundOut(mTmpCropRect); + } params.setProgress(1f - fullScreenProgress); params.applySurfaceParams(surfaceTransaction == null @@ -511,8 +535,8 @@ public void apply(TransformParams params, @Nullable SurfaceTransaction surfaceTr + " taskRect: " + mTaskRect + " taskPrimaryT: " + taskPrimaryTranslation.value + " taskSecondaryT: " + taskSecondaryTranslation.value - + " carouselPrimaryT: " + carouselPrimaryTranslation.value - + " carouselSecondaryT: " + carouselSecondaryTranslation.value + + " taskGridTranslationX: " + taskGridTranslationX.value + + " taskGridTranslationY: " + taskGridTranslationY.value + " recentsPrimaryT: " + recentsViewPrimaryTranslation.value + " recentsSecondaryT: " + recentsViewSecondaryTranslation.value + " recentsScroll: " + recentsViewScroll.value @@ -527,23 +551,30 @@ public void onBuildTargetParams( .setWindowCrop(mTmpCropRect) .setCornerRadius(getCurrentCornerRadius()); - // If mDrawsBelowRecents is unset, no reordering will be enforced. + if (mDrawsBelowRecents == null && mDrawAboveOtherApps == null) { + // No reordering will be enforced. + return; + } + + // In shell transitions, the animation leashes are reparented to an animation container + // so we can bump layers as needed. + int baseLayer = app.prefixOrderIndex - mDesktopTaskIndex; + // 1000/2000 are arbitrary numbers to give room for multiple layers. if (mDrawsBelowRecents != null) { - // In legacy transitions, the animation leashes remain in same hierarchy in the - // TaskDisplayArea, so we don't want to bump the layer too high otherwise it will - // conflict with layers that WM core positions (ie. the input consumers). For shell - // transitions, the animation leashes are reparented to an animation container so we - // can bump layers as needed. - if (ENABLE_SHELL_TRANSITIONS) { - builder.setLayer(mDrawsBelowRecents - ? Integer.MIN_VALUE + app.prefixOrderIndex - // 1000 is an arbitrary number to give room for multiple layers. - : Integer.MAX_VALUE - 1000 + app.prefixOrderIndex); - } else { - builder.setLayer(mDrawsBelowRecents - ? Integer.MIN_VALUE + app.prefixOrderIndex - : 0); - } + baseLayer += mDrawsBelowRecents ? Integer.MIN_VALUE + 2000 : Integer.MAX_VALUE - 2000; + } + if (mDrawAboveOtherApps != null && mDrawAboveOtherApps) { + baseLayer += 1000; + } + SurfaceControl overviewOverlay; + if (mSizeStrategy instanceof FallbackWindowInterface windowInterface + && (overviewOverlay = windowInterface.getOverviewOverlay()) != null + && app.taskInfo.getActivityType() != ACTIVITY_TYPE_HOME) { + // the Overview surface will live on the overviewOverlayLayer meaning that we + // allow taskview simulator be set above/below this layer as needed for animations. + builder.setRelativeLayer(overviewOverlay, baseLayer); + } else { + builder.setLayer(baseLayer); } } @@ -552,12 +583,18 @@ public void onBuildTargetParams( * TaskView */ public float getCurrentCornerRadius() { - float visibleRadius = mCurrentFullscreenParams.getCurrentDrawnCornerRadius(); + float visibleRadius = mCurrentFullscreenParams.getCurrentCornerRadius(); mTempPoint[0] = visibleRadius; mTempPoint[1] = 0; mInversePositionMatrix.mapVectors(mTempPoint); + // If this task has another transform of it, then its scale also needs to be taken into + // consideration for the radius. + if (mTaskRectTransform != null && mTaskRectTransformInverse != null) { + mTaskRectTransformInverse.mapVectors(mTempPoint); + } + // Ideally we should use square-root. This is an optimization as one of the dimension is 0. return Math.max(Math.abs(mTempPoint[0]), Math.abs(mTempPoint[1])); } -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/quickstep/util/TaskVisualsChangeListener.java b/quickstep/src/com/android/quickstep/util/TaskVisualsChangeListener.java index 66bff730bfc..519ef60ecae 100644 --- a/quickstep/src/com/android/quickstep/util/TaskVisualsChangeListener.java +++ b/quickstep/src/com/android/quickstep/util/TaskVisualsChangeListener.java @@ -16,6 +16,7 @@ package com.android.quickstep.util; +import android.annotation.NonNull; import android.os.UserHandle; import com.android.systemui.shared.recents.model.Task; @@ -36,7 +37,7 @@ default Task onTaskThumbnailChanged(int taskId, ThumbnailData thumbnailData) { /** * Called when the icon for a task changes */ - default void onTaskIconChanged(String pkg, UserHandle user) {} + default void onTaskIconChanged(@NonNull String pkg, @NonNull UserHandle user) {} /** * Called when the icon for a task changes diff --git a/quickstep/src/com/android/quickstep/util/TransformParams.java b/quickstep/src/com/android/quickstep/util/TransformParams.java index 9bad1108bb8..c70061f635a 100644 --- a/quickstep/src/com/android/quickstep/util/TransformParams.java +++ b/quickstep/src/com/android/quickstep/util/TransformParams.java @@ -19,9 +19,16 @@ import android.util.FloatProperty; import android.view.RemoteAnimationTarget; +import android.view.SurfaceControl; +import android.window.TransitionInfo; + +import androidx.annotation.VisibleForTesting; import com.android.quickstep.RemoteAnimationTargets; import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; +import com.android.window.flags2.Flags; + +import java.util.function.Supplier; public class TransformParams { @@ -56,15 +63,24 @@ public Float get(TransformParams params) { private float mTargetAlpha; private float mCornerRadius; private RemoteAnimationTargets mTargetSet; + private TransitionInfo mTransitionInfo; + private boolean mCornerRadiusIsOverridden; private SurfaceTransactionApplier mSyncTransactionApplier; + private Supplier mSurfaceTransactionSupplier; private BuilderProxy mHomeBuilderProxy = BuilderProxy.ALWAYS_VISIBLE; private BuilderProxy mBaseBuilderProxy = BuilderProxy.ALWAYS_VISIBLE; public TransformParams() { + this(SurfaceTransaction::new); + } + + @VisibleForTesting + public TransformParams(Supplier surfaceTransactionSupplier) { mProgress = 0; mTargetAlpha = 1; mCornerRadius = -1; + mSurfaceTransactionSupplier = surfaceTransactionSupplier; } /** @@ -106,6 +122,15 @@ public TransformParams setTargetSet(RemoteAnimationTargets targetSet) { return this; } + /** + * Provides the {@code TransitionInfo} of the transition that this transformation stems from. + */ + public TransformParams setTransitionInfo(TransitionInfo transitionInfo) { + mTransitionInfo = transitionInfo; + mCornerRadiusIsOverridden = false; + return this; + } + /** * Sets the SyncRtSurfaceTransactionApplierCompat that will apply the SurfaceParams that * are computed based on these TransformParams. @@ -136,26 +161,31 @@ public TransformParams setHomeBuilderProxy(BuilderProxy proxy) { /** Builds the SurfaceTransaction from the given BuilderProxy params. */ public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) { RemoteAnimationTargets targets = mTargetSet; - SurfaceTransaction transaction = new SurfaceTransaction(); + SurfaceTransaction transaction = mSurfaceTransactionSupplier.get(); if (targets == null) { return transaction; } for (int i = 0; i < targets.unfilteredApps.length; i++) { RemoteAnimationTarget app = targets.unfilteredApps[i]; SurfaceProperties builder = transaction.forSurface(app.leash); + BuilderProxy targetProxy = + app.windowConfiguration.getActivityType() == ACTIVITY_TYPE_HOME + ? mHomeBuilderProxy + : (app.mode == targets.targetMode ? proxy : mBaseBuilderProxy); if (app.mode == targets.targetMode) { - int activityType = app.windowConfiguration.getActivityType(); - if (activityType == ACTIVITY_TYPE_HOME) { - mHomeBuilderProxy.onBuildTargetParams(builder, app, this); - } else { - builder.setAlpha(getTargetAlpha()); - proxy.onBuildTargetParams(builder, app, this); - } - } else { - mBaseBuilderProxy.onBuildTargetParams(builder, app, this); + builder.setAlpha(getTargetAlpha()); + } + targetProxy.onBuildTargetParams(builder, app, this); + // Override the corner radius for {@code app} with the leash used by Shell, so that it + // doesn't interfere with the window clip and corner radius applied here. + // Only override the corner radius once - so that we don't accidentally override at the + // end of transition after WM Shell has reset the corner radius of the task. + if (!mCornerRadiusIsOverridden) { + overrideFreeformChangeLeashCornerRadiusToZero(app, transaction.getTransaction()); } } + mCornerRadiusIsOverridden = true; // always put wallpaper layer to bottom. final int wallpaperLength = targets.wallpapers != null ? targets.wallpapers.length : 0; @@ -166,7 +196,33 @@ public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) { return transaction; } - // Pubic getters so outside packages can read the values. + private void overrideFreeformChangeLeashCornerRadiusToZero( + RemoteAnimationTarget app, SurfaceControl.Transaction transaction) { + if (!Flags.enableDesktopRecentsTransitionsCornersBugfix()) { + return; + } + if (app.taskInfo == null || !app.taskInfo.isFreeform()) { + return; + } + + SurfaceControl changeLeash = getChangeLeashForApp(app); + if (changeLeash != null) { + transaction.setCornerRadius(changeLeash, 0); + } + } + + private SurfaceControl getChangeLeashForApp(RemoteAnimationTarget app) { + if (mTransitionInfo == null) return null; + for (TransitionInfo.Change change : mTransitionInfo.getChanges()) { + if (change.getTaskInfo() == null) continue; + if (change.getTaskInfo().taskId == app.taskId) { + return change.getLeash(); + } + } + return null; + } + + // Public getters so outside packages can read the values. public float getProgress() { return mProgress; @@ -201,4 +257,4 @@ public interface BuilderProxy { void onBuildTargetParams(SurfaceProperties builder, RemoteAnimationTarget app, TransformParams params); } -} \ No newline at end of file +} diff --git a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java index 0a97793b289..32e0e132e05 100644 --- a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java +++ b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java @@ -30,6 +30,7 @@ import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.util.FloatProperty; +import android.util.Log; import android.view.View; import com.android.app.animation.Interpolators; @@ -51,6 +52,8 @@ */ public class WorkspaceRevealAnim { + private static final String TAG = "WorkspaceRevealAnim"; + // Should be used for animations running alongside this WorkspaceRevealAnim. public static final int DURATION_MS = 350; private static final FloatProperty> WORKSPACE_SCALE_PROPERTY = @@ -97,6 +100,19 @@ public WorkspaceRevealAnim(Launcher launcher, boolean animateOverviewScrim) { mAnimators.setDuration(DURATION_MS); mAnimators.setInterpolator(Interpolators.DECELERATED_EASE); + mAnimators.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationCancel(Animator animation) { + super.onAnimationCancel(animation); + Log.d(TAG, "onAnimationCancel"); + } + + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + Log.d(TAG, "onAnimationEnd: workspace alpha = " + workspace.getAlpha()); + } + }); } private void addRevealAnimatorsForView(T v, FloatProperty scaleProperty) { diff --git a/quickstep/src/com/android/quickstep/util/unfold/LauncherUnfoldTransitionController.kt b/quickstep/src/com/android/quickstep/util/unfold/LauncherUnfoldTransitionController.kt index 09563f55279..6fc450a01bc 100644 --- a/quickstep/src/com/android/quickstep/util/unfold/LauncherUnfoldTransitionController.kt +++ b/quickstep/src/com/android/quickstep/util/unfold/LauncherUnfoldTransitionController.kt @@ -22,7 +22,6 @@ import com.android.launcher3.Alarm import com.android.launcher3.DeviceProfile import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener import com.android.launcher3.anim.PendingAnimation -import com.android.launcher3.config.FeatureFlags import com.android.launcher3.uioverrides.QuickstepLauncher import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener @@ -30,7 +29,7 @@ import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionPr /** Controls animations that are happening during unfolding foldable devices */ class LauncherUnfoldTransitionController( private val launcher: QuickstepLauncher, - private val progressProvider: ProxyUnfoldTransitionProvider + private val progressProvider: ProxyUnfoldTransitionProvider, ) : OnDeviceProfileChangeListener, ActivityLifecycleCallbacksAdapter, TransitionProgressListener { private var isTablet: Boolean? = null @@ -57,11 +56,7 @@ class LauncherUnfoldTransitionController( } override fun onDeviceProfileChanged(dp: DeviceProfile) { - if (!FeatureFlags.PREEMPTIVE_UNFOLD_ANIMATION_START.get()) { - return - } - - if (isTablet != null && dp.isTablet != isTablet) { + if (isTablet != null && dp.getDeviceProperties().isTablet != isTablet) { // We should preemptively start the animation only if: // - We changed to the unfolded screen // - SystemUI IPC connection is alive, so we won't end up in a situation that we won't @@ -71,20 +66,24 @@ class LauncherUnfoldTransitionController( // if Launcher was not open during unfold, in this case we receive the configuration // change only after we went back to home screen and we don't want to start the // animation in this case. - if (dp.isTablet && progressProvider.isActive && !hasUnfoldTransitionStarted) { + if ( + dp.getDeviceProperties().isTablet && + progressProvider.isActive && + !hasUnfoldTransitionStarted + ) { // Preemptively start the unfold animation to make sure that we have drawn // the first frame of the animation before the screen gets unblocked onTransitionStarted() Trace.beginAsyncSection("$TAG#startedPreemptively", 0) timeoutAlarm.setAlarm(PREEMPTIVE_UNFOLD_TIMEOUT_MS) } - if (!dp.isTablet) { + if (!dp.getDeviceProperties().isTablet) { // Reset unfold transition status when folded hasUnfoldTransitionStarted = false } } - isTablet = dp.isTablet + isTablet = dp.getDeviceProperties().isTablet } override fun onTransitionStarted() { @@ -93,7 +92,7 @@ class LauncherUnfoldTransitionController( provider = this, factory = this::onPrepareUnfoldAnimation, duration = - 1000L // The expected duration for the animation. Then only comes to play if we have + 1000L, // The expected duration for the animation. Then only comes to play if we have // to run the animation ourselves in case sysui misses the end signal ) timeoutAlarm.cancelAlarm() @@ -119,7 +118,7 @@ class LauncherUnfoldTransitionController( launcher, isVertical, dp.displayInfo.currentSize, - anim + anim, ) } diff --git a/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt b/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt new file mode 100644 index 00000000000..1ec80e7c12a --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.views + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.content.Context +import android.graphics.Canvas +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.util.AttributeSet +import android.util.FloatProperty +import android.widget.ImageButton +import androidx.core.animation.addListener +import com.android.app.animation.Interpolators.LINEAR +import com.android.launcher3.LauncherAnimUtils.DRAWABLE_ALPHA +import com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X +import com.android.launcher3.R +import com.android.launcher3.util.KFloatProperty +import com.android.launcher3.util.MultiPropertyDelegate +import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.MultiValueAlpha +import com.android.quickstep.util.BorderAnimator +import com.android.quickstep.util.BorderAnimator.Companion.createSimpleBorderAnimator + +/** + * Button for supporting multiple desktop sessions. The button will be next to the first TaskView + * inside overview, while clicking this button will create a new desktop session. + */ +class AddDesktopButton @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : + ImageButton(context, attrs) { + + private val addDeskButtonAlpha = MultiValueAlpha(this, Alpha.entries.size) + var contentAlpha by MultiPropertyDelegate(addDeskButtonAlpha, Alpha.CONTENT) + var visibilityAlpha by MultiPropertyDelegate(addDeskButtonAlpha, Alpha.VISIBILITY) + var clickAlpha by MultiPropertyDelegate(addDeskButtonAlpha, Alpha.CLICK) + var gestureAlpha by MultiPropertyDelegate(addDeskButtonAlpha, Alpha.GESTURE) + + private val multiTranslationX = + MultiPropertyFactory(this, VIEW_TRANSLATE_X, TranslationX.entries.size) { a: Float, b: Float + -> + a + b + } + var gridTranslationX by MultiPropertyDelegate(multiTranslationX, TranslationX.GRID) + var offsetTranslationX by MultiPropertyDelegate(multiTranslationX, TranslationX.OFFSET) + + private val focusBorderAnimator: BorderAnimator = + createSimpleBorderAnimator( + context.resources.getDimensionPixelSize(R.dimen.add_desktop_button_size), + context.resources.getDimensionPixelSize(R.dimen.keyboard_quick_switch_border_width), + this::getBorderBounds, + this, + context + .obtainStyledAttributes(attrs, R.styleable.AddDesktopButton) + .getColor( + R.styleable.AddDesktopButton_focusBorderColor, + BorderAnimator.DEFAULT_BORDER_COLOR, + ), + ) + + var borderEnabled = false + set(value) { + if (field == value) { + return + } + field = value + focusBorderAnimator.setBorderVisibility(visible = field && isFocused, animated = true) + } + + @JvmOverloads + fun setContentVisibility( + toVisible: Boolean, + animate: Boolean, + onAnimationEndAction: Runnable? = null, + ) { + val targetButtonAlpha = if (toVisible) 1f else 0f + val targetDrawableAlpha = if (toVisible) 255 else 0 + + if (!animate) { + clickAlpha = targetButtonAlpha + drawable.mutate().alpha = targetDrawableAlpha + onAnimationEndAction?.run() + return + } + + val iconDrawable: Drawable = drawable.mutate() + val fadeDuration = + context.resources.getInteger(R.integer.add_desktop_button_fade_duration).toLong() + val fadeDelay = + context.resources.getInteger(R.integer.add_desktop_button_fade_delay).toLong() + + val buttonFadeAnimator = + ObjectAnimator.ofFloat(this, CLICK_ALPHA, targetButtonAlpha).apply { + duration = fadeDuration + startDelay = fadeDelay + interpolator = LINEAR + } + + val iconFadeAnimator = + ObjectAnimator.ofInt(iconDrawable, DRAWABLE_ALPHA, targetDrawableAlpha).apply { + duration = fadeDuration + interpolator = LINEAR + } + + AnimatorSet().apply { + playTogether(buttonFadeAnimator, iconFadeAnimator) + addListener(onEnd = { onAnimationEndAction?.run() }) + start() + } + } + + public override fun onFocusChanged( + gainFocus: Boolean, + direction: Int, + previouslyFocusedRect: Rect?, + ) { + super.onFocusChanged(gainFocus, direction, previouslyFocusedRect) + if (borderEnabled) { + focusBorderAnimator.setBorderVisibility(gainFocus, /* animated= */ true) + } + } + + private fun getBorderBounds(bounds: Rect) { + bounds.set(0, 0, width, height) + val outlinePadding = + context.resources.getDimensionPixelSize(R.dimen.add_desktop_button_outline_padding) + bounds.inset(-outlinePadding, -outlinePadding) + } + + override fun draw(canvas: Canvas) { + focusBorderAnimator.drawBorder(canvas) + super.draw(canvas) + } + + companion object { + private enum class Alpha { + CONTENT, + VISIBILITY, + CLICK, + GESTURE, + } + + private enum class TranslationX { + GRID, + OFFSET, + } + + @JvmField + val VISIBILITY_ALPHA: FloatProperty = + KFloatProperty(AddDesktopButton::visibilityAlpha) + + private val CLICK_ALPHA: FloatProperty = + KFloatProperty(AddDesktopButton::clickAlpha) + + @JvmField + val GESTURE_ALPHA: FloatProperty = + KFloatProperty(AddDesktopButton::gestureAlpha) + } +} diff --git a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java index 121d8ede11c..166ed7916cd 100644 --- a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java +++ b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java @@ -267,8 +267,8 @@ private void init(Launcher launcher) { DeviceProfile grid = launcher.getDeviceProfile(); DragLayer.LayoutParams lp = new DragLayer.LayoutParams(mWidthPx, mMaxHeightPx); lp.ignoreInsets = true; - lp.leftMargin = (grid.widthPx - mWidthPx) / 2; - lp.topMargin = grid.heightPx - grid.hotseatBarSizePx - mMaxHeightPx; + lp.leftMargin = (grid.getDeviceProperties().getWidthPx() - mWidthPx) / 2; + lp.topMargin = grid.getDeviceProperties().getHeightPx() - grid.hotseatBarSizePx - mMaxHeightPx; setLayoutParams(lp); } diff --git a/quickstep/src/com/android/quickstep/views/BlurUtils.kt b/quickstep/src/com/android/quickstep/views/BlurUtils.kt new file mode 100644 index 00000000000..318a0437f37 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/BlurUtils.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.views + +import com.android.launcher3.Flags.enableOverviewBackgroundWallpaperBlur +import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle + +/** Applies blur either behind launcher surface or live tile app. */ +class BlurUtils(private val recentsView: RecentsView<*, *>) { + + private fun getLiveTileRemoteTargetHandles() = + if ( + recentsView.remoteTargetHandles != null && + recentsView.recentsAnimationController != null + ) + recentsView.remoteTargetHandles + else null + + private fun Array.setDrawBelowRecents(drawBelowRecents: Boolean) { + forEach { it.taskViewSimulator.drawsBelowRecents = drawBelowRecents } + } + + /** + * Controls if live tile should be above or below Recents layer, and update the base layer to + * apply blur to in BaseDepthController. + */ + fun setDrawLiveTileBelowRecents(drawBelowRecents: Boolean) { + getLiveTileRemoteTargetHandles()?.setDrawBelowRecents(drawBelowRecents) + updateBlurLayer() + } + + /** + * Set surface in [remoteTargetHandles] to be above Recents layer, and update the base layer to + * apply blur to in BaseDepthController. + */ + fun setDrawAboveRecents(remoteTargetHandles: Array) { + remoteTargetHandles.setDrawBelowRecents(false) + updateBlurLayer(drawingAboveRecents = true) + } + + private fun updateBlurLayer(drawingAboveRecents: Boolean = false) { + if (!enableOverviewBackgroundWallpaperBlur()) return + // Blurs behind lowest live tile surface that's below recents or Launcher if there + // are none. + recentsView.depthController?.setBaseSurfaceOverride( + getLiveTileRemoteTargetHandles() + ?.asSequence() + ?.filter { it.taskViewSimulator.drawsBelowRecents } + ?.flatMap { it.transformParams.targetSet.apps.asIterable() } + ?.map { it.leash } + ?.maxByOrNull { it.layerId }, + /* applyOnDraw= */ drawingAboveRecents, + ) + } +} diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java deleted file mode 100644 index a5db439b4c3..00000000000 --- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java +++ /dev/null @@ -1,345 +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.quickstep.views; - -import static com.android.launcher3.Flags.enableGridOnlyOverview; -import static com.android.quickstep.util.BorderAnimator.DEFAULT_BORDER_COLOR; - -import android.content.Context; -import android.content.res.Resources; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.Rect; -import android.util.AttributeSet; -import android.util.FloatProperty; -import android.widget.Button; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Flags; -import com.android.launcher3.R; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.BorderAnimator; - -import kotlin.Unit; - -import app.lawnchair.font.FontManager; -import app.lawnchair.theme.drawable.DrawableTokens; - -public class ClearAllButton extends Button { - - public static final FloatProperty VISIBILITY_ALPHA = new FloatProperty( - "visibilityAlpha") { - @Override - public Float get(ClearAllButton view) { - return view.mVisibilityAlpha; - } - - @Override - public void setValue(ClearAllButton view, float v) { - view.setVisibilityAlpha(v); - } - }; - - public static final FloatProperty DISMISS_ALPHA = new FloatProperty( - "dismissAlpha") { - @Override - public Float get(ClearAllButton view) { - return view.mDismissAlpha; - } - - @Override - public void setValue(ClearAllButton view, float v) { - view.setDismissAlpha(v); - } - }; - - private final RecentsViewContainer mContainer; - private float mScrollAlpha = 1; - private float mContentAlpha = 1; - private float mVisibilityAlpha = 1; - private float mDismissAlpha = 1; - private float mFullscreenProgress = 1; - private float mGridProgress = 1; - - private boolean mIsRtl; - private float mNormalTranslationPrimary; - private float mFullscreenTranslationPrimary; - private float mGridTranslationPrimary; - private float mGridScrollOffset; - private float mScrollOffsetPrimary; - - private int mSidePadding; - private int mOutlinePadding; - private boolean mBorderEnabled; - @Nullable - private final BorderAnimator mFocusBorderAnimator; - - public ClearAllButton(Context context, AttributeSet attrs) { - super(context, attrs); - mIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL; - mContainer = RecentsViewContainer.containerFromContext(context); - FontManager.INSTANCE.get(context).overrideFont(this, attrs); - setBackground(DrawableTokens.BgOverviewClearAllButton.resolve(context)); - if (Flags.enableFocusOutline()) { - TypedArray styledAttrs = context.obtainStyledAttributes(attrs, - R.styleable.ClearAllButton); - Resources resources = getResources(); - mOutlinePadding = resources.getDimensionPixelSize( - R.dimen.recents_clear_all_outline_padding); - mFocusBorderAnimator = BorderAnimator.createSimpleBorderAnimator( - /* borderRadiusPx= */ resources.getDimensionPixelSize( - R.dimen.recents_clear_all_outline_radius), - /* borderWidthPx= */ context.getResources().getDimensionPixelSize( - R.dimen.keyboard_quick_switch_border_width), - /* boundsBuilder= */ this::updateBorderBounds, - /* targetView= */ this, - /* borderColor= */ styledAttrs.getColor( - R.styleable.ClearAllButton_focusBorderColor, - DEFAULT_BORDER_COLOR)); - styledAttrs.recycle(); - } else { - mFocusBorderAnimator = null; - } - } - - private Unit updateBorderBounds(@NonNull Rect bounds) { - bounds.set(0, 0, getWidth(), getHeight()); - // Make the value negative to form a padding between button and outline - bounds.inset(-mOutlinePadding, -mOutlinePadding); - return Unit.INSTANCE; - } - - @Override - public void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) { - super.onFocusChanged(gainFocus, direction, previouslyFocusedRect); - if (mFocusBorderAnimator != null && mBorderEnabled) { - mFocusBorderAnimator.setBorderVisibility(gainFocus, /* animated= */ true); - } - } - - /** - * Enable or disable showing border on focus change - */ - public void setBorderEnabled(boolean enabled) { - if (mBorderEnabled == enabled) { - return; - } - - mBorderEnabled = enabled; - if (mFocusBorderAnimator != null) { - mFocusBorderAnimator.setBorderVisibility(/* visible= */ - enabled && isFocused(), /* animated= */true); - } - } - - @Override - public void draw(Canvas canvas) { - if (mFocusBorderAnimator != null) { - mFocusBorderAnimator.drawBorder(canvas); - } - super.draw(canvas); - } - - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - super.onLayout(changed, left, top, right, bottom); - RecentsPagedOrientationHandler orientationHandler = getRecentsView().getPagedOrientationHandler(); - mSidePadding = orientationHandler.getClearAllSidePadding(getRecentsView(), mIsRtl); - } - - private RecentsView getRecentsView() { - return (RecentsView) getParent(); - } - - @Override - public void onRtlPropertiesChanged(int layoutDirection) { - super.onRtlPropertiesChanged(layoutDirection); - mIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL; - } - - @Override - public boolean hasOverlappingRendering() { - return false; - } - - public float getScrollAlpha() { - return mScrollAlpha; - } - - public void setContentAlpha(float alpha) { - if (mContentAlpha != alpha) { - mContentAlpha = alpha; - updateAlpha(); - } - } - - public void setVisibilityAlpha(float alpha) { - if (mVisibilityAlpha != alpha) { - mVisibilityAlpha = alpha; - updateAlpha(); - } - } - - public void setDismissAlpha(float alpha) { - if (mDismissAlpha != alpha) { - mDismissAlpha = alpha; - updateAlpha(); - } - } - - public void onRecentsViewScroll(int scroll, boolean gridEnabled) { - RecentsView recentsView = getRecentsView(); - if (recentsView == null) { - return; - } - - RecentsPagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); - float orientationSize = orientationHandler.getPrimaryValue(getWidth(), getHeight()); - if (orientationSize == 0) { - return; - } - - int clearAllScroll = recentsView.getClearAllScroll(); - int adjustedScrollFromEdge = Math.abs(scroll - clearAllScroll); - float shift = Math.min(adjustedScrollFromEdge, orientationSize); - mNormalTranslationPrimary = mIsRtl ? -shift : shift; - if (!gridEnabled) { - mNormalTranslationPrimary += mSidePadding; - } - applyPrimaryTranslation(); - applySecondaryTranslation(); - float clearAllSpacing = recentsView.getPageSpacing() + recentsView.getClearAllExtraPageSpacing(); - clearAllSpacing = mIsRtl ? -clearAllSpacing : clearAllSpacing; - mScrollAlpha = Math.max((clearAllScroll + clearAllSpacing - scroll) / clearAllSpacing, 0); - updateAlpha(); - } - - private void updateAlpha() { - final float alpha = mScrollAlpha * mContentAlpha * mVisibilityAlpha * mDismissAlpha; - setAlpha(alpha); - setClickable(Math.min(alpha, 1) == 1); - } - - public void setFullscreenTranslationPrimary(float fullscreenTranslationPrimary) { - mFullscreenTranslationPrimary = fullscreenTranslationPrimary; - applyPrimaryTranslation(); - } - - public void setGridTranslationPrimary(float gridTranslationPrimary) { - mGridTranslationPrimary = gridTranslationPrimary; - applyPrimaryTranslation(); - } - - public void setGridScrollOffset(float gridScrollOffset) { - mGridScrollOffset = gridScrollOffset; - } - - public void setScrollOffsetPrimary(float scrollOffsetPrimary) { - mScrollOffsetPrimary = scrollOffsetPrimary; - } - - public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) { - float scrollAdjustment = 0; - if (fullscreenEnabled) { - scrollAdjustment += mFullscreenTranslationPrimary; - } - if (gridEnabled) { - scrollAdjustment += mGridTranslationPrimary + mGridScrollOffset; - } - scrollAdjustment += mScrollOffsetPrimary; - return scrollAdjustment; - } - - public float getOffsetAdjustment(boolean fullscreenEnabled, boolean gridEnabled) { - return getScrollAdjustment(fullscreenEnabled, gridEnabled); - } - - /** - * Adjust translation when this TaskView is about to be shown fullscreen. - * - * @param progress: 0 = no translation; 1 = translate according to TaskVIew - * translations. - */ - public void setFullscreenProgress(float progress) { - mFullscreenProgress = progress; - applyPrimaryTranslation(); - } - - /** - * Moves ClearAllButton between carousel and 2 row grid. - * - * @param gridProgress 0 = carousel; 1 = 2 row grid. - */ - public void setGridProgress(float gridProgress) { - mGridProgress = gridProgress; - applyPrimaryTranslation(); - } - - private void applyPrimaryTranslation() { - RecentsView recentsView = getRecentsView(); - if (recentsView == null) { - return; - } - - RecentsPagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); - orientationHandler.getPrimaryViewTranslate().set(this, - orientationHandler.getPrimaryValue(0f, getOriginalTranslationY()) - + mNormalTranslationPrimary + getFullscreenTrans( - mFullscreenTranslationPrimary) - + getGridTrans(mGridTranslationPrimary)); - } - - private void applySecondaryTranslation() { - RecentsView recentsView = getRecentsView(); - if (recentsView == null) { - return; - } - - RecentsPagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); - orientationHandler.getSecondaryViewTranslate().set(this, - orientationHandler.getSecondaryValue(0f, getOriginalTranslationY())); - } - - private float getFullscreenTrans(float endTranslation) { - return mFullscreenProgress > 0 ? endTranslation : 0; - } - - private float getGridTrans(float endTranslation) { - return mGridProgress > 0 ? endTranslation : 0; - } - - /** - * Get the Y translation that is set in the original layout position, before - * scrolling. - */ - private float getOriginalTranslationY() { - DeviceProfile deviceProfile = mContainer.getDeviceProfile(); - if (deviceProfile.isTablet) { - if (enableGridOnlyOverview()) { - return (getRecentsView().getLastComputedTaskSize().height() - + deviceProfile.overviewTaskThumbnailTopMarginPx) / 2.0f - + deviceProfile.overviewRowSpacing; - } else { - return deviceProfile.overviewRowSpacing; - } - } - return deviceProfile.overviewTaskThumbnailTopMarginPx / 2.0f; - } -} diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.kt b/quickstep/src/com/android/quickstep/views/ClearAllButton.kt new file mode 100644 index 00000000000..48aa999b3ec --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.kt @@ -0,0 +1,255 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.views + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Rect +import android.util.AttributeSet +import android.util.FloatProperty +import android.widget.Button +import com.android.launcher3.Flags.enableFocusOutline +import com.android.launcher3.R +import com.android.launcher3.util.KFloatProperty +import com.android.launcher3.util.MultiPropertyDelegate +import com.android.launcher3.util.MultiValueAlpha +import com.android.quickstep.util.BorderAnimator +import com.android.quickstep.util.BorderAnimator.Companion.createSimpleBorderAnimator +import kotlin.math.abs +import kotlin.math.min + +class ClearAllButton +@JvmOverloads +constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, + defStyleRes: Int = 0, +) : Button(context, attrs, defStyleAttr, defStyleRes) { + + private val clearAllButtonAlpha = + object : MultiValueAlpha(this, Alpha.entries.size) { + override fun apply(value: Float) { + super.apply(value) + isClickable = value >= 1f + } + } + var scrollAlpha by MultiPropertyDelegate(clearAllButtonAlpha, Alpha.SCROLL) + var contentAlpha by MultiPropertyDelegate(clearAllButtonAlpha, Alpha.CONTENT) + var visibilityAlpha by MultiPropertyDelegate(clearAllButtonAlpha, Alpha.VISIBILITY) + var dismissAlpha by MultiPropertyDelegate(clearAllButtonAlpha, Alpha.DISMISS) + + var fullscreenProgress = 1f + set(value) { + if (field == value) { + return + } + field = value + applyPrimaryTranslation() + } + + /** + * Moves ClearAllButton between carousel and 2 row grid. + * + * 0 = carousel; 1 = 2 row grid. + */ + var gridProgress = 1f + set(value) { + if (field == value) { + return + } + field = value + applyPrimaryTranslation() + } + + private var normalTranslationPrimary = 0f + var fullscreenTranslationPrimary = 0f + set(value) { + if (field == value) { + return + } + field = value + applyPrimaryTranslation() + } + + var gridTranslationPrimary = 0f + set(value) { + if (field == value) { + return + } + field = value + applyPrimaryTranslation() + } + + /** Used to put the button at the middle in the secondary coordinate. */ + var taskAlignmentTranslationY = 0f + set(value) { + if (field == value) { + return + } + field = value + applySecondaryTranslation() + } + + var gridScrollOffset = 0f + var scrollOffsetPrimary = 0f + + private var sidePadding = 0 + var borderEnabled = false + set(value) { + if (field == value) { + return + } + field = value + focusBorderAnimator?.setBorderVisibility(visible = field && isFocused, animated = true) + } + + private val focusBorderAnimator: BorderAnimator? = + if (enableFocusOutline()) + createSimpleBorderAnimator( + context.resources.getDimensionPixelSize(R.dimen.recents_clear_all_outline_radius), + context.resources.getDimensionPixelSize(R.dimen.keyboard_quick_switch_border_width), + this::getBorderBounds, + this, + context + .obtainStyledAttributes(attrs, R.styleable.ClearAllButton) + .getColor( + R.styleable.ClearAllButton_focusBorderColor, + BorderAnimator.DEFAULT_BORDER_COLOR, + ), + ) + else null + + private fun getBorderBounds(bounds: Rect) { + bounds.set(0, 0, width, height) + val outlinePadding = + context.resources.getDimensionPixelSize(R.dimen.recents_clear_all_outline_padding) + // Make the value negative to form a padding between button and outline + bounds.inset(-outlinePadding, -outlinePadding) + } + + public override fun onFocusChanged( + gainFocus: Boolean, + direction: Int, + previouslyFocusedRect: Rect?, + ) { + super.onFocusChanged(gainFocus, direction, previouslyFocusedRect) + if (borderEnabled) { + focusBorderAnimator?.setBorderVisibility(gainFocus, /* animated= */ true) + } + } + + override fun draw(canvas: Canvas) { + focusBorderAnimator?.drawBorder(canvas) + super.draw(canvas) + } + + override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { + super.onLayout(changed, left, top, right, bottom) + sidePadding = + recentsView?.let { it.pagedOrientationHandler?.getClearAllSidePadding(it, isLayoutRtl) } + ?: 0 + } + + private val recentsView: RecentsView<*, *>? + get() = parent as? RecentsView<*, *>? + + override fun hasOverlappingRendering() = false + + fun onRecentsViewScroll(scroll: Int, gridEnabled: Boolean) { + val recentsView = recentsView ?: return + + val orientationSize = + recentsView.pagedOrientationHandler.getPrimaryValue(width, height).toFloat() + if (orientationSize == 0f) { + return + } + + val clearAllScroll = recentsView.clearAllScroll + val adjustedScrollFromEdge = abs((scroll - clearAllScroll)).toFloat() + val shift = min(adjustedScrollFromEdge, orientationSize) + normalTranslationPrimary = if (isLayoutRtl) -shift else shift + if (!gridEnabled) { + normalTranslationPrimary += sidePadding.toFloat() + } + applyPrimaryTranslation() + applySecondaryTranslation() + var clearAllSpacing = recentsView.pageSpacing + recentsView.clearAllExtraPageSpacing + clearAllSpacing = if (isLayoutRtl) -clearAllSpacing else clearAllSpacing + scrollAlpha = + ((clearAllScroll + clearAllSpacing - scroll) / clearAllSpacing.toFloat()).coerceAtLeast( + 0f + ) + } + + fun getScrollAdjustment(fullscreenEnabled: Boolean, gridEnabled: Boolean): Float { + var scrollAdjustment = 0f + if (fullscreenEnabled) { + scrollAdjustment += fullscreenTranslationPrimary + } + if (gridEnabled) { + scrollAdjustment += gridTranslationPrimary + gridScrollOffset + } + scrollAdjustment += scrollOffsetPrimary + return scrollAdjustment + } + + fun getOffsetAdjustment(fullscreenEnabled: Boolean, gridEnabled: Boolean) = + getScrollAdjustment(fullscreenEnabled, gridEnabled) + + private fun applyPrimaryTranslation() { + val recentsView = recentsView ?: return + val orientationHandler = recentsView.pagedOrientationHandler + orientationHandler.primaryViewTranslate.set( + this, + (orientationHandler.getPrimaryValue(0f, taskAlignmentTranslationY) + + normalTranslationPrimary + + getFullscreenTrans(fullscreenTranslationPrimary) + + getGridTrans(gridTranslationPrimary)), + ) + } + + private fun applySecondaryTranslation() { + val recentsView = recentsView ?: return + val orientationHandler = recentsView.pagedOrientationHandler + orientationHandler.secondaryViewTranslate.set( + this, + orientationHandler.getSecondaryValue(0f, taskAlignmentTranslationY), + ) + } + + private fun getFullscreenTrans(endTranslation: Float) = + if (fullscreenProgress > 0) endTranslation else 0f + + private fun getGridTrans(endTranslation: Float) = if (gridProgress > 0) endTranslation else 0f + + companion object { + private enum class Alpha { + SCROLL, + CONTENT, + VISIBILITY, + DISMISS, + } + + @JvmField + val VISIBILITY_ALPHA: FloatProperty = + KFloatProperty(ClearAllButton::visibilityAlpha) + + @JvmField + val DISMISS_ALPHA: FloatProperty = + KFloatProperty(ClearAllButton::dismissAlpha) + } +} diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskContentView.kt b/quickstep/src/com/android/quickstep/views/DesktopTaskContentView.kt new file mode 100644 index 00000000000..4d179f54464 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/DesktopTaskContentView.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.quickstep.views + +import android.content.Context +import android.graphics.Outline +import android.graphics.Rect +import android.util.AttributeSet +import android.view.View +import android.view.ViewOutlineProvider +import android.widget.FrameLayout + +class DesktopTaskContentView +@JvmOverloads +constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) { + var cornerRadius: Float = 0f + set(value) { + field = value + invalidateOutline() + } + + private val bounds = Rect() + + init { + clipToOutline = true + clipChildren = false + outlineProvider = + object : ViewOutlineProvider() { + override fun getOutline(view: View, outline: Outline) { + outline.setRoundRect(bounds, cornerRadius) + } + } + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + bounds.set(0, 0, w, h) + invalidateOutline() + } +} diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt index c56d7db5c61..d0d54e99d3a 100644 --- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt +++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt @@ -15,271 +15,873 @@ */ package com.android.quickstep.views +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ObjectAnimator +import android.annotation.SuppressLint import android.content.Context -import android.graphics.Point +import android.content.res.Configuration +import android.graphics.Matrix import android.graphics.PointF import android.graphics.Rect -import android.graphics.drawable.LayerDrawable -import android.graphics.drawable.ShapeDrawable -import android.graphics.drawable.shapes.RoundRectShape +import android.graphics.Rect.intersects +import android.graphics.RectF import android.util.AttributeSet +import android.util.FloatProperty import android.util.Log +import android.view.Display.INVALID_DISPLAY +import android.view.Gravity import android.view.View -import android.view.ViewGroup +import android.view.ViewStub +import android.widget.ImageView +import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.drawable.toDrawable import androidx.core.view.updateLayoutParams -import app.lawnchair.theme.color.tokens.ColorTokens +import com.android.internal.hidden_from_bootclasspath.com.android.window.flags.Flags.enableDesktopRecentsTransitionsCornersBugfix +import com.android.launcher3.Flags.enableDesktopExplodedView +import com.android.launcher3.Flags.enableOverviewDesktopTileWallpaperBackground +import com.android.launcher3.Flags.enableRefactorTaskContentView +import com.android.launcher3.Flags.enableRefactorTaskThumbnail import com.android.launcher3.R +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.testing.TestLogging +import com.android.launcher3.testing.shared.TestProtocol +import com.android.launcher3.util.KFloatProperty +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu import com.android.launcher3.Utilities import com.android.launcher3.util.RunnableList import com.android.launcher3.util.SplitConfigurationOptions import com.android.launcher3.util.TransformingTouchDelegate import com.android.launcher3.util.ViewPool +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.launcher3.util.rects.lerpRect import com.android.launcher3.util.rects.set import com.android.quickstep.BaseContainerInterface +import com.android.quickstep.DesktopFullscreenDrawParams +import com.android.quickstep.FullscreenDrawParams +import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle import com.android.quickstep.TaskOverlayFactory +import com.android.quickstep.ViewUtils.addAccessibleChildToList +import com.android.quickstep.recents.data.DesktopBackgroundResult +import com.android.quickstep.recents.data.DesktopTileBackgroundRepository.Companion.DESKTOP_BACKGROUND_FALLBACK_COLOR +import com.android.quickstep.recents.di.RecentsDependencies +import com.android.quickstep.recents.di.get +import com.android.quickstep.recents.domain.model.DesktopLayoutConfig +import com.android.quickstep.recents.domain.model.DesktopTaskVisibilityData +import com.android.quickstep.recents.domain.model.DesktopTaskVisibilityData.HiddenDesktopTaskVisibilityData +import com.android.quickstep.recents.domain.model.DesktopTaskVisibilityData.RenderedDesktopTaskVisibilityData +import com.android.quickstep.recents.domain.usecase.DesktopLayoutUtils +import com.android.quickstep.recents.ui.viewmodel.DesktopTaskViewModel +import com.android.quickstep.recents.ui.viewmodel.TaskData +import com.android.quickstep.task.thumbnail.TaskContentView +import com.android.quickstep.task.thumbnail.TaskThumbnailView +import com.android.quickstep.util.DesktopTask import com.android.quickstep.util.RecentsOrientedState -import com.android.systemui.shared.recents.model.Task +import com.android.quickstep.util.getRemoteTargetHandle +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus.enableMultipleDesktops +import kotlin.math.roundToInt +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch + +import app.lawnchair.theme.color.tokens.ColorTokens /** TaskView that contains all tasks that are part of the desktop. */ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : - TaskView(context, attrs) { + TaskView( + context, + attrs, + type = TaskViewType.DESKTOP, + thumbnailFullscreenParams = DesktopFullscreenDrawParams(context), + ) { + private val desktopTask: DesktopTask? + get() = groupTask as? DesktopTask + + val deskId + get() = desktopTask?.deskId ?: DesktopVisibilityController.INACTIVE_DESK_ID + + val selectedTaskId: Int? + get() = + taskContainers + .firstOrNull { it.taskContentView.isFocused || it.taskContentView.isHovered } + ?.task + ?.key + ?.id + + private val contentViewFullscreenParams = FullscreenDrawParams(context) + + private val taskThumbnailViewDeprecatedPool = + if (!enableRefactorTaskThumbnail()) { + ViewPool( + context, + this, + R.layout.task_thumbnail_deprecated, + VIEW_POOL_MAX_SIZE, + VIEW_POOL_INITIAL_SIZE, + ) + } else null - private val snapshotDrawParams = - object : FullscreenDrawParams(context) { - // DesktopTaskView thumbnail's corner radius is independent of fullscreenProgress. - override fun computeTaskCornerRadius(context: Context) = - computeWindowCornerRadius(context) - } private val taskThumbnailViewPool = - ViewPool( - context, - this, - R.layout.task_thumbnail, - VIEW_POOL_MAX_SIZE, - VIEW_POOL_INITIAL_SIZE - ) + if (enableRefactorTaskThumbnail()) { + ViewPool( + context, + this, + R.layout.task_thumbnail, + VIEW_POOL_MAX_SIZE, + VIEW_POOL_INITIAL_SIZE, + ) + } else null + + private val taskContentViewPool = + if (enableRefactorTaskContentView()) { + ViewPool( + context, + this, + R.layout.task_content_view, + VIEW_POOL_MAX_SIZE, + VIEW_POOL_INITIAL_SIZE, + ) + } else null + private val tempPointF = PointF() - private val tempRect = Rect() - private lateinit var backgroundView: View + private val lastComputedTaskSize = Rect() private lateinit var iconView: TaskViewIcon - private var childCountAtInflation = 0 + private lateinit var iconTouchDelegate: TransformingTouchDelegate + private lateinit var contentView: DesktopTaskContentView + private lateinit var backgroundView: ImageView + private val dispatcherProvider: DispatcherProvider = RecentsDependencies.get(context) + private var viewModel = + DesktopTaskViewModel( + organizeDesktopTasksUseCase = RecentsDependencies.get(context), + getObscuredDesktopTaskIdsUseCase = RecentsDependencies.get(context), + desktopTileBackgroundRepository = RecentsDependencies.get(context), + dispatcherProvider = dispatcherProvider, + ) + private val coroutineScope: CoroutineScope = RecentsDependencies.get(context) + private val wallpaperBackgroundFetchCoroutineJobs = mutableListOf() + + /** + * Map from task IDs to previous organized task positions. This is used to animate between two + * sets of organized task positions when a task is being dismissed. + */ + private var previousOrganizedDesktopTaskVisibilityDataMap: + Map? = + null + + /** + * When enableDesktopExplodedView is enabled, this controls the gradual transition from the + * default positions to the organized non-overlapping positions. + */ + var explodeProgress = 0.0f + set(value) { + field = value + positionTaskWindows() + } + + /** + * When enableDesktopExplodedView is enabled, and a task is removed, this controls the gradual + * transition from the previous organized task positions to the new. + */ + private var taskRemoveProgress = 0.0f + set(value) { + field = value + positionTaskWindows() + } + + private var taskRemoveAnimator: ObjectAnimator? = null + + // The id of the task that is being reordered to the front. This is used to animate the task + // properly when it is minimized. + private var taskIdReorderToFront: Int? = null + + var remoteTargetHandles: Array? = null + set(value) { + field = value + if (value != null) { + positionTaskWindows() + } + } + + override val displayId: Int + get() = + if (enableMultipleDesktops(context)) { + desktopTask?.displayId ?: INVALID_DISPLAY + } else { + super.displayId + } override fun onFinishInflate() { super.onFinishInflate() - backgroundView = - findViewById(R.id.background)!!.apply { + contentView = + findViewById(R.id.desktop_content).apply { updateLayoutParams { - topMargin = container.deviceProfile.overviewTaskThumbnailTopMarginPx + topMargin = container.deviceProfile.overviewProfile.taskThumbnailTopMarginPx + } + cornerRadius = contentViewFullscreenParams.currentCornerRadius + backgroundView = findViewById(R.id.background) + backgroundView.setBackgroundColor( + resources.getColor(ColorTokens.Neutral2_300.resolveColor(context), context.theme)) + // pE-TODO(QPR2): Investigate colour DESKTOP_BACKGROUND_FALLBACK_COLOR + if (!enableOverviewDesktopTileWallpaperBackground()) { + setWallpaperBackground( + DesktopBackgroundResult.FallbackBackground( + DESKTOP_BACKGROUND_FALLBACK_COLOR + ) + ) } - background = - ShapeDrawable(RoundRectShape(FloatArray(8) { taskCornerRadius }, null, null)) - .apply { - setTint( - ColorTokens.Neutral2_300.resolveColor(context) - ) - } - } - iconView = - getOrInflateIconView(R.id.icon).apply { - val iconBackground = resources.getDrawable(R.drawable.bg_circle, context.theme) - val icon = resources.getDrawable(R.drawable.ic_desktop, context.theme) - setIcon(this, LayerDrawable(arrayOf(iconBackground, icon))) } - childCountAtInflation = childCount } - override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec) - val containerWidth = MeasureSpec.getSize(widthMeasureSpec) - var containerHeight = MeasureSpec.getSize(heightMeasureSpec) - setMeasuredDimension(containerWidth, containerHeight) + override fun inflateViewStubs() { + findViewById(R.id.icon) + ?.apply { + layoutResource = + if (enableOverviewIconMenu()) R.layout.icon_app_chip_view + else R.layout.icon_view + } + ?.inflate() + } + private fun positionTaskWindows(updateLayout: Boolean = false) { if (taskContainers.isEmpty()) { return } - val thumbnailTopMarginPx = container.deviceProfile.overviewTaskThumbnailTopMarginPx - containerHeight -= thumbnailTopMarginPx + val (widthScale, heightScale) = getScreenScaleFactors() + taskContainers.forEach { taskContainer -> + val taskId = taskContainer.task.key.id + val fullscreenTaskBounds = + viewModel.fullscreenTaskPositions.firstOrNull { it.taskId == taskId }?.bounds + ?: return@forEach - BaseContainerInterface.getTaskDimension(context, container.deviceProfile, tempPointF) - val windowWidth = tempPointF.x.toInt() - val windowHeight = tempPointF.y.toInt() - val scaleWidth = containerWidth / windowWidth.toFloat() - val scaleHeight = containerHeight / windowHeight.toFloat() - if (DEBUG) { - Log.d( - TAG, - "onMeasure: container=[$containerWidth,$containerHeight] " + - "window=[$windowWidth,$windowHeight] scale=[$scaleWidth,$scaleHeight]" - ) - } + val organizedTaskVisibilityData: DesktopTaskVisibilityData? = + if (enableDesktopExplodedView()) { + viewModel.organizedDesktopTaskVisibilityDataMap[taskId] + } else { + null + } + + val shouldBeDisplayedInOverview: Boolean + val overviewTaskBounds: Rect + var isObscured = false - // Desktop tile is a shrunk down version of launcher and freeform task thumbnails. - taskContainers.forEach { - // Default to quarter of the desktop if we did not get app bounds. - val taskSize = - it.task.appBounds - ?: tempRect.apply { - left = 0 - top = 0 - right = windowWidth / 4 - bottom = windowHeight / 4 + if (!enableDesktopExplodedView()) { + shouldBeDisplayedInOverview = true + overviewTaskBounds = fullscreenTaskBounds + } else { + when (organizedTaskVisibilityData) { + is RenderedDesktopTaskVisibilityData -> { + shouldBeDisplayedInOverview = true + overviewTaskBounds = organizedTaskVisibilityData.bounds + isObscured = organizedTaskVisibilityData.isObscured } - val thumbWidth = (taskSize.width() * scaleWidth).toInt() - val thumbHeight = (taskSize.height() * scaleHeight).toInt() - it.thumbnailViewDeprecated.measure( - MeasureSpec.makeMeasureSpec(thumbWidth, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(thumbHeight, MeasureSpec.EXACTLY) - ) + is HiddenDesktopTaskVisibilityData -> { + shouldBeDisplayedInOverview = false + overviewTaskBounds = + DesktopLayoutUtils.createPlaceholderBounds(getDesktopLayoutConfig()) + } + null -> { + shouldBeDisplayedInOverview = false + // Skip the task for the edge case where [organizedTaskData] is null. + return@forEach + } + } + } - // Position the task to the same position as it would be on the desktop - val positionInParent = it.task.positionInParent ?: ORIGIN - val taskX = (positionInParent.x * scaleWidth).toInt() - var taskY = (positionInParent.y * scaleHeight).toInt() - // move task down by margin size - taskY += thumbnailTopMarginPx - it.thumbnailViewDeprecated.x = taskX.toFloat() - it.thumbnailViewDeprecated.y = taskY.toFloat() - if (DEBUG) { - Log.d( - TAG, - "onMeasure: task=${it.task.key} thumb=[$thumbWidth,$thumbHeight]" + - " pos=[$taskX,$taskY]" + val currentTaskBounds = + if (enableDesktopExplodedView()) { + TEMP_OVERVIEW_TASK_POSITION.apply { + // When removing a task, interpolate between its old organized bounds and + // [overviewTaskBounds]. + val previousOrganizedTaskDataItem = + previousOrganizedDesktopTaskVisibilityDataMap?.get(taskId) + + if (previousOrganizedTaskDataItem is RenderedDesktopTaskVisibilityData) { + lerpRect( + previousOrganizedTaskDataItem.bounds, + overviewTaskBounds, + taskRemoveProgress, + ) + } else { + set(overviewTaskBounds) + } + + // If the task is minimized but not being launched, we can just fade it in. + // Otherwise, we need to translate it from its actual position on the + // desktop. + if ( + (!taskContainer.task.isMinimized && !isObscured) || + taskId == taskIdReorderToFront + ) { + lerpRect(fullscreenTaskBounds, this, explodeProgress) + } + } + } else { + fullscreenTaskBounds + } + + if (enableDesktopExplodedView()) { + remoteTargetHandles?.getRemoteTargetHandle(taskId)?.let { remoteTargetHandle -> + val fromRect = + TEMP_FROM_RECTF.apply { + set(fullscreenTaskBounds) + scale(widthScale) + offset( + lastComputedTaskSize.left.toFloat(), + lastComputedTaskSize.top.toFloat(), + ) + } + val toRect = + TEMP_TO_RECTF.apply { + set(currentTaskBounds) + scale(widthScale) + offset( + lastComputedTaskSize.left.toFloat(), + lastComputedTaskSize.top.toFloat(), + ) + } + val transform = Matrix() + transform.setRectToRect(fromRect, toRect, Matrix.ScaleToFit.FILL) + remoteTargetHandle.taskViewSimulator.setTaskRectTransform(transform) + remoteTargetHandle.taskViewSimulator.apply(remoteTargetHandle.transformParams) + + val targetAlpha = + when { + // Animate to hide a task window that should not show in the desktop + // tile. + !shouldBeDisplayedInOverview -> 1f - explodeProgress + // Obscured windows should be treated similarly to minimized windows and + // should fade in. Activated windows should stay visible however. + isObscured && taskId != taskIdReorderToFront -> explodeProgress + // Regular windows will stay opaque if they should be shown. + else -> 1f + } + remoteTargetHandle.transformParams.setTargetAlpha(targetAlpha) + } + + (taskContainer.taskContentView as? TaskContentView)?.setTaskHeaderAlpha( + if (shouldBeDisplayedInOverview) explodeProgress else 0f ) + + val isMinimized = taskContainer.task.isMinimized + + taskContainer.taskContentView.alpha = + when { + !isMinimized && !shouldBeDisplayedInOverview -> + // Non-minimized windows should fade out if it they should not show in + // the desktop tile. + 1f - explodeProgress + !isMinimized && isObscured -> + // Obscured windows should be treated similarly to minimized windows and + // should fade in. + explodeProgress + !isMinimized || taskId == taskIdReorderToFront -> + // Normal tasks stay opaque. If the task is being reordered to the + // front, we also want it to stay at full opacity. + 1f + shouldBeDisplayedInOverview -> + // Minimized tasks are immediately placed in the exploded position and + // then fade in during the course of EXPLODE_PROGRESS. + explodeProgress + else -> 0f + } } - } - } - override fun onRecycle() { - super.onRecycle() - visibility = VISIBLE + val overviewTaskLeft = overviewTaskBounds.left * widthScale + val overviewTaskTop = overviewTaskBounds.top * heightScale + val overviewTaskWidth = overviewTaskBounds.width() * widthScale + val overviewTaskHeight = overviewTaskBounds.height() * heightScale + + if (updateLayout) { + // Position the task to the same position as it would be on the desktop + taskContainer.taskContentView.updateLayoutParams { + gravity = Gravity.LEFT or Gravity.TOP + width = overviewTaskWidth.toInt() + height = overviewTaskHeight.toInt() + leftMargin = overviewTaskLeft.toInt() + topMargin = overviewTaskTop.toInt() + } + + if (enableDesktopExplodedView() && enableRefactorTaskContentView()) { + // The taskContentView and its descendant close button should only be focusable + // if the task is actually visible. Note that disabling the view also makes + // it not hoverable. + val taskContentView = taskContainer.taskContentView as TaskContentView + taskContentView.isHoverable = shouldBeDisplayedInOverview + taskContentView.isFocusable = shouldBeDisplayedInOverview + taskContentView.descendantFocusability = + if (shouldBeDisplayedInOverview) FOCUS_BEFORE_DESCENDANTS + else FOCUS_BLOCK_DESCENDANTS + } + } + + if (enableDesktopRecentsTransitionsCornersBugfix() && enableRefactorTaskThumbnail()) { + // When exploded view is disabled, these scale factors will be 1.0. This secondary + // scale factor is needed because a scale transform is applied to the thumbnail. + val thumbnailScaleWidth = + overviewTaskBounds.width().toFloat() / currentTaskBounds.width() + val thumbnailScaleHeight = + overviewTaskBounds.height().toFloat() / currentTaskBounds.height() + val screenRect = getScreenRect() + val contentOutlineBounds = + if (intersects(currentTaskBounds, screenRect)) + Rect(currentTaskBounds).apply { + intersectUnchecked(screenRect) + // Offset to 0,0 to transform into TaskThumbnailView's coordinate + // system. + offset(-currentTaskBounds.left, -currentTaskBounds.top) + left = (left * widthScale * thumbnailScaleWidth).roundToInt() + top = (top * heightScale * thumbnailScaleHeight).roundToInt() + right = (right * widthScale * thumbnailScaleWidth).roundToInt() + bottom = (bottom * heightScale * thumbnailScaleHeight).roundToInt() + } + else null + + if (enableRefactorTaskContentView()) { + (taskContainer.taskContentView as TaskContentView).outlineBounds = + contentOutlineBounds + } else { + taskContainer.thumbnailView.outlineBounds = contentOutlineBounds + } + } + + val currentTaskLeft = currentTaskBounds.left * widthScale + val currentTaskTop = currentTaskBounds.top * heightScale + val currentTaskWidth = currentTaskBounds.width() * widthScale + val currentTaskHeight = currentTaskBounds.height() * heightScale + // During the animation, apply translation and scale such that the view is transformed + // to where we want, without triggering layout. + taskContainer.taskContentView.apply { + pivotX = 0.0f + pivotY = 0.0f + translationX = currentTaskLeft - overviewTaskLeft + translationY = currentTaskTop - overviewTaskTop + scaleX = if (overviewTaskWidth != 0f) currentTaskWidth / overviewTaskWidth else 1f + scaleY = + if (overviewTaskHeight != 0f) currentTaskHeight / overviewTaskHeight else 1f + } + } } /** Updates this desktop task to the gives task list defined in `tasks` */ fun bind( - tasks: List, + desktopTask: DesktopTask, orientedState: RecentsOrientedState, - taskOverlayFactory: TaskOverlayFactory + taskOverlayFactory: TaskOverlayFactory, ) { + viewModel.bind(desktopTask) + this.groupTask = desktopTask + // Minimized tasks are shown in Overview when exploded view is enabled. + val tasks = + if (enableDesktopExplodedView()) { + desktopTask.tasks + } else { + desktopTask.tasks.filterNot { it.isMinimized } + } if (DEBUG) { val sb = StringBuilder() sb.append("bind tasks=").append(tasks.size).append("\n") tasks.forEach { sb.append(" key=${it.key}\n") } Log.d(TAG, sb.toString()) } - cancelPendingLoadTasks() - if (!isTaskContainersInitialized()) { - taskContainers = arrayListOf() - } - val taskContainers = taskContainers as ArrayList - taskContainers.ensureCapacity(tasks.size) - tasks.forEachIndexed { index, task -> - val thumbnailViewDeprecated: TaskThumbnailViewDeprecated - if (index >= taskContainers.size) { - thumbnailViewDeprecated = taskThumbnailViewPool.view - // Add thumbnailView from to position after the initial child views. - addView( - thumbnailViewDeprecated, - childCountAtInflation, - LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT - ) + iconView = + (findViewById(R.id.icon) as TaskViewIcon).apply { + setIcon( + this, + ResourcesCompat.getDrawable( + context.resources, + R.drawable.ic_desktop_with_bg, + context.theme, + ), ) - } else { - thumbnailViewDeprecated = taskContainers[index].thumbnailViewDeprecated + setText(resources.getText(R.string.recent_task_desktop)) } - val taskContainer = + iconTouchDelegate = TransformingTouchDelegate(iconView.asView()) + + cancelPendingLoadTasks() + val backgroundViewIndex = contentView.indexOfChild(backgroundView) + taskContainers = + tasks.map { task -> + val taskContentView = + when { + enableRefactorTaskContentView() -> taskContentViewPool!!.view + enableRefactorTaskThumbnail() -> taskThumbnailViewPool!!.view + else -> taskThumbnailViewDeprecatedPool!!.view + } + contentView.addView(taskContentView, backgroundViewIndex + 1) + val snapshotView = + if (enableRefactorTaskContentView()) { + taskContentView.findViewById(R.id.snapshot) + } else { + taskContentView + } + if (enableDesktopExplodedView()) { + taskContentView.setOnClickListener { + launchTaskWithDesktopController(animated = true, task.key.id) + } + if (taskContentView is TaskContentView) { + // Desktop tasks should have their own accessibility nodes so specific + // actions can be performed on them. + taskContentView.importantForAccessibility = + View.IMPORTANT_FOR_ACCESSIBILITY_YES + } + } + TaskContainer( - task, - // TODO(b/338360089): Support new TTV for DesktopTaskView - thumbnailView = null, - thumbnailViewDeprecated, - iconView, - TransformingTouchDelegate(iconView.asView()), - SplitConfigurationOptions.STAGE_POSITION_UNDEFINED, - digitalWellBeingToast = null, - showWindowsView = null, - taskOverlayFactory - ) - .apply { thumbnailViewDeprecated.bind(task, overlay) } - if (index >= taskContainers.size) { - taskContainers.add(taskContainer) - } else { - taskContainers[index] = taskContainer + this, + task, + taskContentView, + snapshotView, + iconView, + iconTouchDelegate, + SplitConfigurationOptions.STAGE_POSITION_UNDEFINED, + digitalWellBeingToast = null, + showWindowsView = null, + taskOverlayFactory, + ) } - } - repeat(taskContainers.size - tasks.size) { - if (Utilities.ATLEAST_T) { - with(taskContainers.removeLast()) { - removeView(thumbnailViewDeprecated) - taskThumbnailViewPool.recycle(thumbnailViewDeprecated) - } - } else { - taskContainers.removeAt(taskContainers.lastIndex) + onBind(orientedState) + } + + override fun onBind(orientedState: RecentsOrientedState) { + super.onBind(orientedState) + if (enableRefactorTaskThumbnail()) { + if (enableOverviewDesktopTileWallpaperBackground()) { + setWallpaperBackground(false) } } + } + + override fun onRecycle() { + super.onRecycle() + explodeProgress = 0.0f + taskRemoveProgress = 0.0f + previousOrganizedDesktopTaskVisibilityDataMap = null + visibility = VISIBLE + taskContainers.forEach { removeAndRecycleThumbnailView(it) } + remoteTargetHandles = null + taskIdReorderToFront = null + viewModel.bind(null) + } + + @SuppressLint("RtlHardcoded") + override fun updateTaskSize(lastComputedTaskSize: Rect, lastComputedGridTaskSize: Rect) { + super.updateTaskSize(lastComputedTaskSize, lastComputedGridTaskSize) + this.lastComputedTaskSize.set(lastComputedTaskSize) + + updateTaskPositions() + } + + override fun onTaskListVisibilityChanged(visible: Boolean, changes: Int) { + super.onTaskListVisibilityChanged(visible, changes) + if (needsUpdate(changes, FLAG_UPDATE_CORNER_RADIUS)) { + contentViewFullscreenParams.updateCornerRadius(context) + } + } + + override fun onIconLoaded(taskContainer: TaskContainer) { + // Update contentDescription of snapshotView only, individual task icon is unused. + taskContainer.snapshotView.contentDescription = taskContainer.task.titleDescription + } - setOrientationState(orientedState) + override fun setIconState(container: TaskContainer, state: TaskData?) { + container.snapshotView.contentDescription = (state as? TaskData.Data)?.titleDescription } - override fun needsUpdate(dataChange: Int, flag: Int) = - if (flag == FLAG_UPDATE_THUMBNAIL) super.needsUpdate(dataChange, flag) else false + // Ignoring [onIconUnloaded] as all tasks shares the same Desktop icon + override fun onIconUnloaded(taskContainer: TaskContainer) {} // thumbnailView is laid out differently and is handled in onMeasure override fun updateThumbnailSize() {} override fun getThumbnailBounds(bounds: Rect, relativeToDragLayer: Boolean) { if (relativeToDragLayer) { - container.dragLayer.getDescendantRectRelativeToSelf(backgroundView, bounds) + container.dragLayer.getDescendantRectRelativeToSelf(contentView, bounds) } else { - bounds.set(backgroundView) + bounds.set(contentView) } } - override fun launchTaskAnimated(): RunnableList? { + /** + * Launches the desktop task and activate the task with [taskIdToReorderToFront] if it's + * provided and already on the desktop. It will exit Overview to desktop and activate the + * according new task afterwards if applicable. + */ + fun launchTaskWithDesktopController( + animated: Boolean, + taskIdToReorderToFront: Int? = null, + ): RunnableList? { val recentsView = recentsView ?: return null + TestLogging.recordEvent( + TestProtocol.SEQUENCE_MAIN, + "launchDesktopFromRecents", + taskIds.contentToString(), + ) val endCallback = RunnableList() val desktopController = recentsView.desktopRecentsController checkNotNull(desktopController) { "recentsController is null" } - desktopController.launchDesktopFromRecents(this) { endCallback.executeAllAndDestroy() } - Log.d(TAG, "launchTaskAnimated - launchDesktopFromRecents: ${taskIds.contentToString()}") + + if (taskIdToReorderToFront != null) { + taskIdReorderToFront = taskIdToReorderToFront + } + val launchDesktopFromRecents = { + desktopController.launchDesktopFromRecents(this, animated, taskIdToReorderToFront) { + endCallback.executeAllAndDestroy() + } + } + if ( + enableMultipleDesktops(context) && desktopTask?.tasks?.none { !it.isMinimized } == true + ) { + recentsView.switchToScreenshot { + recentsView.finishRecentsAnimation( + /* toHome= */ true, + /* shouldPip= */ false, + launchDesktopFromRecents, + ) + } + } else { + launchDesktopFromRecents() + } + Log.d( + TAG, + "launchTaskWithDesktopController: ${taskIds.contentToString()}, withRemoteTransition: $animated", + ) // Callbacks get run from recentsView for case when recents animation already running recentsView.addSideTaskLaunchCallback(endCallback) return endCallback } - override fun launchTask(callback: (launched: Boolean) -> Unit, isQuickSwitch: Boolean) { - launchTasks() - callback(true) - } + override fun launchAsStaticTile() = launchTaskWithDesktopController(animated = true) - // Desktop tile can't be in split screen - override fun confirmSecondSplitSelectApp(): Boolean = false + override fun launchWithoutAnimation( + isQuickSwitch: Boolean, + callback: (launched: Boolean) -> Unit, + ) = launchTaskWithDesktopController(animated = false)?.add { callback(true) } ?: callback(false) + + // Return true when Task cannot be launched as fullscreen (i.e. in split select state) to skip + // putting DesktopTaskView to split as it's not supported. + override fun confirmSecondSplitSelectApp(): Boolean = + recentsView?.canLaunchFullscreenTask() != true + + override fun getTaskIcons(): Sequence> = + sequenceOf(iconView to iconTouchDelegate) + + override fun getContainerForIconView(iconView: TaskViewIcon) = null // TODO(b/330685808) support overlay for Screenshot action override fun setOverlayEnabled(overlayEnabled: Boolean) {} override fun onFullscreenProgressChanged(fullscreenProgress: Float) { - // Don't show background while we are transitioning to/from fullscreen - backgroundView.visibility = if (fullscreenProgress > 0) INVISIBLE else VISIBLE + backgroundView.alpha = 1 - fullscreenProgress + updateSettledProgressFullscreen(fullscreenProgress) + } + + override fun updateFullscreenParams() { + super.updateFullscreenParams() + updateFullscreenParams(contentViewFullscreenParams) + contentView.cornerRadius = contentViewFullscreenParams.currentCornerRadius + } + + override fun addChildrenForAccessibility(outChildren: ArrayList) { + super.addChildrenForAccessibility(outChildren) + addAccessibleChildToList(iconView.asView(), outChildren) + addAccessibleChildToList(backgroundView, outChildren) + } + + fun removeTaskFromExplodedView(taskId: Int, animate: Boolean) { + if (!enableDesktopExplodedView()) { + Log.e( + TAG, + "removeTaskFromExplodedView called when enableDesktopExplodedView flag is false", + ) + return + } + + // Remove the task's [taskContainer] and its associated Views. + val taskContainer = getTaskContainerById(taskId) ?: return + removeAndRecycleThumbnailView(taskContainer) + taskContainer.destroy() + taskContainers = taskContainers.filterNot { it == taskContainer } + + // Dismiss the current DesktopTaskView if all its windows are closed. + if (taskContainers.isEmpty()) { + recentsView?.dismissTaskView(this, animate, /* removeTask= */ true) + } else { + // If this task has a live window, then hide it. + // TODO(b/413120214) The dismissed view should fade out. + remoteTargetHandles?.getRemoteTargetHandle(taskId)?.let { + it.taskViewSimulator.setTaskRectTransform(Matrix().apply { postScale(0.0f, 0.0f) }) + it.taskViewSimulator.apply(it.transformParams) + } + + // TODO(b/413130378) Nicer handling of multiple quick task dismissals. + taskRemoveAnimator?.cancel() + taskRemoveAnimator = + ObjectAnimator.ofFloat(this, TASK_REMOVE_PROGRESS, 0f, 1f).apply { + addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animator: Animator) { + previousOrganizedDesktopTaskVisibilityDataMap = null + taskRemoveAnimator = null + } + } + ) + start() + } + + // Store the current organized positions before computing new ones. This allows us to + // animate from the current layout to the new. + previousOrganizedDesktopTaskVisibilityDataMap = + viewModel.organizedDesktopTaskVisibilityDataMap + updateTaskPositions(taskId) + } + } + + private fun removeAndRecycleThumbnailView(taskContainer: TaskContainer) { + contentView.removeView(taskContainer.taskContentView) + when { + enableRefactorTaskContentView() -> + taskContentViewPool!!.recycle(taskContainer.taskContentView as TaskContentView) + + enableRefactorTaskThumbnail() -> + taskThumbnailViewPool!!.recycle(taskContainer.taskContentView as TaskThumbnailView) + + else -> taskThumbnailViewDeprecatedPool!!.recycle(taskContainer.thumbnailViewDeprecated) + } + } + + private fun updateTaskPositions(dismissedTaskId: Int? = null) { + if (enableDesktopExplodedView()) { + val layoutConfig = getDesktopLayoutConfig() + viewModel.organizeDesktopTasks(layoutConfig, dismissedTaskId) + } + positionTaskWindows(updateLayout = true) + } + + private fun getDesktopLayoutConfig(): DesktopLayoutConfig { + val (widthScale, heightScale) = getScreenScaleFactors() + val res = context.resources + return DesktopLayoutConfig( + desktopBounds = getScreenRect(), + topBottomMarginOneRow = + (res.getDimensionPixelSize(R.dimen.desktop_top_bottom_margin_one_row) / heightScale) + .toInt(), + topMarginMultiRows = + (res.getDimensionPixelSize(R.dimen.desktop_top_margin_multi_rows) / heightScale) + .toInt(), + bottomMarginMultiRows = + (res.getDimensionPixelSize(R.dimen.desktop_bottom_margin_multi_rows) / heightScale) + .toInt(), + leftRightMarginOneRow = + (res.getDimensionPixelSize(R.dimen.desktop_left_right_margin_one_row) / widthScale) + .toInt(), + leftRightMarginMultiRows = + (res.getDimensionPixelSize(R.dimen.desktop_left_right_margin_multi_rows) / + widthScale) + .toInt(), + horizontalPaddingBetweenTasks = + (res.getDimensionPixelSize(R.dimen.desktop_horizontal_padding_between_tasks) / + widthScale) + .toInt(), + verticalPaddingBetweenTasks = + (res.getDimensionPixelSize(R.dimen.desktop_vertical_padding_between_tasks) / + heightScale) + .toInt(), + minTaskWidth = + (res.getDimensionPixelSize(R.dimen.desktop_min_task_width) / widthScale).toInt(), + maxRows = res.getInteger(R.integer.desktop_layout_max_rows), + ) + } + + /** + * Calculates the scale factors for the desktop task view's width and height. This is determined + * by comparing the available task view dimensions (after accounting for margins like + * [thumbnailTopMarginPx]) against the total screen dimensions. + * + * @return A [Pair] where the first value is the scale factor for width and the second is for + * height. + */ + private fun getScreenScaleFactors(): Pair { + val thumbnailTopMarginPx = container.deviceProfile.overviewProfile.taskThumbnailTopMarginPx + val taskViewWidth = layoutParams.width + val taskViewHeight = layoutParams.height - thumbnailTopMarginPx + + val screenRect = getScreenRect() + val widthScale = taskViewWidth / screenRect.width().toFloat() + val heightScale = taskViewHeight / screenRect.height().toFloat() + + return Pair(widthScale, heightScale) + } + + /** Returns the dimensions of the screen. */ + private fun getScreenRect(): Rect { + BaseContainerInterface.getTaskDimension(container.deviceProfile, tempPointF) + return Rect(0, 0, tempPointF.x.toInt(), tempPointF.y.toInt()) + } + + override fun onConfigurationChanged(newConfig: Configuration?) { + super.onConfigurationChanged(newConfig) + if (enableOverviewDesktopTileWallpaperBackground()) { + cancelFetchWallpaperBackgroundJobs() + setWallpaperBackground(true) + } + } + + private fun setWallpaperBackground(forceRefresh: Boolean) { + wallpaperBackgroundFetchCoroutineJobs += + coroutineScope.launch(dispatcherProvider.main) { + setWallpaperBackground(viewModel.getWallpaperBackground(forceRefresh)) + } + } + + private fun setWallpaperBackground(desktopBackgroundResult: DesktopBackgroundResult) { + backgroundView.setImageDrawable( + when (desktopBackgroundResult) { + is DesktopBackgroundResult.WallpaperBackground -> { + desktopBackgroundResult.background.toDrawable(resources) + } + + is DesktopBackgroundResult.FallbackBackground -> { + resources + .getColor(desktopBackgroundResult.background, context.theme) + .toDrawable() + } + } + ) } - override fun updateCurrentFullscreenParams() { - super.updateCurrentFullscreenParams() - updateFullscreenParams(snapshotDrawParams) + override fun cancelJobs() { + super.cancelJobs() + cancelFetchWallpaperBackgroundJobs() } - override fun getThumbnailFullscreenParams() = snapshotDrawParams + private fun cancelFetchWallpaperBackgroundJobs() { + if (enableOverviewDesktopTileWallpaperBackground()) { + val coroutineJobsToCancel = wallpaperBackgroundFetchCoroutineJobs.toList() + wallpaperBackgroundFetchCoroutineJobs.clear() + if (coroutineJobsToCancel.isNotEmpty()) { + coroutineScope.launch(dispatcherProvider.lightweightBackground) { + coroutineJobsToCancel.forEach { it.cancel() } + } + } + } + } companion object { private const val TAG = "DesktopTaskView" private const val DEBUG = false - private const val VIEW_POOL_MAX_SIZE = 10 + private const val VIEW_POOL_MAX_SIZE = 5 + // As DesktopTaskView is inflated in background, use initialSize=0 to avoid initPool. private const val VIEW_POOL_INITIAL_SIZE = 0 - private val ORIGIN = Point(0, 0) + + // Temporaries used for various purposes to avoid allocations. + private val TEMP_OVERVIEW_TASK_POSITION = Rect() + private val TEMP_FROM_RECTF = RectF() + private val TEMP_TO_RECTF = RectF() + private val TASK_REMOVE_PROGRESS: FloatProperty = + KFloatProperty(DesktopTaskView::taskRemoveProgress) } } diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java deleted file mode 100644 index a9236197dfc..00000000000 --- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java +++ /dev/null @@ -1,443 +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.quickstep.views; - -import static android.provider.Settings.ACTION_APP_USAGE_SETTINGS; - -import static com.android.launcher3.Utilities.prefixTextWithIcon; -import static com.android.launcher3.util.Executors.ORDERED_BG_EXECUTOR; - -import android.app.ActivityOptions; -import android.content.ActivityNotFoundException; -import android.content.Context; -import android.content.Intent; -import android.content.pm.LauncherApps; -import android.content.pm.LauncherApps.AppUsageLimit; -import android.graphics.Outline; -import android.graphics.Paint; -import android.icu.text.MeasureFormat; -import android.icu.text.MeasureFormat.FormatWidth; -import android.icu.util.Measure; -import android.icu.util.MeasureUnit; -import android.os.UserHandle; -import android.util.Log; -import android.util.Pair; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewOutlineProvider; -import android.view.accessibility.AccessibilityNodeInfo; -import android.widget.FrameLayout; -import android.widget.TextView; - -import androidx.annotation.IntDef; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; -import com.android.quickstep.TaskUtils; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.systemui.shared.recents.model.Task; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.time.Duration; -import java.util.Locale; - -public final class DigitalWellBeingToast { - - private static final float THRESHOLD_LEFT_ICON_ONLY = 0.4f; - private static final float THRESHOLD_RIGHT_ICON_ONLY = 0.6f; - - /** Will span entire width of taskView with full text */ - private static final int SPLIT_BANNER_FULLSCREEN = 0; - /** Used for grid task view, only showing icon and time */ - private static final int SPLIT_GRID_BANNER_LARGE = 1; - /** Used for grid task view, only showing icon */ - private static final int SPLIT_GRID_BANNER_SMALL = 2; - - @IntDef(value = { - SPLIT_BANNER_FULLSCREEN, - SPLIT_GRID_BANNER_LARGE, - SPLIT_GRID_BANNER_SMALL, - }) - @Retention(RetentionPolicy.SOURCE) - @interface SplitBannerConfig { - } - - static final Intent OPEN_APP_USAGE_SETTINGS_TEMPLATE = new Intent(ACTION_APP_USAGE_SETTINGS); - static final int MINUTE_MS = 60000; - - private static final String TAG = "DigitalWellBeingToast"; - - private final RecentsViewContainer mContainer; - private final TaskView mTaskView; - private final LauncherApps mLauncherApps; - - private final int mBannerHeight; - - private Task mTask; - private boolean mHasLimit; - - private long mAppRemainingTimeMs; - @Nullable - private View mBanner; - private ViewOutlineProvider mOldBannerOutlineProvider; - private float mBannerOffsetPercentage; - @Nullable - private SplitBounds mSplitBounds; - private float mSplitOffsetTranslationY; - private float mSplitOffsetTranslationX; - - private boolean mIsDestroyed = false; - - public DigitalWellBeingToast(RecentsViewContainer container, TaskView taskView) { - mContainer = container; - mTaskView = taskView; - mLauncherApps = container.asContext().getSystemService(LauncherApps.class); - mBannerHeight = container.asContext().getResources().getDimensionPixelSize( - R.dimen.digital_wellbeing_toast_height); - } - - private void setNoLimit() { - mHasLimit = false; - mTaskView.setContentDescription(mTask.titleDescription); - replaceBanner(null); - mAppRemainingTimeMs = -1; - } - - private void setLimit(long appUsageLimitTimeMs, long appRemainingTimeMs) { - mAppRemainingTimeMs = appRemainingTimeMs; - mHasLimit = true; - TextView toast = mContainer.getViewCache().getView(R.layout.digital_wellbeing_toast, - mContainer.asContext(), mTaskView); - toast.setText(prefixTextWithIcon(mContainer.asContext(), R.drawable.ic_hourglass_top, - getText())); - toast.setOnClickListener(this::openAppUsageSettings); - replaceBanner(toast); - - mTaskView.setContentDescription( - getContentDescriptionForTask(mTask, appUsageLimitTimeMs, appRemainingTimeMs)); - } - - public String getText() { - return getText(mAppRemainingTimeMs, false /* forContentDesc */); - } - - public boolean hasLimit() { - return mHasLimit; - } - - public void initialize(Task task) { - if (mIsDestroyed) { - throw new IllegalStateException("Cannot re-initialize a destroyed toast"); - } - mTask = task; - ORDERED_BG_EXECUTOR.execute(() -> { - AppUsageLimit usageLimit = null; - try { - usageLimit = mLauncherApps.getAppUsageLimit( - mTask.getTopComponent().getPackageName(), - UserHandle.of(mTask.key.userId)); - } catch (Exception e) { - Log.e(TAG, "Error initializing digital well being toast", e); - } - final long appUsageLimitTimeMs = usageLimit != null ? usageLimit.getTotalUsageLimit() : -1; - final long appRemainingTimeMs = usageLimit != null ? usageLimit.getUsageRemaining() : -1; - - mTaskView.post(() -> { - if (mIsDestroyed) { - return; - } - if (appUsageLimitTimeMs < 0 || appRemainingTimeMs < 0) { - setNoLimit(); - } else { - setLimit(appUsageLimitTimeMs, appRemainingTimeMs); - } - }); - }); - } - - /** - * Mark the DWB toast as destroyed and remove banner from TaskView. - */ - public void destroy() { - mIsDestroyed = true; - mTaskView.post(() -> replaceBanner(null)); - } - - public void setSplitBounds(@Nullable SplitBounds splitBounds) { - mSplitBounds = splitBounds; - } - - private @SplitBannerConfig int getSplitBannerConfig() { - if (mSplitBounds == null - || !mContainer.getDeviceProfile().isTablet - || mTaskView.isFocusedTask()) { - return SPLIT_BANNER_FULLSCREEN; - } - - // For portrait grid only height of task changes, not width. So we keep the text - // the same - if (!mContainer.getDeviceProfile().isLeftRightSplit) { - return SPLIT_GRID_BANNER_LARGE; - } - - // For landscape grid, for 30% width we only show icon, otherwise show icon and - // time - if (mTask.key.id == mSplitBounds.leftTopTaskId) { - return mSplitBounds.leftTaskPercent < THRESHOLD_LEFT_ICON_ONLY - ? SPLIT_GRID_BANNER_SMALL - : SPLIT_GRID_BANNER_LARGE; - } else { - return mSplitBounds.leftTaskPercent > THRESHOLD_RIGHT_ICON_ONLY - ? SPLIT_GRID_BANNER_SMALL - : SPLIT_GRID_BANNER_LARGE; - } - } - - private String getReadableDuration( - Duration duration, - @StringRes int durationLessThanOneMinuteStringId) { - int hours = Math.toIntExact(duration.toHours()); - int minutes = Math.toIntExact(duration.minusHours(hours).toMinutes()); - - // Apply FormatWidth.WIDE if both the hour part and the minute part are - // non-zero. - if (hours > 0 && minutes > 0) { - return MeasureFormat.getInstance(Locale.getDefault(), FormatWidth.NARROW) - .formatMeasures( - new Measure(hours, MeasureUnit.HOUR), - new Measure(minutes, MeasureUnit.MINUTE)); - } - - // Apply FormatWidth.WIDE if only the hour part is non-zero (unless forced). - if (hours > 0) { - return MeasureFormat.getInstance(Locale.getDefault(), FormatWidth.WIDE).formatMeasures( - new Measure(hours, MeasureUnit.HOUR)); - } - - // Apply FormatWidth.WIDE if only the minute part is non-zero (unless forced). - if (minutes > 0) { - return MeasureFormat.getInstance(Locale.getDefault(), FormatWidth.WIDE).formatMeasures( - new Measure(minutes, MeasureUnit.MINUTE)); - } - - // Use a specific string for usage less than one minute but non-zero. - if (duration.compareTo(Duration.ZERO) > 0) { - return mContainer.asContext().getString(durationLessThanOneMinuteStringId); - } - - // Otherwise, return 0-minute string. - return MeasureFormat.getInstance(Locale.getDefault(), FormatWidth.WIDE).formatMeasures( - new Measure(0, MeasureUnit.MINUTE)); - } - - /** - * Returns text to show for the banner depending on - * {@link #getSplitBannerConfig()} - * If {@param forContentDesc} is {@code true}, this will always return the full - * string corresponding to {@link #SPLIT_BANNER_FULLSCREEN} - */ - private String getText(long remainingTime, boolean forContentDesc) { - final Duration duration = Duration.ofMillis( - remainingTime > MINUTE_MS ? (remainingTime + MINUTE_MS - 1) / MINUTE_MS * MINUTE_MS : remainingTime); - String readableDuration = getReadableDuration(duration, - R.string.shorter_duration_less_than_one_minute - /* forceFormatWidth */); - @SplitBannerConfig - int splitBannerConfig = getSplitBannerConfig(); - if (forContentDesc || splitBannerConfig == SPLIT_BANNER_FULLSCREEN) { - return mContainer.asContext().getString( - R.string.time_left_for_app, - readableDuration); - } - - if (splitBannerConfig == SPLIT_GRID_BANNER_SMALL) { - // show no text - return ""; - } else { // SPLIT_GRID_BANNER_LARGE - // only show time - return readableDuration; - } - } - - public void openAppUsageSettings(View view) { - final Intent intent = new Intent(OPEN_APP_USAGE_SETTINGS_TEMPLATE) - .putExtra(Intent.EXTRA_PACKAGE_NAME, - mTask.getTopComponent().getPackageName()) - .addFlags( - Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - try { - final RecentsViewContainer container = RecentsViewContainer.containerFromContext(view.getContext()); - final ActivityOptions options = ActivityOptions.makeScaleUpAnimation( - view, 0, 0, - view.getWidth(), view.getHeight()); - container.asContext().startActivity(intent, options.toBundle()); - - // TODO: add WW logging on the app usage settings click. - } catch (ActivityNotFoundException e) { - Log.e(TAG, "Failed to open app usage settings for task " - + mTask.getTopComponent().getPackageName(), e); - } - } - - private String getContentDescriptionForTask( - Task task, long appUsageLimitTimeMs, long appRemainingTimeMs) { - return appUsageLimitTimeMs >= 0 && appRemainingTimeMs >= 0 ? mContainer.asContext().getString( - R.string.task_contents_description_with_remaining_time, - task.titleDescription, - getText(appRemainingTimeMs, true /* forContentDesc */)) : task.titleDescription; - } - - private void replaceBanner(@Nullable View view) { - resetOldBanner(); - setBanner(view); - } - - private void resetOldBanner() { - if (mBanner != null) { - mBanner.setOutlineProvider(mOldBannerOutlineProvider); - mTaskView.removeView(mBanner); - mBanner.setOnClickListener(null); - mContainer.getViewCache().recycleView(R.layout.digital_wellbeing_toast, mBanner); - } - } - - private void setBanner(@Nullable View view) { - mBanner = view; - if (mBanner != null && mTaskView.getRecentsView() != null) { - setupAndAddBanner(); - setBannerOutline(); - } - } - - private void setupAndAddBanner() { - FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) mBanner.getLayoutParams(); - DeviceProfile deviceProfile = mContainer.getDeviceProfile(); - layoutParams.bottomMargin = ((ViewGroup.MarginLayoutParams) mTaskView.getFirstThumbnailViewDeprecated() - .getLayoutParams()).bottomMargin; - RecentsPagedOrientationHandler orientationHandler = mTaskView.getPagedOrientationHandler(); - Pair translations = orientationHandler - .getDwbLayoutTranslations(mTaskView.getMeasuredWidth(), - mTaskView.getMeasuredHeight(), mSplitBounds, deviceProfile, - mTaskView.getThumbnailViews(), mTask.key.id, mBanner); - mSplitOffsetTranslationX = translations.first; - mSplitOffsetTranslationY = translations.second; - updateTranslationY(); - updateTranslationX(); - mTaskView.addView(mBanner); - } - - private void setBannerOutline() { - // TODO(b\273367585) to investigate why mBanner.getOutlineProvider() can be null - mOldBannerOutlineProvider = mBanner.getOutlineProvider() != null - ? mBanner.getOutlineProvider() - : ViewOutlineProvider.BACKGROUND; - - mBanner.setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - mOldBannerOutlineProvider.getOutline(view, outline); - float verticalTranslation = -view.getTranslationY() + mSplitOffsetTranslationY; - outline.offset(0, Math.round(verticalTranslation)); - } - }); - mBanner.setClipToOutline(true); - } - - void updateBannerOffset(float offsetPercentage) { - if (mBannerOffsetPercentage != offsetPercentage) { - mBannerOffsetPercentage = offsetPercentage; - if (mBanner != null) { - updateTranslationY(); - mBanner.invalidateOutline(); - } - } - } - - private void updateTranslationY() { - if (mBanner == null) { - return; - } - - mBanner.setTranslationY( - (mBannerOffsetPercentage * mBannerHeight) + mSplitOffsetTranslationY); - } - - private void updateTranslationX() { - if (mBanner == null) { - return; - } - - mBanner.setTranslationX(mSplitOffsetTranslationX); - } - - void setBannerColorTint(int color, float amount) { - if (mBanner == null) { - return; - } - if (amount == 0) { - mBanner.setLayerType(View.LAYER_TYPE_NONE, null); - } - Paint layerPaint = new Paint(); - layerPaint.setColorFilter(Utilities.makeColorTintingColorFilter(color, amount)); - mBanner.setLayerType(View.LAYER_TYPE_HARDWARE, layerPaint); - mBanner.setLayerPaint(layerPaint); - } - - void setBannerVisibility(int visibility) { - if (mBanner == null) { - return; - } - - mBanner.setVisibility(visibility); - } - - private int getAccessibilityActionId() { - return (mSplitBounds != null - && mSplitBounds.rightBottomTaskId == mTask.key.id) - ? R.id.action_digital_wellbeing_bottom_right - : R.id.action_digital_wellbeing_top_left; - } - - @Nullable - public AccessibilityNodeInfo.AccessibilityAction getDWBAccessibilityAction() { - if (!hasLimit()) { - return null; - } - - Context context = mContainer.asContext(); - String label = (mTaskView.containsMultipleTasks()) - ? context.getString( - R.string.split_app_usage_settings, - TaskUtils.getTitle(context, mTask)) - : context.getString(R.string.accessibility_app_usage_settings); - return new AccessibilityNodeInfo.AccessibilityAction(getAccessibilityActionId(), label); - } - - public boolean handleAccessibilityAction(int action) { - if (getAccessibilityActionId() == action) { - openAppUsageSettings(mTaskView); - return true; - } else { - return false; - } - } -} diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt new file mode 100644 index 00000000000..8c7f4830dbf --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt @@ -0,0 +1,372 @@ +/* + * 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.quickstep.views + +import android.annotation.SuppressLint +import android.app.ActivityOptions +import android.content.ActivityNotFoundException +import android.content.Context +import android.content.Intent +import android.content.pm.LauncherApps +import android.content.pm.LauncherApps.AppUsageLimit +import android.graphics.Outline +import android.graphics.Paint +import android.os.UserHandle +import android.provider.Settings +import android.util.AttributeSet +import android.util.Log +import android.view.View +import android.view.ViewOutlineProvider +import android.view.accessibility.AccessibilityNodeInfo +import android.widget.TextView +import androidx.annotation.VisibleForTesting +import androidx.core.util.component1 +import androidx.core.util.component2 +import androidx.core.view.isVisible +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.util.Executors +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED +import com.android.launcher3.util.SplitConfigurationOptions.StagePosition +import com.android.quickstep.TaskUtils +import com.android.quickstep.task.apptimer.DurationFormatter +import com.android.systemui.shared.recents.model.Task +import com.android.wm.shell.shared.split.SplitBounds +import java.time.Duration + +@SuppressLint("AppCompatCustomView") +class DigitalWellBeingToast +@JvmOverloads +constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, + defStyleRes: Int = 0, +) : TextView(context, attrs, defStyleAttr, defStyleRes) { + private val recentsViewContainer: RecentsViewContainer = + RecentsViewContainer.containerFromContext(context) + + private val launcherApps: LauncherApps? = context.getSystemService(LauncherApps::class.java) + + private val bannerHeight = + context.resources.getDimensionPixelSize(R.dimen.digital_wellbeing_toast_height) + + private lateinit var task: Task + private lateinit var taskView: TaskView + private lateinit var snapshotView: View + @StagePosition private var stagePosition = STAGE_POSITION_UNDEFINED + + private var appRemainingTimeMs: Long = 0 + private var splitOffsetTranslationY = 0f + set(value) { + if (field != value) { + field = value + updateTranslationY() + } + } + + var isDestroyed = false + private set + + var hasLimit = false + var splitBounds: SplitBounds? = null + var bannerOffsetPercentage = 0f + set(value) { + if (field != value) { + field = value + updateTranslationY() + } + } + + init { + setOnClickListener(::openAppUsageSettings) + outlineProvider = + object : ViewOutlineProvider() { + override fun getOutline(view: View, outline: Outline) { + BACKGROUND.getOutline(view, outline) + val verticalTranslation = splitOffsetTranslationY - translationY + outline.offset(0, Math.round(verticalTranslation)) + } + } + clipToOutline = true + } + + private fun setNoLimit() { + isVisible = false + hasLimit = false + appRemainingTimeMs = -1 + setContentDescription(appUsageLimitTimeMs = -1, appRemainingTimeMs = -1) + } + + private fun setLimit(appUsageLimitTimeMs: Long, appRemainingTimeMs: Long) { + isVisible = true + hasLimit = true + this.appRemainingTimeMs = appRemainingTimeMs + setContentDescription(appUsageLimitTimeMs, appRemainingTimeMs) + text = Utilities.prefixTextWithIcon(context, R.drawable.ic_hourglass_top, getBannerText()) + } + + private fun setContentDescription(appUsageLimitTimeMs: Long, appRemainingTimeMs: Long) { + val contentDescription = + getContentDescriptionForTask(task, appUsageLimitTimeMs, appRemainingTimeMs) + snapshotView.contentDescription = contentDescription + } + + fun initialize() { + check(!isDestroyed) { "Cannot re-initialize a destroyed toast" } + setupTranslations() + Executors.ORDERED_BG_EXECUTOR.execute { + var usageLimit: AppUsageLimit? = null + try { + usageLimit = + launcherApps?.getAppUsageLimit( + task.topComponent.packageName, + UserHandle.of(task.key.userId), + ) + } catch (e: Exception) { + Log.e(TAG, "Error initializing digital well being toast", e) + } + val appUsageLimitTimeMs = usageLimit?.totalUsageLimit ?: -1 + val appRemainingTimeMs = usageLimit?.usageRemaining ?: -1 + + taskView.post { + if (isDestroyed) return@post + if (appUsageLimitTimeMs < 0 || appRemainingTimeMs < 0) { + setNoLimit() + } else { + setLimit(appUsageLimitTimeMs, appRemainingTimeMs) + } + } + } + } + + /** Bind the DWB toast to its dependencies. */ + fun bind( + task: Task, + taskView: TaskView, + snapshotView: View, + @StagePosition stagePosition: Int, + ) { + this.task = task + this.taskView = taskView + this.snapshotView = snapshotView + this.stagePosition = stagePosition + isDestroyed = false + } + + /** Mark the DWB toast as destroyed and hide it. */ + fun destroy() { + isVisible = false + isDestroyed = true + } + + private fun getSplitBannerConfig(): SplitBannerConfig { + val splitBounds = splitBounds + return when { + splitBounds == null || + !recentsViewContainer.deviceProfile.deviceProperties.isTablet || + taskView.isLargeTile -> SplitBannerConfig.SPLIT_BANNER_FULLSCREEN + // For portrait grid only height of task changes, not width. So we keep the text the + // same + !recentsViewContainer.deviceProfile.isLeftRightSplit -> + SplitBannerConfig.SPLIT_GRID_BANNER_LARGE + // For landscape grid, for 30% width we only show icon, otherwise show icon and time + task.key.id == splitBounds.leftTopTaskId -> + if (splitBounds.leftTopTaskPercent < THRESHOLD_LEFT_ICON_ONLY) + SplitBannerConfig.SPLIT_GRID_BANNER_SMALL + else SplitBannerConfig.SPLIT_GRID_BANNER_LARGE + else -> + if (splitBounds.leftTopTaskPercent > THRESHOLD_RIGHT_ICON_ONLY) + SplitBannerConfig.SPLIT_GRID_BANNER_SMALL + else SplitBannerConfig.SPLIT_GRID_BANNER_LARGE + } + } + + /** + * Returns text to show for the banner depending on [.getSplitBannerConfig] If {@param + * forContentDesc} is `true`, this will always return the full string corresponding to + * [.SPLIT_BANNER_FULLSCREEN] + */ + @JvmOverloads + @VisibleForTesting + fun getBannerText( + remainingTime: Long = appRemainingTimeMs, + forContentDesc: Boolean = false, + ): String { + val duration = + Duration.ofMillis( + if (remainingTime > MINUTE_MS) + (remainingTime + MINUTE_MS - 1) / MINUTE_MS * MINUTE_MS + else remainingTime + ) + val readableDuration = + DurationFormatter.format( + context, + duration, + R.string.shorter_duration_less_than_one_minute, /* forceFormatWidth */ + ) + val splitBannerConfig = getSplitBannerConfig() + return when { + forContentDesc || splitBannerConfig == SplitBannerConfig.SPLIT_BANNER_FULLSCREEN -> + context.getString(R.string.time_left_for_app, readableDuration) + // show no text + splitBannerConfig == SplitBannerConfig.SPLIT_GRID_BANNER_SMALL -> "" + // SPLIT_GRID_BANNER_LARGE only show time + else -> readableDuration + } + } + + private fun openAppUsageSettings(view: View) { + val intent = + Intent(OPEN_APP_USAGE_SETTINGS_TEMPLATE) + .putExtra(Intent.EXTRA_PACKAGE_NAME, task.topComponent.packageName) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + try { + val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height) + context.startActivity(intent, options.toBundle()) + + // TODO: add WW logging on the app usage settings click. + } catch (e: ActivityNotFoundException) { + Log.e( + TAG, + "Failed to open app usage settings for task " + task.topComponent.packageName, + e, + ) + } + } + + private fun getContentDescriptionForTask( + task: Task, + appUsageLimitTimeMs: Long, + appRemainingTimeMs: Long, + ): String? = + if (appUsageLimitTimeMs >= 0 && appRemainingTimeMs >= 0) + context.getString( + R.string.task_contents_description_with_remaining_time, + task.titleDescription, + getBannerText(appRemainingTimeMs, true /* forContentDesc */), + ) + else task.titleDescription + + fun setupLayout() { + val snapshotWidth: Int + val snapshotHeight: Int + val splitBounds = splitBounds + if (splitBounds == null) { + snapshotWidth = taskView.layoutParams.width + snapshotHeight = + taskView.layoutParams.height - + recentsViewContainer.deviceProfile.overviewProfile.taskThumbnailTopMarginPx + } else { + val groupedTaskSize = + taskView.pagedOrientationHandler.getGroupedTaskViewSizes( + recentsViewContainer.deviceProfile, + splitBounds, + taskView.layoutParams.width, + taskView.layoutParams.height, + ) + if (stagePosition == STAGE_POSITION_TOP_OR_LEFT) { + snapshotWidth = groupedTaskSize.first.x + snapshotHeight = groupedTaskSize.first.y + } else { + snapshotWidth = groupedTaskSize.second.x + snapshotHeight = groupedTaskSize.second.y + } + } + taskView.pagedOrientationHandler.updateDwbBannerLayout( + taskView.layoutParams.width, + taskView.layoutParams.height, + taskView is GroupedTaskView, + recentsViewContainer.deviceProfile, + snapshotWidth, + snapshotHeight, + this, + ) + } + + private fun setupTranslations() { + val (translationX, translationY) = + taskView.pagedOrientationHandler.getDwbBannerTranslations( + taskView.layoutParams.width, + taskView.layoutParams.height, + splitBounds, + recentsViewContainer.deviceProfile, + taskView.taskContentViews, + task.key.id, + this, + ) + this.translationX = translationX + this.splitOffsetTranslationY = translationY + } + + private fun updateTranslationY() { + translationY = bannerOffsetPercentage * bannerHeight + splitOffsetTranslationY + invalidateOutline() + } + + fun setColorTint(color: Int, amount: Float) { + if (amount == 0f) { + setLayerType(View.LAYER_TYPE_NONE, null) + } + val layerPaint = Paint() + layerPaint.setColorFilter(Utilities.makeColorTintingColorFilter(color, amount)) + setLayerType(View.LAYER_TYPE_HARDWARE, layerPaint) + setLayerPaint(layerPaint) + } + + private fun getAccessibilityActionId(): Int = + if (splitBounds?.rightBottomTaskId == task.key.id) + R.id.action_digital_wellbeing_bottom_right + else R.id.action_digital_wellbeing_top_left + + fun getDWBAccessibilityAction(): AccessibilityNodeInfo.AccessibilityAction? { + if (!hasLimit) return null + val label = + if (taskView.containsMultipleTasks()) + context.getString( + R.string.split_app_usage_settings, + TaskUtils.getTitle(context, task), + ) + else context.getString(R.string.accessibility_app_usage_settings) + return AccessibilityNodeInfo.AccessibilityAction(getAccessibilityActionId(), label) + } + + fun handleAccessibilityAction(action: Int): Boolean { + if (getAccessibilityActionId() != action) return false + openAppUsageSettings(taskView) + return true + } + + companion object { + private const val THRESHOLD_LEFT_ICON_ONLY = 0.4f + private const val THRESHOLD_RIGHT_ICON_ONLY = 0.6f + + enum class SplitBannerConfig { + /** Will span entire width of taskView with full text */ + SPLIT_BANNER_FULLSCREEN, + /** Used for grid task view, only showing icon and time */ + SPLIT_GRID_BANNER_LARGE, + /** Used for grid task view, only showing icon */ + SPLIT_GRID_BANNER_SMALL, + } + + val OPEN_APP_USAGE_SETTINGS_TEMPLATE: Intent = Intent(Settings.ACTION_APP_USAGE_SETTINGS) + const val MINUTE_MS: Int = 60000 + + private const val TAG = "DigitalWellBeingToast" + } +} diff --git a/quickstep/src/com/android/quickstep/views/FixedSizeImageView.kt b/quickstep/src/com/android/quickstep/views/FixedSizeImageView.kt new file mode 100644 index 00000000000..c8930165b58 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/FixedSizeImageView.kt @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.views + +import android.annotation.SuppressLint +import android.content.Context +import android.util.AttributeSet +import android.view.ViewGroup +import android.widget.ImageView + +/** + * An [ImageView] that does not requestLayout() unless setLayoutParams is called. + * + * This is useful, particularly during animations, for [ImageView]s that are not supposed to be + * resized. + */ +@SuppressLint("AppCompatCustomView") +class FixedSizeImageView : ImageView { + private var shouldRequestLayoutOnChanges = false + + constructor(context: Context) : super(context) + + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + + constructor( + context: Context, + attrs: AttributeSet?, + defStyleAttr: Int, + ) : super(context, attrs, defStyleAttr) + + override fun setLayoutParams(params: ViewGroup.LayoutParams?) { + shouldRequestLayoutOnChanges = true + super.setLayoutParams(params) + shouldRequestLayoutOnChanges = false + } + + override fun requestLayout() { + if (shouldRequestLayoutOnChanges) { + super.requestLayout() + } + } +} diff --git a/quickstep/src/com/android/quickstep/views/FloatingAppPairBackground.kt b/quickstep/src/com/android/quickstep/views/FloatingAppPairBackground.kt index e024995aa30..4361a33aa53 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingAppPairBackground.kt +++ b/quickstep/src/com/android/quickstep/views/FloatingAppPairBackground.kt @@ -37,12 +37,12 @@ import com.android.systemui.shared.system.QuickStepContract * increase in size during the animation. */ open class FloatingAppPairBackground( - context: Context, - // the view that we will draw this background on - protected val floatingView: FloatingAppPairView, - private val appIcon1: Drawable, - private val appIcon2: Drawable?, - dividerPos: Int + context: Context, + // the view that we will draw this background on + protected val floatingView: FloatingAppPairView, + private val appIcon1: Drawable, + private val appIcon2: Drawable?, + dividerPos: Int, ) : Drawable() { companion object { // Design specs -- app icons start small and expand during the animation @@ -57,6 +57,7 @@ open class FloatingAppPairBackground( private val container: RecentsViewContainer private val backgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG) + private val dividerPaint = Paint(Paint.ANTI_ALIAS_FLAG) // Animation interpolators protected val expandXInterpolator: Interpolator @@ -78,40 +79,45 @@ open class FloatingAppPairBackground( backgroundPaint.color = ta.getColor(R.styleable.FolderIconPreview_folderPreviewColor, 0) ta.recycle() // Set up timings and interpolators - val timings = AnimUtils.getDeviceAppPairLaunchTimings(container.deviceProfile.isTablet) + val timings = + AnimUtils.getDeviceAppPairLaunchTimings( + container.deviceProfile.deviceProperties.isTablet + ) expandXInterpolator = Interpolators.clampToProgress( timings.getStagedRectScaleXInterpolator(), timings.stagedRectSlideStartOffset, - timings.stagedRectSlideEndOffset + timings.stagedRectSlideEndOffset, ) expandYInterpolator = Interpolators.clampToProgress( timings.getStagedRectScaleYInterpolator(), timings.stagedRectSlideStartOffset, - timings.stagedRectSlideEndOffset + timings.stagedRectSlideEndOffset, ) cellSplitInterpolator = Interpolators.clampToProgress( timings.cellSplitInterpolator, timings.cellSplitStartOffset, - timings.cellSplitEndOffset + timings.cellSplitEndOffset, ) iconFadeInterpolator = Interpolators.clampToProgress( timings.iconFadeInterpolator, timings.iconFadeStartOffset, - timings.iconFadeEndOffset + timings.iconFadeEndOffset, ) // Find device-specific measurements - deviceCornerRadius = QuickStepContract.getWindowCornerRadius(container.asContext()) + val resources = context.resources + deviceCornerRadius = QuickStepContract.getWindowCornerRadius(context) deviceHalfDividerSize = - container.asContext().resources.getDimensionPixelSize(R.dimen.multi_window_task_divider_size) / 2f + resources.getDimensionPixelSize(R.dimen.multi_window_task_divider_size) / 2f val dividerCenterPos = dividerPos + deviceHalfDividerSize desiredSplitRatio = - if (dp.isLeftRightSplit) dividerCenterPos / dp.widthPx - else dividerCenterPos / dp.heightPx + if (dp.isLeftRightSplit) dividerCenterPos / dp.deviceProperties.widthPx + else dividerCenterPos / dp.deviceProperties.heightPx + dividerPaint.color = resources.getColor(R.color.taskbar_background_dark, null /*theme*/) } override fun draw(canvas: Canvas) { @@ -153,8 +159,17 @@ open class FloatingAppPairBackground( val leftSide = RectF(0f, 0f, dividerCenterPos - changingDividerSize, height) // The right half of the background image val rightSide = RectF(dividerCenterPos + changingDividerSize, 0f, width, height) + // Middle part is for divider background + val middleRect = + RectF( + leftSide.right - deviceHalfDividerSize, + 0f, + rightSide.left + deviceHalfDividerSize, + height, + ) // Draw background + canvas.drawRect(middleRect, dividerPaint) drawCustomRoundedRect( canvas, leftSide, @@ -167,7 +182,7 @@ open class FloatingAppPairBackground( changingInnerRadiusY, cornerRadiusX, cornerRadiusY, - ) + ), ) drawCustomRoundedRect( canvas, @@ -181,7 +196,7 @@ open class FloatingAppPairBackground( cornerRadiusY, changingInnerRadiusX, changingInnerRadiusY, - ) + ), ) // Calculate changing measurements for icons. @@ -251,8 +266,17 @@ open class FloatingAppPairBackground( val topSide = RectF(0f, 0f, width, dividerCenterPos - changingDividerSize) // The bottom half of the background image val bottomSide = RectF(0f, dividerCenterPos + changingDividerSize, width, height) + // Middle part is for divider background + val middleRect = + RectF( + 0f, + topSide.bottom - deviceHalfDividerSize, + width, + bottomSide.top + deviceHalfDividerSize, + ) // Draw background + canvas.drawRect(middleRect, dividerPaint) drawCustomRoundedRect( canvas, topSide, @@ -264,8 +288,8 @@ open class FloatingAppPairBackground( changingInnerRadiusX, changingInnerRadiusY, changingInnerRadiusX, - changingInnerRadiusY - ) + changingInnerRadiusY, + ), ) drawCustomRoundedRect( canvas, @@ -278,8 +302,8 @@ open class FloatingAppPairBackground( cornerRadiusX, cornerRadiusY, cornerRadiusX, - cornerRadiusY - ) + cornerRadiusY, + ), ) // Calculate changing measurements for icons. diff --git a/quickstep/src/com/android/quickstep/views/FloatingAppPairView.kt b/quickstep/src/com/android/quickstep/views/FloatingAppPairView.kt index e8d1cc1e36d..668413817a4 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingAppPairView.kt +++ b/quickstep/src/com/android/quickstep/views/FloatingAppPairView.kt @@ -27,7 +27,7 @@ import android.view.ViewGroup import android.widget.FrameLayout import com.android.launcher3.R import com.android.launcher3.Utilities -import com.android.launcher3.statemanager.StatefulActivity +import com.android.launcher3.views.ActivityContext import com.android.launcher3.views.BaseDragLayer /** @@ -38,11 +38,11 @@ class FloatingAppPairView @JvmOverloads constructor(context: Context, attrs: Att FrameLayout(context, attrs) { companion object { fun getFloatingAppPairView( - launcher: StatefulActivity<*>, + launcher: ActivityContext, originalView: View, appIcon1: Drawable?, appIcon2: Drawable?, - dividerPos: Int + dividerPos: Int, ): FloatingAppPairView { val dragLayer: ViewGroup = launcher.getDragLayer() val floatingView = @@ -62,11 +62,11 @@ class FloatingAppPairView @JvmOverloads constructor(context: Context, attrs: Att /** Initializes the view, copying the bounds and location of the original icon view. */ fun init( - launcher: StatefulActivity<*>, + launcher: ActivityContext, originalView: View, appIcon1: Drawable?, appIcon2: Drawable?, - dividerPos: Int + dividerPos: Int, ) { val viewBounds = Rect(0, 0, originalView.width, originalView.height) Utilities.getBoundsForViewInDragLayer( @@ -75,12 +75,12 @@ class FloatingAppPairView @JvmOverloads constructor(context: Context, attrs: Att viewBounds, false /* ignoreTransform */, null /* recycle */, - startingPosition + startingPosition, ) val lp = BaseDragLayer.LayoutParams( Math.round(startingPosition.width()), - Math.round(startingPosition.height()) + Math.round(startingPosition.height()), ) lp.ignoreInsets = true @@ -92,14 +92,14 @@ class FloatingAppPairView @JvmOverloads constructor(context: Context, attrs: Att layoutParams = lp // Prepare to draw app pair icon background - background = if (appIcon1 == null || appIcon2 == null) { - val iconToAnimate = appIcon1 ?: appIcon2 - checkNotNull(iconToAnimate) - FloatingFullscreenAppPairBackground(context, this, iconToAnimate, - dividerPos) - } else { - FloatingAppPairBackground(context, this, appIcon1, appIcon2, dividerPos) - } + background = + if (appIcon1 == null || appIcon2 == null) { + val iconToAnimate = appIcon1 ?: appIcon2 + checkNotNull(iconToAnimate) + FloatingFullscreenAppPairBackground(context, this, iconToAnimate, dividerPos) + } else { + FloatingAppPairBackground(context, this, appIcon1, appIcon2, dividerPos) + } background.setBounds(0, 0, lp.width, lp.height) } diff --git a/quickstep/src/com/android/quickstep/views/FloatingDesktopTaskView.kt b/quickstep/src/com/android/quickstep/views/FloatingDesktopTaskView.kt new file mode 100644 index 00000000000..24ce42445c0 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/FloatingDesktopTaskView.kt @@ -0,0 +1,214 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.views + +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.RectF +import android.util.AttributeSet +import android.view.ViewGroup +import android.widget.FrameLayout +import com.android.app.animation.Interpolators +import com.android.launcher3.InsettableFrameLayout +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.anim.PendingAnimation +import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.views.BaseDragLayer +import com.android.quickstep.util.MultiValueUpdateListener +import com.android.quickstep.util.SplitAnimationTimings +import com.android.systemui.shared.system.QuickStepContract + +/** + * View representing a Desktop task by showing its thumbnail. + * + * Use [Companion.create] to create an instance of this view, and [addClosingAnimation] to animate + * the closing of the Desktop task. + */ +class FloatingDesktopTaskView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : + FrameLayout(context, attrs, defStyleAttr) { + + constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) + + private val isRtl = Utilities.isRtl(resources) + private val cornerRadius = QuickStepContract.getWindowCornerRadius(context) + private lateinit var thumbnailView: FloatingTaskThumbnailView + private lateinit var startBounds: RectF + + override fun onFinishInflate() { + super.onFinishInflate() + thumbnailView = findViewById(R.id.thumbnail) + } + + private fun init( + recentsViewContainer: RecentsViewContainer, + startBounds: RectF, + thumbnail: Bitmap?, + ) { + this.startBounds = startBounds + val lp: BaseDragLayer.LayoutParams = + BaseDragLayer.LayoutParams( + Math.round(startBounds.width()), + Math.round(startBounds.height()), + ) + initPosition(recentsViewContainer, startBounds, lp) + layoutParams = lp + + pivotX = 0f + pivotY = 0f + + // Copy bounds of exiting thumbnail into ImageView + thumbnailView.setThumbnail(thumbnail) + thumbnailView.setDrawCallback { canvas: Canvas, paint: Paint -> + canvas.drawRoundRect( + /* left= */ 0f, + /* top= */ 0f, + measuredWidth.toFloat(), + measuredHeight.toFloat(), + cornerRadius, + cornerRadius, + paint, + ) + } + thumbnailView.visibility = VISIBLE + } + + private fun initPosition( + recentsViewContainer: RecentsViewContainer, + pos: RectF, + lp: InsettableFrameLayout.LayoutParams, + ) { + lp.ignoreInsets = true + // Position the floating view exactly on top of the original + lp.topMargin = Math.round(pos.top) + if (isRtl) { + val deviceProperties = recentsViewContainer.getDeviceProfile().deviceProperties + lp.marginStart = deviceProperties.widthPx - Math.round(pos.right) + } else { + lp.marginStart = Math.round(pos.left) + } + + // Set the properties here already to make sure they are available when running the first + // animation frame. + val left = pos.left.toInt() + layout(left, lp.topMargin, left + lp.width, lp.topMargin + lp.height) + } + + /** Animates the FloatingTaskThumbnailView to fade out and scale down. */ + fun addClosingAnimation( + recentsViewContainer: RecentsViewContainer, + animation: PendingAnimation, + ) { + // Use the Workspace pivot point, so the Desktop task view scales together with Workspace. + if (recentsViewContainer is QuickstepLauncher) { + recentsViewContainer.workspace.setPivotToScaleWithSelf(this) + } + + val timings = + if (recentsViewContainer.deviceProfile.deviceProperties.isTablet) { + SplitAnimationTimings.TABLET_OVERVIEW_TO_SPLIT + } else { + SplitAnimationTimings.PHONE_OVERVIEW_TO_SPLIT + } + addFadeAnimation(animation, timings) + addScaleAnimation(animation, timings) + } + + private fun addFadeAnimation(animation: PendingAnimation, timings: SplitAnimationTimings) { + // FloatingTaskThumbnailView: thumbnail fades out to transparent + animation.setViewAlpha( + thumbnailView, + 0f, + Interpolators.clampToProgress( + Interpolators.LINEAR, + timings.placeholderFadeInStartOffset, + timings.placeholderFadeInEndOffset, + ), + ) + } + + private fun addScaleAnimation(animation: PendingAnimation, timings: SplitAnimationTimings) { + val transitionAnimator = ValueAnimator.ofFloat(0f, 1f) + animation.add(transitionAnimator) + val floatingTaskViewBounds = RectF() + val listener: MultiValueUpdateListener = + object : MultiValueUpdateListener() { + val scaleX: FloatProp = + FloatProp( + 1f, + TASK_VIEW_END_SCALE, + Interpolators.clampToProgress( + timings.stagedRectScaleXInterpolator, + timings.stagedRectSlideStartOffset, + timings.stagedRectSlideEndOffset, + ), + ) + val scaleY: FloatProp = + FloatProp( + 1f, + TASK_VIEW_END_SCALE, + Interpolators.clampToProgress( + timings.stagedRectScaleYInterpolator, + timings.stagedRectSlideStartOffset, + timings.stagedRectSlideEndOffset, + ), + ) + + override fun onUpdate(percent: Float, initOnly: Boolean) { + floatingTaskViewBounds.set(startBounds) + update(scaleX.value, scaleY.value) + } + } + + transitionAnimator.addUpdateListener(listener) + } + + private fun update(scaleX: Float, scaleY: Float) { + setScaleX(scaleX) + setScaleY(scaleY) + thumbnailView.invalidate() + } + + companion object { + private const val TASK_VIEW_END_SCALE = 0.95f + + /** + * Configures and returns an instance of [FloatingDesktopTaskView] showing [thumbnail] with + * an initial position of [startBounds]. + */ + fun create( + recentsViewContainer: RecentsViewContainer, + startBounds: RectF, + thumbnail: Bitmap, + ): FloatingDesktopTaskView { + val dragLayer: ViewGroup = recentsViewContainer.dragLayer + val floatingView = + recentsViewContainer.layoutInflater.inflate( + R.layout.floating_desktop_view, + dragLayer, + /* attachToRoot= */ false, + ) as FloatingDesktopTaskView + + floatingView.init(recentsViewContainer, startBounds, thumbnail) + FloatingTaskView.addViewBelowTaskMenu(recentsViewContainer, floatingView) + return floatingView + } + } +} diff --git a/quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java index e5a733391e5..898a3e91287 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java +++ b/quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java @@ -26,6 +26,7 @@ import android.util.AttributeSet; import android.view.View; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; /** @@ -36,11 +37,19 @@ */ public class FloatingTaskThumbnailView extends View { + /** Callback used to draw this view. */ + public interface DrawCallback { + /** Draw onto the given {@code canvas} using the given {@code paint}. */ + void draw(@NonNull Canvas canvas, @NonNull Paint paint); + } + private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); private final Matrix mMatrix = new Matrix(); private @Nullable BitmapShader mBitmapShader; private @Nullable Bitmap mBitmap; + private boolean mFitXY = false; + private DrawCallback mDrawCallback; public FloatingTaskThumbnailView(Context context) { this(context, null); @@ -60,14 +69,13 @@ protected void onDraw(Canvas canvas) { return; } - // Scale down the bitmap to fix x, and crop in y. - float scale = 1.0f * getMeasuredWidth() / mBitmap.getWidth(); + float scaleX = 1.0f * getMeasuredWidth() / mBitmap.getWidth(); + float scaleY = 1.0f * getMeasuredHeight() / mBitmap.getHeight(); mMatrix.reset(); - mMatrix.postScale(scale, scale); + // Either scale to fit x and y, or fit x and crop in y. + mMatrix.postScale(scaleX, mFitXY ? scaleY : scaleX); mBitmapShader.setLocalMatrix(mMatrix); - - FloatingTaskView parent = (FloatingTaskView) getParent(); - parent.drawRoundedRect(canvas, mPaint); + mDrawCallback.draw(canvas, mPaint); } public void setThumbnail(Bitmap bitmap) { @@ -77,4 +85,14 @@ public void setThumbnail(Bitmap bitmap) { mPaint.setShader(mBitmapShader); } } + + /** Sets the callback to use to draw this view. */ + public void setDrawCallback(DrawCallback callback) { + mDrawCallback = callback; + } + + /** Scale the thumbnail in both x and y. */ + public void setFitXY() { + mFitXY = true; + } } diff --git a/quickstep/src/com/android/quickstep/views/FloatingTaskView.java b/quickstep/src/com/android/quickstep/views/FloatingTaskView.java index acbb2eccbbc..80994c4714e 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingTaskView.java +++ b/quickstep/src/com/android/quickstep/views/FloatingTaskView.java @@ -124,8 +124,8 @@ protected void onFinishInflate() { mSplitPlaceholderView.setAlpha(0); } - private void init(RecentsViewContainer launcher, View originalView, @Nullable Bitmap thumbnail, - Drawable icon, RectF positionOut) { + private void init(RecentsViewContainer recentsViewContainer, View originalView, + @Nullable Bitmap thumbnail, Drawable icon, RectF positionOut) { mStartingPosition = positionOut; updateInitialPositionForView(originalView); final InsettableFrameLayout.LayoutParams lp = @@ -137,10 +137,11 @@ private void init(RecentsViewContainer launcher, View originalView, @Nullable Bi // Copy bounds of exiting thumbnail into ImageView mThumbnailView.setThumbnail(thumbnail); + mThumbnailView.setDrawCallback(this::drawRoundedRect); mThumbnailView.setVisibility(VISIBLE); - RecentsView recentsView = launcher.getOverviewPanel(); + RecentsView recentsView = recentsViewContainer.getOverviewPanel(); mOrientationHandler = recentsView.getPagedOrientationHandler(); mStagePosition = recentsView.getSplitSelectController().getActiveSplitStagePosition(); mSplitPlaceholderView.setIcon(icon, mSplitHolderSize); @@ -151,15 +152,16 @@ private void init(RecentsViewContainer launcher, View originalView, @Nullable Bi * Configures and returns a an instance of {@link FloatingTaskView} initially matching the * appearance of {@code originalView}. */ - public static FloatingTaskView getFloatingTaskView(RecentsViewContainer launcher, + public static FloatingTaskView getFloatingTaskView(RecentsViewContainer recentsViewContainer, View originalView, @Nullable Bitmap thumbnail, Drawable icon, RectF positionOut) { - final ViewGroup dragLayer = launcher.getDragLayer(); - final FloatingTaskView floatingView = (FloatingTaskView) launcher.getLayoutInflater() + final ViewGroup dragLayer = recentsViewContainer.getDragLayer(); + final FloatingTaskView floatingView = (FloatingTaskView) recentsViewContainer + .getLayoutInflater() .inflate(R.layout.floating_split_select_view, dragLayer, false); - floatingView.init(launcher, originalView, thumbnail, icon, positionOut); + floatingView.init(recentsViewContainer, originalView, thumbnail, icon, positionOut); // Add this animating view underneath the existing open task menu view (if there is one) - View openTaskView = AbstractFloatingView.getOpenView(launcher, TYPE_TASK_MENU); + View openTaskView = AbstractFloatingView.getOpenView(recentsViewContainer, TYPE_TASK_MENU); int openTaskViewIndex = dragLayer.indexOfChild(openTaskView); if (openTaskViewIndex == -1) { // Add to top if not @@ -239,7 +241,7 @@ protected void initPosition(RectF pos, InsettableFrameLayout.LayoutParams lp) { // Position the floating view exactly on top of the original lp.topMargin = Math.round(pos.top); if (mIsRtl) { - lp.setMarginStart(mContainer.getDeviceProfile().widthPx - Math.round(pos.right)); + lp.setMarginStart(mContainer.getDeviceProfile().getDeviceProperties().getWidthPx() - Math.round(pos.right)); } else { lp.setMarginStart(Math.round(pos.left)); } @@ -256,7 +258,7 @@ protected void initPosition(RectF pos, InsettableFrameLayout.LayoutParams lp) { */ public void addStagingAnimation(PendingAnimation animation, RectF startingBounds, Rect endBounds, boolean fadeWithThumbnail, boolean isStagedTask) { - boolean isTablet = mContainer.getDeviceProfile().isTablet; + boolean isTablet = mContainer.getDeviceProfile().getDeviceProperties().isTablet(); boolean splittingFromOverview = fadeWithThumbnail; SplitAnimationTimings timings; @@ -280,7 +282,7 @@ public void addStagingAnimation(PendingAnimation animation, RectF startingBounds public void addConfirmAnimation(PendingAnimation animation, RectF startingBounds, Rect endBounds, boolean fadeWithThumbnail, boolean isStagedTask) { SplitAnimationTimings timings = - AnimUtils.getDeviceSplitToConfirmTimings(mContainer.getDeviceProfile().isTablet); + AnimUtils.getDeviceSplitToConfirmTimings(mContainer.getDeviceProfile().getDeviceProperties().isTablet()); addAnimation(animation, startingBounds, endBounds, fadeWithThumbnail, isStagedTask, timings); @@ -362,6 +364,11 @@ public void onUpdate(float percent, boolean initOnly) { transitionAnimator.addUpdateListener(listener); } + /** Scale the thumbnail image so that the task view looks just like the original task. */ + public void setUseFitXYThumbnailScale() { + mThumbnailView.setFitXY(); + } + void fadeInSplitPlaceholder(PendingAnimation animation, SplitAnimationTimings timings) { animation.setViewAlpha(mSplitPlaceholderView, 1, clampToProgress(LINEAR, timings.getPlaceholderFadeInStartOffset(), @@ -401,6 +408,18 @@ public int getStagePosition() { return mStagePosition; } + /** Add the given view underneath the existing open task menu view (if there is one). */ + public static void addViewBelowTaskMenu(RecentsViewContainer launcher, View view) { + ViewGroup dragLayer = launcher.getDragLayer(); + View openTaskView = AbstractFloatingView.getOpenView(launcher, TYPE_TASK_MENU); + int openTaskViewIndex = dragLayer.indexOfChild(openTaskView); + if (openTaskViewIndex == -1) { + // Add to top if not + openTaskViewIndex = dragLayer.getChildCount(); + } + dragLayer.addView(view, openTaskViewIndex); + } + private static class SplitOverlayProperties { private final float finalTaskViewScaleX; diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java index e5f241fdbeb..b060168b1bc 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java +++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java @@ -33,7 +33,6 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.widget.LauncherAppWidgetHostView; -import com.android.launcher3.widget.RoundedCornerEnforcement; import java.util.stream.IntStream; @@ -180,8 +179,7 @@ private static boolean isSupportedDrawable(Drawable drawable) { /** Corner radius from source view's outline, or enforced view. */ private static float getOutlineRadius(LauncherAppWidgetHostView hostView, View v) { - if (RoundedCornerEnforcement.isRoundedCornerEnabled() - && hostView.hasEnforcedCornerRadius()) { + if (hostView.hasEnforcedCornerRadius()) { return hostView.getEnforcedCornerRadius(); } else if (Utilities.ATLEAST_S && v.getOutlineProvider() instanceof RemoteViewOutlineProvider diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java index fc52b8ee939..b12a345f647 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java +++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java @@ -18,6 +18,7 @@ import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.annotation.TargetApi; +import android.app.TaskInfo; import android.content.Context; import android.graphics.Matrix; import android.graphics.RectF; @@ -49,7 +50,6 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener, OnGlobalLayoutListener, FloatingView { private static final Matrix sTmpMatrix = new Matrix(); - private final QuickstepLauncher mLauncher; private final ListenerView mListenerView; private final FloatingWidgetBackgroundView mBackgroundView; private final RectF mBackgroundOffset = new RectF(); @@ -80,7 +80,6 @@ public FloatingWidgetView(Context context, @Nullable AttributeSet attrs) { public FloatingWidgetView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - mLauncher = QuickstepLauncher.getLauncher(context); mListenerView = new ListenerView(context, attrs); mBackgroundView = new FloatingWidgetBackgroundView(context, attrs, defStyleAttr); addView(mBackgroundView); @@ -122,10 +121,9 @@ protected void onDetachedFromWindow() { @Override public void onGlobalLayout() { - if (isUninitialized()) - return; - positionViews(); - if (mOnTargetChangeRunnable != null) { + if (isUninitialized()) return; + boolean positionsChanged = positionViews(); + if (mOnTargetChangeRunnable != null && positionsChanged) { mOnTargetChangeRunnable.run(); } } @@ -143,8 +141,7 @@ public void setFastFinishRunnable(Runnable runnable) { /** Callback at the end or early exit of the animation. */ @Override public void fastFinish() { - if (isUninitialized()) - return; + if (isUninitialized()) return; Runnable fastFinishRunnable = mFastFinishRunnable; if (fastFinishRunnable != null) { fastFinishRunnable.run(); @@ -156,15 +153,16 @@ public void fastFinish() { } } - private void init(DragLayer dragLayer, LauncherAppWidgetHostView originalView, + private void init(QuickstepLauncher launcher, DragLayer dragLayer, + LauncherAppWidgetHostView originalView, RectF widgetBackgroundPosition, Size windowSize, float windowCornerRadius, boolean appTargetIsTranslucent, int fallbackBackgroundColor) { mAppWidgetView = originalView; // Deferrals must begin before GhostView is created. See b/190818220 - mAppWidgetView.beginDeferringUpdates(); + mAppWidgetView.setUpdatesDeferred(true); mBackgroundPosition = widgetBackgroundPosition; mAppTargetIsTranslucent = appTargetIsTranslucent; - mEndRunnable = () -> finish(dragLayer); + mEndRunnable = () -> finish(launcher, dragLayer); mAppWidgetBackgroundView = RoundedCornerEnforcement.findBackground(mAppWidgetView); if (mAppWidgetBackgroundView == null) { @@ -189,23 +187,18 @@ private void init(DragLayer dragLayer, LauncherAppWidgetHostView originalView, /** * Updates the position and opacity of the floating widget's components. * - * @param backgroundPosition the new position of the widget's background - * relative to the + * @param backgroundPosition the new position of the widget's background relative to the * {@link FloatingWidgetView}'s parent - * @param floatingWidgetAlpha the overall opacity of the - * {@link FloatingWidgetView} + * @param floatingWidgetAlpha the overall opacity of the {@link FloatingWidgetView} * @param foregroundAlpha the opacity of the foreground layer - * @param fallbackBackgroundAlpha the opacity of the fallback background used - * when the App + * @param fallbackBackgroundAlpha the opacity of the fallback background used when the App * Widget doesn't have a background - * @param cornerRadiusProgress progress of the corner radius animation, where - * 0 is the + * @param cornerRadiusProgress progress of the corner radius animation, where 0 is the * original radius and 1 is the window radius */ public void update(RectF backgroundPosition, float floatingWidgetAlpha, float foregroundAlpha, float fallbackBackgroundAlpha, float cornerRadiusProgress) { - if (isUninitialized() || mAppTargetIsTranslucent) - return; + if (isUninitialized() || mAppTargetIsTranslucent) return; setAlpha(floatingWidgetAlpha); mBackgroundView.update(cornerRadiusProgress, fallbackBackgroundAlpha); mAppWidgetView.setAlpha(foregroundAlpha); @@ -220,46 +213,73 @@ public void setPositionOffsetY(float y) { } /** - * Sets the layout parameters of the floating view and its background view - * child. + * Sets the layout parameters of the floating view and its background view child. + * @return true if any of the views positions change due to this call. */ - private void positionViews() { + private boolean positionViews() { + boolean positionsChanged = false; + LayoutParams layoutParams = (LayoutParams) getLayoutParams(); - layoutParams.setMargins(0, 0, 0, 0); - setLayoutParams(layoutParams); + + if (layoutParams.topMargin != 0 || layoutParams.bottomMargin != 0 + || layoutParams.rightMargin != 0 || layoutParams.leftMargin != 0) { + positionsChanged = true; + layoutParams.setMargins(0, 0, 0, 0); + setLayoutParams(layoutParams); + } // FloatingWidgetView layout is forced LTR - mBackgroundView.setTranslationX(mBackgroundPosition.left); - mBackgroundView.setTranslationY(mBackgroundPosition.top + mIconOffsetY); + float targetY = mBackgroundPosition.top + mIconOffsetY; + if (mBackgroundView.getTranslationX() != mBackgroundPosition.left + || mBackgroundView.getTranslationY() != targetY) { + positionsChanged = true; + mBackgroundView.setTranslationX(mBackgroundPosition.left); + mBackgroundView.setTranslationY(targetY); + } + LayoutParams backgroundParams = (LayoutParams) mBackgroundView.getLayoutParams(); - backgroundParams.leftMargin = 0; - backgroundParams.topMargin = 0; - backgroundParams.width = (int) mBackgroundPosition.width(); - backgroundParams.height = (int) mBackgroundPosition.height(); - mBackgroundView.setLayoutParams(backgroundParams); + if (backgroundParams.leftMargin != 0 || backgroundParams.topMargin != 0 + || backgroundParams.width != Math.round(mBackgroundPosition.width()) + || backgroundParams.height != Math.round(mBackgroundPosition.height())) { + positionsChanged = true; + + backgroundParams.leftMargin = 0; + backgroundParams.topMargin = 0; + backgroundParams.width = Math.round(mBackgroundPosition.width()); + backgroundParams.height = Math.round(mBackgroundPosition.height()); + mBackgroundView.setLayoutParams(backgroundParams); + } if (mForegroundOverlayView != null) { sTmpMatrix.reset(); - float foregroundScale = mBackgroundPosition.width() / mAppWidgetBackgroundView.getWidth(); + float foregroundScale = + mBackgroundPosition.width() / mAppWidgetBackgroundView.getWidth(); sTmpMatrix.setTranslate(-mBackgroundOffset.left - mAppWidgetView.getLeft(), -mBackgroundOffset.top - mAppWidgetView.getTop()); sTmpMatrix.postScale(foregroundScale, foregroundScale); sTmpMatrix.postTranslate(mBackgroundPosition.left, mBackgroundPosition.top + mIconOffsetY); - mForegroundOverlayView.setMatrix(sTmpMatrix); + + // We use the animation matrix here, because calling setMatrix on the GhostView + // actually sets the animation matrix, not the regular one. + if (!sTmpMatrix.equals(mForegroundOverlayView.getAnimationMatrix())) { + positionsChanged = true; + mForegroundOverlayView.setMatrix(sTmpMatrix); + } } + return positionsChanged; } - private void finish(DragLayer dragLayer) { + private void finish(QuickstepLauncher launcher, DragLayer dragLayer) { mAppWidgetView.setAlpha(1f); GhostView.removeGhost(mAppWidgetView); ((ViewGroup) dragLayer.getParent()).removeView(this); dragLayer.removeView(mListenerView); mBackgroundView.finish(); // Removing GhostView must occur before ending deferrals. See b/190818220 - mAppWidgetView.endDeferringUpdates(); + mAppWidgetView.setUpdatesDeferred(false); recycle(); - mLauncher.getViewCache().recycleView(R.layout.floating_widget_view, this); + launcher.getViewCache().recycleView(R.layout.floating_widget_view, this); } public float getInitialCornerRadius() { @@ -284,12 +304,10 @@ private void recycle() { } /** - * Configures and returns a an instance of {@link FloatingWidgetView} matching - * the appearance of + * Configures and returns a an instance of {@link FloatingWidgetView} matching the appearance of * {@param originalView}. * - * @param widgetBackgroundPosition a {@link RectF} that will be updated with the - * widget's + * @param widgetBackgroundPosition a {@link RectF} that will be updated with the widget's * background bounds * @param windowSize the size of the window when launched * @param windowCornerRadius the corner radius of the window @@ -300,31 +318,35 @@ public static FloatingWidgetView getFloatingWidgetView(QuickstepLauncher launche int fallbackBackgroundColor) { final DragLayer dragLayer = launcher.getDragLayer(); ViewGroup parent = (ViewGroup) dragLayer.getParent(); - FloatingWidgetView floatingView = launcher.getViewCache().getView(R.layout.floating_widget_view, launcher, - parent); + FloatingWidgetView floatingView = + launcher.getViewCache().getView(R.layout.floating_widget_view, launcher, parent); floatingView.recycle(); - floatingView.init(dragLayer, originalView, widgetBackgroundPosition, windowSize, + floatingView.init(launcher, dragLayer, originalView, widgetBackgroundPosition, windowSize, windowCornerRadius, appTargetsAreTranslucent, fallbackBackgroundColor); parent.addView(floatingView); return floatingView; } /** - * Extract a background color from a target's task description, or fall back to - * the given + * Extract a background color from a target's task description, or fall back to the given * context's theme background color. */ public static int getDefaultBackgroundColor( - Context context, RemoteAnimationTarget target) { - return (target != null && target.taskInfo != null - && target.taskInfo.taskDescription != null) - ? target.taskInfo.taskDescription.getBackgroundColor() - : Themes.getColorBackground(context); + Context context, @Nullable RemoteAnimationTarget target) { + final int fallbackColor = Themes.getColorBackground(context); + if (target == null) { + return fallbackColor; + } + final TaskInfo taskInfo = target.taskInfo; + if (taskInfo == null) { + return fallbackColor; + } + return taskInfo.taskDescription.getBackgroundColor(); } private static void getRelativePosition(View descendant, View ancestor, RectF position) { - float[] points = new float[] { 0, 0, descendant.getWidth(), descendant.getHeight() }; + float[] points = new float[]{0, 0, descendant.getWidth(), descendant.getHeight()}; Utilities.getDescendantCoordRelativeToAncestor(descendant, ancestor, points, false /* includeRootScroll */, true /* ignoreTransform */); position.set( diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.kt b/quickstep/src/com/android/quickstep/views/GroupedTaskView.kt index d6a3376c533..48c71e51cf8 100644 --- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.kt +++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.kt @@ -21,24 +21,30 @@ import android.graphics.PointF import android.util.AttributeSet import android.util.Log import android.view.View +import android.view.ViewStub import com.android.internal.jank.Cuj -import com.android.launcher3.Flags.enableOverviewIconMenu +import com.android.launcher3.Flags.enableRefactorDigitalWellbeingToast +import com.android.launcher3.Flags.enableRefactorTaskContentView +import com.android.launcher3.Flags.enableRefactorTaskThumbnail +import com.android.launcher3.Flags.showCloseButtonOnTaskviewHover import com.android.launcher3.R import com.android.launcher3.Utilities -import com.android.launcher3.config.FeatureFlags +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu import com.android.launcher3.util.RunnableList -import com.android.launcher3.util.SplitConfigurationOptions import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED import com.android.quickstep.TaskOverlayFactory +import com.android.quickstep.recents.di.RecentsDependencies +import com.android.quickstep.recents.di.get +import com.android.quickstep.recents.ui.viewmodel.GroupedTaskViewModel import com.android.quickstep.util.RecentsOrientedState -import com.android.quickstep.util.SplitScreenUtils.Companion.convertLauncherSplitBoundsToShell import com.android.quickstep.util.SplitSelectStateController -import com.android.systemui.shared.recents.model.Task -import com.android.systemui.shared.recents.utilities.PreviewPositionHelper +import com.android.quickstep.util.SplitTask import com.android.systemui.shared.system.InteractionJankMonitorWrapper -import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition +import com.android.wm.shell.Flags.enableFlexibleTwoAppSplit +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants.PersistentSnapPosition /** * TaskView that contains and shows thumbnails for not one, BUT TWO(!!) tasks @@ -51,9 +57,18 @@ import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosi * (Icon loading sold separately, fees may apply. Shipping & Handling for Overlays not included). */ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : - TaskView(context, attrs) { + TaskView(context, attrs, type = TaskViewType.GROUPED) { + + private val MINIMUM_RATIO_TO_SHOW_ICON = 0.25f + + val leftTopTaskContainer: TaskContainer + get() = taskContainers[0] + + val rightBottomTaskContainer: TaskContainer + get() = taskContainers[1] + // TODO(b/336612373): Support new TTV for GroupedTaskView - var splitBoundsConfig: SplitConfigurationOptions.SplitBounds? = null + var splitBoundsConfig: SplitBounds? = null private set @get:PersistentSnapPosition @@ -61,109 +76,100 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu /** Returns the [PersistentSnapPosition] of this pair of tasks. */ get() = splitBoundsConfig?.snapPosition ?: STAGE_POSITION_UNDEFINED + private val viewModel = + GroupedTaskViewModel(isPointerConnectedUseCase = RecentsDependencies.get(context)) + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { super.onMeasure(widthMeasureSpec, heightMeasureSpec) val widthSize = MeasureSpec.getSize(widthMeasureSpec) val heightSize = MeasureSpec.getSize(heightMeasureSpec) setMeasuredDimension(widthSize, heightSize) val splitBoundsConfig = splitBoundsConfig ?: return - val initSplitTaskId = getThisTaskCurrentlyInSplitSelection() - if (initSplitTaskId == INVALID_TASK_ID) { - pagedOrientationHandler.measureGroupedTaskViewThumbnailBounds( - taskContainers[0].thumbnailViewDeprecated, - taskContainers[1].thumbnailViewDeprecated, - widthSize, - heightSize, - splitBoundsConfig, - container.deviceProfile, - layoutDirection == LAYOUT_DIRECTION_RTL - ) - // Should we be having a separate translation step apart from the measuring above? - // The following only applies to large screen for now, but for future reference - // we'd want to abstract this out in PagedViewHandlers to get the primary/secondary - // translation directions - taskContainers[0] - .thumbnailViewDeprecated - .applySplitSelectTranslateX(taskContainers[0].thumbnailViewDeprecated.translationX) - taskContainers[0] - .thumbnailViewDeprecated - .applySplitSelectTranslateY(taskContainers[0].thumbnailViewDeprecated.translationY) - taskContainers[1] - .thumbnailViewDeprecated - .applySplitSelectTranslateX(taskContainers[1].thumbnailViewDeprecated.translationX) - taskContainers[1] - .thumbnailViewDeprecated - .applySplitSelectTranslateY(taskContainers[1].thumbnailViewDeprecated.translationY) - } else { - // Currently being split with this taskView, let the non-split selected thumbnail - // take up full thumbnail area - taskContainers - .firstOrNull { it.task.key.id != initSplitTaskId } - ?.thumbnailViewDeprecated - ?.measure( - widthMeasureSpec, - MeasureSpec.makeMeasureSpec( - heightSize - container.deviceProfile.overviewTaskThumbnailTopMarginPx, - MeasureSpec.EXACTLY - ) - ) - } + val inSplitSelection = getThisTaskCurrentlyInSplitSelection() != INVALID_TASK_ID + pagedOrientationHandler.measureGroupedTaskViewThumbnailBounds( + leftTopTaskContainer.taskContentView, + rightBottomTaskContainer.taskContentView, + widthSize, + heightSize, + splitBoundsConfig, + container.deviceProfile, + layoutDirection == LAYOUT_DIRECTION_RTL, + inSplitSelection, + ) + if (!enableOverviewIconMenu()) { updateIconPlacement() } } + override fun inflateViewStubs() { + super.inflateViewStubs() + findViewById(R.id.bottomright_task_content_view) + ?.apply { + inflatedId = + if (enableRefactorTaskContentView()) R.id.bottomright_task_content_view + else R.id.bottomright_snapshot + layoutResource = + when { + enableRefactorTaskContentView() -> R.layout.task_content_view + enableRefactorTaskThumbnail() -> R.layout.task_thumbnail + else -> R.layout.task_thumbnail_deprecated + } + } + ?.inflate() + findViewById(R.id.bottomRight_icon) + ?.apply { + layoutResource = + if (enableOverviewIconMenu()) R.layout.icon_app_chip_view + else R.layout.icon_view + } + ?.inflate() + if (!enableRefactorDigitalWellbeingToast()) { + findViewById(R.id.bottomRight_digital_wellbeing_toast) + ?.apply { layoutResource = R.layout.digital_wellbeing_toast } + ?.inflate() + } + } + override fun onRecycle() { super.onRecycle() splitBoundsConfig = null } fun bind( - primaryTask: Task, - secondaryTask: Task, + splitTask: SplitTask, orientedState: RecentsOrientedState, taskOverlayFactory: TaskOverlayFactory, - splitBoundsConfig: SplitConfigurationOptions.SplitBounds?, ) { + this.groupTask = splitTask cancelPendingLoadTasks() taskContainers = listOf( createTaskContainer( - primaryTask, + splitTask.topLeftTask, + R.id.task_content_view, R.id.snapshot, R.id.icon, R.id.show_windows, + R.id.digital_wellbeing_toast, STAGE_POSITION_TOP_OR_LEFT, - taskOverlayFactory + taskOverlayFactory, ), createTaskContainer( - secondaryTask, - R.id.bottomright_snapshot, + splitTask.bottomRightTask, + R.id.bottomright_task_content_view, + if (enableRefactorTaskContentView()) R.id.snapshot + else R.id.bottomright_snapshot, R.id.bottomRight_icon, R.id.show_windows_right, + R.id.bottomRight_digital_wellbeing_toast, STAGE_POSITION_BOTTOM_OR_RIGHT, - taskOverlayFactory - ) + taskOverlayFactory, + ), ) - this.splitBoundsConfig = - splitBoundsConfig?.also { - taskContainers[0] - .thumbnailViewDeprecated - .previewPositionHelper - .setSplitBounds( - convertLauncherSplitBoundsToShell(it), - PreviewPositionHelper.STAGE_POSITION_TOP_OR_LEFT - ) - taskContainers[1] - .thumbnailViewDeprecated - .previewPositionHelper - .setSplitBounds( - convertLauncherSplitBoundsToShell(it), - PreviewPositionHelper.STAGE_POSITION_BOTTOM_OR_RIGHT - ) - } - taskContainers.forEach { it.digitalWellBeingToast?.setSplitBounds(splitBoundsConfig) } - setOrientationState(orientedState) + this.splitBoundsConfig = splitTask.splitBounds + taskContainers.forEach { it.digitalWellBeingToast?.splitBounds = splitBoundsConfig } + onBind(orientedState) } override fun setOrientationState(orientationState: RecentsOrientedState) { @@ -174,7 +180,7 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu container.deviceProfile, it, layoutParams.width, - layoutParams.height + layoutParams.height, ) val iconViewMarginStart = resources.getDimensionPixelSize( @@ -185,81 +191,122 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu R.dimen.task_thumbnail_icon_menu_background_margin_top_start ) val iconMargins = (iconViewMarginStart + iconViewBackgroundMarginStart) * 2 + val spaceForTaskDismissButton = calculateSpaceForTaskDismissButton() // setMaxWidth() needs to be called before mIconView.setIconOrientation which is // called in the super below. - (taskContainers[0].iconView as IconAppChipView).setMaxWidth( - groupedTaskViewSizes.first.x - iconMargins - ) - (taskContainers[1].iconView as IconAppChipView).setMaxWidth( - groupedTaskViewSizes.second.x - iconMargins - ) + (leftTopTaskContainer.iconView as IconAppChipView).maxWidth = + groupedTaskViewSizes.first.x - iconMargins - spaceForTaskDismissButton + (rightBottomTaskContainer.iconView as IconAppChipView).maxWidth = + groupedTaskViewSizes.second.x - iconMargins - spaceForTaskDismissButton } + super.setOrientationState(orientationState) } - super.setOrientationState(orientationState) updateIconPlacement() } + private fun calculateSpaceForTaskDismissButton() = + if (showCloseButtonOnTaskviewHover() && viewModel.showTaskDismissButton()) { + val taskDismissBtnWidth = + resources.getDimensionPixelSize(R.dimen.task_dismiss_button_width) + val taskDismissBtnMargin = + resources.getDimensionPixelSize(R.dimen.task_dismiss_button_margin) + val taskDismissBtnPadding = + resources.getDimensionPixelSize(R.dimen.task_dismiss_button_padding) + + taskDismissBtnWidth + taskDismissBtnMargin + taskDismissBtnPadding + } else { + 0 + } + private fun updateIconPlacement() { val splitBoundsConfig = splitBoundsConfig ?: return - val taskIconHeight = container.deviceProfile.overviewTaskIconSizePx - val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL + val deviceProfile = container.deviceProfile + val taskIconHeight = deviceProfile.overviewProfile.taskIconSizePx + val inSplitSelection = getThisTaskCurrentlyInSplitSelection() != INVALID_TASK_ID + var oneIconHiddenDueToSmallWidth = false + + if (enableFlexibleTwoAppSplit()) { + // Update values for both icons' setFlexSplitAlpha. Mainly, we want to hide an icon if + // its app tile is too small. But we also have to set the alphas back if we go to + // split selection. + val hideLeftTopIcon: Boolean + val hideRightBottomIcon: Boolean + if (inSplitSelection) { + hideLeftTopIcon = + getThisTaskCurrentlyInSplitSelection() == splitBoundsConfig.leftTopTaskId + hideRightBottomIcon = + getThisTaskCurrentlyInSplitSelection() == splitBoundsConfig.rightBottomTaskId + } else { + hideLeftTopIcon = splitBoundsConfig.leftTopTaskPercent < MINIMUM_RATIO_TO_SHOW_ICON + hideRightBottomIcon = + splitBoundsConfig.rightBottomTaskPercent < MINIMUM_RATIO_TO_SHOW_ICON + if (hideLeftTopIcon || hideRightBottomIcon) { + oneIconHiddenDueToSmallWidth = true + } + } + + leftTopTaskContainer.iconView.setFlexSplitAlpha(if (hideLeftTopIcon) 0f else 1f) + rightBottomTaskContainer.iconView.setFlexSplitAlpha(if (hideRightBottomIcon) 0f else 1f) + } + if (enableOverviewIconMenu()) { + val isDeviceRtl = Utilities.isRtl(resources) val groupedTaskViewSizes = pagedOrientationHandler.getGroupedTaskViewSizes( - container.deviceProfile, + deviceProfile, splitBoundsConfig, layoutParams.width, - layoutParams.height + layoutParams.height, ) pagedOrientationHandler.setSplitIconParams( - taskContainers[0].iconView.asView(), - taskContainers[1].iconView.asView(), + leftTopTaskContainer.iconView.asView(), + rightBottomTaskContainer.iconView.asView(), taskIconHeight, groupedTaskViewSizes.first.x, groupedTaskViewSizes.first.y, layoutParams.height, layoutParams.width, - isRtl, - container.deviceProfile, - splitBoundsConfig + isDeviceRtl, + deviceProfile, + splitBoundsConfig, + inSplitSelection, + oneIconHiddenDueToSmallWidth, ) } else { pagedOrientationHandler.setSplitIconParams( - taskContainers[0].iconView.asView(), - taskContainers[1].iconView.asView(), + leftTopTaskContainer.iconView.asView(), + rightBottomTaskContainer.iconView.asView(), taskIconHeight, - taskContainers[0].thumbnailViewDeprecated.measuredWidth, - taskContainers[0].thumbnailViewDeprecated.measuredHeight, + leftTopTaskContainer.taskContentView.measuredWidth, + leftTopTaskContainer.taskContentView.measuredHeight, measuredHeight, measuredWidth, - isRtl, - container.deviceProfile, - splitBoundsConfig + isLayoutRtl, + deviceProfile, + splitBoundsConfig, + inSplitSelection, + oneIconHiddenDueToSmallWidth, ) } } - fun updateSplitBoundsConfig(splitBounds: SplitConfigurationOptions.SplitBounds?) { + fun updateSplitBoundsConfig(splitBounds: SplitBounds?) { splitBoundsConfig = splitBounds taskContainers.forEach { - it.digitalWellBeingToast?.setSplitBounds(splitBoundsConfig) - it.digitalWellBeingToast?.initialize(it.task) + it.digitalWellBeingToast?.splitBounds = splitBoundsConfig + it.digitalWellBeingToast?.initialize() } invalidate() } - override fun launchTaskAnimated(): RunnableList? { - if (taskContainers.isEmpty()) { - Log.d(TAG, "launchTaskAnimated - task is not bound") - return null - } + override fun launchAsStaticTile(): RunnableList? { val recentsView = recentsView ?: return null val endCallback = RunnableList() // Callbacks run from remote animation when recents animation not currently running InteractionJankMonitorWrapper.begin( this, Cuj.CUJ_SPLIT_SCREEN_ENTER, - "Enter form GroupedTaskView" + "Enter form GroupedTaskView", ) launchTaskInternal(isQuickSwitch = false, launchingExistingTaskView = true) { endCallback.executeAllAndDestroy() @@ -271,8 +318,11 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu return endCallback } - override fun launchTask(callback: (launched: Boolean) -> Unit, isQuickSwitch: Boolean) { - launchTaskInternal(isQuickSwitch, false, callback /*launchingExistingTaskview*/) + override fun launchWithoutAnimation( + isQuickSwitch: Boolean, + callback: (launched: Boolean) -> Unit, + ) { + launchTaskInternal(isQuickSwitch, launchingExistingTaskView = false, callback) } /** @@ -284,19 +334,22 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu private fun launchTaskInternal( isQuickSwitch: Boolean, launchingExistingTaskView: Boolean, - callback: (launched: Boolean) -> Unit + callback: (launched: Boolean) -> Unit, ) { recentsView?.let { it.splitSelectController.launchExistingSplitPair( if (launchingExistingTaskView) this else null, - taskContainers[0].task.key.id, - taskContainers[1].task.key.id, + leftTopTaskContainer.task.key.id, + rightBottomTaskContainer.task.key.id, STAGE_POSITION_TOP_OR_LEFT, callback, isQuickSwitch, - snapPosition + snapPosition, + ) + Log.d( + TAG, + "launchTaskInternal - launchExistingSplitPair: ${taskIds.contentToString()}, launchingExistingTaskView: $launchingExistingTaskView", ) - Log.d(TAG, "launchTaskInternal - launchExistingSplitPair: ${taskIds.contentToString()}") } } @@ -317,14 +370,14 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu // checks below aren't reliable since both of those views may be gone/transformed val initSplitTaskId = getThisTaskCurrentlyInSplitSelection() if (initSplitTaskId != INVALID_TASK_ID) { - return if (initSplitTaskId == taskContainers[0].task.key.id) 1 else 0 + return if (initSplitTaskId == leftTopTaskContainer.task.key.id) 1 else 0 } } // Check which of the two apps was selected if ( - taskContainers[1].iconView.asView().containsPoint(lastTouchDownPosition) || - taskContainers[1].thumbnailViewDeprecated.containsPoint(lastTouchDownPosition) + rightBottomTaskContainer.iconView.asView().containsPoint(lastTouchDownPosition) || + rightBottomTaskContainer.snapshotView.containsPoint(lastTouchDownPosition) ) { return 1 } @@ -337,14 +390,6 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu return Utilities.pointInView(this, localPos[0], localPos[1], 0f /* slop */) } - override fun setOverlayEnabled(overlayEnabled: Boolean) { - if (FeatureFlags.enableAppPairs()) { - super.setOverlayEnabled(overlayEnabled) - } else { - // Intentional no-op to prevent setting smart actions overlay on thumbnails - } - } - companion object { private const val TAG = "GroupedTaskView" } diff --git a/quickstep/src/com/android/quickstep/views/IconAppChipView.java b/quickstep/src/com/android/quickstep/views/IconAppChipView.java deleted file mode 100644 index ba42594e99c..00000000000 --- a/quickstep/src/com/android/quickstep/views/IconAppChipView.java +++ /dev/null @@ -1,464 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.views; - -import static com.android.app.animation.Interpolators.EMPHASIZED; -import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.animation.RectEvaluator; -import android.animation.ValueAnimator; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Outline; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewAnimationUtils; -import android.view.ViewOutlineProvider; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.util.MultiPropertyFactory; -import com.android.launcher3.util.MultiValueAlpha; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.RecentsOrientedState; - -/** - * An icon app menu view which can be used in place of an IconView in overview TaskViews. - */ -public class IconAppChipView extends FrameLayout implements TaskViewIcon { - - private static final int MENU_BACKGROUND_REVEAL_DURATION = 417; - private static final int MENU_BACKGROUND_HIDE_DURATION = 333; - - private static final int NUM_ALPHA_CHANNELS = 3; - private static final int INDEX_CONTENT_ALPHA = 0; - private static final int INDEX_COLOR_FILTER_ALPHA = 1; - private static final int INDEX_MODAL_ALPHA = 2; - - private final MultiValueAlpha mMultiValueAlpha; - - private View mMenuAnchorView; - private IconView mIconView; - // Two textview so we can ellipsize the collapsed view and crossfade on expand to the full name. - private TextView mIconTextCollapsedView; - private TextView mIconTextExpandedView; - private ImageView mIconArrowView; - private final Rect mBackgroundRelativeLtrLocation = new Rect(); - final RectEvaluator mBackgroundAnimationRectEvaluator = - new RectEvaluator(mBackgroundRelativeLtrLocation); - private final int mCollapsedMenuDefaultWidth; - private final int mExpandedMenuDefaultWidth; - private final int mCollapsedMenuDefaultHeight; - private final int mExpandedMenuDefaultHeight; - private final int mIconMenuMarginTopStart; - private final int mMenuToChipGap; - private final int mBackgroundMarginTopStart; - private final int mAppNameHorizontalMargin; - private final int mIconViewMarginStart; - private final int mAppIconSize; - private final int mArrowSize; - private final int mIconViewDrawableExpandedSize; - private final int mArrowMarginEnd; - private AnimatorSet mAnimator; - - private int mMaxWidth = Integer.MAX_VALUE; - - private static final int INDEX_SPLIT_TRANSLATION = 0; - private static final int INDEX_MENU_TRANSLATION = 1; - private static final int INDEX_COUNT_TRANSLATION = 2; - - private final MultiPropertyFactory mViewTranslationX; - private final MultiPropertyFactory mViewTranslationY; - - /** - * Gets the view split x-axis translation - */ - public MultiPropertyFactory.MultiProperty getSplitTranslationX() { - return mViewTranslationX.get(INDEX_SPLIT_TRANSLATION); - } - - /** - * Sets the view split x-axis translation - * @param translationX x-axis translation - */ - public void setSplitTranslationX(float translationX) { - getSplitTranslationX().setValue(translationX); - } - - /** - * Gets the view split y-axis translation - */ - public MultiPropertyFactory.MultiProperty getSplitTranslationY() { - return mViewTranslationY.get(INDEX_SPLIT_TRANSLATION); - } - - /** - * Sets the view split y-axis translation - * @param translationY y-axis translation - */ - public void setSplitTranslationY(float translationY) { - getSplitTranslationY().setValue(translationY); - } - - /** - * Gets the menu x-axis translation for split task - */ - public MultiPropertyFactory.MultiProperty getMenuTranslationX() { - return mViewTranslationX.get(INDEX_MENU_TRANSLATION); - } - - /** - * Gets the menu y-axis translation for split task - */ - public MultiPropertyFactory.MultiProperty getMenuTranslationY() { - return mViewTranslationY.get(INDEX_MENU_TRANSLATION); - } - - public IconAppChipView(Context context) { - this(context, null); - } - - public IconAppChipView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public IconAppChipView(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public IconAppChipView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - Resources res = getResources(); - mMultiValueAlpha = new MultiValueAlpha(this, NUM_ALPHA_CHANNELS); - mMultiValueAlpha.setUpdateVisibility(/* updateVisibility= */ true); - - // Menu dimensions - mCollapsedMenuDefaultWidth = - res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_collapsed_width); - mExpandedMenuDefaultWidth = - res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_width); - mCollapsedMenuDefaultHeight = - res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_collapsed_height); - mExpandedMenuDefaultHeight = - res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_height); - mIconMenuMarginTopStart = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_expanded_top_start_margin); - mMenuToChipGap = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_expanded_gap); - - // Background dimensions - mBackgroundMarginTopStart = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_background_margin_top_start); - - // Contents dimensions - mAppNameHorizontalMargin = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_app_name_margin_horizontal_collapsed); - mArrowMarginEnd = res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_arrow_margin); - mIconViewMarginStart = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_view_start_margin); - mAppIconSize = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_app_icon_collapsed_size); - mArrowSize = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_arrow_size); - mIconViewDrawableExpandedSize = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_app_icon_expanded_size); - - mViewTranslationX = new MultiPropertyFactory<>(this, VIEW_TRANSLATE_X, - INDEX_COUNT_TRANSLATION, - Float::sum); - mViewTranslationY = new MultiPropertyFactory<>(this, VIEW_TRANSLATE_Y, - INDEX_COUNT_TRANSLATION, - Float::sum); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mIconView = findViewById(R.id.icon_view); - mIconTextCollapsedView = findViewById(R.id.icon_text_collapsed); - mIconTextExpandedView = findViewById(R.id.icon_text_expanded); - mIconArrowView = findViewById(R.id.icon_arrow); - mMenuAnchorView = findViewById(R.id.icon_view_menu_anchor); - } - - protected IconView getIconView() { - return mIconView; - } - - @Override - public void setText(CharSequence text) { - if (mIconTextCollapsedView != null) { - mIconTextCollapsedView.setText(text); - } - if (mIconTextExpandedView != null) { - mIconTextExpandedView.setText(text); - } - } - - @Override - public Drawable getDrawable() { - return mIconView == null ? null : mIconView.getDrawable(); - } - - @Override - public void setDrawable(Drawable icon) { - if (mIconView != null) { - mIconView.setDrawable(icon); - } - } - - @Override - public void setDrawableSize(int iconWidth, int iconHeight) { - if (mIconView != null) { - mIconView.setDrawableSize(iconWidth, iconHeight); - } - } - - /** - * Sets the maximum width of this Icon Menu. This is usually used when space is limited for - * split screen. - */ - public void setMaxWidth(int maxWidth) { - // Width showing only the app icon and arrow. Max width should not be set to less than this. - int minimumMaxWidth = mIconViewMarginStart + mAppIconSize + mArrowSize + mArrowMarginEnd; - mMaxWidth = Math.max(maxWidth, minimumMaxWidth); - } - - @Override - public void setIconOrientation(RecentsOrientedState orientationState, boolean isGridTask) { - RecentsPagedOrientationHandler orientationHandler = - orientationState.getOrientationHandler(); - // Layout params for anchor view - LayoutParams anchorLayoutParams = (LayoutParams) mMenuAnchorView.getLayoutParams(); - anchorLayoutParams.topMargin = mExpandedMenuDefaultHeight + mMenuToChipGap; - mMenuAnchorView.setLayoutParams(anchorLayoutParams); - - // Layout Params for the Menu View (this) - LayoutParams iconMenuParams = (LayoutParams) getLayoutParams(); - iconMenuParams.width = mExpandedMenuDefaultWidth; - iconMenuParams.height = mExpandedMenuDefaultHeight; - orientationHandler.setIconAppChipMenuParams(this, iconMenuParams, mIconMenuMarginTopStart, - mIconMenuMarginTopStart); - setLayoutParams(iconMenuParams); - - // Layout params for the background - Rect collapsedBackgroundBounds = getCollapsedBackgroundLtrBounds(); - mBackgroundRelativeLtrLocation.set(collapsedBackgroundBounds); - setOutlineProvider(new ViewOutlineProvider() { - final Rect mRtlAppliedOutlineBounds = new Rect(); - @Override - public void getOutline(View view, Outline outline) { - mRtlAppliedOutlineBounds.set(mBackgroundRelativeLtrLocation); - if (isLayoutRtl()) { - int width = getWidth(); - mRtlAppliedOutlineBounds.left = width - mBackgroundRelativeLtrLocation.right; - mRtlAppliedOutlineBounds.right = width - mBackgroundRelativeLtrLocation.left; - } - outline.setRoundRect( - mRtlAppliedOutlineBounds, mRtlAppliedOutlineBounds.height() / 2f); - } - }); - - // Layout Params for the Icon View - LayoutParams iconParams = (LayoutParams) mIconView.getLayoutParams(); - int iconMarginStartRelativeToParent = mIconViewMarginStart + mBackgroundMarginTopStart; - orientationHandler.setIconAppChipChildrenParams( - iconParams, iconMarginStartRelativeToParent); - - mIconView.setLayoutParams(iconParams); - mIconView.setDrawableSize(mAppIconSize, mAppIconSize); - - // Layout Params for the collapsed Icon Text View - int textMarginStart = - iconMarginStartRelativeToParent + mAppIconSize + mAppNameHorizontalMargin; - LayoutParams iconTextCollapsedParams = - (LayoutParams) mIconTextCollapsedView.getLayoutParams(); - orientationHandler.setIconAppChipChildrenParams(iconTextCollapsedParams, textMarginStart); - int collapsedTextWidth = collapsedBackgroundBounds.width() - mIconViewMarginStart - - mAppIconSize - mArrowSize - mAppNameHorizontalMargin - mArrowMarginEnd; - iconTextCollapsedParams.width = collapsedTextWidth; - mIconTextCollapsedView.setLayoutParams(iconTextCollapsedParams); - mIconTextCollapsedView.setAlpha(1f); - - // Layout Params for the expanded Icon Text View - LayoutParams iconTextExpandedParams = - (LayoutParams) mIconTextExpandedView.getLayoutParams(); - orientationHandler.setIconAppChipChildrenParams(iconTextExpandedParams, textMarginStart); - mIconTextExpandedView.setLayoutParams(iconTextExpandedParams); - mIconTextExpandedView.setAlpha(0f); - mIconTextExpandedView.setRevealClip(true, 0, mAppIconSize / 2f, collapsedTextWidth); - - // Layout Params for the Icon Arrow View - LayoutParams iconArrowParams = (LayoutParams) mIconArrowView.getLayoutParams(); - int arrowMarginStart = collapsedBackgroundBounds.right - mArrowMarginEnd - mArrowSize; - orientationHandler.setIconAppChipChildrenParams(iconArrowParams, arrowMarginStart); - mIconArrowView.setPivotY(iconArrowParams.height / 2f); - mIconArrowView.setLayoutParams(iconArrowParams); - - // This method is called twice sometimes (like when rotating split tasks). It is called - // once before onMeasure and onLayout, and again after onMeasure but before onLayout with - // a new width. This happens because we update widths on rotation and on measure of - // grouped task views. Calling requestLayout() does not guarantee a call to onMeasure if - // it has just measured, so we explicitly call it here. - measure(MeasureSpec.makeMeasureSpec(getLayoutParams().width, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(getLayoutParams().height, MeasureSpec.EXACTLY)); - } - - @Override - public void setIconColorTint(int color, float amount) { - // RecentsView's COLOR_TINT animates between 0 and 0.5f, we want to hide the app chip menu. - float colorTintAlpha = Utilities.mapToRange(amount, 0f, 0.5f, 1f, 0f, LINEAR); - mMultiValueAlpha.get(INDEX_COLOR_FILTER_ALPHA).setValue(colorTintAlpha); - } - - @Override - public void setContentAlpha(float alpha) { - mMultiValueAlpha.get(INDEX_CONTENT_ALPHA).setValue(alpha); - } - - @Override - public void setModalAlpha(float alpha) { - mMultiValueAlpha.get(INDEX_MODAL_ALPHA).setValue(alpha); - } - - @Override - public int getDrawableWidth() { - return mIconView == null ? 0 : mIconView.getDrawableWidth(); - } - - @Override - public int getDrawableHeight() { - return mIconView == null ? 0 : mIconView.getDrawableHeight(); - } - - protected void revealAnim(boolean isRevealing) { - cancelInProgressAnimations(); - final Rect collapsedBackgroundBounds = getCollapsedBackgroundLtrBounds(); - final Rect expandedBackgroundBounds = getExpandedBackgroundLtrBounds(); - final Rect initialBackground = new Rect(mBackgroundRelativeLtrLocation); - mAnimator = new AnimatorSet(); - - if (isRevealing) { - boolean isRtl = isLayoutRtl(); - bringToFront(); - // Clip expanded text with reveal animation so it doesn't go beyond the edge of the menu - Animator expandedTextRevealAnim = ViewAnimationUtils.createCircularReveal( - mIconTextExpandedView, 0, mIconTextExpandedView.getHeight() / 2, - mIconTextCollapsedView.getWidth(), mIconTextExpandedView.getWidth()); - // Animate background clipping - ValueAnimator backgroundAnimator = ValueAnimator.ofObject( - mBackgroundAnimationRectEvaluator, - initialBackground, - expandedBackgroundBounds); - backgroundAnimator.addUpdateListener(valueAnimator -> invalidateOutline()); - - float iconViewScaling = mIconViewDrawableExpandedSize / (float) mAppIconSize; - float arrowTranslationX = - expandedBackgroundBounds.right - collapsedBackgroundBounds.right; - float iconCenterToTextCollapsed = mAppIconSize / 2f + mAppNameHorizontalMargin; - float iconCenterToTextExpanded = - mIconViewDrawableExpandedSize / 2f + mAppNameHorizontalMargin; - float textTranslationX = iconCenterToTextExpanded - iconCenterToTextCollapsed; - - float textTranslationXWithRtl = isRtl ? -textTranslationX : textTranslationX; - float arrowTranslationWithRtl = isRtl ? -arrowTranslationX : arrowTranslationX; - - mAnimator.playTogether( - expandedTextRevealAnim, - backgroundAnimator, - ObjectAnimator.ofFloat(mIconView, SCALE_X, iconViewScaling), - ObjectAnimator.ofFloat(mIconView, SCALE_Y, iconViewScaling), - ObjectAnimator.ofFloat(mIconTextCollapsedView, TRANSLATION_X, - textTranslationXWithRtl), - ObjectAnimator.ofFloat(mIconTextExpandedView, TRANSLATION_X, - textTranslationXWithRtl), - ObjectAnimator.ofFloat(mIconTextCollapsedView, ALPHA, 0), - ObjectAnimator.ofFloat(mIconTextExpandedView, ALPHA, 1), - ObjectAnimator.ofFloat(mIconArrowView, TRANSLATION_X, arrowTranslationWithRtl), - ObjectAnimator.ofFloat(mIconArrowView, SCALE_Y, -1)); - mAnimator.setDuration(MENU_BACKGROUND_REVEAL_DURATION); - } else { - // Clip expanded text with reveal animation so it doesn't go beyond the edge of the menu - Animator expandedTextClipAnim = ViewAnimationUtils.createCircularReveal( - mIconTextExpandedView, 0, mIconTextExpandedView.getHeight() / 2, - mIconTextExpandedView.getWidth(), mIconTextCollapsedView.getWidth()); - - // Animate background clipping - ValueAnimator backgroundAnimator = ValueAnimator.ofObject( - mBackgroundAnimationRectEvaluator, - initialBackground, - collapsedBackgroundBounds); - backgroundAnimator.addUpdateListener(valueAnimator -> invalidateOutline()); - - mAnimator.playTogether( - expandedTextClipAnim, - backgroundAnimator, - ObjectAnimator.ofFloat(mIconView, SCALE_PROPERTY, 1), - ObjectAnimator.ofFloat(mIconTextCollapsedView, TRANSLATION_X, 0), - ObjectAnimator.ofFloat(mIconTextExpandedView, TRANSLATION_X, 0), - ObjectAnimator.ofFloat(mIconTextCollapsedView, ALPHA, 1), - ObjectAnimator.ofFloat(mIconTextExpandedView, ALPHA, 0), - ObjectAnimator.ofFloat(mIconArrowView, TRANSLATION_X, 0), - ObjectAnimator.ofFloat(mIconArrowView, SCALE_Y, 1)); - mAnimator.setDuration(MENU_BACKGROUND_HIDE_DURATION); - } - - mAnimator.setInterpolator(EMPHASIZED); - mAnimator.start(); - } - - private Rect getCollapsedBackgroundLtrBounds() { - Rect bounds = new Rect( - 0, - 0, - Math.min(mMaxWidth, mCollapsedMenuDefaultWidth), - mCollapsedMenuDefaultHeight); - bounds.offset(mBackgroundMarginTopStart, mBackgroundMarginTopStart); - return bounds; - } - - private Rect getExpandedBackgroundLtrBounds() { - return new Rect(0, 0, mExpandedMenuDefaultWidth, mExpandedMenuDefaultHeight); - } - - private void cancelInProgressAnimations() { - // We null the `AnimatorSet` because it holds references to the `Animators` which aren't - // expecting to be mutable and will cause a crash if they are re-used. - if (mAnimator != null && mAnimator.isStarted()) { - mAnimator.cancel(); - mAnimator = null; - } - } - - @Override - public View asView() { - return this; - } -} diff --git a/quickstep/src/com/android/quickstep/views/IconAppChipView.kt b/quickstep/src/com/android/quickstep/views/IconAppChipView.kt new file mode 100644 index 00000000000..e14e6effe27 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/IconAppChipView.kt @@ -0,0 +1,681 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.views + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.animation.RectEvaluator +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Canvas +import android.graphics.Outline +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.text.TextUtils.TruncateAt +import android.util.AttributeSet +import android.view.Gravity +import android.view.KeyEvent +import android.view.View +import android.view.ViewAnimationUtils +import android.view.ViewOutlineProvider +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.TextView +import androidx.core.animation.addListener +import androidx.core.view.updateLayoutParams +import com.android.app.animation.Interpolators +import com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY +import com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X +import com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.MultiPropertyFactory.FloatBiFunction +import com.android.launcher3.util.MultiValueAlpha +import com.android.quickstep.util.BorderAnimator +import com.android.quickstep.util.BorderAnimator.Companion.createSimpleBorderAnimator +import com.android.quickstep.util.RecentsOrientedState +import kotlin.math.max +import kotlin.math.min + +/** An icon app menu view which can be used in place of an IconView in overview TaskViews. */ +class IconAppChipView +@JvmOverloads +constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, + defStyleRes: Int = 0, +) : FrameLayout(context, attrs, defStyleAttr, defStyleRes), TaskViewIcon { + + private var iconView: IconView? = null + private var iconArrowView: ImageView? = null + private var menuAnchorView: View? = null + + // Two textview so we can ellipsize the collapsed view and crossfade on expand to the full name. + private var appTitle: TextView? = null + private var isLayoutNaturalToLauncher = true + + private val backgroundRelativeLtrLocation = Rect() + private val backgroundAnimationRectEvaluator = RectEvaluator(backgroundRelativeLtrLocation) + + // Menu dimensions + private val collapsedMenuDefaultWidth: Int = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_collapsed_width) + private val expandedMenuDefaultWidth: Int = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_width) + private val collapsedMenuDefaultHeight = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_collapsed_height) + private val expandedMenuDefaultHeight = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_height) + private val iconMenuMarginTopStart = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_top_start_margin) + private val menuToChipGap: Int = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_gap) + + // Background dimensions + val backgroundMarginTopStart: Int = + resources.getDimensionPixelSize( + R.dimen.task_thumbnail_icon_menu_background_margin_top_start + ) + + // Contents dimensions + private val appNameHorizontalMarginCollapsed = + resources.getDimensionPixelSize( + R.dimen.task_thumbnail_icon_menu_app_name_margin_horizontal_collapsed + ) + private val appNameHorizontalMarginExpanded = + resources.getDimensionPixelSize( + R.dimen.task_thumbnail_icon_menu_app_name_margin_horizontal_expanded + ) + private val arrowMarginEnd = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_arrow_margin) + private val iconViewMarginStart = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_view_start_margin) + private val appIconSize = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_app_icon_collapsed_size) + private val iconMenuElevation = + resources.getDimension(R.dimen.task_thumbnail_icon_menu_elevation) + private val arrowSize = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_arrow_size) + private val iconViewDrawableExpandedSize = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_app_icon_expanded_size) + private val focusBorderWidth = + resources.getDimensionPixelSize(R.dimen.app_chip_keyboard_border_width) + private val cornerRadius = resources.getDimensionPixelSize(R.dimen.app_chip_round_corner_radius) + + private var animator: AnimatorSet? = null + + private val multiValueAlpha: MultiValueAlpha = + MultiValueAlpha(this, NUM_ALPHA_CHANNELS).apply { setUpdateVisibility(true) } + + private val viewTranslationX: MultiPropertyFactory = + MultiPropertyFactory(this, VIEW_TRANSLATE_X, INDEX_COUNT_TRANSLATION, SUM_AGGREGATOR) + + private val viewTranslationY: MultiPropertyFactory = + MultiPropertyFactory(this, VIEW_TRANSLATE_Y, INDEX_COUNT_TRANSLATION, SUM_AGGREGATOR) + + // Width showing only the app icon and arrow. Max width should not be set to less than + // this. + private val minWidthAllowed = iconViewMarginStart + appIconSize + arrowSize + arrowMarginEnd + var maxWidth = Integer.MAX_VALUE + /** + * Sets the maximum width of this Icon Menu. This is usually used when space is limited for + * split screen. + */ + set(value) { + // Width showing only the app icon and arrow. Max width should not be set to less than + // this. + field = max(value, minWidthAllowed) + } + + var status: AppChipStatus = AppChipStatus.Collapsed + private set + + val menuToCollapsedChipGap: Int = + getExpandedBackgroundLtrBounds().bottom - + getCollapsedBackgroundLtrBounds().bottom - + menuToChipGap + + private val focusBorderAnimator: BorderAnimator = + createSimpleBorderAnimator( + borderRadiusPx = cornerRadius, + borderWidthPx = focusBorderWidth, + boundsBuilder = { bounds -> + bounds.set(backgroundRelativeLtrLocation) + if (status == AppChipStatus.Expanded) { + // Draws the border inside the chip to avoid overlap with the task menu. + var inset = focusBorderWidth - 1 + bounds.inset(inset, inset) + } + }, + targetView = this, + borderColor = + context + .obtainStyledAttributes(attrs, R.styleable.IconAppChip) + .getColor( + R.styleable.IconAppChip_focusBorderColor, + BorderAnimator.DEFAULT_BORDER_COLOR, + ), + ) + + private var focusAnimator: AnimatorSet? = null + + private fun animateFocusBorder(isAppearing: Boolean) { + focusAnimator?.cancel() + focusAnimator = null + val borderAnimator = focusBorderAnimator.buildAnimator(isAppearing) + + val initialBackground = Rect(backgroundRelativeLtrLocation) + val targetBackground: Rect = + when { + // Background animator to increase the clipping size to show the focus border. + isAppearing -> + Rect(backgroundRelativeLtrLocation).apply { + if (status == AppChipStatus.Collapsed) + inset(-focusBorderWidth + 1, -focusBorderWidth + 1) + } + // Background animator to restore the outline size to hide the focus border + status == AppChipStatus.Expanded -> getExpandedBackgroundLtrBounds() + else -> getCollapsedBackgroundLtrBounds() + } + val backgroundAnimator = + ValueAnimator.ofObject( + backgroundAnimationRectEvaluator, + initialBackground, + targetBackground, + ) + .apply { addUpdateListener { invalidateOutline() } } + + focusAnimator = + AnimatorSet().apply { + playTogether(borderAnimator, backgroundAnimator) + duration = borderAnimator.duration + interpolator = borderAnimator.interpolator + start() + } + } + + public override fun onFocusChanged( + gainFocus: Boolean, + direction: Int, + previouslyFocusedRect: Rect?, + ) { + super.onFocusChanged(gainFocus, direction, previouslyFocusedRect) + animateFocusBorder(isAppearing = gainFocus) + } + + override fun draw(canvas: Canvas) { + super.draw(canvas) + focusBorderAnimator.drawBorder(canvas) + } + + override fun onFinishInflate() { + super.onFinishInflate() + iconView = findViewById(R.id.icon_view) + appTitle = findViewById(R.id.icon_title) + iconArrowView = findViewById(R.id.icon_arrow) + menuAnchorView = findViewById(R.id.icon_view_menu_anchor) + } + + override fun setText(text: CharSequence?) { + if (text == appTitle?.text) return + appTitle?.text = text + } + + override fun getDrawable(): Drawable? = iconView?.drawable + + private var currentIconDrawableHash: Int = 0 + + override fun setDrawable(icon: Drawable?) { + if (icon.hashCode() == currentIconDrawableHash) return + iconView?.drawable = icon + currentIconDrawableHash = icon.hashCode() + } + + override fun setDrawableSize(iconWidth: Int, iconHeight: Int) { + iconView?.setDrawableSize(iconWidth, iconHeight) + } + + override fun getMinimumWidth(): Int = min(maxWidth, collapsedMenuDefaultWidth) + + override fun setIconOrientation(orientationState: RecentsOrientedState, isGridTask: Boolean) { + val orientationHandler = orientationState.orientationHandler + isLayoutNaturalToLauncher = orientationHandler.isLayoutNaturalToLauncher + // Layout params for anchor view + val anchorLayoutParams = menuAnchorView!!.layoutParams as LayoutParams + if (orientationHandler.isLayoutNaturalToLauncher) { + anchorLayoutParams.gravity = Gravity.START + anchorLayoutParams.marginStart = backgroundMarginTopStart + } else { + anchorLayoutParams.gravity = Gravity.LEFT + anchorLayoutParams.marginStart = 0 + } + anchorLayoutParams.topMargin = expandedMenuDefaultHeight + menuToChipGap + menuAnchorView!!.layoutParams = anchorLayoutParams + + // Layout Params for the Menu View (this) + val iconMenuParams = layoutParams as LayoutParams + iconMenuParams.width = getChipWidth() + iconMenuParams.height = expandedMenuDefaultHeight + orientationHandler.setIconAppChipMenuParams( + this, + iconMenuParams, + iconMenuMarginTopStart, + iconMenuMarginTopStart, + ) + layoutParams = iconMenuParams + + // Layout params for the background + val collapsedBackgroundBounds = getCollapsedBackgroundLtrBounds() + backgroundRelativeLtrLocation.set(collapsedBackgroundBounds) + outlineProvider = + object : ViewOutlineProvider() { + val mRtlAppliedOutlineBounds: Rect = Rect() + + override fun getOutline(view: View, outline: Outline) { + mRtlAppliedOutlineBounds.set(backgroundRelativeLtrLocation) + if (isLayoutRtl) { + val width = width + mRtlAppliedOutlineBounds.left = width - backgroundRelativeLtrLocation.right + mRtlAppliedOutlineBounds.right = width - backgroundRelativeLtrLocation.left + } + outline.setRoundRect( + mRtlAppliedOutlineBounds, + resources.getDimension(R.dimen.app_chip_round_corner_radius), + ) + } + } + + // Layout Params for the Icon View + val iconParams = iconView!!.layoutParams as LayoutParams + val iconMarginStartRelativeToParent = iconViewMarginStart + backgroundMarginTopStart + orientationHandler.setIconAppChipChildrenParams(iconParams, iconMarginStartRelativeToParent) + + iconView!!.layoutParams = iconParams + iconView!!.setDrawableSize(appIconSize, appIconSize) + + // Layout Params for the collapsed Icon Text View + val textMarginStart = + iconMarginStartRelativeToParent + appIconSize + appNameHorizontalMarginCollapsed + val iconTextCollapsedParams = appTitle!!.layoutParams as LayoutParams + orientationHandler.setIconAppChipChildrenParams(iconTextCollapsedParams, textMarginStart) + iconTextCollapsedParams.width = + calculateCollapsedTextWidth(collapsedBackgroundBounds.width()) + appTitle?.layoutParams = iconTextCollapsedParams + + // Layout Params for the Icon Arrow View + val iconArrowParams = iconArrowView!!.layoutParams as LayoutParams + val arrowMarginStart = collapsedBackgroundBounds.right - arrowMarginEnd - arrowSize + orientationHandler.setIconAppChipChildrenParams(iconArrowParams, arrowMarginStart) + iconArrowView!!.pivotY = iconArrowParams.height / 2f + iconArrowView!!.layoutParams = iconArrowParams + + // This method is called twice sometimes (like when rotating split tasks). It is called + // once before onMeasure and onLayout, and again after onMeasure but before onLayout with + // a new width. This happens because we update widths on rotation and on measure of + // grouped task views. Calling requestLayout() does not guarantee a call to onMeasure if + // it has just measured, so we explicitly call it here. + measure( + MeasureSpec.makeMeasureSpec(layoutParams.width, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(layoutParams.height, MeasureSpec.EXACTLY), + ) + } + + private fun enableMarquee(isEnabled: Boolean) { + // Marquee should not be enabled when is running test harness. + val isMarqueeEnabled = isEnabled && !Utilities.isRunningInTestHarness() + appTitle?.let { + it.ellipsize = if (isMarqueeEnabled) TruncateAt.MARQUEE else null + it.isSelected = isMarqueeEnabled + } + } + + /** + * Calculates the width available for the collapsed text (app name) within the view. + * + * This function determines the maximum width that the app name can occupy when the view is in + * its collapsed state. It considers various factors such as the maximum allowed width, the + * bounds of the collapsed background, the size of the app icon, the arrow, and the margins + * around these elements. + * + * @return The calculated width available for the collapsed text (app name). + */ + private fun calculateCollapsedTextWidth(width: Int): Int { + val collapsedTextWidth = + (width - + iconViewMarginStart - + appIconSize - + arrowSize - + appNameHorizontalMarginCollapsed - + arrowMarginEnd) + + val spaceLeftForText = maxWidth - minWidthAllowed + return minOf(collapsedTextWidth, spaceLeftForText).coerceAtLeast(0) + } + + private fun calculateExpandedTextWidth(width: Int): Int = + width - + iconViewMarginStart - + iconViewDrawableExpandedSize - + arrowSize - + appNameHorizontalMarginExpanded - + arrowMarginEnd + + override fun setIconColorTint(color: Int, amount: Float) { + // RecentsView's COLOR_TINT animates between 0 and 0.5f, we want to hide the app chip menu. + val colorTintAlpha = Utilities.mapToRange(amount, 0f, 0.5f, 1f, 0f, Interpolators.LINEAR) + multiValueAlpha[INDEX_COLOR_FILTER_ALPHA].value = colorTintAlpha + } + + override fun setContentAlpha(alpha: Float) { + multiValueAlpha[INDEX_CONTENT_ALPHA].value = alpha + } + + override fun setModalAlpha(alpha: Float) { + multiValueAlpha[INDEX_MODAL_ALPHA].value = alpha + } + + override fun setFlexSplitAlpha(alpha: Float) { + multiValueAlpha[INDEX_MINIMUM_RATIO_ALPHA].value = alpha + } + + override fun getDrawableWidth(): Int = iconView?.drawableWidth ?: 0 + + override fun getDrawableHeight(): Int = iconView?.drawableHeight ?: 0 + + /** Gets the view split x-axis translation */ + fun getSplitTranslationX(): MultiPropertyFactory.MultiProperty = + viewTranslationX.get(INDEX_SPLIT_TRANSLATION) + + /** + * Sets the view split x-axis translation + * + * @param value x-axis translation + */ + fun setSplitTranslationX(value: Float) { + getSplitTranslationX().value = value + } + + /** Gets the view split y-axis translation */ + fun getSplitTranslationY(): MultiPropertyFactory.MultiProperty = + viewTranslationY[INDEX_SPLIT_TRANSLATION] + + /** + * Sets the view split y-axis translation + * + * @param value y-axis translation + */ + fun setSplitTranslationY(value: Float) { + getSplitTranslationY().value = value + } + + /** Gets the menu x-axis translation for split task */ + fun getMenuTranslationX(): MultiPropertyFactory.MultiProperty = + viewTranslationX[INDEX_MENU_TRANSLATION] + + /** Gets the menu y-axis translation for split task */ + fun getMenuTranslationY(): MultiPropertyFactory.MultiProperty = + viewTranslationY[INDEX_MENU_TRANSLATION] + + internal fun revealAnim(isRevealing: Boolean, animated: Boolean = true): AnimatorSet { + cancelInProgressAnimations() + val collapsedBackgroundBounds = getCollapsedBackgroundLtrBounds() + val expandedBackgroundBounds = getExpandedBackgroundLtrBounds() + val initialBackground = Rect(backgroundRelativeLtrLocation) + animator = AnimatorSet() + + val isRtl = isLayoutRtl + if (isRevealing) { + bringToFront() + // Animate background clipping + val backgroundAnimator = + ValueAnimator.ofObject( + backgroundAnimationRectEvaluator, + initialBackground, + expandedBackgroundBounds, + ) + backgroundAnimator.addUpdateListener { invalidateOutline() } + + val iconViewScaling = iconViewDrawableExpandedSize / appIconSize.toFloat() + val arrowTranslationX = + (expandedBackgroundBounds.right - collapsedBackgroundBounds.right).toFloat() + val iconCenterToTextCollapsed = appIconSize / 2f + appNameHorizontalMarginCollapsed + val iconCenterToTextExpanded = + iconViewDrawableExpandedSize / 2f + appNameHorizontalMarginCollapsed + val textTranslationX = iconCenterToTextExpanded - iconCenterToTextCollapsed + + val textTranslationXWithRtl = if (isRtl) -textTranslationX else textTranslationX + val arrowTranslationWithRtl = if (isRtl) -arrowTranslationX else arrowTranslationX + + animator!!.playTogether( + backgroundAnimator, + ObjectAnimator.ofFloat(iconView, SCALE_X, iconViewScaling), + ObjectAnimator.ofFloat(iconView, SCALE_Y, iconViewScaling), + ObjectAnimator.ofFloat(appTitle, TRANSLATION_X, textTranslationXWithRtl), + ObjectAnimator.ofFloat(iconArrowView, TRANSLATION_X, arrowTranslationWithRtl), + ObjectAnimator.ofFloat(iconArrowView, SCALE_Y, -1f), + ) + animator!!.duration = MENU_BACKGROUND_REVEAL_DURATION.toLong() + status = AppChipStatus.Expanded + } else { + // Clip expanded text with reveal animation so it doesn't go beyond the edge of the menu + val expandedTextClipAnim = + ViewAnimationUtils.createCircularReveal( + appTitle, + if (isRtl) appTitle!!.width else 0, + appTitle!!.height / 2, + appTitle!!.width.toFloat(), + calculateCollapsedTextWidth(collapsedBackgroundBounds.width()).toFloat(), + ) + + // Animate background clipping + val backgroundAnimator = + ValueAnimator.ofObject( + backgroundAnimationRectEvaluator, + initialBackground, + collapsedBackgroundBounds, + ) + backgroundAnimator.addUpdateListener { valueAnimator: ValueAnimator? -> + invalidateOutline() + } + + animator!!.playTogether( + expandedTextClipAnim, + backgroundAnimator, + ObjectAnimator.ofFloat(iconView, SCALE_PROPERTY, 1f), + ObjectAnimator.ofFloat(appTitle, TRANSLATION_X, 0f), + ObjectAnimator.ofFloat(iconArrowView, TRANSLATION_X, 0f), + ObjectAnimator.ofFloat(iconArrowView, SCALE_Y, 1f), + ) + animator!!.duration = MENU_BACKGROUND_HIDE_DURATION.toLong() + status = AppChipStatus.Collapsed + sendToBack() + } + + if (!animated) animator!!.duration = 0 + animator!!.interpolator = Interpolators.EMPHASIZED + + // Increase the chip and appTitle size before the animation starts when it's expanding. + // And decrease the size after the animation when is collapsing. + animator!!.addListener( + onStart = { + // Hide focused border during expanding/collapsing animation + if (isFocused) { + focusBorderAnimator.setBorderVisibility(visible = false, animated = false) + } + when (status) { + AppChipStatus.Expanded -> updateChipSize() + // Disable marquee before chip is collapsed + AppChipStatus.Collapsed -> enableMarquee(false) + } + }, + onEnd = { + if (isFocused) animateFocusBorder(isAppearing = true) + when (status) { + AppChipStatus.Collapsed -> updateChipSize() + // Enable marquee after chip is fully expanded + AppChipStatus.Expanded -> enableMarquee(true) + } + }, + ) + return animator!! + } + + /** + * Updates the width of the app title based on the current [AppChipStatus]. + * + * This function dynamically adjusts the width of the `appTitle` TextView depending on whether + * the app chip is in an expanded or collapsed state. + * - When the chip is [AppChipStatus.Expanded], the title width is set to + * [expandedMaxTextWidth], allowing the title to potentially take up more space. + * - When the chip is [AppChipStatus.Collapsed], the title width is calculated based on the + * width of the collapsed background. This ensures the title fits within the smaller, + * collapsed chip boundaries. The width is then determined by calling + * [calculateCollapsedTextWidth]. + */ + private fun updateChipSize() { + val chipWidth = getChipWidth() + when (status) { + AppChipStatus.Expanded -> { + updateLayoutParams { width = chipWidth } + appTitle!!.updateLayoutParams { width = calculateExpandedTextWidth(chipWidth) } + } + AppChipStatus.Collapsed -> { + appTitle!!.updateLayoutParams { + val collapsedBackgroundWidth = getCollapsedBackgroundLtrBounds().width() + width = calculateCollapsedTextWidth(collapsedBackgroundWidth) + } + updateLayoutParams { width = chipWidth } + } + } + } + + private fun getCollapsedBackgroundLtrBounds(): Rect { + val bounds = Rect(0, 0, minimumWidth, collapsedMenuDefaultHeight) + bounds.offset(backgroundMarginTopStart, backgroundMarginTopStart) + return bounds + } + + private fun getExpandedBackgroundLtrBounds() = + Rect(0, 0, expandedMenuDefaultWidth, expandedMenuDefaultHeight) + + private fun getCollapsedBackgroundWidth() = getCollapsedBackgroundLtrBounds().right + + private fun getChipWidth(): Int { + // TODO(b/292269949): When in fake orientation, the width of the chip remains expanded + // to prevent wrong translation due to chip rotation and anchor. + if (!isLayoutNaturalToLauncher) return expandedMenuDefaultWidth + return when (status) { + AppChipStatus.Expanded -> expandedMenuDefaultWidth + AppChipStatus.Collapsed -> getCollapsedBackgroundWidth() + } + } + + private fun cancelInProgressAnimations() { + // We null the `AnimatorSet` because it holds references to the `Animators` which aren't + // expecting to be mutable and will cause a crash if they are re-used. + if (animator != null && animator!!.isStarted) { + animator!!.cancel() + animator = null + } + } + + override fun bringToFront() { + super.bringToFront() + z = iconMenuElevation + Z_INDEX_FRONT + updateParentZIndex(Z_INDEX_FRONT) + } + + private fun sendToBack() { + z = iconMenuElevation + updateParentZIndex(0f) + } + + private fun updateParentZIndex(zIndex: Float) { + val parentView = parent as? TaskView + if (parentView?.isOnGridBottomRow == true) { + parentView.z = zIndex + } + } + + override fun focusSearch(direction: Int): View? { + if (mParent == null) return null + return when (direction) { + FOCUS_RIGHT, + FOCUS_DOWN -> mParent.focusSearch(this, FOCUS_FORWARD) + FOCUS_UP, + FOCUS_LEFT -> mParent.focusSearch(this, FOCUS_BACKWARD) + else -> super.focusSearch(direction) + } + } + + /** + * We need to over-ride here due to liveTile mode, the [OverviewInputConsumer] is added, which + * consumes all [InputEvent]'s and focus isn't moved correctly. + */ + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (event.action != KeyEvent.ACTION_DOWN) return super.dispatchKeyEvent(event) + + val currentFocus = findFocus() ?: return super.dispatchKeyEvent(event) + + val nextFocus = + when (event.keyCode) { + KeyEvent.KEYCODE_DPAD_UP -> focusSearch(currentFocus, FOCUS_BACKWARD) + KeyEvent.KEYCODE_DPAD_DOWN -> focusSearch(currentFocus, FOCUS_FORWARD) + KeyEvent.KEYCODE_TAB -> + focusSearch( + currentFocus, + if (event.isShiftPressed) FOCUS_BACKWARD else FOCUS_FORWARD, + ) + else -> null + } + + return nextFocus?.requestFocus() ?: super.dispatchKeyEvent(event) + } + + fun reset() { + setText(null) + drawable = null + } + + override fun asView(): View = this + + enum class AppChipStatus { + Expanded, + Collapsed, + } + + private companion object { + private val SUM_AGGREGATOR = FloatBiFunction { a: Float, b: Float -> a + b } + + private const val MENU_BACKGROUND_REVEAL_DURATION = 417 + private const val MENU_BACKGROUND_HIDE_DURATION = 333 + + private const val Z_INDEX_FRONT = 10f + + private const val NUM_ALPHA_CHANNELS = 4 + private const val INDEX_CONTENT_ALPHA = 0 + private const val INDEX_COLOR_FILTER_ALPHA = 1 + private const val INDEX_MODAL_ALPHA = 2 + /** Used to hide the app chip for 90:10 flex split. */ + private const val INDEX_MINIMUM_RATIO_ALPHA = 3 + + private const val INDEX_SPLIT_TRANSLATION = 0 + private const val INDEX_MENU_TRANSLATION = 1 + private const val INDEX_COUNT_TRANSLATION = 2 + } +} diff --git a/quickstep/src/com/android/quickstep/views/IconView.java b/quickstep/src/com/android/quickstep/views/IconView.java deleted file mode 100644 index bb4a7ecda68..00000000000 --- a/quickstep/src/com/android/quickstep/views/IconView.java +++ /dev/null @@ -1,209 +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.quickstep.views; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.view.Gravity; -import android.view.View; -import android.widget.FrameLayout; - -import androidx.annotation.Nullable; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Utilities; -import com.android.launcher3.util.MultiValueAlpha; -import com.android.launcher3.views.ActivityContext; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.RecentsOrientedState; - -/** - * A view which draws a drawable stretched to fit its size. Unlike ImageView, it avoids relayout - * when the drawable changes. - */ -public class IconView extends View implements TaskViewIcon { - private static final int NUM_ALPHA_CHANNELS = 2; - private static final int INDEX_CONTENT_ALPHA = 0; - private static final int INDEX_MODAL_ALPHA = 1; - - private final MultiValueAlpha mMultiValueAlpha; - - @Nullable - private Drawable mDrawable; - private int mDrawableWidth, mDrawableHeight; - - public IconView(Context context) { - this(context, null); - } - - public IconView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public IconView(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public IconView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - mMultiValueAlpha = new MultiValueAlpha(this, NUM_ALPHA_CHANNELS); - mMultiValueAlpha.setUpdateVisibility(/* updateVisibility= */ true); - } - - /** - * Sets a {@link Drawable} to be displayed. - */ - @Override - public void setDrawable(@Nullable Drawable d) { - if (mDrawable != null) { - mDrawable.setCallback(null); - } - mDrawable = d; - if (mDrawable != null) { - mDrawable.setCallback(this); - setDrawableSizeInternal(getWidth(), getHeight()); - } - invalidate(); - } - - /** - * Sets the size of the icon drawable. - */ - @Override - public void setDrawableSize(int iconWidth, int iconHeight) { - mDrawableWidth = iconWidth; - mDrawableHeight = iconHeight; - if (mDrawable != null) { - setDrawableSizeInternal(getWidth(), getHeight()); - } - } - - private void setDrawableSizeInternal(int selfWidth, int selfHeight) { - Rect selfRect = new Rect(0, 0, selfWidth, selfHeight); - Rect drawableRect = new Rect(); - Gravity.apply(Gravity.CENTER, mDrawableWidth, mDrawableHeight, selfRect, drawableRect); - mDrawable.setBounds(drawableRect); - } - - @Override - @Nullable - public Drawable getDrawable() { - return mDrawable; - } - - @Override - public int getDrawableWidth() { - return mDrawableWidth; - } - - @Override - public int getDrawableHeight() { - return mDrawableHeight; - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - if (mDrawable != null) { - setDrawableSizeInternal(w, h); - } - } - - @Override - protected boolean verifyDrawable(Drawable who) { - return super.verifyDrawable(who) || who == mDrawable; - } - - @Override - protected void drawableStateChanged() { - super.drawableStateChanged(); - - final Drawable drawable = mDrawable; - if (drawable != null && drawable.isStateful() - && drawable.setState(getDrawableState())) { - invalidateDrawable(drawable); - } - } - - @Override - protected void onDraw(Canvas canvas) { - if (mDrawable != null) { - mDrawable.draw(canvas); - } - } - - @Override - public boolean hasOverlappingRendering() { - return false; - } - - @Override - public void setContentAlpha(float alpha) { - mMultiValueAlpha.get(INDEX_CONTENT_ALPHA).setValue(alpha); - } - - @Override - public void setModalAlpha(float alpha) { - mMultiValueAlpha.get(INDEX_MODAL_ALPHA).setValue(alpha); - } - - /** - * Set the tint color of the icon, useful for scrimming or dimming. - * - * @param color to blend in. - * @param amount [0,1] 0 no tint, 1 full tint - */ - @Override - public void setIconColorTint(int color, float amount) { - if (mDrawable != null) { - mDrawable.setColorFilter(Utilities.makeColorTintingColorFilter(color, amount)); - } - } - - @Override - public void setIconOrientation(RecentsOrientedState orientationState, boolean isGridTask) { - RecentsPagedOrientationHandler orientationHandler = - orientationState.getOrientationHandler(); - boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL; - DeviceProfile deviceProfile = - ActivityContext.lookupContext(getContext()).getDeviceProfile(); - - FrameLayout.LayoutParams iconParams = (FrameLayout.LayoutParams) getLayoutParams(); - - int thumbnailTopMargin = deviceProfile.overviewTaskThumbnailTopMarginPx; - int taskIconHeight = deviceProfile.overviewTaskIconSizePx; - int taskMargin = deviceProfile.overviewTaskMarginPx; - - orientationHandler.setTaskIconParams(iconParams, taskMargin, taskIconHeight, - thumbnailTopMargin, isRtl); - iconParams.width = iconParams.height = taskIconHeight; - setLayoutParams(iconParams); - - setRotation(orientationHandler.getDegreesRotated()); - int iconDrawableSize = isGridTask ? deviceProfile.overviewTaskIconDrawableSizeGridPx - : deviceProfile.overviewTaskIconDrawableSizePx; - setDrawableSize(iconDrawableSize, iconDrawableSize); - } - - @Override - public View asView() { - return this; - } -} diff --git a/quickstep/src/com/android/quickstep/views/IconView.kt b/quickstep/src/com/android/quickstep/views/IconView.kt new file mode 100644 index 00000000000..04f95376175 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/IconView.kt @@ -0,0 +1,195 @@ +/* + * 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.quickstep.views + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.util.AttributeSet +import android.view.Gravity +import android.view.View +import android.widget.FrameLayout +import androidx.core.view.updateLayoutParams +import com.android.launcher3.DeviceProfile +import com.android.launcher3.Flags +import com.android.launcher3.Utilities +import com.android.launcher3.util.MSDLPlayerWrapper +import com.android.launcher3.util.MultiValueAlpha +import com.android.launcher3.views.ActivityContext +import com.android.quickstep.util.RecentsOrientedState +import com.google.android.msdl.data.model.MSDLToken + +/** + * A view which draws a drawable stretched to fit its size. Unlike ImageView, it avoids relayout + * when the drawable changes. + */ +class IconView : View, TaskViewIcon { + private val multiValueAlpha: MultiValueAlpha = MultiValueAlpha(this, NUM_ALPHA_CHANNELS) + private var drawable: Drawable? = null + private var drawableWidth = 0 + private var drawableHeight = 0 + private var msdlPlayerWrapper: MSDLPlayerWrapper? = null + + constructor(context: Context) : super(context) { + setUpHaptics() + } + + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { + setUpHaptics() + } + + constructor( + context: Context, + attrs: AttributeSet?, + defStyleAttr: Int, + ) : super(context, attrs, defStyleAttr) { + setUpHaptics() + } + + init { + multiValueAlpha.setUpdateVisibility(true) + } + + private fun setUpHaptics() { + msdlPlayerWrapper = MSDLPlayerWrapper.INSTANCE.get(context) + // Haptics are handled by the MSDLPlayerWrapper + isHapticFeedbackEnabled = !Flags.msdlFeedback() || msdlPlayerWrapper == null + } + + override fun setOnLongClickListener(l: OnLongClickListener?) { + super.setOnLongClickListener(l?.withFeedback()) + } + + /** Sets a [Drawable] to be displayed. */ + override fun setDrawable(d: Drawable?) { + drawable?.callback = null + + // Copy drawable so that mutations below do not affect other users of the drawable + drawable = d?.constantState?.newDrawable()?.mutate() + drawable?.let { + it.callback = this + setDrawableSizeInternal(width, height) + } + invalidate() + } + + /** Sets the size of the icon drawable. */ + override fun setDrawableSize(iconWidth: Int, iconHeight: Int) { + drawableWidth = iconWidth + drawableHeight = iconHeight + drawable?.let { setDrawableSizeInternal(width, height) } + } + + private fun setDrawableSizeInternal(selfWidth: Int, selfHeight: Int) { + val selfRect = Rect(0, 0, selfWidth, selfHeight) + val drawableRect = Rect() + Gravity.apply(Gravity.CENTER, drawableWidth, drawableHeight, selfRect, drawableRect) + drawable?.bounds = drawableRect + } + + override fun getDrawable(): Drawable? = drawable + + override fun getDrawableWidth(): Int = drawableWidth + + override fun getDrawableHeight(): Int = drawableHeight + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + drawable?.let { setDrawableSizeInternal(w, h) } + } + + override fun verifyDrawable(who: Drawable): Boolean = + super.verifyDrawable(who) || who === drawable + + override fun drawableStateChanged() { + super.drawableStateChanged() + drawable?.let { + if (it.isStateful && it.setState(drawableState)) { + invalidateDrawable(it) + } + } + } + + override fun onDraw(canvas: Canvas) { + drawable?.draw(canvas) + } + + override fun hasOverlappingRendering(): Boolean = false + + override fun setContentAlpha(alpha: Float) { + multiValueAlpha[INDEX_CONTENT_ALPHA].setValue(alpha) + } + + override fun setModalAlpha(alpha: Float) { + multiValueAlpha[INDEX_MODAL_ALPHA].setValue(alpha) + } + + override fun setFlexSplitAlpha(alpha: Float) { + multiValueAlpha[INDEX_FLEX_SPLIT_ALPHA].setValue(alpha) + } + + /** + * Set the tint color of the icon, useful for scrimming or dimming. + * + * @param color to blend in. + * @param amount [0,1] 0 no tint, 1 full tint + */ + override fun setIconColorTint(color: Int, amount: Float) { + drawable?.colorFilter = Utilities.makeColorTintingColorFilter(color, amount) + } + + override fun setIconOrientation(orientationState: RecentsOrientedState, isGridTask: Boolean) { + val orientationHandler = orientationState.orientationHandler + val deviceProfile: DeviceProfile = + (ActivityContext.lookupContext(context) as ActivityContext).getDeviceProfile() + orientationHandler.setTaskIconParams( + iconParams = layoutParams as FrameLayout.LayoutParams, + taskIconMargin = deviceProfile.overviewProfile.taskMarginPx, + taskIconHeight = deviceProfile.overviewProfile.taskIconSizePx, + thumbnailTopMargin = deviceProfile.overviewProfile.taskThumbnailTopMarginPx, + isRtl = layoutDirection == LAYOUT_DIRECTION_RTL, + ) + updateLayoutParams { + height = deviceProfile.overviewProfile.taskIconSizePx + width = height + } + setRotation(orientationHandler.degreesRotated) + val iconDrawableSize = + if (isGridTask) deviceProfile.overviewProfile.taskIconDrawableSizeGridPx + else deviceProfile.overviewProfile.taskIconDrawableSizePx + setDrawableSize(iconDrawableSize, iconDrawableSize) + } + + override fun asView(): View = this + + private fun OnLongClickListener.withFeedback(): OnLongClickListener { + val delegate = this + return OnLongClickListener { v: View -> + if (Flags.msdlFeedback()) { + msdlPlayerWrapper?.playToken(MSDLToken.LONG_PRESS) + } + delegate.onLongClick(v) + } + } + + companion object { + private const val NUM_ALPHA_CHANNELS = 3 + private const val INDEX_CONTENT_ALPHA = 0 + private const val INDEX_MODAL_ALPHA = 1 + private const val INDEX_FLEX_SPLIT_ALPHA = 2 + } +} diff --git a/quickstep/src/com/android/quickstep/views/KeyboardFocusTask.kt b/quickstep/src/com/android/quickstep/views/KeyboardFocusTask.kt new file mode 100644 index 00000000000..6200df66ec2 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/KeyboardFocusTask.kt @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.views + +/** + * Helper class representing which TaskView should be focused when entering Overview with keyboard. + */ +sealed class KeyboardFocusTask { + + // No TaskView should be focused, No-Op + data object Unfocused : KeyboardFocusTask() + + // Focus the current page TaskView + data object CurrentPageTaskView : KeyboardFocusTask() + + // Focus the task that is expected to be the current task. + // See comments in RecentsViewUtils#getExpectedCurrentTask() for more details. + data object ExpectedCurrentTask : KeyboardFocusTask() + + // Focus the TaskView with task ids matching a given set + data class TaskViewWithIds(val taskIds: Set) : KeyboardFocusTask() + + override fun toString(): String { + return when (this) { + is Unfocused -> "Unfocused" + is CurrentPageTaskView -> "CurrentPageTaskView" + is ExpectedCurrentTask -> "ExpectedCurrentTask" + is TaskViewWithIds -> "TaskViewWithIds( $taskIds )" + } + } +} diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java index b4bca1ced86..4fd16bfbe30 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java @@ -17,16 +17,11 @@ import static android.app.ActivityTaskManager.INVALID_TASK_ID; -import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON; -import static com.android.launcher3.LauncherState.EDIT_MODE; -import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK; import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT; -import static com.android.launcher3.LauncherState.SPRING_LOADED; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SPLIT_SELECTION_EXIT_HOME; -import static com.android.window.flags2.Flags.enableDesktopWindowingWallpaperActivity; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import android.annotation.TargetApi; import android.content.Context; @@ -36,11 +31,9 @@ import androidx.annotation.Nullable; -import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.desktop.DesktopRecentsTransitionController; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.statehandlers.DepthController; @@ -52,11 +45,10 @@ import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource; import com.android.quickstep.GestureState; -import com.android.quickstep.LauncherActivityInterface; -import com.android.quickstep.RotationTouchHelper; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.util.SplitSelectStateController; -import com.android.systemui.shared.recents.model.Task; +import com.android.wm.shell.shared.GroupedTaskInfo; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import kotlin.Unit; @@ -76,7 +68,7 @@ public LauncherRecentsView(Context context, @Nullable AttributeSet attrs) { } public LauncherRecentsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr, LauncherActivityInterface.INSTANCE); + super(context, attrs, defStyleAttr); getStateManager().addStateListener(this); } @@ -88,18 +80,6 @@ public void init(OverviewActionsView actionsView, setContentAlpha(0); } - @Override - protected void handleStartHome(boolean animated) { - StateManager stateManager = getStateManager(); - animated &= stateManager.shouldAnimateStateChange(); - stateManager.goToState(NORMAL, animated); - if (FeatureFlags.enableSplitContextually()) { - mSplitSelectStateController.getSplitAnimationController() - .playPlaceholderDismissAnim(mContainer, LAUNCHER_SPLIT_SELECTION_EXIT_HOME); - } - AbstractFloatingView.closeAllOpenViews(mContainer, animated); - } - @Override protected boolean canStartHomeSafely() { return mContainer.canStartHomeSafely(); @@ -128,9 +108,11 @@ public void onTaskIconChanged(int taskId) { // If Launcher needs to return to split select state, do it now, after the icon has updated. if (mContainer.hasPendingSplitSelectInfo()) { PendingSplitSelectInfo recoveryData = mContainer.getPendingSplitSelectInfo(); - if (recoveryData.getStagedTaskId() == taskId) { + TaskContainer taskContainer; + if (recoveryData != null && recoveryData.getStagedTaskId() == taskId && (taskContainer = + mUtils.getTaskContainerById(taskId)) != null) { initiateSplitSelect( - getTaskViewByTaskId(recoveryData.getStagedTaskId()), + taskContainer, recoveryData.getStagePosition(), recoveryData.getSource() ); mContainer.finishSplitSelectRecovery(); @@ -150,7 +132,14 @@ public void reset() { public void onStateTransitionStart(LauncherState toState) { setOverviewStateEnabled(toState.isRecentsViewVisible); - setOverviewGridEnabled(toState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())); + if (enableGridOnlyOverview()) { + if (toState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())) { + setOverviewGridEnabled(true); + } + } else { + setOverviewGridEnabled( + toState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())); + } setOverviewFullscreenEnabled(toState.getOverviewFullscreenProgress() == 1); if (toState == OVERVIEW_MODAL_TASK) { setOverviewSelectEnabled(true); @@ -158,21 +147,28 @@ public void onStateTransitionStart(LauncherState toState) { resetModalVisuals(); } - // Set border after select mode changes to avoid showing border during state transition - if (!toState.isRecentsViewVisible || toState == OVERVIEW_MODAL_TASK) { + resetShareUIState(); + + // Set border state changes to avoid showing border during state transitions + if (!toState.isRecentsViewVisible || toState == OVERVIEW_MODAL_TASK + || toState == OVERVIEW_SPLIT_SELECT) { setTaskBorderEnabled(false); } setFreezeViewVisibility(true); - if (mContainer.getDesktopVisibilityController() != null) { - mContainer.getDesktopVisibilityController().onLauncherStateChanged(toState); - } } @Override public void onStateTransitionComplete(LauncherState finalState) { - if (finalState == NORMAL || finalState == SPRING_LOADED || finalState == EDIT_MODE - || finalState == ALL_APPS) { + DesktopVisibilityController.INSTANCE.get(mContainer).onLauncherStateChanged( + mContainer.getDisplayId(), finalState); + if (enableGridOnlyOverview()) { + if (!finalState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())) { + setOverviewGridEnabled(false); + } + } + + if (!finalState.isRecentsViewVisible) { // Clean-up logic that occurs when recents is no longer in use/visible. reset(); } @@ -186,10 +182,8 @@ public void onStateTransitionComplete(LauncherState finalState) { if (finalState.isRecentsViewVisible && finalState != OVERVIEW_MODAL_TASK) { setTaskBorderEnabled(true); } - if (isOverlayEnabled) { - runActionOnRemoteHandles( - remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(true)); + mBlurUtils.setDrawLiveTileBelowRecents(true); } } @@ -198,8 +192,8 @@ public void setOverviewStateEnabled(boolean enabled) { super.setOverviewStateEnabled(enabled); if (enabled) { LauncherState state = getStateManager().getState(); - boolean hasClearAllButton = (state.getVisibleElements(mContainer) - & CLEAR_ALL_BUTTON) != 0; + boolean hasClearAllButton = (state.getVisibleElements(mContainer.getLauncherUiState()) + & CLEAR_ALL_BUTTON) != 0; setDisallowScrollToClearAll(!hasClearAllButton); } } @@ -238,10 +232,10 @@ protected void onDismissAnimationEnds() { } @Override - public void initiateSplitSelect(TaskView taskView, + public void initiateSplitSelect(TaskContainer taskContainer, @SplitConfigurationOptions.StagePosition int stagePosition, StatsLogManager.EventEnum splitEvent) { - super.initiateSplitSelect(taskView, stagePosition, splitEvent); + super.initiateSplitSelect(taskContainer, stagePosition, splitEvent); getStateManager().goToState(LauncherState.OVERVIEW_SPLIT_SELECT); } @@ -252,50 +246,33 @@ public void initiateSplitSelect(SplitSelectSource splitSelectSource) { } @Override - protected boolean canLaunchFullscreenTask() { - if (FeatureFlags.enableSplitContextually()) { - return !mSplitSelectStateController.isSplitSelectActive(); - } else { - return !mContainer.isInState(OVERVIEW_SPLIT_SELECT); - } + public boolean canLaunchFullscreenTask() { + return !mSplitSelectStateController.isSplitSelectActive(); } @Override - public void onGestureAnimationStart(Task[] runningTasks, - RotationTouchHelper rotationTouchHelper) { - super.onGestureAnimationStart(runningTasks, rotationTouchHelper); - DesktopVisibilityController desktopVisibilityController = - mContainer.getDesktopVisibilityController(); - if (!enableDesktopWindowingWallpaperActivity() && desktopVisibilityController != null) { - // TODO: b/333533253 - Remove after flag rollout - desktopVisibilityController.setRecentsGestureStart(); - } + public void onGestureAnimationStart(GroupedTaskInfo groupedTaskInfo) { + super.onGestureAnimationStart(groupedTaskInfo); } @Override public void onGestureAnimationEnd() { - DesktopVisibilityController desktopVisibilityController = - mContainer.getDesktopVisibilityController(); + final DesktopVisibilityController desktopVisibilityController = + DesktopVisibilityController.INSTANCE.get(mContainer); boolean showDesktopApps = false; - GestureState.GestureEndTarget endTarget = null; - if (desktopVisibilityController != null) { - desktopVisibilityController = mContainer.getDesktopVisibilityController(); - endTarget = mCurrentGestureEndTarget; - if (endTarget == GestureState.GestureEndTarget.LAST_TASK - && desktopVisibilityController.areDesktopTasksVisible()) { - // Recents gesture was cancelled and we are returning to the previous task. - // After super class has handled clean up, show desktop apps on top again - showDesktopApps = true; - } + GestureState.GestureEndTarget endTarget = mCurrentGestureEndTarget; + if (endTarget == GestureState.GestureEndTarget.LAST_TASK + && desktopVisibilityController.isInDesktopModeAndNotInOverview( + mContainer.getDisplayId())) { + // Recents gesture was cancelled and we are returning to the previous task. + // After super class has handled clean up, show desktop apps on top again + showDesktopApps = true; } super.onGestureAnimationEnd(); - if (!enableDesktopWindowingWallpaperActivity() && desktopVisibilityController != null) { - // TODO: b/333533253 - Remove after flag rollout - desktopVisibilityController.setRecentsGestureEnd(endTarget); - } if (showDesktopApps && Utilities.ATLEAST_R) { SystemUiProxy.INSTANCE.get(mContainer).showDesktopApps(mContainer.getDisplay().getDisplayId(), - null /* transition */); + /* transition */ null, /* taskIdToReorderToFront */ null, + DesktopModeTransitionSource.RECENTS); } } } diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java index 9c1f0663e3b..88d021bd63a 100644 --- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java +++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java @@ -16,11 +16,14 @@ package com.android.quickstep.views; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; + import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; import android.util.AttributeSet; import android.util.Log; +import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; @@ -31,7 +34,6 @@ import androidx.annotation.Nullable; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Flags; import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.anim.AnimatedFloat; @@ -40,6 +42,8 @@ import com.android.launcher3.util.NavigationMode; import com.android.quickstep.TaskOverlayFactory.OverlayUICallbacks; import com.android.quickstep.util.LayoutUtils; +import com.android.wm.shell.shared.TypefaceUtils; +import com.android.wm.shell.shared.TypefaceUtils.FontFamily; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -55,6 +59,34 @@ public class OverviewActionsView extends FrameLayo public static final String TAG = "OverviewActionsView"; private final Rect mInsets = new Rect(); + /** + * We need to over-ride here due to liveTile mode, the [OverviewInputConsumer] is added, which + * consumes all [InputEvent]'s and focus isn't moved correctly. + */ + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + if (event.getAction() != KeyEvent.ACTION_DOWN) return super.dispatchKeyEvent(event); + + View currentFocus = findFocus(); + if (currentFocus == null) return super.dispatchKeyEvent(event); + + View nextFocus = null; + switch (event.getKeyCode()) { + case KeyEvent.KEYCODE_DPAD_LEFT -> nextFocus = focusSearch(currentFocus, + FOCUS_BACKWARD); + case KeyEvent.KEYCODE_DPAD_RIGHT -> nextFocus = focusSearch(currentFocus, + FOCUS_FORWARD); + case KeyEvent.KEYCODE_TAB -> nextFocus = focusSearch(currentFocus, + event.isShiftPressed() ? FOCUS_BACKWARD : FOCUS_FORWARD); + } + + if (nextFocus != null) { + return nextFocus.requestFocus(); + } + + return super.dispatchKeyEvent(event); + } + @IntDef(flag = true, value = { HIDDEN_NON_ZERO_ROTATION, HIDDEN_NO_TASKS, @@ -65,8 +97,7 @@ public class OverviewActionsView extends FrameLayo HIDDEN_DESKTOP }) @Retention(RetentionPolicy.SOURCE) - public @interface ActionsHiddenFlags { - } + public @interface ActionsHiddenFlags { } public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 0; public static final int HIDDEN_NO_TASKS = 1 << 1; @@ -79,10 +110,9 @@ public class OverviewActionsView extends FrameLayo @IntDef(flag = true, value = { DISABLED_SCROLLING, DISABLED_ROTATED, - DISABLED_NO_THUMBNAIL }) + DISABLED_NO_THUMBNAIL}) @Retention(RetentionPolicy.SOURCE) - public @interface ActionsDisabledFlags { - } + public @interface ActionsDisabledFlags { } public static final int DISABLED_SCROLLING = 1 << 0; public static final int DISABLED_ROTATED = 1 << 1; @@ -92,20 +122,18 @@ public class OverviewActionsView extends FrameLayo private static final int INDEX_VISIBILITY_ALPHA = 1; private static final int INDEX_FULLSCREEN_ALPHA = 2; private static final int INDEX_HIDDEN_FLAGS_ALPHA = 3; + // The alpha on the actions view as a result of the share targets being present private static final int INDEX_SHARE_TARGET_ALPHA = 4; private static final int INDEX_SCROLL_ALPHA = 5; private static final int INDEX_GROUPED_ALPHA = 6; private static final int INDEX_3P_LAUNCHER = 7; private static final int NUM_ALPHAS = 8; - public @interface SplitButtonHiddenFlags { - } - + public @interface SplitButtonHiddenFlags { } public static final int FLAG_SMALL_SCREEN_HIDE_SPLIT = 1 << 0; /** - * Holds an AnimatedFloat for each alpha property, used to set or animate alpha - * values in + * Holds an AnimatedFloat for each alpha property, used to set or animate alpha values in * {@link #mMultiValueAlphas}. */ private final AnimatedFloat[] mAlphaProperties = new AnimatedFloat[NUM_ALPHAS]; @@ -117,14 +145,11 @@ public class OverviewActionsView extends FrameLayo /** Index used for grouped-task actions in the mMultiValueAlphas array */ private static final int GROUP_ACTIONS_ALPHAS = 1; - /** - * Container for the action buttons below a focused, non-split Overview tile. - */ + /** Container for the action buttons below a focused, non-split Overview tile. */ protected LinearLayout mActionButtons; private Button mSplitButton; /** - * The "save app pair" button. Currently this is the only button that is not - * contained in + * The "save app pair" button. Currently this is the only button that is not contained in * mActionButtons, since it is the sole button that appears for a grouped task. */ private Button mSaveAppPairButton; @@ -163,18 +188,17 @@ public OverviewActionsView(Context context, @Nullable AttributeSet attrs, int de protected void onFinishInflate() { super.onFinishInflate(); // Initialize 2 view containers: one for single tasks, one for grouped tasks. - // These will take up the same space on the screen and alternate visibility as - // needed. + // These will take up the same space on the screen and alternate visibility as needed. // Currently, the only grouped task action is "save app pairs". mActionButtons = findViewById(R.id.action_buttons); mSaveAppPairButton = findViewById(R.id.action_save_app_pair); - // Initialize a list to hold alphas for mActionButtons and any group action - // buttons. + TypefaceUtils.setTypeface(mSaveAppPairButton, FontFamily.GSF_LABEL_LARGE); + // Initialize a list to hold alphas for mActionButtons and any group action buttons. mMultiValueAlphas[ACTIONS_ALPHAS] = new MultiValueAlpha(mActionButtons, NUM_ALPHAS); - mMultiValueAlphas[GROUP_ACTIONS_ALPHAS] = new MultiValueAlpha(mSaveAppPairButton, NUM_ALPHAS); + mMultiValueAlphas[GROUP_ACTIONS_ALPHAS] = + new MultiValueAlpha(mSaveAppPairButton, NUM_ALPHAS); Arrays.stream(mMultiValueAlphas).forEach(a -> a.setUpdateVisibility(true)); - // To control alpha simultaneously on mActionButtons and any group action - // buttons, we set up + // To control alpha simultaneously on mActionButtons and any group action buttons, we set up // an AnimatedFloat for each alpha property. for (int i = 0; i < NUM_ALPHAS; i++) { final int index = i; @@ -185,10 +209,8 @@ protected void onFinishInflate() { }, 1f /* initialValue */); } - // The screenshot button is implemented as a Button in launcher3 and - // NexusLauncher, but is - // an ImageButton in go launcher (does not share a common class with Button). - // Take care when + // The screenshot button is implemented as a Button in launcher3 and NexusLauncher, but is + // an ImageButton in go launcher (does not share a common class with Button). Take care when // casting this. View screenshotButton = findViewById(R.id.action_screenshot); screenshotButton.setOnClickListener(this); @@ -245,15 +267,12 @@ public void updateHiddenFlags(@ActionsHiddenFlags int visibilityFlags, boolean e } /** - * Updates the proper disabled flag to indicate whether OverviewActionsView - * should be enabled. - * Ignores DISABLED_ROTATED flag for determining enabled. Flag is used to - * enable/disable + * Updates the proper disabled flag to indicate whether OverviewActionsView should be enabled. + * Ignores DISABLED_ROTATED flag for determining enabled. Flag is used to enable/disable * buttons individually, currently done for select button in subclass. * * @param disabledFlags The flag to update. - * @param enable Whether to enable the disable flag: True will cause view - * to be disabled. + * @param enable Whether to enable the disable flag: True will cause view to be disabled. */ public void updateDisabledFlags(@ActionsDisabledFlags int disabledFlags, boolean enable) { if (enable) { @@ -266,14 +285,11 @@ public void updateDisabledFlags(@ActionsDisabledFlags int disabledFlags, boolean } /** - * Updates a batch of flags to hide and show actions buttons when a grouped task - * (split screen) + * Updates a batch of flags to hide and show actions buttons when a grouped task (split screen) * is focused. - * - * @param isGroupedTask True if the focused task is a grouped task. - * @param canSaveAppPair True if the focused task is a grouped task and can be - * saved as an app - * pair. + * @param isGroupedTask True if the focused task is a grouped task. + * @param canSaveAppPair True if the focused task is a grouped task and can be saved as an app + * pair. */ public void updateForGroupedTask(boolean isGroupedTask, boolean canSaveAppPair) { Log.d(TAG, "updateForGroupedTask() called with: isGroupedTask = [" + isGroupedTask @@ -284,20 +300,21 @@ public void updateForGroupedTask(boolean isGroupedTask, boolean canSaveAppPair) } /** - * Updates a batch of flags to hide and show actions buttons for tablet/non - * tablet case. + * Updates a batch of flags to hide and show actions buttons for tablet/non tablet case. */ private void updateForIsTablet() { assert mDp != null; // Update flags to see if split button should be hidden. - updateSplitButtonHiddenFlags(FLAG_SMALL_SCREEN_HIDE_SPLIT, !mDp.isTablet); + updateSplitButtonHiddenFlags(FLAG_SMALL_SCREEN_HIDE_SPLIT, !mDp.getDeviceProperties().isTablet()); updateActionButtonsVisibility(); } private void updateActionButtonsVisibility() { - assert mDp != null; + if (mDp == null) { + return; + } boolean showSingleTaskActions = !mIsGroupedTask; - boolean showGroupActions = mIsGroupedTask && mDp.isTablet && mCanSaveAppPair; + boolean showGroupActions = mIsGroupedTask && mDp.getDeviceProperties().isTablet() && mCanSaveAppPair; Log.d(TAG, "updateActionButtonsVisibility() called: showSingleTaskActions = [" + showSingleTaskActions + "], showGroupActions = [" + showGroupActions + "]"); getActionsAlphas().get(INDEX_GROUPED_ALPHA).setValue(showSingleTaskActions ? 1 : 0); @@ -320,17 +337,14 @@ private MultiValueAlpha getGroupActionsAlphas() { } /** - * Updates the proper flags to indicate whether the "Split screen" button should - * be hidden. + * Updates the proper flags to indicate whether the "Split screen" button should be hidden. * * @param flag The flag to update. - * @param enable Whether to enable the hidden flag: True will cause view to be - * hidden. + * @param enable Whether to enable the hidden flag: True will cause view to be hidden. */ void updateSplitButtonHiddenFlags(@SplitButtonHiddenFlags int flag, boolean enable) { - if (mSplitButton == null) - return; + if (mSplitButton == null) return; if (enable) { mSplitButtonHiddenFlags |= flag; } else { @@ -372,19 +386,14 @@ public boolean areActionsButtonsVisible() { } /** - * Offsets OverviewActionsView horizontal position based on 3 button nav - * container in taskbar. + * Offsets OverviewActionsView horizontal position based on 3 button nav container in taskbar. */ private void updatePadding() { - // If taskbar is in overview, overview action has dedicated space above nav - // buttons + // If taskbar is in overview, overview action has dedicated space above nav buttons setPadding(mInsets.left, 0, mInsets.right, 0); } - /** - * Updates vertical margins for different navigation mode or configuration - * changes. - */ + /** Updates vertical margins for different navigation mode or configuration changes. */ public void updateVerticalMargin(NavigationMode mode) { updateActionBarPosition(mActionButtons); updateActionBarPosition(mSaveAppPairButton); @@ -398,7 +407,7 @@ private void updateActionBarPosition(View actionBar) { LayoutParams actionParams = (LayoutParams) actionBar.getLayoutParams(); actionParams.setMargins( - actionParams.leftMargin, mDp.overviewActionsTopMarginPx, + actionParams.leftMargin, mDp.getOverviewProfile().getActionsTopMarginPx(), actionParams.rightMargin, getBottomMargin()); } @@ -407,13 +416,18 @@ private int getBottomMargin() { return 0; } - if (mDp.isTablet && Flags.enableGridOnlyOverview()) { - return mDp.stashedTaskbarHeight; + if (mDp.getDeviceProperties().isTablet() && enableGridOnlyOverview()) { + int modalTaskbarHeight = mDp.getTaskbarProfile().isTransientTaskbar() + ? mDp.getTaskbarProfile().getStashedTaskbarHeight() + : mDp.getTaskbarProfile().getHeight(); + return modalTaskbarHeight + mDp.getOverviewProfile().getActionsTopMarginPx(); } // Align to bottom of task Rect. - return mDp.heightPx - mTaskSize.bottom - mDp.overviewActionsTopMarginPx - - mDp.overviewActionsHeight; + return mDp.getDeviceProperties().getHeightPx() + - mTaskSize.bottom + - mDp.getOverviewProfile().getActionsTopMarginPx() + - mDp.getOverviewProfile().getActionsHeight(); } /** diff --git a/quickstep/src/com/android/quickstep/views/RecentsDismissUtils.kt b/quickstep/src/com/android/quickstep/views/RecentsDismissUtils.kt new file mode 100644 index 00000000000..e8b1cb5306f --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/RecentsDismissUtils.kt @@ -0,0 +1,1422 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.views + +import android.app.ActivityTaskManager.INVALID_TASK_ID +import android.view.View +import androidx.core.graphics.toRectF +import androidx.core.view.children +import androidx.core.view.contains +import androidx.dynamicanimation.animation.FloatPropertyCompat +import androidx.dynamicanimation.animation.FloatValueHolder +import androidx.dynamicanimation.animation.SpringAnimation +import androidx.dynamicanimation.animation.SpringForce +import com.android.internal.jank.Cuj +import com.android.launcher3.PagedView +import com.android.launcher3.R +import com.android.launcher3.concurrent.annotations.LightweightBackground +import com.android.launcher3.concurrent.annotations.LightweightBackgroundPriority +import com.android.launcher3.logging.StatsLogManager.LauncherEvent +import com.android.launcher3.util.DynamicResource +import com.android.launcher3.util.MSDLPlayerWrapper +import com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview +import com.android.launcher3.views.ActivityContext +import com.android.quickstep.SystemUiProxy +import com.android.quickstep.util.TaskGridNavHelper +import com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY +import com.android.quickstep.views.TaskView.Companion.GRID_END_TRANSLATION_X +import com.android.systemui.shared.system.ActivityManagerWrapper +import com.android.systemui.shared.system.InteractionJankMonitorWrapper +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource +import com.google.android.msdl.data.model.MSDLToken +import com.google.common.util.concurrent.ListeningExecutorService +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import kotlin.math.abs +import kotlin.math.max +import kotlin.math.roundToInt +import kotlin.math.sign + +/** + * Helper class for [RecentsView]. This util class contains refactored and extracted functions from + * RecentsView related to TaskView dismissal. + */ +class RecentsDismissUtils +@AssistedInject +constructor( + @Assisted private val recentsView: RecentsView<*, *>, + private val systemUiProxy: SystemUiProxy, + @LightweightBackground(LightweightBackgroundPriority.UI) + private val uiHelperExecutor: ListeningExecutorService, + private val activityManagerWrapper: ActivityManagerWrapper, + private val msdlPlayerWrapper: MSDLPlayerWrapper, +) { + @AssistedFactory + interface Factory { + fun create(recentsView: RecentsView<*, *>): RecentsDismissUtils + } + + /** + * Runs the default spring animation when a dismissed task view in overview is released. + * + *

When a task dismiss is cancelled, the task will return to its original position via a + * spring animation. As it passes the threshold of its settling state, its neighbors will spring + * in response to the perceived impact of the settling task. + */ + fun createTaskDismissSpringAnimation( + dismissedTaskView: TaskView?, + shouldRemoveTaskView: Boolean, + isSplitSelection: Boolean, + ): SpringSet? { + if (dismissedTaskView == null || isSplitSelection) { + return createTaskDismissSpringAnimation( + dismissedTaskView, + isDismissing = true, + DismissedTaskData( + startVelocity = 0f, + dismissLength = 0, + dismissThreshold = 0, + finalPosition = 0f, + ), + shouldRemoveTaskView, + isSplitSelection, + ) + } + return createTaskDismissSpringAnimation( + dismissedTaskView, + isDismissing = true, + getDefaultDismissedTaskData(dismissedTaskView), + shouldRemoveTaskView, + isSplitSelection, + ) + } + + /** + * Runs the spring animations when a dismissed task view in overview is released. + * + *

When a task dismiss is cancelled, the task will return to its original position via a + * spring animation. As it passes the threshold of its settling state, its neighbors will spring + * in response to the perceived impact of the settling task. + */ + fun createTaskDismissSpringAnimation( + dismissedTaskView: TaskView?, + isDismissing: Boolean, + dismissedTaskData: DismissedTaskData, + shouldRemoveTaskView: Boolean, + isSplitSelection: Boolean, + ): SpringSet? { + val gridEndData = getGridEndData(dismissedTaskView) + val dismissedTaskSecondaryDimension = + if (dismissedTaskView == null) + recentsView.pagedOrientationHandler.getSecondarySize( + recentsView.mLastComputedTaskSize.toRectF() + ) + else { + recentsView.pagedOrientationHandler + .getSecondaryDimension(dismissedTaskView) + .toFloat() + } + val verticalFactor = + recentsView.pagedOrientationHandler.getTaskDismissVerticalDirection().toFloat() + val startVelocity = + abs(dismissedTaskData.startVelocity).coerceAtLeast(dismissedTaskSecondaryDimension) * + dismissedTaskData.startVelocity.sign + + // Spring that animates the dismissed task. + val dismissedTaskViewSpring = + if (isSplitSelection || dismissedTaskView == null) null + else { + createDismissedTaskViewSpringAnimation( + dismissedTaskView, + isDismissing, + DismissedTaskData( + startVelocity = startVelocity, + dismissLength = dismissedTaskData.dismissLength, + finalPosition = dismissedTaskData.finalPosition, + dismissThreshold = dismissedTaskData.dismissThreshold, + ), + ) + } + + // SpringSet tracking all dismiss springs before running end-snapping and relayout. + var springSet = + dismissedTaskViewSpring?.let { SpringSet(it, dismissedTaskData.finalPosition) } + + if (isDismissing) { + val reflowSplitFromDesktopTile = + isSplitSelection && + recentsView.showAsGrid() && + dismissedTaskView != null && + recentsView.currentPageTaskView is DesktopTaskView + // The spring set that will reflow the tasks to fill the gap left by the dismissed task. + var (reflowSpringSet, tasksToReflow) = + createTaskGridReflowSpringSet( + dismissedTaskView, + getDismissedTaskGapForReflow(dismissedTaskView, isSplitSelection), + gridEndData, + isSplitSelection, + reflowSplitFromDesktopTile, + ) + // Animate remaining tasks when splitting a task while focused on a desktop task. + if (reflowSplitFromDesktopTile && dismissedTaskView != null) { + val splitWithLargeTileReflowSpringSet = + createSplitWithCurrentPageFadeOutReflowSpringSet( + dismissedTaskView, + tasksToReflow, + ) + if (reflowSpringSet == null) { + reflowSpringSet = splitWithLargeTileReflowSpringSet + } else { + reflowSpringSet.playTogether(splitWithLargeTileReflowSpringSet) + } + } + if (springSet == null) { + // Only reflow, as there is no dismissed task to animate. + springSet = reflowSpringSet + } else if (reflowSpringSet != null) { + springSet.playAfterThreshold( + driverThreshold = dismissedTaskSecondaryDimension * verticalFactor, + triggeredSpringSet = reflowSpringSet, + ) + } + } else if (springSet != null && dismissedTaskView != null) { + // Neighbor settling spring animations. + val neighborSettlingSpringSet = + createNeighborSettlingSpringSet(dismissedTaskView, isSpringDirectionVertical = true) + springSet.playAfterThreshold( + driverThreshold = dismissedTaskData.finalPosition, + triggeredSpringSet = neighborSettlingSpringSet, + minVelocity = startVelocity, + ) + springSet.addEndListener { + InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_OVERVIEW_TASK_DISMISS) + } + } + + if (!isSplitSelection) { + springSet?.addStartListener { + InteractionJankMonitorWrapper.begin( + recentsView, + Cuj.CUJ_LAUNCHER_OVERVIEW_TASK_DISMISS, + ) + } + } + val endRunnable = { + if (isDismissing) { + onEndSnappingAndRelayout( + dismissedTaskView, + shouldRemoveTaskView, + isSplitSelection, + gridEndData, + ) + } else { + dismissedTaskView?.isBeingDismissed = false + recentsView.onDismissAnimationEnds() + } + } + if (springSet == null) { + endRunnable() + return null + } + return springSet.addEndListener(endRunnable).start() + } + + /** Default dismissed task view spring animation. */ + private fun createDismissedTaskViewSpringAnimation( + dismissedTaskView: TaskView + ): SpringAnimation? { + return createDismissedTaskViewSpringAnimation( + dismissedTaskView, + isDismissing = true, + getDefaultDismissedTaskData(dismissedTaskView), + ) + } + + /** Dismissed task view spring animation. */ + private fun createDismissedTaskViewSpringAnimation( + dismissedTaskView: TaskView, + isDismissing: Boolean, + dismissedTaskData: DismissedTaskData, + ): SpringAnimation? { + dismissedTaskView.isBeingDismissed = true + val taskDismissFloatProperty = + FloatPropertyCompat.createFloatPropertyCompat( + dismissedTaskView.secondaryDismissTranslationProperty + ) + var previousDisplacement = taskDismissFloatProperty.getValue(dismissedTaskView) + // Animate dismissed task towards dismissal or rest state. + val dismissedTaskViewSpringAnimation = + SpringAnimation(dismissedTaskView, taskDismissFloatProperty) + .setSpring( + createExpressiveDismissSpringForce() + .setFinalPosition(dismissedTaskData.finalPosition) + ) + .setStartVelocity(dismissedTaskData.startVelocity) + .addUpdateListener { animation, currentDisplacement, _ -> + // Play haptic as task crosses dismiss threshold from above or below. + val previousBeyondThreshold = + abs(previousDisplacement) >= abs(dismissedTaskData.dismissThreshold) + val currentBeyondThreshold = + abs(currentDisplacement) >= abs(dismissedTaskData.dismissThreshold) + if (previousBeyondThreshold != currentBeyondThreshold) { + msdlPlayerWrapper.playToken(MSDLToken.SWIPE_THRESHOLD_INDICATOR) + } + previousDisplacement = currentDisplacement + + if (dismissedTaskView.isRunningTask && recentsView.enableDrawingLiveTile) { + recentsView.runActionOnRemoteHandles { remoteTargetHandle -> + remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation.value = + taskDismissFloatProperty.getValue(dismissedTaskView) + } + recentsView.redrawLiveTile() + } + // End dismissed task animation once beyond the screen so next animations play. + if ( + isDismissing && + abs(currentDisplacement) >= abs(dismissedTaskData.dismissLength) + ) { + (animation as SpringAnimation).skipToEnd() + } + } + return dismissedTaskViewSpringAnimation + } + + private fun getDefaultDismissedTaskData(dismissedTaskView: TaskView): DismissedTaskData { + with(recentsView) { + dismissedTaskView.getThumbnailBounds(mTempRect, /* relativeToDragLayer= */ true) + val secondaryLayerDimension = + pagedOrientationHandler.getSecondaryDimension( + (mContainer as ActivityContext).getDragLayer() + ) + val verticalFactor = pagedOrientationHandler.getTaskDismissVerticalDirection().toFloat() + val dismissLength = + (pagedOrientationHandler.getTaskDismissLength(secondaryLayerDimension, mTempRect) * + verticalFactor) + .toInt() + val dismissThreshold = (dismissLength * DEFAULT_DISMISS_THRESHOLD_FRACTION).toInt() + val startVelocity = mTempRect.height().toFloat() + val finalPosition = dismissLength.toFloat() + return DismissedTaskData( + startVelocity = startVelocity, + dismissLength = dismissLength, + finalPosition = finalPosition, + dismissThreshold = dismissThreshold, + ) + } + } + + /** Dismisses all */ + fun dismissAllTasks() { + val allDismissSprings = + recentsView.mUtils.taskViews + .reversed() + .filter { taskView -> recentsView.isTaskViewVisible(taskView) } + .mapNotNull { createDismissedTaskViewSpringAnimation(it) } + SpringSet(SpringAnimation(FloatValueHolder()).setSpring(SpringForce(1f))) + .playTogether(allDismissSprings) + .addEndListener { + with(recentsView) { + // Remove desktops first, since desks can be empty (so they have no recent + // tasks), and closing all tasks on a desk doesn't always necessarily mean that + // the desk will be removed. So, there are no guarantees that the below call to + // `ActivityManagerWrapper::removeAllRecentTasks()` will be enough. + systemUiProxy.removeAllDesks(DesktopModeTransitionSource.RECENTS) + + // Remove all the task views now + finishRecentsAnimation(/* toHome */ true, /* shouldPip */ false) { + uiHelperExecutor.execute { activityManagerWrapper.removeAllRecentTasks() } + removeAllTaskViews() + if (!mUtils.isInDesktopFirstMode()) { + startHome() + } + onDismissAnimationEnds() + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_OVERVIEW_CLEAR_ALL) + } + } + } + .start() + } + + /** Bounce neighboring tasks due to a canceled dismiss or the reflow of tasks after dismiss. */ + private fun createNeighborSettlingSpringSet( + dismissedTaskView: TaskView, + tasksToExclude: List = emptyList(), + isSpringDirectionVertical: Boolean, + ): SpringSet { + // Empty spring animation exists for conditional start, and to drive neighboring springs. + val neighborsToSettle = + SpringAnimation(FloatValueHolder()) + .setSpring(createExpressiveDismissSpringForce().setFinalPosition(0f)) + val neighborSettlingSpringSet = SpringSet(neighborsToSettle) + + // Add tasks before dismissed index, fanning out from the dismissed task. + // The order they are added matters, as each spring drives the next. + var previousNeighbor = neighborsToSettle + getTasksOffsetPairAdjacentToDismissedTask(dismissedTaskView, towardsStart = true) + .filter { (taskView, _) -> !tasksToExclude.contains(taskView) } + .forEach { (taskView, offset) -> + previousNeighbor = + createNeighboringTaskViewSpringAnimation( + taskView, + offset * ADDITIONAL_DISMISS_DAMPING_RATIO, + previousNeighbor, + isSpringDirectionVertical, + neighborSettlingSpringSet, + ) + } + // Add tasks after dismissed index, fanning out from the dismissed task. + // The order they are added matters, as each spring drives the next. + previousNeighbor = neighborsToSettle + getTasksOffsetPairAdjacentToDismissedTask(dismissedTaskView, towardsStart = false) + .filter { (taskView, _) -> !tasksToExclude.contains(taskView) } + .forEach { (taskView, offset) -> + previousNeighbor = + createNeighboringTaskViewSpringAnimation( + taskView, + offset * ADDITIONAL_DISMISS_DAMPING_RATIO, + previousNeighbor, + isSpringDirectionVertical, + neighborSettlingSpringSet, + ) + } + return neighborSettlingSpringSet + } + + /** + * Gets pairs of (TaskView, offset) adjacent the dismissed task in visual order. + * + *

Gets tasks either before or after the dismissed task along with their offset from it. The + * offset is the distance between indices for carousels, or distance between columns for grids. + */ + private fun getTasksOffsetPairAdjacentToDismissedTask( + dismissedTaskView: TaskView, + towardsStart: Boolean, + ): Sequence> { + if (recentsView.showAsGrid()) { + val taskGridNavHelper = + TaskGridNavHelper( + recentsView.mUtils.getTopRowIdArray(), + recentsView.mUtils.getBottomRowIdArray(), + recentsView.mUtils.getLargeTaskViewIds(), + hasAddDesktopButton = false, + ) + return taskGridNavHelper + .gridTaskViewIdOffsetPairInTabOrderSequence( + dismissedTaskView.taskViewId, + towardsStart, + ) + .mapNotNull { (taskViewId, columnOffset) -> + recentsView.getTaskViewFromTaskViewId(taskViewId)?.let { taskView -> + Pair(taskView, columnOffset) + } + } + } else { + val taskViewList = recentsView.mUtils.taskViews.toList() + val dismissedTaskViewIndex = taskViewList.indexOf(dismissedTaskView) + if (taskViewList.isEmpty() || dismissedTaskViewIndex == -1) return emptySequence() + + return if (towardsStart) { + taskViewList + .take(dismissedTaskViewIndex) + .reversed() + .mapIndexed { index, taskView -> Pair(taskView, index + 1) } + .asSequence() + } else { + taskViewList + .takeLast(taskViewList.size - dismissedTaskViewIndex - 1) + .mapIndexed { index, taskView -> Pair(taskView, index + 1) } + .asSequence() + } + } + } + + /** Creates a neighboring task view spring, driven by the spring of its neighbor. */ + private fun createNeighboringTaskViewSpringAnimation( + taskView: TaskView, + dampingOffsetRatio: Float, + previousNeighborSpringAnimation: SpringAnimation, + springingDirectionVertical: Boolean, + neighborSettlingSpringSet: SpringSet, + ): SpringAnimation { + val springProperty = + if (springingDirectionVertical) taskView.secondaryDismissTranslationProperty + else taskView.primaryDismissTranslationProperty + val neighboringTaskViewSpringAnimation = + SpringAnimation(taskView, FloatPropertyCompat.createFloatPropertyCompat(springProperty)) + .setSpring(createExpressiveDismissSpringForce(dampingOffsetRatio)) + // Update live tile on spring animation. + if (taskView.isRunningTask && recentsView.enableDrawingLiveTile) { + neighboringTaskViewSpringAnimation.addUpdateListener { _, _, _ -> + recentsView.runActionOnRemoteHandles { remoteTargetHandle -> + val taskTranslation = + if (springingDirectionVertical) { + remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation + } else { + remoteTargetHandle.taskViewSimulator.taskPrimaryTranslation + } + taskTranslation.value = springProperty.get(taskView) + } + recentsView.redrawLiveTile() + } + } + neighborSettlingSpringSet.trackSpring(neighboringTaskViewSpringAnimation) + // Drive current neighbor's spring with the previous neighbor's. + previousNeighborSpringAnimation.addUpdateListener { _, value, _ -> + neighboringTaskViewSpringAnimation.animateToFinalPosition(value) + } + return neighboringTaskViewSpringAnimation + } + + /** Animates with springs the TaskViews beyond the dismissed task to fill the gap it left. */ + private fun createTaskGridReflowSpringSet( + dismissedTaskView: TaskView?, + dismissedTaskGap: Float, + gridEndData: GridEndData, + isSplitSelection: Boolean, + reflowSplitFromDesktopTile: Boolean, + ): Pair> { + val towardsStart = if (recentsView.isRtl) dismissedTaskGap < 0 else dismissedTaskGap > 0 + // Grid end translation to run after all reflow animations have completed. + val gridEndSpringSet = + if (reflowSplitFromDesktopTile) null else createGridEndTranslationSpringSet(gridEndData) + val tasksWithOffsetsToReflow = getTasksToReflow(dismissedTaskView, towardsStart) + if (tasksWithOffsetsToReflow.isEmpty()) { + return Pair(gridEndSpringSet, emptyList()) + } else { + // Empty spring exists for conditional start, and to drive neighboring springs. + val reflowSpringAnimationDriver = + SpringAnimation(FloatValueHolder()) + .setSpring( + createExpressiveGridReflowSpringForce(finalPosition = dismissedTaskGap) + ) + recentsView.mTaskViewsDismissPrimaryTranslations.clear() + // Separate spring end manager for reflow to coordinate start of grid end springs. + val reflowSpringSet = SpringSet(reflowSpringAnimationDriver, dismissedTaskGap) + buildDismissReflowSpringAnimationChain( + tasksWithOffsetsToReflow, + dismissedTaskGap, + previousSpring = reflowSpringAnimationDriver, + reflowSpringSet, + isSplitSelection, + ) + val tasksToExclude = tasksWithOffsetsToReflow.map { (taskView, _) -> taskView } + if (gridEndSpringSet != null) { + reflowSpringSet.playAfterThreshold( + driverThreshold = dismissedTaskGap, + triggeredSpringSet = gridEndSpringSet, + ) + } else if (!reflowSplitFromDesktopTile && dismissedTaskView != null) { + // When reflowing tasks when splitting from a large tile, do not settle neighbors. + val neighborSettlingSpringSet = + createNeighborSettlingSpringSet( + dismissedTaskView, + tasksToExclude, + isSpringDirectionVertical = false, + ) + reflowSpringSet.playAfterThreshold( + driverThreshold = dismissedTaskGap, + triggeredSpringSet = neighborSettlingSpringSet, + ) + } + return Pair(reflowSpringSet, tasksToExclude) + } + } + + private fun getDismissedTaskGapForReflow( + dismissedTaskView: TaskView?, + isSplitSelection: Boolean, + ): Float { + with(recentsView) { + val dismissedTaskGap = + if (dismissedTaskView == null) { + 0f + } else { + // If current page beyond last TaskView's index, use last TaskView to calculate + // offset. + val lastTaskViewIndex = indexOfChild(mUtils.getLastTaskView()) + val currentPage = currentPage.coerceAtMost(lastTaskViewIndex) + val dismissHorizontalFactor = + when { + dismissedTaskView.isGridTask -> 1f + currentPage == lastTaskViewIndex -> -1f + indexOfChild(dismissedTaskView) < currentPage -> -1f + else -> 1f + } * (if (isRtl) 1f else -1f) + (pagedOrientationHandler.getPrimarySize(dismissedTaskView) + pageSpacing) * + dismissHorizontalFactor + } + // Add sliding translation for splitting tasks with large tiles present. + val slidingTranslation = getSlidingTranslation(isSplitSelection) + return dismissedTaskGap + slidingTranslation + } + } + + private fun getTasksToReflow( + dismissedTaskView: TaskView?, + towardsStart: Boolean, + ): List> { + // Null if splitting tasks while Desktop tasks are visible. Reflow all remaining grid tasks. + if (dismissedTaskView == null) { + return getGridTasksWithOffsets() + } + val isDismissedTaskViewOnTopRow = recentsView.isOnGridTopRow(dismissedTaskView) + val isDismissedTaskViewOnBottomRow = recentsView.isOnGridBottomRow(dismissedTaskView) + return getTasksOffsetPairAdjacentToDismissedTask(dismissedTaskView, towardsStart) + .filter { (taskView, _) -> + when { + isDismissedTaskViewOnBottomRow -> recentsView.isOnGridBottomRow(taskView) + isDismissedTaskViewOnTopRow -> recentsView.isOnGridTopRow(taskView) + else -> true + } + } + .toList() + } + + private fun getSlidingTranslation(isSplitSelection: Boolean) = + with(recentsView) { + if (isSplitSelection && currentPageTaskView is DesktopTaskView) { + val nextSnappedPage = indexOfChild(mUtils.getFirstNonDesktopTaskView()) + val newClearAllShortTotalWidthTranslation = + getGridEndData(dismissedTaskView = null).newClearAllShortTotalWidthTranslation + pagedOrientationHandler.getPrimaryScroll(this@with) - + getScrollForPage(nextSnappedPage) + + if (isRtl) newClearAllShortTotalWidthTranslation + else -newClearAllShortTotalWidthTranslation + } else { + 0f + } * (if (isRtl) 1f else -1f) + } + + /** + * Returns all grid tasks with their column offset. + * + *

Providing the dismissedTaskView will exclude it from the output. + */ + private fun getGridTasksWithOffsets( + dismissedTaskView: TaskView? = null + ): List> = + (recentsView.mUtils + .getTopRowTaskViews() + .filterNot { it == dismissedTaskView } + .mapIndexed { index, taskView -> taskView to index } + + recentsView.mUtils + .getBottomRowTaskViews() + .filterNot { it == dismissedTaskView } + .mapIndexed { index, taskView -> taskView to index }) + .sortedBy { it.second } + + private fun willTaskBeVisibleAfterDismiss(taskView: TaskView, taskTranslation: Int): Boolean { + val screenStart = recentsView.pagedOrientationHandler.getPrimaryScroll(recentsView) + val screenEnd = + screenStart + recentsView.pagedOrientationHandler.getMeasuredSize(recentsView) + return recentsView.isTaskViewWithinBounds( + taskView, + screenStart, + screenEnd, + /* taskViewTranslation = */ taskTranslation, + ) + } + + /** Builds a chain of spring animations for task reflow after dismissal */ + private fun buildDismissReflowSpringAnimationChain( + taskViewOffsetPairs: List>, + dismissedTaskGap: Float, + previousSpring: SpringAnimation, + reflowSpringSet: SpringSet, + isSplitSelection: Boolean, + ): SpringAnimation { + if (taskViewOffsetPairs.isEmpty()) return previousSpring + var lastTaskViewSpring = previousSpring + var previousColumnDriverSpring = previousSpring + var lastColumnOffset = taskViewOffsetPairs.first().second + taskViewOffsetPairs + .filter { (taskView, _) -> + willTaskBeVisibleAfterDismiss(taskView, dismissedTaskGap.roundToInt()) + } + .forEach { (taskView, column) -> + val startValue = + if ( + isSplitSelection && + taskView !is DesktopTaskView && + recentsView.currentPageTaskView is DesktopTaskView && + !recentsView.isTaskViewVisible(taskView) + ) { + dismissedTaskGap + + (if (recentsView.isRtl) -recentsView.mLastComputedTaskSize.right + else recentsView.mLastComputedTaskSize.right) + } else 0f + val taskViewSpringAnimation = + SpringAnimation( + taskView, + FloatPropertyCompat.createFloatPropertyCompat( + taskView.primaryDismissTranslationProperty + ), + ) + .setSpring(createExpressiveGridReflowSpringForce(dismissedTaskGap)) + .setStartValue(startValue) + // Update live tile on spring animation. + if (taskView.isRunningTask && recentsView.enableDrawingLiveTile) { + taskViewSpringAnimation.addUpdateListener { _, _, _ -> + recentsView.runActionOnRemoteHandles { remoteTargetHandle -> + remoteTargetHandle.taskViewSimulator.taskPrimaryTranslation.value = + taskView.primaryDismissTranslationProperty.get(taskView) + } + recentsView.redrawLiveTile() + } + } + // For grid overview, if we are animating tasks in the same column offset, they + // should both be pulled by the previous spring at the same time. + if (column != lastColumnOffset) { + previousColumnDriverSpring = lastTaskViewSpring + lastColumnOffset = column + } + previousColumnDriverSpring.addUpdateListener { _, value, _ -> + taskViewSpringAnimation.animateToFinalPosition(value) + } + lastTaskViewSpring = taskViewSpringAnimation + reflowSpringSet.trackSpring(taskViewSpringAnimation, dismissedTaskGap) + recentsView.mTaskViewsDismissPrimaryTranslations[taskView] = + dismissedTaskGap.toInt() + } + return lastTaskViewSpring + } + + /** Animates non-reflowing tasks when splitting while current page is a desktop tile. */ + private fun createSplitWithCurrentPageFadeOutReflowSpringSet( + dismissedTaskView: TaskView, + tasksToReflow: List, + ): SpringSet { + val slidingTranslation = getSlidingTranslation(isSplitSelection = true) + val otherGridRowToReflow = + SpringAnimation(FloatValueHolder()) + .setSpring(createExpressiveGridReflowSpringForce(slidingTranslation)) + val otherGridRowReflowSpringSet = SpringSet(otherGridRowToReflow, slidingTranslation) + // All grid tasks which are not reflowing to be animated. + val taskViewOffsetPairs = + getGridTasksWithOffsets(dismissedTaskView).filterNot { (taskView, _) -> + taskView in tasksToReflow + } + buildDismissReflowSpringAnimationChain( + taskViewOffsetPairs, + slidingTranslation, + otherGridRowToReflow, + otherGridRowReflowSpringSet, + isSplitSelection = true, + ) + return otherGridRowReflowSpringSet + } + + /** Animates the grid to compensate the clear all gap after dismissal. */ + private fun createGridEndTranslationSpringSet(gridEndData: GridEndData): SpringSet? { + val gridEndOffset = gridEndData.gridEndOffset + if (gridEndOffset == 0f) { + return null + } + + // Create spring animation to drive all task view grid translations simultaneously. + val gridEndSpring = + SpringAnimation(FloatValueHolder()) + .setSpring(createExpressiveGridReflowSpringForce(finalPosition = gridEndOffset)) + val gridEndSpringSet = SpringSet(gridEndSpring, gridEndOffset) + recentsView.mUtils.taskViews.forEach { taskView -> + val taskViewGridEndSpringAnimation = + SpringAnimation( + taskView, + FloatPropertyCompat.createFloatPropertyCompat(GRID_END_TRANSLATION_X), + ) + .setSpring(createExpressiveGridReflowSpringForce(gridEndOffset)) + // Update live tile on spring animation. + if (taskView.isRunningTask && recentsView.enableDrawingLiveTile) { + taskViewGridEndSpringAnimation.addUpdateListener { _, _, _ -> + recentsView.runActionOnRemoteHandles { remoteTargetHandle -> + remoteTargetHandle.taskViewSimulator.taskPrimaryTranslation.value = + GRID_END_TRANSLATION_X.get(taskView) + } + recentsView.redrawLiveTile() + } + } + gridEndSpringSet.trackSpring(taskViewGridEndSpringAnimation, gridEndOffset) + gridEndSpring.addUpdateListener { _, value, _ -> + taskViewGridEndSpringAnimation.animateToFinalPosition(value) + } + } + // Animate alpha of clear all if translating grid to hide it. + if (recentsView.isClearAllHidden) { + SpringAnimation( + recentsView.clearAllButton, + FloatPropertyCompat.createFloatPropertyCompat(ClearAllButton.DISMISS_ALPHA), + ) + .setSpring(createExpressiveDismissAlphaSpringForce()) + .addEndListener { _, _, _, _ -> recentsView.clearAllButton.dismissAlpha = 1f } + .animateToFinalPosition(0f) + } + return gridEndSpringSet + } + + /** Returns the distance between the end of the grid and clear all button after dismissal. */ + fun getGridEndData( + dismissedTaskView: TaskView?, + isExpressiveDismiss: Boolean = true, + isFocusedTaskDismissed: Boolean = false, + nextFocusedTaskView: TaskView? = null, + isStagingFocusedTask: Boolean = false, + nextFocusedTaskFromTop: Boolean = false, + nextFocusedTaskWidth: Float = 0f, + ): GridEndData { + var gridEndOffset = 0f + var snapToLastTask = false + var newClearAllShortTotalWidthTranslation: Float + var currentPageSnapsToEndOfGrid: Boolean + with(recentsView) { + val lastGridTaskView = if (showAsGrid()) lastGridTaskView else null + val currentPageScroll = getScrollForPage(currentPage) + val lastGridTaskScroll = getScrollForPage(indexOfChild(lastGridTaskView)) + currentPageSnapsToEndOfGrid = currentPageScroll == lastGridTaskScroll + var topGridRowCount = mTopRowIdSet.size() + var bottomGridRowCount = + taskViewCount - mTopRowIdSet.size() - mUtils.getLargeTileCount() + val topRowLonger = topGridRowCount > bottomGridRowCount + val bottomRowLonger = bottomGridRowCount > topGridRowCount + val dismissedFromTop = + dismissedTaskView != null && mTopRowIdSet.contains(dismissedTaskView.taskViewId) + val dismissedFromBottom = + dismissedTaskView != null && !dismissedFromTop && !dismissedTaskView.isLargeTile + if (dismissedFromTop || (isFocusedTaskDismissed && nextFocusedTaskFromTop)) { + topGridRowCount-- + } + if (dismissedFromBottom || (isFocusedTaskDismissed && !nextFocusedTaskFromTop)) { + bottomGridRowCount-- + } + newClearAllShortTotalWidthTranslation = + getNewClearAllShortTotalWidthTranslation( + topGridRowCount, + bottomGridRowCount, + isStagingFocusedTask, + ) + val isLastGridTaskViewVisibleForDismiss = + when { + lastGridTaskView == null -> false + isExpressiveDismiss -> + isTaskViewVisible(lastGridTaskView) || lastGridTaskView == dismissedTaskView + else -> lastGridTaskView.isVisibleToUser + } + if (!isLastGridTaskViewVisibleForDismiss) { + return GridEndData( + gridEndOffset, + snapToLastTask, + newClearAllShortTotalWidthTranslation, + currentPageSnapsToEndOfGrid, + ) + } + val dismissedTaskWidth = + if (dismissedTaskView == null) 0f + else (dismissedTaskView.layoutParams.width + pageSpacing).toFloat() + val gapWidth = + when { + (topRowLonger && dismissedFromTop) || + (bottomRowLonger && dismissedFromBottom) -> dismissedTaskWidth + nextFocusedTaskView != null && + ((topRowLonger && nextFocusedTaskFromTop) || + (bottomRowLonger && !nextFocusedTaskFromTop)) -> nextFocusedTaskWidth + else -> 0f + } + if (gapWidth > 0) { + if (clearAllShortTotalWidthTranslation == 0) { + val gapCompensation = gapWidth - newClearAllShortTotalWidthTranslation + gridEndOffset += if (isRtl) -gapCompensation else gapCompensation + } + if (isClearAllHidden) { + // If ClearAllButton isn't fully shown, snap to the last task. + snapToLastTask = true + } + } + val isLeftRightSplit = + (mContainer as ActivityContext).getDeviceProfile().isLeftRightSplit && + isSplitSelectionActive + if (isLeftRightSplit && !isStagingFocusedTask) { + // LastTask's scroll is the minimum scroll in split select, if current scroll is + // beyond that, we'll need to snap to last task instead. + getLastGridTaskView()?.let { lastTask -> + val primaryScroll = pagedOrientationHandler.getPrimaryScroll(this) + val lastTaskScroll = getScrollForPage(indexOfChild(lastTask)) + if ( + (isRtl && primaryScroll < lastTaskScroll) || + (!isRtl && primaryScroll > lastTaskScroll) + ) { + snapToLastTask = true + } + } + } + if (snapToLastTask) { + gridEndOffset += snapToLastTaskScrollDiff.toFloat() + } else if (isLeftRightSplit && currentPageSnapsToEndOfGrid) { + // Use last task as reference point for scroll diff and snapping calculation as it's + // the only invariant point in landscape split screen. + snapToLastTask = true + } + + // Handle large tile scroll when dismissing the last small task. + if (mUtils.getGridTaskCount() == 1 && dismissedTaskView?.isGridTask == true) { + mUtils.getLastLargeTaskView()?.let { lastLargeTile -> + val primaryScroll = pagedOrientationHandler.getPrimaryScroll(this) + val lastLargeTileScroll = getScrollForPage(indexOfChild(lastLargeTile)) + gridEndOffset = (primaryScroll - lastLargeTileScroll).toFloat() + + if (!isClearAllHidden) { + // If ClearAllButton is visible, reduce the distance by scroll difference + // between ClearAllButton and the last task. + gridEndOffset += + getLastTaskScroll( + /*clearAllScroll=*/ 0, + pagedOrientationHandler.getPrimarySize(clearAllButton), + ) + .toFloat() + } + } + } + } + return GridEndData( + gridEndOffset, + snapToLastTask, + newClearAllShortTotalWidthTranslation, + currentPageSnapsToEndOfGrid, + ) + } + + private fun getNewClearAllShortTotalWidthTranslation( + topGridRowCount: Int, + bottomGridRowCount: Int, + isStagingFocusedTask: Boolean, + ): Float { + with(recentsView) { + if (clearAllShortTotalWidthTranslation != 0) { + return 0f + } + // If first task is not in the expected position (mLastComputedTaskSize) and too + // close to ClearAllButton, then apply extra translation to ClearAllButton. + var longRowWidth = + max(topGridRowCount, bottomGridRowCount) * + (mLastComputedGridTaskSize.width() + pageSpacing) + if (!enableGridOnlyOverview() && !isStagingFocusedTask) { + longRowWidth += mLastComputedTaskSize.width() + pageSpacing + } + val firstTaskStart = mLastComputedGridSize.left + longRowWidth + val expectedFirstTaskStart = mLastComputedTaskSize.right + // Compensate the removed gap if we don't already have shortTotalCompensation, + // and adjust accordingly to the new shortTotalCompensation after dismiss. + return if (firstTaskStart < expectedFirstTaskStart) { + (expectedFirstTaskStart - firstTaskStart).toFloat() + } else { + 0f + } + } + } + + private fun onEndSnappingAndRelayout( + dismissedTaskView: TaskView?, + shouldRemoveTask: Boolean, + dismissingForSplitSelection: Boolean, + gridEndData: GridEndData, + ) { + with(recentsView) { + if (pageCount == 0) { + return@with + } + updateCurveProperties() + loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL) + + // Page snapping and relayout to run after all animations have completed. + val onFinishComplete = { + // Reset task translations as they may have updated via the dismiss animations. + resetTaskVisuals() + + // Denote if any task has been dismissed for grid rebalancing. + mAnyTaskHasBeenDismissed = true + if (shouldRemoveTask && dismissedTaskView != null) { + // Cache group task before removing. + handleGroupTaskRemoval(dismissedTaskView) + } + + // Get page to snap to before removing dismissed task. + val dismissedTaskViewId = dismissedTaskView?.taskViewId ?: INVALID_TASK_ID + val pageToSnapTo = + when { + (dismissedTaskView != null && + (!showAsGrid() || dismissedTaskView.isLargeTile)) -> { + getPageToSnapTo(dismissedTaskView) + } + showAsGrid() -> { + getPageToSnapToForGrid(gridEndData, dismissedTaskViewId) + } + else -> { + currentPage + } + } + + // Remove dismissed task. + removeViewInLayout(dismissedTaskView) + mTopRowIdSet.remove(dismissedTaskViewId) + + // Update the UI after removal and snap to page. + updateUiAfterTaskRemoval(dismissedTaskView, pageToSnapTo) + + if (!dismissingForSplitSelection) { + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_OVERVIEW_TASK_DISMISS) + } + } + + // Run the final page snapping and relayout + if (enableDrawingLiveTile && dismissedTaskView?.isRunningTask == true) { + finishRecentsAnimation(/* toHome */ true, /* shouldPip */ false, onFinishComplete) + } else { + onFinishComplete() + } + } + } + + /** + * Caches the groupTask before removing it. As the deskId might become invalid by + * removeViewInLayout called on the dismissed task. It might happen before + * removeGroupTaskInternal which runs on a helper thread. + */ + private fun handleGroupTaskRemoval(dismissedTaskView: TaskView) { + with(recentsView) { + val groupTask = dismissedTaskView.groupTask ?: return + if (dismissedTaskView.isRunningTask) { + finishRecentsAnimation(/* toHome */ true, /* shouldPip */ false) { + removeGroupTaskInternal(groupTask) + } + } else { + removeGroupTaskInternal(groupTask) + } + (mContainer as ActivityContext) + .statsLogManager + .logger() + .withItemInfo(dismissedTaskView.itemInfo) + .log(LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP) + } + } + + private fun getPageToSnapTo(dismissedTaskView: TaskView?): Int { + with(recentsView) { + var pageToSnapTo = currentPage + if ( + indexOfChild(dismissedTaskView) < pageToSnapTo || + pageToSnapTo == indexOfChild(mUtils.getLastTaskView()) + ) { + pageToSnapTo-- + } + return pageToSnapTo + } + } + + private fun getPageToSnapToForGrid(gridEndData: GridEndData, dismissedTaskViewId: Int): Int { + with(recentsView) { + var pageToSnapTo = currentPage + var taskViewIdToSnapTo = -1 + currentPageScrollDiff = 0 + + if (gridEndData.gridEndOffset != 0f) { + if (gridEndData.snapToLastTask) { + // Last task will be determined after removing dismissed task. + pageToSnapTo = -1 + } else if (taskViewCount > 2) { + pageToSnapTo = indexOfChild(clearAllButton) + } else if (isClearAllHidden) { + // Snap to focused task if clear all is hidden. + pageToSnapTo = firstTaskViewIndex + } + } else { + val snappedTaskView = currentPageTaskView + if (snappedTaskView != null && !gridEndData.snapToLastTask) { + val snappedTaskViewId = snappedTaskView.taskViewId + val isSnappedTaskInTopRow = mTopRowIdSet.contains(snappedTaskViewId) + val taskViewIdArray = + if (isSnappedTaskInTopRow) { + mUtils.getTopRowIdArray() + } else { + mUtils.getBottomRowIdArray() + } + val snappedIndex = taskViewIdArray.indexOf(snappedTaskViewId) + taskViewIdArray.removeValue(dismissedTaskViewId) + if (snappedIndex >= 0 && snappedIndex < taskViewIdArray.size()) { + taskViewIdToSnapTo = taskViewIdArray[snappedIndex] + } else if (snappedIndex == taskViewIdArray.size()) { + val inverseRowTaskViewIdArray = + if (isSnappedTaskInTopRow) { + mUtils.getBottomRowIdArray() + } else { + mUtils.getTopRowIdArray() + } + if (snappedIndex < inverseRowTaskViewIdArray.size()) { + taskViewIdToSnapTo = inverseRowTaskViewIdArray[snappedIndex] + } + } + } + val primaryScroll = pagedOrientationHandler.getPrimaryScroll(this) + val currentPageScroll = getScrollForPage(currentPage) + currentPageScrollDiff = primaryScroll - currentPageScroll + } + + // Calculate page to snap to as if the dismissed task view is removed from the grid. + val topRowIdArray = mUtils.getTopRowIdArray() + val bottomRowIdArray = mUtils.getBottomRowIdArray() + topRowIdArray.removeValue(dismissedTaskViewId) + bottomRowIdArray.removeValue(dismissedTaskViewId) + val children = + children.filter { child -> child != getTaskViewFromTaskViewId(dismissedTaskViewId) } + if (gridEndData.snapToLastTask) { + val lastGridTaskView = getLastGridTaskView(topRowIdArray, bottomRowIdArray) + pageToSnapTo = + if (lastGridTaskView == null) PagedView.INVALID_PAGE + else children.indexOf(lastGridTaskView as View) + if (pageToSnapTo == PagedView.INVALID_PAGE) { + val lastLargeTaskView = mUtils.getLastLargeTaskView() + pageToSnapTo = + if (lastLargeTaskView == null) PagedView.INVALID_PAGE + else children.indexOf(lastLargeTaskView as View) + } + } else if (taskViewIdToSnapTo != -1) { + // If snapping to another page due to indices rearranging, find + // the new index after dismissal & rearrange using the TaskView ID. + pageToSnapTo = + children.indexOf(getTaskViewFromTaskViewId(taskViewIdToSnapTo) as View) + if (!gridEndData.currentPageSnapsToEndOfGrid) { + val dismissedTaskViewIndex = + indexOfChild(getTaskViewFromTaskViewId(dismissedTaskViewId)) + currentPageScrollDiff += + getOffsetFromScrollPosition( + pageToSnapTo, + topRowIdArray, + bottomRowIdArray, + dismissedTaskViewIndex, + ) + } + } + return pageToSnapTo + } + } + + private fun updateUiAfterTaskRemoval(dismissedTaskView: TaskView?, pageToSnapTo: Int) { + with(recentsView) { + if (taskViewCount == 0) { + if (!isSplitSelectionActive) { + removeViewInLayout(clearAllButton) + removeViewInLayout(addDeskButton) + if (dismissedTaskView === homeTaskView) { + updateEmptyMessage() + } else { + if (!mUtils.isInDesktopFirstMode()) { + startHome() + } + } + } + } else { + updateTaskSize() + mUtils.updateChildTaskOrientations() + updateScrollSynchronously() + + val highestVisibleTaskView = getHighestVisibleTaskView() + if (showAsGrid() && highestVisibleTaskView != null) { + rebalanceTasksInGrid(highestVisibleTaskView) + } + pageBeginTransition() + currentPage = pageToSnapTo + dispatchScrollChanged() + updateActionsViewFocusedScroll() + if ( + isClearAllHidden && + !(mContainer as ActivityContext) + .getDeviceProfile() + .deviceProperties + .isTablet + ) { + actionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, false) + } + } + updateCurrentTaskActionsVisibility() + onDismissAnimationEnds() + mTaskViewsDismissPrimaryTranslations.clear() + dismissedTaskView?.isBeingDismissed = false + } + } + + private fun rebalanceTasksInGrid(highestVisibleTaskView: TaskView) { + with(recentsView) { + val screenStart = pagedOrientationHandler.getPrimaryScroll(this) + val taskStart = + (pagedOrientationHandler.getChildStart(highestVisibleTaskView) + + highestVisibleTaskView.getOffsetAdjustment(true).toInt()) + + val shouldRebalance = + if (isRtl) { + taskStart <= screenStart + pageSpacing + } else { + val screenEnd = (screenStart + pagedOrientationHandler.getMeasuredSize(this)) + val taskSize = + (pagedOrientationHandler.getMeasuredSize(highestVisibleTaskView) * + highestVisibleTaskView.getSizeAdjustment(false)) + .toInt() + val taskEnd = taskStart + taskSize + taskEnd >= screenEnd - pageSpacing + } + + if (shouldRebalance) { + updateGridProperties(highestVisibleTaskView) + updateScrollSynchronously() + } + } + } + + /** Animates RecentsView's scale to the provided value, using spring animations. */ + fun animateRecentsScale(scale: Float): SpringAnimation { + val resourceProvider = DynamicResource.provider(recentsView.mContainer) + val dampingRatio = resourceProvider.getFloat(R.dimen.swipe_up_rect_scale_damping_ratio) + val stiffness = resourceProvider.getFloat(R.dimen.swipe_up_rect_scale_stiffness) + + // Spring which sets the Recents scale on update. This is needed, as the SpringAnimation + // struggles to animate small values like changing recents scale from 0.9 to 1. So + // we animate over a larger range (e.g. 900 to 1000) and convert back to the required value. + // (This is instead of converting RECENTS_SCALE_PROPERTY to a FloatPropertyCompat and + // animating it directly via springs.) + val initialRecentsScaleSpringValue = + RECENTS_SCALE_SPRING_MULTIPLIER * RECENTS_SCALE_PROPERTY.get(recentsView) + return SpringAnimation(FloatValueHolder(initialRecentsScaleSpringValue)) + .setSpring( + SpringForce(initialRecentsScaleSpringValue) + .setDampingRatio(dampingRatio) + .setStiffness(stiffness) + ) + .addUpdateListener { _, value, _ -> + RECENTS_SCALE_PROPERTY.setValue( + recentsView, + value / RECENTS_SCALE_SPRING_MULTIPLIER, + ) + } + .apply { animateToFinalPosition(RECENTS_SCALE_SPRING_MULTIPLIER * scale) } + } + + private fun createExpressiveDismissSpringForce(dampingRatioOffset: Float = 0f): SpringForce { + val resourceProvider = DynamicResource.provider(recentsView.mContainer) + return SpringForce() + .setDampingRatio( + resourceProvider.getFloat(R.dimen.expressive_dismiss_task_trans_y_damping_ratio) + + dampingRatioOffset + ) + .setStiffness( + resourceProvider.getFloat(R.dimen.expressive_dismiss_task_trans_y_stiffness) + ) + } + + private fun createExpressiveGridReflowSpringForce( + finalPosition: Float = Float.MAX_VALUE + ): SpringForce { + val resourceProvider = DynamicResource.provider(recentsView.mContainer) + return SpringForce(finalPosition) + .setDampingRatio( + resourceProvider.getFloat(R.dimen.expressive_dismiss_task_trans_x_damping_ratio) + ) + .setStiffness( + resourceProvider.getFloat(R.dimen.expressive_dismiss_task_trans_x_stiffness) + ) + } + + private fun createExpressiveDismissAlphaSpringForce(): SpringForce { + val resourceProvider = DynamicResource.provider(recentsView.mContainer) + return SpringForce() + .setDampingRatio( + resourceProvider.getFloat(R.dimen.expressive_dismiss_effects_damping_ratio) + ) + .setStiffness(resourceProvider.getFloat(R.dimen.expressive_dismiss_effects_stiffness)) + } + + /** + * Plays a set of {@link SpringAnimation} objects in the specified order. + * + *

Animations can play together, in sequence, or after a specified threshold is passed. + */ + class SpringSet(private val driverSpring: SpringAnimation, driverSpringThreshold: Float = 0f) { + private val trackedSprings = mutableSetOf() + private val trackedSpringSets = mutableSetOf() + private var runningSpringCount = 0 + private val startListenerSet = mutableSetOf<() -> Unit>() + private val endListenerSet = mutableSetOf<() -> Unit>() + private var hasStarted = false + private var hasEnded = false + + init { + trackSpring(driverSpring, driverSpringThreshold) + } + + fun start(): SpringSet { + if (hasStarted) { + return this + } + hasStarted = true + if (trackedSprings.isEmpty()) { + onEnd() + return this + } + driverSpring.start() + startListenerSet.forEach { it() } + return this + } + + private fun onEnd() { + if (hasEnded) { + return + } + hasEnded = true + endListenerSet.forEach { it() } + } + + fun cancel(): SpringSet { + driverSpring.cancel() + trackedSprings.forEach { it.cancel() } + trackedSpringSets.forEach { it.cancel() } + onEnd() + return this + } + + /** + * Increase spring constants to force animations to end quickly. + * + *

A high stiffness applies more force to the object to bring it to its end value. A + * damping ratio of 1f is critically damped, and the object will return to equilibrium + * within the shortest amount of time. + */ + fun speedUpSpringsToEnd(): SpringSet { + trackedSprings.forEach { + it.spring.setStiffness(SPEED_UP_STIFFNESS).setDampingRatio(1f) + } + trackedSpringSets.forEach { it.speedUpSpringsToEnd() } + return this + } + + fun addStartListener(startListener: () -> Unit): SpringSet { + startListenerSet.add(startListener) + return this + } + + fun addEndListener(endRunnable: () -> Unit): SpringSet { + endListenerSet.add(endRunnable) + return this + } + + fun trackSpring(spring: SpringAnimation, minimumDistance: Float = 0f): SpringSet { + if (trackedSprings.contains(spring)) { + throw IllegalArgumentException("SpringSet already contains this spring.") + } + trackedSprings.add(spring) + runningSpringCount++ + var canSpringEnd = false + spring.addUpdateListener { _, value, _ -> + // Do not allow end listener to fire until we have passed the minimum distance. + if (!canSpringEnd && abs(value - minimumDistance) < spring.minimumVisibleChange) { + canSpringEnd = true + } + } + spring.addEndListener { _, _, _, _ -> + if (!canSpringEnd || runningSpringCount == 0) { + return@addEndListener + } + if (--runningSpringCount == 0) { + onEnd() + } + } + return this + } + + private fun trackSpringSet(springSet: SpringSet): SpringSet { + runningSpringCount++ + trackedSpringSets.add(springSet) + springSet.addEndListener { + if (--runningSpringCount == 0) { + onEnd() + } + } + return this + } + + fun playAfterThreshold( + driverThreshold: Float, + triggeredSpringSet: SpringSet, + minVelocity: Float = 0f, + ): SpringSet { + trackSpringSet(triggeredSpringSet) + var lastPosition = 0f + var isTriggered = false + driverSpring.addUpdateListener { _, value, velocity -> + // We do not compare to the threshold directly, as the update listener + // does not necessarily hit every value. Do not check again once it has started + // settling, as a spring can bounce past the end value multiple times. + if (isTriggered) return@addUpdateListener + if ( + lastPosition < driverThreshold && value >= driverThreshold || + lastPosition > driverThreshold && value <= driverThreshold + ) { + isTriggered = true + } + lastPosition = value + if (isTriggered) { + val startVelocity = + abs(velocity).coerceAtLeast(abs(minVelocity)) * velocity.sign + triggeredSpringSet.driverSpring.setStartVelocity(startVelocity) + triggeredSpringSet.start() + } + } + return this + } + + fun playTogether(springSet: SpringSet): SpringSet { + trackSpringSet(springSet) + addStartListener { springSet.start() } + return this + } + + fun playTogether(springs: List): SpringSet { + springs.forEach { + trackSpring(it) + addStartListener { it.start() } + } + return this + } + } + + data class GridEndData( + val gridEndOffset: Float, + val snapToLastTask: Boolean, + val newClearAllShortTotalWidthTranslation: Float, + val currentPageSnapsToEndOfGrid: Boolean, + ) + + data class DismissedTaskData( + val startVelocity: Float, + val dismissLength: Int, + val finalPosition: Float, + val dismissThreshold: Int, + ) + + private companion object { + // The additional damping to apply to tasks further from the dismissed task. + private const val ADDITIONAL_DISMISS_DAMPING_RATIO = 0.15f + private const val RECENTS_SCALE_SPRING_MULTIPLIER = 1000f + private const val DEFAULT_DISMISS_THRESHOLD_FRACTION = 0.5f + private const val SPEED_UP_STIFFNESS = 100_000f + } +} diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 163732ff07c..8f151e23093 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -17,7 +17,9 @@ package com.android.quickstep.views; import static android.app.ActivityTaskManager.INVALID_TASK_ID; -import static android.view.Surface.ROTATION_0; +import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.os.Trace.traceBegin; +import static android.os.Trace.traceEnd; import static android.view.View.MeasureSpec.EXACTLY; import static android.view.View.MeasureSpec.makeMeasureSpec; @@ -25,24 +27,28 @@ import static com.android.app.animation.Interpolators.ACCELERATE_0_75; import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE; import static com.android.app.animation.Interpolators.DECELERATE_2; +import static com.android.app.animation.Interpolators.EMPHASIZED; import static com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE; import static com.android.app.animation.Interpolators.FAST_OUT_SLOW_IN; import static com.android.app.animation.Interpolators.FINAL_FRAME; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.app.animation.Interpolators.OVERSHOOT_0_75; import static com.android.app.animation.Interpolators.clampToProgress; import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE; -import static com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU; -import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType; import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS; -import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; -import static com.android.launcher3.Flags.enableGridOnlyOverview; +import static com.android.launcher3.Flags.enableDesktopExplodedView; +import static com.android.launcher3.Flags.enableExpressiveDismissTaskMotion; +import static com.android.launcher3.Flags.enableOverviewBackgroundWallpaperBlur; +import static com.android.launcher3.Flags.enableOverviewDesktopTileWallpaperBackground; +import static com.android.launcher3.Flags.enablePreventOverviewMouseDrag; import static com.android.launcher3.Flags.enableRefactorTaskThumbnail; import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS; import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; +import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR; import static com.android.launcher3.LauncherState.BACKGROUND_APP; import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION; import static com.android.launcher3.Utilities.EDGE_NAV_BAR; +import static com.android.launcher3.Utilities.debugLog; +import static com.android.launcher3.Utilities.getTrimmedStackTrace; import static com.android.launcher3.Utilities.mapToRange; import static com.android.launcher3.Utilities.squaredHypot; import static com.android.launcher3.Utilities.squaredTouchSlop; @@ -51,73 +57,79 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN; +import static com.android.launcher3.statehandlers.DesktopVisibilityController.INACTIVE_DESK_ID; import static com.android.launcher3.testing.shared.TestProtocol.DISMISS_ANIMATION_ENDS_MESSAGE; import static com.android.launcher3.touch.PagedOrientationHandler.CANVAS_TRANSLATE; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK; +import static com.android.quickstep.BaseContainerInterface.getTaskDimension; import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId; +import static com.android.quickstep.util.DesksUtils.areMultiDesksFlagsEnabled; +import static com.android.quickstep.util.ExternalDisplaysKt.isExternalDisplay; import static com.android.quickstep.util.LogUtils.splitFailureMessage; -import static com.android.quickstep.util.TaskGridNavHelper.DIRECTION_DOWN; -import static com.android.quickstep.util.TaskGridNavHelper.DIRECTION_LEFT; -import static com.android.quickstep.util.TaskGridNavHelper.DIRECTION_RIGHT; -import static com.android.quickstep.util.TaskGridNavHelper.DIRECTION_TAB; -import static com.android.quickstep.util.TaskGridNavHelper.DIRECTION_UP; import static com.android.quickstep.views.ClearAllButton.DISMISS_ALPHA; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_ACTIONS_IN_MENU; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_DESKTOP; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS; -import static com.android.quickstep.views.OverviewActionsView.HIDDEN_SPLIT_SCREEN; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_SPLIT_SELECT_ACTIVE; +import static com.android.quickstep.views.RecentsViewUtils.DESK_EXPLODE_PROGRESS; +import static com.android.quickstep.views.TaskView.SPLIT_ALPHA; +import static com.android.quickstep.window.RecentsWindowFlags.enableOverviewOnConnectedDisplays; +import static com.android.wm.shell.Flags.enableCreateAnyBubble; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; -import android.animation.LayoutTransition; -import android.animation.LayoutTransition.TransitionListener; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; import android.animation.ValueAnimator; import android.annotation.SuppressLint; +import android.app.ActivityManager; import android.app.WindowConfiguration; import android.content.Context; import android.content.Intent; import android.content.LocusId; +import android.content.pm.LauncherApps; import android.content.res.Configuration; import android.graphics.Bitmap; import android.graphics.BlendMode; import android.graphics.Canvas; +import android.graphics.Color; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.PointF; import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.RectF; -import android.graphics.Typeface; import android.graphics.drawable.Drawable; +import android.hardware.input.InputManager; import android.os.Bundle; import android.os.SystemClock; +import android.os.Trace; import android.os.UserHandle; import android.os.VibrationEffect; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint; +import android.util.ArraySet; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.Log; import android.util.Pair; import android.util.SparseBooleanArray; import android.view.HapticFeedbackConstants; +import android.view.InputDevice; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.RemoteAnimationTarget; import android.view.View; import android.view.ViewDebug; -import android.view.ViewGroup; import android.view.ViewTreeObserver.OnScrollChangedListener; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; @@ -125,20 +137,24 @@ import android.widget.ListView; import android.widget.OverScroller; import android.widget.Toast; +import android.window.DesktopExperienceFlags; +import android.window.DesktopModeFlags; import android.window.PictureInPictureSurfaceTransaction; +import android.window.TransitionInfo; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.core.graphics.ColorUtils; +import androidx.dynamicanimation.animation.SpringAnimation; import com.android.internal.jank.Cuj; import com.android.launcher3.AbstractFloatingView; -import com.android.launcher3.BaseActivity.MultiWindowModeChangedListener; +import com.android.launcher3.BuildConfig; +import com.android.launcher3.BuildConfigs; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Flags; import com.android.launcher3.Insettable; -import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.MotionEventsUtils; import com.android.launcher3.PagedView; import com.android.launcher3.R; import com.android.launcher3.Utilities; @@ -149,11 +165,14 @@ import com.android.launcher3.anim.SpringProperty; import com.android.launcher3.compat.AccessibilityManagerCompat; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.dagger.LauncherComponentProvider; import com.android.launcher3.desktop.DesktopRecentsTransitionController; +import com.android.launcher3.deviceprofile.OverviewProfile; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.statehandlers.DepthController; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StateManager; import com.android.launcher3.statemanager.StatefulContainer; @@ -164,19 +183,20 @@ import com.android.launcher3.util.DynamicResource; import com.android.launcher3.util.IntArray; import com.android.launcher3.util.IntSet; -import com.android.launcher3.util.ResourceBasedOverride.Overrides; import com.android.launcher3.util.RunnableList; -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import com.android.launcher3.util.Themes; import com.android.launcher3.util.TraceHelper; import com.android.launcher3.util.TranslateEdgeEffect; import com.android.launcher3.util.VibratorWrapper; import com.android.launcher3.util.ViewPool; +import com.android.launcher3.util.coroutines.DispatcherProvider; +import com.android.launcher3.util.coroutines.ProductionDispatchers; import com.android.quickstep.BaseContainerInterface; import com.android.quickstep.GestureState; +import com.android.quickstep.HighResLoadingState; import com.android.quickstep.OverviewCommandHelper; +import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RecentsAnimationController; import com.android.quickstep.RecentsAnimationTargets; import com.android.quickstep.RecentsFilterState; @@ -188,24 +208,37 @@ import com.android.quickstep.SplitSelectionListener; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TaskOverlayFactory; -import com.android.quickstep.TaskThumbnailCache; import com.android.quickstep.TaskViewUtils; import com.android.quickstep.TopTaskTracker; import com.android.quickstep.ViewUtils; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.recents.data.TasksRepository; +import com.android.quickstep.recents.data.AppTimersRepository; +import com.android.quickstep.recents.data.AppTimersRepositoryImpl; +import com.android.quickstep.recents.data.InputManagerWrapper; +import com.android.quickstep.recents.data.PointerRepository; +import com.android.quickstep.recents.data.PointerRepositoryImpl; +import com.android.quickstep.recents.data.RecentTasksRepository; +import com.android.quickstep.recents.data.RecentsDeviceProfileRepository; +import com.android.quickstep.recents.data.RecentsDeviceProfileRepositoryImpl; +import com.android.quickstep.recents.data.RecentsRotationStateRepository; +import com.android.quickstep.recents.data.RecentsRotationStateRepositoryImpl; +import com.android.quickstep.recents.di.RecentsDependencies; import com.android.quickstep.recents.viewmodel.RecentsViewData; -import com.android.quickstep.util.ActiveGestureErrorDetector; +import com.android.quickstep.recents.viewmodel.RecentsViewModel; import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ActiveGestureProtoLogProxy; import com.android.quickstep.util.AnimUtils; import com.android.quickstep.util.DesktopTask; +import com.android.quickstep.util.FontUtils; import com.android.quickstep.util.GroupTask; import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.util.RecentsAtomicAnimationFactory; import com.android.quickstep.util.RecentsOrientedState; +import com.android.quickstep.util.SingleTask; import com.android.quickstep.util.SplitAnimationController.Companion.SplitAnimInitProps; import com.android.quickstep.util.SplitAnimationTimings; import com.android.quickstep.util.SplitSelectStateController; +import com.android.quickstep.util.SplitTask; import com.android.quickstep.util.SurfaceTransaction; import com.android.quickstep.util.SurfaceTransactionApplier; import com.android.quickstep.util.TaskGridNavHelper; @@ -213,47 +246,58 @@ import com.android.quickstep.util.TaskVisualsChangeListener; import com.android.quickstep.util.TransformParams; import com.android.quickstep.util.VibrationConstants; -import com.android.quickstep.views.TaskView.TaskContainer; +import com.android.quickstep.window.RecentsWindowManager; import com.android.systemui.plugins.ResourceProvider; import com.android.systemui.shared.recents.model.Task; +import com.android.systemui.shared.recents.model.Task.TaskKey; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import com.android.systemui.shared.system.PackageManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.common.pip.IPipAnimationListener; -import com.android.wm.shell.shared.DesktopModeStatus; +import com.android.wm.shell.common.pip.IPipAnimationListener.PipResources; +import com.android.wm.shell.shared.GroupedTaskInfo; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; +import com.android.wm.shell.shared.pip.PipFlags; +import com.android.wm.shell.shared.split.SplitBounds; import kotlin.Unit; +import kotlin.collections.CollectionsKt; + +import kotlinx.coroutines.CoroutineScope; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.stream.Collectors; /** * A list of recent tasks. + * * @param : the container that should host recents view - * @param : the type of base state that will be used + * @param : the type of base state that will be used */ - -public abstract class RecentsView, STATE_TYPE extends BaseState> extends PagedView implements Insettable, - TaskThumbnailCache.HighResLoadingState.HighResLoadingStateChangedCallback, + HighResLoadingState.HighResLoadingStateChangedCallback, TaskVisualsChangeListener { - private static final String TAG = "RecentsView"; - private static final boolean DEBUG = false; + protected static final String TAG = "RecentsView"; - public static final FloatProperty CONTENT_ALPHA = - new FloatProperty("contentAlpha") { + public static final FloatProperty> CONTENT_ALPHA = + new FloatProperty<>("contentAlpha") { @Override public void setValue(RecentsView view, float v) { view.setContentAlpha(v); @@ -265,8 +309,8 @@ public Float get(RecentsView view) { } }; - public static final FloatProperty FULLSCREEN_PROGRESS = - new FloatProperty("fullscreenProgress") { + public static final FloatProperty> FULLSCREEN_PROGRESS = + new FloatProperty<>("fullscreenProgress") { @Override public void setValue(RecentsView recentsView, float v) { recentsView.setFullscreenProgress(v); @@ -278,8 +322,8 @@ public Float get(RecentsView recentsView) { } }; - public static final FloatProperty TASK_MODALNESS = - new FloatProperty("taskModalness") { + public static final FloatProperty> TASK_MODALNESS = + new FloatProperty<>("taskModalness") { @Override public void setValue(RecentsView recentsView, float v) { recentsView.setTaskModalness(v); @@ -291,8 +335,8 @@ public Float get(RecentsView recentsView) { } }; - public static final FloatProperty ADJACENT_PAGE_HORIZONTAL_OFFSET = - new FloatProperty("adjacentPageHorizontalOffset") { + public static final FloatProperty> ADJACENT_PAGE_HORIZONTAL_OFFSET = + new FloatProperty<>("adjacentPageHorizontalOffset") { @Override public void setValue(RecentsView recentsView, float v) { if (recentsView.mAdjacentPageHorizontalOffset != v) { @@ -307,6 +351,20 @@ public Float get(RecentsView recentsView) { } }; + public static final FloatProperty> RUNNING_TASK_ATTACH_ALPHA = + new FloatProperty<>("runningTaskAttachAlpha") { + @Override + public void setValue(RecentsView recentsView, float v) { + recentsView.mRunningTaskAttachAlpha = v; + recentsView.applyAttachAlpha(); + } + + @Override + public Float get(RecentsView recentsView) { + return recentsView.mRunningTaskAttachAlpha; + } + }; + public static final int SCROLL_VIBRATION_PRIMITIVE = Utilities.ATLEAST_S ? VibrationEffect.Composition.PRIMITIVE_LOW_TICK : -1; public static final float SCROLL_VIBRATION_PRIMITIVE_SCALE = 0.6f; @@ -317,10 +375,9 @@ public Float get(RecentsView recentsView) { /** * Can be used to tint the color of the RecentsView to simulate a scrim that can views * excluded from. Really should be a proper scrim. - * TODO(b/187528071): Remove this and replace with a real scrim. */ - private static final FloatProperty COLOR_TINT = - new FloatProperty("colorTint") { + private static final FloatProperty> COLOR_TINT = + new FloatProperty<>("colorTint") { @Override public void setValue(RecentsView recentsView, float v) { recentsView.setColorTint(v); @@ -338,8 +395,8 @@ public Float get(RecentsView recentsView) { * more specific, we'd want to create a similar FloatProperty just for a TaskView's * offsetX/Y property */ - public static final FloatProperty TASK_SECONDARY_TRANSLATION = - new FloatProperty("taskSecondaryTranslation") { + public static final FloatProperty> TASK_SECONDARY_TRANSLATION = + new FloatProperty<>("taskSecondaryTranslation") { @Override public void setValue(RecentsView recentsView, float v) { recentsView.setTaskViewsResistanceTranslation(v); @@ -357,8 +414,8 @@ public Float get(RecentsView recentsView) { * more specific, we'd want to create a similar FloatProperty just for a TaskView's * offsetX/Y property */ - public static final FloatProperty TASK_PRIMARY_SPLIT_TRANSLATION = - new FloatProperty("taskPrimarySplitTranslation") { + public static final FloatProperty> TASK_PRIMARY_SPLIT_TRANSLATION = + new FloatProperty<>("taskPrimarySplitTranslation") { @Override public void setValue(RecentsView recentsView, float v) { recentsView.setTaskViewsPrimarySplitTranslation(v); @@ -370,8 +427,8 @@ public Float get(RecentsView recentsView) { } }; - public static final FloatProperty TASK_SECONDARY_SPLIT_TRANSLATION = - new FloatProperty("taskSecondarySplitTranslation") { + public static final FloatProperty> TASK_SECONDARY_SPLIT_TRANSLATION = + new FloatProperty<>("taskSecondarySplitTranslation") { @Override public void setValue(RecentsView recentsView, float v) { recentsView.setTaskViewsSecondarySplitTranslation(v); @@ -384,15 +441,12 @@ public Float get(RecentsView recentsView) { }; /** Same as normal SCALE_PROPERTY, but also updates page offsets that depend on this scale. */ - public static final FloatProperty RECENTS_SCALE_PROPERTY = - new FloatProperty("recentsScale") { + public static final FloatProperty> RECENTS_SCALE_PROPERTY = + new FloatProperty<>("recentsScale") { @Override public void setValue(RecentsView view, float scale) { view.setScaleX(scale); view.setScaleY(scale); - if (enableRefactorTaskThumbnail()) { - view.mRecentsViewData.getScale().setValue(scale); - } view.mLastComputedTaskStartPushOutDistance = null; view.mLastComputedTaskEndPushOutDistance = null; view.runActionOnRemoteHandles(new Consumer() { @@ -417,8 +471,8 @@ public Float get(RecentsView view) { * Progress of Recents view from carousel layout to grid layout. If Recents is not shown as a * grid, then the value remains 0. */ - public static final FloatProperty RECENTS_GRID_PROGRESS = - new FloatProperty("recentsGrid") { + public static final FloatProperty> RECENTS_GRID_PROGRESS = + new FloatProperty<>("recentsGrid") { @Override public void setValue(RecentsView view, float gridProgress) { view.setGridProgress(gridProgress); @@ -430,12 +484,27 @@ public Float get(RecentsView view) { } }; + public static final FloatProperty> DESKTOP_CAROUSEL_DETACH_PROGRESS = + new FloatProperty<>("desktopCarouselDetachProgress") { + @Override + public void setValue(RecentsView view, float offset) { + view.mDesktopCarouselDetachProgress = offset; + view.applyAttachAlpha(); + view.updatePageOffsets(); + } + + @Override + public Float get(RecentsView view) { + return view.mDesktopCarouselDetachProgress; + } + }; + /** * Alpha of the task thumbnail splash, where being in BackgroundAppState has a value of 1, and * being in any other state has a value of 0. */ - public static final FloatProperty TASK_THUMBNAIL_SPLASH_ALPHA = - new FloatProperty("taskThumbnailSplashAlpha") { + public static final FloatProperty> TASK_THUMBNAIL_SPLASH_ALPHA = + new FloatProperty<>("taskThumbnailSplashAlpha") { @Override public void setValue(RecentsView view, float taskThumbnailSplashAlpha) { view.setTaskThumbnailSplashAlpha(taskThumbnailSplashAlpha); @@ -463,11 +532,8 @@ public Float get(RecentsView view) { private static final float FOREGROUND_SCRIM_TINT = 0.32f; - public final RecentsViewData mRecentsViewData = new RecentsViewData(); - public final TasksRepository mTasksRepository; - protected final RecentsOrientedState mOrientationState; - protected final BaseContainerInterface mSizeStrategy; + protected final BaseContainerInterface mContainerInterface; @Nullable protected RecentsAnimationController mRecentsAnimationController; @Nullable @@ -483,11 +549,9 @@ public Float get(RecentsView view) { @Nullable protected RemoteTargetHandle[] mRemoteTargetHandles; - protected final Rect mLastComputedCarouselTaskSize = new Rect(); protected final Rect mLastComputedTaskSize = new Rect(); protected final Rect mLastComputedGridSize = new Rect(); protected final Rect mLastComputedGridTaskSize = new Rect(); - private TaskView mSelectedTask = null; // How much a task that is directly offscreen will be pushed out due to RecentsView scale/pivot. @Nullable protected Float mLastComputedTaskStartPushOutDistance = null; @@ -499,7 +563,7 @@ public Float get(RecentsView view) { private final PointF mTempPointF = new PointF(); private final Matrix mTempMatrix = new Matrix(); private final float[] mTempFloat = new float[1]; - private final List mScrollListeners = new ArrayList<>(); + private final ArraySet mScrollListeners = new ArraySet<>(); // The threshold at which we update the SystemUI flags when animating from the task into the app public static final float UPDATE_SYSUI_FLAGS_THRESHOLD = 0.85f; @@ -511,19 +575,25 @@ public Float get(RecentsView view) { private final int mSplitPlaceholderSize; private final int mSplitPlaceholderInset; private final ClearAllButton mClearAllButton; + @Nullable + private AddDesktopButton mAddDesktopButton = null; private final Rect mClearAllButtonDeadZoneRect = new Rect(); private final Rect mTaskViewDeadZoneRect = new Rect(); + private final Rect mTopRowDeadZoneRect = new Rect(); + private final Rect mBottomRowDeadZoneRect = new Rect(); + + @Nullable + private DesktopVisibilityController mDesktopVisibilityController = null; + /** - * Reflects if Recents is currently in the middle of a gesture, and if so, which tasks are - * running. If a gesture is not in progress, this will be null. + * Reflects if Recents is currently in the middle of a gesture, and if so, which related + * [GroupedTaskInfo] is running. If a gesture is not in progress, this will be null. */ - private @Nullable Task[] mActiveGestureRunningTasks; + private @Nullable GroupedTaskInfo mActiveGestureGroupedTaskInfo; // Keeps track of the previously known visible tasks for purposes of loading/unloading task data private final SparseBooleanArray mHasVisibleTaskData = new SparseBooleanArray(); - private final InvariantDeviceProfile mIdp; - /** * Getting views should be done via {@link #getTaskViewFromPool(int)} */ @@ -531,7 +601,7 @@ public Float get(RecentsView view) { private final ViewPool mGroupedTaskViewPool; private final ViewPool mDesktopTaskViewPool; - private final TaskOverlayFactory mTaskOverlayFactory; + protected final TaskOverlayFactory mTaskOverlayFactory; protected boolean mDisallowScrollToClearAll; private boolean mOverlayEnabled; @@ -544,21 +614,22 @@ public Float get(RecentsView view) { private int mClampedScrollOffsetBound; private float mAdjacentPageHorizontalOffset = 0; + private float mDesktopCarouselDetachProgress = 0; protected float mTaskViewsSecondaryTranslation = 0; protected float mTaskViewsPrimarySplitTranslation = 0; protected float mTaskViewsSecondarySplitTranslation = 0; // Progress from 0 to 1 where 0 is a carousel and 1 is a 2 row grid. private float mGridProgress = 0; private float mTaskThumbnailSplashAlpha = 0; + private boolean mBorderEnabled = false; private boolean mShowAsGridLastOnLayout = false; - private final IntSet mTopRowIdSet = new IntSet(); + protected final IntSet mTopRowIdSet = new IntSet(); private int mClearAllShortTotalWidthTranslation = 0; // The GestureEndTarget that is still in progress. @Nullable protected GestureState.GestureEndTarget mCurrentGestureEndTarget; - // TODO(b/187528071): Remove these and replace with a real scrim. private float mColorTint; private final int mTintingColor; @Nullable @@ -568,7 +639,8 @@ public Float get(RecentsView view) { private long mScrollLastHapticTimestamp; private int mKeyboardTaskFocusSnapAnimationDuration; - private int mKeyboardTaskFocusIndex = INVALID_PAGE; + + protected Map mTaskViewsDismissPrimaryTranslations = new HashMap<>(); /** * TODO: Call reloadIdNeeded in onTaskStackChanged. @@ -597,47 +669,72 @@ public void onActivityUnpinned() { return; } - reloadIfNeeded(); - enableLayoutTransitions(); + // Only invalidate task list but don't trigger the reload, so that the list is only + // updated the next time user enters Overview + invalidateTaskList(); } @Override public void onTaskRemoved(int taskId) { if (!mHandleTaskStackChanges) { + Log.d(TAG, "onTaskRemoved: " + taskId + ", not handling task stack changes"); return; } - TaskView taskView = getTaskViewByTaskId(taskId); - if (taskView == null) { + TaskContainer taskContainer = mUtils.getTaskContainerById(taskId); + if (taskContainer == null) { + Log.d(TAG, "onTaskRemoved: " + taskId + ", no associated Task"); return; } - Task.TaskKey taskKey = taskView.getFirstTask().key; + Log.d(TAG, "onTaskRemoved: " + taskId); + TaskKey taskKey = taskContainer.getTask().key; UI_HELPER_EXECUTOR.execute(new CancellableTask<>( () -> PackageManagerWrapper.getInstance() .getActivityInfo(taskKey.getComponent(), taskKey.userId) == null, MAIN_EXECUTOR, apkRemoved -> { if (apkRemoved) { - dismissTask(taskId); + dismissTask(taskId, /*animate=*/true, /*removeTask=*/false); } else { mModel.isTaskRemoved(taskKey.id, taskRemoved -> { if (taskRemoved) { - dismissTask(taskId); + dismissTask(taskId, /*animate=*/true, /*removeTask=*/false); } - }, RecentsFilterState.getFilter(mFilterState.getPackageNameToFilter())); + }, RecentsFilterState.getFilter(mFilterState.getPackageNameToFilter(), + mContainer.getDisplayId())); } })); } + + @Override + public void onTaskDisplayChanged(int taskId, int newDisplayId) { + Log.d(TAG, "onTaskDisplayChanged: " + taskId + ", new displayId = " + newDisplayId); + if (!mHandleTaskStackChanges) { + return; + } + if (newDisplayId != mContainer.getDisplayId()) { + dismissTask(taskId, /*animate=*/ true, /*removeTask=*/ false); + } + } + + @Override + public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task, + boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) { + if (enableCreateAnyBubble() && task.isAppBubble && mHandleTaskStackChanges) { + // Remove task from recents if it moved to a bubble, but keep it running + dismissTask(task.taskId, /* animate= */ true, /* removeTask= */ false); + } + } + }; private final PinnedStackAnimationListener mIPipAnimationListener = new PinnedStackAnimationListener(); - private int mPipCornerRadius; - private int mPipShadowRadius; + private PipResources mPipResources = new PipResources(); // Used to keep track of the last requested task list id, so that we do not request to load the // tasks again if we have already requested it and the task list has not changed - private int mTaskListChangeId = -1; + private int mAppliedTaskListChangeId = -1; // Only valid until the launcher state changes to NORMAL /** @@ -647,12 +744,11 @@ public void onTaskRemoved(int taskId) { protected int mRunningTaskViewId = -1; private int mTaskViewIdCount; protected boolean mRunningTaskTileHidden; - @Nullable - private Task[] mTmpRunningTasks; - protected int mFocusedTaskViewId = -1; + protected int mFocusedTaskViewId = INVALID_TASK_ID; - private boolean mTaskIconScaledDown = false; + private boolean mTaskIconVisible = true; private boolean mRunningTaskShowScreenshot = false; + private float mRunningTaskAttachAlpha; private boolean mOverviewStateEnabled; private boolean mHandleTaskStackChanges; @@ -664,8 +760,6 @@ public void onTaskRemoved(int taskId) { @Nullable private PendingAnimation mPendingAnimation; - @Nullable - private LayoutTransition mLayoutTransition; @ViewDebug.ExportedProperty(category = "launcher") protected float mContentAlpha = 1; @@ -697,6 +791,7 @@ public void onTaskRemoved(int taskId) { /** * Placeholder view indicating where the first split screen selected app will be placed */ + @Nullable protected SplitSelectStateController mSplitSelectStateController; /** @@ -721,10 +816,12 @@ public void onTaskRemoved(int taskId) { private final SplitSelectionListener mSplitSelectionListener = new SplitSelectionListener() { @Override - public void onSplitSelectionConfirmed() { } + public void onSplitSelectionConfirmed() { + } @Override - public void onSplitSelectionActive() { } + public void onSplitSelectionActive() { + } @Override public void onSplitSelectionExit(boolean launchedSplit) { @@ -762,26 +859,7 @@ public void onSplitSelectionExit(boolean launchedSplit) { @Nullable private DesktopRecentsTransitionController mDesktopRecentsTransitionController; - /** - * Keeps track of the desktop task. Optional and only present when the feature flag is enabled. - */ - @Nullable - private DesktopTaskView mDesktopTaskView; - - private MultiWindowModeChangedListener mMultiWindowModeChangedListener = - new MultiWindowModeChangedListener() { - @Override - public void onMultiWindowModeChanged(boolean inMultiWindowMode) { - mOrientationState.setMultiWindowMode(inMultiWindowMode); - setLayoutRotation(mOrientationState.getTouchRotation(), - mOrientationState.getDisplayRotation()); - updateChildTaskOrientations(); - if (!inMultiWindowMode && mOverviewStateEnabled) { - // TODO: Re-enable layout transitions for addition of the unpinned task - reloadIfNeeded(); - } - } - }; + private boolean mIs3PLauncher = false; @Nullable private RunnableList mSideTaskLaunchCallback; @@ -796,40 +874,116 @@ public void onMultiWindowModeChanged(boolean inMultiWindowMode) { private int mOffsetMidpointIndexOverride = INVALID_PAGE; - public RecentsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, - BaseContainerInterface sizeStrategy) { + /** + * Whether or not any task has been dismissed i.e. swiped away by the user, in the lifetime of + * RecentsView being open and displayed to the user. It is reset in the {@link #reset()} method + * i.e. when RecentsView closes. + */ + protected boolean mAnyTaskHasBeenDismissed; + + protected final RecentsViewModel mRecentsViewModel; + private final RecentsViewModelHelper mHelper; + protected final RecentsViewUtils mUtils = new RecentsViewUtils(this); + protected final RecentsDismissUtils mDismissUtils = LauncherComponentProvider.get( + getContext()).getRecentsDismissUtilsFactory().create(this); + + private final Matrix mTmpMatrix = new Matrix(); + + private int mTaskViewCount = 0; + + protected final BlurUtils mBlurUtils = new BlurUtils(this); + + public RecentsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); setEnableFreeScroll(true); - mSizeStrategy = sizeStrategy; + mContainer = RecentsViewContainer.containerFromContext(context); + mContainerInterface = mContainer.getContainerInterface(); mOrientationState = new RecentsOrientedState( - context, mSizeStrategy, this::animateRecentsRotationInPlace); + context, mContainerInterface, this::animateRecentsRotationInPlace); final int rotation; rotation = Utilities.ATLEAST_R ? mContainer.getDisplay().getRotation() : WindowConfiguration.ROTATION_UNDEFINED; mOrientationState.setRecentsRotation(rotation); + // Start Recents Dependency graph + if (enableRefactorTaskThumbnail()) { + RecentsDependencies recentsDependencies = + RecentsDependencies.maybeInitialize(context, ProductionDispatchers.INSTANCE); + String scopeId = recentsDependencies.createRecentsViewScope(context); + mRecentsViewModel = new RecentsViewModel( + recentsDependencies.inject(RecentTasksRepository.class, scopeId), + recentsDependencies.inject(RecentsViewData.class, scopeId), + mContainer.getDisplayId() + ); + mHelper = new RecentsViewModelHelper( + mRecentsViewModel, + recentsDependencies.inject(CoroutineScope.class, scopeId), + recentsDependencies.inject(DispatcherProvider.class, scopeId) + ); + + recentsDependencies.provide(RecentsRotationStateRepository.class, scopeId, + () -> new RecentsRotationStateRepositoryImpl(mOrientationState)); + + recentsDependencies.provide(RecentsDeviceProfileRepository.class, scopeId, + () -> new RecentsDeviceProfileRepositoryImpl(mContainer)); + + recentsDependencies.provide(AppTimersRepository.class, scopeId, + () -> new AppTimersRepositoryImpl( + context.getApplicationContext().getSystemService(LauncherApps.class), + recentsDependencies.inject(DispatcherProvider.class, scopeId) + )); + + recentsDependencies.provide(PointerRepository.class, scopeId, + () -> new PointerRepositoryImpl(new InputManagerWrapper( + context.getApplicationContext().getSystemService(InputManager.class)))); + } else { + mRecentsViewModel = null; + mHelper = null; + } + mScrollHapticMinGapMillis = getResources() .getInteger(R.integer.recentsScrollHapticMinGapMillis); mFastFlingVelocity = getResources() .getDimensionPixelSize(R.dimen.recents_fast_fling_velocity); mModel = RecentsModel.INSTANCE.get(context); - mIdp = InvariantDeviceProfile.INSTANCE.get(context); - if (enableRefactorTaskThumbnail()) { - mTasksRepository = new TasksRepository( - mModel, mModel.getThumbnailCache(), mModel.getIconCache()); - } else { - mTasksRepository = null; - } mClearAllButton = (ClearAllButton) LayoutInflater.from(context) .inflate(R.layout.overview_clear_all_button, this, false); mClearAllButton.setOnClickListener(this::dismissAllTasks); + + boolean isMultipleDesktopFrontendEnabledOnDisplay; + if (false) { + isMultipleDesktopFrontendEnabledOnDisplay = DesktopModeStatus.isMultipleDesktopFrontendEnabledOnDisplay(mContext, + mContainer.getDisplay()); + } else { + isMultipleDesktopFrontendEnabledOnDisplay = false; + } + + if (isMultipleDesktopFrontendEnabledOnDisplay) { + mAddDesktopButton = (AddDesktopButton) LayoutInflater.from(context).inflate( + R.layout.overview_add_desktop_button, this, false); + mAddDesktopButton.setOnClickListener(view -> { + AddDesktopButton button = (AddDesktopButton) view; + button.setContentVisibility(/* toVisible= */ false, /* animate= */ true, () -> { + createDesk(view); + button.setContentVisibility(/* toVisible= */ true, /* animate= */ true); + }); + }); + + mDesktopVisibilityController = DesktopVisibilityController.INSTANCE.get(mContext); + // Update its visibility based on whether we can create a desk or not. + mUtils.onCanCreateDesksChanged( + mDesktopVisibilityController.getCanCreateDesks()); + } + mTaskViewPool = new ViewPool<>(context, this, R.layout.task, 20 /* max size */, 10 /* initial size */); + int groupedViewPoolInitialSize = enableRefactorTaskThumbnail() ? 2 : 10; mGroupedTaskViewPool = new ViewPool<>(context, this, - R.layout.task_grouped, 20 /* max size */, 10 /* initial size */); + R.layout.task_grouped, 20 /* max size */, groupedViewPoolInitialSize); + int desktopViewPoolInitialSize = DesktopModeStatus.canEnterDesktopMode(mContext) ? 1 : 0; mDesktopTaskViewPool = new ViewPool<>(context, this, R.layout.task_desktop, - 5 /* max size */, 1 /* initial size */); + 5 /* max size */, desktopViewPoolInitialSize); setOrientationHandler(mOrientationState.getOrientationHandler()); mIsRtl = getPagedOrientationHandler().getRecentsRtlSetting(getResources()); @@ -842,25 +996,23 @@ public RecentsView(Context context, @Nullable AttributeSet attrs, int defStyleAt mClampedScrollOffsetBound = getResources().getDimensionPixelSize( R.dimen.transient_taskbar_clamped_offset_bound); - mEmptyIcon = context.getDrawable(R.drawable.ic_empty_recents); + mEmptyIcon = context.getDrawable(R.drawable.ic_view_carousel); mEmptyIcon.setCallback(this); mEmptyMessage = context.getText(R.string.recents_empty_message); mEmptyMessagePaint = new TextPaint(); - mEmptyMessagePaint.setColor(Themes.getAttrColor(context, android.R.attr.textColorPrimary)); + mEmptyMessagePaint.setColor( + getResources().getColor(R.color.materialColorOnSurface, context.getTheme())); + mEmptyMessagePaint.setTextSize(getResources() .getDimension(R.dimen.recents_empty_message_text_size)); - mEmptyMessagePaint.setTypeface(Typeface.create(Themes.getDefaultBodyFont(context), - Typeface.NORMAL)); + mEmptyMessagePaint.setTypeface(FontUtils.getTypeFace(getResources())); mEmptyMessagePaint.setAntiAlias(true); mEmptyMessagePadding = getResources() .getDimensionPixelSize(R.dimen.recents_empty_message_text_padding); setWillNotDraw(false); updateEmptyMessage(); - mTaskOverlayFactory = Overrides.getObject( - TaskOverlayFactory.class, - context.getApplicationContext(), - R.string.task_overlay_factory_class); + mTaskOverlayFactory = LauncherComponentProvider.get(context).getTaskOverlayFactory(); // Initialize quickstep specific cache params here, as this is constructed only once mContainer.getViewCache().setCacheSize(R.layout.digital_wellbeing_toast, 5); @@ -933,7 +1085,7 @@ public void updateClearAllFunction() { * Invalidates the list of tasks so that an update occurs to the list of tasks if requested. */ private void invalidateTaskList() { - mTaskListChangeId = -1; + mAppliedTaskListChangeId = -1; } public OverScroller getScroller() { @@ -1019,15 +1171,20 @@ public int getOverScrollShift() { @Override @Nullable public Task onTaskThumbnailChanged(int taskId, ThumbnailData thumbnailData) { + if (enableRefactorTaskThumbnail()) { + return null; + } if (mHandleTaskStackChanges) { - TaskView taskView = getTaskViewByTaskId(taskId); - if (taskView != null) { - for (TaskContainer container : taskView.getTaskContainers()) { - if (container == null || taskId != container.getTask().key.id) { - continue; + if (!enableRefactorTaskThumbnail()) { + TaskView taskView = getTaskViewByTaskId(taskId); + if (taskView != null) { + for (TaskContainer container : taskView.getTaskContainers()) { + if (taskId != container.getTask().key.id) { + continue; + } + container.getThumbnailViewDeprecated().setThumbnail(container.getTask(), + thumbnailData); } - container.getThumbnailViewDeprecated().setThumbnail(container.getTask(), - thumbnailData); } } } @@ -1035,15 +1192,15 @@ public Task onTaskThumbnailChanged(int taskId, ThumbnailData thumbnailData) { } @Override - public void onTaskIconChanged(String pkg, UserHandle user) { - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView tv = requireTaskViewAt(i); - Task task = tv.getFirstTask(); - if (pkg.equals(task.key.getPackageName()) && task.key.userId == user.getIdentifier()) { - task.icon = null; - if (tv.getTaskContainers().stream().anyMatch( + public void onTaskIconChanged(@NonNull String pkg, @NonNull UserHandle user) { + for (TaskView taskView : getTaskViews()) { + Task firstTask = taskView.getFirstTask(); + if (firstTask != null && pkg.equals(firstTask.key.getPackageName()) + && firstTask.key.userId == user.getIdentifier()) { + firstTask.icon = null; + if (taskView.getTaskContainers().stream().anyMatch( container -> container.getIconView().getDrawable() != null)) { - tv.onTaskListVisibilityChanged(true /* visible */); + taskView.onTaskListVisibilityChanged(true /* visible */); } } } @@ -1051,42 +1208,36 @@ public void onTaskIconChanged(String pkg, UserHandle user) { @Override public void onTaskIconChanged(int taskId) { + if (enableRefactorTaskThumbnail()) { + return; + } TaskView taskView = getTaskViewByTaskId(taskId); if (taskView != null) { taskView.refreshTaskThumbnailSplash(); } } - /** - * Update the thumbnail(s) of the relevant TaskView. - * @param refreshNow Refresh immediately if it's true. - */ - @Nullable - public TaskView updateThumbnail( - HashMap thumbnailData, boolean refreshNow) { - TaskView updatedTaskView = null; - for (Map.Entry entry : thumbnailData.entrySet()) { - Integer id = entry.getKey(); - ThumbnailData thumbnail = entry.getValue(); - TaskView taskView = getTaskViewByTaskId(id); - if (taskView == null) { - continue; - } - // taskView could be a GroupedTaskView, so select the relevant task by ID - TaskContainer taskAttributes = taskView.getTaskContainerById(id); - if (taskAttributes == null) { - continue; + /** Updates the thumbnail(s) of the relevant TaskView. */ + public void updateThumbnail(Map thumbnailData) { + if (!enableRefactorTaskThumbnail()) { + for (Map.Entry entry : thumbnailData.entrySet()) { + Integer id = entry.getKey(); + ThumbnailData thumbnail = entry.getValue(); + TaskView taskView = getTaskViewByTaskId(id); + if (taskView == null) { + continue; + } + // taskView could be a GroupedTaskView, so select the relevant task by ID + TaskContainer taskContainer = taskView.getTaskContainerById(id); + if (taskContainer == null) { + continue; + } + Task task = taskContainer.getTask(); + TaskThumbnailViewDeprecated taskThumbnailViewDeprecated = + taskContainer.getThumbnailViewDeprecated(); + taskThumbnailViewDeprecated.setThumbnail(task, thumbnail, /*refreshNow=*/false); } - Task task = taskAttributes.getTask(); - TaskThumbnailViewDeprecated taskThumbnailViewDeprecated = - taskAttributes.getThumbnailViewDeprecated(); - taskThumbnailViewDeprecated.setThumbnail(task, thumbnail, refreshNow); - // thumbnailData can contain 1-2 ids, but they should correspond to the same - // TaskView, so overwriting is ok - updatedTaskView = taskView; } - - return updatedTaskView; } @Override @@ -1097,10 +1248,11 @@ protected void onWindowVisibilityChanged(int visibility) { public void init(OverviewActionsView actionsView, SplitSelectStateController splitController, @Nullable DesktopRecentsTransitionController desktopRecentsTransitionController) { + mIs3PLauncher = !OverviewComponentObserver.INSTANCE.get(mContext).isHomeAndOverviewSame(); mActionsView = actionsView; - mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, getTaskViewCount() == 0); + mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, !hasTaskViews()); // Update flags for 1p/3p launchers - mActionsView.updateFor3pLauncher(!supportsAppPairs()); + mActionsView.updateFor3pLauncher(mIs3PLauncher); mSplitSelectStateController = splitController; mDesktopRecentsTransitionController = desktopRecentsTransitionController; mActionsView.setClearAllClickListener(this::dismissAllTasks); @@ -1111,14 +1263,16 @@ public SplitSelectStateController getSplitSelectController() { } public boolean isSplitSelectionActive() { - return mSplitSelectStateController.isSplitSelectActive(); + return mSplitSelectStateController != null + && mSplitSelectStateController.isSplitSelectActive(); } /** * See overridden implementations + * * @return {@code true} if child TaskViews can be launched when user taps on them */ - protected boolean canLaunchFullscreenTask() { + public boolean canLaunchFullscreenTask() { return true; } @@ -1127,78 +1281,115 @@ protected void onAttachedToWindow() { super.onAttachedToWindow(); updateTaskStackListenerState(); mModel.getThumbnailCache().getHighResLoadingState().addCallback(this); - mContainer.addMultiWindowModeChangedListener(mMultiWindowModeChangedListener); TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener); mSyncTransactionApplier = new SurfaceTransactionApplier(this); runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams() .setSyncTransactionApplier(mSyncTransactionApplier)); - RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this); + RecentsModel.INSTANCE.get(mContext).addThumbnailChangeListener(this); mIPipAnimationListener.setActivityAndRecentsView(mContainer, this); - SystemUiProxy.INSTANCE.get(getContext()).setPipAnimationListener( + SystemUiProxy.INSTANCE.get(mContext).setPipAnimationListener( mIPipAnimationListener); mOrientationState.initListeners(); mTaskOverlayFactory.initListeners(); - if (FeatureFlags.enableSplitContextually()) { - mSplitSelectStateController.registerSplitListener(mSplitSelectionListener); + mSplitSelectStateController.registerSplitListener(mSplitSelectionListener); + if (mDesktopVisibilityController != null) { + mDesktopVisibilityController.registerDesktopVisibilityListener(mUtils); } } @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); + updateTaskStackListenerState(); mModel.getThumbnailCache().getHighResLoadingState().removeCallback(this); - mContainer.removeMultiWindowModeChangedListener(mMultiWindowModeChangedListener); TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener); mSyncTransactionApplier = null; runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams() .setSyncTransactionApplier(null)); executeSideTaskLaunchCallback(); - RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this); - SystemUiProxy.INSTANCE.get(getContext()).setPipAnimationListener(null); + RecentsModel.INSTANCE.get(mContext).removeThumbnailChangeListener(this); + SystemUiProxy.INSTANCE.get(mContext).setPipAnimationListener(null); mIPipAnimationListener.setActivityAndRecentsView(null, null); mOrientationState.destroyListeners(); mTaskOverlayFactory.removeListeners(); - if (FeatureFlags.enableSplitContextually()) { - mSplitSelectStateController.unregisterSplitListener(mSplitSelectionListener); + mSplitSelectStateController.unregisterSplitListener(mSplitSelectionListener); + if (mDesktopVisibilityController != null) { + mDesktopVisibilityController.unregisterDesktopVisibilityListener(mUtils); } + mTaskLaunchListener = null; + mOnTaskLaunchCancelledRunnable = null; reset(); } + /** + * Execute clean-up logic needed when the view is destroyed. + */ + public void destroy() { + Log.d(TAG, "destroy"); + if (enableRefactorTaskThumbnail()) { + if (enableOverviewDesktopTileWallpaperBackground()) { + reset(); + } + mTaskViewPool.cancelOngoingInitializations(); + mGroupedTaskViewPool.cancelOngoingInitializations(); + mDesktopTaskViewPool.cancelOngoingInitializations(); + mHelper.onDestroy(); + RecentsDependencies.destroy(getContext()); + } + } + @Override public void onViewRemoved(View child) { + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.onViewRemoved"); super.onViewRemoved(child); - // Clear the task data for the removed child if it was visible unless: // - It's the initial taskview for entering split screen, we only pretend to dismiss the // task // - It's the focused task to be moved to the front, we immediately re-add the task - if (child instanceof TaskView && child != mSplitHiddenTaskView - && child != mMovingTaskView) { - TaskView taskView = (TaskView) child; - for (int i : taskView.getTaskIds()) { - mHasVisibleTaskData.delete(i); - } - if (child instanceof GroupedTaskView) { - mGroupedTaskViewPool.recycle((GroupedTaskView) taskView); - } else if (child instanceof DesktopTaskView) { - mDesktopTaskViewPool.recycle((DesktopTaskView) taskView); - } else { - mTaskViewPool.recycle(taskView); + if (child instanceof TaskView) { + mTaskViewCount = Math.max(0, --mTaskViewCount); + if (child != mSplitHiddenTaskView && child != mMovingTaskView) { + clearAndRecycleTaskView((TaskView) child); } - mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, getTaskViewCount() == 0); } + traceEnd(Trace.TRACE_TAG_APP); + } + + private void clearAndRecycleTaskView(TaskView taskView) { + for (int i : taskView.getTaskIds()) { + mHasVisibleTaskData.delete(i); + } + if (taskView instanceof GroupedTaskView) { + mGroupedTaskViewPool.recycle((GroupedTaskView) taskView); + } else if (taskView instanceof DesktopTaskView) { + mDesktopTaskViewPool.recycle((DesktopTaskView) taskView); + } else { + mTaskViewPool.recycle(taskView); + } + mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, !hasTaskViews()); } @Override public void onViewAdded(View child) { + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.onViewAdded"); super.onViewAdded(child); - child.setAlpha(mContentAlpha); + if (child instanceof TaskView) { + mTaskViewCount++; + } + if (mAddDesktopButton != null && child instanceof AddDesktopButton) { + mAddDesktopButton.setContentAlpha(mContentAlpha); + } else if (child instanceof ClearAllButton) { + mClearAllButton.setContentAlpha(mContentAlpha); + } else { + child.setAlpha(mContentAlpha); + } // RecentsView is set to RTL in the constructor when system is using LTR. Here we set the // child direction back to match system settings. child.setLayoutDirection(mIsRtl ? View.LAYOUT_DIRECTION_LTR : View.LAYOUT_DIRECTION_RTL); mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, false); updateEmptyMessage(); + traceEnd(Trace.TRACE_TAG_APP); } @Override @@ -1277,15 +1468,18 @@ public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) { RemoteAnimationTargets targets = params.getTargetSet(); if (targets != null && targets.findTask(taskId) != null) { launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers, - targets.nonApps); + targets.nonApps, /* transitionInfo= */ null); } } public void launchSideTaskInLiveTileMode(int taskId, RemoteAnimationTarget[] apps, - RemoteAnimationTarget[] wallpaper, RemoteAnimationTarget[] nonApps) { + RemoteAnimationTarget[] wallpaper, RemoteAnimationTarget[] nonApps, + @Nullable TransitionInfo transitionInfo) { AnimatorSet anim = new AnimatorSet(); TaskView taskView = getTaskViewByTaskId(taskId); - if (taskView == null || !isTaskViewVisible(taskView)) { + if (taskView == null + || !isTaskViewVisible(taskView) + || isTaskOnDesktopLaunchingFullscreen(taskId, taskView, apps)) { // TODO: Refine this animation. SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(mContainer.getDragLayer()); @@ -1299,9 +1493,9 @@ public void launchSideTaskInLiveTileMode(int taskId, RemoteAnimationTarget[] app for (int i = apps.length - 1; i >= 0; --i) { RemoteAnimationTarget app = apps[i]; - float dx = mContainer.getDeviceProfile().widthPx * (1 - percent) / 2 + float dx = mContainer.getDeviceProfile().getDeviceProperties().getWidthPx() * (1 - percent) / 2 + app.screenSpaceBounds.left * percent; - float dy = mContainer.getDeviceProfile().heightPx * (1 - percent) / 2 + float dy = mContainer.getDeviceProfile().getDeviceProperties().getHeightPx() * (1 - percent) / 2 + app.screenSpaceBounds.top * percent; matrix.setScale(percent, percent); matrix.postTranslate(dx, dy); @@ -1328,22 +1522,35 @@ public void onAnimationStart(Animator animation) { anim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - finishRecentsAnimation(false /* toRecents */, null); + finishRecentsAnimation(false /* toRecents */, true /*shouldPip*/, () -> { + if (mContainer instanceof RecentsWindowManager recentsWindowManager) { + recentsWindowManager.hideRecentsWindow(); + } + }); } }); } else { TaskViewUtils.composeRecentsLaunchAnimator(anim, taskView, apps, wallpaper, nonApps, true /* launcherClosing */, getStateManager(), this, - getDepthController()); + getDepthController(), transitionInfo, /* appearedTaskId= */ taskId); } anim.start(); } + private static boolean isTaskOnDesktopLaunchingFullscreen( + int taskId, TaskView taskView, RemoteAnimationTarget[] apps) { + if (!(taskView instanceof DesktopTaskView)) { + return false; + } + return Arrays.stream(apps).anyMatch(t -> t.taskId == taskId + && t.windowConfiguration.getWindowingMode() == WINDOWING_MODE_FULLSCREEN); + } + public boolean isTaskViewVisible(TaskView tv) { if (showAsGrid()) { int screenStart = getPagedOrientationHandler().getPrimaryScroll(this); int screenEnd = screenStart + getPagedOrientationHandler().getMeasuredSize(this); - return isTaskViewWithinBounds(tv, screenStart, screenEnd); + return isTaskViewWithinBounds(tv, screenStart, screenEnd, /*taskViewTranslation=*/ 0); } else { // For now, just check if it's the active task or an adjacent task return Math.abs(indexOfChild(tv) - getNextPage()) <= 1; @@ -1362,12 +1569,12 @@ public boolean isTaskViewFullyVisible(TaskView tv) { } @Nullable - private TaskView getLastGridTaskView() { - return getLastGridTaskView(getTopRowIdArray(), getBottomRowIdArray()); + protected TaskView getLastGridTaskView() { + return getLastGridTaskView(mUtils.getTopRowIdArray(), mUtils.getBottomRowIdArray()); } @Nullable - private TaskView getLastGridTaskView(IntArray topRowIdArray, IntArray bottomRowIdArray) { + protected TaskView getLastGridTaskView(IntArray topRowIdArray, IntArray bottomRowIdArray) { if (topRowIdArray.isEmpty() && bottomRowIdArray.isEmpty()) { return null; } @@ -1376,7 +1583,7 @@ private TaskView getLastGridTaskView(IntArray topRowIdArray, IntArray bottomRowI return getTaskViewFromTaskViewId(lastTaskViewId); } - private int getSnapToLastTaskScrollDiff() { + protected int getSnapToLastTaskScrollDiff() { // Snap to a position where ClearAll is just invisible. int screenStart = getPagedOrientationHandler().getPrimaryScroll(this); int clearAllScroll = getScrollForPage(indexOfChild(mClearAllButton)); @@ -1385,19 +1592,38 @@ private int getSnapToLastTaskScrollDiff() { return screenStart - lastTaskScroll; } - private int getLastTaskScroll(int clearAllScroll, int clearAllWidth) { + protected int getLastTaskScroll(int clearAllScroll, int clearAllWidth) { int distance = clearAllWidth + getClearAllExtraPageSpacing(); return clearAllScroll + (mIsRtl ? distance : -distance); } - private boolean isTaskViewWithinBounds(TaskView tv, int start, int end) { - int taskStart = getPagedOrientationHandler().getChildStart(tv) - + (int) tv.getOffsetAdjustment(showAsGrid()); - int taskSize = (int) (getPagedOrientationHandler().getMeasuredSize(tv) - * tv.getSizeAdjustment(showAsFullscreen())); + @Nullable + public RunnableList launchDesktopTaskView() { + return mUtils.launchDesktopTaskView(); + } + + /* + * Returns if TaskView is within screen bounds defined in [screenStart, screenEnd]. + * + * @param taskViewTranslation taskView is considered within bounds if either translated or + * original position of taskView is within screen bounds. + */ + protected boolean isTaskViewWithinBounds(TaskView taskView, int screenStart, int screenEnd, + int taskViewTranslation) { + int taskStart = getPagedOrientationHandler().getChildStart(taskView) + + (int) taskView.getOffsetAdjustment(showAsGrid()); + int taskSize = (int) (getPagedOrientationHandler().getMeasuredSize(taskView) + * taskView.getSizeAdjustment(showAsFullscreen())); int taskEnd = taskStart + taskSize; - return (taskStart >= start && taskStart <= end) || (taskEnd >= start - && taskEnd <= end); + + int translatedTaskStart = taskStart + taskViewTranslation; + int translatedTaskEnd = taskEnd + taskViewTranslation; + + taskStart = Math.min(taskStart, translatedTaskStart); + taskEnd = Math.max(taskEnd, translatedTaskEnd); + + return (taskStart >= screenStart && taskStart <= screenEnd) || (taskEnd >= screenStart + && taskEnd <= screenEnd); } private boolean isTaskViewFullyWithinBounds(TaskView tv, int start, int end) { @@ -1410,17 +1636,19 @@ private boolean isTaskViewFullyWithinBounds(TaskView tv, int start, int end) { } /** - * Returns true if the task is in expected scroll position. - * - * @param taskIndex the index of the task + * Returns true if the given TaskView is in expected scroll position. */ - public boolean isTaskInExpectedScrollPosition(int taskIndex) { - return getScrollForPage(taskIndex) == getPagedOrientationHandler().getPrimaryScroll(this); + public boolean isTaskInExpectedScrollPosition(@NonNull TaskView taskView) { + return getScrollForPage(indexOfChild(taskView)) + == getPagedOrientationHandler().getPrimaryScroll(this); } - private boolean isFocusedTaskInExpectedScrollPosition() { + /** + * Returns true if the focused TaskView is in expected scroll position. + */ + public boolean isFocusedTaskInExpectedScrollPosition() { TaskView focusedTask = getFocusedTaskView(); - return focusedTask != null && isTaskInExpectedScrollPosition(indexOfChild(focusedTask)); + return focusedTask != null && isTaskInExpectedScrollPosition(focusedTask); } /** @@ -1432,8 +1660,7 @@ public TaskView getTaskViewByTaskId(int taskId) { return null; } - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView taskView = requireTaskViewAt(i); + for (TaskView taskView : getTaskViews()) { if (taskView.containsTaskId(taskId)) { return taskView; } @@ -1454,8 +1681,7 @@ public TaskView getTaskViewByTaskIds(int[] taskIds) { int[] taskIdsCopy = Arrays.copyOf(taskIds, taskIds.length); Arrays.sort(taskIdsCopy); - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView taskView = requireTaskViewAt(i); + for (TaskView taskView : getTaskViews()) { int[] taskViewIdsCopy = taskView.getTaskIds(); Arrays.sort(taskViewIdsCopy); if (Arrays.equals(taskIdsCopy, taskViewIdsCopy)) { @@ -1477,9 +1703,6 @@ public void setOverviewStateEnabled(boolean enabled) { updateTaskStackListenerState(); mOrientationState.setRotationWatcherEnabled(enabled); if (!enabled) { - // Reset the running task when leaving overview since it can still have a reference to - // its thumbnail - mTmpRunningTasks = null; mSplitBoundsConfig = null; mTaskOverlayFactory.clearAllActiveState(); } @@ -1490,12 +1713,14 @@ public void setOverviewStateEnabled(boolean enabled) { * Enable or disable showing border on hover and focus change on task views */ public void setTaskBorderEnabled(boolean enabled) { - int taskCount = getTaskViewCount(); - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); + mBorderEnabled = enabled; + for (TaskView taskView : getTaskViews()) { taskView.setBorderEnabled(enabled); } mClearAllButton.setBorderEnabled(enabled); + if (mAddDesktopButton != null) { + mAddDesktopButton.setBorderEnabled(enabled); + } } /** @@ -1512,7 +1737,7 @@ public boolean isClearAllHidden() { @Override protected void onPageBeginTransition() { super.onPageBeginTransition(); - if (!mContainer.getDeviceProfile().isTablet) { + if (!mContainer.getDeviceProfile().getDeviceProperties().isTablet()) { mActionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, true); } if (mOverviewStateEnabled) { // only when in overview @@ -1523,9 +1748,8 @@ protected void onPageBeginTransition() { @Override protected void onPageEndTransition() { super.onPageEndTransition(); - ActiveGestureLog.INSTANCE.addLog( - "onPageEndTransition: current page index updated", getNextPage()); - if (isClearAllHidden() && !mContainer.getDeviceProfile().isTablet) { + ActiveGestureProtoLogProxy.logOnPageEndTransition(getNextPage()); + if (!mContainer.getDeviceProfile().getDeviceProperties().isTablet()) { mActionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, false); } if (getNextPage() > 0) { @@ -1537,21 +1761,21 @@ protected void onPageEndTransition() { @Override protected boolean isSignificantMove(float absoluteDelta, int pageOrientedSize) { DeviceProfile deviceProfile = mContainer.getDeviceProfile(); - if (!deviceProfile.isTablet) { + if (!deviceProfile.getDeviceProperties().isTablet()) { return super.isSignificantMove(absoluteDelta, pageOrientedSize); } return absoluteDelta - > deviceProfile.availableWidthPx * SIGNIFICANT_MOVE_SCREEN_WIDTH_PERCENTAGE; + > deviceProfile.getDeviceProperties().getAvailableWidthPx() * SIGNIFICANT_MOVE_SCREEN_WIDTH_PERCENTAGE; } @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - boolean intercept = super.onInterceptTouchEvent(ev); - if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) { - Log.d("b/318590728", "onInterceptTouchEvent: " + ev); + protected void updateIsBeingDraggedOnTouchDown(MotionEvent ev) { + // Do not allow mouse to drag RecentsView on action down. + if (!shouldAllowDrag(ev)) { + return; } - return intercept; + super.updateIsBeingDraggedOnTouchDown(ev); } @Override @@ -1559,9 +1783,7 @@ public boolean onTouchEvent(MotionEvent ev) { super.onTouchEvent(ev); if (showAsGrid()) { - int taskCount = getTaskViewCount(); - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); + for (TaskView taskView : getTaskViews()) { if (isTaskViewVisible(taskView) && taskView.offerTouchToChildren(ev)) { // Keep consuming events to pass to delegate return true; @@ -1580,7 +1802,13 @@ public boolean onTouchEvent(MotionEvent ev) { switch (ev.getAction()) { case MotionEvent.ACTION_UP: if (mTouchDownToStartHome) { - startHome(); + TaskView taskView = getCurrentPageTaskView(); + if (isExternalDisplay(mContainer.getDisplayId()) && taskView != null + && !taskView.isBeingDismissed() && isTaskViewVisible(taskView)) { + taskView.launchWithAnimation(); + } else { + startHome(); + } } mTouchDownToStartHome = false; break; @@ -1607,8 +1835,11 @@ public boolean onTouchEvent(MotionEvent ev) { mClearAllButton.getAlpha() == 1 && mClearAllButtonDeadZoneRect.contains(x, y); final boolean cameFromNavBar = (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0; + int adjustedX = x + getScrollX(); if (!clearAllButtonDeadZoneConsumed && !cameFromNavBar - && !mTaskViewDeadZoneRect.contains(x + getScrollX(), y)) { + && !mTaskViewDeadZoneRect.contains(adjustedX, y) + && !mTopRowDeadZoneRect.contains(adjustedX, y) + && !mBottomRowDeadZoneRect.contains(adjustedX, y)) { mTouchDownToStartHome = true; } } @@ -1643,11 +1874,19 @@ protected void onNotSnappingToPageInFreeScroll() { return; } TaskView taskView = getTaskViewAt(mNextPage); - // Snap to fully visible focused task and clear all button. - boolean shouldSnapToFocusedTask = taskView != null && taskView.isFocusedTask() - && isTaskViewFullyVisible(taskView); + boolean shouldSnapToLargeTask = taskView != null && taskView.isLargeTile(); + boolean shouldSnapToSmallTask = enableGridOnlyOverview() && taskView != null + && taskView == mUtils.getFirstSmallTaskView(); boolean shouldSnapToClearAll = mNextPage == indexOfChild(mClearAllButton); - if (!shouldSnapToFocusedTask && !shouldSnapToClearAll) { + boolean shouldSnapToLastTask = + enableGridOnlyOverview() && taskView != null && getScrollForPage( + indexOfChild(taskView)) == getScrollForPage(indexOfChild( + getLastGridTaskView(mUtils.getTopRowIdArray(), + mUtils.getBottomRowIdArray()))); + boolean shouldSnap = + shouldSnapToLargeTask || shouldSnapToClearAll || shouldSnapToSmallTask + || shouldSnapToLastTask; + if (!shouldSnap) { return; } } @@ -1659,6 +1898,8 @@ protected void onNotSnappingToPageInFreeScroll() { if (extraScrollDuration > 0) { mScroller.extendDuration(extraScrollDuration); } + debugLog(TAG, "onNotSnappingToPageInFreeScroll - mNextPage: " + mNextPage + + ", scrollSnapped: " + pageSnapped); } } @@ -1683,31 +1924,32 @@ private void vibrateForScroll() { @Override protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) { - // Enables swiping to the left or right only if the task overlay is not modal. - if (!isModal()) { + // Enables swiping to the left or right only if the task overlay is not modal, and event + // is not from a mouse. + if (!isModal() && shouldAllowDrag(ev)) { super.determineScrollingStart(ev, touchSlopScale); } } + private boolean shouldAllowDrag(MotionEvent ev) { + boolean isMouseDrag = ev.isFromSource(InputDevice.SOURCE_MOUSE) + && !MotionEventsUtils.isTrackpadScroll(ev) + && !MotionEventsUtils.isTrackpadFourFingerSwipe(ev); + return !(enablePreventOverviewMouseDrag() && isMouseDrag); + } + /** - * Moves the running task to the front of the carousel in tablets, to minimize animation - * required to move the running task in grid. + * Moves the running task to the expected position in the carousel. In tablets, this minimize + * animation required to move the running task into focused task position. */ - public void moveRunningTaskToFront() { - if (!mContainer.getDeviceProfile().isTablet) { - return; - } - + public void moveRunningTaskToExpectedPosition() { TaskView runningTaskView = getRunningTaskView(); - if (runningTaskView == null) { + if (runningTaskView == null || mCurrentPage != indexOfChild(runningTaskView)) { return; } - if (indexOfChild(runningTaskView) != mCurrentPage) { - return; - } - - if (mCurrentPage == 0) { + int runningTaskExpectedIndex = mUtils.getRunningTaskExpectedIndex(runningTaskView); + if (mCurrentPage == runningTaskExpectedIndex) { return; } @@ -1719,16 +1961,16 @@ public void moveRunningTaskToFront() { removeView(runningTaskView); mMovingTaskView = null; runningTaskView.resetPersistentViewTransforms(); - addView(runningTaskView, 0); - setCurrentPage(0); + + addView(runningTaskView, runningTaskExpectedIndex); + setCurrentPage(runningTaskExpectedIndex); updateTaskSize(); } @Override protected void onScrollerAnimationAborted() { - ActiveGestureLog.INSTANCE.addLog("scroller animation aborted", - ActiveGestureErrorDetector.GestureEvent.SCROLLER_ANIMATION_ABORTED); + ActiveGestureProtoLogProxy.logOnScrollerAnimationAborted(); } @Override @@ -1736,21 +1978,35 @@ protected boolean isPageScrollsInitialized() { return super.isPageScrollsInitialized() && mLoadPlanEverApplied; } - protected void applyLoadPlan(List taskGroups) { + protected void applyLoadPlan(List taskGroups, int taskListChangeId) { + if (enableRefactorTaskThumbnail() && !(isAttachedToWindow() + && RecentsDependencies.Companion.hasScope(mContext))) { + // This can happen if a TaskView callback is triggered after the view is destroyed + // (b/404920951). Prevent crashes by returning immediately. + Log.d(TAG, "applyLoadPlan - view invalid, isAttachedToWindow: " + isAttachedToWindow() + + ", hasScope: " + RecentsDependencies.Companion.hasScope(mContext)); + return; + } if (mPendingAnimation != null) { - mPendingAnimation.addEndListener(success -> applyLoadPlan(taskGroups)); + final List finalTaskGroups = taskGroups; + mPendingAnimation.addEndListener( + success -> applyLoadPlan(finalTaskGroups, taskListChangeId)); return; } if (taskGroups == null) { - Log.d(TAG, "applyLoadPlan - taskGroups is null"); + Log.d(TAG, + "applyLoadPlan - taskGroups is null - taskListChangeId: " + taskListChangeId); } else { Log.d(TAG, "applyLoadPlan - taskGroups: " + taskGroups.stream().map( - GroupTask::toString).collect(Collectors.toList())); + GroupTask::toString).toList() + ", taskListChangeId: " + taskListChangeId); + } + if (!mLoadPlanEverApplied) { + mLoadPlanEverApplied = true; + mPageScrolls = null; } - mLoadPlanEverApplied = true; if (taskGroups == null || taskGroups.isEmpty()) { - removeTasksViewsAndClearAllButton(); + removeAllTaskViews(); onTaskStackUpdated(); // With all tasks removed, touch handling in PagedView is disabled and we need to reset // touch state or otherwise values will be obsolete. @@ -1761,12 +2017,19 @@ protected void applyLoadPlan(List taskGroups) { return; } - int[] currentTaskIds; + // Start here to avoid early returns and empty cases which have special logic + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.applyLoadPlan"); + TaskView currentTaskView = getTaskViewAt(mCurrentPage); - if (currentTaskView != null) { + int[] currentTaskIds = null; + // Track the current DesktopTaskView through [deskId] as a desk can be empty without any + // tasks. + int currentTaskViewDeskId = INACTIVE_DESK_ID; + if (areMultiDesksFlagsEnabled() + && currentTaskView instanceof DesktopTaskView desktopTaskView) { + currentTaskViewDeskId = desktopTaskView.getDeskId(); + } else if (currentTaskView != null) { currentTaskIds = currentTaskView.getTaskIds(); - } else { - currentTaskIds = new int[0]; } // Unload existing visible task data @@ -1778,19 +2041,33 @@ protected void applyLoadPlan(List taskGroups) { // Save running task ID if it exists before rebinding all taskViews, otherwise the task from // the runningTaskView currently bound could get assigned to another TaskView - int[] runningTaskIds = getTaskIdsForTaskViewId(mRunningTaskViewId); - int[] focusedTaskIds = getTaskIdsForTaskViewId(mFocusedTaskViewId); + TaskView runningTaskView = getRunningTaskView(); + int[] runningTaskIds = null; + + // Track the running TaskView through [deskId] as a desk can be empty without any tasks. + int runningTaskViewDeskId = INACTIVE_DESK_ID; + if (areMultiDesksFlagsEnabled() + && runningTaskView instanceof DesktopTaskView desktopTaskView) { + runningTaskViewDeskId = desktopTaskView.getDeskId(); + } else if (runningTaskView != null) { + runningTaskIds = runningTaskView.getTaskIds(); + } + int[] focusedTaskIds = getTaskIdsForTaskViewId(mFocusedTaskViewId); // Reset the focused task to avoiding initializing TaskViews layout as focused task during // binding. The focused task view will be updated after all the TaskViews are bound. - mFocusedTaskViewId = INVALID_TASK_ID; + setFocusedTaskViewId(INVALID_TASK_ID); // Removing views sets the currentPage to 0, so we save this and restore it after // the new set of views are added int previousCurrentPage = mCurrentPage; int previousFocusedPage = indexOfChild(getFocusedChild()); + // TaskIds will no longer be valid after remove and re-add, clearing mTopRowIdSet. + mAnyTaskHasBeenDismissed = false; + mTopRowIdSet.clear(); + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.applyLoadPlan.removeAllViews"); removeAllViews(); - + traceEnd(Trace.TRACE_TAG_APP); // If we are entering Overview as a result of initiating a split from somewhere else // (e.g. split from Home), we need to make sure the staged app is not drawn as a thumbnail. int stagedTaskIdToBeRemoved; @@ -1804,81 +2081,108 @@ protected void applyLoadPlan(List taskGroups) { mFilterState.updateInstanceCountMap(taskGroups); // Clear out desktop view if it is set - mDesktopTaskView = null; + + // Move Desktop Tasks to the end of the list + taskGroups = mUtils.sortDesktopTasksToFront(taskGroups); + if (!enableOverviewOnConnectedDisplays()) { + taskGroups = mUtils.sortExternalDisplayTasksToFront(taskGroups); + } + + if (mAddDesktopButton != null) { + // Add `mAddDesktopButton` as the first child. + addView(mAddDesktopButton); + } + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.applyLoadPlan.forLoop"); // Add views as children based on whether it's grouped or single task. Looping through // taskGroups backwards populates the thumbnail grid from least recent to most recent. for (int i = taskGroups.size() - 1; i >= 0; i--) { GroupTask groupTask = taskGroups.get(i); - boolean isRemovalNeeded = stagedTaskIdToBeRemoved != INVALID_TASK_ID + boolean containsStagedTask = stagedTaskIdToBeRemoved != INVALID_TASK_ID && groupTask.containsTask(stagedTaskIdToBeRemoved); + boolean shouldSkipGroupTask = containsStagedTask && groupTask instanceof SingleTask; - if (isRemovalNeeded && !groupTask.hasMultipleTasks()) { - // If the task we need to remove is not part of a pair, avoiding creating the - // TaskView. + if ((isSplitSelectionActive() && groupTask.taskViewType == TaskViewType.DESKTOP) + || shouldSkipGroupTask) { + // To avoid these tasks from being chosen as the app pair, the creation of a + // TaskView is bypassed. The staged task is already selected for the app pair, + // and the Desktop task should be hidden when selecting a pair. continue; } // If we need to remove half of a pair of tasks, force a TaskView with Type.SINGLE // to be a temporary container for the remaining task. + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.applyLoadPlan.forLoop.createTaskView"); TaskView taskView = getTaskViewFromPool( - isRemovalNeeded ? TaskView.Type.SINGLE : groupTask.taskViewType); - if (taskView instanceof GroupedTaskView) { - boolean firstTaskIsLeftTopTask = - groupTask.mSplitBounds.leftTopTaskId == groupTask.task1.key.id; - Task leftTopTask = firstTaskIsLeftTopTask ? groupTask.task1 : groupTask.task2; - Task rightBottomTask = firstTaskIsLeftTopTask ? groupTask.task2 : groupTask.task1; - ((GroupedTaskView) taskView).bind(leftTopTask, rightBottomTask, mOrientationState, - mTaskOverlayFactory, groupTask.mSplitBounds); - } else if (taskView instanceof DesktopTaskView) { - ((DesktopTaskView) taskView).bind(((DesktopTask) groupTask).tasks, - mOrientationState, mTaskOverlayFactory); - mDesktopTaskView = (DesktopTaskView) taskView; + containsStagedTask ? TaskViewType.SINGLE : groupTask.taskViewType); + traceEnd(Trace.TRACE_TAG_APP); + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.applyLoadPlan.forLoop.bind"); + if (taskView instanceof GroupedTaskView groupedTaskView) { + groupedTaskView.bind((SplitTask) groupTask, mOrientationState, mTaskOverlayFactory); + } else if (taskView instanceof DesktopTaskView desktopTaskView) { + desktopTaskView.bind((DesktopTask) groupTask, mOrientationState, + mTaskOverlayFactory); + } else if (groupTask instanceof SplitTask splitTask) { + Task task = splitTask.getTopLeftTask().key.id == stagedTaskIdToBeRemoved + ? splitTask.getBottomRightTask() + : splitTask.getTopLeftTask(); + taskView.bind(new SingleTask(task), mOrientationState, mTaskOverlayFactory); } else { - Task task = groupTask.task1.key.id == stagedTaskIdToBeRemoved ? groupTask.task2 - : groupTask.task1; - taskView.bind(task, mOrientationState, mTaskOverlayFactory); + taskView.bind((SingleTask) groupTask, mOrientationState, mTaskOverlayFactory); } + traceEnd(Trace.TRACE_TAG_APP); + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.applyLoadPlan.forLoop.addTaskView"); addView(taskView); + traceEnd(Trace.TRACE_TAG_APP); // enables instance filtering if the feature flag for it is on if (FeatureFlags.ENABLE_MULTI_INSTANCE.get()) { taskView.setUpShowAllInstancesListener(); } } + // For loop end trace + traceEnd(Trace.TRACE_TAG_APP); - if (!taskGroups.isEmpty()) { - addView(mClearAllButton); - } + addView(mClearAllButton); // Keep same previous focused task - TaskView newFocusedTaskView = getTaskViewByTaskIds(focusedTaskIds); - // If the list changed, maybe the focused task doesn't exist anymore - if (newFocusedTaskView == null && getTaskViewCount() > 0) { - newFocusedTaskView = getTaskViewAt(0); + TaskView newFocusedTaskView = null; + if (!enableGridOnlyOverview()) { + newFocusedTaskView = getTaskViewByTaskIds(focusedTaskIds); + if (newFocusedTaskView instanceof DesktopTaskView) { + newFocusedTaskView = null; + } + // If the list changed, maybe the focused task doesn't exist anymore. + if (newFocusedTaskView == null) { + newFocusedTaskView = mUtils.getFirstNonDesktopTaskView(); + } } - mFocusedTaskViewId = newFocusedTaskView != null && !enableGridOnlyOverview() - ? newFocusedTaskView.getTaskViewId() : INVALID_TASK_ID; + setFocusedTaskViewId( + newFocusedTaskView != null ? newFocusedTaskView.getTaskViewId() : INVALID_TASK_ID); + + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.applyLoadPlan.layouts"); updateTaskSize(); - updateChildTaskOrientations(); + mUtils.updateChildTaskOrientations(); + traceEnd(Trace.TRACE_TAG_APP); - TaskView newRunningTaskView = null; - if (hasAllValidTaskIds(runningTaskIds)) { + TaskView newRunningTaskView = mUtils.getDesktopTaskViewForDeskId(runningTaskViewDeskId); + if (newRunningTaskView == null) { // Update mRunningTaskViewId to be the new TaskView that was assigned by binding // the full list of tasks to taskViews newRunningTaskView = getTaskViewByTaskIds(runningTaskIds); - if (newRunningTaskView != null) { - setRunningTaskViewId(newRunningTaskView.getTaskViewId()); + } + if (newRunningTaskView != null) { + setRunningTaskViewId(newRunningTaskView.getTaskViewId()); + } else { + if (mActiveGestureGroupedTaskInfo != null) { + // This will update mRunningTaskViewId and create a stub view if necessary. + // We try to avoid this because it can cause a scroll jump, but it is needed + // for cases where the running task isn't included in this load plan (e.g. if + // the current running task is excludedFromRecents.) + showCurrentTask(mActiveGestureGroupedTaskInfo, "applyLoadPlan"); + newRunningTaskView = getRunningTaskView(); } else { - if (mActiveGestureRunningTasks != null) { - // This will update mRunningTaskViewId and create a stub view if necessary. - // We try to avoid this because it can cause a scroll jump, but it is needed - // for cases where the running task isn't included in this load plan (e.g. if - // the current running task is excludedFromRecents.) - showCurrentTask(mActiveGestureRunningTasks); - } else { - setRunningTaskViewId(INVALID_TASK_ID); - } + setRunningTaskViewId(INVALID_TASK_ID); } } @@ -1886,37 +2190,25 @@ protected void applyLoadPlan(List taskGroups) { if (mNextPage != INVALID_PAGE) { // Restore mCurrentPage but don't call setCurrentPage() as that clobbers the scroll. mCurrentPage = previousCurrentPage; - if (hasAllValidTaskIds(currentTaskIds)) { + currentTaskView = mUtils.getDesktopTaskViewForDeskId(currentTaskViewDeskId); + if (currentTaskView == null) { currentTaskView = getTaskViewByTaskIds(currentTaskIds); - if (currentTaskView != null) { - targetPage = indexOfChild(currentTaskView); - } + } + if (currentTaskView != null) { + targetPage = indexOfChild(currentTaskView); } } else if (previousFocusedPage != INVALID_PAGE) { targetPage = previousFocusedPage; } else { - // Set the current page to the running task, but not if settling on new task. - if (hasAllValidTaskIds(runningTaskIds)) { - targetPage = indexOfChild(newRunningTaskView); - } else if (getTaskViewCount() > 0) { - targetPage = indexOfChild(requireTaskViewAt(0)); - } + targetPage = indexOfChild( + mUtils.getExpectedCurrentTask(newRunningTaskView, newFocusedTaskView)); } if (targetPage != -1 && mCurrentPage != targetPage) { int finalTargetPage = targetPage; - runOnPageScrollsInitialized(() -> { - // TODO(b/246283207): Remove logging once root cause of flake detected. - if (Utilities.isRunningInTestHarness()) { - Log.d("b/246283207", "RecentsView#applyLoadPlan() -> " - + "previousCurrentPage: " + previousCurrentPage - + ", targetPage: " + finalTargetPage - + ", getScrollForPage(targetPage): " - + getScrollForPage(finalTargetPage)); - } - setCurrentPage(finalTargetPage); - }); + runOnPageScrollsInitialized(() -> setCurrentPage(finalTargetPage)); } + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.applyLoadPlan.cleanupStates"); if (mIgnoreResetTaskId != INVALID_TASK_ID && getTaskViewByTaskId(mIgnoreResetTaskId) != ignoreResetTaskView) { // If the taskView mapping is changing, do not preserve the visuals. Since we are @@ -1924,12 +2216,18 @@ protected void applyLoadPlan(List taskGroups) { // generally map to the same task. mIgnoreResetTaskId = INVALID_TASK_ID; } + + mAppliedTaskListChangeId = taskListChangeId; resetTaskVisuals(); onTaskStackUpdated(); updateEnabledOverlays(); if (isPageScrollsInitialized()) { onPageScrollsInitialized(); } + traceEnd(Trace.TRACE_TAG_APP); + + // applyLoadPlan end trace + traceEnd(Trace.TRACE_TAG_APP); } private boolean isModal() { @@ -1940,38 +2238,30 @@ public boolean isLoadingTasks() { return mModel.isLoadingTasksInBackground(); } - private void removeTasksViewsAndClearAllButton() { - // This handles an edge case where applyLoadPlan happens during a gesture when the - // only Task is one with excludeFromRecents, in which case we should not remove it. - final int stubRunningTaskIndex = isGestureActive() ? getRunningTaskIndex() : -1; - - for (int i = getTaskViewCount() - 1; i >= 0; i--) { - if (i == stubRunningTaskIndex) { - continue; - } - removeView(requireTaskViewAt(i)); - } - if (getTaskViewCount() == 0 && indexOfChild(mClearAllButton) != -1) { + protected void removeAllTaskViews() { + // This handles an edge case where applyLoadPlan happens during a gesture when the only + // Task is one with excludeFromRecents, in which case we should not remove it. + CollectionsKt + .filter(getTaskViews(), taskView -> !isGestureActive() || !taskView.isRunningTask()) + .forEach(this::removeView); + if (!hasTaskViews()) { + removeView(mAddDesktopButton); removeView(mClearAllButton); } } + /** Returns true if there are at least one TaskView has been added to the RecentsView. */ + public boolean hasTaskViews() { + return mUtils.hasTaskViews(); + } + public int getTaskViewCount() { - int taskViewCount = getChildCount(); - if (indexOfChild(mClearAllButton) != -1) { - taskViewCount--; - } - return taskViewCount; + return mTaskViewCount; } - public int getGroupedTaskViewCount() { - int groupViewCount = 0; - for (int i = 0; i < getChildCount(); i++) { - if (getChildAt(i) instanceof GroupedTaskView) { - groupViewCount++; - } - } - return groupViewCount; + /** Counts {@link TaskView}s that are not {@link DesktopTaskView} instances. */ + public int getNonDesktopTaskViewCount() { + return mUtils.getNonDesktopTaskViewCount(); } /** @@ -1993,17 +2283,21 @@ protected void onTaskStackUpdated() { updateEmptyMessage(); } + protected void resetTaskVisuals(TaskView taskView) { + taskView.resetViewTransforms(); + taskView.setIconVisibleForGesture(mTaskIconVisible); + taskView.setStableAlpha(mContentAlpha); + taskView.setFullscreenProgress(mFullscreenProgress); + taskView.setModalness(mTaskModalness); + taskView.setTaskThumbnailSplashAlpha(mTaskThumbnailSplashAlpha); + taskView.setBorderEnabled(mBorderEnabled); + } + public void resetTaskVisuals() { - for (int i = getTaskViewCount() - 1; i >= 0; i--) { - TaskView taskView = requireTaskViewAt(i); + for (TaskView taskView : getTaskViews()) { if (Arrays.stream(taskView.getTaskIds()).noneMatch( taskId -> taskId == mIgnoreResetTaskId)) { - taskView.resetViewTransforms(); - taskView.setIconScaleAndDim(mTaskIconScaledDown ? 0 : 1); - taskView.setStableAlpha(mContentAlpha); - taskView.setFullscreenProgress(mFullscreenProgress); - taskView.setModalness(mTaskModalness); - taskView.setTaskThumbnailSplashAlpha(mTaskThumbnailSplashAlpha); + resetTaskVisuals(taskView); } } // resetTaskVisuals is called at the end of dismiss animation which could update @@ -2016,14 +2310,10 @@ public void resetTaskVisuals() { simulator.fullScreenProgress.value = 0; simulator.recentsViewScale.value = 1; }); - // Similar to setRunningTaskHidden below, reapply the state before runningTaskView is - // null. - if (!mRunningTaskShowScreenshot) { - setRunningTaskViewShowScreenshot(mRunningTaskShowScreenshot); - } - if (mRunningTaskTileHidden) { - setRunningTaskHidden(mRunningTaskTileHidden); - } + // Reapply runningTask related attributes as they might have been reset by + // resetViewTransforms(). + setRunningTaskViewShowScreenshot(mRunningTaskShowScreenshot); + applyAttachAlpha(); updateCurveProperties(); // Update the set of visible task's data @@ -2034,12 +2324,8 @@ public void resetTaskVisuals() { public void setFullscreenProgress(float fullscreenProgress) { mFullscreenProgress = fullscreenProgress; - if (enableRefactorTaskThumbnail()) { - mRecentsViewData.getFullscreenProgress().setValue(mFullscreenProgress); - } - int taskCount = getTaskViewCount(); - for (int i = 0; i < taskCount; i++) { - requireTaskViewAt(i).setFullscreenProgress(mFullscreenProgress); + for (TaskView taskView : getTaskViews()) { + taskView.setFullscreenProgress(mFullscreenProgress); } mClearAllButton.setFullscreenProgress(fullscreenProgress); @@ -2049,9 +2335,11 @@ public void setFullscreenProgress(float fullscreenProgress) { } private void updateTaskStackListenerState() { - boolean handleTaskStackChanges = mOverviewStateEnabled && isAttachedToWindow() - && getWindowVisibility() == VISIBLE; + boolean handleTaskStackChanges = isAttachedToWindow() + && ((mOverviewStateEnabled && getWindowVisibility() == VISIBLE) + || mActiveGestureGroupedTaskInfo != null); if (handleTaskStackChanges != mHandleTaskStackChanges) { + Log.d(TAG, "updateTaskStackListenerState: " + handleTaskStackChanges); mHandleTaskStackChanges = handleTaskStackChanges; if (handleTaskStackChanges) { reloadIfNeeded(); @@ -2068,9 +2356,9 @@ public void setInsets(Rect insets) { setOverviewGridEnabled( getStateManager().getState().displayOverviewTasksAsGrid(dp)); if (enableGridOnlyOverview()) { - mActionsView.updateHiddenFlags(HIDDEN_ACTIONS_IN_MENU, dp.isTablet); + mActionsView.updateHiddenFlags(HIDDEN_ACTIONS_IN_MENU, dp.getDeviceProperties().isTablet()); } - setPageSpacing(dp.overviewPageSpacing); + setPageSpacing(dp.getOverviewProfile().getPageSpacing()); // Propagate DeviceProfile change event. runActionOnRemoteHandles( @@ -2113,16 +2401,16 @@ private void updateOrientationHandler(boolean forceRecreateDragLayerControllers) } } - boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0 - || mOrientationState.getRecentsActivityRotation() != ROTATION_0; - mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION, - !mOrientationState.isRecentsActivityRotationAllowed() && isInLandscape); + mActionsView.updateHiddenFlags( + HIDDEN_NON_ZERO_ROTATION, + mOrientationState.shouldHideActionButtons() + ); // Recalculate DeviceProfile dependent layout. updateSizeAndPadding(); // Update TaskView's DeviceProfile dependent layout. - updateChildTaskOrientations(); + mUtils.updateChildTaskOrientations(); requestLayout(); // Reapply the current page to update page scrolls. @@ -2145,23 +2433,19 @@ private void updateSizeAndPadding() { mTaskWidth = mLastComputedTaskSize.width(); mTaskHeight = mLastComputedTaskSize.height(); setPadding(mLastComputedTaskSize.left - mInsets.left, - mLastComputedTaskSize.top - dp.overviewTaskThumbnailTopMarginPx - mInsets.top, - dp.widthPx - mInsets.right - mLastComputedTaskSize.right, - dp.heightPx - mInsets.bottom - mLastComputedTaskSize.bottom); + mLastComputedTaskSize.top - dp.getOverviewProfile().getTaskThumbnailTopMarginPx() + - mInsets.top, + dp.getDeviceProperties().getWidthPx() - mInsets.right - mLastComputedTaskSize.right, + dp.getDeviceProperties().getHeightPx() - mInsets.bottom - mLastComputedTaskSize.bottom); - mSizeStrategy.calculateGridSize(dp, mContainer, mLastComputedGridSize); - mSizeStrategy.calculateGridTaskSize(mContainer, dp, mLastComputedGridTaskSize, + mContainerInterface.calculateGridSize(dp, mContainer, mLastComputedGridSize); + mContainerInterface.calculateGridTaskSize(mContainer, dp, mLastComputedGridTaskSize, getPagedOrientationHandler()); - if (enableGridOnlyOverview()) { - mSizeStrategy.calculateCarouselTaskSize(mContainer, dp, mLastComputedCarouselTaskSize, - getPagedOrientationHandler()); - } - mTaskGridVerticalDiff = mLastComputedGridTaskSize.top - mLastComputedTaskSize.top; - mTopBottomRowHeightDiff = - mLastComputedGridTaskSize.height() + dp.overviewTaskThumbnailTopMarginPx - + dp.overviewRowSpacing; + mTopBottomRowHeightDiff = mLastComputedGridTaskSize.height() + + dp.getOverviewProfile().getTaskThumbnailTopMarginPx() + + dp.getOverviewProfile().getRowSpacing(); // Force TaskView to update size from thumbnail updateTaskSize(); @@ -2171,34 +2455,15 @@ private void updateSizeAndPadding() { /** * Updates TaskView scaling and translation required to support variable width. */ - private void updateTaskSize() { - updateTaskSize(false); - } - - /** - * Updates TaskView scaling and translation required to support variable width. - * - * @param isTaskDismissal indicates if update was called due to task dismissal - */ - private void updateTaskSize(boolean isTaskDismissal) { - final int taskCount = getTaskViewCount(); - if (taskCount == 0) { + protected void updateTaskSize() { + if (!hasTaskViews()) { return; } float accumulatedTranslationX = 0; - float translateXToMiddle = 0; - if (enableGridOnlyOverview() && mContainer.getDeviceProfile().isTablet) { - translateXToMiddle = mIsRtl - ? mLastComputedCarouselTaskSize.right - mLastComputedTaskSize.right - : mLastComputedCarouselTaskSize.left - mLastComputedTaskSize.left; - } - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); - taskView.updateTaskSize(mLastComputedTaskSize, mLastComputedGridTaskSize, - mLastComputedCarouselTaskSize); + for (TaskView taskView : getTaskViews()) { + taskView.updateTaskSize(mLastComputedTaskSize, mLastComputedGridTaskSize); taskView.setNonGridTranslationX(accumulatedTranslationX); - taskView.setNonGridPivotTranslationX(translateXToMiddle); // Compensate space caused by TaskView scaling. float widthDiff = taskView.getLayoutParams().width * (1 - taskView.getNonGridScale()); @@ -2207,37 +2472,65 @@ private void updateTaskSize(boolean isTaskDismissal) { mClearAllButton.setFullscreenTranslationPrimary(accumulatedTranslationX); - updateGridProperties(isTaskDismissal); + float taskAlignmentTranslationY = getTaskAlignmentTranslationY(); + mClearAllButton.setTaskAlignmentTranslationY(taskAlignmentTranslationY); + if (mAddDesktopButton != null) { + mAddDesktopButton.setTranslationY(taskAlignmentTranslationY); + } + + updateGridProperties(); } public void getTaskSize(Rect outRect) { - mSizeStrategy.calculateTaskSize(mContainer, mContainer.getDeviceProfile(), outRect, + mContainerInterface.calculateTaskSize(mContainer, mContainer.getDeviceProfile(), outRect, getPagedOrientationHandler()); } /** - * Sets the last TaskView selected. + * Returns the currently selected TaskView in Select mode. + */ + @Nullable + public TaskView getSelectedTaskView() { + return mUtils.getSelectedTaskView(); + } + + /** + * Sets the selected TaskView in Select mode. */ public void setSelectedTask(int lastSelectedTaskId) { - mSelectedTask = getTaskViewByTaskId(lastSelectedTaskId); + mUtils.setSelectedTaskView(getTaskViewByTaskId(lastSelectedTaskId)); } /** * Returns the bounds of the task selected to enter modal state. */ public Rect getSelectedTaskBounds() { - if (mSelectedTask == null) { + if (getSelectedTaskView() == null) { return mLastComputedTaskSize; } - return getTaskBounds(mSelectedTask); + return getTaskBounds(getSelectedTaskView()); + } + + /** + * Get the Y translation that should be applied to the non-TaskView item inside the RecentsView + * (ClearAllButton and AddDesktopButton) in the original layout position, before scrolling. This + * is done to make sure the button is aligned to the middle of Task thumbnail in y coordinate. + */ + private float getTaskAlignmentTranslationY() { + DeviceProfile deviceProfile = mContainer.getDeviceProfile(); + if (deviceProfile.getDeviceProperties().isTablet()) { + return deviceProfile.getOverviewProfile().getRowSpacing(); + } + return deviceProfile.getOverviewProfile().getTaskThumbnailTopMarginPx() / 2.0f; } - private Rect getTaskBounds(TaskView taskView) { + protected Rect getTaskBounds(TaskView taskView) { int selectedPage = indexOfChild(taskView); int primaryScroll = getPagedOrientationHandler().getPrimaryScroll(this); int selectedPageScroll = getScrollForPage(selectedPage); - boolean isTopRow = taskView != null && mTopRowIdSet.contains(taskView.getTaskViewId()); - Rect outRect = new Rect(mLastComputedTaskSize); + boolean isTopRow = mTopRowIdSet.contains(taskView.getTaskViewId()); + Rect outRect = new Rect( + taskView.isGridTask() ? mLastComputedGridTaskSize : mLastComputedTaskSize); outRect.offset( -(primaryScroll - (selectedPageScroll + getOffsetFromScrollPosition(selectedPage))), (int) (showAsGrid() && enableGridOnlyOverview() && !isTopRow @@ -2254,14 +2547,10 @@ public Rect getLastComputedGridTaskSize() { return mLastComputedGridTaskSize; } - public Rect getLastComputedCarouselTaskSize() { - return mLastComputedCarouselTaskSize; - } - /** Gets the task size for modal state. */ public void getModalTaskSize(Rect outRect) { - mSizeStrategy.calculateModalTaskSize(mContainer, mContainer.getDeviceProfile(), outRect, - getPagedOrientationHandler()); + mContainerInterface.calculateModalTaskSize(mContainer, mContainer.getDeviceProfile(), + outRect, getPagedOrientationHandler()); } @Override @@ -2277,6 +2566,8 @@ protected boolean computeScrollHelper() { // After scrolling, update the visible task's data loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL); + + recalculateTaskViewScreenEdgeIntersections(); } // Update ActionsView's visibility when scroll changes. @@ -2287,7 +2578,29 @@ protected boolean computeScrollHelper() { return scrolling; } - private void updateActionsViewFocusedScroll() { + private void recalculateTaskViewScreenEdgeIntersections() { + RecentsPagedOrientationHandler pagedOrientationHandler = getPagedOrientationHandler(); + final int pageOrientedSize = pagedOrientationHandler.getMeasuredSize(this); + final int screenStart = pagedOrientationHandler.getPrimaryScroll(this); + final int screenEnd = screenStart + pageOrientedSize; + final boolean showAsGrid = showAsGrid(); + final boolean showAsFullscreen = showAsFullscreen(); + + getTaskViews().forEachWithIndexInParent((index, taskView) -> { + float taskSize = pagedOrientationHandler.getMeasuredSize(taskView) + * taskView.getSizeAdjustment(showAsFullscreen); + float taskStart = (pagedOrientationHandler.getChildStart(taskView) + + taskView.getOffsetAdjustment(showAsGrid)); + float taskEnd = taskStart + taskSize; + + boolean intersectsEndOfScreen = taskStart < screenEnd && screenEnd < taskEnd; + boolean intersectsStartOfScreen = taskStart < screenStart && screenStart < taskEnd; + boolean intersectsEdgeOfScreen = intersectsEndOfScreen || intersectsStartOfScreen; + taskView.onIntersectScreenEdgeChanged(intersectsEdgeOfScreen); + }); + } + + protected void updateActionsViewFocusedScroll() { if (showAsGrid()) { float actionsViewAlphaValue = isFocusedTaskInExpectedScrollPosition() ? 1 : 0; // If animation is already in progress towards the same end value, do not restart. @@ -2300,6 +2613,10 @@ private void updateActionsViewFocusedScroll() { } } + protected OverviewActionsView getActionsView() { + return mActionsView; + } + private void animateActionsViewAlpha(float alphaValue, long duration) { mActionsViewAlphaAnimator = ObjectAnimator.ofFloat(mActionsView.getVisibilityAlpha(), AnimatedFloat.VALUE, alphaValue); @@ -2326,7 +2643,7 @@ public void updateCurveProperties() { @Override protected int getDestinationPage(int scaledScroll) { - if (!mContainer.getDeviceProfile().isTablet) { + if (!mContainer.getDeviceProfile().getDeviceProperties().isTablet()) { return super.getDestinationPage(scaledScroll); } if (!isPageScrollsInitialized()) { @@ -2341,6 +2658,11 @@ protected int getDestinationPage(int scaledScroll) { int minDistanceFromScreenStart = Integer.MAX_VALUE; int minDistanceFromScreenStartIndex = INVALID_PAGE; for (int i = 0; i < getChildCount(); ++i) { + // Do not set the destination page to the AddDesktopButton, which has the same page + // scrolls as the first [TaskView] and shouldn't be scrolled to. + if (getChildAt(i) instanceof AddDesktopButton) { + continue; + } int distanceFromScreenStart = Math.abs(mPageScrolls[i] - scaledScroll); if (distanceFromScreenStart < minDistanceFromScreenStart) { minDistanceFromScreenStart = distanceFromScreenStart; @@ -2356,47 +2678,45 @@ protected int getDestinationPage(int scaledScroll) { */ public void loadVisibleTaskData(@TaskView.TaskDataChanges int dataChanges) { boolean hasLeftOverview = !mOverviewStateEnabled && mScroller.isFinished(); - if (hasLeftOverview || mTaskListChangeId == -1) { + if (hasLeftOverview || mAppliedTaskListChangeId == -1) { // Skip loading visible task data if we've already left the overview state, or if the // task list hasn't been loaded yet (the task views will not reflect the task list) return; } - int lower = 0; - int upper = 0; - int visibleStart = 0; - int visibleEnd = 0; + int lowerIndex, upperIndex, visibleStart, visibleEnd; if (showAsGrid()) { int screenStart = getPagedOrientationHandler().getPrimaryScroll(this); int pageOrientedSize = getPagedOrientationHandler().getMeasuredSize(this); // For GRID_ONLY_OVERVIEW, use +/- 1 task column as visible area for preloading // adjacent thumbnails, otherwise use +/-50% screen width - int extraWidth = enableGridOnlyOverview() ? getLastComputedTaskSize().width() - + getPageSpacing() : pageOrientedSize / 2; + int extraWidth = enableGridOnlyOverview() + ? getLastComputedGridTaskSize().width() + getPageSpacing() + : pageOrientedSize / 2; + lowerIndex = upperIndex = 0; visibleStart = screenStart - extraWidth; visibleEnd = screenStart + pageOrientedSize + extraWidth; } else { int centerPageIndex = getPageNearestToCenterOfScreen(); int numChildren = getChildCount(); - lower = Math.max(0, centerPageIndex - 2); - upper = Math.min(centerPageIndex + 2, numChildren - 1); + lowerIndex = Math.max(0, centerPageIndex - 2); + upperIndex = Math.min(centerPageIndex + 2, numChildren - 1); + visibleStart = visibleEnd = 0; } List visibleTaskIds = new ArrayList<>(); - // Update the task data for the in/visible children - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView taskView = requireTaskViewAt(i); + getTaskViews().forEachWithIndexInParent((index, taskView) -> { List containers = taskView.getTaskContainers(); if (containers.isEmpty()) { - continue; + return; } - int index = indexOfChild(taskView); boolean visible; if (showAsGrid()) { - visible = isTaskViewWithinBounds(taskView, visibleStart, visibleEnd); + visible = isTaskViewWithinBounds(taskView, visibleStart, visibleEnd, + mTaskViewsDismissPrimaryTranslations.getOrDefault(taskView, 0)); } else { - visible = lower <= index && index <= upper; + visible = index >= lowerIndex && index <= upperIndex; } if (visible) { // Default update all non-null tasks, then remove running ones @@ -2405,18 +2725,12 @@ public void loadVisibleTaskData(@TaskView.TaskDataChanges int dataChanges) { .collect(Collectors.toCollection(ArrayList::new)); if (enableRefactorTaskThumbnail()) { visibleTaskIds.addAll( - tasksToUpdate.stream().map((task) -> task.key.id).collect(Collectors.toList())); - } - if (mTmpRunningTasks != null) { - for (Task t : mTmpRunningTasks) { - // Skip loading if this is the task that we are animating into - // TODO(b/280812109) change this equality check to use A.equals(B) - tasksToUpdate.removeIf(task -> task == t); - } + tasksToUpdate.stream().map((task) -> task.key.id).toList()); } if (tasksToUpdate.isEmpty()) { - continue; + return; } + int visibilityChanges = 0; for (Task task : tasksToUpdate) { if (!mHasVisibleTaskData.get(task.key.id)) { // Ignore thumbnail update if it's current running task during the gesture @@ -2425,25 +2739,32 @@ public void loadVisibleTaskData(@TaskView.TaskDataChanges int dataChanges) { if (taskView == getRunningTaskView() && isGestureActive()) { changes &= ~TaskView.FLAG_UPDATE_THUMBNAIL; } - taskView.onTaskListVisibilityChanged(true /* visible */, changes); + visibilityChanges |= changes; } - mHasVisibleTaskData.put(task.key.id, visible); + mHasVisibleTaskData.put(task.key.id, true); + } + if (visibilityChanges != 0) { + taskView.onTaskListVisibilityChanged(true /* visible */, visibilityChanges); } } else { + int visibilityChanges = 0; for (TaskContainer container : containers) { if (container == null) { continue; } if (mHasVisibleTaskData.get(container.getTask().key.id)) { - taskView.onTaskListVisibilityChanged(false /* visible */, dataChanges); + visibilityChanges = dataChanges; } mHasVisibleTaskData.delete(container.getTask().key.id); } + if (visibilityChanges != 0) { + taskView.onTaskListVisibilityChanged(false /* visible */, visibilityChanges); + } } - } + }); if (enableRefactorTaskThumbnail()) { - mTasksRepository.setVisibleTasks(visibleTaskIds); + mRecentsViewModel.updateVisibleTasks(visibleTaskIds); } } @@ -2470,6 +2791,10 @@ public void onHighResLoadingStateChanged(boolean enabled) { mModel.preloadCacheIfNeeded(); } + if (enableRefactorTaskThumbnail()) { + return; + } + // Whenever the high res loading state changes, poke each of the visible tasks to see if // they want to updated their thumbnail state for (int i = 0; i < mHasVisibleTaskData.size(); i++) { @@ -2485,15 +2810,23 @@ public void onHighResLoadingStateChanged(boolean enabled) { } public void startHome() { - startHome(mContainer.isStarted()); + startHome(mContainer.isStarted(), /* onHomeAnimationComplete= */ null); } - public void startHome(boolean animated) { - if (!canStartHomeSafely()) return; - handleStartHome(animated); + public void startHome(@Nullable Runnable onHomeAnimationComplete) { + startHome(mContainer.isStarted(), onHomeAnimationComplete); } - protected abstract void handleStartHome(boolean animated); + public void startHome(boolean animated, @Nullable Runnable onHomeAnimationComplete) { + if (!canStartHomeSafely()) { + if (onHomeAnimationComplete != null) { + onHomeAnimationComplete.run(); + } + return; + } + mContainer.startHome(animated, onHomeAnimationComplete); + AbstractFloatingView.closeAllOpenViews(mContainer, mContainer.isStarted()); + } /** Returns whether user can start home based on state in {@link OverviewCommandHelper}. */ protected abstract boolean canStartHomeSafely(); @@ -2503,41 +2836,63 @@ public void startHome(boolean animated) { ? extends StatefulContainer> getStateManager(); public void reset() { + Log.d(TAG, "reset - mEnableDrawingLiveTile: " + mEnableDrawingLiveTile + + ", mRecentsAnimationController: " + mRecentsAnimationController); setCurrentTask(-1); mCurrentPageScrollDiff = 0; mIgnoreResetTaskId = -1; - mTaskListChangeId = -1; - mFocusedTaskViewId = -1; + mAppliedTaskListChangeId = -1; + setFocusedTaskViewId(INVALID_TASK_ID); + mAnyTaskHasBeenDismissed = false; + setTaskIconVisible(true); + setActiveGestureGroupedTaskInfo(null); + if (mAddDesktopButton != null) { + mAddDesktopButton.setGestureAlpha(1f); + } + setKeyboardFocusTask(KeyboardFocusTask.Unfocused.INSTANCE); - Log.d(TAG, "reset - mEnableDrawingLiveTile: " + mEnableDrawingLiveTile - + ", mRecentsAnimationController: " + mRecentsAnimationController); - if (mEnableDrawingLiveTile) { - if (mRecentsAnimationController != null) { - // We owns mRecentsAnimationController, finish it now to clean up. - finishRecentsAnimation(true /* toRecents */, null); - } else { - // Only clean up target set if we no longer owns mRecentsAnimationController. - runActionOnRemoteHandles(remoteTargetHandle -> - remoteTargetHandle.getTransformParams().setTargetSet(null)); - } - setEnableDrawingLiveTile(false); + if (enableRefactorTaskThumbnail()) { + // TODO(b/353917593): RecentsView is never destroyed, so its dependencies need to + // be cleaned up during the reset, but re-created when RecentsView is "resumed". + // RecentsDependencies.Companion.destroy(); } - runActionOnRemoteHandles(remoteTargetHandle -> - remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(false)); - if (!FeatureFlags.enableSplitContextually()) { - resetFromSplitSelectionState(); + + if (mEnableDrawingLiveTile && mRecentsAnimationController != null) { + // We own mRecentsAnimationController, finish it now to clean up. + finishRecentsAnimation(true /* toHome */, null); + } else { + // We don't own mRecentsAnimationController, just clear the reference. + mRecentsAnimationController = null; + cleanupRemoteTargets(); } + setEnableDrawingLiveTile(false); + mBlurUtils.setDrawLiveTileBelowRecents(false); + if (enableRefactorTaskThumbnail()) { + // TODO(b/391842220): This should not need to be explicitly called from here. When TVs + // are added and removed with the RecentsView lifecycle, this can be removed. + // This is was added because without it cancelling jobs was happening after work was + // scheduled for those jobs resulting in delays. + mUtils.getTaskViews().forEach(TaskView::cancelJobs); + } // These are relatively expensive and don't need to be done this frame (RecentsView isn't // visible anyway), so defer by a frame to get off the critical path, e.g. app to home. - post(() -> { - unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL); - setCurrentPage(0); - LayoutUtils.setViewEnabled(mActionsView, true); - if (mOrientationState.setGestureActive(false)) { - updateOrientationHandler(/* forceRecreateDragLayerControllers = */ false); - } - }); + // Defer onto the main thread rather than the view message queue since this will not always + // be called in the Recents In Window case. + MAIN_EXECUTOR.getHandler().post(this::onReset); + } + + private void onReset() { + unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL); + setCurrentPage(0); + LayoutUtils.setViewEnabled(mActionsView, true); + if (mOrientationState.setGestureActive(false)) { + updateOrientationHandler(/* forceRecreateDragLayerControllers = */ false); + } + if (enableRefactorTaskThumbnail()) { + mRecentsViewModel.onReset(); + } + executeSideTaskLaunchCallback(); } public int getRunningTaskViewId() { @@ -2567,13 +2922,12 @@ private int[] getTaskIdsForTaskViewId(int taskViewId) { } @Nullable - private TaskView getTaskViewFromTaskViewId(int taskViewId) { + TaskView getTaskViewFromTaskViewId(int taskViewId) { if (taskViewId == -1) { return null; } - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView taskView = requireTaskViewAt(i); + for (TaskView taskView : getTaskViews()) { if (taskView.getTaskViewId() == taskViewId) { return taskView; } @@ -2594,16 +2948,16 @@ public int getRunningTaskIndex() { * Handle the edge case where Recents could increment task count very high over long * period of device usage. Probably will never happen, but meh. */ - private TaskView getTaskViewFromPool(@TaskView.Type int type) { + protected TaskView getTaskViewFromPool(TaskViewType type) { TaskView taskView; switch (type) { - case TaskView.Type.GROUPED: + case GROUPED: taskView = mGroupedTaskViewPool.getView(); break; - case TaskView.Type.DESKTOP: + case DESKTOP: taskView = mDesktopTaskViewPool.getView(); break; - case TaskView.Type.SINGLE: + case SINGLE: default: taskView = mTaskViewPool.getView(); } @@ -2619,6 +2973,7 @@ private TaskView getTaskViewFromPool(@TaskView.Type int type) { /** * Get the index of the task view whose id matches {@param taskId}. + * * @return -1 if there is no task view for the task id, else the index of the task view. */ public int getTaskIndexForId(int taskId) { @@ -2626,44 +2981,65 @@ public int getTaskIndexForId(int taskId) { return tv == null ? -1 : indexOfChild(tv); } + protected int getClearAllShortTotalWidthTranslation() { + return mClearAllShortTotalWidthTranslation; + } + /** * Reloads the view if anything in recents changed. */ public void reloadIfNeeded() { - if (!mModel.isTaskListValid(mTaskListChangeId)) { - mTaskListChangeId = mModel.getTasks(this::applyLoadPlan, RecentsFilterState - .getFilter(mFilterState.getPackageNameToFilter())); + if (!mModel.isTaskListValid(mAppliedTaskListChangeId)) { + mModel.getTasks(this::applyLoadPlan, RecentsFilterState + .getFilter(mFilterState.getPackageNameToFilter(), mContainer.getDisplayId())); + Log.d(TAG, "reloadIfNeeded - getTasks: " + mAppliedTaskListChangeId); if (enableRefactorTaskThumbnail()) { - mTasksRepository.getAllTaskData(/* forceRefresh = */ true); + mRecentsViewModel.refreshAllTaskData(); } + } else { + Log.d(TAG, "reloadIfNeeded - task list still valid: " + mAppliedTaskListChangeId); } } + private void setActiveGestureGroupedTaskInfo(GroupedTaskInfo groupedTaskInfo) { + mActiveGestureGroupedTaskInfo = groupedTaskInfo; + updateTaskStackListenerState(); + } + /** * Called when a gesture from an app is starting. */ - public void onGestureAnimationStart( - Task[] runningTasks, RotationTouchHelper rotationTouchHelper) { - Log.d(TAG, "onGestureAnimationStart - runningTasks: " + Arrays.toString(runningTasks)); - mActiveGestureRunningTasks = runningTasks; + public void onGestureAnimationStart(GroupedTaskInfo groupedTaskInfo) { + Log.d(TAG, "onGestureAnimationStart - groupedTaskInfo: " + groupedTaskInfo); + setActiveGestureGroupedTaskInfo(groupedTaskInfo); + // This needs to be called before the other states are set since it can create the task view if (mOrientationState.setGestureActive(true)) { - setLayoutRotation(rotationTouchHelper.getCurrentActiveRotation(), - rotationTouchHelper.getDisplayRotation()); + reapplyActiveRotation(); // Force update to ensure the initial task size is computed even if the orientation has // not changed. updateSizeAndPadding(); } - showCurrentTask(mActiveGestureRunningTasks); + showCurrentTask(groupedTaskInfo, "onGestureAnimationStart"); setEnableFreeScroll(false); setEnableDrawingLiveTile(false); setRunningTaskHidden(true); - setTaskIconScaledDown(true); + setTaskIconVisible(false); + if (mAddDesktopButton != null) { + mAddDesktopButton.setGestureAlpha(0f); + } + } + + /** + * Returns whether the running task's attach alpha should be updated during the attach animation + */ + public boolean shouldUpdateRunningTaskAlpha() { + return getRunningTaskView() instanceof DesktopTaskView; } private boolean isGestureActive() { - return mActiveGestureRunningTasks != null; + return mActiveGestureGroupedTaskInfo != null; } /** @@ -2671,12 +3047,13 @@ private boolean isGestureActive() { * {@link #onGestureAnimationStart} and {@link #onGestureAnimationEnd()}. */ public void onSwipeUpAnimationSuccess() { - animateUpTaskIconScale(); + startIconFadeInOnGestureComplete(); setSwipeDownShouldLaunchApp(true); } private void animateRecentsRotationInPlace(int newRotation) { - if (mOrientationState.isRecentsActivityRotationAllowed()) { + if (mOrientationState.isRecentsActivityRotationAllowed() + || mOrientationState.isLauncherFixedLandscape()) { // Let system take care of the rotation return; } @@ -2687,7 +3064,7 @@ private void animateRecentsRotationInPlace(int newRotation) { // Animate the rotation and stops running task switchToScreenshot(() -> { animateRotation(newRotation); - finishRecentsAnimation(true /* toRecents */, false /* shouldPip */, + finishRecentsAnimation(true /* toHome */, false /* shouldPip */, null /* onFinishComplete */); }); } @@ -2710,78 +3087,21 @@ public AnimatorSet setRecentsChangedOrientation(boolean fadeOut) { return as; } - private void updateChildTaskOrientations() { - for (int i = 0; i < getTaskViewCount(); i++) { - requireTaskViewAt(i).setOrientationState(mOrientationState); - } - boolean shouldRotateMenuForFakeRotation = - !mOrientationState.isRecentsActivityRotationAllowed(); - if (!shouldRotateMenuForFakeRotation) { - return; - } - TaskMenuView tv = (TaskMenuView) getTopOpenViewWithType(mContainer, TYPE_TASK_MENU); - if (tv != null) { - // Rotation is supported on phone (details at b/254198019#comment4) - tv.onRotationChanged(); - } - } - /** * Called when a gesture from an app has finished, and an end target has been determined. */ public void onPrepareGestureEndAnimation( - @Nullable AnimatorSet animatorSet, GestureState.GestureEndTarget endTarget, - TaskViewSimulator[] taskViewSimulators) { - Log.d(TAG, "onPrepareGestureEndAnimation - endTarget: " + endTarget); - mCurrentGestureEndTarget = endTarget; - boolean isOverviewEndTarget = endTarget == GestureState.GestureEndTarget.RECENTS; - if (isOverviewEndTarget) { - updateGridProperties(); - } - - BaseState endState = mSizeStrategy.stateFromGestureEndTarget(endTarget); - if (endState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())) { - TaskView runningTaskView = getRunningTaskView(); - float runningTaskPrimaryGridTranslation = 0; - float runningTaskSecondaryGridTranslation = 0; - if (runningTaskView != null) { - // Apply the grid translation to running task unless it's being snapped to - // and removes the current translation applied to the running task. - runningTaskPrimaryGridTranslation = runningTaskView.getGridTranslationX() - - runningTaskView.getNonGridTranslationX(); - runningTaskSecondaryGridTranslation = runningTaskView.getGridTranslationY(); - } - for (TaskViewSimulator tvs : taskViewSimulators) { - if (animatorSet == null) { - setGridProgress(1); - tvs.taskPrimaryTranslation.value = runningTaskPrimaryGridTranslation; - tvs.taskSecondaryTranslation.value = runningTaskSecondaryGridTranslation; - } else { - animatorSet.play(ObjectAnimator.ofFloat(this, RECENTS_GRID_PROGRESS, 1)); - animatorSet.play(tvs.carouselScale.animateToValue(1)); - animatorSet.play(tvs.carouselPrimaryTranslation.animateToValue(0)); - animatorSet.play(tvs.carouselSecondaryTranslation.animateToValue(0)); - animatorSet.play(tvs.taskPrimaryTranslation.animateToValue( - runningTaskPrimaryGridTranslation)); - animatorSet.play(tvs.taskSecondaryTranslation.animateToValue( - runningTaskSecondaryGridTranslation)); - } - } - } - int splashAlpha = endState.showTaskThumbnailSplash() ? 1 : 0; - if (animatorSet == null) { - setTaskThumbnailSplashAlpha(splashAlpha); - } else { - animatorSet.play( - ObjectAnimator.ofFloat(this, TASK_THUMBNAIL_SPLASH_ALPHA, splashAlpha)); - } + AnimatorSet animatorSet, GestureState.GestureEndTarget endTarget, + RemoteTargetHandle[] remoteTargetHandles, boolean isHandlingAtomicEvent) { + mUtils.onPrepareGestureEndAnimation(animatorSet, endTarget, remoteTargetHandles, + isHandlingAtomicEvent); } /** * Called when a gesture from an app has finished, and the animation to the target has ended. */ public void onGestureAnimationEnd() { - mActiveGestureRunningTasks = null; + setActiveGestureGroupedTaskInfo(null); if (mOrientationState.setGestureActive(false)) { updateOrientationHandler(/* forceRecreateDragLayerControllers = */ false); } @@ -2790,70 +3110,85 @@ public void onGestureAnimationEnd() { setEnableDrawingLiveTile(mCurrentGestureEndTarget == GestureState.GestureEndTarget.RECENTS); Log.d(TAG, "onGestureAnimationEnd - mEnableDrawingLiveTile: " + mEnableDrawingLiveTile); setRunningTaskHidden(false); - animateUpTaskIconScale(); + startIconFadeInOnGestureComplete(); + setTaskIconVisible(true); + mUtils.startAddDesktopButtonFadeInOnGestureComplete(); animateActionsViewIn(); + if (mEnableDrawingLiveTile) { + if (enableDesktopExplodedView()) { + for (TaskView taskView : getTaskViews()) { + if (taskView instanceof DesktopTaskView desktopTaskView) { + desktopTaskView.setRemoteTargetHandles(mRemoteTargetHandles); + } + } + } + TaskView runningTaskView = getRunningTaskView(); + if (showAsGrid() && enableGridOnlyOverview() && runningTaskView != null) { + runActionOnRemoteHandles(remoteTargetHandle -> { + TaskViewSimulator taskViewSimulator = remoteTargetHandle.getTaskViewSimulator(); + // After settling in Overview, recentsScroll will be used to adjust horizontally + // location and taskGridTranslationX doesn't needs to be applied. + taskViewSimulator.taskGridTranslationX.value = 0; + taskViewSimulator.taskGridTranslationY.value = + runningTaskView.getGridTranslationY(); + }); + } + } else { + setCurrentTask(-1); + } + mCurrentGestureEndTarget = null; } /** - * Returns true if we should add a stub taskView for the running task id + * Returns true to avoid adding a stub task even when [getRunningTaskViewFromGroupedTaskInfo] + * cannot find a [runningTaskView]. */ - protected boolean shouldAddStubTaskView(Task[] runningTasks) { - int[] runningTaskIds = Arrays.stream(runningTasks).mapToInt(task -> task.key.id).toArray(); - TaskView matchingTaskView = null; - if (hasDesktopTask(runningTasks) && runningTaskIds.length == 1) { - // TODO(b/249371338): Unsure if it's expected, desktop runningTasks only have a single - // taskId, therefore we match any DesktopTaskView that contains the runningTaskId. - TaskView taskview = getTaskViewByTaskId(runningTaskIds[0]); - if (taskview instanceof DesktopTaskView) { - matchingTaskView = taskview; - } - } else { - matchingTaskView = getTaskViewByTaskIds(runningTaskIds); - } - return matchingTaskView == null; + protected boolean shouldAvoidAddingStubTaskView(GroupedTaskInfo groupedTaskInfo) { + return false; } /** - * Creates a task view (if necessary) to represent the task with the {@param runningTaskId}. + * Creates a task view (if necessary) to represent the tasks with the {@param groupedTaskInfo}. * * All subsequent calls to reload will keep the task as the first item until {@link #reset()} * is called. Also scrolls the view to this task. */ - private void showCurrentTask(Task[] runningTasks) { - Log.d(TAG, "showCurrentTask - runningTasks: " + Arrays.toString(runningTasks)); - if (runningTasks.length == 0) { + private void showCurrentTask(GroupedTaskInfo groupedTaskInfo, String caller) { + Log.d(TAG, "showCurrentTask(" + caller + ") - groupedTaskInfo: " + groupedTaskInfo); + if (groupedTaskInfo == null) { return; } - int runningTaskViewId = -1; - boolean needGroupTaskView = runningTasks.length > 1; - boolean needDesktopTask = hasDesktopTask(runningTasks); - if (shouldAddStubTaskView(runningTasks)) { + + final int runningTaskViewId; + TaskView runningTaskView = mUtils.getRunningTaskViewFromGroupTaskInfo(groupedTaskInfo); + if (runningTaskView != null) { + runningTaskViewId = runningTaskView.getTaskViewId(); + } else if (!shouldAvoidAddingStubTaskView(groupedTaskInfo)) { boolean wasEmpty = getChildCount() == 0; // Add an empty view for now until the task plan is loaded and applied final TaskView taskView; - if (needDesktopTask) { - taskView = getTaskViewFromPool(TaskView.Type.DESKTOP); - mTmpRunningTasks = Arrays.copyOf(runningTasks, runningTasks.length); - ((DesktopTaskView) taskView).bind(Arrays.asList(mTmpRunningTasks), - mOrientationState, mTaskOverlayFactory); - } else if (needGroupTaskView) { - taskView = getTaskViewFromPool(TaskView.Type.GROUPED); - mTmpRunningTasks = new Task[]{runningTasks[0], runningTasks[1]}; + if (groupedTaskInfo.isBaseType(GroupedTaskInfo.TYPE_DESK)) { + taskView = mUtils.createDesktopTaskViewForActiveDesk(groupedTaskInfo); + } else if (groupedTaskInfo.isBaseType(GroupedTaskInfo.TYPE_SPLIT)) { + taskView = getTaskViewFromPool(TaskViewType.GROUPED); // When we create a placeholder task view mSplitBoundsConfig will be null, but with // the actual app running we won't need to show the thumbnail until all the tasks // load later anyways - ((GroupedTaskView)taskView).bind(mTmpRunningTasks[0], mTmpRunningTasks[1], - mOrientationState, mTaskOverlayFactory, mSplitBoundsConfig); + ((GroupedTaskView) taskView).bind( + new SplitTask(Task.from(groupedTaskInfo.getTaskInfo1()), + Task.from(groupedTaskInfo.getTaskInfo2()), mSplitBoundsConfig), + mOrientationState, mTaskOverlayFactory); } else { - taskView = getTaskViewFromPool(TaskView.Type.SINGLE); - // The temporary running task is only used for the duration between the start of the - // gesture and the task list is loaded and applied - mTmpRunningTasks = new Task[]{runningTasks[0]}; - taskView.bind(mTmpRunningTasks[0], mOrientationState, mTaskOverlayFactory); + taskView = getTaskViewFromPool(TaskViewType.SINGLE); + taskView.bind(new SingleTask(Task.from(groupedTaskInfo.getTaskInfo1())), + mOrientationState, mTaskOverlayFactory); } - addView(taskView, 0); + if (mAddDesktopButton != null && wasEmpty) { + addView(mAddDesktopButton); + } + addView(taskView, mUtils.getRunningTaskExpectedIndex(taskView)); runningTaskViewId = taskView.getTaskViewId(); if (wasEmpty) { addView(mClearAllButton); @@ -2864,39 +3199,31 @@ private void showCurrentTask(Task[] runningTasks) { measure(makeMeasureSpec(getMeasuredWidth(), EXACTLY), makeMeasureSpec(getMeasuredHeight(), EXACTLY)); layout(getLeft(), getTop(), getRight(), getBottom()); - } else if (getTaskViewByTaskId(runningTasks[0].key.id) != null) { - runningTaskViewId = getTaskViewByTaskId(runningTasks[0].key.id).getTaskViewId(); + } else { + runningTaskViewId = -1; } boolean runningTaskTileHidden = mRunningTaskTileHidden; setCurrentTask(runningTaskViewId); - mFocusedTaskViewId = enableGridOnlyOverview() ? INVALID_TASK_ID : runningTaskViewId; + + int focusedTaskViewId; + if (enableGridOnlyOverview()) { + focusedTaskViewId = INVALID_TASK_ID; + } else if (getRunningTaskView() instanceof DesktopTaskView) { + TaskView focusedTaskView = mUtils.getFirstNonDesktopTaskView(); + focusedTaskViewId = + focusedTaskView != null ? focusedTaskView.getTaskViewId() : INVALID_TASK_ID; + } else { + focusedTaskViewId = runningTaskViewId; + } + setFocusedTaskViewId(focusedTaskViewId); + runOnPageScrollsInitialized(() -> setCurrentPage(getRunningTaskIndex())); setRunningTaskViewShowScreenshot(false); setRunningTaskHidden(runningTaskTileHidden); // Update task size after setting current task. updateTaskSize(); - updateChildTaskOrientations(); - - // Reload the task list - reloadIfNeeded(); - } - - private boolean hasDesktopTask(Task[] runningTasks) { - try { - if (!DesktopModeStatus.canEnterDesktopMode(getContext())) { - return false; - } - } catch (NoClassDefFoundError e) { - // Desktop mode is not supported on this device - return false; - } - for (Task task : runningTasks) { - if (task.key.windowingMode == WindowConfiguration.WINDOWING_MODE_FREEFORM) { - return true; - } - } - return false; + mUtils.updateChildTaskOrientations(); } /** @@ -2909,7 +3236,7 @@ public void setCurrentTask(int runningTaskViewId) { if (mRunningTaskViewId != -1) { // Reset the state on the old running task view - setTaskIconScaledDown(false); + setTaskIconVisible(true); setRunningTaskViewShowScreenshot(true); setRunningTaskHidden(false); } @@ -2917,21 +3244,20 @@ public void setCurrentTask(int runningTaskViewId) { } private void setRunningTaskViewId(int runningTaskViewId) { - int prevRunningTaskViewId = mRunningTaskViewId; mRunningTaskViewId = runningTaskViewId; - if (Flags.enableRefactorTaskThumbnail()) { - TaskView previousRunningTaskView = getTaskViewFromTaskViewId(prevRunningTaskViewId); - if (previousRunningTaskView != null) { - previousRunningTaskView.notifyIsRunningTaskUpdated(); - } - TaskView newRunningTaskView = getTaskViewFromTaskViewId(runningTaskViewId); - if (newRunningTaskView != null) { - newRunningTaskView.notifyIsRunningTaskUpdated(); - } + if (enableRefactorTaskThumbnail()) { + TaskView runningTaskView = getTaskViewFromTaskViewId(runningTaskViewId); + mRecentsViewModel.updateRunningTask( + runningTaskView != null ? runningTaskView.getTaskIdSet() + : Collections.emptySet()); } } + private void setFocusedTaskViewId(int viewId) { + mFocusedTaskViewId = viewId; + } + private int getTaskViewIdFromTaskId(int taskId) { TaskView taskView = getTaskViewByTaskId(taskId); return taskView != null ? taskView.getTaskViewId() : -1; @@ -2942,68 +3268,79 @@ private int getTaskViewIdFromTaskId(int taskId) { */ public void setRunningTaskHidden(boolean isHidden) { mRunningTaskTileHidden = isHidden; + // mRunningTaskAttachAlpha can be changed by RUNNING_TASK_ATTACH_ALPHA animation without + // changing mRunningTaskTileHidden. + mRunningTaskAttachAlpha = isHidden ? 0f : 1f; TaskView runningTask = getRunningTaskView(); - if (runningTask != null) { - runningTask.setStableAlpha(isHidden ? 0 : mContentAlpha); - if (!isHidden) { - AccessibilityManagerCompat.sendCustomAccessibilityEvent(runningTask, - AccessibilityEvent.TYPE_VIEW_FOCUSED, null); - } + if (runningTask == null) { + return; } + applyAttachAlpha(); + if (!isHidden) { + AccessibilityManagerCompat.sendCustomAccessibilityEvent( + runningTask, AccessibilityEvent.TYPE_VIEW_FOCUSED, null); + } + } + + private void applyAttachAlpha() { + // Only hide non running task carousel when it's fully off screen, otherwise it needs to + // be visible to move to on screen. + mUtils.applyAttachAlpha( + /*nonRunningTaskCarouselHidden=*/mDesktopCarouselDetachProgress == 1f); } private void setRunningTaskViewShowScreenshot(boolean showScreenshot) { + setRunningTaskViewShowScreenshot(showScreenshot, /*updatedThumbnails=*/null); + } + + private void setRunningTaskViewShowScreenshot(boolean showScreenshot, + @Nullable Map updatedThumbnails) { mRunningTaskShowScreenshot = showScreenshot; TaskView runningTaskView = getRunningTaskView(); if (runningTaskView != null) { - runningTaskView.setShouldShowScreenshot(mRunningTaskShowScreenshot); + runningTaskView.setShouldShowScreenshot(mRunningTaskShowScreenshot, updatedThumbnails); + } + if (enableRefactorTaskThumbnail()) { + mRecentsViewModel.setRunningTaskShowScreenshot(showScreenshot); } } - public void setTaskIconScaledDown(boolean isScaledDown) { - if (mTaskIconScaledDown != isScaledDown) { - mTaskIconScaledDown = isScaledDown; - int taskCount = getTaskViewCount(); - for (int i = 0; i < taskCount; i++) { - requireTaskViewAt(i).setIconScaleAndDim(mTaskIconScaledDown ? 0 : 1); + /** + * Updates icon visibility when going in or out of overview. + */ + public void setTaskIconVisible(boolean isVisible) { + if (mTaskIconVisible != isVisible) { + mTaskIconVisible = isVisible; + for (TaskView taskView : getTaskViews()) { + taskView.setIconVisibleForGesture(mTaskIconVisible); } } } private void animateActionsViewIn() { if (!showAsGrid() || isFocusedTaskInExpectedScrollPosition()) { - animateActionsViewAlpha(1, TaskView.SCALE_ICON_DURATION); - } - } - - public void animateUpTaskIconScale() { - mTaskIconScaledDown = false; - int taskCount = getTaskViewCount(); - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); - taskView.animateIconScaleAndDimIntoView(); + animateActionsViewAlpha(1, TaskView.FADE_IN_ICON_DURATION); } } /** - * Updates TaskView and ClearAllButtion scaling and translation required to turn into grid - * layout. - * This method is used when no task dismissal has occurred. + * Updates icon visibility when gesture is settled. */ - private void updateGridProperties() { - updateGridProperties(false, Integer.MAX_VALUE); + public void startIconFadeInOnGestureComplete() { + mTaskIconVisible = true; + for (TaskView taskView : getTaskViews()) { + taskView.startIconFadeInOnGestureComplete(); + } } /** * Updates TaskView and ClearAllButtion scaling and translation required to turn into grid * layout. * - * This method is used when task dismissal has occurred, but rebalance is not needed. - * - * @param isTaskDismissal indicates if update was called due to task dismissal + * Skips rebalance. */ - private void updateGridProperties(boolean isTaskDismissal) { - updateGridProperties(isTaskDismissal, Integer.MAX_VALUE); + protected void updateGridProperties() { + updateGridProperties(null); } /** @@ -3013,83 +3350,112 @@ private void updateGridProperties(boolean isTaskDismissal) { * This method only calculates the potential position and depends on {@link #setGridProgress} to * apply the actual scaling and translation. * - * @param isTaskDismissal indicates if update was called due to task dismissal - * @param startRebalanceAfter which view index to start rebalancing from. Use Integer.MAX_VALUE - * to skip rebalance + * @param lastVisibleTaskViewDuringDismiss which TaskView to start rebalancing from. Use + * `null` to skip rebalance. */ - private void updateGridProperties(boolean isTaskDismissal, int startRebalanceAfter) { - int taskCount = getTaskViewCount(); - if (taskCount == 0) { + protected void updateGridProperties(TaskView lastVisibleTaskViewDuringDismiss) { + if (!hasTaskViews()) { return; } DeviceProfile deviceProfile = mContainer.getDeviceProfile(); - int taskTopMargin = deviceProfile.overviewTaskThumbnailTopMarginPx; + int taskTopMargin = deviceProfile.getOverviewProfile().getTaskThumbnailTopMarginPx(); int topRowWidth = 0; int bottomRowWidth = 0; + int largeTileRowWidth = 0; float topAccumulatedTranslationX = 0; float bottomAccumulatedTranslationX = 0; - // Contains whether the child index is in top or bottom of grid (for non-focused task) - // Different from mTopRowIdSet, which contains the taskViewId of what task is in top row - IntSet topSet = new IntSet(); - IntSet bottomSet = new IntSet(); + // Horizontal grid translation for each task. + Map gridTranslations = new HashMap<>(); - // Horizontal grid translation for each task - float[] gridTranslations = new float[taskCount]; - - int focusedTaskIndex = Integer.MAX_VALUE; - int focusedTaskShift = 0; - int focusedTaskWidthAndSpacing = 0; + TaskView lastLargeTaskView = mUtils.getLastLargeTaskView(); + int focusedTaskViewShift = 0; + int largeTaskWidthAndSpacing = 0; int snappedTaskRowWidth = 0; - int snappedPage = isKeyboardTaskFocusPending() ? mKeyboardTaskFocusIndex : getNextPage(); - TaskView snappedTaskView = getTaskViewAt(snappedPage); + int expectedCurrentTaskRowWidth = 0; + TaskView snappedTaskView = isKeyboardTaskFocusPending() + ? getKeyboardFocusTaskView() : getNextPageTaskView(); TaskView homeTaskView = getHomeTaskView(); + // Determine the currentTaskView when going from Home to Overview, and ensure it can be + // snapped to its expected position. + TaskView expectedCurrentTaskView = mUtils.getExpectedCurrentTask(/* runningTaskView= */null, + getFocusedTaskView()); TaskView nextFocusedTaskView = null; - if (!isTaskDismissal) { + // Don't clear the top row, if the user has dismissed a task, to maintain the task order. + if (!mAnyTaskHasBeenDismissed) { mTopRowIdSet.clear(); } - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); + + // Consecutive task views in the top row or bottom row, which means another one set will + // be cleared up while starting to add TaskViews to one of them. Also means only one of + // them can be non-empty at most. + Set lastTopTaskViews = new HashSet<>(); + Set lastBottomTaskViews = new HashSet<>(); + + int largeTasksCount = 0; + // True if the last large TaskView has been visited during the TaskViews iteration. + boolean encounteredLastLargeTaskView = false; + // True if the highest index visible TaskView has been visited during the TaskViews + // iteration. + boolean encounteredLastVisibleTaskView = false; + for (TaskView taskView : getTaskViews()) { + if (taskView == lastLargeTaskView) { + encounteredLastLargeTaskView = true; + } + if (taskView == lastVisibleTaskViewDuringDismiss) { + encounteredLastVisibleTaskView = true; + } + float gridTranslation = 0f; int taskWidthAndSpacing = taskView.getLayoutParams().width + mPageSpacing; // Evenly distribute tasks between rows unless rearranging due to task dismissal, in // which case keep tasks in their respective rows. For the running task, don't join // the grid. - if (taskView.isFocusedTask()) { - topRowWidth += taskWidthAndSpacing; - bottomRowWidth += taskWidthAndSpacing; - - focusedTaskIndex = i; - focusedTaskWidthAndSpacing = taskWidthAndSpacing; - gridTranslations[i] += focusedTaskShift; - gridTranslations[i] += mIsRtl ? taskWidthAndSpacing : -taskWidthAndSpacing; + if (taskView.isLargeTile()) { + largeTasksCount++; + // DesktopTaskView`s are hidden during split select state, so we shouldn't count + // them when calculating row width. + if (!(taskView instanceof DesktopTaskView && isSplitSelectionActive())) { + topRowWidth += taskWidthAndSpacing; + bottomRowWidth += taskWidthAndSpacing; + largeTileRowWidth += taskWidthAndSpacing; + } + gridTranslation += focusedTaskViewShift; + gridTranslation += mIsRtl ? taskWidthAndSpacing : -taskWidthAndSpacing; // Center view vertically in case it's from different orientation. taskView.setGridTranslationY((mLastComputedTaskSize.height() + taskTopMargin - taskView.getLayoutParams().height) / 2f); + largeTaskWidthAndSpacing = taskWidthAndSpacing; + if (taskView == snappedTaskView) { - // If focused task is snapped, the row width is just task width and spacing. - snappedTaskRowWidth = taskWidthAndSpacing; + snappedTaskRowWidth = largeTileRowWidth; + } + if (taskView == expectedCurrentTaskView) { + expectedCurrentTaskRowWidth = largeTileRowWidth; } } else { - if (i > focusedTaskIndex) { - // For tasks after the focused task, shift by focused task's width and spacing. - gridTranslations[i] += - mIsRtl ? focusedTaskWidthAndSpacing : -focusedTaskWidthAndSpacing; + if (encounteredLastLargeTaskView) { + // For tasks after the last large task, shift by large task's width and spacing. + gridTranslation += + mIsRtl ? largeTaskWidthAndSpacing : -largeTaskWidthAndSpacing; } else { - // For task before the focused task, accumulate the width and spacing to - // calculate the distance focused task need to shift. - focusedTaskShift += mIsRtl ? taskWidthAndSpacing : -taskWidthAndSpacing; + // For TaskViews before the new focused TaskView, accumulate the width and + // spacing to calculate the distance the new focused TaskView needs to shift. + // This could happen for example after multiple times of dismissing the + // focused TaskView, the triggered rebalance might set a non-first TaskView + // inside `mChildren` as the new focused TaskView. + focusedTaskViewShift += mIsRtl ? taskWidthAndSpacing : -taskWidthAndSpacing; } int taskViewId = taskView.getTaskViewId(); - // Rebalance the grid starting after a certain index boolean isTopRow; - if (isTaskDismissal) { - if (i > startRebalanceAfter) { + if (mAnyTaskHasBeenDismissed) { + // Rebalance the grid starting after a certain index. + if (encounteredLastVisibleTaskView) { mTopRowIdSet.remove(taskViewId); isTopRow = topRowWidth <= bottomRowWidth; } else { @@ -3106,47 +3472,47 @@ private void updateGridProperties(boolean isTaskDismissal, int startRebalanceAft } else { topRowWidth += taskWidthAndSpacing; } - topSet.add(i); mTopRowIdSet.add(taskViewId); - taskView.setGridTranslationY(mTaskGridVerticalDiff); // Move horizontally into empty space. float widthOffset = 0; - for (int j = i - 1; !topSet.contains(j) && j >= 0; j--) { - if (j == focusedTaskIndex) { - continue; - } - widthOffset += requireTaskViewAt(j).getLayoutParams().width + mPageSpacing; + for (TaskView bottomTaskView : lastBottomTaskViews) { + widthOffset += bottomTaskView.getLayoutParams().width + mPageSpacing; } float currentTaskTranslationX = mIsRtl ? widthOffset : -widthOffset; - gridTranslations[i] += topAccumulatedTranslationX + currentTaskTranslationX; + gridTranslation += topAccumulatedTranslationX + currentTaskTranslationX; topAccumulatedTranslationX += currentTaskTranslationX; + lastTopTaskViews.add(taskView); + lastBottomTaskViews.clear(); } else { bottomRowWidth += taskWidthAndSpacing; - bottomSet.add(i); // Move into bottom row. taskView.setGridTranslationY(mTopBottomRowHeightDiff + mTaskGridVerticalDiff); // Move horizontally into empty space. float widthOffset = 0; - for (int j = i - 1; !bottomSet.contains(j) && j >= 0; j--) { - if (j == focusedTaskIndex) { - continue; - } - widthOffset += requireTaskViewAt(j).getLayoutParams().width + mPageSpacing; + for (TaskView topTaskView : lastTopTaskViews) { + widthOffset += topTaskView.getLayoutParams().width + mPageSpacing; } float currentTaskTranslationX = mIsRtl ? widthOffset : -widthOffset; - gridTranslations[i] += bottomAccumulatedTranslationX + currentTaskTranslationX; + gridTranslation += bottomAccumulatedTranslationX + currentTaskTranslationX; bottomAccumulatedTranslationX += currentTaskTranslationX; + lastBottomTaskViews.add(taskView); + lastTopTaskViews.clear(); } + int taskViewRowWidth = isTopRow ? topRowWidth : bottomRowWidth; if (taskView == snappedTaskView) { - snappedTaskRowWidth = isTopRow ? topRowWidth : bottomRowWidth; + snappedTaskRowWidth = taskViewRowWidth; + } + if (taskView == expectedCurrentTaskView) { + expectedCurrentTaskRowWidth = taskViewRowWidth; } } + gridTranslations.put(taskView, gridTranslation); } // We need to maintain snapped task's page scroll invariant between quick switch and @@ -3157,22 +3523,22 @@ private void updateGridProperties(boolean isTaskDismissal, int startRebalanceAft if (snappedTaskView != null) { snappedTaskNonGridScrollAdjustment = snappedTaskView.getScrollAdjustment( /*gridEnabled=*/false); - snappedTaskGridTranslationX = gridTranslations[snappedPage]; + snappedTaskGridTranslationX = gridTranslations.getOrDefault(snappedTaskView, 0f); } // Use the accumulated translation of the row containing the last task. - float clearAllAccumulatedTranslation = topSet.contains(taskCount - 1) + float clearAllAccumulatedTranslation = !lastTopTaskViews.isEmpty() ? topAccumulatedTranslationX : bottomAccumulatedTranslationX; // If the last task is on the shorter row, ClearAllButton will embed into the shorter row // which is not what we want. Compensate the width difference of the 2 rows in that case. float shorterRowCompensation = 0; if (topRowWidth <= bottomRowWidth) { - if (topSet.contains(taskCount - 1)) { + if (!lastTopTaskViews.isEmpty()) { shorterRowCompensation = bottomRowWidth - topRowWidth; } } else { - if (bottomSet.contains(taskCount - 1)) { + if (!lastBottomTaskViews.isEmpty()) { shorterRowCompensation = topRowWidth - bottomRowWidth; } } @@ -3183,12 +3549,20 @@ private void updateGridProperties(boolean isTaskDismissal, int startRebalanceAft // accordingly. Update longRowWidth if ClearAllButton has been moved. float clearAllShortTotalWidthTranslation = 0; int longRowWidth = Math.max(topRowWidth, bottomRowWidth); - if (longRowWidth < mLastComputedGridSize.width()) { - mClearAllShortTotalWidthTranslation = - (mIsRtl - ? mLastComputedTaskSize.right - : deviceProfile.widthPx - mLastComputedTaskSize.left) - - longRowWidth - deviceProfile.overviewGridSideMargin; + + // If first task is not in the expected position (mLastComputedTaskSize) and being too close + // to ClearAllButton, then apply extra translation to ClearAllButton. + int rowWidthAfterExpectedCurrentTask = longRowWidth - expectedCurrentTaskRowWidth; + int expectedCurrentTaskWidthAndSpacing = + (expectedCurrentTaskView != null + ? expectedCurrentTaskView.getLayoutParams().width + : 0 + ) + mPageSpacing; + int firstTaskStart = mLastComputedGridSize.left + rowWidthAfterExpectedCurrentTask + + expectedCurrentTaskWidthAndSpacing; + int expectedFirstTaskStart = mLastComputedTaskSize.right; + if (firstTaskStart < expectedFirstTaskStart) { + mClearAllShortTotalWidthTranslation = expectedFirstTaskStart - firstTaskStart; clearAllShortTotalWidthTranslation = mIsRtl ? -mClearAllShortTotalWidthTranslation : mClearAllShortTotalWidthTranslation; if (snappedTaskRowWidth == longRowWidth) { @@ -3203,10 +3577,10 @@ private void updateGridProperties(boolean isTaskDismissal, int startRebalanceAft float clearAllTotalTranslationX = clearAllAccumulatedTranslation + clearAllShorterRowCompensation + clearAllShortTotalWidthTranslation + snappedTaskNonGridScrollAdjustment; - if (focusedTaskIndex < taskCount) { + if (largeTasksCount > 0) { // Shift by focused task's width and spacing if a task is focused. clearAllTotalTranslationX += - mIsRtl ? focusedTaskWidthAndSpacing : -focusedTaskWidthAndSpacing; + mIsRtl ? largeTaskWidthAndSpacing : -largeTaskWidthAndSpacing; } // Make sure there are enough space between snapped page and ClearAllButton, for the case @@ -3217,28 +3591,34 @@ private void updateGridProperties(boolean isTaskDismissal, int startRebalanceAft int minimumDistance = (mIsRtl ? mLastComputedTaskSize.left - : deviceProfile.widthPx - mLastComputedTaskSize.right) - - deviceProfile.overviewGridSideMargin - mPageSpacing - + (mTaskWidth - snappedTaskView.getLayoutParams().width) - - mClearAllShortTotalWidthTranslation; + : deviceProfile.getDeviceProperties().getWidthPx() - mLastComputedTaskSize.right) + - deviceProfile.getOverviewProfile().getGridSideMargin() - mPageSpacing + + (mTaskWidth - snappedTaskView.getLayoutParams().width) + - mClearAllShortTotalWidthTranslation; if (distanceFromClearAll < minimumDistance) { int distanceDifference = minimumDistance - distanceFromClearAll; snappedTaskGridTranslationX += mIsRtl ? distanceDifference : -distanceDifference; } } - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); - taskView.setGridTranslationX(gridTranslations[i] - snappedTaskGridTranslationX - + snappedTaskNonGridScrollAdjustment); + for (TaskView taskView : getTaskViews()) { + taskView.setGridTranslationX( + gridTranslations.getOrDefault(taskView, 0f) - snappedTaskGridTranslationX + + snappedTaskNonGridScrollAdjustment); } - final TaskView runningTask = getRunningTaskView(); - if (showAsGrid() && enableGridOnlyOverview() && runningTask != null) { - runActionOnRemoteHandles( - remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() - .taskSecondaryTranslation.value = runningTask.getGridTranslationY() - ); + if (mAddDesktopButton != null) { + TaskView firstTaskView = getFirstTaskView(); + float translationX = 0f; + if (firstTaskView != null) { + translationX += firstTaskView.getGridTranslationX(); + } + if (focusedTaskViewShift != 0) { + // If the focused task is inserted between `firstTaskView` and + // `mAddDesktopButton`, shift `mAddDesktopButton` to accommodate. + translationX += largeTaskWidthAndSpacing; + } + mAddDesktopButton.setGridTranslationX(translationX); } mClearAllButton.setGridTranslationPrimary( @@ -3246,19 +3626,18 @@ private void updateGridProperties(boolean isTaskDismissal, int startRebalanceAft mClearAllButton.setGridScrollOffset( mIsRtl ? mLastComputedTaskSize.left - mLastComputedGridSize.left : mLastComputedTaskSize.right - mLastComputedGridSize.right); - setGridProgress(mGridProgress); } - private boolean isSameGridRow(TaskView taskView1, TaskView taskView2) { + protected boolean isSameGridRow(TaskView taskView1, TaskView taskView2) { if (taskView1 == null || taskView2 == null) { return false; } - int taskViewId1 = taskView1.getTaskViewId(); - int taskViewId2 = taskView2.getTaskViewId(); - if (taskViewId1 == mFocusedTaskViewId || taskViewId2 == mFocusedTaskViewId) { + if (taskView1.isLargeTile() || taskView2.isLargeTile()) { return false; } + int taskViewId1 = taskView1.getTaskViewId(); + int taskViewId2 = taskView2.getTaskViewId(); return (mTopRowIdSet.contains(taskViewId1) && mTopRowIdSet.contains(taskViewId2)) || ( !mTopRowIdSet.contains(taskViewId1) && !mTopRowIdSet.contains(taskViewId2)); } @@ -3271,53 +3650,19 @@ private boolean isSameGridRow(TaskView taskView1, TaskView taskView2) { private void setGridProgress(float gridProgress) { mGridProgress = gridProgress; - int taskCount = getTaskViewCount(); - for (int i = 0; i < taskCount; i++) { - requireTaskViewAt(i).setGridProgress(gridProgress); + for (TaskView taskView : getTaskViews()) { + taskView.setGridProgress(gridProgress); } mClearAllButton.setGridProgress(gridProgress); } private void setTaskThumbnailSplashAlpha(float taskThumbnailSplashAlpha) { - int taskCount = getTaskViewCount(); - if (taskCount == 0) { - return; - } - mTaskThumbnailSplashAlpha = taskThumbnailSplashAlpha; - for (int i = 0; i < taskCount; i++) { - requireTaskViewAt(i).setTaskThumbnailSplashAlpha(taskThumbnailSplashAlpha); + for (TaskView taskView : getTaskViews()) { + taskView.setTaskThumbnailSplashAlpha(taskThumbnailSplashAlpha); } } - private void enableLayoutTransitions() { - if (mLayoutTransition == null) { - mLayoutTransition = new LayoutTransition(); - mLayoutTransition.enableTransitionType(LayoutTransition.APPEARING); - mLayoutTransition.setDuration(ADDITION_TASK_DURATION); - mLayoutTransition.setStartDelay(LayoutTransition.APPEARING, 0); - - mLayoutTransition.addTransitionListener(new TransitionListener() { - @Override - public void startTransition(LayoutTransition transition, ViewGroup viewGroup, - View view, int i) { - } - - @Override - public void endTransition(LayoutTransition transition, ViewGroup viewGroup, - View view, int i) { - // When the unpinned task is added, snap to first page and disable transitions - if (view instanceof TaskView) { - snapToPage(0); - setLayoutTransition(null); - } - - } - }); - } - setLayoutTransition(mLayoutTransition); - } - public void setSwipeDownShouldLaunchApp(boolean swipeDownShouldLaunchApp) { mSwipeDownShouldLaunchApp = swipeDownShouldLaunchApp; } @@ -3358,12 +3703,9 @@ private void addDismissedTaskAnimations(TaskView taskView, long duration, if (taskView.isRunningTask()) { anim.addOnFrameCallback(() -> { if (!mEnableDrawingLiveTile) return; - runActionOnRemoteHandles( - remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() - .taskSecondaryTranslation.value = getPagedOrientationHandler() - .getSecondaryValue(taskView.getTranslationX(), - taskView.getTranslationY() - )); + runActionOnRemoteHandles(remoteTargetHandle -> + remoteTargetHandle.getTaskViewSimulator().taskSecondaryTranslation.value = + taskView.getSecondaryDismissTranslationProperty().get(taskView)); redrawLiveTile(); }); } @@ -3378,7 +3720,7 @@ private void createInitialSplitSelectAnimation(PendingAnimation anim) { mSplitPlaceholderInset, mContainer.getDeviceProfile(), mSplitSelectStateController.getActiveSplitStagePosition(), mTempRect); SplitAnimationTimings timings = - AnimUtils.getDeviceOverviewToSplitTimings(mContainer.getDeviceProfile().isTablet); + AnimUtils.getDeviceOverviewToSplitTimings(mContainer.getDeviceProfile().getDeviceProperties().isTablet()); RectF startingTaskRect = new RectF(); safeRemoveDragLayerView(mSplitSelectStateController.getFirstFloatingTaskView()); @@ -3387,7 +3729,7 @@ private void createInitialSplitSelectAnimation(PendingAnimation anim) { () -> mSplitHiddenTaskView, () -> mSplitSelectSource); if (mSplitSelectStateController.isAnimateCurrentTaskDismissal()) { // Create the split select animation from Overview - mSplitHiddenTaskView.setThumbnailVisibility(INVISIBLE, + mSplitHiddenTaskView.setThumbnailVisibility(false, mSplitSelectStateController.getInitialTaskId()); anim.setViewAlpha(splitAnimInitProps.getIconView(), 0, clampToProgress(LINEAR, timings.getIconFadeStartOffset(), @@ -3407,7 +3749,8 @@ private void createInitialSplitSelectAnimation(PendingAnimation anim) { firstFloatingTaskView.setOnClickListener(view -> mSplitSelectStateController.getSplitAnimationController(). playAnimPlaceholderToFullscreen(mContainer, view, - Optional.of(() -> resetFromSplitSelectionState()))); + Optional.of(() -> mSplitSelectStateController.resetState()))); + firstFloatingTaskView.setContentDescription(splitAnimInitProps.getContentDescription()); // SplitInstructionsView: animate in safeRemoveDragLayerView(mSplitSelectStateController.getSplitInstructionsView()); @@ -3428,14 +3771,9 @@ private void createInitialSplitSelectAnimation(PendingAnimation anim) { anim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { - if (mSplitHiddenTaskView == getRunningTaskView()) { - finishRecentsAnimation(true /* toRecents */, false /* shouldPip */, - null /* onFinishComplete */); - } else { - switchToScreenshot( - () -> finishRecentsAnimation(true /* toRecents */, - false /* shouldPip */, null /* onFinishComplete */)); - } + switchToScreenshot( + () -> finishRecentsAnimation(true /* toHome */, + false /* shouldPip */, null /* onFinishComplete */)); } }); anim.addEndListener(success -> { @@ -3443,11 +3781,7 @@ public void onAnimationStart(Animator animation) { InteractionJankMonitorWrapper.end(Cuj.CUJ_SPLIT_SCREEN_ENTER); } else { // If transition to split select was interrupted, clean up to prevent glitches - if (FeatureFlags.enableSplitContextually()) { - mSplitSelectStateController.resetState(); - } else { - resetFromSplitSelectionState(); - } + mSplitSelectStateController.resetState(); InteractionJankMonitorWrapper.cancel(Cuj.CUJ_SPLIT_SCREEN_ENTER); } @@ -3457,17 +3791,23 @@ public void onAnimationStart(Animator animation) { /** * Creates a {@link PendingAnimation} for dismissing the specified {@link TaskView}. - * @param dismissedTaskView the {@link TaskView} to be dismissed - * @param animateTaskView whether the {@link TaskView} to be dismissed should be animated - * @param shouldRemoveTask whether the associated {@link Task} should be removed from - * ActivityManager after dismissal - * @param duration duration of the animation + * + * @param dismissedTaskView the {@link TaskView} to be dismissed + * @param animateTaskView whether the {@link TaskView} to be dismissed should be + * animated + * @param shouldRemoveTask whether the associated {@link Task} should be removed from + * ActivityManager after dismissal + * @param duration duration of the animation * @param dismissingForSplitSelection task dismiss animation is used for entering split * selection state from app icon + * @param gridEndData used to compute any gap left between the end of the + * grid and the clear all button. */ - public void createTaskDismissAnimation(PendingAnimation anim, TaskView dismissedTaskView, + public void createTaskDismissAnimation(PendingAnimation anim, + @Nullable TaskView dismissedTaskView, boolean animateTaskView, boolean shouldRemoveTask, long duration, - boolean dismissingForSplitSelection) { + boolean dismissingForSplitSelection, + @Nullable RecentsDismissUtils.GridEndData gridEndData) { if (mPendingAnimation != null) { mPendingAnimation.createPlaybackController().dispatchOnCancel().dispatchOnEnd(); } @@ -3480,35 +3820,44 @@ public void createTaskDismissAnimation(PendingAnimation anim, TaskView dismissed boolean showAsGrid = showAsGrid(); int taskCount = getTaskViewCount(); int dismissedIndex = indexOfChild(dismissedTaskView); - int dismissedTaskViewId = dismissedTaskView.getTaskViewId(); + int dismissedTaskViewId = + dismissedTaskView != null ? dismissedTaskView.getTaskViewId() : INVALID_TASK_ID; // Grid specific properties. boolean isFocusedTaskDismissed = false; boolean isStagingFocusedTask = false; + boolean isSlidingTasks; TaskView nextFocusedTaskView = null; boolean nextFocusedTaskFromTop = false; float dismissedTaskWidth = 0; float nextFocusedTaskWidth = 0; - // Non-grid specific properties. int[] oldScroll = new int[count]; int[] newScroll = new int[count]; int scrollDiffPerPage = 0; + // Non-grid specific properties. boolean needsCurveUpdates = false; + boolean areAllDesktopTasksDismissed = false; if (showAsGrid) { - dismissedTaskWidth = dismissedTaskView.getLayoutParams().width + mPageSpacing; - isFocusedTaskDismissed = dismissedTaskViewId == mFocusedTaskViewId; + if (dismissedTaskView != null) { + dismissedTaskWidth = dismissedTaskView.getLayoutParams().width + mPageSpacing; + } + isFocusedTaskDismissed = dismissedTaskViewId != INVALID_TASK_ID + && dismissedTaskViewId == mFocusedTaskViewId; + if (dismissingForSplitSelection && getTaskViewAt( + mCurrentPage) instanceof DesktopTaskView) { + areAllDesktopTasksDismissed = true; + } if (isFocusedTaskDismissed) { if (isSplitSelectionActive()) { isStagingFocusedTask = true; } else { nextFocusedTaskFromTop = - mTopRowIdSet.size() > 0 && mTopRowIdSet.size() >= (taskCount - 1) / 2f; + !mTopRowIdSet.isEmpty() && mTopRowIdSet.size() >= (taskCount - 1) / 2f; // Pick the next focused task from the preferred row. - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); - if (taskView == dismissedTaskView) { + for (TaskView taskView : getTaskViews()) { + if (taskView == dismissedTaskView || taskView.isLargeTile()) { continue; } boolean isTopRow = mTopRowIdSet.contains(taskView.getTaskViewId()); @@ -3524,288 +3873,177 @@ public void createTaskDismissAnimation(PendingAnimation anim, TaskView dismissed } } } - } else { - getPageScrolls(oldScroll, false, SIMPLE_SCROLL_LOGIC); - getPageScrolls(newScroll, false, - v -> v.getVisibility() != GONE && v != dismissedTaskView); - if (count > 1) { - scrollDiffPerPage = Math.abs(oldScroll[1] - oldScroll[0]); - } } + getPageScrolls(oldScroll, false, SIMPLE_SCROLL_LOGIC); + getPageScrolls(newScroll, false, + v -> v.getVisibility() != GONE && v != dismissedTaskView); + if (count > 1) { + scrollDiffPerPage = Math.abs(oldScroll[1] - oldScroll[0]); + } + + isSlidingTasks = isStagingFocusedTask || areAllDesktopTasksDismissed; float dismissTranslationInterpolationEnd = 1; boolean closeGapBetweenClearAll = false; boolean isClearAllHidden = isClearAllHidden(); - boolean snapToLastTask = false; - boolean isLeftRightSplit = - mContainer.getDeviceProfile().isLeftRightSplit && isSplitSelectionActive(); - TaskView lastGridTaskView = showAsGrid ? getLastGridTaskView() : null; - int currentPageScroll = getScrollForPage(mCurrentPage); - int lastGridTaskScroll = getScrollForPage(indexOfChild(lastGridTaskView)); - boolean currentPageSnapsToEndOfGrid = currentPageScroll == lastGridTaskScroll; - if (lastGridTaskView != null && lastGridTaskView.isVisibleToUser()) { - // After dismissal, animate translation of the remaining tasks to fill any gap left - // between the end of the grid and the clear all button. Only animate if the clear - // all button is visible or would become visible after dismissal. - float longGridRowWidthDiff = 0; - - int topGridRowSize = mTopRowIdSet.size(); - int bottomGridRowSize = taskCount - mTopRowIdSet.size() - - (enableGridOnlyOverview() ? 0 : 1); - boolean topRowLonger = topGridRowSize > bottomGridRowSize; - boolean bottomRowLonger = bottomGridRowSize > topGridRowSize; - boolean dismissedTaskFromTop = mTopRowIdSet.contains(dismissedTaskViewId); - boolean dismissedTaskFromBottom = !dismissedTaskFromTop && !isFocusedTaskDismissed; - if (dismissedTaskFromTop || (isFocusedTaskDismissed && nextFocusedTaskFromTop)) { - topGridRowSize--; - } - if (dismissedTaskFromBottom || (isFocusedTaskDismissed && !nextFocusedTaskFromTop)) { - bottomGridRowSize--; - } - int longRowWidth = Math.max(topGridRowSize, bottomGridRowSize) - * (mLastComputedGridTaskSize.width() + mPageSpacing); - if (!enableGridOnlyOverview() && !isStagingFocusedTask) { - longRowWidth += mLastComputedTaskSize.width() + mPageSpacing; - } - - float gapWidth = 0; - if ((topRowLonger && dismissedTaskFromTop) - || (bottomRowLonger && dismissedTaskFromBottom)) { - gapWidth = dismissedTaskWidth; - } else if (nextFocusedTaskView != null - && ((topRowLonger && nextFocusedTaskFromTop) - || (bottomRowLonger && !nextFocusedTaskFromTop))) { - gapWidth = nextFocusedTaskWidth; - } - if (gapWidth > 0) { - if (mClearAllShortTotalWidthTranslation == 0) { - // Compensate the removed gap if we don't already have shortTotalCompensation, - // and adjust accordingly to the new shortTotalCompensation after dismiss. - int newClearAllShortTotalWidthTranslation = 0; - if (longRowWidth < mLastComputedGridSize.width()) { - DeviceProfile deviceProfile = mContainer.getDeviceProfile(); - newClearAllShortTotalWidthTranslation = - (mIsRtl - ? mLastComputedTaskSize.right - : deviceProfile.widthPx - mLastComputedTaskSize.left) - - longRowWidth - deviceProfile.overviewGridSideMargin; - } - float gapCompensation = gapWidth - newClearAllShortTotalWidthTranslation; - longGridRowWidthDiff += mIsRtl ? -gapCompensation : gapCompensation; - } - if (isClearAllHidden) { - // If ClearAllButton isn't fully shown, snap to the last task. - snapToLastTask = true; - } - } - if (isLeftRightSplit && !isStagingFocusedTask) { - // LastTask's scroll is the minimum scroll in split select, if current scroll is - // beyond that, we'll need to snap to last task instead. - TaskView lastTask = getLastGridTaskView(); - if (lastTask != null) { - int primaryScroll = getPagedOrientationHandler().getPrimaryScroll(this); - int lastTaskScroll = getScrollForPage(indexOfChild(lastTask)); - if ((mIsRtl && primaryScroll < lastTaskScroll) - || (!mIsRtl && primaryScroll > lastTaskScroll)) { - snapToLastTask = true; - } - } - } - if (snapToLastTask) { - longGridRowWidthDiff += getSnapToLastTaskScrollDiff(); - } else if (isLeftRightSplit && currentPageSnapsToEndOfGrid) { - // Use last task as reference point for scroll diff and snapping calculation as it's - // the only invariant point in landscape split screen. - snapToLastTask = true; - } - - // If we need to animate the grid to compensate the clear all gap, we split the second - // half of the dismiss pending animation (in which the non-dismissed tasks slide into - // place) in half again, making the first quarter the existing non-dismissal sliding - // and the second quarter this new animation of gap filling. This is due to the fact - // that PendingAnimation is a single animation, not a sequence of animations, so we - // fake it using interpolation. - if (longGridRowWidthDiff != 0) { - closeGapBetweenClearAll = true; - // Stagger the offsets of each additional task for a delayed animation. We use - // half here as this animation is half of half of an animation (1/4th). - float halfAdditionalDismissTranslationOffset = - (0.5f * ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET); + + if (gridEndData == null) { + gridEndData = mDismissUtils.getGridEndData(dismissedTaskView, + false /* isExpressiveDismiss */, isFocusedTaskDismissed, nextFocusedTaskView, + isStagingFocusedTask, nextFocusedTaskFromTop, nextFocusedTaskWidth); + } + float longGridRowWidthDiff = gridEndData.getGridEndOffset(); + boolean snapToLastTask = gridEndData.getSnapToLastTask(); + float newClearAllShortTotalWidthTranslation = + gridEndData.getNewClearAllShortTotalWidthTranslation(); + boolean currentPageSnapsToEndOfGrid = gridEndData.getCurrentPageSnapsToEndOfGrid(); + if (longGridRowWidthDiff != 0f) { + closeGapBetweenClearAll = true; + } + + // After dismissal, animate translation of the remaining tasks to fill any gap left + // between the end of the grid and the clear all button. Only animate if the clear + // all button is visible or would become visible after dismissal. + if (longGridRowWidthDiff != 0) { + // If we need to animate the grid to compensate the clear all gap, we split the + // second half of the dismiss pending animation (in which the non-dismissed tasks + // slide into place) in half again, making the first quarter the existing + // non-dismissal sliding and the second quarter this new animation of gap filling. + // This is due to the fact that PendingAnimation is a single animation, not a + // sequence of animations, so we fake it using interpolation. Stagger the offsets of + // each additional task for a delayed animation. We use half here as this animation is + // half of half of an animation (1/4th). + float halfAdditionalDismissTranslationOffset = + (0.5f * ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET); + dismissTranslationInterpolationEnd = Utilities.boundToRange( + END_DISMISS_TRANSLATION_INTERPOLATION_OFFSET + + (taskCount - 1) * halfAdditionalDismissTranslationOffset, + END_DISMISS_TRANSLATION_INTERPOLATION_OFFSET, 1); + for (TaskView taskView : getTaskViews()) { + anim.setFloat(taskView, TaskView.GRID_END_TRANSLATION_X, + longGridRowWidthDiff, + clampToProgress(LINEAR, dismissTranslationInterpolationEnd, 1)); dismissTranslationInterpolationEnd = Utilities.boundToRange( - END_DISMISS_TRANSLATION_INTERPOLATION_OFFSET - + (taskCount - 1) * halfAdditionalDismissTranslationOffset, + dismissTranslationInterpolationEnd + - halfAdditionalDismissTranslationOffset, END_DISMISS_TRANSLATION_INTERPOLATION_OFFSET, 1); - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); - anim.setFloat(taskView, TaskView.GRID_END_TRANSLATION_X, longGridRowWidthDiff, - clampToProgress(LINEAR, dismissTranslationInterpolationEnd, 1)); - dismissTranslationInterpolationEnd = Utilities.boundToRange( - dismissTranslationInterpolationEnd - - halfAdditionalDismissTranslationOffset, - END_DISMISS_TRANSLATION_INTERPOLATION_OFFSET, 1); - if (mEnableDrawingLiveTile && taskView.isRunningTask()) { - anim.addOnFrameCallback(() -> { - runActionOnRemoteHandles( - remoteTargetHandle -> - remoteTargetHandle.getTaskViewSimulator() - .taskPrimaryTranslation.value = - TaskView.GRID_END_TRANSLATION_X.get(taskView)); - redrawLiveTile(); - }); - } - } - - // Change alpha of clear all if translating grid to hide it - if (isClearAllHidden) { - anim.setFloat(mClearAllButton, DISMISS_ALPHA, 0, LINEAR); - anim.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); - mClearAllButton.setDismissAlpha(1); - } + if (mEnableDrawingLiveTile && taskView.isRunningTask()) { + anim.addOnFrameCallback(() -> { + runActionOnRemoteHandles(remoteTargetHandle -> + remoteTargetHandle.getTaskViewSimulator() + .taskPrimaryTranslation.value = + TaskView.GRID_END_TRANSLATION_X.get(taskView)); + redrawLiveTile(); }); } } + + // Change alpha of clear all if translating grid to hide it + if (isClearAllHidden) { + anim.setFloat(mClearAllButton, DISMISS_ALPHA, 0, LINEAR); + anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + mClearAllButton.setDismissAlpha(1); + } + }); + } } SplitAnimationTimings splitTimings = - AnimUtils.getDeviceOverviewToSplitTimings(mContainer.getDeviceProfile().isTablet); - - int distanceFromDismissedTask = 0; + AnimUtils.getDeviceOverviewToSplitTimings(mContainer.getDeviceProfile().getDeviceProperties().isTablet()); + + int distanceFromDismissedTask = 1; + int slidingTranslation = 0; + if (isSlidingTasks) { + int nextSnappedPage = indexOfChild(isStagingFocusedTask + ? mUtils.getFirstSmallTaskView() + : mUtils.getFirstNonDesktopTaskView()); + slidingTranslation = getPagedOrientationHandler().getPrimaryScroll(this) + - getScrollForPage(nextSnappedPage); + slidingTranslation += mIsRtl ? newClearAllShortTotalWidthTranslation + : -newClearAllShortTotalWidthTranslation; + } + mTaskViewsDismissPrimaryTranslations.clear(); + int lastTaskViewIndex = indexOfChild(mUtils.getLastTaskView()); for (int i = 0; i < count; i++) { View child = getChildAt(i); if (child == dismissedTaskView) { - if (animateTaskView) { - if (dismissingForSplitSelection) { - createInitialSplitSelectAnimation(anim); - } else { - addDismissedTaskAnimations(dismissedTaskView, duration, anim); - } + if (animateTaskView && !dismissingForSplitSelection) { + addDismissedTaskAnimations(dismissedTaskView, duration, anim); } - } else if (!showAsGrid) { - // Compute scroll offsets from task dismissal for animation. - // If we just take newScroll - oldScroll, everything to the right of dragged task - // translates to the left. We need to offset this in some cases: - // - In RTL, add page offset to all pages, since we want pages to move to the right - // Additionally, add a page offset if: - // - Current page is rightmost page (leftmost for RTL) - // - Dragging an adjacent page on the left side (right side for RTL) - int offset = mIsRtl ? scrollDiffPerPage : 0; - if (mCurrentPage == dismissedIndex) { - int lastPage = taskCount - 1; - if (mCurrentPage == lastPage) { - offset += mIsRtl ? -scrollDiffPerPage : scrollDiffPerPage; - } - } else { - // Dismissing an adjacent page. - int negativeAdjacent = mCurrentPage - 1; // (Right in RTL, left in LTR) - if (dismissedIndex == negativeAdjacent) { - offset += mIsRtl ? -scrollDiffPerPage : scrollDiffPerPage; - } - } - + } else if (!showAsGrid || (dismissedTaskView != null && dismissedTaskView.isLargeTile() + && nextFocusedTaskView == null && !dismissingForSplitSelection)) { + int offset = getOffsetToDismissedTask(scrollDiffPerPage, dismissedIndex, + lastTaskViewIndex); int scrollDiff = newScroll[i] - oldScroll[i] + offset; if (scrollDiff != 0) { - FloatProperty translationProperty = child instanceof TaskView - ? ((TaskView) child).getPrimaryDismissTranslationProperty() - : getPagedOrientationHandler().getPrimaryViewTranslate(); - - float additionalDismissDuration = - ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET * Math.abs( - i - dismissedIndex); - - // We are in non-grid layout. - // If dismissing for split select, use split timings. - // If not, use dismiss timings. - float animationStartProgress = isSplitSelectionActive() - ? Utilities.boundToRange(splitTimings.getGridSlideStartOffset(), 0f, 1f) - : Utilities.boundToRange( - INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET - + additionalDismissDuration, 0f, 1f); - - float animationEndProgress = isSplitSelectionActive() - ? Utilities.boundToRange(splitTimings.getGridSlideStartOffset() - + splitTimings.getGridSlideDurationOffset(), 0f, 1f) - : 1f; - - // Slide tiles in horizontally to fill dismissed area - anim.setFloat(child, translationProperty, scrollDiff, - clampToProgress( - splitTimings.getGridSlidePrimaryInterpolator(), - animationStartProgress, - animationEndProgress - ) - ); - - if (mEnableDrawingLiveTile && child instanceof TaskView - && ((TaskView) child).isRunningTask()) { - anim.addOnFrameCallback(() -> { - runActionOnRemoteHandles( - remoteTargetHandle -> - remoteTargetHandle.getTaskViewSimulator() - .taskPrimaryTranslation.value = - getPagedOrientationHandler().getPrimaryValue( - child.getTranslationX(), - child.getTranslationY() - )); - redrawLiveTile(); - }); + translateTaskWhenDismissed( + child, + Math.abs(i - dismissedIndex), + scrollDiff, + anim, + splitTimings); + if (child instanceof TaskView taskView) { + mTaskViewsDismissPrimaryTranslations.put(taskView, scrollDiffPerPage); } needsCurveUpdates = true; } - } else if (child instanceof TaskView) { - TaskView taskView = (TaskView) child; - if (isFocusedTaskDismissed) { - if (nextFocusedTaskView != null && - !isSameGridRow(taskView, nextFocusedTaskView)) { - continue; - } - } else { - if (i < dismissedIndex || !isSameGridRow(taskView, dismissedTaskView)) { - continue; - } - } + } else if (child instanceof TaskView taskView) { // Animate task with index >= dismissed index and in the same row as the // dismissed index or next focused index. Offset successive task dismissal // durations for a staggered effect. - distanceFromDismissedTask++; - int staggerColumn = isStagingFocusedTask + int staggerColumn = isSlidingTasks ? (int) Math.ceil(distanceFromDismissedTask / 2f) : distanceFromDismissedTask; // Set timings based on if user is initiating splitscreen on the focused task, // or splitting/dismissing some other task. - float animationStartProgress = isStagingFocusedTask - ? Utilities.boundToRange( - splitTimings.getGridSlideStartOffset() - + (splitTimings.getGridSlideStaggerOffset() - * staggerColumn), - 0f, - dismissTranslationInterpolationEnd) - : Utilities.boundToRange( - INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET - + ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET - * staggerColumn, 0f, dismissTranslationInterpolationEnd); - float animationEndProgress = isStagingFocusedTask - ? Utilities.boundToRange( - splitTimings.getGridSlideStartOffset() - + (splitTimings.getGridSlideStaggerOffset() * staggerColumn) - + splitTimings.getGridSlideDurationOffset(), - 0f, - dismissTranslationInterpolationEnd) - : dismissTranslationInterpolationEnd; - Interpolator dismissInterpolator = isStagingFocusedTask ? OVERSHOOT_0_75 : LINEAR; + final float animationStartProgress; + if (isSlidingTasks) { + float slidingStartOffset = splitTimings.getGridSlideStartOffset() + + (splitTimings.getGridSlideStaggerOffset() * staggerColumn); + if (areAllDesktopTasksDismissed) { + animationStartProgress = Utilities.boundToRange( + slidingStartOffset + + splitTimings.getDesktopFadeSplitAnimationEndOffset(), + 0f, + dismissTranslationInterpolationEnd); + } else { + animationStartProgress = Utilities.boundToRange( + slidingStartOffset, + 0f, + dismissTranslationInterpolationEnd); + } + } else { + animationStartProgress = Utilities.boundToRange( + INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET + + ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET + * staggerColumn, 0f, dismissTranslationInterpolationEnd); + } + + final float animationEndProgress; + if (isSlidingTasks && taskView != nextFocusedTaskView) { + animationEndProgress = Utilities.boundToRange( + splitTimings.getGridSlideStartOffset() + + (splitTimings.getGridSlideStaggerOffset() * staggerColumn) + + splitTimings.getGridSlideDurationOffset(), + 0f, + dismissTranslationInterpolationEnd); + } else { + animationEndProgress = dismissTranslationInterpolationEnd; + } + + Interpolator dismissInterpolator = isSlidingTasks ? EMPHASIZED : LINEAR; + float primaryTranslation = 0; if (taskView == nextFocusedTaskView) { // Enlarge the task to be focused next, and translate into focus position. float scale = mTaskWidth / (float) mLastComputedGridTaskSize.width(); anim.setFloat(taskView, TaskView.DISMISS_SCALE, scale, clampToProgress(LINEAR, animationStartProgress, dismissTranslationInterpolationEnd)); - anim.setFloat(taskView, taskView.getPrimaryDismissTranslationProperty(), - mIsRtl ? dismissedTaskWidth : -dismissedTaskWidth, - clampToProgress(LINEAR, animationStartProgress, - dismissTranslationInterpolationEnd)); + primaryTranslation += dismissedTaskWidth; float secondaryTranslation = -mTaskGridVerticalDiff; if (!nextFocusedTaskFromTop) { secondaryTranslation -= mTopBottomRowHeightDiff; @@ -3813,27 +4051,42 @@ public void onAnimationEnd(Animator animation) { anim.setFloat(taskView, taskView.getSecondaryDismissTranslationProperty(), secondaryTranslation, clampToProgress(LINEAR, animationStartProgress, dismissTranslationInterpolationEnd)); - anim.add(taskView.getFocusTransitionScaleAndDimOutAnimator(), + anim.add(taskView.getDismissIconFadeOutAnimator(), clampToProgress(LINEAR, 0f, ANIMATION_DISMISS_PROGRESS_MIDPOINT)); - } else { - float primaryTranslation = + } else if ((isFocusedTaskDismissed && nextFocusedTaskView != null && isSameGridRow( + taskView, nextFocusedTaskView)) + || (!isFocusedTaskDismissed && i >= dismissedIndex && isSameGridRow( + taskView, dismissedTaskView))) { + primaryTranslation += nextFocusedTaskView != null ? nextFocusedTaskWidth : dismissedTaskWidth; - if (isStagingFocusedTask) { - // Moves less if focused task is not in scroll position. - int focusedTaskScroll = getScrollForPage(dismissedIndex); - int primaryScroll = getPagedOrientationHandler().getPrimaryScroll(this); - int focusedTaskScrollDiff = primaryScroll - focusedTaskScroll; - primaryTranslation += - mIsRtl ? focusedTaskScrollDiff : -focusedTaskScrollDiff; - } + } + if (!(taskView instanceof DesktopTaskView)) { + primaryTranslation += mIsRtl ? slidingTranslation : -slidingTranslation; + } - anim.setFloat(taskView, taskView.getPrimaryDismissTranslationProperty(), - mIsRtl ? primaryTranslation : -primaryTranslation, + if (primaryTranslation != 0) { + float finalTranslation = mIsRtl ? primaryTranslation : -primaryTranslation; + float startTranslation = 0; + if (!(taskView instanceof DesktopTaskView) && slidingTranslation != 0) { + startTranslation = isTaskViewVisible(taskView) ? 0 + : finalTranslation + (mIsRtl ? -mLastComputedTaskSize.right + : mLastComputedTaskSize.right); + } + Animator dismissAnimator = ObjectAnimator.ofFloat(taskView, + taskView.getPrimaryDismissTranslationProperty(), + startTranslation, finalTranslation); + dismissAnimator.setInterpolator( clampToProgress(dismissInterpolator, animationStartProgress, animationEndProgress)); + anim.add(dismissAnimator); + mTaskViewsDismissPrimaryTranslations.put(taskView, (int) finalTranslation); + distanceFromDismissedTask++; } } } + if (dismissingForSplitSelection) { + createInitialSplitSelectAnimation(anim); + } if (needsCurveUpdates) { anim.addOnFrameCallback(this::updateCurveProperties); @@ -3842,21 +4095,26 @@ secondaryTranslation, clampToProgress(LINEAR, animationStartProgress, // Add a tiny bit of translation Z, so that it draws on top of other views. This is relevant // (e.g.) when we dismiss a task by sliding it upward: if there is a row of icons above, we // want the dragged task to stay above all other views. - if (animateTaskView) { + if (animateTaskView && dismissedTaskView != null) { dismissedTaskView.setTranslationZ(0.1f); } - + loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL); + if (!dismissingForSplitSelection) { + anim.addStartListener(() -> InteractionJankMonitorWrapper.begin(this, + Cuj.CUJ_LAUNCHER_OVERVIEW_TASK_DISMISS)); + } mPendingAnimation = anim; final TaskView finalNextFocusedTaskView = nextFocusedTaskView; final boolean finalCloseGapBetweenClearAll = closeGapBetweenClearAll; final boolean finalSnapToLastTask = snapToLastTask; final boolean finalIsFocusedTaskDismissed = isFocusedTaskDismissed; - mPendingAnimation.addEndListener(new Consumer() { + mPendingAnimation.addEndListener(new Consumer<>() { @Override public void accept(Boolean success) { - if (mEnableDrawingLiveTile && dismissedTaskView.isRunningTask() && success) { - finishRecentsAnimation(true /* toRecents */, false /* shouldPip */, - () -> onEnd(success)); + if (mEnableDrawingLiveTile && dismissedTaskView != null + && dismissedTaskView.isRunningTask() && success) { + finishRecentsAnimation(true /* toHome */, false /* shouldPip */, + () -> onEnd(true)); } else { onEnd(success); } @@ -3869,17 +4127,21 @@ private void onEnd(boolean success) { resetTaskVisuals(); if (success) { - if (shouldRemoveTask) { + mAnyTaskHasBeenDismissed = true; + // Caches the [groupTask] before removing it. As the [deskId] might become + // invalid by [removeViewInLayout] on the [dismissedTaskView] below. It might + // happen before [removeGroupTaskInternal] that runs on a helper thread. + final GroupTask groupTask; + if (shouldRemoveTask && dismissedTaskView != null + && (groupTask = dismissedTaskView.getGroupTask()) != null) { if (dismissedTaskView.isRunningTask()) { - finishRecentsAnimation(true /* toRecents */, false /* shouldPip */, - () -> removeTaskInternal(dismissedTaskViewId)); + finishRecentsAnimation(true /* toHome */, false /* shouldPip */, + () -> removeGroupTaskInternal(groupTask)); } else { - removeTaskInternal(dismissedTaskViewId); + removeGroupTaskInternal(groupTask); } - announceForAccessibility( - getResources().getString(R.string.task_view_closed)); mContainer.getStatsLogManager().logger() - .withItemInfo(dismissedTaskView.getFirstItemInfo()) + .withItemInfo(dismissedTaskView.getItemInfo()) .log(LAUNCHER_TASK_DISMISS_SWIPE_UP); } @@ -3895,7 +4157,7 @@ private void onEnd(boolean success) { pageToSnapTo = indexOfChild(mClearAllButton); } else if (isClearAllHidden) { // Snap to focused task if clear all is hidden. - pageToSnapTo = 0; + pageToSnapTo = getFirstTaskViewIndex(); } } else { // Get the id of the task view we will snap to based on the current @@ -3913,7 +4175,7 @@ private void onEnd(boolean success) { } else { // Won't focus next task in split select, so snap to the // first task. - pageToSnapTo = 0; + pageToSnapTo = getFirstTaskViewIndex(); calculateScrollDiff = false; } } else { @@ -3921,8 +4183,8 @@ private void onEnd(boolean success) { boolean isSnappedTaskInTopRow = mTopRowIdSet.contains( snappedTaskViewId); IntArray taskViewIdArray = - isSnappedTaskInTopRow ? getTopRowIdArray() - : getBottomRowIdArray(); + isSnappedTaskInTopRow ? mUtils.getTopRowIdArray() + : mUtils.getBottomRowIdArray(); int snappedIndex = taskViewIdArray.indexOf(snappedTaskViewId); taskViewIdArray.removeValue(dismissedTaskViewId); if (finalNextFocusedTaskView != null) { @@ -3937,8 +4199,8 @@ private void onEnd(boolean success) { // dismissed row, // snap to the same column in the other grid row IntArray inverseRowTaskViewIdArray = - isSnappedTaskInTopRow ? getBottomRowIdArray() - : getTopRowIdArray(); + isSnappedTaskInTopRow ? mUtils.getBottomRowIdArray() + : mUtils.getTopRowIdArray(); if (snappedIndex < inverseRowTaskViewIdArray.size()) { taskViewIdToSnapTo = inverseRowTaskViewIdArray.get( snappedIndex); @@ -3954,7 +4216,7 @@ private void onEnd(boolean success) { mCurrentPageScrollDiff = primaryScroll - currentPageScroll; } } - } else if (dismissedIndex < pageToSnapTo || pageToSnapTo == taskCount - 1) { + } else if (dismissedIndex < pageToSnapTo || pageToSnapTo == lastTaskViewIndex) { pageToSnapTo--; } boolean isHomeTaskDismissed = dismissedTaskView == getHomeTaskView(); @@ -3962,37 +4224,40 @@ private void onEnd(boolean success) { mTopRowIdSet.remove(dismissedTaskViewId); if (taskCount == 1) { - removeViewInLayout(mClearAllButton); - if (isHomeTaskDismissed) { - updateEmptyMessage(); - } else if (!mSplitSelectStateController.isSplitSelectActive()) { - startHome(); + if (!isSplitSelectionActive()) { + removeViewInLayout(mClearAllButton); + removeViewInLayout(mAddDesktopButton); + if (isHomeTaskDismissed) { + updateEmptyMessage(); + } else { + startHome(); + } } } else { // Update focus task and its size. if (finalIsFocusedTaskDismissed && finalNextFocusedTaskView != null) { - mFocusedTaskViewId = enableGridOnlyOverview() + setFocusedTaskViewId(enableGridOnlyOverview() ? INVALID_TASK_ID - : finalNextFocusedTaskView.getTaskViewId(); + : finalNextFocusedTaskView.getTaskViewId()); mTopRowIdSet.remove(mFocusedTaskViewId); - finalNextFocusedTaskView.animateIconScaleAndDimIntoView(); + finalNextFocusedTaskView.getDismissIconFadeInAnimator().start(); } - updateTaskSize(/*isTaskDismissal=*/ true); - updateChildTaskOrientations(); + updateTaskSize(); + mUtils.updateChildTaskOrientations(); // Update scroll and snap to page. updateScrollSynchronously(); if (showAsGrid) { // Rebalance tasks in the grid - int highestVisibleTaskIndex = getHighestVisibleTaskIndex(); - if (highestVisibleTaskIndex < Integer.MAX_VALUE) { - TaskView taskView = requireTaskViewAt(highestVisibleTaskIndex); - + TaskView highestVisibleTaskView = getHighestVisibleTaskView(); + if (highestVisibleTaskView != null) { boolean shouldRebalance; int screenStart = getPagedOrientationHandler().getPrimaryScroll( RecentsView.this); - int taskStart = getPagedOrientationHandler().getChildStart(taskView) - + (int) taskView.getOffsetAdjustment(/*gridEnabled=*/ true); + int taskStart = getPagedOrientationHandler().getChildStart( + highestVisibleTaskView) + + (int) highestVisibleTaskView.getOffsetAdjustment( + /*gridEnabled=*/true); // Rebalance only if there is a maximum gap between the task and the // screen's edge; this ensures that rebalanced tasks are outside the @@ -4005,26 +4270,33 @@ private void onEnd(boolean success) { RecentsView.this); int taskSize = (int) ( getPagedOrientationHandler().getMeasuredSize( - taskView) * taskView - .getSizeAdjustment(/*fullscreenEnabled=*/false)); + highestVisibleTaskView) * highestVisibleTaskView + .getSizeAdjustment(/*fullscreenEnabled=*/ + false)); int taskEnd = taskStart + taskSize; shouldRebalance = taskEnd >= screenEnd - mPageSpacing; } if (shouldRebalance) { - updateGridProperties(/*isTaskDismissal=*/ true, - highestVisibleTaskIndex); + updateGridProperties(highestVisibleTaskView); updateScrollSynchronously(); } } - IntArray topRowIdArray = getTopRowIdArray(); - IntArray bottomRowIdArray = getBottomRowIdArray(); + IntArray topRowIdArray = mUtils.getTopRowIdArray(); + IntArray bottomRowIdArray = mUtils.getBottomRowIdArray(); if (finalSnapToLastTask) { // If snapping to last task, find the last task after dismissal. pageToSnapTo = indexOfChild( getLastGridTaskView(topRowIdArray, bottomRowIdArray)); + + if (pageToSnapTo == INVALID_PAGE) { + // Snap to latest large tile page after dismissing the + // last grid task. This will prevent snapping to page 0 when + // desktop task is visible as large tile. + pageToSnapTo = indexOfChild(mUtils.getLastLargeTaskView()); + } } else if (taskViewIdToSnapTo != -1) { // If snapping to another page due to indices rearranging, find // the new index after dismissal & rearrange using the task view id. @@ -4044,7 +4316,7 @@ private void onEnd(boolean success) { // Update various scroll-dependent UI. dispatchScrollChanged(); updateActionsViewFocusedScroll(); - if (isClearAllHidden() && !mContainer.getDeviceProfile().isTablet) { + if (!mContainer.getDeviceProfile().getDeviceProperties().isTablet()) { mActionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, false); } @@ -4053,89 +4325,141 @@ private void onEnd(boolean success) { updateCurrentTaskActionsVisibility(); onDismissAnimationEnds(); mPendingAnimation = null; + mTaskViewsDismissPrimaryTranslations.clear(); + + if (!dismissingForSplitSelection && success) { + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_OVERVIEW_TASK_DISMISS); + } else if (!dismissingForSplitSelection) { + InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_OVERVIEW_TASK_DISMISS); + } } }); } + /** + * Compute scroll offsets from task dismissal for animation. + * If we just take newScroll - oldScroll, everything to the right of dragged task + * translates to the left. We need to offset this in some cases: + * - In RTL, add page offset to all pages, since we want pages to move to the right + * Additionally, add a page offset if: + * - Current page is rightmost page (leftmost for RTL) + * - Dragging an adjacent page on the left side (right side for RTL) + */ + private int getOffsetToDismissedTask(int scrollDiffPerPage, int dismissedIndex, + int lastTaskViewIndex) { + // If `mCurrentPage` is beyond `lastTaskViewIndex`, use the last TaskView instead to + // calculate offset. + int currentPage = Math.min(mCurrentPage, lastTaskViewIndex); + int offset = mIsRtl ? scrollDiffPerPage : 0; + if (currentPage == dismissedIndex) { + if (currentPage == lastTaskViewIndex) { + offset += mIsRtl ? -scrollDiffPerPage : scrollDiffPerPage; + } + } else { + // Dismissing an adjacent page. + int negativeAdjacent = currentPage - 1; // (Right in RTL, left in LTR) + if (dismissedIndex == negativeAdjacent) { + offset += mIsRtl ? -scrollDiffPerPage : scrollDiffPerPage; + } + } + return offset; + } + + private void translateTaskWhenDismissed( + View view, + int indexDiff, + int scrollDiffPerPage, + PendingAnimation pendingAnimation, + SplitAnimationTimings splitTimings) { + // No need to translate the AddDesktopButton on dismissing a TaskView, which should be + // always at the right most position, even when dismissing the last TaskView. + if (view instanceof AddDesktopButton) { + return; + } + FloatProperty translationProperty = view instanceof TaskView + ? ((TaskView) view).getPrimaryDismissTranslationProperty() + : getPagedOrientationHandler().getPrimaryViewTranslate(); + + float additionalDismissDuration = + ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET * indexDiff; + + // We are in non-grid layout. + // If dismissing for split select, use split timings. + // If not, use dismiss timings. + float animationStartProgress = isSplitSelectionActive() + ? Utilities.boundToRange(splitTimings.getGridSlideStartOffset(), 0f, 1f) + : Utilities.boundToRange( + INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET + + additionalDismissDuration, 0f, 1f); + + float animationEndProgress = isSplitSelectionActive() + ? Utilities.boundToRange(splitTimings.getGridSlideStartOffset() + + splitTimings.getGridSlideDurationOffset(), 0f, 1f) + : 1f; + + // Slide tiles in horizontally to fill dismissed area + pendingAnimation.setFloat( + view, + translationProperty, + scrollDiffPerPage, + clampToProgress( + splitTimings.getGridSlidePrimaryInterpolator(), + animationStartProgress, + animationEndProgress + ) + ); + if (mEnableDrawingLiveTile && view instanceof TaskView + && ((TaskView) view).isRunningTask()) { + pendingAnimation.addOnFrameCallback(() -> { + runActionOnRemoteHandles( + remoteTargetHandle -> + remoteTargetHandle.getTaskViewSimulator() + .taskPrimaryTranslation.value = + getPagedOrientationHandler().getPrimaryValue( + view.getTranslationX(), + view.getTranslationY() + )); + redrawLiveTile(); + }); + } + } + /** * Hides all overview actions if user is halfway through split selection, shows otherwise. * We only show split option if: * * Focused view is a single app * * Device is large screen */ - private void updateCurrentTaskActionsVisibility() { + protected void updateCurrentTaskActionsVisibility() { TaskView taskView = getCurrentPageTaskView(); boolean isCurrentSplit = taskView instanceof GroupedTaskView; GroupedTaskView groupedTaskView = isCurrentSplit ? (GroupedTaskView) taskView : null; // Update flags to see if entire actions bar should be hidden. - if (!FeatureFlags.enableAppPairs()) { - mActionsView.updateHiddenFlags(HIDDEN_SPLIT_SCREEN, isCurrentSplit); - } mActionsView.updateHiddenFlags(HIDDEN_SPLIT_SELECT_ACTIVE, isSplitSelectionActive()); // Update flags to see if actions bar should show buttons for a single task or a pair of // tasks. - boolean canSaveAppPair = isCurrentSplit && supportsAppPairs() && - getSplitSelectController().getAppPairsController().canSaveAppPair(groupedTaskView); + boolean canSaveAppPair = isCurrentSplit + && !mIs3PLauncher + && getSplitSelectController().getAppPairsController().canSaveAppPair( + groupedTaskView); mActionsView.updateForGroupedTask(isCurrentSplit, canSaveAppPair); boolean isCurrentDesktop = taskView instanceof DesktopTaskView; mActionsView.updateHiddenFlags(HIDDEN_DESKTOP, isCurrentDesktop); } - /** Returns if app pairs are supported in this launcher. Overridden in subclasses. */ - public boolean supportsAppPairs() { - return true; - } - - /** - * Returns all the tasks in the top row, without the focused task - */ - private IntArray getTopRowIdArray() { - if (mTopRowIdSet.isEmpty()) { - return new IntArray(0); - } - IntArray topArray = new IntArray(mTopRowIdSet.size()); - int taskViewCount = getTaskViewCount(); - for (int i = 0; i < taskViewCount; i++) { - int taskViewId = requireTaskViewAt(i).getTaskViewId(); - if (mTopRowIdSet.contains(taskViewId)) { - topArray.add(taskViewId); - } - } - return topArray; - } - - /** - * Returns all the tasks in the bottom row, without the focused task - */ - private IntArray getBottomRowIdArray() { - int bottomRowIdArraySize = getBottomRowTaskCountForTablet(); - if (bottomRowIdArraySize <= 0) { - return new IntArray(0); - } - IntArray bottomArray = new IntArray(bottomRowIdArraySize); - int taskViewCount = getTaskViewCount(); - for (int i = 0; i < taskViewCount; i++) { - int taskViewId = requireTaskViewAt(i).getTaskViewId(); - if (!mTopRowIdSet.contains(taskViewId) && taskViewId != mFocusedTaskViewId) { - bottomArray.add(taskViewId); - } - } - return bottomArray; - } - /** * Iterate the grid by columns instead of by TaskView index, starting after the focused task and * up to the last balanced column. * - * @return the highest visible TaskView index between both rows + * @return the highest visible TaskView between both rows */ - private int getHighestVisibleTaskIndex() { - if (mTopRowIdSet.isEmpty()) return Integer.MAX_VALUE; // return earlier + protected TaskView getHighestVisibleTaskView() { + if (mTopRowIdSet.isEmpty()) return null; // return earlier - int lastVisibleIndex = Integer.MAX_VALUE; - IntArray topRowIdArray = getTopRowIdArray(); - IntArray bottomRowIdArray = getBottomRowIdArray(); + TaskView lastVisibleTaskView = null; + IntArray topRowIdArray = mUtils.getTopRowIdArray(); + IntArray bottomRowIdArray = mUtils.getBottomRowIdArray(); int balancedColumns = Math.min(bottomRowIdArray.size(), topRowIdArray.size()); for (int i = 0; i < balancedColumns; i++) { @@ -4143,25 +4467,41 @@ private int getHighestVisibleTaskIndex() { if (isTaskViewVisible(topTask)) { TaskView bottomTask = getTaskViewFromTaskViewId(bottomRowIdArray.get(i)); - lastVisibleIndex = Math.max(indexOfChild(topTask), indexOfChild(bottomTask)); - } else if (lastVisibleIndex < Integer.MAX_VALUE) { + lastVisibleTaskView = + indexOfChild(topTask) > indexOfChild(bottomTask) ? topTask : bottomTask; + } else if (lastVisibleTaskView != null) { break; } } - return lastVisibleIndex; - } - - private void removeTaskInternal(int dismissedTaskViewId) { - int[] taskIds = getTaskIdsForTaskViewId(dismissedTaskViewId); - UI_HELPER_EXECUTOR.getHandler().post( - () -> { - for (int taskId : taskIds) { - if (taskId != -1) { - ActivityManagerWrapper.getInstance().removeTask(taskId); - } - } - }); + return lastVisibleTaskView; + } + + protected void removeGroupTaskInternal(@NonNull GroupTask groupTask) { + UI_HELPER_EXECUTOR + .getHandler() + .post( + () -> { + if (groupTask instanceof DesktopTask desktopTask) { + if (areMultiDesksFlagsEnabled()) { + SystemUiProxy.INSTANCE + .get(getContext()) + .removeDesk(desktopTask.getDeskId(), + DesktopModeTransitionSource.RECENTS); + } else if (DesktopModeFlags + .ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()) { + SystemUiProxy.INSTANCE + .get(getContext()) + .removeDefaultDeskInDisplay( + mContainer.getDisplay().getDisplayId(), + DesktopModeTransitionSource.RECENTS); + } + } else { + for (Task task : groupTask.getTasks()) { + ActivityManagerWrapper.getInstance().removeTask(task.key.id); + } + } + }); } protected void onDismissAnimationEnds() { @@ -4175,20 +4515,27 @@ public PendingAnimation createAllTasksDismissAnimation(long duration) { } PendingAnimation anim = new PendingAnimation(duration); - int count = getTaskViewCount(); - for (int i = 0; i < count; i++) { - addDismissedTaskAnimations(requireTaskViewAt(i), duration, anim); + for (TaskView taskView : getTaskViews()) { + addDismissedTaskAnimations(taskView, duration, anim); } mPendingAnimation = anim; mPendingAnimation.addEndListener(isSuccess -> { if (isSuccess) { + // Remove desktops first, since desks can be empty (so they have no recent tasks), + // and closing all tasks on a desk doesn't always necessarily mean that the desk + // will be removed. So, there are no guarantees that the below call to + // `ActivityManagerWrapper::removeAllRecentTasks()` will be enough. + SystemUiProxy.INSTANCE.get(getContext()).removeAllDesks( + DesktopModeTransitionSource.RECENTS); + // Remove all the task views now - finishRecentsAnimation(true /* toRecents */, false /* shouldPip */, () -> { + finishRecentsAnimation(true /* toHome */, false /* shouldPip */, () -> { UI_HELPER_EXECUTOR.getHandler().post( ActivityManagerWrapper.getInstance()::removeAllRecentTasks); - removeTasksViewsAndClearAllButton(); + removeAllTaskViews(); startHome(); + InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_OVERVIEW_CLEAR_ALL); }); } mPendingAnimation = null; @@ -4196,8 +4543,8 @@ public PendingAnimation createAllTasksDismissAnimation(long duration) { return anim; } - private boolean snapToPageRelative(int delta, boolean cycle, - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction) { + protected boolean snapToPageRelative(int delta, boolean cycle, + TaskGridNavHelper.TaskNavDirection direction) { // Set next page if scroll animation is still running, otherwise cannot snap to the // next page on successive key presses. Setting the current page aborts the scroll. if (!mScroller.isFinished()) { @@ -4211,37 +4558,67 @@ private boolean snapToPageRelative(int delta, boolean cycle, if (!cycle && (newPageUnbound < 0 || newPageUnbound > pageCount)) { return false; } - snapToPage((newPageUnbound + pageCount) % pageCount); - getChildAt(getNextPage()).requestFocus(); + final int newPage = (newPageUnbound + pageCount) % pageCount; + snapToPage(newPage); + View child = getChildAt(newPage); + if (child != null) { + // TAB focuses first focusable (or last if direction reversed), including task itself. + if (direction == TaskGridNavHelper.TaskNavDirection.TAB) { + List visibleFocusables = mUtils.getVisibleFocusables(child, + delta > 0 ? FOCUS_FORWARD : FOCUS_BACKWARD); + if (!visibleFocusables.isEmpty()) { + (delta > 0 ? visibleFocusables.getFirst() + : visibleFocusables.getLast()).requestFocus(); + return true; + } + } + child.requestFocus(); + } return true; } - private int getNextPageInternal(int delta, @TaskGridNavHelper.TASK_NAV_DIRECTION int direction, + @Override + protected boolean snapToPage(int whichPage, int delta, int duration, boolean immediate) { + debugLog(TAG, "snapToPage, whichPage: " + whichPage + ", delta: " + delta + ", duration: " + + duration + ", immediate: " + immediate); + return super.snapToPage(whichPage, delta, duration, immediate); + } + + private int getNextPageInternal(int delta, TaskGridNavHelper.TaskNavDirection direction, boolean cycle) { if (!showAsGrid()) { return getNextPage() + delta; } // Init task grid nav helper with top/bottom id arrays. - TaskGridNavHelper taskGridNavHelper = new TaskGridNavHelper(getTopRowIdArray(), - getBottomRowIdArray(), mFocusedTaskViewId); + TaskGridNavHelper taskGridNavHelper = new TaskGridNavHelper(mUtils.getTopRowIdArray(), + mUtils.getBottomRowIdArray(), mUtils.getLargeTaskViewIds(), + mAddDesktopButton != null); // Get current page's task view ID. TaskView currentPageTaskView = getCurrentPageTaskView(); int currentPageTaskViewId; + final int clearAllButtonIndex = indexOfChild(mClearAllButton); + final int addDesktopButtonIndex = indexOfChild(mAddDesktopButton); if (currentPageTaskView != null) { currentPageTaskViewId = currentPageTaskView.getTaskViewId(); - } else if (mCurrentPage == indexOfChild(mClearAllButton)) { + } else if (mCurrentPage == clearAllButtonIndex) { currentPageTaskViewId = TaskGridNavHelper.CLEAR_ALL_PLACEHOLDER_ID; + } else if (mCurrentPage == addDesktopButtonIndex) { + currentPageTaskViewId = TaskGridNavHelper.ADD_DESK_PLACEHOLDER_ID; } else { return INVALID_PAGE; } - int nextGridPage = + final int nextGridPage = taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - return nextGridPage == TaskGridNavHelper.CLEAR_ALL_PLACEHOLDER_ID - ? indexOfChild(mClearAllButton) - : indexOfChild(getTaskViewFromTaskViewId(nextGridPage)); + if (nextGridPage == TaskGridNavHelper.CLEAR_ALL_PLACEHOLDER_ID) { + return clearAllButtonIndex; + } + if (nextGridPage == TaskGridNavHelper.ADD_DESK_PLACEHOLDER_ID) { + return addDesktopButtonIndex; + } + return indexOfChild(getTaskViewFromTaskViewId(nextGridPage)); } private void runDismissAnimation(PendingAnimation pendingAnim) { @@ -4252,51 +4629,90 @@ private void runDismissAnimation(PendingAnimation pendingAnim) { } @UiThread - private void dismissTask(int taskId) { + public void dismissTask(int taskId, boolean animate, boolean removeTask) { TaskView taskView = getTaskViewByTaskId(taskId); if (taskView == null) { + Log.d(TAG, "dismissTask: " + taskId + ", no associated TaskView"); return; } - dismissTask(taskView, true /* animate */, false /* removeTask */); + Log.d(TAG, "dismissTask: " + taskId); + + if (enableDesktopExplodedView() && taskView instanceof DesktopTaskView desktopTaskView) { + desktopTaskView.removeTaskFromExplodedView(taskId, animate); + + if (removeTask) { + ActivityManagerWrapper.getInstance().removeTask(taskId); + } + } else if (!taskView.isBeingDismissed()) { + dismissTaskView(taskView, animate, removeTask); + } } - public void dismissTask(TaskView taskView, boolean animateTaskView, boolean removeTask) { - PendingAnimation pa = new PendingAnimation(DISMISS_TASK_DURATION); - createTaskDismissAnimation(pa, taskView, animateTaskView, removeTask, DISMISS_TASK_DURATION, - false /* dismissingForSplitSelection*/); - runDismissAnimation(pa); + /** Dismisses the entire [taskView]. */ + public void dismissTaskView(TaskView taskView, boolean animateTaskView, boolean removeTask) { + if (enableExpressiveDismissTaskMotion() && (!showAsGrid() || enableGridOnlyOverview())) { + mDismissUtils.createTaskDismissSpringAnimation(taskView, removeTask, + false /* isSplitSelection */); + } else { + PendingAnimation pa = new PendingAnimation(DISMISS_TASK_DURATION); + createTaskDismissAnimation(pa, taskView, animateTaskView, removeTask, + DISMISS_TASK_DURATION, false /* dismissingForSplitSelection*/, + null /* gridEndData */); + runDismissAnimation(pa); + } } @SuppressWarnings("unused") private void dismissAllTasks(View view) { - runDismissAnimation(createAllTasksDismissAnimation(DISMISS_TASK_DURATION)); + InteractionJankMonitorWrapper.begin(this, Cuj.CUJ_LAUNCHER_OVERVIEW_CLEAR_ALL); + if (enableExpressiveDismissTaskMotion()) { + mDismissUtils.dismissAllTasks(); + } else { + runDismissAnimation(createAllTasksDismissAnimation(DISMISS_TASK_DURATION)); + } mContainer.getStatsLogManager().logger().log(LAUNCHER_TASK_CLEAR_ALL); } private void dismissCurrentTask() { TaskView taskView = getNextPageTaskView(); if (taskView != null) { - dismissTask(taskView, true /*animateTaskView*/, true /*removeTask*/); + dismissTaskView(taskView, true /*animateTaskView*/, true /*removeTask*/); } } + private void createDesk(View view) { + SystemUiProxy.INSTANCE + .get(getContext()) + .createDesk(mContainer.getDisplay().getDisplayId()); + } + @Override public boolean dispatchKeyEvent(KeyEvent event) { - if (isHandlingTouch() || event.getAction() != KeyEvent.ACTION_DOWN) { + if (isHandlingTouch() || event.getAction() != KeyEvent.ACTION_DOWN + || getStateManager().isInTransition()) { return super.dispatchKeyEvent(event); } + + if (mUtils.taskMenuIsOpen()) { + return super.dispatchKeyEvent(event); + } + switch (event.getKeyCode()) { - case KeyEvent.KEYCODE_TAB: - return snapToPageRelative(event.isShiftPressed() ? -1 : 1, true /* cycle */, - DIRECTION_TAB); + case KeyEvent.KEYCODE_TAB: { + return mUtils.handleTabKeyEvent(event, super::dispatchKeyEvent); + } case KeyEvent.KEYCODE_DPAD_RIGHT: - return snapToPageRelative(mIsRtl ? -1 : 1, true /* cycle */, DIRECTION_RIGHT); + return snapToPageRelative(mIsRtl ? -1 : 1, true /* cycle */, + TaskGridNavHelper.TaskNavDirection.RIGHT); case KeyEvent.KEYCODE_DPAD_LEFT: - return snapToPageRelative(mIsRtl ? 1 : -1, true /* cycle */, DIRECTION_LEFT); + return snapToPageRelative(mIsRtl ? 1 : -1, true /* cycle */, + TaskGridNavHelper.TaskNavDirection.LEFT); case KeyEvent.KEYCODE_DPAD_UP: - return snapToPageRelative(1, false /* cycle */, DIRECTION_UP); + return snapToPageRelative(1, false /* cycle */, + TaskGridNavHelper.TaskNavDirection.UP); case KeyEvent.KEYCODE_DPAD_DOWN: - return snapToPageRelative(1, false /* cycle */, DIRECTION_DOWN); + return snapToPageRelative(1, false /* cycle */, + TaskGridNavHelper.TaskNavDirection.DOWN); case KeyEvent.KEYCODE_DEL: case KeyEvent.KEYCODE_FORWARD_DEL: dismissCurrentTask(); @@ -4337,18 +4753,19 @@ public void setContentAlpha(float alpha) { if (alpha == mContentAlpha) { return; } + + traceBegin(Trace.TRACE_TAG_APP, "RecentsView.setContentAlpha"); alpha = Utilities.boundToRange(alpha, 0, 1); mContentAlpha = alpha; - TaskView runningTaskView = getRunningTaskView(); - for (int i = getTaskViewCount() - 1; i >= 0; i--) { - TaskView child = requireTaskViewAt(i); - if (runningTaskView != null && mRunningTaskTileHidden && child == runningTaskView) { - continue; - } - child.setStableAlpha(alpha); + for (TaskView taskView : getTaskViews()) { + taskView.setStableAlpha(alpha); } mClearAllButton.setContentAlpha(mContentAlpha); + + if (mAddDesktopButton != null) { + mAddDesktopButton.setContentAlpha(mContentAlpha); + } int alphaInt = Math.round(alpha * 255); mEmptyMessagePaint.setAlpha(alphaInt); mEmptyIcon.setAlpha(alphaInt); @@ -4359,6 +4776,7 @@ public void setContentAlpha(float alpha) { } else if (!mFreezeViewVisibility) { setVisibility(INVISIBLE); } + traceEnd(Trace.TRACE_TAG_APP); } /** @@ -4404,6 +4822,15 @@ public void updateRecentsRotation() { } } + public void reapplyActiveRotation() { + RotationTouchHelper rotationTouchHelper = RotationTouchHelper.REPOSITORY_INSTANCE.get( + getContext()).get(mContainer.getDisplayId()); + if (rotationTouchHelper != null) { + setLayoutRotation(rotationTouchHelper.getCurrentActiveRotation(), + rotationTouchHelper.getDisplayRotation()); + } + } + public void setLayoutRotation(int touchRotation, int displayRotation) { if (mOrientationState.update(touchRotation, displayRotation)) { updateOrientationHandler(); @@ -4423,14 +4850,68 @@ public TaskView getNextTaskView() { return getTaskViewAt(getRunningTaskIndex() + 1); } - @Nullable - public TaskView getCurrentPageTaskView() { - return getTaskViewAt(getCurrentPage()); + @Nullable + public TaskView getPreviousTaskView() { + return getTaskViewAt(getRunningTaskIndex() - 1); + } + + @Nullable + public TaskView getFirstNonDesktopTaskView() { + return mUtils.getFirstNonDesktopTaskView(); + } + + @Nullable + public TaskView getLastDesktopTaskView() { + return mUtils.getLastDesktopTaskView(); + } + + @Nullable + public TaskView getLastLargeTaskView() { + return mUtils.getLastLargeTaskView(); + } + + @Nullable + public TaskView getCurrentPageTaskView() { + return getTaskViewAt(getCurrentPage()); + } + + @Nullable + public TaskView getNextPageTaskView() { + return getTaskViewAt(getNextPage()); + } + + @Nullable + public TaskView getFirstTaskView() { + return mUtils.getFirstTaskView(); + } + + public int getFirstTaskViewIndex() { + return indexOfChild(getFirstTaskView()); + } + + /** + * Returns false if it is the last desktop on desktop-first when multi-desk enabled. Otherwise, + * returns true. + */ + public boolean canRemoveTaskView(TaskView taskView) { + return mUtils.canRemoveTaskView(taskView); + } + + @Override + public int getNextPage() { + int nextPage = super.getNextPage(); + if (getPageAt(nextPage) instanceof AddDesktopButton) { + nextPage = mUtils.getAlternatePageWithSameScroll(nextPage); + } + return nextPage; + } + + protected int getCurrentPageScrollDiff() { + return mCurrentPageScrollDiff; } - @Nullable - public TaskView getNextPageTaskView() { - return getTaskViewAt(getNextPage()); + protected void setCurrentPageScrollDiff(int currentPageScrollDiff) { + mCurrentPageScrollDiff = currentPageScrollDiff; } @Nullable @@ -4448,11 +4929,10 @@ public TaskView getTaskViewAt(int index) { } /** - * A version of {@link #getTaskViewAt} when the caller is sure about the input index. + * Returns iterable [TaskView] children. */ - @NonNull - private TaskView requireTaskViewAt(int index) { - return Objects.requireNonNull(getTaskViewAt(index)); + public RecentsViewUtils.TaskViewsIterable getTaskViews() { + return mUtils.getTaskViews(); } public void setOnEmptyMessageUpdatedListener(OnEmptyMessageUpdatedListener listener) { @@ -4460,13 +4940,14 @@ public void setOnEmptyMessageUpdatedListener(OnEmptyMessageUpdatedListener liste } public void updateEmptyMessage() { - boolean isEmpty = getTaskViewCount() == 0; + boolean isEmpty = !hasTaskViews() && !isSplitSelectionActive(); boolean hasSizeChanged = mLastMeasureSize.x != getWidth() || mLastMeasureSize.y != getHeight(); if (isEmpty == mShowEmptyMessage && !hasSizeChanged) { return; } setContentDescription(isEmpty ? mEmptyMessage : ""); + setFocusable(isEmpty); mShowEmptyMessage = isEmpty; updateEmptyStateUi(hasSizeChanged); invalidate(); @@ -4499,32 +4980,23 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto .setScroll(getScrollOffset())); setImportantForAccessibility(isModal() ? IMPORTANT_FOR_ACCESSIBILITY_NO : IMPORTANT_FOR_ACCESSIBILITY_AUTO); + recalculateTaskViewScreenEdgeIntersections(); } private void updatePivots() { - if (mOverviewSelectEnabled) { - if (enableGridOnlyOverview()) { - getModalTaskSize(mTempRect); - Rect selectedTaskPosition = getSelectedTaskBounds(); - Utilities.getPivotsForScalingRectToRect(mTempRect, selectedTaskPosition, - mTempPointF); - } else { - mTempPointF.set(mLastComputedTaskSize.centerX(), mLastComputedTaskSize.bottom); - } + if (mOverviewSelectEnabled && !enableGridOnlyOverview()) { + mTempPointF.set(mLastComputedTaskSize.centerX(), mLastComputedTaskSize.bottom); } else { - // Only update pivot when it is tablet and not in grid yet, so the pivot is correct - // for non-current tasks when swiping up to overview - if (enableGridOnlyOverview() && mContainer.getDeviceProfile().isTablet - && !mOverviewGridEnabled) { - mTempRect.set(mLastComputedCarouselTaskSize); - } else { - mTempRect.set(mLastComputedTaskSize); - } + mTempRect.set(mLastComputedTaskSize); getPagedViewOrientedState().getFullScreenScaleAndPivot(mTempRect, mContainer.getDeviceProfile(), mTempPointF); } setPivotX(mTempPointF.x); setPivotY(mTempPointF.y); + if (enableGridOnlyOverview()) { + runActionOnRemoteHandles(remoteTargetHandle -> + remoteTargetHandle.getTaskViewSimulator().setPivotOverride(mTempPointF)); + } } /** @@ -4532,9 +5004,6 @@ private void updatePivots() { * than the running task, when updating page offsets. */ public void setOffsetMidpointIndexOverride(int offsetMidpointIndexOverride) { - if (!enableAdditionalHomeAnimations()) { - return; - } mOffsetMidpointIndexOverride = offsetMidpointIndexOverride; updatePageOffsets(); } @@ -4551,24 +5020,34 @@ private void updatePageOffsets() { ? (runningTask == null ? INVALID_PAGE : indexOfChild(runningTask)) : mOffsetMidpointIndexOverride; int modalMidpoint = getCurrentPage(); - boolean isModalGridWithoutFocusedTask = - showAsGrid && enableGridOnlyOverview() && mTaskModalness > 0; - if (isModalGridWithoutFocusedTask) { - modalMidpoint = indexOfChild(mSelectedTask); + TaskView carouselHiddenMidpointTask = runningTask != null ? runningTask + : mUtils.getFirstTaskViewInCarousel(/*nonRunningTaskCarouselHidden=*/true, + /*runningTaskView=*/null); + int carouselHiddenMidpoint = indexOfChild(carouselHiddenMidpointTask); + boolean shouldCalculateOffsetForAllTasks = showAsGrid && mTaskModalness > 0; + if (shouldCalculateOffsetForAllTasks) { + modalMidpoint = indexOfChild(getSelectedTaskView()); } float midpointOffsetSize = 0; float leftOffsetSize = midpoint - 1 >= 0 ? getHorizontalOffsetSize(midpoint - 1, midpoint, offset) : 0; - float rightOffsetSize = midpoint + 1 < count - ? getHorizontalOffsetSize(midpoint + 1, midpoint, offset) + int rightOffsetReferenceIndex; + if (areMultiDesksFlagsEnabled() && midpoint == INVALID_PAGE) { + rightOffsetReferenceIndex = getFirstViewIndex(); + } else { + rightOffsetReferenceIndex = midpoint + 1; + } + float rightOffsetSize = rightOffsetReferenceIndex >= 0 && rightOffsetReferenceIndex < count + ? getHorizontalOffsetSize(rightOffsetReferenceIndex, midpoint, offset) : 0; float modalMidpointOffsetSize = 0; float modalLeftOffsetSize = 0; float modalRightOffsetSize = 0; float gridOffsetSize = 0; + float carouselHiddenOffsetSize = 0; if (showAsGrid) { // In grid, we only focus the task on the side. The reference index used for offset @@ -4586,27 +5065,49 @@ private void updatePageOffsets() { : 0; } + int primarySize = getPagedOrientationHandler().getPrimaryValue(getWidth(), getHeight()); + float maxOverscroll = primarySize * OverScroll.OVERSCROLL_DAMP_FACTOR; for (int i = 0; i < count; i++) { + View child = getChildAt(i); float translation = i == midpoint ? midpointOffsetSize : i < midpoint ? leftOffsetSize : rightOffsetSize; - if (isModalGridWithoutFocusedTask) { + if (shouldCalculateOffsetForAllTasks) { gridOffsetSize = getHorizontalOffsetSize(i, modalMidpoint, modalOffset); gridOffsetSize = Math.abs(gridOffsetSize) * (i <= modalMidpoint ? 1 : -1); } + if (child instanceof TaskView + && !mUtils.isVisibleInCarousel((TaskView) child, + runningTask, /*nonRunningTaskCarouselHidden=*/true)) { + // Increment carouselHiddenOffsetSize by maxOverscroll so it won't be on screen + // even when user overscroll. + carouselHiddenOffsetSize = (Math.abs(getMaxHorizontalOffsetSize(i, + carouselHiddenMidpoint)) + maxOverscroll) + * mDesktopCarouselDetachProgress; + carouselHiddenOffsetSize = carouselHiddenOffsetSize * ( + i <= carouselHiddenMidpoint ? 1 : -1); + } else { + carouselHiddenOffsetSize = 0; + } float modalTranslation = i == modalMidpoint ? modalMidpointOffsetSize : showAsGrid - ? gridOffsetSize + ? mIsRtl ? gridOffsetSize : -gridOffsetSize : i < modalMidpoint ? modalLeftOffsetSize : modalRightOffsetSize; - float totalTranslationX = translation + modalTranslation; - View child = getChildAt(i); - FloatProperty translationPropertyX = child instanceof TaskView - ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty() - : getPagedOrientationHandler().getPrimaryViewTranslate(); - translationPropertyX.set(child, totalTranslationX); + boolean skipTranslationOffset = + i == getRunningTaskIndex() && child instanceof DesktopTaskView; + float totalTranslationX = (skipTranslationOffset ? 0f : translation) + modalTranslation + + carouselHiddenOffsetSize; + if (child instanceof TaskView taskView) { + taskView.getPrimaryTaskOffsetTranslationProperty().set(taskView, totalTranslationX); + } else if (child instanceof ClearAllButton) { + getPagedOrientationHandler().getPrimaryViewTranslate().set(child, + totalTranslationX); + } else if (child instanceof AddDesktopButton addDesktopButton) { + addDesktopButton.setOffsetTranslationX(totalTranslationX); + } if (mEnableDrawingLiveTile && i == getRunningTaskIndex()) { runActionOnRemoteHandles( remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() @@ -4614,11 +5115,11 @@ private void updatePageOffsets() { redrawLiveTile(); } - if (showAsGrid && enableGridOnlyOverview() && child instanceof TaskView) { - float totalTranslationY = getVerticalOffsetSize(i, modalOffset); - FloatProperty translationPropertyY = - ((TaskView) child).getSecondaryTaskOffsetTranslationProperty(); - translationPropertyY.set(child, totalTranslationY); + if (showAsGrid && enableGridOnlyOverview() && child instanceof TaskView taskView) { + float totalTranslationY = getVerticalOffsetSize(taskView, modalOffset); + FloatProperty translationPropertyY = + taskView.getSecondaryTaskOffsetTranslationProperty(); + translationPropertyY.set(taskView, totalTranslationY); } } updateCurveProperties(); @@ -4635,7 +5136,10 @@ private void getPersistentChildPosition(int childIndex, int midPointScroll, Rect TaskView taskView = (TaskView) child; outRect.offset(taskView.getPersistentTranslationX(), taskView.getPersistentTranslationY()); - outRect.top += mContainer.getDeviceProfile().overviewTaskThumbnailTopMarginPx; + outRect.top += mContainer + .getDeviceProfile() + .getOverviewProfile() + .getTaskThumbnailTopMarginPx(); mTempMatrix.reset(); float persistentScale = taskView.getPersistentScale(); @@ -4650,21 +5154,31 @@ private void getPersistentChildPosition(int childIndex, int midPointScroll, Rect /** * Computes the distance to offset the given child such that it is completely offscreen when * translating away from the given midpoint. + * * @param offsetProgress From 0 to 1 where 0 means no offset and 1 means offset offscreen. */ - private float getHorizontalOffsetSize(int childIndex, int midpointIndex, float offsetProgress) { + protected float getHorizontalOffsetSize(int childIndex, int midpointIndex, + float offsetProgress) { if (offsetProgress == 0) { // Don't bother calculating everything below if we won't offset anyway. return 0; } + return getMaxHorizontalOffsetSize(childIndex, midpointIndex) * offsetProgress; + } + + /** + * Computes the distance to offset the given child such that it is completely offscreen when + * translating away from the given midpoint. + */ + private float getMaxHorizontalOffsetSize(int childIndex, int midpointIndex) { // First, get the position of the task relative to the midpoint. If there is no midpoint // then we just use the normal (centered) task position. RectF taskPosition = mTempRectF; // Whether the task should be shifted to start direction (i.e. left edge for portrait, top // edge for landscape/seascape). boolean isStartShift; - if (midpointIndex > -1) { + if (midpointIndex > -1 && midpointIndex < getChildCount()) { // When there is a midpoint reference task, adjacent tasks have less distance to travel // to reach offscreen. Offset the task position to the task's starting point, and offset // by current page's scroll diff. @@ -4717,7 +5231,7 @@ private float getHorizontalOffsetSize(int childIndex, int midpointIndex, float o } distanceToOffscreen -= mLastComputedTaskEndPushOutDistance; } - return distanceToOffscreen * offsetProgress; + return distanceToOffscreen; } /** @@ -4725,19 +5239,18 @@ private float getHorizontalOffsetSize(int childIndex, int midpointIndex, float o * * @param offsetProgress From 0 to 1 where 0 means no offset and 1 means offset offscreen. */ - private float getVerticalOffsetSize(int childIndex, float offsetProgress) { + private float getVerticalOffsetSize(TaskView taskView, float offsetProgress) { if (offsetProgress == 0 || !(showAsGrid() && enableGridOnlyOverview()) - || mSelectedTask == null) { + || getSelectedTaskView() == null) { // Don't bother calculating everything below if we won't offset vertically. return 0; } // First, get the position of the task relative to the top row. - TaskView child = getTaskViewAt(childIndex); - Rect taskPosition = getTaskBounds(child); + Rect taskPosition = getTaskBounds(taskView); - boolean isSelectedTaskTopRow = mTopRowIdSet.contains(mSelectedTask.getTaskViewId()); - boolean isChildTopRow = mTopRowIdSet.contains(child.getTaskViewId()); + boolean isSelectedTaskTopRow = mTopRowIdSet.contains(getSelectedTaskView().getTaskViewId()); + boolean isChildTopRow = mTopRowIdSet.contains(taskView.getTaskViewId()); // Whether the task should be shifted to the top. boolean isTopShift = !isSelectedTaskTopRow && isChildTopRow; boolean isBottomShift = isSelectedTaskTopRow && !isChildTopRow; @@ -4747,16 +5260,16 @@ private float getVerticalOffsetSize(int childIndex, float offsetProgress) { if (isTopShift) { distanceToOffscreen = -taskPosition.bottom; } else if (isBottomShift) { - distanceToOffscreen = mContainer.getDeviceProfile().heightPx - taskPosition.top; + distanceToOffscreen = mContainer.getDeviceProfile().getDeviceProperties().getHeightPx() - taskPosition.top; } return distanceToOffscreen * offsetProgress; } protected void setTaskViewsResistanceTranslation(float translation) { mTaskViewsSecondaryTranslation = translation; - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView task = requireTaskViewAt(i); - task.getTaskResistanceTranslationProperty().set(task, translation / getScaleY()); + for (TaskView taskView : getTaskViews()) { + taskView.getTaskResistanceTranslationProperty().set(taskView, + translation / getScaleY()); } runActionOnRemoteHandles( remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() @@ -4764,23 +5277,21 @@ protected void setTaskViewsResistanceTranslation(float translation) { } private void updateTaskViewsSnapshotRadius() { - for (int i = 0; i < getTaskViewCount(); i++) { - requireTaskViewAt(i).updateSnapshotRadius(); + for (TaskView taskView : getTaskViews()) { + taskView.updateFullscreenParams(); } } protected void setTaskViewsPrimarySplitTranslation(float translation) { mTaskViewsPrimarySplitTranslation = translation; - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView task = requireTaskViewAt(i); - task.getPrimarySplitTranslationProperty().set(task, translation); + for (TaskView taskView : getTaskViews()) { + taskView.getPrimarySplitTranslationProperty().set(taskView, translation); } } protected void setTaskViewsSecondarySplitTranslation(float translation) { mTaskViewsSecondarySplitTranslation = translation; - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView taskView = requireTaskViewAt(i); + for (TaskView taskView : getTaskViews()) { if (taskView == mSplitHiddenTaskView && !taskView.containsMultipleTasks()) { continue; } @@ -4792,32 +5303,37 @@ protected void setTaskViewsSecondarySplitTranslation(float translation) { * Resets the visuals when exit modal state. */ public void resetModalVisuals() { - if (mSelectedTask != null) { - mSelectedTask.taskContainers.forEach( + if (getSelectedTaskView() != null) { + getSelectedTaskView().taskContainers.forEach( taskContainer -> taskContainer.getOverlay().resetModalVisuals()); } } + protected void resetShareUIState() { + mUtils.resetShareUIState(); + } + /** * Primarily used by overview actions to initiate split from focused task, logs the source * of split invocation as such. */ - public void initiateSplitSelect(TaskView taskView) { + public void initiateSplitSelect(TaskContainer taskContainer) { int defaultSplitPosition = getPagedOrientationHandler() .getDefaultSplitPosition(mContainer.getDeviceProfile()); - initiateSplitSelect(taskView, defaultSplitPosition, LAUNCHER_OVERVIEW_ACTIONS_SPLIT); + initiateSplitSelect(taskContainer, defaultSplitPosition, LAUNCHER_OVERVIEW_ACTIONS_SPLIT); } /** TODO(b/266477929): Consolidate this call w/ the one below */ - public void initiateSplitSelect(TaskView taskView, @StagePosition int stagePosition, + public void initiateSplitSelect(TaskContainer taskContainer, + @StagePosition int stagePosition, StatsLogManager.EventEnum splitEvent) { + TaskView taskView = taskContainer.getTaskView(); mSplitHiddenTaskView = taskView; mSplitSelectStateController.setInitialTaskSelect(null /*intent*/, stagePosition, - taskView.getFirstItemInfo(), splitEvent, taskView.getFirstTask().key.id); + taskContainer.getItemInfo(), splitEvent, taskContainer.getTask().key.id); mSplitSelectStateController.setAnimateCurrentTaskDismissal( true /*animateCurrentTaskDismissal*/); mSplitHiddenTaskViewIndex = indexOfChild(taskView); - updateDesktopTaskVisibility(false /* visible */); } /** @@ -4831,20 +5347,63 @@ public void initiateSplitSelect(SplitSelectSource splitSelectSource) { mSplitHiddenTaskView = getTaskViewByTaskId(splitSelectSource.alreadyRunningTaskId); mSplitHiddenTaskViewIndex = indexOfChild(mSplitHiddenTaskView); mSplitSelectStateController - .setAnimateCurrentTaskDismissal(splitSelectSource.animateCurrentTaskDismissal); + .setAnimateCurrentTaskDismissal(splitSelectSource.animateCurrentTaskDismissal + && mSplitHiddenTaskView != null + && !(mSplitHiddenTaskView instanceof DesktopTaskView)); // Prevent dismissing whole task if we're only initiating from one of 2 tasks in split pair mSplitSelectStateController.setDismissingFromSplitPair(mSplitHiddenTaskView != null && mSplitHiddenTaskView instanceof GroupedTaskView); mSplitSelectStateController.setInitialTaskSelect(splitSelectSource.intent, - splitSelectSource.position.stagePosition, splitSelectSource.itemInfo, + splitSelectSource.position.stagePosition, splitSelectSource.getItemInfo(), splitSelectSource.splitEvent, splitSelectSource.alreadyRunningTaskId); - updateDesktopTaskVisibility(false /* visible */); } - private void updateDesktopTaskVisibility(boolean visible) { - if (mDesktopTaskView != null) { - mDesktopTaskView.setVisibility(visible ? VISIBLE : GONE); + /** + * Animate DesktopTaskView(s) to hide in split select + */ + public void handleDesktopTaskInSplitSelectState(PendingAnimation builder, + Interpolator deskTopFadeInterPolator) { + SplitAnimationTimings timings = AnimUtils.getDeviceOverviewToSplitTimings( + mContainer.getDeviceProfile().getDeviceProperties().isTablet()); + getTaskViews().forEachWithIndexInParent((index, taskView) -> { + if (taskView instanceof DesktopTaskView) { + // Setting pivot to scale down from screen centre. + if (isTaskViewVisible(taskView)) { + float pivotX = 0f; + if (index < mCurrentPage) { + pivotX = mIsRtl ? taskView.getWidth() / 2f - mPageSpacing + - taskView.getWidth() + : taskView.getWidth() / 2f + mPageSpacing + taskView.getWidth(); + } else if (index == mCurrentPage) { + pivotX = taskView.getWidth() / 2f; + } else { + pivotX = mIsRtl ? taskView.getWidth() + mPageSpacing + + taskView.getWidth() + : taskView.getWidth() - mPageSpacing - taskView.getWidth(); + } + taskView.setPivotX(pivotX); + taskView.setPivotY(taskView.getHeight() / 2f); + builder.add(ObjectAnimator + .ofFloat(taskView, TaskView.DISMISS_SCALE, 0.95f), + clampToProgress(timings.getDesktopTaskScaleInterpolator(), 0f, + timings.getDesktopFadeSplitAnimationEndOffset())); + } + builder.addFloat(taskView, SPLIT_ALPHA, 1f, 0f, + clampToProgress(deskTopFadeInterPolator, 0f, + timings.getDesktopFadeSplitAnimationEndOffset())); + } + }); + } + + /** + * While exiting from split mode, show all existing DesktopTaskViews. + */ + public void resetDesktopTaskFromSplitSelectState() { + for (TaskView taskView : getTaskViews()) { + if (taskView instanceof DesktopTaskView) { + taskView.setSplitAlpha(1f); + } } } @@ -4857,35 +5416,74 @@ public void createSplitSelectInitAnimation(PendingAnimation builder, int duratio boolean isInitiatingTaskViewSplitPair = mSplitSelectStateController.isDismissingFromSplitPair(); if (isInitiatingSplitFromTaskView && isInitiatingTaskViewSplitPair - && mSplitHiddenTaskView instanceof GroupedTaskView) { + && mSplitHiddenTaskView instanceof GroupedTaskView groupedTaskView) { // Splitting from Overview for split pair task createInitialSplitSelectAnimation(builder); // Animate pair thumbnail into full thumbnail - boolean primaryTaskSelected = mSplitHiddenTaskView.getTaskIds()[0] + boolean primaryTaskSelected = groupedTaskView.getLeftTopTaskContainer().getTask().key.id == mSplitSelectStateController.getInitialTaskId(); - TaskContainer taskContainer = mSplitHiddenTaskView - .getTaskContainers().get(primaryTaskSelected ? 1 : 0); - TaskThumbnailViewDeprecated thumbnail = taskContainer.getThumbnailViewDeprecated(); + TaskContainer taskContainer = + primaryTaskSelected ? groupedTaskView.getRightBottomTaskContainer() + : groupedTaskView.getLeftTopTaskContainer(); mSplitSelectStateController.getSplitAnimationController() .addInitialSplitFromPair(taskContainer, builder, mContainer.getDeviceProfile(), - mSplitHiddenTaskView.getWidth(), mSplitHiddenTaskView.getHeight(), + mSplitHiddenTaskView.getLayoutParams().width, + mSplitHiddenTaskView.getLayoutParams().height, primaryTaskSelected); - builder.addOnFrameCallback(() ->{ - thumbnail.refreshSplashView(); - mSplitHiddenTaskView.updateSnapshotRadius(); + builder.addOnFrameCallback(() -> { + if (!enableRefactorTaskThumbnail()) { + taskContainer.getThumbnailViewDeprecated().refreshSplashView(); + } + mSplitHiddenTaskView.updateFullscreenParams(); }); } else if (isInitiatingSplitFromTaskView) { + mSplitHiddenTaskView.setBorderEnabled(false); // Splitting from Overview for fullscreen task - createTaskDismissAnimation(builder, mSplitHiddenTaskView, true, false, duration, - true /* dismissingForSplitSelection*/); + if (enableExpressiveDismissTaskMotion() + && (!showAsGrid() || enableGridOnlyOverview())) { + runExpressiveSplit(builder, mSplitHiddenTaskView); + } else { + createTaskDismissAnimation(builder, mSplitHiddenTaskView, true, false, duration, + true /* dismissingForSplitSelection*/, null /* gridEndData */); + } } else { // Splitting from Home - createInitialSplitSelectAnimation(builder); + TaskView currentPageTaskView = getTaskViewAt(mCurrentPage); + // When current page is a Desktop task it needs special handling to + // display correct animation in split mode + if (currentPageTaskView instanceof DesktopTaskView) { + if (enableExpressiveDismissTaskMotion() + && (!showAsGrid() || enableGridOnlyOverview())) { + runExpressiveSplit(builder, /* taskView= */ null); + } else { + createTaskDismissAnimation(builder, null, true, false, duration, + true /* dismissingForSplitSelection*/, null /* gridEndData */); + } + } else { + createInitialSplitSelectAnimation(builder); + } } } + private void runExpressiveSplit(PendingAnimation builder, @Nullable TaskView taskView) { + createInitialSplitSelectAnimation(builder); + AtomicBoolean hasRunDismiss = new AtomicBoolean(false); + builder.addOnFrameListener((animator) -> { + SplitAnimationTimings splitTimings = + AnimUtils.getDeviceOverviewToSplitTimings( + mContainer.getDeviceProfile().getDeviceProperties().isTablet()); + if (animator.getAnimatedFraction() > splitTimings.getGridSlideStartOffset() + && !hasRunDismiss.get()) { + mDismissUtils.createTaskDismissSpringAnimation( + taskView, false /* shouldRemoveTaskView */, + true /* isSplitSelection */); + hasRunDismiss.set(true); + } + }); + } + /** * Confirms the selection of the next split task. The extra data is passed through because the * user may be selecting a subtask in a group. @@ -4893,17 +5491,21 @@ public void createSplitSelectInitAnimation(PendingAnimation builder, int duratio * @param containerTaskView If our second selected app is currently running in Recents, this is * the "container" TaskView from Recents. If we are starting a fresh * instance of the app from an Intent, this will be null. - * @param task The Task corresponding to our second selected app. If we are starting a fresh - * instance of the app from an Intent, this will be null. - * @param drawable The Drawable corresponding to our second selected app's icon. - * @param secondView The View representing the current space on the screen where the second app - * is (either the ThumbnailView or the tapped icon). - * @param intent If we are launching a fresh instance of the app, this is the Intent for it. If - * the second app is already running in Recents, this will be null. - * @param user If we are launching a fresh instance of the app, this is the UserHandle for it. - * If the second app is already running in Recents, this will be null. + * @param task The Task corresponding to our second selected app. If we are + * starting a fresh + * instance of the app from an Intent, this will be null. + * @param drawable The Drawable corresponding to our second selected app's icon. + * @param secondView The View representing the current space on the screen where the + * second app + * is (either the ThumbnailView or the tapped icon). + * @param intent If we are launching a fresh instance of the app, this is the Intent + * for it. If + * the second app is already running in Recents, this will be null. + * @param user If we are launching a fresh instance of the app, this is the + * UserHandle for it. + * If the second app is already running in Recents, this will be null. * @return true if waiting for confirmation of second app or if split animations are running, - * false otherwise + * false otherwise */ public boolean confirmSplitSelect(TaskView containerTaskView, Task task, Drawable drawable, View secondView, @Nullable Bitmap thumbnail, Intent intent, UserHandle user, @@ -4937,7 +5539,7 @@ public boolean confirmSplitSelect(TaskView containerTaskView, Task task, Drawabl Rect firstTaskStartingBounds = new Rect(); Rect firstTaskEndingBounds = mTempRect; - boolean isTablet = mContainer.getDeviceProfile().isTablet; + boolean isTablet = mContainer.getDeviceProfile().getDeviceProperties().isTablet(); SplitAnimationTimings timings = AnimUtils.getDeviceSplitToConfirmTimings(isTablet); PendingAnimation pendingAnimation = new PendingAnimation(timings.getDuration()); @@ -4952,6 +5554,14 @@ public boolean confirmSplitSelect(TaskView containerTaskView, Task task, Drawabl .addScrimBehindAnim(pendingAnimation, mContainer, getContext()); FloatingTaskView firstFloatingTaskView = mSplitSelectStateController.getFirstFloatingTaskView(); + + if (DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX.isTrue() + && firstFloatingTaskView == null) { + Log.d(TAG, "confirmSplitSelect: First floating task view was null, aborting split."); + mSplitSelectStateController.resetState(); + return false; + } + firstFloatingTaskView.getBoundsOnScreen(firstTaskStartingBounds); firstFloatingTaskView.addConfirmAnimation(pendingAnimation, new RectF(firstTaskStartingBounds), firstTaskEndingBounds, @@ -4972,18 +5582,14 @@ public boolean confirmSplitSelect(TaskView containerTaskView, Task task, Drawabl pendingAnimation.addEndListener(aBoolean -> { mSplitSelectStateController.launchSplitTasks( aBoolean1 -> { - if (FeatureFlags.enableSplitContextually()) { - mSplitSelectStateController.resetState(); - } else { - resetFromSplitSelectionState(); - } InteractionJankMonitorWrapper.end(Cuj.CUJ_SPLIT_SCREEN_ENTER); + mSplitSelectStateController.resetState(); }); }); mSecondSplitHiddenView = containerTaskView; if (mSecondSplitHiddenView != null) { - mSecondSplitHiddenView.setThumbnailVisibility(INVISIBLE, + mSecondSplitHiddenView.setThumbnailVisibility(false, mSplitSelectStateController.getSecondTaskId()); } @@ -4991,28 +5597,25 @@ public boolean confirmSplitSelect(TaskView containerTaskView, Task task, Drawabl "Second tile selected"); // Fade out all other views underneath placeholders - ObjectAnimator tvFade = ObjectAnimator.ofFloat(this, RecentsView.CONTENT_ALPHA,1, 0); + ObjectAnimator tvFade = ObjectAnimator.ofFloat(this, RecentsView.CONTENT_ALPHA, 1, 0); pendingAnimation.add(tvFade, DECELERATE_2, SpringProperty.DEFAULT); pendingAnimation.buildAnim().start(); return true; } @SuppressLint("WrongCall") - protected void resetFromSplitSelectionState() { - if (mSplitSelectSource != null || mSplitHiddenTaskViewIndex != -1 || - FeatureFlags.enableSplitContextually()) { - safeRemoveDragLayerView(mSplitSelectStateController.getFirstFloatingTaskView()); - safeRemoveDragLayerView(mSecondFloatingTaskView); - safeRemoveDragLayerView(mSplitSelectStateController.getSplitInstructionsView()); - safeRemoveDragLayerView(mSplitScrim); - mSecondFloatingTaskView = null; - mSplitSelectSource = null; - mSplitSelectStateController.getSplitAnimationController() - .removeSplitInstructionsView(mContainer); - } + private void resetFromSplitSelectionState() { + safeRemoveDragLayerView(mSplitSelectStateController.getFirstFloatingTaskView()); + safeRemoveDragLayerView(mSecondFloatingTaskView); + safeRemoveDragLayerView(mSplitSelectStateController.getSplitInstructionsView()); + safeRemoveDragLayerView(mSplitScrim); + mSecondFloatingTaskView = null; + mSplitSelectSource = null; + mSplitSelectStateController.getSplitAnimationController() + .removeSplitInstructionsView(mContainer); if (mSecondSplitHiddenView != null) { - mSecondSplitHiddenView.setThumbnailVisibility(VISIBLE, INVALID_TASK_ID); + mSecondSplitHiddenView.setThumbnailVisibility(true, INVALID_TASK_ID); mSecondSplitHiddenView = null; } @@ -5021,15 +5624,10 @@ protected void resetFromSplitSelectionState() { setTaskViewsPrimarySplitTranslation(0); setTaskViewsSecondarySplitTranslation(0); - if (!FeatureFlags.enableSplitContextually()) { - // When flag is on, this method gets called from resetState() call below, let's avoid - // infinite recursion today - mSplitSelectStateController.resetState(); - } if (mSplitHiddenTaskViewIndex == -1) { return; } - if (!mContainer.getDeviceProfile().isTablet) { + if (!mContainer.getDeviceProfile().getDeviceProperties().isTablet()) { int pageToSnapTo = mCurrentPage; if (mSplitHiddenTaskViewIndex <= pageToSnapTo) { pageToSnapTo += 1; @@ -5043,10 +5641,21 @@ protected void resetFromSplitSelectionState() { resetTaskVisuals(); mSplitHiddenTaskViewIndex = -1; if (mSplitHiddenTaskView != null) { - mSplitHiddenTaskView.setThumbnailVisibility(VISIBLE, INVALID_TASK_ID); + mSplitHiddenTaskView.setThumbnailVisibility(true, INVALID_TASK_ID); + // mSplitHiddenTaskView is set when split select animation starts. The TaskView is only + // removed when when the animation finishes. So in the case of overview being dismissed + // during the animation, we should not call clearAndRecycleTaskView() because it has + // not been removed yet. + if (mSplitHiddenTaskView.getParent() == null) { + clearAndRecycleTaskView(mSplitHiddenTaskView); + } mSplitHiddenTaskView = null; } - updateDesktopTaskVisibility(true /* visible */); + + // Recents doesn't receive activity callback, so we cleanup manually + if (mContainer instanceof RecentsWindowManager manager) { + manager.hideRecentsWindow(); + } } private void safeRemoveDragLayerView(@Nullable View viewToRemove) { @@ -5068,11 +5677,11 @@ public float getSplitSelectTranslation() { int direction = orientationHandler.getSplitTranslationDirectionFactor( splitPosition, deviceProfile); - if (deviceProfile.isTablet && deviceProfile.isLeftRightSplit) { + if (deviceProfile.getDeviceProperties().isTablet() && deviceProfile.isLeftRightSplit) { // Only shift TaskViews if there is not enough space on the side of // mLastComputedTaskSize to minimize motion. int sideSpace = mIsRtl - ? deviceProfile.widthPx - mLastComputedTaskSize.right + ? deviceProfile.getDeviceProperties().getWidthPx() - mLastComputedTaskSize.right : mLastComputedTaskSize.left; int extraSpace = splitPlaceholderSize + mPageSpacing - sideSpace; if (extraSpace <= 0f) { @@ -5096,7 +5705,7 @@ protected void onRotateInSplitSelectionState() { firstFloatingTaskView.update(mTempRectF, /*progress=*/1f); RecentsPagedOrientationHandler orientationHandler = getPagedOrientationHandler(); - Pair, FloatProperty> taskViewsFloat = + Pair>, FloatProperty>> taskViewsFloat = orientationHandler.getSplitSelectTaskOffset( TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION, mContainer.getDeviceProfile()); @@ -5118,15 +5727,8 @@ private void updateDeadZoneRects() { mClearAllButtonDeadZoneRect.inset(-getPaddingRight() / 2, -verticalMargin); } - // Get the deadzone rect between the task views - mTaskViewDeadZoneRect.setEmpty(); - int count = getTaskViewCount(); - if (count > 0) { - final View taskView = requireTaskViewAt(0); - requireTaskViewAt(count - 1).getHitRect(mTaskViewDeadZoneRect); - mTaskViewDeadZoneRect.union(taskView.getLeft(), taskView.getTop(), taskView.getRight(), - taskView.getBottom()); - } + mUtils.updateTaskViewDeadZoneRect(mTaskViewDeadZoneRect, mTopRowDeadZoneRect, + mBottomRowDeadZoneRect); } private void updateEmptyStateUi(boolean sizeChanged) { @@ -5139,7 +5741,7 @@ private void updateEmptyStateUi(boolean sizeChanged) { if (mShowEmptyMessage && hasValidSize && mEmptyTextLayout == null) { int availableWidth = mLastMeasureSize.x - mEmptyMessagePadding - mEmptyMessagePadding; mEmptyTextLayout = StaticLayout.Builder.obtain(mEmptyMessage, 0, mEmptyMessage.length(), - mEmptyMessagePaint, availableWidth) + mEmptyMessagePaint, availableWidth) .setAlignment(Layout.Alignment.ALIGN_CENTER) .build(); int totalHeight = mEmptyTextLayout.getHeight() @@ -5181,23 +5783,56 @@ protected void maybeDrawEmptyMessage(Canvas canvas) { * to the right. */ @SuppressLint("Recycle") - public AnimatorSet createAdjacentPageAnimForTaskLaunch(TaskView tv) { + public AnimatorSet createAdjacentPageAnimForTaskLaunch(TaskView taskView) { AnimatorSet anim = new AnimatorSet(); - int taskIndex = indexOfChild(tv); + int taskIndex = indexOfChild(taskView); int centerTaskIndex = getCurrentPage(); float toScale = getMaxScaleForFullScreen(); boolean showAsGrid = showAsGrid(); - boolean launchingCenterTask = showAsGrid - ? tv.isFocusedTask() && isTaskViewFullyVisible(tv) - : taskIndex == centerTaskIndex; - if (launchingCenterTask) { + boolean zoomInTaskView = showAsGrid ? taskView.isLargeTile() : taskIndex == centerTaskIndex; + if (zoomInTaskView) { anim.play(ObjectAnimator.ofFloat(this, RECENTS_SCALE_PROPERTY, toScale)); anim.play(ObjectAnimator.ofFloat(this, FULLSCREEN_PROGRESS, 1)); + anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(@NonNull Animator animation) { + taskView.getThumbnailBounds(mTempRect, /*relativeToDragLayer=*/true); + getTaskDimension(mContainer.getDeviceProfile(), mTempPointF); + Rect fullscreenBounds = new Rect(0, 0, (int) mTempPointF.x, + (int) mTempPointF.y); + Utilities.getPivotsForScalingRectToRect(mTempRect, fullscreenBounds, + mTempPointF); + setPivotX(mTempPointF.x); + setPivotY(mTempPointF.y); + + // If live tile is not launching, apply pivot to live tile as well and bring it + // above RecentsView to avoid wallpaper blur from being applied to it. + if (!taskView.isRunningTask()) { + runActionOnRemoteHandles( + remoteTargetHandle -> + remoteTargetHandle.getTaskViewSimulator() + .setPivotOverride(mTempPointF)); + mBlurUtils.setDrawLiveTileBelowRecents(false); + } + } + + @Override + public void onAnimationEnd(Animator animation) { + // If live tile is not launching, reset the pivot applied above. + if (!taskView.isRunningTask()) { + runActionOnRemoteHandles( + remoteTargetHandle -> { + remoteTargetHandle.getTaskViewSimulator().setPivotOverride( + null); + }); + } + } + }); } else if (!showAsGrid) { // We are launching an adjacent task, so parallax the center and other adjacent task. - float displacementX = tv.getWidth() * (toScale - 1f); + float displacementX = taskView.getWidth() * (toScale - 1f); float primaryTranslation = mIsRtl ? -displacementX : displacementX; anim.play(ObjectAnimator.ofFloat(getPageAt(centerTaskIndex), getPagedOrientationHandler().getPrimaryViewTranslate(), primaryTranslation)); @@ -5225,6 +5860,20 @@ && getRemoteTargetHandles() != null) { } } anim.play(ObjectAnimator.ofFloat(this, TASK_THUMBNAIL_SPLASH_ALPHA, 0, 1)); + if (taskView instanceof DesktopTaskView) { + anim.play(ObjectAnimator.ofArgb(mContainer.getScrimView(), VIEW_BACKGROUND_COLOR, + Color.TRANSPARENT)); + if (enableDesktopExplodedView()) { + anim.play(ObjectAnimator.ofFloat(this, DESK_EXPLODE_PROGRESS, 1f, 0f)); + } + } + DepthController depthController = getDepthController(); + if (depthController != null) { + float targetDepth = taskView instanceof DesktopTaskView ? 0 : BACKGROUND_APP.getDepth( + mContainer); + anim.play(ObjectAnimator.ofFloat(depthController.stateDepth, MULTI_PROPERTY_VALUE, + targetDepth)); + } return anim; } @@ -5232,31 +5881,28 @@ && getRemoteTargetHandles() != null) { * Returns the scale up required on the view, so that it coves the screen completely */ public float getMaxScaleForFullScreen() { - if (enableGridOnlyOverview() && mContainer.getDeviceProfile().isTablet - && !mOverviewGridEnabled) { - if (mLastComputedCarouselTaskSize.isEmpty()) { - mSizeStrategy.calculateCarouselTaskSize(mContainer, mContainer.getDeviceProfile(), - mLastComputedCarouselTaskSize, getPagedOrientationHandler()); - } - mTempRect.set(mLastComputedCarouselTaskSize); - } else { - if (mLastComputedTaskSize.isEmpty()) { - getTaskSize(mLastComputedTaskSize); - } - mTempRect.set(mLastComputedTaskSize); + if (mLastComputedTaskSize.isEmpty()) { + getTaskSize(mLastComputedTaskSize); } + mTempRect.set(mLastComputedTaskSize); return getPagedViewOrientedState().getFullScreenScaleAndPivot( mTempRect, mContainer.getDeviceProfile(), mTempPointF); } + /** + * Clears the existing PendingAnimation. + */ + public void clearPendingAnimation() { + mPendingAnimation = null; + } + public PendingAnimation createTaskLaunchAnimation( - TaskView tv, long duration, Interpolator interpolator) { + TaskView taskView, long duration, Interpolator interpolator) { if (FeatureFlags.IS_STUDIO_BUILD && mPendingAnimation != null) { throw new IllegalStateException("Another pending animation is still running"); } - int count = getTaskViewCount(); - if (count == 0) { + if (!hasTaskViews()) { return new PendingAnimation(duration); } @@ -5265,13 +5911,13 @@ public PendingAnimation createTaskLaunchAnimation( updateGridProperties(); updateScrollSynchronously(); - int targetSysUiFlags = tv.getFirstThumbnailViewDeprecated().getSysUiStatusNavFlags(); - final boolean[] passedOverviewThreshold = new boolean[] {false}; - ValueAnimator progressAnim = ValueAnimator.ofFloat(0, 1); - progressAnim.addUpdateListener(animator -> { + int targetSysUiFlags = taskView.getSysUiStatusNavFlags(); + final boolean[] passedOverviewThreshold = new boolean[]{false}; + AnimatorSet anim = createAdjacentPageAnimForTaskLaunch(taskView); + anim.play(new AnimatedFloat(v -> { // Once we pass a certain threshold, update the sysui flags to match the target // tasks' flags - if (animator.getAnimatedFraction() > UPDATE_SYSUI_FLAGS_THRESHOLD) { + if (v > UPDATE_SYSUI_FLAGS_THRESHOLD) { mContainer.getSystemUiController().updateUiState( UI_STATE_FULLSCREEN_TASK, targetSysUiFlags); } else { @@ -5279,8 +5925,7 @@ public PendingAnimation createTaskLaunchAnimation( } // Passing the threshold from taskview to fullscreen app will vibrate - final boolean passed = animator.getAnimatedFraction() >= - SUCCESS_TRANSITION_PROGRESS; + final boolean passed = v >= SUCCESS_TRANSITION_PROGRESS; if (passed != passedOverviewThreshold[0]) { passedOverviewThreshold[0] = passed; performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, @@ -5290,30 +5935,26 @@ public PendingAnimation createTaskLaunchAnimation( mRecentsAnimationController.setWillFinishToHome(!passed); } } - }); - - AnimatorSet anim = createAdjacentPageAnimForTaskLaunch(tv); - - DepthController depthController = getDepthController(); - if (depthController != null) { - ObjectAnimator depthAnimator = ObjectAnimator.ofFloat(depthController.stateDepth, - MULTI_PROPERTY_VALUE, BACKGROUND_APP.getDepth(mContainer)); - anim.play(depthAnimator); - } - anim.play(ObjectAnimator.ofFloat(this, TASK_THUMBNAIL_SPLASH_ALPHA, 0f, 1f)); - - anim.play(progressAnim); + }).animateToValue(0f, 1f)); anim.setInterpolator(interpolator); mPendingAnimation = new PendingAnimation(duration); mPendingAnimation.add(anim); - runActionOnRemoteHandles( - remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() - .addOverviewToAppAnim(mPendingAnimation, interpolator)); - mPendingAnimation.addOnFrameCallback(this::redrawLiveTile); + if (taskView.isRunningTask()) { + runActionOnRemoteHandles( + remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() + .addOverviewToAppAnim(mPendingAnimation, interpolator)); + mPendingAnimation.addOnFrameCallback(this::redrawLiveTile); + } + mPendingAnimation.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + mBlurUtils.setDrawLiveTileBelowRecents(false); + } + }); mPendingAnimation.addEndListener(isSuccess -> { if (isSuccess) { - if (tv instanceof GroupedTaskView && hasAllValidTaskIds(tv.getTaskIds()) + if (taskView instanceof GroupedTaskView && hasAllValidTaskIds(taskView.getTaskIds()) && mRemoteTargetHandles != null) { // TODO(b/194414938): make this part of the animations instead. TaskViewUtils.createSplitAuxiliarySurfacesAnimator( @@ -5323,13 +5964,14 @@ public PendingAnimation createTaskLaunchAnimation( dividerAnimator.end(); }); } - if (tv.isRunningTask()) { - finishRecentsAnimation(false /* toRecents */, null); + if (taskView.isRunningTask()) { + finishRecentsAnimation(false /* toHome */, null); onTaskLaunchAnimationEnd(true /* success */); } else { - tv.launchTask(this::onTaskLaunchAnimationEnd); + finishRecentsAnimation(true /* toHome */, + () -> taskView.launchWithoutAnimation(this::onTaskLaunchAnimationEnd)); } - mContainer.getStatsLogManager().logger().withItemInfo(tv.getFirstItemInfo()) + mContainer.getStatsLogManager().logger().withItemInfo(taskView.getItemInfo()) .log(LAUNCHER_TASK_LAUNCH_SWIPE_DOWN); } else { onTaskLaunchAnimationEnd(false); @@ -5342,6 +5984,12 @@ public PendingAnimation createTaskLaunchAnimation( protected Unit onTaskLaunchAnimationEnd(boolean success) { if (success) { resetTaskVisuals(); + } else { + // If launch animation didn't complete i.e. user dragged live tile down and then + // back up and returned to Overview, then we need to ensure we reset the + // view to draw below recents so that it can't be interacted with. + mBlurUtils.setDrawLiveTileBelowRecents(true); + redrawLiveTile(); } return Unit.INSTANCE; } @@ -5352,6 +6000,14 @@ protected void notifyPageSwitchListener(int prevPage) { updateCurrentTaskActionsVisibility(); loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL); updateEnabledOverlays(); + if (enableRefactorTaskThumbnail()) { + mUtils.updateCentralTask(); + } + } + + @Override + protected void pageBeginTransition() { + super.pageBeginTransition(); } @Override @@ -5361,37 +6017,19 @@ protected String getCurrentPageDescription() { @Override public void addChildrenForAccessibility(ArrayList outChildren) { - // Add children in reverse order - for (int i = getChildCount() - 1; i >= 0; --i) { - outChildren.add(getChildAt(i)); - } + outChildren.addAll(mUtils.getAccessibilityChildren()); } @Override public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfo(info); + // We only care about TaskView's for the `CollectionInfo` that Talkback uses to read out. final AccessibilityNodeInfo.CollectionInfo - collectionInfo = AccessibilityNodeInfo.CollectionInfo.obtain( - 1, getTaskViewCount(), false, - AccessibilityNodeInfo.CollectionInfo.SELECTION_MODE_NONE); + collectionInfo = new AccessibilityNodeInfo.CollectionInfo( + 1, getTaskViewCount(), false); info.setCollectionInfo(collectionInfo); } - @Override - public void onInitializeAccessibilityEvent(AccessibilityEvent event) { - super.onInitializeAccessibilityEvent(event); - - final int taskViewCount = getTaskViewCount(); - event.setScrollable(taskViewCount > 0); - - if (event.getEventType() == AccessibilityEvent.TYPE_VIEW_SCROLLED) { - final int[] visibleTasks = getVisibleChildrenRange(); - event.setFromIndex(taskViewCount - visibleTasks[1]); - event.setToIndex(taskViewCount - visibleTasks[0]); - event.setItemCount(taskViewCount); - } - } - @Override public CharSequence getAccessibilityClassName() { // To hear position-in-list related feedback from Talkback. @@ -5407,6 +6045,10 @@ public void setEnableDrawingLiveTile(boolean enableDrawingLiveTile) { mEnableDrawingLiveTile = enableDrawingLiveTile; } + public boolean getEnableDrawingLiveTile() { + return mEnableDrawingLiveTile; + } + public void redrawLiveTile() { runActionOnRemoteHandles(remoteTargetHandle -> { TransformParams params = remoteTargetHandle.getTransformParams(); @@ -5416,11 +6058,11 @@ public void redrawLiveTile() { }); } + @Nullable public RemoteTargetHandle[] getRemoteTargetHandles() { return mRemoteTargetHandles; } - // TODO: To be removed in a follow up CL public void setRecentsAnimationTargets(RecentsAnimationController recentsAnimationController, RecentsAnimationTargets recentsAnimationTargets) { Log.d(TAG, "setRecentsAnimationTargets " @@ -5432,14 +6074,19 @@ public void setRecentsAnimationTargets(RecentsAnimationController recentsAnimati return; } - RemoteTargetGluer gluer; - if (recentsAnimationTargets.hasDesktopTasks()) { - gluer = new RemoteTargetGluer(getContext(), getSizeStrategy(), recentsAnimationTargets, - true /* forDesktop */); - mRemoteTargetHandles = gluer.assignTargetsForDesktop(recentsAnimationTargets); + boolean forDesktop; + if (DesktopModeStatus.enableMultipleDesktops(getContext())) { + forDesktop = mActiveGestureGroupedTaskInfo != null + && mActiveGestureGroupedTaskInfo.isBaseType(GroupedTaskInfo.TYPE_DESK); + } else { + forDesktop = recentsAnimationTargets.hasDesktopTasks(mContext); + } + RemoteTargetGluer gluer = new RemoteTargetGluer(getContext(), getContainerInterface(), + recentsAnimationTargets, forDesktop); + if (forDesktop) { + mRemoteTargetHandles = gluer.assignTargetsForDesktop( + recentsAnimationTargets, /* transitionInfo = */ null); } else { - gluer = new RemoteTargetGluer(getContext(), getSizeStrategy(), recentsAnimationTargets, - false); mRemoteTargetHandles = gluer.assignTargetsForSplitScreen(recentsAnimationTargets); } mSplitBoundsConfig = gluer.getSplitBounds(); @@ -5449,6 +6096,14 @@ public void setRecentsAnimationTargets(RecentsAnimationController recentsAnimati // mSyncTransactionApplier doesn't get transferred over runActionOnRemoteHandles(remoteTargetHandle -> { final TransformParams params = remoteTargetHandle.getTransformParams(); + if (mContainer instanceof RecentsWindowManager manager) { + params.setHomeBuilderProxy((builder, app, transformParams) -> { + mTmpMatrix.setScale( + 1f, 1f, app.localBounds.exactCenterX(), app.localBounds.exactCenterY()); + builder.setMatrix(mTmpMatrix).setAlpha(1f).setShow(); + }); + } + if (mSyncTransactionApplier != null) { params.setSyncTransactionApplier(mSyncTransactionApplier); params.getTargetSet().addReleaseCheck(mSyncTransactionApplier); @@ -5484,18 +6139,22 @@ public void runActionOnRemoteHandles(Consumer consumer) { /** * Finish recents animation. */ - public void finishRecentsAnimation(boolean toRecents, @Nullable Runnable onFinishComplete) { - finishRecentsAnimation(toRecents, true /* shouldPip */, onFinishComplete); + public void finishRecentsAnimation(boolean toHome, @Nullable Runnable onFinishComplete) { + finishRecentsAnimation(toHome, true /* shouldPip */, onFinishComplete); } /** - * NOTE: Whatever value gets passed through to the toRecents param may need to also be set on + * NOTE: Whatever value gets passed through to the toHome param may need to also be set on * {@link #mRecentsAnimationController#setWillFinishToHome}. */ - public void finishRecentsAnimation(boolean toRecents, boolean shouldPip, + public void finishRecentsAnimation( + boolean toHome, + boolean shouldPip, @Nullable Runnable onFinishComplete) { Log.d(TAG, "finishRecentsAnimation - mRecentsAnimationController: " - + mRecentsAnimationController); + + mRecentsAnimationController + ", toHome: " + toHome + ", shouldPip: " + shouldPip + + ", partial trace:\n" + + getTrimmedStackTrace("RecentsView.finishRecentsAnimation")); // TODO(b/197232424#comment#10) Move this back into onRecentsAnimationComplete(). Maybe? cleanupRemoteTargets(); @@ -5506,9 +6165,10 @@ public void finishRecentsAnimation(boolean toRecents, boolean shouldPip, return; } - final boolean sendUserLeaveHint = toRecents && shouldPip; - if (sendUserLeaveHint) { + final boolean sendUserLeaveHint = toHome && shouldPip; + if (sendUserLeaveHint && !PipFlags.isPip2ExperimentEnabled()) { // Notify the SysUI to use fade-in animation when entering PiP from live tile. + // Note: PiP2 handles entering differently, so skip if enable_pip2=true. final SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(getContext()); systemUiProxy.setPipAnimationTypeToAlpha(); systemUiProxy.setShelfHeight(true, mContainer.getDeviceProfile().hotseatBarSizePx); @@ -5525,12 +6185,20 @@ public void finishRecentsAnimation(boolean toRecents, boolean shouldPip, tx, null /* overlay */); } } - mRecentsAnimationController.finish(toRecents, () -> { - if (onFinishComplete != null) { - onFinishComplete.run(); - } - onRecentsAnimationComplete(); - }, sendUserLeaveHint); + if (enableOverviewBackgroundWallpaperBlur()) { + mBlurUtils.setDrawLiveTileBelowRecents(false); + } + mRecentsAnimationController.finish( + toHome, + /* onFinishComplete= */ () -> { + if (onFinishComplete != null) { + onFinishComplete.run(); + } + onRecentsAnimationComplete(); + }, + sendUserLeaveHint, + /* reason= */ new ActiveGestureLog.CompoundString( + "RecentsView.finishRecentsAnimation")); } /** @@ -5551,7 +6219,9 @@ public void onRecentsAnimationComplete() { setCurrentTask(-1); mRecentsAnimationController = null; mSplitSelectStateController.setRecentsAnimationRunning(false); - executeSideTaskLaunchCallback(); + if (enableOverviewBackgroundWallpaperBlur()) { + mBlurUtils.setDrawLiveTileBelowRecents(false); + } } public void setDisallowScrollToClearAll(boolean disallowScrollToClearAll) { @@ -5582,23 +6252,21 @@ protected int getChildGap(int fromIndex, int toIndex) { } protected int getClearAllExtraPageSpacing() { + OverviewProfile overviewProfile = mContainer.getDeviceProfile().getOverviewProfile(); return showAsGrid() - ? Math.max(mContainer.getDeviceProfile().overviewGridSideMargin - mPageSpacing, 0) - : 0; + ? Math.max(overviewProfile.getGridSideMargin() - mPageSpacing, 0) : 0; } @Override protected void updateMinAndMaxScrollX() { super.updateMinAndMaxScrollX(); - if (DEBUG) { - Log.d(TAG, "updateMinAndMaxScrollX - mMinScroll: " + mMinScroll); - Log.d(TAG, "updateMinAndMaxScrollX - mMaxScroll: " + mMaxScroll); - } + debugLog(TAG, "updateMinAndMaxScrollX - mMinScroll: " + mMinScroll); + debugLog(TAG, "updateMinAndMaxScrollX - mMaxScroll: " + mMaxScroll); } @Override protected int computeMinScroll() { - if (getTaskViewCount() <= 0) { + if (!hasTaskViews()) { return super.computeMinScroll(); } @@ -5607,7 +6275,7 @@ protected int computeMinScroll() { @Override protected int computeMaxScroll() { - if (getTaskViewCount() <= 0) { + if (!hasTaskViews()) { return super.computeMaxScroll(); } @@ -5615,26 +6283,42 @@ protected int computeMaxScroll() { } private int getFirstViewIndex() { - TaskView focusedTaskView = mShowAsGridLastOnLayout ? getFocusedTaskView() : null; - return focusedTaskView != null ? indexOfChild(focusedTaskView) : 0; + final View firstView; + if (mShowAsGridLastOnLayout) { + // For grid Overview, it always start if a large tile (focused task or desktop task) if + // they exist, otherwise it start with the first task. + TaskView firstLargeTaskView = mUtils.getFirstLargeTaskView(); + if (firstLargeTaskView != null) { + firstView = firstLargeTaskView; + } else { + firstView = mUtils.getFirstSmallTaskView(); + } + } else { + firstView = mUtils.getFirstTaskViewInCarousel( + /*nonRunningTaskCarouselHidden=*/mDesktopCarouselDetachProgress > 0); + } + return indexOfChild(firstView); } private int getLastViewIndex() { + final View lastView; if (!mDisallowScrollToClearAll) { - return indexOfChild(mClearAllButton); - } - - if (!mShowAsGridLastOnLayout) { - return getTaskViewCount() - 1; - } - - TaskView lastGridTaskView = getLastGridTaskView(); - if (lastGridTaskView != null) { - return indexOfChild(lastGridTaskView); + // When ClearAllButton is present, it always end with ClearAllButton. + lastView = mClearAllButton; + } else if (mShowAsGridLastOnLayout) { + // When ClearAllButton is absent, for the grid Overview, it always end with a grid task + // if they exist, otherwise it ends with a large tile (focused task or desktop task). + TaskView lastGridTaskView = getLastGridTaskView(); + if (lastGridTaskView != null) { + lastView = lastGridTaskView; + } else { + lastView = mUtils.getLastLargeTaskView(); + } + } else { + lastView = mUtils.getLastTaskViewInCarousel( + /*nonRunningTaskCarouselHidden=*/mDesktopCarouselDetachProgress > 0); } - - // Returns focus task if there are no grid tasks. - return indexOfChild(getFocusedTaskView()); + return indexOfChild(lastView); } /** @@ -5660,42 +6344,40 @@ protected boolean getPageScrolls(int[] outPageScrolls, boolean layoutChildren, mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff); } - boolean pageScrollChanged = false; - + int[] oldPageScrolls = Arrays.copyOf(outPageScrolls, outPageScrolls.length); int clearAllIndex = indexOfChild(mClearAllButton); int clearAllScroll = 0; int clearAllWidth = getPagedOrientationHandler().getPrimarySize(mClearAllButton); if (clearAllIndex != -1 && clearAllIndex < outPageScrolls.length) { float scrollDiff = mClearAllButton.getScrollAdjustment(showAsFullscreen, showAsGrid); - clearAllScroll = newPageScrolls[clearAllIndex] + (int) scrollDiff; - if (outPageScrolls[clearAllIndex] != clearAllScroll) { - pageScrollChanged = true; - outPageScrolls[clearAllIndex] = clearAllScroll; - } + clearAllScroll = newPageScrolls[clearAllIndex] + Math.round(scrollDiff); + outPageScrolls[clearAllIndex] = clearAllScroll; } - final int taskCount = getTaskViewCount(); int lastTaskScroll = getLastTaskScroll(clearAllScroll, clearAllWidth); - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); + getTaskViews().forEachWithIndexInParent((index, taskView) -> { float scrollDiff = taskView.getScrollAdjustment(showAsGrid); - int pageScroll = newPageScrolls[i] + Math.round(scrollDiff); + int pageScroll = newPageScrolls[index] + Math.round(scrollDiff); if ((mIsRtl && pageScroll < lastTaskScroll) || (!mIsRtl && pageScroll > lastTaskScroll)) { pageScroll = lastTaskScroll; } - if (outPageScrolls[i] != pageScroll) { - pageScrollChanged = true; - outPageScrolls[i] = pageScroll; - } - if (DEBUG) { - Log.d(TAG, "getPageScrolls - outPageScrolls[" + i + "]: " + outPageScrolls[i]); + outPageScrolls[index] = pageScroll; + debugLog(TAG, + "getPageScrolls - outPageScrolls[" + index + "]: " + outPageScrolls[index]); + }); + + int addDesktopButtonIndex = indexOfChild(mAddDesktopButton); + if (addDesktopButtonIndex >= 0 && addDesktopButtonIndex < outPageScrolls.length) { + int firstViewIndex = getFirstViewIndex(); + if (firstViewIndex >= 0 && firstViewIndex < outPageScrolls.length) { + outPageScrolls[addDesktopButtonIndex] = outPageScrolls[firstViewIndex]; } + debugLog(TAG, "getPageScrolls - addDesktopButtonScroll: " + + outPageScrolls[addDesktopButtonIndex]); } - if (DEBUG) { - Log.d(TAG, "getPageScrolls - clearAllScroll: " + clearAllScroll); - } - return pageScrollChanged; + debugLog(TAG, "getPageScrolls - clearAllScroll: " + clearAllScroll); + return !Arrays.equals(oldPageScrolls, outPageScrolls); } @Override @@ -5712,12 +6394,12 @@ protected int getChildOffset(int index) { } @Override - protected int getChildVisibleSize(int index) { - final TaskView taskView = getTaskViewAt(index); + protected int getChildVisibleSize(int childIndex) { + final TaskView taskView = getTaskViewAt(childIndex); if (taskView == null) { - return super.getChildVisibleSize(index); + return super.getChildVisibleSize(childIndex); } - return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment( + return (int) (super.getChildVisibleSize(childIndex) * taskView.getSizeAdjustment( showAsFullscreen())); } @@ -5725,6 +6407,11 @@ public ClearAllButton getClearAllButton() { return mClearAllButton; } + @Nullable + public AddDesktopButton getAddDeskButton() { + return mAddDesktopButton; + } + /** * @return How many pixels the running task is offset on the currently laid out dominant axis. */ @@ -5741,7 +6428,7 @@ public int getScrollOffsetForKeyboardTaskFocus() { return getScrollOffset(getRunningTaskIndex()); } return getPagedOrientationHandler().getPrimaryScroll(this) - - getScrollForPage(mKeyboardTaskFocusIndex) + - getScrollForPage(indexOfChild(getKeyboardFocusTaskView())) + getScrollOffset(getRunningTaskIndex()); } @@ -5749,6 +6436,7 @@ public int getScrollOffsetForKeyboardTaskFocus() { * Sets whether or not we should clamp the scroll offset. * This is used to avoid x-axis movement when swiping up transient taskbar. * Should only be set at the beginning and end of the gesture, otherwise a jump may occur. + * * @param clampScrollOffset When true, we clamp the scroll to 0 before the clamp threshold is * met. */ @@ -5775,17 +6463,17 @@ public int getScrollOffset(int pageIndex) { * Returns how many pixels the page is offset on the currently laid out dominant axis. */ private int getUnclampedScrollOffset(int pageIndex) { - if (pageIndex == -1) { + if (pageIndex == INVALID_PAGE) { return 0; } // Don't dampen the scroll (due to overscroll) if the adjacent tasks are offscreen, so that // the page can move freely given there's no visual indication why it shouldn't. int overScrollShift = mAdjacentPageHorizontalOffset > 0 - ? (int) Utilities.mapRange( - mAdjacentPageHorizontalOffset, - getOverScrollShift(), - getUndampedOverScrollShift()) - : getOverScrollShift(); + ? (int) Utilities.mapRange( + mAdjacentPageHorizontalOffset, + getOverScrollShift(), + getUndampedOverScrollShift()) + : getOverScrollShift(); return getScrollForPage(pageIndex) - getPagedOrientationHandler().getPrimaryScroll(this) + overScrollShift + getOffsetFromScrollPosition(pageIndex); } @@ -5794,11 +6482,18 @@ private int getUnclampedScrollOffset(int pageIndex) { * Returns how many pixels the page is offset from its scroll position. */ private int getOffsetFromScrollPosition(int pageIndex) { - return getOffsetFromScrollPosition(pageIndex, getTopRowIdArray(), getBottomRowIdArray()); + return getOffsetFromScrollPosition(pageIndex, mUtils.getTopRowIdArray(), + mUtils.getBottomRowIdArray()); } private int getOffsetFromScrollPosition( int pageIndex, IntArray topRowIdArray, IntArray bottomRowIdArray) { + return getOffsetFromScrollPosition(pageIndex, topRowIdArray, bottomRowIdArray, + /* removedPageIndex= */ INVALID_PAGE); + } + + protected int getOffsetFromScrollPosition(int pageIndex, IntArray topRowIdArray, + IntArray bottomRowIdArray, int removedPageIndex) { if (!showAsGrid()) { return 0; } @@ -5813,7 +6508,12 @@ private int getOffsetFromScrollPosition( return 0; } - if (getScrollForPage(pageIndex) != getScrollForPage(indexOfChild(lastGridTaskView))) { + int lastGridTaskViewIndex = indexOfChild(lastGridTaskView); + // When computing offset, account for a removed page if provided. + if (removedPageIndex != INVALID_PAGE && removedPageIndex < lastGridTaskViewIndex) { + lastGridTaskViewIndex--; + } + if (getScrollForPage(pageIndex) != getScrollForPage(lastGridTaskViewIndex)) { return 0; } @@ -5844,12 +6544,19 @@ private int getPositionInRow( } /** - * @return true if the task in on the top of the grid + * @return true if the task in on the bottom of the grid */ public boolean isOnGridBottomRow(TaskView taskView) { return showAsGrid() && !mTopRowIdSet.contains(taskView.getTaskViewId()) - && taskView.getTaskViewId() != mFocusedTaskViewId; + && !taskView.isLargeTile(); + } + + /** + * @return true if the task in on the top of the grid + */ + public boolean isOnGridTopRow(TaskView taskView) { + return showAsGrid() && mTopRowIdSet.contains(taskView.getTaskViewId()); } public Consumer getEventDispatcher(float navbarRotation) { @@ -5882,19 +6589,27 @@ public Consumer getEventDispatcher(float navbarRotation) { } private void updateEnabledOverlays() { - TaskView focusedTaskView = getFocusedTaskView(); - int taskCount = getTaskViewCount(); - for (int i = 0; i < taskCount; i++) { - TaskView taskView = requireTaskViewAt(i); - if (taskView == focusedTaskView) { - continue; + if (enableRefactorTaskThumbnail()) { + Set fullyVisibleTaskIds = new HashSet<>(); + for (TaskView taskView : getTaskViews()) { + if (isTaskViewFullyVisible(taskView)) { + fullyVisibleTaskIds.addAll(taskView.getTaskIdSet()); + } + } + mRecentsViewModel.updateTasksFullyVisible(fullyVisibleTaskIds); + } else { + TaskView focusedTaskView = getFocusedTaskView(); + for (TaskView taskView : getTaskViews()) { + if (taskView == focusedTaskView) { + continue; + } + taskView.setOverlayEnabled(mOverlayEnabled && isTaskViewFullyVisible(taskView)); + } + // Focus task overlay should be enabled and refreshed at last + if (focusedTaskView != null) { + focusedTaskView.setOverlayEnabled( + mOverlayEnabled && isTaskViewFullyVisible(focusedTaskView)); } - taskView.setOverlayEnabled(mOverlayEnabled && isTaskViewFullyVisible(taskView)); - } - // Focus task overlay should be enabled and refreshed at last - if (focusedTaskView != null) { - focusedTaskView.setOverlayEnabled( - mOverlayEnabled && isTaskViewFullyVisible(focusedTaskView)); } } @@ -5902,6 +6617,10 @@ public void setOverlayEnabled(boolean overlayEnabled) { if (mOverlayEnabled != overlayEnabled) { mOverlayEnabled = overlayEnabled; updateEnabledOverlays(); + + if (enableRefactorTaskThumbnail()) { + mRecentsViewModel.setOverlayEnabled(overlayEnabled); + } } } @@ -5949,32 +6668,19 @@ public void switchToScreenshot(Runnable onFinishRunnable) { return; } - switchToScreenshotInternal(onFinishRunnable); - } - - private void switchToScreenshotInternal(Runnable onFinishRunnable) { TaskView taskView = getRunningTaskView(); if (taskView == null) { onFinishRunnable.run(); return; } - setRunningTaskViewShowScreenshot(true); - for (TaskContainer container : taskView.getTaskContainers()) { - if (container == null) { - continue; - } - - ThumbnailData td = - mRecentsAnimationController.screenshotTask(container.getTask().key.id); - TaskThumbnailViewDeprecated thumbnailView = container.getThumbnailViewDeprecated(); - if (td != null) { - thumbnailView.setThumbnail(container.getTask(), td); - } else { - thumbnailView.refresh(); - } + Map updatedThumbnails = mUtils.screenshotTasks(taskView); + if (enableRefactorTaskThumbnail()) { + mHelper.switchToScreenshot(taskView, updatedThumbnails, onFinishRunnable); + } else { + setRunningTaskViewShowScreenshot(true, updatedThumbnails); + ViewUtils.postFrameDrawn(taskView, onFinishRunnable); } - ViewUtils.postFrameDrawn(taskView, onFinishRunnable); } /** @@ -5988,9 +6694,12 @@ public void switchToScreenshot(@Nullable HashMap thumbna Runnable onFinishRunnable) { final TaskView taskView = getRunningTaskView(); if (taskView != null) { - taskView.setShouldShowScreenshot(true); - taskView.refreshThumbnails(thumbnailDatas); - ViewUtils.postFrameDrawn(taskView, onFinishRunnable); + if (enableRefactorTaskThumbnail()) { + mHelper.switchToScreenshot(taskView, thumbnailDatas, onFinishRunnable); + } else { + taskView.setShouldShowScreenshot(true, thumbnailDatas); + ViewUtils.postFrameDrawn(taskView, onFinishRunnable); + } } else { onFinishRunnable.run(); } @@ -6003,15 +6712,22 @@ public void switchToScreenshot(@Nullable HashMap thumbna private void setTaskModalness(float modalness) { mTaskModalness = modalness; updatePageOffsets(); - if (mSelectedTask != null) { - mSelectedTask.setModalness(modalness); + if (getSelectedTaskView() != null) { + if (enableGridOnlyOverview()) { + for (TaskView taskView : getTaskViews()) { + taskView.setModalness(modalness); + } + } else { + getSelectedTaskView().setModalness(modalness); + } } else if (getCurrentPageTaskView() != null) { getCurrentPageTaskView().setModalness(modalness); } // Only show actions view when it's modal for in-place landscape mode. - boolean inPlaceLandscape = !mOrientationState.isRecentsActivityRotationAllowed() - && mOrientationState.getTouchRotation() != ROTATION_0; - mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION, modalness < 1 && inPlaceLandscape); + mActionsView.updateHiddenFlags( + HIDDEN_NON_ZERO_ROTATION, modalness < 1 + && mOrientationState.shouldHideActionButtons() + ); } @Nullable @@ -6031,8 +6747,8 @@ public TaskOverlayFactory getTaskOverlayFactory() { return mTaskOverlayFactory; } - public BaseContainerInterface getSizeStrategy() { - return mSizeStrategy; + public BaseContainerInterface getContainerInterface() { + return mContainerInterface; } /** @@ -6055,12 +6771,11 @@ public void showForegroundScrim(boolean show) { } /** Tint the RecentsView and TaskViews in to simulate a scrim. */ - // TODO(b/187528071): Replace this tinting with a scrim on top of RecentsView private void setColorTint(float tintAmount) { mColorTint = tintAmount; - for (int i = 0; i < getTaskViewCount(); i++) { - requireTaskViewAt(i).setColorTint(mColorTint, mTintingColor); + for (TaskView taskView : getTaskViews()) { + taskView.setColorTint(mColorTint, mTintingColor); } Drawable scrimBg = mContainer.getScrimView().getBackground(); @@ -6086,11 +6801,11 @@ private float getColorTint() { /** Returns {@code true} if the overview tasks are displayed as a grid. */ public boolean showAsGrid() { return mOverviewGridEnabled || (mCurrentGestureEndTarget != null - && mSizeStrategy.stateFromGestureEndTarget(mCurrentGestureEndTarget) - .displayOverviewTasksAsGrid(mContainer.getDeviceProfile())); + && mContainerInterface.stateFromGestureEndTarget(mCurrentGestureEndTarget) + .displayOverviewTasksAsGrid(mContainer.getDeviceProfile())); } - private boolean showAsFullscreen() { + protected boolean showAsFullscreen() { return mOverviewFullscreenEnabled && mCurrentGestureEndTarget != GestureState.GestureEndTarget.RECENTS; } @@ -6116,6 +6831,14 @@ public interface OnEmptyMessageUpdatedListener { * Adds a listener for scroll changes */ public void addOnScrollChangedListener(OnScrollChangedListener listener) { + if (mScrollListeners.contains(listener)) { + if (BuildConfigs.IS_STUDIO_BUILD) { + throw new IllegalStateException( + "Should not add duplicated OnScrollChangedListener"); + } else { + mScrollListeners.remove(listener); + } + } mScrollListeners.add(listener); } @@ -6127,19 +6850,11 @@ public void removeOnScrollChangedListener(OnScrollChangedListener listener) { } /** - * @return Corner radius in pixel value for PiP window, which is updated via - * {@link #mIPipAnimationListener} - */ - public int getPipCornerRadius() { - return mPipCornerRadius; - } - - /** - * @return Shadow radius in pixel value for PiP window, which is updated via - * {@link #mIPipAnimationListener} + * @return PiP resources for PiP window, which is updated via + * {@link #mIPipAnimationListener} */ - public int getPipShadowRadius() { - return mPipShadowRadius; + public PipResources getPipResources() { + return mPipResources; } @Override @@ -6204,17 +6919,26 @@ protected void onScrollChanged(int l, int t, int oldl, int oldt) { * Prepares this RecentsView to scroll properly for an upcoming child view focus request from * keyboard quick switching */ - public void setKeyboardTaskFocusIndex(int taskIndex) { - mKeyboardTaskFocusIndex = taskIndex; + public void setKeyboardFocusTask(@NonNull KeyboardFocusTask keyboardFocusTask) { + mUtils.setKeyboardFocusTask(keyboardFocusTask); + } + + /** + * Returns the TaskView that will be focused for an upcoming child view focus request from + * keyboard quick switching + */ + @Nullable + public TaskView getKeyboardFocusTaskView() { + return mUtils.getKeyboardFocusTaskView(); } /** Returns whether this RecentsView will be scrolling to a child view for a focus request */ public boolean isKeyboardTaskFocusPending() { - return mKeyboardTaskFocusIndex != INVALID_PAGE; + return mUtils.isKeyboardTaskFocusPending(); } private boolean isKeyboardTaskFocusPendingForChild(View child) { - return isKeyboardTaskFocusPending() && mKeyboardTaskFocusIndex == indexOfChild(child); + return isKeyboardTaskFocusPending() && getKeyboardFocusTaskView() == child; } @Override @@ -6246,11 +6970,11 @@ public void requestChildFocus(View child, View focused) { super.requestChildFocus(child, focused); } - private void dispatchScrollChanged() { + protected void dispatchScrollChanged() { runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator().setScroll(getScrollOffset())); for (int i = mScrollListeners.size() - 1; i >= 0; i--) { - mScrollListeners.get(i).onScrollChanged(); + mScrollListeners.valueAt(i).onScrollChanged(); } } @@ -6279,10 +7003,9 @@ public void onPipAnimationStarted() { } @Override - public void onPipResourceDimensionsChanged(int cornerRadius, int shadowRadius) { + public void onPipResourceDimensionsChanged(PipResources res) { if (mRecentsView != null) { - mRecentsView.mPipCornerRadius = cornerRadius; - mRecentsView.mPipShadowRadius = shadowRadius; + mRecentsView.mPipResources = res; } } @@ -6290,12 +7013,12 @@ public void onPipResourceDimensionsChanged(int cornerRadius, int shadowRadius) { public void onExpandPip() { MAIN_EXECUTOR.execute(() -> { if (mRecentsView == null - || mRecentsView.mSizeStrategy.getTaskbarController() == null) { + || mRecentsView.mContainerInterface.getTaskbarInteractor() == null) { return; } // Hide the task bar when leaving PiP to prevent it from flickering once // the app settles in full-screen mode. - mRecentsView.mSizeStrategy.getTaskbarController().onExpandPip(); + mRecentsView.mContainerInterface.getTaskbarInteractor().onExpandPip(); }); } } @@ -6338,10 +7061,10 @@ public void updateLocusId() { public void moveTaskToDesktop(TaskContainer taskContainer, DesktopModeTransitionSource transitionSource, Runnable successCallback) { - if (!DesktopModeStatus.canEnterDesktopMode(getContext())) { + if (!DesktopModeStatus.canEnterDesktopMode(mContext)) { return; } - switchToScreenshot(() -> finishRecentsAnimation(/* toRecents= */true, /* shouldPip= */false, + switchToScreenshot(() -> finishRecentsAnimation(/* toHome= */true, /* shouldPip= */false, () -> moveTaskToDesktopInternal(taskContainer, successCallback, transitionSource))); } @@ -6350,11 +7073,41 @@ private void moveTaskToDesktopInternal(TaskContainer taskContainer, if (mDesktopRecentsTransitionController == null) { return; } - mDesktopRecentsTransitionController.moveToDesktop(taskContainer.getTask().key.id, + + mDesktopRecentsTransitionController.moveToDesktop(taskContainer, transitionSource, () -> { + successCallback.run(); + if (mContainer instanceof RecentsWindowManager recentsWindowManager) { + post(recentsWindowManager::hideRecentsWindow); + } + }); + } + + /** + * Move the provided task into external display and invoke {@code successCallback} if succeeded. + */ + public void moveTaskToExternalDisplay(TaskContainer taskContainer, + DesktopModeTransitionSource transitionSource, Runnable successCallback) { + if (!DesktopModeStatus.canEnterDesktopMode(mContext)) { + return; + } + switchToScreenshot(() -> finishRecentsAnimation(/* toHome= */true, /* shouldPip= */false, + () -> moveTaskToExternalDisplayInternal(taskContainer, successCallback, + transitionSource))); + } + + private void moveTaskToExternalDisplayInternal(TaskContainer taskContainer, + Runnable successCallback, + DesktopModeTransitionSource transitionSource) { + if (mDesktopRecentsTransitionController == null) { + return; + } + mDesktopRecentsTransitionController.moveToExternalDisplay(taskContainer.getTask().key.id, transitionSource); + dismissTaskView(taskContainer.getTaskView(), /*animate*/true, /*removeTask*/false); successCallback.run(); } + // Logs when the orientation of Overview changes. We log both real and fake orientation changes. private void logOrientationChanged() { // Only log when Overview is showing. @@ -6373,7 +7126,42 @@ private void logOrientationChanged() { } } + /** + * Runs the spring animations as a task dismisses or settles back into its place in overview. + * + *

When a task dismiss is cancelled, the task will return to its original position via a + * spring animation. As it passes the threshold of its settling state, its neighbors will + * spring in response to the perceived impact of the settling task. + */ + public RecentsDismissUtils.SpringSet runTaskDismissSettlingSpringAnimation( + TaskView draggedTaskView, boolean isDismissing, + RecentsDismissUtils.DismissedTaskData dismissedTaskData, boolean shouldRemoveTaskView, + boolean isSplitSelection) { + return mDismissUtils.createTaskDismissSpringAnimation(draggedTaskView, isDismissing, + dismissedTaskData, shouldRemoveTaskView, isSplitSelection); + } + + /** + * Animates RecentsView's scale to the provided value, using spring animations. + */ + public SpringAnimation animateRecentsScale(float scale) { + return mDismissUtils.animateRecentsScale(scale); + } + public interface TaskLaunchListener { void onTaskLaunched(); } + + /** + * Draws the remote animation targets above the recents view. + * + * @param remoteTargetHandles collection of remoteTargetHandles in Recents. + */ + public void setDrawAboveRecents(RemoteTargetHandle[] remoteTargetHandles) { + mBlurUtils.setDrawAboveRecents(remoteTargetHandles); + } + + public Map getTaskViewsDismissPrimaryTranslations() { + return mTaskViewsDismissPrimaryTranslations; + } } diff --git a/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java b/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java index 060c71e4467..8b2f2e58105 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java +++ b/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java @@ -16,7 +16,6 @@ package com.android.quickstep.views; -import android.app.Activity; import android.content.Context; import android.content.ContextWrapper; import android.content.LocusId; @@ -26,11 +25,16 @@ import android.view.View; import android.view.Window; +import androidx.annotation.Nullable; + import com.android.launcher3.BaseActivity; import com.android.launcher3.logger.LauncherAtom; -import com.android.launcher3.util.SystemUiController; +import com.android.launcher3.taskbar.TaskbarInteractor; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.ScrimView; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.util.SplitSelectStateController; /** * Interface to be implemented by the parent view of RecentsView @@ -41,7 +45,7 @@ public interface RecentsViewContainer extends ActivityContext { * Returns an instance of an implementation of RecentsViewContainer * @param context will find instance of recentsViewContainer from given context. */ - static T containerFromContext(Context context) { + static T containerFromContext(Context context) { if (context instanceof RecentsViewContainer) { return (T) context; } else if (context instanceof ContextWrapper) { @@ -51,33 +55,20 @@ static T containerFromContext(Context context) } } - /** - * Returns {@link SystemUiController} to manage various window flags to control system UI. - */ - SystemUiController getSystemUiController(); - /** * Returns {@link ScrimView} */ ScrimView getScrimView(); /** - * Returns the Overview Panel as a View - */ - T getOverviewPanel(); - - /** - * Returns the RootView + * Returns the BaseContainerInterface to interact with RecentsViewContainer. */ - View getRootView(); + > T getContainerInterface(); /** - * Dispatches a generic motion event to the view hierarchy. - * Returns the current RecentsViewContainer as context + * Returns the Overview Panel as a View */ - default Context asContext() { - return (Context) this; - } + T getOverviewPanel(); /** * @see Window.Callback#dispatchGenericMotionEvent(MotionEvent) @@ -92,7 +83,7 @@ default Context asContext() { /** * Returns overview actions view as a view */ - View getActionsView(); + OverviewActionsView getActionsView(); /** * @see BaseActivity#addForceInvisibleFlag(int) @@ -140,38 +131,32 @@ default Context asContext() { void runOnBindToTouchInteractionService(Runnable r); /** - * @see Activity#getWindow() - * @return Window + * Begins transition from overview back to homescreen */ - Window getWindow(); + void returnToHomescreen(); /** - * @see - * BaseActivity#addMultiWindowModeChangedListener(BaseActivity.MultiWindowModeChangedListener) - * @param listener {@link BaseActivity.MultiWindowModeChangedListener} + * True if the overview panel is visible. + * @return Boolean */ - void addMultiWindowModeChangedListener( - BaseActivity.MultiWindowModeChangedListener listener); + boolean isRecentsViewVisible(); /** - * @see - * BaseActivity#removeMultiWindowModeChangedListener( - * BaseActivity.MultiWindowModeChangedListener) - * @param listener {@link BaseActivity.MultiWindowModeChangedListener} + * Begins transition to start home through container. */ - void removeMultiWindowModeChangedListener( - BaseActivity.MultiWindowModeChangedListener listener); + void startHome(boolean animated, @Nullable Runnable onHomeAnimationComplete); /** - * Begins transition from overview back to homescreen + * Checks container to see if we can start home transition safely */ - void returnToHomescreen(); + boolean canStartHomeSafely(); + /** - * True if the overview panel is visible. - * @return Boolean + * Enter staged split directly from the current running app. + * @param leftOrTop if the staged split will be positioned left or top. */ - boolean isRecentsViewVisible(); + default void enterStageSplitFromRunningApp(boolean leftOrTop, int displayId) {} /** * Overwrites any logged item in Launcher that doesn't have a container with the @@ -198,4 +183,21 @@ default void applyOverwritesToLogItem(LauncherAtom.ItemInfo.Builder itemInfoBuil .setOrientationHandler(orientationForLogging)) .build()); } + + void setTaskbarInteractor(@Nullable TaskbarInteractor taskbarInteractor); + + @Nullable TaskbarInteractor getTaskbarInteractor(); + + /** + * Returns the Split Select State Controller + */ + SplitSelectStateController getSplitSelectStateController(); + + /** + * Changes the state to the provided {@link RecentsState} or equivalent. + * + * @param animated false if the state should change immediately without any animation, + * true otherwise + */ + void goToRecentsState(RecentsState recentsState, boolean animated); } diff --git a/quickstep/src/com/android/quickstep/views/RecentsViewModelHelper.kt b/quickstep/src/com/android/quickstep/views/RecentsViewModelHelper.kt new file mode 100644 index 00000000000..d420bc056e9 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/RecentsViewModelHelper.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.quickstep.views + +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.ViewUtils +import com.android.quickstep.recents.viewmodel.RecentsViewModel +import com.android.systemui.shared.recents.model.ThumbnailData +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.cancel +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +/** Helper for [RecentsView] to interact with the [RecentsViewModel]. */ +class RecentsViewModelHelper( + private val recentsViewModel: RecentsViewModel, + private val recentsCoroutineScope: CoroutineScope, + private val dispatcherProvider: DispatcherProvider, +) { + fun onDestroy() { + recentsCoroutineScope.cancel("RecentsView is being destroyed") + } + + fun switchToScreenshot( + taskView: TaskView, + updatedThumbnails: Map?, + onFinishRunnable: Runnable, + ) { + // Update recentsViewModel and apply the thumbnailOverride ASAP, before waiting inside + // viewAttachedScope. + recentsViewModel.setRunningTaskShowScreenshot(true) + recentsCoroutineScope.launch(dispatcherProvider.lightweightBackground) { + recentsViewModel.waitForRunningTaskShowScreenshotToUpdate() + recentsViewModel.waitForThumbnailsToUpdate(updatedThumbnails) + withContext(dispatcherProvider.main) { + ViewUtils.postFrameDrawn(taskView, onFinishRunnable) + } + } + } +} diff --git a/quickstep/src/com/android/quickstep/views/RecentsViewUtils.kt b/quickstep/src/com/android/quickstep/views/RecentsViewUtils.kt new file mode 100644 index 00000000000..890ba666165 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/RecentsViewUtils.kt @@ -0,0 +1,900 @@ +/* + * 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.quickstep.views + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.graphics.PointF +import android.graphics.Rect +import android.util.FloatProperty +import android.util.Log +import android.util.Property +import android.view.KeyEvent +import android.view.View +import android.view.View.LAYOUT_DIRECTION_LTR +import android.view.View.LAYOUT_DIRECTION_RTL +import androidx.core.view.ancestors +import androidx.core.view.children +import androidx.core.view.isEmpty +import androidx.core.view.isInvisible +import androidx.dynamicanimation.animation.FloatPropertyCompat +import androidx.dynamicanimation.animation.SpringAnimation +import androidx.dynamicanimation.animation.SpringForce +import com.android.app.animation.Interpolators.LINEAR +import com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU +import com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType +import com.android.launcher3.Flags.enableDesktopExplodedView +import com.android.launcher3.Flags.enableOverviewOnConnectedDisplays +import com.android.launcher3.PagedView.INVALID_PAGE +import com.android.launcher3.R +import com.android.launcher3.Utilities.getPivotsForScalingRectToRect +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.statehandlers.DesktopVisibilityController.Companion.INACTIVE_DESK_ID +import com.android.launcher3.statemanager.BaseState +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.IntArray +import com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu +import com.android.launcher3.util.RunnableList +import com.android.launcher3.util.window.WindowManagerProxy.DesktopVisibilityListener +import com.android.quickstep.GestureState +import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle +import com.android.quickstep.util.DesksUtils.Companion.areMultiDesksFlagsEnabled +import com.android.quickstep.util.DesktopTask +import com.android.quickstep.util.GroupTask +import com.android.quickstep.util.TaskGridNavHelper +import com.android.quickstep.util.isExternalDisplay +import com.android.quickstep.views.RecentsView.DESKTOP_CAROUSEL_DETACH_PROGRESS +import com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS +import com.android.quickstep.views.RecentsView.RUNNING_TASK_ATTACH_ALPHA +import com.android.quickstep.views.RecentsView.TAG +import com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA +import com.android.quickstep.views.TaskView.Companion.FLAG_UPDATE_ALL +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.wm.shell.shared.GroupedTaskInfo +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus.enableMultipleDesktops +import java.util.function.BiConsumer +import kotlin.math.min +import kotlin.reflect.KMutableProperty1 + +/** + * Helper class for [RecentsView]. This util class contains refactored and extracted functions from + * RecentsView to facilitate the implementation of unit tests. + */ +class RecentsViewUtils(private val recentsView: RecentsView<*, *>) : DesktopVisibilityListener { + val taskViews = TaskViewsIterable(recentsView) + + private val displayController = DisplayController.INSTANCE[recentsView.context] + + var keyboardFocusTask: KeyboardFocusTask = KeyboardFocusTask.Unfocused + + /** Takes a screenshot of all [taskView] and return map of taskId to the screenshot */ + fun screenshotTasks(taskView: TaskView): Map { + val recentsAnimationController = recentsView.recentsAnimationController ?: return emptyMap() + return taskView.taskContainers + .associate { + it.task.key.id to recentsAnimationController.screenshotTask(it.task.key.id) + } + .filter { it.value.thumbnail != null } + } + + /** + * Sorts task groups to move desktop tasks to the end of the list. + * + * @param tasks List of group tasks to be sorted. + * @return Sorted list of GroupTasks to be used in the RecentsView. + */ + fun sortDesktopTasksToFront(tasks: List): List { + var (desktopTasks, otherTasks) = tasks.partition { it.taskViewType == TaskViewType.DESKTOP } + if (areMultiDesksFlagsEnabled()) { + // Desk IDs of newer desks are larger than those of older desks, hence we can use them + // to sort desks from old to new. + desktopTasks = desktopTasks.sortedBy { (it as DesktopTask).deskId } + } + return otherTasks + desktopTasks + } + + fun sortExternalDisplayTasksToFront(tasks: List): List { + val (externalDisplayTasks, otherTasks) = + tasks.partition { it.tasks.firstOrNull().isExternalDisplay } + return otherTasks + externalDisplayTasks + } + + class TaskViewsIterable(val recentsView: RecentsView<*, *>) : Iterable { + /** Iterates TaskViews when its index inside the RecentsView is needed. */ + fun forEachWithIndexInParent(consumer: BiConsumer) { + recentsView.children.forEachIndexed { index, child -> + (child as? TaskView)?.let { consumer.accept(index, it) } + } + } + + override fun iterator(): Iterator = + recentsView.children.mapNotNull { it as? TaskView }.iterator() + } + + /** Counts [TaskView]s that are [DesktopTaskView] instances. */ + fun getDesktopTaskViewCount(): Int = taskViews.count { it is DesktopTaskView } + + /** Counts [TaskView]s that are not [DesktopTaskView] instances. */ + fun getNonDesktopTaskViewCount(): Int = taskViews.count { it !is DesktopTaskView } + + /** Returns a list of all large TaskView Ids from [TaskView]s */ + fun getLargeTaskViewIds(): List = taskViews.filter { it.isLargeTile }.map { it.taskViewId } + + /** Returns a list of all large TaskViews [TaskView]s */ + fun getLargeTaskViews(): List = taskViews.filter { it.isLargeTile } + + /** Returns a list of all non-large TaskViews [TaskView]s */ + fun getSmallTaskViews(): List = taskViews.filter { !it.isLargeTile } + + /** Returns all the TaskViews in the top row, without the focused task */ + fun getTopRowTaskViews(): List = + taskViews.filter { recentsView.mTopRowIdSet.contains(it.taskViewId) } + + /** Returns all the task Ids in the top row, without the focused task */ + fun getTopRowIdArray(): IntArray = + getTopRowTaskViews().map { it.taskViewId }.toLauncher3IntArray() + + /** Returns all the TaskViews in the bottom row, without the focused task */ + fun getBottomRowTaskViews(): List = + taskViews.filter { !recentsView.mTopRowIdSet.contains(it.taskViewId) && !it.isLargeTile } + + /** Returns all the task Ids in the bottom row, without the focused task */ + fun getBottomRowIdArray(): IntArray = + getBottomRowTaskViews().map { it.taskViewId }.toLauncher3IntArray() + + private fun List.toLauncher3IntArray() = + IntArray(size).apply { this@toLauncher3IntArray.forEach(::add) } + + /** Counts [TaskView]s that are large tiles. */ + fun getLargeTileCount(): Int = taskViews.count { it.isLargeTile } + + /** Counts [TaskView]s that are grid tasks. */ + fun getGridTaskCount(): Int = taskViews.count { it.isGridTask } + + /** Returns the first TaskView that should be displayed as a large tile. */ + fun getFirstLargeTaskView(): TaskView? = + taskViews.firstOrNull { + it.isLargeTile && !(recentsView.isSplitSelectionActive && it is DesktopTaskView) + } + + /** + * Returns the [DesktopTaskView] that matches the given [deskId], or null if it doesn't exist. + */ + fun getDesktopTaskViewForDeskId(deskId: Int): DesktopTaskView? { + if (deskId == INACTIVE_DESK_ID) { + return null + } + return taskViews.firstOrNull { it is DesktopTaskView && it.deskId == deskId } + as? DesktopTaskView + } + + /** Returns the active desk ID of the display that contains the [recentsView] instance. */ + fun getActiveDeskIdOnThisDisplay(): Int = + DesktopVisibilityController.INSTANCE.get(recentsView.context) + .getActiveDeskId(recentsView.mContainer.display.displayId) + + /** Returns the expected focus task. */ + fun getFirstNonDesktopTaskView(): TaskView? = taskViews.firstOrNull { it !is DesktopTaskView } + + fun getLastDesktopTaskView(): TaskView? = taskViews.lastOrNull { it is DesktopTaskView } + + /** Returns true if it is in desktop-first mode. Otherwise, returns false. */ + fun isInDesktopFirstMode() = + displayController + .getInfoForDisplay(recentsView.mContainer.displayId) + ?.isInDesktopFirstMode == true + + /** + * Returns false if it is the last desktop on desktop-first when multi-desk enabled. Otherwise, + * returns true. + */ + fun canRemoveTaskView(taskView: TaskView): Boolean { + if (!areMultiDesksFlagsEnabled() || !isInDesktopFirstMode()) { + return true + } + + return taskView !is DesktopTaskView || getDesktopTaskViewCount() > 1 + } + + /** + * Returns the [TaskView] that should be the current page during task binding, in the following + * priorities: + * 1. Running task + * 2. Focused task + * 3. First non-desktop task + * 4. Last desktop task + * 5. null otherwise + */ + fun getExpectedCurrentTask(runningTaskView: TaskView?, focusedTaskView: TaskView?): TaskView? = + runningTaskView + ?: focusedTaskView + ?: taskViews.firstOrNull { + it !is DesktopTaskView && + (enableOverviewOnConnectedDisplays() || !it.isExternalDisplay) + } + ?: taskViews.lastOrNull() + + fun handleTabKeyEvent(event: KeyEvent, superCall: (KeyEvent) -> Boolean): Boolean { + val isShiftPressed = event.isShiftPressed + val cycleTaskViews = { + recentsView.snapToPageRelative( + if (isShiftPressed) -1 else 1, + /* cycle= */ true, + TaskGridNavHelper.TaskNavDirection.TAB, + ) + } + + // When alt + tabbing on phones (KQS handles on large screens) go to the next task. + if (event.isAltPressed) { + return cycleTaskViews() + } + + // If not alt + tabbing, cycle through the available views in a single task (e.g. chip menu) + val currentFocus: View = recentsView.findFocus() ?: return superCall(event) + + // If already at the last focusable element within the TaskView (or if cycling in reverse + // order and on first element), snap to the next page. + val direction = if (isShiftPressed) View.FOCUS_BACKWARD else View.FOCUS_FORWARD + findParentTaskView(currentFocus)?.getVisibleFocusables(direction)?.let { focusables -> + if ( + focusables.isNotEmpty() && + ((!isShiftPressed && currentFocus == focusables.last()) || + (isShiftPressed && currentFocus == focusables.first())) + ) { + return cycleTaskViews() + } + } + + // Snap to next page if a single item is focusable, like the clear all button. Skip any + // invisible views for focusing. + val nextFocus: View? = recentsView.focusSearch(currentFocus, direction) + if (nextFocus == null || !nextFocus.isVisibleToUser) { + return cycleTaskViews() + } + + return nextFocus.requestFocus() + } + + /** Finds the first parent of this View that is an instance of TaskView, including itself. */ + private fun findParentTaskView(view: View): TaskView? { + if (view is TaskView) { + return view + } + return view.ancestors.filterIsInstance().firstOrNull() + } + + fun View.getVisibleFocusables(direction: Int): List = + getFocusables(direction)?.filter { it.isVisibleToUser } ?: emptyList() + + private fun getDeviceProfile() = (recentsView.mContainer as RecentsViewContainer).deviceProfile + + fun getRunningTaskExpectedIndex(runningTaskView: TaskView): Int { + if (areMultiDesksFlagsEnabled() && runningTaskView is DesktopTaskView) { + // Use the [deskId] to keep desks in the order of their creation, as a newer desk + // always has a larger [deskId] than the older desks. + val desktopTaskView = + taskViews.firstOrNull { + it is DesktopTaskView && + it.deskId != INACTIVE_DESK_ID && + it.deskId <= runningTaskView.deskId + } + if (desktopTaskView != null) return recentsView.indexOfChild(desktopTaskView) + } + val firstTaskViewIndex = recentsView.indexOfChild(getFirstTaskView()) + return if (getDeviceProfile().deviceProperties.isTablet) { + var index = firstTaskViewIndex + if (runningTaskView !is DesktopTaskView) { + // For fullsreen tasks, skip over Desktop tasks in its section + index += + if (runningTaskView.isExternalDisplay) { + taskViews.count { it is DesktopTaskView && it.isExternalDisplay } + } else { + taskViews.count { it is DesktopTaskView && !it.isExternalDisplay } + } + } + if (!runningTaskView.isExternalDisplay) { + // For main display section, skip over external display tasks + index += taskViews.count { it.isExternalDisplay } + } + index + } else { + val currentIndex: Int = recentsView.indexOfChild(runningTaskView) + return if (currentIndex != -1) { + currentIndex // Keep the position if running task already in layout. + } else { + // New running task are added to the front to begin with. + firstTaskViewIndex + } + } + } + + /** Returns the first TaskView if it exists, or null otherwise. */ + fun getFirstTaskView(): TaskView? = taskViews.firstOrNull() + + /** Returns the last TaskView if it exists, or null otherwise. */ + fun getLastTaskView(): TaskView? = taskViews.lastOrNull() + + /** Returns the first TaskView that is not large */ + fun getFirstSmallTaskView(): TaskView? = taskViews.firstOrNull { !it.isLargeTile } + + /** Returns the last TaskView that should be displayed as a large tile. */ + fun getLastLargeTaskView(): TaskView? = taskViews.lastOrNull { it.isLargeTile } + + override fun onCanCreateDesksChanged(canCreateDesks: Boolean) { + recentsView.addDeskButton?.isInvisible = !canCreateDesks + } + + /** Animates the alpha of the AddDesktopButton when a gesture ends. */ + fun startAddDesktopButtonFadeInOnGestureComplete() { + val addDesktopButton = recentsView.addDeskButton ?: return + ObjectAnimator.ofFloat(addDesktopButton, AddDesktopButton.GESTURE_ALPHA, 1f) + .apply { + duration = TaskView.FADE_IN_ICON_DURATION + interpolator = LINEAR + } + .start() + } + + private fun animateDesktopTaskViewSpringIn( + desktopTaskView: DesktopTaskView, + fadeInAddDesktopButton: Boolean, + ) { + val taskDismissFloatProperty = + FloatPropertyCompat.createFloatPropertyCompat( + desktopTaskView.primaryDismissTranslationProperty + ) + + with(recentsView) { + // Calculate initial translation to bring it offscreen. + val desktopTaskViewIndex = indexOfChild(desktopTaskView) + val midpointIndex = + if (getTaskViewAt(desktopTaskViewIndex + 1) != null) desktopTaskViewIndex + 1 + else INVALID_PAGE + var offscreenTranslationX = + getHorizontalOffsetSize(desktopTaskViewIndex, midpointIndex, 1f) + + // Add 40dp to the offscreen translation. + val additionalOffsetPx = + context.resources.getDimensionPixelSize( + R.dimen.newly_created_desktop_offscreen_position + ) + offscreenTranslationX += if (isRtl) additionalOffsetPx else -additionalOffsetPx + desktopTaskView.primaryDismissTranslationProperty.set( + desktopTaskView, + offscreenTranslationX, + ) + desktopTaskView.isInvisible = false + + val dampingRatio = + context.resources.getFloat(R.dimen.newly_created_desktop_spring_damping_ratio) + val stiffness = + context.resources.getFloat(R.dimen.newly_created_desktop_spring_stiffness) + + SpringAnimation(desktopTaskView, taskDismissFloatProperty) + .setSpring(SpringForce(0f).setDampingRatio(dampingRatio).setStiffness(stiffness)) + .addEndListener { _, _, _, _ -> + if (fadeInAddDesktopButton) { + addDeskButton?.setContentVisibility(toVisible = true, animate = true) + } + } + .start() + } + } + + override fun onDeskAdded(displayId: Int, deskId: Int) { + with(recentsView) { + // Ignore desk changes that don't belong to this display. + if (displayId != mContainer.displayId) { + return + } + + if (getDesktopTaskViewForDeskId(deskId) != null) { + Log.e(TAG, "A task view for this desk has already been added.") + return + } + val currentPageChild = getChildAt(currentPage) + + val wasEmpty = isEmpty() + if (wasEmpty) { + // Add ClearAllButton and AddDesktopButton if they are not present. + addDeskButton?.let { + it.setContentVisibility(toVisible = false, animate = false) + addView(it) + } + addView(clearAllButton) + } + + // Compute [mCurrentPageScrollDiff] to be used for adjusting the scroll to guarantee + // the existing tasks remain in their previous position after creating the desktop. + val primaryScroll = pagedOrientationHandler.getPrimaryScroll(this) + val currentPageScroll = getScrollForPage(currentPage) + currentPageScrollDiff = primaryScroll - currentPageScroll + + // We assume that a newly added desk is always empty and gets added to the left of the + // `AddNewDesktopButton`. + val desktopTaskView = getTaskViewFromPool(TaskViewType.DESKTOP) as DesktopTaskView + desktopTaskView.bind( + DesktopTask(deskId, displayId, emptyList()), + pagedViewOrientedState, + taskOverlayFactory, + ) + desktopTaskView.isInvisible = true + + val insertionIndex = 1 + indexOfChild(addDeskButton!!) + addView(desktopTaskView, insertionIndex) + updateTaskSize() + updateChildTaskOrientations() + updateScrollSynchronously() + animateDesktopTaskViewSpringIn(desktopTaskView, fadeInAddDesktopButton = wasEmpty) + + // Set Current Page based on the stored View. + currentPageChild?.let { setCurrentPage(indexOfChild(it)) } + // Reset visuals for the newly created desk. + resetTaskVisuals(desktopTaskView) + } + } + + override fun onDeskRemoved(displayId: Int, deskId: Int) { + with(recentsView) { + // Ignore desk changes that don't belong to this display. + if (displayId != mContainer.displayId) { + return + } + + // We need to distinguish between desk removals that are triggered from outside of + // overview vs. the ones that were initiated from overview by dismissing the + // corresponding desktop task view. + getDesktopTaskViewForDeskId(deskId)?.let { + dismissTaskView(it, /* animateTaskView= */ true, /* removeTask= */ true) + } + } + } + + /** + * Gets the list of accessibility children. Currently all the children of RecentsViews are + * added, and in the reverse order to the list. + */ + fun getAccessibilityChildren(): List = recentsView.children.toList().reversed() + + @JvmOverloads + /** Returns the first [TaskView], with some tasks possibly hidden in the carousel. */ + fun getFirstTaskViewInCarousel( + nonRunningTaskCarouselHidden: Boolean, + runningTaskView: TaskView? = recentsView.runningTaskView, + ): TaskView? = + taskViews.firstOrNull { + it.isVisibleInCarousel(runningTaskView, nonRunningTaskCarouselHidden) + } + + /** Returns the last [TaskView], with some tasks possibly hidden in the carousel. */ + fun getLastTaskViewInCarousel(nonRunningTaskCarouselHidden: Boolean): TaskView? = + taskViews.lastOrNull { + it.isVisibleInCarousel(recentsView.runningTaskView, nonRunningTaskCarouselHidden) + } + + /** Returns if any small tasks are fully visible */ + fun isAnySmallTaskFullyVisible(): Boolean = + taskViews.any { !it.isLargeTile && recentsView.isTaskViewFullyVisible(it) } + + /** Apply attachAlpha to all [TaskView] accordingly to different conditions. */ + fun applyAttachAlpha(nonRunningTaskCarouselHidden: Boolean) { + taskViews.forEach { taskView -> + taskView.attachAlpha = + if (taskView == recentsView.runningTaskView) { + RUNNING_TASK_ATTACH_ALPHA.get(recentsView) + } else { + if ( + taskView.isVisibleInCarousel( + recentsView.runningTaskView, + nonRunningTaskCarouselHidden, + ) + ) + 1f + else 0f + } + } + } + + fun TaskView.isVisibleInCarousel( + runningTaskView: TaskView?, + nonRunningTaskCarouselHidden: Boolean, + ): Boolean = + if (!nonRunningTaskCarouselHidden) true + else getCarouselType() == runningTaskView.getCarouselType() + + /** Returns the carousel type of the TaskView, and default to fullscreen if it's null. */ + private fun TaskView?.getCarouselType(): TaskViewCarousel = + if (this is DesktopTaskView) TaskViewCarousel.DESKTOP else TaskViewCarousel.FULL_SCREEN + + private enum class TaskViewCarousel { + FULL_SCREEN, + DESKTOP, + } + + /** Returns true if there are at least one TaskView has been added to the RecentsView. */ + fun hasTaskViews() = taskViews.any() + + fun getTaskContainerById(taskId: Int) = + taskViews.firstNotNullOfOrNull { it.getTaskContainerById(taskId) } + + private fun getRowRect(firstView: View?, lastView: View?, outRowRect: Rect) { + outRowRect.setEmpty() + firstView?.let { + it.getHitRect(TEMP_RECT) + outRowRect.union(TEMP_RECT) + } + lastView?.let { + it.getHitRect(TEMP_RECT) + outRowRect.union(TEMP_RECT) + } + } + + private fun getRowRect(rowTaskViewIds: IntArray, outRowRect: Rect) { + if (rowTaskViewIds.isEmpty) { + outRowRect.setEmpty() + return + } + getRowRect( + recentsView.getTaskViewFromTaskViewId(rowTaskViewIds.get(0)), + recentsView.getTaskViewFromTaskViewId(rowTaskViewIds.get(rowTaskViewIds.size() - 1)), + outRowRect, + ) + } + + fun updateTaskViewDeadZoneRect( + outTaskViewRowRect: Rect, + outTopRowRect: Rect, + outBottomRowRect: Rect, + ) { + if (!getDeviceProfile().deviceProperties.isTablet) { + getRowRect(getFirstTaskView(), getLastTaskView(), outTaskViewRowRect) + return + } + getRowRect(getFirstLargeTaskView(), getLastLargeTaskView(), outTaskViewRowRect) + getRowRect(getTopRowIdArray(), outTopRowRect) + getRowRect(getBottomRowIdArray(), outBottomRowRect) + + // Expand large tile Rect to include space between top/bottom row. + val nonEmptyRowRect = + when { + !outTopRowRect.isEmpty -> outTopRowRect + !outBottomRowRect.isEmpty -> outBottomRowRect + else -> return + } + if (recentsView.isRtl) { + if (outTaskViewRowRect.left > nonEmptyRowRect.right) { + outTaskViewRowRect.left = nonEmptyRowRect.right + } + } else { + if (outTaskViewRowRect.right < nonEmptyRowRect.left) { + outTaskViewRowRect.right = nonEmptyRowRect.left + } + } + + // Expand the shorter row Rect to include the space between the 2 rows. + if (outTopRowRect.isEmpty || outBottomRowRect.isEmpty) return + if (outTopRowRect.width() <= outBottomRowRect.width()) { + if (outTopRowRect.bottom < outBottomRowRect.top) { + outTopRowRect.bottom = outBottomRowRect.top + } + } else { + if (outBottomRowRect.top > outTopRowRect.bottom) { + outBottomRowRect.top = outTopRowRect.bottom + } + } + } + + private fun getTaskMenu(): TaskMenuView? = + getTopOpenViewWithType(recentsView.mContainer, TYPE_TASK_MENU) as? TaskMenuView + + fun taskMenuIsOpen(): Boolean { + if (enableOverviewIconMenu()) { + return getTaskMenu()?.isOpen == true + } + return false + } + + fun updateChildTaskOrientations() { + with(recentsView) { + taskViews.forEach { it.setOrientationState(mOrientationState) } + if (enableOverviewIconMenu()) { + children.forEach { + it.layoutDirection = if (isRtl) LAYOUT_DIRECTION_LTR else LAYOUT_DIRECTION_RTL + } + } + + // Return when it's not fake landscape + if (mOrientationState.isRecentsActivityRotationAllowed) return@with + + // Rotation is supported on phone (details at b/254198019#comment4) + getTaskMenu()?.onRotationChanged() + } + } + + fun updateCentralTask() { + val isTablet: Boolean = getDeviceProfile().deviceProperties.isTablet + val actionsViewCanRelateToTaskView = !(isTablet && enableGridOnlyOverview()) + val focusedTaskView = recentsView.focusedTaskView + val currentPageTaskView = recentsView.currentPageTaskView + + fun isInExpectedScrollPosition(taskView: TaskView?) = + taskView?.let { recentsView.isTaskInExpectedScrollPosition(it) } ?: false + + val centralTaskIds: Set = + when { + !actionsViewCanRelateToTaskView -> emptySet() + isTablet && isInExpectedScrollPosition(focusedTaskView) -> + focusedTaskView!!.taskIdSet + isInExpectedScrollPosition(currentPageTaskView) -> currentPageTaskView!!.taskIdSet + else -> emptySet() + } + + recentsView.mRecentsViewModel.updateCentralTaskIds(centralTaskIds) + } + + var deskExplodeProgress: Float = 0f + set(value) { + field = value + taskViews.filterIsInstance().forEach { it.explodeProgress = field } + } + + var selectedTaskView: TaskView? = null + set(newValue) { + val oldValue = field + field = newValue + if (oldValue != newValue) { + onSelectedTaskViewUpdated(oldValue, newValue) + } + } + + private fun onSelectedTaskViewUpdated( + oldSelectedTaskView: TaskView?, + newSelectedTaskView: TaskView?, + ) { + if (!enableGridOnlyOverview()) return + with(recentsView) { + oldSelectedTaskView?.modalScale = 1f + oldSelectedTaskView?.modalPivot = null + + if (newSelectedTaskView == null) return + + val modalTaskBounds = mTempRect + getModalTaskSize(modalTaskBounds) + val selectedTaskBounds = getTaskBounds(newSelectedTaskView) + + // Map bounds to selectedTaskView's coordinate system. + modalTaskBounds.offset(-selectedTaskBounds.left, -selectedTaskBounds.top) + selectedTaskBounds.offset(-selectedTaskBounds.left, -selectedTaskBounds.top) + + val modalScale = + min( + (modalTaskBounds.height().toFloat() / selectedTaskBounds.height()), + (modalTaskBounds.width().toFloat() / selectedTaskBounds.width()), + ) + val modalPivot = PointF() + getPivotsForScalingRectToRect(modalTaskBounds, selectedTaskBounds, modalPivot) + + newSelectedTaskView.modalScale = modalScale + newSelectedTaskView.modalPivot = modalPivot + } + } + + /** + * Creates a [DesktopTaskView] for the currently active desk on this display, which contains the + * tasks with the given [groupedTaskInfo]. + */ + fun createDesktopTaskViewForActiveDesk(groupedTaskInfo: GroupedTaskInfo): DesktopTaskView { + val desktopTaskView = + recentsView.getTaskViewFromPool(TaskViewType.DESKTOP) as DesktopTaskView + val tasks: List = groupedTaskInfo.taskInfoList.map { taskInfo -> Task.from(taskInfo) } + desktopTaskView.bind( + DesktopTask(groupedTaskInfo.deskId, groupedTaskInfo.deskDisplayId, tasks), + recentsView.mOrientationState, + recentsView.mTaskOverlayFactory, + ) + return desktopTaskView + } + + fun getRunningTaskViewFromGroupTaskInfo(groupedTaskInfo: GroupedTaskInfo) = + if (enableMultipleDesktops(recentsView.context)) { + if (groupedTaskInfo.isBaseType(GroupedTaskInfo.TYPE_DESK)) { + getDesktopTaskViewForDeskId(groupedTaskInfo.deskId) + } else { + val runningTaskIds = groupedTaskInfo.taskInfoList.map { it.taskId }.toIntArray() + val taskView = recentsView.getTaskViewByTaskIds(runningTaskIds) + if (taskView?.type == groupedTaskInfo.getTaskViewType()) taskView else null + } + } else { + if ( + groupedTaskInfo.isBaseType(GroupedTaskInfo.TYPE_DESK) && + groupedTaskInfo.taskInfoList.size == 1 + ) { + recentsView.getTaskViewByTaskId(groupedTaskInfo.taskInfo1!!.taskId) + as? DesktopTaskView + } else { + val runningTaskIds = groupedTaskInfo.taskInfoList.map { it.taskId }.toIntArray() + recentsView.getTaskViewByTaskIds(runningTaskIds) + } + } + + private fun GroupedTaskInfo.getTaskViewType() = + when { + isBaseType(GroupedTaskInfo.TYPE_FULLSCREEN) -> TaskViewType.SINGLE + isBaseType(GroupedTaskInfo.TYPE_SPLIT) -> TaskViewType.GROUPED + isBaseType(GroupedTaskInfo.TYPE_DESK) -> TaskViewType.DESKTOP + else -> null + } + + fun onPrepareGestureEndAnimation( + animatorSet: AnimatorSet, + endTarget: GestureState.GestureEndTarget, + remoteTargetHandles: Array, + isHandlingAtomicEvent: Boolean, + ) { + // Create ObjectAnimator that immediately settles on [endStateValue] when + // [isHandlingAtomicEvent] is true. + fun immediateObjectAnimator( + target: T, + property: Property, + endStateValue: Float, + ) = + if (isHandlingAtomicEvent) + ObjectAnimator.ofFloat(target, property, endStateValue, endStateValue) + else ObjectAnimator.ofFloat(target, property, endStateValue) + + with(recentsView) { + Log.d(TAG, "onPrepareGestureEndAnimation - endTarget: $endTarget") + mCurrentGestureEndTarget = endTarget + val endState: BaseState<*> = mContainerInterface.stateFromGestureEndTarget(endTarget) + + // Starting the desk exploded animation when the gesture from an app is released. + if (enableDesktopExplodedView()) { + animatorSet.play( + ObjectAnimator.ofFloat( + this, + DESK_EXPLODE_PROGRESS, + if (endState.showExplodedDesktopView()) 1f else 0f, + ) + ) + taskViews.filterIsInstance().forEach { + it.remoteTargetHandles = remoteTargetHandles + } + } + + if (endState.displayOverviewTasksAsGrid(getDeviceProfile())) { + updateGridProperties() + animatorSet.play(immediateObjectAnimator(this, RECENTS_GRID_PROGRESS, 1f)) + + val runningTaskView = runningTaskView + var runningTaskGridTranslationX = 0f + var runningTaskGridTranslationY = 0f + if (runningTaskView != null) { + // Apply the grid translation to running task unless it's being snapped to + // and removes the current translation applied to the running task. + runningTaskGridTranslationX = + (runningTaskView.gridTranslationX - runningTaskView.nonGridTranslationX) + runningTaskGridTranslationY = runningTaskView.gridTranslationY + } + remoteTargetHandles.forEach { remoteTargetHandle -> + val taskViewSimulator = remoteTargetHandle.taskViewSimulator + if (enableGridOnlyOverview()) { + animatorSet.play(taskViewSimulator.carouselScale.animateToValue(1f)) + animatorSet.play( + taskViewSimulator.taskGridTranslationX.animateToValue( + runningTaskGridTranslationX + ) + ) + animatorSet.play( + taskViewSimulator.taskGridTranslationY.animateToValue( + runningTaskGridTranslationY + ) + ) + } else { + animatorSet.play( + taskViewSimulator.taskPrimaryTranslation.animateToValue( + runningTaskGridTranslationX + ) + ) + animatorSet.play( + taskViewSimulator.taskSecondaryTranslation.animateToValue( + runningTaskGridTranslationY + ) + ) + } + } + } + animatorSet.play( + immediateObjectAnimator( + this, + TASK_THUMBNAIL_SPLASH_ALPHA, + if (endState.showTaskThumbnailSplash()) 1f else 0f, + ) + ) + animatorSet.play(ObjectAnimator.ofFloat(this, DESKTOP_CAROUSEL_DETACH_PROGRESS, 0f)) + + if (enableGridOnlyOverview()) { + // Reload visible tasks according to new [mCurrentGestureEndTarget] value. + loadVisibleTaskData(FLAG_UPDATE_ALL) + } + } + } + + fun resetShareUIState() { + taskViews.flatMap { it.taskContainers }.forEach { it.overlay.resetShareUI() } + } + + fun getKeyboardFocusTaskView(): TaskView? = + when (val keyboardFocusTask = keyboardFocusTask) { + is KeyboardFocusTask.Unfocused -> null + is KeyboardFocusTask.CurrentPageTaskView -> recentsView.currentPageTaskView + is KeyboardFocusTask.ExpectedCurrentTask -> + getExpectedCurrentTask(recentsView.runningTaskView, recentsView.focusedTaskView) + is KeyboardFocusTask.TaskViewWithIds -> + recentsView.getTaskViewByTaskIds(keyboardFocusTask.taskIds.toIntArray()) + } + + fun isKeyboardTaskFocusPending() = keyboardFocusTask !is KeyboardFocusTask.Unfocused + + fun getAlternatePageWithSameScroll(page: Int): Int { + val pageScroll = recentsView.getScrollForPage(page) + recentsView.children.forEachIndexed { index, _ -> + if (index != page && recentsView.getScrollForPage(index) == pageScroll) { + return index + } + } + return INVALID_PAGE + } + + /** + * Launch task view if it is instance of DesktopTaskView. Prioritize launching running task + * view, then current page task view, and finally the last desktop task view. + * + * @return provides runnable list to attach runnable at end of Desktop Mode launch + */ + fun launchDesktopTaskView(): RunnableList? = + with(recentsView) { + val desktopTaskView = + (runningTaskView as? DesktopTaskView) + ?: currentPageTaskView as? DesktopTaskView + ?: lastDesktopTaskView + ?: return null + if (!isTaskViewVisible(desktopTaskView)) { + snapToPageImmediately(indexOfChild(desktopTaskView)) + } + return desktopTaskView.launchWithAnimation() + } + + companion object { + class RecentsViewFloatProperty( + private val utilsProperty: KMutableProperty1 + ) : FloatProperty>(utilsProperty.name) { + override fun get(recentsView: RecentsView<*, *>): Float = + utilsProperty.get(recentsView.mUtils) + + override fun setValue(recentsView: RecentsView<*, *>, value: Float) { + utilsProperty.set(recentsView.mUtils, value) + } + } + + @JvmField + val DESK_EXPLODE_PROGRESS = RecentsViewFloatProperty(RecentsViewUtils::deskExplodeProgress) + + val TEMP_RECT = Rect() + } +} diff --git a/quickstep/src/com/android/quickstep/views/SplitInstructionsView.java b/quickstep/src/com/android/quickstep/views/SplitInstructionsView.java index e86b5a0fd9a..7796795980f 100644 --- a/quickstep/src/com/android/quickstep/views/SplitInstructionsView.java +++ b/quickstep/src/com/android/quickstep/views/SplitInstructionsView.java @@ -16,12 +16,10 @@ package com.android.quickstep.views; -import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SPLIT_SELECTION_EXIT_CANCEL_BUTTON; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; @@ -40,11 +38,11 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StateManager; -import com.android.launcher3.states.StateAnimationConfig; +import com.android.quickstep.util.AnimUtils; import com.android.quickstep.util.SplitSelectStateController; +import com.android.wm.shell.shared.TypefaceUtils; +import com.android.wm.shell.shared.TypefaceUtils.FontFamily; /** * A rounded rectangular component containing a single TextView. @@ -56,7 +54,6 @@ public class SplitInstructionsView extends LinearLayout { private static final int BOUNCE_DURATION = 250; private static final float BOUNCE_HEIGHT = 20; - private static final int DURATION_DEFAULT_SPLIT_DISMISS = 350; private final RecentsViewContainer mContainer; public boolean mIsCurrentlyAnimating = false; @@ -126,36 +123,35 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { } private void init() { - TextView cancelTextView = findViewById(R.id.split_instructions_text); + TextView cancelTextView = findViewById(R.id.split_instructions_text_cancel); TextView instructionTextView = findViewById(R.id.split_instructions_text); - if (FeatureFlags.enableSplitContextually()) { - cancelTextView.setVisibility(VISIBLE); - cancelTextView.setOnClickListener((v) -> exitSplitSelection()); - instructionTextView.setText(R.string.toast_contextual_split_select_app); - - // After layout, expand touch target of cancel button to meet minimum a11y measurements. - post(() -> { - int minTouchSize = getResources() - .getDimensionPixelSize(R.dimen.settingslib_preferred_minimum_touch_target); - Rect r = new Rect(); - cancelTextView.getHitRect(r); - - if (r.width() < minTouchSize) { - // add 1 to ensure ceiling on int division - int expandAmount = (minTouchSize + 1 - r.width()) / 2; - r.left -= expandAmount; - r.right += expandAmount; - } - if (r.height() < minTouchSize) { - int expandAmount = (minTouchSize + 1 - r.height()) / 2; - r.top -= expandAmount; - r.bottom += expandAmount; - } + cancelTextView.setVisibility(VISIBLE); + cancelTextView.setOnClickListener((v) -> exitSplitSelection()); + instructionTextView.setText(R.string.toast_contextual_split_select_app); + TypefaceUtils.setTypeface(instructionTextView, FontFamily.GSF_BODY_MEDIUM); + + // After layout, expand touch target of cancel button to meet minimum a11y measurements. + post(() -> { + int minTouchSize = getResources() + .getDimensionPixelSize(R.dimen.settingslib_preferred_minimum_touch_target); + Rect r = new Rect(); + cancelTextView.getHitRect(r); + + if (r.width() < minTouchSize) { + // add 1 to ensure ceiling on int division + int expandAmount = (minTouchSize + 1 - r.width()) / 2; + r.left -= expandAmount; + r.right += expandAmount; + } + if (r.height() < minTouchSize) { + int expandAmount = (minTouchSize + 1 - r.height()) / 2; + r.top -= expandAmount; + r.bottom += expandAmount; + } - setTouchDelegate(new TouchDelegate(r, cancelTextView)); - }); - } + setTouchDelegate(new TouchDelegate(r, cancelTextView)); + }); // Set accessibility title, will be announced by a11y tools. if (Utilities.ATLEAST_P) { @@ -166,25 +162,11 @@ private void init() { private void exitSplitSelection() { RecentsView recentsView = mContainer.getOverviewPanel(); SplitSelectStateController splitSelectController = recentsView.getSplitSelectController(); - StateManager stateManager = recentsView.getStateManager(); - BaseState startState = stateManager.getState(); - long duration = startState.getTransitionDuration(mContainer.asContext(), false); - if (duration == 0) { - // Case where we're in contextual on workspace (NORMAL), which by default has 0 - // transition duration - duration = DURATION_DEFAULT_SPLIT_DISMISS; - } - StateAnimationConfig config = new StateAnimationConfig(); - config.duration = duration; - AnimatorSet stateAnim = stateManager.createAtomicAnimation( - startState, NORMAL, config); - AnimatorSet dismissAnim = splitSelectController.getSplitAnimationController() - .createPlaceholderDismissAnim(mContainer, - LAUNCHER_SPLIT_SELECTION_EXIT_CANCEL_BUTTON, duration); - stateAnim.play(dismissAnim); - stateManager.setCurrentAnimation(stateAnim, NORMAL); - stateAnim.start(); + + AnimUtils.goToNormalStateWithSplitDismissal(stateManager, mContainer, + LAUNCHER_SPLIT_SELECTION_EXIT_CANCEL_BUTTON, + splitSelectController.getSplitAnimationController(), /* onEndCallback= */ null); } void ensureProperRotation() { diff --git a/quickstep/src/com/android/quickstep/views/TaskContainer.kt b/quickstep/src/com/android/quickstep/views/TaskContainer.kt new file mode 100644 index 00000000000..0acfa6de83f --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/TaskContainer.kt @@ -0,0 +1,255 @@ +/* + * 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.quickstep.views + +import android.graphics.Bitmap +import android.graphics.Matrix +import android.view.View +import android.view.View.OnClickListener +import androidx.core.view.isVisible + +import com.android.launcher3.Flags.enableRefactorDigitalWellbeingToast +import com.android.launcher3.Flags.enableRefactorTaskContentView +import com.android.launcher3.Flags.enableRefactorTaskThumbnail +import com.android.launcher3.model.data.TaskViewItemInfo +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.launcher3.util.TransformingTouchDelegate +import com.android.quickstep.TaskOverlayFactory +import com.android.quickstep.ViewUtils.addAccessibleChildToList +import com.android.quickstep.recents.domain.usecase.ThumbnailPosition +import com.android.quickstep.recents.ui.mapper.TaskUiStateMapper +import com.android.quickstep.recents.ui.viewmodel.TaskData +import com.android.quickstep.task.thumbnail.TaskContentView +import com.android.quickstep.task.thumbnail.TaskThumbnailView +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.ThumbnailData + +/** Holder for all Task dependent information. */ +class TaskContainer( + val taskView: TaskView, + val task: Task, + // TODO(b/409248525): Upon flag cleanup, use the `TaskContentView` type + val taskContentView: View, + val snapshotView: View, + val iconView: TaskViewIcon, + /** + * This technically can be a vanilla [android.view.TouchDelegate] class, however that class + * requires setting the touch bounds at construction, so we'd repeatedly be created many + * instances unnecessarily as scrolling occurs, whereas [TransformingTouchDelegate] allows touch + * delegated bounds only to be updated. + */ + val iconTouchDelegate: TransformingTouchDelegate, + /** Defaults to STAGE_POSITION_UNDEFINED if in not a split screen task view */ + @SplitConfigurationOptions.StagePosition val stagePosition: Int, + val digitalWellBeingToast: DigitalWellBeingToast?, + val showWindowsView: View?, + taskOverlayFactory: TaskOverlayFactory, +) { + val overlay: TaskOverlayFactory.TaskOverlay<*> = taskOverlayFactory.createOverlay(this) + var thumbnailPosition: ThumbnailPosition? = null + private var overlayEnabledStatus = false + + init { + when { + enableRefactorTaskContentView() -> { + require(taskContentView is TaskContentView) + require(snapshotView is TaskThumbnailView) + } + enableRefactorTaskThumbnail() -> { + require(taskContentView is TaskThumbnailView) + require(snapshotView is TaskThumbnailView) + } + else -> { + require(taskContentView is TaskThumbnailViewDeprecated) + require(snapshotView is TaskThumbnailViewDeprecated) + } + } + } + + internal var thumbnailData: ThumbnailData? = null + private set + + val thumbnail: Bitmap? + /** If possible don't use this. It should be replaced as part of b/331753115. */ + get() = + if (enableRefactorTaskThumbnail()) thumbnailData?.thumbnail + else thumbnailViewDeprecated.thumbnail + + val thumbnailView: TaskThumbnailView + get() { + require(enableRefactorTaskThumbnail()) + return snapshotView as TaskThumbnailView + } + + val thumbnailViewDeprecated: TaskThumbnailViewDeprecated + get() { + require(!enableRefactorTaskThumbnail()) + return snapshotView as TaskThumbnailViewDeprecated + } + + var isThumbnailValid: Boolean = false + internal set + + val shouldShowSplashView: Boolean + get() = + if (enableRefactorTaskThumbnail()) taskView.shouldShowSplash() + else thumbnailViewDeprecated.shouldShowSplashView() + + /** Builds proto for logging */ + val itemInfo: TaskViewItemInfo + get() = TaskViewItemInfo(taskView, this) + + fun bind() = { + digitalWellBeingToast?.bind(task, taskView, snapshotView, stagePosition) + if (!enableRefactorTaskThumbnail()) { + thumbnailViewDeprecated.bind(task, overlay, taskView) + } + } + + fun destroy() = { + digitalWellBeingToast?.destroy() + taskContentView.scaleX = 1f + taskContentView.scaleY = 1f + overlay.reset() + if (enableRefactorTaskThumbnail()) { + isThumbnailValid = false + thumbnailData = null + thumbnailView.onRecycle() + } else { + thumbnailViewDeprecated.setShowSplashForSplitSelection(false) + } + } + + fun setOverlayEnabled(enabled: Boolean) { + if (!enableRefactorTaskThumbnail()) { + thumbnailViewDeprecated.setOverlayEnabled(enabled) + } + } + + fun setOverlayEnabled(enabled: Boolean, thumbnailPosition: ThumbnailPosition) { + if (enableRefactorTaskThumbnail()) { + if (overlayEnabledStatus != enabled || this.thumbnailPosition != thumbnailPosition) { + overlayEnabledStatus = enabled + + refreshOverlay(thumbnailPosition) + } + } + } + + fun refreshOverlay(thumbnailPosition: ThumbnailPosition) = { + this.thumbnailPosition = thumbnailPosition + if (overlayEnabledStatus) { + overlay.initOverlay( + task, + thumbnailData?.thumbnail, + thumbnailPosition.matrix, + thumbnailPosition.isRotated, + ) + } else { + overlay.reset() + } + } + + fun addChildForAccessibility(outChildren: ArrayList) { + addAccessibleChildToList(iconView.asView(), outChildren) + addAccessibleChildToList( + if (enableRefactorTaskContentView()) taskContentView else snapshotView, + outChildren, + ) + showWindowsView?.let { addAccessibleChildToList(it, outChildren) } + digitalWellBeingToast?.let { addAccessibleChildToList(it, outChildren) } + overlay.addChildForAccessibility(outChildren) + } + + fun setState( + state: TaskData?, + hasHeader: Boolean, + canShowAppTimer: Boolean, + clickCloseListener: OnClickListener?, + ) = { + if (enableRefactorTaskContentView()) { + (taskContentView as TaskContentView).setState( + TaskUiStateMapper.toTaskHeaderState(state, hasHeader, clickCloseListener), + TaskUiStateMapper.toTaskThumbnailUiState(state), + TaskUiStateMapper.toTaskAppTimerUiState(canShowAppTimer, stagePosition, state), + state?.taskId, + ) + } else { + thumbnailView.setState( + TaskUiStateMapper.toTaskThumbnailUiState(state), + state?.taskId, + ) + } + thumbnailData = if (state is TaskData.Data) state.thumbnailData else null + overlay.setThumbnailState(thumbnailData) + } + + fun updateTintAmount(tintAmount: Float) { + thumbnailView.updateTintAmount(tintAmount) + } + + /** + * Updates the progress of the menu opening animation. + * + * This function propagates the given `progress` value to the `thumbnailView` allowing the + * thumbnail view to animate its visual state in sync with the menu's opening/closing + * transition. + * + * @param progress The progress of the menu opening animation (from closed=0 to fully open=1) + */ + fun updateMenuOpenProgress(progress: Float) { + thumbnailView.updateMenuOpenProgress(progress) + } + + /** + * Updates the thumbnail splash progress for a given task. + * + * This function manages the visual feedback of a "splash" effect that can be displayed over a + * thumbnail image, typically during loading or updating. It calculates the alpha (transparency) + * of the splash based on the provided progress and then applies this alpha to the thumbnail + * view if it should be displayed. + * + * @param progress The progress of the operation, ranging from 0.0 to 1.0 + */ + fun updateThumbnailSplashProgress(progress: Float) { + if (enableRefactorTaskThumbnail()) { + thumbnailView.updateSplashAlpha(progress) + } else { + thumbnailViewDeprecated.setSplashAlpha(progress) + } + } + + fun updateThumbnailMatrix(matrix: Matrix) { + thumbnailView.setImageMatrix(matrix) + } + + fun digitalWellBeingBannerHeight(): Int { + if (enableRefactorTaskContentView() && enableRefactorDigitalWellbeingToast()) { + return (taskContentView as? TaskContentView)?.getTaskAppTimerToastHeight() ?: 0 + } + + if (digitalWellBeingToast?.isVisible == true) { + return digitalWellBeingToast.height + } + + return 0 + } + + companion object { + const val TAG = "TaskContainer" + } +} diff --git a/quickstep/src/com/android/quickstep/views/TaskHeaderView.kt b/quickstep/src/com/android/quickstep/views/TaskHeaderView.kt new file mode 100644 index 00000000000..63978ddf641 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/TaskHeaderView.kt @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.views + +import android.content.Context +import android.graphics.Rect +import android.util.AttributeSet +import android.view.TouchDelegate +import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction +import android.widget.ImageButton +import android.widget.ImageView +import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.view.isGone +import com.android.launcher3.R +import com.android.quickstep.task.thumbnail.TaskHeaderUiState + +class TaskHeaderView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : + ConstraintLayout(context, attrs) { + + private val headerTitleView: TextView by lazy { findViewById(R.id.header_app_title) } + private val headerIconView: ImageView by lazy { findViewById(R.id.header_app_icon) } + private val headerCloseButton: ImageButton by lazy { findViewById(R.id.header_close_button) } + + var closeButtonAccessibilityAction: AccessibilityAction? = null + + override fun onFinishInflate() { + super.onFinishInflate() + // Post to ensure the button has been laid out and has its dimensions. + headerCloseButton.post { + val delegateArea = Rect() + headerCloseButton.getHitRect(delegateArea) + + // Calculate the desired touch area size in pixels. + val touchTargetSize = + resources.getDimensionPixelSize( + R.dimen.task_thumbnail_header_close_button_hit_rect_size + ) + + // Expand the hit rect to the desired touch target size, centered on the button. + val sizeDifferenceX = (touchTargetSize - delegateArea.width()) / 2 + val sizeDifferenceY = (touchTargetSize - delegateArea.height()) / 2 + delegateArea.inset(-sizeDifferenceX, -sizeDifferenceY) + + // The TouchDelegate is set on the parent `TaskHeaderView`. + touchDelegate = TouchDelegate(delegateArea, headerCloseButton) + } + } + + fun setState(taskHeaderState: TaskHeaderUiState) { + when (taskHeaderState) { + is TaskHeaderUiState.ShowHeader -> { + setHeader(taskHeaderState.header) + isGone = false + closeButtonAccessibilityAction = + createCloseButtonAccessibilityAction(context, taskHeaderState.header.title) + } + is TaskHeaderUiState.HideHeader -> { + isGone = true + closeButtonAccessibilityAction = null + } + } + } + + fun getSupportedAccessibilityActions(): List = + listOfNotNull(closeButtonAccessibilityAction) + + fun handleAccessibilityAction(action: Int): Boolean { + closeButtonAccessibilityAction?.let { + if (action == it.id) { + return headerCloseButton.callOnClick() ?: false + } + } + return false + } + + private fun setHeader(header: TaskHeaderUiState.ThumbnailHeader) { + headerTitleView.text = header.title + headerIconView.setImageDrawable(header.icon) + headerCloseButton.setOnClickListener(header.clickCloseListener) + } + + companion object { + const val TAG = "TaskHeaderView" + + private fun createCloseButtonAccessibilityAction( + context: Context, + taskDescription: String?, + ) = + AccessibilityAction( + R.id.action_close, + context.getString(R.string.close_task_accessibility, taskDescription), + ) + } +} diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java deleted file mode 100644 index 1eba5bfe37f..00000000000 --- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java +++ /dev/null @@ -1,435 +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.quickstep.views; - -import static com.android.app.animation.Interpolators.EMPHASIZED; -import static com.android.launcher3.Flags.enableOverviewIconMenu; -import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; -import static com.android.quickstep.views.TaskThumbnailViewDeprecated.DIM_ALPHA; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; -import android.content.Context; -import android.graphics.Outline; -import android.graphics.Rect; -import android.graphics.drawable.GradientDrawable; -import android.graphics.drawable.ShapeDrawable; -import android.graphics.drawable.shapes.RectShape; -import android.util.AttributeSet; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewOutlineProvider; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.android.app.animation.Interpolators; -import com.android.launcher3.AbstractFloatingView; -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.R; -import com.android.launcher3.anim.AnimationSuccessListener; -import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; -import com.android.launcher3.popup.SystemShortcut; -import com.android.launcher3.views.BaseDragLayer; -import com.android.quickstep.TaskOverlayFactory; -import com.android.quickstep.TaskUtils; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.TaskCornerRadius; -import com.android.quickstep.views.TaskView.TaskContainer; - -import app.lawnchair.theme.drawable.DrawableTokens; - -/** - * Contains options for a recent task when long-pressing its icon. - */ -public class TaskMenuView extends AbstractFloatingView { - - private static final Rect sTempRect = new Rect(); - - private static final int REVEAL_OPEN_DURATION = enableOverviewIconMenu() ? 417 : 150; - private static final int REVEAL_CLOSE_DURATION = enableOverviewIconMenu() ? 333 : 100; - - private RecentsViewContainer mContainer; - private TextView mTaskName; - @Nullable - private AnimatorSet mOpenCloseAnimator; - @Nullable - private ValueAnimator mRevealAnimator; - @Nullable - private Runnable mOnClosingStartCallback; - private TaskView mTaskView; - private TaskContainer mTaskContainer; - private LinearLayout mOptionLayout; - private float mMenuTranslationYBeforeOpen; - private float mMenuTranslationXBeforeOpen; - - public TaskMenuView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public TaskMenuView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - - mContainer = RecentsViewContainer.containerFromContext(context); - setClipToOutline(true); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mTaskName = findViewById(R.id.task_name); - mTaskName.setBackground(DrawableTokens.TaskMenuItemBg.resolve(getContext())); - mOptionLayout = findViewById(R.id.menu_option_layout); - } - - @Override - public boolean onControllerInterceptTouchEvent(MotionEvent ev) { - if (ev.getAction() == MotionEvent.ACTION_DOWN) { - BaseDragLayer dl = mContainer.getDragLayer(); - if (!dl.isEventOverView(this, ev)) { - // TODO: log this once we have a new container type for it? - close(true); - return true; - } - } - return false; - } - - @Override - protected void handleClose(boolean animate) { - animateClose(); - } - - @Override - protected boolean isOfType(int type) { - return (type & TYPE_TASK_MENU) != 0; - } - - @Override - public ViewOutlineProvider getOutlineProvider() { - return new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), - TaskCornerRadius.get(view.getContext())); - } - }; - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - if (!(enableOverviewIconMenu() - && ((RecentsView) mContainer.getOverviewPanel()).isOnGridBottomRow(mTaskView))) { - // TODO(b/326952853): Cap menu height for grid bottom row in a way that doesn't - // break - // additionalTranslationY. - int maxMenuHeight = calculateMaxHeight(); - if (MeasureSpec.getSize(heightMeasureSpec) > maxMenuHeight) { - heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxMenuHeight, MeasureSpec.AT_MOST); - } - } - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - } - - public void onRotationChanged() { - if (mOpenCloseAnimator != null && mOpenCloseAnimator.isRunning()) { - mOpenCloseAnimator.end(); - } - if (mIsOpen) { - mOptionLayout.removeAllViews(); - if (enableOverviewIconMenu() || !populateAndLayoutMenu()) { - close(false); - } - } - } - - /** - * Show a task menu for the given taskContainer. - */ - public static boolean showForTask(TaskContainer taskContainer, - @Nullable Runnable onClosingStartCallback) { - RecentsViewContainer container = RecentsViewContainer.containerFromContext( - taskContainer.getTaskView().getContext()); - final TaskMenuView taskMenuView = (TaskMenuView) container.getLayoutInflater().inflate( - R.layout.task_menu, container.getDragLayer(), false); - taskMenuView.setOnClosingStartCallback(onClosingStartCallback); - return taskMenuView.populateAndShowForTask(taskContainer); - } - - /** - * Show a task menu for the given taskContainer. - */ - public static boolean showForTask(TaskContainer taskContainer) { - return showForTask(taskContainer, null); - } - - private boolean populateAndShowForTask(TaskContainer taskContainer) { - if (isAttachedToWindow()) { - return false; - } - mContainer.getDragLayer().addView(this); - mTaskView = taskContainer.getTaskView(); - mTaskContainer = taskContainer; - if (!populateAndLayoutMenu()) { - return false; - } - post(this::animateOpen); - return true; - } - - /** - * @return true if successfully able to populate task view menu, false otherwise - */ - private boolean populateAndLayoutMenu() { - addMenuOptions(mTaskContainer); - orientAroundTaskView(mTaskContainer); - return true; - } - - private void addMenuOptions(TaskContainer taskContainer) { - if (enableOverviewIconMenu()) { - removeView(mTaskName); - } else { - mTaskName.setText(TaskUtils.getTitle(getContext(), taskContainer.getTask())); - mTaskName.setOnClickListener(v -> close(true)); - } - TaskOverlayFactory.getEnabledShortcuts(mTaskView, taskContainer) - .forEach(this::addMenuOption); - } - - private void addMenuOption(SystemShortcut menuOption) { - LinearLayout menuOptionView = (LinearLayout) mContainer.getLayoutInflater().inflate( - R.layout.task_view_menu_option, this, false); - if (enableOverviewIconMenu()) { - ((GradientDrawable) menuOptionView.getBackground()).setCornerRadius(0); - } - menuOption.setIconAndLabelFor( - menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text)); - LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams(); - mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp, - menuOptionView, mContainer.getDeviceProfile()); - // Set an onClick listener on each menu option. The onClick method is - // responsible for - // ending LiveTile mode on the thumbnail if needed. - menuOptionView.setOnClickListener(menuOption::onClick); - mOptionLayout.addView(menuOptionView); - } - - private void orientAroundTaskView(TaskContainer taskContainer) { - RecentsView recentsView = mContainer.getOverviewPanel(); - RecentsPagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); - measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED); - - // Get Position - DeviceProfile deviceProfile = mContainer.getDeviceProfile(); - mContainer.getDragLayer().getDescendantRectRelativeToSelf( - enableOverviewIconMenu() - ? getIconView().findViewById(R.id.icon_view_menu_anchor) - : taskContainer.getThumbnailViewDeprecated(), - sTempRect); - Rect insets = mContainer.getDragLayer().getInsets(); - BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams(); - params.width = orientationHandler.getTaskMenuWidth( - taskContainer.getThumbnailViewDeprecated(), deviceProfile, - taskContainer.getStagePosition()); - // Gravity set to Left instead of Start as sTempRect.left measures Left distance - // not Start - params.gravity = Gravity.LEFT; - setLayoutParams(params); - setScaleX(mTaskView.getScaleX()); - setScaleY(mTaskView.getScaleY()); - - // Set divider spacing - ShapeDrawable divider = new ShapeDrawable(new RectShape()); - divider.getPaint().setColor(getResources().getColor(android.R.color.transparent)); - int dividerSpacing = (int) getResources().getDimension(R.dimen.task_menu_spacing); - mOptionLayout.setShowDividers( - enableOverviewIconMenu() ? SHOW_DIVIDER_NONE : SHOW_DIVIDER_MIDDLE); - - orientationHandler.setTaskOptionsMenuLayoutOrientation( - deviceProfile, mOptionLayout, dividerSpacing, divider); - float thumbnailAlignedX = sTempRect.left - insets.left; - float thumbnailAlignedY = sTempRect.top - insets.top; - - // Changing pivot to make computations easier - // NOTE: Changing the pivots means the rotated view gets rotated about the new - // pivots set, - // which would render the X and Y position set here incorrect - setPivotX(0); - setPivotY(0); - setRotation(orientationHandler.getDegreesRotated()); - - if (enableOverviewIconMenu()) { - setTranslationX(thumbnailAlignedX); - setTranslationY(thumbnailAlignedY); - } else { - // Margin that insets the menuView inside the taskView - float taskInsetMargin = getResources().getDimension(R.dimen.task_card_margin); - setTranslationX(orientationHandler.getTaskMenuX(thumbnailAlignedX, - mTaskContainer.getThumbnailViewDeprecated(), deviceProfile, taskInsetMargin, - getIconView())); - setTranslationY(orientationHandler.getTaskMenuY( - thumbnailAlignedY, mTaskContainer.getThumbnailViewDeprecated(), - mTaskContainer.getStagePosition(), this, taskInsetMargin, - getIconView())); - } - } - - private void animateOpen() { - mMenuTranslationYBeforeOpen = getTranslationY(); - mMenuTranslationXBeforeOpen = getTranslationX(); - animateOpenOrClosed(false); - mIsOpen = true; - } - - private View getIconView() { - return mTaskContainer.getIconView().asView(); - } - - private void animateClose() { - animateOpenOrClosed(true); - } - - private void animateOpenOrClosed(boolean closing) { - if (mOpenCloseAnimator != null && mOpenCloseAnimator.isRunning()) { - mOpenCloseAnimator.cancel(); - } - mOpenCloseAnimator = new AnimatorSet(); - // If we're opening, we just start from the beginning as a new `TaskMenuView` is - // created - // each time we do the open animation so there will never be a partial value - // here. - float revealAnimationStartProgress = 0f; - if (closing && mRevealAnimator != null) { - revealAnimationStartProgress = 1f - mRevealAnimator.getAnimatedFraction(); - } - mRevealAnimator = createOpenCloseOutlineProvider() - .createRevealAnimator(this, closing, revealAnimationStartProgress); - mRevealAnimator.setInterpolator(enableOverviewIconMenu() ? Interpolators.EMPHASIZED - : Interpolators.DECELERATE); - - if (enableOverviewIconMenu()) { - IconAppChipView iconAppChip = (IconAppChipView) mTaskContainer.getIconView().asView(); - - float additionalTranslationY = 0; - if (((RecentsView) mContainer.getOverviewPanel()).isOnGridBottomRow(mTaskView)) { - // Animate menu up for enough room to display full menu when task on bottom row. - float menuBottom = getHeight() + mMenuTranslationYBeforeOpen; - float taskBottom = mTaskView.getHeight() + mTaskView.getPersistentTranslationY(); - float taskbarTop = mContainer.getDeviceProfile().heightPx - - mContainer.getDeviceProfile().getOverviewActionsClaimedSpaceBelow(); - float midpoint = (taskBottom + taskbarTop) / 2f; - additionalTranslationY = -Math.max(menuBottom - midpoint, 0); - } - ObjectAnimator translationYAnim = ObjectAnimator.ofFloat(this, TRANSLATION_Y, - closing ? mMenuTranslationYBeforeOpen - : mMenuTranslationYBeforeOpen + additionalTranslationY); - translationYAnim.setInterpolator(EMPHASIZED); - - ObjectAnimator menuTranslationYAnim = ObjectAnimator.ofFloat( - iconAppChip.getMenuTranslationY(), - MULTI_PROPERTY_VALUE, closing ? 0 : additionalTranslationY); - menuTranslationYAnim.setInterpolator(EMPHASIZED); - - float additionalTranslationX = 0; - if (mContainer.getDeviceProfile().isLandscape - && mTaskContainer.getStagePosition() == STAGE_POSITION_BOTTOM_OR_RIGHT) { - // Animate menu and icon when split task would display off the side of the - // screen. - additionalTranslationX = Math.max( - getTranslationX() + getWidth() - (mContainer.getDeviceProfile().widthPx - - getResources().getDimensionPixelSize( - R.dimen.task_menu_edge_padding) * 2), - 0); - } - - ObjectAnimator translationXAnim = ObjectAnimator.ofFloat(this, TRANSLATION_X, - closing ? mMenuTranslationXBeforeOpen - : mMenuTranslationXBeforeOpen - additionalTranslationX); - translationXAnim.setInterpolator(EMPHASIZED); - - ObjectAnimator menuTranslationXAnim = ObjectAnimator.ofFloat( - iconAppChip.getMenuTranslationX(), - MULTI_PROPERTY_VALUE, closing ? 0 : -additionalTranslationX); - menuTranslationXAnim.setInterpolator(EMPHASIZED); - - mOpenCloseAnimator.playTogether(translationYAnim, translationXAnim, - menuTranslationXAnim, menuTranslationYAnim); - } - mOpenCloseAnimator.playTogether(mRevealAnimator, - ObjectAnimator.ofFloat( - mTaskContainer.getThumbnailViewDeprecated(), DIM_ALPHA, - closing ? 0 : TaskView.MAX_PAGE_SCRIM_ALPHA), - ObjectAnimator.ofFloat(this, ALPHA, closing ? 0 : 1)); - mOpenCloseAnimator.addListener(new AnimationSuccessListener() { - @Override - public void onAnimationStart(Animator animation) { - setVisibility(VISIBLE); - if (closing && mOnClosingStartCallback != null) { - mOnClosingStartCallback.run(); - } - } - - @Override - public void onAnimationSuccess(Animator animator) { - if (closing) { - closeComplete(); - } - } - }); - mOpenCloseAnimator.setDuration(closing ? REVEAL_CLOSE_DURATION : REVEAL_OPEN_DURATION); - mOpenCloseAnimator.start(); - } - - private void closeComplete() { - mIsOpen = false; - mContainer.getDragLayer().removeView(this); - mRevealAnimator = null; - } - - private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() { - float radius = TaskCornerRadius.get(mContext); - Rect fromRect = new Rect( - enableOverviewIconMenu() && isLayoutRtl() ? getWidth() : 0, - 0, - enableOverviewIconMenu() && !isLayoutRtl() ? 0 : getWidth(), - 0); - Rect toRect = new Rect(0, 0, getWidth(), getHeight()); - return new RoundedRectRevealOutlineProvider(radius, radius, fromRect, toRect); - } - - /** - * Calculates max height based on how much space we have available. - * If not enough space then the view will scroll. The maximum menu size will sit - * inside the task - * with a margin on the top and bottom. - */ - private int calculateMaxHeight() { - float taskInsetMargin = getResources().getDimension(R.dimen.task_card_margin); - return mTaskView.getPagedOrientationHandler().getTaskMenuHeight(taskInsetMargin, - mContainer.getDeviceProfile(), getTranslationX(), getTranslationY()); - } - - private void setOnClosingStartCallback(Runnable onClosingStartCallback) { - mOnClosingStartCallback = onClosingStartCallback; - } -} diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.kt b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt new file mode 100644 index 00000000000..da61ab1739a --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt @@ -0,0 +1,619 @@ +/* + * 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.quickstep.views + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.animation.TimeInterpolator +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Outline +import android.graphics.Rect +import android.graphics.drawable.ShapeDrawable +import android.graphics.drawable.shapes.RectShape +import android.util.AttributeSet +import android.view.Gravity +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.View +import android.view.ViewOutlineProvider +import android.widget.LinearLayout +import android.widget.TextView +import androidx.core.content.res.ResourcesCompat +import com.android.app.animation.Interpolators +import com.android.app.animation.Interpolators.clampToProgress +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.Flags.enableRefactorTaskThumbnail +import com.android.launcher3.R +import com.android.launcher3.anim.AnimationSuccessListener +import com.android.launcher3.anim.RoundedRectRevealOutlineProvider +import com.android.launcher3.popup.SystemShortcut +import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED +import com.android.launcher3.views.BaseDragLayer +import com.android.quickstep.TaskOverlayFactory +import com.android.quickstep.TaskUtils +import com.android.quickstep.orientation.RecentsPagedOrientationHandler +import com.android.quickstep.util.TaskCornerRadius +import kotlin.math.max +import kotlin.math.roundToInt + +/** Contains options for a recent task when long-pressing its icon. */ +class TaskMenuView +@JvmOverloads +constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int = 0) : + AbstractFloatingView(context, attrs, defStyleAttr) { + private val recentsViewContainer: RecentsViewContainer = + RecentsViewContainer.containerFromContext(context) + private val tempRect = Rect() + private val taskName: TextView by lazy { findViewById(R.id.task_name) } + private val optionLayout: LinearLayout by lazy { findViewById(R.id.menu_option_layout) } + private var openCloseAnimator: AnimatorSet? = null + private var revealAnimator: ValueAnimator? = null + private var onClosingStartCallback: Runnable? = null + private lateinit var orientationHandler: RecentsPagedOrientationHandler + private lateinit var taskTarget: TaskTarget + private val taskView: TaskView + get() = taskTarget.taskView + + private val taskContainer: TaskContainer? + get() = (taskTarget as? TaskTarget.FromTaskContainer)?.container + + private val containerView: View + get() = taskContainer?.snapshotView ?: taskView + + private val stagePosition: Int + get() = taskContainer?.stagePosition ?: STAGE_POSITION_UNDEFINED + + private var menuTranslationXBeforeOpen = 0f + private var menuTranslationYBeforeOpen = 0f + + // Spaced claimed below Overview (taskbar and insets) + private val taskbarTop by lazy { + recentsViewContainer.deviceProfile.deviceProperties.heightPx - + recentsViewContainer.deviceProfile.overviewActionsClaimedSpaceBelow + } + private val minMenuTop by lazy { iconView.height.toFloat() } + private val maxMenuBottom by lazy { taskbarTop - recentsViewContainer.dragLayer.insets.top } + + init { + clipToOutline = true + } + + override fun onControllerInterceptTouchEvent(ev: MotionEvent): Boolean { + if (ev.action == MotionEvent.ACTION_DOWN) { + if (!recentsViewContainer.dragLayer.isEventOverView(this, ev)) { + // TODO: log this once we have a new container type for it? + animateOpenOrClosed(true) + return true + } + } + return false + } + + override fun handleClose(animate: Boolean) { + animateOpenOrClosed(closing = true, animated = false) + } + + override fun isOfType(type: Int): Boolean = (type and TYPE_TASK_MENU) != 0 + + override fun getOutlineProvider(): ViewOutlineProvider = + object : ViewOutlineProvider() { + override fun getOutline(view: View, outline: Outline) { + outline.setRoundRect( + 0, + 0, + view.width, + view.height, + TaskCornerRadius.get(view.context), + ) + } + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + var heightMeasure = heightMeasureSpec + val maxMenuHeight = calculateMaxHeight() + if (MeasureSpec.getSize(heightMeasure) > maxMenuHeight) { + heightMeasure = MeasureSpec.makeMeasureSpec(maxMenuHeight, MeasureSpec.AT_MOST) + } + super.onMeasure(widthMeasureSpec, heightMeasure) + } + + fun onRotationChanged() { + openCloseAnimator?.let { if (it.isRunning) it.end() } + if (mIsOpen) { + optionLayout.removeAllViews() + if (enableOverviewIconMenu() || !populateAndLayoutMenu()) { + close(false) + } + } + } + + private fun populateAndShowForTask(taskTarget: TaskTarget): Boolean { + if (isAttachedToWindow) return false + recentsViewContainer.dragLayer.addView(this) + this.taskTarget = taskTarget + if (!populateAndLayoutMenu()) return false + post { this.animateOpen() } + return true + } + + /** @return true if successfully able to populate task view menu, false otherwise */ + private fun populateAndLayoutMenu(): Boolean { + addMenuOptions() + orientAroundTaskView() + return true + } + + private fun addMenuOptions() { + if (enableOverviewIconMenu()) { + removeView(taskName) + } else { + taskName.text = TaskUtils.getTitle(context, taskContainer?.task) + taskName.setOnClickListener { close(true) } + } + TaskOverlayFactory.getEnabledShortcuts(taskView, taskContainer).forEach { + menuOption: SystemShortcut<*> -> + addMenuOption(menuOption) + } + } + + private fun addMenuOption(menuOption: SystemShortcut<*>) { + val menuOptionView = + recentsViewContainer.layoutInflater.inflate(R.layout.task_view_menu_option, this, false) + as LinearLayout + if (enableOverviewIconMenu()) { + menuOptionView.background = + ResourcesCompat.getDrawable( + resources, + R.drawable.app_chip_menu_item_bg, + context.theme, + ) + } + menuOption.setIconAndLabelFor( + menuOptionView.findViewById(R.id.icon), + menuOptionView.findViewById(R.id.text), + ) + val lp = menuOptionView.layoutParams as LayoutParams + taskView.pagedOrientationHandler.setLayoutParamsForTaskMenuOptionItem( + lp, + menuOptionView, + recentsViewContainer.deviceProfile, + ) + // Set an onClick listener on each menu option. The onClick method is responsible for + // ending LiveTile mode on the thumbnail if needed. + menuOptionView.setOnClickListener { v: View? -> menuOption.onClick(v) } + optionLayout.addView(menuOptionView) + } + + private fun orientAroundTaskView() { + val recentsView = recentsViewContainer.getOverviewPanel>() + orientationHandler = recentsView.pagedOrientationHandler + measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED) + + // Get Position + val deviceProfile = recentsViewContainer.deviceProfile + recentsViewContainer.dragLayer.getDescendantRectRelativeToSelf( + if (enableOverviewIconMenu()) iconView.findViewById(R.id.icon_view_menu_anchor) + else containerView, + tempRect, + ) + val insets = recentsViewContainer.dragLayer.insets + val params = layoutParams as BaseDragLayer.LayoutParams + params.width = + orientationHandler.getTaskMenuWidth(containerView, deviceProfile, stagePosition) + // Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start + params.gravity = + if (enableOverviewIconMenu() && orientationHandler.isLayoutNaturalToLauncher) + Gravity.START + else Gravity.LEFT + layoutParams = params + scaleX = taskView.scaleX + scaleY = taskView.scaleY + + // Set divider spacing + val divider = ShapeDrawable(RectShape()) + divider.paint.color = resources.getColor(android.R.color.transparent) + val dividerSpacing = resources.getDimension(R.dimen.task_menu_spacing).toInt() + optionLayout.showDividers = + if (enableOverviewIconMenu()) SHOW_DIVIDER_NONE else SHOW_DIVIDER_MIDDLE + + optionLayout.background = + if (enableOverviewIconMenu()) { + ResourcesCompat.getDrawable(resources, R.drawable.app_chip_menu_bg, context.theme) + } else { + null + } + if (enableOverviewIconMenu()) { + background = + ResourcesCompat.getDrawable(resources, R.drawable.app_chip_menu_bg, context.theme) + } + + orientationHandler.setTaskOptionsMenuLayoutOrientation( + deviceProfile, + optionLayout, + dividerSpacing, + divider, + ) + + val thumbnailAlignedX = + if ( + enableOverviewIconMenu() && + orientationHandler.isLayoutNaturalToLauncher && + isLayoutRtl + ) + -(recentsViewContainer.dragLayer.width - tempRect.right - insets.right).toFloat() + else (tempRect.left - insets.left).toFloat() + val thumbnailAlignedY = (tempRect.top - insets.top).toFloat() + + // Changing pivot to make computations easier + // NOTE: Changing the pivots means the rotated view gets rotated about the new pivots set, + // which would render the X and Y position set here incorrect + pivotX = 0f + pivotY = 0f + rotation = orientationHandler.degreesRotated + + var taskInsetMargin = resources.getDimension(R.dimen.task_card_margin) + if (enableOverviewIconMenu()) { + elevation = resources.getDimension(R.dimen.task_thumbnail_icon_menu_elevation) + taskInsetMargin = 0f + } + + translationX = + orientationHandler.getTaskMenuX( + thumbnailAlignedX, + containerView, + deviceProfile, + taskInsetMargin, + iconView, + ) + translationY = + orientationHandler.getTaskMenuY( + thumbnailAlignedY, + containerView, + stagePosition, + this, + taskInsetMargin, + iconView, + ) + } + + private fun animateOpen() { + menuTranslationYBeforeOpen = translationY + menuTranslationXBeforeOpen = translationX + animateOpenOrClosed(closing = false) + mIsOpen = true + } + + private val iconView: View + get() = taskContainer?.iconView?.asView() ?: taskView.getTaskIcons().first().first.asView() + + private fun animateOpenOrClosed(closing: Boolean, animated: Boolean = true) { + if (!iconView.isAttachedToWindow) return + openCloseAnimator?.let { if (it.isRunning) it.cancel() } + // If we're opening, we just start from the beginning as a new `TaskMenuView` is + // created + // each time we do the open animation so there will never be a partial value + // here. + var revealAnimationStartProgress = 0f + if (closing) revealAnimator?.let { revealAnimationStartProgress = 1f - it.animatedFraction } + revealAnimator = + createOpenCloseOutlineProvider() + .createRevealAnimator(this, closing, revealAnimationStartProgress) + .apply { + interpolator = + if (enableOverviewIconMenu()) Interpolators.EMPHASIZED + else Interpolators.DECELERATE + + if (enableRefactorTaskThumbnail()) { + addUpdateListener { animation: ValueAnimator -> + val animatedFraction = animation.animatedFraction + val openProgress = + if (closing) (1 - animatedFraction) else animatedFraction + taskContainer?.updateMenuOpenProgress(openProgress) + } + } + } + openCloseAnimator = + AnimatorSet() + .apply { + duration = + when { + animated && closing -> REVEAL_CLOSE_DURATION + animated && !closing -> REVEAL_OPEN_DURATION + else -> 0L + } + addListener( + object : AnimationSuccessListener() { + override fun onAnimationStart(animation: Animator) { + visibility = VISIBLE + if (closing) onClosingStartCallback?.run() + } + + override fun onAnimationSuccess(animator: Animator) { + if (closing) closeComplete() + } + } + ) + } + .also { animator -> + val animatorBuilder = animator.play(revealAnimator) + if (enableOverviewIconMenu()) { + animateOpenOrCloseAppChip(closing, animatorBuilder) + } else { + animatorBuilder.with( + ObjectAnimator.ofFloat(this, ALPHA, (if (closing) 0 else 1).toFloat()) + ) + } + + if (!enableRefactorTaskThumbnail()) { + taskContainer?.let { + animatorBuilder.with( + ObjectAnimator.ofFloat( + it.thumbnailViewDeprecated, + TaskThumbnailViewDeprecated.DIM_ALPHA, + if (closing) 0f else TaskView.MAX_PAGE_SCRIM_ALPHA, + ) + ) + } + } + + animator.start() + } + } + + private fun TaskView.isOnGridBottomRow(): Boolean = + (recentsViewContainer.getOverviewPanel() as RecentsView<*, *>).isOnGridBottomRow(this) + + private fun closeComplete() { + mIsOpen = false + recentsViewContainer.dragLayer.removeView(this) + revealAnimator = null + } + + private fun createOpenCloseOutlineProvider(): RoundedRectRevealOutlineProvider { + val radius = TaskCornerRadius.get(mContext) + + val fromRect = + if (enableOverviewIconMenu()) { + Rect( + /* left = */ if (isLayoutRtl) width - iconView.minimumWidth else 0, + /* top = */ 0, + /* right = */ if (isLayoutRtl) width else iconView.minimumWidth, + /* bottom = */ (height * CONTAINER_SCALE_PERCENTAGE).roundToInt(), + ) + } else { + Rect(0, 0, width, 0) + } + + val toRect = Rect(0, 0, width, height) + return RoundedRectRevealOutlineProvider(radius, radius, fromRect, toRect) + } + + /** + * Calculates max height based on how much space we have available. If not enough space then the + * view will scroll. The maximum menu size will sit inside the task with a margin on the top and + * bottom. + */ + private fun calculateMaxHeight(): Int = + taskView.pagedOrientationHandler.getTaskMenuHeight( + taskInsetMargin = resources.getDimension(R.dimen.task_card_margin), // taskInsetMargin + deviceProfile = recentsViewContainer.deviceProfile, + taskMenuX = translationX, + taskMenuY = + // Bottom menu can translate up to show more options. So we use the min + // translation allowed to calculate its max height. + if (enableOverviewIconMenu() && taskView.isOnGridBottomRow()) minMenuTop + else translationY, + ) + + private fun setOnClosingStartCallback(onClosingStartCallback: Runnable?) { + this.onClosingStartCallback = onClosingStartCallback + } + + private fun animateOpenOrCloseAppChip(closing: Boolean, animatorBuilder: AnimatorSet.Builder) { + if (!closing) { + alpha = 0f + optionLayout.apply { + pivotX = if (isLayoutRtl) optionLayout.width.toFloat() else 0f + pivotY = 0f + scaleX = CONTAINER_SCALE_PERCENTAGE + scaleY = CONTAINER_SCALE_PERCENTAGE + alpha = 0f + } + } + + val iconAppChip = iconView as IconAppChipView + + // Animate menu up for enough room to display full menu when task on bottom row. + var additionalTranslationY = 0f + val translationYMargin = orientationHandler.getAppChipMenuMarginY(iconAppChip, isLayoutRtl) + if (taskView.isOnGridBottomRow()) { + val expandedMenuPosition = menuTranslationYBeforeOpen + translationYMargin + val currentMenuBottom: Float = expandedMenuPosition + height + additionalTranslationY = + if (currentMenuBottom < maxMenuBottom) 0f + // Translate menu up for enough room to display full menu when task on bottom row. + else maxMenuBottom - currentMenuBottom + + val currentMenuTop = expandedMenuPosition + additionalTranslationY + // If it translate above the min accepted, it translates to the top of the screen + if (currentMenuTop < minMenuTop) { + // It subtracts the menuTranslation to make it 0 (top of the screen) + chip size. + additionalTranslationY = -expandedMenuPosition + minMenuTop + } + } + + val translationYAnim = + ObjectAnimator.ofFloat( + this, + TRANSLATION_Y, + if (closing) menuTranslationYBeforeOpen + else menuTranslationYBeforeOpen + translationYMargin + additionalTranslationY, + ) + translationYAnim.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(translationYAnim) + + val menuTranslationYAnim: ObjectAnimator = + ObjectAnimator.ofFloat( + iconAppChip.getMenuTranslationY(), + MultiPropertyFactory.MULTI_PROPERTY_VALUE, + if (closing) 0f else additionalTranslationY, + ) + menuTranslationYAnim.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(menuTranslationYAnim) + + var additionalTranslationX = 0f + if ( + taskView.pagedOrientationHandler.isLayoutNaturalToLauncher && + taskContainer?.stagePosition == + SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + ) { + // Animate menu and icon when split task would display off the side of the screen. + additionalTranslationX = + max( + (translationX + width - + (recentsViewContainer.deviceProfile.deviceProperties.widthPx - + resources.getDimensionPixelSize( + R.dimen.task_menu_edge_padding + ) * 2)) + .toDouble(), + 0.0, + ) + .toFloat() + } + + val translationXMargin = orientationHandler.getAppChipMenuMarginX(iconAppChip, isLayoutRtl) + val translationXAnim = + ObjectAnimator.ofFloat( + this, + TRANSLATION_X, + if (closing) menuTranslationXBeforeOpen + else menuTranslationXBeforeOpen - translationXMargin - additionalTranslationX, + ) + translationXAnim.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(translationXAnim) + + val menuTranslationXAnim: ObjectAnimator = + ObjectAnimator.ofFloat( + iconAppChip.getMenuTranslationX(), + MultiPropertyFactory.MULTI_PROPERTY_VALUE, + if (closing) 0f else -additionalTranslationX, + ) + menuTranslationXAnim.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(menuTranslationXAnim) + + // Scaling the container inside the menu + val toScaleX = if (closing) CONTAINER_SCALE_PERCENTAGE else 1f + val animatorScaleX = ObjectAnimator.ofFloat(optionLayout, SCALE_X, toScaleX) + animatorScaleX.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(animatorScaleX) + + val toScaleY = if (closing) CONTAINER_SCALE_PERCENTAGE else 1f + val animatorScaleY = ObjectAnimator.ofFloat(optionLayout, SCALE_Y, toScaleY) + animatorScaleY.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(animatorScaleY) + + val alphaValue = if (closing) 0f else 1f + val optionLayoutAlphaAnimator = + ObjectAnimator.ofFloat(optionLayout, ALPHA, alphaValue).apply { + interpolator = TimeInterpolator { + clampToProgress(Interpolators.EMPHASIZED.getInterpolation(it), .75f, 1f) + } + } + animatorBuilder.with(optionLayoutAlphaAnimator) + + val menuAlphaAnimator = + ObjectAnimator.ofFloat(this, ALPHA, alphaValue).apply { + interpolator = TimeInterpolator { + clampToProgress(Interpolators.EMPHASIZED.getInterpolation(it), .48f, .74f) + } + } + animatorBuilder.with(menuAlphaAnimator) + + val recentsView = recentsViewContainer.getOverviewPanel>() + val isAnimated = !recentsView.isSplitSelectionActive + animatorBuilder.with(iconAppChip.revealAnim(isRevealing = !closing, isAnimated)) + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (enableOverviewIconMenu()) { + if (event.action != KeyEvent.ACTION_DOWN) return super.dispatchKeyEvent(event) + + val isFirstMenuOptionFocused = optionLayout.indexOfChild(optionLayout.focusedChild) == 0 + val isLastMenuOptionFocused = + optionLayout.indexOfChild(optionLayout.focusedChild) == optionLayout.childCount - 1 + if ( + (isLastMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_DOWN) || + (isFirstMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_UP) + ) { + iconView.requestFocus() + return true + } else { + val currentFocus = findFocus() ?: return super.dispatchKeyEvent(event) + + val nextFocus = + when (event.keyCode) { + KeyEvent.KEYCODE_DPAD_UP -> focusSearch(currentFocus, FOCUS_BACKWARD) + KeyEvent.KEYCODE_DPAD_DOWN -> focusSearch(currentFocus, FOCUS_FORWARD) + KeyEvent.KEYCODE_TAB -> + focusSearch( + currentFocus, + if (event.isShiftPressed) FOCUS_BACKWARD else FOCUS_FORWARD, + ) + else -> null + } + + return nextFocus?.requestFocus() ?: super.dispatchKeyEvent(event) + } + } + return super.dispatchKeyEvent(event) + } + + companion object { + private val REVEAL_OPEN_DURATION = if (enableOverviewIconMenu()) 417L else 150L + private val REVEAL_CLOSE_DURATION = if (enableOverviewIconMenu()) 333L else 100L + private const val CONTAINER_SCALE_PERCENTAGE = .8f + + /** Show a task menu for the given task. */ + fun showForTask(taskTarget: TaskTarget, onClosingStartCallback: Runnable? = null): Boolean { + val container: RecentsViewContainer = + RecentsViewContainer.containerFromContext(taskTarget.context) + val taskMenuView = + container.layoutInflater.inflate(R.layout.task_menu, container.dragLayer, false) + as TaskMenuView + taskMenuView.setOnClosingStartCallback(onClosingStartCallback) + return taskMenuView.populateAndShowForTask(taskTarget) + } + } + + /** An identifier for a task, which can be either a [TaskContainer] or a [TaskView]. */ + sealed class TaskTarget { + abstract val taskView: TaskView + val context: Context + get() = taskView.context + + data class FromTaskContainer(val container: TaskContainer) : TaskTarget() { + override val taskView: TaskView + get() = container.taskView + } + + data class FromTaskView(override val taskView: TaskView) : TaskTarget() + } +} diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt b/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt index 346eb2ff654..42f7dc2aa20 100644 --- a/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt +++ b/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt @@ -29,8 +29,6 @@ import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import android.widget.LinearLayout -import app.lawnchair.theme.color.tokens.ColorTokens -import com.android.launcher3.BaseDraggingActivity import com.android.launcher3.DeviceProfile import com.android.launcher3.InsettableFrameLayout import com.android.launcher3.R @@ -39,32 +37,43 @@ import com.android.launcher3.popup.RoundedArrowDrawable import com.android.launcher3.popup.SystemShortcut import com.android.launcher3.util.Themes import com.android.quickstep.TaskOverlayFactory -import com.android.quickstep.views.TaskView.TaskContainer + +import app.lawnchair.theme.color.tokens.ColorTokens class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T : Context { companion object { const val TAG = "TaskMenuViewWithArrow" - fun showForTask(taskContainer: TaskContainer, alignedOptionIndex: Int = 0): Boolean { + fun showForTask( + taskContainer: TaskContainer, + alignedOptionIndex: Int = 0, + onClosedCallback: Runnable? = null, + ): Boolean { val container: RecentsViewContainer = RecentsViewContainer.containerFromContext(taskContainer.taskView.context) val taskMenuViewWithArrow = container.layoutInflater.inflate( R.layout.task_menu_with_arrow, container.dragLayer, - false + false, ) as TaskMenuViewWithArrow<*> - return taskMenuViewWithArrow.populateAndShowForTask(taskContainer, alignedOptionIndex) + return taskMenuViewWithArrow.populateAndShowForTask( + taskContainer, + alignedOptionIndex, + onClosedCallback, + ) } } constructor(context: Context) : super(context) + constructor(context: Context, attrs: AttributeSet) : super(context, attrs) + constructor( context: Context, attrs: AttributeSet, - defStyleAttr: Int + defStyleAttr: Int, ) : super(context, attrs, defStyleAttr) init { @@ -82,6 +91,7 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T private var alignedOptionIndex: Int = 0 private val extraSpaceForRowAlignment: Int get() = optionMeasuredHeight * alignedOptionIndex + private val menuPaddingEnd = context.resources.getDimensionPixelSize(R.dimen.task_card_margin) private lateinit var taskView: TaskView @@ -91,13 +101,14 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T private var optionMeasuredHeight = 0 private val arrowHorizontalPadding: Int get() = - if (taskView.isFocusedTask) + if (taskView.isLargeTile) resources.getDimensionPixelSize(R.dimen.task_menu_horizontal_padding) else 0 private var iconView: IconView? = null private var scrim: View? = null private val scrimAlpha = 0.8f + private var onClosedCallback: Runnable? = null override fun isOfType(type: Int): Boolean = type and TYPE_TASK_MENU != 0 @@ -135,13 +146,14 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T taskInsetMargin, mActivityContext.deviceProfile, translationX, - translationY + translationY, ) } private fun populateAndShowForTask( taskContainer: TaskContainer, - alignedOptionIndex: Int + alignedOptionIndex: Int, + onClosedCallback: Runnable?, ): Boolean { if (isAttachedToWindow) { return false @@ -150,6 +162,7 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T taskView = taskContainer.taskView this.taskContainer = taskContainer this.alignedOptionIndex = alignedOptionIndex + this.onClosedCallback = onClosedCallback if (!populateMenu()) return false addScrim() show() @@ -162,8 +175,9 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T layoutParams = FrameLayout.LayoutParams( FrameLayout.LayoutParams.MATCH_PARENT, - FrameLayout.LayoutParams.MATCH_PARENT + FrameLayout.LayoutParams.MATCH_PARENT, ) + // pE-TODO(QPR2): Investigate colour overviewScrimColor setBackgroundColor(ColorTokens.OverviewScrimColor.resolveColor(context)) alpha = 0f } @@ -199,7 +213,7 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T deviceProfile, optionLayout, dividerSpacing, - divider + divider, ) } @@ -209,7 +223,7 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T as LinearLayout menuOption.setIconAndLabelFor( menuOptionView.requireViewById(R.id.icon), - menuOptionView.requireViewById(R.id.text) + menuOptionView.requireViewById(R.id.text), ) val lp = menuOptionView.layoutParams as LayoutParams lp.width = LayoutParams.MATCH_PARENT @@ -217,7 +231,7 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T menuOptionView.paddingStart, menuOptionView.paddingTop, menuPaddingEnd, - menuOptionView.paddingBottom + menuOptionView.paddingBottom, ) menuOptionView.setOnClickListener { view: View? -> menuOption.onClick(view) } optionLayout.addView(menuOptionView) @@ -226,7 +240,8 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T override fun assignMarginsAndBackgrounds(viewGroup: ViewGroup) { assignMarginsAndBackgrounds( this, - ColorTokens.Surface.resolveColor(context) + // pE-TODO(QPR2): Investigate colour com.android.internal.R.attr.colorSurface + ColorTokens.Surface.resolveColor(context), ) } @@ -252,6 +267,7 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T super.closeComplete() popupContainer.removeView(scrim) popupContainer.removeView(iconView) + onClosedCallback?.run() } /** @@ -263,15 +279,15 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T IconView(context).apply { layoutParams = FrameLayout.LayoutParams( - taskContainer.iconView.width, - taskContainer.iconView.height + taskContainer.iconView.asView().width, + taskContainer.iconView.asView().height, ) x = mTempRect.left.toFloat() - insets.left y = mTempRect.top.toFloat() - insets.top drawable = taskContainer.iconView.drawable setDrawableSize( taskContainer.iconView.drawableWidth, - taskContainer.iconView.drawableHeight + taskContainer.iconView.drawableHeight, ) } @@ -357,7 +373,7 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T mArrowHeight.toFloat(), mArrowPointRadius.toFloat(), mIsLeftAligned, - mArrowColor + mArrowColor, ) elevation = mElevation mArrow.elevation = mElevation diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailViewDeprecated.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailViewDeprecated.java index 4283d0e4cfa..a39100ebc2a 100644 --- a/quickstep/src/com/android/quickstep/views/TaskThumbnailViewDeprecated.java +++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailViewDeprecated.java @@ -28,16 +28,13 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; -import android.graphics.Insets; import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; -import android.graphics.RectF; import android.graphics.Shader; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.Property; @@ -45,18 +42,16 @@ import android.widget.ImageView; import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import androidx.core.graphics.ColorUtils; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Utilities; -import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.SystemUiController; import com.android.launcher3.util.SystemUiController.SystemUiControllerFlags; import com.android.launcher3.util.ViewPool; +import com.android.quickstep.FullscreenDrawParams; import com.android.quickstep.TaskOverlayFactory.TaskOverlay; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.views.TaskView.FullscreenDrawParams; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.recents.utilities.PreviewPositionHelper; @@ -70,8 +65,6 @@ */ @Deprecated public class TaskThumbnailViewDeprecated extends View implements ViewPool.Reusable { - private static final MainThreadInitializedObject TEMP_PARAMS = - new MainThreadInitializedObject<>(FullscreenDrawParams::new); public static final Property DIM_ALPHA = new FloatProperty("dimAlpha") { @@ -98,36 +91,7 @@ public Float get(TaskThumbnailViewDeprecated thumbnailView) { return thumbnailView.mSplashAlpha / 255f; } }; - - /** Use to animate thumbnail translationX while first app in split selection is initiated */ - public static final Property SPLIT_SELECT_TRANSLATE_X = - new FloatProperty("splitSelectTranslateX") { - @Override - public void setValue(TaskThumbnailViewDeprecated thumbnail, - float splitSelectTranslateX) { - thumbnail.applySplitSelectTranslateX(splitSelectTranslateX); - } - - @Override - public Float get(TaskThumbnailViewDeprecated thumbnailView) { - return thumbnailView.mSplitSelectTranslateX; - } - }; - - /** Use to animate thumbnail translationY while first app in split selection is initiated */ - public static final Property SPLIT_SELECT_TRANSLATE_Y = - new FloatProperty("splitSelectTranslateY") { - @Override - public void setValue(TaskThumbnailViewDeprecated thumbnail, - float splitSelectTranslateY) { - thumbnail.applySplitSelectTranslateY(splitSelectTranslateY); - } - - @Override - public Float get(TaskThumbnailViewDeprecated thumbnailView) { - return thumbnailView.mSplitSelectTranslateY; - } - }; + private static final int IGNORE_DENSITY_SCALING = 0; private final RecentsViewContainer mContainer; private TaskOverlay mOverlay; @@ -141,9 +105,10 @@ public Float get(TaskThumbnailViewDeprecated thumbnailView) { // Contains the portion of the thumbnail that is clipped when fullscreen progress = 0. private final Rect mPreviewRect = new Rect(); private final PreviewPositionHelper mPreviewPositionHelper = new PreviewPositionHelper(); - private TaskView.FullscreenDrawParams mFullscreenParams; + private FullscreenDrawParams mFullscreenParams; private ImageView mSplashView; private Drawable mSplashViewDrawable; + private TaskView mTaskView; @Nullable private Task mTask; @@ -160,8 +125,6 @@ public Float get(TaskThumbnailViewDeprecated thumbnailView) { private boolean mOverlayEnabled; /** Used as a placeholder when the original thumbnail animates out to. */ private boolean mShowSplashForSplitSelection; - private float mSplitSelectTranslateX; - private float mSplitSelectTranslateY; public TaskThumbnailViewDeprecated(Context context) { this(context, null); @@ -180,8 +143,7 @@ public TaskThumbnailViewDeprecated(Context context, @Nullable AttributeSet attrs mClearPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR)); mContainer = RecentsViewContainer.containerFromContext(context); // Initialize with placeholder value. It is overridden later by TaskView - mFullscreenParams = TEMP_PARAMS.get(context); - + mFullscreenParams = new FullscreenDrawParams(context, __ -> 0f, __ -> 0f); mDimColor = RecentsView.getForegroundScrimDimColor(context); mDimmingPaintAfterClearing.setColor(mDimColor); } @@ -189,10 +151,11 @@ public TaskThumbnailViewDeprecated(Context context, @Nullable AttributeSet attrs /** * Updates the thumbnail to draw the provided task */ - public void bind(Task task, TaskOverlay overlay) { + public void bind(Task task, TaskOverlay overlay, TaskView taskView) { mOverlay = overlay; mOverlay.reset(); mTask = task; + mTaskView = taskView; int color = task == null ? Color.BLACK : task.colorBackground | 0xFF000000; mPaint.setColor(color); mBackgroundPaint.setColor(color); @@ -200,17 +163,6 @@ public void bind(Task task, TaskOverlay overlay) { updateSplashView(mTask.icon); } - /** - * Sets TaskOverlay without binding a task. - * - * @deprecated Should only be used when using new - * {@link com.android.quickstep.task.thumbnail.TaskThumbnailView}. - */ - @Deprecated - public void setTaskOverlay(TaskOverlay overlay) { - mOverlay = overlay; - } - /** * Updates the thumbnail. * @@ -298,40 +250,6 @@ public float getDimAlpha() { return mDimAlpha; } - /** - * Get the scaled insets that are being used to draw the task view. This is a subsection of - * the full snapshot. - * - * @return the insets in snapshot bitmap coordinates. - */ - @RequiresApi(api = Build.VERSION_CODES.Q) - public Insets getScaledInsets() { - if (mThumbnailData == null) { - return Insets.NONE; - } - - RectF bitmapRect = new RectF( - 0, - 0, - mThumbnailData.getThumbnail().getWidth(), - mThumbnailData.getThumbnail().getHeight()); - RectF viewRect = new RectF(0, 0, getMeasuredWidth(), getMeasuredHeight()); - - // The position helper matrix tells us how to transform the bitmap to fit the view, the - // inverse tells us where the view would be in the bitmaps coordinates. The insets are the - // difference between the bitmap bounds and the projected view bounds. - Matrix boundsToBitmapSpace = new Matrix(); - mPreviewPositionHelper.getMatrix().invert(boundsToBitmapSpace); - RectF boundsInBitmapSpace = new RectF(); - boundsToBitmapSpace.mapRect(boundsInBitmapSpace, viewRect); - - DeviceProfile dp = mContainer.getDeviceProfile(); - int bottomInset = dp.isTablet - ? Math.round(bitmapRect.bottom - boundsInBitmapSpace.bottom) : 0; - return Insets.of(0, 0, 0, bottomInset); - } - - @SystemUiControllerFlags public int getSysUiStatusNavFlags() { if (mThumbnailData != null) { @@ -358,7 +276,7 @@ protected void onDraw(Canvas canvas) { canvas.save(); // Draw the insets if we're being drawn fullscreen (we do this for quick switch). drawOnCanvas(canvas, 0, 0, getMeasuredWidth(), getMeasuredHeight(), - mFullscreenParams.getCurrentDrawnCornerRadius()); + mFullscreenParams.getCurrentCornerRadius()); canvas.restore(); } @@ -366,15 +284,15 @@ public PreviewPositionHelper getPreviewPositionHelper() { return mPreviewPositionHelper; } - public void setFullscreenParams(TaskView.FullscreenDrawParams fullscreenParams) { + public void setFullscreenParams(FullscreenDrawParams fullscreenParams) { mFullscreenParams = fullscreenParams; invalidate(); } public void drawOnCanvas(Canvas canvas, float x, float y, float width, float height, float cornerRadius) { - if (mTask != null && getTaskView().isRunningTask() - && !getTaskView().getShouldShowScreenshot()) { + if (mTask != null && mTaskView.isRunningTask() + && !mTaskView.getShouldShowScreenshot()) { canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mClearPaint); canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mDimmingPaintAfterClearing); @@ -415,35 +333,6 @@ public void drawOnCanvas(Canvas canvas, float x, float y, float width, float hei } } - /** See {@link #SPLIT_SELECT_TRANSLATE_X} */ - protected void applySplitSelectTranslateX(float splitSelectTranslateX) { - mSplitSelectTranslateX = splitSelectTranslateX; - applyTranslateX(); - } - - /** See {@link #SPLIT_SELECT_TRANSLATE_Y} */ - protected void applySplitSelectTranslateY(float splitSelectTranslateY) { - mSplitSelectTranslateY = splitSelectTranslateY; - applyTranslateY(); - } - - private void applyTranslateX() { - setTranslationX(mSplitSelectTranslateX); - } - - private void applyTranslateY() { - setTranslationY(mSplitSelectTranslateY); - } - - protected void resetViewTransforms() { - mSplitSelectTranslateX = 0; - mSplitSelectTranslateY = 0; - } - - public TaskView getTaskView() { - return (TaskView) getParent(); - } - public void setOverlayEnabled(boolean overlayEnabled) { if (mOverlayEnabled != overlayEnabled) { mOverlayEnabled = overlayEnabled; @@ -496,9 +385,9 @@ private void updateSplashView(Drawable icon) { float viewCenterY = viewHeight / 2f; float centeredDrawableLeft = (viewWidth - drawableWidth) / 2f; float centeredDrawableTop = (viewHeight - drawableHeight) / 2f; - float nonGridScale = getTaskView() == null ? 1 : 1 / getTaskView().getNonGridScale(); - float recentsMaxScale = getTaskView() == null || getTaskView().getRecentsView() == null - ? 1 : 1 / getTaskView().getRecentsView().getMaxScaleForFullScreen(); + float nonGridScale = mTaskView == null ? 1 : 1 / mTaskView.getNonGridScale(); + float recentsMaxScale = mTaskView == null || mTaskView.getRecentsView() == null + ? 1 : 1 / mTaskView.getRecentsView().getMaxScaleForFullScreen(); float scaleX = nonGridScale * recentsMaxScale * (1 / getScaleX()); float scaleY = nonGridScale * recentsMaxScale * (1 / getScaleY()); @@ -524,8 +413,13 @@ private boolean isThumbnailAspectRatioDifferentFromThumbnailData() { thumbnailDataAspect, MAX_PCT_BEFORE_ASPECT_RATIOS_CONSIDERED_DIFFERENT); } - private boolean isThumbnailRotationDifferentFromTask() { - RecentsView recents = getTaskView().getRecentsView(); + /** + * Returns whether or not the current thumbnail is a different orientation to the task. + *

+ * Used to disable modal state when screenshot doesn't match the device orientation. + */ + public boolean isThumbnailRotationDifferentFromTask() { + RecentsView recents = mTaskView.getRecentsView(); if (recents == null || mThumbnailData == null) { return false; } @@ -544,7 +438,9 @@ private boolean isThumbnailRotationDifferentFromTask() { */ private void refreshOverlay() { if (mOverlayEnabled) { - mOverlay.initOverlay(mTask, mThumbnailData, mPreviewPositionHelper.getMatrix(), + mOverlay.initOverlay(mTask, + mThumbnailData != null ? mThumbnailData.getThumbnail() : null, + mPreviewPositionHelper.getMatrix(), mPreviewPositionHelper.isOrientationChanged()); } else { mOverlay.reset(); @@ -571,15 +467,16 @@ private void updateThumbnailMatrix() { if (mBitmapShader != null && mThumbnailData != null) { mPreviewRect.set(0, 0, mThumbnailData.getThumbnail().getWidth(), mThumbnailData.getThumbnail().getHeight()); - int currentRotation = getTaskView().getOrientedState().getRecentsActivityRotation(); + int currentRotation = mTaskView.getOrientedState().getRecentsActivityRotation(); boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL; mPreviewPositionHelper.updateThumbnailMatrix(mPreviewRect, mThumbnailData, - getMeasuredWidth(), getMeasuredHeight(), dp.isTablet, currentRotation, isRtl); + getMeasuredWidth(), getMeasuredHeight(), dp.getDeviceProperties().isTablet(), + currentRotation, isRtl, IGNORE_DENSITY_SCALING); mBitmapShader.setLocalMatrix(mPreviewPositionHelper.getMatrix()); mPaint.setShader(mBitmapShader); } - getTaskView().updateCurrentFullscreenParams(); + mTaskView.updateFullscreenParams(); invalidate(); } @@ -617,6 +514,10 @@ public boolean isRealSnapshot() { return mThumbnailData.isRealSnapshot && !mTask.isLocked; } + public Matrix getThumbnailMatrix() { + return mPreviewPositionHelper.getMatrix(); + } + @Override public void onRecycle() { // Do nothing diff --git a/quickstep/src/com/android/quickstep/views/TaskView.kt b/quickstep/src/com/android/quickstep/views/TaskView.kt index 3b2be643ecc..5eb39e63aac 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.kt +++ b/quickstep/src/com/android/quickstep/views/TaskView.kt @@ -21,8 +21,9 @@ import android.animation.AnimatorSet import android.animation.ObjectAnimator import android.annotation.IdRes import android.app.ActivityOptions +import android.app.ActivityTaskManager.INVALID_TASK_ID +import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN import android.content.Context -import android.content.Intent import android.graphics.Canvas import android.graphics.PointF import android.graphics.Rect @@ -39,71 +40,90 @@ import android.view.View.OnClickListener import android.view.ViewGroup import android.view.ViewStub import android.view.accessibility.AccessibilityNodeInfo -import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction import android.widget.FrameLayout import android.widget.Toast import androidx.annotation.IntDef import androidx.annotation.RequiresApi import androidx.annotation.VisibleForTesting +import androidx.core.animation.doOnCancel +import androidx.core.view.isGone +import androidx.core.view.isInvisible import androidx.core.view.updateLayoutParams import com.android.app.animation.Interpolators -import com.android.launcher3.Flags.enableCursorHoverStates -import com.android.launcher3.Flags.enableFocusOutline -import com.android.launcher3.Flags.enableGridOnlyOverview -import com.android.launcher3.Flags.enableOverviewIconMenu +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.Flags.enableDesktopExplodedView +import com.android.launcher3.Flags.enableRefactorDigitalWellbeingToast +import com.android.launcher3.Flags.enableRefactorTaskContentView import com.android.launcher3.Flags.enableRefactorTaskThumbnail -import com.android.launcher3.Flags.privateSpaceRestrictAccessibilityDrag -import com.android.launcher3.LauncherSettings import com.android.launcher3.R import com.android.launcher3.Utilities import com.android.launcher3.anim.AnimatedFloat -import com.android.launcher3.config.FeatureFlags.ENABLE_KEYBOARD_QUICK_SWITCH import com.android.launcher3.logging.StatsLogManager.LauncherEvent import com.android.launcher3.model.data.ItemInfo -import com.android.launcher3.model.data.ItemInfoWithIcon -import com.android.launcher3.model.data.WorkspaceItemInfo -import com.android.launcher3.pm.UserCache +import com.android.launcher3.model.data.TaskViewItemInfo import com.android.launcher3.testing.TestLogging import com.android.launcher3.testing.shared.TestProtocol import com.android.launcher3.util.CancellableTask -import com.android.launcher3.util.DisplayController import com.android.launcher3.util.Executors +import com.android.launcher3.util.KFloatProperty +import com.android.launcher3.util.MultiPropertyDelegate import com.android.launcher3.util.MultiPropertyFactory -import com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE +import com.android.launcher3.util.MultiValueAlpha +import com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview +import com.android.launcher3.util.OverviewReleaseFlags.enableOverviewIconMenu import com.android.launcher3.util.RunnableList -import com.android.launcher3.util.SafeCloseable import com.android.launcher3.util.SplitConfigurationOptions import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED -import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption import com.android.launcher3.util.SplitConfigurationOptions.StagePosition import com.android.launcher3.util.TraceHelper import com.android.launcher3.util.TransformingTouchDelegate import com.android.launcher3.util.ViewPool +import com.android.launcher3.util.coroutines.DispatcherProvider import com.android.launcher3.util.rects.set -import com.android.launcher3.views.ActivityContext +import com.android.quickstep.FullscreenDrawParams import com.android.quickstep.RecentsModel import com.android.quickstep.RemoteAnimationTargets -import com.android.quickstep.TaskAnimationManager +import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle import com.android.quickstep.TaskOverlayFactory -import com.android.quickstep.TaskOverlayFactory.TaskOverlay -import com.android.quickstep.TaskUtils import com.android.quickstep.TaskViewUtils import com.android.quickstep.orientation.RecentsPagedOrientationHandler -import com.android.quickstep.task.thumbnail.TaskThumbnail -import com.android.quickstep.task.thumbnail.TaskThumbnailView -import com.android.quickstep.task.viewmodel.TaskViewData +import com.android.quickstep.recents.di.RecentsDependencies +import com.android.quickstep.recents.di.get +import com.android.quickstep.recents.domain.usecase.ThumbnailPosition +import com.android.quickstep.recents.ui.mapper.TaskUiStateMapper +import com.android.quickstep.recents.ui.viewmodel.TaskData +import com.android.quickstep.recents.ui.viewmodel.TaskTileUiState +import com.android.quickstep.recents.ui.viewmodel.TaskViewModel +import com.android.quickstep.task.TaskDismissButtonState +import com.android.quickstep.task.thumbnail.TaskContentView import com.android.quickstep.util.ActiveGestureErrorDetector import com.android.quickstep.util.ActiveGestureLog import com.android.quickstep.util.BorderAnimator +import com.android.quickstep.util.BorderAnimator.Companion.DEFAULT_APPEARANCE_ANIMATION_DURATION_MS +import com.android.quickstep.util.BorderAnimator.Companion.DEFAULT_DISAPPEARANCE_ANIMATION_DURATION_MS +import com.android.quickstep.util.BorderAnimator.Companion.DEFAULT_INTERPOLATOR import com.android.quickstep.util.BorderAnimator.Companion.createSimpleBorderAnimator +import com.android.quickstep.util.GroupTask import com.android.quickstep.util.RecentsOrientedState +import com.android.quickstep.util.SingleTask import com.android.quickstep.util.TaskCornerRadius import com.android.quickstep.util.TaskRemovedDuringLaunchListener +import com.android.quickstep.util.isExternalDisplay +import com.android.quickstep.util.safeDisplayId +import com.android.quickstep.views.IconAppChipView.AppChipStatus +import com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL +import com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED import com.android.quickstep.views.RecentsView.UNBOUND_TASK_VIEW_ID +import com.android.quickstep.window.RecentsWindowFlags.enableOverviewOnConnectedDisplays import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.ThumbnailData import com.android.systemui.shared.system.ActivityManagerWrapper -import com.android.systemui.shared.system.QuickStepContract +import com.android.wm.shell.shared.split.SplitScreenConstants +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.launch /** A task in the Recents view. */ open class TaskView @@ -114,7 +134,9 @@ constructor( defStyleAttr: Int = 0, defStyleRes: Int = 0, focusBorderAnimator: BorderAnimator? = null, - hoverBorderAnimator: BorderAnimator? = null + hoverBorderAnimator: BorderAnimator? = null, + val type: TaskViewType = TaskViewType.SINGLE, + protected val thumbnailFullscreenParams: FullscreenDrawParams = FullscreenDrawParams(context), ) : FrameLayout(context, attrs), ViewPool.Reusable { /** * Used in conjunction with [onTaskListVisibilityChanged], providing more granularity on which @@ -124,37 +146,43 @@ constructor( @IntDef(FLAG_UPDATE_ALL, FLAG_UPDATE_ICON, FLAG_UPDATE_THUMBNAIL, FLAG_UPDATE_CORNER_RADIUS) annotation class TaskDataChanges - /** Type of task view */ - @Retention(AnnotationRetention.SOURCE) - @IntDef(Type.SINGLE, Type.GROUPED, Type.DESKTOP) - annotation class Type { - companion object { - const val SINGLE = 1 - const val GROUPED = 2 - const val DESKTOP = 3 - } - } + var groupTask: GroupTask? = null - val taskViewData = TaskViewData() val taskIds: IntArray /** Returns a copy of integer array containing taskIds of all tasks in the TaskView. */ get() = taskContainers.map { it.task.key.id }.toIntArray() - val thumbnailViews: Array - get() = taskContainers.map { it.thumbnailViewDeprecated }.toTypedArray() + val taskIdSet: Set + /** Returns a copy of integer array containing taskIds of all tasks in the TaskView. */ + get() = taskContainers.map { it.task.key.id }.toSet() + + val snapshotViews: Array + get() = taskContainers.map { it.snapshotView }.toTypedArray() + + val taskContentViews: Array + get() = taskContainers.map { it.taskContentView }.toTypedArray() val isGridTask: Boolean /** Returns whether the task is part of overview grid and not being focused. */ - get() = container.deviceProfile.isTablet && !isFocusedTask + get() = container.deviceProfile.getDeviceProperties().isTablet && !isLargeTile val isRunningTask: Boolean get() = this === recentsView?.runningTaskView - val isFocusedTask: Boolean - get() = this === recentsView?.focusedTaskView + private val isSelectedTask: Boolean + get() = this === recentsView?.selectedTaskView + + open val displayId: Int + get() = taskContainers.firstOrNull()?.task.safeDisplayId + + val isExternalDisplay: Boolean + get() = displayId.isExternalDisplay - val taskCornerRadius: Float - get() = currentFullscreenParams.cornerRadius + val isLargeTile: Boolean + get() = + this == recentsView?.focusedTaskView || + type == TaskViewType.DESKTOP || + (isExternalDisplay && !enableOverviewOnConnectedDisplays()) val recentsView: RecentsView<*, *>? get() = parent as? RecentsView<*, *> @@ -162,21 +190,28 @@ constructor( val pagedOrientationHandler: RecentsPagedOrientationHandler get() = orientedState.orientationHandler - @get:Deprecated("Use [taskContainers] instead.") - val firstTask: Task + val firstTaskContainer: TaskContainer? + get() = taskContainers.firstOrNull() + + val firstTask: Task? /** Returns the first task bound to this TaskView. */ - get() = taskContainers[0].task + get() = firstTaskContainer?.task - @get:Deprecated("Use [taskContainers] instead.") - val firstThumbnailViewDeprecated: TaskThumbnailViewDeprecated - /** Returns the first thumbnailView of the TaskView. */ - get() = taskContainers[0].thumbnailViewDeprecated + val firstItemInfo: ItemInfo? + get() = firstTaskContainer?.itemInfo - @get:Deprecated("Use [taskContainers] instead.") - val firstItemInfo: ItemInfo - get() = taskContainers[0].itemInfo + val isOnGridBottomRow: Boolean + get() = recentsView?.isOnGridBottomRow(this) == true + + /** + * A [TaskViewItemInfo] of this TaskView. The [firstTaskContainer] will be used to get some + * specific information like user, title etc of the Task. However, these task specific + * information will be skipped if the TaskView has no [taskContainers]. Note, please use + * [TaskContainer.itemInfo] for [TaskViewItemInfo] on a specific [TaskContainer]. + */ + val itemInfo: TaskViewItemInfo + get() = TaskViewItemInfo(this, firstTaskContainer) - private val currentFullscreenParams = FullscreenDrawParams(context) protected val container: RecentsViewContainer = RecentsViewContainer.containerFromContext(context) protected val lastTouchDownPosition = PointF() @@ -194,12 +229,9 @@ constructor( * Returns addition of translationX that is persistent (e.g. fullscreen and grid), and does * not change according to a temporary state (e.g. task offset). */ - get() = - (getNonGridTrans(nonGridTranslationX) + - getGridTrans(this.gridTranslationX) + - getNonGridTrans(nonGridPivotTranslationX)) + get() = (getNonGridTrans(nonGridTranslationX) + getGridTrans(this.gridTranslationX)) - protected val persistentTranslationY: Float + val persistentTranslationY: Float /** * Returns addition of translationY that is persistent (e.g. fullscreen and grid), and does * not change according to a temporary state (e.g. task offset). @@ -210,21 +242,21 @@ constructor( get() = pagedOrientationHandler.getPrimaryValue( SPLIT_SELECT_TRANSLATION_X, - SPLIT_SELECT_TRANSLATION_Y + SPLIT_SELECT_TRANSLATION_Y, ) protected val secondarySplitTranslationProperty: FloatProperty get() = pagedOrientationHandler.getSecondaryValue( SPLIT_SELECT_TRANSLATION_X, - SPLIT_SELECT_TRANSLATION_Y + SPLIT_SELECT_TRANSLATION_Y, ) - protected val primaryDismissTranslationProperty: FloatProperty + val primaryDismissTranslationProperty: FloatProperty get() = pagedOrientationHandler.getPrimaryValue(DISMISS_TRANSLATION_X, DISMISS_TRANSLATION_Y) - protected val secondaryDismissTranslationProperty: FloatProperty + val secondaryDismissTranslationProperty: FloatProperty get() = pagedOrientationHandler.getSecondaryValue(DISMISS_TRANSLATION_X, DISMISS_TRANSLATION_Y) @@ -232,26 +264,54 @@ constructor( get() = pagedOrientationHandler.getPrimaryValue( TASK_OFFSET_TRANSLATION_X, - TASK_OFFSET_TRANSLATION_Y + TASK_OFFSET_TRANSLATION_Y, ) protected val secondaryTaskOffsetTranslationProperty: FloatProperty get() = pagedOrientationHandler.getSecondaryValue( TASK_OFFSET_TRANSLATION_X, - TASK_OFFSET_TRANSLATION_Y + TASK_OFFSET_TRANSLATION_Y, ) protected val taskResistanceTranslationProperty: FloatProperty get() = pagedOrientationHandler.getSecondaryValue( TASK_RESISTANCE_TRANSLATION_X, - TASK_RESISTANCE_TRANSLATION_Y + TASK_RESISTANCE_TRANSLATION_Y, ) private val tempCoordinates = FloatArray(2) - private val focusBorderAnimator: BorderAnimator? - private val hoverBorderAnimator: BorderAnimator? + private val focusBorderAnimator: BorderAnimator? = + focusBorderAnimator + ?: createSimpleBorderAnimator( + TaskCornerRadius.get(context).toInt(), + context.resources.getDimensionPixelSize(R.dimen.keyboard_quick_switch_border_width), + this::getThumbnailBounds, + this, + context + .obtainStyledAttributes(attrs, R.styleable.TaskView, defStyleAttr, defStyleRes) + .getColor( + R.styleable.TaskView_focusBorderColor, + BorderAnimator.DEFAULT_BORDER_COLOR, + ), + ) + + private val hoverBorderAnimator: BorderAnimator? = + hoverBorderAnimator + ?: createSimpleBorderAnimator( + TaskCornerRadius.get(context).toInt(), + context.resources.getDimensionPixelSize(R.dimen.task_hover_border_width), + this::getThumbnailBounds, + this, + context + .obtainStyledAttributes(attrs, R.styleable.TaskView, defStyleAttr, defStyleRes) + .getColor( + R.styleable.TaskView_hoverBorderColor, + BorderAnimator.DEFAULT_BORDER_COLOR, + ), + ) + private val rootViewDisplayId: Int get() = rootView.display?.displayId ?: Display.DEFAULT_DISPLAY @@ -263,11 +323,22 @@ constructor( var taskViewId = UNBOUND_TASK_VIEW_ID var isEndQuickSwitchCuj = false + var isBeingDraggedForDismissal = false + var isBeingDismissed: Boolean = false + + private val systemGestureExclusionRectList = listOf(Rect()) // We only need 1 exclusion Rect + + var sysUiStatusNavFlags: Int = 0 + get() = + if (enableRefactorTaskThumbnail()) field + else firstTaskContainer?.thumbnailViewDeprecated?.sysUiStatusNavFlags ?: 0 + private set // Various animation progress variables. // progress: 0 = show icon and no insets; 1 = don't show icon and show full insets. protected var fullscreenProgress = 0f set(value) { + if (value == field && enableOverviewIconMenu()) return field = Utilities.boundToRange(value, 0f, 1f) onFullscreenProgressChanged(field) } @@ -292,6 +363,18 @@ constructor( onModalnessUpdated(field) } + var modalPivot: PointF? = null + set(value) { + field = value + updatePivots() + } + + var splitSplashAlpha = 0f + set(value) { + field = value + applyThumbnailSplashAlpha() + } + protected var taskThumbnailSplashAlpha = 0f set(value) { field = value @@ -310,6 +393,12 @@ constructor( applyScale() } + var modalScale = 1f + set(value) { + field = value + applyScale() + } + private var dismissTranslationX = 0f set(value) { field = value @@ -354,7 +443,7 @@ constructor( } // The following grid translations scales with mGridProgress. - protected var gridTranslationX = 0f + var gridTranslationX = 0f set(value) { field = value applyTranslationX() @@ -375,13 +464,7 @@ constructor( // Applied as a complement to gridTranslation, for adjusting the carousel overview and quick // switch. - protected var nonGridTranslationX = 0f - set(value) { - field = value - applyTranslationX() - } - - protected var nonGridPivotTranslationX = 0f + var nonGridTranslationX = 0f set(value) { field = value applyTranslationX() @@ -400,14 +483,15 @@ constructor( applyTranslationX() } - protected var stableAlpha = 1f - set(value) { - field = value - alpha = stableAlpha - } + private val taskViewAlpha = MultiValueAlpha(this, Alpha.entries.size) + protected var stableAlpha by MultiPropertyDelegate(taskViewAlpha, Alpha.Stable) + var attachAlpha by MultiPropertyDelegate(taskViewAlpha, Alpha.Attach) + var splitAlpha by MultiPropertyDelegate(taskViewAlpha, Alpha.Split) + private var modalAlpha by MultiPropertyDelegate(taskViewAlpha, Alpha.Modal) protected var shouldShowScreenshot = false get() = !isRunningTask || field + private set /** Enable or disable showing border on hover and focus change */ @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) @@ -423,37 +507,99 @@ constructor( focusBorderAnimator?.setBorderVisibility(visible = field && isFocused, animated = true) } - private var focusTransitionProgress = 1f + /** + * Used to cache the hover border state so we don't repeatedly call the border animator with + * every hover event when the user hasn't crossed the threshold of the [thumbnailBounds]. + */ + private var hoverBorderVisible = false + set(value) { + if (field == value) { + return + } + field = value + Log.d( + TAG, + "${taskIds.contentToString()} - setting border animator visibility to: $field", + ) + hoverBorderAnimator?.setBorderVisibility(visible = field, animated = true) + } + + // Used to cache thumbnail bounds to avoid recalculating on every hover move. + private var thumbnailBounds = Rect() + + // Progress variable indicating if the TaskView is in a settled state: + // 0 = The TaskView is in a transitioning state e.g. during gesture, in quickswitch carousel, + // becoming focus task etc. + // 1 = The TaskView is settled and no longer transitioning + private var settledProgress = 1f set(value) { + if (value == field && enableOverviewIconMenu()) return field = value - onFocusTransitionProgressUpdated(field) + onSettledProgressUpdated(field) } - private val focusTransitionPropertyFactory = + private val settledProgressPropertyFactory = MultiPropertyFactory( this, - FOCUS_TRANSITION, - FOCUS_TRANSITION_INDEX_COUNT, + SETTLED_PROGRESS, + SettledProgress.entries.size, { x: Float, y: Float -> x * y }, - 1f + 1f, ) - private val focusTransitionFullscreen = - focusTransitionPropertyFactory.get(FOCUS_TRANSITION_INDEX_FULLSCREEN) - private val focusTransitionScaleAndDim = - focusTransitionPropertyFactory.get(FOCUS_TRANSITION_INDEX_SCALE_AND_DIM) + private var settledProgressFullscreen by + MultiPropertyDelegate(settledProgressPropertyFactory, SettledProgress.Fullscreen) + private var settledProgressGesture by + MultiPropertyDelegate(settledProgressPropertyFactory, SettledProgress.Gesture) + private var settledProgressDismiss by + MultiPropertyDelegate(settledProgressPropertyFactory, SettledProgress.Dismiss) + + private val viewModel = + if (enableRefactorTaskThumbnail()) { + TaskViewModel( + recentsViewData = RecentsDependencies.get(context), + getTaskUseCase = RecentsDependencies.get(context), + getSysUiStatusNavFlagsUseCase = RecentsDependencies.get(context), + isThumbnailValidUseCase = RecentsDependencies.get(context), + getThumbnailPositionUseCase = RecentsDependencies.get(context), + dispatcherProvider = RecentsDependencies.get(context), + ) + } else null + private val dispatcherProvider: DispatcherProvider = RecentsDependencies.get(context) + private val coroutineScope: CoroutineScope = RecentsDependencies.get(context) + private val coroutineJobs = mutableListOf() + private var taskDismissButton: FrameLayout? = null + private var taskDismissButtonAnimator: ObjectAnimator? = null + private var taskDismissButtonEnabled: Boolean = false /** - * Returns an animator of [focusTransitionScaleAndDim] that transition out with a built-in + * Returns a sequence of [Pair]s, where each pair contains a [TaskViewIcon] and its + * corresponding [TransformingTouchDelegate]. + */ + open fun getTaskIcons(): Sequence> = + taskContainers.asSequence().map() { it.iconView to it.iconTouchDelegate } + + /** + * Returns an animator of [settledProgressDismiss] that transition in with a built-in * interpolator. */ - fun getFocusTransitionScaleAndDimOutAnimator(): ObjectAnimator = + fun getDismissIconFadeInAnimator(): ObjectAnimator = + ObjectAnimator.ofFloat(this, SETTLED_PROGRESS_DISMISS, 1f).apply { + duration = FADE_IN_ICON_DURATION + interpolator = FADE_IN_ICON_INTERPOLATOR + } + + /** + * Returns an animator of [settledProgressDismiss] that transition out with a built-in + * interpolator. [AnimatedFloat] is used to apply another level of interpolation, on top of + * interpolator set to the [Animator] by the caller. + */ + fun getDismissIconFadeOutAnimator(): ObjectAnimator = AnimatedFloat { v -> - focusTransitionScaleAndDim.value = - FOCUS_TRANSITION_FAST_OUT_INTERPOLATOR.getInterpolation(v) + settledProgressDismiss = SETTLED_PROGRESS_FAST_OUT_INTERPOLATOR.getInterpolation(v) } .animateToValue(1f, 0f) - private var iconAndDimAnimator: ObjectAnimator? = null + private var iconFadeInOnGestureCompleteAnimator: ObjectAnimator? = null // The current background requests to load the task thumbnail and icon private val pendingThumbnailLoadRequests = mutableListOf>() private val pendingIconLoadRequests = mutableListOf>() @@ -461,56 +607,15 @@ constructor( init { setOnClickListener { _ -> onClick() } - val keyboardFocusHighlightEnabled = - (ENABLE_KEYBOARD_QUICK_SWITCH.get() || enableFocusOutline()) - val cursorHoverStatesEnabled = enableCursorHoverStates() - setWillNotDraw(!keyboardFocusHighlightEnabled && !cursorHoverStatesEnabled) - val attrs = - context.obtainStyledAttributes(attrs, R.styleable.TaskView, defStyleAttr, defStyleRes) - try { - this.focusBorderAnimator = - focusBorderAnimator - ?: if (keyboardFocusHighlightEnabled) - createSimpleBorderAnimator( - currentFullscreenParams.cornerRadius.toInt(), - context.resources.getDimensionPixelSize( - R.dimen.keyboard_quick_switch_border_width - ), - { bounds: Rect -> getThumbnailBounds(bounds) }, - this, - attrs.getColor( - R.styleable.TaskView_focusBorderColor, - BorderAnimator.DEFAULT_BORDER_COLOR - ) - ) - else null - this.hoverBorderAnimator = - hoverBorderAnimator - ?: if (cursorHoverStatesEnabled) - createSimpleBorderAnimator( - currentFullscreenParams.cornerRadius.toInt(), - context.resources.getDimensionPixelSize( - R.dimen.task_hover_border_width - ), - { bounds: Rect -> getThumbnailBounds(bounds) }, - this, - attrs.getColor( - R.styleable.TaskView_hoverBorderColor, - BorderAnimator.DEFAULT_BORDER_COLOR - ) - ) - else null - } finally { - attrs.recycle() - } - } + setWillNotDraw(false) + } @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) public override fun onFocusChanged( gainFocus: Boolean, direction: Int, - previouslyFocusedRect: Rect? + previouslyFocusedRect: Rect?, ) { super.onFocusChanged(gainFocus, direction, previouslyFocusedRect) if (borderEnabled) { @@ -521,20 +626,68 @@ constructor( override fun onHoverEvent(event: MotionEvent): Boolean { if (borderEnabled) { when (event.action) { - MotionEvent.ACTION_HOVER_ENTER -> - hoverBorderAnimator?.setBorderVisibility(visible = true, animated = true) - MotionEvent.ACTION_HOVER_EXIT -> - hoverBorderAnimator?.setBorderVisibility(visible = false, animated = true) + MotionEvent.ACTION_HOVER_ENTER -> { + getThumbnailBounds(thumbnailBounds) + hoverBorderVisible = event.isWithinThumbnailBounds() + showTaskDismissButton() + } + MotionEvent.ACTION_HOVER_MOVE -> + hoverBorderVisible = event.isWithinThumbnailBounds() + MotionEvent.ACTION_HOVER_EXIT -> { + hoverBorderVisible = false + if (taskDismissButton?.isHovered == false) { + hideTaskDismissButton() + } + } else -> {} } } return super.onHoverEvent(event) } - // avoid triggering hover event on child elements which would cause HOVER_EXIT for this - // task view - override fun onInterceptHoverEvent(event: MotionEvent) = - if (enableCursorHoverStates()) true else super.onInterceptHoverEvent(event) + private fun showTaskDismissButton() { + if (!taskDismissButtonEnabled) return + + val taskDismissButton = taskDismissButton ?: return + + if (taskDismissButtonAnimator?.isRunning == true) { + taskDismissButtonAnimator?.cancel() + } + + if (taskDismissButton.alpha == 1f) { + return + } + + taskDismissButtonAnimator = + ObjectAnimator.ofFloat(taskDismissButton, View.ALPHA, 1f).apply { + duration = DEFAULT_APPEARANCE_ANIMATION_DURATION_MS + interpolator = DEFAULT_INTERPOLATOR + doOnCancel { taskDismissButton.alpha = 0f } + start() + } + } + + private fun hideTaskDismissButton() { + if (!taskDismissButtonEnabled) return + + val taskDismissButton = taskDismissButton ?: return + + if (taskDismissButtonAnimator?.isRunning == true) { + taskDismissButtonAnimator?.cancel() + } + + if (taskDismissButton.alpha == 0f) { + return + } + + taskDismissButtonAnimator = + ObjectAnimator.ofFloat(taskDismissButton, View.ALPHA, 0f).apply { + duration = DEFAULT_DISAPPEARANCE_ANIMATION_DURATION_MS + interpolator = DEFAULT_INTERPOLATOR + doOnCancel { taskDismissButton.alpha = 0f } + start() + } + } override fun dispatchTouchEvent(ev: MotionEvent): Boolean { val recentsView = recentsView ?: return false @@ -562,38 +715,86 @@ constructor( super.draw(canvas) } + override fun setLayoutDirection(layoutDirection: Int) { + super.setLayoutDirection(layoutDirection) + if (enableOverviewIconMenu()) { + val deviceLayoutDirection = resources.configuration.layoutDirection + getTaskIcons().forEach { (icon, _) -> + (icon as IconAppChipView).layoutDirection = deviceLayoutDirection + } + } + } + @RequiresApi(Build.VERSION_CODES.Q) override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { super.onLayout(changed, left, top, right, bottom) - val thumbnailTopMargin = container.deviceProfile.overviewTaskThumbnailTopMarginPx - if (container.deviceProfile.isTablet) { - pivotX = (if (layoutDirection == LAYOUT_DIRECTION_RTL) 0 else right - left).toFloat() - pivotY = thumbnailTopMargin.toFloat() - } else { - pivotX = (right - left) * 0.5f - pivotY = thumbnailTopMargin + (height - thumbnailTopMargin) * 0.5f + updatePivots() + systemGestureExclusionRectList[0].apply { + this.right = width + this.bottom = height } - systemGestureExclusionRects = - SYSTEM_GESTURE_EXCLUSION_RECT.onEach { - it.right = width - it.bottom = height + getThumbnailBounds(thumbnailBounds) + } + + private fun updatePivots() { + val modalPivot = modalPivot + if (modalPivot != null) { + pivotX = modalPivot.x + pivotY = modalPivot.y + } else { + val thumbnailTopMargin = + container.deviceProfile.overviewProfile.taskThumbnailTopMarginPx + if (container.deviceProfile.getDeviceProperties().isTablet) { + pivotX = + (if (layoutDirection == LAYOUT_DIRECTION_RTL) 0 else right - left).toFloat() + pivotY = thumbnailTopMargin.toFloat() + } else { + pivotX = (right - left) * 0.5f + pivotY = thumbnailTopMargin + (height - thumbnailTopMargin) * 0.5f } + } } override fun onRecycle() { + isBeingDraggedForDismissal = false + isBeingDismissed = false resetPersistentViewTransforms() + + groupTask = null + viewModel?.unbind() + attachAlpha = 1f + splitAlpha = 1f + splitSplashAlpha = 0f + modalAlpha = 1f + modalScale = 1f + modalPivot = null + taskThumbnailSplashAlpha = 0f // Clear any references to the thumbnail (it will be re-read either from the cache or the // system on next bind) - if (enableRefactorTaskThumbnail()) { - notifyIsRunningTaskUpdated() - } else { + if (!enableRefactorTaskThumbnail()) { taskContainers.forEach { it.thumbnailViewDeprecated.setThumbnail(it.task, null) } } setOverlayEnabled(false) onTaskListVisibilityChanged(false) borderEnabled = false + hoverBorderVisible = false taskViewId = UNBOUND_TASK_VIEW_ID + // TODO(b/390583187): Clean the components UI State when TaskView is recycled. taskContainers.forEach { it.destroy() } + + if (enableOverviewIconMenu()) { + getTaskIcons().forEach { (icon, _) -> (icon as IconAppChipView).reset() } + } + recycleTaskDismissButton() + } + + private fun recycleTaskDismissButton() { + if (taskDismissButtonAnimator?.isRunning == true) { + taskDismissButtonAnimator?.cancel() + } + taskDismissButtonEnabled = false + taskDismissButton?.setOnClickListener(null) + taskDismissButton?.alpha = 0f } // TODO: Clip-out the icon region from the thumbnail, since they are overlapping. @@ -602,34 +803,45 @@ constructor( override fun onInitializeAccessibilityNodeInfo(info: AccessibilityNodeInfo) { super.onInitializeAccessibilityNodeInfo(info) with(info) { - addAction( - AccessibilityAction( - R.id.action_close, - context.getText(R.string.accessibility_close) - ) - ) - - taskContainers.forEach { - TraceHelper.allowIpcs("TV.a11yInfo") { - TaskOverlayFactory.getEnabledShortcuts(this@TaskView, it).forEach { shortcut -> - addAction(shortcut.createAccessibilityAction(context)) + // Only make actions available if the app icon menu is visible to the user. + // When modalness is >0, the user is in select mode and the icon menu is hidden. + // When split selection is active, they should only be able to select the app and not + // take any other action. + val shouldPopulateAccessibilityMenu = + modalness == 0f && recentsView?.isSplitSelectionActive == false + if (shouldPopulateAccessibilityMenu) { + taskContainers.forEach { + TraceHelper.allowIpcs("TV.a11yInfo") { + TaskOverlayFactory.getEnabledShortcuts(this@TaskView, it).forEach { shortcut + -> + addAction(shortcut.createAccessibilityAction(context)) + } } } - } - // Add DWB accessibility action at the end of the list - taskContainers.forEach { - it.digitalWellBeingToast?.getDWBAccessibilityAction()?.let(::addAction) + // Add DWB accessibility action at the end of the list + taskContainers.forEach { + if ( + enableRefactorDigitalWellbeingToast() && + it.taskContentView is TaskContentView + ) { + it.taskContentView.getSupportedAccessibilityActions().forEach(::addAction) + } else { + it.digitalWellBeingToast?.getDWBAccessibilityAction()?.let(::addAction) + } + } } recentsView?.let { collectionItemInfo = - AccessibilityNodeInfo.CollectionItemInfo.obtain( + AccessibilityNodeInfo.CollectionItemInfo( 0, 1, - it.taskViewCount - it.indexOfChild(this@TaskView) - 1, + // We only care about TaskView's for the `CollectionInfo` that Talkback uses + // to read out. + it.taskViews.reversed().indexOf(this@TaskView), 1, - false + false, ) } } @@ -637,14 +849,15 @@ constructor( override fun performAccessibilityAction(action: Int, arguments: Bundle?): Boolean { // TODO(b/343708271): Add support for multiple tasks per action. - if (action == R.id.action_close) { - recentsView?.dismissTask(this, true /*animateTaskView*/, true /*removeTask*/) - return true - } - taskContainers.forEach { - if (it.digitalWellBeingToast?.handleAccessibilityAction(action) == true) { - return true + if (enableRefactorDigitalWellbeingToast() && it.taskContentView is TaskContentView) { + if (it.taskContentView.handleAccessibilityAction(action)) { + return true + } + } else { + if (it.digitalWellBeingToast?.handleAccessibilityAction(action) == true) { + return true + } } TaskOverlayFactory.getEnabledShortcuts(this, it).forEach { shortcut -> @@ -658,83 +871,345 @@ constructor( return super.performAccessibilityAction(action, arguments) } + override fun onFinishInflate() { + super.onFinishInflate() + inflateViewStubs() + taskDismissButton = findViewById(R.id.task_dismiss_button) + } + + fun onIntersectScreenEdgeChanged(intersectsScreenEdge: Boolean) { + systemGestureExclusionRects = + if (intersectsScreenEdge) systemGestureExclusionRectList else emptyList() + } + + protected open fun inflateViewStubs() { + findViewById(R.id.task_content_view) + ?.apply { + inflatedId = + if (enableRefactorTaskContentView()) R.id.task_content_view else R.id.snapshot + layoutResource = + when { + enableRefactorTaskContentView() -> R.layout.task_content_view + enableRefactorTaskThumbnail() -> R.layout.task_thumbnail + else -> R.layout.task_thumbnail_deprecated + } + } + ?.inflate() + + findViewById(R.id.icon) + ?.apply { + layoutResource = + if (enableOverviewIconMenu()) R.layout.icon_app_chip_view + else R.layout.icon_view + } + ?.inflate() + + if (!enableRefactorDigitalWellbeingToast()) { + findViewById(R.id.digital_wellbeing_toast) + ?.apply { layoutResource = R.layout.digital_wellbeing_toast } + ?.inflate() + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if (enableRefactorTaskThumbnail()) { + // TaskView binds the ViewModel during onBind, and unbinds it in onRecycle. So it + // should start listening here. + // TV Lifecycle: onBind -> onAttachedToWindow -> onDetachFromWindow -> onRecycle + coroutineJobs += + coroutineScope.launch(dispatcherProvider.main) { + viewModel!!.state.collectLatest(::updateTaskViewState) + } + } + } + + private fun updateTaskViewState(state: TaskTileUiState) { + sysUiStatusNavFlags = state.sysUiStatusNavFlags + + // Updating containers + val mapOfTasks = state.tasks.associateBy { it.taskId } + taskContainers.forEach { container -> + val taskId = container.task.key.id + val containerState = mapOfTasks[taskId] + val shouldHaveHeader = (type == TaskViewType.DESKTOP) && enableDesktopExplodedView() + val shouldShowAppTimer = + (type == TaskViewType.SINGLE || type == TaskViewType.GROUPED) + container.setState( + state = containerState, + hasHeader = shouldHaveHeader, + canShowAppTimer = shouldShowAppTimer, + clickCloseListener = + if (shouldHaveHeader) { + { + // Update the layout UI to remove this task from the layout grid, + // and remove the task from ActivityManager afterwards. + recentsView?.dismissTask( + taskId, + /* animate= */ true, + /* removeTask= */ true, + ) + } + } else { + null + }, + ) + updateThumbnailValidity(container) + val thumbnailPosition = + updateThumbnailMatrix( + container = container, + width = container.thumbnailView.width, + height = container.thumbnailView.height, + ) + container.setOverlayEnabled(state.taskOverlayEnabled, thumbnailPosition) + if (state.isCentralTask) { + this.container.actionsView.let { + it.updateDisabledFlags(DISABLED_ROTATED, thumbnailPosition.isRotated) + it.updateDisabledFlags( + DISABLED_NO_THUMBNAIL, + state.tasks.any { taskData -> + (taskData as? TaskData.Data)?.thumbnailData?.thumbnail == null + }, + ) + } + } + + if (enableOverviewIconMenu()) { + setIconState(container, containerState) + if ( + containerState is TaskData && + container.digitalWellBeingToast?.isDestroyed == false && + container.task.titleDescription != null + ) { + container.digitalWellBeingToast.initialize() + } + } + + val dismissTaskViewOnClick: (View) -> Unit = { + recentsView?.dismissTaskView( + container.taskView, + /* animateTaskView = */ true, + /* removeTask= */ true, + ) + } + setTaskDismissButtonState( + TaskUiStateMapper.toTaskDismissButtonState( + (type == TaskViewType.DESKTOP), + dismissTaskViewOnClick, + ) + ) + } + } + + private fun setTaskDismissButtonState(state: TaskDismissButtonState) { + when (state) { + is TaskDismissButtonState.Enabled -> { + taskDismissButtonEnabled = true + taskDismissButton?.setOnClickListener(state.clickCloseListener) + } + is TaskDismissButtonState.Disabled -> { + taskDismissButtonEnabled = false + taskDismissButton?.setOnClickListener(null) + } + } + } + + private fun updateThumbnailValidity(container: TaskContainer) { + container.isThumbnailValid = + viewModel!!.isThumbnailValid( + thumbnail = container.thumbnailData, + width = container.thumbnailView.width, + height = container.thumbnailView.height, + splitBounds = (this as? GroupedTaskView)?.splitBoundsConfig, + stagePosition = container.stagePosition, + ) + applyThumbnailSplashAlpha() + } + + /** + * Updates the thumbnail's transformation matrix and rotation state within a TaskContainer. + * + * This function is called to reposition the thumbnail in the following scenarios: + * - When the TTV's size changes (onSizeChanged), and it's displaying a SnapshotSplash. + * - When drawing a snapshot (drawSnapshot). + * + * @param container The TaskContainer holding the thumbnail to be updated. + * @param width The desired width of the thumbnail's container. + * @param height The desired height of the thumbnail's container. + */ + private fun updateThumbnailMatrix( + container: TaskContainer, + width: Int, + height: Int, + ): ThumbnailPosition { + // TODO: b/428764855: Refactor `TaskViewModel` to include Split data. + val splitPosition = + when (container.stagePosition) { + SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT -> + SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT + SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT -> + SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT + else -> SplitScreenConstants.SPLIT_POSITION_UNDEFINED + } + val thumbnailPosition = + viewModel!!.getThumbnailPosition( + container.thumbnailData, + width, + height, + isLayoutRtl, + (this as? GroupedTaskView)?.splitBoundsConfig, + splitPosition, + context.resources.displayMetrics.densityDpi, + ) + container.updateThumbnailMatrix(thumbnailPosition.matrix) + return thumbnailPosition + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + cancelJobs() + } + + open fun cancelJobs() { + if (enableRefactorTaskThumbnail()) { + // The jobs are being cancelled in the background thread. So we make a copy of the + // list to prevent cleaning a new job that might be added to this list during + // onAttach or another moment in the lifecycle. + val coroutineJobsToCancel = coroutineJobs.toList() + coroutineJobs.clear() + if (coroutineJobsToCancel.isEmpty()) return + + // TODO(b/391842220): This should ideally be handled in the completion block of the + // jobs above to be cancelled. + taskContainers.forEach { + it.setState( + state = null, + hasHeader = false, + canShowAppTimer = false, + clickCloseListener = null, + ) + // Do not set icon to null if we are actively in split selection. The task + // appears to have been offloaded as we remove it during split, but we still + // need the icon to show over the split task. + if (enableOverviewIconMenu() && recentsView?.isSplitSelectionActive == false) { + setIconState(it, null) + } + } + + coroutineScope.launch(dispatcherProvider.lightweightBackground) { + coroutineJobsToCancel.forEach { + it.cancel("TaskView detaching from window") + } + } + } + } + /** Updates this task view to the given {@param task}. */ open fun bind( - task: Task, + singleTask: SingleTask, orientedState: RecentsOrientedState, - taskOverlayFactory: TaskOverlayFactory + taskOverlayFactory: TaskOverlayFactory, ) { + this.groupTask = singleTask cancelPendingLoadTasks() + this.orientedState = orientedState // Needed for dependencies taskContainers = listOf( createTaskContainer( - task, + singleTask.task, + R.id.task_content_view, R.id.snapshot, R.id.icon, R.id.show_windows, + R.id.digital_wellbeing_toast, STAGE_POSITION_UNDEFINED, - taskOverlayFactory + taskOverlayFactory, ) ) - setOrientationState(orientedState) + onBind(orientedState) + } + + protected open fun onBind(orientedState: RecentsOrientedState) { + if (enableRefactorTaskThumbnail()) { + Log.d(TAG, "onBind $context ${orientedState.containerInterface}") + viewModel!!.bind(type, *taskIds) + } + + taskContainers.forEach { container -> + container.bind() + if (enableRefactorTaskContentView()) { + (container.taskContentView as TaskContentView).cornerRadius = + thumbnailFullscreenParams.currentCornerRadius + container.taskContentView.doOnSizeChange { width, height -> + updateThumbnailValidity(container) + val thumbnailPosition = updateThumbnailMatrix(container, width, height) + container.refreshOverlay(thumbnailPosition) + } + } else if (enableRefactorTaskThumbnail()) { + container.thumbnailView.cornerRadius = + thumbnailFullscreenParams.currentCornerRadius + container.thumbnailView.doOnSizeChange { width, height -> + updateThumbnailValidity(container) + val thumbnailPosition = updateThumbnailMatrix(container, width, height) + container.refreshOverlay(thumbnailPosition) + } + } + } + setOrientationState(orientedState) + } + + private fun applyThumbnailSplashAlpha() { + val alpha = getSplashAlphaProgress() + taskContainers.forEach { it.updateThumbnailSplashProgress(alpha) } } + private fun getSplashAlphaProgress(): Float = + when { + !enableRefactorTaskThumbnail() -> taskThumbnailSplashAlpha + splitSplashAlpha > 0f -> splitSplashAlpha + shouldShowSplash() -> taskThumbnailSplashAlpha + else -> 0f + } + + internal fun shouldShowSplash(): Boolean = taskContainers.any { !it.isThumbnailValid } + protected fun createTaskContainer( task: Task, + @IdRes taskContentViewId: Int, @IdRes thumbnailViewId: Int, @IdRes iconViewId: Int, @IdRes showWindowViewId: Int, + @IdRes digitalWellbeingBannerId: Int, @StagePosition stagePosition: Int, - taskOverlayFactory: TaskOverlayFactory + taskOverlayFactory: TaskOverlayFactory, ): TaskContainer { - val thumbnailViewDeprecated: TaskThumbnailViewDeprecated = findViewById(thumbnailViewId)!! - val thumbnailView: TaskThumbnailView? - if (enableRefactorTaskThumbnail()) { - val indexOfSnapshotView = indexOfChild(thumbnailViewDeprecated) - thumbnailView = - TaskThumbnailView(context).apply { - layoutParams = thumbnailViewDeprecated.layoutParams - addView(this, indexOfSnapshotView) + val iconView = findViewById(iconViewId) as TaskViewIcon + val taskContentView = + if (enableRefactorTaskContentView()) findViewById(taskContentViewId) + else findViewById(thumbnailViewId) + val snapshotView = + if (enableRefactorTaskContentView()) taskContentView.findViewById(thumbnailViewId) + else taskContentView + + val digitalWellBeingToast: DigitalWellBeingToast? = + if (enableRefactorDigitalWellbeingToast()) { + null + } else { + findViewById(digitalWellbeingBannerId)!! } - thumbnailViewDeprecated.visibility = GONE - } else { - thumbnailView = null - } - val iconView = getOrInflateIconView(iconViewId) - return TaskContainer( + return TaskContainer( + this, task, - thumbnailView, - thumbnailViewDeprecated, + taskContentView, + snapshotView, iconView, TransformingTouchDelegate(iconView.asView()), stagePosition, - DigitalWellBeingToast(container, this), + digitalWellBeingToast, findViewById(showWindowViewId)!!, - taskOverlayFactory + taskOverlayFactory, ) - .apply { - if (enableRefactorTaskThumbnail()) { - thumbnailViewDeprecated.setTaskOverlay(overlay) - bindThumbnailView() - } else { - thumbnailViewDeprecated.bind(task, overlay) - } - } - } - - protected fun getOrInflateIconView(@IdRes iconViewId: Int): TaskViewIcon { - val iconView = findViewById(iconViewId)!! - return iconView as? TaskViewIcon - ?: (iconView as ViewStub) - .apply { - layoutResource = - if (enableOverviewIconMenu()) R.layout.icon_app_chip_view - else R.layout.icon_view - } - .inflate() as TaskViewIcon - } - - protected fun isTaskContainersInitialized() = this::taskContainers.isInitialized + } fun containsMultipleTasks() = taskContainers.size > 1 @@ -748,15 +1223,17 @@ constructor( fun containsTaskId(taskId: Int) = getTaskContainerById(taskId) != null open fun setOrientationState(orientationState: RecentsOrientedState) { - this.orientedState = orientationState - taskContainers.forEach { it.iconView.setIconOrientation(orientationState, isGridTask) } - setThumbnailOrientation(orientationState) - } + this.orientedState = orientationState + getTaskIcons().forEach { (icon, _) -> + icon.setIconOrientation(orientationState, isGridTask) + } + setThumbnailOrientation(orientationState) + } protected open fun setThumbnailOrientation(orientationState: RecentsOrientedState) { taskContainers.forEach { it.overlay.updateOrientationState(orientationState) - it.digitalWellBeingToast?.initialize(it.task) + it.digitalWellBeingToast?.initialize() } } @@ -764,24 +1241,21 @@ constructor( * Updates TaskView scaling and translation required to support variable width if enabled, while * ensuring TaskView fits into screen in fullscreen. */ - fun updateTaskSize( - lastComputedTaskSize: Rect, - lastComputedGridTaskSize: Rect, - lastComputedCarouselTaskSize: Rect - ) { - val thumbnailPadding = container.deviceProfile.overviewTaskThumbnailTopMarginPx + open fun updateTaskSize(lastComputedTaskSize: Rect, lastComputedGridTaskSize: Rect) { + val thumbnailPadding = container.deviceProfile.overviewProfile.taskThumbnailTopMarginPx val taskWidth = lastComputedTaskSize.width() val taskHeight = lastComputedTaskSize.height() val nonGridScale: Float val boxTranslationY: Float val expectedWidth: Int val expectedHeight: Int - if (container.deviceProfile.isTablet) { + if (container.deviceProfile.getDeviceProperties().isTablet) { val boxWidth: Int val boxHeight: Int - if (isFocusedTask) { - // Task will be focused and should use focused task size. Use focusTaskRatio - // that is associated with the original orientation of the focused task. + + // Focused task and Desktop tasks should use focusTaskRatio that is associated + // with the original orientation of the focused task. + if (isLargeTile) { boxWidth = taskWidth boxHeight = taskHeight } else { @@ -795,22 +1269,15 @@ constructor( expectedHeight = boxHeight + thumbnailPadding // Scale to to fit task Rect. - nonGridScale = - if (enableGridOnlyOverview()) { - lastComputedCarouselTaskSize.width() / taskWidth.toFloat() - } else { - taskWidth / boxWidth.toFloat() - } + nonGridScale = taskWidth / boxWidth.toFloat() // Align to top of task Rect. boxTranslationY = (expectedHeight - thumbnailPadding - taskHeight) / 2.0f } else { nonGridScale = 1f boxTranslationY = 0f - expectedWidth = if (enableOverviewIconMenu()) taskWidth else LayoutParams.MATCH_PARENT - expectedHeight = - if (enableOverviewIconMenu()) taskHeight + thumbnailPadding - else LayoutParams.MATCH_PARENT + expectedWidth = taskWidth + expectedHeight = taskHeight + thumbnailPadding } this.nonGridScale = nonGridScale this.boxTranslationY = boxTranslationY @@ -824,9 +1291,10 @@ constructor( protected open fun updateThumbnailSize() { // TODO(b/271468547), we should default to setting translations only on the snapshot instead // of a hybrid of both margins and translations - taskContainers[0].snapshotView.updateLayoutParams { - topMargin = container.deviceProfile.overviewTaskThumbnailTopMarginPx + firstTaskContainer?.taskContentView?.updateLayoutParams { + topMargin = container.deviceProfile.overviewProfile.taskThumbnailTopMarginPx } + taskContainers.forEach { it.digitalWellBeingToast?.setupLayout() } } /** Returns the thumbnail's bounds, optionally relative to the screen. */ @@ -837,11 +1305,11 @@ constructor( val thumbnailBounds = Rect() if (relativeToDragLayer) { container.dragLayer.getDescendantRectRelativeToSelf( - it.snapshotView, - thumbnailBounds + it.taskContentView, + thumbnailBounds, ) } else { - thumbnailBounds.set(it.snapshotView) + thumbnailBounds.set(it.taskContentView) } bounds.union(thumbnailBounds) } @@ -870,7 +1338,8 @@ constructor( taskContainers.forEach { if (visible) { recentsModel.thumbnailCache - .updateThumbnailInBackground(it.task) { thumbnailData -> + .getThumbnailInBackground(it.task) { thumbnailData -> + it.task.thumbnail = thumbnailData it.thumbnailViewDeprecated.setThumbnail(it.task, thumbnailData) } ?.also { request -> pendingThumbnailLoadRequests.add(request) } @@ -882,28 +1351,27 @@ constructor( } } } - if (needsUpdate(changes, FLAG_UPDATE_ICON)) { + if ( + needsUpdate(changes, FLAG_UPDATE_ICON) && + !(enableOverviewIconMenu() && enableRefactorTaskThumbnail()) + ) { taskContainers.forEach { if (visible) { recentsModel.iconCache - .updateIconInBackground(it.task) { task -> - setIcon(it.iconView, task.icon) - if (enableOverviewIconMenu()) { - setText(it.iconView, task.title) - } - it.digitalWellBeingToast?.initialize(task) + .getIconInBackground(it.task) { icon, contentDescription, title -> + it.task.icon = icon + it.task.titleDescription = contentDescription + it.task.title = title + onIconLoaded(it) } ?.also { request -> pendingIconLoadRequests.add(request) } } else { - setIcon(it.iconView, null) - if (enableOverviewIconMenu()) { - setText(it.iconView, null) - } + onIconUnloaded(it) } } } if (needsUpdate(changes, FLAG_UPDATE_CORNER_RADIUS)) { - currentFullscreenParams.updateCornerRadius(context) + thumbnailFullscreenParams.updateCornerRadius(context) } } @@ -911,40 +1379,68 @@ constructor( (dataChange and flag) == flag protected open fun cancelPendingLoadTasks() { - pendingThumbnailLoadRequests.forEach { it.cancel() } - pendingThumbnailLoadRequests.clear() - pendingIconLoadRequests.forEach { it.cancel() } - pendingIconLoadRequests.clear() + pendingThumbnailLoadRequests.forEach { it.cancel() } + pendingThumbnailLoadRequests.clear() + pendingIconLoadRequests.forEach { it.cancel() } + pendingIconLoadRequests.clear() + } + + protected open fun setIconState(container: TaskContainer, state: TaskData?) { + if (enableOverviewIconMenu()) { + if (state is TaskData.Data) { + setIcon(container.iconView, state.icon) + container.iconView.setText(state.title) + } else { + setIcon(container.iconView, null) + container.iconView.setText(null) + } + } + } + + protected open fun onIconLoaded(taskContainer: TaskContainer) { + setIcon(taskContainer.iconView, taskContainer.task.icon) + if (enableOverviewIconMenu()) { + taskContainer.iconView.setText(taskContainer.task.title) + } + taskContainer.digitalWellBeingToast?.initialize() + } + + protected open fun onIconUnloaded(taskContainer: TaskContainer) { + setIcon(taskContainer.iconView, null) + if (enableOverviewIconMenu()) { + taskContainer.iconView.setText(null) + } } protected fun setIcon(iconView: TaskViewIcon, icon: Drawable?) { with(iconView) { if (icon != null) { setDrawable(icon) - setOnClickListener { + asView().setOnClickListener { if (!confirmSecondSplitSelectApp()) { showTaskMenu(this) } } - setOnLongClickListener { + asView().setOnLongClickListener { requestDisallowInterceptTouchEvent(true) showTaskMenu(this) } } else { setDrawable(null) - setOnClickListener(null) - setOnLongClickListener(null) + asView().setOnClickListener(null) + asView().setOnLongClickListener(null) } } } - protected fun setText(iconView: TaskViewIcon, text: CharSequence?) { - iconView.setText(text) - } - - open fun refreshThumbnails(thumbnailDatas: HashMap?) { + @JvmOverloads + open fun setShouldShowScreenshot( + shouldShowScreenshot: Boolean, + thumbnailDatas: Map? = null, + ) { + if (this.shouldShowScreenshot == shouldShowScreenshot) return + this.shouldShowScreenshot = shouldShowScreenshot if (enableRefactorTaskThumbnail()) { - // TODO(b/342560598) add thumbnail logic return } @@ -960,102 +1456,212 @@ constructor( private fun onClick() { if (confirmSecondSplitSelectApp()) { - Log.d("b/310064698", "${taskIds.contentToString()} - onClick - split select is active") return } - val callbackList = - launchTasks()?.apply { - add { - Log.d("b/310064698", "${taskIds.contentToString()} - onClick - launchCompleted") - } - } - Log.d("b/310064698", "${taskIds.contentToString()} - onClick - callbackList: $callbackList") + launchWithAnimation() container.statsLogManager .logger() - .withItemInfo(firstItemInfo) + .withItemInfo(itemInfo) .log(LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP) } - /** - * Starts the task associated with this view and animates the startup. + /** Launch of the current task (both live and inactive tasks) with an animation. */ + fun launchWithAnimation(): RunnableList? { + return if (isRunningTask && recentsView?.remoteTargetHandles != null) { + launchAsLiveTile(recentsView?.remoteTargetHandles!!) + } else { + launchAsStaticTile() + } + ?.also { + it.add { + Log.d( + TAG, + "${taskIds.contentToString()} - launchWithAnimation - launchCompleted", + ) + } + } + } + + private fun launchAsLiveTile(remoteTargetHandles: Array): RunnableList? { + val recentsView = recentsView ?: return null + if (!isClickableAsLiveTile) { + Log.e( + TAG, + "launchAsLiveTile - TaskView is not clickable as a live tile; returning to home: ${taskIds.contentToString()}", + ) + return null + } + isClickableAsLiveTile = false + val targets = + if (remoteTargetHandles.isNotEmpty()) { + if (remoteTargetHandles.size == 1) { + remoteTargetHandles[0].transformParams.targetSet + } else { + val apps = + remoteTargetHandles.flatMap { + it.transformParams.targetSet.apps.asIterable() + } + val wallpapers = + remoteTargetHandles.flatMap { + it.transformParams.targetSet.wallpapers.asIterable() + } + RemoteAnimationTargets( + apps.toTypedArray(), + wallpapers.toTypedArray(), + remoteTargetHandles[0].transformParams.targetSet.nonApps, + remoteTargetHandles[0].transformParams.targetSet.targetMode, + ) + } + } else { + null + } + if (targets == null) { + // If the recents animation is cancelled somehow between the parent if block and + // here, try to launch the task as a non live tile task. + val runnableList = launchAsStaticTile() + if (runnableList == null) { + Log.e( + TAG, + "launchAsLiveTile - Recents animation cancelled and cannot launch task as non-live tile; returning to home: ${taskIds.contentToString()}", + ) + } + isClickableAsLiveTile = true + return runnableList + } + TestLogging.recordEvent( + TestProtocol.SEQUENCE_MAIN, + "composeRecentsLaunchAnimator", + taskIds.contentToString(), + ) + val runnableList = RunnableList() + with(AnimatorSet()) { + TaskViewUtils.composeRecentsLaunchAnimator( + this, + this@TaskView, + targets.apps, + targets.wallpapers, + targets.nonApps, + true, /* launcherClosing */ + recentsView.stateManager, + recentsView, + recentsView.depthController, + /* transitionInfo= */ null, + /* appearedTaskId= */ INVALID_TASK_ID, + ) + addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animator: Animator) { + if (taskContainers.any { it.task.key.displayId != rootViewDisplayId }) { + launchAsStaticTile() + } + isClickableAsLiveTile = true + runEndCallback() + } + + override fun onAnimationCancel(animation: Animator) { + runEndCallback() + } + + private fun runEndCallback() { + runnableList.executeAllAndDestroy() + } + } + ) + start() + } + Log.d(TAG, "launchAsLiveTile - composeRecentsLaunchAnimator: ${taskIds.contentToString()}") + recentsView.onTaskLaunchedInLiveTileMode() + return runnableList + } + + /** + * Starts the task associated with this view and animates the startup. * * @return CompletionStage to indicate the animation completion or null if the launch failed. */ - open fun launchTaskAnimated(): RunnableList? { + open fun launchAsStaticTile(): RunnableList? { + val firstTaskContainer = firstTaskContainer ?: return null TestLogging.recordEvent( TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", - taskIds.contentToString() + taskIds.contentToString(), ) val opts = container.getActivityLaunchOptions(this, null).apply { - options.launchDisplayId = display?.displayId ?: Display.DEFAULT_DISPLAY + options.launchDisplayId = displayId + // On external displays the default windowing mode is not fullscreen. To make + // sure fullscreen apps remain fullscreen we set the windowing mode explicitly. + options.launchWindowingMode = WINDOWING_MODE_FULLSCREEN } if ( ActivityManagerWrapper.getInstance() - .startActivityFromRecents(taskContainers[0].task.key, opts.options) + .startActivityFromRecents(firstTaskContainer.task.key, opts.options) ) { Log.d( TAG, - "launchTaskAnimated - startActivityFromRecents: ${taskIds.contentToString()}" + "launchAsStaticTile - startActivityFromRecents: ${taskIds.contentToString()}", ) ActiveGestureLog.INSTANCE.trackEvent( ActiveGestureErrorDetector.GestureEvent.EXPECTING_TASK_APPEARED ) val recentsView = recentsView ?: return null - if (recentsView.runningTaskViewId != -1) { + if ( + recentsView.runningTaskViewId != -1 && + recentsView.mRecentsAnimationController != null + ) { recentsView.onTaskLaunchedInLiveTileMode() // Return a fresh callback in the live tile case, so that it's not accidentally // triggered by QuickstepTransitionManager.AppLaunchAnimationRunner. return RunnableList().also { recentsView.addSideTaskLaunchCallback(it) } } - if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) { - // If the recents transition is running (ie. in live tile mode), then the start - // of a new task will merge into the existing transition and it currently will - // not be run independently, so we need to rely on the onTaskAppeared() call - // for the new task to trigger the side launch callback to flush this runnable - // list (which is usually flushed when the app launch animation finishes) - recentsView.addSideTaskLaunchCallback(opts.onEndCallback) - } + // If the recents transition is running (ie. in live tile mode), then the start + // of a new task will merge into the existing transition and it currently will + // not be run independently, so we need to rely on the onTaskAppeared() call + // for the new task to trigger the side launch callback to flush this runnable + // list (which is usually flushed when the app launch animation finishes) + recentsView.addSideTaskLaunchCallback(opts.onEndCallback) return opts.onEndCallback } else { - notifyTaskLaunchFailed() + notifyTaskLaunchFailed("launchAsStaticTile") return null } } /** Starts the task associated with this view without any animation */ - fun launchTask(callback: (launched: Boolean) -> Unit) { - launchTask(callback, isQuickSwitch = false) - } - - /** Starts the task associated with this view without any animation */ - open fun launchTask(callback: (launched: Boolean) -> Unit, isQuickSwitch: Boolean) { + @JvmOverloads + open fun launchWithoutAnimation( + isQuickSwitch: Boolean = false, + callback: (launched: Boolean) -> Unit, + ) { + val callbackWithLogging = { launchSuccess: Boolean -> + Log.d(TAG, "launchWithoutAnimation - callback: launchSuccess: $launchSuccess") + callback(launchSuccess) + } + val firstTaskContainer = firstTaskContainer ?: return TestLogging.recordEvent( TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", - taskIds.contentToString() + taskIds.contentToString(), ) - val firstContainer = taskContainers[0] val failureListener = TaskRemovedDuringLaunchListener(context.applicationContext) if (isQuickSwitch) { // We only listen for failures to launch in quickswitch because the during this // gesture launcher is in the background state, vs other launches which are in // the actual overview state - failureListener.register(container, firstContainer.task.key.id) { - notifyTaskLaunchFailed() + failureListener.register(container, firstTaskContainer.task.key.id) { + notifyTaskLaunchFailed("launchWithoutAnimation") recentsView?.let { // Disable animations for now, as it is an edge case and the app usually // covers launcher and also any state transition animation also gets // clobbered by QuickstepTransitionManager.createWallpaperOpenAnimations // when launcher shows again - it.startHome(false /* animated */) + it.startHome(false /* animated */, null /* onHomeAnimationComplete */) // LauncherTaskbarUIController depends on the launcher state when // checking whether to handle resume, but that can come in before // startHome() changes the state, so force-refresh here to ensure the // taskbar is updated - it.mSizeStrategy.taskbarController?.refreshResumedState() + it.mContainerInterface.getTaskbarInteractor()?.refreshResumedState() } } } @@ -1066,8 +1672,9 @@ constructor( 0, 0, Executors.MAIN_EXECUTOR.handler, - { callback(true) } + { callbackWithLogging(true) }, ) { + Log.d(TAG, "launchWithoutAnimation: launch animation finished") failureListener.onTransitionFinished() } .apply { @@ -1075,113 +1682,34 @@ constructor( if (isQuickSwitch) { setFreezeRecentTasksReordering() } - // TODO(b/334826842) add splash functionality to new TTV - if (!enableRefactorTaskThumbnail()) { - disableStartingWindow = - firstContainer.thumbnailViewDeprecated.shouldShowSplashView() - } + // TODO(b/331754864): Update this to use TV.shouldShowSplash + disableStartingWindow = firstTaskContainer.shouldShowSplashView } Executors.UI_HELPER_EXECUTOR.execute { + Log.d( + TAG, + "launchWithoutAnimation(isQuickSwitch: $isQuickSwitch) - " + + "startActivityFromRecents: ${taskIds.contentToString()}", + ) if ( !ActivityManagerWrapper.getInstance() - .startActivityFromRecents(firstContainer.task.key, if (Utilities.ATLEAST_Q) opts else null) + .startActivityFromRecents(firstTaskContainer.task.key, if (Utilities.ATLEAST_Q) opts else null) ) { + Log.d(TAG, "launchWithoutAnimation - task launch failed") // If the call to start activity failed, then post the result immediately, // otherwise, wait for the animation start callback from the activity options // above Executors.MAIN_EXECUTOR.post { - notifyTaskLaunchFailed() - callback(false) + notifyTaskLaunchFailed("launchTask") + callbackWithLogging(false) } } - Log.d(TAG, "launchTask - startActivityFromRecents: ${taskIds.contentToString()}") } } - /** Launch of the current task (both live and inactive tasks) with an animation. */ - fun launchTasks(): RunnableList? { - val recentsView = recentsView ?: return null - val remoteTargetHandles = recentsView.mRemoteTargetHandles - if (!isRunningTask || remoteTargetHandles == null) { - return launchTaskAnimated() - } - if (!isClickableAsLiveTile) { - Log.e(TAG, "TaskView is not clickable as a live tile; returning to home.") - return null - } - isClickableAsLiveTile = false - val targets = - if (remoteTargetHandles.size == 1) { - remoteTargetHandles[0].transformParams.targetSet - } else { - val apps = - remoteTargetHandles.flatMap { it.transformParams.targetSet.apps.asIterable() } - val wallpapers = - remoteTargetHandles.flatMap { - it.transformParams.targetSet.wallpapers.asIterable() - } - RemoteAnimationTargets( - apps.toTypedArray(), - wallpapers.toTypedArray(), - remoteTargetHandles[0].transformParams.targetSet.nonApps, - remoteTargetHandles[0].transformParams.targetSet.targetMode - ) - } - if (targets == null) { - // If the recents animation is cancelled somehow between the parent if block and - // here, try to launch the task as a non live tile task. - val runnableList = launchTaskAnimated() - if (runnableList == null) { - Log.e( - TAG, - "Recents animation cancelled and cannot launch task as non-live tile" + - "; returning to home" - ) - } - isClickableAsLiveTile = true - return runnableList - } - val runnableList = RunnableList() - with(AnimatorSet()) { - TaskViewUtils.composeRecentsLaunchAnimator( - this, - this@TaskView, - targets.apps, - targets.wallpapers, - targets.nonApps, - true /* launcherClosing */, - recentsView.stateManager, - recentsView, - recentsView.depthController - ) - addListener( - object : AnimatorListenerAdapter() { - override fun onAnimationEnd(animator: Animator) { - if (taskContainers.any { it.task.key.displayId != rootViewDisplayId }) { - launchTaskAnimated() - } - isClickableAsLiveTile = true - runEndCallback() - } - - override fun onAnimationCancel(animation: Animator) { - runEndCallback() - } - - private fun runEndCallback() { - runnableList.executeAllAndDestroy() - } - } - ) - start() - } - Log.d(TAG, "launchTasks - composeRecentsLaunchAnimator: ${taskIds.contentToString()}") - recentsView.onTaskLaunchedInLiveTileMode() - return runnableList - } - - private fun notifyTaskLaunchFailed() { - val sb = StringBuilder("Failed to launch task \n") + private fun notifyTaskLaunchFailed(launchMethod: String) { + val sb = + StringBuilder("$launchMethod - Failed to launch task: ${taskIds.contentToString()}\n") taskContainers.forEach { sb.append("(task=${it.task.key.baseIntent} userId=${it.task.key.userId})\n") } @@ -1189,14 +1717,6 @@ constructor( Toast.makeText(context, R.string.activity_not_available, Toast.LENGTH_SHORT).show() } - fun initiateSplitSelect(splitPositionOption: SplitPositionOption) { - recentsView?.initiateSplitSelect( - this, - splitPositionOption.stagePosition, - SplitConfigurationOptions.getLogEventForPosition(splitPositionOption.stagePosition) - ) - } - /** * Returns `true` if user is already in split select mode and this tap was to choose the second * app. `false` otherwise @@ -1212,11 +1732,11 @@ constructor( this, container.task, container.iconView.drawable, - container.thumbnailViewDeprecated, - container.thumbnailViewDeprecated.thumbnail, /* intent */ - null, /* user */ - null, - container.itemInfo + container.snapshotView, + container.thumbnail, + /* intent */ null, + /* user */ null, + container.itemInfo, ) } @@ -1233,30 +1753,59 @@ constructor( // Don't show menu when selecting second split screen app return true } - if (!container.deviceProfile.isTablet && !recentsView.isClearAllHidden) { + if ( + !container.deviceProfile.getDeviceProperties().isTablet && !recentsView.isClearAllHidden + ) { recentsView.snapToPage(recentsView.indexOfChild(this)) return false } - val menuContainer = taskContainers.firstOrNull { it.iconView === iconView } ?: return false + val menuContainer = getContainerForIconView(iconView) + container.statsLogManager .logger() - .withItemInfo(menuContainer.itemInfo) + .withItemInfo(menuContainer?.itemInfo ?: itemInfo) .log(LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS) return showTaskMenuWithContainer(menuContainer) } - private fun showTaskMenuWithContainer(menuContainer: TaskContainer): Boolean { + private fun closeTaskMenu(): Boolean { + val floatingView: AbstractFloatingView? = + AbstractFloatingView.getTopOpenViewWithType( + container, + AbstractFloatingView.TYPE_TASK_MENU, + ) + if (floatingView?.isOpen == true) { + floatingView.close(true) + return true + } else { + return false + } + } + + private fun showTaskMenuWithContainer(menuContainer: TaskContainer?): Boolean { val recentsView = recentsView ?: return false - return if (enableOverviewIconMenu() && menuContainer.iconView is IconAppChipView) { - menuContainer.iconView.revealAnim(/* isRevealing= */ true) - TaskMenuView.showForTask(menuContainer) { - menuContainer.iconView.revealAnim(/* isRevealing= */ false) + // Disable hover on all TaskView's whilst menu is showing. + recentsView.setTaskBorderEnabled(false) + val iconView = menuContainer?.iconView ?: getTaskIcons().elementAt(0).first + + return if (enableOverviewIconMenu() && iconView is IconAppChipView) { + if (iconView.status == AppChipStatus.Expanded) { + closeTaskMenu() + } else { + val onShowAction = { recentsView.setTaskBorderEnabled(true) } + val taskTarget = + if (menuContainer != null) { + TaskMenuView.TaskTarget.FromTaskContainer(menuContainer) + } else { + TaskMenuView.TaskTarget.FromTaskView(this) + } + TaskMenuView.showForTask(taskTarget, onShowAction) } - } else if (container.deviceProfile.isTablet) { + } else if (container.deviceProfile.deviceProperties.isTablet && menuContainer != null) { val alignedOptionIndex = if ( recentsView.isOnGridBottomRow(menuContainer.taskView) && - container.deviceProfile.isLandscape + container.deviceProfile.deviceProperties.isLandscape ) { if (enableGridOnlyOverview()) { // With no focused task, there is less available space below the tasks, so @@ -1270,9 +1819,19 @@ constructor( } else { 0 } - TaskMenuViewWithArrow.showForTask(menuContainer, alignedOptionIndex) + + TaskMenuViewWithArrow.showForTask(menuContainer, alignedOptionIndex) { + recentsView.setTaskBorderEnabled(true) + } } else { - TaskMenuView.showForTask(menuContainer) + val onShowAction = { recentsView.setTaskBorderEnabled(true) } + val taskTarget = + if (menuContainer != null) { + TaskMenuView.TaskTarget.FromTaskContainer(menuContainer) + } else { + TaskMenuView.TaskTarget.FromTaskView(this) + } + TaskMenuView.showForTask(taskTarget, onShowAction) } } @@ -1281,10 +1840,10 @@ constructor( * might require special handling. */ open fun offerTouchToChildren(event: MotionEvent): Boolean { - taskContainers.forEach { + getTaskIcons().forEach { (icon, iconTouchDelegate) -> if (event.action == MotionEvent.ACTION_DOWN) { - computeAndSetIconTouchDelegate(it.iconView, tempCoordinates, it.iconTouchDelegate) - if (it.iconTouchDelegate.onTouchEvent(event)) { + computeAndSetIconTouchDelegate(icon, tempCoordinates, iconTouchDelegate) + if (iconTouchDelegate.onTouchEvent(event)) { return true } } @@ -1295,10 +1854,10 @@ constructor( private fun computeAndSetIconTouchDelegate( view: TaskViewIcon, tempCenterCoordinates: FloatArray, - transformingTouchDelegate: TransformingTouchDelegate + transformingTouchDelegate: TransformingTouchDelegate, ) { - val viewHalfWidth = view.width / 2f - val viewHalfHeight = view.height / 2f + val viewHalfWidth = view.asView().width / 2f + val viewHalfHeight = view.asView().height / 2f Utilities.getDescendantCoordRelativeToAncestor( view.asView(), container.dragLayer, @@ -1306,13 +1865,13 @@ constructor( this[0] = viewHalfWidth this[1] = viewHalfHeight }, - false + false, ) transformingTouchDelegate.setBounds( (tempCenterCoordinates[0] - viewHalfWidth).toInt(), (tempCenterCoordinates[1] - viewHalfHeight).toInt(), (tempCenterCoordinates[0] + viewHalfWidth).toInt(), - (tempCenterCoordinates[1] + viewHalfHeight).toInt() + (tempCenterCoordinates[1] + viewHalfHeight).toInt(), ) } @@ -1322,7 +1881,7 @@ constructor( it.showWindowsView?.let { showWindowsView -> updateFilterCallback( showWindowsView, - getFilterUpdateCallback(it.task.key.packageName) + getFilterUpdateCallback(it.task.key.packageName), ) } } @@ -1355,23 +1914,27 @@ constructor( * Called to animate a smooth transition when going directly from an app into Overview (and vice * versa). Icons fade in, and DWB banners slide in with a "shift up" animation. */ - private fun onFocusTransitionProgressUpdated(focusTransitionProgress: Float) { + private fun onSettledProgressUpdated(settledProgress: Float) { + getTaskIcons().forEach { (icon, _) -> icon.setContentAlpha(settledProgress) } taskContainers.forEach { - it.iconView.setContentAlpha(focusTransitionProgress) - it.digitalWellBeingToast?.updateBannerOffset(1f - focusTransitionProgress) + if (enableRefactorDigitalWellbeingToast() && it.taskContentView is TaskContentView) { + it.taskContentView.onParentAnimationProgress(settledProgress) + } else { + it.digitalWellBeingToast?.bannerOffsetPercentage = 1f - settledProgress + } } } - fun animateIconScaleAndDimIntoView() { - iconAndDimAnimator?.cancel() - iconAndDimAnimator = - ObjectAnimator.ofFloat(focusTransitionScaleAndDim, MULTI_PROPERTY_VALUE, 0f, 1f).apply { - duration = SCALE_ICON_DURATION + fun startIconFadeInOnGestureComplete() { + iconFadeInOnGestureCompleteAnimator?.cancel() + iconFadeInOnGestureCompleteAnimator = + ObjectAnimator.ofFloat(this, SETTLED_PROGRESS_GESTURE, 1f).apply { + duration = FADE_IN_ICON_DURATION interpolator = Interpolators.LINEAR addListener( object : AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { - iconAndDimAnimator = null + iconFadeInOnGestureCompleteAnimator = null } } ) @@ -1379,20 +1942,21 @@ constructor( } } - fun setIconScaleAndDim(iconScale: Float) { - iconAndDimAnimator?.cancel() - focusTransitionScaleAndDim.value = iconScale + fun setIconVisibleForGesture(isVisible: Boolean) { + iconFadeInOnGestureCompleteAnimator?.cancel() + settledProgressGesture = if (isVisible) 1f else 0f } /** Set a color tint on the snapshot and supporting views. */ open fun setColorTint(amount: Float, tintColor: Int) { + getTaskIcons().forEach { (icon, _) -> icon.setIconColorTint(tintColor, amount) } taskContainers.forEach { - if (!enableRefactorTaskThumbnail()) { - // TODO(b/334832108) Add scrim to new TTV + if (enableRefactorTaskThumbnail()) { + it.updateTintAmount(amount) + } else { it.thumbnailViewDeprecated.dimAlpha = amount } - it.iconView.setIconColorTint(tintColor, amount) - it.digitalWellBeingToast?.setBannerColorTint(tintColor, amount) + it.digitalWellBeingToast?.setColorTint(tintColor, amount) } } @@ -1402,28 +1966,36 @@ constructor( * * @param taskId is only used when setting visibility to a non-[View.VISIBLE] value */ - open fun setThumbnailVisibility(visibility: Int, taskId: Int) { - taskContainers.forEach { - if (visibility == VISIBLE || it.task.key.id == taskId) { - it.snapshotView.visibility = visibility - it.digitalWellBeingToast?.setBannerVisibility(visibility) - it.showWindowsView?.visibility = visibility - it.overlay.setVisibility(visibility) + open fun setThumbnailVisibility(isVisible: Boolean, taskId: Int) { + taskContainers + .filter { isVisible || it.task.key.id == taskId } + .forEach { taskContainer -> + sequenceOf( + taskContainer.taskContentView, + taskContainer.digitalWellBeingToast, + taskContainer.showWindowsView, + taskContainer.overlay.suggestView, + ) + .filterNotNull() + .forEach { + // Prevent setting to INVISIBLE when already GONE to avoid onLayout pass. + // Use isInvisible to set visible/invisible. Using isVisible sets GONE if + // false. + if (it.isInvisible != !isVisible && !it.isGone) { + it.isInvisible = !isVisible + } + } } - } } open fun setOverlayEnabled(overlayEnabled: Boolean) { - // TODO(b/335606129) Investigate the usage of [TaskOverlay] in the new TaskThumbnailView. - // and if it's still necessary we should support that in the new TTV class. if (!enableRefactorTaskThumbnail()) { - taskContainers.forEach { it.thumbnailViewDeprecated.setOverlayEnabled(overlayEnabled) } + taskContainers.forEach { it.setOverlayEnabled(overlayEnabled) } } } protected open fun refreshTaskThumbnailSplash() { if (!enableRefactorTaskThumbnail()) { - // TODO(b/334826842) add splash functionality to new TTV taskContainers.forEach { it.thumbnailViewDeprecated.refreshSplashView() } } } @@ -1431,27 +2003,15 @@ constructor( protected fun getScrollAdjustment(gridEnabled: Boolean) = if (gridEnabled) gridTranslationX else nonGridTranslationX - protected fun getOffsetAdjustment(gridEnabled: Boolean) = getScrollAdjustment(gridEnabled) + fun getOffsetAdjustment(gridEnabled: Boolean) = getScrollAdjustment(gridEnabled) fun getSizeAdjustment(fullscreenEnabled: Boolean) = if (fullscreenEnabled) nonGridScale else 1f private fun applyScale() { - val scale = persistentScale * dismissScale + val scale = persistentScale * dismissScale * Utilities.mapRange(modalness, 1f, modalScale) scaleX = scale scaleY = scale - if (enableRefactorTaskThumbnail()) { - taskViewData.scale.value = scale - } - updateSnapshotRadius() - } - - protected open fun applyThumbnailSplashAlpha() { - if (!enableRefactorTaskThumbnail()) { - // TODO(b/334826842) add splash functionality to new TTV - taskContainers.forEach { - it.thumbnailViewDeprecated.setSplashAlpha(taskThumbnailSplashAlpha) - } - } + updateFullscreenParams() } private fun applyTranslationX() { @@ -1480,46 +2040,54 @@ constructor( } protected open fun onFullscreenProgressChanged(fullscreenProgress: Float) { - taskContainers.forEach { - it.iconView.setVisibility(if (fullscreenProgress < 1) VISIBLE else INVISIBLE) - it.overlay.setFullscreenProgress(fullscreenProgress) + if (!enableOverviewIconMenu()) { + getTaskIcons().forEach { (icon, _) -> + icon.asView().visibility = if (fullscreenProgress < 1) VISIBLE else INVISIBLE + } } - focusTransitionFullscreen.value = - FOCUS_TRANSITION_FAST_OUT_INTERPOLATOR.getInterpolation(1 - fullscreenProgress) - updateSnapshotRadius() + taskContainers.forEach { it.overlay.setFullscreenProgress(fullscreenProgress) } + updateSettledProgressFullscreen(fullscreenProgress) + updateFullscreenParams() } - protected open fun updateSnapshotRadius() { - updateCurrentFullscreenParams() - taskContainers.forEach { - it.thumbnailViewDeprecated.setFullscreenParams(getThumbnailFullscreenParams()) - it.overlay.setFullscreenParams(getThumbnailFullscreenParams()) - } + protected fun updateSettledProgressFullscreen(fullscreenProgress: Float) { + settledProgressFullscreen = + SETTLED_PROGRESS_FAST_OUT_INTERPOLATOR.getInterpolation(1 - fullscreenProgress) } - protected open fun updateCurrentFullscreenParams() { - updateFullscreenParams(currentFullscreenParams) + protected open fun updateFullscreenParams() { + updateFullscreenParams(thumbnailFullscreenParams) + taskContainers.forEach { + if (enableRefactorTaskContentView()) { + (it.taskContentView as TaskContentView).cornerRadius = + thumbnailFullscreenParams.currentCornerRadius + } else if (enableRefactorTaskThumbnail()) { + it.thumbnailView.cornerRadius = thumbnailFullscreenParams.currentCornerRadius + } else { + it.thumbnailViewDeprecated.setFullscreenParams(thumbnailFullscreenParams) + } + it.overlay.setFullscreenParams(thumbnailFullscreenParams) + } } protected fun updateFullscreenParams(fullscreenParams: FullscreenDrawParams) { recentsView?.let { fullscreenParams.setProgress(fullscreenProgress, it.scaleX, scaleX) } } - protected open fun getThumbnailFullscreenParams(): FullscreenDrawParams = - currentFullscreenParams - private fun onModalnessUpdated(modalness: Float) { + isClickable = modalness == 0f + getTaskIcons().forEach { (icon, _) -> icon.setModalAlpha(1f - modalness) } taskContainers.forEach { - it.iconView.setModalAlpha(1 - modalness) - it.digitalWellBeingToast?.updateBannerOffset(modalness) + if (enableRefactorDigitalWellbeingToast() && it.taskContentView is TaskContentView) { + it.taskContentView.onParentAnimationProgress(1f - modalness) + } else { + it.digitalWellBeingToast?.bannerOffsetPercentage = modalness + } + } + if (enableGridOnlyOverview()) { + modalAlpha = if (isSelectedTask) 1f else (1f - modalness) + applyScale() } - } - - /** Updates [TaskThumbnailView] to reflect the latest [Task] state (i.e., task isRunning). */ - fun notifyIsRunningTaskUpdated() { - // TODO(b/335649589): TaskView's VM will already have access to TaskThumbnailView's VM - // so there will be no need to access TaskThumbnailView's VM through the TaskThumbnailView - taskContainers.forEach { it.bindThumbnailView() } } fun resetPersistentViewTransforms() { @@ -1527,19 +2095,26 @@ constructor( gridTranslationX = 0f gridTranslationY = 0f boxTranslationY = 0f - nonGridPivotTranslationX = 0f + taskContainers.forEach { + it.snapshotView.translationX = 0f + it.snapshotView.translationY = 0f + } resetViewTransforms() } - open fun resetViewTransforms() { + fun resetViewTransforms() { + // Dismiss translation shouldn't reset if actively being dragged + if (!isBeingDraggedForDismissal) { + secondaryDismissTranslationProperty.setValue(this, 0f) + } + primaryDismissTranslationProperty.setValue(this, 0f) + // fullscreenTranslation and accumulatedTranslation should not be reset, as // resetViewTransforms is called during QuickSwitch scrolling. - dismissTranslationX = 0f taskOffsetTranslationX = 0f taskResistanceTranslationX = 0f splitSelectTranslationX = 0f gridEndTranslationX = 0f - dismissTranslationY = 0f taskOffsetTranslationY = 0f taskResistanceTranslationY = 0f if (recentsView?.isSplitSelectionActive != true) { @@ -1547,13 +2122,9 @@ constructor( } dismissScale = 1f translationZ = 0f - alpha = stableAlpha - setIconScaleAndDim(1f) + setIconVisibleForGesture(true) + settledProgressDismiss = 1f setColorTint(0f, 0) - if (!enableRefactorTaskThumbnail()) { - // TODO(b/335399428) add split select functionality to new TTV - taskContainers.forEach { it.thumbnailViewDeprecated.resetViewTransforms() } - } } private fun getGridTrans(endTranslation: Float) = @@ -1562,243 +2133,95 @@ constructor( private fun getNonGridTrans(endTranslation: Float) = endTranslation - getGridTrans(endTranslation) - /** We update and subsequently draw these in [fullscreenProgress]. */ - open class FullscreenDrawParams(context: Context) : SafeCloseable { - var cornerRadius = 0f - private var windowCornerRadius = 0f - var currentDrawnCornerRadius = 0f - - init { - updateCornerRadius(context) - } - - /** Recomputes the start and end corner radius for the given Context. */ - fun updateCornerRadius(context: Context) { - cornerRadius = computeTaskCornerRadius(context) - windowCornerRadius = computeWindowCornerRadius(context) - } - - @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) - open fun computeTaskCornerRadius(context: Context): Float { - return TaskCornerRadius.get(context) - } - - @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) - open fun computeWindowCornerRadius(context: Context): Float { - val activityContext: ActivityContext? = ActivityContext.lookupContextNoThrow(context) - - // The corner radius is fixed to match when Taskbar is persistent mode - return if ( - activityContext != null && - activityContext.deviceProfile?.isTaskbarPresent == true && - DisplayController.isTransientTaskbar(context) - ) { - context.resources - .getDimensionPixelSize(R.dimen.persistent_taskbar_corner_radius) - .toFloat() - } else { - QuickStepContract.getWindowCornerRadius(context) - } - } + private fun MotionEvent.isWithinThumbnailBounds(): Boolean { + return thumbnailBounds.contains(x.toInt(), y.toInt()) + } - /** Sets the progress in range [0, 1] */ - fun setProgress(fullscreenProgress: Float, parentScale: Float, taskViewScale: Float) { - currentDrawnCornerRadius = - Utilities.mapRange(fullscreenProgress, cornerRadius, windowCornerRadius) / - parentScale / - taskViewScale + override fun addChildrenForAccessibility(outChildren: ArrayList) { + (if (isLayoutRtl) taskContainers.reversed() else taskContainers).forEach { + it.addChildForAccessibility(outChildren) } - - override fun close() {} } - /** Holder for all Task dependent information. */ - inner class TaskContainer( - val task: Task, - val thumbnailView: TaskThumbnailView?, - val thumbnailViewDeprecated: TaskThumbnailViewDeprecated, - val iconView: TaskViewIcon, - /** - * This technically can be a vanilla [android.view.TouchDelegate] class, however that class - * requires setting the touch bounds at construction, so we'd repeatedly be created many - * instances unnecessarily as scrolling occurs, whereas [TransformingTouchDelegate] allows - * touch delegated bounds only to be updated. - */ - val iconTouchDelegate: TransformingTouchDelegate, - /** Defaults to STAGE_POSITION_UNDEFINED if in not a split screen task view */ - @StagePosition val stagePosition: Int, - val digitalWellBeingToast: DigitalWellBeingToast?, - val showWindowsView: View?, - taskOverlayFactory: TaskOverlayFactory - ) { - val overlay: TaskOverlay<*> = taskOverlayFactory.createOverlay(this) - - val snapshotView: View - get() = thumbnailView ?: thumbnailViewDeprecated - - /** Builds proto for logging */ - val itemInfo: WorkspaceItemInfo - get() = - WorkspaceItemInfo().apply { - itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK - container = LauncherSettings.Favorites.CONTAINER_TASKSWITCHER - val componentKey = TaskUtils.getLaunchComponentKeyForTask(task.key) - user = componentKey.user - intent = Intent().setComponent(componentKey.componentName) - title = task.title - recentsView?.let { screenId = it.indexOfChild(this@TaskView) } - if (privateSpaceRestrictAccessibilityDrag()) { - if ( - UserCache.getInstance(context).getUserInfo(componentKey.user).isPrivate - ) { - runtimeStatusFlags = - runtimeStatusFlags or ItemInfoWithIcon.FLAG_NOT_PINNABLE - } - } - } + protected open fun getContainerForIconView(iconView: TaskViewIcon) = + taskContainers.firstOrNull { it.iconView === iconView } - val taskView: TaskView - get() = this@TaskView + companion object { + private const val TAG = "TaskView" - fun destroy() { - digitalWellBeingToast?.destroy() - thumbnailView?.let { taskView.removeView(it) } + private enum class Alpha { + Stable, + Attach, + Split, + Modal, } - // TODO(b/335649589): TaskView's VM will already have access to TaskThumbnailView's VM - // so there will be no need to access TaskThumbnailView's VM through the TaskThumbnailView - fun bindThumbnailView() { - // TODO(b/343364498): Existing view has shouldShowScreenshot as an override as well but - // this should be decided inside TaskThumbnailViewModel. - thumbnailView?.viewModel?.bind(TaskThumbnail(task.key.id, isRunningTask)) + private enum class SettledProgress { + Fullscreen, + Gesture, + Dismiss, } - } - companion object { - private const val TAG = "TaskView" const val FLAG_UPDATE_ICON = 1 const val FLAG_UPDATE_THUMBNAIL = FLAG_UPDATE_ICON shl 1 const val FLAG_UPDATE_CORNER_RADIUS = FLAG_UPDATE_THUMBNAIL shl 1 const val FLAG_UPDATE_ALL = (FLAG_UPDATE_ICON or FLAG_UPDATE_THUMBNAIL or FLAG_UPDATE_CORNER_RADIUS) - const val FOCUS_TRANSITION_INDEX_FULLSCREEN = 0 - const val FOCUS_TRANSITION_INDEX_SCALE_AND_DIM = 1 - const val FOCUS_TRANSITION_INDEX_COUNT = 2 - /** The maximum amount that a task view can be scrimmed, dimmed or tinted. */ const val MAX_PAGE_SCRIM_ALPHA = 0.4f - const val SCALE_ICON_DURATION: Long = 120 + const val FADE_IN_ICON_DURATION: Long = 120 private const val DIM_ANIM_DURATION: Long = 700 - private const val FOCUS_TRANSITION_THRESHOLD = - SCALE_ICON_DURATION.toFloat() / DIM_ANIM_DURATION - val FOCUS_TRANSITION_FAST_OUT_INTERPOLATOR = + private const val SETTLE_TRANSITION_THRESHOLD = + FADE_IN_ICON_DURATION.toFloat() / DIM_ANIM_DURATION + val SETTLED_PROGRESS_FAST_OUT_INTERPOLATOR = Interpolators.clampToProgress( Interpolators.FAST_OUT_SLOW_IN, - 1f - FOCUS_TRANSITION_THRESHOLD, - 1f + 1f - SETTLE_TRANSITION_THRESHOLD, + 1f, )!! - private val SYSTEM_GESTURE_EXCLUSION_RECT = listOf(Rect()) + private val FADE_IN_ICON_INTERPOLATOR = Interpolators.LINEAR - private val FOCUS_TRANSITION: FloatProperty = - object : FloatProperty("focusTransition") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.focusTransitionProgress = v - } + private val SETTLED_PROGRESS: FloatProperty = + KFloatProperty(TaskView::settledProgress) - override fun get(taskView: TaskView) = taskView.focusTransitionProgress - } + private val SETTLED_PROGRESS_GESTURE: FloatProperty = + KFloatProperty(TaskView::settledProgressGesture) - private val SPLIT_SELECT_TRANSLATION_X: FloatProperty = - object : FloatProperty("splitSelectTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.splitSelectTranslationX = v - } + private val SETTLED_PROGRESS_DISMISS: FloatProperty = + KFloatProperty(TaskView::settledProgressDismiss) - override fun get(taskView: TaskView) = taskView.splitSelectTranslationX - } + private val SPLIT_SELECT_TRANSLATION_X: FloatProperty = + KFloatProperty(TaskView::splitSelectTranslationX) private val SPLIT_SELECT_TRANSLATION_Y: FloatProperty = - object : FloatProperty("splitSelectTranslationY") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.splitSelectTranslationY = v - } - - override fun get(taskView: TaskView) = taskView.splitSelectTranslationY - } + KFloatProperty(TaskView::splitSelectTranslationY) private val DISMISS_TRANSLATION_X: FloatProperty = - object : FloatProperty("dismissTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.dismissTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.dismissTranslationX - } + KFloatProperty(TaskView::dismissTranslationX) private val DISMISS_TRANSLATION_Y: FloatProperty = - object : FloatProperty("dismissTranslationY") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.dismissTranslationY = v - } - - override fun get(taskView: TaskView) = taskView.dismissTranslationY - } + KFloatProperty(TaskView::dismissTranslationY) private val TASK_OFFSET_TRANSLATION_X: FloatProperty = - object : FloatProperty("taskOffsetTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.taskOffsetTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.taskOffsetTranslationX - } + KFloatProperty(TaskView::taskOffsetTranslationX) private val TASK_OFFSET_TRANSLATION_Y: FloatProperty = - object : FloatProperty("taskOffsetTranslationY") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.taskOffsetTranslationY = v - } - - override fun get(taskView: TaskView) = taskView.taskOffsetTranslationY - } + KFloatProperty(TaskView::taskOffsetTranslationY) private val TASK_RESISTANCE_TRANSLATION_X: FloatProperty = - object : FloatProperty("taskResistanceTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.taskResistanceTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.taskResistanceTranslationX - } + KFloatProperty(TaskView::taskResistanceTranslationX) private val TASK_RESISTANCE_TRANSLATION_Y: FloatProperty = - object : FloatProperty("taskResistanceTranslationY") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.taskResistanceTranslationY = v - } - - override fun get(taskView: TaskView) = taskView.taskResistanceTranslationY - } + KFloatProperty(TaskView::taskResistanceTranslationY) @JvmField val GRID_END_TRANSLATION_X: FloatProperty = - object : FloatProperty("gridEndTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.gridEndTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.gridEndTranslationX - } + KFloatProperty(TaskView::gridEndTranslationX) @JvmField - val DISMISS_SCALE: FloatProperty = - object : FloatProperty("dismissScale") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.dismissScale = v - } + val DISMISS_SCALE: FloatProperty = KFloatProperty(TaskView::dismissScale) - override fun get(taskView: TaskView) = taskView.dismissScale - } + @JvmField val SPLIT_ALPHA: FloatProperty = KFloatProperty(TaskView::splitAlpha) } } diff --git a/quickstep/src/com/android/quickstep/views/TaskViewIcon.java b/quickstep/src/com/android/quickstep/views/TaskViewIcon.java index 94739cbc909..04776e067de 100644 --- a/quickstep/src/com/android/quickstep/views/TaskViewIcon.java +++ b/quickstep/src/com/android/quickstep/views/TaskViewIcon.java @@ -27,16 +27,6 @@ */ public interface TaskViewIcon { - /** - * Returns the width of this icon view. - */ - int getWidth(); - - /** - * Returns the height of this icon view. - */ - int getHeight(); - /** * Sets the opacity of the view. */ @@ -47,6 +37,11 @@ public interface TaskViewIcon { */ void setModalAlpha(float alpha); + /** + * Sets the opacity of the view for flex split state. + */ + void setFlexSplitAlpha(float alpha); + /** * Returns this icon view's drawable. */ @@ -57,26 +52,6 @@ public interface TaskViewIcon { */ void setDrawable(@Nullable Drawable icon); - /** - * Register a callback to be invoked when this view is clicked. - */ - void setOnClickListener(@Nullable View.OnClickListener l); - - /** - * Register a callback to be invoked when this view is clicked and held. - */ - void setOnLongClickListener(@Nullable View.OnLongClickListener l); - - /** - * Returns the LayoutParams associated with this view. - */ - ViewGroup.LayoutParams getLayoutParams(); - - /** - * Sets the layout parameters associated with this view. - */ - void setLayoutParams(ViewGroup.LayoutParams params); - /** * Sets the degrees that the view is rotated around the pivot point. */ @@ -92,11 +67,6 @@ public interface TaskViewIcon { */ void setIconOrientation(RecentsOrientedState orientationState, boolean isGridTask); - /** - * Sets the visibility state of this view. - */ - void setVisibility(int visibility); - /** * Sets the tint color of the icon, useful for scrimming or dimming. * @@ -105,11 +75,6 @@ public interface TaskViewIcon { */ void setIconColorTint(int color, float amount); - /** - * Gets the opacity of the view. - */ - float getAlpha(); - /** * Returns the width of this icon view's drawable. */ @@ -120,16 +85,6 @@ public interface TaskViewIcon { */ int getDrawableHeight(); - /** - * Directly calls any attached OnClickListener. - */ - boolean callOnClick(); - - /** - * Calls this view's OnLongClickListener. - */ - boolean performLongClick(); - /** * Sets the text for this icon view if any text view is associated. */ diff --git a/quickstep/src/com/android/quickstep/views/TaskViewType.kt b/quickstep/src/com/android/quickstep/views/TaskViewType.kt new file mode 100644 index 00000000000..b2a32a96c84 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/TaskViewType.kt @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.views + +/** Type of the [TaskView] */ +enum class TaskViewType { + SINGLE, + GROUPED, + DESKTOP +} diff --git a/quickstep/src/com/android/quickstep/views/WallpaperScreenshotClipView.java b/quickstep/src/com/android/quickstep/views/WallpaperScreenshotClipView.java new file mode 100644 index 00000000000..05d6740b1d6 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/WallpaperScreenshotClipView.java @@ -0,0 +1,369 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.views; + +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; + +import static com.android.app.animation.Interpolators.ACCELERATE; +import static com.android.app.animation.Interpolators.LINEAR; +import static com.android.launcher3.Utilities.mapToRange; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; + +import android.animation.AnimatorSet; +import android.animation.ValueAnimator; +import android.app.WallpaperManager; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Canvas; +import android.graphics.Matrix; +import android.graphics.Path; +import android.graphics.Rect; +import android.graphics.RectF; +import android.util.AttributeSet; +import android.util.Log; +import android.util.PathParser; +import android.view.SurfaceControl; +import android.view.View; +import android.view.ViewTreeObserver; +import android.view.Window; +import android.view.WindowManager; +import android.view.WindowManagerGlobal; +import android.widget.FrameLayout; +import android.widget.ImageView; +import android.window.ScreenCaptureInternal; + +import androidx.core.content.ContextCompat; + +import com.android.launcher3.R; +import com.android.launcher3.Utilities; +import com.android.launcher3.util.CancellableTask; + +/** + * A custom ViewGroup that displays a clipped screenshot of the device wallpaper, overlaid with a + * color scrim. + * + * Manages the task of capturing the screenshot and animating the children. + */ +public class WallpaperScreenshotClipView extends FrameLayout { + + private static final String TAG = "WSCV"; + + // Arbitrarily large number to avoid rounding issues when tracking progress. + public static final int CLIP_ANIM_DURATION = 10000; + + private static final float MAX_SCALE_MULTIPLIER = 1.50f; + private static final int COLOR_ALPHA_DURATION_MS = 25; + private static final float CLIP_TRANSLATION_MULTIPLIER = 0.55f; + private static final float INITIAL_ARROW_SCALE = 2.4100475221f; + + private ImageView mWallpaperView; + private View mColorOverlay; + public boolean mHasValidScreenshot = false; + public boolean mForceFallbackAnimation = false; + + private final Path mOriginalPath; + private Path mCurrentClipPath; + private final RectF mBounds = new RectF(); + private final RectF mOriginalBounds = new RectF(); + private final Matrix mScaleMatrix = new Matrix(); + private final Matrix mInvertScaleMatrix = new Matrix(); + + private float mInitialArrowPositionY; + // Keeps the arrow centered in the middle + private float mClipTranslationY; + + // Briefly moves the arrow upwards in the first part of the animation + private float mClipTranslateYUpwards; + private final float mMinClipTranslateY; + private final float mMaxClipTranslateY; + private final float mMaxArrowScale; + private final int mWindowWidth; + private final int mWindowHeight; + + private CancellableTask mCaptureTask; + + public WallpaperScreenshotClipView(Context context) { + this(context, null); + } + + public WallpaperScreenshotClipView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public WallpaperScreenshotClipView(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } + + public WallpaperScreenshotClipView(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + Resources r = getResources(); + + mWallpaperView = new ImageView(context); + mWallpaperView.setLayoutParams(new LayoutParams(MATCH_PARENT, MATCH_PARENT)); + + mColorOverlay = new View(context); + mColorOverlay.setLayoutParams(new LayoutParams(MATCH_PARENT, MATCH_PARENT)); + mColorOverlay.setBackgroundColor(context.getColor(R.color.materialColorSecondaryContainer)); + + addView(mWallpaperView); + addView(mColorOverlay); + + mOriginalPath = new Path(PathParser + .createPathFromPathData(r.getString(R.string.all_set_arrow_path))); + resetAndSetMatrixScale(INITIAL_ARROW_SCALE); + mOriginalPath.transform(mScaleMatrix); + mOriginalPath.computeBounds(mOriginalBounds); + + mCurrentClipPath = new Path(mOriginalPath); + setClipPath(mCurrentClipPath); + + Rect windowBounds = ContextCompat.getSystemService(context, WindowManager.class) + .getCurrentWindowMetrics().getBounds(); + + mWindowHeight = windowBounds.height(); + mWindowWidth = windowBounds.width(); + mInitialArrowPositionY = mWindowHeight + - mOriginalBounds.height() + - r.getDimensionPixelSize(R.dimen.allset_hint_margin_bottom) + - Utilities.calculateTextHeight( + r.getDimensionPixelSize(R.dimen.allset_page_swipe_up_text_size_expressive)) + - r.getDimensionPixelSize(R.dimen.allset_arrow_margin_bottom); + + + getViewTreeObserver().addOnWindowAttachListener( + new ViewTreeObserver.OnWindowAttachListener() { + @Override + public void onWindowAttached() { + } + + @Override + public void onWindowDetached() { + if (mCaptureTask != null) { + mCaptureTask.cancel(); + mCaptureTask = null; + } + getViewTreeObserver().removeOnWindowAttachListener(this); + } + }); + + mMinClipTranslateY = Math.max(mOriginalBounds.height(), mOriginalBounds.width()); + mMaxClipTranslateY = Math.max(mWindowHeight, mWindowWidth); + + // Create a large max scale so that the shape can fill the entire screen. + mMaxArrowScale = Math.max(mWindowHeight, mWindowWidth) * MAX_SCALE_MULTIPLIER + / Math.min(mOriginalBounds.width(), mOriginalBounds.height()); + } + + private void resetAndSetMatrixScale(float scale) { + mScaleMatrix.reset(); + mScaleMatrix.setScale(scale, scale); + } + + private void setClipPath(Path clipPath) { + mCurrentClipPath = clipPath; + invalidate(); + } + + @Override + protected void dispatchDraw(Canvas canvas) { + int count = canvas.save(); + if (mCurrentClipPath != null) { + mCurrentClipPath.computeBounds(mBounds); + } + + float transX = (getWidth() - mBounds.width()) / 2; + float transY = mInitialArrowPositionY + + mClipTranslationY + + mClipTranslateYUpwards + - ((mBounds.height() - mOriginalBounds.height()) / 2); + if (mCurrentClipPath != null) { + mCurrentClipPath.offset(transX, transY); + canvas.clipPath(mCurrentClipPath); + } + super.dispatchDraw(canvas); + canvas.restoreToCount(count); + if (mCurrentClipPath != null) { + mCurrentClipPath.offset(-transX, -transY); + } + } + + /** + * Sets the {@code translationY} of the clipped views. + */ + public void setClipTranslationY(float translationY, float progress) { + mClipTranslationY = translationY * CLIP_TRANSLATION_MULTIPLIER; + mClipTranslateYUpwards = -Math.min(mMinClipTranslateY, + mapToRange(progress, 0, 1, 0, mMaxClipTranslateY, LINEAR)); + invalidate(); + } + + /** + * Adds clip animation to {@code animatorSet}. + */ + public void addClipAnimation(AnimatorSet animatorSet) { + ValueAnimator scale = ValueAnimator.ofFloat(0, 1f); + scale.setDuration(CLIP_ANIM_DURATION); + scale.setInterpolator(ACCELERATE); + scale.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator valueAnimator) { + // undo any previous scale + mCurrentClipPath.transform(mInvertScaleMatrix); + + // set new scale + float scale = 1 + (valueAnimator.getAnimatedFraction() * mMaxArrowScale); + resetAndSetMatrixScale(scale); + mCurrentClipPath.transform(mScaleMatrix); + setClipPath(mCurrentClipPath); + + // prepare inversion for next update + mInvertScaleMatrix.reset(); + mScaleMatrix.invert(mInvertScaleMatrix); + + } + }); + animatorSet.play(scale); + + ValueAnimator color = ValueAnimator.ofFloat(0, 1f); + color.setDuration(CLIP_ANIM_DURATION); + color.setInterpolator(LINEAR); + color.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator valueAnimator) { + if (!mHasValidScreenshot || mForceFallbackAnimation) { + // Do nothing. The entire window will fade out instead. + } else { + float interpProgress = mapToRange(valueAnimator.getAnimatedFraction(), 0, 1f, 0, + 1f, LINEAR); + float maxAlpha = 1f * CLIP_ANIM_DURATION / COLOR_ALPHA_DURATION_MS; + float alpha = Math.min(1f, + mapToRange(interpProgress, 0, 1, 0, maxAlpha, LINEAR)); + mColorOverlay.setAlpha(1f - alpha); + } + } + }); + animatorSet.play(color); + } + + /** + * Checks if the SurfaceControl is invalid (or null) and releases it if so. + * + * @return true if the control was invalid, false otherwise. + */ + private boolean releaseIfInvalid(SurfaceControl control) { + if (control == null) { + return true; + } + if (!control.isValid()) { + control.release(); + return true; + } + return false; + } + + /** + * Captures a screenshot of the wallpaper. + */ + public void tryCaptureWallpaperScreenshot(Window window, int displayId, View rootView, + int wallpaperBlurRadius, Runnable onEndRunnable) { + Log.d(TAG, "tryCaptureWallpaperScreenshot() called"); + + if (mHasValidScreenshot) { + Log.d(TAG, "setupWallpaperScreenshot return: already have a screenshot"); + onEndRunnable.run(); + return; + } + if (WallpaperManager.getInstance(mContext).getWallpaperInfo() != null) { + // Play fallback animation for live wallpapers. + Log.d(TAG, "setupWallpaperScreenshot return: wallpaperInfo is null"); + onEndRunnable.run(); + return; + } + WindowManagerGlobal windowManagerGlobal = WindowManagerGlobal.getInstance(); + if (windowManagerGlobal == null) { + Log.d(TAG, "setupWallpaperScreenshot return: windowManagerGlobal is null"); + onEndRunnable.run(); + return; + } + SurfaceControl rootSurfaceControl = rootView.getViewRootImpl().getSurfaceControl(); + if (rootSurfaceControl == null) { // We do not release if invalid. + Log.d(TAG, "setupWallpaperScreenshot return: rootSurfaceControl is null"); + onEndRunnable.run(); + return; + } + SurfaceControl wallpaperMirror = windowManagerGlobal.mirrorWallpaperSurface( + displayId); + if (releaseIfInvalid(wallpaperMirror)) { + Log.d(TAG, "setupWallpaperScreenshot return: wallpaperMirror=" + wallpaperMirror); + onEndRunnable.run(); + return; + } + + // It's important to set blur to 0 before trying to mirror the surface. + window.setBackgroundBlurRadius(0); + SurfaceControl allSetMirror = SurfaceControl.mirrorSurface(rootSurfaceControl); + + if (releaseIfInvalid(allSetMirror)) { + Log.d(TAG, "setupWallpaperScreenshot return: allSetMirror=" + allSetMirror); + onEndRunnable.run(); + wallpaperMirror.release(); + return; + } + + SurfaceControl rootControl = new SurfaceControl.Builder() + .setName("Wallpaper Screenshot Clip View") + .build(); + SurfaceControl.Transaction transaction = new SurfaceControl.Transaction() + .reparent(wallpaperMirror, rootControl) + .setLayer(wallpaperMirror, -1) + .reparent(allSetMirror, rootControl) + .setLayer(allSetMirror, 0); + Rect captureBounds = new Rect(); + captureBounds.set(0, 0, mWindowWidth, mWindowHeight); + mCaptureTask = new CancellableTask<>( + () -> { + transaction.apply(true); + return ScreenCaptureInternal.captureLayers(rootControl, captureBounds, 1); + }, + MAIN_EXECUTOR, + (ScreenCaptureInternal.ScreenshotHardwareBuffer buffer) -> { + window.setBackgroundBlurRadius(wallpaperBlurRadius); + if (buffer != null) { + mWallpaperView.setImageBitmap(buffer.asBitmap()); + mHasValidScreenshot = true; + } + Log.d(TAG, "capture callback: mHasValidScreenshot=" + mHasValidScreenshot); + }, + () -> { + onEndRunnable.run(); + mCaptureTask = null; + rootControl.release(); + allSetMirror.release(); + wallpaperMirror.release(); + }); + UI_HELPER_EXECUTOR.execute(mCaptureTask); + } + + /** + * @param forceFallbackAnimation True if we should play the fallback animation. + */ + public void setForceFallbackAnimation(boolean forceFallbackAnimation) { + mForceFallbackAnimation = forceFallbackAnimation; + } +} diff --git a/quickstep/src/com/android/quickstep/window/RecentsWindowContext.kt b/quickstep/src/com/android/quickstep/window/RecentsWindowContext.kt new file mode 100644 index 00000000000..6b36b1eb4f3 --- /dev/null +++ b/quickstep/src/com/android/quickstep/window/RecentsWindowContext.kt @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.window + +import android.content.Context +import android.graphics.PixelFormat +import android.view.Display +import android.view.KeyEvent +import android.view.WindowManager +import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS +import android.view.WindowManager.LayoutParams.PRIVATE_FLAG_CONSUME_IME_INSETS +import com.android.launcher3.DeviceProfile +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.util.BaseContext +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.Themes + +/** + * Window context for the Overview overlays. + * + *

+ * Overlays have their own window and need a window context. + */ +abstract class RecentsWindowContext(windowContext: Context, wallpaperColorHints: Int) : + BaseContext( + base = windowContext, + themeResId = Themes.getActivityThemeRes(windowContext, wallpaperColorHints), + destroyOnDetach = false, + ), + DisplayController.DisplayInfoChangeListener { + + private var deviceProfile: DeviceProfile? = null + + private val windowTitle: String = "RecentsWindow" + + protected fun getWindowLayoutParams(): WindowManager.LayoutParams { + return createDefaultWindowLayoutParams( + WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY, + windowTitle, + ) + } + + open fun onRootViewDispatchKeyEvent(event: KeyEvent?): Boolean = false + + init { + DisplayController.INSTANCE.get(this).addChangeListener(this) + } + + override fun destroy() { + super.destroy() + DisplayController.INSTANCE.get(this).removeChangeListener(this) + } + + fun initDeviceProfile() { + deviceProfile = + if (displayId == Display.DEFAULT_DISPLAY) + InvariantDeviceProfile.INSTANCE[this].getDeviceProfile(this) + else InvariantDeviceProfile.INSTANCE[this].createDeviceProfileForSecondaryDisplay(this) + } + + override fun getDeviceProfile(): DeviceProfile { + if (deviceProfile == null) { + initDeviceProfile() + } + return deviceProfile!! + } + + /** + * Creates LayoutParams for adding a view directly to WindowManager as a new window. + * + * @param type The window type to pass to the created WindowManager.LayoutParams. + * @param title The window title to pass to the created WindowManager.LayoutParams. + */ + private fun createDefaultWindowLayoutParams( + type: Int, + title: String, + ): WindowManager.LayoutParams { + val width = getDeviceProfile().deviceProperties.widthPx + val height = getDeviceProfile().deviceProperties.heightPx + + var windowFlags = + (WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or + WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS or + WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED) + + val windowLayoutParams = + WindowManager.LayoutParams(width, height, type, windowFlags, PixelFormat.TRANSLUCENT) + + windowLayoutParams.title = title + windowLayoutParams.fitInsetsTypes = 0 + windowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS + windowLayoutParams.isSystemApplicationOverlay = true + windowLayoutParams.privateFlags = PRIVATE_FLAG_CONSUME_IME_INSETS + + return windowLayoutParams + } +} diff --git a/quickstep/src/com/android/quickstep/window/RecentsWindowFlags.kt b/quickstep/src/com/android/quickstep/window/RecentsWindowFlags.kt new file mode 100644 index 00000000000..232fe8237c8 --- /dev/null +++ b/quickstep/src/com/android/quickstep/window/RecentsWindowFlags.kt @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.window + +//import android.window.DesktopExperienceFlags.DesktopExperienceFlag +import com.android.launcher3.Flags + +// Lawnchair-TODO-Flags: @JvmField +// val enableLauncherOverviewInWindow: DesktopExperienceFlag = +// DesktopExperienceFlag( +// Flags::enableLauncherOverviewInWindow, +// false, +// Flags.FLAG_ENABLE_LAUNCHER_OVERVIEW_IN_WINDOW, +// ) +// Impl: var.isTrue() +object RecentsWindowFlags { + @JvmField + val enableLauncherOverviewInWindow = false + + @JvmField + val enableFallbackOverviewInWindow = false + + @JvmField + val enableOverviewOnConnectedDisplays = false + + @JvmStatic + val enableOverviewInWindow + get() = false + + @JvmStatic fun enableOverviewOnConnectedDisplays() = enableOverviewOnConnectedDisplays +} diff --git a/quickstep/src/com/android/quickstep/window/RecentsWindowManager.kt b/quickstep/src/com/android/quickstep/window/RecentsWindowManager.kt new file mode 100644 index 00000000000..31d85e62160 --- /dev/null +++ b/quickstep/src/com/android/quickstep/window/RecentsWindowManager.kt @@ -0,0 +1,865 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.window + +import android.animation.AnimatorSet +import android.app.ActivityOptions +import android.app.ActivityTaskManager +import android.content.ComponentCallbacks +import android.content.ComponentName +import android.content.Context +import android.content.LocusId +import android.content.pm.ActivityInfo.CONFIG_ORIENTATION +import android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE +import android.content.res.Configuration +import android.os.Bundle +import android.os.IBinder +import android.util.Log +import android.view.Display.DEFAULT_DISPLAY +import android.view.KeyEvent +import android.view.LayoutInflater +import android.view.MotionEvent +import android.view.RemoteAnimationAdapter +import android.view.RemoteAnimationTarget +import android.view.SurfaceControl +import android.view.SurfaceControl.Transaction +import android.view.SurfaceControlViewHost +import android.view.View +import android.window.BackEvent +import android.window.DesktopExperienceFlags +import android.window.OnBackInvokedCallback +import android.window.RemoteTransition +import android.window.SplashScreen +import androidx.annotation.UiThread +import androidx.core.animation.addListener +import androidx.core.view.isVisible +import com.android.app.displaylib.PerDisplayInstanceProviderWithTeardown +import com.android.app.displaylib.PerDisplayRepository +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.BaseActivity +import com.android.launcher3.Flags.enablePredictiveBackInOverview +import com.android.launcher3.LauncherAnimationRunner +import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory +import com.android.launcher3.LauncherRootView +import com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION +import com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_DURATION +import com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_PRE_DELAY +import com.android.launcher3.R +import com.android.launcher3.anim.PendingAnimation +import com.android.launcher3.compat.AccessibilityManagerCompat +import com.android.launcher3.concurrent.annotations.Ui +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.dagger.WindowContext +import com.android.launcher3.desktop.DesktopRecentsTransitionController +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.statemanager.StateManager +import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory +import com.android.launcher3.statemanager.StatefulContainer +import com.android.launcher3.taskbar.TaskbarInteractor +import com.android.launcher3.testing.TestLogging +import com.android.launcher3.testing.shared.TestProtocol.LAUNCHER_ACTIVITY_STOPPED_MESSAGE +import com.android.launcher3.testing.shared.TestProtocol.SEQUENCE_MAIN +import com.android.launcher3.util.ActivityOptionsWrapper +import com.android.launcher3.util.DaggerSingletonObject +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.Executors +import com.android.launcher3.util.LooperExecutor +import com.android.launcher3.util.RunnableList +import com.android.launcher3.util.ScreenOnTracker +import com.android.launcher3.util.ScreenOnTracker.ScreenOnListener +import com.android.launcher3.util.SystemUiController +import com.android.launcher3.util.WallpaperColorHints +import com.android.launcher3.util.window.WindowManagerProxy +import com.android.launcher3.views.BaseDragLayer +import com.android.launcher3.views.ScrimView +import com.android.quickstep.BaseContainerInterface +import com.android.quickstep.FallbackWindowInterface +import com.android.quickstep.HomeVisibilityState +import com.android.quickstep.OverviewComponentObserver +import com.android.quickstep.RecentsAnimationCallbacks +import com.android.quickstep.RecentsAnimationCallbacks.RecentsAnimationListener +import com.android.quickstep.RecentsAnimationController +import com.android.quickstep.RecentsModel +import com.android.quickstep.RemoteAnimationTargets +import com.android.quickstep.SystemUiProxy +import com.android.quickstep.TaskViewUtils +import com.android.quickstep.dagger.QuickstepBaseAppComponent +import com.android.quickstep.fallback.FallbackRecentsStateController +import com.android.quickstep.fallback.FallbackRecentsView +import com.android.quickstep.fallback.RecentsDragLayer +import com.android.quickstep.fallback.RecentsState +import com.android.quickstep.fallback.RecentsState.Companion.BACKGROUND_APP +import com.android.quickstep.fallback.RecentsState.Companion.BG_LAUNCHER +import com.android.quickstep.fallback.RecentsState.Companion.DEFAULT +import com.android.quickstep.fallback.RecentsState.Companion.MODAL_TASK +import com.android.quickstep.fallback.RecentsState.Companion.OVERVIEW_SPLIT_SELECT +import com.android.quickstep.fallback.toLauncherStateOrdinal +import com.android.quickstep.util.RecentsAtomicAnimationFactory +import com.android.quickstep.util.RecentsWindowProtoLogProxy +import com.android.quickstep.util.SplitSelectStateController +import com.android.quickstep.util.TISBindHelper +import com.android.quickstep.views.OverviewActionsView +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.TaskView +import com.android.systemui.animation.back.FlingOnBackAnimationCallback +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.wm.shell.shared.desktopmode.DesktopState +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import javax.inject.Inject + +/** + * Class that will manage RecentsView lifecycle within a window and interface correctly where + * needed. This allows us to run RecentsView in a window where needed. + * + * todo: b/365776320,b/365777482 + * + * To add new protologs, see [RecentsWindowProtoLogProxy]. To enable logging to logcat, see + * [QuickstepProtoLogGroup.Constants.DEBUG_RECENTS_WINDOW] + */ +class RecentsWindowManager +@AssistedInject +constructor( + @Assisted windowContext: Context, + @Assisted private val fallbackWindowInterface: FallbackWindowInterface, + @Assisted private val recentsWindowTracker: RecentsWindowTracker, + wallpaperColorHints: WallpaperColorHints, + private val systemUiProxy: SystemUiProxy, + private val recentsModel: RecentsModel, + private val screenOnTracker: ScreenOnTracker, + private val desktopState: DesktopState, + private val displayController: DisplayController, + @Ui private val uiExecutor: LooperExecutor, +) : + RecentsWindowContext(windowContext, wallpaperColorHints.hints), + RecentsViewContainer, + StatefulContainer, + ComponentCallbacks { + + companion object { + private const val HOME_APPEAR_DURATION: Long = 250 + private const val RECENTS_ANIMATION_TIMEOUT = 1000L + private const val TAG = "RecentsWindowManager" + + @JvmField + val REPOSITORY_INSTANCE = + DaggerSingletonObject>( + QuickstepBaseAppComponent::getRecentsWindowManagerRepository + ) + } + + protected var recentsView: FallbackRecentsView? = null + private var surfaceControlViewHost: SurfaceControlViewHost? = null + private var layoutInflater: LayoutInflater = LayoutInflater.from(this).cloneInContext(this) + private var stateManager: StateManager = + StateManager(this, BG_LAUNCHER) + private var systemUiController: SystemUiController? = null + + private var overviewOverlay: SurfaceControl? = null + private var dragLayer: RecentsDragLayer? = null + private var windowRootView = RecentsWindowRootView(this) + private var windowView: View? = null + private var actionsView: OverviewActionsView<*>? = null + private var scrimView: ScrimView? = null + + private var callbacks: RecentsAnimationCallbacks? = null + + private var taskbarInteractor: TaskbarInteractor? = null + + private var oldConfiguration: Configuration? = null + private var oldRotation: Int = -1 + + private val tisBindHelper: TISBindHelper = TISBindHelper(this) {} + private val splitSelectStateController: SplitSelectStateController = + SplitSelectStateController( + /* container= */ this, + stateManager, + /* depthController= */ null, + statsLogManager, + systemUiProxy, + recentsModel, + /* activityBackCallback= */ null, + ) + + // Callback array that corresponds to events defined in @ActivityEvent + private val eventCallbacks = + listOf(RunnableList(), RunnableList(), RunnableList(), RunnableList()) + + val onBackInvokedCallback = + if (enablePredictiveBackInOverview()) { + object : FlingOnBackAnimationCallback() { + override fun onBackInvokedCompat() { + Log.d(TAG, "onBackInvokedCompat: displayId=$displayId") + stateManager.state.onBackInvoked(this@RecentsWindowManager) + TestLogging.recordEvent(SEQUENCE_MAIN, "onBackInvoked") + } + + override fun onBackStartedCompat(backEvent: BackEvent) { + Log.d(TAG, "onBackStartedCompat: displayId=$displayId") + stateManager.state.onBackStarted(this@RecentsWindowManager) + } + + override fun onBackProgressedCompat(backEvent: BackEvent) { + Log.d( + TAG, + "onBackProgressedCompat: displayId=$displayId, progress=${backEvent.progress}", + ) + stateManager.state.onBackProgressed( + this@RecentsWindowManager, + backEvent.progress, + ) + } + + override fun onBackCancelledCompat() { + Log.d(TAG, "onBackCancelledCompat: displayId=$displayId") + } + } + } else { + OnBackInvokedCallback { + Log.d(TAG, "onBackInvokedCallback: displayId=$displayId") + stateManager.state.onBackInvoked(this@RecentsWindowManager) + TestLogging.recordEvent(SEQUENCE_MAIN, "onBackInvoked") + } + } + + private val homeVisibilityState = systemUiProxy.homeVisibilityState + private val homeVisibilityListener = + object : HomeVisibilityState.VisibilityChangeListener { + override fun onHomeVisibilityChanged(isVisible: Boolean) { + if (isShowing() && !isVisible && isInState(DEFAULT)) { + // handling state where we end recents animation by swiping livetile away + // TODO: animate this switch. + hideRecentsWindow() + } + } + } + + private val recentsAnimationListener = + object : RecentsAnimationListener { + override fun onRecentsAnimationCanceled(thumbnailDatas: HashMap) { + recentAnimationStopped() + } + + override fun onRecentsAnimationFinished(controller: RecentsAnimationController) { + recentAnimationStopped() + } + } + + private val screenChangedListener = ScreenOnListener { isOn -> + if (!isOn) { + hideRecentsWindow() + } + } + + var activityLaunchAnimationRunner: RemoteAnimationFactory? = null + + init { + fallbackWindowInterface.setRecentsWindowManager(this) + if (displayId == DEFAULT_DISPLAY) { + homeVisibilityState.addListener(homeVisibilityListener) + } + + if ( + DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT_BUGFIX.isTrue && + displayId != DEFAULT_DISPLAY && + desktopState.canEnterDesktopModeOrShowAppHandle + ) { + splitSelectStateController.initSplitFromDesktopController(this) + } + + displayController.addChangeListenerForDisplay(this, displayId) + } + + fun createWindowView() { + if (windowView != null) { + return + } + + theme.applyStyle(overviewBlurStyleResId, true) + windowView = layoutInflater.inflate(R.layout.fallback_recents_activity, null) + windowView?.let { + actionsView = it.findViewById(R.id.overview_actions_view) + recentsView = + it.findViewById?>(R.id.overview_panel) + ?.apply { + init( + actionsView, + splitSelectStateController, + DesktopRecentsTransitionController( + stateManager, + systemUiProxy, + iApplicationThread, + /* depthController= */ null, + desktopState, + ), + ) + } + actionsView?.apply { + updateDimension(getDeviceProfile(), recentsView?.lastComputedTaskSize) + updateVerticalMargin(DisplayController.getNavigationMode(this@RecentsWindowManager)) + } + scrimView = it.findViewById(R.id.scrim_view) + dragLayer = it.findViewById(R.id.drag_layer) + + it.systemUiVisibility = + (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or + View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or + View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + + surfaceControlViewHost = SurfaceControlViewHost(this, display, null as IBinder?) + windowRootView.addView(it) + surfaceControlViewHost?.let { scvh -> + scvh.setView(windowRootView, getWindowLayoutParams()) + scvh.surfacePackage?.let { surfacePackage -> + getOverviewOverlay()?.let { overviewOverlay -> + Transaction() + .reparent(surfacePackage.surfaceControl, overviewOverlay) + .show(surfacePackage.surfaceControl) + .apply(true) + } + ?: run { + Log.e( + TAG, + "OverviewOverlay is null, can't reparent surface", + Exception(), + ) + } + } + ?: run { + Log.e(TAG, "SurfaceControlViewHost.SurfacePackage is null", Exception()) + } + } + + it.findOnBackInvokedDispatcher() + ?.registerSystemOnBackInvokedCallback(onBackInvokedCallback) + + recentsWindowTracker.handleCreate(this) + onViewCreated() + } + systemUiController = SystemUiController(windowView) + registerComponentCallbacks(this) + } + + override fun destroy() { + super.destroy() + displayController.removeChangeListenerForDisplay(this, displayId) + fallbackWindowInterface.setRecentsWindowManager(null) + tisBindHelper.onDestroy() + Executors.MAIN_EXECUTOR.execute { + onViewDestroyed() + hideRecentsWindow() + if (windowView?.parent != null) { + surfaceControlViewHost?.release() + surfaceControlViewHost = null + } + windowView + ?.findOnBackInvokedDispatcher() + ?.unregisterOnBackInvokedCallback(onBackInvokedCallback) + callbacks?.removeListener(recentsAnimationListener) + if (displayId == DEFAULT_DISPLAY) { + homeVisibilityState.removeListener(homeVisibilityListener) + } + unregisterComponentCallbacks(this) + recentsWindowTracker.onContextDestroyed(this) + recentsView?.destroy() + recentsView = null + windowView = null + } + } + + override fun handleConfigurationChanged(newConfiguration: Configuration?) { + val diff = oldConfiguration?.let { newConfiguration?.diff(it) } ?: -1 + val rotation = WindowManagerProxy.INSTANCE[this].getRotation(this) + if ((diff and (CONFIG_ORIENTATION or CONFIG_SCREEN_SIZE)) != 0 || rotation != oldRotation) { + onHandleConfigurationChanged(newConfiguration) + } + + oldConfiguration = newConfiguration + oldRotation = rotation + } + + fun onHandleConfigurationChanged(configuration: Configuration?) { + initDeviceProfile() + AbstractFloatingView.closeOpenViews( + this, + true, + AbstractFloatingView.TYPE_ALL and AbstractFloatingView.TYPE_REBIND_SAFE.inv(), + ) + dispatchDeviceProfileChanged() + + (windowView as LauncherRootView?)?.dispatchInsets() + getStateManager().reapplyState(true /* cancelCurrentAnimation */) + dragLayer?.recreateControllers() + } + + override fun onDisplayInfoChanged( + context: Context?, + info: DisplayController.Info?, + flags: Int, + ) { + initDeviceProfile() + surfaceControlViewHost?.relayout(getWindowLayoutParams()) + } + + fun getOverviewOverlay(): SurfaceControl? { + if (overviewOverlay == null) { + overviewOverlay = systemUiProxy.getOverviewOverlayContainer(displayId) + } + return overviewOverlay + } + + @UiThread + fun showRecentsWindow(callbacks: RecentsAnimationCallbacks? = null) { + RecentsWindowProtoLogProxy.logStartRecentsWindow(isShowing(), windowView == null) + if (isShowing()) { + return + } + + createWindowView() + windowRootView.visibility = View.VISIBLE + + this.callbacks = callbacks + callbacks?.addListener(recentsAnimationListener) + screenOnTracker.addListener(screenChangedListener) + } + + override fun onConfigurationChanged(newConfiguration: Configuration) { + Log.d(TAG, "onConfigurationChanged: $newConfiguration") + handleConfigurationChanged(newConfiguration) + } + + override fun onLowMemory() { + // Do nothing + } + + override fun startHome(animated: Boolean, onHomeAnimationComplete: Runnable?) { + startHomeWithRemoteAnimation(onHomeAnimationComplete = onHomeAnimationComplete) + } + + @JvmOverloads + fun startHomeWithRemoteAnimation( + finishRecentsAnimation: Boolean = true, + onHomeAnimationComplete: Runnable? = null, + ) { + val recentsView: RecentsView<*, *>? = getOverviewPanel() + if (recentsView == null) { + onHomeAnimationComplete?.run() + return + } + recentsView.switchToScreenshot { + if (finishRecentsAnimation) { + recentsView.finishRecentsAnimation( + /* toHome= */ true, + { startHomeWithRemoteAnimationInternal(onHomeAnimationComplete) }, + ) + } else { + startHomeWithRemoteAnimationInternal(onHomeAnimationComplete) + } + } + } + + override fun getActivityLaunchOptions(view: View?, item: ItemInfo?): ActivityOptionsWrapper { + val taskView = + view as? TaskView + ?: return super.getActivityLaunchOptions(view, item) + val recentsView = + recentsView ?: return super.getActivityLaunchOptions(view, item) + val onEndCallback = RunnableList() + + activityLaunchAnimationRunner = + object : RemoteAnimationFactory { + override fun onAnimationStart( + transit: Int, + apps: Array?, + wallpapers: Array?, + nonApps: Array?, + callback: LauncherAnimationRunner.AnimationResult?, + ) { + if ( + apps == null || + wallpapers == null || + nonApps == null || + callback == null || + recentsView == null + ) { + return + } + val anim = + composeRecentsLaunchAnimator( + recentsView, + taskView, + apps, + wallpapers, + nonApps, + ) + .apply { + addListener( + onEnd = { + recentsView.resetTaskVisuals() + stateManager.reapplyState() + } + ) + } + callback.setAnimation( + anim, + this@RecentsWindowManager, + { onEndCallback.executeAllAndDestroy() }, + true, /* skipFirstFrame */ + ) + } + + override fun onAnimationCancelled() { + onEndCallback.executeAllAndDestroy() + } + } + + val wrapper = + LauncherAnimationRunner( + uiExecutor.handler, + activityLaunchAnimationRunner, + /* startAtFrontOfQueue=*/ true, + ) + val options = + ActivityOptions.makeRemoteAnimation( + RemoteAnimationAdapter( + wrapper, + RECENTS_LAUNCH_DURATION.toLong(), + (RECENTS_LAUNCH_DURATION - + STATUS_BAR_TRANSITION_DURATION - + STATUS_BAR_TRANSITION_PRE_DELAY) + .toLong(), + ), + RemoteTransition( + wrapper.toRemoteTransition(), + iApplicationThread, + "LaunchFromRecents", + ), + ) + return ActivityOptionsWrapper(options, onEndCallback).apply { + options.apply { + splashScreenStyle = SplashScreen.SPLASH_SCREEN_STYLE_ICON + launchDisplayId = taskView.displayId + pendingIntentBackgroundActivityStartMode = + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED + } + } + } + + /** Composes the animations for a launch from the recents list if possible. */ + private fun composeRecentsLaunchAnimator( + recentsView: RecentsView<*, *>, + taskView: TaskView, + appTargets: Array, + wallpaperTargets: Array, + nonAppTargets: Array, + ): AnimatorSet { + val animatorSet = AnimatorSet() + val pendingAnimation = PendingAnimation(RECENTS_LAUNCH_DURATION.toLong()) + TaskViewUtils.createRecentsWindowAnimator( + recentsView, + taskView, + /* skipViewChanges= */ true, + appTargets, + wallpaperTargets, + nonAppTargets, + /* depthController= */ null, + /* transitionInfo= */ null, + /* appearedTaskId= */ ActivityTaskManager.INVALID_TASK_ID, + pendingAnimation, + ) + animatorSet.play(pendingAnimation.buildAnim()) + return animatorSet + } + + private fun startHomeWithRemoteAnimationInternal(onHomeAnimationComplete: Runnable?) { + val displayId = displayId + val animationToHomeFactory = + RemoteAnimationFactory { + _: Int, + appTargets: Array?, + wallpaperTargets: Array?, + nonAppTargets: Array?, + result: LauncherAnimationRunner.AnimationResult? -> + result ?: return@RemoteAnimationFactory + val controller = + getStateManager() + .createAnimationToNewWorkspace(BG_LAUNCHER, HOME_APPEAR_DURATION) + controller.dispatchOnStart() + val targets = + RemoteAnimationTargets( + appTargets, + wallpaperTargets, + nonAppTargets, + RemoteAnimationTarget.MODE_OPENING, + ) + targets.apps.forEach { Transaction().setAlpha(it.leash, 1f).apply() } + val anim = + AnimatorSet().apply { + play(controller.animationPlayer) + duration = HOME_APPEAR_DURATION + } + result.setAnimation( + anim, + this@RecentsWindowManager, + { + getStateManager().goToState(BG_LAUNCHER, true) + hideRecentsWindow() + onHomeAnimationComplete?.run() + }, + true, /* skipFirstFrame */ + ) + } + val runner = LauncherAnimationRunner(mainThreadHandler, animationToHomeFactory, true) + val options = + ActivityOptions.makeRemoteAnimation( + RemoteAnimationAdapter(runner, HOME_APPEAR_DURATION, 0), + RemoteTransition( + runner.toRemoteTransition(), + iApplicationThread, + "StartHomeFromRecents", + ), + ) + options.launchDisplayId = displayId + OverviewComponentObserver.startHomeIntentSafely(this, options.toBundle(), TAG, displayId) + stateManager.moveToRestState() + } + + fun hideRecentsWindow() { + RecentsWindowProtoLogProxy.logCleanup(isShowing()) + if (isShowing()) { + AbstractFloatingView.closeAllOpenViews(this, /* animate= */ false) + recentsView?.viewRootImpl?.touchModeChanged(true) + windowRootView.visibility = View.GONE + AccessibilityManagerCompat.sendTestProtocolEventToTest( + this, + LAUNCHER_ACTIVITY_STOPPED_MESSAGE, + ) + } + stateManager.moveToRestState() + callbacks?.removeListener(recentsAnimationListener) + callbacks = null + screenOnTracker.removeListener(screenChangedListener) + } + + private fun isShowing(): Boolean { + return windowView?.parent != null && windowRootView.isVisible + } + + private fun recentAnimationStopped() { + if (isInState(BACKGROUND_APP)) { + hideRecentsWindow() + } + } + + override fun getComponentName(): ComponentName { + return ComponentName(this, RecentsWindowManager::class.java) + } + + override fun canStartHomeSafely(): Boolean { + val overviewCommandHelper = tisBindHelper.overviewCommandHelper + return overviewCommandHelper == null || + overviewCommandHelper.canStartHomeSafely() || + displayId != DEFAULT_DISPLAY + } + + override fun setTaskbarInteractor(taskbarInteractor: TaskbarInteractor?) { + this.taskbarInteractor = taskbarInteractor + } + + override fun getTaskbarInteractor(): TaskbarInteractor? { + return taskbarInteractor + } + + override fun collectStateHandlers(out: MutableList>?) { + out!!.add(FallbackRecentsStateController(this)) + } + + override fun getStateManager(): StateManager { + return this.stateManager + } + + override fun shouldAnimateStateChange(): Boolean { + return false + } + + override fun isInState(state: RecentsState?): Boolean { + return stateManager.state == state + } + + override fun onStateSetStart(state: RecentsState) { + super.onStateSetStart(state) + RecentsWindowProtoLogProxy.logOnStateSetStart(state.toString()) + } + + override fun onStateSetEnd(state: RecentsState) { + super.onStateSetEnd(state) + RecentsWindowProtoLogProxy.logOnStateSetEnd(state.toString()) + if (!state.isRecentsViewVisible()) { + hideRecentsWindow() + } + AccessibilityManagerCompat.sendStateEventToTest(baseContext, state.toLauncherStateOrdinal()) + } + + override fun onRepeatStateSetAborted(state: RecentsState) { + super.onRepeatStateSetAborted(state) + RecentsWindowProtoLogProxy.logOnRepeatStateSetAborted(state.toString()) + if (!state.isRecentsViewVisible()) { + hideRecentsWindow() + } + } + + override fun getSystemUiController(): SystemUiController? { + if (systemUiController == null) { + systemUiController = SystemUiController(rootView) + } + return systemUiController + } + + override fun getScrimView(): ScrimView? { + return scrimView + } + + override fun ?> getContainerInterface(): T { + return fallbackWindowInterface as T + } + + override fun getOverviewPanel(): T { + return recentsView as T + } + + override fun getSplitSelectStateController(): SplitSelectStateController { + return splitSelectStateController + } + + override fun goToRecentsState(recentsState: RecentsState, animated: Boolean) { + stateManager.goToState(recentsState, animated) + } + + override fun getRootView(): View { + return windowRootView + } + + override fun getDragLayer(): BaseDragLayer { + return dragLayer!! + } + + override fun dispatchGenericMotionEvent(ev: MotionEvent?): Boolean { + return windowRootView.dispatchGenericMotionEvent(ev) + } + + override fun dispatchKeyEvent(ev: KeyEvent?): Boolean { + return windowRootView.dispatchKeyEvent(ev) + } + + override fun onRootViewDispatchKeyEvent(event: KeyEvent?): Boolean { + TestLogging.recordKeyEvent(SEQUENCE_MAIN, "Key event", event) + return if ( + event?.action != KeyEvent.ACTION_DOWN || event.keyCode != KeyEvent.KEYCODE_ESCAPE + ) { + super.onRootViewDispatchKeyEvent(event) + } else if (isInState(OVERVIEW_SPLIT_SELECT) || isInState(MODAL_TASK)) { + stateManager.goToState(DEFAULT, true) + true + } else if (isInState(DEFAULT)) { + stateManager.state.onBackInvoked(this@RecentsWindowManager) + true + } else { + super.onRootViewDispatchKeyEvent(event) + } + } + + override fun getActionsView(): OverviewActionsView<*>? { + return actionsView + } + + override fun addForceInvisibleFlag(flag: Int) {} + + override fun clearForceInvisibleFlag(flag: Int) {} + + override fun setLocusContext(id: LocusId?, bundle: Bundle?) { + // no op + } + + override fun isStarted(): Boolean { + return isShowing() && stateManager.state.isRecentsViewVisible() + } + + /** Adds a callback for the provided activity event */ + override fun addEventCallback(@BaseActivity.ActivityEvent event: Int, callback: Runnable?) { + eventCallbacks[event].add(callback) + } + + /** Removes a previously added callback */ + override fun removeEventCallback(@BaseActivity.ActivityEvent event: Int, callback: Runnable?) { + eventCallbacks[event].remove(callback) + } + + override fun runOnBindToTouchInteractionService(r: Runnable?) { + tisBindHelper.runOnBindToTouchInteractionService(r) + } + + override fun returnToHomescreen() { + startHomeWithRemoteAnimation() + } + + override fun isRecentsViewVisible(): Boolean { + return isShowing() || getStateManager().state!!.isRecentsViewVisible() + } + + override fun createAtomicAnimationFactory(): AtomicAnimationFactory { + return RecentsAtomicAnimationFactory(this) + } + + override fun getOverviewBlurStyleResId(): Int { + return R.style.OverviewBlurFallbackStyle + } + + @AssistedFactory + interface Factory { + /** Creates a new instance of [RecentsWindowManager] for a given [context]. */ + fun create( + @WindowContext context: Context, + fallbackWindowInterface: FallbackWindowInterface, + recentsWindowTracker: RecentsWindowTracker, + ): RecentsWindowManager + } +} + +@LauncherAppSingleton +class RecentsWindowManagerInstanceProvider +@Inject +constructor( + private val factory: RecentsWindowManager.Factory, + @WindowContext private val windowContextRepository: PerDisplayRepository, + private val fallbackWindowInterfaceRepository: PerDisplayRepository, + private val recentsWindowTrackerRepository: PerDisplayRepository, +) : PerDisplayInstanceProviderWithTeardown { + override fun createInstance(displayId: Int) = + windowContextRepository[displayId]?.let { windowContext -> + fallbackWindowInterfaceRepository[displayId]?.let { fallbackWindowInterface -> + recentsWindowTrackerRepository[displayId]?.let { recentsWindowTracker -> + factory.create(windowContext, fallbackWindowInterface, recentsWindowTracker) + } + } + } + + override fun destroyInstance(instance: RecentsWindowManager) { + instance.destroy() + } +} diff --git a/quickstep/src/com/android/quickstep/window/RecentsWindowRootView.kt b/quickstep/src/com/android/quickstep/window/RecentsWindowRootView.kt new file mode 100644 index 00000000000..04860d93935 --- /dev/null +++ b/quickstep/src/com/android/quickstep/window/RecentsWindowRootView.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.window + +import android.view.KeyEvent +import android.widget.FrameLayout + +/** + * A root view for the Recents Window that can be used to intercept events that would otherwise go + * to the Launcher activity. + */ +class RecentsWindowRootView(private val recentsWindowContext : RecentsWindowContext) + : FrameLayout(recentsWindowContext.asContext()) { + + override fun dispatchKeyEvent(event: KeyEvent?): Boolean { + return recentsWindowContext.onRootViewDispatchKeyEvent(event) + || super.dispatchKeyEvent(event) + } +} \ No newline at end of file diff --git a/quickstep/src/com/android/quickstep/window/RecentsWindowSwipeHandler.java b/quickstep/src/com/android/quickstep/window/RecentsWindowSwipeHandler.java new file mode 100644 index 00000000000..083129d5eeb --- /dev/null +++ b/quickstep/src/com/android/quickstep/window/RecentsWindowSwipeHandler.java @@ -0,0 +1,514 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.window; + +import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; +import static android.content.Intent.EXTRA_COMPONENT_NAME; +import static android.content.Intent.EXTRA_USER; + +import static com.android.app.animation.Interpolators.ACCELERATE; +import static com.android.launcher3.GestureNavContract.EXTRA_ENABLE_GESTURE_CONTRACT; +import static com.android.launcher3.GestureNavContract.EXTRA_GESTURE_CONTRACT; +import static com.android.launcher3.GestureNavContract.EXTRA_ICON_POSITION; +import static com.android.launcher3.GestureNavContract.EXTRA_ICON_SURFACE; +import static com.android.launcher3.GestureNavContract.EXTRA_ON_FINISH_CALLBACK; +import static com.android.launcher3.GestureNavContract.EXTRA_REMOTE_CALLBACK; +import static com.android.launcher3.anim.AnimatorListeners.forEndCallback; +import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely; + +import android.animation.Animator; +import android.app.ActivityManager.RunningTaskInfo; +import android.app.ActivityOptions; +import android.content.Context; +import android.content.Intent; +import android.graphics.Matrix; +import android.graphics.PointF; +import android.graphics.Rect; +import android.graphics.RectF; +import android.os.Bundle; +import android.os.Handler; +import android.os.IBinder; +import android.os.Looper; +import android.os.Message; +import android.os.Messenger; +import android.os.ParcelUuid; +import android.os.RemoteException; +import android.os.UserHandle; +import android.util.Log; +import android.view.RemoteAnimationTarget; +import android.view.Surface; +import android.view.SurfaceControl; +import android.view.SurfaceControl.Transaction; +import android.view.animation.Interpolator; +import android.window.TransitionInfo; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; + +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Utilities; +import com.android.launcher3.anim.AnimatedFloat; +import com.android.launcher3.anim.AnimationSuccessListener; +import com.android.launcher3.anim.AnimatorPlaybackController; +import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.anim.SpringAnimationBuilder; +import com.android.launcher3.states.StateAnimationConfig; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.MSDLPlayerWrapper; +import com.android.quickstep.AbsSwipeUpHandler; +import com.android.quickstep.GestureState; +import com.android.quickstep.RecentsAnimationController; +import com.android.quickstep.RecentsAnimationDeviceState; +import com.android.quickstep.RecentsAnimationTargets; +import com.android.quickstep.RotationTouchHelper; +import com.android.quickstep.TaskAnimationManager; +import com.android.quickstep.fallback.FallbackRecentsView; +import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.RectFSpringAnim; +import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; +import com.android.quickstep.util.TransformParams; +import com.android.quickstep.views.TaskView; +import com.android.systemui.shared.recents.model.Task.TaskKey; +import com.android.systemui.shared.system.InputConsumerController; + +import java.lang.ref.WeakReference; +import java.util.List; +import java.util.UUID; +import java.util.function.Consumer; + +/** + * Handles the navigation gestures when a 3rd party launcher is the default home activity. + * + * Bugs: b/365775417 + */ +public class RecentsWindowSwipeHandler extends AbsSwipeUpHandler, RecentsState> { + + private static final String TAG = "RecentsWindowSwipeHandler"; + + /** + * Message used for receiving gesture nav contract information. We use a static messenger to + * avoid leaking too make binders in case the receiving launcher does not handle the contract + * properly. + */ + private static StaticMessageReceiver sMessageReceiver = null; + + private FallbackHomeAnimationFactory mActiveAnimationFactory; + private final RecentsWindowManager mRecentsWindowManager; + + private final boolean mRunningOverHome; + + private final Matrix mTmpMatrix = new Matrix(); + private float mMaxLauncherScale = 1; + + private boolean mAppCanEnterPip; + + public RecentsWindowSwipeHandler(Context context, TaskAnimationManager taskAnimationManager, + RecentsAnimationDeviceState deviceState, RotationTouchHelper rotationTouchHelper, + RecentsWindowManager recentsWindowManager, GestureState gestureState, long touchTimeMs, + boolean continuingLastGesture, InputConsumerController inputConsumer, + MSDLPlayerWrapper msdlPlayerWrapper) { + super(context, taskAnimationManager, deviceState, rotationTouchHelper, gestureState, + touchTimeMs, continuingLastGesture, inputConsumer, msdlPlayerWrapper); + + mRecentsWindowManager = recentsWindowManager; + mRunningOverHome = mGestureState.getRunningTask() != null + && mGestureState.getRunningTask().isHomeTask(); + + initTransformParams(); + } + + @Override + public void onRecentsAnimationStart(RecentsAnimationController controller, + RecentsAnimationTargets targets, @Nullable TransitionInfo transitionInfo) { + super.onRecentsAnimationStart(controller, targets, transitionInfo); + initTransformParams(); + } + + private void initTransformParams() { + if (mActiveAnimationFactory != null) { + mActiveAnimationFactory.initTransformParams(); + return; + } + runActionOnRemoteHandles(remoteTargetHandle -> + remoteTargetHandle.getTransformParams().setHomeBuilderProxy( + RecentsWindowSwipeHandler.this::updateHomeActivityTransformDuringSwipeUp)); + } + + @Override + protected void initTransitionEndpoints(DeviceProfile dp) { + super.initTransitionEndpoints(dp); + if (mRunningOverHome) { + // Full screen scale should be independent of remote target handle + mMaxLauncherScale = 1 / mRemoteTargetHandles[0].getTaskViewSimulator() + .getFullScreenScale(); + } + } + + @UiThread + @Override + protected void animateGestureEnd( + float startShift, + float endShift, + long duration, + @NonNull Interpolator interpolator, + @NonNull GestureState.GestureEndTarget endTarget, + @NonNull PointF velocityPxPerMs) { + boolean fromHomeToHome = mRunningOverHome + && endTarget == GestureState.GestureEndTarget.HOME; + if (fromHomeToHome) { + mRecentsWindowManager.startHomeWithRemoteAnimation(/* finishRecentsAnimation= */ false); + } + super.animateGestureEnd( + startShift, + endShift, + fromHomeToHome ? 0 : duration, + interpolator, + endTarget, + velocityPxPerMs); + } + + private void updateHomeActivityTransformDuringSwipeUp(SurfaceProperties builder, + RemoteAnimationTarget app, TransformParams params) { + if (mActiveAnimationFactory != null) { + return; + } + setHomeScaleAndAlpha( + builder, + app, + mCurrentShift.value, + mRunningOverHome ? Utilities.boundToRange(1 - mCurrentShift.value, 0, 1) : 0f); + } + + private void setHomeScaleAndAlpha(SurfaceProperties builder, + RemoteAnimationTarget app, float verticalShift, float alpha) { + if (app.windowConfiguration.getActivityType() != ACTIVITY_TYPE_HOME) { + return; + } + float scale = Utilities.mapRange(verticalShift, 1, mMaxLauncherScale); + mTmpMatrix.setScale(scale, scale, + app.localBounds.exactCenterX(), app.localBounds.exactCenterY()); + builder.setMatrix(mTmpMatrix).setAlpha(alpha); + builder.setShow(); + } + + @Override + protected HomeAnimationFactory createHomeAnimationFactory( + List launchCookies, + long duration, + boolean isTargetTranslucent, + boolean appCanEnterPip, + RemoteAnimationTarget runningTaskTarget, + @Nullable TaskView targetTaskView) { + mAppCanEnterPip = appCanEnterPip; + if (appCanEnterPip) { + return new FallbackPipToHomeAnimationFactory(); + } + mActiveAnimationFactory = new FallbackHomeAnimationFactory(duration); + startHomeIntent( + mActiveAnimationFactory, runningTaskTarget, "RecentsWindowSwipeHandler-home"); + return mActiveAnimationFactory; + } + + private void startHomeIntent( + @Nullable FallbackHomeAnimationFactory gestureContractAnimationFactory, + @Nullable RemoteAnimationTarget runningTaskTarget, + @NonNull String reason) { + ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0); + Intent intent = new Intent(mGestureState.getHomeIntent()); + if (gestureContractAnimationFactory != null && runningTaskTarget != null) { + gestureContractAnimationFactory.addGestureContract(intent, runningTaskTarget.taskInfo); + } + startHomeIntentSafely(mContext, intent, options.toBundle(), reason); + } + + @Override + protected void finishRecentsControllerToHome(Runnable callback) { + final Runnable recentsCallback; + // TODO(b/404866791): check if this is actually necessary for this recents-in-window class + if (mAppCanEnterPip) { + // Make sure Launcher is resumed after auto-enter-pip transition to actually trigger + // the PiP task appearing. + recentsCallback = () -> mRecentsWindowManager.startHomeWithRemoteAnimation( + /* finishRecentsAnimation= */ true, /* onHomeAnimationComplete= */ callback); + } else { + recentsCallback = callback; + } + if (mRecentsView != null) { + mRecentsView.cleanupRemoteTargets(); + } + mRecentsAnimationController.finish( + /* toHome= */ true, + recentsCallback, + /* sendUserLeaveHint= */ true, + /* reason= */ new ActiveGestureLog.CompoundString( + "RecentsWindowSwipeHandler.finishRecentsControllerToHome")); + } + + @Override + protected void switchToScreenshot() { + if (mRunningOverHome) { + // When the current task is home, then we don't need to capture anything + mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED); + } else { + super.switchToScreenshot(); + } + } + + @Override + protected void notifyGestureAnimationStartToRecents() { + if (!mRunningOverHome) { + super.notifyGestureAnimationStartToRecents(); + return; + } + if ((DisplayController.getNavigationMode(mContext).hasGestures + || mGestureState.isTrackpadGesture()) + && mRecentsView != null) { + mRecentsView.onGestureAnimationStartOnHome( + mGestureState.getRunningTask().getPlaceholderGroupedTaskInfo( + /* splitTaskIds = */ null)); + } + } + + private class FallbackPipToHomeAnimationFactory extends HomeAnimationFactory { + @NonNull + @Override + public AnimatorPlaybackController createActivityAnimationToHome() { + // copied from {@link LauncherSwipeHandlerV2.LauncherHomeAnimationFactory} + long accuracy = 2 * Math.max(mDp.getDeviceProperties().getWidthPx(), + mDp.getDeviceProperties().getHeightPx()); + return mRecentsWindowManager + .getStateManager() + .createAnimationToNewWorkspace( + RecentsState.HOME, accuracy, StateAnimationConfig.SKIP_ALL_ANIMATIONS); + } + } + + private class FallbackHomeAnimationFactory extends HomeAnimationFactory + implements Consumer { + private final Rect mTempRect = new Rect(); + + private final TransformParams mTransformParams = new TransformParams(); + private final AnimatedFloat mHomeAlpha = new AnimatedFloat(this::updateAppTransforms); + private final AnimatedFloat mVerticalShiftForScale = + new AnimatedFloat(this::updateAppTransforms); + private final AnimatedFloat mRecentsAlpha = new AnimatedFloat(this::updateAppTransforms); + + private final RectF mTargetRect = new RectF(); + private SurfaceControl mSurfaceControl; + + private boolean mAnimationFinished; + private Message mOnFinishCallback; + + private final long mDuration; + + private RectFSpringAnim mSpringAnim; + FallbackHomeAnimationFactory(long duration) { + mDuration = duration; + + if (mRunningOverHome) { + mVerticalShiftForScale.value = mCurrentShift.value; + } + mRecentsAlpha.value = 1; + mHomeAlpha.value = 0; + + initTransformParams(); + } + + @NonNull + @Override + public RectF getWindowTargetRect() { + if (mTargetRect.isEmpty()) { + mTargetRect.set(super.getWindowTargetRect()); + } + return mTargetRect; + } + + @NonNull + @Override + public AnimatorPlaybackController createActivityAnimationToHome() { + // TODO(b/377678992): Implement a new AtomicAnimationFactory for RecentsWindowManager + PendingAnimation pa = new PendingAnimation(mDuration); + pa.setFloat(mRecentsAlpha, AnimatedFloat.VALUE, 0, ACCELERATE); + pa.setFloat(mHomeAlpha, AnimatedFloat.VALUE, 1, ACCELERATE); + pa.addListener(new AnimationSuccessListener() { + @Override + public void onAnimationSuccess(Animator animator) { + mRecentsWindowManager + .getStateManager() + .goToState(RecentsState.HOME, false); + } + }); + return pa.createPlaybackController(); + } + + @Override + public void playAtomicAnimation(float velocity) { + if (!mRunningOverHome) { + return; + } + // Spring back launcher scale + new SpringAnimationBuilder(mContext) + .setStartValue(mVerticalShiftForScale.value) + .setEndValue(0) + .setStartVelocity(-velocity / mTransitionDragLength) + .setMinimumVisibleChange(1f / mDp.getDeviceProperties().getHeightPx()) + .setDampingRatio(0.6f) + .setStiffness(800) + .build(mVerticalShiftForScale, AnimatedFloat.VALUE) + .start(); + } + + @Override + public void setAnimation(RectFSpringAnim anim) { + mSpringAnim = anim; + mSpringAnim.addAnimatorListener(forEndCallback(this::onRectAnimationEnd)); + } + + private void initTransformParams() { + runActionOnRemoteHandles(remoteTargetHandle -> + remoteTargetHandle.getTransformParams().setHomeBuilderProxy( + FallbackHomeAnimationFactory.this + ::updateHomeActivityTransformDuringHomeAnim)); + + mTransformParams.setHomeBuilderProxy(FallbackHomeAnimationFactory.this + ::updateHomeActivityTransformDuringHomeAnim); + mTransformParams.setTargetSet(mRecentsAnimationTargets); + } + + private void updateRecentsActivityTransformDuringHomeAnim(SurfaceProperties builder, + RemoteAnimationTarget app, TransformParams params) { + if (app.mode != mRecentsAnimationTargets.targetMode) { + return; + } + builder.setAlpha(mRecentsAlpha.value); + } + + private void updateAppTransforms() { + mTransformParams.applySurfaceParams( + mTransformParams.createSurfaceParams(FallbackHomeAnimationFactory.this + ::updateRecentsActivityTransformDuringHomeAnim)); + } + + private void updateHomeActivityTransformDuringHomeAnim(SurfaceProperties builder, + RemoteAnimationTarget app, TransformParams params) { + setHomeScaleAndAlpha(builder, app, mVerticalShiftForScale.value, mHomeAlpha.value); + } + + private void onRectAnimationEnd() { + mAnimationFinished = true; + maybeSendEndMessage(); + } + + private void maybeSendEndMessage() { + if (mAnimationFinished && mOnFinishCallback != null) { + try { + mOnFinishCallback.replyTo.send(mOnFinishCallback); + } catch (RemoteException e) { + Log.e(TAG, "Error sending icon position", e); + } + } + } + + @Override + public void accept(Message msg) { + try { + Bundle data = msg.getData(); + RectF position = data.getParcelable(EXTRA_ICON_POSITION); + if (!position.isEmpty()) { + mSurfaceControl = data.getParcelable(EXTRA_ICON_SURFACE); + mTargetRect.set(position); + if (mSpringAnim != null) { + mSpringAnim.onTargetPositionChanged(); + } + } + mOnFinishCallback = data.getParcelable(EXTRA_ON_FINISH_CALLBACK); + maybeSendEndMessage(); + } catch (Exception e) { + // Ignore + } + } + + @Override + public void update(RectF currentRect, float progress, float radius, int overlayAlpha) { + if (mSurfaceControl != null) { + currentRect.roundOut(mTempRect); + Transaction t = new Transaction(); + try { + t.setGeometry(mSurfaceControl, null, mTempRect, Surface.ROTATION_0); + t.apply(); + } catch (RuntimeException e) { + // Ignore + } + } + } + + private void addGestureContract(Intent intent, RunningTaskInfo runningTaskInfo) { + if (mRunningOverHome || runningTaskInfo == null) { + return; + } + + TaskKey key = new TaskKey(runningTaskInfo); + if (key.getComponent() != null) { + if (sMessageReceiver == null) { + sMessageReceiver = new StaticMessageReceiver(); + } + + Bundle gestureNavContract = new Bundle(); + gestureNavContract.putBoolean( + EXTRA_ENABLE_GESTURE_CONTRACT, mRemoteTargetHandles.length <= 1); + gestureNavContract.putParcelable(EXTRA_COMPONENT_NAME, key.getComponent()); + gestureNavContract.putParcelable(EXTRA_USER, UserHandle.of(key.userId)); + gestureNavContract.putParcelable( + EXTRA_REMOTE_CALLBACK, sMessageReceiver.newCallback(this)); + intent.putExtra(EXTRA_GESTURE_CONTRACT, gestureNavContract); + } + } + } + + private static class StaticMessageReceiver implements Handler.Callback { + + private final Messenger mMessenger = + new Messenger(new Handler(Looper.getMainLooper(), this)); + + private ParcelUuid mCurrentUID = new ParcelUuid(UUID.randomUUID()); + private WeakReference> mCurrentCallback = new WeakReference<>(null); + + public Message newCallback(Consumer callback) { + mCurrentUID = new ParcelUuid(UUID.randomUUID()); + mCurrentCallback = new WeakReference<>(callback); + + Message msg = Message.obtain(); + msg.replyTo = mMessenger; + msg.obj = mCurrentUID; + return msg; + } + + @Override + public boolean handleMessage(@NonNull Message message) { + if (mCurrentUID.equals(message.obj)) { + Consumer consumer = mCurrentCallback.get(); + if (consumer != null) { + consumer.accept(message); + return true; + } + } + return false; + } + } +} diff --git a/quickstep/src/com/android/quickstep/window/RecentsWindowTracker.kt b/quickstep/src/com/android/quickstep/window/RecentsWindowTracker.kt new file mode 100644 index 00000000000..d783f374fc4 --- /dev/null +++ b/quickstep/src/com/android/quickstep/window/RecentsWindowTracker.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.window + +import com.android.app.displaylib.PerDisplayRepository +import com.android.launcher3.util.ContextTracker +import com.android.launcher3.util.DaggerSingletonObject +import com.android.quickstep.dagger.QuickstepBaseAppComponent + +class RecentsWindowTracker : ContextTracker() { + + // Always return true since the recents window is meant to be agnostic of the launcher and + // will not receive start callbacks. + override fun isHomeStarted(context: RecentsWindowManager?) = true + + companion object { + + @JvmField + val REPOSITORY_INSTANCE = + DaggerSingletonObject>( + QuickstepBaseAppComponent::getRecentsWindowTrackerRepository + ) + } +} diff --git a/quickstep/src_protolog/com/android/launcher3/util/OverviewCommandHelperProtoLogProxy.java b/quickstep/src_protolog/com/android/launcher3/util/OverviewCommandHelperProtoLogProxy.java new file mode 100644 index 00000000000..43160381d19 --- /dev/null +++ b/quickstep/src_protolog/com/android/launcher3/util/OverviewCommandHelperProtoLogProxy.java @@ -0,0 +1,244 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.util; + +import static com.android.quickstep.util.QuickstepProtoLogGroup.OVERVIEW_COMMAND_HELPER; +import static com.android.quickstep.util.QuickstepProtoLogGroup.isProtoLogInitialized; + +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.internal.protolog.ProtoLog; +import com.android.quickstep.util.QuickstepProtoLogGroup; + +/** + * Proxy class used for OverviewCommandHelper ProtoLog support. (e.g. for 3 button nav) + */ +public class OverviewCommandHelperProtoLogProxy { + private static final QuickstepProtoLogGroup PROTO_LOG_GROUP = OVERVIEW_COMMAND_HELPER; + + private static boolean willProtoLog() { + return isProtoLogInitialized(); + } + + private static void logToLogcatIfNeeded(String message, Object... args) { + if (!willProtoLog() || !PROTO_LOG_GROUP.isLogToLogcat()) { + Log.d(PROTO_LOG_GROUP.getTag(), String.format(message, args)); + } + } + + private static void logEToLogcatIfNeeded(String message, Object... args) { + if (!willProtoLog() || !PROTO_LOG_GROUP.isLogToLogcat()) { + Log.e(PROTO_LOG_GROUP.getTag(), String.format(message, args)); + } + } + + public static void logCommandQueueFull(@NonNull Object type, @NonNull Object commandQueue) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "command not added: %s - queue is full (%s).", type, + commandQueue); + } + logToLogcatIfNeeded("command not added: %s - queue is full (%s).", type, commandQueue); + } + + public static void logCommandAdded(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "command added: %s", command); + } + logToLogcatIfNeeded("command added: %s", command); + } + + public static void logCommandExecuted(@NonNull Object command, int queueSize) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "execute: %s - queue size: %d", command, queueSize); + } + logToLogcatIfNeeded("execute: %s - queue size: %d", command, queueSize); + } + + public static void logCommandNotExecuted(@NonNull Object command, int queueSize) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "command not executed: %s - queue size: %d", command, + queueSize); + } + logToLogcatIfNeeded("command not executed: %s - queue size: %d", command, queueSize); + } + + public static void logClearPendingCommands(@NonNull Object commandQueue) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "clearing pending commands: %s", commandQueue); + } + logToLogcatIfNeeded("clearing pending commands: %s", commandQueue); + } + + public static void logNoPendingCommands() { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "no pending commands to be executed."); + } + logToLogcatIfNeeded("no pending commands to be executed."); + } + + public static void logExecutingCommand(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "executing command: %s", command); + } + logToLogcatIfNeeded("executing command: %s", command); + } + + public static void logExecutingCommand(@NonNull Object command, @Nullable Object recentsView) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "executing command: %s - visibleRecentsView: %s", command, + recentsView); + } + logToLogcatIfNeeded("executing command: %s - visibleRecentsView: %s", command, recentsView); + } + + public static void logExecutedCommandWithResult(@NonNull Object command, boolean isCompleted) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "command executed: %s with result: %b", command, + isCompleted); + } + logToLogcatIfNeeded("command executed: %s with result: %b", command, isCompleted); + } + + public static void logWaitingForCommandCallback(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "waiting for command callback: %s", command); + } + logToLogcatIfNeeded("waiting for command callback: %s", command); + } + + public static void logLaunchingTaskCallback(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "launching task callback: %s", command); + } + logToLogcatIfNeeded("launching task callback: %s", command); + } + + public static void logLaunchingTaskWaitingForCallback(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "launching task - waiting for callback: %s", command); + } + logToLogcatIfNeeded("launching task - waiting for callback: %s", command); + } + + public static void logSwitchingToOverviewStateStart(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "switching to Overview state - onAnimationStart: %s", + command); + } + logToLogcatIfNeeded("switching to Overview state - onAnimationStart: %s", command); + } + + public static void logSwitchingToOverviewStateEnd(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "switching to Overview state - onAnimationEnd: %s", + command); + } + logToLogcatIfNeeded("switching to Overview state - onAnimationEnd: %s", command); + } + + public static void logSwitchingToOverviewStateWaiting(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "switching to Overview state - waiting: %s", command); + } + logToLogcatIfNeeded("switching to Overview state - waiting: %s", command); + } + + public static void logRecentsAnimStarted(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "recents animation started: %s", command); + } + logToLogcatIfNeeded("recents animation started: %s", command); + } + + public static void logOnInitBackgroundStateUI(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "recents animation started - onInitBackgroundStateUI: %s", + command); + } + logToLogcatIfNeeded("recents animation started - onInitBackgroundStateUI: %s", command); + } + + public static void logRecentsAnimCanceled(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "recents animation canceled: %s", command); + } + logToLogcatIfNeeded("recents animation canceled: %s", command); + } + + public static void logSwitchingViaRecentsAnim(@NonNull Object command, + @NonNull Object endTarget) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "switching via recents animation - onGestureStarted: %s with end target: %s", + command, endTarget); + } + logToLogcatIfNeeded( + "switching via recents animation - onGestureStarted: %s with end target: %s", + command, endTarget); + } + + public static void logSwitchingViaRecentsAnimComplete(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "switching via recents animation - onTransitionComplete: %s", command); + } + logToLogcatIfNeeded("switching via recents animation - onTransitionComplete: %s", command); + } + + public static void logCommandFinishedButNotScheduled(@Nullable Object nextCommandInQueue, + @NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "next task not scheduled. First pending command type is %s - command type is:" + + " %s", nextCommandInQueue, command); + } + logToLogcatIfNeeded( + "next task not scheduled. First pending command type is %s - command type is:" + + " %s", nextCommandInQueue, command); + } + + public static void logCommandFinishedSuccessfully(@NonNull Object command) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "command executed successfully: %s", command); + } + logToLogcatIfNeeded("command executed successfully: %s", command); + } + + public static void logCommandCanceled(@NonNull Object command, @Nullable Throwable throwable) { + if (willProtoLog()) { + ProtoLog.e(PROTO_LOG_GROUP, "command canceled: %s - %s", command, throwable); + } + logEToLogcatIfNeeded("command canceled: %s - %s", command, throwable); + } + + public static void logOnNewIntent(boolean alreadyOnHome, boolean shouldMoveToDefaultScreen, + String intentAction, boolean internalStateHandled) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "Launcher.onNewIntent: alreadyOnHome: %b, shouldMoveToDefaultScreen: %b, " + + "intentAction: %s, internalStateHandled: %b", alreadyOnHome, + shouldMoveToDefaultScreen, intentAction, internalStateHandled); + } + logToLogcatIfNeeded( + "Launcher.onNewIntent: alreadyOnHome: %b, shouldMoveToDefaultScreen: %b, " + + "intentAction: %s, internalStateHandled: %b", alreadyOnHome, + shouldMoveToDefaultScreen, intentAction, internalStateHandled); + } +} diff --git a/quickstep/src_protolog/com/android/launcher3/util/StateManagerProtoLogProxy.java b/quickstep/src_protolog/com/android/launcher3/util/StateManagerProtoLogProxy.java new file mode 100644 index 00000000000..914228ffdd7 --- /dev/null +++ b/quickstep/src_protolog/com/android/launcher3/util/StateManagerProtoLogProxy.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.util; + +import static com.android.quickstep.util.QuickstepProtoLogGroup.LAUNCHER_STATE_MANAGER; +import static com.android.quickstep.util.QuickstepProtoLogGroup.isProtoLogInitialized; + +import android.util.Log; +import android.window.DesktopModeFlags.DesktopModeFlag; + +import androidx.annotation.NonNull; + +import com.android.internal.protolog.ProtoLog; +import com.android.launcher3.Flags; +import com.android.quickstep.util.QuickstepProtoLogGroup; + +/** + * Proxy class used for StateManager ProtoLog support. + */ +public class StateManagerProtoLogProxy { + private static final boolean IS_STATE_MANAGER_PROTOLOG_ENABLED = new DesktopModeFlag( + Flags::enableStateManagerProtoLog, true).isTrue(); + + private static final QuickstepProtoLogGroup PROTO_LOG_GROUP = LAUNCHER_STATE_MANAGER; + + private static boolean willProtoLog() { + return IS_STATE_MANAGER_PROTOLOG_ENABLED && isProtoLogInitialized(); + } + + private static void logToLogcatIfNeeded(String message, Object... args) { + if (!willProtoLog() || !PROTO_LOG_GROUP.isLogToLogcat()) { + Log.d(PROTO_LOG_GROUP.getTag(), String.format(message, args)); + } + } + + public static void logGoToState(@NonNull Object fromState, @NonNull Object toState, + @NonNull String trace) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "StateManager.goToState: fromState: %s, toState: %s, partial trace:\n%s", + fromState, toState, trace); + } + logToLogcatIfNeeded( + "StateManager.goToState: fromState: %s, toState: %s, partial trace:\n%s", + fromState, toState, trace); + } + + public static void logCreateAtomicAnimation(@NonNull Object fromState, @NonNull Object toState, + @NonNull String trace) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "StateManager.createAtomicAnimation: " + + "fromState: %s, toState: %s, partial trace:\n%s", fromState, toState, trace); + } + logToLogcatIfNeeded("StateManager.createAtomicAnimation: " + + "fromState: %s, toState: %s, partial trace:\n%s", fromState, toState, trace); + } + + public static void logOnStateTransitionStart(@NonNull Object state) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "StateManager.onStateTransitionStart: state: %s", state); + } + logToLogcatIfNeeded("StateManager.onStateTransitionStart: state: %s", state); + } + + public static void logOnStateTransitionEnd(@NonNull Object state) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "StateManager.onStateTransitionEnd: state: %s", state); + } + logToLogcatIfNeeded("StateManager.onStateTransitionEnd: state: %s", state); + } + + public static void logOnRepeatStateSetAborted(@NonNull Object state) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "StateManager.onRepeatStateSetAborted: state: %s", state); + } + logToLogcatIfNeeded("StateManager.onRepeatStateSetAborted: state: %s", state); + } + + public static void logCancelAnimation(boolean animationOngoing, @NonNull String trace) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "StateManager.cancelAnimation: animation ongoing: %b, partial trace:\n%s", + animationOngoing, trace); + } + logToLogcatIfNeeded( + "StateManager.cancelAnimation: animation ongoing: %b, partial trace:\n%s", + animationOngoing, trace); + } +} diff --git a/quickstep/src/com/android/quickstep/util/ActiveGestureErrorDetector.java b/quickstep/src_protolog/com/android/quickstep/util/ActiveGestureErrorDetector.java similarity index 89% rename from quickstep/src/com/android/quickstep/util/ActiveGestureErrorDetector.java rename to quickstep/src_protolog/com/android/quickstep/util/ActiveGestureErrorDetector.java index cfa6b9891f0..6067179f30f 100644 --- a/quickstep/src/com/android/quickstep/util/ActiveGestureErrorDetector.java +++ b/quickstep/src_protolog/com/android/quickstep/util/ActiveGestureErrorDetector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,8 @@ */ package com.android.quickstep.util; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.UNFINISHED_TASK_LAUNCH; + import android.util.ArraySet; import androidx.annotation.NonNull; @@ -36,10 +38,12 @@ public enum GestureEvent { SET_END_TARGET_NEW_TASK, SET_END_TARGET_ALL_APPS, ON_SETTLED_ON_END_TARGET, ON_START_RECENTS_ANIMATION, ON_FINISH_RECENTS_ANIMATION, ON_CANCEL_RECENTS_ANIMATION, START_RECENTS_ANIMATION, FINISH_RECENTS_ANIMATION, CANCEL_RECENTS_ANIMATION, - SET_ON_PAGE_TRANSITION_END_CALLBACK, CANCEL_CURRENT_ANIMATION, CLEANUP_SCREENSHOT, - SCROLLER_ANIMATION_ABORTED, TASK_APPEARED, EXPECTING_TASK_APPEARED, - FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER, LAUNCHER_DESTROYED, RECENT_TASKS_MISSING, - INVALID_VELOCITY_ON_SWIPE_UP, RECENTS_ANIMATION_START_PENDING, + SET_ON_PAGE_TRANSITION_END_CALLBACK, CANCEL_CURRENT_ANIMATION, SCROLLER_ANIMATION_ABORTED, + TASK_APPEARED, EXPECTING_TASK_APPEARED, FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER, + LAUNCHER_DESTROYED, RECENT_TASKS_MISSING, INVALID_VELOCITY_ON_SWIPE_UP, + RECENTS_ANIMATION_START_PENDING, QUICK_SWITCH_FROM_HOME_FALLBACK, + QUICK_SWITCH_FROM_HOME_FAILED, NAVIGATION_MODE_SWITCHED, RECENTS_ANIMATION_START_TIMEOUT, + INCORRECT_HOME_GESTURE_REQUEST, UNFINISHED_TASK_LAUNCH, /** * These GestureEvents are specifically associated to state flags that get set in @@ -125,15 +129,6 @@ protected static void analyseAndDump( + "before/without startRecentsAnimation.", writer); break; - case CLEANUP_SCREENSHOT: - errorDetected |= printErrorIfTrue( - !encounteredEvents.contains(GestureEvent.STATE_SCREENSHOT_CAPTURED), - prefix, - /* errorMessage= */ "recents activity screenshot was " - + "cleaned up before/without STATE_SCREENSHOT_CAPTURED " - + "being set.", - writer); - break; case SCROLLER_ANIMATION_ABORTED: errorDetected |= printErrorIfTrue( encounteredEvents.contains(GestureEvent.SET_END_TARGET_HOME) @@ -282,6 +277,45 @@ protected static void analyseAndDump( + " animation is still pending.", writer); break; + case QUICK_SWITCH_FROM_HOME_FALLBACK: + errorDetected |= printErrorIfTrue( + true, + prefix, + /* errorMessage= */ "Quick switch from home fallback case: the " + + "TaskView at the current page index was missing.", + writer); + break; + case QUICK_SWITCH_FROM_HOME_FAILED: + errorDetected |= printErrorIfTrue( + true, + prefix, + /* errorMessage= */ "Quick switch from home failed: the TaskViews at " + + "the current page index and index 0 were missing.", + writer); + break; + case INCORRECT_HOME_GESTURE_REQUEST: + errorDetected |= printErrorIfTrue( + true, + prefix, + /* errorMessage= */ "Home gesture request is unmatched to the display " + + "that the gesture is running on. (EG HOME detected on " + + "!Default, or REJECT_HOME detected on Default)", + writer); + break; + case NAVIGATION_MODE_SWITCHED: + errorDetected |= printErrorIfTrue( + true, + prefix, + /* errorMessage= */ "Navigation mode switched mid-gesture.", + writer); + break; + case RECENTS_ANIMATION_START_TIMEOUT: + errorDetected |= printErrorIfTrue( + true, + prefix, + /* errorMessage= */ "Recents animation start timed out.", + writer); + break; case EXPECTING_TASK_APPEARED: case MOTION_DOWN: case SET_END_TARGET: @@ -296,6 +330,7 @@ protected static void analyseAndDump( case STATE_CAPTURE_SCREENSHOT: case STATE_HANDLER_INVALIDATED: case STATE_LAUNCHER_DRAWN: + case UNFINISHED_TASK_LAUNCH: default: // No-Op } @@ -396,15 +431,6 @@ protected static void analyseAndDump( + "wasn't called and STATE_HANDLER_INVALIDATED wasn't set.", writer); - errorDetected |= printErrorIfTrue( - /* condition= */ encounteredEvents.contains( - GestureEvent.STATE_RECENTS_ANIMATION_CANCELED) - && !encounteredEvents.contains(GestureEvent.CLEANUP_SCREENSHOT), - prefix, - /* errorMessage= */ "STATE_RECENTS_ANIMATION_CANCELED was set but " - + "the task screenshot wasn't cleaned up.", - writer); - errorDetected |= printErrorIfTrue( /* condition= */ encounteredEvents.contains( GestureEvent.EXPECTING_TASK_APPEARED) @@ -437,6 +463,12 @@ protected static void analyseAndDump( "onRecentsAnimationCanceled was called but onAnimationCanceled was not", writer); + errorDetected |= printErrorIfTrue( + /* condition= */ encounteredEvents.contains(UNFINISHED_TASK_LAUNCH), + prefix, + /* errorMessage= */ "Recents animation interrupted mid-task launch", + writer); + if (!errorDetected) { writer.println(prefix + "\tNo errors detected."); } diff --git a/quickstep/src/com/android/quickstep/util/ActiveGestureLog.java b/quickstep/src_protolog/com/android/quickstep/util/ActiveGestureLog.java similarity index 77% rename from quickstep/src/com/android/quickstep/util/ActiveGestureLog.java rename to quickstep/src_protolog/com/android/quickstep/util/ActiveGestureLog.java index c54862aba38..23e245c51a0 100644 --- a/quickstep/src/com/android/quickstep/util/ActiveGestureLog.java +++ b/quickstep/src_protolog/com/android/quickstep/util/ActiveGestureLog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.launcher3.util.Preconditions; - import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; @@ -71,14 +71,6 @@ public void addLog(@NonNull String event) { addLog(event, null); } - public void addLog(@NonNull String event, int extras) { - addLog(event, extras, null); - } - - public void addLog(@NonNull String event, boolean extras) { - addLog(event, extras, null); - } - /** * Adds a log to be printed at log-dump-time and track the associated event for error detection. * @@ -89,20 +81,6 @@ public void addLog( addLog(new CompoundString(event), gestureEvent); } - public void addLog( - @NonNull String event, - int extras, - @Nullable ActiveGestureErrorDetector.GestureEvent gestureEvent) { - addLog(new CompoundString(event).append(": ").append(extras), gestureEvent); - } - - public void addLog( - @NonNull String event, - boolean extras, - @Nullable ActiveGestureErrorDetector.GestureEvent gestureEvent) { - addLog(new CompoundString(event).append(": ").append(extras), gestureEvent); - } - public void addLog(@NonNull CompoundString compoundString) { addLog(compoundString, null); } @@ -237,7 +215,8 @@ public long getTime() { /** An entire log of entries associated with a single log ID */ protected static class EventLog { - protected final List eventEntries = new ArrayList<>(); + protected final List eventEntries = + Collections.synchronizedList(new ArrayList<>()); protected final int logId; protected final boolean mIsFullyGesturalNavMode; @@ -250,25 +229,27 @@ private EventLog(int logId, boolean isFullyGesturalNavMode) { /** A buildable string stored as an array for memory efficiency. */ public static class CompoundString { - public static final CompoundString NO_OP = new CompoundString(); + public static final CompoundString NO_OP = new CompoundString(true); private final List mSubstrings; private final List mArgs; private final boolean mIsNoOp; - private CompoundString() { - this(null); + public static CompoundString newEmptyString() { + return new CompoundString(false); } - public CompoundString(String substring) { - mIsNoOp = substring == null; + private CompoundString(boolean isNoOp) { + mIsNoOp = isNoOp; mSubstrings = mIsNoOp ? null : new ArrayList<>(); mArgs = mIsNoOp ? null : new ArrayList<>(); + } - if (!mIsNoOp) { - mSubstrings.add(substring); - } + public CompoundString(String substring, Object... args) { + this(substring == null); + + append(substring, args); } public CompoundString append(CompoundString substring) { @@ -281,80 +262,24 @@ public CompoundString append(CompoundString substring) { return this; } - public CompoundString append(String substring) { + public CompoundString append(String substring, Object... args) { if (mIsNoOp) { return this; } mSubstrings.add(substring); + mArgs.addAll(Arrays.stream(args).toList()); return this; } - public CompoundString append(int num) { - if (mIsNoOp) { - return this; - } - mArgs.add(num); - - return append("%d"); - } - - public CompoundString append(long num) { - if (mIsNoOp) { - return this; - } - mArgs.add(num); - - return append("%d"); - } - - public CompoundString append(float num) { - if (mIsNoOp) { - return this; - } - mArgs.add(num); - - return append("%.2f"); - } - - public CompoundString append(double num) { - if (mIsNoOp) { - return this; - } - mArgs.add(num); - - return append("%.2f"); - } - - public CompoundString append(boolean bool) { - if (mIsNoOp) { - return this; - } - mArgs.add(bool); - - return append("%b"); - } - - private Object[] getArgs() { - Preconditions.assertTrue(!mIsNoOp); - - return mArgs.toArray(); - } - @Override public String toString() { - return String.format(toUnformattedString(), getArgs()); - } - - private String toUnformattedString() { - Preconditions.assertTrue(!mIsNoOp); - + if (mIsNoOp) return null; StringBuilder sb = new StringBuilder(); for (String substring : mSubstrings) { sb.append(substring); } - - return sb.toString(); + return String.format(sb.toString(), mArgs.toArray()); } @Override @@ -364,10 +289,9 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (!(obj instanceof CompoundString)) { + if (!(obj instanceof CompoundString other)) { return false; } - CompoundString other = (CompoundString) obj; return (mIsNoOp == other.mIsNoOp) && Objects.equals(mSubstrings, other.mSubstrings) && Objects.equals(mArgs, other.mArgs); diff --git a/quickstep/src_protolog/com/android/quickstep/util/ActiveGestureProtoLogProxy.java b/quickstep/src_protolog/com/android/quickstep/util/ActiveGestureProtoLogProxy.java new file mode 100644 index 00000000000..d2cf63b7e80 --- /dev/null +++ b/quickstep/src_protolog/com/android/quickstep/util/ActiveGestureProtoLogProxy.java @@ -0,0 +1,637 @@ +/* + * 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.quickstep.util; + +import static android.view.MotionEvent.ACTION_DOWN; + +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.CANCEL_RECENTS_ANIMATION; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.FINISH_RECENTS_ANIMATION; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.INVALID_VELOCITY_ON_SWIPE_UP; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.LAUNCHER_DESTROYED; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_DOWN; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_MOVE; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_UP; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.NAVIGATION_MODE_SWITCHED; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_CANCEL_RECENTS_ANIMATION; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_FINISH_RECENTS_ANIMATION; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_SETTLED_ON_END_TARGET; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_START_RECENTS_ANIMATION; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.QUICK_SWITCH_FROM_HOME_FAILED; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.QUICK_SWITCH_FROM_HOME_FALLBACK; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.RECENTS_ANIMATION_START_PENDING; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.RECENTS_ANIMATION_START_TIMEOUT; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.RECENT_TASKS_MISSING; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.SET_END_TARGET; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION; +import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.UNFINISHED_TASK_LAUNCH; +import static com.android.quickstep.util.QuickstepProtoLogGroup.ACTIVE_GESTURE_LOG; +import static com.android.quickstep.util.QuickstepProtoLogGroup.isProtoLogInitialized; + +import android.graphics.Point; +import android.graphics.RectF; +import android.view.MotionEvent; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.internal.protolog.ProtoLog; +import com.android.internal.protolog.common.IProtoLogGroup; + +/** + * Proxy class used for ActiveGestureLog ProtoLog support. + *

+ * This file will have all of its static strings in the + * {@link ProtoLog#d(IProtoLogGroup, String, Object...)} calls replaced by dynamic code/strings. + *

+ * When a new ActiveGestureLog entry needs to be added to the codebase (or and existing entry needs + * to be modified), add it here under a new unique method and make sure the ProtoLog entry matches + * to avoid confusion. + */ +public class ActiveGestureProtoLogProxy { + private static final QuickstepProtoLogGroup PROTO_LOG_GROUP = ACTIVE_GESTURE_LOG; + + private static boolean willProtoLog() { + return isProtoLogInitialized(); + } + + public static void logLauncherDestroyed() { + ActiveGestureLog.INSTANCE.addLog("Launcher destroyed", LAUNCHER_DESTROYED); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Launcher destroyed"); + } + } + + public static void logAbsSwipeUpHandlerOnRecentsAnimationCanceled() { + ActiveGestureLog.INSTANCE.addLog( + /* event= */ "AbsSwipeUpHandler.onRecentsAnimationCanceled", + /* gestureEvent= */ CANCEL_RECENTS_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "AbsSwipeUpHandler.onRecentsAnimationCanceled"); + } + } + + public static void logAbsSwipeUpHandlerOnRecentsAnimationFinished() { + ActiveGestureLog.INSTANCE.addLog( + /* event= */ "RecentsAnimationCallbacks.onAnimationFinished", + ON_FINISH_RECENTS_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "AbsSwipeUpHandler.onAnimationFinished"); + } + } + + public static void logAbsSwipeUpHandlerCancelCurrentAnimation() { + ActiveGestureLog.INSTANCE.addLog("AbsSwipeUpHandler.cancelCurrentAnimation", + ActiveGestureErrorDetector.GestureEvent.CANCEL_CURRENT_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "AbsSwipeUpHandler.cancelCurrentAnimation"); + } + } + + public static void logAbsSwipeUpHandlerOnTasksAppeared() { + ActiveGestureLog.INSTANCE.addLog("AbsSwipeUpHandler.onTasksAppeared: " + + "force finish recents animation complete; clearing state callback."); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "AbsSwipeUpHandler.onTasksAppeared: " + + "force finish recents animation complete; clearing state callback."); + } + } + + public static void logHandOffAnimation() { + ActiveGestureLog.INSTANCE.addLog("AbsSwipeUpHandler.handOffAnimation"); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "AbsSwipeUpHandler.handOffAnimation"); + } + } + + public static void logRecentsAnimationCallbacksOnAnimationCancelled() { + ActiveGestureLog.INSTANCE.addLog( + /* event= */ "RecentsAnimationCallbacks.onAnimationCanceled", + /* gestureEvent= */ ON_CANCEL_RECENTS_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "RecentsAnimationCallbacks.onAnimationCanceled"); + } + } + + public static void logRecentsAnimationCallbacksOnTasksAppeared() { + ActiveGestureLog.INSTANCE.addLog("RecentsAnimationCallbacks.onTasksAppeared", + ActiveGestureErrorDetector.GestureEvent.TASK_APPEARED); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "RecentsAnimationCallbacks.onTasksAppeared"); + } + } + + public static void logStartRecentsAnimation() { + ActiveGestureLog.INSTANCE.addLog( + /* event= */ "TaskAnimationManager.startRecentsAnimation", + /* gestureEvent= */ START_RECENTS_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "TaskAnimationManager.startRecentsAnimation"); + } + } + + public static void logLaunchingSideTaskFailed() { + ActiveGestureLog.INSTANCE.addLog("Unable to launch side task (no recents)"); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Unable to launch side task (no recents)"); + } + } + + public static void logContinueRecentsAnimation() { + ActiveGestureLog.INSTANCE.addLog(/* event= */ "continueRecentsAnimation"); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "continueRecentsAnimation"); + } + } + + public static void logCleanUpRecentsAnimationSkipped() { + ActiveGestureLog.INSTANCE.addLog( + /* event= */ "cleanUpRecentsAnimation skipped due to wrong callbacks"); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "cleanUpRecentsAnimation skipped due to wrong callbacks"); + } + } + + public static void logCleanUpRecentsAnimation() { + ActiveGestureLog.INSTANCE.addLog(/* event= */ "cleanUpRecentsAnimation"); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "cleanUpRecentsAnimation"); + } + } + + public static void logOnInputEventUserLocked(int displayId) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TIS.onInputEvent(displayId=%d): Cannot process input event: user is locked", + displayId)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "TIS.onInputEvent(displayId=%d): Cannot process input event: user is locked", + displayId); + } + } + + public static void logOnInputIgnoringFollowingEvents(int displayId) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TIS.onMotionEvent(displayId=%d): A new gesture has been started, " + + "but a previously-requested recents animation hasn't started. " + + "Ignoring all following motion events.", displayId), + RECENTS_ANIMATION_START_PENDING); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "TIS.onMotionEvent(displayId=%d): A new gesture has been started, " + + "but a previously-requested recents animation hasn't started. " + + "Ignoring all following motion events.", displayId); + } + } + + public static void logOnInputEventThreeButtonNav(int displayId) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TIS.onInputEvent(displayId=%d): Cannot process input event: " + + "using 3-button nav and event is not a trackpad event", displayId)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "TIS.onInputEvent(displayId=%d): Cannot process input event: " + + "using 3-button nav and event is not a trackpad event", displayId); + } + } + + public static void logPreloadRecentsAnimation() { + ActiveGestureLog.INSTANCE.addLog("preloadRecentsAnimation"); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "preloadRecentsAnimation"); + } + } + + public static void logRecentTasksMissing() { + ActiveGestureLog.INSTANCE.addLog("Null mRecentTasks", RECENT_TASKS_MISSING); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Null mRecentTasks"); + } + } + + public static void logFinishRecentsAnimationCallback() { + ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation-callback"); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "finishRecentsAnimation-callback"); + } + } + + public static void logOnScrollerAnimationAborted() { + ActiveGestureLog.INSTANCE.addLog("scroller animation aborted", + ActiveGestureErrorDetector.GestureEvent.SCROLLER_ANIMATION_ABORTED); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "scroller animation aborted"); + } + } + + public static void logInputConsumerBecameActive(@NonNull String consumerName) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("%s became active", consumerName)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "%s became active", consumerName); + } + } + + public static void logTaskLaunchFailed(int launchedTaskId) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "Launch failed, task (id=%d) finished mid transition", launchedTaskId)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Launch failed, task (id=%d) finished mid transition", + launchedTaskId); + } + } + + public static void logOnPageEndTransition(int nextPageIndex) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "onPageEndTransition: current page index updated: %d", nextPageIndex)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "onPageEndTransition: current page index updated: %d", + nextPageIndex); + } + } + + public static void logQuickSwitchFromHomeFallback(int taskIndex) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "Quick switch from home fallback case: The TaskView at index %d is missing.", + taskIndex), QUICK_SWITCH_FROM_HOME_FALLBACK); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "Quick switch from home fallback case: The TaskView at index %d is missing.", + taskIndex); + } + } + + public static void logQuickSwitchFromHomeFailed(int taskIndex) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "Quick switch from home failed: TaskViews at indices %d and 0 are missing.", + taskIndex), QUICK_SWITCH_FROM_HOME_FAILED); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "Quick switch from home failed: TaskViews at indices %d and 0 are missing.", + taskIndex); + } + } + + public static void logFinishRecentsAnimation(boolean toHome, + @NonNull ActiveGestureLog.CompoundString reason) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "RecentsAnimationController.finishRecentsAnimation: toHome=%b, reason=", + toHome).append(reason), + /* gestureEvent= */ FINISH_RECENTS_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "RecentsAnimationController.finishRecentsAnimation: toHome=%b, reason=%s", + toHome, reason.toString()); + } + } + + public static void logSetEndTarget(@NonNull String target) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("setEndTarget %s", target), /* gestureEvent= */ + SET_END_TARGET); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "setEndTarget %s", target); + } + } + + public static void logStartHomeIntent(@NonNull String reason) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("OverviewComponentObserver.startHomeIntent: %s", + reason)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "OverviewComponentObserver.startHomeIntent: %s", reason); + } + } + + public static void logRunningTaskPackage(@NonNull String packageName) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("Current running task package name=%s", + packageName)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Current running task package name=%s", packageName); + } + } + + public static void logSysuiStateFlags(@NonNull String stateFlags) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("Current SystemUi state flags=%s", stateFlags)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Current SystemUi state flags=%s", stateFlags); + } + } + + public static void logSetInputConsumer(@NonNull String consumerName, @NonNull String reason) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("setInputConsumer: %s. reason(s):%s", + consumerName, reason)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "setInputConsumer: %s. reason(s):%s", consumerName, reason); + } + } + + public static void logUpdateGestureStateRunningTask(@NonNull String otherTaskPackage, + @NonNull String runningTaskPackage) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "Changing active task to %s because the previous task running on top of this " + + "one (%s) was excluded from recents", otherTaskPackage, + runningTaskPackage)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "Changing active task to %s because the previous task running on top of this " + + "one (%s) was excluded from recents", otherTaskPackage, + runningTaskPackage); + } + } + + public static void logOnInputEventActionUp(int x, int y, int action, + @NonNull String classification, int displayId) { + String actionString = MotionEvent.actionToString(action); + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("onMotionEvent(%d, %d): %s, %s, displayId=%d", + x, y, actionString, classification, displayId), + /* gestureEvent= */ action == ACTION_DOWN ? MOTION_DOWN : MOTION_UP); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "onMotionEvent(%d, %d): %s, %s, displayId=%d", x, y, + actionString, classification, displayId); + } + } + + public static void logOnInputEventActionMove(@NonNull String action, + @NonNull String classification, int pointerCount, int displayId) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "onMotionEvent: %s, %s, pointerCount: %d, displayId=%d", action, classification, + pointerCount, displayId), MOTION_MOVE); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "onMotionEvent: %s, %s, pointerCount: %d, displayId=%d", + action, classification, pointerCount, displayId); + } + } + + public static void logOnInputEventGenericAction(@NonNull String action, + @NonNull String classification, int displayId) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("onMotionEvent: %s, %s, displayId=%d", action, + classification, displayId)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "onMotionEvent: %s, %s, displayId=%d", action, + classification, displayId); + } + } + + public static void logOnInputEventNavModeSwitched(int displayId, @NonNull String startNavMode, + @NonNull String currentNavMode) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TIS.onInputEvent(displayId=%d): Navigation mode switched mid-gesture (%s" + + " -> %s); " + "cancelling gesture.", displayId, startNavMode, + currentNavMode), NAVIGATION_MODE_SWITCHED); + if (!isProtoLogInitialized()) return; + ProtoLog.d(ACTIVE_GESTURE_LOG, + "TIS.onInputEvent(displayId=%d): Navigation mode switched mid-gesture (%s -> %s); " + + "cancelling gesture.", displayId, startNavMode, currentNavMode); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "TIS.onInputEvent(displayId=%d): Navigation mode switched mid-gesture (%s -> " + + "%s); " + "cancelling gesture.", displayId, startNavMode, + currentNavMode); + } + } + + public static void logUnknownInputEvent(int displayId, @NonNull String event) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TIS.onInputEvent(displayId=%d): Cannot process input event: " + + "received unknown event %s", displayId, event)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "TIS.onInputEvent(displayId=%d): Cannot process input event: " + + "received unknown event %s", displayId, event); + } + } + + public static void logFinishRunningRecentsAnimation(boolean toHome, + @NonNull ActiveGestureLog.CompoundString reason) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TaskAnimationManager.finishRunningRecentsAnimation: toHome=%b, reason=", + toHome).append(reason)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "TaskAnimationManager.finishRunningRecentsAnimation: toHome=%b, reason=%s", + toHome, reason.toString()); + } + } + + public static void logOnRecentsAnimationStartCancelled() { + ActiveGestureLog.INSTANCE.addLog("RecentsAnimationCallbacks.onAnimationStart (canceled): 0", + /* gestureEvent= */ ON_START_RECENTS_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "RecentsAnimationCallbacks.onAnimationStart (canceled): 0"); + } + } + + public static void logOnRecentsAnimationStart(int appCount) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "RecentsAnimationCallbacks.onAnimationStart: %d", appCount), + /* gestureEvent= */ ON_START_RECENTS_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "RecentsAnimationCallbacks.onAnimationStart: %d", appCount); + } + } + + public static void logStartRecentsAnimationCallback(@NonNull String callback) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TaskAnimationManager.startRecentsAnimation(%s): " + + "Setting mRecentsAnimationStartPending = false", callback)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "TaskAnimationManager.startRecentsAnimation(%s): " + + "Setting mRecentsAnimationStartPending = false", callback); + } + } + + public static void logSettingRecentsAnimationStartPending(boolean value) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TaskAnimationManager.startRecentsAnimation: " + + "Setting mRecentsAnimationStartPending = %b", value)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "TaskAnimationManager.startRecentsAnimation: " + + "Setting mRecentsAnimationStartPending = %b", value); + } + } + + public static void logLaunchingSideTask(int taskId) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("Launching side task id=%d", taskId)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Launching side task id=%d", taskId); + } + } + + public static void logOnInputEventActionDown(int displayId, + @NonNull ActiveGestureLog.CompoundString reason) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("TIS.onMotionEvent(displayId=%d): ", + displayId).append(reason)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "TIS.onMotionEvent(displayId=%d): %s", displayId, + reason.toString()); + } + } + + public static void logStartNewTask(@NonNull ActiveGestureLog.CompoundString tasks) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("Launching task: ").append(tasks)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "TIS.onMotionEvent: %s", tasks.toString()); + } + } + + public static void logMotionPauseDetectorEvent(@NonNull ActiveGestureLog.CompoundString event) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("MotionPauseDetector: ").append(event)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "MotionPauseDetector: %s", event.toString()); + } + } + + public static void logOnInvalidTasksAppeared(@NonNull ActiveGestureLog.CompoundString reason) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "AbsSwipeHandler.onTasksAppeared check failed, " + + "attempting to forcefully finish recents animation. Reason: ").append( + reason)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "AbsSwipeHandler.onTasksAppeared check failed, " + + "attempting to forcefully finish recents animation. Reason: %s", + reason.toString()); + } + } + + /** + * This is for special cases where the string is purely dynamic and therefore has no format that + * can be extracted. Do not use in any other case. + */ + public static void logDynamicString(@NonNull String string, + @Nullable ActiveGestureErrorDetector.GestureEvent gestureEvent) { + ActiveGestureLog.INSTANCE.addLog(string, gestureEvent); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "%s", string); + } + } + + public static void logOnSettledOnEndTarget(@NonNull String endTarget) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("onSettledOnEndTarget %s", endTarget), + /* gestureEvent= */ ON_SETTLED_ON_END_TARGET); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "onSettledOnEndTarget %s", endTarget); + } + } + + public static void logOnCalculateEndTarget(float velocityX, float velocityY, double angle) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "calculateEndTarget: velocities=(x=%fdp/ms, y=%fdp/ms), angle=%f", + velocityX, + velocityY, angle), + velocityX == 0 && velocityY == 0 ? INVALID_VELOCITY_ON_SWIPE_UP : null); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "calculateEndTarget: velocities=(x=%fdp/ms, y=%fdp/ms), angle=%f", velocityX, + velocityY, angle); + } + } + + public static void logCreateTouchRegionForDisplay(int displayRotation, + @NonNull Point displaySize, @NonNull RectF swipeRegion, @NonNull RectF ohmRegion, + int gesturalHeight, int largerGesturalHeight, @NonNull String reason) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "OrientationTouchTransformer.createRegionForDisplay: " + + "dispRot=%d, dispSize=%s, swipeRegion=%s, ohmRegion=%s, " + + "gesturalHeight=%d, largerGesturalHeight=%d, reason=%s", + displayRotation, + displaySize.flattenToString(), swipeRegion.toShortString(), + ohmRegion.toShortString(), gesturalHeight, largerGesturalHeight, reason); + } + } + + public static void logOnTaskAnimationManagerNotAvailable(int displayId) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "TaskAnimationManager not available for displayId=%d", displayId)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "TaskAnimationManager not available for displayId=%d", + displayId); + } + } + + public static void logOnAbsSwipeUpHandlerNotAvailable(int displayId) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "AbsSwipeUpHandler not available for displayId=%d", displayId)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "AbsSwipeUpHandler not available for displayId=%d", + displayId); + } + } + + public static void logGestureStartSwipeHandler(@NonNull String interactionHandler) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "OtherActivityInputConsumer.startTouchTrackingForWindowAnimation: " + + "interactionHandler=%s", interactionHandler)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "OtherActivityInputConsumer.startTouchTrackingForWindowAnimation: " + + "interactionHandler=%s", interactionHandler); + } + } + + public static void logQueuingForceFinishRecentsAnimation() { + ActiveGestureLog.INSTANCE.addLog("Launcher destroyed while mRecentsAnimationStartPending ==" + + " true, queuing a callback to clean the pending animation up on start", + /* gestureEvent= */ ON_START_RECENTS_ANIMATION); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Launcher destroyed while mRecentsAnimationStartPending ==" + + " true, queuing a callback to clean the pending animation up on start"); + } + } + + public static void logRecentsAnimationStartTimedOut() { + ActiveGestureLog.INSTANCE.addLog("Recents animation start has timed out; forcefully " + + "cleaning up the recents animation.", + /* gestureEvent= */ RECENTS_ANIMATION_START_TIMEOUT); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Recents animation start has timed out; forcefully " + + "cleaning up the recents animation."); + } + } + + public static void logHandleUnfinishedTaskLaunch(@NonNull String endTarget, + @NonNull ActiveGestureLog.CompoundString reason) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString( + "Recents animation interrupted unexpectedly during gesture to %s, reason=", + endTarget).append(reason), + /* gestureEvent= */ UNFINISHED_TASK_LAUNCH); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, + "Recents animation interrupted unexpectedly during gesture to %s, reason=%s", + endTarget, reason.toString()); + } + } + + public static void logCalculateEndTargetResultAndReason(@NonNull String endTarget, + @NonNull ActiveGestureLog.CompoundString reason) { + ActiveGestureLog.INSTANCE.addLog( + new ActiveGestureLog.CompoundString("calculateEndTarget: endTarget=%s, reason=", + endTarget).append(reason)); + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "calculateEndTarget: endTarget=%s, reason=%s", endTarget, + reason.toString()); + } + } +} diff --git a/quickstep/src_protolog/com/android/quickstep/util/QuickstepProtoLogGroup.java b/quickstep/src_protolog/com/android/quickstep/util/QuickstepProtoLogGroup.java new file mode 100644 index 00000000000..47f3f1db280 --- /dev/null +++ b/quickstep/src_protolog/com/android/quickstep/util/QuickstepProtoLogGroup.java @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.util; + +import android.util.Log; + +import androidx.annotation.NonNull; + +import com.android.internal.protolog.ProtoLog; +import com.android.internal.protolog.common.IProtoLogGroup; + +import java.util.UUID; + +/** Enums used to interface with the ProtoLog API. */ +public enum QuickstepProtoLogGroup implements IProtoLogGroup { + + ACTIVE_GESTURE_LOG(true, true, Constants.DEBUG_ACTIVE_GESTURE, "ActiveGestureLog"), + RECENTS_WINDOW(true, true, Constants.DEBUG_RECENTS_WINDOW, "RecentsWindow"), + LAUNCHER_STATE_MANAGER(true, true, Constants.DEBUG_STATE_MANAGER, "LauncherStateManager"), + OVERVIEW_COMMAND_HELPER(true, true, Constants.DEBUG_OVERVIEW_COMMAND_HELPER, + "OverviewCommandHelper"); + + private final boolean mEnabled; + private volatile boolean mLogToProto; + private volatile boolean mLogToLogcat; + private final @NonNull String mTag; + + public static boolean isProtoLogInitialized() { + if (!Variables.sIsInitialized) { + Log.w(Constants.TAG, + "Attempting to log to ProtoLog before initializing it.", + new IllegalStateException()); + } + return Variables.sIsInitialized; + } + + public static void initProtoLog() { + if (Variables.sIsInitialized) { + Log.e(Constants.TAG, + "Attempting to re-initialize ProtoLog.", new IllegalStateException()); + return; + } + Log.i(Constants.TAG, "Initializing ProtoLog."); + Variables.sIsInitialized = true; + ProtoLog.init(QuickstepProtoLogGroup.values()); + } + + /** + * @param enabled set to false to exclude all log statements for this group from + * compilation, + * they will not be available in runtime. + * @param logToProto enable binary logging for the group + * @param logToLogcat enable text logging for the group + * @param tag name of the source of the logged message + */ + QuickstepProtoLogGroup( + boolean enabled, boolean logToProto, boolean logToLogcat, @NonNull String tag) { + this.mEnabled = enabled; + this.mLogToProto = logToProto; + this.mLogToLogcat = logToLogcat; + this.mTag = tag; + } + + @Override + public boolean isEnabled() { + return mEnabled; + } + + @Override + public boolean isLogToLogcat() { + return mLogToLogcat; + } + + @Override + public int getId() { + return Constants.LOG_START_ID + this.ordinal(); + } + + @Override + public @NonNull String getTag() { + return mTag; + } + + @Override + public void setLogToLogcat(boolean logToLogcat) { + this.mLogToLogcat = logToLogcat; + } + + private static final class Variables { + + private static boolean sIsInitialized = false; + } + + private static final class Constants { + + private static final String TAG = "QuickstepProtoLogGroup"; + + private static final boolean DEBUG_ACTIVE_GESTURE = false; + private static final boolean DEBUG_RECENTS_WINDOW = false; + private static final boolean DEBUG_STATE_MANAGER = false; // b/279059025, b/325463989 + private static final boolean DEBUG_OVERVIEW_COMMAND_HELPER = false; + + private static final int LOG_START_ID = + (int) (UUID.nameUUIDFromBytes(QuickstepProtoLogGroup.class.getName().getBytes()) + .getMostSignificantBits() % Integer.MAX_VALUE); + } +} diff --git a/quickstep/src_protolog/com/android/quickstep/util/RecentsWindowProtoLogProxy.java b/quickstep/src_protolog/com/android/quickstep/util/RecentsWindowProtoLogProxy.java new file mode 100644 index 00000000000..2faf77a95b0 --- /dev/null +++ b/quickstep/src_protolog/com/android/quickstep/util/RecentsWindowProtoLogProxy.java @@ -0,0 +1,92 @@ +/* + * 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.quickstep.util; + +import static com.android.quickstep.util.QuickstepProtoLogGroup.RECENTS_WINDOW; +import static com.android.quickstep.util.QuickstepProtoLogGroup.isProtoLogInitialized; + +import android.util.Log; +import android.window.DesktopExperienceFlags; + +import androidx.annotation.NonNull; + +import com.android.internal.protolog.ProtoLog; +import com.android.internal.protolog.common.IProtoLogGroup; +import com.android.launcher3.Flags; + +/** + * Proxy class used for Recents Window ProtoLog support. + *

+ * This file will have all of its static strings in the + * {@link ProtoLog#d(IProtoLogGroup, String, Object...)} calls replaced by dynamic code/strings. + *

+ * When a new Recents Window log needs to be added to the codebase, add it here under a new unique + * method. Or, if an existing entry needs to be modified, simply update it here. + */ +public class RecentsWindowProtoLogProxy { + private static final boolean IS_RECENTS_WINDOW_PROTOLOG_ENABLED = + new DesktopExperienceFlags.DesktopExperienceFlag(Flags::enableRecentsWindowProtoLog, + false, Flags.FLAG_ENABLE_RECENTS_WINDOW_PROTO_LOG).isTrue(); + private static final QuickstepProtoLogGroup PROTO_LOG_GROUP = RECENTS_WINDOW; + + private static boolean willProtoLog() { + return IS_RECENTS_WINDOW_PROTOLOG_ENABLED && isProtoLogInitialized(); + } + + private static void logToLogcatIfNeeded(String message, Object... args) { + if (!willProtoLog() || !PROTO_LOG_GROUP.isLogToLogcat()) { + Log.d(PROTO_LOG_GROUP.getTag(), String.format(message, args)); + } + } + + public static void logOnStateSetStart(@NonNull String stateName) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "onStateSetStart: %s", stateName); + } + logToLogcatIfNeeded("onStateSetStart: %s", stateName); + } + + public static void logOnStateSetEnd(@NonNull String stateName) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "onStateSetEnd: %s", stateName); + } + logToLogcatIfNeeded("onStateSetEnd: %s", stateName); + } + + public static void logOnRepeatStateSetAborted(@NonNull String stateName) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "onRepeatStateSetAborted: %s", stateName); + } + logToLogcatIfNeeded("onRepeatStateSetAborted: %s", stateName); + } + + public static void logStartRecentsWindow(boolean isShown, boolean windowViewIsNull) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Starting recents window: isShow= %b, windowViewIsNull=%b", + isShown, windowViewIsNull); + } + logToLogcatIfNeeded("Starting recents window: isShow= %b, windowViewIsNull=%b", isShown, + windowViewIsNull); + } + + public static void logCleanup(boolean isShown) { + if (willProtoLog()) { + ProtoLog.d(PROTO_LOG_GROUP, "Cleaning up recents window: isShow= %b", isShown); + } + logToLogcatIfNeeded("Cleaning up recents window: isShow= %b", isShown); + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/imagecomparison/ComposableBasedImageTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/imagecomparison/ComposableBasedImageTest.kt new file mode 100644 index 00000000000..5e48878fe9a --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/imagecomparison/ComposableBasedImageTest.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.imagecomparison + +import android.platform.test.flag.junit.SetFlagsRule +import com.android.launcher3.util.rule.ScreenRecordRule +import com.android.launcher3.util.rule.TestStabilityRule +import com.google.android.apps.nexuslauncher.MultivalentTestWrapper +import com.google.android.apps.nexuslauncher.imagecomparison.goldenpathmanager.NexusLauncherGoldenPathManager +import org.junit.ClassRule +import org.junit.Rule +import org.junit.rules.TestRule +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.utils.compose.ComposeScreenshotTestRule + +abstract class ComposableBasedImageTest(deviceEmulationSpec: DeviceEmulationSpec) { + @get:Rule(order = 0) val testStabilityRule = TestStabilityRule() + + @get:Rule(order = 1) val screenRecordRule = ScreenRecordRule() + + @get:Rule(order = 2) + val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) + + @get:Rule(order = 3) + open val screenshotRule = + ComposeScreenshotTestRule( + deviceEmulationSpec, + NexusLauncherGoldenPathManager(deviceEmulationSpec, this::class.java.simpleName), + ) + + companion object { + @ClassRule + @JvmStatic + fun commonImageTestRules(): TestRule = MultivalentTestWrapper.commonImageTestRules() + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/imagecomparison/ViewBasedImageTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/imagecomparison/ViewBasedImageTest.kt new file mode 100644 index 00000000000..ff96130bd11 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/imagecomparison/ViewBasedImageTest.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.imagecomparison + +import android.platform.test.flag.junit.SetFlagsRule +import com.android.launcher3.util.rule.ScreenRecordRule +import com.android.launcher3.util.rule.TestStabilityRule +import com.google.android.apps.nexuslauncher.MultivalentTestWrapper +import com.google.android.apps.nexuslauncher.imagecomparison.goldenpathmanager.NexusLauncherGoldenPathManager +import org.junit.ClassRule +import org.junit.Rule +import org.junit.rules.TestRule +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.ViewScreenshotTestRule + +abstract class ViewBasedImageTest(deviceEmulationSpec: DeviceEmulationSpec) { + + @get:Rule(order = 0) val testStabilityRule = TestStabilityRule() + + @get:Rule(order = 1) val screenRecordRule = ScreenRecordRule() + + @get:Rule(order = 2) + val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) + + @get:Rule(order = 3) + open val screenshotRule = + ViewScreenshotTestRule( + deviceEmulationSpec, + NexusLauncherGoldenPathManager(deviceEmulationSpec, this::class.java.simpleName), + ) + + companion object { + @ClassRule + @JvmStatic + fun commonImageTestRules(): TestRule = MultivalentTestWrapper.commonImageTestRules() + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewScreenshotTest.kt new file mode 100644 index 00000000000..5a09a7e4c18 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewScreenshotTest.kt @@ -0,0 +1,199 @@ +/* + * 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.launcher3.taskbar.bubbles + +import android.content.Context +import android.graphics.Color +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.rule.ScreenRecordRule +import android.view.View +import android.widget.FrameLayout +import android.widget.FrameLayout.LayoutParams.MATCH_PARENT +import android.widget.FrameLayout.LayoutParams.WRAP_CONTENT +import androidx.activity.ComponentActivity +import com.android.launcher3.R +import com.android.launcher3.imagecomparison.ViewBasedImageTest +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import org.junit.Test +import org.junit.runner.RunWith +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.Displays + +/** Screenshot tests for [BubbleBarView]. */ +@RunWith(ParameterizedAndroidJunit4::class) +@ScreenRecordRule.ScreenRecord +class BubbleBarViewScreenshotTest(emulationSpec: DeviceEmulationSpec) : + ViewBasedImageTest(emulationSpec) { + + private lateinit var bubbleBarView: BubbleBarView + + companion object { + @Parameters(name = "{0}") + @JvmStatic + fun getTestSpecs() = + DeviceEmulationSpec.forDisplays( + Displays.Phone, + isDarkTheme = false, + isLandscape = false, + ) + } + + @Test + @DisableFlags("com.android.launcher3.avoid_display_cutout_bubble_bar") + fun bubbleBarView_collapsed_oneBubble() { + screenshotRule.screenshotTest("collapsed_oneBubble") { activity -> + setupBubbleBarView(activity) + bubbleBarView.addBubble(createBubble(activity, "key1", Color.GREEN), false) + val container = FrameLayout(activity) + val lp = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) + container.layoutParams = lp + container.addView(bubbleBarView) + container + } + } + + @Test + @EnableFlags("com.android.launcher3.avoid_display_cutout_bubble_bar") + fun bubbleBarView_collapsed_oneBubble_flagOn() { + screenshotRule.screenshotTest("collapsed_oneBubble_flagOn") { activity -> + setupBubbleBarView(activity) + bubbleBarView.addBubble(createBubble(activity, "key1", Color.GREEN), false) + val container = FrameLayout(activity) + val lp = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) + container.layoutParams = lp + container.addView(bubbleBarView) + container + } + } + + @Test + @DisableFlags("com.android.launcher3.avoid_display_cutout_bubble_bar") + fun bubbleBarView_collapsed_twoBubbles() { + screenshotRule.screenshotTest("collapsed_twoBubbles") { activity -> + setupBubbleBarView(activity) + bubbleBarView.addBubble(createBubble(activity, "key1", Color.GREEN), true) + bubbleBarView.addBubble(createBubble(activity, "key2", Color.CYAN), true) + val container = FrameLayout(activity) + val lp = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) + container.layoutParams = lp + container.addView(bubbleBarView) + container + } + } + + @Test + @EnableFlags("com.android.launcher3.avoid_display_cutout_bubble_bar") + fun bubbleBarView_collapsed_twoBubbles_flagOn() { + screenshotRule.screenshotTest("collapsed_twoBubbles_flagOn") { activity -> + setupBubbleBarView(activity) + bubbleBarView.addBubble(createBubble(activity, "key1", Color.GREEN), true) + bubbleBarView.addBubble(createBubble(activity, "key2", Color.CYAN), true) + val container = FrameLayout(activity) + val lp = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) + container.layoutParams = lp + container.addView(bubbleBarView) + container + } + } + + @Test + @DisableFlags("com.android.launcher3.avoid_display_cutout_bubble_bar") + fun bubbleBarView_expanded_threeBubbles() { + // if we're still expanding, wait with taking a screenshot + val shouldWait: (ComponentActivity, View) -> Boolean = { _, _ -> bubbleBarView.isExpanding } + // increase the frame limit to allow the animation to end before taking the screenshot + screenshotRule.frameLimit = 500 + screenshotRule.screenshotTest("expanded_threeBubbles", checkView = shouldWait) { activity -> + setupBubbleBarView(activity) + bubbleBarView.addBubble(createBubble(activity, "key1", Color.GREEN), false) + bubbleBarView.addBubble(createBubble(activity, "key2", Color.CYAN), false) + bubbleBarView.addBubble(createBubble(activity, "key3", Color.MAGENTA), false) + val container = FrameLayout(activity) + val lp = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) + container.layoutParams = lp + container.addView(bubbleBarView) + bubbleBarView.animateExpanded(true) + container + } + } + + @Test + @EnableFlags("com.android.launcher3.avoid_display_cutout_bubble_bar") + fun bubbleBarView_expanded_threeBubbles_flagOn() { + // if we're still expanding, wait with taking a screenshot + val shouldWait: (ComponentActivity, View) -> Boolean = { _, _ -> bubbleBarView.isExpanding } + // increase the frame limit to allow the animation to end before taking the screenshot + screenshotRule.frameLimit = 500 + screenshotRule.screenshotTest("expanded_threeBubbles_flagOn", checkView = shouldWait) { + activity -> + setupBubbleBarView(activity) + bubbleBarView.addBubble(createBubble(activity, "key1", Color.GREEN), false) + bubbleBarView.addBubble(createBubble(activity, "key2", Color.CYAN), false) + bubbleBarView.addBubble(createBubble(activity, "key3", Color.MAGENTA), false) + val container = FrameLayout(activity) + val lp = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) + container.layoutParams = lp + container.addView(bubbleBarView) + bubbleBarView.animateExpanded(true) + container + } + } + + private fun setupBubbleBarView(context: Context) { + bubbleBarView = BubbleBarView(context) + val lp = FrameLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT) + bubbleBarView.layoutParams = lp + val paddingTop = + context.resources.getDimensionPixelSize(R.dimen.bubblebar_pointer_visible_size) + bubbleBarView.setPadding(0, paddingTop, 0, 0) + bubbleBarView.setController( + object : BubbleBarView.Controller { + override fun getBubbleBarTranslationY(): Float = 0f + + override fun onBubbleBarTouched() {} + + override fun expandBubbleBar() {} + + override fun dismissBubbleBar() {} + + override fun updateBubbleBarLocation(location: BubbleBarLocation?, source: Int) {} + + override fun setIsDragging(dragging: Boolean) {} + + override fun onBubbleBarExpandedStateChanged(expanded: Boolean) {} + } + ) + bubbleBarView.visibility = View.VISIBLE + bubbleBarView.alpha = 1f + } + + private fun createBubble(context: Context, key: String, color: Int): BubbleView { + val bubbleView = + FakeBubbleViewFactory.createBubble( + context, + key, + parent = bubbleBarView, + iconColor = color, + ) + bubbleView.showDotIfNeeded(1f) + bubbleBarView.setSelectedBubble(bubbleView) + return bubbleView + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewScreenshotTest.kt new file mode 100644 index 00000000000..b541455fbd9 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewScreenshotTest.kt @@ -0,0 +1,78 @@ +/* + * 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.launcher3.taskbar.bubbles + +import android.content.Context +import android.graphics.Color +import com.android.launcher3.imagecomparison.ViewBasedImageTest +import org.junit.Test +import org.junit.runner.RunWith +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.Displays + +/** Screenshot tests for [BubbleView]. */ +@RunWith(ParameterizedAndroidJunit4::class) +class BubbleViewScreenshotTest(emulationSpec: DeviceEmulationSpec) : + ViewBasedImageTest(emulationSpec) { + + companion object { + @Parameters(name = "{0}") + @JvmStatic + fun getTestSpecs() = + DeviceEmulationSpec.forDisplays( + Displays.Phone, + isDarkTheme = false, + isLandscape = false, + ) + } + + @Test + fun bubbleView_hasUnseenContent() { + screenshotRule.screenshotTest("hasUnseenContent") { activity -> setupBubbleView(activity) } + } + + @Test + fun bubbleView_seen() { + screenshotRule.screenshotTest("seen") { activity -> + setupBubbleView(activity, suppressNotification = true) + } + } + + @Test + fun bubbleView_badgeHidden() { + screenshotRule.screenshotTest("badgeHidden") { activity -> + setupBubbleView(activity).apply { setBadgeScale(0f) } + } + } + + private fun setupBubbleView( + context: Context, + suppressNotification: Boolean = false, + ): BubbleView { + val bubbleView = + FakeBubbleViewFactory.createBubble( + context, + key = "key", + parent = null, + iconColor = Color.LTGRAY, + suppressNotification = suppressNotification, + ) + bubbleView.showDotIfNeeded(1f) + return bubbleView + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/FakeBubbleViewFactory.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/FakeBubbleViewFactory.kt new file mode 100644 index 00000000000..e821907b557 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/FakeBubbleViewFactory.kt @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.bubbles + +import android.app.Notification +import android.content.Context +import android.graphics.Bitmap +import android.graphics.Color +import android.graphics.drawable.AdaptiveIconDrawable +import android.graphics.drawable.ColorDrawable +import android.graphics.drawable.Icon +import android.os.Process +import android.view.ViewGroup +import com.android.wm.shell.shared.bubbles.BubbleInfo + +object FakeBubbleViewFactory { + + /** Inflates a [BubbleView] and adds it to the [parent] view if it is present. */ + fun createBubble( + context: Context, + key: String, + parent: ViewGroup?, + iconColor: Int, + badgeColor: Int = Color.RED, + suppressNotification: Boolean = false, + ): BubbleView { + val flags = + if (suppressNotification) Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION else 0 + val bubbleInfo = + BubbleInfo( + key, + flags, + "non-existent-bubble-shortcut-id", + Icon.createWithAdaptiveBitmap( + Bitmap.createBitmap(200, 200, Bitmap.Config.ARGB_8888).apply { + eraseColor(iconColor) + } + ), + Process.myUserHandle().identifier, + context.packageName, + "test app", + "test app", + false, + true, + null, + ) + return BubbleCreator(context) + .populateBubble( + context, + bubbleInfo, + AdaptiveIconDrawable(ColorDrawable(badgeColor), null), + bubbleInfo.appName, + parent, + null, + )!! + .view + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/OWNERS b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/OWNERS new file mode 100644 index 00000000000..63c14984b90 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/OWNERS @@ -0,0 +1,4 @@ +atsjenk@google.com +liranb@google.com +madym@google.com +mpodolian@google.com diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutViewScreenshotTest.kt new file mode 100644 index 00000000000..c3d74aadb25 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutViewScreenshotTest.kt @@ -0,0 +1,229 @@ +/* + * 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.launcher3.taskbar.bubbles.flyout + +import android.graphics.Color +import android.graphics.PointF +import android.graphics.drawable.ColorDrawable +import com.android.launcher3.imagecomparison.ViewBasedImageTest +import org.junit.Test +import org.junit.runner.RunWith +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.Displays + +/** Screenshot tests for [BubbleBarFlyoutView]. */ +@RunWith(ParameterizedAndroidJunit4::class) +class BubbleBarFlyoutViewScreenshotTest(emulationSpec: DeviceEmulationSpec) : + ViewBasedImageTest(emulationSpec) { + companion object { + @Parameters(name = "{0}") + @JvmStatic + fun getTestSpecs() = + DeviceEmulationSpec.forDisplays( + Displays.Phone, + isDarkTheme = false, + isLandscape = false, + ) + } + + @Test + fun bubbleBarFlyoutView_noAvatar_onRight() { + screenshotRule.screenshotTest("noAvatar_onRight") { activity -> + val flyout = + BubbleBarFlyoutView(activity, FakeBubbleBarFlyoutPositioner(isOnLeft = false)) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage(icon = null, title = "sender", message = "message") + ) {} + flyout.updateExpansionProgress(1f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_noAvatar_onLeft() { + screenshotRule.screenshotTest("noAvatar_onLeft") { activity -> + val flyout = + BubbleBarFlyoutView(activity, FakeBubbleBarFlyoutPositioner(isOnLeft = true)) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage(icon = null, title = "sender", message = "message") + ) {} + flyout.updateExpansionProgress(1f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_noAvatar_longMessage() { + screenshotRule.screenshotTest("noAvatar_longMessage") { activity -> + val flyout = + BubbleBarFlyoutView(activity, FakeBubbleBarFlyoutPositioner(isOnLeft = true)) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage( + icon = null, + title = "sender", + message = "really, really, really, really, really long message. like really.", + ) + ) {} + flyout.updateExpansionProgress(1f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_avatar_onRight() { + screenshotRule.screenshotTest("avatar_onRight") { activity -> + val flyout = + BubbleBarFlyoutView(activity, FakeBubbleBarFlyoutPositioner(isOnLeft = false)) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage( + icon = ColorDrawable(Color.RED), + title = "sender", + message = "message", + ) + ) {} + flyout.updateExpansionProgress(1f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_avatar_onLeft() { + screenshotRule.screenshotTest("avatar_onLeft") { activity -> + val flyout = + BubbleBarFlyoutView(activity, FakeBubbleBarFlyoutPositioner(isOnLeft = true)) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage( + icon = ColorDrawable(Color.RED), + title = "sender", + message = "message", + ) + ) {} + flyout.updateExpansionProgress(1f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_avatar_longMessage() { + screenshotRule.screenshotTest("avatar_longMessage") { activity -> + val flyout = + BubbleBarFlyoutView(activity, FakeBubbleBarFlyoutPositioner(isOnLeft = true)) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage( + icon = ColorDrawable(Color.RED), + title = "sender", + message = "really, really, really, really, really long message. like really.", + ) + ) {} + flyout.updateExpansionProgress(1f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_collapsed_onLeft() { + screenshotRule.screenshotTest("collapsed_onLeft") { activity -> + val flyout = + BubbleBarFlyoutView(activity, FakeBubbleBarFlyoutPositioner(isOnLeft = true)) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage( + icon = ColorDrawable(Color.RED), + title = "sender", + message = "collapsed on left", + ) + ) {} + flyout.updateExpansionProgress(0f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_collapsed_onRight() { + screenshotRule.screenshotTest("collapsed_onRight") { activity -> + val flyout = + BubbleBarFlyoutView(activity, FakeBubbleBarFlyoutPositioner(isOnLeft = false)) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage( + icon = ColorDrawable(Color.RED), + title = "sender", + message = "collapsed on right", + ) + ) {} + flyout.updateExpansionProgress(0f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_90p_onLeft() { + screenshotRule.screenshotTest("90p_onLeft") { activity -> + val flyout = + BubbleBarFlyoutView( + activity, + FakeBubbleBarFlyoutPositioner( + isOnLeft = true, + distanceToCollapsedPosition = PointF(100f, 100f), + ), + ) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage( + icon = ColorDrawable(Color.RED), + title = "sender", + message = "expanded 90% on left", + ) + ) {} + flyout.updateExpansionProgress(0.9f) + flyout + } + } + + @Test + fun bubbleBarFlyoutView_80p_onRight() { + screenshotRule.screenshotTest("80p_onRight") { activity -> + val flyout = + BubbleBarFlyoutView( + activity, + FakeBubbleBarFlyoutPositioner( + isOnLeft = false, + distanceToCollapsedPosition = PointF(200f, 100f), + ), + ) + flyout.showFromCollapsed( + BubbleBarFlyoutMessage( + icon = ColorDrawable(Color.RED), + title = "sender", + message = "expanded 80% on right", + ) + ) {} + flyout.updateExpansionProgress(0.8f) + flyout + } + } + + private class FakeBubbleBarFlyoutPositioner( + override val isOnLeft: Boolean, + override val distanceToCollapsedPosition: PointF = PointF(0f, 0f), + ) : BubbleBarFlyoutPositioner { + override val targetTy = 0f + override val collapsedSize = 30f + override val collapsedColor = Color.BLUE + override val collapsedElevation = 1f + override val distanceToRevealTriangle = 10f + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/apptimer/TaskAppTimerScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/apptimer/TaskAppTimerScreenshotTest.kt new file mode 100644 index 00000000000..cefa8562131 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/apptimer/TaskAppTimerScreenshotTest.kt @@ -0,0 +1,154 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.apptimer + +import android.content.Context +import android.graphics.Color +import android.view.Gravity +import android.view.LayoutInflater +import android.widget.FrameLayout +import com.android.launcher3.Flags +import com.android.launcher3.R +import com.android.launcher3.imagecomparison.ViewBasedImageTest +import com.android.launcher3.util.Themes +import com.android.launcher3.util.rule.setFlags +import com.android.quickstep.task.thumbnail.TaskContentView +import com.android.quickstep.task.thumbnail.TaskHeaderUiState +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly +import java.time.Duration +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.Displays + +/** Screenshot tests for the digital wellbeing timer shown in the task content view */ +@RunWith(ParameterizedAndroidJunit4::class) +class TaskAppTimerScreenshotTest(emulationSpec: DeviceEmulationSpec) : + ViewBasedImageTest(emulationSpec) { + + @Before + fun setUp() { + setFlagsRule.setFlags( + true, + Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL, + Flags.FLAG_ENABLE_REFACTOR_TASK_CONTENT_VIEW, + Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST, + ) + } + + @Test + fun taskAppTimer_iconAndFullText() { + screenshotRule.screenshotTest("iconAndFullText") { activity -> + val container = createContainer(activity) + val taskContentView = createTaskContentView(activity) + container.addView(taskContentView, CONTAINER_WIDTH_WIDE, CONTAINER_HEIGHT) + + taskContentView.setState( + taskHeaderState = TaskHeaderUiState.HideHeader, + taskThumbnailUiState = BackgroundOnly(Color.YELLOW), + taskAppTimerUiState = TIMER_UI_STATE, + taskId = null, + ) + + container + } + } + + @Test + fun taskAppTimer_iconAndShortText() { + screenshotRule.screenshotTest("iconAndShortText") { activity -> + val container = createContainer(activity) + val taskContentView = createTaskContentView(activity) + container.addView(taskContentView, CONTAINER_WIDTH_MEDIUM, CONTAINER_HEIGHT) + + taskContentView.setState( + taskHeaderState = TaskHeaderUiState.HideHeader, + taskThumbnailUiState = BackgroundOnly(Color.YELLOW), + taskAppTimerUiState = TIMER_UI_STATE, + taskId = null, + ) + + container + } + } + + @Test + fun taskAppTimer_iconOnly() { + screenshotRule.screenshotTest("iconOnly") { activity -> + val container = createContainer(activity) + val taskContentView = createTaskContentView(activity) + container.addView(taskContentView, CONTAINER_WIDTH_NARROW, CONTAINER_HEIGHT) + + taskContentView.setState( + taskHeaderState = TaskHeaderUiState.HideHeader, + taskThumbnailUiState = BackgroundOnly(Color.YELLOW), + taskAppTimerUiState = TIMER_UI_STATE, + taskId = null, + ) + + container + } + } + + private fun createTaskContentView(context: Context): TaskContentView { + val taskContentView = + LayoutInflater.from(context).inflate(R.layout.task_content_view, null, false) + as TaskContentView + taskContentView.cornerRadius = Themes.getDialogCornerRadius(context) + return taskContentView + } + + private fun createContainer(context: Context): FrameLayout { + val container = FrameLayout(context) + val lp = + FrameLayout.LayoutParams( + FrameLayout.LayoutParams.WRAP_CONTENT, + FrameLayout.LayoutParams.WRAP_CONTENT, + Gravity.CENTER, + ) + container.layoutParams = lp + + return container + } + + companion object { + private const val CONTAINER_HEIGHT = 700 + private const val CONTAINER_WIDTH_WIDE = 800 + private const val CONTAINER_WIDTH_MEDIUM = 500 + private const val CONTAINER_WIDTH_NARROW = 150 + + private val TIMER_UI_STATE = + TaskAppTimerUiState.Timer( + timeRemaining = Duration.ofHours(23).plusMinutes(2), + taskDescription = "test", + taskPackageName = "com.test", + accessibilityActionId = R.id.action_digital_wellbeing_top_left, + ) + + @Parameters(name = "{0}") + @JvmStatic + fun getTestSpecs() = + DeviceEmulationSpec.forDisplays( + Displays.Phone, + isDarkTheme = false, + isLandscape = false, + ) + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/SplashHelper.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/SplashHelper.kt new file mode 100644 index 00000000000..8cc09d470b9 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/SplashHelper.kt @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.thumbnail + +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint + +object SplashHelper { + private val BITMAP_RECT_COLORS = listOf(Color.GREEN, Color.RED, Color.BLUE, Color.CYAN) + + fun createSplash(): Bitmap = createBitmap(width = 20, height = 20, rectColorRotation = 1) + + fun createBitmap(width: Int, height: Int, rectColorRotation: Int = 0): Bitmap = + Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888).apply { + Canvas(this).apply { + val paint = Paint() + paint.color = BITMAP_RECT_COLORS[rectColorRotation % 4] + drawRect(0f, 0f, width / 2f, height / 2f, paint) + paint.color = BITMAP_RECT_COLORS[(1 + rectColorRotation) % 4] + drawRect(width / 2f, 0f, width.toFloat(), height / 2f, paint) + paint.color = BITMAP_RECT_COLORS[(2 + rectColorRotation) % 4] + drawRect(0f, height / 2f, width / 2f, height.toFloat(), paint) + paint.color = BITMAP_RECT_COLORS[(3 + rectColorRotation) % 4] + drawRect(width / 2f, height / 2f, width.toFloat(), height.toFloat(), paint) + } + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskContentViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskContentViewScreenshotTest.kt new file mode 100644 index 00000000000..52d35fabc6f --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskContentViewScreenshotTest.kt @@ -0,0 +1,140 @@ +/* + * 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.quickstep.task.thumbnail + +import android.content.Context +import android.graphics.Color +import android.graphics.drawable.BitmapDrawable +import android.view.LayoutInflater +import com.android.launcher3.Flags +import com.android.launcher3.R +import com.android.launcher3.imagecomparison.ViewBasedImageTest +import com.android.launcher3.util.rule.setFlags +import com.android.quickstep.task.apptimer.TaskAppTimerUiState +import com.android.quickstep.task.thumbnail.SplashHelper.createSplash +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly +import java.time.Duration +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.Displays +import platform.test.screenshot.ViewScreenshotTestRule + +/** Screenshot tests for [TaskContentView]. */ +@RunWith(ParameterizedAndroidJunit4::class) +class TaskContentViewScreenshotTest(emulationSpec: DeviceEmulationSpec) : + ViewBasedImageTest(emulationSpec) { + + @Before + fun setUp() { + setFlagsRule.setFlags( + true, + Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL, + Flags.FLAG_ENABLE_REFACTOR_TASK_CONTENT_VIEW, + Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST, + ) + } + + @Test + fun taskContentView_recyclesToUninitialized() { + screenshotRule.screenshotTest("uninitialized", ViewScreenshotTestRule.Mode.MatchSize) { + activity -> + val taskContentView = createTaskContentView(activity) + taskContentView.setState( + TaskHeaderUiState.HideHeader, + BackgroundOnly(Color.YELLOW), + TIMER_UI_STATE, + null, + ) + taskContentView.onRecycle() + taskContentView + } + } + + @Test + fun taskContentView_shows_thumbnail_and_header() { + screenshotRule.screenshotTest( + "shows_thumbnail_and_header", + ViewScreenshotTestRule.Mode.MatchSize, + ) { activity -> + createTaskContentView(activity).apply { + setState( + TaskHeaderUiState.ShowHeader( + TaskHeaderUiState.ThumbnailHeader( + BitmapDrawable(activity.resources, createSplash()), + "test", + ) {} + ), + BackgroundOnly(Color.YELLOW), + NO_TIMER_UI_STATE, + null, + ) + } + } + } + + @Test + fun taskContentView_scaled_roundRoundedCorners() { + screenshotRule.screenshotTest( + "scaledRoundedCorners", + ViewScreenshotTestRule.Mode.MatchSize, + ) { activity -> + createTaskContentView(activity).apply { + scaleX = 0.75f + scaleY = 0.3f + setState( + TaskHeaderUiState.HideHeader, + BackgroundOnly(Color.YELLOW), + NO_TIMER_UI_STATE, + null, + ) + } + } + } + + private fun createTaskContentView(context: Context): TaskContentView { + val taskContentView = + LayoutInflater.from(context).inflate(R.layout.task_content_view, null, false) + as TaskContentView + taskContentView.cornerRadius = CORNER_RADIUS + return taskContentView + } + + companion object { + @Parameters(name = "{0}") + @JvmStatic + fun getTestSpecs() = + DeviceEmulationSpec.forDisplays( + Displays.Phone, + isDarkTheme = false, + isLandscape = false, + ) + + const val CORNER_RADIUS = 56f + + private val TIMER_UI_STATE = + TaskAppTimerUiState.Timer( + timeRemaining = Duration.ofHours(2).plusMinutes(20L), + taskDescription = "test", + taskPackageName = "com.test", + accessibilityActionId = R.id.action_digital_wellbeing_top_left, + ) + private val NO_TIMER_UI_STATE = TaskAppTimerUiState.NoTimer(taskDescription = "test") + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskHeaderViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskHeaderViewScreenshotTest.kt new file mode 100644 index 00000000000..dacdd3641a0 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskHeaderViewScreenshotTest.kt @@ -0,0 +1,144 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.thumbnail + +import android.content.Context +import android.graphics.drawable.BitmapDrawable +import android.view.LayoutInflater +import android.widget.FrameLayout +import android.widget.ImageButton +import com.android.launcher3.R +import com.android.launcher3.imagecomparison.ViewBasedImageTest +import com.android.quickstep.task.thumbnail.SplashHelper.createSplash +import com.android.quickstep.views.TaskHeaderView +import org.junit.Test +import org.junit.runner.RunWith +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.Displays +import platform.test.screenshot.ViewScreenshotTestRule.Mode.WrapContent + +/** Screenshot tests for [TaskHeaderView]. */ +@RunWith(ParameterizedAndroidJunit4::class) +class TaskHeaderViewScreenshotTest(emulationSpec: DeviceEmulationSpec) : + ViewBasedImageTest(emulationSpec) { + + @Test + fun taskHeaderView_showHeader() { + screenshotRule.screenshotTest("showHeader", mode = WrapContent) { activity -> + val container = FrameLayout(activity) + val headerView = createTaskHeaderView(activity) + + container.addView(headerView, CONTAINER_WIDTH, CONTAINER_HEIGHT) + headerView.setState( + TaskHeaderUiState.ShowHeader( + TaskHeaderUiState.ThumbnailHeader( + BitmapDrawable(activity.resources, createSplash()), + "Example", + ) {} + ) + ) + container + } + } + + @Test + fun taskNarrowHeaderView_showHeader() { + screenshotRule.screenshotTest("narrowShowHeader", mode = WrapContent) { activity -> + val container = FrameLayout(activity) + val headerView = createTaskHeaderView(activity) + + container.addView(headerView, CONTAINER_NARROW_WIDTH, CONTAINER_HEIGHT) + headerView.setState( + TaskHeaderUiState.ShowHeader( + TaskHeaderUiState.ThumbnailHeader( + BitmapDrawable(activity.resources, createSplash()), + "Example", + ) {} + ) + ) + container + } + } + + @Test + fun taskHeaderView_closeButtonHovered() { + screenshotRule.screenshotTest("closeButtonHovered", mode = WrapContent) { activity -> + val container = FrameLayout(activity) + val headerView = createTaskHeaderView(activity) + + container.addView(headerView, CONTAINER_WIDTH, CONTAINER_HEIGHT) + headerView.setState( + TaskHeaderUiState.ShowHeader( + TaskHeaderUiState.ThumbnailHeader( + BitmapDrawable(activity.resources, createSplash()), + "Example", + ) {} + ) + ) + // Simulate hover state on the close button + val closeButton = headerView.findViewById(R.id.header_close_button) + activity.runOnUiThread { closeButton.isHovered = true } + container + } + } + + @Test + fun taskHeaderView_closeButtonPressed() { + screenshotRule.screenshotTest("closeButtonPressed", mode = WrapContent) { activity -> + val container = FrameLayout(activity) + val headerView = createTaskHeaderView(activity) + + container.addView(headerView, CONTAINER_WIDTH, CONTAINER_HEIGHT) + headerView.setState( + TaskHeaderUiState.ShowHeader( + TaskHeaderUiState.ThumbnailHeader( + BitmapDrawable(activity.resources, createSplash()), + "Example", + ) {} + ) + ) + // Simulate press state on the close button + val closeButton = headerView.findViewById(R.id.header_close_button) + activity.runOnUiThread { closeButton.isPressed = true } + container + } + } + + private fun createTaskHeaderView(context: Context): TaskHeaderView { + val taskHeaderView = + LayoutInflater.from(context).inflate(R.layout.task_header_view, null, false) + as TaskHeaderView + return taskHeaderView + } + + companion object { + private const val CONTAINER_HEIGHT = 65 + private const val CONTAINER_WIDTH = 400 + private const val CONTAINER_NARROW_WIDTH = 200 + + @Parameters(name = "{0}") + @JvmStatic + fun getTestSpecs() = + DeviceEmulationSpec.forDisplays( + Displays.Tablet, + isDarkTheme = false, + isLandscape = true, + ) + } +} diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewScreenshotTest.kt new file mode 100644 index 00000000000..69fac135cc5 --- /dev/null +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewScreenshotTest.kt @@ -0,0 +1,241 @@ +/* + * 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.quickstep.task.thumbnail + +import android.content.Context +import android.graphics.Color +import android.graphics.Matrix +import android.graphics.drawable.BitmapDrawable +import android.view.LayoutInflater +import android.view.Surface.ROTATION_0 +import com.android.launcher3.Flags +import com.android.launcher3.R +import com.android.launcher3.imagecomparison.ViewBasedImageTest +import com.android.launcher3.util.rule.setFlags +import com.android.quickstep.task.thumbnail.SplashHelper.createBitmap +import com.android.quickstep.task.thumbnail.SplashHelper.createSplash +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Snapshot +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.SnapshotSplash +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Uninitialized +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters +import platform.test.screenshot.DeviceEmulationSpec +import platform.test.screenshot.Displays + +/** Screenshot tests for [TaskThumbnailView]. */ +@RunWith(ParameterizedAndroidJunit4::class) +class TaskThumbnailViewScreenshotTest(emulationSpec: DeviceEmulationSpec) : + ViewBasedImageTest(emulationSpec) { + + @Before + fun setUp() { + setFlagsRule.setFlags(false, Flags.FLAG_ENABLE_REFACTOR_TASK_CONTENT_VIEW) + } + + @Test + fun taskThumbnailView_uninitializedByDefault() { + screenshotRule.screenshotTest("uninitialized") { activity -> + createTaskThumbnailView(activity) + } + } + + @Test + fun taskThumbnailView_resetsToUninitialized() { + screenshotRule.screenshotTest("uninitialized") { activity -> + val taskThumbnailView = createTaskThumbnailView(activity) + taskThumbnailView.setState(BackgroundOnly(Color.YELLOW)) + taskThumbnailView.setState(Uninitialized) + taskThumbnailView + } + } + + @Test + fun taskThumbnailView_recyclesToUninitialized() { + screenshotRule.screenshotTest("uninitialized") { activity -> + val taskThumbnailView = createTaskThumbnailView(activity) + taskThumbnailView.setState(BackgroundOnly(Color.YELLOW)) + taskThumbnailView.onRecycle() + taskThumbnailView + } + } + + @Test + fun taskThumbnailView_backgroundOnly() { + screenshotRule.screenshotTest("backgroundOnly") { activity -> + createTaskThumbnailView(activity).apply { setState(BackgroundOnly(Color.YELLOW)) } + } + } + + @Test + fun taskThumbnailView_liveTile() { + screenshotRule.screenshotTest("liveTile") { activity -> + createTaskThumbnailView(activity).apply { setState(TaskThumbnailUiState.LiveTile) } + } + } + + @Test + fun taskThumbnailView_image() { + screenshotRule.screenshotTest("image") { activity -> + createTaskThumbnailView(activity).apply { + setState( + SnapshotSplash( + Snapshot( + createBitmap(VIEW_ENV_WIDTH, VIEW_ENV_HEIGHT), + ROTATION_0, + Color.DKGRAY, + ), + null, + ) + ) + } + } + } + + @Test + fun taskThumbnailView_image_withImageMatrix() { + screenshotRule.screenshotTest("image_withMatrix") { activity -> + createTaskThumbnailView(activity).apply { + val lessThanHeightMatchingAspectRatio = (VIEW_ENV_HEIGHT / 2) - 200 + setState( + SnapshotSplash( + Snapshot( + createBitmap( + width = VIEW_ENV_WIDTH / 2, + height = lessThanHeightMatchingAspectRatio, + ), + ROTATION_0, + Color.DKGRAY, + ), + null, + ) + ) + setImageMatrix(Matrix().apply { postScale(2f, 2f) }) + } + } + } + + @Test + fun taskThumbnailView_splash() { + screenshotRule.screenshotTest("partial_splash") { activity -> + createTaskThumbnailView(activity).apply { + setState( + SnapshotSplash( + Snapshot( + createBitmap(VIEW_ENV_WIDTH, VIEW_ENV_HEIGHT), + ROTATION_0, + Color.DKGRAY, + ), + BitmapDrawable(activity.resources, createSplash()), + ) + ) + updateSplashAlpha(0.5f) + } + } + } + + @Test + fun taskThumbnailView_splash_withImageMatrix() { + screenshotRule.screenshotTest("partial_splash_withMatrix") { activity -> + createTaskThumbnailView(activity).apply { + val lessThanHeightMatchingAspectRatio = (VIEW_ENV_HEIGHT / 2) - 200 + setState( + SnapshotSplash( + Snapshot( + createBitmap( + width = VIEW_ENV_WIDTH / 2, + height = lessThanHeightMatchingAspectRatio, + ), + ROTATION_0, + Color.DKGRAY, + ), + BitmapDrawable(activity.resources, createSplash()), + ) + ) + setImageMatrix(Matrix().apply { postScale(2f, 2f) }) + updateSplashAlpha(0.5f) + } + } + } + + @Test + fun taskThumbnailView_dimmed_tintAmount() { + screenshotRule.screenshotTest("dimmed_40") { activity -> + createTaskThumbnailView(activity).apply { + setState(BackgroundOnly(Color.YELLOW)) + updateTintAmount(.4f) + } + } + } + + @Test + fun taskThumbnailView_dimmed_menuOpen() { + screenshotRule.screenshotTest("dimmed_40") { activity -> + createTaskThumbnailView(activity).apply { + setState(BackgroundOnly(Color.YELLOW)) + updateMenuOpenProgress(1f) + } + } + } + + @Test + fun taskThumbnailView_dimmed_tintAmountAndMenuOpen() { + screenshotRule.screenshotTest("dimmed_80") { activity -> + createTaskThumbnailView(activity).apply { + setState(BackgroundOnly(Color.YELLOW)) + updateTintAmount(.8f) + updateMenuOpenProgress(1f) + } + } + } + + @Test + fun taskThumbnailView_scaled_roundRoundedCorners() { + screenshotRule.screenshotTest("scaledRoundedCorners") { activity -> + createTaskThumbnailView(activity).apply { + scaleX = 0.75f + scaleY = 0.3f + setState(BackgroundOnly(Color.YELLOW)) + } + } + } + + private fun createTaskThumbnailView(context: Context): TaskThumbnailView { + val taskThumbnailView = + LayoutInflater.from(context).inflate(R.layout.task_thumbnail, null, false) + as TaskThumbnailView + taskThumbnailView.cornerRadius = CORNER_RADIUS + return taskThumbnailView + } + + companion object { + @Parameters(name = "{0}") + @JvmStatic + fun getTestSpecs() = + DeviceEmulationSpec.forDisplays( + Displays.Phone, + isDarkTheme = false, + isLandscape = false, + ) + + const val CORNER_RADIUS = 56f + const val VIEW_ENV_WIDTH = 1440 + const val VIEW_ENV_HEIGHT = 3120 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt new file mode 100644 index 00000000000..059d425383f --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt @@ -0,0 +1,133 @@ +/* + * 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.launcher3.desktop + +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD +import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM +import android.content.Context +import android.content.res.Resources +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.WindowManager.TRANSIT_OPEN +import android.view.WindowManager.TRANSIT_TO_FRONT +import android.window.TransitionFilter +import android.window.TransitionFilter.CONTAINER_ORDER_ANY +import android.window.TransitionFilter.CONTAINER_ORDER_TOP +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.util.DisplayController +import com.android.quickstep.SystemUiProxy +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +class DesktopAppLaunchTransitionManagerTest { + + @get:Rule val mSetFlagsRule = SetFlagsRule() + + private val context = mock() + private val applicationContext = mock() + private val resources = mock() + private val systemUiProxy = mock() + private val displayController = mock() + private lateinit var transitionManager: DesktopAppLaunchTransitionManager + + @Before + fun setUp() { + whenever(context.applicationContext).thenReturn(applicationContext) + whenever(context.resources).thenReturn(resources) + whenever(applicationContext.resources).thenReturn(resources) + whenever(resources.getDimensionPixelSize(any())).thenReturn(42) + whenever(DesktopModeStatus.canEnterDesktopMode(context)).thenReturn(true) + transitionManager = + DesktopAppLaunchTransitionManager(context, systemUiProxy, displayController) + } + + @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX) + fun registerTransitions_appLaunchFlagEnabled_registersTransition() { + transitionManager.registerTransitions() + + verify(systemUiProxy, times(1)).registerRemoteTransition(any(), any()) + } + + @Test + @DisableFlags(FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX) + fun registerTransitions_appLaunchFlagDisabled_doesntRegisterTransition() { + transitionManager.registerTransitions() + + verify(systemUiProxy, times(0)).registerRemoteTransition(any(), any()) + } + + @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX) + @DisableFlags(FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX) + fun registerTransitions_usesCorrectFilter_flagDisabled() { + transitionManager.registerTransitions() + val filterArgumentCaptor = argumentCaptor() + + verify(systemUiProxy, times(1)) + .registerRemoteTransition(any(), filterArgumentCaptor.capture()) + + assertThat(filterArgumentCaptor.lastValue).isNotNull() + assertThat(filterArgumentCaptor.lastValue.mTypeSet) + .isEqualTo(intArrayOf(TRANSIT_OPEN, TRANSIT_TO_FRONT)) + assertThat(filterArgumentCaptor.lastValue.mRequirements).hasLength(1) + val launchRequirement = filterArgumentCaptor.lastValue.mRequirements!![0] + assertThat(launchRequirement.mModes).isEqualTo(intArrayOf(TRANSIT_OPEN, TRANSIT_TO_FRONT)) + assertThat(launchRequirement.mActivityType).isEqualTo(ACTIVITY_TYPE_STANDARD) + assertThat(launchRequirement.mWindowingMode).isEqualTo(WINDOWING_MODE_FREEFORM) + assertThat(launchRequirement.mOrder).isEqualTo(CONTAINER_ORDER_TOP) + } + + @Test + @EnableFlags( + FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX, + FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX, + ) + fun registerTransitions_usesCorrectFilter_flagEnabled() { + transitionManager.registerTransitions() + val filterArgumentCaptor = argumentCaptor() + + verify(systemUiProxy, times(1)) + .registerRemoteTransition(any(), filterArgumentCaptor.capture()) + + assertThat(filterArgumentCaptor.lastValue).isNotNull() + assertThat(filterArgumentCaptor.lastValue.mTypeSet) + .isEqualTo(intArrayOf(TRANSIT_OPEN, TRANSIT_TO_FRONT)) + assertThat(filterArgumentCaptor.lastValue.mRequirements).hasLength(1) + val launchRequirement = filterArgumentCaptor.lastValue.mRequirements!![0] + assertThat(launchRequirement.mModes).isEqualTo(intArrayOf(TRANSIT_OPEN, TRANSIT_TO_FRONT)) + assertThat(launchRequirement.mActivityType).isEqualTo(ACTIVITY_TYPE_STANDARD) + assertThat(launchRequirement.mWindowingMode).isEqualTo(WINDOWING_MODE_FREEFORM) + assertThat(launchRequirement.mOrder).isEqualTo(CONTAINER_ORDER_ANY) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/dragndrop/SystemDragControllerImplTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/dragndrop/SystemDragControllerImplTest.kt new file mode 100644 index 00000000000..40be8bff411 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/dragndrop/SystemDragControllerImplTest.kt @@ -0,0 +1,203 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.dragndrop + +import android.net.Uri +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.DragEvent +import androidx.test.filters.SmallTest +import com.android.launcher3.Flags.FLAG_ENABLE_SYSTEM_DRAG +import com.android.launcher3.Launcher +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.AllModulesForTest +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.SandboxApplication +import dagger.BindsInstance +import dagger.Component +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.Mock +import org.mockito.Mockito.verify +import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyNoInteractions +import org.mockito.kotlin.verifyNoMoreInteractions +import org.mockito.kotlin.whenever + +/** Tests for {@link SystemDragControllerImpl}. */ +@SmallTest +@EnableFlags(FLAG_ENABLE_SYSTEM_DRAG) +@RunWith(LauncherMultivalentJUnit::class) +class SystemDragControllerImplTest { + + @get:Rule val context = SandboxApplication() + @get:Rule val flags = SetFlagsRule() + @get:Rule val mockito = MockitoJUnit.rule() + + @Mock private lateinit var mockDragEvent: DragEvent + @Mock private lateinit var mockItemInfo: SystemDragItemInfo + @Mock private lateinit var mockLauncher: Launcher + @Mock private lateinit var mockSystemDragListener: SystemDragListener + @Mock private lateinit var mockUri: Uri + + private lateinit var controller: SystemDragControllerImpl + + @Before + fun setUp() { + initMock(mockLauncher) + initMock(mockSystemDragListener) + + context.initDaggerComponent( + DaggerSystemDragControllerImplTest_TestComponent.builder() + .bindSystemDragListenerFactory { mockSystemDragListener } + ) + + val controller = SystemDragController.INSTANCE[context] + assertTrue(controller is SystemDragControllerImpl) + this.controller = controller as SystemDragControllerImpl + } + + @Test + fun testAcceptDropWhenUriListIsEmpty() { + whenever(mockItemInfo.uriList).thenReturn(emptyList()) + assertFalse(controller.acceptDrop(mockItemInfo)) + } + + @Test + fun testAcceptDropWhenUriListIsNull() { + whenever(mockItemInfo.uriList).thenReturn(null) + assertFalse(controller.acceptDrop(mockItemInfo)) + } + + @Test + fun testAcceptDropWhenUriListIsPopulated() { + whenever(mockItemInfo.uriList).thenReturn(listOf(mockUri)) + assertTrue(controller.acceptDrop(mockItemInfo)) + } + + @Test + fun testDragContinue() { + testDragStart() + clearInvocations(mockSystemDragListener) + + whenever(mockDragEvent.action).thenReturn(DragEvent.ACTION_DRAG_LOCATION) + whenever(mockLauncher.dragController.isDragging).thenReturn(true) + + // NOTE: Fulfillment is delegated to the system drag listener. + assertTrue(controller.onDrag(mockDragEvent)) + verify(mockSystemDragListener).onDrag(mockDragEvent) + + whenever(mockLauncher.dragController.isDragging).thenReturn(false) + + // NOTE: Fulfillment is delegated to the system drag listener. + assertTrue(controller.onDrag(mockDragEvent)) + verify(mockSystemDragListener, times(2)).onDrag(mockDragEvent) + } + + @Test + fun testDragStart() { + controller.setLauncher(mockLauncher) + + whenever(mockDragEvent.action).thenReturn(DragEvent.ACTION_DRAG_STARTED) + whenever(mockLauncher.dragController.isDragging).thenReturn(false) + + // NOTE: Fulfillment is delegated to the system drag listener. + assertTrue(controller.onDrag(mockDragEvent)) + verify(mockSystemDragListener).onDrag(mockDragEvent) + } + + @Test + fun testDragStartAfterCleanup() { + testDragStart() + + val cleanupCallbackCaptor = ArgumentCaptor.forClass(Runnable::class.java) + verify(mockSystemDragListener).setCleanupCallback(cleanupCallbackCaptor.capture()) + cleanupCallbackCaptor.value.run() + + val oldMockSystemDragListener = mockSystemDragListener + mockSystemDragListener = mock().apply(this::initMock) + + testDragStart() + verifyNoMoreInteractions(oldMockSystemDragListener) + } + + @Test + fun testDragStartWhenActionIsNotStarted() { + controller.setLauncher(mockLauncher) + + whenever(mockDragEvent.action).thenReturn(DragEvent.ACTION_DRAG_LOCATION) + whenever(mockLauncher.dragController.isDragging).thenReturn(false) + + // NOTE: Fulfillment is *not* delegated to the system drag listener. + assertFalse(controller.onDrag(mockDragEvent)) + verifyNoInteractions(mockSystemDragListener) + } + + @Test + fun testDragStartWhenAlreadyDragging() { + controller.setLauncher(mockLauncher) + + whenever(mockDragEvent.action).thenReturn(DragEvent.ACTION_DRAG_STARTED) + whenever(mockLauncher.dragController.isDragging).thenReturn(true) + + // NOTE: Fulfillment is *not* delegated to the system drag listener. + assertFalse(controller.onDrag(mockDragEvent)) + verifyNoInteractions(mockSystemDragListener) + } + + @Test + fun testSetLauncher() { + controller.setLauncher(mockLauncher) + verify(mockLauncher.dragController).addSystemDragHandler(controller) + + val oldMockLauncher = mockLauncher + mockLauncher = mock().apply(this::initMock) + + controller.setLauncher(mockLauncher) + verify(oldMockLauncher.dragController).removeSystemDragHandler(controller) + verify(mockLauncher.dragController).addSystemDragHandler(controller) + } + + private fun initMock(mockLauncher: Launcher) { + whenever(mockLauncher.dragController).thenReturn(mock()) + } + + private fun initMock(mockSystemDragListener: SystemDragListener) { + whenever(mockSystemDragListener.onDrag(mockDragEvent)).thenReturn(true) + } + + @LauncherAppSingleton + @Component(modules = [AllModulesForTest::class]) + interface TestComponent : LauncherAppComponent { + @Component.Builder + interface Builder : LauncherAppComponent.Builder { + @BindsInstance + fun bindSystemDragListenerFactory(factory: SystemDragListenerFactory): Builder + + override fun build(): TestComponent + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/dragndrop/SystemDragControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/dragndrop/SystemDragControllerTest.kt new file mode 100644 index 00000000000..369711626d0 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/dragndrop/SystemDragControllerTest.kt @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.dragndrop + +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import androidx.test.filters.SmallTest +import com.android.launcher3.Flags.FLAG_ENABLE_SYSTEM_DRAG +import com.android.launcher3.dagger.DaggerLauncherAppComponent +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.SandboxApplication +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +/** Tests for {@link SystemDragController}. */ +@SmallTest +@RunWith(LauncherMultivalentJUnit::class) +class SystemDragControllerTest { + + @get:Rule val context = SandboxApplication() + @get:Rule val flags: SetFlagsRule = SetFlagsRule() + + private lateinit var controller: SystemDragController + + @Before + fun setUp() { + context.initDaggerComponent(DaggerLauncherAppComponent.builder()) + controller = SystemDragController.INSTANCE[context] + } + + @Test + @DisableFlags(FLAG_ENABLE_SYSTEM_DRAG) + fun testInjection_withFlagDisabled() { + assertTrue(controller is SystemDragControllerStub) + } + + @Test + @EnableFlags(FLAG_ENABLE_SYSTEM_DRAG) + fun testInjection_withFlagEnabled() { + assertTrue(controller is SystemDragControllerImpl) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/homescreenfiles/HomeScreenFilesProviderTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/homescreenfiles/HomeScreenFilesProviderTest.kt new file mode 100644 index 00000000000..83ff34c7537 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/homescreenfiles/HomeScreenFilesProviderTest.kt @@ -0,0 +1,306 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.homescreenfiles + +import android.content.ContentProviderClient +import android.content.ContentResolver +import android.content.ContentValues +import android.content.Context +import android.database.ContentObserver +import android.database.MatrixCursor +import android.net.Uri +import android.os.Bundle +import android.os.Process +import android.provider.DocumentsContract +import android.provider.DocumentsContract.EXTERNAL_STORAGE_PROVIDER_AUTHORITY +import android.provider.DocumentsContract.EXTRA_URI +import android.provider.MediaStore +import android.provider.MediaStore.Files.FileColumns.RELATIVE_PATH +import androidx.core.net.toUri +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.homescreenfiles.HomeScreenFilesProvider.Companion.HOME_SCREEN_FOLDER_RELATIVE_PATH +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.launcher3.util.SafeCloseable +import com.google.common.truth.Truth.assertThat +import com.google.common.util.concurrent.MoreExecutors +import java.util.concurrent.CompletableFuture +import java.util.concurrent.Executor +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argThat +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.eq +import org.mockito.kotlin.isNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +class HomeScreenFilesProviderTest { + + @get:Rule val mockito = MockitoJUnit.rule() + + @Mock private lateinit var context: Context + @Mock private lateinit var contentResolver: ContentResolver + @Mock private lateinit var contentProviderClient: ContentProviderClient + + private val lifeCycleTracker: DaggerSingletonTracker = + mock() { + on { addCloseable(any()) } doAnswer + { + lifecycleCloseables.add(it.getArgument(0)) + Unit + } + + on { close() } doAnswer { lifecycleCloseables.forEach { it.close() } } + } + + private lateinit var provider: HomeScreenFilesProvider + + private val lifecycleCloseables = mutableListOf() + + @Before + fun setUp() { + whenever(context.contentResolver).thenReturn(contentResolver) + provider = + HomeScreenFilesMediaStoreProvider( + context, + MoreExecutors.newDirectExecutorService(), + lifeCycleTracker, + ) + } + + @Test + fun testCanMoveToHomeScreen() { + val espUri = createExternalStoreProviderUri("externalRelativePath", "externalDisplayName") + val mediaStoreUri = createMediaStoreUri("mediaStoreId") + val testUri = createTestUri("testId") + + assertFalse(provider.canMoveToHomeScreen(null)) + assertFalse(provider.canMoveToHomeScreen(emptyList())) + assertTrue(provider.canMoveToHomeScreen(listOf(espUri))) + assertTrue(provider.canMoveToHomeScreen(listOf(espUri, mediaStoreUri))) + assertFalse(provider.canMoveToHomeScreen(listOf(espUri, mediaStoreUri, testUri))) + } + + @Test + fun testMoveToHomeScreen() { + val espUri = createExternalStoreProviderUri("externalRelativePath", "externalDisplayName") + val mediaStoreUri = createMediaStoreUri("mediaStoreId") + val mediaStoreUriResolvedFromEsp = createMediaStoreUri("externalId") + val testUri = createTestUri("testId") + + // Mock attempts to resolve media store URIs. + whenever(contentProviderClient.call(eq(GET_MEDIA_URI_CALL), anyOrNull(), any())) + .thenAnswer { invocation -> + Bundle().apply { + putParcelable( + EXTRA_URI, + when ( + invocation + .getArgument(2) + .getParcelable(EXTRA_URI, Uri::class.java) + ) { + espUri -> mediaStoreUriResolvedFromEsp + mediaStoreUri -> mediaStoreUri + else -> null + }, + ) + } + } + + // Associate media store content provider client with content resolver. + whenever(contentResolver.acquireContentProviderClient(MediaStore.AUTHORITY)) + .thenReturn(contentProviderClient) + + // Mock attempts to update media store. + whenever( + contentResolver.update( + /*uri=*/ anyOrNull(), + /*contentValues=*/ eq( + ContentValues().apply { + put(RELATIVE_PATH, HOME_SCREEN_FOLDER_RELATIVE_PATH) + } + ), + /*where=*/ eq("$RELATIVE_PATH != ?"), + /*selectionArgs=*/ eq(arrayOf(HOME_SCREEN_FOLDER_RELATIVE_PATH)), + ) + ) + .thenAnswer { invocation -> + when (invocation.getArgument(0)) { + mediaStoreUri, + mediaStoreUriResolvedFromEsp -> 1 + else -> throw RuntimeException() + } + } + + // Attempt to move URIs to home screen. + assertEquals( + listOf( + /*expectedEspUriResult=*/ true, + /*expectedMediaStoreUriResult=*/ true, + /*expectedTestUriResult=*/ false, + ), + provider + .moveToHomeScreen(listOf(espUri, mediaStoreUri, testUri)) + .map(CompletableFuture::get), + ) + } + + @Test + fun testQueriesMediaStore() { + val expectedUri = Uri.parse("content://media/external/file") + val expectedProjection = + arrayOf( + MediaStore.Files.FileColumns._ID, + MediaStore.Files.FileColumns.DISPLAY_NAME, + MediaStore.Files.FileColumns.MIME_TYPE, + MediaStore.Files.FileColumns.DATA, + ) + + whenever( + contentResolver.query( + eq(expectedUri), + eq(expectedProjection), + any(), + any(), + isNull(), + isNull(), + ) + ) + .thenAnswer { + val answer = MatrixCursor(expectedProjection) + answer.addRow( + arrayOf("1", "test.png", "image/png", "/storage/emulated/0/Desktop/test.png") + ) + answer.addRow( + arrayOf("2", "subfolder", null, "/storage/emulated/0/Desktop/subfolder") + ) + return@thenAnswer answer + } + + val result = provider.query().value + assertThat(result.size).isEqualTo(2) + + val uri1 = Uri.parse("content://media/external/file/1") + assertThat(result.containsKey(uri1)).isTrue() + assertThat(result[uri1]!!.displayName).isEqualTo("test.png") + assertThat(result[uri1]!!.mimeType).isEqualTo("image/png") + + val uri2 = Uri.parse("content://media/external/file/2") + assertThat(result.containsKey(uri2)).isTrue() + assertThat(result[uri2]!!.displayName).isEqualTo("subfolder") + assertThat(result[uri2]!!.mimeType).isNull() + + verify(contentResolver, times(1)) + .query( + eq(expectedUri), + eq(expectedProjection), + eq("${MediaStore.Files.FileColumns.RELATIVE_PATH} = ?"), + argThat { x -> x.contentDeepEquals(arrayOf("Home screen/")) }, + isNull(), + isNull(), + ) + } + + @Test + fun testRegistersChangeCallback() { + whenever( + contentResolver.query( + eq(Uri.parse("content://media/external/file/1")), + any(), + any(), + any(), + isNull(), + isNull(), + ) + ) + .thenAnswer { + val answer = + MatrixCursor( + arrayOf( + MediaStore.Files.FileColumns.DISPLAY_NAME, + MediaStore.Files.FileColumns.MIME_TYPE, + MediaStore.Files.FileColumns.DATA, + ) + ) + answer.addRow( + arrayOf("NEW_test.png", "image/png", "/storage/emulated/0/Desktop/test.png") + ) + return@thenAnswer answer + } + + val callback = mock<(HomeScreenFilesProvider.FileChange) -> Unit>() + val immediateExecutor = Executor { r -> r.run() } + val unregisterChangeCallback = + provider.fileChanges.forEach(immediateExecutor) { callback(it) } + val underlyingContentObserverCaptor = argumentCaptor() + verify(contentResolver, times(1)) + .registerContentObserver( + eq(Uri.parse("content://media/external/file")), + eq(true), + underlyingContentObserverCaptor.capture(), + ) + + underlyingContentObserverCaptor.firstValue.dispatchChange( + false, + Uri.parse("content://media/external/file/1"), + ContentResolver.NOTIFY_INSERT, + ) + + val fileChangeCaptor = argumentCaptor() + verify(callback, times(1))(fileChangeCaptor.capture()) + val fileChange = fileChangeCaptor.firstValue + assertThat(fileChange.uri).isEqualTo(Uri.parse("content://media/external/file/1")) + assertThat(fileChange.flags).isEqualTo(ContentResolver.NOTIFY_INSERT) + assertThat(fileChange.file.get()!!.displayName).isEqualTo("NEW_test.png") + assertThat(fileChange.file.get()!!.mimeType).isEqualTo("image/png") + assertThat(fileChange.file.get()!!.isDirectory).isFalse() + assertThat(fileChange.user).isEqualTo(Process.myUserHandle()) + + lifeCycleTracker.close() + verify(contentResolver, times(1)) + .unregisterContentObserver(eq(underlyingContentObserverCaptor.firstValue)) + + unregisterChangeCallback.close() + } + + private fun createExternalStoreProviderUri(relativePath: String, displayName: String) = + DocumentsContract.buildDocumentUri( + /*authority=*/ EXTERNAL_STORAGE_PROVIDER_AUTHORITY, + /*documentId=*/ "primary:$relativePath%3F$displayName", + ) + + private fun createMediaStoreUri(id: String) = MediaStore.Files.getContentUri(id) + + private fun createTestUri(id: String) = "content://test/path/$id".toUri() + + companion object { + private const val GET_MEDIA_URI_CALL = "get_media_uri" + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/AppEventProducerTest.java b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/AppEventProducerTest.java index d4dd58040ac..ed0b7268638 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/AppEventProducerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/AppEventProducerTest.java @@ -16,16 +16,11 @@ package com.android.launcher3.model; -import static androidx.test.core.app.ApplicationProvider.getApplicationContext; - import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION; import static junit.framework.Assert.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; - import android.app.prediction.AppTarget; import android.content.ComponentName; import android.content.Intent; @@ -37,56 +32,37 @@ import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.model.data.AppInfo; -import com.android.launcher3.pm.UserCache; -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; +import com.android.launcher3.util.SandboxApplication; import com.android.launcher3.util.UserIconInfo; +import com.android.launcher3.util.rule.MockUsersRule; +import com.android.launcher3.util.rule.MockUsersRule.MockUser; import com.android.systemui.shared.system.SysUiStatsLog; -import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.util.Arrays; @SmallTest @RunWith(AndroidJUnit4.class) public class AppEventProducerTest { private static final UserHandle MAIN_HANDLE = Process.myUserHandle(); - private static final UserHandle PRIVATE_HANDLE = new UserHandle(11); - private static final UserIconInfo MAIN_ICON_INFO = - new UserIconInfo(MAIN_HANDLE, UserIconInfo.TYPE_MAIN); - private static final UserIconInfo PRIVATE_ICON_INFO = - new UserIconInfo(PRIVATE_HANDLE, UserIconInfo.TYPE_PRIVATE); + @Rule public SandboxApplication mContext = new SandboxApplication(); + @Rule public MockUsersRule mMockUsersRule = new MockUsersRule(mContext); - private SandboxContext mContext; private AppEventProducer mAppEventProducer; - @Mock - private UserCache mUserCache; @Before public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = new SandboxContext(getApplicationContext()); - mContext.putObject(UserCache.INSTANCE, mUserCache); mAppEventProducer = new AppEventProducer(mContext, null); } - @After - public void tearDown() { - mContext.onDestroy(); - } - + @MockUser(userType = UserIconInfo.TYPE_MAIN) + @MockUser(userType = UserIconInfo.TYPE_PRIVATE) @Test public void buildAppTarget_containsCorrectUser() { - when(mUserCache.getUserProfiles()) - .thenReturn(Arrays.asList(MAIN_HANDLE, PRIVATE_HANDLE)); - when(mUserCache.getUserInfo(any(UserHandle.class))) - .thenReturn(MAIN_ICON_INFO, PRIVATE_ICON_INFO); ComponentName gmailComponentName = new ComponentName(mContext, "com.android.launcher3.tests.Activity" + "Gmail"); AppInfo gmailAppInfo = new @@ -94,29 +70,30 @@ public void buildAppTarget_containsCorrectUser() { gmailAppInfo.container = CONTAINER_ALL_APPS; gmailAppInfo.itemType = ITEM_TYPE_APPLICATION; + UserHandle privateUserHandler = mMockUsersRule.findUser(UserIconInfo::isPrivate); + AppTarget gmailTarget = mAppEventProducer - .toAppTarget(buildItemInfoProtoForAppInfo(gmailAppInfo)); + .toAppTarget(buildItemInfoProtoForAppInfo(gmailAppInfo, privateUserHandler)); assert gmailTarget != null; assertEquals(gmailTarget.getUser(), MAIN_HANDLE); - when(mUserCache.getUserInfo(any(UserHandle.class))) - .thenReturn(MAIN_ICON_INFO, PRIVATE_ICON_INFO); AppInfo gmailAppInfoPrivate = new - AppInfo(gmailComponentName, "Gmail", PRIVATE_HANDLE, new Intent()); + AppInfo(gmailComponentName, "Gmail", privateUserHandler, new Intent()); gmailAppInfoPrivate.container = CONTAINER_ALL_APPS; gmailAppInfoPrivate.itemType = ITEM_TYPE_APPLICATION; AppTarget gmailPrivateTarget = mAppEventProducer - .toAppTarget(buildItemInfoProtoForAppInfo(gmailAppInfoPrivate)); + .toAppTarget(buildItemInfoProtoForAppInfo(gmailAppInfoPrivate, privateUserHandler)); assert gmailPrivateTarget != null; - assertEquals(gmailPrivateTarget.getUser(), PRIVATE_HANDLE); + assertEquals(gmailPrivateTarget.getUser(), privateUserHandler); } - private LauncherAtom.ItemInfo buildItemInfoProtoForAppInfo(AppInfo appInfo) { + private LauncherAtom.ItemInfo buildItemInfoProtoForAppInfo( + AppInfo appInfo, UserHandle privateUserHandler) { LauncherAtom.ItemInfo.Builder itemBuilder = LauncherAtom.ItemInfo.newBuilder(); - if (appInfo.user.equals(PRIVATE_HANDLE)) { + if (appInfo.user.equals(privateUserHandler)) { itemBuilder.setUserType(SysUiStatsLog.LAUNCHER_UICHANGED__USER_TYPE__TYPE_PRIVATE); } else { itemBuilder.setUserType(SysUiStatsLog.LAUNCHER_UICHANGED__USER_TYPE__TYPE_MAIN); diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionHelperTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionHelperTest.kt new file mode 100644 index 00000000000..5897f8419ea --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionHelperTest.kt @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.model + +import android.app.prediction.AppTargetEvent +import android.content.ComponentName +import android.content.Intent +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PIN_WIDGETS +import com.android.launcher3.WorkspaceLayoutManager.FIRST_SCREEN_ID +import com.android.launcher3.model.PredictionHelper.BUNDLE_KEY_ADDED_APP_WIDGETS +import com.android.launcher3.model.PredictionHelper.BUNDLE_KEY_PIN_EVENTS +import com.android.launcher3.model.PredictionHelper.getBundleForHotseatPredictions +import com.android.launcher3.model.PredictionHelper.getBundleForWidgetPredictions +import com.android.launcher3.model.PredictionHelper.isTrackedForHotseatPrediction +import com.android.launcher3.model.PredictionHelper.isTrackedForWidgetPrediction +import com.android.launcher3.model.data.AppInfo +import com.android.launcher3.model.data.LauncherAppWidgetInfo +import com.android.launcher3.util.ModelTestExtensions.initItems +import com.android.launcher3.util.SandboxApplication +import com.google.common.truth.Truth.assertThat +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class PredictionHelperTest { + + @get:Rule val context = SandboxApplication() + private var itemIdCounter: Int = 0 + + @Test + fun isTrackedForHotseatPrediction_true_for_valid_items() { + createAppInfo("test").let { + assertTrue(it.isTrackedForHotseatPrediction()) + assertTrue(it.buildProto(context).isTrackedForHotseatPrediction()) + } + + createAppInfo("test", CONTAINER_HOTSEAT).let { + assertTrue(it.isTrackedForHotseatPrediction()) + assertTrue(it.buildProto(context).isTrackedForHotseatPrediction()) + } + } + + @Test + fun isTrackedForHotseatPrediction_false_for_invalid_items() { + createAppInfo("test", CONTAINER_DESKTOP, 3).let { + assertFalse(it.isTrackedForHotseatPrediction()) + assertFalse(it.buildProto(context).isTrackedForHotseatPrediction()) + } + + createAppInfo("test", 2 /* folder */).let { + assertFalse(it.isTrackedForHotseatPrediction()) + assertFalse(it.buildProto(context).isTrackedForHotseatPrediction()) + } + + createAppInfo("test", CONTAINER_ALL_APPS).let { + assertFalse(it.isTrackedForHotseatPrediction()) + assertFalse(it.buildProto(context).isTrackedForHotseatPrediction()) + } + } + + @Test + fun isTrackedForWidgetPrediction_true_for_valid_items() { + createWidgetInfoInfo("test").let { + assertTrue(it.isTrackedForWidgetPrediction()) + assertTrue(it.buildProto(context).isTrackedForWidgetPrediction()) + } + } + + @Test + fun isTrackedForWidgetPrediction_false_for_invalid_items() { + createAppInfo("test").let { + assertFalse(it.isTrackedForWidgetPrediction()) + assertFalse(it.buildProto(context).isTrackedForWidgetPrediction()) + } + + createWidgetInfoInfo("test", CONTAINER_PIN_WIDGETS).let { + assertFalse(it.isTrackedForWidgetPrediction()) + assertFalse(it.buildProto(context).isTrackedForWidgetPrediction()) + } + } + + @Test + fun getBundleForHotseatPredictions_contains_pin_events() { + val dataModel = context.appComponent.testableModelState.dataModel + dataModel.initItems( + createAppInfo("test1"), + createAppInfo("test2", CONTAINER_HOTSEAT, 2), + createAppInfo("test3", 2 /* folder */), + ) + + val items = + getBundleForHotseatPredictions(context, dataModel) + .getParcelableArrayList(BUNDLE_KEY_PIN_EVENTS)!! + assertThat(items).hasSize(2) + assertThat(items[0].launchLocation).isEqualTo("workspace/0/[0,0]/[1,1]") + assertThat(items[0].target!!.packageName).isEqualTo("test1") + + assertThat(items[1].launchLocation).isEqualTo("hotseat/2/[2,0]/[1,1]") + assertThat(items[1].target!!.packageName).isEqualTo("test2") + } + + @Test + fun getBundleForWidgetPredictions_contains_pin_events() { + val dataModel = context.appComponent.testableModelState.dataModel + dataModel.initItems( + createAppInfo("test1"), + createAppInfo("test2", CONTAINER_HOTSEAT, 2), + createWidgetInfoInfo("test3"), + ) + + val items = + getBundleForWidgetPredictions(context, dataModel) + .getParcelableArrayList(BUNDLE_KEY_ADDED_APP_WIDGETS)!! + assertThat(items).hasSize(1) + assertThat(items[0].launchLocation).isEqualTo("workspace/0/[0,0]/[1,1]") + assertThat(items[0].target!!.packageName).isEqualTo("test3") + } + + private fun createAppInfo( + pkg: String, + container: Int = CONTAINER_DESKTOP, + screenId: Int = FIRST_SCREEN_ID, + ) = + AppInfo().apply { + this.id = itemIdCounter + this.container = container + this.screenId = screenId + this.intent = Intent().setComponent(ComponentName(pkg, pkg)) + this.componentName = ComponentName(pkg, pkg) + this.cellX = 0 + this.cellY = 0 + + itemIdCounter++ + } + + private fun createWidgetInfoInfo( + pkg: String, + container: Int = CONTAINER_DESKTOP, + screenId: Int = FIRST_SCREEN_ID, + ) = + LauncherAppWidgetInfo().apply { + this.id = itemIdCounter + this.container = container + this.screenId = screenId + this.providerName = ComponentName(pkg, pkg) + this.cellX = 0 + this.cellY = 0 + + itemIdCounter++ + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionUpdateTaskTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionUpdateTaskTest.kt new file mode 100644 index 00000000000..a17ab9033a6 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionUpdateTaskTest.kt @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.model + +import android.app.prediction.AppTarget +import android.app.prediction.AppTargetId +import android.os.Process.myUserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.icons.cache.CacheLookupFlag.Companion.DEFAULT_LOOKUP_FLAG +import com.android.launcher3.util.AllModulesForTest +import com.android.launcher3.util.Executors.MODEL_EXECUTOR +import com.android.launcher3.util.LauncherModelHelper.TEST_ACTIVITY +import com.android.launcher3.util.LauncherModelHelper.TEST_ACTIVITY2 +import com.android.launcher3.util.LauncherModelHelper.TEST_PACKAGE +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.TestUtil +import com.google.common.truth.Truth.assertThat +import dagger.Component +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class PredictionUpdateTaskTest { + + @get:Rule val context = SandboxApplication().withModelDependency() + + private val containerId = -300 + private val predictorState = PredictorState(containerId, "test-storage", DEFAULT_LOOKUP_FLAG) + + lateinit var component: TestComponent + + @Before + fun setup() { + context.initDaggerComponent(DaggerPredictionUpdateTaskTest_TestComponent.builder()) + component = context.appComponent as TestComponent + } + + @Test + fun emptyPredictions_update_data_model() { + assertThat(component.getDataModel().itemsIdMap[containerId]).isNull() + + TestUtil.runOnExecutorSync(MODEL_EXECUTOR) { + PredictionUpdateTask(predictorState, listOf()) + .execute( + component.getTaskController(), + component.getDataModel(), + component.getAllAppsList(), + ) + } + assertThat(component.getDataModel().itemsIdMap[containerId]).isNotNull() + assertThat(component.getDataModel().itemsIdMap.getPredictedContents(containerId)).isEmpty() + } + + @Test + fun validPredictions_added_to_data_model() { + assertThat(component.getDataModel().itemsIdMap[containerId]).isNull() + + TestUtil.runOnExecutorSync(MODEL_EXECUTOR) { + PredictionUpdateTask( + predictorState, + listOf(createAppTarget(TEST_ACTIVITY), createAppTarget(TEST_ACTIVITY2)), + ) + .execute( + component.getTaskController(), + component.getDataModel(), + component.getAllAppsList(), + ) + } + assertThat(component.getDataModel().itemsIdMap[containerId]).isNotNull() + val items = component.getDataModel().itemsIdMap.getPredictedContents(containerId) + assertThat(items).hasSize(2) + } + + private fun createAppTarget(className: String): AppTarget = + AppTarget.Builder(AppTargetId("app:$className"), TEST_PACKAGE, myUserHandle()) + .setClassName(className) + .build() + + @LauncherAppSingleton + @Component(modules = [AllModulesForTest::class]) + interface TestComponent : LauncherAppComponent { + + fun getDataModel(): BgDataModel + + fun getAllAppsList(): AllAppsList + + fun getTaskController(): ModelTaskController + + @Component.Builder + interface Builder : LauncherAppComponent.Builder { + + override fun build(): TestComponent + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt new file mode 100644 index 00000000000..28d512d8f1d --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt @@ -0,0 +1,144 @@ +/* + * 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.launcher3.model + +import android.app.prediction.AppPredictor +import android.app.prediction.AppTarget +import android.app.prediction.AppTargetEvent +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WALLPAPERS +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION +import com.android.launcher3.util.SandboxApplication +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertSame +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.Mockito.verifyNoMoreInteractions +import org.mockito.junit.MockitoJUnit + +/** Unit tests for [QuickstepModelDelegate]. */ +@RunWith(AndroidJUnit4::class) +class QuickstepModelDelegateTest { + + @get:Rule val context = SandboxApplication().withModelDependency() + + private lateinit var underTest: QuickstepModelDelegate + + @get:Rule val mockito = MockitoJUnit.rule() + @Mock private lateinit var target: AppTarget + @Mock private lateinit var mockedAppTargetEvent: AppTargetEvent + @Mock private lateinit var allAppsPredictor: AppPredictor + @Mock private lateinit var hotseatPredictor: AppPredictor + @Mock private lateinit var widgetRecommendationPredictor: AppPredictor + @Mock private lateinit var itemParserFactory: PredictedItemFactory.Factory + + @Before + fun setUp() { + underTest = + QuickstepModelDelegate( + context, + context.appComponent.idp, + context.appComponent.userCache, + itemParserFactory, + "", /* dbFileName */ + ) + underTest.mAllPredictionAppsState.predictor = allAppsPredictor + underTest.mHotseatPredictionState.predictor = hotseatPredictor + underTest.mWidgetsRecommendationState.predictor = widgetRecommendationPredictor + underTest.mModel = context.appComponent.testableModelState.model + underTest.mDataModel = context.appComponent.testableModelState.dataModel + } + + @Test + fun onAppTargetEvent_notifyTarget() { + underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_ALL_APPS_PREDICTION) + + verify(allAppsPredictor).notifyAppTargetEvent(mockedAppTargetEvent) + verifyNoMoreInteractions(hotseatPredictor) + verifyNoMoreInteractions(widgetRecommendationPredictor) + } + + @Test + fun onWidgetPrediction_notifyWidgetRecommendationPredictor() { + underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_WIDGETS_PREDICTION) + + verifyNoMoreInteractions(allAppsPredictor) + verify(widgetRecommendationPredictor).notifyAppTargetEvent(mockedAppTargetEvent) + verifyNoMoreInteractions(hotseatPredictor) + } + + @Test + fun onHotseatPrediction_notifyHotseatPredictor() { + underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_HOTSEAT_PREDICTION) + + verifyNoMoreInteractions(allAppsPredictor) + verifyNoMoreInteractions(widgetRecommendationPredictor) + verify(hotseatPredictor).notifyAppTargetEvent(mockedAppTargetEvent) + } + + @Test + fun onOtherClient_notifyHotseatPredictor() { + underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_WALLPAPERS) + + verifyNoMoreInteractions(allAppsPredictor) + verifyNoMoreInteractions(widgetRecommendationPredictor) + verify(hotseatPredictor).notifyAppTargetEvent(mockedAppTargetEvent) + } + + @Test + fun hotseatActionPin_recreateHotSeat() { + assertSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) + val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_PIN).build() + underTest.markActive() + + underTest.onAppTargetEvent(appTargetEvent, CONTAINER_HOTSEAT_PREDICTION) + + verify(hotseatPredictor).destroy() + assertNotSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) + } + + @Test + fun hotseatActionUnpin_recreateHotSeat() { + assertSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) + underTest.markActive() + val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_UNPIN).build() + + underTest.onAppTargetEvent(appTargetEvent, CONTAINER_HOTSEAT_PREDICTION) + + verify(hotseatPredictor).destroy() + assertNotSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) + } + + @Test + fun container_actionPin_notRecreateHotSeat() { + assertSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) + val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_UNPIN).build() + underTest.markActive() + + underTest.onAppTargetEvent(appTargetEvent, CONTAINER_ALL_APPS_PREDICTION) + + verify(allAppsPredictor, never()).destroy() + verify(hotseatPredictor, never()).destroy() + assertSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java new file mode 100644 index 00000000000..35235441517 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java @@ -0,0 +1,290 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.model; + +import static android.content.pm.ApplicationInfo.CATEGORY_PRODUCTIVITY; +import static android.content.pm.ApplicationInfo.FLAG_INSTALLED; +import static android.os.Process.myUserHandle; + +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; +import static com.android.launcher3.icons.cache.CacheLookupFlag.DEFAULT_LOOKUP_FLAG; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; +import static com.android.launcher3.util.TestUtil.runOnExecutorSync; +import static com.android.launcher3.util.WidgetUtils.createAppWidgetProviderInfo; + +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.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; + +import android.app.prediction.AppTarget; +import android.app.prediction.AppTargetId; +import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProviderInfo; +import android.content.ComponentName; +import android.content.pm.ApplicationInfo; +import android.content.pm.LauncherApps; +import android.os.Process; +import android.os.UserHandle; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.flag.junit.SetFlagsRule; +import android.text.TextUtils; + +import androidx.annotation.NonNull; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.launcher3.Flags; +import com.android.launcher3.LauncherAppState; +import com.android.launcher3.LauncherModel; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.util.LauncherLayoutBuilder; +import com.android.launcher3.util.LayoutResource; +import com.android.launcher3.util.SandboxApplication; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; +import com.android.launcher3.widget.PendingAddWidgetInfo; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public final class WidgetsPredicationUpdateTaskTest { + + @Rule + public final MockitoRule mocks = MockitoJUnit.rule(); + + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + + @Rule public SandboxApplication mContext = new SandboxApplication().withModelDependency(); + @Rule public LayoutResource mLayout = new LayoutResource(mContext); + + private AppWidgetProviderInfo mApp1Provider1; + private AppWidgetProviderInfo mApp1Provider2; + private AppWidgetProviderInfo mApp2Provider1; + private AppWidgetProviderInfo mApp4Provider1; + private AppWidgetProviderInfo mApp4Provider2; + private AppWidgetProviderInfo mApp5Provider1; + private AppWidgetProviderInfo mApp6PinOnlyProvider1; + private List allWidgets; + + private FakeBgDataModelCallback mCallback = new FakeBgDataModelCallback(); + private UserHandle mUserHandle; + private LauncherApps mLauncherApps; + + + @Before + public void setup() throws Exception { + mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_CATEGORIZED_WIDGET_SUGGESTIONS); + + mUserHandle = myUserHandle(); + mApp1Provider1 = createAppWidgetProviderInfo( + ComponentName.createRelative("app1", "provider1")); + mApp1Provider2 = createAppWidgetProviderInfo( + ComponentName.createRelative("app1", "provider2")); + mApp2Provider1 = createAppWidgetProviderInfo( + ComponentName.createRelative("app2", "provider1")); + mApp4Provider1 = createAppWidgetProviderInfo( + ComponentName.createRelative("app4", "provider1")); + mApp4Provider2 = createAppWidgetProviderInfo( + ComponentName.createRelative("app4", ".provider2")); + mApp5Provider1 = createAppWidgetProviderInfo( + ComponentName.createRelative("app5", "provider1")); + mApp6PinOnlyProvider1 = createAppWidgetProviderInfo( + ComponentName.createRelative("app6", "provider1"), + /*hideFromPicker=*/ true + ); + + + allWidgets = Arrays.asList(mApp1Provider1, mApp1Provider2, mApp2Provider1, + mApp4Provider1, mApp4Provider2, mApp5Provider1, mApp6PinOnlyProvider1); + + mLauncherApps = mContext.spyService(LauncherApps.class); + doAnswer(i -> { + String pkg = i.getArgument(0); + ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.packageName = pkg; + applicationInfo.name = "App " + pkg; + applicationInfo.uid = Process.myUid(); + applicationInfo.category = CATEGORY_PRODUCTIVITY; + applicationInfo.flags = FLAG_INSTALLED; + return applicationInfo; + }).when(mLauncherApps).getApplicationInfo(anyString(), anyInt(), any()); + + AppWidgetManager manager = mContext.spyService(AppWidgetManager.class); + doReturn(allWidgets).when(manager).getInstalledProviders(); + doReturn(allWidgets).when(manager).getInstalledProvidersForProfile(eq(myUserHandle())); + doAnswer(i -> { + String pkg = i.getArgument(0); + return TextUtils.isEmpty(pkg) ? allWidgets : allWidgets.stream() + .filter(a -> pkg.equals(a.provider.getPackageName())) + .collect(Collectors.toList()); + }).when(manager).getInstalledProvidersForPackage(any(), eq(myUserHandle())); + + LauncherLayoutBuilder builder = new LauncherLayoutBuilder() + .atWorkspace(0, 1, 2).putWidget("app4", "provider1", 1, 1) + .atWorkspace(0, 1, 3).putWidget("app5", "provider1", 1, 1); + mLayout.withCallbacks(mCallback).set(builder); + } + + @Test + @DisableFlags(Flags.FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER) // Flag off + public void widgetsRecommendationRan_shouldOnlyReturnNotAddedWidgetsInAppPredictionOrder() { + // Run on model executor so that no other task runs in the middle. + runOnExecutorSync(MODEL_EXECUTOR, () -> { + // WHEN newPredicationTask is executed with app predication of 5 apps. + AppTarget app1 = new AppTarget(new AppTargetId("app1"), "app1", "provider1", + mUserHandle); + AppTarget app2 = new AppTarget(new AppTargetId("app2"), "app2", "provider1", + mUserHandle); + AppTarget app3 = new AppTarget(new AppTargetId("app3"), "app3", "className", + mUserHandle); + AppTarget app4 = new AppTarget(new AppTargetId("app4"), "app4", "provider1", + mUserHandle); + AppTarget app5 = new AppTarget(new AppTargetId("app5"), "app5", "provider1", + mUserHandle); + mCallback.mRecommendedWidgets = null; + getModel().enqueueModelUpdateTask( + newWidgetsPredicationTask(List.of(app5, app3, app2, app4, app1))); + runOnExecutorSync(MAIN_EXECUTOR, () -> { }); + + // THEN only 2 widgets are returned because + // 1. app5/provider1 & app4/provider1 have already been added to workspace. They are + // excluded from the result. + // 2. app3 doesn't have a widget. + // 3. only 1 widget is picked from app1 because we only want to promote one widget + // per app. + List recommendedWidgets = mCallback.mRecommendedWidgets + .getContents() + .stream() + .map(itemInfo -> (PendingAddWidgetInfo) itemInfo) + .collect(Collectors.toList()); + assertThat(recommendedWidgets).hasSize(2); + recommendedWidgets.forEach(pendingAddWidgetInfo -> + assertThat(pendingAddWidgetInfo.recommendationCategory).isNotNull() + ); + assertWidgetInfo(recommendedWidgets.get(0).info, mApp2Provider1); + assertWidgetInfo(recommendedWidgets.get(1).info, mApp1Provider1); + }); + } + + @Test + @DisableFlags(Flags.FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER) // Flag off + public void widgetsRecommendationRan_shouldReturnEmptyWidgetsWhenEmpty() { + runOnExecutorSync(MODEL_EXECUTOR, () -> { + + // Not installed widget + AppTarget widget1 = new AppTarget(new AppTargetId("app1"), "app1", "provider3", + mUserHandle); + // Not installed app + AppTarget widget3 = new AppTarget(new AppTargetId("app2"), "app3", "provider1", + mUserHandle); + // Workspace added widgets + AppTarget widget4 = new AppTarget(new AppTargetId("app4"), "app4", "provider1", + mUserHandle); + AppTarget widget5 = new AppTarget(new AppTargetId("app5"), "app5", "provider1", + mUserHandle); + + mCallback.mRecommendedWidgets = null; + getModel().enqueueModelUpdateTask( + newWidgetsPredicationTask(List.of(widget5, widget3, widget4, widget1))); + runOnExecutorSync(MAIN_EXECUTOR, () -> { }); + + // Only widgets suggested by prediction system are returned. + List recommendedWidgets = mCallback.mRecommendedWidgets + .getContents() + .stream() + .map(itemInfo -> (PendingAddWidgetInfo) itemInfo) + .collect(Collectors.toList()); + assertThat(recommendedWidgets).hasSize(0); + }); + } + + @Test + public void widgetsRecommendations_excludesWidgetsHiddenForPicker() { + runOnExecutorSync(MODEL_EXECUTOR, () -> { + + // Not installed widget - hence eligible + AppTarget widget1 = new AppTarget(new AppTargetId("app1"), "app1", "provider1", + mUserHandle); + // Provider marked as hidden from picker - hence not eligible + AppTarget widget6 = new AppTarget(new AppTargetId("app6"), "app6", "provider1", + mUserHandle); + + mCallback.mRecommendedWidgets = null; + getModel().enqueueModelUpdateTask( + newWidgetsPredicationTask(List.of(widget1, widget6))); + runOnExecutorSync(MAIN_EXECUTOR, () -> { }); + + // Only widget 1 (and no widget 6 as its meant to be hidden from picker). + List recommendedWidgets = mCallback.mRecommendedWidgets + .getContents() + .stream() + .map(itemInfo -> (PendingAddWidgetInfo) itemInfo) + .collect(Collectors.toList()); + assertThat(recommendedWidgets).hasSize(1); + assertThat(recommendedWidgets.get(0).componentName.getPackageName()).isEqualTo("app1"); + }); + } + + private void assertWidgetInfo( + LauncherAppWidgetProviderInfo actual, AppWidgetProviderInfo expected) { + assertThat(actual.provider).isEqualTo(expected.provider); + assertThat(actual.getUser()).isEqualTo(expected.getProfile()); + } + + private WidgetsPredictionUpdateTask newWidgetsPredicationTask(List appTargets) { + return new WidgetsPredictionUpdateTask( + new PredictorState(CONTAINER_WIDGETS_PREDICTION, "test_widgets_prediction", + DEFAULT_LOOKUP_FLAG), + appTargets); + } + + private LauncherModel getModel() { + return LauncherAppState.getInstance(mContext).getModel(); + } + + private final class FakeBgDataModelCallback implements BgDataModel.Callbacks { + + private PredictedContainerInfo mRecommendedWidgets = null; + + @Override + public void bindItemsUpdated(@NonNull Set updates) { + for (ItemInfo update : updates) { + if (update.id == CONTAINER_WIDGETS_PREDICTION + && update instanceof PredictedContainerInfo pci) { + mRecommendedWidgets = pci; + } + } + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt new file mode 100644 index 00000000000..79bc69acc27 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt @@ -0,0 +1,282 @@ +/* + * 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.launcher3.model + +import android.app.prediction.AppPredictionManager +import android.app.prediction.AppPredictor +import android.app.prediction.AppTarget +import android.app.prediction.AppTargetEvent +import android.app.prediction.AppTargetId +import android.appwidget.AppWidgetProviderInfo +import android.content.ComponentName +import android.os.Process.myUserHandle +import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.DeviceProfile +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.icons.IconCache +import com.android.launcher3.model.WidgetPredictionsRequester.LAUNCH_LOCATION +import com.android.launcher3.model.WidgetPredictionsRequester.buildBundleForPredictionSession +import com.android.launcher3.model.WidgetPredictionsRequester.filterPredictions +import com.android.launcher3.model.WidgetPredictionsRequester.notOnUiSurfaceFilter +import com.android.launcher3.util.ComponentKey +import com.android.launcher3.util.Executors +import com.android.launcher3.util.Executors.MODEL_EXECUTOR +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.TestUtil +import com.android.launcher3.util.WidgetUtils.createAppWidgetProviderInfo +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo +import com.android.launcher3.widget.PendingAddWidgetInfo +import com.google.common.truth.Truth.assertThat +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import java.util.function.Predicate +import junit.framework.Assert.assertNotNull +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +class WidgetsPredictionsRequesterTest { + + @get:Rule val context = SandboxApplication() + + private lateinit var mUserHandle: UserHandle + private lateinit var deviceProfile: DeviceProfile + private lateinit var testInvariantProfile: InvariantDeviceProfile + + private lateinit var widget1aInfo: AppWidgetProviderInfo + private lateinit var widget1bInfo: AppWidgetProviderInfo + private lateinit var widget2Info: AppWidgetProviderInfo + + private lateinit var widgetItem1a: WidgetItem + private lateinit var widgetItem1b: WidgetItem + private lateinit var widgetItem2: WidgetItem + + private lateinit var allWidgets: Map + + @get:Rule val mockito = MockitoJUnit.rule() + @Mock private lateinit var iconCache: IconCache + @Mock private lateinit var apmMock: AppPredictionManager + @Mock private lateinit var predictorMock: AppPredictor + + @Before + fun setUp() { + mUserHandle = myUserHandle() + doReturn(predictorMock).whenever(apmMock).createAppPredictionSession(any()) + + context.spyService(AppPredictionManager::class.java) { apmMock } + testInvariantProfile = InvariantDeviceProfile.INSTANCE[context] + deviceProfile = testInvariantProfile.getDeviceProfile(context).copy() + + widget1aInfo = + createAppWidgetProviderInfo( + ComponentName.createRelative(APP_1_PACKAGE_NAME, APP_1_PROVIDER_A_CLASS_NAME) + ) + widget1bInfo = + createAppWidgetProviderInfo( + ComponentName.createRelative(APP_1_PACKAGE_NAME, APP_1_PROVIDER_B_CLASS_NAME) + ) + widgetItem1a = createWidgetItem(widget1aInfo) + widgetItem1b = createWidgetItem(widget1bInfo) + + widget2Info = + createAppWidgetProviderInfo( + ComponentName.createRelative(APP_2_PACKAGE_NAME, APP_2_PROVIDER_1_CLASS_NAME) + ) + widgetItem2 = createWidgetItem(widget2Info) + + allWidgets = + mapOf( + ComponentKey(widgetItem1a.componentName, widgetItem1a.user) to widgetItem1a, + ComponentKey(widgetItem1b.componentName, widgetItem1b.user) to widgetItem1b, + ComponentKey(widgetItem2.componentName, widgetItem2.user) to widgetItem2, + ) + } + + @Test + fun buildBundleForPredictionSession_includesAddedAppWidgets() { + val existingWidgets = arrayListOf(widget1aInfo, widget1bInfo, widget2Info) + + val bundle = buildBundleForPredictionSession(existingWidgets) + val addedWidgetsBundleExtra = + bundle.getParcelableArrayList(BUNDLE_KEY_ADDED_APP_WIDGETS, AppTarget::class.java) + + assertNotNull(addedWidgetsBundleExtra) + assertThat(addedWidgetsBundleExtra) + .containsExactly( + buildExpectedAppTargetEvent( + /*pkg=*/ APP_1_PACKAGE_NAME, + /*providerClassName=*/ APP_1_PROVIDER_A_CLASS_NAME, + /*user=*/ mUserHandle, + ), + buildExpectedAppTargetEvent( + /*pkg=*/ APP_1_PACKAGE_NAME, + /*providerClassName=*/ APP_1_PROVIDER_B_CLASS_NAME, + /*user=*/ mUserHandle, + ), + buildExpectedAppTargetEvent( + /*pkg=*/ APP_2_PACKAGE_NAME, + /*providerClassName=*/ APP_2_PROVIDER_1_CLASS_NAME, + /*user=*/ mUserHandle, + ), + ) + } + + @Test + fun request_invokesCallbackWithPredictedItems() { + TestUtil.runOnExecutorSync(MODEL_EXECUTOR) { + val underTest = WidgetPredictionsRequester(context, TEST_UI_SURFACE, allWidgets) + val existingWidgets = arrayListOf(widget1aInfo, widget1bInfo) + val predictions = + listOf( + // (existing) already on surface + AppTarget( + AppTargetId(APP_1_PACKAGE_NAME), + APP_1_PACKAGE_NAME, + APP_1_PROVIDER_B_CLASS_NAME, + mUserHandle, + ), + // eligible + AppTarget( + AppTargetId(APP_2_PACKAGE_NAME), + APP_2_PACKAGE_NAME, + APP_2_PROVIDER_1_CLASS_NAME, + mUserHandle, + ), + ) + doAnswer { + underTest.onTargetsAvailable(predictions) + null + } + .whenever(predictorMock) + .requestPredictionUpdate() + val testCountDownLatch = CountDownLatch(1) + val listener = + WidgetPredictionsRequester.WidgetPredictionsListener { itemInfos -> + if (itemInfos.size == 1 && itemInfos[0] is PendingAddWidgetInfo) { + // only one item was eligible. + testCountDownLatch.countDown() + } else { + println("Unexpected prediction items found: ${itemInfos.size}") + } + } + + underTest.request(existingWidgets, listener) + TestUtil.runOnExecutorSync(Executors.MAIN_EXECUTOR) {} + + assertThat(testCountDownLatch.await(TEST_TIMEOUT, TimeUnit.SECONDS)).isTrue() + } + } + + @Test + fun filterPredictions_notOnUiSurfaceFilter_returnsOnlyEligiblePredictions() { + val widgetsAlreadyOnSurface = arrayListOf(widget1bInfo) + val filter: Predicate = notOnUiSurfaceFilter(widgetsAlreadyOnSurface) + + val predictions = + listOf( + // already on surface + AppTarget( + AppTargetId(APP_1_PACKAGE_NAME), + APP_1_PACKAGE_NAME, + APP_1_PROVIDER_B_CLASS_NAME, + mUserHandle, + ), + // eligible + AppTarget( + AppTargetId(APP_2_PACKAGE_NAME), + APP_2_PACKAGE_NAME, + APP_2_PROVIDER_1_CLASS_NAME, + mUserHandle, + ), + ) + + // only 2 was eligible + assertThat(filterPredictions(predictions, allWidgets, filter)).containsExactly(widgetItem2) + } + + @Test + fun filterPredictions_appPredictions_returnsEmptyList() { + val widgetsAlreadyOnSurface = arrayListOf(widget1bInfo) + val filter: Predicate = notOnUiSurfaceFilter(widgetsAlreadyOnSurface) + + val predictions = + listOf( + AppTarget( + AppTargetId(APP_1_PACKAGE_NAME), + APP_1_PACKAGE_NAME, + "$APP_1_PACKAGE_NAME.SomeActivity", + mUserHandle, + ), + AppTarget( + AppTargetId(APP_2_PACKAGE_NAME), + APP_2_PACKAGE_NAME, + "$APP_2_PACKAGE_NAME.SomeActivity2", + mUserHandle, + ), + ) + + assertThat(filterPredictions(predictions, allWidgets, filter)).isEmpty() + } + + private fun createWidgetItem(providerInfo: AppWidgetProviderInfo): WidgetItem { + val widgetInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(context, providerInfo) + return WidgetItem(widgetInfo, testInvariantProfile, iconCache, context) + } + + companion object { + const val TEST_TIMEOUT = 3L + + const val TEST_UI_SURFACE = "widgets_test" + const val BUNDLE_KEY_ADDED_APP_WIDGETS = "added_app_widgets" + + const val APP_1_PACKAGE_NAME = "com.example.app1" + const val APP_1_PROVIDER_A_CLASS_NAME = "app1Provider1" + const val APP_1_PROVIDER_B_CLASS_NAME = "app1Provider2" + + const val APP_2_PACKAGE_NAME = "com.example.app2" + const val APP_2_PROVIDER_1_CLASS_NAME = "app2Provider1" + + const val TEST_PACKAGE = "pkg" + + private fun buildExpectedAppTargetEvent( + pkg: String, + providerClassName: String, + userHandle: UserHandle, + ): AppTargetEvent { + val appTarget = + AppTarget.Builder( + /*id=*/ AppTargetId("widget:$pkg"), + /*packageName=*/ pkg, + /*user=*/ userHandle, + ) + .setClassName(providerClassName) + .build() + return AppTargetEvent.Builder(appTarget, AppTargetEvent.ACTION_PIN) + .setLaunchLocation(LAUNCH_LOCATION) + .build() + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/data/TaskViewItemInfoTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/data/TaskViewItemInfoTest.kt new file mode 100644 index 00000000000..c0f1e5e586a --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/data/TaskViewItemInfoTest.kt @@ -0,0 +1,214 @@ +/* + * 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.launcher3.model.data + +import android.content.ComponentName +import android.content.Intent +import android.os.Process +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.Flags.enableRefactorTaskThumbnail +import com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_NOT_PINNABLE +import com.android.launcher3.model.data.TaskViewItemInfo.Companion.createTaskViewAtom +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.launcher3.util.TestDispatcherProvider +import com.android.launcher3.util.TransformingTouchDelegate +import com.android.launcher3.util.UserIconInfo +import com.android.launcher3.util.rule.MockUsersRule +import com.android.launcher3.util.rule.MockUsersRule.MockUser +import com.android.quickstep.TaskOverlayFactory +import com.android.quickstep.TaskOverlayFactory.TaskOverlay +import com.android.quickstep.recents.di.RecentsDependencies +import com.android.quickstep.task.thumbnail.TaskContentView +import com.android.quickstep.task.thumbnail.TaskThumbnailView +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.TaskContainer +import com.android.quickstep.views.TaskThumbnailViewDeprecated +import com.android.quickstep.views.TaskView +import com.android.quickstep.views.TaskViewIcon +import com.android.quickstep.views.TaskViewType +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.Task.TaskKey +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.StandardTestDispatcher +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +/** Test for [TaskViewItemInfo] */ +@RunWith(AndroidJUnit4::class) +class TaskViewItemInfoTest { + + @get:Rule val context = SandboxApplication() + @get:Rule val mockUsers = MockUsersRule(context) + + private val taskView = mock() + private val recentsView = mock>() + private val overlayFactory = mock() + private val dispatcher = StandardTestDispatcher() + + @Before + fun setUp() { + whenever(overlayFactory.createOverlay(any())).thenReturn(mock>()) + whenever(taskView.context).thenReturn(context) + whenever(taskView.recentsView).thenReturn(recentsView) + whenever(recentsView.indexOfChild(taskView)).thenReturn(TASK_VIEW_INDEX) + RecentsDependencies.maybeInitialize(context, TestDispatcherProvider(dispatcher)) + } + + @After + fun tearDown() { + RecentsDependencies.destroy(context) + } + + @Test + fun singleTask() { + val taskContainers = listOf(createTaskContainer(createTask(1))) + whenever(taskView.type).thenReturn(TaskViewType.SINGLE) + whenever(taskView.taskContainers).thenReturn(taskContainers) + + val taskViewItemInfo = TaskViewItemInfo(taskContainers[0].taskView, taskContainers[0]) + + assertThat(taskViewItemInfo.taskViewAtom) + .isEqualTo( + createTaskViewAtom( + type = 0, + index = TASK_VIEW_INDEX, + componentName = "${PACKAGE}/${CLASS}", + cardinality = 1, + ) + ) + assertThat(taskViewItemInfo.runtimeStatusFlags and FLAG_NOT_PINNABLE).isEqualTo(0) + } + + @Test + fun splitTask() { + val taskContainers = + listOf(createTaskContainer(createTask(1)), createTaskContainer(createTask(2))) + whenever(taskView.type).thenReturn(TaskViewType.GROUPED) + whenever(taskView.taskContainers).thenReturn(taskContainers) + + val taskViewItemInfo = TaskViewItemInfo(taskContainers[0].taskView, taskContainers[0]) + + assertThat(taskViewItemInfo.taskViewAtom) + .isEqualTo( + createTaskViewAtom( + type = 1, + index = TASK_VIEW_INDEX, + componentName = "${PACKAGE}/${CLASS}", + cardinality = 2, + ) + ) + assertThat(taskViewItemInfo.runtimeStatusFlags and FLAG_NOT_PINNABLE).isEqualTo(0) + } + + @Test + fun desktopTask() { + val taskContainers = + listOf( + createTaskContainer(createTask(1)), + createTaskContainer(createTask(2)), + createTaskContainer(createTask(3)), + ) + whenever(taskView.type).thenReturn(TaskViewType.DESKTOP) + whenever(taskView.taskContainers).thenReturn(taskContainers) + + val taskViewItemInfo = TaskViewItemInfo(taskContainers[0].taskView, taskContainers[0]) + + assertThat(taskViewItemInfo.taskViewAtom) + .isEqualTo( + createTaskViewAtom( + type = 2, + index = TASK_VIEW_INDEX, + componentName = "${PACKAGE}/${CLASS}", + cardinality = 3, + ) + ) + assertThat(taskViewItemInfo.runtimeStatusFlags and FLAG_NOT_PINNABLE).isEqualTo(0) + } + + @MockUser(userType = UserIconInfo.TYPE_PRIVATE) + @Test + fun privateTask() { + val taskContainers = listOf(createTaskContainer(createTask(1))) + whenever(taskView.type).thenReturn(TaskViewType.SINGLE) + whenever(taskView.taskContainers).thenReturn(taskContainers) + + val taskViewItemInfo = TaskViewItemInfo(taskContainers[0].taskView, taskContainers[0]) + + assertThat(taskViewItemInfo.taskViewAtom) + .isEqualTo( + createTaskViewAtom( + type = 0, + index = TASK_VIEW_INDEX, + componentName = "${PACKAGE}/${CLASS}", + cardinality = 1, + ) + ) + assertThat(taskViewItemInfo.runtimeStatusFlags and FLAG_NOT_PINNABLE) + .isEqualTo(FLAG_NOT_PINNABLE) + } + + @Test + fun emptyDesktopTask() { + whenever(taskView.type).thenReturn(TaskViewType.DESKTOP) + + val taskViewItemInfo = TaskViewItemInfo(taskView = taskView, taskContainer = null) + + assertThat(taskViewItemInfo.taskViewAtom) + .isEqualTo( + createTaskViewAtom( + type = 2, + index = TASK_VIEW_INDEX, + componentName = "", + cardinality = 0, + ) + ) + assertThat(taskViewItemInfo.user).isEqualTo(Process.myUserHandle()) + assertThat(taskViewItemInfo.intent).isNotNull() + } + + private fun createTask(id: Int) = + Task(TaskKey(id, 0, Intent(), ComponentName(PACKAGE, CLASS), 0, 2000)) + + private fun createTaskContainer(task: Task): TaskContainer { + return TaskContainer( + taskView, + task, + mock(), + if (enableRefactorTaskThumbnail()) mock() + else mock(), + mock(), + mock(), + SplitConfigurationOptions.STAGE_POSITION_UNDEFINED, + digitalWellBeingToast = null, + showWindowsView = null, + overlayFactory, + ) + } + + companion object { + const val PACKAGE = "package" + const val CLASS = "class" + const val TASK_VIEW_INDEX = 4 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DepthControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DepthControllerTest.kt new file mode 100644 index 00000000000..744c2e2c1c8 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DepthControllerTest.kt @@ -0,0 +1,209 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.statehandlers + +import android.content.res.Resources +import android.platform.test.annotations.EnableFlags +import android.view.ViewTreeObserver +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.Flags +import com.android.launcher3.Launcher +import com.android.launcher3.LauncherState +import com.android.launcher3.R +import com.android.launcher3.dragndrop.DragLayer +import com.android.launcher3.statemanager.StateManager +import com.android.launcher3.uioverrides.QuickstepLauncher +import java.util.Collections +import junit.framework.TestCase.assertFalse +import junit.framework.TestCase.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.reset +import org.mockito.Mockito.same +import org.mockito.Mockito.verify +import org.mockito.Mockito.verifyNoMoreInteractions +import org.mockito.Mockito.`when` +import org.mockito.junit.MockitoJUnit + +@SmallTest +@RunWith(AndroidJUnit4::class) +class DepthControllerTest { + + private lateinit var underTest: DepthController + @get:Rule val mockito = MockitoJUnit.rule() + @Mock private lateinit var launcher: QuickstepLauncher + @Mock private lateinit var stateManager: StateManager + @Mock private lateinit var resource: Resources + @Mock private lateinit var dragLayer: DragLayer + @Mock private lateinit var viewTreeObserver: ViewTreeObserver + + @Before + fun setUp() { + `when`(launcher.resources).thenReturn(resource) + `when`(resource.getInteger(R.integer.max_depth_blur_radius)).thenReturn(30) + `when`(launcher.dragLayer).thenReturn(dragLayer) + `when`(dragLayer.viewTreeObserver).thenReturn(viewTreeObserver) + `when`(launcher.stateManager).thenReturn(stateManager) + `when`(launcher.depthBlurTargets).thenReturn(Collections.emptyList()) + + underTest = DepthController(launcher) + } + + @Test + fun setActivityStarted_add_onDrawListener() { + underTest.setActivityStarted(true) + + verify(viewTreeObserver).addOnDrawListener(same(underTest.mOnDrawListener)) + } + + @Test + fun setActivityStopped_not_remove_onDrawListener() { + underTest.setActivityStarted(false) + + // Because underTest.mOnDrawListener is never added + verifyNoMoreInteractions(viewTreeObserver) + } + + @Test + fun setActivityStared_then_stopped_remove_onDrawListener() { + underTest.setActivityStarted(true) + reset(viewTreeObserver) + + underTest.setActivityStarted(false) + + verify(viewTreeObserver).removeOnDrawListener(same(underTest.mOnDrawListener)) + } + + @Test + fun setActivityStared_then_stopped_multiple_times_remove_onDrawListener_once() { + underTest.setActivityStarted(true) + reset(viewTreeObserver) + + underTest.setActivityStarted(false) + underTest.setActivityStarted(false) + underTest.setActivityStarted(false) + + // Should just remove mOnDrawListener once + verify(viewTreeObserver).removeOnDrawListener(same(underTest.mOnDrawListener)) + } + + @Test + fun test_onInvalidSurface_multiple_times_add_onDrawListener_once() { + underTest.onInvalidSurface() + underTest.onInvalidSurface() + underTest.onInvalidSurface() + + // We should only call addOnDrawListener 1 time + verify(viewTreeObserver).addOnDrawListener(same(underTest.mOnDrawListener)) + } + + @Test + @EnableFlags(Flags.FLAG_ALL_APPS_BLUR) + fun test_blurWorkspaceDepthTargets() { + // Transitioning to ALL_APPS from any state should blur the workspace depth targets. + + `when`(stateManager.currentStableState).thenReturn(LauncherState.NORMAL) + `when`(stateManager.state).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.state).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.SPRING_LOADED) + `when`(stateManager.state).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.EDIT_MODE) + `when`(stateManager.state).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.BACKGROUND_APP) + `when`(stateManager.state).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + // Returning from ALL_APPS to NORMAL should continue blurring the workspace depth targets. + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.state).thenReturn(LauncherState.NORMAL) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + // Exiting ALL_APPS to other states such as drag-and-drop should not blur the workspace. + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.state).thenReturn(LauncherState.SPRING_LOADED) + assertFalse(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.state).thenReturn(LauncherState.EDIT_MODE) + assertFalse(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.state).thenReturn(LauncherState.OVERVIEW) + assertFalse(underTest.blurWorkspaceDepthTargets()) + } + + @Test + @EnableFlags(Flags.FLAG_ALL_APPS_BLUR) + fun test_blurWorkspaceDepthTargets_withTargetState() { + // Transitioning to ALL_APPS from any state should blur the workspace depth targets. + + `when`(stateManager.currentStableState).thenReturn(LauncherState.NORMAL) + `when`(stateManager.targetState).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.targetState).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.SPRING_LOADED) + `when`(stateManager.targetState).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.EDIT_MODE) + `when`(stateManager.targetState).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.BACKGROUND_APP) + `when`(stateManager.targetState).thenReturn(LauncherState.ALL_APPS) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + // Returning from ALL_APPS to NORMAL should continue blurring the workspace depth targets. + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.targetState).thenReturn(LauncherState.NORMAL) + assertTrue(underTest.blurWorkspaceDepthTargets()) + + // Exiting ALL_APPS to other states such as drag-and-drop should not blur the workspace. + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.targetState).thenReturn(LauncherState.SPRING_LOADED) + assertFalse(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.targetState).thenReturn(LauncherState.EDIT_MODE) + assertFalse(underTest.blurWorkspaceDepthTargets()) + + `when`(stateManager.currentStableState).thenReturn(LauncherState.ALL_APPS) + `when`(stateManager.targetState).thenReturn(LauncherState.OVERVIEW) + assertFalse(underTest.blurWorkspaceDepthTargets()) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt new file mode 100644 index 00000000000..0b025a6ecfe --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.statehandlers + +import android.content.Context +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.LauncherState +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.quickstep.SystemUiProxy +import com.android.window.flags2.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND +import com.android.window.flags2.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND +import com.android.wm.shell.desktopmode.DisplayDeskState +import com.android.wm.shell.desktopmode.IDesktopTaskListener +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.nullableArgumentCaptor +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** + * Tests the behavior of [DesktopVisibilityController] in regards to multiple desktops and multiple + * displays. + */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class DesktopVisibilityControllerTest { + + @get:Rule val setFlagsRule = SetFlagsRule() + + private val context = mock() + private val systemUiProxy = mock() + private val lifeCycleTracker = mock() + private lateinit var desktopVisibilityController: DesktopVisibilityController + private val listenerCaptor = nullableArgumentCaptor() + + @Before + fun setUp() { + whenever(context.resources).thenReturn(mock()) + whenever(DesktopModeStatus.enableMultipleDesktops(context)).thenReturn(true) + desktopVisibilityController = + DesktopVisibilityController(context, systemUiProxy, lifeCycleTracker) + verify(systemUiProxy).setDesktopTaskListener(listenerCaptor.capture()) + } + + @Test + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND) + fun noCrashWhenCheckingNonExistentDisplay() { + assertThat(desktopVisibilityController.isInDesktopMode(displayId = 500)).isFalse() + assertThat(desktopVisibilityController.isInDesktopModeAndNotInOverview(displayId = 300)) + .isFalse() + } + + @Test + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND) + fun taskListenerConnects() { + connectTaskListener() + } + + @Test + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND) + fun getActiveDeskIdIsAreCorrect() { + connectTaskListener() + + assertThat(desktopVisibilityController.getActiveDeskId(FIRST_DISPLAY_ID)) + .isEqualTo(FIRST_DISPLAY_ACTIVE_DESK_ID) + assertThat(desktopVisibilityController.getActiveDeskId(SECOND_DISPLAY_ID)) + .isEqualTo(SECOND_DISPLAY_ACTIVE_DESK_ID) + } + + @Test + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND) + fun isInDesktopModeIsCorrect() { + connectTaskListener() + + assertThat(desktopVisibilityController.isInDesktopMode(FIRST_DISPLAY_ID)).isTrue() + assertThat(desktopVisibilityController.isInDesktopMode(SECOND_DISPLAY_ID)).isTrue() + assertThat(desktopVisibilityController.isInDesktopMode(NON_DESKTOP_DISPLAY_ID)).isFalse() + } + + @Test + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND) + fun launcherStateChangeUpdatesState() { + connectTaskListener() + + assertThat(desktopVisibilityController.isInDesktopModeAndNotInOverview(FIRST_DISPLAY_ID)) + .isTrue() + + desktopVisibilityController.onLauncherStateChanged(FIRST_DISPLAY_ID, LauncherState.OVERVIEW) + + assertThat(desktopVisibilityController.isInDesktopModeAndNotInOverview(FIRST_DISPLAY_ID)) + .isFalse() + + desktopVisibilityController.onLauncherStateChanged( + FIRST_DISPLAY_ID, + LauncherState.BACKGROUND_APP, + ) + + assertThat(desktopVisibilityController.isInDesktopModeAndNotInOverview(FIRST_DISPLAY_ID)) + .isTrue() + } + + private fun connectTaskListener() { + val firstDisplay = + DisplayDeskState().apply { + displayId = FIRST_DISPLAY_ID + activeDeskId = FIRST_DISPLAY_ACTIVE_DESK_ID + deskIds = FIRST_DISPLAY_DESK_IDS + } + val secondDisplay = + DisplayDeskState().apply { + displayId = SECOND_DISPLAY_ID + activeDeskId = SECOND_DISPLAY_ACTIVE_DESK_ID + deskIds = SECOND_DISPLAY_DESK_IDS + } + val states = arrayOf(firstDisplay, secondDisplay) + val listener = listenerCaptor.lastValue + assertThat(listener).isNotNull() + listener!!.onListenerConnected(states, /* canCreateDesks= */ true) + getInstrumentation().waitForIdleSync() + assertThat(desktopVisibilityController.canCreateDesks).isTrue() + } + + companion object { + private const val FIRST_DISPLAY_ID = 0 + private const val FIRST_DISPLAY_ACTIVE_DESK_ID = 0 + private val FIRST_DISPLAY_DESK_IDS = intArrayOf(0, 1, 2, 3, 4) + private const val SECOND_DISPLAY_ID = 1 + private const val SECOND_DISPLAY_ACTIVE_DESK_ID = 5 + private val SECOND_DISPLAY_DESK_IDS = intArrayOf(5, 6) + private const val NON_DESKTOP_DISPLAY_ID = 2 + } +} diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt similarity index 97% rename from quickstep/tests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt index 04012c027df..b39c3f1e357 100644 --- a/quickstep/tests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt @@ -17,7 +17,7 @@ package com.android.launcher3.taskbar -import androidx.test.runner.AndroidJUnit4 +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.statemanager.StateManager import com.android.quickstep.RecentsActivity import com.android.quickstep.fallback.RecentsState @@ -33,7 +33,7 @@ import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) class FallbackTaskbarUIControllerTest : TaskbarBaseTestCase() { - lateinit var fallbackTaskbarUIController: FallbackTaskbarUIController + lateinit var fallbackTaskbarUIController: FallbackTaskbarUIController lateinit var stateListener: StateManager.StateListener private val recentsActivity: RecentsActivity = mock() diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/KeyboardQuickSwitchControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/KeyboardQuickSwitchControllerTest.kt new file mode 100644 index 00000000000..2f60192d452 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/KeyboardQuickSwitchControllerTest.kt @@ -0,0 +1,393 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.content.ComponentName +import android.content.Intent +import android.graphics.Rect +import android.os.Process +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.Display.DEFAULT_DISPLAY +import android.window.RemoteTransition +import androidx.test.core.app.ApplicationProvider +import com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING +import com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.rules.AllTaskbarSandboxModules +import com.android.launcher3.taskbar.rules.MockedRecentsModelHelper +import com.android.launcher3.taskbar.rules.MockedRecentsModelTestRule +import com.android.launcher3.taskbar.rules.SandboxParams +import com.android.launcher3.taskbar.rules.TaskbarSandboxComponent +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.launcher3.util.TestUtil.getOnUiThread +import com.android.quickstep.RecentsModel +import com.android.quickstep.SystemUiProxy +import com.android.quickstep.util.DesktopTask +import com.android.quickstep.util.GroupTask +import com.android.quickstep.util.SingleTask +import com.android.quickstep.util.SlideInRemoteTransition +import com.android.quickstep.util.SplitTask +import com.android.systemui.shared.recents.model.Task +import com.android.wm.shell.desktopmode.IDesktopTaskListener +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource +import com.android.wm.shell.shared.desktopmode.DesktopTaskToFrontReason +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants +import com.google.common.truth.Truth.assertThat +import dagger.BindsInstance +import dagger.Component +import org.junit.Ignore +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.eq +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelTablet2023"]) +@Ignore("b/413540825") +class KeyboardQuickSwitchControllerTest { + private var systemUiProxySpy: SystemUiProxy? = null + private var desktopTaskListener: IDesktopTaskListener? = null + private val mockRecentsModelHelper: MockedRecentsModelHelper = MockedRecentsModelHelper() + private val taskIdCaptor = argumentCaptor() + private val transitionCaptor = argumentCaptor() + + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + @get:Rule(order = 1) + val context = + TaskbarWindowSandboxContext.create( + SandboxParams( + { + spy(SystemUiProxy( + ApplicationProvider.getApplicationContext(), + MAIN_EXECUTOR, + UI_HELPER_EXECUTOR, + )) { proxy -> + systemUiProxySpy = proxy + doAnswer { desktopTaskListener = it.getArgument(0) } + .whenever(proxy) + .setDesktopTaskListener(anyOrNull()) + } + }, + builderBase = + DaggerKeyboardQuickSwitchControllerComponent.builder() + .bindRecentsModel(mockRecentsModelHelper.mockRecentsModel), + ) + ) + + @get:Rule(order = 2) val recentsModel = MockedRecentsModelTestRule(mockRecentsModelHelper) + @get:Rule(order = 3) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var keyboardQuickSwitchController: KeyboardQuickSwitchController + + private val isKqsShown: Boolean + get() = getOnUiThread { keyboardQuickSwitchController.isShown } + + private val shownTaskIds: List + get() = getOnUiThread { keyboardQuickSwitchController.shownTaskIds() } + + @Test + fun noRecentTasks_noShownTaskIds() { + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds).isEmpty() + } + + @Test + fun onlySingleTasksPresent_shouldShowAllTaskIds() { + updateRecentsModel( + listOf(createSingleTask(PREVIOUS_TASK_ID), createSingleTask(RUNNING_TASK_ID)) + ) + + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds).containsExactly(RUNNING_TASK_ID, PREVIOUS_TASK_ID).inOrder() + } + + @Test + fun onlyDesktopTasksPresent_shouldShowAllTaskIds() { + updateRecentsModel(listOf(createDesktopTask(listOf(RUNNING_TASK_ID, PREVIOUS_TASK_ID)))) + enableDesktopMode() + + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds).containsExactly(RUNNING_TASK_ID, PREVIOUS_TASK_ID).inOrder() + } + + @Test + @DisableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + fun singleAndDesktopTasksPresent_notOnDesktopWithFlatenningOff_onlyShowSingleTaskIds() { + updateRecentsModel( + listOf( + createDesktopTask(listOf(PREVIOUS_TASK_ID, OLDEST_TASK_ID)), + createSingleTask(RUNNING_TASK_ID), + ) + ) + + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds).containsExactly(RUNNING_TASK_ID) + } + + @Test + @DisableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + fun singleAndDesktopTasksPresent_onDesktopWithFlatenningOff_onlyShowDesktopTaskIds() { + updateRecentsModel( + listOf( + createDesktopTask(listOf(RUNNING_TASK_ID, OLDEST_TASK_ID)), + createSingleTask(PREVIOUS_TASK_ID), + ) + ) + enableDesktopMode() + + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds).containsExactly(RUNNING_TASK_ID, OLDEST_TASK_ID).inOrder() + } + + @Test + @EnableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + fun singleAndDesktopTasksPresent_onDesktopWithFlatenningOn_showAllTaskIds() { + updateRecentsModel( + listOf( + createDesktopTask(listOf(RUNNING_TASK_ID, OLDEST_TASK_ID)), + createSingleTask(PREVIOUS_TASK_ID), + ) + ) + enableDesktopMode() + + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds) + .containsExactly(RUNNING_TASK_ID, PREVIOUS_TASK_ID, OLDEST_TASK_ID) + .inOrder() + } + + @Test + @EnableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + fun singleAndDesktopTasksPresent_notOnDesktopWithFlatenningOn_showAllTaskIds() { + updateRecentsModel( + listOf( + createDesktopTask(listOf(PREVIOUS_TASK_ID, OLDEST_TASK_ID)), + createSingleTask(RUNNING_TASK_ID), + ) + ) + + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds) + .containsExactly(RUNNING_TASK_ID, PREVIOUS_TASK_ID, OLDEST_TASK_ID) + .inOrder() + } + + @Test + @DisableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING, FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS) + fun multipleDesktopTasksPresent_onDesktopWithCdFlagOff_onlyShowCurrentDesktopTasks() { + updateRecentsModel( + listOf( + createDesktopTask(listOf(RUNNING_TASK_ID)), + createDesktopTask(listOf(PREVIOUS_TASK_ID)), + ) + ) + enableDesktopMode() + + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds).containsExactly(RUNNING_TASK_ID) + } + + @Test + @DisableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + @EnableFlags(FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS) + fun multipleDesktopTasksPresent_onDesktopWithCdFlagON_showAllDesktopTasks() { + updateRecentsModel( + listOf( + createDesktopTask(listOf(RUNNING_TASK_ID)), + createDesktopTask(listOf(PREVIOUS_TASK_ID)), + ) + ) + enableDesktopMode() + + triggerAltTab() + + assertThat(isKqsShown).isTrue() + assertThat(shownTaskIds).containsExactly(RUNNING_TASK_ID, PREVIOUS_TASK_ID).inOrder() + } + + @Test + @EnableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + fun splitAndSingleTaskPresent_withFlatenningOn_shouldSortTaskIds() { + updateRecentsModel( + listOf( + createSplitTask(OLDEST_TASK_ID to RUNNING_TASK_ID), + createSingleTask(PREVIOUS_TASK_ID), + ) + ) + + triggerAltTab() + + // Although single task is more recent than one of the split tasks, the split tasks should + // be together. Furthermore, the shownTaskIds returns left split task first. + assertThat(shownTaskIds) + .containsExactly(OLDEST_TASK_ID, RUNNING_TASK_ID, PREVIOUS_TASK_ID) + .inOrder() + } + + @Test + @EnableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + fun launchDesktopApp_notOnDesktop_shouldCallSysUIProxyToStartSpecificApp() { + val deskId = 1 + updateRecentsModel(listOf(createDesktopTask(listOf(PREVIOUS_TASK_ID), deskId))) + + triggerAltTabAndLaunchFocusedTask() + + val deskIdCaptor = argumentCaptor() + verify(systemUiProxySpy) + ?.activateDesk( + deskIdCaptor.capture(), + transitionCaptor.capture(), + transitionSource = eq(DesktopModeTransitionSource.KEYBOARD_SHORTCUT), + ) + assertThat(deskIdCaptor.firstValue).isEqualTo(deskId) + assertThat(transitionCaptor.firstValue.remoteTransition) + .isInstanceOf(SlideInRemoteTransition::class.java) + + verify(systemUiProxySpy) + ?.showDesktopApp(taskIdCaptor.capture(), eq(null), eq(DesktopTaskToFrontReason.ALT_TAB)) + assertThat(taskIdCaptor.firstValue).isEqualTo(PREVIOUS_TASK_ID) + } + + @Test + @EnableFlags(FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + fun launchSingleApp_onDesktop_shouldCallSysUIProxyToMoveToFullscreen() { + updateRecentsModel(listOf(createSingleTask(PREVIOUS_TASK_ID))) + enableDesktopMode() + + triggerAltTabAndLaunchFocusedTask() + + verify(systemUiProxySpy) + ?.moveToFullscreen( + taskIdCaptor.capture(), + eq(DesktopModeTransitionSource.KEYBOARD_SHORTCUT), + transitionCaptor.capture(), + ) + assertThat(taskIdCaptor.firstValue).isEqualTo(PREVIOUS_TASK_ID) + assertThat(transitionCaptor.firstValue.remoteTransition) + .isInstanceOf(SlideInRemoteTransition::class.java) + } + + private fun createSingleTask(taskId: Int) = SingleTask(createTask(taskId)) + + private fun createSplitTask(taskIds: Pair) = + SplitTask( + createTask(taskIds.first), + createTask(taskIds.second), + SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_50_50, + ), + ) + + private fun createDesktopTask(taskIds: List, deskId: Int = 0) = + DesktopTask(deskId, DEFAULT_DISPLAY, taskIds.map { createTask(it) }) + + private fun enableDesktopMode() { + whenever(DesktopVisibilityController.INSTANCE[context].isInDesktopMode(any())) + .thenReturn(true) + } + + /* + * Returns a task with the given ID and a fake package name. + * + * Note: the task ID is added to last active time, thus higher task ID indicates a more recent + * active task. + */ + private fun createTask(taskId: Int): Task { + return Task( + Task.TaskKey( + taskId, + 0, + Intent().apply { `package` = "Fake${taskId}" }, + ComponentName("Fake${taskId}", ""), + Process.myUserHandle().identifier, + 2000L + taskId, + ) + ) + } + + private fun updateRecentsModel(tasks: List) { + recentsModel.updateRecentTasks(tasks) + runOnMainSync { recentsModel.resolvePendingTaskRequests() } + } + + private fun triggerAltTab() = runOnMainSync { + keyboardQuickSwitchController.openQuickSwitchView() + recentsModel.resolvePendingTaskRequests() + } + + private fun triggerAltTabAndLaunchFocusedTask() { + triggerAltTab() + runOnMainSync { keyboardQuickSwitchController.launchFocusedTask() } + } + + private companion object { + const val OLDEST_TASK_ID = 1 + const val PREVIOUS_TASK_ID = 2 + const val RUNNING_TASK_ID = 3 + } +} + +/** KeyboardQuickSwitchControllerComponent used to bind the RecentsModel. */ +@LauncherAppSingleton +@Component(modules = [AllTaskbarSandboxModules::class]) +interface KeyboardQuickSwitchControllerComponent : TaskbarSandboxComponent { + + @Component.Builder + interface Builder : TaskbarSandboxComponent.Builder { + @BindsInstance fun bindRecentsModel(model: RecentsModel): Builder + + override fun build(): KeyboardQuickSwitchControllerComponent + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/NavbarButtonsViewControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/NavbarButtonsViewControllerTest.kt new file mode 100644 index 00000000000..38c21f60348 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/NavbarButtonsViewControllerTest.kt @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.animation.AnimatorTestRule +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import com.android.launcher3.Flags.FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT +import com.android.launcher3.taskbar.NavbarButtonsViewController.ALPHA_INDEX_KEYGUARD_OR_DISABLE +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.THREE_BUTTONS +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.UserLocked +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +private const val ANIMATION_DURATION = 300L // Default from ValueAnimator. + +@RunWith(LauncherMultivalentJUnit::class) +@EnableFlags(FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT) +class NavbarButtonsViewControllerTest { + + @get:Rule(order = 0) val animatorTestRule = AnimatorTestRule(this) + @get:Rule(order = 1) val setFlagsRule = SetFlagsRule() + @get:Rule(order = 2) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 3) val taskbarModeRule = TaskbarModeRule(context) + @get:Rule(order = 4) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var navbarButtonsViewController: NavbarButtonsViewController + + @Test + @TaskbarMode(THREE_BUTTONS) + @UserLocked + fun userLocked_keyguardOccluded_homeButtonHidden() { + runOnMainSync { + navbarButtonsViewController.setKeyguardVisible( + /* isKeyguardVisible = */ true, + /* isKeyguardOccluded = */ true, + ) + animatorTestRule.advanceTimeBy(ANIMATION_DURATION) + } + val alpha = + navbarButtonsViewController.homeButtonAlpha[ALPHA_INDEX_KEYGUARD_OR_DISABLE].value + assertThat(alpha).isZero() + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun userUnlocked_keyguardOccluded_homeButtonShown() { + runOnMainSync { + navbarButtonsViewController.setKeyguardVisible( + /* isKeyguardVisible = */ true, + /* isKeyguardOccluded = */ true, + ) + animatorTestRule.advanceTimeBy(ANIMATION_DURATION) + } + val alpha = + navbarButtonsViewController.homeButtonAlpha[ALPHA_INDEX_KEYGUARD_OR_DISABLE].value + assertThat(alpha).isEqualTo(1) + } + + @Test + @TaskbarMode(THREE_BUTTONS) + @UserLocked + fun userLocked_keyguardVisible_backButtonHidden() { + runOnMainSync { + navbarButtonsViewController.setKeyguardVisible( + /* isKeyguardVisible = */ true, + /* isKeyguardOccluded = */ false, + ) + animatorTestRule.advanceTimeBy(ANIMATION_DURATION) + } + val alpha = + navbarButtonsViewController.backButtonAlpha[ALPHA_INDEX_KEYGUARD_OR_DISABLE].value + assertThat(alpha).isZero() + } + + @Test + @TaskbarMode(THREE_BUTTONS) + @UserLocked + fun userLocked_keyguardBouncerVisible_backButtonShown() { + runOnMainSync { + navbarButtonsViewController.setKeyguardVisible( + /* isKeyguardVisible = */ true, + /* isKeyguardOccluded = */ false, + ) + navbarButtonsViewController.setBackForBouncer(true) + animatorTestRule.advanceTimeBy(ANIMATION_DURATION) + } + val alpha = + navbarButtonsViewController.backButtonAlpha[ALPHA_INDEX_KEYGUARD_OR_DISABLE].value + assertThat(alpha).isEqualTo(1) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/OverflownAppsContainerControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/OverflownAppsContainerControllerTest.kt new file mode 100644 index 00000000000..c098e010fb9 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/OverflownAppsContainerControllerTest.kt @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatItems +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.TestUtil.getOnUiThread +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +class OverflownAppsContainerControllerTest { + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var viewController: TaskbarViewController + private lateinit var overflownController: OverflownAppsContainerController + + private lateinit var overflowIcon: TaskbarOverflowView + private val taskbarActivityContext: TaskbarActivityContext + get() = taskbarUnitTestRule.activityContext + + @Before + fun setUp() { + overflownController = viewController.overflownAppsContainerController + overflowIcon = getOnUiThread { TaskbarOverflowView(taskbarActivityContext) } + } + + @Test + fun testToggleOverflownAppsView_showsContainer() { + val apps = + createHotseatItems( + taskbarActivityContext.taskbarSpecsEvaluator.numShownHotseatIcons + 3 + ) + .toList() + + assertThat( + AbstractFloatingView.hasOpenView( + taskbarActivityContext, + AbstractFloatingView.TYPE_TASKBAR_OVERFLOW, + ) + ) + .isFalse() + + // Toggle the OverflownAppsView should open the container view. + runOnMainSync { overflownController.toggleOverflownAppsView(overflowIcon, apps) {} } + // Run an empty frame so that the taskbar drag layer can resize and show the overflown + // container. + runOnMainSync {} + assertThat( + AbstractFloatingView.hasOpenView( + taskbarActivityContext, + AbstractFloatingView.TYPE_TASKBAR_OVERFLOW, + ) + ) + .isTrue() + } + + @Test + fun testToggleOverflownAppsView_closesContainer() { + val apps = + createHotseatItems( + taskbarActivityContext.taskbarSpecsEvaluator.numShownHotseatIcons + 3 + ) + .toList() + runOnMainSync { overflownController.toggleOverflownAppsView(overflowIcon, apps) {} } + // Run an empty frame so that the taskbar drag layer can resize and show the overflown + // container. + runOnMainSync {} + assertThat( + AbstractFloatingView.hasOpenView( + taskbarActivityContext, + AbstractFloatingView.TYPE_TASKBAR_OVERFLOW, + ) + ) + .isTrue() + + // Toggle the OverflownAppsView again should close the container view. + runOnMainSync { overflownController.toggleOverflownAppsView(overflowIcon, apps) {} } + assertThat( + AbstractFloatingView.hasOpenView( + taskbarActivityContext, + AbstractFloatingView.TYPE_TASKBAR_OVERFLOW, + ) + ) + .isFalse() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/PinToTaskbarShortcutTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/PinToTaskbarShortcutTest.kt new file mode 100644 index 00000000000..ab3050c2f62 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/PinToTaskbarShortcutTest.kt @@ -0,0 +1,214 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.content.ComponentName +import android.content.Intent +import android.os.UserHandle +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.util.SparseArray +import android.view.View +import androidx.core.util.size +import com.android.launcher3.model.data.AppInfo +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.customization.TASKBAR_OVERFLOW_PIN_LIMIT +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.TestUtil.getOnUiThread +import com.android.window.flags.Flags.FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.eq +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** Tests for [PinToTaskbarShortcut]. */ +@RunWith(LauncherMultivalentJUnit::class) +class PinToTaskbarShortcutTest { + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + + @get:Rule(order = 1) val context = TaskbarWindowSandboxContext.create() + + @get:Rule(order = 2) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + private val taskbarActivityContext: TaskbarActivityContext + get() = taskbarUnitTestRule.activityContext + + private val pinnedInfoList = SparseArray() + private lateinit var view: View + + @Before + fun setUp() { + runOnMainSync { view = View(taskbarActivityContext) } + } + + @Test + fun testUnpin_removeItemFromTaskbar() { + populatePinnedInfoList(0) + assertThat(pinnedInfoList.size).isEqualTo(1) + val shortcut = createShortcut(false, pinnedInfoList[0] ?: ItemInfo()) + mockUnpinItem(shortcut) + + runOnMainSync { shortcut.onClick(null) } + + verify(shortcut).unpinItem(anyOrNull(), anyOrNull()) + assertThat(pinnedInfoList.size).isEqualTo(0) + } + + @Test + @EnableFlags(FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS) + fun testPin_noOverflow_pinsToEnd() { + populatePinnedInfoList(0, 1, 2) + val newItemInfo = createItemInfoToPin() + val shortcut = createShortcut(true, newItemInfo) + mockPinItem(shortcut) + + runOnMainSync { shortcut.onClick(null) } + + verify(shortcut).pinItem(anyOrNull(), anyOrNull(), any(), eq(3), any()) + assertThat(pinnedInfoList.size).isEqualTo(4) + assertThat(pinnedInfoList[3]?.targetComponent).isEqualTo(newItemInfo.componentName) + } + + @Test + @DisableFlags(FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS) + fun testPin_noOverflow_compactsAndPinsToEnd() { + // Create a list of pinned info where the last space has a pinned item. + populatePinnedInfoList( + 0, + 3, + taskbarActivityContext.taskbarSpecsEvaluator.numShownHotseatIcons - 1, + ) + val newItemInfo = createItemInfoToPin() + val shortcut = createShortcut(true, newItemInfo) + mockPinItem(shortcut) + + runOnMainSync { shortcut.onClick(null) } + + // The pinned items are compacted and the new item is pinned to the end + verify(shortcut).pinItem(anyOrNull(), anyOrNull(), any(), eq(3), any()) + + assertThat(pinnedInfoList.size).isEqualTo(4) + assertThat(pinnedInfoList[3]?.targetComponent).isEqualTo(newItemInfo.componentName) + } + + @Test + @EnableFlags(FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS) + fun testPin_noOverflow_emptyTaskbar_pinsToIndex0() { + val newItemInfo = createItemInfoToPin() + val shortcut = createShortcut(true, newItemInfo) + mockPinItem(shortcut) + + runOnMainSync { shortcut.onClick(null) } + + verify(shortcut).pinItem(anyOrNull(), anyOrNull(), any(), eq(0), any()) + assertThat(pinnedInfoList.size).isEqualTo(1) + assertThat(pinnedInfoList[0]?.targetComponent).isEqualTo(newItemInfo.componentName) + } + + @Test + @EnableFlags(FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS) + fun testPin_withOverflow_pinsToNextAvailableIndex() { + populatePinnedInfoList(2, TASKBAR_OVERFLOW_PIN_LIMIT - 1) + val newItemInfo = createItemInfoToPin() + val shortcut = createShortcut(true, newItemInfo) + mockPinItem(shortcut) + + runOnMainSync { shortcut.onClick(null) } + + // The new item should be pinned to index 2, as it's the first available slot. + verify(shortcut).pinItem(anyOrNull(), anyOrNull(), any(), eq(2), any()) + assertThat(pinnedInfoList.size).isEqualTo(3) + assertThat(pinnedInfoList[2]?.targetComponent).isEqualTo(newItemInfo.componentName) + } + + private fun createItemInfoToPin(): AppInfo { + return AppInfo().apply { + user = UserHandle.CURRENT + componentName = ComponentName(taskbarActivityContext, "new.test.class") + intent = Intent().setComponent(componentName) + } + } + + private fun createShortcut( + isPin: Boolean, + itemInfo: ItemInfo, + ): PinToTaskbarShortcut { + return getOnUiThread { + spy(PinToTaskbarShortcut(taskbarActivityContext, itemInfo, view, isPin, pinnedInfoList)) + } + } + + private fun populatePinnedInfoList(vararg positions: Int) { + for (pos in positions) { + val info = + AppInfo().apply { + screenId = pos + cellX = pos + user = UserHandle.CURRENT + componentName = ComponentName(taskbarActivityContext, "test.class.$pos") + intent = Intent().setComponent(componentName) + } + pinnedInfoList.put(pos, info.makeWorkspaceItem(context)) + } + } + + private fun mockPinItem(shortcut: PinToTaskbarShortcut) { + doAnswer { + runOnMainSync { + val newInfo = it.getArgument(1) + val cellX = it.getArgument(3) + pinnedInfoList.put(cellX, newInfo) + } + null + } + .whenever(shortcut) + .pinItem(anyOrNull(), anyOrNull(), any(), any(), any()) + } + + private fun mockUnpinItem(shortcut: PinToTaskbarShortcut) { + doAnswer { + runOnMainSync { + val infoToUnpin = it.getArgument(1) + for (i in 0 until pinnedInfoList.size) { + if ( + pinnedInfoList.valueAt(i)?.targetComponent == + infoToUnpin?.targetComponent + ) { + pinnedInfoList.removeAt(i) + break + } + } + } + null + } + .whenever(shortcut) + .unpinItem(anyOrNull(), anyOrNull()) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/RecentsHitboxExtenderTest.java b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/RecentsHitboxExtenderTest.java index 929bff30049..6b4a9445569 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/RecentsHitboxExtenderTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/RecentsHitboxExtenderTest.java @@ -22,10 +22,12 @@ import com.android.launcher3.DeviceProfile; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import java.util.function.Supplier; @@ -37,6 +39,10 @@ public class RecentsHitboxExtenderTest { private static final int BUTTON_HEIGHT = 10; private final RecentsHitboxExtender mHitboxExtender = new RecentsHitboxExtender(); + + + @Rule + public MockitoRule mockitoRule = MockitoJUnit.rule(); @Mock View mMockRecentsButton; @Mock @@ -52,7 +58,6 @@ public class RecentsHitboxExtenderTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); mContext = instrumentation.getContext(); mHitboxExtender.init(mMockRecentsButton, mMockRecentsParent, mMockDeviceProfile, mSupplier, diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendControllerTest.kt new file mode 100644 index 00000000000..6926616dc6f --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendControllerTest.kt @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.taskbar + +import android.animation.AnimatorTestRule +import androidx.test.core.app.ApplicationProvider +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_BUBBLES +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TOUCHING +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR +import com.android.launcher3.taskbar.rules.SandboxParams +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.quickstep.SystemUiProxy +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.spy +import org.mockito.kotlin.whenever + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelTablet2023"]) +class TaskbarAutohideSuspendControllerTest { + + @get:Rule(order = 0) + val context = + TaskbarWindowSandboxContext.create( + SandboxParams({ + spy(SystemUiProxy( + ApplicationProvider.getApplicationContext(), + MAIN_EXECUTOR, + UI_HELPER_EXECUTOR, + )) { proxy -> + doAnswer { latestSuspendNotification = it.getArgument(0) } + .whenever(proxy) + .notifyTaskbarAutohideSuspend(anyOrNull()) + } + }) + ) + @get:Rule(order = 1) val animatorTestRule = AnimatorTestRule(this) + @get:Rule(order = 2) val taskbarModeRule = TaskbarModeRule(context) + @get:Rule(order = 3) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var autohideSuspendController: TaskbarAutohideSuspendController + @InjectController lateinit var stashController: TaskbarStashController + + private var latestSuspendNotification: Boolean? = null + + @Test + fun testUpdateFlag_suspendInLauncher_notifiesSuspend() { + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER, true) + } + assertThat(latestSuspendNotification).isTrue() + } + + @Test + fun testUpdateFlag_toggleSuspendDraggingTwice_notifiesUnsuspend() { + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_DRAGGING, true) + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_DRAGGING, false) + } + assertThat(latestSuspendNotification).isFalse() + } + + @Test + fun testUpdateFlag_resetsAlreadyUnsetFlag_noNotifyUnsuspend() { + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_DRAGGING, false) + } + assertThat(latestSuspendNotification).isNull() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateFlag_suspendTransientTaskbarForTouch_cancelsAutoStashTimeout() { + // Unstash and verify alarm. + getInstrumentation().runOnMainSync { + stashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashController.timeoutAlarm.alarmPending()).isTrue() + + // EDU opens while unstashed. + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_TOUCHING, true) + } + assertThat(stashController.timeoutAlarm.alarmPending()).isFalse() + } + + @Test + fun isSuspended_withBubblesFlag_returnsCorrectValue() { + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, true) + } + assertThat(autohideSuspendController.isSuspended).isTrue() + + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, false) + } + assertThat(autohideSuspendController.isSuspended).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun suspendAutoHideForBubbles_doesNotSuspendTransientTaskbarStashing() { + // Unstash and verify alarm. + getInstrumentation().runOnMainSync { + stashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashController.timeoutAlarm.alarmPending()).isTrue() + + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, true) + } + assertThat(stashController.timeoutAlarm.alarmPending()).isTrue() + assertThat(autohideSuspendController.isTransientTaskbarStashingSuspended).isFalse() + } + + @Test + fun suspendedForBubbles_shouldForceVisible() { + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, true) + } + assertThat(autohideSuspendController.shouldForceVisible()).isTrue() + + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, false) + } + assertThat(autohideSuspendController.shouldForceVisible()).isFalse() + } + + @Test + fun suspendedForUnstashedTaskbar_shouldForceVisible() { + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR, true) + } + assertThat(autohideSuspendController.shouldForceVisible()).isTrue() + + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR, false) + } + assertThat(autohideSuspendController.shouldForceVisible()).isFalse() + } +} diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt similarity index 88% rename from quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt index 15b1e532bd2..4ea1d852dcd 100644 --- a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt @@ -17,12 +17,15 @@ package com.android.launcher3.taskbar import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController import com.android.launcher3.taskbar.bubbles.BubbleControllers +import com.android.launcher3.taskbar.growth.NudgeController +import com.android.launcher3.taskbar.handoff.TaskbarHandoffController import com.android.launcher3.taskbar.overlay.TaskbarOverlayController import com.android.systemui.shared.rotation.RotationButtonController import java.util.Optional import org.junit.Before +import org.junit.Rule import org.mockito.Mock -import org.mockito.MockitoAnnotations +import org.mockito.junit.MockitoJUnit /** * Helper class to extend to get access to all controllers. Gotta be careful of your relationship @@ -30,6 +33,7 @@ import org.mockito.MockitoAnnotations */ abstract class TaskbarBaseTestCase { + @get:Rule val mockito = MockitoJUnit.rule() @Mock lateinit var taskbarActivityContext: TaskbarActivityContext @Mock lateinit var taskbarDragController: TaskbarDragController @Mock lateinit var navButtonController: TaskbarNavButtonController @@ -57,6 +61,10 @@ abstract class TaskbarBaseTestCase { @Mock lateinit var keyboardQuickSwitchController: KeyboardQuickSwitchController @Mock lateinit var taskbarPinningController: TaskbarPinningController @Mock lateinit var optionalBubbleControllers: Optional + @Mock lateinit var taskbarDesktopModeController: TaskbarDesktopModeController + @Mock lateinit var nudgeController: NudgeController + @Mock lateinit var nudgeViewController: NudgeViewController + @Mock lateinit var taskbarHandoffController: TaskbarHandoffController lateinit var taskbarControllers: TaskbarControllers @@ -69,7 +77,6 @@ abstract class TaskbarBaseTestCase { * If you want to mock one of those methods, you need to make a parent interface that * includes that method to allow mocking it. */ - MockitoAnnotations.initMocks(this) taskbarControllers = TaskbarControllers( taskbarActivityContext, @@ -98,6 +105,10 @@ abstract class TaskbarBaseTestCase { keyboardQuickSwitchController, taskbarPinningController, optionalBubbleControllers, + taskbarDesktopModeController, + nudgeController, + nudgeViewController, + taskbarHandoffController, ) } } diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarControllerTestUtil.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarControllerTestUtil.kt new file mode 100644 index 00000000000..0e066cd13b6 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarControllerTestUtil.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.launcher3.taskbar + +import android.content.Context +import com.android.launcher3.ConstantItem +import com.android.launcher3.LauncherPrefs +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.TestUtil +import kotlin.properties.ReadWriteProperty +import kotlin.reflect.KProperty + +object TaskbarControllerTestUtil { + inline fun runOnMainSync(crossinline runTest: () -> Unit) { + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) { runTest() } + } + + /** Returns a property to read/write the value of a [ConstantItem]. */ + fun ConstantItem.asProperty(context: Context): ReadWriteProperty { + return TaskbarItemProperty(context, this) + } + + private class TaskbarItemProperty( + private val context: Context, + private val item: ConstantItem, + ) : ReadWriteProperty { + + override fun getValue(thisRef: Any?, property: KProperty<*>): T { + return LauncherPrefs.get(context).get(item) + } + + override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) { + runOnMainSync { LauncherPrefs.get(context).put(item, value) } + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarDesktopModeControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarDesktopModeControllerTest.kt new file mode 100644 index 00000000000..455b6c5b985 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarDesktopModeControllerTest.kt @@ -0,0 +1,48 @@ +/* + * 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.launcher3.taskbar + +import com.android.launcher3.taskbar.TaskbarBackgroundRenderer.Companion.MAX_ROUNDNESS +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@LauncherMultivalentJUnit.EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +class TaskbarDesktopModeControllerTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @TaskbarUnitTestRule.InjectController + lateinit var taskbarDesktopModeController: TaskbarDesktopModeController + + @Test + fun whenTaskbarRequiresCornerRoundness_shouldReturnDefaultCornerRoundness() { + assertThat(taskbarDesktopModeController.getTaskbarCornerRoundness(true)) + .isEqualTo(MAX_ROUNDNESS) + } + + @Test + fun whenTaskbarRequiresCornerRoundness_shouldReturnZeroAsCornerRoundness() { + assertThat(taskbarDesktopModeController.getTaskbarCornerRoundness(false)).isEqualTo(0f) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarEduTooltipControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarEduTooltipControllerTest.kt new file mode 100644 index 00000000000..04b1a968889 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarEduTooltipControllerTest.kt @@ -0,0 +1,191 @@ +/* + * 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.launcher3.taskbar + +import com.android.launcher3.Utilities +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.asProperty +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.PINNED +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.THREE_BUTTONS +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.launcher3.util.OnboardingPrefs +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +class TaskbarEduTooltipControllerTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + + @get:Rule(order = 1) val taskbarModeRule = TaskbarModeRule(context) + + @get:Rule(order = 2) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var taskbarEduTooltipController: TaskbarEduTooltipController + + private val taskbarContext: TaskbarActivityContext + get() = taskbarUnitTestRule.activityContext + + private val wasInTestHarness = Utilities.isRunningInTestHarness() + + private var tooltipStep by OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP.prefItem.asProperty(context) + private var searchEduSeen by OnboardingPrefs.TASKBAR_SEARCH_EDU_SEEN.asProperty(context) + + @Before + fun setUp() { + Utilities.disableRunningInTestHarnessForTests() + } + + @After + fun tearDown() { + if (wasInTestHarness) { + Utilities.enableRunningInTestHarnessForTests() + } + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testMaybeShowSwipeEdu_whenTaskbarIsInThreeButtonMode_doesNotShowSwipeEdu() { + tooltipStep = TOOLTIP_STEP_SWIPE + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_SWIPE) + runOnMainSync { taskbarEduTooltipController.maybeShowSwipeEdu() } + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_SWIPE) + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testMaybeShowSwipeEdu_whenSwipeEduAlreadyShown_doesNotShowSwipeEdu() { + tooltipStep = TOOLTIP_STEP_FEATURES + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_FEATURES) + runOnMainSync { taskbarEduTooltipController.maybeShowSwipeEdu() } + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_FEATURES) + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testMaybeShowSwipeEdu_whenUserHasNotSeen_doesShowSwipeEdu() { + tooltipStep = TOOLTIP_STEP_SWIPE + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_SWIPE) + runOnMainSync { taskbarEduTooltipController.maybeShowSwipeEdu() } + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_FEATURES) + assertThat(taskbarEduTooltipController.isTooltipOpen).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testMaybeShowFeaturesEdu_whenFeatureEduAlreadyShown_doesNotShowFeatureEdu() { + tooltipStep = TOOLTIP_STEP_NONE + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_NONE) + runOnMainSync { taskbarEduTooltipController.maybeShowFeaturesEdu() } + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_NONE) + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testMaybeShowFeaturesEdu_whenUserHasNotSeen_doesShowFeatureEdu() { + tooltipStep = TOOLTIP_STEP_FEATURES + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_FEATURES) + runOnMainSync { taskbarEduTooltipController.maybeShowFeaturesEdu() } + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_NONE) + assertThat(taskbarEduTooltipController.isTooltipOpen).isTrue() + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testMaybeShowPinningEdu_whenTaskbarIsInThreeButtonMode_doesNotShowPinningEdu() { + tooltipStep = TOOLTIP_STEP_PINNING + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_PINNING) + runOnMainSync { taskbarEduTooltipController.maybeShowFeaturesEdu() } + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_PINNING) + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testMaybeShowPinningEdu_whenUserHasNotSeen_doesShowPinningEdu() { + // Test standalone pinning edu, where user has seen taskbar edu before, but not pinning edu. + tooltipStep = TOOLTIP_STEP_PINNING + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_PINNING) + runOnMainSync { taskbarEduTooltipController.maybeShowFeaturesEdu() } + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_NONE) + assertThat(taskbarEduTooltipController.isTooltipOpen).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testIsBeforeTooltipFeaturesStep_whenUserHasNotSeenFeatureEdu_shouldReturnTrue() { + tooltipStep = TOOLTIP_STEP_SWIPE + assertThat(taskbarEduTooltipController.isBeforeTooltipFeaturesStep).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testIsBeforeTooltipFeaturesStep_whenUserHasSeenFeatureEdu_shouldReturnFalse() { + tooltipStep = TOOLTIP_STEP_NONE + assertThat(taskbarEduTooltipController.isBeforeTooltipFeaturesStep).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testHide_whenTooltipIsOpen_shouldCloseTooltip() { + tooltipStep = TOOLTIP_STEP_SWIPE + assertThat(taskbarEduTooltipController.tooltipStep).isEqualTo(TOOLTIP_STEP_SWIPE) + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + runOnMainSync { taskbarEduTooltipController.maybeShowSwipeEdu() } + assertThat(taskbarEduTooltipController.isTooltipOpen).isTrue() + runOnMainSync { taskbarEduTooltipController.hide() } + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testMaybeShowSearchEdu_whenTaskbarIsTransient_shouldNotShowSearchEdu() { + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + runOnMainSync { + taskbarEduTooltipController.init(taskbarContext.controllers, TaskbarUiState()) + } + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + } + + @Test + @TaskbarMode(PINNED) + fun testMaybeShowSearchEdu_whenTaskbarIsPinnedAndUserHasSeenSearchEdu_shouldNotShowSearchEdu() { + searchEduSeen = true + assertThat(taskbarEduTooltipController.userHasSeenSearchEdu).isTrue() + runOnMainSync { taskbarEduTooltipController.hide() } + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + runOnMainSync { + taskbarEduTooltipController.init(taskbarContext.controllers, TaskbarUiState()) + } + assertThat(taskbarEduTooltipController.isTooltipOpen).isFalse() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarHoverToolTipControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarHoverToolTipControllerTest.kt new file mode 100644 index 00000000000..04c66987313 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarHoverToolTipControllerTest.kt @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.view.MotionEvent +import android.view.MotionEvent.ACTION_HOVER_ENTER +import android.view.MotionEvent.ACTION_HOVER_EXIT +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.BubbleTextView +import com.android.launcher3.R +import com.android.launcher3.apppairs.AppPairIcon +import com.android.launcher3.folder.FolderIcon +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatAppPairsItem +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatFolderItem +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatWorkspaceItem +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +class TaskbarHoverToolTipControllerTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var autohideSuspendController: TaskbarAutohideSuspendController + @InjectController lateinit var popupController: TaskbarPopupController + + private val taskbarContext: TaskbarActivityContext by taskbarUnitTestRule::activityContext + + private lateinit var taskbarView: TaskbarView + private lateinit var iconView: BubbleTextView + private lateinit var appPairIcon: AppPairIcon + private lateinit var folderIcon: FolderIcon + + private val isHoverToolTipOpen: Boolean + get() { + // TaskbarHoverToolTip uses ArrowTipView which is type TYPE_ON_BOARD_POPUP. + return AbstractFloatingView.hasOpenView( + taskbarContext, + AbstractFloatingView.TYPE_ON_BOARD_POPUP, + ) + } + + @Before + fun setup() { + runOnMainSync { taskbarView = taskbarContext.dragLayer.findViewById(R.id.taskbar_view) } + + val hotseatItems = + arrayOf( + createHotseatWorkspaceItem(), + createHotseatAppPairsItem(), + createHotseatFolderItem(), + ) + runOnMainSync { + taskbarView.updateItems(hotseatItems, emptyList(), emptyList()) + iconView = + taskbarView.iconViews.filterIsInstance().first { + it.tag is WorkspaceItemInfo + } + appPairIcon = taskbarView.iconViews.filterIsInstance().first() + folderIcon = taskbarView.iconViews.filterIsInstance().first() + } + } + + @Test + fun onHover_hoverEnterIcon_revealToolTip_hoverExitIcon_closeToolTip() { + runOnMainSync { iconView.dispatchGenericMotionEvent(HOVER_ENTER) } + assertThat(isHoverToolTipOpen).isTrue() + assertThat(autohideSuspendController.isTransientTaskbarStashingSuspended).isTrue() + runOnMainSync { iconView.dispatchGenericMotionEvent(HOVER_EXIT) } + assertThat(isHoverToolTipOpen).isFalse() + assertThat(autohideSuspendController.isTransientTaskbarStashingSuspended).isFalse() + } + + @Test + fun onHover_hoverEnterFolderIcon_revealToolTip_hoverExitFolderIcon_closeToolTip() { + runOnMainSync { folderIcon.dispatchGenericMotionEvent(HOVER_ENTER) } + assertThat(isHoverToolTipOpen).isTrue() + assertThat(autohideSuspendController.isTransientTaskbarStashingSuspended).isTrue() + runOnMainSync { folderIcon.dispatchGenericMotionEvent(HOVER_EXIT) } + assertThat(isHoverToolTipOpen).isFalse() + assertThat(autohideSuspendController.isTransientTaskbarStashingSuspended).isFalse() + } + + @Test + fun onHover_hoverEnterAppPair_revealToolTip_hoverExitAppPair_closeToolTip() { + runOnMainSync { appPairIcon.dispatchGenericMotionEvent(HOVER_ENTER) } + assertThat(isHoverToolTipOpen).isTrue() + assertThat(autohideSuspendController.isTransientTaskbarStashingSuspended).isTrue() + runOnMainSync { appPairIcon.dispatchGenericMotionEvent(HOVER_EXIT) } + assertThat(isHoverToolTipOpen).isFalse() + assertThat(autohideSuspendController.isTransientTaskbarStashingSuspended).isFalse() + } + + @Test + fun onHover_hoverEnterIconAlignedWithHotseat_noToolTip() { + taskbarContext.setUIController( + object : TaskbarUIController() { + override fun isIconAlignedWithHotseat(): Boolean = true + } + ) + + runOnMainSync { iconView.dispatchGenericMotionEvent(HOVER_ENTER) } + assertThat(isHoverToolTipOpen).isFalse() + } + + @Test + fun onHover_hoverEnterFolderOpen_noToolTip() { + runOnMainSync { + folderIcon.folder.animateOpen() + iconView.dispatchGenericMotionEvent(HOVER_ENTER) + } + assertThat(isHoverToolTipOpen).isFalse() + } + + @Test + fun onHover_hoverEnterPopupOpen_noToolTip() { + runOnMainSync { + popupController.show(iconView) + iconView.dispatchGenericMotionEvent(HOVER_ENTER) + } + assertThat(isHoverToolTipOpen).isFalse() + } + + @Test + fun onHover_emptyTitle_noTooltip() { + runOnMainSync { + iconView.text = "" + iconView.dispatchGenericMotionEvent(HOVER_ENTER) + } + assertThat(isHoverToolTipOpen).isFalse() + } + + companion object { + private val HOVER_EXIT = MotionEvent.obtain(0, 0, ACTION_HOVER_EXIT, 0f, 0f, 0) + private val HOVER_ENTER = MotionEvent.obtain(0, 0, ACTION_HOVER_ENTER, 0f, 0f, 0) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarInsetsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarInsetsControllerTest.kt new file mode 100644 index 00000000000..db04163dcbe --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarInsetsControllerTest.kt @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.animation.AnimatorTestRule +import android.view.ViewTreeObserver +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.DEFAULT_TOUCH_REGION +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.FULLSCREEN_TASKBAR_WINDOW +import com.android.launcher3.taskbar.TaskbarInsetsController.DebugTouchableRegion.Companion.ICONS_INVISIBLE +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_VISIBLE +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +class TaskbarInsetsControllerTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val animatorTestRule = AnimatorTestRule(this) + @get:Rule(order = 2) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var taskbarInsetsController: TaskbarInsetsController + @InjectController lateinit var taskbarStashController: TaskbarStashController + + private val taskbarContext by taskbarUnitTestRule::activityContext + + @Test + fun imeShowing_taskbarWindowUntouchable() { + runOnMainSync { taskbarContext.updateSysuiStateFlags(SYSUI_STATE_IME_VISIBLE, false) } + runOnMainSync { + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableReason) + .isEqualTo(ICONS_INVISIBLE) + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableInsets) + .isEqualTo(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION) + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableBounds.isEmpty) + .isTrue() + } + } + + @Test + @TaskbarMode(TRANSIENT) + fun imeShowing_transientTaskbarUnstashed_taskbarWindowTouchable() { + runOnMainSync { + taskbarContext.updateSysuiStateFlags(SYSUI_STATE_IME_VISIBLE, true) + taskbarStashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(taskbarStashController.stashDuration) + } + runOnMainSync { + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableReason) + .isEqualTo(DEFAULT_TOUCH_REGION) + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableInsets) + .isEqualTo(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION) + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableBounds.isEmpty) + .isFalse() + } + } + + @Test + @TaskbarMode(TRANSIENT) + fun imeShowing_transientTaskbarStashed_taskbarWindowUntouchable() { + runOnMainSync { taskbarContext.updateSysuiStateFlags(SYSUI_STATE_IME_VISIBLE, true) } + runOnMainSync { + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableReason) + .isEqualTo(ICONS_INVISIBLE) + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableInsets) + .isEqualTo(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION) + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableBounds.isEmpty) + .isTrue() + } + } + + @Test + fun windowFullscreen_entireTaskbarWindowTouchable() { + runOnMainSync { taskbarContext.setTaskbarWindowFullscreen(true) } + runOnMainSync { + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableReason) + .isEqualTo(FULLSCREEN_TASKBAR_WINDOW) + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableInsets) + .isEqualTo(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME) + } + } + + @Test + fun windowFullscreen_imeShowing_entireTaskbarWindowTouchable() { + runOnMainSync { + taskbarContext.setTaskbarWindowFullscreen(true) + taskbarContext.updateSysuiStateFlags(SYSUI_STATE_IME_VISIBLE, false) + } + runOnMainSync { + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableReason) + .isEqualTo(FULLSCREEN_TASKBAR_WINDOW) + assertThat(taskbarInsetsController.debugTouchableRegion.lastSetTouchableInsets) + .isEqualTo(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME) + } + } +} diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt similarity index 97% rename from quickstep/tests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt index e619e7cd381..24310202ca4 100644 --- a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt @@ -16,6 +16,7 @@ package com.android.launcher3.taskbar import android.app.KeyguardManager +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISABLED import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING @@ -23,6 +24,7 @@ import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_B import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED 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.never @@ -30,6 +32,7 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever +@RunWith(AndroidJUnit4::class) class TaskbarKeyguardControllerTest : TaskbarBaseTestCase() { private val baseDragLayer: TaskbarDragLayer = mock() diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarLauncherStateControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarLauncherStateControllerTest.kt new file mode 100644 index 00000000000..a2521f54676 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarLauncherStateControllerTest.kt @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.animation.AnimatorTestRule +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.Flags.enableTaskbarUiThread +import com.android.launcher3.Hotseat +import com.android.launcher3.Launcher +import com.android.launcher3.LauncherInteractor +import com.android.launcher3.LauncherState +import com.android.launcher3.LauncherUiState +import com.android.launcher3.statemanager.StateManager +import com.android.launcher3.taskbar.TaskbarManagerImpl.TASKBAR_UI_THREAD +import com.android.launcher3.taskbar.bubbles.BubbleControllers +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.launcher3.util.MutableListenableRef +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_AWAKE +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_TRANSITION +import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags +import com.android.wm.shell.Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE +import com.google.common.truth.Truth.assertThat +import java.util.Optional +import java.util.concurrent.Executor +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixel9profold", "pixelTablet2023"]) +class TaskbarLauncherStateControllerTest { + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + @get:Rule(order = 1) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 2) val animatorTestRule = AnimatorTestRule(this) + @get:Rule(order = 3) val taskbarUnitTestRule = TaskbarUnitTestRule(testInstance = this, context) + + @InjectController lateinit var bubbleControllers: Optional + @InjectController lateinit var taskbarStashController: TaskbarStashController + + private val bubbleBarViewController by lazy { + bubbleControllers.orElseThrow().bubbleBarViewController + } + private val bubbleBarStashController by lazy { + bubbleControllers.orElseThrow().bubbleStashController + } + private val taskbarLauncherStateController = TaskbarLauncherStateController() + + @Test + fun updateStateForSysuiFlags_singleTapPowerButton_stashTaskAndBubbleBarOnAnimationEnd() { + initForWakeTransitionWithBubbles(SYSUI_STATE_AWAKE) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleBarStashController.showBubbleBar(expandBubbles = true) + animatorTestRule.advanceTimeBy(BubbleStashController.BAR_STASH_DURATION) + } + + assertThat(bubbleBarStashController.isStashed).isFalse() + assertThat(bubbleBarViewController.isExpanded).isTrue() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + // simulate the device going to sleep + taskbarLauncherStateController.updateStateForSysuiFlags( + SYSUI_STATE_WAKEFULNESS_TRANSITION and SYSUI_STATE_AWAKE.inv() + ) + // Stash the taskbar. + animatorTestRule.advanceTimeBy(taskbarStashController.stashDuration) + // Stash the bubble bar. + animatorTestRule.advanceTimeBy(BubbleStashController.BAR_STASH_DURATION) + } + + assertThat(bubbleBarStashController.isStashed).isTrue() + assertThat(bubbleBarViewController.isExpanded).isFalse() + } + + @Test + @EnableFlags(FLAG_ENABLE_CREATE_ANY_BUBBLE) + fun updateStateForSysuiFlags_doubleTapPowerButton_doesNotStashTaskAndBubbleBarOnAnimationEnd() { + initForWakeTransitionWithBubbles(SYSUI_STATE_AWAKE) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleBarStashController.showBubbleBar(expandBubbles = true) + animatorTestRule.advanceTimeBy(BubbleStashController.BAR_STASH_DURATION) + } + + assertThat(bubbleBarStashController.isStashed).isFalse() + assertThat(bubbleBarViewController.isExpanded).isTrue() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + // simulate double tap + taskbarLauncherStateController.updateStateForSysuiFlags( + SYSUI_STATE_WAKEFULNESS_TRANSITION and SYSUI_STATE_AWAKE.inv() + ) + taskbarLauncherStateController.updateStateForSysuiFlags( + SYSUI_STATE_WAKEFULNESS_TRANSITION or SYSUI_STATE_AWAKE + ) + animatorTestRule.advanceTimeBy(taskbarStashController.stashDuration) + } + + assertThat(bubbleBarStashController.isStashed).isFalse() + assertThat(bubbleBarViewController.isExpanded).isTrue() + } + + /** Initializes the controller for a wake transition with a transit taskbar and bubbles. */ + private fun initForWakeTransitionWithBubbles(@SystemUiStateFlags sysUiStateFlags: Long) { + val launcherStateManager = + mock> { + on { state } doReturn mock() + } + val dp = taskbarUnitTestRule.activityContext.deviceProfile + val mockedLauncherUiState = + mock { + on { deviceProfileRef } doReturn MutableListenableRef(dp) + on { isSplitSelectActiveRef } doReturn MutableListenableRef(false) + on { launcherStateRef } doReturn MutableListenableRef(LauncherState.NORMAL) + on { taskbarAlignmentChannelAlpha } doReturn MutableListenableRef(0f) + } + val quickstepLauncher = + mock { + on { deviceProfile } doReturn dp + on { hotseat } doReturn mock() + on { stateManager } doReturn launcherStateManager + on { launcherUiState } doReturn mockedLauncherUiState + } + val controllers = taskbarUnitTestRule.activityContext.controllers + val immediateExecutor = Executor { r -> r.run() } + val launcherExecutor: Executor = + if (enableTaskbarUiThread()) MAIN_EXECUTOR else immediateExecutor + val taskbarExecutor: Executor = + if (enableTaskbarUiThread()) TASKBAR_UI_THREAD else immediateExecutor + InstrumentationRegistry.getInstrumentation().runOnMainSync { + taskbarLauncherStateController.init( + controllers, + LauncherInteractor(quickstepLauncher, launcherExecutor), + mockedLauncherUiState, + sysUiStateFlags, + taskbarExecutor, + ) + taskbarStashController.toggleTaskbarStash() // Un-stashing the taskbar. + bubbleBarViewController.setHiddenForBubbles(false) // Show the bubble bar. + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarManagerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarManagerTest.kt new file mode 100644 index 00000000000..27e40ceb267 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarManagerTest.kt @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import com.android.launcher3.Flags.FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.UserLocked +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.launcher3.util.SandboxApplication +import com.android.quickstep.SystemUiProxy +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAVIGATION_BAR_DISABLED +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelTablet2023"]) +class TaskbarManagerTest { + + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + @get:Rule(order = 1) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 2) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + private val taskbarManager by taskbarUnitTestRule::taskbarManager + private val activityContext by taskbarUnitTestRule::activityContext + + @Test + fun addDisplay_externalActivityContextInitialized() { + val displayId = context.virtualDisplayRule.add() + val activityContext = checkNotNull(taskbarManager.getTaskbarForDisplay(displayId)) + + assertThat(activityContext.displayId).isEqualTo(displayId) + // Allow drag layer to attach before checking. + runOnMainSync { assertThat(activityContext.dragLayer.isAttachedToWindow).isTrue() } + } + + @Test + fun removeDisplay_externalActivityContextDestroyed() { + val displayId = context.virtualDisplayRule.add() + val activityContext = checkNotNull(taskbarManager.getTaskbarForDisplay(displayId)) + context.virtualDisplayRule.remove(displayId) + + assertThat(taskbarManager.getTaskbarForDisplay(displayId)).isNull() + assertThat(activityContext.dragLayer.isAttachedToWindow).isFalse() + assertThat(activityContext.isDestroyed).isTrue() + } + + @Test + @UserLocked + @DisableFlags(FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT) + fun onUserUnlocked_noDirectBootSupport_taskbarCreatedAfterUnlock() { + assertThat(taskbarManager.currentActivityContext).isNull() + taskbarUnitTestRule.unlockUser() + assertThat(taskbarManager.currentActivityContext).isNotNull() + } + + @Test + @UserLocked + @DisableFlags(FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT) + fun onUserUnlocked_noDirectBootSupport_connectedDisplay_taskbarCreatedAfterUnlock() { + val displayId = context.virtualDisplayRule.add() + assertThat(taskbarManager.getTaskbarForDisplay(displayId)).isNull() + taskbarUnitTestRule.unlockUser() + assertThat(taskbarManager.getTaskbarForDisplay(displayId)).isNotNull() + } + + @Test + @UserLocked + @EnableFlags(FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT) + fun onUserUnlocked_directBootSupport_taskbarRecreatedOutsideBootAppContext() { + assertThat(activityContext.applicationContext) + .isInstanceOf(TaskbarBootAppContext::class.java) + taskbarUnitTestRule.unlockUser() + assertThat(activityContext.applicationContext).isInstanceOf(SandboxApplication::class.java) + } + + @Test + @UserLocked + @EnableFlags(FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT) + fun onUserUnlocked_directBootSupport_connectedDisplay_taskbarRecreatedOutsideBootAppContext() { + val displayId = context.virtualDisplayRule.add() + var application = + checkNotNull(taskbarManager.getTaskbarForDisplay(displayId)).applicationContext + assertThat(application).isInstanceOf(TaskbarBootAppContext::class.java) + + taskbarUnitTestRule.unlockUser() + application = + checkNotNull(taskbarManager.getTaskbarForDisplay(displayId)).applicationContext + assertThat(application).isInstanceOf(SandboxApplication::class.java) + } + + @Test + @UserLocked + @EnableFlags(FLAG_ENABLE_TASKBAR_FOR_DIRECT_BOOT) + fun onUserUnlocked_directBootSupport_connectedDisplay_deviceProfileCacheCleared() { + val displayId = context.virtualDisplayRule.add() + val dp1 = checkNotNull(taskbarManager.getTaskbarForDisplay(displayId)).deviceProfile + + taskbarUnitTestRule.unlockUser() + val dp2 = checkNotNull(taskbarManager.getTaskbarForDisplay(displayId)).deviceProfile + assertThat(dp1).isNotSameInstanceAs(dp2) + } + + @Test + fun toggleAllAppsSearch_deviceLocked_allAppsNotOpened() { + SystemUiProxy.INSTANCE[context].focusState.focusedDisplayId = context.displayId + runOnMainSync { + taskbarManager.onSystemUiFlagsChanged( + SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING, + context.displayId, + ) + taskbarManager.toggleAllAppsSearch() + } + assertThat(activityContext.controllers.taskbarAllAppsController.isOpen).isFalse() + } + + @Test + fun toggleAllAppsSearch_deviceUnlocked_allAppsOpened() { + SystemUiProxy.INSTANCE[context].focusState.focusedDisplayId = context.displayId + runOnMainSync { + taskbarManager.onSystemUiFlagsChanged( + SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY, + context.displayId, + ) + taskbarManager.toggleAllAppsSearch() + } + assertThat(activityContext.controllers.taskbarAllAppsController.isOpen).isTrue() + } + + @Test + fun onSystemUiFlagsChanged_navBarDisabled_taskbarDestroyed() { + assertThat(taskbarManager.currentActivityContext).isNotNull() + + runOnMainSync { + taskbarManager.onSystemUiFlagsChanged( + SYSUI_STATE_NAVIGATION_BAR_DISABLED, + context.displayId + ) + } + + assertThat(taskbarManager.currentActivityContext).isNull() + } + + @Test + fun onSystemUiFlagsChanged_navBarEnabled_taskbarCreated() { + runOnMainSync { + // Start with taskbar disabled + taskbarManager.onSystemUiFlagsChanged( + SYSUI_STATE_NAVIGATION_BAR_DISABLED, + context.displayId + ) + } + assertThat(taskbarManager.currentActivityContext).isNull() + + runOnMainSync { + // Then enable it + taskbarManager.onSystemUiFlagsChanged(0, context.displayId) + } + + assertThat(taskbarManager.currentActivityContext).isNotNull() + } + + @Test + fun onSystemUiFlagsChanged_connectedDisplay_navBarDisabled_taskbarDestroyed() { + val displayId = context.virtualDisplayRule.add() + assertThat(taskbarManager.getTaskbarForDisplay(displayId)).isNotNull() + + runOnMainSync { + taskbarManager.onSystemUiFlagsChanged( + SYSUI_STATE_NAVIGATION_BAR_DISABLED, + displayId + ) + } + + assertThat(taskbarManager.getTaskbarForDisplay(displayId)).isNull() + } + + @Test + fun onSystemUiFlagsChanged_connectedDisplay_navBarEnabled_taskbarCreated() { + val displayId = context.virtualDisplayRule.add() + runOnMainSync { + // Start with taskbar disabled + taskbarManager.onSystemUiFlagsChanged( + SYSUI_STATE_NAVIGATION_BAR_DISABLED, + displayId + ) + } + assertThat(taskbarManager.getTaskbarForDisplay(displayId)).isNull() + + runOnMainSync { + // Then enable it + taskbarManager.onSystemUiFlagsChanged(0, displayId) + } + + assertThat(taskbarManager.getTaskbarForDisplay(displayId)).isNotNull() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java index 0f06d98740c..67743a78725 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java @@ -4,6 +4,8 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_BACK_BUTTON_TAP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_HOME_BUTTON_LONGPRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_HOME_BUTTON_TAP; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_LONGPRESS; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_TAP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_OVERVIEW_BUTTON_LONGPRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_OVERVIEW_BUTTON_TAP; import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_A11Y; @@ -16,15 +18,23 @@ import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.contextualsearch.ContextualSearchConfig; +import android.graphics.Rect; import android.os.Handler; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; +import android.view.KeyEvent; import android.view.View; import androidx.test.platform.app.InstrumentationRegistry; @@ -34,27 +44,35 @@ import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TouchInteractionService; -import com.android.quickstep.util.AssistUtils; +import com.android.quickstep.util.ContextualSearchInvoker; +import com.android.systemui.contextualeducation.GestureType; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; @RunWith(AndroidJUnit4.class) public class TaskbarNavButtonControllerTest { private final static int DISPLAY_ID = 2; + + @Rule public MockitoRule mockitoRule = MockitoJUnit.rule(); + @Mock SystemUiProxy mockSystemUiProxy; + @Mock TouchInteractionService mockService; @Mock Handler mockHandler; @Mock - AssistUtils mockAssistUtils; + ContextualSearchInvoker mockContextualSearchInvoker; @Mock StatsLogManager mockStatsLogManager; @Mock @@ -64,18 +82,23 @@ public class TaskbarNavButtonControllerTest { @Mock TaskbarActivityContext mockTaskbarActivityContext; @Mock + TaskbarSharedState mockSharedState; + @Mock View mockView; + @Rule + public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); + private int mHomePressCount; private int mOverviewToggleCount; private final TaskbarNavButtonCallbacks mCallbacks = new TaskbarNavButtonCallbacks() { @Override - public void onNavigateHome() { + public void onNavigateHome(int displayId) { mHomePressCount++; } @Override - public void onToggleOverview() { + public void onToggleOverview(int displayId) { mOverviewToggleCount++; } }; @@ -84,7 +107,6 @@ public void onToggleOverview() { @Before public void setup() { - MockitoAnnotations.initMocks(this); when(mockService.getDisplayId()).thenReturn(DISPLAY_ID); when(mockService.getApplicationContext()) .thenReturn(InstrumentationRegistry.getInstrumentation().getTargetContext() @@ -92,25 +114,47 @@ public void setup() { when(mockStatsLogManager.logger()).thenReturn(mockStatsLogger); when(mockTaskbarControllers.getTaskbarActivityContext()) .thenReturn(mockTaskbarActivityContext); + when(mockTaskbarControllers.getSharedState()).thenReturn(mockSharedState); doReturn(mockStatsLogManager).when(mockTaskbarActivityContext).getStatsLogManager(); + when(mockTaskbarActivityContext.getDisplayId()).thenReturn(DISPLAY_ID); mNavButtonController = new TaskbarNavButtonController( - mockService, + DISPLAY_ID, mCallbacks, mockSystemUiProxy, mockHandler, - mockAssistUtils); + mockContextualSearchInvoker); + mNavButtonController.init(mockTaskbarControllers); } @Test public void testPressBack() { mNavButtonController.onButtonClick(BUTTON_BACK, mockView); - verify(mockSystemUiProxy, times(1)).onBackPressed(); + verify(mockSystemUiProxy, times(1)).onBackEvent(null, DISPLAY_ID); + } + + @Test + public void testPressBack_updateContextualEduData() { + mNavButtonController.onButtonClick(BUTTON_BACK, mockView); + verify(mockSystemUiProxy, times(1)) + .updateContextualEduStats(/* isTrackpad= */ eq(false), eq(GestureType.BACK)); } @Test public void testPressImeSwitcher() { mNavButtonController.onButtonClick(BUTTON_IME_SWITCH, mockView); + verify(mockStatsLogger, times(1)).log(LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_TAP); + verify(mockStatsLogger, never()).log(LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_LONGPRESS); verify(mockSystemUiProxy, times(1)).onImeSwitcherPressed(); + verify(mockSystemUiProxy, never()).onImeSwitcherLongPress(); + } + + @Test + public void testLongPressImeSwitcher() { + mNavButtonController.onButtonLongClick(BUTTON_IME_SWITCH, mockView); + verify(mockStatsLogger, never()).log(LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_TAP); + verify(mockSystemUiProxy, never()).onImeSwitcherPressed(); + verify(mockStatsLogger, times(1)).log(LAUNCHER_TASKBAR_IME_SWITCHER_BUTTON_LONGPRESS); + verify(mockSystemUiProxy, times(1)).onImeSwitcherLongPress(); } @Test @@ -128,41 +172,49 @@ public void testPressA11yLongClick() { @Test public void testLongPressHome_enabled_withoutOverride() { - mNavButtonController.setAssistantLongPressEnabled(true /*assistantLongPressEnabled*/); - when(mockAssistUtils.tryStartAssistOverride(anyInt())).thenReturn(false); + mockSharedState.assistantLongPressEnabled = true; + when(mockContextualSearchInvoker.tryStartAssistOverride(anyInt(), + any(ContextualSearchConfig.class))).thenReturn(false); mNavButtonController.onButtonLongClick(BUTTON_HOME, mockView); - verify(mockAssistUtils, times(1)).tryStartAssistOverride(anyInt()); + verify(mockContextualSearchInvoker, times(1)) + .tryStartAssistOverride(anyInt(), any(ContextualSearchConfig.class)); verify(mockSystemUiProxy, times(1)).startAssistant(any()); } @Test public void testLongPressHome_enabled_withOverride() { - mNavButtonController.setAssistantLongPressEnabled(true /*assistantLongPressEnabled*/); - when(mockAssistUtils.tryStartAssistOverride(anyInt())).thenReturn(true); + mockSharedState.assistantLongPressEnabled = true; + when(mockContextualSearchInvoker.tryStartAssistOverride(anyInt(), + any(ContextualSearchConfig.class))).thenReturn(true); mNavButtonController.onButtonLongClick(BUTTON_HOME, mockView); - verify(mockAssistUtils, times(1)).tryStartAssistOverride(anyInt()); + verify(mockContextualSearchInvoker, times(1)) + .tryStartAssistOverride(anyInt(), any(ContextualSearchConfig.class)); verify(mockSystemUiProxy, never()).startAssistant(any()); } @Test public void testLongPressHome_disabled_withoutOverride() { - mNavButtonController.setAssistantLongPressEnabled(false /*assistantLongPressEnabled*/); - when(mockAssistUtils.tryStartAssistOverride(anyInt())).thenReturn(false); + mockSharedState.assistantLongPressEnabled = false; + when(mockContextualSearchInvoker.tryStartAssistOverride(anyInt(), + any(ContextualSearchConfig.class))).thenReturn(false); mNavButtonController.onButtonLongClick(BUTTON_HOME, mockView); - verify(mockAssistUtils, never()).tryStartAssistOverride(anyInt()); + verify(mockContextualSearchInvoker, never()) + .tryStartAssistOverride(anyInt(), any(ContextualSearchConfig.class)); verify(mockSystemUiProxy, never()).startAssistant(any()); } @Test public void testLongPressHome_disabled_withOverride() { - mNavButtonController.setAssistantLongPressEnabled(false /*assistantLongPressEnabled*/); - when(mockAssistUtils.tryStartAssistOverride(anyInt())).thenReturn(true); + mockSharedState.assistantLongPressEnabled = false; + when(mockContextualSearchInvoker.tryStartAssistOverride(anyInt(), + any(ContextualSearchConfig.class))).thenReturn(true); mNavButtonController.onButtonLongClick(BUTTON_HOME, mockView); - verify(mockAssistUtils, never()).tryStartAssistOverride(anyInt()); + verify(mockContextualSearchInvoker, never()) + .tryStartAssistOverride(anyInt(), any(ContextualSearchConfig.class)); verify(mockSystemUiProxy, never()).startAssistant(any()); } @@ -172,12 +224,26 @@ public void testPressHome() { assertThat(mHomePressCount).isEqualTo(1); } + @Test + public void testPressHome_updateContextualEduData() { + mNavButtonController.onButtonClick(BUTTON_HOME, mockView); + verify(mockSystemUiProxy, times(1)) + .updateContextualEduStats(/* isTrackpad= */ eq(false), eq(GestureType.HOME)); + } + @Test public void testPressRecents() { mNavButtonController.onButtonClick(BUTTON_RECENTS, mockView); assertThat(mOverviewToggleCount).isEqualTo(1); } + @Test + public void testPressRecents_updateContextualEduData() { + mNavButtonController.onButtonClick(BUTTON_RECENTS, mockView); + verify(mockSystemUiProxy, times(1)) + .updateContextualEduStats(/* isTrackpad= */ eq(false), eq(GestureType.OVERVIEW)); + } + @Test public void testPressRecentsWithScreenPinned_noNavigationToOverview() { mNavButtonController.updateSysuiFlags(SYSUI_STATE_SCREEN_PINNING); @@ -233,6 +299,7 @@ public void testLongPressBackRecentsMultipleAttemptPinned() { @Test public void testLongPressHomeScreenPinned() { + mockSharedState.assistantLongPressEnabled = true; mNavButtonController.updateSysuiFlags(SYSUI_STATE_SCREEN_PINNING); mNavButtonController.onButtonLongClick(BUTTON_HOME, mockView); verify(mockSystemUiProxy, times(0)).startAssistant(any()); @@ -240,6 +307,8 @@ public void testLongPressHomeScreenPinned() { @Test public void testNoCallsToNullLogger() { + doReturn(null).when(mockTaskbarActivityContext).getStatsLogManager(); + mNavButtonController.init(mockTaskbarControllers); mNavButtonController.onButtonClick(BUTTON_HOME, mockView); verify(mockStatsLogManager, times(0)).logger(); verify(mockStatsLogger, times(0)).log(any()); @@ -247,7 +316,6 @@ public void testNoCallsToNullLogger() { @Test public void testNoCallsAfterNullingOut() { - mNavButtonController.init(mockTaskbarControllers); mNavButtonController.onButtonClick(BUTTON_HOME, mockView); mNavButtonController.onDestroy(); mNavButtonController.onButtonClick(BUTTON_HOME, mockView); @@ -257,7 +325,6 @@ public void testNoCallsAfterNullingOut() { @Test public void testLogOnTap() { - mNavButtonController.init(mockTaskbarControllers); mNavButtonController.onButtonClick(BUTTON_HOME, mockView); verify(mockStatsLogger, times(1)).log(LAUNCHER_TASKBAR_HOME_BUTTON_TAP); verify(mockStatsLogger, times(0)).log(LAUNCHER_TASKBAR_HOME_BUTTON_LONGPRESS); @@ -265,7 +332,7 @@ public void testLogOnTap() { @Test public void testLogOnLongpress() { - mNavButtonController.init(mockTaskbarControllers); + mockSharedState.assistantLongPressEnabled = true; mNavButtonController.onButtonLongClick(BUTTON_HOME, mockView); verify(mockStatsLogger, times(1)).log(LAUNCHER_TASKBAR_HOME_BUTTON_LONGPRESS); verify(mockStatsLogger, times(0)).log(LAUNCHER_TASKBAR_HOME_BUTTON_TAP); @@ -273,7 +340,6 @@ public void testLogOnLongpress() { @Test public void testBackOverviewLogOnLongpress() { - mNavButtonController.init(mockTaskbarControllers); mNavButtonController.onButtonLongClick(BUTTON_RECENTS, mockView); verify(mockStatsLogger, times(1)).log(LAUNCHER_TASKBAR_OVERVIEW_BUTTON_LONGPRESS); verify(mockStatsLogger, times(0)).log(LAUNCHER_TASKBAR_OVERVIEW_BUTTON_TAP); @@ -282,4 +348,56 @@ public void testBackOverviewLogOnLongpress() { verify(mockStatsLogger, times(1)).log(LAUNCHER_TASKBAR_BACK_BUTTON_LONGPRESS); verify(mockStatsLogger, times(0)).log(LAUNCHER_TASKBAR_BACK_BUTTON_TAP); } + + @Test + public void testPredictiveBackInvoked() { + ArgumentCaptor keyEventCaptor = ArgumentCaptor.forClass(KeyEvent.class); + ArgumentCaptor displayIdCaptor = ArgumentCaptor.forClass(Integer.class); + mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, false); + mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_UP, false); + verify(mockSystemUiProxy, times(2)).onBackEvent(keyEventCaptor.capture(), + displayIdCaptor.capture()); + verifyKeyEvent(keyEventCaptor.getAllValues().getFirst(), KeyEvent.ACTION_DOWN, false); + verifyKeyEvent(keyEventCaptor.getAllValues().getLast(), KeyEvent.ACTION_UP, false); + assertTrue(displayIdCaptor.getAllValues().stream().allMatch(v -> v == DISPLAY_ID)); + } + + @Test + public void testPredictiveBackCancelled() { + ArgumentCaptor keyEventCaptor = ArgumentCaptor.forClass(KeyEvent.class); + ArgumentCaptor displayIdCaptor = ArgumentCaptor.forClass(Integer.class); + mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, false); + mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_UP, true); + verify(mockSystemUiProxy, times(2)).onBackEvent(keyEventCaptor.capture(), + displayIdCaptor.capture()); + verifyKeyEvent(keyEventCaptor.getAllValues().getFirst(), KeyEvent.ACTION_DOWN, false); + verifyKeyEvent(keyEventCaptor.getAllValues().getLast(), KeyEvent.ACTION_UP, true); + assertTrue(displayIdCaptor.getAllValues().stream().allMatch(v -> v == DISPLAY_ID)); + } + + @Test + public void testButtonsDisabledWhileBackPressed() { + mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, false); + mNavButtonController.onButtonClick(BUTTON_HOME, mockView); + mNavButtonController.onButtonClick(BUTTON_RECENTS, mockView); + mNavButtonController.onButtonLongClick(BUTTON_A11Y, mockView); + mNavButtonController.onButtonClick(BUTTON_IME_SWITCH, mockView); + mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_UP, false); + assertThat(mHomePressCount).isEqualTo(0); + verify(mockSystemUiProxy, never()).notifyAccessibilityButtonLongClicked(); + assertThat(mOverviewToggleCount).isEqualTo(0); + verify(mockSystemUiProxy, never()).onImeSwitcherPressed(); + } + + @Test + public void testOnRecentsButtonLayoutChanged() { + Rect rect = new Rect(10, 20, 30, 40); + mNavButtonController.onRecentsButtonLayoutChanged(rect); + verify(mockSystemUiProxy).notifyRecentsButtonPositionChanged(eq(rect)); + } + + private void verifyKeyEvent(KeyEvent keyEvent, int action, boolean isCancelled) { + assertEquals(isCancelled, keyEvent.isCanceled()); + assertEquals(action, keyEvent.getAction()); + } } diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt new file mode 100644 index 00000000000..2c2caf3de27 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt @@ -0,0 +1,916 @@ +/* + * 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.launcher3.taskbar + +import android.animation.AnimatorTestRule +import android.app.WindowConfiguration +import android.content.ComponentName +import android.content.Intent +import android.os.Process +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.window.RemoteTransition +import androidx.test.core.app.ApplicationProvider +import com.android.launcher3.BubbleTextView +import com.android.launcher3.Flags.FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR +import com.android.launcher3.R +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.dagger.LauncherComponentProvider.appComponent +import com.android.launcher3.model.BgDataModel +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.TaskItemInfo +import com.android.launcher3.model.data.WorkspaceData +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.popup.SystemShortcut +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.TaskbarIconType.ALL_APPS +import com.android.launcher3.taskbar.TaskbarIconType.HOTSEAT +import com.android.launcher3.taskbar.TaskbarIconType.OVERFLOW +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatItems +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController +import com.android.launcher3.taskbar.rules.AllTaskbarSandboxModules +import com.android.launcher3.taskbar.rules.MockedRecentsModelHelper +import com.android.launcher3.taskbar.rules.MockedRecentsModelTestRule +import com.android.launcher3.taskbar.rules.SandboxParams +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.PINNED +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarSandboxComponent +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.launcher3.util.Preconditions.assertNotNull +import com.android.launcher3.util.TestUtil.getOnUiThread +import com.android.quickstep.RecentsModel +import com.android.quickstep.SystemUiProxy +import com.android.quickstep.util.DesktopTask +import com.android.quickstep.util.GroupTask +import com.android.quickstep.util.SingleTask +import com.android.quickstep.util.SingleTask.Companion.createTaskItemInfo +import com.android.quickstep.util.SlideInRemoteTransition +import com.android.systemui.shared.recents.model.Task +import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE +import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS +import com.android.window.flags.Flags.FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS +import com.android.window.flags.Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU +import com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_OVERFLOW +import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_BAR +import com.android.wm.shell.desktopmode.IDesktopTaskListener +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource +import com.google.common.truth.Truth.assertThat +import dagger.BindsInstance +import dagger.Component +import java.util.function.Predicate +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelTablet2023"]) +@EnableFlags( + FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS, + FLAG_ENABLE_DESKTOP_WINDOWING_MODE, + FLAG_ENABLE_BUBBLE_BAR, + FLAG_ENABLE_TASKBAR_OVERFLOW, +) +@DisableFlags(FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR) +class TaskbarOverflowTest { + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + + val mockRecentsModelHelper: MockedRecentsModelHelper = MockedRecentsModelHelper() + + private var systemUiProxySpy: SystemUiProxy? = null + + @get:Rule(order = 1) + val context = + TaskbarWindowSandboxContext.create( + SandboxParams( + { + spy(SystemUiProxy( + ApplicationProvider.getApplicationContext(), + MAIN_EXECUTOR, + UI_HELPER_EXECUTOR + )) { proxy -> + systemUiProxySpy = proxy + doAnswer { desktopTaskListener = it.getArgument(0) } + .whenever(proxy) + .setDesktopTaskListener(anyOrNull()) + } + }, + DaggerTaskbarOverflowComponent.builder() + .bindRecentsModel(mockRecentsModelHelper.mockRecentsModel), + ) + ) + + @get:Rule(order = 2) val recentsModel = MockedRecentsModelTestRule(mockRecentsModelHelper) + + @get:Rule(order = 3) val taskbarModeRule = TaskbarModeRule(context) + + @get:Rule(order = 4) val animatorTestRule = AnimatorTestRule(this) + + @get:Rule(order = 5) + val taskbarUnitTestRule = TaskbarUnitTestRule(this, context, this::onControllersInitialized) + + @InjectController lateinit var taskbarViewController: TaskbarViewController + @InjectController lateinit var recentAppsController: TaskbarRecentAppsController + @InjectController lateinit var bubbleBarViewController: BubbleBarViewController + @InjectController lateinit var bubbleStashController: BubbleStashController + @InjectController lateinit var keyboardQuickSwitchController: KeyboardQuickSwitchController + + private val desktopVisibilityController: DesktopVisibilityController + get() = DesktopVisibilityController.INSTANCE[context] + + private var desktopTaskListener: IDesktopTaskListener? = null + private val modelCallback = ModelCallbacks() + + private val taskbarContext: TaskbarActivityContext + get() = taskbarUnitTestRule.activityContext + + private var currentControllerInitCallback: () -> Unit = {} + set(value) { + runOnMainSync { value.invoke() } + field = value + } + + private fun onControllersInitialized() { + runOnMainSync { + if (!recentAppsController.canShowRunningApps) { + recentAppsController.onDestroy() + recentAppsController.canShowRunningApps = true + recentAppsController.init( + taskbarUnitTestRule.activityContext.controllers, + emptyList(), + ) + } + + currentControllerInitCallback.invoke() + } + } + + @Before + fun ensureRunningAppsShowing() { + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + runOnMainSync { recentsModel.resolvePendingTaskRequests() } + } + + @Test + @TaskbarMode(PINNED) + fun testTaskbarWithMaxNumIcons_pinned() { + addRunningAppsAndVerifyOverflowState(0) + + assertThat(taskbarIconsCentered).isTrue() + assertThat(taskbarEndMargin).isAtLeast(navButtonEndSpacing) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testTaskbarWithMaxNumIcons_transient() { + addRunningAppsAndVerifyOverflowState(0) + + assertThat(taskbarIconsCentered).isTrue() + assertThat(taskbarEndMargin).isAtLeast(navButtonEndSpacing) + } + + @Test + @TaskbarMode(PINNED) + fun testOverflownTaskbar_pinned() { + addRunningAppsAndVerifyOverflowState(5) + + assertThat(taskbarIconsCentered).isTrue() + assertThat(taskbarEndMargin).isAtLeast(navButtonEndSpacing) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testOverflownTaskbar_transient() { + addRunningAppsAndVerifyOverflowState(5) + + assertThat(taskbarIconsCentered).isTrue() + assertThat(taskbarEndMargin).isAtLeast(navButtonEndSpacing) + } + + @Test + @TaskbarMode(PINNED) + fun testOverflownTaskbarWithNoSpaceForRecentApps_pinned() { + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + + // Create two "recent" desktop tasks, and then add enough hotseat items so the taskbar + // reaches max number of items with hotseat item icons, all apps and divider icons only. + // I.e. so all desktop tasks are in taskbar overflow. + createDesktopTask(2) + runOnMainSync { + val taskbarView: TaskbarView = + taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + taskbarView.updateItems( + createHotseatItems(maxNumberOfTaskbarIcons - initialIconCount), + recentAppsController.shownTasks, + emptyList(), + ) + } + + // Verify that taskbar overflow view is shown (eventhough it exceeds max taskbar icons). + assertThat(currentNumberOfTaskbarIcons).isEqualTo(maxNumberOfTaskbarIcons + 1) + assertThat(taskbarOverflowIconIndex).isEqualTo(maxNumberOfTaskbarIcons) + assertThat(overflowItems).containsExactlyElementsIn(0..1) + } + + @Test + @TaskbarMode(PINNED) + fun testOverflownTaskbarWithNoSpaceForRecentApps_singleRecent_pinned() { + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + + // Create a "recent" desktop task, and then add enough hotseat items so the taskbar + // reaches max number of items with hotseat item icons, all apps and divider icons only. + // I.e. so the single desktop tasks is in taskbar overflow. + createDesktopTask(1) + runOnMainSync { + val taskbarView: TaskbarView = + taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + val hotseatItems = createHotseatItems(maxNumberOfTaskbarIcons - initialIconCount) + + taskbarView.updateItems( + recentAppsController.updateHotseatItemInfos(hotseatItems as Array), + recentAppsController.shownTasks, + emptyList(), + ) + } + + // Verify that recent task is shown (eventhough it exceeds max taskbar icons), and that + // the taskbar overflow view is not added for the single recent app. + assertThat(currentNumberOfTaskbarIcons).isEqualTo(maxNumberOfTaskbarIcons + 1) + assertThat(taskbarOverflowIconIndex).isEqualTo(-1) + } + + @Test + @TaskbarMode(PINNED) + fun testBubbleBarReducesTaskbarMaxNumIcons_pinned() { + var initialMaxNumIconViews = maxNumberOfTaskbarIcons + assertThat(initialMaxNumIconViews).isGreaterThan(0) + + currentControllerInitCallback = { bubbleBarViewController.setHiddenForBubbles(false) } + + val maxNumIconViews = addRunningAppsAndVerifyOverflowState(2) + assertThat(maxNumIconViews).isLessThan(initialMaxNumIconViews) + + assertThat(taskbarIconsCentered).isTrue() + } + + @Test + @TaskbarMode(PINNED) + @EnableFlags(FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS) + fun testTaskbarWithPinAppsOverflow_pinned() { + val numHotseatIcons = taskbarContext.deviceProfile.numShownHotseatIcons + + val taskbarView = getOnUiThread { + val view = taskbarContext.dragLayer.findViewById(R.id.taskbar_view) + view.updateItems(createHotseatItems(numHotseatIcons + 2), emptyList(), emptyList()) + view + } + + TaskbarViewTestUtil.assertThat(taskbarView) + .hasIconTypes(ALL_APPS, *HOTSEAT * (numHotseatIcons - 1), OVERFLOW) + assertThat(taskbarOverflowIconIndex).isEqualTo(numHotseatIcons) + assertThat(overflowItems) + .containsExactlyElementsIn(numHotseatIcons - 1..numHotseatIcons + 1) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testBubbleBarReducesTaskbarMaxNumIcons_transient() { + var initialMaxNumIconViews = maxNumberOfTaskbarIcons + assertThat(initialMaxNumIconViews).isGreaterThan(0) + + currentControllerInitCallback = { bubbleBarViewController.setHiddenForBubbles(false) } + + val maxNumIconViews = addRunningAppsAndVerifyOverflowState(2) + assertThat(maxNumIconViews).isLessThan(initialMaxNumIconViews) + + assertThat(taskbarIconsCentered).isTrue() + assertThat(taskbarEndMargin) + .isAtLeast( + navButtonEndSpacing + + bubbleBarViewController.collapsedWidthWithMaxVisibleBubbles.toInt() + ) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testBubbleBarReducesTaskbarMaxNumIcons_transientBubbleInitiallyStashed() { + var initialMaxNumIconViews = maxNumberOfTaskbarIcons + assertThat(initialMaxNumIconViews).isGreaterThan(0) + currentControllerInitCallback = { + bubbleStashController.stashBubbleBarImmediate() + bubbleBarViewController.setHiddenForBubbles(false) + } + + val maxNumIconViews = addRunningAppsAndVerifyOverflowState(2) + assertThat(maxNumIconViews).isLessThan(initialMaxNumIconViews) + + assertThat(taskbarIconsCentered).isTrue() + assertThat(taskbarEndMargin) + .isAtLeast( + navButtonEndSpacing + + bubbleBarViewController.collapsedWidthWithMaxVisibleBubbles.toInt() + ) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testStashingBubbleBarMaintainsMaxNumIcons_transient() { + currentControllerInitCallback = { bubbleBarViewController.setHiddenForBubbles(false) } + + val initialNumIcons = currentNumberOfTaskbarIcons + val maxNumIconViews = addRunningAppsAndVerifyOverflowState(2) + + runOnMainSync { bubbleStashController.stashBubbleBarImmediate() } + assertThat(maxNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(currentNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(taskbarOverflowIconIndex).isEqualTo(initialNumIcons.coerceAtLeast(2)) + } + + @Test + @TaskbarMode(PINNED) + fun testHidingBubbleBarIncreasesMaxNumIcons_pinned() { + currentControllerInitCallback = { bubbleBarViewController.setHiddenForBubbles(false) } + + val initialNumIcons = currentNumberOfTaskbarIcons + val initialMaxNumIconViews = addRunningAppsAndVerifyOverflowState(5) + + currentControllerInitCallback = { bubbleBarViewController.setHiddenForBubbles(true) } + runOnMainSync { animatorTestRule.advanceTimeBy(150) } + + val maxNumIconViews = maxNumberOfTaskbarIcons + assertThat(maxNumIconViews).isGreaterThan(initialMaxNumIconViews) + assertThat(currentNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(taskbarOverflowIconIndex).isEqualTo(initialNumIcons.coerceAtLeast(2)) + + assertThat(taskbarIconsCentered).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testHidingBubbleBarIncreasesMaxNumIcons_transient() { + currentControllerInitCallback = { bubbleBarViewController.setHiddenForBubbles(false) } + + val initialNumIcons = currentNumberOfTaskbarIcons + val initialMaxNumIconViews = addRunningAppsAndVerifyOverflowState(5) + + currentControllerInitCallback = { bubbleBarViewController.setHiddenForBubbles(true) } + runOnMainSync { animatorTestRule.advanceTimeBy(150) } + + val maxNumIconViews = maxNumberOfTaskbarIcons + assertThat(maxNumIconViews).isGreaterThan(initialMaxNumIconViews) + assertThat(currentNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(taskbarOverflowIconIndex).isEqualTo(initialNumIcons.coerceAtLeast(2)) + + assertThat(taskbarIconsCentered).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testPressingOverflowButtonOpensKeyboardQuickSwitch() { + val maxNumIconViews = maxNumberOfTaskbarIcons + // Assume there are at least all apps and divider icon, as they would appear once running + // apps are added, even if not present initially. + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + + val targetOverflowSize = 5 + val createdTasks = maxNumIconViews - initialIconCount + targetOverflowSize + createDesktopTask(createdTasks) + + assertThat(taskbarOverflowIconIndex).isEqualTo(initialIconCount) + assertThat(getOverflowIconTooltipText()).isEqualTo("Other recent apps") + + tapOverflowIcon() + // Keyboard quick switch view is shown only after list of recent task is asynchronously + // retrieved from the recents model. + runOnMainSync { recentsModel.resolvePendingTaskRequests() } + + assertThat(getOnUiThread { keyboardQuickSwitchController.isShownFromTaskbar }).isTrue() + assertThat(getOnUiThread { keyboardQuickSwitchController.shownTaskIds() }) + .containsExactlyElementsIn(0..targetOverflowSize) + assertThat(getOverflowIconTooltipText()).isNull() + + tapOverflowIcon() + assertThat(keyboardQuickSwitchController.isShown).isFalse() + assertThat(getOverflowIconTooltipText()).isEqualTo("Other recent apps") + } + + @Test + @TaskbarMode(PINNED) + fun testKeyboardQuickSwitchLaunchesTaskAsDesktopApp() { + val maxNumIconViews = maxNumberOfTaskbarIcons + // Assume there are at least all apps and divider icon, as they would appear once running + // apps are added, even if not present initially. + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + + val targetOverflowSize = 5 + val createdTasks = maxNumIconViews - initialIconCount + targetOverflowSize + createDesktopTask(createdTasks) + + assertThat(taskbarOverflowIconIndex).isEqualTo(initialIconCount) + + tapOverflowIcon() + // Keyboard quick switch view is shown only after list of recent task is asynchronously + // retrieved from the recents model. + runOnMainSync { recentsModel.resolvePendingTaskRequests() } + + assertThat(getOnUiThread { keyboardQuickSwitchController.isShownFromTaskbar }).isTrue() + assertThat(getOnUiThread { keyboardQuickSwitchController.shownTaskIds() }) + .containsExactlyElementsIn(0..targetOverflowSize) + + runOnMainSync { keyboardQuickSwitchController.launchFocusedTask() } + + // `keyboardQuickSwitchController.launchFocusedTask()` will post a task to activate target + // desk to `UI_HELPER_EXECUTOR`. Flush the executor to make sure the task runs before + // verifying mocks. + UI_HELPER_EXECUTOR.submit { null }.get() + + val deskIdCaptor = argumentCaptor() + val taskIdCaptor = argumentCaptor() + val transitionCaptor = argumentCaptor() + val transitionSource = argumentCaptor() + verify(systemUiProxySpy) + ?.activateDesk( + deskIdCaptor.capture(), + transitionCaptor.capture(), + taskIdCaptor.capture(), + transitionSource.capture(), + ) + assertThat(deskIdCaptor.firstValue).isEqualTo(0) + assertThat(taskIdCaptor.firstValue).isEqualTo(0) + assertThat(transitionCaptor.firstValue.remoteTransition) + .isInstanceOf(SlideInRemoteTransition::class.java) + assertThat(transitionSource.firstValue) + .isEqualTo(DesktopModeTransitionSource.KEYBOARD_SHORTCUT) + } + + @Test + @TaskbarMode(PINNED) + fun testHotseatItemTasksNotShownInRecents() { + val maxNumIconViews = maxNumberOfTaskbarIcons + // Assume there are at least all apps and divider icon, as they would appear once running + // apps are added, even if not present initially. + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + val hotseatItems = createHotseatItems(1) + + val targetOverflowSize = 5 + val createdTasks = maxNumIconViews - initialIconCount + targetOverflowSize + createDesktopTaskWithTasksFromPackages( + listOf("fake") + + listOf(hotseatItems[0]?.targetPackage ?: "") + + List(createdTasks - 2) { "fake" } + ) + + runOnMainSync { + val taskbarView: TaskbarView = + taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + taskbarView.updateItems( + recentAppsController.updateHotseatItemInfos(hotseatItems as Array), + recentAppsController.shownTasks, + emptyList(), + ) + } + + assertThat(maxNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(currentNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(taskbarOverflowIconIndex).isEqualTo(initialIconCount + hotseatItems.size) + assertThat(overflowItems) + .containsExactlyElementsIn(listOf(0) + (2..targetOverflowSize + 1).toList()) + } + + @Test + @TaskbarMode(PINNED) + fun testHotseatItemTasksNotShownInKQS() { + val maxNumIconViews = maxNumberOfTaskbarIcons + // Assume there are at least all apps and divider icon, as they would appear once running + // apps are added, even if not present initially. + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + val hotseatItems = createHotseatItems(1) + + val targetOverflowSize = 5 + val createdTasks = maxNumIconViews - initialIconCount + targetOverflowSize + createDesktopTaskWithTasksFromPackages( + listOf("fake") + + listOf(hotseatItems[0]?.targetPackage ?: "") + + List(createdTasks - 2) { "fake" } + ) + + runOnMainSync { + val taskbarView: TaskbarView = + taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + taskbarView.updateItems( + recentAppsController.updateHotseatItemInfos(hotseatItems as Array), + recentAppsController.shownTasks, + emptyList(), + ) + } + + tapOverflowIcon() + // Keyboard quick switch view is shown only after list of recent task is asynchronously + // retrieved from the recents model. + runOnMainSync { recentsModel.resolvePendingTaskRequests() } + + assertThat(getOnUiThread { keyboardQuickSwitchController.isShownFromTaskbar }).isTrue() + assertThat(getOnUiThread { keyboardQuickSwitchController.shownTaskIds() }) + .containsExactlyElementsIn(listOf(0) + (2..targetOverflowSize + 1).toList()) + } + + @Test + @TaskbarMode(PINNED) + fun testLimitMaxTaskbarIcons() { + val maxNumIconViews = maxNumberOfTaskbarIcons + createDesktopTask(5) + + runOnMainSync { taskbarUnitTestRule.activityContext.limitMaxTaskbarIconsNum(4) } + assertThat(maxNumberOfTaskbarIcons).isAtMost(4) + assertThat(currentNumberOfTaskbarIcons).isAtMost(4) + + runOnMainSync { taskbarUnitTestRule.activityContext.limitMaxTaskbarIconsNum(-1) } + assertThat(maxNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(currentNumberOfTaskbarIcons).isGreaterThan(4) + } + + @Test + @TaskbarMode(PINNED) + fun testFullscreenTasksNotShownInKQS() { + val maxNumIconViews = maxNumberOfTaskbarIcons + // Assume there are at least all apps and divider icon, as they would appear once running + // apps are added, even if not present initially. + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + val hotseatItems = createHotseatItems(1) + + val targetOverflowSize = 5 + val createdTasks = maxNumIconViews - initialIconCount + targetOverflowSize + createFullscreenAndDesktopTasksFromPackages( + listOf("fakeFullscreen"), + listOf("fake") + + listOf(hotseatItems[0]?.targetPackage ?: "") + + List(createdTasks - 2) { "fake" }, + ) + + runOnMainSync { + val taskbarView: TaskbarView = + taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + taskbarView.updateItems( + recentAppsController.updateHotseatItemInfos(hotseatItems as Array), + recentAppsController.shownTasks, + emptyList(), + ) + } + + tapOverflowIcon() + // Keyboard quick switch view is shown only after list of recent task is asynchronously + // retrieved from the recents model. + runOnMainSync { recentsModel.resolvePendingTaskRequests() } + + assertThat(getOnUiThread { keyboardQuickSwitchController.isShownFromTaskbar }).isTrue() + // Taskbar is in overflow by `targetOverflowSize`, so overflow UI should have + // `targetOverflowSize + 1` items, to account for a spot in taskbar taken by the overflow + // icon. Task IDs for running desktop apps start at 1 - 0 is used for fullscreen task. + assertThat(getOnUiThread { keyboardQuickSwitchController.shownTaskIds() }) + .containsExactlyElementsIn(listOf(1) + (3..targetOverflowSize + 2).toList()) + } + + @Test + @TaskbarMode(PINNED) + @EnableFlags(FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU) + fun pinToTaskbarShortcut_unpinPinnedItem() { + // Create two tasks and two pinned items. + createDesktopTask(2) + val hotseatItems = createHotseatItems(2) + var shortcut: SystemShortcut<*>? = null + var hotseatIcon: BubbleTextView? = null + runOnMainSync { + val taskbarView = setUpTaskbarAndModelCallback(hotseatItems) + hotseatIcon = + taskbarView.iconViews.filterIsInstance().first { + it.tag is WorkspaceItemInfo + } + shortcut = + taskbarContext.controllers.taskbarPopupController.createPinShortcut( + taskbarContext, + hotseatIcon!!.tag as ItemInfo, + hotseatIcon, + ) as SystemShortcut<*> + } + assertNotNull(shortcut) + runOnMainSync { shortcut?.onClick(hotseatIcon) } + // After unpinning the first item, only the second app is left. + assertThat(modelCallback.hotseatItems.map { info -> info.title }) + .isEqualTo(listOf("Test App 1")) + // The unpinned app doesn't have a task so the shown tasks won't change. + assertThat(recentAppsController.shownTasks.map { it.tasks[0].key.id }) + .isEqualTo(listOf(0, 1)) + } + + @Test + @TaskbarMode(PINNED) + @EnableFlags(FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU) + fun pinToTaskbarShortcut_unpinPinnedItemWithTask() { + // Create two hotseat items with a task for both of them respectively. + var hotseatItems = + createHotseatItems(2).mapIndexed { idx, item -> TaskItemInfo(idx, item) }.toTypedArray() + createDesktopTaskWithTasksFromPackages(hotseatItems.mapNotNull { it.targetPackage }) + var shortcut: SystemShortcut<*>? = null + var hotseatIcon: BubbleTextView? = null + runOnMainSync { + val taskbarView = setUpTaskbarAndModelCallback(hotseatItems.map { it }.toTypedArray()) + hotseatIcon = + taskbarView.iconViews.filterIsInstance().first { + it.tag is WorkspaceItemInfo + } + shortcut = + taskbarContext.controllers.taskbarPopupController.createPinShortcut( + taskbarContext, + hotseatIcon!!.tag as ItemInfo, + hotseatIcon, + ) as SystemShortcut<*> + } + // Before unpinning the app, both of the apps should be pinned and no shown task available. + assertThat(modelCallback.hotseatItems.map { info -> info.title }) + .isEqualTo(listOf("Test App 0", "Test App 1")) + assertThat(recentAppsController.shownTasks.map { it.tasks[0].key.id }) + .isEqualTo(emptyList()) + assertNotNull(shortcut) + runOnMainSync { shortcut?.onClick(hotseatIcon) } + // After unpinning the app, app 0 is removed and its task is shown as a recent task. + assertThat(modelCallback.hotseatItems.map { info -> info.title }) + .isEqualTo(listOf("Test App 1")) + assertThat(recentAppsController.shownTasks.map { it.tasks[0].key.id }).isEqualTo(listOf(0)) + } + + @Test + @TaskbarMode(PINNED) + @EnableFlags(FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU) + fun pinToTaskbarShortcut_pinRecentTask() { + // Create two tasks and two pinned items. + createDesktopTask(2) + val hotseatItems = createHotseatItems(2) + + var shortcut: SystemShortcut<*>? = null + var recentTaskIcon: BubbleTextView? = null + runOnMainSync { + val taskbarView = setUpTaskbarAndModelCallback(hotseatItems) + // Get the first recent task icon + recentTaskIcon = + taskbarView.iconViews.filterIsInstance().first { + it.tag is GroupTask + } + val recentTaskInfo = + createTaskItemInfo( + recentTaskIcon!!.tag as SingleTask, + WorkspaceItemInfo().apply { + title = "Test App 2" + intent = Intent().apply { `package` = "fake" } + }, + ) + shortcut = + taskbarContext.controllers.taskbarPopupController.createPinShortcut( + taskbarContext, + recentTaskInfo, + recentTaskIcon, + ) as SystemShortcut<*> + } + assertNotNull(shortcut) + runOnMainSync { shortcut?.onClick(recentTaskIcon) } + + // After pinning the recent task, it should be included in the hotseat items. + assertThat(modelCallback.hotseatItems.map { info -> info.title }) + .isEqualTo(listOf("Test App 0", "Test App 1", "Test App 2")) + // As the task is pinned, the shown tasks should remove it from the list + assertThat(recentAppsController.shownTasks.map { it.tasks[0].key.id }).isEqualTo(listOf(1)) + } + + private fun setUpTaskbarAndModelCallback(hotseatItems: Array): TaskbarView { + val taskbarView: TaskbarView = + taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + taskbarView.updateItems(hotseatItems, recentAppsController.shownTasks, emptyList()) + modelCallback.recentAppsController = recentAppsController + context.baseContext.appComponent.launcherAppState.model.addCallbacks(modelCallback) + modelCallback.bindItemsAdded(hotseatItems.toList()) + return taskbarView + } + + private fun createDesktopTask(tasksToAdd: Int) { + createDesktopTaskWithTasksFromPackages((0..) { + createFullscreenAndDesktopTasksFromPackages(emptyList(), packages) + } + + private fun createFullscreenAndDesktopTasksFromPackages( + fullscreenPackages: List, + desktopPackages: List, + ) { + val defaultDisplayId = context.displayId + val tasks: List = + fullscreenPackages.mapIndexed({ index, p -> + SingleTask( + Task( + Task.TaskKey( + index, + WindowConfiguration.WINDOWING_MODE_FULLSCREEN, + Intent().apply { `package` = p }, + ComponentName(p, ""), + Process.myUserHandle().identifier, + 2000, + ) + ) + ) + }) + + val desktopTasks = + desktopPackages.mapIndexed({ index, p -> + Task( + Task.TaskKey( + index + fullscreenPackages.size, + WindowConfiguration.WINDOWING_MODE_FREEFORM, + Intent().apply { `package` = p }, + ComponentName(p, ""), + Process.myUserHandle().identifier, + 2000, + ) + ) + }) + + recentsModel.updateRecentTasks( + tasks + listOf(DesktopTask(deskId = 0, defaultDisplayId, desktopTasks)) + ) + for (task in 1..desktopTasks.size) { + desktopTaskListener?.onTasksVisibilityChanged(defaultDisplayId, task) + } + runOnMainSync { recentsModel.resolvePendingTaskRequests() } + } + + private val navButtonEndSpacing: Int + get() { + return taskbarUnitTestRule.activityContext.resources.getDimensionPixelSize( + taskbarUnitTestRule.activityContext.deviceProfile.inv.inlineNavButtonsEndSpacing + ) + } + + private val taskbarOverflowIconIndex: Int + get() { + return getOnUiThread { + taskbarViewController.iconViews.indexOfFirst { it is TaskbarOverflowView } + } + } + + private val maxNumberOfTaskbarIcons: Int + get() = getOnUiThread { taskbarViewController.maxNumIconViews } + + private val currentNumberOfTaskbarIcons: Int + get() = getOnUiThread { taskbarViewController.iconViews.size } + + private val taskbarIconsCentered: Boolean + get() { + return getOnUiThread { + val iconLayoutBounds = + taskbarViewController.transientTaskbarIconLayoutBoundsInParent + val availableWidth = + taskbarUnitTestRule.activityContext.deviceProfile.deviceProperties.widthPx + iconLayoutBounds.left - (availableWidth - iconLayoutBounds.right) < 2 + } + } + + private val taskbarEndMargin: Int + get() { + return getOnUiThread { + taskbarUnitTestRule.activityContext.deviceProfile.deviceProperties.widthPx - + taskbarViewController.transientTaskbarIconLayoutBoundsInParent.right + } + } + + private val overflowItems: List + get() { + return getOnUiThread { + val overflowIcon = + taskbarViewController.iconViews.firstOrNull { it is TaskbarOverflowView } + + if (overflowIcon is TaskbarOverflowView) { + overflowIcon.itemIds + } else { + emptyList() + } + } + } + + private fun tapOverflowIcon() { + runOnMainSync { + val overflowIcon = + taskbarViewController.iconViews.firstOrNull { it is TaskbarOverflowView } + assertThat(overflowIcon?.callOnClick()).isTrue() + } + } + + private fun getOverflowIconTooltipText(): String? { + return getOnUiThread { + val overflowIcon = + taskbarViewController.iconViews.firstOrNull { it is TaskbarOverflowView } + (overflowIcon as? TaskbarOverflowView)?.getTextForTooltipPopup() + } + } + + /** + * Adds enough running apps for taskbar to enter overflow of `targetOverflowSize`, and verifies + * * max number of icons in the taskbar remains unchanged + * * number of icons in the taskbar is at most max number of icons + * * whether the taskbar overflow icon is shown, and its position in taskbar. + * + * Returns max number of icons. + */ + private fun addRunningAppsAndVerifyOverflowState(targetOverflowSize: Int): Int { + val maxNumIconViews = maxNumberOfTaskbarIcons + assertThat(maxNumIconViews).isGreaterThan(0) + // Assume there are at least all apps and divider icon, as they would appear once running + // apps are added, even if not present initially. + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + assertThat(initialIconCount).isLessThan(maxNumIconViews) + + createDesktopTask(maxNumIconViews - initialIconCount + targetOverflowSize) + + assertThat(maxNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(currentNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(taskbarOverflowIconIndex) + .isEqualTo(if (targetOverflowSize > 0) initialIconCount else -1) + if (targetOverflowSize > 0) { + assertThat(overflowItems).containsExactlyElementsIn(0..targetOverflowSize) + } + return maxNumIconViews + } + + private class ModelCallbacks : BgDataModel.Callbacks { + var hotseatItems = mutableListOf() + var recentAppsController: TaskbarRecentAppsController? = null + + override fun bindCompleteModel(itemIdMap: WorkspaceData, isBindingSync: Boolean) = + bindItemsAdded(itemIdMap.toList()) + + override fun bindItemsAdded(items: List) { + runOnMainSync { + items + .filter { item -> + item is WorkspaceItemInfo && + !hotseatItems.any { it.targetPackage == item.targetPackage } + } + .forEach { item -> hotseatItems.add(item as WorkspaceItemInfo) } + recentAppsController?.updateHotseatItemInfos(hotseatItems.toTypedArray()) + } + } + + override fun bindWorkspaceComponentsRemoved(matcher: Predicate) { + runOnMainSync { + for (i in hotseatItems.size - 1 downTo 0) { + if (matcher.test(hotseatItems[i])) { + hotseatItems.removeAt(i) + } + } + recentAppsController?.updateHotseatItemInfos(hotseatItems.toTypedArray()) + } + } + } +} + +/** TaskbarOverflowComponent used to bind the RecentsModel. */ +@LauncherAppSingleton +@Component(modules = [AllTaskbarSandboxModules::class]) +interface TaskbarOverflowComponent : TaskbarSandboxComponent { + + @Component.Builder + interface Builder : TaskbarSandboxComponent.Builder { + @BindsInstance fun bindRecentsModel(model: RecentsModel): Builder + + override fun build(): TaskbarOverflowComponent + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPinningControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPinningControllerTest.kt new file mode 100644 index 00000000000..0d26d2c9fba --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPinningControllerTest.kt @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.animation.AnimatorTestRule +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_PINNING_POPUP +import com.android.launcher3.R +import com.android.launcher3.popup.ArrowPopup.OPEN_DURATION_U +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatItems +import com.android.launcher3.taskbar.customization.TaskbarDividerContainer +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +class TaskbarPinningControllerTest { + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + @get:Rule(order = 2) val animatorTestRule = AnimatorTestRule(this) + + @InjectController lateinit var pinningController: TaskbarPinningController + + private val taskbarContext: TaskbarActivityContext + get() = taskbarUnitTestRule.activityContext + + private lateinit var taskbarView: TaskbarView + private lateinit var dividerIcon: TaskbarDividerContainer + + @Before + fun setup() { + taskbarContext.controllers.uiController.init(taskbarContext.controllers) + runOnMainSync { taskbarView = taskbarContext.dragLayer.findViewById(R.id.taskbar_view) } + + runOnMainSync { + taskbarView.updateItems(createHotseatItems(1), emptyList(), emptyList()) + dividerIcon = requireNotNull(taskbarView.taskbarDividerViewContainer) + } + } + + @Test + fun showPinningView() { + assertThat(hasPinningPopUp).isFalse() + runOnMainSync { pinningController.showPinningView(dividerIcon) } + runOnMainSync { + // Animation has started. Advance to end of animation. + animatorTestRule.advanceTimeBy(OPEN_DURATION_U.toLong()) + } + assertThat(hasPinningPopUp).isTrue() + } + + private val hasPinningPopUp: Boolean + get() { + return AbstractFloatingView.hasOpenView(taskbarContext, TYPE_TASKBAR_PINNING_POPUP) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPopupControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPopupControllerTest.kt new file mode 100644 index 00000000000..4757fdf9862 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPopupControllerTest.kt @@ -0,0 +1,178 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.content.ComponentName +import android.content.Intent +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.util.SparseArray +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.BubbleTextView +import com.android.launcher3.Flags.FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR +import com.android.launcher3.LauncherSettings +import com.android.launcher3.R +import com.android.launcher3.model.data.AppInfo +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatWorkspaceItem +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createRecents +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createTestWorkspaceItem +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.quickstep.util.GroupTask +import com.android.window.flags2.Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU +import com.google.common.truth.Truth.assertThat +import org.junit.Assert +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.whenever + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +@DisableFlags(FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR) +class TaskbarPopupControllerTest { + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + + @get:Rule(order = 1) val context = TaskbarWindowSandboxContext.create() + + @get:Rule(order = 2) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var popupController: TaskbarPopupController + + private val taskbarContext: TaskbarActivityContext + get() = taskbarUnitTestRule.activityContext + + private val desktopVisibilityController: DesktopVisibilityController + get() = DesktopVisibilityController.INSTANCE[context] + + private lateinit var taskbarView: TaskbarView + private lateinit var hotseatIcon: BubbleTextView + private lateinit var recentTaskIcon: BubbleTextView + + @Before + fun setup() { + taskbarContext.controllers.uiController.init(taskbarContext.controllers) + runOnMainSync { taskbarView = taskbarContext.dragLayer.findViewById(R.id.taskbar_view) } + + val hotseatItems = arrayOf(createHotseatWorkspaceItem()) + popupController.setApps( + hotseatItems + .map { item -> AppInfo(item.targetComponent, item.title, item.user, item.intent) } + .toTypedArray() + ) + popupController.setTaskbarInfoList(SparseArray()) + val recentItems = createRecents(2) + runOnMainSync { + taskbarView.updateItems(hotseatItems, recentItems, emptyList()) + hotseatIcon = + taskbarView.iconViews.filterIsInstance().first { + it.tag is WorkspaceItemInfo + } + recentTaskIcon = + taskbarView.iconViews.filterIsInstance().first { + it.tag is GroupTask + } + } + } + + @Test + fun showForIcon_hotseatItem() { + assertThat(hasPopupMenu()).isFalse() + runOnMainSync { popupController.show(hotseatIcon) } + assertThat(hasPopupMenu()).isTrue() + } + + @Test + @EnableFlags(FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU) + fun showForIcon_recentTask() { + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + assertThat(hasPopupMenu()).isFalse() + runOnMainSync { popupController.show(recentTaskIcon) } + assertThat(hasPopupMenu()).isTrue() + } + + @Test + fun createPinShortcut_itemAlreadyPinned_returnsUnpinShortcut() { + val hotseatItems = SparseArray() + val appUser = android.os.Process.myUserHandle() + val appAIntent = Intent().setComponent(ComponentName("com.example.app", "AppAActivity")) + + val itemFromAllApps = + createTestWorkspaceItem( + 0, + "AppA", + appAIntent, + appUser, + LauncherSettings.Favorites.CONTAINER_ALL_APPS, + ) + + val pinnedItemInHotseat = + createTestWorkspaceItem( + 1, + "AppA", + appAIntent, + appUser, + LauncherSettings.Favorites.CONTAINER_HOTSEAT, + ) + + hotseatItems.put(0, pinnedItemInHotseat) + popupController.setTaskbarInfoList(hotseatItems) + val allAppsAppIcon = Mockito.mock(BubbleTextView::class.java) + + val shortcut = + popupController.createPinShortcut(taskbarContext, itemFromAllApps, allAppsAppIcon) + Assert.assertNotNull("Shortcut should not be null", shortcut) + Assert.assertTrue( + "Shortcut should be PinToTaskbarShortcut", + shortcut is PinToTaskbarShortcut<*>, + ) + Assert.assertFalse((shortcut as PinToTaskbarShortcut<*>).isPin) + } + + private fun hasPopupMenu(): Boolean { + return AbstractFloatingView.hasOpenView( + taskbarContext, + AbstractFloatingView.TYPE_ACTION_POPUP, + ) + } + + @Test + fun createPinShortcut_forAllAppsPredictedApp_returnsShortcut() { + val item = ItemInfo() + item.container = LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION + val shortcut = + popupController.createPinShortcut( + taskbarContext, + item, + Mockito.mock(BubbleTextView::class.java), + ) + Assert.assertNotNull( + "Pin shortcut should be available for predicted All Apps items", + shortcut, + ) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt new file mode 100644 index 00000000000..cf579c4d963 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt @@ -0,0 +1,1545 @@ +/* + * 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.launcher3.taskbar + +import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM +import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.res.Resources +import android.graphics.Rect +import android.os.Process +import android.os.UserHandle +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.annotation.UiThreadTest +import com.android.internal.R +import com.android.launcher3.BubbleTextView.RunningAppState +import com.android.launcher3.DeviceProfile +import com.android.launcher3.Flags +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION +import com.android.launcher3.graphics.ThemeManager +import com.android.launcher3.icons.IconShape +import com.android.launcher3.model.data.AppInfo +import com.android.launcher3.model.data.AppPairInfo +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.TaskItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.taskbar.TaskbarRecentAppsController.TaskState +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.MutableListenableRef +import com.android.quickstep.RecentsModel +import com.android.quickstep.RecentsModel.RecentTasksChangedListener +import com.android.quickstep.TaskIconCache +import com.android.quickstep.util.DesktopTask +import com.android.quickstep.util.GroupTask +import com.android.quickstep.util.SingleTask +import com.android.quickstep.util.SplitTask +import com.android.systemui.shared.recents.model.Task +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants +import com.google.common.truth.Truth.assertThat +import java.util.function.Consumer +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TestWatcher +import org.junit.runner.Description +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.Mock +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@UiThreadTest +@RunWith(LauncherMultivalentJUnit::class) +@EnableFlags(Flags.FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR) +class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { + + @get:Rule val setFlagsRule = SetFlagsRule() + @get:Rule + val disableControllerForCertainTestsWatcher = + object : TestWatcher() { + override fun starting(description: Description) { + // Update canShowRunningAndRecentAppsAtInit before setUp() is called for each test. + canShowRunningAndRecentAppsAtInit = + description.methodName !in + listOf("canShowRunningAndRecentAppsAtInitIsFalse_getTasksNeverCalled") + } + } + + @Mock private lateinit var mockIconCache: TaskIconCache + @Mock private lateinit var mockRecentsModel: RecentsModel + @Mock private lateinit var mockThemeManager: ThemeManager + @Mock private lateinit var mockContext: Context + @Mock private lateinit var mockResources: Resources + @Mock private lateinit var mockDeviceProfile: DeviceProfile + + private var taskListChangeId: Int = 1 + + private lateinit var recentAppsController: TaskbarRecentAppsController + private lateinit var myUserHandle: UserHandle + private val USER_HANDLE_1 = UserHandle.of(1) + private val USER_HANDLE_2 = UserHandle.of(2) + + private var canShowRunningAndRecentAppsAtInit = true + private var recentTasksChangedListener: RecentTasksChangedListener? = null + + val recentShownTasks: List + get() = recentAppsController.shownTasks.flatMap { it.tasks } + + @Before + fun setUp() { + super.setup() + myUserHandle = Process.myUserHandle() + + // Set desktop mode supported + whenever(mockContext.getResources()).thenReturn(mockResources) + whenever(mockResources.getBoolean(R.bool.config_isDesktopModeSupported)).thenReturn(true) + whenever(taskbarActivityContext.deviceProfile).thenReturn(mockDeviceProfile) + mockDeviceProfile.isTaskbarPresent = true + + whenever(mockRecentsModel.iconCache).thenReturn(mockIconCache) + whenever(mockRecentsModel.unregisterRecentTasksChangedListener(any())).then { + recentTasksChangedListener = null + it + } + whenever(mockThemeManager.iconShapeData).thenReturn(MutableListenableRef(IconShape.EMPTY)) + whenever(taskbarDesktopModeController.isLauncherAnimationRunning).thenReturn(false) + recentAppsController = + TaskbarRecentAppsController(mockContext, mockRecentsModel, mockThemeManager) + recentAppsController.canShowRunningApps = canShowRunningAndRecentAppsAtInit + recentAppsController.canShowRecentApps = canShowRunningAndRecentAppsAtInit + + // To ensure the initial getTasks() call is not seen as "loading" for the rest of the test, + // execute its callback. + doAnswer { + val callback: Consumer> = it.getArgument(1) + callback.accept(arrayListOf()) + taskListChangeId + } + .whenever(mockRecentsModel) + .getTasks(any(), any>>()) + recentAppsController.init(taskbarControllers, emptyList()) + taskbarControllers.onPostInit() + + recentTasksChangedListener = + if (canShowRunningAndRecentAppsAtInit) { + val listenerCaptor = ArgumentCaptor.forClass(RecentTasksChangedListener::class.java) + verify(mockRecentsModel) + .registerRecentTasksChangedListener(listenerCaptor.capture()) + listenerCaptor.value + } else { + verify(mockRecentsModel, never()).registerRecentTasksChangedListener(any()) + null + } + + // Make sure updateHotseatItemInfos() is called after commitRunningAppsToUI() + whenever(taskbarViewController.commitRunningAppsToUI()).then { + recentAppsController.updateHotseatItemInfos( + recentAppsController.shownHotseatItems.toTypedArray() + ) + } + } + + // See the TestWatcher rule at the top which sets canShowRunningAndRecentAppsAtInit = false. + @Test + fun canShowRunningAndRecentAppsAtInitIsFalse_getTasksNeverCalled() { + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2), + runningTasks = listOf(createTask(1, RUNNING_APP_PACKAGE_1)), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + verify(mockRecentsModel, never()).getTasks(any(), any>>()) + } + + @Test + fun canShowRunningAndRecentAppsIsFalseAfterInit_getTasksOnlyCalledInInit() { + // getTasks() should have been called once from init(). + verify(mockRecentsModel, times(1)).getTasks(any(), any>>()) + recentAppsController.canShowRunningApps = false + recentAppsController.canShowRecentApps = false + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2), + runningTasks = listOf(createTask(1, RUNNING_APP_PACKAGE_1)), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + // Verify that getTasks() was not called again after the init(). + verify(mockRecentsModel, times(1)).getTasks(any(), any>>()) + } + + @Test + @EnableFlags(com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) + fun recentTasksChanged_duringGetTasksLoading_dontCallGetTasks() { + // getTasks() should have been called once from init(). + verify(mockRecentsModel, times(1)).getTasks(any(), any>>()) + // Override the mock answer for getTasks() so it doesn't call the callback immediately. + doAnswer { taskListChangeId } + .whenever(mockRecentsModel) + .getTasks(any(), any>>()) + recentTasksChangedListener?.onRecentTasksChanged() + // By not invoking the callback passed to getTasks() we here emulate getTasks() loading. + + recentTasksChangedListener?.onRecentTasksChanged() + + // getTasks() is only called two times overall (init + once more). + verify(mockRecentsModel, times(2)).getTasks(any(), any>>()) + } + + @Test + @EnableFlags(com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) + fun recentTasksChanged_duringGetTasksLoading_getTasksCalledWhenLoadingDone() { + val callbackCaptor = argumentCaptor>>() + // getTasks() should have been called once from init(). + verify(mockRecentsModel, times(1)).getTasks(any(), callbackCaptor.capture()) + // Override the mock answer for getTasks() so it doesn't call the callback immediately. + doAnswer { taskListChangeId } + .whenever(mockRecentsModel) + .getTasks(any(), any>>()) + recentTasksChangedListener?.onRecentTasksChanged() + // By not invoking the callback passed to getTasks() we here emulate getTasks() loading. + + recentTasksChangedListener?.onRecentTasksChanged() + callbackCaptor.lastValue.accept(emptyList()) + + // getTasks() is called again now that the first getTasks() call finished. + verify(mockRecentsModel, times(3)).getTasks(any(), any>>()) + } + + @Test + @DisableFlags(com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) + fun recentTasksChanged_duringGetTasksLoading_flagDisabled_callGetTasks() { + // getTasks() should have been called once from init(). + verify(mockRecentsModel, times(1)).getTasks(any(), any>>()) + // Override the mock answer for getTasks() so it doesn't call the callback immediately. + doAnswer { taskListChangeId } + .whenever(mockRecentsModel) + .getTasks(any(), any>>()) + recentTasksChangedListener?.onRecentTasksChanged() + // By not invoking the callback passed to getTasks() we here emulate getTasks() loading. + + recentTasksChangedListener?.onRecentTasksChanged() + + // getTasks() is called once per onRecentTasksChanged() invocation (and once at init) + verify(mockRecentsModel, times(3)).getTasks(any(), any>>()) + } + + @Test + @DisableFlags(com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) + fun recentTasksChanged_duringGetTasksLoading_flagDisabled_getTasksNotCalledWhenLoadingDone() { + val callbackCaptor = argumentCaptor>>() + // getTasks() should have been called once from init(). + verify(mockRecentsModel, times(1)).getTasks(any(), callbackCaptor.capture()) + // Override the mock answer for getTasks() so it doesn't call the callback immediately. + doAnswer { taskListChangeId } + .whenever(mockRecentsModel) + .getTasks(any(), any>>()) + recentTasksChangedListener?.onRecentTasksChanged() + recentTasksChangedListener?.onRecentTasksChanged() + verify(mockRecentsModel, times(3)).getTasks(any(), any>>()) + + callbackCaptor.lastValue.accept(emptyList()) + + // getTasks() is called once per onRecentTasksChanged() invocation (and once at init) + verify(mockRecentsModel, times(3)).getTasks(any(), any>>()) + } + + @Test + fun getDesktopItemState_nullItemInfo_returnsNotRunning() { + setInDesktopMode(true) + val taskState = recentAppsController.getDesktopItemState(/* itemInfo= */ null) + assertThat(taskState).isEqualTo(TaskState(RunningAppState.NOT_RUNNING)) + } + + @Test + fun getDesktopItemState_noItemPackage_returnsNotRunning() { + setInDesktopMode(true) + val taskState = recentAppsController.getDesktopItemState(ItemInfo()) + assertThat(taskState).isEqualTo(TaskState(RunningAppState.NOT_RUNNING)) + } + + @Test + fun getDesktopItemState_noMatchingTasks_returnsNotRunning() { + setInDesktopMode(true) + val taskState = recentAppsController.getDesktopItemState(createItemInfo("package")) + assertThat(taskState).isEqualTo(TaskState(RunningAppState.NOT_RUNNING)) + } + + @Test + fun getDesktopItemState_matchingVisibleTask_returnsVisible() { + setInDesktopMode(true) + val visibleTask = + PerDisplayRunningApps( + listOf(createTask(id = 1, "visiblePackage", isVisible = true)), + DEFAULT_DISPLAY, + ) + updateRecentTasks(runningTasks = listOf(visibleTask), recentTaskPackages = emptyList()) + + val taskState = recentAppsController.getDesktopItemState(createItemInfo("visiblePackage")) + + assertThat(taskState).isEqualTo(TaskState(RunningAppState.RUNNING, taskId = 1)) + } + + @Test + fun getDesktopItemState_matchingVisibleTaskOnSecondaryDisplay_returnsVisible() { + setInDesktopMode(true) + val visibleTask1 = + PerDisplayRunningApps( + listOf(createTask(id = 1, "visiblePackage1", isVisible = false)), + DEFAULT_DISPLAY, + ) + val visibleTask2 = + PerDisplayRunningApps( + listOf(createTask(id = 2, "visiblePackage2", isVisible = true)), + DEFAULT_DISPLAY + 1, + ) + updateRecentTasks( + runningTasks = listOf(visibleTask1, visibleTask2), + recentTaskPackages = emptyList(), + ) + + val taskState = recentAppsController.getDesktopItemState(createItemInfo("visiblePackage2")) + + assertThat(taskState).isEqualTo(TaskState(RunningAppState.RUNNING, taskId = 2)) + } + + @Test + fun getDesktopItemState_matchingMinimizedTask_returnsMinimized() { + setInDesktopMode(true) + val minimizedTask = + PerDisplayRunningApps( + listOf( + createTask(id = 1, "minimizedPackage", isVisible = false, isMinimized = true) + ), + DEFAULT_DISPLAY, + ) + updateRecentTasks(runningTasks = listOf(minimizedTask), recentTaskPackages = emptyList()) + + val taskState = recentAppsController.getDesktopItemState(createItemInfo("minimizedPackage")) + + assertThat(taskState).isEqualTo(TaskState(RunningAppState.MINIMIZED, taskId = 1)) + } + + @Test + fun getDesktopItemState_matchingMinimizedTaskOnSecondaryDisplay_returnsVisible() { + setInDesktopMode(true) + val visibleTask1 = + PerDisplayRunningApps( + listOf(createTask(id = 1, "visiblePackage1", isVisible = false)), + DEFAULT_DISPLAY, + ) + val visibleTask2 = + PerDisplayRunningApps( + listOf( + createTask(id = 2, "visiblePackage2", isVisible = false, isMinimized = true) + ), + DEFAULT_DISPLAY + 1, + ) + updateRecentTasks( + runningTasks = listOf(visibleTask1, visibleTask2), + recentTaskPackages = emptyList(), + ) + + val taskState = recentAppsController.getDesktopItemState(createItemInfo("visiblePackage2")) + + assertThat(taskState).isEqualTo(TaskState(RunningAppState.MINIMIZED, taskId = 2)) + } + + @Test + fun getDesktopItemState_matchingMinimizedAndRunningTask_returnsVisible() { + setInDesktopMode(true) + updateRecentTasks( + runningTasks = + listOf( + PerDisplayRunningApps( + listOf( + createTask(id = 1, "package", isVisible = false, isMinimized = true), + createTask(id = 2, "package", isVisible = true), + ), + DEFAULT_DISPLAY, + ) + ), + recentTaskPackages = emptyList(), + ) + + val taskState = recentAppsController.getDesktopItemState(createItemInfo("package")) + assertThat(taskState).isEqualTo(TaskState(RunningAppState.RUNNING, taskId = 2)) + } + + @Test + fun getDesktopItemState_noMatchingUserId_returnsNotRunning() { + setInDesktopMode(true) + updateRecentTasks( + runningTasks = + listOf( + PerDisplayRunningApps( + listOf( + createTask(id = 1, "package", isVisible = false, USER_HANDLE_1), + createTask(id = 2, "package", isVisible = true, USER_HANDLE_1), + ), + DEFAULT_DISPLAY, + ) + ), + recentTaskPackages = emptyList(), + ) + + val taskState = + recentAppsController.getDesktopItemState(createItemInfo("package", USER_HANDLE_2)) + + assertThat(taskState).isEqualTo(TaskState(RunningAppState.NOT_RUNNING)) + } + + @Test + fun getRunningAppState_taskNotRunningOrMinimized_returnsNotRunning() { + setInDesktopMode(true) + updateRecentTasks(runningTasks = emptyList(), recentTaskPackages = emptyList()) + + assertThat(recentAppsController.getRunningAppState(taskId = 1)) + .isEqualTo(RunningAppState.NOT_RUNNING) + } + + @Test + fun getRunningAppState_taskNotVisible_returnsMinimized() { + setInDesktopMode(true) + val task1 = + createTask( + id = 1, + packageName = RUNNING_APP_PACKAGE_1, + isVisible = false, + isMinimized = true, + ) + val task2 = createTask(id = 2, packageName = RUNNING_APP_PACKAGE_1, isVisible = true) + updateRecentTasks( + runningTasks = listOf(PerDisplayRunningApps(listOf(task1, task2), DEFAULT_DISPLAY)), + recentTaskPackages = emptyList(), + ) + + assertThat(recentAppsController.getRunningAppState(taskId = 1)) + .isEqualTo(RunningAppState.MINIMIZED) + } + + @Test + fun getRunningAppState_taskNotVisible_returnsMinimizedForSecondaryDisplay() { + setInDesktopMode(true) + val task1 = createTask(id = 1, packageName = RUNNING_APP_PACKAGE_1, isVisible = false) + val task2 = createTask(id = 2, packageName = RUNNING_APP_PACKAGE_1, isVisible = true) + val task3 = + createTask( + id = 3, + packageName = RUNNING_APP_PACKAGE_3, + isVisible = false, + isMinimized = true, + ) + val task4 = createTask(id = 3, packageName = RUNNING_APP_PACKAGE_3, isVisible = false) + updateRecentTasks( + runningTasks = + listOf( + PerDisplayRunningApps(listOf(task1, task2), DEFAULT_DISPLAY), + PerDisplayRunningApps(listOf(task3, task4), DEFAULT_DISPLAY + 1), + ), + recentTaskPackages = emptyList(), + ) + + assertThat(recentAppsController.getRunningAppState(taskId = 3)) + .isEqualTo(RunningAppState.MINIMIZED) + } + + @Test + fun getRunningAppState_taskVisible_returnsRunningForSecondaryDisplay() { + setInDesktopMode(true) + val task1 = createTask(id = 1, packageName = RUNNING_APP_PACKAGE_1, isVisible = false) + val task2 = createTask(id = 2, packageName = RUNNING_APP_PACKAGE_1, isVisible = true) + val task3 = createTask(id = 3, packageName = RUNNING_APP_PACKAGE_3, isVisible = true) + updateRecentTasks( + runningTasks = + listOf( + PerDisplayRunningApps(listOf(task1, task2), DEFAULT_DISPLAY), + PerDisplayRunningApps(listOf(task3), DEFAULT_DISPLAY + 1), + ), + recentTaskPackages = emptyList(), + ) + + assertThat(recentAppsController.getRunningAppState(taskId = 3)) + .isEqualTo(RunningAppState.RUNNING) + } + + @Test + fun updateHotseatItemInfos_cantShowRunning_inDesktopMode_returnsAllHotseatItems() { + recentAppsController.canShowRunningApps = false + setInDesktopMode(true) + val hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2, PREDICTED_PACKAGE_1) + val newHotseatItems = + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = hotseatPackages, + runningTasks = emptyList(), + recentTaskPackages = emptyList(), + ) + assertThat(newHotseatItems.map { it?.targetPackage }) + .containsExactlyElementsIn(hotseatPackages) + } + + @Test + fun updateHotseatItemInfos_cantShowRecent_notInDesktopMode_returnsAllHotseatItems() { + recentAppsController.canShowRecentApps = false + setInDesktopMode(false) + val hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2, PREDICTED_PACKAGE_1) + val newHotseatItems = + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = hotseatPackages, + runningTasks = emptyList(), + recentTaskPackages = emptyList(), + ) + assertThat(newHotseatItems.map { it?.targetPackage }) + .containsExactlyElementsIn(hotseatPackages) + } + + @Test + fun updateHotseatItemInfos_canShowRunning_inDesktopMode_returnsNonPredictedHotseatItems() { + recentAppsController.canShowRunningApps = true + setInDesktopMode(true) + val newHotseatItems = + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2, PREDICTED_PACKAGE_1), + runningTasks = emptyList(), + recentTaskPackages = emptyList(), + ) + val expectedPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2) + assertThat(newHotseatItems.map { it?.targetPackage }) + .containsExactlyElementsIn(expectedPackages) + } + + @Test + fun updateHotseatItemInfos_inDesktopMode_hotseatPackageHasRunningTask_hotseatItemLinksToTask() { + setInDesktopMode(true) + + val newHotseatItems = + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2), + runningTasks = listOf(createTask(id = 1, HOTSEAT_PACKAGE_1)), + recentTaskPackages = emptyList(), + ) + + assertThat(newHotseatItems).hasLength(2) + assertThat(newHotseatItems[0]).isInstanceOf(TaskItemInfo::class.java) + assertThat(newHotseatItems[1]).isNotInstanceOf(TaskItemInfo::class.java) + val hotseatItem1 = newHotseatItems[0] as TaskItemInfo + assertThat(hotseatItem1.taskId).isEqualTo(1) + } + + /** + * Tests that in desktop mode, when two tasks have the same package name and one is in the + * hotseat, only the hotseat item represents the app, and no duplicate is shown in recent apps. + */ + @Test + fun updateHotseatItemInfos_inDesktopMode_twoRunningTasksSamePackage_onlyHotseatCoversTask() { + setInDesktopMode(true) + + val newHotseatItems = + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2), + runningTasks = + listOf( + createTask(id = 1, HOTSEAT_PACKAGE_1), + createTask(id = 2, HOTSEAT_PACKAGE_1), + ), + recentTaskPackages = emptyList(), + ) + + // The task is in Hotseat Items + assertThat(newHotseatItems).hasLength(2) + assertThat(newHotseatItems[0]).isInstanceOf(TaskItemInfo::class.java) + assertThat(newHotseatItems[1]).isNotInstanceOf(TaskItemInfo::class.java) + val hotseatItem1 = newHotseatItems[0] as TaskItemInfo + assertThat(hotseatItem1.targetPackage).isEqualTo(HOTSEAT_PACKAGE_1) + + // The other task of the same package is not in recentShownTasks + assertThat(recentShownTasks).isEmpty() + } + + @Test + fun updateHotseatItemInfos_canShowRecent_notInDesktopMode_returnsNonPredictedHotseatItems() { + recentAppsController.canShowRecentApps = true + setInDesktopMode(false) + val newHotseatItems = + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2, PREDICTED_PACKAGE_1), + runningTasks = emptyList(), + recentTaskPackages = emptyList(), + ) + val expectedPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2) + assertThat(newHotseatItems.map { it?.targetPackage }) + .containsExactlyElementsIn(expectedPackages) + } + + @Test + fun onRecentTasksChanged_cantShowRunning_inDesktopMode_shownTasks_returnsEmptyList() { + recentAppsController.canShowRunningApps = false + setInDesktopMode(true) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2, PREDICTED_PACKAGE_1), + runningTasks = + listOf( + createTask(id = 1, RUNNING_APP_PACKAGE_1), + createTask(id = 2, RUNNING_APP_PACKAGE_2), + ), + recentTaskPackages = emptyList(), + ) + assertThat(recentAppsController.shownTasks).isEmpty() + } + + @Test + fun onRecentTasksChanged_cantShowRecent_notInDesktopMode_shownTasks_returnsEmptyList() { + recentAppsController.canShowRecentApps = false + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2, PREDICTED_PACKAGE_1), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + assertThat(recentAppsController.shownTasks).isEmpty() + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_noRecentTasks_shownTasks_returnsEmptyList() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = + listOf( + createTask(id = 1, RUNNING_APP_PACKAGE_1), + createTask(id = 2, RUNNING_APP_PACKAGE_2), + ), + recentTaskPackages = emptyList(), + ) + assertThat(recentAppsController.shownTasks).isEmpty() + assertThat(recentAppsController.minimizedTaskIds).isEmpty() + } + + @Test + fun onRecentTasksChanged_inDesktopMode_noRunningApps_shownTasks_returnsEmptyList() { + setInDesktopMode(true) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + assertThat(recentAppsController.shownTasks).isEmpty() + } + + @Test + fun onRecentTasksChanged_inDesktopMode_shownTasks_returnsRunningTasks() { + setInDesktopMode(true) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1, task2), + recentTaskPackages = emptyList(), + ) + assertThat(recentShownTasks).containsExactlyElementsIn(listOf(task1, task2)) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_getRunningApps_returnsEmptySet() { + setInDesktopMode(false) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1, task2), + recentTaskPackages = emptyList(), + ) + assertThat(recentAppsController.runningTaskIds).isEmpty() + assertThat(recentAppsController.minimizedTaskIds).isEmpty() + } + + @Test + fun onRecentTasksChanged_inDesktopMode_getRunningApps_returnsAllDesktopTasks() { + setInDesktopMode(true) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1, task2), + recentTaskPackages = emptyList(), + ) + assertThat(recentAppsController.runningTaskIds).containsExactlyElementsIn(listOf(1, 2)) + assertThat(recentAppsController.minimizedTaskIds).isEmpty() + } + + @Test + fun onRecentTasksChanged_inDesktopMode_getRunningApps_includesHotseat() { + setInDesktopMode(true) + val runningTasks = + listOf( + createTask(id = 1, HOTSEAT_PACKAGE_1), + createTask(id = 2, RUNNING_APP_PACKAGE_1), + createTask(id = 3, RUNNING_APP_PACKAGE_2), + ) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2), + runningTasks = runningTasks, + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + assertThat(recentAppsController.runningTaskIds).containsExactlyElementsIn(listOf(1, 2, 3)) + assertThat(recentAppsController.minimizedTaskIds).isEmpty() + } + + @Test + fun onRecentTasksChanged_inDesktopMode_allAppsRunningAndInvisibleAppsMinimized() { + setInDesktopMode(true) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + val task3Minimized = + createTask(id = 3, RUNNING_APP_PACKAGE_3, isVisible = false, isMinimized = true) + val runningTasks = listOf(task1, task2, task3Minimized) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = runningTasks, + recentTaskPackages = emptyList(), + ) + assertThat(recentAppsController.runningTaskIds).containsExactly(1, 2, 3) + assertThat(recentAppsController.minimizedTaskIds).containsExactly(3) + } + + @Test + fun minimizedTaskIds_multipleDesktopsEnabled_returnsMinimizedTasks() { + setInDesktopMode(true) + whenever(DesktopModeStatus.enableMultipleDesktops(mockContext)).thenReturn(true) + + val task1Minimized = + createTask(id = 1, RUNNING_APP_PACKAGE_1, isMinimized = true, isVisible = false) + val task2Visible = + createTask(id = 2, RUNNING_APP_PACKAGE_2, isMinimized = false, isVisible = false) + val task3Minimized = + createTask(id = 3, RUNNING_APP_PACKAGE_3, isMinimized = true, isVisible = false) + val runningTasks = listOf(task1Minimized, task2Visible, task3Minimized) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = runningTasks, + recentTaskPackages = emptyList(), + ) + assertThat(recentAppsController.minimizedTaskIds).containsExactly(1, 3) + } + + @Test + fun minimizedTaskIds_multipleDesktopsDisabled_returnsInvisibleTasks() { + setInDesktopMode(true) + whenever(DesktopModeStatus.enableMultipleDesktops(mockContext)).thenReturn(false) + val task1Invisible = + createTask(id = 1, RUNNING_APP_PACKAGE_1, isMinimized = true, isVisible = false) + val task2InVisible = + createTask(id = 2, RUNNING_APP_PACKAGE_2, isMinimized = false, isVisible = false) + val task3Invisible = + createTask(id = 3, RUNNING_APP_PACKAGE_3, isMinimized = true, isVisible = false) + val runningTasks = listOf(task1Invisible, task2InVisible, task3Invisible) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = runningTasks, + recentTaskPackages = emptyList(), + ) + assertThat(recentAppsController.minimizedTaskIds).containsExactly(1, 2, 3) + } + + @Test + fun onRecentTasksChanged_inDesktopMode_samePackage_differentTasks_severalRunningTasks() { + setInDesktopMode(true) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1, task2), + recentTaskPackages = emptyList(), + ) + assertThat(recentAppsController.runningTaskIds).containsExactlyElementsIn(listOf(1, 2)) + } + + @Test + fun onRecentTasksChanged_inDesktopMode_shownTasks_maintainsOrder() { + setInDesktopMode(true) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1, task2), + recentTaskPackages = emptyList(), + ) + + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task2, task1), + recentTaskPackages = emptyList(), + ) + + assertThat(recentShownTasks).isEqualTo(listOf(task1, task2)) + } + + /** + * Tests that when multiple instances of the same app are running in desktop mode and the app is + * not in the hotseat, only one instance is shown in the recent apps section. + */ + @Test + fun onRecentTasksChanged_inDesktopMode_multiInstance_noHotseat_shownTasksHasOneInstance() { + setInDesktopMode(true) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_1) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1, task2), + recentTaskPackages = emptyList(), + ) + + // Assert that recentShownTasks contains only one instance of the app + assertThat(recentShownTasks).hasSize(1) + assertThat(recentShownTasks[0].key.packageName).isEqualTo(RUNNING_APP_PACKAGE_1) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_shownTasks_maintainsRecency() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2, RECENT_PACKAGE_3), + ) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_2, RECENT_PACKAGE_3, RECENT_PACKAGE_1), + ) + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + // Most recent packages, minus the currently running one (RECENT_PACKAGE_1). + assertThat(shownPackages).isEqualTo(listOf(RECENT_PACKAGE_2, RECENT_PACKAGE_3)) + } + + @Test + fun onRecentTasksChanged_inDesktopMode_addTask_shownTasks_maintainsOrder() { + setInDesktopMode(true) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + val task3 = createTask(id = 3, RUNNING_APP_PACKAGE_3) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1, task2), + recentTaskPackages = emptyList(), + ) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task2, task1, task3), + recentTaskPackages = emptyList(), + ) + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + val expectedOrder = + listOf(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2, RUNNING_APP_PACKAGE_3) + assertThat(shownPackages).isEqualTo(expectedOrder) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_addTask_shownTasks_maintainsRecency() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_3, RECENT_PACKAGE_2), + ) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_2, RECENT_PACKAGE_3, RECENT_PACKAGE_1), + ) + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + // Most recent packages, minus the currently running one (RECENT_PACKAGE_1). + assertThat(shownPackages).isEqualTo(listOf(RECENT_PACKAGE_2, RECENT_PACKAGE_3)) + } + + @Test + fun onRecentTasksChanged_inDesktopMode_removeTask_shownTasks_maintainsOrder() { + setInDesktopMode(true) + val task1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val task2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + val task3 = createTask(id = 3, RUNNING_APP_PACKAGE_3) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1, task2, task3), + recentTaskPackages = emptyList(), + ) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task2, task1), + recentTaskPackages = emptyList(), + ) + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + assertThat(shownPackages).isEqualTo(listOf(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2)) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_removeTask_shownTasks_maintainsRecency() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2, RECENT_PACKAGE_3), + ) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_2, RECENT_PACKAGE_3), + ) + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + // Most recent packages, minus the currently running one (RECENT_PACKAGE_3). + assertThat(shownPackages).isEqualTo(listOf(RECENT_PACKAGE_2)) + } + + @Test + fun onRecentTasksChanged_enterDesktopMode_shownTasks_onlyIncludesRunningTasks() { + setInDesktopMode(false) + val runningTask1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val runningTask2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + val recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2) + + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(runningTask1, runningTask2), + recentTaskPackages = recentTaskPackages, + ) + + setInDesktopMode(true) + recentTasksChangedListener!!.onRecentTasksChanged() + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + assertThat(shownPackages).containsExactly(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2) + } + + @Test + fun onRecentTasksChanged_exitDesktopMode_shownTasks_onlyIncludesRecentTasks() { + setInDesktopMode(true) + val runningTask1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val runningTask2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + val recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2, RECENT_PACKAGE_3) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(runningTask1, runningTask2), + recentTaskPackages = recentTaskPackages, + ) + setInDesktopMode(false) + recentTasksChangedListener!!.onRecentTasksChanged() + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + // Don't expect RECENT_PACKAGE_3 because it is currently running. + val expectedPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2) + assertThat(shownPackages).containsExactlyElementsIn(expectedPackages) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_hasRecentTasks_shownTasks_returnsRecentTasks() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2, RECENT_PACKAGE_3), + ) + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + // RECENT_PACKAGE_3 is the top task (visible to user) so should be excluded. + val expectedPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2) + assertThat(shownPackages).containsExactlyElementsIn(expectedPackages) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_hasRecentAndRunningTasks_shownTasks_returnsRecentTaskAndDesktopTile() { + setInDesktopMode(false) + val runningTask1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val runningTask2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(runningTask1, runningTask2), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + val shownPackages = recentAppsController.shownTasks.map { it.packageNames } + // Only 2 recent tasks shown: Desktop Tile + 1 Recent Task + val desktopTilePackages = listOf(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2) + val recentTaskPackages = listOf(RECENT_PACKAGE_1) + val expectedPackages = listOf(desktopTilePackages, recentTaskPackages) + assertThat(shownPackages).containsExactlyElementsIn(expectedPackages) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_hasRecentAndSplitTasks_shownTasks_returnsRecentTaskAndPair() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_SPLIT_PACKAGES_1, RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + val shownPackages = recentAppsController.shownTasks.map { it.packageNames } + // Only 2 recent tasks shown: Pair + 1 Recent Task + val pairPackages = RECENT_SPLIT_PACKAGES_1.split("_") + val recentTaskPackages = listOf(RECENT_PACKAGE_1) + val expectedPackages = listOf(pairPackages, recentTaskPackages) + assertThat(shownPackages).containsExactlyElementsIn(expectedPackages) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_hasMatchingAppPairAndSplitTask_dedupesSplitTask() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(RECENT_SPLIT_PACKAGES_1), + runningTasks = emptyList(), + recentTaskPackages = + listOf( + RECENT_SPLIT_PACKAGES_1, + RECENT_PACKAGE_1, + RECENT_PACKAGE_2, + RECENT_PACKAGE_3, + ), + ) + + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + val expectedPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2) + assertThat(shownPackages).containsExactlyElementsIn(expectedPackages) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_hasReversedAppPairAndSplitTask_dedupesSplitTask() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(RECENT_SPLIT_PACKAGES_1), + runningTasks = emptyList(), + recentTaskPackages = + listOf( + RECENT_SPLIT_PACKAGES_1_REVERSED, + RECENT_PACKAGE_1, + RECENT_PACKAGE_2, + RECENT_PACKAGE_3, + ), + ) + + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + val expectedPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2) + assertThat(shownPackages).containsExactlyElementsIn(expectedPackages) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_hasDifferentAppPairAndSplitTask_includesSplitTask() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = listOf(RECENT_SPLIT_PACKAGES_1), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_SPLIT_PACKAGES_2, RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + + val shownPackages = recentAppsController.shownTasks.map { it.packageNames } + val pairPackages = RECENT_SPLIT_PACKAGES_2.split("_") + val recentTaskPackages = listOf(RECENT_PACKAGE_1) + val expectedPackages = listOf(pairPackages, recentTaskPackages) + assertThat(shownPackages).containsExactlyElementsIn(expectedPackages) + } + + @Test + fun onRecentTasksChanged_notInDesktopMode_noActualChangeToRecents_commitRunningAppsToUI_notCalled() { + setInDesktopMode(false) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + verify(taskbarViewController, times(1)).commitRunningAppsToUI() + // Call onRecentTasksChanged() again with the same tasks, verify it's a no-op. + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + verify(taskbarViewController, times(1)).commitRunningAppsToUI() + } + + @Test + fun onRecentTasksChanged_inDesktopMode_noActualChangeToRunning_commitRunningAppsToUI_notCalled() { + setInDesktopMode(true) + val runningTask1 = createTask(id = 1, RUNNING_APP_PACKAGE_1) + val runningTask2 = createTask(id = 2, RUNNING_APP_PACKAGE_2) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(runningTask1, runningTask2), + recentTaskPackages = emptyList(), + ) + verify(taskbarViewController, times(1)).commitRunningAppsToUI() + // Call onRecentTasksChanged() again with the same tasks, verify it's a no-op. + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(runningTask1, runningTask2), + recentTaskPackages = emptyList(), + ) + verify(taskbarViewController, times(1)).commitRunningAppsToUI() + } + + @Test + fun onRecentTasksChanged_onlyMinimizedChanges_commitRunningAppsToUI_isCalled() { + setInDesktopMode(true) + val task1Minimized = + createTask(id = 1, RUNNING_APP_PACKAGE_1, isVisible = false, isMinimized = true) + val task2Visible = createTask(id = 2, RUNNING_APP_PACKAGE_2) + val task2Minimized = + createTask(id = 2, RUNNING_APP_PACKAGE_2, isVisible = false, isMinimized = true) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1Minimized, task2Visible), + recentTaskPackages = emptyList(), + ) + verify(taskbarViewController, times(1)).commitRunningAppsToUI() + + // Call onRecentTasksChanged() again with a new minimized app, verify we update UI. + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(task1Minimized, task2Minimized), + recentTaskPackages = emptyList(), + ) + + verify(taskbarViewController, times(2)).commitRunningAppsToUI() + } + + @Test + fun onRecentTasksChanged_hotseatAppStartsRunning_commitRunningAppsToUI_isCalled() { + setInDesktopMode(true) + val hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2) + val originalTasks = listOf(createTask(id = 1, RUNNING_APP_PACKAGE_1)) + val newTasks = + listOf(createTask(id = 1, RUNNING_APP_PACKAGE_1), createTask(id = 2, HOTSEAT_PACKAGE_1)) + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = hotseatPackages, + runningTasks = originalTasks, + recentTaskPackages = emptyList(), + ) + verify(taskbarViewController, times(1)).commitRunningAppsToUI() + + // Call onRecentTasksChanged() again with a new running app, verify we update UI. + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = hotseatPackages, + runningTasks = newTasks, + recentTaskPackages = emptyList(), + ) + + verify(taskbarViewController, times(2)).commitRunningAppsToUI() + } + + @Test + fun onRecentTasksChanged_inDesktopMode_sameHotseatPackage_differentUser_isInShownTasks() { + setInDesktopMode(true) + val hotseatPackageUser = PackageUser(HOTSEAT_PACKAGE_1, USER_HANDLE_2) + val hotseatPackageUsers = listOf(hotseatPackageUser) + val runningTask = createTask(id = 1, HOTSEAT_PACKAGE_1, localUserHandle = USER_HANDLE_1) + val runningTasks = listOf(PerDisplayRunningApps(listOf(runningTask), DEFAULT_DISPLAY)) + prepareHotseatAndRunningAndRecentAppsInternal( + hotseatPackageUsers = hotseatPackageUsers, + runningTasks = runningTasks, + recentTaskPackages = emptyList(), + ) + assertThat(recentShownTasks).contains(runningTask) + assertThat(recentAppsController.runningTaskIds).containsExactlyElementsIn(listOf(1)) + } + + @Test + fun onRecentTasksChanged_inDesktopMode_multipleDesktops() { + setInDesktopMode(true) + val hotseatPackageUsers = listOf(PackageUser(HOTSEAT_PACKAGE_1, USER_HANDLE_1)) + val defaultDisplayRunningTask = + createTask(id = 1, HOTSEAT_PACKAGE_1, localUserHandle = USER_HANDLE_1) + val secondaryDisplayRunningTask = + createTask(id = 2, RUNNING_APP_PACKAGE_1, localUserHandle = USER_HANDLE_1) + val runningTasks = + listOf( + PerDisplayRunningApps(listOf(defaultDisplayRunningTask), DEFAULT_DISPLAY), + PerDisplayRunningApps(listOf(secondaryDisplayRunningTask), DEFAULT_DISPLAY + 1), + ) + prepareHotseatAndRunningAndRecentAppsInternal( + hotseatPackageUsers = hotseatPackageUsers, + runningTasks = runningTasks, + recentTaskPackages = emptyList(), + ) + assertThat(recentShownTasks).containsExactly(secondaryDisplayRunningTask) + assertThat(recentAppsController.runningTaskIds).containsExactlyElementsIn(listOf(1, 2)) + } + + @Test + fun onRecentTasksChanged_inDesktopMode_multipleDesktops_appsNotInHotseat() { + setInDesktopMode(true) + val hotseatPackageUsers = listOf(PackageUser(HOTSEAT_PACKAGE_1, USER_HANDLE_1)) + val defaultDisplayRunningTask = + createTask(id = 1, RUNNING_APP_PACKAGE_1, localUserHandle = USER_HANDLE_1) + val secondaryDisplayRunningTask = + createTask(id = 2, RUNNING_APP_PACKAGE_2, localUserHandle = USER_HANDLE_1) + val runningTasks = + listOf( + PerDisplayRunningApps(listOf(defaultDisplayRunningTask), DEFAULT_DISPLAY), + PerDisplayRunningApps(listOf(secondaryDisplayRunningTask), DEFAULT_DISPLAY + 1), + ) + prepareHotseatAndRunningAndRecentAppsInternal( + hotseatPackageUsers = hotseatPackageUsers, + runningTasks = runningTasks, + recentTaskPackages = emptyList(), + ) + assertThat(recentShownTasks) + .containsExactly(defaultDisplayRunningTask, secondaryDisplayRunningTask) + assertThat(recentAppsController.runningTaskIds).containsExactlyElementsIn(listOf(1, 2)) + } + + @Test + fun onRecentTasksChanged_inDesktopMode_multipleDesktops_multipleAppInstances() { + setInDesktopMode(true) + val hotseatPackageUsers = listOf(PackageUser(HOTSEAT_PACKAGE_1, USER_HANDLE_1)) + val defaultDisplayRunningTask1 = + createTask(id = 1, HOTSEAT_PACKAGE_1, localUserHandle = USER_HANDLE_1) + val defaultDisplayRunningTask2 = + createTask(id = 2, RUNNING_APP_PACKAGE_1, localUserHandle = USER_HANDLE_1) + + val secondaryDisplayRunningTask1 = + createTask(id = 3, RUNNING_APP_PACKAGE_1, localUserHandle = USER_HANDLE_1) + val secondaryDisplayRunningTask2 = + createTask(id = 4, HOTSEAT_PACKAGE_1, localUserHandle = USER_HANDLE_1) + + val runningTasks = + listOf( + PerDisplayRunningApps( + listOf(defaultDisplayRunningTask1, defaultDisplayRunningTask2), + DEFAULT_DISPLAY, + ), + PerDisplayRunningApps( + listOf(secondaryDisplayRunningTask1, secondaryDisplayRunningTask2), + DEFAULT_DISPLAY + 1, + ), + ) + prepareHotseatAndRunningAndRecentAppsInternal( + hotseatPackageUsers = hotseatPackageUsers, + runningTasks = runningTasks, + recentTaskPackages = emptyList(), + ) + + assertThat(recentShownTasks).hasSize(1) + assertThat(recentShownTasks) + .containsAnyOf(defaultDisplayRunningTask2, secondaryDisplayRunningTask1) + + assertThat(recentAppsController.runningTaskIds) + .containsExactlyElementsIn(listOf(1, 2, 3, 4)) + } + + @Test + fun hasSingleTask_noTargetPackage_returnsFalse() { + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1), + ) + assertThat(recentAppsController.getSingleTask(ItemInfo())).isNull() + } + + @Test + fun hasSingleTask_noRecentTasks_returnsFalse() { + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = emptyList(), + ) + val itemInfo = createItemInfo(RECENT_PACKAGE_1) + assertThat(recentAppsController.getSingleTask(itemInfo)).isNull() + } + + @Test + fun hasSingleTask_noMatchingSingleTask_returnsFalse() { + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1), + ) + val itemInfo = createItemInfo(RECENT_PACKAGE_2) + assertThat(recentAppsController.getSingleTask(itemInfo)).isNull() + } + + @Test + fun hasSingleTask_matchingSingleTask_returnsTrue() { + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1, RECENT_PACKAGE_2), + ) + val itemInfo = createItemInfo(RECENT_PACKAGE_1) + assertThat(recentAppsController.getSingleTask(itemInfo)).isNotNull() + } + + @Test + fun hasSingleTask_matchingSingleTaskDifferentUser_returnsFalse() { + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = emptyList(), + recentTaskPackages = listOf(RECENT_PACKAGE_1), + ) + // RECENT_PACKAGE_1 is created with myUserHandle in createRecentTasksFromPackageNames + val itemInfo = createItemInfo(RECENT_PACKAGE_1, USER_HANDLE_1) + assertThat(recentAppsController.getSingleTask(itemInfo)).isNull() + } + + @Test + fun onRecentTasksChanged_inDesktopMode_transparentTask_isFilteredOut() { + setInDesktopMode(true) + val transparentTask = createTask(id = 1, "transparentPackage") + transparentTask.key.isTopActivityTransparent = true + transparentTask.key.isActivityStackTransparent = true + transparentTask.key.windowingMode = WINDOWING_MODE_FULLSCREEN + val regularTask = createTask(id = 2, RUNNING_APP_PACKAGE_1) + + prepareHotseatAndRunningAndRecentApps( + hotseatPackages = emptyList(), + runningTasks = listOf(transparentTask, regularTask), + recentTaskPackages = emptyList(), + ) + + assertThat(recentAppsController.runningTaskIds).containsExactly(2) + val shownPackages = recentAppsController.shownTasks.flatMap { it.packageNames } + assertThat(shownPackages).containsExactly(RUNNING_APP_PACKAGE_1) + } + + @Test + fun multiInstanceApp_onDifferentDesktops_hotseatIconPointsToActiveDesktopInstance() { + setInDesktopMode(true) + whenever(DesktopModeStatus.enableMultipleDesktops(mockContext)).thenReturn(true) + + val hotseatPackage = HOTSEAT_PACKAGE_1 + // Create two instances of the same app + val taskOnDesk1 = createTask(id = 101, packageName = hotseatPackage, lastActiveTime = 1000L) + val taskOnDesk2 = createTask(id = 102, packageName = hotseatPackage, lastActiveTime = 2000L) + assertThat(taskOnDesk1.key.id).isNotEqualTo(taskOnDesk2.key.id) + + val desktopTask1 = + DesktopTask( + deskId = 1, + desktopDisplayId = DEFAULT_DISPLAY, + tasks = arrayListOf(taskOnDesk1), + ) + val desktopTask2 = + DesktopTask( + deskId = 2, + desktopDisplayId = DEFAULT_DISPLAY, + tasks = arrayListOf(taskOnDesk2), + ) + val allTasks = listOf(desktopTask2, desktopTask1) + + val hotseatItems = + createHotseatItemsFromPackageUsers(listOf(PackageUser(hotseatPackage, myUserHandle))) + .toTypedArray() + recentAppsController.updateHotseatItemInfos(hotseatItems as Array) + + // Phase 1: Make desktop 1 active and verify the hotseat item points to the task on desk #1 + whenever(taskbarControllers.taskbarDesktopModeController.getActiveDeskId).thenReturn(1) + updateTasks(allTasks) + var taskItemInfo = recentAppsController.shownHotseatItems[0] as TaskItemInfo + assertThat(taskItemInfo.taskId).isEqualTo(taskOnDesk1.key.id) + verify(taskbarViewController, times(1)).commitRunningAppsToUI() + + // Phase 2: Switch to desktop 2 and verify the hotseat item now points to the task desk #2 + whenever(taskbarControllers.taskbarDesktopModeController.getActiveDeskId).thenReturn(2) + updateTasks(allTasks) + taskItemInfo = recentAppsController.shownHotseatItems[0] as TaskItemInfo + assertThat(taskItemInfo.taskId).isEqualTo(taskOnDesk2.key.id) + verify(taskbarViewController, times(2)).commitRunningAppsToUI() + } + + /** + * Updates the mock RecentsModel with the provided list of tasks, simulating a refresh by + * configuring the mock and notifying listeners. + */ + private fun updateTasks(tasks: List) { + doAnswer { + val callback: Consumer> = it.getArgument(1) + callback.accept(ArrayList(tasks)) + taskListChangeId + } + .whenever(mockRecentsModel) + .getTasks(any(), any>>()) + recentTasksChangedListener?.onRecentTasksChanged() + } + + private fun prepareHotseatAndRunningAndRecentApps( + hotseatPackages: List, + runningTasks: List, + recentTaskPackages: List, + ): Array { + val hotseatPackageUsers = hotseatPackages.map { PackageUser(it, myUserHandle) } + return prepareHotseatAndRunningAndRecentAppsInternal( + hotseatPackageUsers, + listOf(PerDisplayRunningApps(runningTasks, DEFAULT_DISPLAY)), + recentTaskPackages, + ) + } + + private fun prepareHotseatAndRunningAndRecentAppsInternal( + hotseatPackageUsers: List, + runningTasks: List, + recentTaskPackages: List, + ): Array { + val hotseatItems = createHotseatItemsFromPackageUsers(hotseatPackageUsers) + recentAppsController.updateHotseatItemInfos(hotseatItems.toTypedArray()) + updateRecentTasks(runningTasks, recentTaskPackages) + return recentAppsController.shownHotseatItems.toTypedArray() + } + + private fun updateRecentTasks( + runningTasks: List, + recentTaskPackages: List, + ) { + val recentTasks = createRecentTasksFromPackageNames(recentTaskPackages) + val allTasks = + ArrayList().apply { + runningTasks.forEach { + add(DesktopTask(deskId = 0, it.displayId, ArrayList(it.tasks))) + } + addAll(recentTasks) + } + doAnswer { + val callback: Consumer> = it.getArgument(1) + callback.accept(allTasks) + taskListChangeId + } + .whenever(mockRecentsModel) + .getTasks(any(), any>>()) + recentTasksChangedListener?.onRecentTasksChanged() + } + + private fun createHotseatItemsFromPackageUsers( + packageUsers: List + ): List { + return packageUsers.map { + val userHandle = it.userHandle + if (it.packageName.startsWith("split")) { + AppPairInfo( + it.packageName.split("_").map { + createTestAppInfo(packageName = it, userHandle = userHandle) + .makeWorkspaceItem(taskbarActivityContext) + } + ) + } else { + createTestAppInfo(packageName = it.packageName, userHandle = userHandle) + .apply { + container = + if (it.packageName.startsWith("predicted")) { + CONTAINER_HOTSEAT_PREDICTION + } else { + CONTAINER_HOTSEAT + } + } + .makeWorkspaceItem(taskbarActivityContext) + } + } + } + + private fun createTestAppInfo( + packageName: String = "testPackageName", + className: String = "testClassName", + userHandle: UserHandle, + ) = AppInfo(ComponentName(packageName, className), className /* title */, userHandle, Intent()) + + private fun createRecentTasksFromPackageNames(packageNames: List): List { + return packageNames.map { packageName -> + if (packageName.startsWith("split")) { + val splitPackages = packageName.split("_") + SplitTask( + createTask(100, splitPackages[0]), + createTask(101, splitPackages[1]), + SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_50_50, + ), + ) + } else { + // Use the number at the end of the test packageName as the id. + val id = 1000 + packageName[packageName.length - 1].code + SingleTask(createTask(id, packageName)) + } + } + } + + private fun createTask( + id: Int, + packageName: String, + isVisible: Boolean = true, + localUserHandle: UserHandle? = null, + isMinimized: Boolean = false, + lastActiveTime: Long = 0L, + ): Task { + return Task( + Task.TaskKey( + id, + WINDOWING_MODE_FREEFORM, + Intent().apply { `package` = packageName }, + ComponentName(packageName, "TestActivity"), + localUserHandle?.identifier ?: myUserHandle.identifier, + lastActiveTime, + ) + ) + .apply { + this.isVisible = isVisible + this.isMinimized = isMinimized + } + } + + private fun setInDesktopMode(inDesktopMode: Boolean) { + whenever(taskbarControllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar()) + .thenReturn(inDesktopMode) + whenever(taskbarControllers.taskbarDesktopModeController.isInDesktopMode(DEFAULT_DISPLAY)) + .thenReturn(inDesktopMode) + } + + private fun createItemInfo( + packageName: String, + userHandle: UserHandle = myUserHandle, + ): ItemInfo { + val appInfo = AppInfo() + appInfo.intent = Intent().setComponent(ComponentName(packageName, "className")) + appInfo.user = userHandle + return WorkspaceItemInfo(appInfo) + } + + private val GroupTask.packageNames: List + get() = tasks.map { task -> task.key.packageName } + + private companion object { + const val HOTSEAT_PACKAGE_1 = "hotseat1" + const val HOTSEAT_PACKAGE_2 = "hotseat2" + const val PREDICTED_PACKAGE_1 = "predicted1" + const val RUNNING_APP_PACKAGE_1 = "running1" + const val RUNNING_APP_PACKAGE_2 = "running2" + const val RUNNING_APP_PACKAGE_3 = "running3" + const val RECENT_PACKAGE_1 = "recent1" + const val RECENT_PACKAGE_2 = "recent2" + const val RECENT_PACKAGE_3 = "recent3" + const val RECENT_SPLIT_PACKAGES_1 = "split1_split2" + const val RECENT_SPLIT_PACKAGES_1_REVERSED = "split1_split2" + const val RECENT_SPLIT_PACKAGES_2 = "split3_split4" + } + + data class PackageUser(val packageName: String, val userHandle: UserHandle) + + data class PerDisplayRunningApps(val tasks: List, val displayId: Int) +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRunningAppStateAnimationControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRunningAppStateAnimationControllerTest.kt new file mode 100644 index 00000000000..9117134081c --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRunningAppStateAnimationControllerTest.kt @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar + +import android.animation.AnimatorTestRule +import com.android.launcher3.BubbleTextView +import com.android.launcher3.BubbleTextView.RunningAppState +import com.android.launcher3.BubbleTextView.RunningAppState.MINIMIZED +import com.android.launcher3.BubbleTextView.RunningAppState.NOT_RUNNING +import com.android.launcher3.BubbleTextView.RunningAppState.RUNNING +import com.android.launcher3.model.data.TaskItemInfo +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.TaskbarRunningAppStateAnimationController.Companion.LINE_ANIM_DURATION +import com.android.launcher3.taskbar.TaskbarRunningAppStateAnimationController.Companion.UNPINNED_APP_LINE_ANIM_DELAY +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.MultiTranslateDelegate.INDEX_TASKBAR_APP_RUNNING_STATE_ANIM +import com.android.launcher3.util.TestActivityContext +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +private const val FRAME_TIME_MS = 16L // Simulates 60 Hz. +private val PINNED_APP = TaskItemInfo(0, TaskbarViewTestUtil.createHotseatWorkspaceItem(0)) +private val UNPINNED_APP = TaskbarViewTestUtil.createRecentTask(1) + +@RunWith(LauncherMultivalentJUnit::class) +class TaskbarRunningAppStateAnimationControllerTest { + + @get:Rule val animatorTestRule = AnimatorTestRule(this) + @get:Rule val context = TestActivityContext() + + private val btv = BubbleTextView(context) + private val controller = TaskbarRunningAppStateAnimationController(context) + + @Test + fun updateRunningState_minimizeApp_verifySpringEndState() { + startStateChange(start = RUNNING, end = MINIMIZED) + verifySpringAnimationEnd(MINIMIZED) + } + + @Test + fun updateRunningState_minimizeApp_verifyCancelEndState() { + startStateChange(start = RUNNING, end = MINIMIZED) + runOnMainSync { controller.onDestroy() } + verifyStateSettled(state = MINIMIZED) + } + + @Test + fun updateRunningState_restoreApp_verifySpringEndState() { + startStateChange(start = MINIMIZED, end = RUNNING) + verifySpringAnimationEnd(RUNNING) + } + + @Test + fun updateRunningState_openPinnedApp_verifySpringEndState() { + btv.tag = PINNED_APP + startStateChange(start = NOT_RUNNING, end = RUNNING) + verifySpringAnimationEnd(RUNNING) + } + + @Test + fun updateRunningState_openUnpinnedApp_verifyStartDelay() { + btv.tag = UNPINNED_APP + startStateChange(start = NOT_RUNNING, end = RUNNING) + runOnMainSync { animatorTestRule.advanceTimeBy(UNPINNED_APP_LINE_ANIM_DELAY) } + verifyLineIndicator(state = NOT_RUNNING) + } + + @Test + fun updateRunningState_openUnpinnedApp_verifyEndState() { + btv.tag = UNPINNED_APP + startStateChange(start = NOT_RUNNING, end = RUNNING) + runOnMainSync { + animatorTestRule.advanceTimeBy(UNPINNED_APP_LINE_ANIM_DELAY + LINE_ANIM_DURATION) + } + + verifyStateSettled(state = RUNNING) + } + + @Test + fun updateRunningState_openUnpinnedApp_verifyCancelEndState() { + btv.tag = UNPINNED_APP + startStateChange(start = NOT_RUNNING, end = RUNNING) + runOnMainSync { controller.onDestroy() } + verifyStateSettled(state = RUNNING) + } + + @Test + fun updateRunningState_closeApp_verifyEndState() { + startStateChange(start = RUNNING, end = NOT_RUNNING) + runOnMainSync { animatorTestRule.advanceTimeBy(LINE_ANIM_DURATION) } + verifyStateSettled(state = NOT_RUNNING) + } + + @Test + fun updateRunningState_repeatUpdateDuringAnimation_animationNotCanceled() { + startStateChange(start = MINIMIZED, end = RUNNING) + runOnMainSync { + animatorTestRule.advanceTimeBy(FRAME_TIME_MS) + controller.updateRunningState(btv, RUNNING, animate = false) + } + assertThat(controller.isAnimationRunning(btv)).isTrue() + } + + @Test + fun updateRunningState_minimizedDuringOpen_verifyMinimizedEndState() { + startStateChange(start = NOT_RUNNING, end = RUNNING) + runOnMainSync { controller.updateRunningState(btv, MINIMIZED, animate = true) } + verifySpringAnimationEnd(MINIMIZED) + } + + @Test + fun onDestroy_multipleAnimations_cancelsAll() { + startStateChange(start = RUNNING, end = MINIMIZED) + val btv2 = BubbleTextView(context) + startStateChange(btv = btv2, start = RUNNING, end = MINIMIZED) + + runOnMainSync { controller.onDestroy() } + verifyStateSettled(state = MINIMIZED) + verifyStateSettled(btv = btv2, state = MINIMIZED) + } + + private fun startStateChange( + btv: BubbleTextView = this.btv, + start: RunningAppState, + end: RunningAppState, + ) { + runOnMainSync { + controller.updateRunningState(btv, start, animate = false) + controller.updateRunningState(btv, end, animate = true) + } + verifyLineIndicator(btv, start) + assertThat(controller.isAnimationRunning(btv)).isTrue() + } + + /** Verifies [btv] spring animation ends at [state]. */ + private fun verifySpringAnimationEnd(state: RunningAppState) { + while (controller.isAnimationRunning(btv)) { + runOnMainSync { animatorTestRule.advanceTimeBy(FRAME_TIME_MS) } + } + verifyStateSettled(state = state) + } + + private fun verifyStateSettled(btv: BubbleTextView = this.btv, state: RunningAppState) { + assertThat(controller.isAnimationRunning(btv)).isFalse() + verifyLineIndicator(btv, state) + + val translateYProp = + btv.translateDelegate.getTranslationY(INDEX_TASKBAR_APP_RUNNING_STATE_ANIM) + assertThat(translateYProp.value).isZero() + } + + private fun verifyLineIndicator(btv: BubbleTextView = this.btv, state: RunningAppState) { + controller.run { + assertThat(btv.lineIndicatorWidth).isEqualTo(state.lineWidth) + assertThat(btv.lineIndicatorColor).isEqualTo(state.lineColor) + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarScrimViewControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarScrimViewControllerTest.kt new file mode 100644 index 00000000000..ef258e1da0e --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarScrimViewControllerTest.kt @@ -0,0 +1,203 @@ +/* + * 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.launcher3.taskbar + +import android.animation.AnimatorTestRule +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.View.GONE +import android.view.View.VISIBLE +import androidx.test.core.app.ApplicationProvider +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController +import com.android.launcher3.taskbar.rules.SandboxParams +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.PINNED +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.quickstep.SystemUiProxy +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE +import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_BAR +import com.android.wm.shell.shared.bubbles.BubbleConstants.BUBBLE_EXPANDED_SCRIM_ALPHA +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.spy +import org.mockito.kotlin.whenever + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelTablet2023"]) +class TaskbarScrimViewControllerTest { + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + @get:Rule(order = 1) + val context = + TaskbarWindowSandboxContext.create( + SandboxParams({ + spy(SystemUiProxy( + ApplicationProvider.getApplicationContext(), + MAIN_EXECUTOR, + UI_HELPER_EXECUTOR, + )) { + doAnswer { backPressed = true }.whenever(it).onBackEvent(anyOrNull(), any()) + } + }) + ) + + @get:Rule(order = 2) val taskbarModeRule = TaskbarModeRule(context) + @get:Rule(order = 3) val animatorTestRule = AnimatorTestRule(this) + @get:Rule(order = 4) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var scrimViewController: TaskbarScrimViewController + + // Default animation duration. + private val animationDuration = + context.resources.getInteger(android.R.integer.config_mediumAnimTime).toLong() + + private var backPressed = false + + @Test + @TaskbarMode(PINNED) + fun testOnTaskbarVisibleChanged_onlyTaskbarVisible_noScrim() { + getInstrumentation().runOnMainSync { + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + scrimViewController.updateStateForSysuiFlags(0, true) + } + assertThat(scrimViewController.scrimAlpha).isEqualTo(0) + } + + @Test + @TaskbarMode(PINNED) + fun testOnTaskbarVisibilityChanged_pinnedTaskbarVisibleWithBubblesExpanded_showsScrim() { + getInstrumentation().runOnMainSync { + scrimViewController.updateStateForSysuiFlags(SYSUI_STATE_BUBBLES_EXPANDED, true) + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + animatorTestRule.advanceTimeBy(animationDuration) + } + + assertThat(scrimViewController.scrimAlpha).isEqualTo(BUBBLE_EXPANDED_SCRIM_ALPHA) + } + + @Test + @DisableFlags(FLAG_ENABLE_BUBBLE_BAR) + @TaskbarMode(PINNED) + fun testOnTaskbarVisibilityChanged_pinnedTaskbarHiddenDuringScrim_hidesScrim() { + getInstrumentation().runOnMainSync { + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + scrimViewController.updateStateForSysuiFlags(SYSUI_STATE_BUBBLES_EXPANDED, true) + } + assertThat(scrimViewController.scrimAlpha).isEqualTo(BUBBLE_EXPANDED_SCRIM_ALPHA) + + getInstrumentation().runOnMainSync { + scrimViewController.onTaskbarVisibilityChanged(GONE) + animatorTestRule.advanceTimeBy(animationDuration) + } + assertThat(scrimViewController.scrimAlpha).isEqualTo(0) + } + + @Test + @EnableFlags(FLAG_ENABLE_BUBBLE_BAR) + @TaskbarMode(PINNED) + fun testOnTaskbarVisibilityChanged_pinnedTaskbarOnHomeHiddenDuringScrim_hidesScrim() { + getInstrumentation().runOnMainSync { + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + taskbarUnitTestRule.activityContext.bubbleControllers!! + .bubbleStashController + .launcherState = BubbleStashController.BubbleLauncherState.HOME + scrimViewController.updateStateForSysuiFlags(SYSUI_STATE_BUBBLES_EXPANDED, true) + } + assertThat(scrimViewController.scrimAlpha).isEqualTo(BUBBLE_EXPANDED_SCRIM_ALPHA) + + getInstrumentation().runOnMainSync { + scrimViewController.onTaskbarVisibilityChanged(GONE) + animatorTestRule.advanceTimeBy(animationDuration) + } + assertThat(scrimViewController.scrimAlpha).isEqualTo(0) + } + + @Test + @TaskbarMode(PINNED) + fun testOnTaskbarVisibilityChanged_notificationsOverPinnedTaskbarAndBubbles_noScrim() { + getInstrumentation().runOnMainSync { + scrimViewController.updateStateForSysuiFlags( + SYSUI_STATE_BUBBLES_EXPANDED or SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, + true, + ) + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + } + assertThat(scrimViewController.scrimAlpha).isEqualTo(0) + } + + @Test + @TaskbarMode(PINNED) + fun testOnTaskbarVisibilityChanged_pinnedTaskbarWithBubbleMenu_darkerScrim() { + getInstrumentation().runOnMainSync { + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + scrimViewController.updateStateForSysuiFlags( + SYSUI_STATE_BUBBLES_EXPANDED or SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED, + true, + ) + } + assertThat(scrimViewController.scrimAlpha).isGreaterThan(BUBBLE_EXPANDED_SCRIM_ALPHA) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testOnTaskbarVisibilityChanged_stashedTaskbarWithBubbles_noScrim() { + getInstrumentation().runOnMainSync { + scrimViewController.updateStateForSysuiFlags(SYSUI_STATE_BUBBLES_EXPANDED, true) + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + } + assertThat(scrimViewController.scrimAlpha).isEqualTo(0) + } + + @Test + @TaskbarMode(PINNED) + fun testOnClick_scrimShown_performsSystemBack() { + getInstrumentation().runOnMainSync { + scrimViewController.updateStateForSysuiFlags(SYSUI_STATE_BUBBLES_EXPANDED, true) + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + } + assertThat(scrimViewController.scrimView.isClickable).isTrue() + + getInstrumentation().runOnMainSync { scrimViewController.scrimView.performClick() } + assertThat(backPressed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testOnClick_scrimHidden_notClickable() { + getInstrumentation().runOnMainSync { + scrimViewController.updateStateForSysuiFlags(SYSUI_STATE_BUBBLES_EXPANDED, true) + scrimViewController.onTaskbarVisibilityChanged(VISIBLE) + } + assertThat(scrimViewController.scrimView.isClickable).isFalse() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarStashControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarStashControllerTest.kt new file mode 100644 index 00000000000..8feb5a1b622 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarStashControllerTest.kt @@ -0,0 +1,942 @@ +/* + * 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.launcher3.taskbar + +import android.animation.AnimatorTestRule +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.WindowInsets +import android.view.WindowManager +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.Flags +import com.android.launcher3.LauncherPrefs +import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING +import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING_IN_DESKTOP_MODE +import com.android.launcher3.QuickstepTransitionManager.PINNED_TASKBAR_TRANSITION_DURATION +import com.android.launcher3.R +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.taskbar.StashedHandleViewController.ALPHA_INDEX_STASHED +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_BUBBLES +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_EDU_OPEN +import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.asProperty +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_AUTO_STASHED_ON_HOME +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_APP +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_OVERVIEW +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_STASHED_LAUNCHER_STATE +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_DEVICE_LOCKED +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_IME +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_IN_APP_AUTO +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_SMALL_SCREEN +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_SYSUI +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_TASKBAR_HIDDEN +import com.android.launcher3.taskbar.TaskbarStashController.TASKBAR_STASH_DURATION +import com.android.launcher3.taskbar.TaskbarStashController.TASKBAR_STASH_DURATION_FOR_IME +import com.android.launcher3.taskbar.TaskbarStashController.TRANSIENT_TASKBAR_STASH_ALPHA_DURATION +import com.android.launcher3.taskbar.TaskbarStashController.TRANSIENT_TASKBAR_STASH_DURATION +import com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_STASH +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.PINNED +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.THREE_BUTTONS +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.UserSetupMode +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.taskbar.rules.displayControllerSpy +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_VISIBLE +import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_BAR +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.atLeastOnce +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@RunWith(LauncherMultivalentJUnit::class) +@EnableFlags(FLAG_ENABLE_BUBBLE_BAR) +@EmulatedDevices(["pixelTablet2023"]) +class TaskbarStashControllerTest { + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + @get:Rule(order = 1) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 2) val taskbarModeRule = TaskbarModeRule(context) + @get:Rule(order = 4) val animatorTestRule = AnimatorTestRule(this) + @get:Rule(order = 5) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var stashController: TaskbarStashController + @InjectController lateinit var viewController: TaskbarViewController + @InjectController lateinit var stashedHandleViewController: StashedHandleViewController + @InjectController lateinit var dragLayerController: TaskbarDragLayerController + @InjectController lateinit var autohideSuspendController: TaskbarAutohideSuspendController + @InjectController lateinit var bubbleBarViewController: BubbleBarViewController + @InjectController lateinit var bubbleStashController: BubbleStashController + + private val desktopVisibilityController: DesktopVisibilityController + get() = DesktopVisibilityController.INSTANCE[context] + + private val activityContext by taskbarUnitTestRule::activityContext + + @After fun cancelTimeoutIfExists() = stashController.cancelTimeoutIfExists() + + @Test + @TaskbarMode(TRANSIENT) + fun testInit_transientMode_stashedInApp() { + assertThat(stashController.isStashedInApp).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testInit_pinnedMode_unstashedInApp() { + assertThat(stashController.isStashedInApp).isFalse() + } + + @Test + @UserSetupMode + @TaskbarMode(PINNED) + fun testInit_userSetupWithPinnedMode_stashedInApp() { + assertThat(stashController.isStashedInApp).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testSetSetupUiVisible_true_stashedInApp() { + getInstrumentation().runOnMainSync { stashController.setSetupUIVisible(true) } + assertThat(stashController.isStashedInApp).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testSetSetupUiVisible_false_unstashedInApp() { + getInstrumentation().runOnMainSync { stashController.setSetupUIVisible(false) } + assertThat(stashController.isStashedInApp).isFalse() + } + + @Test + @DisableFlags(Flags.FLAG_ENABLE_OVERVIEW_ON_CONNECTED_DISPLAYS) + fun testRecreateAsTransient_withoutOverviewOnConnectedDisplays_timeoutStarted() { + context.displayControllerSpy?.setupTaskbarPinningPrefListener(context.displayId) + + testRecreateAsTransient_timeoutStarted() + } + + private fun testRecreateAsTransient_timeoutStarted() { + var isPinned by TASKBAR_PINNING.asProperty(context) + isPinned = true + activityContext.controllers.sharedState?.taskbarWasPinned = true + + isPinned = false + assertThat(stashController.timeoutAlarm.alarmPending()).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testSupportsVisualStashing_transientMode_supported() { + assertThat(stashController.supportsVisualStashing()).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testSupportsVisualStashing_pinnedMode_supported() { + assertThat(stashController.supportsVisualStashing()).isTrue() + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testSupportsVisualStashing_threeButtonsMode_unsupported() { + assertThat(stashController.supportsVisualStashing()).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testGetStashDuration_transientMode() { + assertThat(stashController.stashDuration).isEqualTo(TRANSIENT_TASKBAR_STASH_DURATION) + } + + @Test + @TaskbarMode(PINNED) + fun testGetStashDuration_pinnedMode() { + assertThat(stashController.stashDuration).isEqualTo(PINNED_TASKBAR_TRANSITION_DURATION) + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testGetStashDuration_inThreeButtonMode() { + assertThat(stashController.stashDuration).isEqualTo(PINNED_TASKBAR_TRANSITION_DURATION) + } + + @Test + @TaskbarMode(PINNED) + fun testIsStashed_pinnedInApp_isUnstashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, true) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(PINNED) + fun testIsStashed_pinnedOnHome_isStashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_AUTO_STASHED_ON_HOME, true) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testIsStashed_pinnedOnHome_unStashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_AUTO_STASHED_ON_HOME, false) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testIsStashed_transientInApp_isStashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, true) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testIsStashed_transientNotInApp_isUnstashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, false) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isFalse() + } + + @Test + fun testIsStashed_stashedInLauncherState_isStashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, false) + stashController.updateStateForFlag(FLAG_IN_STASHED_LAUNCHER_STATE, true) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testIsStashed_transientInOverview_isUnstashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, false) + stashController.updateStateForFlag(FLAG_IN_OVERVIEW, true) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(PINNED) + fun testIsStashed_pinnedInOverviewWithIme_isStashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, false) + stashController.updateStateForFlag(FLAG_IN_OVERVIEW, true) + stashController.updateStateForFlag(FLAG_STASHED_IME, true) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testIsStashed_pinnedTaskbarWithPinnedApp_isStashed() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, true) + stashController.updateStateForFlag(FLAG_STASHED_SYSUI, true) // App pinned. + stashController.applyState(0) + } + assertThat(stashController.isStashed).isTrue() + } + + @Test + fun testIsInStashedLauncherState_flagUnset_false() { + stashController.updateStateForFlag(FLAG_IN_STASHED_LAUNCHER_STATE, false) + assertThat(stashController.isInStashedLauncherState).isFalse() + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testIsInStashedLauncherState_flagSetInThreeButtonsMode_false() { + stashController.updateStateForFlag(FLAG_IN_STASHED_LAUNCHER_STATE, true) + assertThat(stashController.isInStashedLauncherState).isFalse() + } + + @Test + @TaskbarMode(PINNED) + fun testIsInStashedLauncherState_flagSetInPinnedMode_true() { + stashController.updateStateForFlag(FLAG_IN_STASHED_LAUNCHER_STATE, true) + assertThat(stashController.isInStashedLauncherState).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testIsTaskbarVisibleAndNotStashing_pinnedButNotVisible_false() { + getInstrumentation().runOnMainSync { + viewController.taskbarIconAlpha.get(ALPHA_INDEX_STASH).value = 0f + } + assertThat(stashController.isTaskbarVisibleAndNotStashing).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testIsTaskbarVisibleAndNotStashing_visibleButStashed_false() { + getInstrumentation().runOnMainSync { + viewController.taskbarIconAlpha.get(ALPHA_INDEX_STASH).value = 1f + } + assertThat(stashController.isTaskbarVisibleAndNotStashing).isFalse() + } + + @Test + @TaskbarMode(PINNED) + fun testIsTaskbarVisibleAndNotStashing_pinnedAndVisible_true() { + getInstrumentation().runOnMainSync { + viewController.taskbarIconAlpha.get(ALPHA_INDEX_STASH).value = 1f + } + assertThat(stashController.isTaskbarVisibleAndNotStashing).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testGetTouchableHeight_isStashed_stashedHeight() { + assertThat(stashController.touchableHeight).isEqualTo(stashController.stashedHeight) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testGetTouchableHeight_unstashedTransientMode_heightAndBottomMargin() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_STASHED_IN_APP_AUTO, false) + stashController.applyState(0) + } + + val expectedHeight = + activityContext.deviceProfile.taskbarProfile.run { height + bottomMargin } + assertThat(stashController.touchableHeight).isEqualTo(expectedHeight) + } + + @Test + @TaskbarMode(PINNED) + fun testGetTouchableHeight_pinnedMode_taskbarHeight() { + assertThat(stashController.touchableHeight) + .isEqualTo(activityContext.deviceProfile.taskbarProfile.height) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testGetContentHeightToReportToApps_transientMode_stashedHeight() { + assertThat(stashController.contentHeightToReportToApps) + .isEqualTo(stashController.stashedHeight) + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testGetContentHeightToReportToApps_threeButtonsMode_taskbarHeight() { + assertThat(stashController.contentHeightToReportToApps) + .isEqualTo(activityContext.deviceProfile.taskbarProfile.height) + } + + @Test + @TaskbarMode(PINNED) + fun testGetContentHeightToReportToApps_pinnedMode_taskbarHeight() { + assertThat(stashController.contentHeightToReportToApps) + .isEqualTo(activityContext.deviceProfile.taskbarProfile.height) + } + + @Test + @TaskbarMode(PINNED) + @UserSetupMode + fun testGetContentHeightToReportToApps_pinnedInSetupMode_setupWizardInsets() { + stashController.mNavbarHiddenOverrideForTest = false + assertThat(stashController.contentHeightToReportToApps) + .isEqualTo(context.resources.getDimensionPixelSize(R.dimen.taskbar_suw_insets)) + stashController.mNavbarHiddenOverrideForTest = null + } + + @Test + @UserSetupMode + fun testGetContentHeightToReportToApps_inExpressiveTheme_setupWizardInsets() { + stashController.mNavbarHiddenOverrideForTest = true + assertThat(stashController.contentHeightToReportToApps) + .isEqualTo(stashController.stashedHeight) + stashController.mNavbarHiddenOverrideForTest = null + } + + @Test + @TaskbarMode(PINNED) + fun testGetContentHeightToReportToApps_pinnedModeButFolded_stashedHeight() { + getInstrumentation().runOnMainSync { + stashedHandleViewController.stashedHandleAlpha.get(ALPHA_INDEX_STASHED).value = 1f + stashController.updateStateForFlag(FLAG_STASHED_SMALL_SCREEN, true) + } + assertThat(stashController.contentHeightToReportToApps) + .isEqualTo(stashController.stashedHeight) + } + + @Test + @TaskbarMode(PINNED) + fun testGetContentHeightToReportToApps_homeDisabledWhenFolded_zeroHeight() { + getInstrumentation().runOnMainSync { + stashedHandleViewController.stashedHandleAlpha.get(ALPHA_INDEX_STASHED).value = 1f + stashedHandleViewController.setIsHomeButtonDisabled(true) + stashController.updateStateForFlag(FLAG_STASHED_SMALL_SCREEN, true) + } + assertThat(stashController.contentHeightToReportToApps).isEqualTo(0) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testGetTappableHeightToReportToApps_transientMode_zeroHeight() { + assertThat(stashController.tappableHeightToReportToApps).isEqualTo(0) + } + + @Test + @TaskbarMode(PINNED) + fun testGetTappableHeightToReportToApps_pinnedMode_taskbarHeight() { + assertThat(stashController.tappableHeightToReportToApps) + .isEqualTo(activityContext.deviceProfile.taskbarProfile.height) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_unstashTaskbar_updatesState() { + getInstrumentation().runOnMainSync { + stashController.updateAndAnimateTransientTaskbar(false) + } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_runUnstashAnimation_startsTaskbarTimeout() { + getInstrumentation().runOnMainSync { + stashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashController.timeoutAlarm.alarmPending()).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testUpdateTaskbarTimeout_unPinnedTaskbarInDesktopMode_startsTaskbarTimeout() { + LauncherPrefs.get(context).put(TASKBAR_PINNING_IN_DESKTOP_MODE, false) + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + stashController.updateTaskbarTimeout(false) + assertThat(stashController.timeoutAlarm.alarmPending()).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testUpdateTaskbarTimeout_pinnedTaskbarInDesktopMode_shouldNotStartsTaskbarTimeout() { + LauncherPrefs.get(context).put(TASKBAR_PINNING_IN_DESKTOP_MODE, true) + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + stashController.updateTaskbarTimeout(false) + assertThat(stashController.timeoutAlarm.alarmPending()).isFalse() + } + + + @Test + @TaskbarMode(THREE_BUTTONS) + fun shouldAllowTaskbarToAutoStash_ThreeButtonNavTaskbar() { + assertThat(stashController.shouldAllowTaskbarToAutoStash()).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun shouldAllowTaskbarToAutoStash_transientTaskbar() { + assertThat(stashController.shouldAllowTaskbarToAutoStash()).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun toggleTaskbarStash_autoStashedDesktopModeTaskbar() { + LauncherPrefs.get(context).put(TASKBAR_PINNING_IN_DESKTOP_MODE, false) + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + + getInstrumentation().runOnMainSync { stashController.toggleTaskbarStash() } + + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_finishTaskbarTimeout_taskbarStashes() { + getInstrumentation().runOnMainSync { + stashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashController.timeoutAlarm.alarmPending()).isTrue() + + getInstrumentation().runOnMainSync { + stashController.timeoutAlarm.finishAlarm() + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_autoHideSuspendedForEdu_remainsUnstashed() { + getInstrumentation().runOnMainSync { + stashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_EDU_OPEN, true) + stashController.updateAndAnimateTransientTaskbar(true) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_unstashTaskbarWithBubbles_bubbleBarUnstashes() { + getInstrumentation().runOnMainSync { + bubbleBarViewController.setHiddenForBubbles(false) + bubbleStashController.stashBubbleBarImmediate() + stashController.updateAndAnimateTransientTaskbar(false, true) + } + assertThat(bubbleStashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_unstashTaskbarWithoutBubbles_bubbleBarStashed() { + getInstrumentation().runOnMainSync { + bubbleBarViewController.setHiddenForBubbles(false) + bubbleStashController.stashBubbleBarImmediate() + stashController.updateAndAnimateTransientTaskbar(false, false) + } + assertThat(bubbleStashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_stashTaskbarWithBubbles_bubbleBarStashes() { + getInstrumentation().runOnMainSync { + bubbleBarViewController.setHiddenForBubbles(false) + bubbleStashController.showBubbleBarImmediate() + stashController.updateAndAnimateTransientTaskbar(true, true) + } + assertThat(bubbleStashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbarInSplitCreation_stashTaskbarWithBubbles_bubbleBarStashes() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, false) + stashController.updateStateForFlag(FLAG_TASKBAR_HIDDEN, false) + stashController.updateStateForFlag(FLAG_STASHED_IN_APP_AUTO, true) + stashController.applyState(0) + bubbleBarViewController.setHiddenForBubbles(false) + bubbleStashController.showBubbleBarImmediate() + stashController.updateAndAnimateTransientTaskbar(true, true) + } + assertThat(bubbleStashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_stashTaskbarWithoutBubbles_bubbleBarUnstashed() { + getInstrumentation().runOnMainSync { + bubbleBarViewController.setHiddenForBubbles(false) + bubbleStashController.showBubbleBarImmediate() + stashController.updateAndAnimateTransientTaskbar(true, false) + } + assertThat(bubbleStashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUpdateAndAnimateTransientTaskbar_bubbleBarExpandedBeforeTimeout_expandedAfterwards() { + getInstrumentation().runOnMainSync { + bubbleBarViewController.setHiddenForBubbles(false) + bubbleBarViewController.animateExpanded(true) + stashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashController.timeoutAlarm.alarmPending()).isTrue() + + getInstrumentation().runOnMainSync { + stashController.timeoutAlarm.finishAlarm() + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(bubbleBarViewController.isExpanded).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testToggleTaskbarStash_pinnedMode_doesNothing() { + getInstrumentation().runOnMainSync { stashController.toggleTaskbarStash() } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testToggleTaskbarStash_transientMode_unstashesTaskbar() { + getInstrumentation().runOnMainSync { stashController.toggleTaskbarStash() } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testToggleTaskbarStash_twiceInTransientMode_stashesTaskbar() { + getInstrumentation().runOnMainSync { + stashController.toggleTaskbarStash() + stashController.toggleTaskbarStash() + } + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testToggleTaskbarStash_notInAppWithTransientMode_doesNothing() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, false) + stashController.applyState(0) + stashController.toggleTaskbarStash() + } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testAnimateTransientTaskbar_bubblesShownInOverview_stashesTaskbar() { + // Start in Overview. Should unstash Taskbar. + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_STASHED_IN_APP_AUTO, false) + stashController.updateStateForFlag(FLAG_IN_APP, false) + stashController.updateStateForFlag(FLAG_IN_OVERVIEW, true) + stashController.applyState(0) + } + assertThat(stashController.isStashed).isFalse() + + // Expand bubbles. Should stash Taskbar. + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(SYSUI_STATE_BUBBLES_EXPANDED, false) + animatorTestRule.advanceTimeBy(TASKBAR_STASH_DURATION) + } + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testAnimatePinnedTaskbar_imeShown_replacesIconsWithHandle() { + try { + activityContext.setImeDockedOverrideForTest(true) + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_VISIBLE, false) + animatorTestRule.advanceTimeBy(TASKBAR_STASH_DURATION_FOR_IME) + } + assertThat(viewController.areIconsVisible()).isFalse() + assertThat(stashedHandleViewController.isStashedHandleVisible).isTrue() + } finally { + activityContext.setImeDockedOverrideForTest(null) + } + } + + @Test + @TaskbarMode(PINNED) + fun testAnimatePinnedTaskbar_imeHidden_replacesHandleWithIcons() { + try { + activityContext.setImeDockedOverrideForTest(true) + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_VISIBLE, true) + animatorTestRule.advanceTimeBy(0) + } + + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(0, true) + animatorTestRule.advanceTimeBy(0) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isFalse() + assertThat(viewController.areIconsVisible()).isTrue() + } finally { + activityContext.setImeDockedOverrideForTest(null) + } + } + + @Test + @TaskbarMode(PINNED) + fun testAnimatePinnedTaskbar_imeHidden_verifyAnimationDuration() { + try { + activityContext.setImeDockedOverrideForTest(true) + // Start with IME shown. + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_VISIBLE, true) + animatorTestRule.advanceTimeBy(0) + } + + // Hide IME with animation. + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(0, false) + // Fast forward without start delay. + animatorTestRule.advanceTimeBy(TASKBAR_STASH_DURATION_FOR_IME) + } + // Icons should not be visible yet due to start delay. + assertThat(viewController.areIconsVisible()).isFalse() + + // Advance by start delay retroactively. Animation should complete. + getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(stashController.taskbarStashStartDelayForIme) + } + assertThat(viewController.areIconsVisible()).isTrue() + } finally { + activityContext.setImeDockedOverrideForTest(null) + } + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testAnimateThreeButtonsTaskbar_imeShown_hidesIconsAndBg() { + try { + activityContext.setImeDockedOverrideForTest(true) + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_VISIBLE, false) + animatorTestRule.advanceTimeBy(TASKBAR_STASH_DURATION_FOR_IME) + } + assertThat(stashController.isStashed).isTrue() + assertThat(viewController.areIconsVisible()).isFalse() + assertThat(dragLayerController.imeBgTaskbar.value).isEqualTo(0) + } finally { + activityContext.setImeDockedOverrideForTest(null) + } + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testAnimateThreeButtonsTaskbar_imeHidden_showsIconsAndBg() { + try { + activityContext.setImeDockedOverrideForTest(true) + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_VISIBLE, false) + animatorTestRule.advanceTimeBy(TASKBAR_STASH_DURATION_FOR_IME) + } + + getInstrumentation().runOnMainSync { + stashController.updateStateForSysuiFlags(0, false) + animatorTestRule.advanceTimeBy( + TASKBAR_STASH_DURATION_FOR_IME + stashController.taskbarStashStartDelayForIme + ) + } + assertThat(viewController.areIconsVisible()).isTrue() + assertThat(dragLayerController.imeBgTaskbar.value).isEqualTo(1) + } finally { + activityContext.setImeDockedOverrideForTest(null) + } + } + + @Test + @TaskbarMode(PINNED) + fun testSysuiStateImeShowingInApp_imeNotDocked_notStashedForIme() { + try { + activityContext.setImeDockedOverrideForTest(false) + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, true) + stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_VISIBLE, true) + } + + assertThat(stashController.isStashed).isFalse() + } finally { + activityContext.setImeDockedOverrideForTest(null) + } + } + + @Test + @TaskbarMode(PINNED) + fun testUnlockTransition_pinnedMode_fadesOutHandle() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_STASHED_DEVICE_LOCKED, true) + stashController.applyState(0) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isTrue() + + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_STASHED_DEVICE_LOCKED, false) + stashController.applyState() + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testUnlockTransition_transientMode_fadesOutHandleEarly() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, false) + stashController.updateStateForFlag(FLAG_STASHED_DEVICE_LOCKED, true) + stashController.applyState(0) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isTrue() + + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_STASHED_DEVICE_LOCKED, false) + stashController.applyState() + // Time it takes for just the handle to hide (full stash animation is longer). + animatorTestRule.advanceTimeBy(TRANSIENT_TASKBAR_STASH_ALPHA_DURATION) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun unstashTaskbar_inApp_navBarForciblyShown() { + val wmLayoutParamsCaptor = argumentCaptor() + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_IN_APP, true) + stashController.applyState(0) + stashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isFalse() + assertThat(stashController.isStashedInApp).isFalse() + + verify(context.windowManagerSpy, atLeastOnce()) + .updateViewLayout(any(), wmLayoutParamsCaptor.capture()) + assertThat(isNavBarForciblyShown(wmLayoutParamsCaptor.lastValue.forciblyShownTypes)) + .isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun stashTaskbar_inApp_withBubbleBarExpanded_navBarForciblyShown() { + val wmLayoutParamsCaptor = argumentCaptor() + getInstrumentation().runOnMainSync { + // unstash taskbar in an app + stashController.updateStateForFlag(FLAG_IN_APP, true) + stashController.applyState(0) + stashController.updateAndAnimateTransientTaskbar(false) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + + // suspend auto hide due to bubble bar and stash taskbar + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, true) + stashController.updateAndAnimateTransientTaskbar( + /* stash= */ true, + /* shouldBubblesFollow= */ false, + ) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isTrue() + assertThat(stashController.isStashedInApp).isTrue() + + // verify the nav bar window should be forcibly shown + verify(context.windowManagerSpy, atLeastOnce()) + .updateViewLayout(any(), wmLayoutParamsCaptor.capture()) + assertThat(isNavBarForciblyShown(wmLayoutParamsCaptor.lastValue.forciblyShownTypes)) + .isTrue() + + // unsuspend auto hide and verify that the nav bar window is no longer forcibly shown + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, false) + } + verify(context.windowManagerSpy, atLeastOnce()) + .updateViewLayout(any(), wmLayoutParamsCaptor.capture()) + assertThat(isNavBarForciblyShown(wmLayoutParamsCaptor.lastValue.forciblyShownTypes)) + .isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun stashTaskbar_taskbarAutohideSuspended_withForceShow_navBarForciblyShown() { + val wmLayoutParamsCaptor = argumentCaptor() + getInstrumentation().runOnMainSync { + // stash taskbar in an app + stashController.updateStateForFlag(FLAG_IN_APP, true) + stashController.applyState(0) + stashController.updateAndAnimateTransientTaskbar(true) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isTrue() + assertThat(stashController.isStashedInApp).isTrue() + + // verify the nav bar window is not forcibly shown + verify(context.windowManagerSpy, atLeastOnce()) + .updateViewLayout(any(), wmLayoutParamsCaptor.capture()) + assertThat(isNavBarForciblyShown(wmLayoutParamsCaptor.lastValue.forciblyShownTypes)) + .isFalse() + + // suspend auto hide for bubbles and verify that the nav bar window is forcibly shown + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_BUBBLES, true) + } + verify(context.windowManagerSpy, atLeastOnce()) + .updateViewLayout(any(), wmLayoutParamsCaptor.capture()) + assertThat(isNavBarForciblyShown(wmLayoutParamsCaptor.lastValue.forciblyShownTypes)) + .isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun stashTaskbar_taskbarAutohideSuspended_withoutForceShow_navBarNotForciblyShown() { + val wmLayoutParamsCaptor = argumentCaptor() + getInstrumentation().runOnMainSync { + // stash taskbar in an app + stashController.updateStateForFlag(FLAG_IN_APP, true) + stashController.applyState(0) + stashController.updateAndAnimateTransientTaskbar(true) + animatorTestRule.advanceTimeBy(stashController.stashDuration) + } + assertThat(stashedHandleViewController.isStashedHandleVisible).isTrue() + assertThat(stashController.isStashedInApp).isTrue() + + // verify the nav bar window is not forcibly shown + verify(context.windowManagerSpy, atLeastOnce()) + .updateViewLayout(any(), wmLayoutParamsCaptor.capture()) + assertThat(isNavBarForciblyShown(wmLayoutParamsCaptor.lastValue.forciblyShownTypes)) + .isFalse() + + // suspend auto hide in a way that does not force show taskbar and verify that the nav bar + // window is not forcibly shown + getInstrumentation().runOnMainSync { + autohideSuspendController.updateFlag(FLAG_AUTOHIDE_SUSPEND_GROWTH_NUDGE_OPEN, true) + } + verify(context.windowManagerSpy, atLeastOnce()) + .updateViewLayout(any(), wmLayoutParamsCaptor.capture()) + assertThat(isNavBarForciblyShown(wmLayoutParamsCaptor.lastValue.forciblyShownTypes)) + .isFalse() + } + + private fun isNavBarForciblyShown(forciblyShownTypes: Int): Boolean = + (forciblyShownTypes and WindowInsets.Type.navigationBars()) != 0 +} + +private fun TaskbarStashController.updateStateForFlag(flag: Int, value: Boolean) { + updateStateForFlag(flag.toLong(), value) +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarUnitTestRule.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarUnitTestRule.kt deleted file mode 100644 index a999e7f7de8..00000000000 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarUnitTestRule.kt +++ /dev/null @@ -1,164 +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.launcher3.taskbar - -import android.app.Instrumentation -import android.app.PendingIntent -import android.content.IIntentSender -import android.content.Intent -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.rule.ServiceTestRule -import com.android.launcher3.LauncherAppState -import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks -import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR -import com.android.launcher3.util.LauncherMultivalentJUnit.Companion.isRunningInRobolectric -import com.android.quickstep.AllAppsActionManager -import com.android.quickstep.TouchInteractionService -import com.android.quickstep.TouchInteractionService.TISBinder -import org.junit.Assume.assumeTrue -import org.junit.rules.MethodRule -import org.junit.runners.model.FrameworkMethod -import org.junit.runners.model.Statement - -/** - * Manages the Taskbar lifecycle for unit tests. - * - * See [InjectController] for grabbing controller(s) under test with minimal boilerplate. - * - * The rule interacts with [TaskbarManager] on the main thread. A good rule of thumb for tests is - * that code that is executed on the main thread in production should also happen on that thread - * when tested. - * - * `@UiThreadTest` is a simple way to run an entire test body on the main thread. But if a test - * executes code that appends message(s) to the main thread's `MessageQueue`, the annotation will - * prevent those messages from being processed until after the test body finishes. - * - * To test pending messages, instead use something like [Instrumentation.runOnMainSync] to perform - * only sections of the test body on the main thread synchronously: - * ``` - * @Test - * fun example() { - * instrumentation.runOnMainSync { doWorkThatPostsMessage() } - * // Second lambda will not execute until message is processed. - * instrumentation.runOnMainSync { verifyMessageResults() } - * } - * ``` - */ -class TaskbarUnitTestRule : MethodRule { - private val instrumentation = InstrumentationRegistry.getInstrumentation() - private val serviceTestRule = ServiceTestRule() - - private lateinit var taskbarManager: TaskbarManager - private lateinit var target: Any - - val activityContext: TaskbarActivityContext - get() { - return taskbarManager.currentActivityContext - ?: throw RuntimeException("Failed to obtain TaskbarActivityContext.") - } - - override fun apply(base: Statement, method: FrameworkMethod, target: Any): Statement { - return object : Statement() { - override fun evaluate() { - this@TaskbarUnitTestRule.target = target - - val context = instrumentation.targetContext - instrumentation.runOnMainSync { - assumeTrue( - LauncherAppState.getIDP(context).getDeviceProfile(context).isTaskbarPresent - ) - } - - // Check for existing Taskbar instance from Launcher process. - val launcherTaskbarManager: TaskbarManager? = - if (!isRunningInRobolectric) { - try { - val tisBinder = - serviceTestRule.bindService( - Intent(context, TouchInteractionService::class.java) - ) as? TISBinder - tisBinder?.taskbarManager - } catch (_: Exception) { - null - } - } else { - null - } - - instrumentation.runOnMainSync { - taskbarManager = - TaskbarManager( - context, - AllAppsActionManager(context, UI_HELPER_EXECUTOR) { - PendingIntent(IIntentSender.Default()) - }, - object : TaskbarNavButtonCallbacks {}, - ) - } - - try { - // Replace Launcher Taskbar window with test instance. - instrumentation.runOnMainSync { - launcherTaskbarManager?.removeTaskbarRootViewFromWindow() - taskbarManager.onUserUnlocked() // Required to complete initialization. - } - - injectControllers() - base.evaluate() - } finally { - // Revert Taskbar window. - instrumentation.runOnMainSync { - taskbarManager.destroy() - launcherTaskbarManager?.addTaskbarRootViewToWindow() - } - } - } - } - } - - /** Simulates Taskbar recreation lifecycle. */ - fun recreateTaskbar() { - taskbarManager.recreateTaskbar() - injectControllers() - } - - private fun injectControllers() { - val controllers = activityContext.controllers - val controllerFieldsByType = controllers.javaClass.fields.associateBy { it.type } - target.javaClass.fields - .filter { it.isAnnotationPresent(InjectController::class.java) } - .forEach { - it.set( - target, - controllerFieldsByType[it.type]?.get(controllers) - ?: throw NoSuchElementException("Failed to find controller for ${it.type}"), - ) - } - } - - /** - * Annotates test controller fields to inject the corresponding controllers from the current - * [TaskbarControllers] instance. - * - * Controllers are injected during test setup and upon calling [recreateTaskbar]. - * - * Multiple controllers can be injected if needed. - */ - @Retention(AnnotationRetention.RUNTIME) - @Target(AnnotationTarget.FIELD) - annotation class InjectController -} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewControllerTest.kt new file mode 100644 index 00000000000..b13eafe5bb1 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewControllerTest.kt @@ -0,0 +1,236 @@ +/* + * 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.launcher3.taskbar + +import android.view.View +import com.android.launcher3.taskbar.TaskbarViewController.DIVIDER_VIEW_POSITION_OFFSET +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +/** + * Legend for the comments below: + * ``` + * A: All Apps Button + * H: Hotseat item + * |: Divider + * R: Recent item + * ``` + * + * The comments are formatted in two lines: + * ``` + * // Items in taskbar, e.g. A | HHHHHH + * // Index of items relative to Hotseat: -1 -.5 012345 + * ``` + */ +class TaskbarViewControllerTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var taskbarViewController: TaskbarViewController + + @Test + fun testGetPositionInHotseat_allAppsButton_nonRtl() { + val position = + taskbarViewController.getPositionInHotseat( + /* numShownHotseatIcons = */ 6, + /* child = */ View(context), + /* isRtl = */ false, + /* isAllAppsButton = */ true, + /* isTaskbarDividerView = */ false, + /* isDividerForRecents = */ false, + /* recentTaskIndex = */ -1, + ) + // [>A<] | [HHHHHH] + // -1 -.5 012345 + assertThat(position).isEqualTo(-1) + } + + @Test + fun testGetPositionInHotseat_allAppsButton_rtl() { + val numShownHotseatIcons = 6 + val position = + taskbarViewController.getPositionInHotseat( + /* numShownHotseatIcons = */ numShownHotseatIcons, + /* child = */ View(context), + /* isRtl = */ true, + /* isAllAppsButton = */ true, + /* isTaskbarDividerView = */ false, + /* isDividerForRecents = */ false, + /* recentTaskIndex = */ -1, + ) + // [HHHHHH] | [>A<] + // 012345 5.5 6 + assertThat(position).isEqualTo(numShownHotseatIcons) + } + + @Test + fun testGetPositionInHotseat_dividerView_notForRecents_nonRtl() { + val position = + taskbarViewController.getPositionInHotseat( + /* numShownHotseatIcons = */ 6, + /* child = */ View(context), + /* isRtl = */ false, + /* isAllAppsButton = */ false, + /* isTaskbarDividerView = */ true, + /* isDividerForRecents = */ false, + /* recentTaskIndex = */ -1, + ) + // [A] >|< [HHHHHH] + // -1 -.5 012345 + assertThat(position).isEqualTo(-DIVIDER_VIEW_POSITION_OFFSET) + } + + @Test + fun testGetPositionInHotseat_dividerView_forRecents_nonRtl() { + val numShownHotseatIcons = 6 + val position = + taskbarViewController.getPositionInHotseat( + /* numShownHotseatIcons = */ numShownHotseatIcons, + /* child = */ View(context), + /* isRtl = */ false, + /* isAllAppsButton = */ false, + /* isTaskbarDividerView = */ true, + /* isDividerForRecents = */ true, + /* recentTaskIndex = */ -1, + ) + // [A] [HHHHHH] >|< [RR] + // -1 012345 5.5 67 + assertThat(position).isEqualTo(numShownHotseatIcons - DIVIDER_VIEW_POSITION_OFFSET) + } + + @Test + fun testGetPositionInHotseat_dividerView_notForRecents_rtl() { + val numShownHotseatIcons = 6 + val position = + taskbarViewController.getPositionInHotseat( + /* numShownHotseatIcons = */ numShownHotseatIcons, + /* child = */ View(context), + /* isRtl = */ true, + /* isAllAppsButton = */ false, + /* isTaskbarDividerView = */ true, + /* isDividerForRecents = */ false, + /* recentTaskIndex = */ -1, + ) + // [HHHHHH] >|< [A] + // 012345 5.5 6 + assertThat(position).isEqualTo(numShownHotseatIcons - DIVIDER_VIEW_POSITION_OFFSET) + } + + @Test + fun testGetPositionInHotseat_dividerView_forRecents_rtl() { + val numShownHotseatIcons = 6 + val position = + taskbarViewController.getPositionInHotseat( + /* numShownHotseatIcons = */ numShownHotseatIcons, + /* child = */ View(context), + /* isRtl = */ true, + /* isAllAppsButton = */ false, + /* isTaskbarDividerView = */ true, + /* isDividerForRecents = */ true, + /* recentTaskIndex = */ -1, + ) + // [HHHHHH][A] >|< [RR] + // 012345 6 6.5 78 + assertThat(position).isEqualTo(numShownHotseatIcons + DIVIDER_VIEW_POSITION_OFFSET) + } + + @Test + fun testGetPositionInHotseat_recentTasks_firstRecentIndex_nonRtl() { + val numShownHotseatIcons = 6 + val recentTaskIndex = 0 + val position = + taskbarViewController.getPositionInHotseat( + /* numShownHotseatIcons = */ numShownHotseatIcons, + /* child = */ View(context), + /* isRtl = */ false, + /* isAllAppsButton = */ false, + /* isTaskbarDividerView = */ false, + /* isDividerForRecents = */ false, + /* recentTaskIndex = */ recentTaskIndex, + ) + // [A][HHHHHH] | [>RR<] + // -1 012345 5.5 6 7 + assertThat(position).isEqualTo(numShownHotseatIcons + recentTaskIndex) + } + + @Test + fun testGetPositionInHotseat_recentTasks_firstRecentIndex_rtl() { + val numShownHotseatIcons = 6 + val recentTaskIndex = 0 + val position = + taskbarViewController.getPositionInHotseat( + /* numShownHotseatIcons = */ numShownHotseatIcons, + /* child = */ View(context), + /* isRtl = */ true, + /* isAllAppsButton = */ false, + /* isTaskbarDividerView = */ false, + /* isDividerForRecents = */ false, + /* recentTaskIndex = */ recentTaskIndex, + ) + // [HHHHHH][A] | [>RR<] + // 012345 6 6.5 7 8 + assertThat(position).isEqualTo(numShownHotseatIcons + 1 + recentTaskIndex) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewTest.kt new file mode 100644 index 00000000000..aa6457dfbb7 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewTest.kt @@ -0,0 +1,702 @@ +/* + * 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.launcher3.taskbar + +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.View +import androidx.core.view.children +import com.android.launcher3.R +import com.android.launcher3.apppairs.AppPairIcon +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.TaskbarIconType.ALL_APPS +import com.android.launcher3.taskbar.TaskbarIconType.DIVIDER +import com.android.launcher3.taskbar.TaskbarIconType.HANDOFF_SUGGESTION +import com.android.launcher3.taskbar.TaskbarIconType.HOTSEAT +import com.android.launcher3.taskbar.TaskbarIconType.OVERFLOW +import com.android.launcher3.taskbar.TaskbarIconType.RECENT +import com.android.launcher3.taskbar.TaskbarViewTestUtil.assertThat +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHandoffSuggestions +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatItems +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createRecents +import com.android.launcher3.taskbar.TaskbarViewTestUtil.createSplitTask +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.ForceRtl +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.window.flags.Flags.FLAG_ENABLE_OVERFLOW_BUTTON_FOR_TASKBAR_PINNED_ITEMS +import com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_OVERFLOW +import com.google.common.truth.Truth +import org.junit.Before +import org.junit.Ignore +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.whenever + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +@EnableFlags(FLAG_ENABLE_TASKBAR_OVERFLOW) +class TaskbarViewTest { + + @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() + @get:Rule(order = 1) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 2) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var viewController: TaskbarViewController + private lateinit var taskbarView: TaskbarView + + private val iconViews: Array + get() = taskbarView.iconViews + + private val desktopVisibilityController: DesktopVisibilityController + get() = DesktopVisibilityController.INSTANCE[context] + + private val maxShownRecents: Int + get() = taskbarView.maxNumIconViews - 2 // Account for All Apps and Divider. + + private val maxShownHotseat: Int + get() = taskbarUnitTestRule.activityContext.taskbarSpecsEvaluator.numShownHotseatIcons + + @Before + fun obtainView() { + taskbarView = taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + } + + @Test + fun testUpdateItems_noItems_hasOnlyAllApps() { + runOnMainSync { taskbarView.updateItems(emptyArray(), emptyList(), emptyList()) } + assertThat(taskbarView).hasIconTypes(ALL_APPS) + } + + @Test + fun testUpdateItems_hotseatItems_hasDividerBetweenAllAppsAndHotseat() { + runOnMainSync { taskbarView.updateItems(createHotseatItems(2), emptyList(), emptyList()) } + assertThat(taskbarView).hasIconTypes(ALL_APPS, DIVIDER, HOTSEAT, HOTSEAT) + } + + @Test + @ForceRtl + fun testUpdateItems_rtlWithHotseatItems_hasDividerBetweenHotseatAndAllApps() { + runOnMainSync { taskbarView.updateItems(createHotseatItems(2), emptyList(), emptyList()) } + assertThat(taskbarView).hasIconTypes(HOTSEAT, HOTSEAT, DIVIDER, ALL_APPS) + } + + @Test + fun testUpdateItems_withNullHotseatItem_filtersNullItem() { + runOnMainSync { + taskbarView.updateItems(arrayOf(*createHotseatItems(2), null), emptyList(), emptyList()) + } + assertThat(taskbarView).hasIconTypes(ALL_APPS, DIVIDER, HOTSEAT, HOTSEAT) + } + + @Test + @ForceRtl + fun testUpdateItems_rtlWithNullHotseatItem_filtersNullItem() { + runOnMainSync { + taskbarView.updateItems(arrayOf(*createHotseatItems(2), null), emptyList(), emptyList()) + } + assertThat(taskbarView).hasIconTypes(HOTSEAT, HOTSEAT, DIVIDER, ALL_APPS) + } + + @Test + fun testUpdateItems_recentsItems_hasDividerBetweenAllAppsAndRecents() { + runOnMainSync { taskbarView.updateItems(emptyArray(), createRecents(4), emptyList()) } + assertThat(taskbarView).hasIconTypes(ALL_APPS, DIVIDER, *RECENT * 4) + } + + @Test + fun testUpdateItems_hotseatItemsAndRecents_hasDividerBetweenHotseatAndRecents() { + runOnMainSync { + taskbarView.updateItems(createHotseatItems(3), createRecents(2), emptyList()) + } + assertThat(taskbarView).hasIconTypes(ALL_APPS, *HOTSEAT * 3, DIVIDER, *RECENT * 2) + } + + @Test + fun testUpdateItems_addHotseatItem_updatesHotseat() { + runOnMainSync { + taskbarView.updateItems( + createHotseatItems(1), + createRecents(1), + createHandoffSuggestions(1), + ) + taskbarView.updateItems( + createHotseatItems(2), + createRecents(1), + createHandoffSuggestions(1), + ) + } + assertThat(taskbarView) + .hasIconTypes(ALL_APPS, *HOTSEAT * 2, DIVIDER, RECENT, HANDOFF_SUGGESTION) + } + + @Test + fun testUpdateItems_removeHotseatItem_updatesHotseat() { + runOnMainSync { + taskbarView.updateItems( + createHotseatItems(2), + createRecents(1), + createHandoffSuggestions(1), + ) + taskbarView.updateItems( + createHotseatItems(1), + createRecents(1), + createHandoffSuggestions(1), + ) + } + assertThat(taskbarView).hasIconTypes(ALL_APPS, HOTSEAT, DIVIDER, RECENT, HANDOFF_SUGGESTION) + } + + @Test + fun testUpdateItems_addRecentsItem_updatesRecents() { + runOnMainSync { + taskbarView.updateItems( + createHotseatItems(1), + createRecents(1), + createHandoffSuggestions(1), + ) + taskbarView.updateItems( + createHotseatItems(1), + createRecents(2), + createHandoffSuggestions(1), + ) + } + assertThat(taskbarView) + .hasIconTypes(ALL_APPS, HOTSEAT, DIVIDER, *RECENT * 2, HANDOFF_SUGGESTION) + } + + @Test + fun testUpdateItems_removeRecentsItem_updatesRecents() { + runOnMainSync { + taskbarView.updateItems( + createHotseatItems(1), + createRecents(2), + createHandoffSuggestions(1), + ) + taskbarView.updateItems( + createHotseatItems(1), + createRecents(1), + createHandoffSuggestions(1), + ) + } + assertThat(taskbarView).hasIconTypes(ALL_APPS, HOTSEAT, DIVIDER, RECENT, HANDOFF_SUGGESTION) + } + + @Test + fun testUpdateItems_addHandoffSuggestion_updatesHandoffSuggestions() { + runOnMainSync { + taskbarView.updateItems(createHotseatItems(1), createRecents(1), emptyList()) + taskbarView.updateItems( + createHotseatItems(1), + createRecents(1), + createHandoffSuggestions(1), + ) + } + assertThat(taskbarView).hasIconTypes(ALL_APPS, HOTSEAT, DIVIDER, RECENT, HANDOFF_SUGGESTION) + } + + @Test + fun testUpdateItems_removeHandoffSuggestion_updatesHandoffSuggestions() { + runOnMainSync { + taskbarView.updateItems( + createHotseatItems(1), + createRecents(1), + createHandoffSuggestions(1), + ) + taskbarView.updateItems(createHotseatItems(1), createRecents(1), emptyList()) + } + assertThat(taskbarView).hasIconTypes(ALL_APPS, HOTSEAT, DIVIDER, RECENT) + } + + @Test + fun testUpdateItem_addHotseatItemAfterRecentsItem_hotseatItemBeforeDivider() { + runOnMainSync { + taskbarView.updateItems(emptyArray(), createRecents(1), emptyList()) + taskbarView.updateItems(createHotseatItems(1), createRecents(1), emptyList()) + } + assertThat(taskbarView).hasIconTypes(ALL_APPS, HOTSEAT, DIVIDER, RECENT) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_hotseatItems_hasDividerBetweenHotseatAndAllApps() { + runOnMainSync { taskbarView.updateItems(createHotseatItems(2), emptyList(), emptyList()) } + assertThat(taskbarView).hasIconTypes(*HOTSEAT * 2, DIVIDER, ALL_APPS) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_recentsItems_hasDividerBetweenRecentsAndAllApps() { + runOnMainSync { taskbarView.updateItems(emptyArray(), createRecents(4), emptyList()) } + assertThat(taskbarView).hasIconTypes(*RECENT * 4, DIVIDER, ALL_APPS) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_recentsItems_recentsAreReversed() { + runOnMainSync { taskbarView.updateItems(emptyArray(), createRecents(4), emptyList()) } + assertThat(taskbarView).hasRecentsOrder(startIndex = 0, expectedIds = listOf(3, 2, 1, 0)) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_hotseatItemsAndRecents_hasDividerBetweenRecentsAndHotseat() { + runOnMainSync { + taskbarView.updateItems(createHotseatItems(3), createRecents(2), emptyList()) + } + assertThat(taskbarView).hasIconTypes(*RECENT * 2, DIVIDER, *HOTSEAT * 3, ALL_APPS) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_addHotseatItemWithoutRecents_updatesHotseat() { + runOnMainSync { + taskbarView.updateItems(createHotseatItems(1), emptyList(), emptyList()) + taskbarView.updateItems(createHotseatItems(2), emptyList(), emptyList()) + } + assertThat(taskbarView).hasIconTypes(*HOTSEAT * 2, DIVIDER, ALL_APPS) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_addHotseatItemWithRecents_updatesHotseat() { + runOnMainSync { + taskbarView.updateItems(createHotseatItems(1), createRecents(1), emptyList()) + taskbarView.updateItems(createHotseatItems(2), createRecents(1), emptyList()) + } + assertThat(taskbarView).hasIconTypes(RECENT, DIVIDER, *HOTSEAT * 2, ALL_APPS) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_removeHotseatItem_updatesHotseat() { + runOnMainSync { + taskbarView.updateItems(createHotseatItems(2), createRecents(1), emptyList()) + taskbarView.updateItems(createHotseatItems(1), createRecents(1), emptyList()) + } + assertThat(taskbarView).hasIconTypes(RECENT, DIVIDER, HOTSEAT, ALL_APPS) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_addRecentsItem_updatesRecents() { + runOnMainSync { + taskbarView.updateItems(createHotseatItems(1), createRecents(1), emptyList()) + taskbarView.updateItems(createHotseatItems(1), createRecents(2), emptyList()) + } + assertThat(taskbarView).hasIconTypes(*RECENT * 2, DIVIDER, HOTSEAT, ALL_APPS) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_removeRecentsItem_updatesRecents() { + runOnMainSync { + taskbarView.updateItems(createHotseatItems(1), createRecents(2), emptyList()) + taskbarView.updateItems(createHotseatItems(1), createRecents(1), emptyList()) + } + assertThat(taskbarView).hasIconTypes(RECENT, DIVIDER, HOTSEAT, ALL_APPS) + } + + @Test + fun testUpdateItems_addRecentsItem_viewAddedOnRight() { + runOnMainSync { + taskbarView.updateItems(emptyArray(), createRecents(1), emptyList()) + val prevIconViews = iconViews + + val newRecents = createRecents(2) + taskbarView.updateItems(emptyArray(), newRecents, emptyList()) + + assertThat(taskbarView).hasRecentsOrder(startIndex = 2, expectedIds = listOf(0, 1)) + Truth.assertThat(iconViews[2]).isSameInstanceAs(prevIconViews[2]) + Truth.assertThat(iconViews.last() in prevIconViews).isFalse() + } + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_addRecentsItem_viewAddedOnLeft() { + runOnMainSync { + taskbarView.updateItems(emptyArray(), createRecents(1), emptyList()) + val prevIconViews = iconViews + + val newRecents = createRecents(2) + taskbarView.updateItems(emptyArray(), newRecents, emptyList()) + + assertThat(taskbarView).hasRecentsOrder(startIndex = 0, expectedIds = listOf(1, 0)) + Truth.assertThat(iconViews[1]).isSameInstanceAs(prevIconViews.first()) + Truth.assertThat(iconViews.first() in prevIconViews).isFalse() + } + } + + @Test + fun testUpdateItems_removeFirstRecentsItem_correspondingViewRemoved() { + runOnMainSync { + val recents = createRecents(2) + taskbarView.updateItems(emptyArray(), recents, emptyList()) + + val expectedViewToRemove = iconViews[2] + Truth.assertThat(expectedViewToRemove.tag).isEqualTo(recents.first()) + + taskbarView.updateItems(emptyArray(), listOf(recents.last()), emptyList()) + Truth.assertThat(expectedViewToRemove in iconViews).isFalse() + } + } + + @Test + fun testUpdateItems_removeLastRecentsItem_correspondingViewRemoved() { + runOnMainSync { + val recents = createRecents(2) + taskbarView.updateItems(emptyArray(), recents, emptyList()) + + val expectedViewToRemove = iconViews[3] + Truth.assertThat(expectedViewToRemove.tag).isEqualTo(recents.last()) + + taskbarView.updateItems(emptyArray(), listOf(recents.first()), emptyList()) + Truth.assertThat(expectedViewToRemove in iconViews).isFalse() + } + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_removeFirstRecentsItem_correspondingViewRemoved() { + runOnMainSync { + val recents = createRecents(2) + taskbarView.updateItems(emptyArray(), recents, emptyList()) + + val expectedViewToRemove = iconViews[1] + Truth.assertThat(expectedViewToRemove.tag).isEqualTo(recents.first()) + + taskbarView.updateItems(emptyArray(), listOf(recents.last()), emptyList()) + Truth.assertThat(expectedViewToRemove in iconViews).isFalse() + } + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_removeLastRecentsItem_correspondingViewRemoved() { + runOnMainSync { + val recents = createRecents(2) + taskbarView.updateItems(emptyArray(), recents, emptyList()) + + val expectedViewToRemove = iconViews[0] + Truth.assertThat(expectedViewToRemove.tag).isEqualTo(recents.last()) + + taskbarView.updateItems(emptyArray(), listOf(recents.first()), emptyList()) + Truth.assertThat(expectedViewToRemove in iconViews).isFalse() + } + } + + @Test + fun testUpdateItems_desktopMode_hotseatItem_noDivider() { + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + runOnMainSync { taskbarView.updateItems(createHotseatItems(1), emptyList(), emptyList()) } + assertThat(taskbarView).hasIconTypes(ALL_APPS, HOTSEAT) + } + + @Test + @Ignore("b/435259563") + fun testUpdateItems_desktopMode_hotseatItem_noDividerAfterDesktopModeChange() { + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(false) + runOnMainSync { taskbarView.updateItems(createHotseatItems(1), emptyList(), emptyList()) } + + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + runOnMainSync { taskbarView.updateItems(createHotseatItems(2), emptyList(), emptyList()) } + + assertThat(taskbarView).hasIconTypes(ALL_APPS, HOTSEAT, HOTSEAT) + } + + @Test + @ForceRtl + fun testUpdateItems_rtlAndDesktopMode_hotseatItem_noDivider() { + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + runOnMainSync { taskbarView.updateItems(createHotseatItems(1), emptyList(), emptyList()) } + assertThat(taskbarView).hasIconTypes(HOTSEAT, ALL_APPS) + } + + @Test + fun testUpdateItems_desktopMode_recentItem_hasDivider() { + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + runOnMainSync { taskbarView.updateItems(emptyArray(), createRecents(1), emptyList()) } + assertThat(taskbarView).hasIconTypes(ALL_APPS, DIVIDER, RECENT) + } + + @Test + @ForceRtl + fun testUpdateItems_rtlAndDesktopMode_recentItem_hasDivider() { + whenever(desktopVisibilityController.isInDesktopMode(context.displayId)).thenReturn(true) + runOnMainSync { taskbarView.updateItems(emptyArray(), createRecents(1), emptyList()) } + assertThat(taskbarView).hasIconTypes(RECENT, DIVIDER, ALL_APPS) + } + + @Test + fun testUpdateItems_maxRecents_noOverflow() { + runOnMainSync { + taskbarView.updateItems(emptyArray(), createRecents(maxShownRecents), emptyList()) + } + assertThat(taskbarView).hasIconTypes(ALL_APPS, DIVIDER, *RECENT * maxShownRecents) + } + + @Test + fun testUpdateItems_moreThanMaxRecents_overflowShownBeforeRecents() { + val recentsSize = maxShownRecents + 2 + runOnMainSync { + taskbarView.updateItems(emptyArray(), createRecents(recentsSize), emptyList()) + } + + val expectedNumRecents = RECENT * getExpectedNumRecentsWithOverflow() + assertThat(taskbarView).hasIconTypes(ALL_APPS, DIVIDER, OVERFLOW, *expectedNumRecents) + } + + @Test + fun testUpdateItems_clearAllRecentsAfterOverflow_recentsEmpty() { + val recentsSize = maxShownRecents + 2 + runOnMainSync { + taskbarView.updateItems(emptyArray(), createRecents(recentsSize), emptyList()) + taskbarView.updateItems(emptyArray(), emptyList(), emptyList()) + } + + assertThat(taskbarView).hasIconTypes(ALL_APPS) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_moreThanMaxRecents_overflowShownAfterRecents() { + val recentsSize = maxShownRecents + 2 + runOnMainSync { + taskbarView.updateItems(emptyArray(), createRecents(recentsSize), emptyList()) + } + + val expectedRecents = RECENT * getExpectedNumRecentsWithOverflow() + assertThat(taskbarView).hasIconTypes(*expectedRecents, OVERFLOW, DIVIDER, ALL_APPS) + } + + @Test + fun testUpdateItems_moreThanMaxRecentsWithHotseat_fewerRecentsShown() { + val hotseatSize = 4 + val recentsSize = maxShownRecents + 2 + runOnMainSync { + taskbarView.updateItems( + createHotseatItems(hotseatSize), + createRecents(recentsSize), + emptyList(), + ) + } + + val expectedRecents = RECENT * getExpectedNumRecentsWithOverflow(hotseatSize) + assertThat(taskbarView) + .hasIconTypes(ALL_APPS, *HOTSEAT * hotseatSize, DIVIDER, OVERFLOW, *expectedRecents) + } + + @Test + @ForceRtl + fun testUpdateItems_rtl_moreThanMaxRecentsWithHotseat_fewerRecentsShown() { + val hotseatSize = 4 + val recentsSize = maxShownRecents + 2 + runOnMainSync { + taskbarView.updateItems( + createHotseatItems(hotseatSize), + createRecents(recentsSize), + emptyList(), + ) + } + + val expectedRecents = RECENT * getExpectedNumRecentsWithOverflow(hotseatSize) + assertThat(taskbarView) + .hasIconTypes(*expectedRecents, OVERFLOW, DIVIDER, *HOTSEAT * hotseatSize, ALL_APPS) + } + + @Test + fun testUpdateItems_moreThanMaxRecents_verifyShownRecentsOrder() { + val recentsSize = maxShownRecents + 2 + runOnMainSync { + taskbarView.updateItems(emptyArray(), createRecents(recentsSize), emptyList()) + } + + val expectedNumRecents = getExpectedNumRecentsWithOverflow() + assertThat(taskbarView) + .hasRecentsOrder( + startIndex = iconViews.size - expectedNumRecents, + expectedIds = ((recentsSize - expectedNumRecents).. { + return Array(size) { createHotseatWorkspaceItem(it) } + } + + fun createHotseatWorkspaceItem(id: Int = 0): WorkspaceItemInfo { + return createTestWorkspaceItem( + id, + "Test App $id", + testIntent(id), + Process.myUserHandle(), + CONTAINER_HOTSEAT, + ) + } + + // Helper to create a test WorkspaceItemInfo + fun createTestWorkspaceItem( + id: Int, + title: String, + intent: Intent, + user: android.os.UserHandle, + container: Int, + ): WorkspaceItemInfo { + val item = WorkspaceItemInfo() + item.id = id + item.title = title + item.intent = intent + item.user = user + item.container = container + // Create a placeholder icon so that the test doesn't try to load a high-res icon. + item.bitmap = + BitmapInfo( + icon = createBitmap(1, 1, Bitmap.Config.ALPHA_8), + color = 0, + themedBitmap = ThemedBitmap.NOT_SUPPORTED, + ) + return item + } + + fun createHotseatAppPairsItem(): AppPairInfo { + return AppPairInfo().apply { + add(createHotseatWorkspaceItem(1)) + add(createHotseatWorkspaceItem(2)) + } + } + + fun createHotseatFolderItem(): FolderInfo { + return FolderInfo().apply { + title = "Test Folder" + add(createHotseatWorkspaceItem(1)) + add(createHotseatWorkspaceItem(2)) + add(createHotseatWorkspaceItem(3)) + } + } + + /** Creates a list of fake recent tasks. */ + fun createRecents(size: Int): List { + return List(size) { createRecentTask(it) } + } + + fun createRecentTask(id: Int = 0): GroupTask = SingleTask(createTask(id)) + + fun createSplitTask(id: Int = 0): SplitTask = + SplitTask(createTask(id), createTask(id + 1), splitBounds = null) + + fun createHandoffSuggestions(size: Int): List { + return List(size) { createHandoffSuggestion(it) } + } + + fun createHandoffSuggestion(id: Int = 0): HandoffSuggestion { + val remoteTask = RemoteTask.Builder(1).setDeviceId(id).build() + return HandoffSuggestion(remoteTask) + } + + private fun createTask(id: Int): Task { + return Task().apply { + title = "Task$id" + key = + TaskKey( + id, + 5, + testIntent(id), + testComponent(id), + Process.myUserHandle().identifier, + System.currentTimeMillis(), + ) + } + } +} + +/** A `Truth` [Subject] with extensions for verifying [TaskbarView]. */ +class TaskbarViewSubject(failureMetadata: FailureMetadata, private val view: TaskbarView?) : + Subject(failureMetadata, view) { + + /** Verifies that the types of icons match [expectedTypes] in order. */ + fun hasIconTypes(vararg expectedTypes: TaskbarIconType) { + val actualTypes = + view?.iconViews?.map { + when (it) { + view.allAppsButtonContainer -> ALL_APPS + view.taskbarDividerViewContainer -> DIVIDER + view.taskbarRecentsOverflowView -> OVERFLOW + view.taskbarPinnedOverflowView -> OVERFLOW + else -> + when (it.tag) { + is ItemInfo -> HOTSEAT + is GroupTask -> RECENT + is HandoffSuggestion -> HANDOFF_SUGGESTION + else -> throw IllegalStateException("Unknown type for $it") + } + } + } + assertThat(actualTypes).containsExactly(*expectedTypes).inOrder() + } + + /** Verifies that recents from [startIndex] have IDs that match [expectedIds] in order. */ + fun hasRecentsOrder(startIndex: Int, expectedIds: List) { + val actualIds = + view?.iconViews?.slice(startIndex.. task.key.id } + } + assertThat(actualIds).containsExactlyElementsIn(expectedIds).inOrder() + } +} + +/** Types of icons in the [TaskbarView]. */ +enum class TaskbarIconType { + ALL_APPS, + DIVIDER, + HOTSEAT, + RECENT, + OVERFLOW, + HANDOFF_SUGGESTION; + + operator fun times(size: Int) = Array(size) { this } +} + +private const val TEST_PACKAGE = "com.android.launcher3.taskbar" +private val testComponent = { i: Int -> ComponentName(TEST_PACKAGE, "Activity $i") } +private val testIntent = { i: Int -> + Intent().apply { + `package` = TEST_PACKAGE + component = testComponent(i) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt index c09dcf27def..711015a323a 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt @@ -16,22 +16,27 @@ package com.android.launcher3.taskbar.allapps +import android.animation.AnimatorTestRule import android.content.ComponentName import android.content.Intent import android.os.Process -import androidx.test.annotation.UiThreadTest import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import com.android.launcher3.BubbleTextView import com.android.launcher3.appprediction.PredictionRowView +import com.android.launcher3.dagger.LauncherComponentProvider.appComponent +import com.android.launcher3.dot.DotInfo import com.android.launcher3.model.data.AppInfo import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.notification.NotificationKeyData -import com.android.launcher3.taskbar.TaskbarUnitTestRule -import com.android.launcher3.taskbar.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync import com.android.launcher3.taskbar.overlay.TaskbarOverlayController +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices import com.android.launcher3.util.PackageUserKey +import com.android.launcher3.util.TestUtil import com.google.common.truth.Truth.assertThat import org.junit.Rule import org.junit.Test @@ -41,133 +46,169 @@ import org.junit.runner.RunWith @EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) class TaskbarAllAppsControllerTest { - @get:Rule val taskbarUnitTestRule = TaskbarUnitTestRule() + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + @get:Rule(order = 2) val animatorTestRule = AnimatorTestRule(this) @InjectController lateinit var allAppsController: TaskbarAllAppsController @InjectController lateinit var overlayController: TaskbarOverlayController @Test - @UiThreadTest fun testToggle_once_showsAllApps() { - allAppsController.toggle() + runOnMainSync { allAppsController.toggle() } assertThat(allAppsController.isOpen).isTrue() } @Test - @UiThreadTest fun testToggle_twice_closesAllApps() { - allAppsController.toggle() - allAppsController.toggle() + runOnMainSync { + allAppsController.toggle() + allAppsController.toggle() + } assertThat(allAppsController.isOpen).isFalse() } @Test - @UiThreadTest fun testToggle_taskbarRecreated_allAppsReopened() { - allAppsController.toggle() + runOnMainSync { allAppsController.toggle() } taskbarUnitTestRule.recreateTaskbar() assertThat(allAppsController.isOpen).isTrue() } @Test - @UiThreadTest fun testSetApps_beforeOpened_cachesInfo() { - allAppsController.setApps(TEST_APPS, 0, emptyMap()) - allAppsController.toggle() + val overlayContext = + TestUtil.getOnUiThread { + allAppsController.setApps(TEST_APPS, 0, emptyMap()) + allAppsController.toggle() + overlayController.requestWindow() + } - val overlayContext = overlayController.requestWindow() assertThat(overlayContext.appsView.appsStore.apps).isEqualTo(TEST_APPS) } @Test - @UiThreadTest fun testSetApps_afterOpened_updatesStore() { - allAppsController.toggle() - allAppsController.setApps(TEST_APPS, 0, emptyMap()) + val overlayContext = + TestUtil.getOnUiThread { + allAppsController.toggle() + allAppsController.setApps(TEST_APPS, 0, emptyMap()) + overlayController.requestWindow() + } - val overlayContext = overlayController.requestWindow() assertThat(overlayContext.appsView.appsStore.apps).isEqualTo(TEST_APPS) } @Test - @UiThreadTest fun testSetPredictedApps_beforeOpened_cachesInfo() { - allAppsController.setPredictedApps(TEST_PREDICTED_APPS) - allAppsController.toggle() - val predictedApps = - overlayController - .requestWindow() - .appsView - .floatingHeaderView - .findFixedRowByType(PredictionRowView::class.java) - .predictedApps + TestUtil.getOnUiThread { + allAppsController.setPredictedApps(TEST_PREDICTED_APPS) + allAppsController.toggle() + + overlayController + .requestWindow() + .appsView + .floatingHeaderView + .findFixedRowByType(PredictionRowView::class.java) + .predictedApps + } + assertThat(predictedApps).isEqualTo(TEST_PREDICTED_APPS) } @Test - @UiThreadTest fun testSetPredictedApps_afterOpened_cachesInfo() { - allAppsController.toggle() - allAppsController.setPredictedApps(TEST_PREDICTED_APPS) - val predictedApps = - overlayController - .requestWindow() - .appsView - .floatingHeaderView - .findFixedRowByType(PredictionRowView::class.java) - .predictedApps + TestUtil.getOnUiThread { + allAppsController.toggle() + allAppsController.setPredictedApps(TEST_PREDICTED_APPS) + + overlayController + .requestWindow() + .appsView + .floatingHeaderView + .findFixedRowByType(PredictionRowView::class.java) + .predictedApps + } + assertThat(predictedApps).isEqualTo(TEST_PREDICTED_APPS) } @Test fun testUpdateNotificationDots_appInfo_hasDot() { - getInstrumentation().runOnMainSync { + runOnMainSync { allAppsController.setApps(TEST_APPS, 0, emptyMap()) allAppsController.toggle() - taskbarUnitTestRule.activityContext.popupDataProvider.onNotificationPosted( - PackageUserKey.fromItemInfo(TEST_APPS[0]), - NotificationKeyData("key"), - ) + val key = PackageUserKey.fromItemInfo(TEST_APPS[0])!! + context.appComponent.notificationRepository.dispatchUpdate( + mapOf( + key to + DotInfo().apply { addOrUpdateNotificationKey(NotificationKeyData("key")) } + ) + ) { + it == key + } } // Ensure the recycler view fully inflates before trying to grab an icon. - getInstrumentation().runOnMainSync { - val btv = + val btv = + TestUtil.getOnUiThread { overlayController .requestWindow() .appsView .activeRecyclerView .findViewHolderForAdapterPosition(0) ?.itemView as? BubbleTextView - assertThat(btv?.hasDot()).isTrue() - } + } + assertThat(btv?.hasDot()).isTrue() } @Test - @UiThreadTest fun testUpdateNotificationDots_predictedApp_hasDot() { - allAppsController.setPredictedApps(TEST_PREDICTED_APPS) - allAppsController.toggle() - - taskbarUnitTestRule.activityContext.popupDataProvider.onNotificationPosted( - PackageUserKey.fromItemInfo(TEST_PREDICTED_APPS[0]), - NotificationKeyData("key"), - ) - - val predictionRowView = - overlayController - .requestWindow() - .appsView - .floatingHeaderView - .findFixedRowByType(PredictionRowView::class.java) - val btv = predictionRowView.getChildAt(0) as BubbleTextView + runOnMainSync { + allAppsController.setPredictedApps(TEST_PREDICTED_APPS) + allAppsController.toggle() + val key = PackageUserKey.fromItemInfo(TEST_PREDICTED_APPS[0])!! + context.appComponent.notificationRepository.dispatchUpdate( + mapOf( + key to + DotInfo().apply { addOrUpdateNotificationKey(NotificationKeyData("key")) } + ) + ) { + it == key + } + } + + val btv = + TestUtil.getOnUiThread { + overlayController + .requestWindow() + .appsView + .floatingHeaderView + .findFixedRowByType(PredictionRowView::class.java) + .getChildAt(0) as BubbleTextView + } assertThat(btv.hasDot()).isTrue() } - private companion object { - private val TEST_APPS = + @Test + fun testToggleSearch_searchEditTextFocused() { + runOnMainSync { allAppsController.toggleSearch() } + runOnMainSync { + // All Apps is now attached to window. Open animation is posted but not started. + } + + runOnMainSync { + // Animation has started. Advance to end of animation. + animatorTestRule.advanceTimeBy(overlayController.openDuration.toLong()) + } + val editText = overlayController.requestWindow().appsView.searchUiManager.editText + assertThat(editText?.hasFocus()).isTrue() + } + + companion object { + val TEST_APPS = Array(16) { AppInfo( ComponentName( @@ -180,6 +221,6 @@ class TaskbarAllAppsControllerTest { ) } - private val TEST_PREDICTED_APPS = TEST_APPS.take(4).map { WorkspaceItemInfo(it) } + val TEST_PREDICTED_APPS = TEST_APPS.take(4).map { WorkspaceItemInfo(it) } } } diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewControllerTest.kt new file mode 100644 index 00000000000..6074b89a684 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewControllerTest.kt @@ -0,0 +1,161 @@ +/* + * 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.launcher3.taskbar.allapps + +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.R +import com.android.launcher3.appprediction.AppsDividerView +import com.android.launcher3.appprediction.AppsDividerView.DividerType +import com.android.launcher3.appprediction.PredictionRowView +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.asProperty +import com.android.launcher3.taskbar.TaskbarStashController +import com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_IN_APP_AUTO +import com.android.launcher3.taskbar.allapps.TaskbarAllAppsControllerTest.Companion.TEST_PREDICTED_APPS +import com.android.launcher3.taskbar.overlay.TaskbarOverlayController +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.PINNED +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT +import com.android.launcher3.util.TestUtil +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023"]) +class TaskbarAllAppsViewControllerTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarModeRule = TaskbarModeRule(context) + @get:Rule(order = 2) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var overlayController: TaskbarOverlayController + @InjectController lateinit var stashController: TaskbarStashController + + private var allAppsVisitedCount by ALL_APPS_VISITED_COUNT.prefItem.asProperty(context) + lateinit private var searchSessionController: TaskbarSearchSessionController + + @Before + fun setUp() { + searchSessionController = + TestUtil.getOnUiThread { + TaskbarSearchSessionController.newInstance(overlayController.requestWindow()) + } + } + + @After + fun cleanUpSearchSessionController() { + getInstrumentation().runOnMainSync { searchSessionController.onDestroy() } + } + + @Test + @TaskbarMode(TRANSIENT) + fun testShow_transientMode_stashesTaskbar() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_STASHED_IN_APP_AUTO.toLong(), false) + stashController.applyState(0) + } + + val viewController = createViewController() + getInstrumentation().runOnMainSync { viewController.show(false) } + assertThat(stashController.isStashed).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testShow_pinnedMode_taskbarDoesNotStash() { + val viewController = createViewController() + getInstrumentation().runOnMainSync { viewController.show(false) } + assertThat(stashController.isStashed).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testHide_transientMode_unstashesTaskbar() { + getInstrumentation().runOnMainSync { + stashController.updateStateForFlag(FLAG_STASHED_IN_APP_AUTO.toLong(), false) + stashController.applyState(0) + } + + val viewController = createViewController() + getInstrumentation().runOnMainSync { viewController.show(false) } + getInstrumentation().runOnMainSync { viewController.close(false) } + assertThat(stashController.isStashed).isFalse() + } + + @Test + fun testShow_firstAllAppsVisit_hasAllAppsTextDivider() { + allAppsVisitedCount = 0 + val viewController = createViewController() + getInstrumentation().runOnMainSync { viewController.show(false) } + + val appsView = overlayController.requestWindow().appsView + getInstrumentation().runOnMainSync { + appsView.floatingHeaderView + .findFixedRowByType(PredictionRowView::class.java) + .setPredictedApps(TEST_PREDICTED_APPS) + } + + val dividerView = + appsView.floatingHeaderView.findFixedRowByType(AppsDividerView::class.java) + assertThat(dividerView.dividerType).isEqualTo(DividerType.ALL_APPS_LABEL) + } + + @Test + fun testShow_maxAllAppsVisitedCount_hasLineDivider() { + allAppsVisitedCount = ALL_APPS_VISITED_COUNT.maxCount + val viewController = createViewController() + getInstrumentation().runOnMainSync { viewController.show(false) } + + val appsView = overlayController.requestWindow().appsView + getInstrumentation().runOnMainSync { + appsView.floatingHeaderView + .findFixedRowByType(PredictionRowView::class.java) + .setPredictedApps(TEST_PREDICTED_APPS) + } + + val dividerView = + appsView.floatingHeaderView.findFixedRowByType(AppsDividerView::class.java) + assertThat(dividerView.dividerType).isEqualTo(DividerType.LINE) + } + + private fun createViewController(): TaskbarAllAppsViewController { + return TestUtil.getOnUiThread { + val overlayContext = overlayController.requestWindow() + TaskbarAllAppsViewController( + overlayContext, + overlayContext.layoutInflater.inflate( + R.layout.taskbar_all_apps_sheet, + overlayContext.dragLayer, + false, + ) as TaskbarAllAppsSlideInView, + taskbarUnitTestRule.activityContext.controllers, + searchSessionController, + /* showKeyboard= */ false, // Covered in TaskbarAllAppsControllerTest. + ) + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarInputConsumerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarInputConsumerTest.kt new file mode 100644 index 00000000000..c365739c29d --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarInputConsumerTest.kt @@ -0,0 +1,158 @@ +/* + * 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.launcher3.taskbar.bubbles + +import android.view.MotionEvent +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController +import com.android.quickstep.inputconsumers.BubbleBarInputConsumer +import com.google.common.truth.Truth.assertThat +import java.util.Optional +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.any +import org.mockito.kotlin.whenever + +/** + * Tests for bubble bar input consumer, namely the static method that indicates whether the input + * consumer should handle the event. + */ +@RunWith(AndroidJUnit4::class) +class BubbleBarInputConsumerTest { + + private lateinit var bubbleControllers: BubbleControllers + + @get:Rule var mockitoRule: MockitoRule = MockitoJUnit.rule() + + @Mock private lateinit var taskbarActivityContext: TaskbarActivityContext + @Mock private lateinit var bubbleBarController: BubbleBarController + @Mock private lateinit var bubbleBarViewController: BubbleBarViewController + @Mock private lateinit var bubbleStashController: BubbleStashController + @Mock private lateinit var bubbleStashedHandleViewController: BubbleStashedHandleViewController + @Mock private lateinit var bubbleDragController: BubbleDragController + @Mock private lateinit var bubbleDismissController: BubbleDismissController + @Mock private lateinit var bubbleBarSwipeController: BubbleBarSwipeController + @Mock private lateinit var dragToBubbleController: DragToBubbleController + @Mock private lateinit var bubbleCreator: BubbleCreator + + @Mock private lateinit var motionEvent: MotionEvent + + @Before + fun setUp() { + bubbleControllers = + BubbleControllers( + bubbleBarController, + bubbleBarViewController, + bubbleStashController, + Optional.of(bubbleStashedHandleViewController), + bubbleDragController, + bubbleDismissController, + Optional.of(bubbleBarSwipeController), + dragToBubbleController, + bubbleCreator, + ) + } + + @Test + fun testIsEventOnBubbles_noTaskbarActivityContext() { + assertThat(BubbleBarInputConsumer.isEventOnBubbles(null, motionEvent)).isFalse() + } + + @Test + fun testIsEventOnBubbles_bubblesNotEnabled() { + whenever(taskbarActivityContext.isBubbleBarEnabled).thenReturn(false) + assertThat(BubbleBarInputConsumer.isEventOnBubbles(taskbarActivityContext, motionEvent)) + .isFalse() + } + + @Test + fun testIsEventOnBubbles_noBubbleControllers() { + whenever(taskbarActivityContext.isBubbleBarEnabled).thenReturn(true) + whenever(taskbarActivityContext.bubbleControllers).thenReturn(null) + assertThat(BubbleBarInputConsumer.isEventOnBubbles(taskbarActivityContext, motionEvent)) + .isFalse() + } + + @Test + fun testIsEventOnBubbles_noBubbles() { + whenever(taskbarActivityContext.isBubbleBarEnabled).thenReturn(true) + whenever(taskbarActivityContext.bubbleControllers).thenReturn(bubbleControllers) + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + assertThat(BubbleBarInputConsumer.isEventOnBubbles(taskbarActivityContext, motionEvent)) + .isFalse() + } + + @Test + fun testIsEventOnBubbles_eventOnStashedHandle() { + whenever(taskbarActivityContext.isBubbleBarEnabled).thenReturn(true) + whenever(taskbarActivityContext.bubbleControllers).thenReturn(bubbleControllers) + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + whenever(bubbleStashController.isStashed).thenReturn(true) + whenever(bubbleStashedHandleViewController.isEventOverHandle(any())).thenReturn(true) + + assertThat(BubbleBarInputConsumer.isEventOnBubbles(taskbarActivityContext, motionEvent)) + .isTrue() + } + + @Test + fun testIsEventOnBubbles_eventNotOnStashedHandle() { + whenever(taskbarActivityContext.isBubbleBarEnabled).thenReturn(true) + whenever(taskbarActivityContext.bubbleControllers).thenReturn(bubbleControllers) + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + whenever(bubbleStashController.isStashed).thenReturn(true) + whenever(bubbleStashedHandleViewController.isEventOverHandle(any())).thenReturn(false) + + assertThat(BubbleBarInputConsumer.isEventOnBubbles(taskbarActivityContext, motionEvent)) + .isFalse() + } + + @Test + fun testIsEventOnBubbles_eventOnVisibleBubbleView() { + whenever(taskbarActivityContext.isBubbleBarEnabled).thenReturn(true) + whenever(taskbarActivityContext.bubbleControllers).thenReturn(bubbleControllers) + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + whenever(bubbleStashController.isStashed).thenReturn(false) + whenever(bubbleBarViewController.isBubbleBarVisible).thenReturn(true) + whenever(bubbleBarViewController.isEventOverBubbleBar(any())).thenReturn(true) + + assertThat(BubbleBarInputConsumer.isEventOnBubbles(taskbarActivityContext, motionEvent)) + .isTrue() + } + + @Test + fun testIsEventOnBubbles_eventNotOnVisibleBubbleView() { + whenever(taskbarActivityContext.isBubbleBarEnabled).thenReturn(true) + whenever(taskbarActivityContext.bubbleControllers).thenReturn(bubbleControllers) + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + whenever(bubbleStashController.isStashed).thenReturn(false) + whenever(bubbleBarViewController.isBubbleBarVisible).thenReturn(true) + whenever(bubbleBarViewController.isEventOverBubbleBar(any())).thenReturn(false) + + assertThat(BubbleBarInputConsumer.isEventOnBubbles(taskbarActivityContext, motionEvent)) + .isFalse() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarSwipeControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarSwipeControllerTest.kt new file mode 100644 index 00000000000..e5a26d2a780 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarSwipeControllerTest.kt @@ -0,0 +1,383 @@ +/* + * 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.launcher3.taskbar.bubbles + +import android.animation.AnimatorTestRule +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController +import com.android.launcher3.touch.OverScroll +import com.google.common.truth.Truth.assertThat +import java.util.Optional +import kotlin.math.abs +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.atLeastOnce +import org.mockito.kotlin.eq +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +class BubbleBarSwipeControllerTest { + + companion object { + const val UNSTASH_THRESHOLD = 100 + const val MAX_OVERSCROLL = 300 + + const val UP_BELOW_UNSTASH = -UNSTASH_THRESHOLD + 10f + const val UP_ABOVE_UNSTASH = -UNSTASH_THRESHOLD - 10f + const val DOWN = UNSTASH_THRESHOLD + 10f + } + + private val context = ApplicationProvider.getApplicationContext() + + @get:Rule(order = 0) val mockitoRule: MockitoRule = MockitoJUnit.rule() + @get:Rule(order = 1) val animatorTestRule: AnimatorTestRule = AnimatorTestRule(this) + + private lateinit var bubbleBarSwipeController: BubbleBarSwipeController + + @Mock private lateinit var bubbleBarController: BubbleBarController + @Mock private lateinit var bubbleBarViewController: BubbleBarViewController + @Mock private lateinit var bubbleStashController: BubbleStashController + @Mock private lateinit var bubbleStashedHandleViewController: BubbleStashedHandleViewController + @Mock private lateinit var bubbleDragController: BubbleDragController + @Mock private lateinit var bubbleDismissController: BubbleDismissController + @Mock private lateinit var dragToBubbleController: DragToBubbleController + @Mock private lateinit var bubbleCreator: BubbleCreator + + @Before + fun setUp() { + val dimensionProvider = + object : BubbleBarSwipeController.DimensionProvider { + override val unstashThreshold: Int + get() = UNSTASH_THRESHOLD + + override val maxOverscroll: Int + get() = MAX_OVERSCROLL + } + bubbleBarSwipeController = BubbleBarSwipeController(context, dimensionProvider) + + val bubbleControllers = + BubbleControllers( + bubbleBarController, + bubbleBarViewController, + bubbleStashController, + Optional.of(bubbleStashedHandleViewController), + bubbleDragController, + bubbleDismissController, + Optional.of(bubbleBarSwipeController), + dragToBubbleController, + bubbleCreator, + ) + + bubbleBarSwipeController.init(bubbleControllers) + } + + // region Test that views have damped translation on swipe + + private fun testViewsHaveDampedTranslationOnSwipe(swipe: Float) { + val isUp = swipe < 0 + val damped = OverScroll.dampedScroll(abs(swipe), MAX_OVERSCROLL).toFloat() + val dampedTranslation = if (isUp) -damped else damped + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(swipe) + } + verify(bubbleStashedHandleViewController).setTranslationYForSwipe(dampedTranslation) + verify(bubbleBarViewController).setTranslationYForSwipe(dampedTranslation) + } + + @Test + fun swipeUp_stashedBar_belowUnstashThreshold_viewsHaveDampedTranslation() { + setUpStashedBar() + testViewsHaveDampedTranslationOnSwipe(UP_BELOW_UNSTASH) + } + + @Test + fun swipeUp_stashedBar_aboveUnstashThreshold_viewsHaveDampedTranslation() { + setUpStashedBar() + testViewsHaveDampedTranslationOnSwipe(UP_ABOVE_UNSTASH) + } + + @Test + fun swipeUp_collapsedBar_aboveUnstashThreshold_viewsHaveDampedTranslation() { + setUpCollapsedBar() + testViewsHaveDampedTranslationOnSwipe(UP_ABOVE_UNSTASH) + } + + // endregion + + // region Test that translation on views is reset on finish + + private fun testViewsTranslationResetOnFinish(swipe: Float) { + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(swipe) + bubbleBarSwipeController.finish() + // We use a spring animation. Advance by 5 seconds to give it time to finish + animatorTestRule.advanceTimeBy(5000) + } + val handleSwipeTranslation = argumentCaptor() + val barSwipeTranslation = argumentCaptor() + verify(bubbleStashedHandleViewController, atLeastOnce()) + .setTranslationYForSwipe(handleSwipeTranslation.capture()) + verify(bubbleBarViewController, atLeastOnce()) + .setTranslationYForSwipe(barSwipeTranslation.capture()) + + assertThat(handleSwipeTranslation.firstValue).isNonZero() + assertThat(handleSwipeTranslation.lastValue).isZero() + + assertThat(barSwipeTranslation.firstValue).isNonZero() + assertThat(barSwipeTranslation.lastValue).isZero() + } + + @Test + fun swipeUp_stashedBar_belowUnstashThreshold_animateTranslationToZeroOnFinish() { + setUpStashedBar() + testViewsTranslationResetOnFinish(UP_BELOW_UNSTASH) + } + + @Test + fun swipeUp_stashedBar_aboveUnstashThreshold_animateTranslationToZeroOnFinish() { + setUpStashedBar() + testViewsTranslationResetOnFinish(UP_ABOVE_UNSTASH) + } + + @Test + fun swipeUp_collapsedBar_aboveUnstashThreshold_animateTranslationToZeroOnFinish() { + setUpCollapsedBar() + testViewsTranslationResetOnFinish(UP_ABOVE_UNSTASH) + } + + // endregion + + // region Test swipe interactions on stashed bar + + @Test + fun swipeUp_stashedBar_belowUnstashThreshold_doesNotShowBar() { + setUpStashedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_BELOW_UNSTASH) + } + verify(bubbleStashController, never()).showBubbleBar(any()) + } + + @Test + fun swipeUp_stashedBar_belowUnstashThreshold_isSwipeGestureFalse() { + setUpStashedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_BELOW_UNSTASH) + } + assertThat(bubbleBarSwipeController.isSwipeGesture()).isFalse() + } + + @Test + fun swipeUp_stashedBar_overUnstashThreshold_unstashBubbleBar() { + setUpStashedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + } + verify(bubbleStashController).showBubbleBar(expandBubbles = false, bubbleBarGesture = true) + } + + @Test + fun swipeUp_stashedBar_overUnstashThreshold_isSwipeGestureTrue() { + setUpStashedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + } + assertThat(bubbleBarSwipeController.isSwipeGesture()).isTrue() + } + + @Test + fun swipeUp_stashedBar_overUnstashThresholdMultipleTimes_unstashesMultipleTimes() { + setUpStashedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + bubbleBarSwipeController.swipeTo(UP_BELOW_UNSTASH) + } + verify(bubbleStashController).showBubbleBar(expandBubbles = false, bubbleBarGesture = true) + verify(bubbleStashController).stashBubbleBar() + + getInstrumentation().runOnMainSync { bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) } + verify(bubbleStashController, times(2)) + .showBubbleBar(expandBubbles = false, bubbleBarGesture = true) + } + + @Test + fun swipeUp_stashedBar_releaseOverUnstashThreshold_expandsBar() { + setUpStashedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + } + verify(bubbleStashController, never()).showBubbleBar(expandBubbles = eq(true), any()) + getInstrumentation().runOnMainSync { bubbleBarSwipeController.finish() } + verify(bubbleStashController).showBubbleBar(expandBubbles = true, bubbleBarGesture = true) + } + + @Test + fun swipeUp_stashedBar_overUnstashReleaseBelowUnstash_doesNotExpandBar() { + setUpStashedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + } + verify(bubbleStashController).showBubbleBar(expandBubbles = false, bubbleBarGesture = true) + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.swipeTo(UP_BELOW_UNSTASH) + bubbleBarSwipeController.finish() + } + verify(bubbleStashController, never()).showBubbleBar(expandBubbles = eq(true), any()) + } + + @Test + fun swipeDown_stashedBar_swipeIgnored() { + setUpStashedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(DOWN) + } + verify(bubbleStashedHandleViewController, never()).setTranslationYForSwipe(any()) + verify(bubbleBarViewController, never()).setTranslationYForSwipe(any()) + verify(bubbleStashController, never()).showBubbleBar(any()) + } + + // endregion + + // region Test swipe interactions on expanded bar + + @Test + fun swipe_expandedBar_swipeIgnored() { + setUpExpandedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + bubbleBarSwipeController.swipeTo(DOWN) + bubbleBarSwipeController.finish() + } + verify(bubbleStashedHandleViewController, never()).setTranslationYForSwipe(any()) + verify(bubbleBarViewController, never()).setTranslationYForSwipe(any()) + verify(bubbleStashController, never()).showBubbleBar(any()) + } + + // endregion + + // region Test swipe interactions on collapsed bar + + @Test + fun swipeUp_collapsedBar_doesNotShowBarDuringDrag() { + setUpCollapsedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_BELOW_UNSTASH) + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + } + verify(bubbleStashController, never()).showBubbleBar(any()) + } + + @Test + fun swipeUp_collapsedBar_belowUnstashThreshold_isSwipeGestureFalse() { + setUpCollapsedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_BELOW_UNSTASH) + } + assertThat(bubbleBarSwipeController.isSwipeGesture()).isFalse() + } + + @Test + fun swipeUp_collapsedBar_overUnstashThreshold_isSwipeGestureTrue() { + setUpCollapsedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + } + assertThat(bubbleBarSwipeController.isSwipeGesture()).isTrue() + } + + @Test + fun swipeUp_collapsedBar_finishOverUnstashThreshold_expandsBar() { + setUpCollapsedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_ABOVE_UNSTASH) + bubbleBarSwipeController.finish() + } + verify(bubbleStashController).showBubbleBar(expandBubbles = true, bubbleBarGesture = true) + } + + @Test + fun swipeUp_collapsedBar_finishBelowUnstashThreshold_doesNotExpandBar() { + setUpCollapsedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(UP_BELOW_UNSTASH) + bubbleBarSwipeController.finish() + } + verify(bubbleStashController, never()).showBubbleBar(any()) + } + + @Test + fun swipeDown_collapsedBar_swipeIgnored() { + setUpCollapsedBar() + getInstrumentation().runOnMainSync { + bubbleBarSwipeController.start() + bubbleBarSwipeController.swipeTo(DOWN) + } + verify(bubbleStashedHandleViewController, never()).setTranslationYForSwipe(any()) + verify(bubbleBarViewController, never()).setTranslationYForSwipe(any()) + verify(bubbleStashController, never()).showBubbleBar(any()) + verify(bubbleStashController, never()).stashBubbleBar() + } + + // endregion + + private fun setUpStashedBar() { + whenever(bubbleStashController.isStashed).thenReturn(true) + whenever(bubbleStashController.isBubbleBarVisible()).thenReturn(false) + whenever(bubbleBarViewController.isExpanded).thenReturn(false) + } + + private fun setUpCollapsedBar() { + whenever(bubbleStashController.isStashed).thenReturn(false) + whenever(bubbleStashController.isBubbleBarVisible()).thenReturn(true) + whenever(bubbleBarViewController.isExpanded).thenReturn(false) + } + + private fun setUpExpandedBar() { + whenever(bubbleStashController.isStashed).thenReturn(false) + whenever(bubbleStashController.isBubbleBarVisible()).thenReturn(true) + whenever(bubbleBarViewController.isExpanded).thenReturn(true) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewTest.kt new file mode 100644 index 00000000000..a35cf43bbc8 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewTest.kt @@ -0,0 +1,96 @@ +/* + * 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.launcher3.taskbar.bubbles + +import android.content.Context +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import android.view.LayoutInflater +import androidx.core.graphics.drawable.toBitmap +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.launcher3.R +import com.android.launcher3.icons.BitmapInfo +import com.android.wm.shell.shared.bubbles.BubbleInfo +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class BubbleViewTest { + + private val context = ApplicationProvider.getApplicationContext() + private lateinit var bubbleView: BubbleView + private lateinit var overflowView: BubbleView + private lateinit var bubble: BubbleBarBubble + + @Test + fun hasUnseenContent_bubble() { + setupBubbleViews() + assertThat(bubbleView.hasUnseenContent()).isTrue() + + bubbleView.markSeen() + assertThat(bubbleView.hasUnseenContent()).isFalse() + } + + @Test + fun hasUnseenContent_overflow() { + setupBubbleViews() + assertThat(overflowView.hasUnseenContent()).isFalse() + } + + private fun setupBubbleViews() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + val inflater = LayoutInflater.from(context) + + val bitmap = ColorDrawable(Color.WHITE).toBitmap(width = 20, height = 20) + overflowView = inflater.inflate(R.layout.bubblebar_item_view, null, false) as BubbleView + overflowView.setOverflow(BubbleBarOverflow(overflowView), bitmap) + + val bubbleInfo = + BubbleInfo( + "key", + 0, + null, + null, + 0, + context.packageName, + null, + null, + false, + true, + null, + ) + bubbleView = inflater.inflate(R.layout.bubblebar_item_view, null, false) as BubbleView + bubble = + BubbleBarBubble( + bubbleInfo, + bubbleView, + BitmapInfo.of(bitmap, Color.WHITE), + bitmap, + Color.WHITE, + "", + null, + ) + bubbleView.setBubble(bubble) + } + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/DragToBubbleControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/DragToBubbleControllerTest.kt new file mode 100644 index 00000000000..e8d5d9fe241 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/DragToBubbleControllerTest.kt @@ -0,0 +1,744 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.bubbles + +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.graphics.Insets +import android.graphics.Rect +import android.widget.FrameLayout +import androidx.core.animation.AnimatorTestRule +import androidx.test.core.app.ApplicationProvider.getApplicationContext +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.DropTarget +import com.android.launcher3.DropTarget.DragObject +import com.android.launcher3.dragndrop.DragOptions +import com.android.launcher3.model.data.AppInfo +import com.android.launcher3.taskbar.bubbles.BubbleBarController.BubbleBarLocationListener +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import com.android.wm.shell.shared.bubbles.DeviceConfig +import com.android.wm.shell.shared.bubbles.DragZoneFactory +import com.android.wm.shell.shared.bubbles.DragZoneFactory.BubbleBarPropertiesProvider +import com.android.wm.shell.shared.bubbles.DragZoneFactory.SplitScreenModeChecker.SplitScreenMode +import com.android.wm.shell.shared.bubbles.DropTargetView +import com.android.wm.shell.shared.bubbles.logging.EntryPoint +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.stub +import org.mockito.kotlin.verify + +/** Unit tests for [DragToBubbleControllerTest]. */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class DragToBubbleControllerTest { + + @get:Rule val animatorTestRule = AnimatorTestRule() + + private val context = getApplicationContext() + private val container = FrameLayout(context) + private val bubbleBarViewController: BubbleBarViewController = mock() + private val bubbleActivityStarter: BubbleActivityStarter = mock() + private val bubbleBarLocationListener: BubbleBarLocationListener = mock() + private val bubbleBarPropertiesProvider = FakeBubbleBarPropertiesProvider() + private val testDragZonesFactory = createTestDragZoneFactory() + private val dragObject = DragObject(context) + private val packageName = "test.package" + private val itemIntent = + Intent().apply { + component = ComponentName(packageName, "TestClass") + `package` = packageName + } + private val appInfo = AppInfo().apply { intent = itemIntent } + private lateinit var dragToBubbleController: DragToBubbleController + + private val dropTargetView: DropTargetView + get() = dragToBubbleController.launcherDropTargetManager.dropTargetView + + private val secondDropTargetView: DropTargetView? + get() = dragToBubbleController.launcherDropTargetManager.secondDropTargetView + + private val shellDropTargetView: DropTargetView? + get() = dragToBubbleController.shellDropTargetManager.secondDropTargetView + + private val bubbleBarLeftDropTarget: DropTarget + get() = dragToBubbleController.bubbleBarLeftDropTarget + + private val bubbleBarRightDropTarget: DropTarget + get() = dragToBubbleController.bubbleBarRightDropTarget + + private val leftDropTargetRect: Rect + get() = testDragZonesFactory.getBubbleBarDropRect(isLeftSide = true) + + private val rightDropTargetRect: Rect + get() = testDragZonesFactory.getBubbleBarDropRect(isLeftSide = false) + + @Before + fun setUp() { + prepareBubbleBarViewController() + setAppInfo() + dragToBubbleController = DragToBubbleController(context, container) + dragToBubbleController.init( + bubbleBarViewController, + bubbleBarPropertiesProvider, + bubbleBarLocationListener, + bubbleActivityStarter, + ) + dragToBubbleController.dragZoneFactory = testDragZonesFactory + } + + @Test + fun dragStarted_noAppInfo_noDropZonesAdded() { + dragObject.dragInfo = null + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + assertThat(bubbleBarLeftDropTarget.isDropEnabled).isFalse() + assertThat(bubbleBarRightDropTarget.isDropEnabled).isFalse() + assertThat(container.childCount).isEqualTo(0) + } + + @Test + fun dragStarted_noBubbleBar_dropZonesAdded() { + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + assertThat(bubbleBarLeftDropTarget.isDropEnabled).isTrue() + assertThat(bubbleBarRightDropTarget.isDropEnabled).isTrue() + assertThat(container.childCount).isEqualTo(DROP_VIEWS_COUNT_NO_BUBBLE_BAR) + assertThat(dropTargetView.parent).isEqualTo(container) + assertThat(secondDropTargetView!!.parent).isEqualTo(container) + assertThat(dropTargetView.alpha).isEqualTo(0f) + assertThat(secondDropTargetView!!.alpha).isEqualTo(0f) + assertThat(dragToBubbleController.isItemDropHandled).isFalse() + } + + @Test + fun dragStarted_hasBubbleBar_dropZonesAdded() { + prepareBubbleBarViewController(hasBubbles = true) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + assertThat(container.childCount).isEqualTo(DROP_VIEWS_COUNT) + assertThat(dropTargetView.parent).isEqualTo(container) + assertThat(dropTargetView.alpha).isEqualTo(0f) + assertThat(secondDropTargetView).isNull() + } + + @Test + fun dragEnded_allViewsRemoved() { + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.onDragEnd() + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + + assertThat(container.childCount).isEqualTo(0) + } + + @Test + fun draggedToTheRightDropZone_noBubbles_dropTargetViewsShown() { + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(rightDropTargetRect) + bubbleBarRightDropTarget.onDragEnter(dragObject) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + + assertThat(dropTargetView.alpha).isEqualTo(1f) + assertThat(secondDropTargetView!!.alpha).isEqualTo(1f) + verify(bubbleBarViewController, never()).animateBubbleBarLocation(any()) + } + + @Test + fun draggedToTheRightDropZone_hasBubblesOnTheRight_dropTargetViewShown() { + prepareBubbleBarViewController(hasBubbles = true) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(rightDropTargetRect) + bubbleBarRightDropTarget.onDragEnter(dragObject) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + + assertThat(dropTargetView.alpha).isEqualTo(1f) + assertThat(secondDropTargetView).isNull() + } + + @Test + fun draggedToTheRightDropZone_hasNoAppData_Noop() { + dragObject.dragInfo = null + prepareBubbleBarViewController(hasBubbles = true) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(rightDropTargetRect) + bubbleBarRightDropTarget.onDragEnter(dragObject) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + + assertThat(container.childCount).isEqualTo(0) + assertThat(bubbleBarLeftDropTarget.isDropEnabled).isFalse() + assertThat(bubbleBarRightDropTarget.isDropEnabled).isFalse() + } + + @Test + fun draggedToTheRightDropZone_hasBubblesOnTheRight_bubbleBarLocationChangeNotRequested() { + prepareBubbleBarViewController(hasBubbles = true) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(rightDropTargetRect) + bubbleBarRightDropTarget.onDragEnter(dragObject) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + verify(bubbleBarViewController, never()).animateBubbleBarLocation(any()) + } + + @Test + fun draggedToTheLeftDropZone_hasBubblesOnTheRight_bubbleBarLocationChangeRequested() { + prepareBubbleBarViewController( + hasBubbles = true, + bubbleBarLocation = BubbleBarLocation.RIGHT, + ) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(leftDropTargetRect) + bubbleBarLeftDropTarget.onDragEnter(dragObject) + } + verify(bubbleBarViewController).animateBubbleBarLocation(BubbleBarLocation.LEFT) + } + + @Test + fun draggedToTheLeftDropZone_dragEnded_hasBubblesOnTheRight_locationRestored() { + val bubbleBarOriginalLocation = BubbleBarLocation.RIGHT + prepareBubbleBarViewController( + hasBubbles = true, + bubbleBarLocation = bubbleBarOriginalLocation, + ) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(leftDropTargetRect) + bubbleBarLeftDropTarget.onDragEnter(dragObject) + dragObject.updateXY(x = 0, y = 0) + bubbleBarLeftDropTarget.onDragExit(dragObject) + dragToBubbleController.onDragEnd() + } + + verify(bubbleBarViewController).animateBubbleBarLocation(BubbleBarLocation.LEFT) + verify(bubbleBarViewController).animateBubbleBarLocation(bubbleBarOriginalLocation) + assertThat(container.childCount).isEqualTo(DROP_VIEWS_COUNT) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + assertThat(container.childCount).isEqualTo(0) + } + + @Test + fun acceptDrop_nullItemInfo_returnsFalse() { + // Prepare DragObject with null dragInfo + val dragObjectWithNullInfo = DragObject(context) + dragObjectWithNullInfo.dragInfo = null // Explicitly set to null + + dragToBubbleController.onDragStart(dragObjectWithNullInfo, DragOptions()) + + // Attempt to drop on the left target + val acceptedLeft = bubbleBarLeftDropTarget.acceptDrop(dragObjectWithNullInfo) + assertThat(acceptedLeft).isFalse() + + // Attempt to drop on the right target + val acceptedRight = bubbleBarRightDropTarget.acceptDrop(dragObjectWithNullInfo) + assertThat(acceptedRight).isFalse() + } + + @Test + fun onDrop_nullItemInfo_onLeftTarget_noSysUiProxyInteractionAndDropNotHandled() { + // Prepare DragObject with null dragInfo + val dragObjectWithNullInfo = DragObject(context) + dragObjectWithNullInfo.dragInfo = null + dragToBubbleController.onDragStart(dragObjectWithNullInfo, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObjectWithNullInfo.updateXYToCenterOf(leftDropTargetRect) + bubbleBarLeftDropTarget.onDragEnter( + dragObjectWithNullInfo + ) // Needed for drop target to be active + bubbleBarLeftDropTarget.onDrop(dragObjectWithNullInfo, DragOptions()) + } + + assertThat(dragToBubbleController.isItemDropHandled).isFalse() + verify(bubbleActivityStarter, never()).showAppBubble(any(), any(), any(), any()) + verify(bubbleActivityStarter, never()).showShortcutBubble(any(), any(), any()) + } + + @Test + fun droppedAtTheLeftDropZone_noBubblesOnTheRight_appBubbleCreationRequested() { + val bubbleBarOriginalLocation = BubbleBarLocation.RIGHT + prepareBubbleBarViewController( + hasBubbles = false, + bubbleBarLocation = bubbleBarOriginalLocation, + ) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(leftDropTargetRect) + bubbleBarLeftDropTarget.onDragEnter(dragObject) + bubbleBarLeftDropTarget.onDrop(dragObject, DragOptions()) + assertThat(dragToBubbleController.isItemDropHandled).isTrue() + bubbleBarLeftDropTarget.onDragExit(dragObject) + } + + // Intent does not implement equals() so we need to capture and compare the intents manually + val intentCaptor = argumentCaptor() + verify(bubbleActivityStarter) + .showAppBubble( + intentCaptor.capture(), + eq(appInfo.user), + eq(EntryPoint.TASKBAR_ICON_DRAG), + eq(BubbleBarLocation.LEFT), + ) + assertThat(intentCaptor.firstValue.filterEquals(itemIntent)).isTrue() + } + + @Test + fun dragExitRightZone_noBubbles_listenerNotNotified() { + // Scenario: No bubbles. Drag enters RIGHT, then exits to no particular zone. + // This is distinct as it starts on the default side. + prepareBubbleBarViewController( + hasBubbles = false, + bubbleBarLocation = BubbleBarLocation.RIGHT, + ) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(rightDropTargetRect) + bubbleBarRightDropTarget.onDragEnter(dragObject) // Location is the same + } + verify(bubbleBarLocationListener, never()) + .onBubbleBarLocationAnimated(BubbleBarLocation.RIGHT) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXY(0, 0) // Move out of all zones + bubbleBarRightDropTarget.onDragExit(dragObject) + } + + // Exiting the RIGHT zone (which is the default) should not re-notify of RIGHT + verify(bubbleBarLocationListener, never()) + .onBubbleBarLocationAnimated(BubbleBarLocation.RIGHT) + } + + @Test + fun onDragEnd_noBubbles_wasDraggingLeft_listenerNotifiedWithDefaultRightLocationAnimated() { + val startingLocation = BubbleBarLocation.RIGHT + // Scenario: No bubbles. Drag was over LEFT zone. Drag ends. + prepareBubbleBarViewController(hasBubbles = false, bubbleBarLocation = startingLocation) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(leftDropTargetRect) + bubbleBarLeftDropTarget.onDragEnter(dragObject) + } + // Notifies onBubbleBarLocationAnimated(LEFT) + verify(bubbleBarLocationListener).onBubbleBarLocationAnimated(BubbleBarLocation.LEFT) + clearInvocations(bubbleBarLocationListener) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.onDragEnd() + } + assertThat(dragToBubbleController.isItemDropHandled).isFalse() + + // After drag ends (and no bubbles), the listener should be notified of the default location + verify(bubbleBarLocationListener).onBubbleBarLocationAnimated(startingLocation) + } + + @Test + fun onDragEnd_noBubbles_wasDraggingRight_listenerNotifiedWithDefaultRightLocationAnimated() { + // Scenario: No bubbles. Drag was over RIGHT zone (default side). Drag ends. + prepareBubbleBarViewController(hasBubbles = false) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(rightDropTargetRect) + } + verify(bubbleBarLocationListener, never()) + .onBubbleBarLocationAnimated(BubbleBarLocation.RIGHT) + clearInvocations(bubbleBarLocationListener) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXY(0, 0) + bubbleBarLeftDropTarget.onDragExit(dragObject) + dragToBubbleController.onDragEnd() + } + + // After drag ends (and no bubbles), listener should not be notified of the default + // location. + verify(bubbleBarLocationListener, never()) + .onBubbleBarLocationAnimated(BubbleBarLocation.RIGHT) + } + + @Test + fun dragEnterLeftZone_bubblesOnLeft_listenerNotNotified() { + // Scenario: Bubbles on LEFT. Drag enters LEFT zone. + prepareBubbleBarViewController( + hasBubbles = true, + bubbleBarLocation = BubbleBarLocation.LEFT, + ) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(leftDropTargetRect) + bubbleBarLeftDropTarget.onDragEnter(dragObject) + } + + // Bubbles are already on the LEFT, and drag enters LEFT. + // No new animation to LEFT should be triggered by the zone entry itself. + verify(bubbleBarLocationListener, never()) + .onBubbleBarLocationAnimated(BubbleBarLocation.LEFT) + } + + @Test + fun onDragEnd_bubblesOnLeft_defaultIsLeft_wasDraggingRight_listenerNotifiedLeftAnimated() { + // Scenario: Bubbles on LEFT. Drag was over RIGHT zone. Drag ends. + prepareBubbleBarViewController( + hasBubbles = true, + bubbleBarLocation = BubbleBarLocation.LEFT, + ) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXYToCenterOf(rightDropTargetRect) + bubbleBarRightDropTarget.onDragEnter(dragObject) // Notifies Animated(RIGHT) + } + verify(bubbleBarLocationListener).onBubbleBarLocationAnimated(BubbleBarLocation.RIGHT) + clearInvocations(bubbleBarLocationListener) // Clear the Animated(RIGHT) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragObject.updateXY(0, 0) + bubbleBarLeftDropTarget.onDragExit(dragObject) + dragToBubbleController.onDragEnd() + } + + // Bubble bar's final animated location should be LEFT. + verify(bubbleBarLocationListener).onBubbleBarLocationAnimated(BubbleBarLocation.LEFT) + } + + @Test + fun dragEnterLeftThenExitToNoZoneThenEnterRight_noBubbles_listenerSequenceCorrectAnimated() { + // Scenario: No bubbles. Complex drag path: Left -> None -> Right + prepareBubbleBarViewController(hasBubbles = false) + dragToBubbleController.onDragStart(dragObject, DragOptions()) + clearInvocations(bubbleBarLocationListener) + + val inOrder = inOrder(bubbleBarLocationListener) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + // 1. Enter Left + dragObject.updateXYToCenterOf(leftDropTargetRect) + bubbleBarLeftDropTarget.onDragEnter(dragObject) + + // 2. Exit Left to no zone + dragObject.updateXY(0, 0) + bubbleBarLeftDropTarget.onDragExit(dragObject) + + // 3. Enter Right + dragObject.updateXYToCenterOf(rightDropTargetRect) + bubbleBarRightDropTarget.onDragEnter(dragObject) + } + + inOrder + .verify(bubbleBarLocationListener) + .onBubbleBarLocationAnimated(BubbleBarLocation.LEFT) + // Revert to default, following enter of the same zone should not trigger updated + inOrder + .verify(bubbleBarLocationListener) + .onBubbleBarLocationAnimated(BubbleBarLocation.RIGHT) + } + + @Test + fun onShellDragStateChanged_true_preparesShellDragManager() { + // When + dragToBubbleController.onShellDragStateChanged(true) + + // Then + assertThat(shellDropTargetView!!.alpha).isEqualTo(0f) + assertThat(shellDropTargetView!!.parent).isEqualTo(container) + } + + @Test + fun onShellDragStateChanged_false_endsShellDragManager() { + // Given + dragToBubbleController.onShellDragStateChanged(true) + + // When, end the drag state + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.onShellDragStateChanged(false) + animatorTestRule.advanceTimeBy( + ANIMATION_DELAY_MS + ) // Advance time for fade out animation + } + + // Then drop target view should be removed from container + assertThat(container.childCount).isEqualTo(0) + assertThat(shellDropTargetView).isNull() + } + + @Test + fun showShellBubbleBarDropTargetAt_leftLocation_showsLeftDropTarget() { + // Given + dragToBubbleController.onShellDragStateChanged(true) + // When + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.showShellBubbleBarDropTargetAt(BubbleBarLocation.LEFT) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + // Then view should be visible + assertThat(shellDropTargetView!!.alpha).isEqualTo(1f) + assertThat(shellDropTargetView!!.parent).isEqualTo(container) + } + + @Test + fun showShellBubbleBarDropTargetAt_rightLocation_showsRightDropTarget() { + // Given + dragToBubbleController.onShellDragStateChanged(true) + // When + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.showShellBubbleBarDropTargetAt(BubbleBarLocation.RIGHT) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + // Then view should be visible + assertThat(shellDropTargetView!!.alpha).isEqualTo(1f) + assertThat(shellDropTargetView!!.parent).isEqualTo(container) + } + + @Test + fun showShellBubbleBarDropTargetAtLeft_nullLocation_hidesDropTarget() { + // Given + dragToBubbleController.onShellDragStateChanged(true) + // When show LEFT drop target + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.showShellBubbleBarDropTargetAt(BubbleBarLocation.LEFT) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + // Then view should be visible + assertThat(shellDropTargetView!!.alpha).isEqualTo(1f) + + // When show null location + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.showShellBubbleBarDropTargetAt(null) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + // Then view should be hidden + assertThat(shellDropTargetView!!.alpha).isEqualTo(0f) + } + + @Test + fun showShellBubbleBarDropTargetToNotNullLocation_setsBubbleBarIsShowingDropTargetToTrue() { + // When show null location + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.showShellBubbleBarDropTargetAt(BubbleBarLocation.RIGHT) + } + // Then bubbleBarViewController isShowingDropTarget should change to true + verify(bubbleBarViewController).isShowingDropTarget = true + } + + @Test + fun showShellBubbleBarDropTargetNullLocation_setsBubbleBarIsShowingDropTargetToFalse() { + // When show null location + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.showShellBubbleBarDropTargetAt(null) + } + // Then bubbleBarViewController isShowingDropTarget should change to false + verify(bubbleBarViewController).isShowingDropTarget = false + } + + @Test + fun showShellBubbleBarDropTargetAt_consecutiveCallsSameLocation_noCallsToListener() { + // Given + prepareBubbleBarViewController(bubbleBarLocation = BubbleBarLocation.LEFT) + dragToBubbleController.onShellDragStateChanged(true) + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.showShellBubbleBarDropTargetAt(BubbleBarLocation.RIGHT) + animatorTestRule.advanceTimeBy(ANIMATION_DELAY_MS) + } + verify(bubbleBarLocationListener).onBubbleBarLocationAnimated(BubbleBarLocation.RIGHT) + clearInvocations(bubbleBarLocationListener) + + // When calling again with the same location + repeat(10) { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.showShellBubbleBarDropTargetAt(BubbleBarLocation.RIGHT) + } + } + // Then no new calls to onDragUpdated + verify(bubbleBarLocationListener, never()).onBubbleBarLocationAnimated(any()) + } + + @Test + fun setOverlayContainerView_nullPassed_sameContainerIsUsed() { + // Given + dragToBubbleController.setOverlayContainerView(null) + // When + dragToBubbleController.onDragStart(dragObject, DragOptions()) + // Then + val dropContainer = dragToBubbleController.launcherDropTargetManager.dropTargetView.parent + assertThat(dropContainer).isEqualTo(container) + assertThat(container.childCount).isEqualTo(DROP_VIEWS_COUNT_NO_BUBBLE_BAR) + } + + @Test + fun setOverlayContainerView_containerPassed_newContainerIsUsed() { + // Given + val newContainer = FrameLayout(context) + dragToBubbleController.setOverlayContainerView(newContainer) + // When + dragToBubbleController.onDragStart(dragObject, DragOptions()) + // Then + val dropContainer = dragToBubbleController.launcherDropTargetManager.dropTargetView.parent + assertThat(dropContainer).isEqualTo(newContainer) + assertThat(container.childCount).isEqualTo(0) + assertThat(newContainer.childCount).isEqualTo(DROP_VIEWS_COUNT_NO_BUBBLE_BAR) + } + + @Test + fun isDragInProgress_initially_returnsFalse() { + assertThat(dragToBubbleController.isDragInProgress).isFalse() + } + + @Test + fun isDragInProgress_afterLauncherDragStart_returnsTrue() { + // When + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + // Then + assertThat(dragToBubbleController.isDragInProgress).isTrue() + } + + @Test + fun isDragInProgress_afterShellDragStart_returnsTrue() { + // When + dragToBubbleController.onShellDragStateChanged(true) + + // Then + assertThat(dragToBubbleController.isDragInProgress).isTrue() + } + + @Test + fun isDragInProgress_afterLauncherDragStartAndDragEnd_returnsFalse() { + // Given + dragToBubbleController.onDragStart(dragObject, DragOptions()) + + // When + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.onDragEnd() + } + + // Then + assertThat(dragToBubbleController.isDragInProgress).isFalse() + } + + @Test + fun isDragInProgress_afterLauncherAndShellDragStartAndDragForShellEnd_returnsTrue() { + // Given + dragToBubbleController.onDragStart(dragObject, DragOptions()) + dragToBubbleController.onShellDragStateChanged(true) + + // When + InstrumentationRegistry.getInstrumentation().runOnMainSync { + dragToBubbleController.onShellDragStateChanged(false) + } + + // Then + assertThat(dragToBubbleController.isDragInProgress).isTrue() + } + + private fun prepareBubbleBarViewController( + hasBubbles: Boolean = false, + bubbleBarLocation: BubbleBarLocation = BubbleBarLocation.RIGHT, + ) { + bubbleBarViewController.stub { + on { hasBubbles() } doReturn hasBubbles + on { getBubbleBarLocation() } doReturn bubbleBarLocation + } + } + + private fun setAppInfo() { + dragObject.dragInfo = appInfo + } + + private fun DragObject.updateXYToCenterOf(rect: Rect) { + updateXY(rect.centerX(), rect.centerY()) + } + + private fun DragObject.updateXY(x: Int, y: Int) { + this.x = x + this.y = y + } + + private fun createTestDragZoneFactory(): DragZoneFactory { + val deviceConfig = + DeviceConfig( + isLargeScreen = true, + isSmallTablet = false, + isLandscape = true, + isRtl = false, + windowBounds = Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), + insets = Insets.NONE, + ) + return DragZoneFactory( + context, + deviceConfig, + { SplitScreenMode.NONE }, + { false }, + bubbleBarPropertiesProvider, + ) + } + + private class FakeBubbleBarPropertiesProvider : BubbleBarPropertiesProvider { + + override fun getHeight(): Int = BUBBLE_BAR_HEIGHT + + override fun getWidth(): Int = BUBBLE_BAR_WIDTH + + override fun getBottomPadding(): Int = BUBBLE_BAR_BOTTOM_PADDING + } + + companion object { + const val BUBBLE_BAR_WIDTH = 100 + const val BUBBLE_BAR_HEIGHT = 110 + const val BUBBLE_BAR_BOTTOM_PADDING = 70 + const val SCREEN_WIDTH = 2000 + const val SCREEN_HEIGHT = 1000 + const val DROP_VIEWS_COUNT = 1 + const val DROP_VIEWS_COUNT_NO_BUBBLE_BAR = 2 + const val ANIMATION_DELAY_MS = 250L + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleAnimatorTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleAnimatorTest.kt new file mode 100644 index 00000000000..da362bdfb33 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleAnimatorTest.kt @@ -0,0 +1,119 @@ +/* + * 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.launcher3.taskbar.bubbles.animation + +import androidx.core.animation.AnimatorTestRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import androidx.test.platform.app.InstrumentationRegistry +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class BubbleAnimatorTest { + + @get:Rule val animatorTestRule = AnimatorTestRule() + + private lateinit var bubbleAnimator: BubbleAnimator + + @Test + fun animateNewBubble_isRunning() { + bubbleAnimator = + BubbleAnimator( + iconSize = 40f, + expandedBarIconSpacing = 10f, + bubbleCount = 5, + onLeft = false, + ) + val listener = TestBubbleAnimatorListener() + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleAnimator.animateNewBubble(selectedBubbleIndex = 2, listener = listener) + } + + assertThat(bubbleAnimator.isRunning).isTrue() + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(250) + } + assertThat(bubbleAnimator.isRunning).isFalse() + } + + @Test + fun animateRemovedBubble_isRunning() { + bubbleAnimator = + BubbleAnimator( + iconSize = 40f, + expandedBarIconSpacing = 10f, + bubbleCount = 5, + onLeft = false, + ) + val listener = TestBubbleAnimatorListener() + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleAnimator.animateRemovedBubble( + bubbleIndex = 2, + selectedBubbleIndex = 3, + removingLastBubble = false, + removingLastRemainingBubble = false, + listener, + ) + } + + assertThat(bubbleAnimator.isRunning).isTrue() + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(250) + } + assertThat(bubbleAnimator.isRunning).isFalse() + } + + @Test + fun animateNewAndRemoveOld_isRunning() { + bubbleAnimator = + BubbleAnimator( + iconSize = 40f, + expandedBarIconSpacing = 10f, + bubbleCount = 5, + onLeft = false, + ) + val listener = TestBubbleAnimatorListener() + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleAnimator.animateNewAndRemoveOld( + selectedBubbleIndex = 3, + newlySelectedBubbleIndex = 2, + removedBubbleIndex = 1, + addedBubbleIndex = 3, + listener, + ) + } + + assertThat(bubbleAnimator.isRunning).isTrue() + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(250) + } + assertThat(bubbleAnimator.isRunning).isFalse() + } + + private class TestBubbleAnimatorListener : BubbleAnimator.Listener { + + override fun onAnimationUpdate(animatedFraction: Float) {} + + override fun onAnimationCancel() {} + + override fun onAnimationEnd() {} + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt deleted file mode 100644 index cc579abc9ed..00000000000 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt +++ /dev/null @@ -1,454 +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.launcher3.taskbar.bubbles.animation - -import android.content.Context -import android.graphics.Color -import android.graphics.Path -import android.graphics.drawable.ColorDrawable -import android.view.LayoutInflater -import android.view.View -import android.view.View.VISIBLE -import android.widget.FrameLayout -import androidx.core.graphics.drawable.toBitmap -import androidx.dynamicanimation.animation.DynamicAnimation -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.launcher3.R -import com.android.launcher3.taskbar.bubbles.BubbleBarBubble -import com.android.launcher3.taskbar.bubbles.BubbleBarOverflow -import com.android.launcher3.taskbar.bubbles.BubbleBarView -import com.android.launcher3.taskbar.bubbles.BubbleStashController -import com.android.launcher3.taskbar.bubbles.BubbleView -import com.android.wm.shell.common.bubbles.BubbleInfo -import com.android.wm.shell.shared.animation.PhysicsAnimator -import com.android.wm.shell.shared.animation.PhysicsAnimatorTestUtils -import com.google.common.truth.Truth.assertThat -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.kotlin.any -import org.mockito.kotlin.atLeastOnce -import org.mockito.kotlin.mock -import org.mockito.kotlin.verify -import org.mockito.kotlin.whenever - -@SmallTest -@RunWith(AndroidJUnit4::class) -class BubbleBarViewAnimatorTest { - - private val context = ApplicationProvider.getApplicationContext() - private lateinit var animatorScheduler: TestBubbleBarViewAnimatorScheduler - private lateinit var overflowView: BubbleView - private lateinit var bubbleView: BubbleView - private lateinit var bubble: BubbleBarBubble - private lateinit var bubbleBarView: BubbleBarView - private lateinit var bubbleStashController: BubbleStashController - - @Before - fun setUp() { - animatorScheduler = TestBubbleBarViewAnimatorScheduler() - PhysicsAnimatorTestUtils.prepareForTest() - } - - @Test - fun animateBubbleInForStashed() { - setUpBubbleBar() - setUpBubbleStashController() - - val handle = View(context) - val handleAnimator = PhysicsAnimator.getInstance(handle) - whenever(bubbleStashController.stashedHandlePhysicsAnimator).thenReturn(handleAnimator) - - val animator = - BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.animateBubbleInForStashed(bubble) - } - - // let the animation start and wait for it to complete - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) - - assertThat(handle.alpha).isEqualTo(0) - assertThat(handle.translationY) - .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) - assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) - assertThat(bubbleBarView.scaleX).isEqualTo(1) - assertThat(bubbleBarView.scaleY).isEqualTo(1) - assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) - assertThat(bubbleBarView.isAnimatingNewBubble).isTrue() - - // execute the hide bubble animation - assertThat(animatorScheduler.delayedBlock).isNotNull() - InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) - - // let the animation start and wait for it to complete - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) - - assertThat(handle.alpha).isEqualTo(1) - assertThat(handle.translationY).isEqualTo(0) - assertThat(bubbleBarView.alpha).isEqualTo(0) - assertThat(bubbleBarView.isAnimatingNewBubble).isFalse() - verify(bubbleStashController).stashBubbleBarImmediate() - } - - @Test - fun animateBubbleInForStashed_tapAnimatingBubble() { - setUpBubbleBar() - setUpBubbleStashController() - - val handle = View(context) - val handleAnimator = PhysicsAnimator.getInstance(handle) - whenever(bubbleStashController.stashedHandlePhysicsAnimator).thenReturn(handleAnimator) - - val animator = - BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.animateBubbleInForStashed(bubble) - } - - // let the animation start and wait for it to complete - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) - - assertThat(handle.alpha).isEqualTo(0) - assertThat(handle.translationY) - .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) - assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) - assertThat(bubbleBarView.scaleX).isEqualTo(1) - assertThat(bubbleBarView.scaleY).isEqualTo(1) - assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) - assertThat(bubbleBarView.isAnimatingNewBubble).isTrue() - - verify(bubbleStashController, atLeastOnce()).updateTaskbarTouchRegion() - - // verify the hide bubble animation is pending - assertThat(animatorScheduler.delayedBlock).isNotNull() - - animator.onBubbleBarTouchedWhileAnimating() - - assertThat(animatorScheduler.delayedBlock).isNull() - assertThat(bubbleBarView.alpha).isEqualTo(1) - assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) - assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) - assertThat(bubbleBarView.isAnimatingNewBubble).isFalse() - } - - @Test - fun animateBubbleInForStashed_touchTaskbarArea_whileShowing() { - setUpBubbleBar() - setUpBubbleStashController() - - val handle = View(context) - val handleAnimator = PhysicsAnimator.getInstance(handle) - whenever(bubbleStashController.stashedHandlePhysicsAnimator).thenReturn(handleAnimator) - - val animator = - BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.animateBubbleInForStashed(bubble) - } - - // wait for the animation to start - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(handleAnimator) { true } - - handleAnimator.assertIsRunning() - assertThat(bubbleBarView.isAnimatingNewBubble).isTrue() - // verify the hide bubble animation is pending - assertThat(animatorScheduler.delayedBlock).isNotNull() - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.onStashStateChangingWhileAnimating() - } - - // verify that the hide animation was canceled - assertThat(animatorScheduler.delayedBlock).isNull() - assertThat(bubbleBarView.isAnimatingNewBubble).isFalse() - verify(bubbleStashController).onNewBubbleAnimationInterrupted(any(), any()) - - // PhysicsAnimatorTestUtils posts the cancellation to the main thread so we need to wait - // again - InstrumentationRegistry.getInstrumentation().waitForIdleSync() - handleAnimator.assertIsNotRunning() - } - - @Test - fun animateBubbleInForStashed_touchTaskbarArea_whileHiding() { - setUpBubbleBar() - setUpBubbleStashController() - - val handle = View(context) - val handleAnimator = PhysicsAnimator.getInstance(handle) - whenever(bubbleStashController.stashedHandlePhysicsAnimator).thenReturn(handleAnimator) - - val animator = - BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.animateBubbleInForStashed(bubble) - } - - // let the animation start and wait for it to complete - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) - - // execute the hide bubble animation - assertThat(animatorScheduler.delayedBlock).isNotNull() - InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) - - // wait for the hide animation to start - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - handleAnimator.assertIsRunning() - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.onStashStateChangingWhileAnimating() - } - - assertThat(bubbleBarView.isAnimatingNewBubble).isFalse() - verify(bubbleStashController).onNewBubbleAnimationInterrupted(any(), any()) - - // PhysicsAnimatorTestUtils posts the cancellation to the main thread so we need to wait - // again - InstrumentationRegistry.getInstrumentation().waitForIdleSync() - handleAnimator.assertIsNotRunning() - } - - @Test - fun animateBubbleInForStashed_showAnimationCanceled() { - setUpBubbleBar() - setUpBubbleStashController() - - val handle = View(context) - val handleAnimator = PhysicsAnimator.getInstance(handle) - whenever(bubbleStashController.stashedHandlePhysicsAnimator).thenReturn(handleAnimator) - - val animator = - BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.animateBubbleInForStashed(bubble) - } - - // wait for the animation to start - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(handleAnimator) { true } - - handleAnimator.assertIsRunning() - assertThat(bubbleBarView.isAnimatingNewBubble).isTrue() - assertThat(animatorScheduler.delayedBlock).isNotNull() - - handleAnimator.cancel() - handleAnimator.assertIsNotRunning() - assertThat(bubbleBarView.isAnimatingNewBubble).isFalse() - assertThat(animatorScheduler.delayedBlock).isNull() - } - - @Test - fun animateToInitialState_inApp() { - setUpBubbleBar() - setUpBubbleStashController() - whenever(bubbleStashController.bubbleBarTranslationY) - .thenReturn(BAR_TRANSLATION_Y_FOR_TASKBAR) - - val handle = View(context) - val handleAnimator = PhysicsAnimator.getInstance(handle) - whenever(bubbleStashController.stashedHandlePhysicsAnimator).thenReturn(handleAnimator) - - val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) - - val animator = - BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.animateToInitialState(bubble, isInApp = true, isExpanding = false) - } - - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) - - barAnimator.assertIsNotRunning() - assertThat(bubbleBarView.isAnimatingNewBubble).isTrue() - assertThat(bubbleBarView.alpha).isEqualTo(1) - assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) - - assertThat(animatorScheduler.delayedBlock).isNotNull() - InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) - - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) - - InstrumentationRegistry.getInstrumentation().waitForIdleSync() - assertThat(bubbleBarView.isAnimatingNewBubble).isFalse() - assertThat(bubbleBarView.alpha).isEqualTo(0) - assertThat(handle.translationY).isEqualTo(0) - assertThat(handle.alpha).isEqualTo(1) - - verify(bubbleStashController).stashBubbleBarImmediate() - } - - @Test - fun animateToInitialState_inApp_autoExpanding() { - setUpBubbleBar() - setUpBubbleStashController() - whenever(bubbleStashController.bubbleBarTranslationY) - .thenReturn(BAR_TRANSLATION_Y_FOR_TASKBAR) - - val handle = View(context) - val handleAnimator = PhysicsAnimator.getInstance(handle) - whenever(bubbleStashController.stashedHandlePhysicsAnimator).thenReturn(handleAnimator) - - val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) - - val animator = - BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.animateToInitialState(bubble, isInApp = true, isExpanding = true) - } - - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) - - barAnimator.assertIsNotRunning() - assertThat(bubbleBarView.isAnimatingNewBubble).isTrue() - assertThat(bubbleBarView.alpha).isEqualTo(1) - assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) - - assertThat(animatorScheduler.delayedBlock).isNotNull() - InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) - - assertThat(bubbleBarView.isAnimatingNewBubble).isFalse() - assertThat(bubbleBarView.alpha).isEqualTo(1) - assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) - - verify(bubbleStashController).showBubbleBarImmediate() - } - - @Test - fun animateToInitialState_inHome() { - setUpBubbleBar() - setUpBubbleStashController() - whenever(bubbleStashController.bubbleBarTranslationY) - .thenReturn(BAR_TRANSLATION_Y_FOR_HOTSEAT) - - val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) - - val animator = - BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) - - InstrumentationRegistry.getInstrumentation().runOnMainSync { - animator.animateToInitialState(bubble, isInApp = false, isExpanding = false) - } - - InstrumentationRegistry.getInstrumentation().runOnMainSync {} - PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) - - barAnimator.assertIsNotRunning() - assertThat(bubbleBarView.isAnimatingNewBubble).isTrue() - assertThat(bubbleBarView.alpha).isEqualTo(1) - assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) - - assertThat(animatorScheduler.delayedBlock).isNotNull() - InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) - - assertThat(bubbleBarView.isAnimatingNewBubble).isFalse() - assertThat(bubbleBarView.alpha).isEqualTo(1) - assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) - - verify(bubbleStashController).showBubbleBarImmediate() - } - - private fun setUpBubbleBar() { - bubbleBarView = BubbleBarView(context) - InstrumentationRegistry.getInstrumentation().runOnMainSync { - bubbleBarView.layoutParams = FrameLayout.LayoutParams(0, 0) - val inflater = LayoutInflater.from(context) - - val bitmap = ColorDrawable(Color.WHITE).toBitmap(width = 20, height = 20) - overflowView = - inflater.inflate(R.layout.bubblebar_item_view, bubbleBarView, false) as BubbleView - overflowView.setOverflow(BubbleBarOverflow(overflowView), bitmap) - bubbleBarView.addView(overflowView) - - val bubbleInfo = - BubbleInfo("key", 0, null, null, 0, context.packageName, null, null, false) - bubbleView = - inflater.inflate(R.layout.bubblebar_item_view, bubbleBarView, false) as BubbleView - bubble = - BubbleBarBubble(bubbleInfo, bubbleView, bitmap, bitmap, Color.WHITE, Path(), "") - bubbleView.setBubble(bubble) - bubbleBarView.addView(bubbleView) - } - InstrumentationRegistry.getInstrumentation().waitForIdleSync() - } - - private fun setUpBubbleStashController() { - bubbleStashController = mock() - whenever(bubbleStashController.isStashed).thenReturn(true) - whenever(bubbleStashController.diffBetweenHandleAndBarCenters) - .thenReturn(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS) - whenever(bubbleStashController.stashedHandleTranslationForNewBubbleAnimation) - .thenReturn(HANDLE_TRANSLATION) - whenever(bubbleStashController.bubbleBarTranslationYForTaskbar) - .thenReturn(BAR_TRANSLATION_Y_FOR_TASKBAR) - } - - private fun PhysicsAnimator.assertIsRunning() { - InstrumentationRegistry.getInstrumentation().runOnMainSync { - assertThat(isRunning()).isTrue() - } - } - - private fun PhysicsAnimator.assertIsNotRunning() { - InstrumentationRegistry.getInstrumentation().runOnMainSync { - assertThat(isRunning()).isFalse() - } - } - - private class TestBubbleBarViewAnimatorScheduler : BubbleBarViewAnimator.Scheduler { - - var delayedBlock: Runnable? = null - private set - - override fun post(block: Runnable) { - block.run() - } - - override fun postDelayed(delayMillis: Long, block: Runnable) { - check(delayedBlock == null) { "there is already a pending block waiting to run" } - delayedBlock = block - } - - override fun cancel(block: Runnable) { - check(delayedBlock == block) { "the pending block does not match the canceled block" } - delayedBlock = null - } - } -} - -private const val DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS = -20f -private const val HANDLE_TRANSLATION = -30f -private const val BAR_TRANSLATION_Y_FOR_TASKBAR = -50f -private const val BAR_TRANSLATION_Y_FOR_HOTSEAT = -40f diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutControllerTest.kt new file mode 100644 index 00000000000..91fe6a6f023 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutControllerTest.kt @@ -0,0 +1,256 @@ +/* + * 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.launcher3.taskbar.bubbles.flyout + +import android.content.Context +import android.graphics.Color +import android.graphics.PointF +import android.view.Gravity +import android.view.View +import android.widget.FrameLayout +import android.widget.TextView +import androidx.core.animation.AnimatorTestRule +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.launcher3.R +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +/** Unit tests for [BubbleBarFlyoutController] */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class BubbleBarFlyoutControllerTest { + + @get:Rule val animatorTestRule = AnimatorTestRule() + + private lateinit var flyoutController: BubbleBarFlyoutController + private lateinit var flyoutContainer: FrameLayout + private lateinit var flyoutCallbacks: FakeFlyoutCallbacks + private val context = ApplicationProvider.getApplicationContext() + private val flyoutMessage = BubbleBarFlyoutMessage(icon = null, "sender name", "message") + private var onLeft = true + private var flyoutTy = 50f + + private val showAnimationDuration = 400L + private val hideAnimationDuration = 350L + + @Before + fun setUp() { + flyoutContainer = FrameLayout(context) + val positioner = + object : BubbleBarFlyoutPositioner { + override val isOnLeft + get() = onLeft + + override val targetTy + get() = flyoutTy + + override val distanceToCollapsedPosition = PointF(100f, 200f) + override val collapsedSize = 30f + override val collapsedColor = Color.BLUE + override val collapsedElevation = 1f + override val distanceToRevealTriangle = 50f + } + flyoutCallbacks = FakeFlyoutCallbacks() + val flyoutScheduler = FlyoutScheduler { block -> block.invoke() } + flyoutController = + BubbleBarFlyoutController(flyoutContainer, positioner, flyoutCallbacks, flyoutScheduler) + } + + @Test + fun flyoutPosition_left() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + assertThat(flyoutContainer.childCount).isEqualTo(1) + val flyout = flyoutContainer.getChildAt(0) + val lp = flyout.layoutParams as FrameLayout.LayoutParams + assertThat(lp.gravity).isEqualTo(Gravity.BOTTOM or Gravity.LEFT) + assertThat(flyout.translationY).isEqualTo(50f) + } + } + + @Test + fun flyoutPosition_right() { + onLeft = false + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + assertThat(flyoutContainer.childCount).isEqualTo(1) + val flyout = flyoutContainer.getChildAt(0) + val lp = flyout.layoutParams as FrameLayout.LayoutParams + assertThat(lp.gravity).isEqualTo(Gravity.BOTTOM or Gravity.RIGHT) + assertThat(flyout.translationY).isEqualTo(50f) + } + } + + @Test + fun flyoutMessage() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + assertThat(flyoutContainer.childCount).isEqualTo(1) + val flyout = flyoutContainer.getChildAt(0) + val sender = flyout.findViewById(R.id.bubble_flyout_title) + assertThat(sender.text).isEqualTo("sender name") + val message = flyout.findViewById(R.id.bubble_flyout_text) + assertThat(message.text).isEqualTo("message") + } + } + + @Test + fun hideFlyout_removedFromContainer() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + assertThat(flyoutController.hasFlyout()).isTrue() + assertThat(flyoutContainer.childCount).isEqualTo(1) + flyoutController.collapseFlyout {} + animatorTestRule.advanceTimeBy(hideAnimationDuration) + } + assertThat(flyoutContainer.childCount).isEqualTo(0) + assertThat(flyoutController.hasFlyout()).isFalse() + } + + @Test + fun cancelFlyout_fadesOutFlyout() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + assertThat(flyoutContainer.childCount).isEqualTo(1) + val flyoutView = flyoutContainer.findViewById(R.id.bubble_bar_flyout_view) + assertThat(flyoutView.alpha).isEqualTo(1f) + flyoutController.cancelFlyout {} + animatorTestRule.advanceTimeBy(hideAnimationDuration) + assertThat(flyoutView.alpha).isEqualTo(0f) + } + } + + @Test + fun clickFlyout_notifiesCallback() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + assertThat(flyoutContainer.childCount).isEqualTo(1) + val flyoutView = flyoutContainer.findViewById(R.id.bubble_bar_flyout_view) + assertThat(flyoutView.alpha).isEqualTo(1f) + animatorTestRule.advanceTimeBy(showAnimationDuration) + flyoutView.performClick() + } + assertThat(flyoutCallbacks.flyoutClicked).isTrue() + } + + @Test + fun updateFlyoutWhileExpanding() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + assertThat(flyoutController.hasFlyout()).isTrue() + val flyout = flyoutContainer.findViewById(R.id.bubble_bar_flyout_view) + assertThat(flyout.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("message") + // advance the animation about halfway + animatorTestRule.advanceTimeBy(100) + } + assertThat(flyoutController.hasFlyout()).isTrue() + + val newFlyoutMessage = flyoutMessage.copy(message = "new message") + InstrumentationRegistry.getInstrumentation().runOnMainSync { + val flyout = flyoutContainer.findViewById(R.id.bubble_bar_flyout_view) + // set negative translation to verify that the top boundary extends as a result of + // updating while expanding + flyout.translationY = -50f + flyoutController.updateFlyoutWhileExpanding(newFlyoutMessage) + assertThat(flyout.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("new message") + } + } + + @Test + fun updateFlyoutFullyExpanded() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + animatorTestRule.advanceTimeBy(showAnimationDuration) + } + assertThat(flyoutController.hasFlyout()).isTrue() + + val newFlyoutMessage = flyoutMessage.copy(message = "new message") + InstrumentationRegistry.getInstrumentation().runOnMainSync { + val flyout = flyoutContainer.findViewById(R.id.bubble_bar_flyout_view) + // set negative translation to verify that the top boundary extends as a result of + // updating while fully expanded + flyout.translationY = -50f + flyoutController.updateFlyoutFullyExpanded(newFlyoutMessage) {} + + // advance the timer so that the fade out animation plays + animatorTestRule.advanceTimeBy(hideAnimationDuration) + assertThat(flyout.alpha).isEqualTo(0) + assertThat(flyout.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("new message") + + // advance the timer so that the fade in animation plays + animatorTestRule.advanceTimeBy(showAnimationDuration) + assertThat(flyout.alpha).isEqualTo(1) + } + } + + @Test + fun updateFlyoutWhileCollapsing() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + setupAndShowFlyout() + animatorTestRule.advanceTimeBy(showAnimationDuration) + } + assertThat(flyoutController.hasFlyout()).isTrue() + + val newFlyoutMessage = flyoutMessage.copy(message = "new message") + InstrumentationRegistry.getInstrumentation().runOnMainSync { + var flyoutCollapsed = false + flyoutController.collapseFlyout { flyoutCollapsed = true } + // advance the fake timer so that the collapse animation runs for 125ms + animatorTestRule.advanceTimeBy(125) + + // update the flyout in the middle of collapsing, which should start expanding it. + var flyoutReversed = false + flyoutController.updateFlyoutWhileCollapsing(newFlyoutMessage) { flyoutReversed = true } + + // the collapse and expand animations use an emphasized interpolator, so the reverse + // path does not take the same time. advance the timer the by full duration of the show + // animation to ensure it completes + animatorTestRule.advanceTimeBy(showAnimationDuration) + val flyout = flyoutContainer.findViewById(R.id.bubble_bar_flyout_view) + assertThat(flyout.alpha).isEqualTo(1) + assertThat(flyout.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("new message") + // verify that we never called the end action on the collapse animation + assertThat(flyoutCollapsed).isFalse() + // verify that we called the end action on the reverse animation + assertThat(flyoutReversed).isTrue() + } + assertThat(flyoutController.hasFlyout()).isTrue() + } + + private fun setupAndShowFlyout() { + flyoutController.setUpAndShowFlyout(flyoutMessage, {}, {}) + } + + class FakeFlyoutCallbacks : FlyoutCallbacks { + + var flyoutClicked = false + + override fun flyoutClicked() { + flyoutClicked = true + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashControllerTest.kt new file mode 100644 index 00000000000..bbacee8aeaf --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashControllerTest.kt @@ -0,0 +1,560 @@ +/* + * 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.launcher3.taskbar.bubbles.stashing + +import android.animation.AnimatorTestRule +import android.content.Context +import android.widget.FrameLayout +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.anim.AnimatedFloat +import com.android.launcher3.taskbar.TaskbarInsetsController +import com.android.launcher3.taskbar.bubbles.BubbleBarView +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.BubbleLauncherState +import com.android.launcher3.util.MultiValueAlpha +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.any +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** Unit tests for [PersistentBubbleStashController]. */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class PersistentBubbleStashControllerTest { + + companion object { + const val BUBBLE_BAR_HEIGHT = 100f + const val HOTSEAT_VERTICAL_CENTER = 95 + const val HOTSEAT_TRANSLATION_Y = -45f + const val TASK_BAR_TRANSLATION_Y = -5f + const val TASK_BAR_STASHED_TRANSLATION_Y = 105f + } + + @get:Rule val animatorTestRule: AnimatorTestRule = AnimatorTestRule(this) + + @get:Rule val rule: MockitoRule = MockitoJUnit.rule() + + private val context = ApplicationProvider.getApplicationContext() + private lateinit var bubbleBarView: BubbleBarView + + @Mock lateinit var bubbleBarViewController: BubbleBarViewController + + @Mock lateinit var taskbarInsetsController: TaskbarInsetsController + + private lateinit var persistentTaskBarStashController: PersistentBubbleStashController + private lateinit var translationY: AnimatedFloat + private lateinit var scale: AnimatedFloat + private lateinit var alpha: MultiValueAlpha + + @Before + fun setUp() { + persistentTaskBarStashController = + PersistentBubbleStashController(DefaultDimensionsProvider()) + setUpBubbleBarView() + setUpBubbleBarController() + persistentTaskBarStashController.bubbleBarVerticalCenterForHome = HOTSEAT_VERTICAL_CENTER + persistentTaskBarStashController.init( + taskbarInsetsController, + bubbleBarViewController, + null, + ImmediateAction(), + ) + } + + @Test + fun updateLauncherState_noBubbles_controllerNotified() { + // Given bubble bar has no bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + + // When switch to home screen + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + } + + // Then bubble bar view controller is notified + verify(bubbleBarViewController).onBubbleBarConfigurationChanged(/* animate= */ false) + } + + @Test + fun setBubblesShowingOnHomeUpdatedToFalse_barPositionYUpdated_controllersNotified() { + // Given bubble bar is on home and has bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + // When switch out of the home screen + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.IN_APP + } + + // Then translation Y is animating and the bubble bar controller is notified + assertThat(translationY.isAnimating).isTrue() + verify(bubbleBarViewController).onBubbleBarConfigurationChanged(/* animate= */ true) + // Wait until animation ends + advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + // Check translation Y is correct and the insets controller is notified + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_TRANSLATION_Y) + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + @Test + fun setBubblesShowingOnHomeUpdatedToTrue_barPositionYUpdated_controllersNotified() { + // Given bubble bar has bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + // When switch to home screen + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + } + + // Then translation Y is animating and the bubble bar controller is notified + assertThat(translationY.isAnimating).isTrue() + verify(bubbleBarViewController).onBubbleBarConfigurationChanged(/* animate= */ true) + // Wait until animation ends + advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + + // Check translation Y is correct and the insets controller is notified + assertThat(bubbleBarView.translationY).isEqualTo(HOTSEAT_TRANSLATION_Y) + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + @Test + fun setBubblesShowingOnOverviewUpdatedToFalse_controllersNotified() { + // Given bubble bar is on overview + persistentTaskBarStashController.launcherState = BubbleLauncherState.OVERVIEW + clearInvocations(bubbleBarViewController) + + // When switch out of the overview screen + persistentTaskBarStashController.launcherState = BubbleLauncherState.IN_APP + + // Then bubble bar controller is notified + verify(bubbleBarViewController).onBubbleBarConfigurationChanged(/* animate= */ true) + } + + @Test + fun setBubblesShowingOnOverviewUpdatedToTrue_controllersNotified() { + // When switch to the overview screen + persistentTaskBarStashController.launcherState = BubbleLauncherState.OVERVIEW + + // Then bubble bar controller is notified + verify(bubbleBarViewController).onBubbleBarConfigurationChanged(/* animate= */ true) + } + + @Test + fun isSysuiLockedSwitchedToFalseForOverview_unlockAnimationIsShown() { + // Given screen is locked and bubble bar has bubbles + persistentTaskBarStashController.isSysuiLocked = true + persistentTaskBarStashController.launcherState = BubbleLauncherState.OVERVIEW + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + // When switch to the overview screen + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.isSysuiLocked = false + } + + // Then + assertThat(translationY.isAnimating).isTrue() + assertThat(scale.isAnimating).isTrue() + // Wait until animation ends + advanceTimeBy(BubbleStashController.BAR_STASH_DURATION) + + // Then bubble bar is fully visible at the correct location + assertThat(bubbleBarView.scaleX).isEqualTo(1f) + assertThat(bubbleBarView.scaleY).isEqualTo(1f) + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_TRANSLATION_Y) + assertThat(bubbleBarView.alpha).isEqualTo(1f) + // Insets controller is notified + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + @Test + fun showBubbleBarImmediateToY() { + // Given bubble bar is fully transparent and scaled to 0 at 0 y position + val targetY = 341f + bubbleBarView.alpha = 0f + bubbleBarView.scaleX = 0f + bubbleBarView.scaleY = 0f + bubbleBarView.translationY = 0f + + // When + persistentTaskBarStashController.showBubbleBarImmediate(targetY) + + // Then all property values are updated + assertThat(bubbleBarView.translationY).isEqualTo(targetY) + assertThat(bubbleBarView.alpha).isEqualTo(1f) + assertThat(bubbleBarView.scaleX).isEqualTo(1f) + assertThat(bubbleBarView.scaleY).isEqualTo(1f) + } + + @Test + fun isTransientTaskbar_false() { + assertThat(persistentTaskBarStashController.isTransientTaskBar).isFalse() + } + + @Test + fun hasHandleView_false() { + assertThat(persistentTaskBarStashController.hasHandleView).isFalse() + } + + @Test + fun isStashed_false() { + assertThat(persistentTaskBarStashController.isStashed).isFalse() + } + + @Test + fun bubbleBarTranslationYForTaskbar() { + // Give bubble bar is on home + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + + // Then bubbleBarTranslationY would be HOTSEAT_TRANSLATION_Y + assertThat(persistentTaskBarStashController.bubbleBarTranslationY) + .isEqualTo(HOTSEAT_TRANSLATION_Y) + + // Give bubble bar is not on home + persistentTaskBarStashController.launcherState = BubbleLauncherState.IN_APP + + // Then bubbleBarTranslationY would be TASK_BAR_TRANSLATION_Y + assertThat(persistentTaskBarStashController.bubbleBarTranslationY) + .isEqualTo(TASK_BAR_TRANSLATION_Y) + } + + @Test + fun inAppDisplayOverrideProgress_onHome_updatesTranslationFromHomeToInApp() { + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + + assertThat(persistentTaskBarStashController.bubbleBarTranslationY) + .isEqualTo(HOTSEAT_TRANSLATION_Y) + + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + + val middleBetweenHotseatAndTaskbar = (HOTSEAT_TRANSLATION_Y + TASK_BAR_TRANSLATION_Y) / 2f + assertThat(persistentTaskBarStashController.bubbleBarTranslationY) + .isWithin(0.1f) + .of(middleBetweenHotseatAndTaskbar) + + persistentTaskBarStashController.inAppDisplayOverrideProgress = 1f + + assertThat(persistentTaskBarStashController.bubbleBarTranslationY) + .isEqualTo(TASK_BAR_TRANSLATION_Y) + } + + @Test + fun inAppDisplayOverrideProgress_onHome_updatesInsetsWhenProgressReachesOne() { + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + // Reset invocations to track only changes from in-app display override + clearInvocations(taskbarInsetsController) + + // Insets are not updated for values between 0 and 1 + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + verify(taskbarInsetsController, never()).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + + // Update insets when progress reaches 1 + persistentTaskBarStashController.inAppDisplayOverrideProgress = 1f + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + @Test + fun inAppDisplayOverrideProgress_onHome_updatesInsetsWhenProgressReachesZero() { + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + persistentTaskBarStashController.inAppDisplayOverrideProgress = 1f + // Reset invocations to track only changes from in-app display override + clearInvocations(taskbarInsetsController) + + // Insets are not updated for values between 0 and 1 + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + verify(taskbarInsetsController, never()).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + + // Update insets when progress reaches 0 + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0f + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + @Test + fun inAppDisplayOverrideProgress_onHome_cancelExistingAnimation() { + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + + bubbleBarViewController.bubbleBarTranslationY.animateToValue(100f) + advanceTimeBy(10) + assertThat(bubbleBarViewController.bubbleBarTranslationY.isAnimating).isTrue() + + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + } + assertThat(bubbleBarViewController.bubbleBarTranslationY.isAnimating).isFalse() + } + + @Test + fun inAppDisplayProgressUpdate_inApp_noTranslationUpdate() { + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + persistentTaskBarStashController.launcherState = BubbleLauncherState.IN_APP + + assertThat(persistentTaskBarStashController.bubbleBarTranslationY) + .isEqualTo(TASK_BAR_TRANSLATION_Y) + + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + + assertThat(persistentTaskBarStashController.bubbleBarTranslationY) + .isEqualTo(TASK_BAR_TRANSLATION_Y) + } + + @Test + fun inAppDisplayOverrideProgress_inApp_noInsetsUpdate() { + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + persistentTaskBarStashController.launcherState = BubbleLauncherState.IN_APP + + // Reset invocations to track only changes from in-app display override + clearInvocations(taskbarInsetsController) + + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + persistentTaskBarStashController.inAppDisplayOverrideProgress = 1f + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0f + + // Never triggers an update to insets + verify(taskbarInsetsController, never()).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + @Test + fun showBubbleBar_expand_bubbleBarGesture() { + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + whenever(bubbleBarViewController.isExpanded).thenReturn(false) + + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.showBubbleBar( + expandBubbles = true, + bubbleBarGesture = true, + ) + } + + verify(bubbleBarViewController).animateExpanded(true, true) + } + + @Test + fun showBubbleBar_expand_notBubbleBarGesture() { + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + whenever(bubbleBarViewController.isExpanded).thenReturn(false) + + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.showBubbleBar( + expandBubbles = true, + bubbleBarGesture = false, + ) + } + + verify(bubbleBarViewController).animateExpanded(true, false) + } + + @Test + fun showBubbleBar_notExpanding_bubbleBarGesture() { + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + whenever(bubbleBarViewController.isExpanded).thenReturn(false) + + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.showBubbleBar( + expandBubbles = false, + bubbleBarGesture = true, + ) + } + + verify(bubbleBarViewController, never()).animateExpanded(any(), any()) + } + + @Test + fun launcherStateChanged_toHome_doesNotCallAnimateExpandedForStateChange() { + clearInvocations(bubbleBarViewController) + + // When switch to home screen + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + } + + // Crucially, animateExpanded is NOT called + verify(bubbleBarViewController, never()).animateExpanded(any(), any()) + } + + @Test + fun switchToOverview_inAppDisplayOverrideProgressIsReset() { + // Given we are on home and the in-app display override is not 0 + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + } + + // When we switch to overview + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.OVERVIEW + } + + // Then the in-app display override is 0 + assertThat(persistentTaskBarStashController.inAppDisplayOverrideProgress).isEqualTo(0f) + } + + @Test + fun switchFromInAppToHome_inAppDisplayOverrideProgressIsNotReset() { + // Given we are inside application (initial state) and the display override is not 0 + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + } + + // When we switch to home + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + } + + // Then the in-app display override is not reset + assertThat(persistentTaskBarStashController.inAppDisplayOverrideProgress).isEqualTo(0.5f) + } + + @Test + fun switchFromHomeToInApp_inAppDisplayOverrideProgressIsNotReset() { + // Given we are on home and the in-app display override is not 0 + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + persistentTaskBarStashController.inAppDisplayOverrideProgress = 0.5f + } + + // When we switch to home + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.IN_APP + } + + // Then the in-app display override is not reset + assertThat(persistentTaskBarStashController.inAppDisplayOverrideProgress).isEqualTo(0.5f) + } + + @Test + fun setStashedInPersistentTaskBar_passingTrue_bubbleBarIsStashed() { + // When setStashedInPersistentTaskBar is called with true + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.setStashedInPersistentTaskBar(true) + animatorTestRule.advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + } + + // Then bubble bar is stashed + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_STASHED_TRANSLATION_Y) + assertThat(persistentTaskBarStashController.isStashed).isTrue() + } + + @Test + fun noCallsToStashedInPersistentTaskBar_stashingTaskbarCallsDoesNotStashBubbleBar() { + // Given bubble bar is IN_APP and has bubbles + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.launcherState = BubbleLauncherState.HOME + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + persistentTaskBarStashController.launcherState = BubbleLauncherState.IN_APP + animatorTestRule.advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_TRANSLATION_Y) + } + + // When calling to stash + persistentTaskBarStashController.stashBubbleBar() + + // Then translation Y remains the same + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_TRANSLATION_Y) + } + + @Test + fun setStashedInPersistentTaskBar_passingTrue_unlocksOtherStashCalls() { + // Given stashing is unlocked and bubble bar is unstashed + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.setStashedInPersistentTaskBar(true) + animatorTestRule.advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + persistentTaskBarStashController.showBubbleBarImmediate() + } + // Check that bubble bar is un-stashed + assertThat(persistentTaskBarStashController.isStashed).isFalse() + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_TRANSLATION_Y) + + // When calling to stash + getInstrumentation().runOnMainSync { + persistentTaskBarStashController.stashBubbleBar() + animatorTestRule.advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + } + + // Then Bubble bar is stashed + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_STASHED_TRANSLATION_Y) + assertThat(persistentTaskBarStashController.isStashed).isTrue() + } + + private fun advanceTimeBy(advanceMs: Long) { + // Advance animator for on-device tests + getInstrumentation().runOnMainSync { animatorTestRule.advanceTimeBy(advanceMs) } + } + + private fun setUpBubbleBarView() { + getInstrumentation().runOnMainSync { + bubbleBarView = BubbleBarView(context) + bubbleBarView.layoutParams = FrameLayout.LayoutParams(0, 0) + bubbleBarView.setController( + object : BubbleBarView.Controller { + override fun getBubbleBarTranslationY(): Float = 0f + + override fun onBubbleBarTouched() {} + + override fun expandBubbleBar() {} + + override fun dismissBubbleBar() {} + + override fun updateBubbleBarLocation( + location: BubbleBarLocation?, + source: Int, + ) {} + + override fun setIsDragging(dragging: Boolean) {} + + override fun onBubbleBarExpandedStateChanged(expanded: Boolean) {} + } + ) + } + } + + private fun setUpBubbleBarController() { + translationY = AnimatedFloat(Runnable { bubbleBarView.translationY = translationY.value }) + scale = + AnimatedFloat( + Runnable { + val scale: Float = scale.value + bubbleBarView.scaleX = scale + bubbleBarView.scaleY = scale + } + ) + alpha = MultiValueAlpha(bubbleBarView, 1 /* num alpha channels */) + + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + whenever(bubbleBarViewController.bubbleBarTranslationY).thenReturn(translationY) + whenever(bubbleBarViewController.bubbleBarScaleY).thenReturn(scale) + whenever(bubbleBarViewController.bubbleBarAlpha).thenReturn(alpha) + whenever(bubbleBarViewController.bubbleBarCollapsedHeight).thenReturn(BUBBLE_BAR_HEIGHT) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/StashingTestUtils.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/StashingTestUtils.kt new file mode 100644 index 00000000000..96c2f4554fb --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/StashingTestUtils.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.launcher3.taskbar.bubbles.stashing + +class ImmediateAction : BubbleStashController.ControllersAfterInitAction { + override fun runAfterInit(action: Runnable) = action.run() +} + +class DefaultDimensionsProvider( + private val taskBarBottomSpace: Int = TASKBAR_BOTTOM_SPACE, + private val taskBarHeight: Int = TASKBAR_HEIGHT, +) : BubbleStashController.TaskbarHotseatDimensionsProvider { + override fun getTaskbarBottomSpace(): Int = taskBarBottomSpace + + override fun getTaskbarHeight(): Int = taskBarHeight + + companion object { + const val TASKBAR_BOTTOM_SPACE = 0 + const val TASKBAR_HEIGHT = 110 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/TransientBubbleStashControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/TransientBubbleStashControllerTest.kt new file mode 100644 index 00000000000..3b6412d787b --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/stashing/TransientBubbleStashControllerTest.kt @@ -0,0 +1,643 @@ +/* + * 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.launcher3.taskbar.bubbles.stashing + +import android.animation.AnimatorSet +import android.animation.AnimatorTestRule +import android.content.Context +import android.view.View +import android.widget.FrameLayout +import androidx.dynamicanimation.animation.DynamicAnimation +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.anim.AnimatedFloat +import com.android.launcher3.taskbar.StashedHandleView +import com.android.launcher3.taskbar.TaskbarInsetsController +import com.android.launcher3.taskbar.TaskbarStashController +import com.android.launcher3.taskbar.bubbles.BubbleBarView +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController +import com.android.launcher3.taskbar.bubbles.BubbleStashedHandleViewController +import com.android.launcher3.taskbar.bubbles.BubbleView +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.BubbleLauncherState +import com.android.launcher3.util.MultiValueAlpha +import com.android.wm.shell.shared.animation.PhysicsAnimator +import com.android.wm.shell.shared.animation.PhysicsAnimatorTestUtils +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import com.google.common.collect.Range +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.any +import org.mockito.kotlin.atLeastOnce +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** Unit tests for [TransientBubbleStashController]. */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class TransientBubbleStashControllerTest { + + companion object { + const val TASKBAR_BOTTOM_SPACE = 5 + const val HOTSEAT_VERTICAL_CENTER = 95 + const val BUBBLE_BAR_WIDTH = 200 + const val BUBBLE_BAR_HEIGHT = 100 + const val HOTSEAT_TRANSLATION_Y = -45f + const val TASK_BAR_TRANSLATION_Y = -TASKBAR_BOTTOM_SPACE.toFloat() + const val HANDLE_VIEW_WIDTH = 150 + const val HANDLE_VIEW_HEIGHT = 4 + const val BUBBLE_BAR_STASHED_TRANSLATION_Y = -4.5f + } + + @get:Rule val animatorTestRule: AnimatorTestRule = AnimatorTestRule(this) + + @get:Rule val rule: MockitoRule = MockitoJUnit.rule() + + @Mock lateinit var bubbleStashedHandleViewController: BubbleStashedHandleViewController + + @Mock lateinit var bubbleBarViewController: BubbleBarViewController + + @Mock lateinit var taskbarInsetsController: TaskbarInsetsController + + private val context = ApplicationProvider.getApplicationContext() + private lateinit var bubbleBarView: BubbleBarView + private lateinit var stashedHandleView: StashedHandleView + private lateinit var bubbleView: BubbleView + private lateinit var barTranslationY: AnimatedFloat + private lateinit var barScaleX: AnimatedFloat + private lateinit var barScaleY: AnimatedFloat + private lateinit var barAlpha: MultiValueAlpha + private lateinit var bubbleOffsetY: AnimatedFloat + private lateinit var bubbleAlpha: AnimatedFloat + private lateinit var backgroundAlpha: AnimatedFloat + private lateinit var stashedHandleAlpha: MultiValueAlpha + private lateinit var stashedHandleScale: AnimatedFloat + private lateinit var stashedHandleTranslationY: AnimatedFloat + private lateinit var stashPhysicsAnimator: PhysicsAnimator + + private lateinit var mTransientBubbleStashController: TransientBubbleStashController + + @Before + fun setUp() { + val taskbarHotseatDimensionsProvider = + DefaultDimensionsProvider(taskBarBottomSpace = TASKBAR_BOTTOM_SPACE) + mTransientBubbleStashController = + TransientBubbleStashController(taskbarHotseatDimensionsProvider, context) + setUpBubbleBarView() + setUpBubbleBarController() + setUpStashedHandleView() + setUpBubbleStashedHandleViewController() + PhysicsAnimatorTestUtils.prepareForTest() + mTransientBubbleStashController.bubbleBarVerticalCenterForHome = HOTSEAT_VERTICAL_CENTER + mTransientBubbleStashController.init( + taskbarInsetsController, + bubbleBarViewController, + bubbleStashedHandleViewController, + ImmediateAction(), + ) + } + + @Test + fun updateLauncherState_noBubbles_controllerNotified() { + // Given bubble bar has no bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + + // When switch to home screen + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.launcherState = BubbleLauncherState.HOME + } + + // Then bubble bar view controller is notified + verify(bubbleBarViewController).onBubbleBarConfigurationChanged(/* animate= */ false) + } + + @Test + fun setBubblesShowingOnHomeUpdatedToTrue_barPositionYUpdated_controllersNotified() { + // Given bubble bar is on home and has bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + // When switch out of the home screen + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.launcherState = BubbleLauncherState.HOME + } + + // Then BubbleBarView is animating, BubbleBarViewController controller is notified + assertThat(barTranslationY.isAnimating).isTrue() + verify(bubbleBarViewController).onBubbleBarConfigurationChanged(/* animate= */ true) + + // Wait until animation ends + advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + // Then translation Y is correct and the insets controller is notified + assertThat(barTranslationY.isAnimating).isFalse() + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + assertThat(bubbleBarView.translationY).isEqualTo(HOTSEAT_TRANSLATION_Y) + } + + @Test + fun setBubblesShowingOnOverviewUpdatedToTrue_barPositionYUpdated_controllersNotified() { + // Given bubble bar is on overview and has bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + // When switch out of the home screen + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.launcherState = BubbleLauncherState.OVERVIEW + } + + // Then BubbleBarView is animating, BubbleBarViewController controller is notified + assertThat(barTranslationY.isAnimating).isTrue() + verify(bubbleBarViewController).onBubbleBarConfigurationChanged(/* animate= */ true) + + // Wait until animation ends + advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + // Then translation Y is correct and the insets controller is notified + assertThat(barTranslationY.isAnimating).isFalse() + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_TRANSLATION_Y) + } + + @Test + fun setBubblesShowingOnOverviewUpdatedToTrue_unstashes() { + // Given bubble bar is stashed with bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = true, + expand = false, + ) + } + assertThat(mTransientBubbleStashController.isStashed).isTrue() + + // Move to overview + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.launcherState = BubbleLauncherState.OVERVIEW + } + // No longer stashed in overview + assertThat(mTransientBubbleStashController.isStashed).isFalse() + } + + @Test + fun updateStashedAndExpandedState_stashAndCollapse_bubbleBarHidden_stashedHandleShown() { + // Given bubble bar has bubbles and not stashed + mTransientBubbleStashController.isStashed = false + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + + val bubbleInitialTranslation = bubbleView.translationY + + // When stash + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = true, + expand = false, + ) + } + + // Wait until animations ends + advanceTimeBy(BubbleStashController.BAR_STASH_DURATION) + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + // Then check BubbleBarController is notified + verify(bubbleBarViewController).onStashStateChanging() + // Bubble bar is stashed + assertThat(mTransientBubbleStashController.isStashed).isTrue() + assertThat(bubbleBarView.translationY).isEqualTo(BUBBLE_BAR_STASHED_TRANSLATION_Y) + assertThat(bubbleBarView.alpha).isEqualTo(0f) + assertThat(bubbleBarView.scaleX).isEqualTo(mTransientBubbleStashController.getStashScaleX()) + assertThat(bubbleBarView.scaleY).isEqualTo(mTransientBubbleStashController.getStashScaleY()) + assertThat(bubbleBarView.background.alpha).isEqualTo(255) + // Handle view is visible + assertThat(stashedHandleView.translationY).isEqualTo(0) + assertThat(stashedHandleView.alpha).isEqualTo(1) + // Bubble view is reset + assertThat(bubbleView.translationY).isEqualTo(bubbleInitialTranslation) + assertThat(bubbleView.alpha).isEqualTo(1f) + } + + @Test + fun updateStashedAndExpandedState_unstash_bubbleBarShown_stashedHandleHidden() { + // Given bubble bar has bubbles and is stashed + mTransientBubbleStashController.isStashed = true + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + + val bubbleInitialTranslation = bubbleView.translationY + + // When unstash + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = false, + expand = false, + ) + } + + // Wait until animations ends + advanceTimeBy(BubbleStashController.BAR_STASH_DURATION) + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + // Then check BubbleBarController is notified + verify(bubbleBarViewController).onStashStateChanging() + // Bubble bar is unstashed + assertThat(mTransientBubbleStashController.isStashed).isFalse() + assertThat(bubbleBarView.translationY).isEqualTo(TASK_BAR_TRANSLATION_Y) + assertThat(bubbleBarView.alpha).isEqualTo(1f) + assertThat(bubbleBarView.scaleX).isEqualTo(1f) + assertThat(bubbleBarView.scaleY).isEqualTo(1f) + assertThat(bubbleBarView.background.alpha).isEqualTo(255) + // Handle view is hidden + assertThat(stashedHandleView.translationY).isEqualTo(0) + assertThat(stashedHandleView.alpha).isEqualTo(0) + // Bubble view is reset + assertThat(bubbleView.translationY).isEqualTo(bubbleInitialTranslation) + assertThat(bubbleView.alpha).isEqualTo(1f) + } + + @Test + fun updateStashedAndExpandedState_stash_animatesAlphaForBubblesAndBackgroundSeparately() { + // Given bubble bar has bubbles and is unstashed + mTransientBubbleStashController.isStashed = false + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + + // When stash + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = true, + expand = false, + ) + } + + // Stop after alpha starts + advanceTimeBy(TaskbarStashController.TASKBAR_STASH_ALPHA_START_DELAY + 10) + + // Bubble bar alpha is set to 1 + assertThat(bubbleBarView.alpha).isEqualTo(1f) + // We animate alpha for background and children separately + assertThat(bubbleView.alpha).isIn(Range.open(0f, 1f)) + assertThat(bubbleBarView.background.alpha).isIn(Range.open(0, 255)) + assertThat(bubbleBarView.background.alpha).isNotEqualTo((bubbleView.alpha * 255f).toInt()) + } + + @Test + fun updateStashedAndExpandedState_unstash_animatesAlphaForBubblesAndBackgroundSeparately() { + // Given bubble bar has bubbles and is stashed + mTransientBubbleStashController.isStashed = true + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + + // When unstash + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = false, + expand = false, + ) + } + + // Stop after alpha starts + advanceTimeBy(TaskbarStashController.TASKBAR_STASH_ALPHA_START_DELAY + 10) + + // Bubble bar alpha is set to 1 + assertThat(bubbleBarView.alpha).isEqualTo(1f) + // We animate alpha for background and children separately + assertThat(bubbleView.alpha).isIn(Range.open(0f, 1f)) + assertThat(bubbleBarView.background.alpha).isIn(Range.open(0, 255)) + assertThat(bubbleBarView.background.alpha).isNotEqualTo((bubbleView.alpha * 255f).toInt()) + } + + @Test + fun updateStashedAndExpandedState_stash_updateBarVisibilityAfterAnimation() { + // Given bubble bar has bubbles and is unstashed + mTransientBubbleStashController.isStashed = false + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + + // When stash + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = true, + expand = false, + ) + } + + // Hides bubble bar only after animation completes + verify(bubbleBarViewController, never()).setHiddenForStashed(true) + advanceTimeBy(BubbleStashController.BAR_STASH_DURATION) + verify(bubbleBarViewController).setHiddenForStashed(true) + } + + @Test + fun updateStashedAndExpandedState_unstash_updateBarVisibilityBeforeAnimation() { + // Given bubble bar has bubbles and is stashed + mTransientBubbleStashController.isStashed = true + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + + // When unstash + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = false, + expand = false, + ) + } + + // Shows bubble bar immediately + verify(bubbleBarViewController).setHiddenForStashed(false) + } + + @Test + fun updateStashedAndExpandedState_expand_bubbleBarGesture() { + mTransientBubbleStashController.isStashed = true + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + whenever(bubbleBarViewController.isExpanded).thenReturn(false) + + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = false, + expand = true, + bubbleBarGesture = true, + ) + } + + verify(bubbleBarViewController).animateExpanded(true, true) + } + + @Test + fun updateStashedAndExpandedState_expand_notBubbleBarGesture() { + mTransientBubbleStashController.isStashed = true + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + whenever(bubbleBarViewController.isExpanded).thenReturn(false) + + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = false, + expand = true, + bubbleBarGesture = false, + ) + } + + verify(bubbleBarViewController).animateExpanded(true, false) + } + + @Test + fun updateStashedAndExpandedState_notExpanding_bubbleBarGesture() { + mTransientBubbleStashController.isStashed = true + whenever(bubbleBarViewController.isHiddenForNoBubbles).thenReturn(false) + whenever(bubbleBarViewController.isExpanded).thenReturn(false) + + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.updateStashedAndExpandedState( + stash = false, + expand = false, + bubbleBarGesture = true, + ) + } + + verify(bubbleBarViewController, never()).animateExpanded(any(), any()) + } + + @Test + fun isSysuiLockedSwitchedToFalseForOverview_unlockAnimationIsShown() { + // Given screen is locked and bubble bar has bubbles + getInstrumentation().runOnMainSync { + mTransientBubbleStashController.isSysuiLocked = true + mTransientBubbleStashController.launcherState = BubbleLauncherState.OVERVIEW + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + } + advanceTimeBy(BubbleStashController.BAR_TRANSLATION_DURATION) + + // When switch to the overview screen + getInstrumentation().runOnMainSync { mTransientBubbleStashController.isSysuiLocked = false } + + // Then + assertThat(barTranslationY.isAnimating).isTrue() + assertThat(barScaleX.isAnimating).isTrue() + // Wait until animation ends + advanceTimeBy(BubbleStashController.BAR_STASH_DURATION) + + // Then bubble bar is fully visible at the correct location + assertThat(bubbleBarView.scaleX).isEqualTo(1f) + assertThat(bubbleBarView.scaleY).isEqualTo(1f) + assertThat(bubbleBarView.translationY) + .isEqualTo(PersistentBubbleStashControllerTest.TASK_BAR_TRANSLATION_Y) + assertThat(bubbleBarView.alpha).isEqualTo(1f) + // Insets controller is notified + verify(taskbarInsetsController, atLeastOnce()) + .onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + } + + @Test + fun showBubbleBarImmediateToY() { + // Given bubble bar is fully transparent and scaled to 0 at 0 y position + val targetY = 341f + bubbleBarView.alpha = 0f + bubbleBarView.scaleX = 0f + bubbleBarView.scaleY = 0f + bubbleBarView.translationY = 0f + stashedHandleView.translationY = targetY + + // When + mTransientBubbleStashController.showBubbleBarImmediate(targetY) + + // Then all property values are updated + assertThat(bubbleBarView.translationY).isEqualTo(targetY) + assertThat(bubbleBarView.alpha).isEqualTo(1f) + assertThat(bubbleBarView.scaleX).isEqualTo(1f) + assertThat(bubbleBarView.scaleY).isEqualTo(1f) + // Handle is transparent + assertThat(stashedHandleView.alpha).isEqualTo(0) + // Insets controller is notified + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + // Bubble bar visibility updated + verify(bubbleBarViewController).setHiddenForStashed(false) + } + + @Test + fun stashBubbleBarImmediate() { + // When + mTransientBubbleStashController.stashBubbleBarImmediate() + + // Then all property values are updated + assertThat(bubbleBarView.translationY).isEqualTo(BUBBLE_BAR_STASHED_TRANSLATION_Y) + assertThat(bubbleBarView.alpha).isEqualTo(0) + assertThat(bubbleBarView.scaleX).isEqualTo(mTransientBubbleStashController.getStashScaleX()) + assertThat(bubbleBarView.scaleY).isEqualTo(mTransientBubbleStashController.getStashScaleY()) + // Handle is visible at correct Y position + assertThat(stashedHandleView.alpha).isEqualTo(1) + assertThat(stashedHandleView.translationY).isEqualTo(0) + // Insets controller is notified + verify(taskbarInsetsController).onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + // Bubble bar visibility updated + verify(bubbleBarViewController).setHiddenForStashed(true) + } + + @Test + fun getTouchableHeight_stashed_stashHeightReturned() { + // When + mTransientBubbleStashController.isStashed = true + val height = mTransientBubbleStashController.getTouchableHeight() + + // Then + assertThat(height).isEqualTo(HANDLE_VIEW_HEIGHT) + } + + @Test + fun getTouchableHeight_unstashed_barHeightReturned() { + // When BubbleBar is not stashed + mTransientBubbleStashController.isStashed = false + val height = mTransientBubbleStashController.getTouchableHeight() + + // Then bubble bar height is returned + assertThat(height).isEqualTo(BUBBLE_BAR_HEIGHT) + } + + @Test + fun getHandleViewAlpha_stashedHasBubbles_alphaPropertyReturned() { + // Given BubbleBar is stashed and has bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + mTransientBubbleStashController.isStashed = true + + // When handle view alpha property + val alphaProperty = mTransientBubbleStashController.getHandleViewAlpha() + + // Then the stash handle alpha property should not be null + assertThat(alphaProperty).isNotNull() + } + + @Test + fun getHandleViewAlpha_stashedHasNoBubblesBar_alphaPropertyIsNull() { + // Given BubbleBar is stashed and has no bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(false) + mTransientBubbleStashController.isStashed = true + + // When handle view alpha property + val alphaProperty = mTransientBubbleStashController.getHandleViewAlpha() + + // Then the stash handle alpha property should be null + assertThat(alphaProperty).isNull() + } + + @Test + fun getHandleViewAlpha_unstashedHasBubbles_alphaPropertyIsNull() { + // Given BubbleBar is not stashed and has bubbles + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + mTransientBubbleStashController.isStashed = false + + // When handle view alpha property + val alphaProperty = mTransientBubbleStashController.getHandleViewAlpha() + + // Then the stash handle alpha property should be null + assertThat(alphaProperty).isNull() + } + + private fun advanceTimeBy(advanceMs: Long) { + // Advance animator for on-device tests + getInstrumentation().runOnMainSync { animatorTestRule.advanceTimeBy(advanceMs) } + } + + private fun setUpBubbleBarView() { + getInstrumentation().runOnMainSync { + bubbleBarView = BubbleBarView(context) + bubbleBarView.layoutParams = + FrameLayout.LayoutParams(BUBBLE_BAR_WIDTH, BUBBLE_BAR_HEIGHT) + bubbleBarView.setController( + object : BubbleBarView.Controller { + override fun getBubbleBarTranslationY(): Float = 0f + + override fun onBubbleBarTouched() {} + + override fun expandBubbleBar() {} + + override fun dismissBubbleBar() {} + + override fun updateBubbleBarLocation( + location: BubbleBarLocation?, + source: Int, + ) {} + + override fun setIsDragging(dragging: Boolean) {} + + override fun onBubbleBarExpandedStateChanged(expanded: Boolean) {} + } + ) + bubbleView = BubbleView(context) + bubbleBarView.addBubble(bubbleView, false) + bubbleBarView.layout(0, 0, BUBBLE_BAR_WIDTH, BUBBLE_BAR_HEIGHT) + } + } + + private fun setUpStashedHandleView() { + getInstrumentation().runOnMainSync { + stashedHandleView = StashedHandleView(context) + stashedHandleView.layoutParams = + FrameLayout.LayoutParams(HANDLE_VIEW_WIDTH, HANDLE_VIEW_HEIGHT) + } + } + + private fun setUpBubbleBarController() { + barTranslationY = + AnimatedFloat(Runnable { bubbleBarView.translationY = barTranslationY.value }) + bubbleOffsetY = AnimatedFloat { value -> bubbleBarView.setBubbleOffsetY(value) } + barScaleX = AnimatedFloat { value -> bubbleBarView.scaleX = value } + barScaleY = AnimatedFloat { value -> bubbleBarView.scaleY = value } + barAlpha = MultiValueAlpha(bubbleBarView, 1 /* num alpha channels */) + bubbleAlpha = AnimatedFloat { value -> bubbleBarView.setBubbleAlpha(value) } + backgroundAlpha = AnimatedFloat { value -> bubbleBarView.setBackgroundAlpha(value) } + + whenever(bubbleBarViewController.hasBubbles()).thenReturn(true) + whenever(bubbleBarViewController.bubbleBarTranslationY).thenReturn(barTranslationY) + whenever(bubbleBarViewController.bubbleOffsetY).thenReturn(bubbleOffsetY) + whenever(bubbleBarViewController.bubbleBarBackgroundScaleX).thenReturn(barScaleX) + whenever(bubbleBarViewController.bubbleBarBackgroundScaleY).thenReturn(barScaleY) + whenever(bubbleBarViewController.bubbleBarAlpha).thenReturn(barAlpha) + whenever(bubbleBarViewController.bubbleBarBubbleAlpha).thenReturn(bubbleAlpha) + whenever(bubbleBarViewController.bubbleBarBackgroundAlpha).thenReturn(backgroundAlpha) + whenever(bubbleBarViewController.bubbleBarCollapsedWidth) + .thenReturn(BUBBLE_BAR_WIDTH.toFloat()) + whenever(bubbleBarViewController.bubbleBarCollapsedHeight) + .thenReturn(BUBBLE_BAR_HEIGHT.toFloat()) + whenever(bubbleBarViewController.createRevealAnimatorForStashChange(any())) + .thenReturn(AnimatorSet()) + } + + private fun setUpBubbleStashedHandleViewController() { + stashedHandleTranslationY = + AnimatedFloat(Runnable { stashedHandleView.translationY = barTranslationY.value }) + stashedHandleScale = + AnimatedFloat( + Runnable { + val scale: Float = barScaleX.value + bubbleBarView.scaleX = scale + bubbleBarView.scaleY = scale + } + ) + stashedHandleAlpha = MultiValueAlpha(stashedHandleView, 1 /* num alpha channels */) + stashPhysicsAnimator = PhysicsAnimator.getInstance(stashedHandleView) + whenever(bubbleStashedHandleViewController.stashedHandleAlpha) + .thenReturn(stashedHandleAlpha) + whenever(bubbleStashedHandleViewController.physicsAnimator).thenReturn(stashPhysicsAnimator) + whenever(bubbleStashedHandleViewController.stashedWidth).thenReturn(HANDLE_VIEW_WIDTH) + whenever(bubbleStashedHandleViewController.stashedHeight).thenReturn(HANDLE_VIEW_HEIGHT) + whenever(bubbleStashedHandleViewController.setTranslationYForSwipe(any())).thenAnswer { + invocation -> + (invocation.arguments[0] as Float).also { stashedHandleView.translationY = it } + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/growth/NudgeControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/growth/NudgeControllerTest.kt new file mode 100644 index 00000000000..3afbca3458c --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/growth/NudgeControllerTest.kt @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.growth + +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +class NudgeControllerTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + + @get:Rule(order = 1) val taskbarModeRule = TaskbarModeRule(context) + + @get:Rule(order = 2) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + + @InjectController lateinit var nudgeController: NudgeController + + private val taskbarContext: TaskbarActivityContext + get() = taskbarUnitTestRule.activityContext + + private val wasInTestHarness = Utilities.isRunningInTestHarness() + + @Before + fun disableRunningInTestHarnessForTests() { + Utilities.disableRunningInTestHarnessForTests() + } + + @After + fun maybeEnableRunningInTestHarnessForTests() { + if (wasInTestHarness) { + Utilities.enableRunningInTestHarnessForTests() + } + } + + @Test + @TaskbarMode(TRANSIENT) + fun testShow_doesShowNudge() { + runOnMainSync { showNudge() } // Then show it + assertThat(nudgeController.isNudgeOpen).isTrue() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testHide_whenNudgeIsOpen_shouldCloseNudge() { + assertThat(nudgeController.isNudgeOpen).isFalse() + runOnMainSync { showNudge() } + assertThat(nudgeController.isNudgeOpen).isTrue() + runOnMainSync { nudgeController.hide() } + assertThat(nudgeController.isNudgeOpen).isFalse() + } + + @Test + @TaskbarMode(TRANSIENT) + fun testShow_whenTaskbarIsTransient_shouldNotShowNudge() { + assertThat(nudgeController.isNudgeOpen).isFalse() + runOnMainSync { nudgeController.init(taskbarContext.controllers) } + assertThat(nudgeController.isNudgeOpen).isFalse() + } + + private fun showNudge() { + val nudgePayload = + NudgePayload( + titleText = "Nudge title", + bodyText = "Nudge body text.", + image = Image.ResourceId(R.drawable.ic_apps), + primaryButton = + ButtonPayload( + label = "Get perk", + actions = listOf(Action.Dismiss(), Action.OpenUrl("https://www.google.com")), + ), + secondaryButton = + ButtonPayload(label = "Dismiss", actions = listOf(Action.Dismiss())), + ) + runOnMainSync { nudgeController.maybeShow(nudgePayload) } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionListTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionListTest.kt new file mode 100644 index 00000000000..c5a07308f08 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionListTest.kt @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.handoff + +import android.companion.datatransfer.continuity.RemoteTask +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +class HandoffSuggestionListTest { + + private val suggestionList = HandoffSuggestionList() + + @Test + fun getSuggestions_initiallyEmpty() { + assertThat(suggestionList.suggestions).isEmpty() + } + + @Test + fun updateSuggestions_addFirstSuggestion_returnsTrue() { + val remoteTasks = listOf(createRemoteTask(1, "Task 1")) + + val result = suggestionList.updateSuggestions(remoteTasks) + + assertThat(result).isTrue() + assertThat(suggestionList.suggestions).hasSize(1) + assertThat(suggestionList.suggestions.first().deviceId).isEqualTo(1) + } + + @Test + fun updateSuggestions_addMultipleSuggestions_returnsTrue() { + val remoteTasks = listOf(createRemoteTask(1, "Task 1"), createRemoteTask(2, "Task 2")) + + val result = suggestionList.updateSuggestions(remoteTasks) + + assertThat(result).isTrue() + assertThat(suggestionList.suggestions).hasSize(2) + assertThat(suggestionList.suggestions.map { it.deviceId }).containsExactly(1, 2) + } + + @Test + fun updateSuggestions_removeSuggestion_returnsTrue() { + val initialTasks = listOf(createRemoteTask(1, "Task 1"), createRemoteTask(2, "Task 2")) + suggestionList.updateSuggestions(initialTasks) + + val updatedTasks = listOf(createRemoteTask(1, "Task 1")) + val result = suggestionList.updateSuggestions(updatedTasks) + + assertThat(result).isTrue() + assertThat(suggestionList.suggestions).hasSize(1) + assertThat(suggestionList.suggestions.first().deviceId).isEqualTo(1) + } + + @Test + fun updateSuggestions_updateExistingSuggestion_returnsFalse() { + val initialTasks = listOf(createRemoteTask(1, "Task 1")) + suggestionList.updateSuggestions(initialTasks) + + val updatedTasks = listOf(createRemoteTask(1, "Task 1 updated")) + val result = suggestionList.updateSuggestions(updatedTasks) + + assertThat(result).isFalse() + val suggestions = suggestionList.suggestions + assertThat(suggestions).hasSize(1) + assertThat(suggestions.first().deviceId).isEqualTo(1) + } + + @Test + fun updateSuggestions_noChange_returnsFalse() { + val remoteTask = createRemoteTask(1, "Task 1") + val initialTasks = listOf(remoteTask) + suggestionList.updateSuggestions(initialTasks) + + val result = suggestionList.updateSuggestions(listOf(remoteTask)) + + assertThat(result).isFalse() + assertThat(suggestionList.suggestions).hasSize(1) + assertThat(suggestionList.suggestions.first().deviceId).isEqualTo(1) + } + + @Test + fun clear_removesAllSuggestions() { + val remoteTasks = listOf(createRemoteTask(1, "Task 1")) + suggestionList.updateSuggestions(remoteTasks) + + suggestionList.clear() + + assertThat(suggestionList.suggestions).isEmpty() + } + + private fun createRemoteTask(deviceId: Int, label: String): RemoteTask = + RemoteTask.Builder(1).setDeviceId(deviceId).setLabel(label).build() +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionMetadataLoaderTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionMetadataLoaderTest.kt new file mode 100644 index 00000000000..12f6e850b68 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/HandoffSuggestionMetadataLoaderTest.kt @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.handoff + +import android.companion.datatransfer.continuity.RemoteTask +import android.graphics.Color +import android.graphics.drawable.BitmapDrawable +import android.graphics.drawable.ColorDrawable +import android.graphics.drawable.Icon +import android.os.Handler +import android.os.TestLooperManager +import androidx.core.graphics.drawable.toBitmap +import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.rule.TestStabilityRule +import com.android.launcher3.util.rule.TestStabilityRule.LOCAL +import com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT +import com.android.launcher3.util.rule.TestStabilityRule.Stability +import com.google.common.truth.Truth.assertThat +import com.google.common.truth.Truth.assertWithMessage +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +class HandoffSuggestionMetadataLoaderTest { + + private val context = InstrumentationRegistry.getInstrumentation().context + + private val bitmap = ColorDrawable(Color.WHITE).toBitmap(width = 20, height = 20) + private val icon = Icon.createWithBitmap(bitmap) + + private val handler = Handler(context.mainLooper) + private val suggestionMetadataLoader = HandoffSuggestionMetadataLoader(context, handler) + + private lateinit var testLooperManager: TestLooperManager + + @get:Rule val testStabilityRule = TestStabilityRule() + + @Before + fun setUp() { + testLooperManager = + InstrumentationRegistry.getInstrumentation().acquireLooperManager(context.mainLooper) + } + + @After + fun tearDown() { + testLooperManager.release() + } + + @Test + @Stability(flavors = LOCAL or PLATFORM_POSTSUBMIT) // b/438797644 + fun loadMetadata_drawableLoaded_callsCallback() { + // Create a fake suggestion to load + val remoteTask = RemoteTask.Builder(1).setIcon(icon).setLabel(TEST_LABEL).build() + val suggestion = HandoffSuggestion(remoteTask) + + // Trigger a load. + val loadedSuggestions = mutableListOf() + suggestionMetadataLoader.loadMetadata(listOf(suggestion)) { loadedSuggestions.add(it) } + val message = testLooperManager.next() + testLooperManager.execute(message) + testLooperManager.recycle(message) + + // Verify the callback was called with the correct metadata. + assertThat(loadedSuggestions).hasSize(1) + assertThat(loadedSuggestions.first().metadata?.label).isEqualTo(TEST_LABEL) + val drawable = loadedSuggestions.first().metadata?.icon + assertThat(drawable).isInstanceOf(BitmapDrawable::class.java) + val bitmapDrawable = drawable as BitmapDrawable + assertThat(bitmapDrawable.bitmap.sameAs(bitmap)).isTrue() + } + + @Test + @Stability(flavors = LOCAL or PLATFORM_POSTSUBMIT) // b/438797644 + fun loadMetadata_allSuggestionsHaveMetadata_doesNotReloadIcons() { + // Create a fake suggestion with loaded metadata + val remoteTask = RemoteTask.Builder(1).setIcon(icon).setLabel(TEST_LABEL).build() + val suggestion = HandoffSuggestion(remoteTask) + suggestion.metadata = + HandoffSuggestion.Metadata(TEST_LABEL, BitmapDrawable(context.resources, bitmap)) + + // Trigger a load. + var wasCallbackCalled = false + suggestionMetadataLoader.loadMetadata(listOf(suggestion)) { wasCallbackCalled = true } + + // Verify no loads were queued. + assertWithMessage("There are no pending loads!").that(testLooperManager.poll()).isNull() + assertThat(wasCallbackCalled).isFalse() + } + + @Test + @Stability(flavors = LOCAL or PLATFORM_POSTSUBMIT) // b/438797644 + fun loadMetadata_taskHasNullIcon_doesNotCallCallback() { + // Create a fake suggestion to load with a null icon + val remoteTask = RemoteTask.Builder(1).setLabel(TEST_LABEL).build() + val suggestion = HandoffSuggestion(remoteTask) + + // Trigger a load. + var wasCallbackCalled = false + suggestionMetadataLoader.loadMetadata(listOf(suggestion)) { wasCallbackCalled = true } + + // Verify no loads were queued. + assertWithMessage("There are no pending loads!").that(testLooperManager.poll()).isNull() + assertThat(wasCallbackCalled).isFalse() + } + + @Test + @Stability(flavors = LOCAL or PLATFORM_POSTSUBMIT) // b/438797644 + fun cancelPendingLoads_cancelsPendingLoads() { + // Create a fake suggestion to load with a null icon + val remoteTask = RemoteTask.Builder(1).setLabel(TEST_LABEL).build() + val suggestion = HandoffSuggestion(remoteTask) + + // Trigger a load. + var wasCallbackCalled = false + suggestionMetadataLoader.loadMetadata(listOf(suggestion)) { wasCallbackCalled = true } + + // Cancel the load. + suggestionMetadataLoader.cancelPendingLoads() + + // Verify no loads were queued. + assertWithMessage("There are no pending loads!").that(testLooperManager.poll()).isNull() + assertThat(wasCallbackCalled).isFalse() + } + + companion object { + private val TEST_LABEL = "test_label" + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/TaskbarHandoffControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/TaskbarHandoffControllerTest.kt new file mode 100644 index 00000000000..2f56ffe3a55 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/handoff/TaskbarHandoffControllerTest.kt @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.handoff + +import android.animation.AnimatorTestRule +import android.companion.Flags +import android.companion.datatransfer.continuity.RemoteTask +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.verify + +/** Tests for [TaskbarHandoffController]. */ +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelTablet2023"]) +@EnableFlags(android.companion.Flags.FLAG_ENABLE_TASK_CONTINUITY) +class TaskbarHandoffControllerTest { + + @get:Rule(order = 1) val setFlagsRule = SetFlagsRule() + @get:Rule(order = 2) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 3) val taskbarModeRule = TaskbarModeRule(context) + @get:Rule(order = 4) val animatorTestRule = AnimatorTestRule(this) + @get:Rule(order = 5) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) + @InjectController lateinit var controller: TaskbarHandoffController + + @Test + @TaskbarMode(TRANSIENT) + @EnableFlags(Flags.FLAG_ENABLE_TASK_CONTINUITY) + fun init_registersListener() { + verify(context.taskContinuityManagerMock).registerRemoteTaskListener(any(), any()) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_TASK_CONTINUITY) + fun onRemoteTasksChanged_updatesSuggestions() { + val task1 = createRemoteTask(1, "Task 1") + val task2 = createRemoteTask(2, "Task 2") + + controller.onRemoteTasksChanged(listOf(task1, task2)) + + val suggestions = controller.suggestions + assertThat(suggestions).hasSize(2) + assertThat(suggestions.map { it.deviceId }).containsExactly(1, 2).inOrder() + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_TASK_CONTINUITY) + fun getSuggestions_afterUpdate_returnsSuggestions() { + assertThat(controller.suggestions).isEmpty() + + val task = createRemoteTask(1, "Task") + + controller.onRemoteTasksChanged(listOf(task)) + + assertThat(controller.suggestions).hasSize(1) + assertThat(controller.suggestions.first().deviceId).isEqualTo(1) + + controller.onDestroy() + + assertThat(controller.suggestions).isEmpty() + } + + private fun createRemoteTask(deviceId: Int, label: String): RemoteTask { + return RemoteTask.Builder(1).setDeviceId(deviceId).setLabel(label).build() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutterTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutterTest.kt new file mode 100644 index 00000000000..e939d4451b2 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutterTest.kt @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.navbutton + +import android.content.res.Resources +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.LinearLayout +import android.widget.Space +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify + +@SmallTest +@RunWith(AndroidJUnit4::class) +class AbstractNavButtonLayoutterTest { + private val resources = mock() + private val navButtonContainer = mock() + private val endContextualContainer = mock() + private val startContextualContainer = mock() + private val imeSwitcher = mock() + private val a11yButton = mock() + private val space = mock() + + private val backButton = mock() + private val homeButton = mock() + private val recentsButton = mock() + + @Test + fun addThreeButtons_noFlip_ExpectedOrder() { + val layoutter = TestLayoutter() + + layoutter.addThreeButtons() + + val captor = argumentCaptor() + verify(navButtonContainer, times(3)).addView(captor.capture()) + + assertThat(captor.allValues) + .containsExactly(backButton, homeButton, recentsButton) + .inOrder() + } + + @Test + fun addThreeButtons_flip_ExpectedOrder() { + val layoutter = TestLayoutter() + + layoutter.flipOrder = true + layoutter.addThreeButtons() + + val captor = argumentCaptor() + verify(navButtonContainer, times(3)).addView(captor.capture()) + + assertThat(captor.allValues) + .containsExactly(recentsButton, homeButton, backButton) + .inOrder() + } + + inner class TestLayoutter : + AbstractNavButtonLayoutter( + resources, + navButtonContainer, + endContextualContainer, + startContextualContainer, + imeSwitcher, + a11yButton, + space, + backButton, + homeButton, + recentsButton, + ) { + var flipOrder: Boolean = false + + override fun layoutButtons( + context: TaskbarActivityContext, + isA11yButtonPersistent: Boolean, + ) {} + + override fun shouldFlipButtonOrder(): Boolean { + return flipOrder + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactoryTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactoryTest.kt index c8f79463b1e..3444c6b1bca 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactoryTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactoryTest.kt @@ -13,11 +13,11 @@ import android.widget.Space import androidx.test.runner.AndroidJUnit4 import com.android.launcher3.DeviceProfile import com.android.launcher3.R -import com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION +import com.android.launcher3.deviceprofile.DeviceProperties import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.ID_END_CONTEXTUAL_BUTTONS import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.ID_END_NAV_BUTTONS import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.ID_START_CONTEXTUAL_BUTTONS -import org.junit.Assume.assumeTrue +import org.junit.Assert.assertThrows import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -50,6 +50,8 @@ class NavButtonLayoutFactoryTest { whenever(mockNavLayout.findViewById(R.id.back)).thenReturn(mockBackButton) whenever(mockNavLayout.findViewById(R.id.home)).thenReturn(mockHomeButton) whenever(mockNavLayout.findViewById(R.id.recent_apps)).thenReturn(mockRecentsButton) + val devicePropertiesMock: DeviceProperties = mock() + whenever(mockDeviceProfile.deviceProperties).thenReturn(devicePropertiesMock) // Init top level layout whenever(mockParentButtonContainer.requireViewById(ID_END_NAV_BUTTONS)) @@ -65,7 +67,6 @@ class NavButtonLayoutFactoryTest { @Test fun getKidsLayoutter() { - assumeTrue(ENABLE_TASKBAR_NAVBAR_UNIFICATION) mockDeviceProfile.isTaskbarPresent = true val layoutter: NavButtonLayoutFactory.NavButtonLayoutter = getLayoutter( @@ -73,14 +74,13 @@ class NavButtonLayoutFactoryTest { isInSetup = false, isThreeButtonNav = false, phoneMode = false, - surfaceRotation = surfaceRotation + surfaceRotation = surfaceRotation, ) assert(layoutter is KidsNavLayoutter) } @Test fun getSetupLayoutter() { - assumeTrue(ENABLE_TASKBAR_NAVBAR_UNIFICATION) mockDeviceProfile.isTaskbarPresent = true val layoutter: NavButtonLayoutFactory.NavButtonLayoutter = getLayoutter( @@ -88,14 +88,13 @@ class NavButtonLayoutFactoryTest { isInSetup = true, isThreeButtonNav = false, phoneMode = false, - surfaceRotation = surfaceRotation + surfaceRotation = surfaceRotation, ) assert(layoutter is SetupNavLayoutter) } @Test fun getTaskbarNavLayoutter() { - assumeTrue(ENABLE_TASKBAR_NAVBAR_UNIFICATION) mockDeviceProfile.isTaskbarPresent = true val layoutter: NavButtonLayoutFactory.NavButtonLayoutter = getLayoutter( @@ -103,27 +102,27 @@ class NavButtonLayoutFactoryTest { isInSetup = false, isThreeButtonNav = false, phoneMode = false, - surfaceRotation = surfaceRotation + surfaceRotation = surfaceRotation, ) assert(layoutter is TaskbarNavLayoutter) } - @Test(expected = IllegalStateException::class) + @Test fun noValidLayoutForLargeScreenTaskbarNotPresent() { - assumeTrue(ENABLE_TASKBAR_NAVBAR_UNIFICATION) mockDeviceProfile.isTaskbarPresent = false - getLayoutter( - isKidsMode = false, - isInSetup = false, - isThreeButtonNav = false, - phoneMode = false, - surfaceRotation = surfaceRotation - ) + assertThrows(IllegalStateException::class.java) { + getLayoutter( + isKidsMode = false, + isInSetup = false, + isThreeButtonNav = false, + phoneMode = false, + surfaceRotation = surfaceRotation, + ) + } } @Test fun getTaskbarPortraitLayoutter() { - assumeTrue(ENABLE_TASKBAR_NAVBAR_UNIFICATION) mockDeviceProfile.isTaskbarPresent = false val layoutter: NavButtonLayoutFactory.NavButtonLayoutter = getLayoutter( @@ -131,14 +130,13 @@ class NavButtonLayoutFactoryTest { isInSetup = false, isThreeButtonNav = true, phoneMode = true, - surfaceRotation = surfaceRotation + surfaceRotation = surfaceRotation, ) assert(layoutter is PhonePortraitNavLayoutter) } @Test fun getTaskbarLandscapeLayoutter() { - assumeTrue(ENABLE_TASKBAR_NAVBAR_UNIFICATION) mockDeviceProfile.isTaskbarPresent = false setDeviceProfileLandscape() val layoutter: NavButtonLayoutFactory.NavButtonLayoutter = @@ -147,14 +145,13 @@ class NavButtonLayoutFactoryTest { isInSetup = false, isThreeButtonNav = true, phoneMode = true, - surfaceRotation = surfaceRotation + surfaceRotation = surfaceRotation, ) assert(layoutter is PhoneLandscapeNavLayoutter) } @Test fun getTaskbarSeascapeLayoutter() { - assumeTrue(ENABLE_TASKBAR_NAVBAR_UNIFICATION) mockDeviceProfile.isTaskbarPresent = false setDeviceProfileLandscape() val layoutter: NavButtonLayoutFactory.NavButtonLayoutter = @@ -163,14 +160,13 @@ class NavButtonLayoutFactoryTest { isInSetup = false, isThreeButtonNav = true, phoneMode = true, - surfaceRotation = ROTATION_270 + surfaceRotation = ROTATION_270, ) assert(layoutter is PhoneSeascapeNavLayoutter) } @Test fun getTaskbarPhoneGestureNavLayoutter() { - assumeTrue(ENABLE_TASKBAR_NAVBAR_UNIFICATION) mockDeviceProfile.isTaskbarPresent = false val layoutter: NavButtonLayoutFactory.NavButtonLayoutter = getLayoutter( @@ -178,16 +174,13 @@ class NavButtonLayoutFactoryTest { isInSetup = false, isThreeButtonNav = false, phoneMode = true, - surfaceRotation = surfaceRotation + surfaceRotation = surfaceRotation, ) assert(layoutter is PhoneGestureLayoutter) } private fun setDeviceProfileLandscape() { - // Use reflection to modify landscape field - val landscapeField = mockDeviceProfile.javaClass.getDeclaredField("isLandscape") - landscapeField.isAccessible = true - landscapeField.set(mockDeviceProfile, true) + whenever(mockDeviceProfile.deviceProperties.isLandscape).thenReturn(true) } private fun getLayoutter( @@ -195,7 +188,7 @@ class NavButtonLayoutFactoryTest { isInSetup: Boolean, isThreeButtonNav: Boolean, phoneMode: Boolean, - @Rotation surfaceRotation: Int + @Rotation surfaceRotation: Int, ): NavButtonLayoutFactory.NavButtonLayoutter { return NavButtonLayoutFactory.getUiLayoutter( deviceProfile = mockDeviceProfile, diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt index eebd8f9f162..f39a6614964 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt @@ -18,216 +18,235 @@ package com.android.launcher3.taskbar.overlay import android.app.ActivityManager.RunningTaskInfo import android.view.MotionEvent -import androidx.test.annotation.UiThreadTest -import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import com.android.launcher3.AbstractFloatingView import com.android.launcher3.AbstractFloatingView.TYPE_OPTIONS_POPUP import com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_ALL_APPS import com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_OVERLAY_PROXY import com.android.launcher3.AbstractFloatingView.hasOpenView import com.android.launcher3.taskbar.TaskbarActivityContext -import com.android.launcher3.taskbar.TaskbarUnitTestRule -import com.android.launcher3.taskbar.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import com.android.launcher3.taskbar.bubbles.BubbleActivityStarter +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices -import com.android.launcher3.views.BaseDragLayer +import com.android.launcher3.util.TestUtil.getOnUiThread import com.android.systemui.shared.system.TaskStackChangeListeners +import com.android.wm.shell.shared.bubbles.logging.EntryPoint import com.google.common.truth.Truth.assertThat import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.mock @RunWith(LauncherMultivalentJUnit::class) @EmulatedDevices(["pixelFoldable2023"]) class TaskbarOverlayControllerTest { - @get:Rule val taskbarUnitTestRule = TaskbarUnitTestRule() + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarUnitTestRule = TaskbarUnitTestRule(this, context) @InjectController lateinit var overlayController: TaskbarOverlayController private val taskbarContext: TaskbarActivityContext get() = taskbarUnitTestRule.activityContext @Test - @UiThreadTest fun testRequestWindow_twice_reusesWindow() { - val context1 = overlayController.requestWindow() - val context2 = overlayController.requestWindow() + val (context1, context2) = + getOnUiThread { + Pair(overlayController.requestWindow(), overlayController.requestWindow()) + } assertThat(context1).isSameInstanceAs(context2) } @Test - @UiThreadTest fun testRequestWindow_afterHidingExistingWindow_createsNewWindow() { - val context1 = overlayController.requestWindow() - overlayController.hideWindow() + val context1 = getOnUiThread { overlayController.requestWindow() } + runOnMainSync { overlayController.hideWindow() } - val context2 = overlayController.requestWindow() + val context2 = getOnUiThread { overlayController.requestWindow() } assertThat(context1).isNotSameInstanceAs(context2) } @Test - @UiThreadTest fun testRequestWindow_afterHidingOverlay_createsNewWindow() { - val context1 = overlayController.requestWindow() - TestOverlayView.show(context1) - overlayController.hideWindow() + val context1 = getOnUiThread { overlayController.requestWindow() } + runOnMainSync { + TestOverlayView.show(context1) + overlayController.hideWindow() + } - val context2 = overlayController.requestWindow() + val context2 = getOnUiThread { overlayController.requestWindow() } assertThat(context1).isNotSameInstanceAs(context2) } @Test - @UiThreadTest fun testRequestWindow_addsProxyView() { - TestOverlayView.show(overlayController.requestWindow()) + runOnMainSync { TestOverlayView.show(overlayController.requestWindow()) } assertThat(hasOpenView(taskbarContext, TYPE_TASKBAR_OVERLAY_PROXY)).isTrue() } @Test - @UiThreadTest fun testRequestWindow_closeProxyView_closesOverlay() { - val overlay = TestOverlayView.show(overlayController.requestWindow()) - AbstractFloatingView.closeOpenContainer(taskbarContext, TYPE_TASKBAR_OVERLAY_PROXY) + val overlay = getOnUiThread { TestOverlayView.show(overlayController.requestWindow()) } + runOnMainSync { + AbstractFloatingView.closeOpenContainer(taskbarContext, TYPE_TASKBAR_OVERLAY_PROXY) + } assertThat(overlay.isOpen).isFalse() } @Test fun testRequestWindow_attachesDragLayer() { - lateinit var dragLayer: BaseDragLayer<*> - getInstrumentation().runOnMainSync { - dragLayer = overlayController.requestWindow().dragLayer - } - + val dragLayer = getOnUiThread { overlayController.requestWindow().dragLayer } // Allow drag layer to attach before checking. - getInstrumentation().runOnMainSync { assertThat(dragLayer.isAttachedToWindow).isTrue() } + runOnMainSync { assertThat(dragLayer.isAttachedToWindow).isTrue() } } @Test - @UiThreadTest fun testHideWindow_closesOverlay() { - val overlay = TestOverlayView.show(overlayController.requestWindow()) - overlayController.hideWindow() + val overlay = getOnUiThread { TestOverlayView.show(overlayController.requestWindow()) } + runOnMainSync { overlayController.hideWindow() } assertThat(overlay.isOpen).isFalse() } @Test fun testHideWindow_detachesDragLayer() { - lateinit var dragLayer: BaseDragLayer<*> - getInstrumentation().runOnMainSync { - dragLayer = overlayController.requestWindow().dragLayer - } + val dragLayer = getOnUiThread { overlayController.requestWindow().dragLayer } // Wait for drag layer to be attached to window before hiding. - getInstrumentation().runOnMainSync { + runOnMainSync { overlayController.hideWindow() assertThat(dragLayer.isAttachedToWindow).isFalse() } } @Test - @UiThreadTest fun testTwoOverlays_closeOne_windowStaysOpen() { - val context = overlayController.requestWindow() - val overlay1 = TestOverlayView.show(context) - val overlay2 = TestOverlayView.show(context) + val (overlay1, overlay2) = + getOnUiThread { + val context = overlayController.requestWindow() + Pair(TestOverlayView.show(context), TestOverlayView.show(context)) + } - overlay1.close(false) + runOnMainSync { overlay1.close(false) } assertThat(overlay2.isOpen).isTrue() assertThat(hasOpenView(taskbarContext, TYPE_TASKBAR_OVERLAY_PROXY)).isTrue() } @Test - @UiThreadTest fun testTwoOverlays_closeAll_closesWindow() { - val context = overlayController.requestWindow() - val overlay1 = TestOverlayView.show(context) - val overlay2 = TestOverlayView.show(context) + val (overlay1, overlay2) = + getOnUiThread { + val context = overlayController.requestWindow() + Pair(TestOverlayView.show(context), TestOverlayView.show(context)) + } - overlay1.close(false) - overlay2.close(false) + runOnMainSync { + overlay1.close(false) + overlay2.close(false) + } assertThat(hasOpenView(taskbarContext, TYPE_TASKBAR_OVERLAY_PROXY)).isFalse() } @Test - @UiThreadTest fun testRecreateTaskbar_closesWindow() { - TestOverlayView.show(overlayController.requestWindow()) + runOnMainSync { TestOverlayView.show(overlayController.requestWindow()) } taskbarUnitTestRule.recreateTaskbar() assertThat(hasOpenView(taskbarContext, TYPE_TASKBAR_OVERLAY_PROXY)).isFalse() } @Test fun testTaskMovedToFront_closesOverlay() { - lateinit var overlay: TestOverlayView - getInstrumentation().runOnMainSync { - overlay = TestOverlayView.show(overlayController.requestWindow()) - } + val overlay = getOnUiThread { TestOverlayView.show(overlayController.requestWindow()) } + TaskStackChangeListeners.getInstance().listenerImpl.onTaskMovedToFront(RunningTaskInfo()) + // Make sure TaskStackChangeListeners' Handler posts the callback before checking state. + runOnMainSync { assertThat(overlay.isOpen).isFalse() } + } + @Test + fun testTaskMovedToFront_stashesBubbleBar() { + val bubbleBarControllers = taskbarContext.controllers.bubbleControllers.get() + val bubbleStashController = bubbleBarControllers.bubbleStashController + runOnMainSync { bubbleBarControllers.bubbleBarViewController.setHiddenForBubbles(false) } + assertThat(bubbleStashController.isStashed).isFalse() + + runOnMainSync { TestOverlayView.show(overlayController.requestWindow()) } + TaskStackChangeListeners.getInstance().listenerImpl.onTaskMovedToFront(RunningTaskInfo()) + + // Make sure TaskStackChangeListeners' Handler posts the callback before checking state. + runOnMainSync { assertThat(bubbleStashController.isStashed).isTrue() } + } + + @Test + fun testTaskMovedToFront_requestedToShowBubble_doesNotStashBubbleBar() { + val bubbleBarControllers = taskbarContext.controllers.bubbleControllers.get() + val bubbleStashController = bubbleBarControllers.bubbleStashController + runOnMainSync { bubbleBarControllers.bubbleBarViewController.setHiddenForBubbles(false) } + assertThat(bubbleStashController.isStashed).isFalse() + + runOnMainSync { TestOverlayView.show(overlayController.requestWindow()) } + BubbleActivityStarter.INSTANCE.get(taskbarContext) + .showAppBubble(null, mock(), EntryPoint.TASKBAR_ICON_MENU) TaskStackChangeListeners.getInstance().listenerImpl.onTaskMovedToFront(RunningTaskInfo()) + // Make sure TaskStackChangeListeners' Handler posts the callback before checking state. - getInstrumentation().runOnMainSync { assertThat(overlay.isOpen).isFalse() } + runOnMainSync { assertThat(bubbleStashController.isStashed).isFalse() } } @Test fun testTaskStackChanged_allAppsClosed_overlayStaysOpen() { - lateinit var overlay: TestOverlayView - getInstrumentation().runOnMainSync { - overlay = TestOverlayView.show(overlayController.requestWindow()) - taskbarContext.controllers.sharedState?.allAppsVisible = false - } + val overlay = getOnUiThread { TestOverlayView.show(overlayController.requestWindow()) } + runOnMainSync { taskbarContext.controllers.sharedState?.allAppsVisible = false } TaskStackChangeListeners.getInstance().listenerImpl.onTaskStackChanged() - getInstrumentation().runOnMainSync { assertThat(overlay.isOpen).isTrue() } + runOnMainSync { assertThat(overlay.isOpen).isTrue() } } @Test fun testTaskStackChanged_allAppsOpen_closesOverlay() { - lateinit var overlay: TestOverlayView - getInstrumentation().runOnMainSync { - overlay = TestOverlayView.show(overlayController.requestWindow()) - taskbarContext.controllers.sharedState?.allAppsVisible = true - } + val overlay = getOnUiThread { TestOverlayView.show(overlayController.requestWindow()) } + runOnMainSync { taskbarContext.controllers.sharedState?.allAppsVisible = true } TaskStackChangeListeners.getInstance().listenerImpl.onTaskStackChanged() - getInstrumentation().runOnMainSync { assertThat(overlay.isOpen).isFalse() } + runOnMainSync { assertThat(overlay.isOpen).isFalse() } } @Test - @UiThreadTest fun testUpdateLauncherDeviceProfile_overlayNotRebindSafe_closesOverlay() { - val overlayContext = overlayController.requestWindow() - val overlay = TestOverlayView.show(overlayContext).apply { type = TYPE_OPTIONS_POPUP } + val context = getOnUiThread { overlayController.requestWindow() } + val overlay = getOnUiThread { + TestOverlayView.show(context).apply { type = TYPE_OPTIONS_POPUP } + } - overlayController.updateLauncherDeviceProfile( - overlayController.launcherDeviceProfile - .toBuilder(overlayContext) - .setGestureMode(false) - .build() - ) + runOnMainSync { + overlayController.updateLauncherDeviceProfile( + overlayController.launcherDeviceProfile.toBuilder().setGestureMode(false).build() + ) + } assertThat(overlay.isOpen).isFalse() } @Test - @UiThreadTest fun testUpdateLauncherDeviceProfile_overlayRebindSafe_overlayStaysOpen() { - val overlayContext = overlayController.requestWindow() - val overlay = TestOverlayView.show(overlayContext).apply { type = TYPE_TASKBAR_ALL_APPS } + val context = getOnUiThread { overlayController.requestWindow() } + val overlay = getOnUiThread { + TestOverlayView.show(context).apply { type = TYPE_TASKBAR_ALL_APPS } + } - overlayController.updateLauncherDeviceProfile( - overlayController.launcherDeviceProfile - .toBuilder(overlayContext) - .setGestureMode(false) - .build() - ) + runOnMainSync { + overlayController.updateLauncherDeviceProfile( + overlayController.launcherDeviceProfile.toBuilder().setGestureMode(false).build() + ) + } assertThat(overlay.isOpen).isTrue() } private class TestOverlayView - private constructor( - private val overlayContext: TaskbarOverlayContext, - ) : AbstractFloatingView(overlayContext, null) { + private constructor(private val overlayContext: TaskbarOverlayContext) : + AbstractFloatingView(overlayContext, null) { var type = TYPE_OPTIONS_POPUP diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelHelper.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelHelper.kt new file mode 100644 index 00000000000..6b34cef3b1f --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelHelper.kt @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.rules + +import com.android.quickstep.RecentsModel +import com.android.quickstep.RecentsModel.RecentTasksChangedListener +import com.android.quickstep.TaskIconCache +import com.android.quickstep.TaskThumbnailCache +import com.android.quickstep.util.GroupTask +import java.util.function.BiConsumer +import java.util.function.Consumer +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock + +/** Helper class to mock the [RecentsModel] object in test */ +class MockedRecentsModelHelper { + private val mockIconCache: TaskIconCache = mock() + private val mockThumbnailCache: TaskThumbnailCache = mock() + + var taskListId = 0 + var recentTasksChangedListener: RecentTasksChangedListener? = null + var taskRequests: MutableList<(List) -> Unit> = mutableListOf() + + val mockRecentsModel: RecentsModel = mock { + on { iconCache } doReturn mockIconCache + + on { thumbnailCache } doReturn mockThumbnailCache + + on { unregisterRecentTasksChangedListener(any()) } doAnswer + { + recentTasksChangedListener = null + } + + on { registerRecentTasksChangedListener(any()) } doAnswer + { + recentTasksChangedListener = it.getArgument(0) + } + + on { getTasks(anyOrNull, Int>>(), anyOrNull()) } doAnswer + { + val request = it.getArgument, Int>?>(0) + if (request != null) { + taskRequests.add { response -> request.accept(response, taskListId) } + } + taskListId + } + + on { getTasks(anyOrNull(), anyOrNull>>()) } doAnswer + { + val request = it.getArgument>?>(1) + if (request != null) { + taskRequests.add { response -> request.accept(response) } + } + taskListId + } + + on { getTasks(anyOrNull()) } doAnswer + { + val request = it.getArgument>?>(0) + if (request != null) { + taskRequests.add { response -> request.accept(response) } + } + taskListId + } + + on { isTaskListValid(any()) } doAnswer { taskListId == it.getArgument(0) } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelTestRule.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelTestRule.kt new file mode 100644 index 00000000000..359b87618c7 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelTestRule.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.launcher3.taskbar.rules + +import com.android.quickstep.util.GroupTask +import org.junit.rules.TestRule +import org.junit.runner.Description +import org.junit.runners.model.Statement + +class MockedRecentsModelTestRule(private val modelHelper: MockedRecentsModelHelper) : TestRule { + private var recentTasks: List = emptyList() + + override fun apply(base: Statement?, description: Description?): Statement { + return object : Statement() { + override fun evaluate() { + base?.evaluate() + } + } + } + + // NOTE: For the update to take effect, `resolvePendingTaskRequests()` needs to be called, so + // calbacks to any pending `RecentsModel.getTasks()` get called with the updated task list. + fun updateRecentTasks(tasks: List) { + ++modelHelper.taskListId + recentTasks = tasks + modelHelper.recentTasksChangedListener?.onRecentTasksChanged() + } + + fun resolvePendingTaskRequests() { + val requests = mutableListOf<(List) -> Unit>() + requests.addAll(modelHelper.taskRequests) + modelHelper.taskRequests.clear() + + requests.forEach { it(recentTasks) } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRule.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRule.kt new file mode 100644 index 00000000000..9630a784684 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRule.kt @@ -0,0 +1,143 @@ +/* + * 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.launcher3.taskbar.rules + +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.NavigationMode +import com.android.launcher3.util.TaskbarModeUtil +import org.junit.rules.TestRule +import org.junit.runner.Description +import org.junit.runners.model.Statement +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.spy +import org.mockito.kotlin.stub +import org.mockito.kotlin.whenever + +/** + * Allows tests to specify which Taskbar [Mode] to run under. + * + * [context] should match the test's target context, so that Dagger singleton instances are properly + * sandboxed. + * + * Annotate tests with [TaskbarMode] to set a mode. If the annotation is omitted for any tests, this + * rule is a no-op. + * + * Make sure this rule precedes any rules that depend on [DisplayController], or else the instance + * might be inconsistent across the test lifecycle. + */ +class TaskbarModeRule(private val context: TaskbarWindowSandboxContext) : TestRule { + /** The selected Taskbar mode. */ + enum class Mode { + TRANSIENT, + PINNED, + THREE_BUTTONS, + } + + /** Overrides Taskbar [mode] for a test. */ + @Retention(AnnotationRetention.RUNTIME) + @Target(AnnotationTarget.FUNCTION) + annotation class TaskbarMode(val mode: Mode) + + override fun apply(base: Statement, description: Description): Statement { + val taskbarMode = description.getAnnotation(TaskbarMode::class.java) ?: return base + + return object : Statement() { + override fun evaluate() { + val mode = taskbarMode.mode + + getInstrumentation().runOnMainSync { + TaskbarModeUtil.INSTANCE[context]?.stub { + doReturn( + when (mode) { + Mode.TRANSIENT -> false + Mode.PINNED -> true + Mode.THREE_BUTTONS -> false + } + ) + .whenever(it) + .isPinned + + doReturn( + when (mode) { + Mode.TRANSIENT -> true + Mode.PINNED -> false + Mode.THREE_BUTTONS -> false + } + ) + .whenever(it) + .isTransient + } + + TaskbarFeatureEvaluator.INSTANCE[context]?.stub { + doReturn( + when (mode) { + Mode.TRANSIENT -> false + Mode.PINNED -> true + Mode.THREE_BUTTONS -> false + } + ) + .whenever(it) + .isPinned + + doReturn( + when (mode) { + Mode.TRANSIENT -> true + Mode.PINNED -> false + Mode.THREE_BUTTONS -> false + } + ) + .whenever(it) + .isTransient + + doReturn( + when (mode) { + Mode.TRANSIENT -> false + Mode.PINNED -> true + Mode.THREE_BUTTONS -> true + } + ) + .whenever(it) + .isPersistent + } + } + + getInstrumentation().runOnMainSync { + DisplayController.INSTANCE[context].let { + if (it is DisplayControllerSpy) { + it.infoModifier = { info -> + spy(info) { + on { navigationMode } doReturn + when (mode) { + Mode.TRANSIENT, + Mode.PINNED -> NavigationMode.NO_BUTTON + Mode.THREE_BUTTONS -> NavigationMode.THREE_BUTTONS + } + } + } + } + } + } + + base.evaluate() + } + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRuleTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRuleTest.kt new file mode 100644 index 00000000000..bc752b666f1 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRuleTest.kt @@ -0,0 +1,89 @@ +/* + * 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.launcher3.taskbar.rules + +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.PINNED +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.THREE_BUTTONS +import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT +import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.launcher3.util.NavigationMode +import com.android.launcher3.util.TaskbarModeUtil +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +class TaskbarModeRuleTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val taskbarModeRule = TaskbarModeRule(context) + + @Test + @TaskbarMode(TRANSIENT) + fun testTaskbarMode_transient_overridesTaskbarUtil() { + assertThat(TaskbarModeUtil.INSTANCE.get(context).isTransient).isTrue() + assertThat(TaskbarModeUtil.INSTANCE.get(context).isPinned).isFalse() + assertThat(DisplayController.getNavigationMode(context)).isEqualTo(NavigationMode.NO_BUTTON) + } + + @Test + @TaskbarMode(TRANSIENT) + fun testTaskbarMode_transient_overridesDeviceProfile() { + val dp = InvariantDeviceProfile.INSTANCE.get(context).getDeviceProfile(context) + assertThat(dp.taskbarProfile.isTransientTaskbar).isTrue() + assertThat(dp.deviceProperties.isGestureMode).isTrue() + } + + @Test + @TaskbarMode(PINNED) + fun testTaskbarMode_pinned_overridesTaskbarUtil() { + assertThat(TaskbarModeUtil.INSTANCE.get(context).isTransient).isFalse() + assertThat(TaskbarModeUtil.INSTANCE.get(context).isPinned).isTrue() + assertThat(DisplayController.getNavigationMode(context)).isEqualTo(NavigationMode.NO_BUTTON) + } + + @Test + @TaskbarMode(PINNED) + fun testTaskbarMode_pinned_overridesDeviceProfile() { + val dp = InvariantDeviceProfile.INSTANCE.get(context).getDeviceProfile(context) + assertThat(dp.taskbarProfile.isTransientTaskbar).isFalse() + assertThat(dp.deviceProperties.isGestureMode).isTrue() + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testTaskbarMode_threeButtons_overridesTaskbarUtil() { + assertThat(TaskbarModeUtil.INSTANCE.get(context).isTransient).isFalse() + assertThat(TaskbarModeUtil.INSTANCE.get(context).isPinned).isFalse() + assertThat(DisplayController.getNavigationMode(context)) + .isEqualTo(NavigationMode.THREE_BUTTONS) + } + + @Test + @TaskbarMode(THREE_BUTTONS) + fun testTaskbarMode_threeButtons_overridesDeviceProfile() { + val dp = InvariantDeviceProfile.INSTANCE.get(context).getDeviceProfile(context) + assertThat(dp.taskbarProfile.isTransientTaskbar).isFalse() + assertThat(dp.deviceProperties.isGestureMode).isFalse() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarSandboxComponent.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarSandboxComponent.kt new file mode 100644 index 00000000000..fecdf835bd8 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarSandboxComponent.kt @@ -0,0 +1,265 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.taskbar.rules + +import android.content.Context +import com.android.app.displaylib.PerDisplayRepository +import com.android.launcher3.Flags +import com.android.launcher3.LauncherPrefChangeListener +import com.android.launcher3.LauncherPrefs +import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING +import com.android.launcher3.compose.core.widgetpicker.NoOpWidgetPickerModule +import com.android.launcher3.concurrent.ExecutorsModule +import com.android.launcher3.dagger.ApiWrapperModule +import com.android.launcher3.dagger.AppModule +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.BasePerDisplayModule +import com.android.launcher3.dagger.DisplayContext +import com.android.launcher3.dagger.HomeScreenFilesModule +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.dagger.LauncherConcurrencyModule +import com.android.launcher3.dagger.LauncherModelModule +import com.android.launcher3.dagger.SettingsModule +import com.android.launcher3.dagger.StaticObjectModule +import com.android.launcher3.dagger.SystemDragModule +import com.android.launcher3.dagger.WidgetModule +import com.android.launcher3.dagger.WindowContext +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.FakePrefsModule +import com.android.launcher3.util.SandboxWmProxyModule +import com.android.launcher3.util.SettingsCache +import com.android.launcher3.util.TaskbarModeUtil +import com.android.launcher3.util.dagger.LauncherExecutorsModule +import com.android.launcher3.util.window.WindowManagerProxy +import com.android.quickstep.FallbackWindowInterface +import com.android.quickstep.RecentsAnimationDeviceState +import com.android.quickstep.RotationTouchHelper +import com.android.quickstep.SystemUiProxy +import com.android.quickstep.TaskAnimationManager +import com.android.quickstep.window.RecentsWindowManager +import com.android.quickstep.window.RecentsWindowTracker +import dagger.Binds +import dagger.BindsInstance +import dagger.Component +import dagger.Module +import dagger.Provides +import javax.inject.Inject +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy + +@LauncherAppSingleton +@Component(modules = [AllTaskbarSandboxModules::class]) +interface TaskbarSandboxComponent : LauncherAppComponent { + + @Component.Builder + interface Builder : LauncherAppComponent.Builder { + @BindsInstance fun bindSystemUiProxy(proxy: SystemUiProxy): Builder + + @BindsInstance fun bindSettingsCache(settingsCache: SettingsCache): Builder + + override fun build(): TaskbarSandboxComponent + } +} + +@Module( + includes = + [ + ApiWrapperModule::class, + StaticObjectModule::class, + WidgetModule::class, + AppModule::class, + BasePerDisplayModule::class, + LauncherConcurrencyModule::class, + ExecutorsModule::class, + LauncherExecutorsModule::class, + FakePrefsModule::class, + TaskbarModule::class, + DisplayControllerModule::class, + SandboxWmProxyModule::class, + TaskbarPerDisplayReposModule::class, + DesktopVisibilityControllerModule::class, + NoOpWidgetPickerModule::class, + LauncherModelModule::class, + HomeScreenFilesModule::class, + SettingsModule::class, + SystemDragModule::class, + ] +) +interface AllTaskbarSandboxModules + +@Module +abstract class DisplayControllerModule { + @Binds abstract fun bindDisplayController(controller: DisplayControllerSpy): DisplayController +} + +@Module +object TaskbarModule { + @JvmStatic + @Provides + @LauncherAppSingleton + fun provideTaskbarModeUtil( + @ApplicationContext context: Context, + displayController: DisplayController, + windowManagerProxy: WindowManagerProxy, + launcherPrefs: LauncherPrefs, + ): TaskbarModeUtil { + return spy(TaskbarModeUtil(context, displayController, windowManagerProxy, launcherPrefs)) + } + + @JvmStatic + @Provides + @LauncherAppSingleton + fun provideTaskbarFeatureEvaluator( + @ApplicationContext context: Context, + displayController: DisplayController, + desktopVisibilityController: DesktopVisibilityController, + launcherPrefs: LauncherPrefs, + ): TaskbarFeatureEvaluator { + return spy( + TaskbarFeatureEvaluator( + context, + displayController, + desktopVisibilityController, + launcherPrefs, + ) + ) + } +} + +/** A wrapper over display controller which allows modifying the underlying info */ +@LauncherAppSingleton +class DisplayControllerSpy +@Inject +constructor( + @ApplicationContext context: Context, + wmProxy: WindowManagerProxy, + private val prefs: LauncherPrefs, + lifecycle: DaggerSingletonTracker, +) : DisplayController(context, wmProxy, prefs, lifecycle) { + + var infoModifier: ((Info) -> Info)? = null + + // When overview on CD is enabled, DisplayController queries getInfoForDisplay instead of + // getInfo for the primary (virtual) display used in tests. So, override it to get info from the + // default display. + private val defaultInfoModifierForDisplay: ((Info?) -> Info?)? = + if (Flags.enableOverviewOnConnectedDisplays()) { + { _ -> info } + } else { + null + } + + var infoModifierForDisplay: ((Info?) -> Info?)? = defaultInfoModifierForDisplay + + private var prefListener: LauncherPrefChangeListener? = null + + init { + // When overview on CD is disabled, DisplayController only adds the info associated with + // the DEFAULT_DISPLAY. So, instead of changing the production code of DisplayController to + // use display from context we manually add the info associated with the virtual display. + if (!Flags.enableOverviewOnConnectedDisplays()) { + getOrCreatePerDisplayInfo(context.display) + lifecycle.addCloseable { removePerDisplayInfo(context.displayId) } + } + } + + override fun getInfo(): Info = infoModifier?.invoke(super.getInfo()) ?: super.getInfo() + + override fun getInfoForDisplay(displayId: Int): Info? = + infoModifierForDisplay?.invoke(super.getInfoForDisplay(displayId)) + ?: super.getInfoForDisplay(displayId) + + /** + * Sets up [TASKBAR_PINNING] pref listener for the given display. + * + *

DisplayController sets up LauncherPrefChangeListener only for the DEFAULT_DISPLAY, this is + * correct but tests rely on treating the created virtual display as default. So, instead of + * changing the production code of DisplayController to be more testable, we add a custom + * listener for our virtual display. + */ + fun setupTaskbarPinningPrefListener(displayId: Int) { + prefListener = + LauncherPrefChangeListener { notifyConfigChangeForDisplay(displayId) } + .also { prefs.addListener(it, TASKBAR_PINNING) } + } + + fun cleanup() { + prefListener?.let { prefs.removeListener(it, TASKBAR_PINNING) } + infoModifier = null + infoModifierForDisplay = defaultInfoModifierForDisplay + } +} + +/** Convenient extension to access [DisplayControllerSpy] from [TaskbarWindowSandboxContext]. */ +val TaskbarWindowSandboxContext.displayControllerSpy: DisplayControllerSpy? + get() = DisplayController.INSTANCE[this] as? DisplayControllerSpy + +@Module +object DesktopVisibilityControllerModule { + @JvmStatic + @Provides + @LauncherAppSingleton + fun provideDesktopVisibilityController( + @ApplicationContext context: Context, + systemUiProxy: SystemUiProxy, + lifecycleTracker: DaggerSingletonTracker, + ): DesktopVisibilityController { + return spy(DesktopVisibilityController(context, systemUiProxy, lifecycleTracker)) + } +} + +@Module +object TaskbarPerDisplayReposModule { + @Provides + @LauncherAppSingleton + fun provideRecentsAnimationDeviceStateRepo(): + PerDisplayRepository = mock() + + @Provides + @LauncherAppSingleton + fun provideTaskAnimationManagerRepo(): PerDisplayRepository = mock() + + @Provides + @LauncherAppSingleton + fun provideRotationTouchHandlerRepo(): PerDisplayRepository = mock() + + @Provides + @LauncherAppSingleton + fun provideFallbackWindowInterfaceRepo(): PerDisplayRepository = mock() + + @Provides + @LauncherAppSingleton + fun provideRecentsWindowManagerRepo(): PerDisplayRepository = mock() + + @Provides + @LauncherAppSingleton + fun provideRecentsWindowTrackerRepo(): PerDisplayRepository = mock() + + @Provides + @LauncherAppSingleton + @DisplayContext + fun provideDisplayContext(): PerDisplayRepository = mock() + + @Provides + @LauncherAppSingleton + @WindowContext + fun provideWindowContext(): PerDisplayRepository = mock() +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt new file mode 100644 index 00000000000..677540dd23c --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt @@ -0,0 +1,280 @@ +/* + * 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.launcher3.taskbar.rules + +import android.app.Instrumentation +import android.app.PendingIntent +import android.content.IIntentSender +import android.os.UserHandle +import android.os.UserManager +import android.provider.Settings.Secure.NAV_BAR_KIDS_MODE +import android.provider.Settings.Secure.USER_SETUP_COMPLETE +import android.provider.Settings.Secure.getUriFor +import androidx.test.platform.app.InstrumentationRegistry +import com.android.app.displaylib.DisplaysWithDecorationsRepositoryCompat +import com.android.launcher3.LauncherAppState +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarControllers +import com.android.launcher3.taskbar.TaskbarManagerImpl +import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks +import com.android.launcher3.taskbar.TaskbarUIController +import com.android.launcher3.taskbar.bubbles.BubbleControllers +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.TestUtil +import com.android.launcher3.util.coroutines.ProductionDispatchers +import com.android.quickstep.AllAppsActionManager +import com.android.quickstep.input.QuickstepKeyGestureEventsManager +import com.android.quickstep.window.RecentsWindowManager +import java.lang.reflect.Field +import java.lang.reflect.ParameterizedType +import java.util.Locale +import java.util.Optional +import org.junit.Assume.assumeTrue +import org.junit.rules.TestRule +import org.junit.runner.Description +import org.junit.runners.model.Statement +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doNothing +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy +import org.mockito.kotlin.stub +import org.mockito.kotlin.whenever + +/** + * Manages the Taskbar lifecycle for unit tests. + * + * Tests should pass in themselves as [testInstance]. They also need to provide their target + * [context] through the constructor. + * + * See [InjectController] for grabbing controller(s) under test with minimal boilerplate. + * + * The rule interacts with [TaskbarManager] on the main thread. A good rule of thumb for tests is + * that code that is executed on the main thread in production should also happen on that thread + * when tested. + * + * `@UiThreadTest` is incompatible with this rule. The annotation causes this rule to run on the + * main thread, but it needs to be run on the test thread for it to work properly. Instead, only run + * code that requires the main thread using something like [Instrumentation.runOnMainSync] or + * [TestUtil.getOnUiThread]. + * + * ``` + * @Test + * fun example() { + * instrumentation.runOnMainSync { doWorkThatPostsMessage() } + * // Second lambda will not execute until message is processed. + * instrumentation.runOnMainSync { verifyMessageResults() } + * } + * ``` + */ +class TaskbarUnitTestRule( + private val testInstance: Any, + private val context: TaskbarWindowSandboxContext, + private val controllerInjectionCallback: () -> Unit = {}, +) : TestRule { + + private val instrumentation = InstrumentationRegistry.getInstrumentation() + + lateinit var taskbarManager: TaskbarManagerImpl + + val activityContext: TaskbarActivityContext + get() { + return taskbarManager.currentActivityContext + ?: throw RuntimeException("Failed to obtain TaskbarActivityContext.") + } + + override fun apply(base: Statement, description: Description): Statement { + return object : Statement() { + override fun evaluate() { + + // Only run test when Taskbar is enabled. + instrumentation.runOnMainSync { + assumeTrue( + "Ignoring test because taskbar is not present", + LauncherAppState.getIDP(context).getDeviceProfile(context).isTaskbarPresent, + ) + } + + // Process secure setting annotations. + context.settingsCacheSandbox[getUriFor(USER_SETUP_COMPLETE)] = + if (description.getAnnotation(UserSetupMode::class.java) != null) 0 else 1 + context.settingsCacheSandbox[getUriFor(NAV_BAR_KIDS_MODE)] = + if (description.getAnnotation(NavBarKidsMode::class.java) != null) 1 else 0 + + val quickstepKeyGestureEventsManagerSpy = + spy( + QuickstepKeyGestureEventsManager( + context, + context.settingsCacheSandbox.cache, + ) + ) + doNothing() + .whenever(quickstepKeyGestureEventsManagerSpy) + .registerAllAppsKeyGestureEvent(any()) + doNothing() + .whenever(quickstepKeyGestureEventsManagerSpy) + .unregisterAllAppsKeyGestureEvent() + doNothing() + .whenever(quickstepKeyGestureEventsManagerSpy) + .registerOverviewKeyGestureEvent(any()) + doNothing() + .whenever(quickstepKeyGestureEventsManagerSpy) + .unregisterOverviewKeyGestureEvent() + + val isUserUnlocked = description.getAnnotation(UserLocked::class.java) == null + context.base.spyService(UserManager::class.java).stub { + doAnswer { isUserUnlocked }.whenever(mock).isUserUnlocked(any()) + doAnswer { isUserUnlocked }.whenever(mock).isUserUnlockingOrUnlocked(any()) + // Needed because the Robolectric version does not overload to the ID method. + doAnswer { isUserUnlocked }.whenever(mock).isUserUnlocked(any()) + doAnswer { isUserUnlocked } + .whenever(mock) + .isUserUnlockingOrUnlocked(any()) + } + + taskbarManager = + TestUtil.getOnUiThread { + object : + TaskbarManagerImpl( + context, + AllAppsActionManager( + context, + UI_HELPER_EXECUTOR, + quickstepKeyGestureEventsManagerSpy, + ) { + PendingIntent(IIntentSender.Default()) + }, + object : TaskbarNavButtonCallbacks {}, + RecentsWindowManager.REPOSITORY_INSTANCE.get(context), + // VirtualDisplaysRule dispatches system decoration changes. + mock(), + ProductionDispatchers.main, + ) { + override fun recreateTaskbars() { + super.recreateTaskbars() + injectControllers() + } + + override fun recreateTaskbarForDisplay(displayId: Int, duration: Int) { + super.recreateTaskbarForDisplay(displayId, duration) + if (displayId == context.displayId) injectControllers() + } + } + } + context.virtualDisplayRule.registerDisplayDecorationListener(taskbarManager) + + if (description.getAnnotation(ForceRtl::class.java) != null) { + // Needs to be set on window context instead of sandbox context, because it does + // does not propagate between them. However, this change will impact created + // TaskbarActivityContext instances, since they wrap the window context. + // TODO: iterate through all window contexts and do this. + taskbarManager.primaryWindowContext.resources.configuration.setLayoutDirection( + RTL_LOCALE + ) + } + + try { + if (isUserUnlocked) unlockUser() + base.evaluate() + } finally { + instrumentation.runOnMainSync { taskbarManager.destroy() } + context.displayControllerSpy?.cleanup() + } + } + } + } + + /** Simulates Taskbar recreation lifecycle. */ + fun recreateTaskbar() = instrumentation.runOnMainSync { taskbarManager.recreateTaskbars() } + + /** Simulates unlocking the user for the first time. */ + fun unlockUser() = instrumentation.runOnMainSync { taskbarManager.onUserUnlocked() } + + // Don't use TaskbarManager property, because the function can be called before initialization. + private fun TaskbarManagerImpl.injectControllers() { + val activityContext = currentActivityContext ?: return + + val bubbleControllerTypes = + BubbleControllers::class.java.fields.map { f -> + if (f.type == Optional::class.java) { + (f.genericType as ParameterizedType).actualTypeArguments[0] as Class<*> + } else { + f.type + } + } + testInstance.javaClass.fields + .filter { it.isAnnotationPresent(InjectController::class.java) } + .forEach { + val controllers: Any = + if (it.type in bubbleControllerTypes) { + activityContext.controllers.bubbleControllers.orElseThrow { + NoSuchElementException("Bubble controllers are not initialized") + } + } else { + activityContext.controllers + } + injectController(it, testInstance, controllers) + } + + // TODO(b/346394875): we should test a non-default uiController. + activityContext.setUIController(TaskbarUIController.DEFAULT) + controllerInjectionCallback.invoke() + } + + private fun injectController(field: Field, testInstance: Any, controllers: Any) { + val controllerFieldsByType = controllers.javaClass.fields.associateBy { it.type } + field.set( + testInstance, + controllerFieldsByType[field.type]?.get(controllers) + ?: throw NoSuchElementException("Failed to find controller for ${field.type}"), + ) + } + + /** + * Annotates test controller fields to inject the corresponding controllers from the current + * [TaskbarControllers] instance. + * + * Controllers are injected during test setup and upon calling [recreateTaskbar]. + * + * Multiple controllers can be injected if needed. + */ + @Retention(AnnotationRetention.RUNTIME) + @Target(AnnotationTarget.FIELD) + annotation class InjectController + + /** Overrides [USER_SETUP_COMPLETE] to be `false` for tests. */ + @Retention(AnnotationRetention.RUNTIME) + @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) + annotation class UserSetupMode + + /** Overrides [NAV_BAR_KIDS_MODE] to be `true` for tests. */ + @Retention(AnnotationRetention.RUNTIME) + @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) + annotation class NavBarKidsMode + + /** Forces RTL UI for tests. */ + @Retention(AnnotationRetention.RUNTIME) + @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) + annotation class ForceRtl + + /** Simulate direct boot for tests, where the user is still locked. */ + @Retention(AnnotationRetention.RUNTIME) + @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) + annotation class UserLocked +} + +private val RTL_LOCALE = Locale.of("ar", "XB") diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRuleTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRuleTest.kt new file mode 100644 index 00000000000..b8b0b5d1e11 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRuleTest.kt @@ -0,0 +1,238 @@ +/* + * 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.launcher3.taskbar.rules + +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import com.android.launcher3.Utilities +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarKeyguardController +import com.android.launcher3.taskbar.TaskbarManager +import com.android.launcher3.taskbar.TaskbarStashController +import com.android.launcher3.taskbar.bubbles.BubbleBarController +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.ForceRtl +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.NavBarKidsMode +import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.UserSetupMode +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.android.wm.shell.Flags +import com.google.common.truth.Truth.assertThat +import org.junit.Assert.assertThrows +import org.junit.Rule +import org.junit.Test +import org.junit.runner.Description +import org.junit.runner.RunWith +import org.junit.runners.model.Statement + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023", "pixelTablet2023"]) +class TaskbarUnitTestRuleTest { + + @get:Rule(order = 0) val context = TaskbarWindowSandboxContext.create() + @get:Rule(order = 1) val setFlagsRule = SetFlagsRule() + + @Test + fun testSetup_taskbarInitialized() { + onSetup { assertThat(activityContext).isInstanceOf(TaskbarActivityContext::class.java) } + } + + @Test + fun testRecreateTaskbar_activityContextChanged() { + onSetup { + val context1 = activityContext + recreateTaskbar() + val context2 = activityContext + assertThat(context1).isNotSameInstanceAs(context2) + } + } + + @Test + fun testTeardown_taskbarDestroyed() { + val testRule = TaskbarUnitTestRule(this, context) + testRule.apply(EMPTY_STATEMENT, DESCRIPTION).evaluate() + assertThrows(RuntimeException::class.java) { testRule.activityContext } + } + + @Test + fun testInjectController_validControllerType_isInjected() { + val testClass = + object { + @InjectController lateinit var controller: TaskbarStashController + val isInjected: Boolean + get() = ::controller.isInitialized + } + + TaskbarUnitTestRule(testClass, context).apply(EMPTY_STATEMENT, DESCRIPTION).evaluate() + + onSetup(TaskbarUnitTestRule(testClass, context)) { + assertThat(testClass.isInjected).isTrue() + } + } + + @Test + fun testInjectController_multipleControllers_areInjected() { + val testClass = + object { + @InjectController lateinit var controller1: TaskbarStashController + @InjectController lateinit var controller2: TaskbarKeyguardController + val areInjected: Boolean + get() = ::controller1.isInitialized && ::controller2.isInitialized + } + + onSetup(TaskbarUnitTestRule(testClass, context)) { + assertThat(testClass.areInjected).isTrue() + } + } + + @Test + fun testInjectController_invalidControllerType_exceptionThrown() { + val testClass = + object { + @InjectController lateinit var manager: TaskbarManager // Not a controller. + } + + // We cannot use #assertThrows because we also catch an assumption violated exception when + // running #evaluate on devices that do not support Taskbar. + val result = + try { + TaskbarUnitTestRule(testClass, context) + .apply(EMPTY_STATEMENT, DESCRIPTION) + .evaluate() + } catch (e: NoSuchElementException) { + e + } + assertThat(result).isInstanceOf(NoSuchElementException::class.java) + } + + @Test + fun testInjectController_recreateTaskbar_controllerChanged() { + val testClass = + object { + @InjectController lateinit var controller: TaskbarStashController + } + + onSetup(TaskbarUnitTestRule(testClass, context)) { + val controller1 = testClass.controller + recreateTaskbar() + val controller2 = testClass.controller + assertThat(controller1).isNotSameInstanceAs(controller2) + } + } + + @EnableFlags(Flags.FLAG_ENABLE_BUBBLE_BAR) + @Test + fun testInjectBubbleController_bubbleFlagOn_isInjected() { + val testClass = + object { + @InjectController lateinit var controller: BubbleBarController + val isInjected: Boolean + get() = ::controller.isInitialized + } + + TaskbarUnitTestRule(testClass, context).apply(EMPTY_STATEMENT, DESCRIPTION).evaluate() + + onSetup(TaskbarUnitTestRule(testClass, context)) { + assertThat(testClass.isInjected).isTrue() + } + } + + @DisableFlags(Flags.FLAG_ENABLE_BUBBLE_BAR) + @Test + fun testInjectBubbleController_bubbleFlagOff_exceptionThrown() { + val testClass = + object { + @InjectController lateinit var controller: BubbleBarController + } + + // We cannot use #assertThrows because we also catch an assumption violated exception when + // running #evaluate on devices that do not support Taskbar. + val result = + try { + TaskbarUnitTestRule(testClass, context) + .apply(EMPTY_STATEMENT, DESCRIPTION) + .evaluate() + } catch (e: NoSuchElementException) { + e + } + assertThat(result).isInstanceOf(NoSuchElementException::class.java) + } + + @Test + fun testUserSetupMode_default_isComplete() { + onSetup { assertThat(activityContext.isUserSetupComplete).isTrue() } + } + + @Test + fun testUserSetupMode_withAnnotation_isIncomplete() { + @UserSetupMode class Mode + onSetup(description = Description.createSuiteDescription(Mode::class.java)) { + assertThat(activityContext.isUserSetupComplete).isFalse() + } + } + + @Test + fun testNavBarKidsMode_default_navBarNotForcedVisible() { + onSetup { assertThat(activityContext.isNavBarForceVisible).isFalse() } + } + + @Test + fun testNavBarKidsMode_withAnnotation_navBarForcedVisible() { + @NavBarKidsMode class Mode + onSetup(description = Description.createSuiteDescription(Mode::class.java)) { + assertThat(activityContext.isNavBarForceVisible).isTrue() + } + } + + @Test + fun testForceRtlAnnotation_setsActivityContextLayoutDirection() { + @ForceRtl class Rtl + onSetup(description = Description.createSuiteDescription(Rtl::class.java)) { + assertThat(Utilities.isRtl(activityContext.resources)).isTrue() + } + } + + /** + * Executes [runTest] after the [testRule] setup phase completes. + * + * A [description] can also be provided to mimic annotating a test or test class. + */ + private fun onSetup( + testRule: TaskbarUnitTestRule = TaskbarUnitTestRule(this, context), + description: Description = DESCRIPTION, + runTest: TaskbarUnitTestRule.() -> Unit, + ) { + testRule + .apply( + object : Statement() { + override fun evaluate() = runTest(testRule) + }, + description, + ) + .evaluate() + } + + private companion object { + private val EMPTY_STATEMENT = + object : Statement() { + override fun evaluate() = Unit + } + private val DESCRIPTION = + Description.createSuiteDescription(TaskbarUnitTestRuleTest::class.java) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContext.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContext.kt new file mode 100644 index 00000000000..a1a559987df --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContext.kt @@ -0,0 +1,130 @@ +/* + * 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.launcher3.taskbar.rules + +import android.companion.datatransfer.continuity.TaskContinuityManager +import android.content.Context +import android.content.ContextWrapper +import android.hardware.display.DisplayManager +import android.hardware.display.VirtualDisplay +import android.view.Display +import android.view.Display.DEFAULT_DISPLAY +import android.view.WindowManager +import android.window.DesktopExperienceFlags +import androidx.test.core.app.ApplicationProvider +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.SettingsCacheSandbox +import com.android.launcher3.util.VirtualDisplaysRule +import com.android.quickstep.SystemUiProxy +import org.junit.rules.ExternalResource +import org.junit.rules.RuleChain +import org.junit.rules.TestRule +import org.junit.runner.Description +import org.junit.runners.model.Statement +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +/** + * [SandboxApplication] for running Taskbar tests. + * + * Tests need to run on a [VirtualDisplay] to avoid conflicting with Launcher's Taskbar on the + * [DEFAULT_DISPLAY] (i.e. test is executing on a device). + */ +class TaskbarWindowSandboxContext +private constructor( + val base: SandboxApplication, + val virtualDisplayRule: VirtualDisplaysRule, + private val params: SandboxParams, +) : ContextWrapper(base), TestRule { + + val settingsCacheSandbox = SettingsCacheSandbox() + val windowManagerSpy = base.spyService(WindowManager::class.java) + val taskContinuityManagerMock: TaskContinuityManager = mock() + + private val sandboxSpyServicesRule = + object : ExternalResource() { + override fun before() { + // Filter out DEFAULT_DISPLAY in case code accesses displays property. The primary + // virtual display has a different ID. + val dm = base.spyService(DisplayManager::class.java) + base.mockService( + Context.TASK_CONTINUITY_SERVICE, + TaskContinuityManager::class.java, + taskContinuityManagerMock, + ) + whenever(dm.displays).thenAnswer { i -> + @Suppress("UNCHECKED_CAST") + val displays = i.callRealMethod() as? Array ?: emptyArray() + displays.filter { it.displayId != DEFAULT_DISPLAY }.toTypedArray() + } + + // Have displays appear as if they support Taskbar. + if (!DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue) { + whenever(windowManagerSpy.shouldShowSystemDecors(any())).thenReturn(true) + } + } + } + + private val singletonSetupRule = + object : ExternalResource() { + override fun before() { + val context = this@TaskbarWindowSandboxContext + val builder = + params.builderBase + .bindSystemUiProxy(params.systemUiProxyProvider.invoke(context)) + .bindSettingsCache(settingsCacheSandbox.cache) + base.initDaggerComponent(builder) + } + } + + override fun apply(statement: Statement, description: Description): Statement { + return RuleChain.outerRule(virtualDisplayRule) + .around(base) + .around(sandboxSpyServicesRule) + .around(singletonSetupRule) + .apply(statement, description) + } + + companion object { + /** Creates a [SandboxApplication] for Taskbar tests. */ + fun create(params: SandboxParams = SandboxParams()): TaskbarWindowSandboxContext { + val base = ApplicationProvider.getApplicationContext() + val virtualDisplaysRule = VirtualDisplaysRule(base) + val defaultDisplay = + checkNotNull( + base.resources.displayMetrics.let { + virtualDisplaysRule[ + virtualDisplaysRule.add(it.widthPixels, it.heightPixels, it.densityDpi)] + } + ) + return TaskbarWindowSandboxContext( + SandboxApplication(base = base.createDisplayContext(defaultDisplay.display)), + virtualDisplaysRule, + params, + ) + } + } +} + +/** Include additional bindings when building a [TaskbarSandboxComponent]. */ +data class SandboxParams( + val systemUiProxyProvider: (Context) -> SystemUiProxy = { SystemUiProxy(it, MAIN_EXECUTOR, UI_HELPER_EXECUTOR) }, + val builderBase: TaskbarSandboxComponent.Builder = DaggerTaskbarSandboxComponent.builder(), +) diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContextTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContextTest.kt new file mode 100644 index 00000000000..a5f5396aa95 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContextTest.kt @@ -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. + */ + +package com.android.launcher3.taskbar.rules + +import android.hardware.display.DisplayManager +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelFoldable2023"]) +class TaskbarWindowSandboxContextTest { + + @get:Rule val context = TaskbarWindowSandboxContext.create() + + @Test + fun testDefaultDisplay_isVirtualDisplay() { + val displayManager = checkNotNull(context.getSystemService(DisplayManager::class.java)) + assertThat(displayManager.displays.size).isEqualTo(1) + assertThat(displayManager.displays[0].displayId).isEqualTo(context.displayId) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/util/SettingsCacheSandbox.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/util/SettingsCacheSandbox.kt new file mode 100644 index 00000000000..5bf9d57689a --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/util/SettingsCacheSandbox.kt @@ -0,0 +1,57 @@ +/* + * 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.launcher3.util + +import android.net.Uri +import com.android.launcher3.util.SettingsCache.OnChangeListener +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +/** Provides [SettingsCache] sandboxed from system settings for testing. */ +class SettingsCacheSandbox { + private val values = mutableMapOf() + private val listeners = mutableMapOf>() + + /** + * Fake cache that delegates: + * - [SettingsCache.getValue] to [values] + * - [SettingsCache.mListenerMap] to [listeners]. + */ + val cache = + mock { + on { getValue(any()) } doAnswer { values.getOrDefault(it.getArgument(0), 0) == 1 } + + doAnswer { + listeners.getOrPut(it.getArgument(0)) { mutableSetOf() }.add(it.getArgument(1)) + } + .whenever(mock) + .register(any(), any()) + doAnswer { listeners[it.getArgument(0)]?.remove(it.getArgument(1)) } + .whenever(mock) + .unregister(any(), any()) + } + + operator fun get(key: Uri): Int? = values[key] + + operator fun set(key: Uri, value: Int) { + if (value == values[key]) return + values[key] = value + listeners[key]?.forEach { it.onSettingsChanged(value == 1) } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/util/VirtualDisplaysRule.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/util/VirtualDisplaysRule.kt new file mode 100644 index 00000000000..259d3e58757 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/util/VirtualDisplaysRule.kt @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.util + +import android.content.Context +import android.hardware.display.DisplayManager +import android.hardware.display.VirtualDisplay +import androidx.test.core.app.ApplicationProvider +import com.android.app.displaylib.DisplayDecorationListener +import com.android.app.displaylib.DisplaysWithDecorationsRepositoryCompat +import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync +import org.junit.rules.ExternalResource + +/** + * Manages multiple displays at runtime. + * + * Use [registerDisplayDecorationListener] to notify tested code when displays are changed. This + * rule handles system decoration changes, because [DisplaysWithDecorationsRepositoryCompat] does + * not respond to [VirtualDisplay] changes in Robolectric. + * + * All [virtualDisplays] are released upon teardown. + */ +class VirtualDisplaysRule(context: Context = ApplicationProvider.getApplicationContext()) : + ExternalResource() { + + private val displayManager = + requireNotNull(context.getSystemService(DisplayManager::class.java)) + private val virtualDisplays = mutableMapOf() + private val displayDecorationListeners = mutableListOf() + + /** + * Adds a display with the provided parameters, and notifies system decorations addition. + * + * Returns the added display ID. + */ + fun add( + width: Int = DEFAULT_WIDTH, + height: Int = DEFAULT_HEIGHT, + density: Int = DEFAULT_DENSITY, + ): Int { + val virtualDisplay = + displayManager.createVirtualDisplay( + "${DISPLAY_NAME_PREFIX}${virtualDisplays.size}", + width, + height, + density, + /* surface = */ null, + /* flags = */ 0, + ) + + val displayId = virtualDisplay.display.displayId + virtualDisplays[displayId] = virtualDisplay + runOnMainSync { + for (l in displayDecorationListeners) l.onDisplayAddSystemDecorations(displayId) + } + + return displayId + } + + /** + * Removes and releases [displayId], and notifies system decoration removal. + * + * Throws [IllegalArgumentException] if the display is not being managed by this rule. + */ + fun remove(displayId: Int) { + val virtualDisplay = + virtualDisplays.remove(displayId) + ?: throw IllegalArgumentException("Display $displayId not added") + + val displayId = virtualDisplay.display.displayId + runOnMainSync { + for (l in displayDecorationListeners) l.onDisplayRemoveSystemDecorations(displayId) + } + + virtualDisplay.release() + } + + fun registerDisplayDecorationListener(listener: DisplayDecorationListener) { + displayDecorationListeners += listener + } + + /** Returns the [VirtualDisplay] for [displayId]. */ + operator fun get(displayId: Int): VirtualDisplay? = virtualDisplays[displayId] + + override fun after() { + for (v in virtualDisplays.values) v.release() + displayDecorationListeners.clear() + } + + companion object { + private const val DISPLAY_NAME_PREFIX = "VirtualDisplayRule" + + const val DEFAULT_WIDTH = 1920 + const val DEFAULT_HEIGHT = 1080 + const val DEFAULT_DENSITY = 160 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/util/VirtualDisplaysRuleTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/util/VirtualDisplaysRuleTest.kt new file mode 100644 index 00000000000..c6cb4aa8a15 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/util/VirtualDisplaysRuleTest.kt @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.util + +import android.hardware.display.VirtualDisplay +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.app.displaylib.DisplayDecorationListener +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.google.common.truth.Truth.assertThat +import dagger.Component +import org.junit.Assert.assertThrows +import org.junit.Rule +import org.junit.Test +import org.junit.runner.Description +import org.junit.runner.RunWith +import org.junit.runners.model.Statement +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify + +@RunWith(AndroidJUnit4::class) +class VirtualDisplaysRuleTest { + + @get:Rule val virtualDisplaysRule = VirtualDisplaysRule() + + private val decorationListener = + mock { + virtualDisplaysRule.registerDisplayDecorationListener(mock) + } + + @Test + fun testAdd_decorationChangeObserved() { + val displayId = virtualDisplaysRule.add() + verify(decorationListener, times(1)).onDisplayAddSystemDecorations(displayId) + } + + @Test + fun testRemove_decorationChangeObserved() { + val displayId = virtualDisplaysRule.add() + virtualDisplaysRule.remove(displayId) + verify(decorationListener, times(1)).onDisplayRemoveSystemDecorations(displayId) + } + + @Test + fun testRemove_displayReleased() { + val displayId = virtualDisplaysRule.add() + val display = checkNotNull(virtualDisplaysRule[displayId]) + virtualDisplaysRule.remove(displayId) + assertThat(display.token).isNull() + } + + @Test + fun testRemove_displayAlreadyRemoved_exceptionThrown() { + val display = virtualDisplaysRule.add() + virtualDisplaysRule.remove(display) + + assertThrows(IllegalArgumentException::class.java) { + virtualDisplaysRule.remove(display) + } + } + + @Test + fun get_displayAdded_notNull() { + val display = virtualDisplaysRule[virtualDisplaysRule.add()] + assertThat(display).isNotNull() + } + + @Test + fun get_displayRemoved_isNull() { + val displayId = virtualDisplaysRule.add() + virtualDisplaysRule.remove(displayId) + assertThat(virtualDisplaysRule[displayId]).isNull() + } + + @Test + fun testTeardown_multipleDisplays_areReleased() { + val virtualDisplaysRule = VirtualDisplaysRule() + lateinit var display1: VirtualDisplay + lateinit var display2: VirtualDisplay + + // Simulate evaluating rule. + virtualDisplaysRule + .apply( + object : Statement() { + override fun evaluate() { + display1 = checkNotNull(virtualDisplaysRule[virtualDisplaysRule.add()]) + display2 = checkNotNull(virtualDisplaysRule[virtualDisplaysRule.add()]) + } + }, + Description.createSuiteDescription(javaClass), + ) + .evaluate() + + assertThat(display1.token).isNull() + assertThat(display2.token).isNull() + } +} + +@LauncherAppSingleton +@Component(modules = [AllModulesMinusWMProxy::class, SandboxWmProxyModule::class]) +interface VirtualDisplaysRuleTestComponent : LauncherAppComponent { + @Component.Builder interface Builder : LauncherAppComponent.Builder +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/widget/picker/WidgetCategoryFilterTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/widget/picker/WidgetCategoryFilterTest.kt new file mode 100644 index 00000000000..9b0a95a526c --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/widget/picker/WidgetCategoryFilterTest.kt @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.launcher3.widget.picker + +import android.appwidget.AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN +import android.appwidget.AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD +import android.appwidget.AppWidgetProviderInfo.WIDGET_CATEGORY_NOT_KEYGUARD +import android.appwidget.AppWidgetProviderInfo.WIDGET_CATEGORY_SEARCHBOX +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class WidgetCategoryFilterTest { + + @Test + fun filterValueZero_everythingMatches() { + val noFilter = WidgetCategoryFilter(categoryMask = 0) + + noFilter.assertMatches(WIDGET_CATEGORY_HOME_SCREEN) + noFilter.assertMatches(WIDGET_CATEGORY_KEYGUARD) + noFilter.assertMatches(WIDGET_CATEGORY_NOT_KEYGUARD) + noFilter.assertMatches(WIDGET_CATEGORY_SEARCHBOX) + noFilter.assertMatches(WIDGET_CATEGORY_HOME_SCREEN or WIDGET_CATEGORY_KEYGUARD) + noFilter.assertMatches(WIDGET_CATEGORY_HOME_SCREEN or WIDGET_CATEGORY_NOT_KEYGUARD) + noFilter.assertMatches( + WIDGET_CATEGORY_HOME_SCREEN or WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_NOT_KEYGUARD + ) + noFilter.assertMatches( + WIDGET_CATEGORY_HOME_SCREEN or WIDGET_CATEGORY_KEYGUARD or WIDGET_CATEGORY_NOT_KEYGUARD + ) + noFilter.assertMatches(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_KEYGUARD) + } + + @Test + fun includeHomeScreen_matchesOnlyIfHomeScreenExists() { + val filter = WidgetCategoryFilter(WIDGET_CATEGORY_HOME_SCREEN) + + filter.assertMatches(WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN) + + filter.assertDoesNotMatch(WIDGET_CATEGORY_KEYGUARD) + filter.assertDoesNotMatch(WIDGET_CATEGORY_NOT_KEYGUARD) + filter.assertDoesNotMatch(WIDGET_CATEGORY_SEARCHBOX) + filter.assertDoesNotMatch(WIDGET_CATEGORY_KEYGUARD or WIDGET_CATEGORY_SEARCHBOX) + } + + @Test + fun includeHomeScreenOrKeyguard_matchesIfEitherHomeScreenOrKeyguardExists() { + val filter = WidgetCategoryFilter(WIDGET_CATEGORY_HOME_SCREEN or WIDGET_CATEGORY_KEYGUARD) + + filter.assertMatches(WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_KEYGUARD) + filter.assertMatches(WIDGET_CATEGORY_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_KEYGUARD) + filter.assertMatches(WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_KEYGUARD) + + filter.assertDoesNotMatch(WIDGET_CATEGORY_NOT_KEYGUARD) + filter.assertDoesNotMatch(WIDGET_CATEGORY_SEARCHBOX) + filter.assertDoesNotMatch(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_NOT_KEYGUARD) + } + + @Test + fun excludeNotKeyguard_doesNotMatchIfNotKeyguardExists() { + val filter = WidgetCategoryFilter(WIDGET_CATEGORY_NOT_KEYGUARD.inv()) + + filter.assertMatches(WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_KEYGUARD) + filter.assertMatches(WIDGET_CATEGORY_SEARCHBOX) + filter.assertMatches(WIDGET_CATEGORY_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertMatches(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_KEYGUARD) + + filter.assertDoesNotMatch(WIDGET_CATEGORY_NOT_KEYGUARD) + filter.assertDoesNotMatch(WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertDoesNotMatch(WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_KEYGUARD) + filter.assertDoesNotMatch(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_NOT_KEYGUARD) + filter.assertDoesNotMatch( + WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN + ) + } + + @Test + fun multipleExclusions_doesNotMatchIfExcludedCategoriesExist() { + val filter = + WidgetCategoryFilter( + WIDGET_CATEGORY_HOME_SCREEN.inv() and WIDGET_CATEGORY_NOT_KEYGUARD.inv() + ) + + filter.assertMatches(WIDGET_CATEGORY_SEARCHBOX) + filter.assertMatches(WIDGET_CATEGORY_KEYGUARD) + filter.assertMatches(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_KEYGUARD) + + filter.assertDoesNotMatch(WIDGET_CATEGORY_HOME_SCREEN) + filter.assertDoesNotMatch(WIDGET_CATEGORY_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertDoesNotMatch(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_HOME_SCREEN) + + filter.assertDoesNotMatch(WIDGET_CATEGORY_NOT_KEYGUARD) + filter.assertDoesNotMatch(WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN) + filter.assertDoesNotMatch(WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_KEYGUARD) + filter.assertDoesNotMatch(WIDGET_CATEGORY_SEARCHBOX or WIDGET_CATEGORY_NOT_KEYGUARD) + filter.assertDoesNotMatch( + WIDGET_CATEGORY_NOT_KEYGUARD or WIDGET_CATEGORY_KEYGUARD or WIDGET_CATEGORY_HOME_SCREEN + ) + } + + private fun WidgetCategoryFilter.assertMatches(category: Int) { + assertThat(matches(category)).isTrue() + } + + private fun WidgetCategoryFilter.assertDoesNotMatch(category: Int) { + assertThat(matches(category)).isFalse() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/AbsSwipeUpHandlerTestCase.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/AbsSwipeUpHandlerTestCase.java new file mode 100644 index 00000000000..f62649506a6 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/AbsSwipeUpHandlerTestCase.java @@ -0,0 +1,821 @@ +/* + * 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.quickstep; + +import static android.view.Display.DEFAULT_DISPLAY; + +import static com.android.launcher3.BaseActivity.EVENT_DESTROYED; +import static com.android.launcher3.statehandlers.DesktopVisibilityController.INACTIVE_DESK_ID; +import static com.android.quickstep.AbsSwipeUpHandler.STATE_GESTURE_CANCELLED; +import static com.android.quickstep.AbsSwipeUpHandler.STATE_HANDLER_INVALIDATED; +import static com.android.quickstep.AbsSwipeUpHandler.STATE_LAUNCHER_PRESENT; +import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_CAN_HAND_OFF_ANIMATION; +import static com.android.wm.shell.shared.split.SplitBounds.KEY_EXTRA_SPLIT_BOUNDS; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50; + +import static junit.framework.Assert.assertNotNull; +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertFalse; +import static junit.framework.TestCase.assertNull; +import static junit.framework.TestCase.assertTrue; + +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.atLeast; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +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.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import android.animation.AnimatorSet; +import android.animation.ValueAnimator; +import android.app.ActivityManager; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.res.Configuration; +import android.graphics.PointF; +import android.graphics.Rect; +import android.os.Bundle; +import android.os.SystemClock; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; +import android.view.RemoteAnimationTarget; +import android.view.SurfaceControl; +import android.view.ViewTreeObserver; + +import androidx.annotation.NonNull; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.app.displaylib.fakes.FakePerDisplayRepository; +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.LauncherRootView; +import com.android.launcher3.anim.AnimationSuccessListener; +import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.statemanager.BaseState; +import com.android.launcher3.statemanager.StateManager; +import com.android.launcher3.statemanager.StatefulContainer; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.Executors; +import com.android.launcher3.util.MSDLPlayerWrapper; +import com.android.launcher3.util.SandboxApplication; +import com.android.launcher3.util.SystemUiController; +import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.ContextInitListener; +import com.android.quickstep.util.MotionPauseDetector; +import com.android.quickstep.util.RecentsOrientedState; +import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.views.TaskView; +import com.android.systemui.shared.system.InputConsumerController; +import com.android.wm.shell.shared.split.SplitBounds; + +import com.google.android.msdl.data.model.MSDLToken; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Set; +import java.util.concurrent.ExecutionException; + +public abstract class AbsSwipeUpHandlerTestCase< + STATE_TYPE extends BaseState, + RECENTS_CONTAINER extends Context & RecentsViewContainer & StatefulContainer, + RECENTS_VIEW extends RecentsView, + SWIPE_HANDLER extends AbsSwipeUpHandler, + CONTAINER_INTERFACE extends BaseContainerInterface> { + + @Rule + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + + @Rule + public final SandboxApplication mContext = new SandboxApplication(); + + protected int mDisplayId = DEFAULT_DISPLAY; + + protected final InputConsumerController mInputConsumerController = + InputConsumerController.getRecentsAnimationInputConsumer(); + protected final ActivityManager.RunningTaskInfo mRunningTaskInfo = + new ActivityManager.RunningTaskInfo(); + + protected final RemoteAnimationTarget mRemoteAnimationTarget = new RemoteAnimationTarget( + /* taskId= */ 0, + /* mode= */ RemoteAnimationTarget.MODE_CLOSING, + /* leash= */ new SurfaceControl(), + /* isTranslucent= */ false, + /* clipRect= */ null, + /* contentInsets= */ null, + /* prefixOrderIndex= */ 0, + /* position= */ null, + /* localBounds= */ null, + /* screenSpaceBounds= */ null, + new Configuration().windowConfiguration, + /* isNotInRecents= */ false, + /* startLeash= */ null, + /* startBounds= */ null, + /* taskInfo= */ mRunningTaskInfo, + /* allowEnterPip= */ false); + + protected final RemoteAnimationTarget mRemoteAnimationLeftTop = new RemoteAnimationTarget( + /* taskId= */ 1, + /* mode= */ RemoteAnimationTarget.MODE_CLOSING, + /* leash= */ new SurfaceControl(), + /* isTranslucent= */ false, + /* clipRect= */ null, + /* contentInsets= */ null, + /* prefixOrderIndex= */ 0, + /* position= */ null, + /* localBounds= */ null, + /* screenSpaceBounds= */ null, + new Configuration().windowConfiguration, + /* isNotInRecents= */ false, + /* startLeash= */ null, + /* startBounds= */ null, + /* taskInfo= */ mRunningTaskInfo, + /* allowEnterPip= */ false); + + protected final RemoteAnimationTarget mRemoteAnimationRightBottom = new RemoteAnimationTarget( + /* taskId= */ 2, + /* mode= */ RemoteAnimationTarget.MODE_CLOSING, + /* leash= */ new SurfaceControl(), + /* isTranslucent= */ false, + /* clipRect= */ null, + /* contentInsets= */ null, + /* prefixOrderIndex= */ 0, + /* position= */ null, + /* localBounds= */ null, + /* screenSpaceBounds= */ null, + new Configuration().windowConfiguration, + /* isNotInRecents= */ false, + /* startLeash= */ null, + /* startBounds= */ null, + /* taskInfo= */ mRunningTaskInfo, + /* allowEnterPip= */ false); + + protected RecentsAnimationTargets mRecentsAnimationTargets; + protected TaskAnimationManager mTaskAnimationManager; + protected StateManager mStateManager; + protected int[] mCurrentPageTaskIds = new int[] { 0 }; + protected int[] mNextPageTaskIds = new int[] { 1 }; + + @Mock protected CONTAINER_INTERFACE mActivityInterface; + @Mock protected ContextInitListener mContextInitListener; + @Mock protected RecentsAnimationController mRecentsAnimationController; + @Mock protected STATE_TYPE mState; + @Mock protected ViewTreeObserver mViewTreeObserver; + @Mock protected DragLayer mDragLayer; + @Mock protected LauncherRootView mRootView; + @Mock protected SystemUiController mSystemUiController; + @Mock protected GestureState mGestureState; + @Mock protected MSDLPlayerWrapper mMSDLPlayerWrapper; + @Mock protected RecentsAnimationDeviceState mDeviceState; + @Mock protected RotationTouchHelper mRotationTouchHelper; + @Mock protected StateManager.AtomicAnimationFactory mAtomicAnimationFactory; + @Mock protected TaskView mCurrentPageTaskView; + @Mock protected TaskView mNextPageTaskView; + @Mock protected BaseContainerInterface.AnimationFactory mAnimationFactory; + + @Before + public void setUpAnimationTargets() { + Bundle extras = new Bundle(); + extras.putBoolean(KEY_EXTRA_SHELL_CAN_HAND_OFF_ANIMATION, true); + extras.putParcelable(KEY_EXTRA_SPLIT_BOUNDS, new SplitBounds( + /* leftTopBounds = */ new Rect(), + /* rightBottomBounds = */ new Rect(), + /* leftTopTaskId = */ mRemoteAnimationLeftTop.taskId, + /* rightBottomTaskId = */ mRemoteAnimationRightBottom.taskId, + /* snapPosition = */ SNAP_TO_2_50_50)); + mRecentsAnimationTargets = new RecentsAnimationTargets( + new RemoteAnimationTarget[] {mRemoteAnimationLeftTop}, + new RemoteAnimationTarget[] {mRemoteAnimationRightBottom}, + new RemoteAnimationTarget[] {mRemoteAnimationTarget}, + /* homeContentInsets= */ new Rect(), + extras); + } + + @Before + public void setUpRunningTaskInfo() { + mRunningTaskInfo.baseIntent = new Intent(Intent.ACTION_MAIN) + .addCategory(Intent.CATEGORY_HOME) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mRunningTaskInfo.baseIntent.setComponent(new ComponentName("test.package", "test.class")); + } + + @Before + public void setUpGestureState() { + when(mGestureState.getRunningTask()).thenReturn(getTaskInfo()); + when(mGestureState.getLastAppearedTaskIds()).thenReturn(new int[0]); + when(mGestureState.getLastStartedTaskIds()).thenReturn(mNextPageTaskIds); + when(mGestureState.getRunningTaskIds(anyBoolean())).thenReturn(mCurrentPageTaskIds); + when(mGestureState.getHomeIntent()).thenReturn(new Intent(Intent.ACTION_MAIN) + .addCategory(Intent.CATEGORY_HOME) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); + doReturn(mActivityInterface).when(mGestureState).getContainerInterface(); + when(mGestureState.getDisplayId()).thenAnswer(invocation -> mDisplayId); + when(mGestureState.getPreviouslyAppearedTaskIds()).thenReturn(Set.of(0)); + when(mGestureState.getLastStartedTaskIdPredicate()).thenReturn( + appearedTarget -> appearedTarget.taskId == mRemoteAnimationTarget.taskId); + } + + @Before + public void setupTaskViews() { + when(mCurrentPageTaskView.getTaskIds()).thenReturn(mCurrentPageTaskIds); + when(mNextPageTaskView.getTaskIds()).thenReturn(mNextPageTaskIds); + } + + @Before + public void setUpRecentsView() { + RECENTS_VIEW recentsView = getRecentsView(); + when(recentsView.getViewTreeObserver()).thenReturn(mViewTreeObserver); + doAnswer(answer -> { + runOnMainSync(() -> answer.getArgument(0).run()); + return this; + }).when(recentsView).runOnPageScrollsInitialized(any()); + when(recentsView.getCurrentPage()).thenReturn(0); + when(recentsView.getNextPage()).thenReturn(1); + when(recentsView.getRunningTaskView()).thenReturn(mCurrentPageTaskView); + when(recentsView.getCurrentPageTaskView()).thenReturn(mCurrentPageTaskView); + when(recentsView.getNextPageTaskView()).thenReturn(mNextPageTaskView); + when(recentsView.getTaskViewAt(anyInt())).thenAnswer( + invocation -> switch ((int) invocation.getArgument(0)) { + case 0 -> mCurrentPageTaskView; + case 1 -> mNextPageTaskView; + default -> null; + }); + } + + @Before + public void setUpRecentsContainer() { + DisplayController displayController = DisplayController.INSTANCE.get(mContext); + FakePerDisplayRepository fakePerDisplayRepository = + new FakePerDisplayRepository<>(); + TaskAnimationManager taskAnimationManager = new TaskAnimationManager(mContext, mDisplayId, + displayController, fakePerDisplayRepository); + fakePerDisplayRepository.add(mDisplayId, taskAnimationManager); + mTaskAnimationManager = spy(taskAnimationManager); + RECENTS_CONTAINER recentsContainer = getRecentsContainer(); + RECENTS_VIEW recentsView = getRecentsView(); + + when(recentsContainer.getDeviceProfile()).thenReturn(new DeviceProfile()); + when(recentsContainer.getOverviewPanel()).thenReturn(recentsView); + when(recentsContainer.getDragLayer()).thenReturn(mDragLayer); + when(recentsContainer.getRootView()).thenReturn(mRootView); + when(recentsContainer.getSystemUiController()).thenReturn(mSystemUiController); + when(recentsContainer.createAtomicAnimationFactory()).thenReturn(mAtomicAnimationFactory); + when(mActivityInterface.createActivityInitListener(any())) + .thenReturn(mContextInitListener); + when(mActivityInterface.prepareRecentsUI(anyBoolean(), any())) + .thenReturn(mAnimationFactory); + doReturn(recentsContainer).when(mActivityInterface).getCreatedContainer(); + doAnswer(answer -> { + answer.getArgument(0).run(); + return this; + }).when(recentsContainer).runOnBindToTouchInteractionService(any()); + + mStateManager = spy(new StateManager<>(recentsContainer, getBaseState())); + + doReturn(mStateManager).when(recentsContainer).getStateManager(); + } + + @Test + public void testInitWhenReady_registersActivityInitListener() { + String reasonString = "because i said so"; + + createSwipeHandler().initWhenReady(reasonString); + verify(mContextInitListener).register(eq(reasonString)); + } + + @Test + public void testOnRecentsAnimationCanceled_unregistersActivityInitListener() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + + swipeHandler.onRecentsAnimationCanceled(new HashMap<>()); + + runOnMainSync(() -> { + verify(mContextInitListener) + .unregister(eq("AbsSwipeUpHandler.onRecentsAnimationCanceled")); + assertTrue(swipeHandler.mStateCallback.hasStates( + STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED)); + }); + } + + @Test + public void testOnConsumerAboutToBeSwitched_unregistersActivityInitListener() { + createSwipeHandler().onConsumerAboutToBeSwitched(); + + runOnMainSync(() -> verify(mContextInitListener) + .unregister("AbsSwipeUpHandler.invalidateHandler")); + } + + @Test + public void testOnConsumerAboutToBeSwitched_midQuickSwitch_unregistersActivityInitListener() { + createSwipeUpHandlerForGesture(GestureState.GestureEndTarget.NEW_TASK) + .onConsumerAboutToBeSwitched(); + + runOnMainSync(() -> verify(mContextInitListener) + .unregister(eq("AbsSwipeUpHandler.cancelCurrentAnimation"))); + } + + @Test + public void testStartNewTask_withNullTask_finishesRecentsAnimationController() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + + onRecentsAnimationStart(swipeHandler); + + runOnMainSync(() -> { + swipeHandler.startNewTask(null, unused -> {}); + verifyRecentsAnimationFinishedAndCallCallback(); + }); + } + + @Test + public void testOnTasksAppeared_withUnexpectedTaskAppeared_launchesCorrectTask() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + RemoteAnimationTarget unexpectedRemoteAnimationTarget = new RemoteAnimationTarget( + /* taskId= */ 2, // unexpected task id + /* mode= */ RemoteAnimationTarget.MODE_CLOSING, + /* leash= */ new SurfaceControl(), + /* isTranslucent= */ false, + /* clipRect= */ null, + /* contentInsets= */ null, + /* prefixOrderIndex= */ 0, + /* position= */ null, + /* localBounds= */ null, + /* screenSpaceBounds= */ null, + new Configuration().windowConfiguration, + /* isNotInRecents= */ false, + /* startLeash= */ null, + /* startBounds= */ null, + /* taskInfo= */ mRunningTaskInfo, + /* allowEnterPip= */ false); + + when(mGestureState.getEndTarget()).thenReturn(GestureState.GestureEndTarget.NEW_TASK); + + swipeHandler.onActivityInit(/* alreadyOnHome= */ false); + onRecentsAnimationStart(swipeHandler); + onTasksAppeared( + swipeHandler, new RemoteAnimationTarget[] { unexpectedRemoteAnimationTarget }); + + runOnMainSync(() -> { + verifyRecentsAnimationFinishedAndCallCallback(); + verify(mCurrentPageTaskView, never()).launchWithoutAnimation(anyBoolean(), any()); + verify(mNextPageTaskView).launchWithoutAnimation(anyBoolean(), any()); + }); + } + + @Test + public void testOnRecentsAnimationCanceled_midQuickSwitch_launchesCorrectTask() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + + when(mGestureState.getEndTarget()).thenReturn(GestureState.GestureEndTarget.NEW_TASK); + + swipeHandler.onActivityInit(/* alreadyOnHome= */ false); + onRecentsAnimationStart(swipeHandler); + swipeHandler.onRecentsAnimationCanceled(new HashMap<>()); + + runOnMainSync(() -> { + verify(mCurrentPageTaskView, never()).launchWithoutAnimation(anyBoolean(), any()); + verify(mNextPageTaskView).launchWithoutAnimation(anyBoolean(), any()); + }); + } + + @Test + public void testHomeGesture_finishesRecentsAnimationController() { + createSwipeUpHandlerForGesture(GestureState.GestureEndTarget.HOME); + + runOnMainSync(() -> { + verify(mRecentsAnimationController).detachNavigationBarFromApp(true); + verifyRecentsAnimationFinishedAndCallCallback(); + }); + } + + @Test + public void testRejectHomeGesture_finishesCorrectly() { + createSwipeUpHandlerForGesture(GestureState.GestureEndTarget.REJECT_HOME); + + runOnMainSync(() -> { + verify(mRecentsAnimationController, never()).detachNavigationBarFromApp(anyBoolean()); + verify(mRecentsAnimationController, never()).handOffAnimation(any(), any()); + verifyRecentsAnimationFinishedAndCallCallback(); + assertEquals("Scroll offset should be 0 after animation to REJECT_HOME is done", + 0, getRecentsView().getScrollOffset()); + }); + } + + @Test + @EnableFlags({com.android.window.flags.Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION}) + public void getHomeTarget_onSecondaryDisplay_withFlagEnabled() { + mDisplayId = DEFAULT_DISPLAY + 1; // Simulate a secondary display + SWIPE_HANDLER handler = createSwipeHandler(); + + GestureState.GestureEndTarget target = handler.getHomeTarget(); + assertEquals("Expected REJECT_HOME on secondary display when reject home is enabled", + GestureState.GestureEndTarget.REJECT_HOME, target); + } + + @Test + @EnableFlags({com.android.window.flags.Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION}) + public void getHomeTarget_onDefaultDisplay_withFlagEnabled() { + mDisplayId = DEFAULT_DISPLAY; + SWIPE_HANDLER handler = createSwipeHandler(); + + GestureState.GestureEndTarget target = handler.getHomeTarget(); + assertEquals("Expected HOME on default display", + GestureState.GestureEndTarget.HOME, target); + } + + @Test + @DisableFlags({com.android.window.flags.Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION}) + public void getHomeTarget_onSecondaryDisplay_withFlagDisabled() { + mDisplayId = DEFAULT_DISPLAY + 1; // Simulate a secondary display + SWIPE_HANDLER handler = createSwipeHandler(); + + GestureState.GestureEndTarget target = handler.getHomeTarget(); + assertEquals("Expected HOME on secondary display when reject home is disabled", + GestureState.GestureEndTarget.HOME, target); + } + + @Test + public void testHomeGesture_handsOffAnimation() { + createSwipeUpHandlerForGesture(GestureState.GestureEndTarget.HOME); + + runOnMainSync(() -> { + verify(mRecentsAnimationController).handOffAnimation(any(), any()); + verifyRecentsAnimationFinishedAndCallCallback(); + }); + } + + @Test + public void testHomeGesture_invalidatesHandlerAfterParallelAnim() { + ValueAnimator parallelAnim = new ValueAnimator(); + parallelAnim.setRepeatCount(ValueAnimator.INFINITE); + when(mActivityInterface.getParallelAnimationToGestureEndTarget(any(), anyLong(), any())) + .thenReturn(parallelAnim); + SWIPE_HANDLER handler = createSwipeUpHandlerForGesture(GestureState.GestureEndTarget.HOME); + runOnMainSync(() -> { + parallelAnim.start(); + verifyRecentsAnimationFinishedAndCallCallback(); + assertFalse(handler.mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)); + parallelAnim.end(); + assertTrue(handler.mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)); + }); + } + + @Test + public void testHomeGesture_invalidatesHandlerIfNoParallelAnim() { + when(mActivityInterface.getParallelAnimationToGestureEndTarget(any(), anyLong(), any())) + .thenReturn(null); + SWIPE_HANDLER handler = createSwipeUpHandlerForGesture(GestureState.GestureEndTarget.HOME); + runOnMainSync(() -> { + verifyRecentsAnimationFinishedAndCallCallback(); + assertTrue(handler.mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)); + }); + } + + @Test + public void invalidateHandlerWithLauncher_runsGestureAnimationEndCallback() { + SWIPE_HANDLER handler = createSwipeHandler(); + Runnable onGestureAnimationEndCallback = mock(Runnable.class); + handler.setGestureAnimationEndCallback(onGestureAnimationEndCallback); + + handler.mStateCallback.setState(STATE_HANDLER_INVALIDATED | STATE_LAUNCHER_PRESENT); + + verify(onGestureAnimationEndCallback).run(); + } + + @Test + @EnableFlags(com.android.launcher3.Flags.FLAG_MSDL_FEEDBACK) + public void onMotionPauseDetected_playsSwipeThresholdToken() { + SWIPE_HANDLER handler = createSwipeHandler(); + MotionPauseDetector.OnMotionPauseListener listener = handler.getMotionPauseListener(); + listener.onMotionPauseDetected(); + + verify(mMSDLPlayerWrapper, times(1)).playToken(eq(MSDLToken.SWIPE_THRESHOLD_INDICATOR)); + verifyNoMoreInteractions(mMSDLPlayerWrapper); + } + + @Test + public void testOnContainerDestroy_cleansUpSwipeHandler() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + + swipeHandler.onActivityInit(true); + + RECENTS_CONTAINER container = getRecentsContainer(); + ArgumentCaptor onContainerDestroyCallbackCaptor = + ArgumentCaptor.forClass(Runnable.class); + + verify(container) + .addEventCallback(eq(EVENT_DESTROYED), onContainerDestroyCallbackCaptor.capture()); + + assertNotNull(swipeHandler.mRecentsView); + assertNotNull(swipeHandler.mContainer); + + onContainerDestroyCallbackCaptor.getValue().run(); + + assertNull(swipeHandler.mRecentsView); + assertNull(swipeHandler.mContainer); + verify(mTaskAnimationManager).onLauncherDestroyed(); + runOnMainSync(() -> { + verify(mContextInitListener).unregister(any()); + assertTrue( + "Swipe handler wasn't invalidated on container destroyed", + swipeHandler.mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)); + }); + } + + @Test + public void test_noActivityInit_doesNotThrowException() { + // Do not trigger onActivityInit to ensure AbsSwipeUpHandler.mRecentsView and + // AbsSwipeUpHandler.mContainer are null + createSwipeUpHandlerForGesture( + GestureState.GestureEndTarget.HOME, /* triggerOnActivityInit= */ false); + } + + @Test + public void testWindowAnimationToHome_setsAndResetsTaskViewClickableState_whenSuccessful() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + ArgumentCaptor callbackCaptor = ArgumentCaptor.forClass(Runnable.class); + + // Call onActivityInit to set RecentsView + swipeHandler.onActivityInit(/* isHomeStarted= */ false); + + AnimationSuccessListener listener = swipeHandler.getWindowAnimationToHomeListener(); + + runOnMainSync(() -> { + listener.onAnimationStart(new AnimatorSet()); + + verify(mCurrentPageTaskView, times(1)).setClickable(eq(false)); + verify(mCurrentPageTaskView, never()).setClickable(eq(true)); + + listener.onAnimationEnd(new AnimatorSet()); + + verify(getRecentsView()).post(callbackCaptor.capture()); + + callbackCaptor.getValue().run(); + + verify(mCurrentPageTaskView, times(1)).setClickable(eq(false)); + verify(mCurrentPageTaskView, times(1)).setClickable(eq(true)); + }); + } + + @Test + public void testWindowAnimationToHome_afterContainerDestroyed_doesNotThrowException() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + ArgumentCaptor callbackCaptor = ArgumentCaptor.forClass(Runnable.class); + + // Call onActivityInit to set RecentsView + swipeHandler.onActivityInit(/* isHomeStarted= */ false); + + AnimationSuccessListener listener = swipeHandler.getWindowAnimationToHomeListener(); + + runOnMainSync(() -> { + listener.onAnimationStart(new AnimatorSet()); + listener.onAnimationEnd(new AnimatorSet()); + + verify(getRecentsView()).post(callbackCaptor.capture()); + + // onContainerDestroyed to set RecentsView to null + onContainerDestroyed(); + + callbackCaptor.getValue().run(); + }); + } + + @Test + public void testWindowAnimationToHome_setsAndResetsTaskViewClickableState_whenCanceled() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + ArgumentCaptor callbackCaptor = ArgumentCaptor.forClass(Runnable.class); + + // Call onActivityInit to set RecentsView + swipeHandler.onActivityInit(/* isHomeStarted= */ false); + + AnimationSuccessListener listener = swipeHandler.getWindowAnimationToHomeListener(); + + runOnMainSync(() -> { + listener.onAnimationStart(new AnimatorSet()); + + verify(mCurrentPageTaskView, times(1)).setClickable(eq(false)); + verify(mCurrentPageTaskView, never()).setClickable(eq(true)); + + listener.onAnimationCancel(new AnimatorSet()); + listener.onAnimationEnd(new AnimatorSet()); + + verify(getRecentsView()).post(callbackCaptor.capture()); + + callbackCaptor.getValue().run(); + + verify(mCurrentPageTaskView, times(1)).setClickable(eq(false)); + verify(mCurrentPageTaskView, times(1)).setClickable(eq(true)); + }); + } + + @Test + public void testWindowAnimationToHome_neverSetsTaskViewClickableState_ifNeverStarted() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + ArgumentCaptor callbackCaptor = ArgumentCaptor.forClass(Runnable.class); + + // Call onActivityInit to set RecentsView + swipeHandler.onActivityInit(/* isHomeStarted= */ false); + + AnimationSuccessListener listener = swipeHandler.getWindowAnimationToHomeListener(); + + runOnMainSync(() -> { + listener.onAnimationEnd(new AnimatorSet()); + + verify(getRecentsView()).post(callbackCaptor.capture()); + + callbackCaptor.getValue().run(); + + verify(mCurrentPageTaskView, never()).setClickable(eq(false)); + verify(mCurrentPageTaskView, never()).setClickable(eq(true)); + }); + } + + @Test + public void test3ButtonMode_shouldUpdateBackgroundAlphaForRunningTask_UpdatesBackgroundAlpha() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + when(mDeviceState.isFullyGesturalNavMode()).thenReturn(false); + when(mGestureState.isTrackpadGesture()).thenReturn(false); + when(getRecentsView().getPagedViewOrientedState()).thenReturn( + new RecentsOrientedState(mContext, swipeHandler.mContainerInterface, (r) -> { + })); + when(getRecentsView().shouldUpdateRunningTaskAlpha()).thenReturn(true); + swipeHandler.onActivityInit(/*isHomeStarted= */ true); + swipeHandler.onGestureStarted(/*isLikelyToStartNewTask =*/ true); + + onRecentsAnimationStart(swipeHandler); + + verify(mAnimationFactory).setRecentsAttachedToAppWindow( + /* attached= */ true, + /* isTrackpadGesture= */ false, + /* updateBackgroundAlpha= */ true); + verify(getRecentsView(), never()).moveRunningTaskToExpectedPosition(); + } + + @Test + public void test3ButtonMode_runningTask_doesNotUpdateBackgroundAlpha() { + SWIPE_HANDLER swipeHandler = createSwipeHandler(); + when(mDeviceState.isFullyGesturalNavMode()).thenReturn(false); + when(mGestureState.isTrackpadGesture()).thenReturn(false); + when(getRecentsView().getPagedViewOrientedState()).thenReturn( + new RecentsOrientedState(mContext, swipeHandler.mContainerInterface, (r) -> { + })); + when(getRecentsView().shouldUpdateRunningTaskAlpha()).thenReturn(false); + swipeHandler.onActivityInit(/*isHomeStarted= */ true); + swipeHandler.onGestureStarted(/*isLikelyToStartNewTask =*/ true); + + onRecentsAnimationStart(swipeHandler); + + verify(mAnimationFactory, never()).setRecentsAttachedToAppWindow( + /* attached= */ true, + /* isTrackpadGesture= */ false, + /* updateBackgroundAlpha= */ true); + verify(getRecentsView(), never()).moveRunningTaskToExpectedPosition(); + } + + /** + * Verifies that RecentsAnimationController#finish() is called, and captures and runs any + * callback that was passed to it. This ensures that STATE_CURRENT_TASK_FINISHED is correctly + * set for example. + */ + private void verifyRecentsAnimationFinishedAndCallCallback() { + ArgumentCaptor finishCallback = ArgumentCaptor.forClass(Runnable.class); + // Check if the 2 parameter method is called. + verify(mRecentsAnimationController, atLeast(0)).finish( + anyBoolean(), finishCallback.capture(), any(ActiveGestureLog.CompoundString.class)); + if (finishCallback.getAllValues().isEmpty()) { + // Check if the 3 parameter method is called. + verify(mRecentsAnimationController).finish( + anyBoolean(), + finishCallback.capture(), + anyBoolean(), + any(ActiveGestureLog.CompoundString.class)); + } + if (finishCallback.getValue() != null) { + finishCallback.getValue().run(); + } + } + + private SWIPE_HANDLER createSwipeUpHandlerForGesture(GestureState.GestureEndTarget endTarget) { + return createSwipeUpHandlerForGesture(endTarget, true); + } + + private SWIPE_HANDLER createSwipeUpHandlerForGesture( + GestureState.GestureEndTarget endTarget, boolean triggerOnActivityInit) { + boolean isQuickSwitch = endTarget == GestureState.GestureEndTarget.NEW_TASK; + + doReturn(mState).when(mActivityInterface).stateFromGestureEndTarget(any()); + when(mGestureState.getEndTarget()).thenReturn(endTarget); + when(mGestureState.isRecentsAnimationRunning()).thenReturn(isQuickSwitch); + + SWIPE_HANDLER swipeHandler = createSwipeHandler(SystemClock.uptimeMillis(), isQuickSwitch); + + if (triggerOnActivityInit) { + swipeHandler.onActivityInit(/* alreadyOnHome= */ false); + } + swipeHandler.onGestureStarted(isQuickSwitch); + onRecentsAnimationStart(swipeHandler); + + runOnMainSync(swipeHandler::switchToScreenshot); + + float xVelocityPxPerMs = isQuickSwitch ? 100 : 0; + float yVelocityPxPerMs = isQuickSwitch ? 0 : -100; + swipeHandler.onGestureEnded( + yVelocityPxPerMs, new PointF(xVelocityPxPerMs, yVelocityPxPerMs), isQuickSwitch); + swipeHandler.onCalculateEndTarget(); + runOnMainSync(swipeHandler::onSettledOnEndTarget); + + return swipeHandler; + } + + private void onRecentsAnimationStart(@NonNull SWIPE_HANDLER absSwipeUpHandler) { + runOnMainSync(() -> absSwipeUpHandler.onRecentsAnimationStart( + mRecentsAnimationController, mRecentsAnimationTargets, /* transitionInfo= */ null)); + } + + private void onTasksAppeared( + @NonNull SWIPE_HANDLER absSwipeUpHandler, + @NonNull RemoteAnimationTarget[] remoteAnimationTargets) { + runOnMainSync(() -> absSwipeUpHandler.onTasksAppeared( + remoteAnimationTargets, /* transitionInfo= */ null)); + } + + private void onContainerDestroyed() { + RECENTS_CONTAINER container = getRecentsContainer(); + ArgumentCaptor onContainerDestroyCallbackCaptor = + ArgumentCaptor.forClass(Runnable.class); + + verify(container) + .addEventCallback(eq(EVENT_DESTROYED), onContainerDestroyCallbackCaptor.capture()); + + onContainerDestroyCallbackCaptor.getValue().run(); + } + + protected static void runOnMainSync(Runnable runnable) { + InstrumentationRegistry.getInstrumentation().runOnMainSync(runnable); + try { + Executors.MAIN_EXECUTOR.submit(() -> null).get(); + } catch (InterruptedException | ExecutionException e) { + throw new RuntimeException(e); + } + } + + @NonNull + private SWIPE_HANDLER createSwipeHandler() { + return createSwipeHandler(SystemClock.uptimeMillis(), false); + } + + @NonNull + protected abstract SWIPE_HANDLER createSwipeHandler( + long touchTimeMs, boolean continuingLastGesture); + + @NonNull + protected abstract RECENTS_CONTAINER getRecentsContainer(); + + @NonNull + protected abstract RECENTS_VIEW getRecentsView(); + + @NonNull + protected abstract STATE_TYPE getBaseState(); + + protected TopTaskTracker.CachedTaskInfo getTaskInfo() { + return new TopTaskTracker.CachedTaskInfo( + Collections.singletonList(mRunningTaskInfo), + mContext, + mDisplayId, + INACTIVE_DESK_ID); + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/AllAppsActionManagerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/AllAppsActionManagerTest.kt index 73b35e8a5c3..9934a3dbcdd 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/AllAppsActionManagerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/AllAppsActionManagerTest.kt @@ -18,44 +18,97 @@ package com.android.quickstep import android.app.PendingIntent import android.content.IIntentSender +import android.hardware.input.InputManager +import android.provider.Settings +import android.provider.Settings.Secure.USER_SETUP_COMPLETE import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.AllModulesForTest import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.SettingsCache +import com.android.launcher3.util.SettingsCacheSandbox import com.android.launcher3.util.TestUtil +import com.android.quickstep.input.QuickstepKeyGestureEventsManager import com.google.common.truth.Truth.assertThat +import dagger.BindsInstance +import dagger.Component import java.util.concurrent.Semaphore import java.util.concurrent.TimeUnit.SECONDS +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.Mockito.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.doNothing +import org.mockito.kotlin.whenever private const val TIMEOUT = 5L +private val USER_SETUP_COMPLETE_URI = Settings.Secure.getUriFor(USER_SETUP_COMPLETE) @RunWith(AndroidJUnit4::class) class AllAppsActionManagerTest { private val callbackSemaphore = Semaphore(0) private val bgExecutor = UI_HELPER_EXECUTOR - private val allAppsActionManager = - AllAppsActionManager( - InstrumentationRegistry.getInstrumentation().targetContext, - bgExecutor, - ) { - callbackSemaphore.release() - PendingIntent(IIntentSender.Default()) + @get:Rule val context = SandboxApplication() + private val inputManager = context.spyService(InputManager::class.java) + + private val settingsCacheSandbox = + SettingsCacheSandbox().also { it[USER_SETUP_COMPLETE_URI] = 1 } + private val quickstepKeyGestureEventsManager by + lazy(LazyThreadSafetyMode.NONE) { + spy( + QuickstepKeyGestureEventsManager( + context, + settingsCacheSandbox.cache, + ) + ) + } + + private val allAppsActionManager by + lazy(LazyThreadSafetyMode.NONE) { + AllAppsActionManager(context, bgExecutor, quickstepKeyGestureEventsManager) { + callbackSemaphore.release() + PendingIntent(IIntentSender.Default()) + } } + @Before + fun initDaggerGraph() { + context.initDaggerComponent( + DaggerAllAppsActionManagerTestComponent.builder() + .bindSettingsCache(settingsCacheSandbox.cache) + ) + + doNothing().whenever(inputManager).registerKeyGestureEventHandler(any(), any()) + doNothing().whenever(inputManager).unregisterKeyGestureEventHandler(any()) + } + + @Before fun unlockUser() = allAppsActionManager.onUserUnlocked() + + @After fun destroyManager() = allAppsActionManager.onDestroy() + @Test fun taskbarPresent_actionRegistered() { allAppsActionManager.isTaskbarPresent = true + TestUtil.runOnExecutorSync(bgExecutor) {} // Force system action to register. assertThat(callbackSemaphore.tryAcquire(TIMEOUT, SECONDS)).isTrue() assertThat(allAppsActionManager.isActionRegistered).isTrue() + verify(quickstepKeyGestureEventsManager).registerAllAppsKeyGestureEvent(any()) } @Test fun homeAndOverviewSame_actionRegistered() { allAppsActionManager.isHomeAndOverviewSame = true + TestUtil.runOnExecutorSync(bgExecutor) {} // Force system action to register. assertThat(callbackSemaphore.tryAcquire(TIMEOUT, SECONDS)).isTrue() assertThat(allAppsActionManager.isActionRegistered).isTrue() + verify(quickstepKeyGestureEventsManager).registerAllAppsKeyGestureEvent(any()) } @Test @@ -66,6 +119,7 @@ class AllAppsActionManagerTest { allAppsActionManager.isTaskbarPresent = false TestUtil.runOnExecutorSync(bgExecutor) {} // Force system action to unregister. assertThat(allAppsActionManager.isActionRegistered).isFalse() + verify(quickstepKeyGestureEventsManager).unregisterAllAppsKeyGestureEvent() } @Test @@ -76,6 +130,7 @@ class AllAppsActionManagerTest { TestUtil.runOnExecutorSync(bgExecutor) {} // Force system action to unregister. assertThat(callbackSemaphore.tryAcquire(TIMEOUT, SECONDS)).isTrue() assertThat(allAppsActionManager.isActionRegistered).isFalse() + verify(quickstepKeyGestureEventsManager).unregisterAllAppsKeyGestureEvent() } @Test @@ -88,4 +143,61 @@ class AllAppsActionManagerTest { assertThat(callbackSemaphore.tryAcquire(TIMEOUT, SECONDS)).isTrue() assertThat(allAppsActionManager.isActionRegistered).isTrue() } + + @Test + fun taskbarPresent_userSetupIncomplete_actionUnregistered() { + settingsCacheSandbox[USER_SETUP_COMPLETE_URI] = 0 + allAppsActionManager.isTaskbarPresent = true + assertThat(allAppsActionManager.isActionRegistered).isFalse() + } + + @Test + fun taskbarPresent_setupUiVisible_actionUnregistered() { + allAppsActionManager.isSetupUiVisible = true + allAppsActionManager.isTaskbarPresent = true + assertThat(allAppsActionManager.isActionRegistered).isFalse() + } + + @Test + fun taskbarPresent_userSetupCompleted_actionRegistered() { + settingsCacheSandbox[USER_SETUP_COMPLETE_URI] = 0 + allAppsActionManager.isTaskbarPresent = true + + settingsCacheSandbox[USER_SETUP_COMPLETE_URI] = 1 + TestUtil.runOnExecutorSync(bgExecutor) {} // Force system action to register. + assertThat(callbackSemaphore.tryAcquire(TIMEOUT, SECONDS)).isTrue() + assertThat(allAppsActionManager.isActionRegistered).isTrue() + verify(quickstepKeyGestureEventsManager).registerAllAppsKeyGestureEvent(any()) + } + + @Test + fun taskbarPresent_setupUiDismissed_actionRegistered() { + allAppsActionManager.isSetupUiVisible = true + allAppsActionManager.isTaskbarPresent = true + + allAppsActionManager.isSetupUiVisible = false + TestUtil.runOnExecutorSync(bgExecutor) {} // Force system action to register. + assertThat(callbackSemaphore.tryAcquire(TIMEOUT, SECONDS)).isTrue() + assertThat(allAppsActionManager.isActionRegistered).isTrue() + verify(quickstepKeyGestureEventsManager).registerAllAppsKeyGestureEvent(any()) + } + + @Test + fun onDestroy_shouldUnregisterAllAppsKeyGestureHandler() { + allAppsActionManager.onDestroy() + + verify(quickstepKeyGestureEventsManager).unregisterAllAppsKeyGestureEvent() + } +} + +@LauncherAppSingleton +@Component(modules = [AllModulesForTest::class]) +interface AllAppsActionManagerTestComponent : LauncherAppComponent { + + @Component.Builder + interface Builder : LauncherAppComponent.Builder { + @BindsInstance fun bindSettingsCache(settingsCache: SettingsCache): Builder + + override fun build(): AllAppsActionManagerTestComponent + } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/DesktopFullscreenDrawParamsTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/DesktopFullscreenDrawParamsTest.kt new file mode 100644 index 00000000000..e62455fd023 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/DesktopFullscreenDrawParamsTest.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep + +import android.content.Context +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock + +/** Test for [DesktopFullscreenDrawParams] class. */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class DesktopFullscreenDrawParamsTest() { + private val params = + DesktopFullscreenDrawParams(mock(), cornerRadiusProvider = { CORNER_RADIUS }) + + @Test + fun setMiddleProgress_invariantCornerRadiusForDesktop() { + params.setProgress(fullscreenProgress = 0f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(CORNER_RADIUS) + + params.setProgress(fullscreenProgress = 0.67f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(CORNER_RADIUS) + + params.setProgress(fullscreenProgress = 1f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(CORNER_RADIUS) + } + + companion object { + const val CORNER_RADIUS = 32f + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/DisplayModelTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/DisplayModelTest.kt new file mode 100644 index 00000000000..3aab5284372 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/DisplayModelTest.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.quickstep + +import android.content.Context +import android.view.Display +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.app.displaylib.DisplaysWithDecorationsRepositoryCompat +import java.io.PrintWriter +import kotlinx.coroutines.test.StandardTestDispatcher +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock + +@SmallTest +@RunWith(AndroidJUnit4::class) +class DisplayModelTest { + private val context: Context = ApplicationProvider.getApplicationContext() + private val systemDecorationChangeObserver = + SystemDecorationChangeObserver.INSTANCE.get(context) + private val displayRepositoryCompat = mock() + private val dispatcher = StandardTestDispatcher() + + class TestableResource : DisplayModel.DisplayResource() { + var isCleanupCalled = false + + override fun cleanup() { + isCleanupCalled = true + } + + override fun dump(prefix: String, writer: PrintWriter) { + // No-Op + } + } + + private val testableDisplayModel = + object : + DisplayModel( + context, + systemDecorationChangeObserver, + displayRepositoryCompat, + dispatcher, + ) { + override fun createDisplayResource(display: Display): TestableResource { + return TestableResource() + } + } + + @Test + fun testCreate() { + testableDisplayModel.storeDisplayResource(Display.DEFAULT_DISPLAY) + val resource = testableDisplayModel.getDisplayResource(Display.DEFAULT_DISPLAY) + assertNotNull(resource) + } + + @Test + fun testCleanAndDelete() { + testableDisplayModel.storeDisplayResource(Display.DEFAULT_DISPLAY) + val resource = testableDisplayModel.getDisplayResource(Display.DEFAULT_DISPLAY)!! + assertNotNull(resource) + testableDisplayModel.deleteDisplayResource(Display.DEFAULT_DISPLAY) + assert(resource.isCleanupCalled) + assertNull(testableDisplayModel.getDisplayResource(Display.DEFAULT_DISPLAY)) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/FallbackSwipeHandlerTestCase.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/FallbackSwipeHandlerTestCase.java new file mode 100644 index 00000000000..109a52e2df7 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/FallbackSwipeHandlerTestCase.java @@ -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.quickstep; + +import androidx.annotation.NonNull; +import androidx.test.filters.SmallTest; + +import com.android.launcher3.util.LauncherMultivalentJUnit; +import com.android.quickstep.fallback.FallbackRecentsView; +import com.android.quickstep.fallback.RecentsState; + +import org.junit.runner.RunWith; +import org.mockito.Mock; + +@SmallTest +@RunWith(LauncherMultivalentJUnit.class) +public class FallbackSwipeHandlerTestCase extends AbsSwipeUpHandlerTestCase< + RecentsState, + RecentsActivity, + FallbackRecentsView, + FallbackSwipeHandler, + FallbackActivityInterface> { + + @Mock private RecentsActivity mRecentsActivity; + @Mock private FallbackRecentsView mRecentsView; + + + @Override + protected FallbackSwipeHandler createSwipeHandler( + long touchTimeMs, boolean continuingLastGesture) { + return new FallbackSwipeHandler( + mContext, + mTaskAnimationManager, + mDeviceState, + mRotationTouchHelper, + mGestureState, + touchTimeMs, + continuingLastGesture, + mInputConsumerController, + mMSDLPlayerWrapper); + } + + @NonNull + @Override + protected RecentsActivity getRecentsContainer() { + return mRecentsActivity; + } + + @NonNull + @Override + protected FallbackRecentsView getRecentsView() { + return mRecentsView; + } + + @NonNull + @Override + protected RecentsState getBaseState() { + return RecentsState.BG_LAUNCHER; + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/FullscreenDrawParamsTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/FullscreenDrawParamsTest.kt index 5d62a4c749b..99b81e05eb0 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/FullscreenDrawParamsTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/FullscreenDrawParamsTest.kt @@ -20,21 +20,17 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.launcher3.FakeInvariantDeviceProfileTest import com.android.quickstep.util.TaskCornerRadius -import com.android.quickstep.views.TaskView.FullscreenDrawParams import com.android.systemui.shared.system.QuickStepContract import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.Mockito.doReturn -import org.mockito.Mockito.mock -import org.mockito.Mockito.spy +import org.mockito.kotlin.mock -/** Test for FullscreenDrawParams class. */ +/** Test for [FullscreenDrawParams] class. */ @SmallTest @RunWith(AndroidJUnit4::class) class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() { - private lateinit var params: FullscreenDrawParams @Before @@ -46,115 +42,108 @@ class FullscreenDrawParamsTest : FakeInvariantDeviceProfileTest() { fun setStartProgress_correctCornerRadiusForTablet() { initializeVarsForTablet() - params.setProgress( - /* fullscreenProgress= */ 0f, - /* parentScale= */ 1.0f, - /* taskViewScale= */ 1.0f - ) + params.setProgress(fullscreenProgress = 0f, parentScale = 1.0f, taskViewScale = 1.0f) val expectedRadius = TaskCornerRadius.get(context) - assertThat(params.currentDrawnCornerRadius).isEqualTo(expectedRadius) + assertThat(params.currentCornerRadius).isEqualTo(expectedRadius) } @Test fun setFullProgress_correctCornerRadiusForTablet() { initializeVarsForTablet() - params.setProgress( - /* fullscreenProgress= */ 1.0f, - /* parentScale= */ 1.0f, - /* taskViewScale= */ 1.0f - ) + params.setProgress(fullscreenProgress = 1.0f, parentScale = 1f, taskViewScale = 1f) val expectedRadius = QuickStepContract.getWindowCornerRadius(context) - assertThat(params.currentDrawnCornerRadius).isEqualTo(expectedRadius) + assertThat(params.currentCornerRadius).isEqualTo(expectedRadius) } @Test fun setStartProgress_correctCornerRadiusForPhone() { initializeVarsForPhone() - params.setProgress( - /* fullscreenProgress= */ 0f, - /* parentScale= */ 1.0f, - /* taskViewScale= */ 1.0f - ) + params.setProgress(fullscreenProgress = 0f, parentScale = 1f, taskViewScale = 1f) val expectedRadius = TaskCornerRadius.get(context) - assertThat(params.currentDrawnCornerRadius).isEqualTo(expectedRadius) + assertThat(params.currentCornerRadius).isEqualTo(expectedRadius) } @Test fun setFullProgress_correctCornerRadiusForPhone() { initializeVarsForPhone() - params.setProgress( - /* fullscreenProgress= */ 1.0f, - /* parentScale= */ 1.0f, - /* taskViewScale= */ 1.0f - ) + params.setProgress(fullscreenProgress = 1.0f, parentScale = 1f, taskViewScale = 1f) val expectedRadius = QuickStepContract.getWindowCornerRadius(context) - assertThat(params.currentDrawnCornerRadius).isEqualTo(expectedRadius) + assertThat(params.currentCornerRadius).isEqualTo(expectedRadius) } @Test fun setStartProgress_correctCornerRadiusForMultiDisplay() { - val display1Context = context - val display2Context = mock(Context::class.java) - val spyParams = spy(params) - - val display1TaskRadius = TaskCornerRadius.get(display1Context) - val display1WindowRadius = QuickStepContract.getWindowCornerRadius(display1Context) - val display2TaskRadius = display1TaskRadius * 2 + 1 // Arbitrarily different. - val display2WindowRadius = display1WindowRadius * 2 + 1 // Arbitrarily different. - doReturn(display2TaskRadius).`when`(spyParams).computeTaskCornerRadius(display2Context) - doReturn(display2WindowRadius).`when`(spyParams).computeWindowCornerRadius(display2Context) - - spyParams.updateCornerRadius(display1Context) - spyParams.setProgress( - /* fullscreenProgress= */ 0f, - /* parentScale= */ 1.0f, - /* taskViewScale= */ 1.0f - ) - assertThat(spyParams.currentDrawnCornerRadius).isEqualTo(display1TaskRadius) - - spyParams.updateCornerRadius(display2Context) - spyParams.setProgress( - /* fullscreenProgress= */ 0f, - /* parentScale= */ 1.0f, - /* taskViewScale= */ 1.0f - ) - assertThat(spyParams.currentDrawnCornerRadius).isEqualTo(display2TaskRadius) + val display1Context = mock() + val display2Context = mock() + val display1TaskRadius = TASK_CORNER_RADIUS + 1 + val display2TaskRadius = TASK_CORNER_RADIUS + 2 + + val params = + FullscreenDrawParams( + context, + taskCornerRadiusProvider = { context -> + when (context) { + display1Context -> display1TaskRadius + display2Context -> display2TaskRadius + else -> TASK_CORNER_RADIUS + } + }, + windowCornerRadiusProvider = { 0f }, + ) + + params.setProgress(fullscreenProgress = 0f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(TASK_CORNER_RADIUS) + + params.updateCornerRadius(display1Context) + params.setProgress(fullscreenProgress = 0f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(display1TaskRadius) + + params.updateCornerRadius(display2Context) + params.setProgress(fullscreenProgress = 0f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(display2TaskRadius) } @Test fun setFullProgress_correctCornerRadiusForMultiDisplay() { - val display1Context = context - val display2Context = mock(Context::class.java) - val spyParams = spy(params) - - val display1TaskRadius = TaskCornerRadius.get(display1Context) - val display1WindowRadius = QuickStepContract.getWindowCornerRadius(display1Context) - val display2TaskRadius = display1TaskRadius * 2 + 1 // Arbitrarily different. - val display2WindowRadius = display1WindowRadius * 2 + 1 // Arbitrarily different. - doReturn(display2TaskRadius).`when`(spyParams).computeTaskCornerRadius(display2Context) - doReturn(display2WindowRadius).`when`(spyParams).computeWindowCornerRadius(display2Context) - - spyParams.updateCornerRadius(display1Context) - spyParams.setProgress( - /* fullscreenProgress= */ 1.0f, - /* parentScale= */ 1.0f, - /* taskViewScale= */ 1.0f - ) - assertThat(spyParams.currentDrawnCornerRadius).isEqualTo(display1WindowRadius) - - spyParams.updateCornerRadius(display2Context) - spyParams.setProgress( - /* fullscreenProgress= */ 1.0f, - /* parentScale= */ 1.0f, - /* taskViewScale= */ 1.0f, - ) - assertThat(spyParams.currentDrawnCornerRadius).isEqualTo(display2WindowRadius) + val display1Context = mock() + val display2Context = mock() + val display1WindowRadius = WINDOW_CORNER_RADIUS + 1 + val display2WindowRadius = WINDOW_CORNER_RADIUS + 2 + + val params = + FullscreenDrawParams( + context, + taskCornerRadiusProvider = { 0f }, + windowCornerRadiusProvider = { context -> + when (context) { + display1Context -> display1WindowRadius + display2Context -> display2WindowRadius + else -> WINDOW_CORNER_RADIUS + } + }, + ) + + params.setProgress(fullscreenProgress = 1f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(WINDOW_CORNER_RADIUS) + + params.updateCornerRadius(display1Context) + params.setProgress(fullscreenProgress = 1f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(display1WindowRadius) + + params.updateCornerRadius(display2Context) + params.setProgress(fullscreenProgress = 1f, parentScale = 1f, taskViewScale = 1f) + assertThat(params.currentCornerRadius).isEqualTo(display2WindowRadius) + } + + companion object { + const val TASK_CORNER_RADIUS = 56f + const val WINDOW_CORNER_RADIUS = 32f } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/HotseatWidthCalculationTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/HotseatWidthCalculationTest.kt index a38851098e6..6ed4dfc7c36 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/HotseatWidthCalculationTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/HotseatWidthCalculationTest.kt @@ -39,7 +39,7 @@ class HotseatWidthCalculationTest : FakeInvariantDeviceProfileTest() { val dp = newDP() dp.isTaskbarPresentInApps = true - assertThat(dp.hotseatBarEndOffset).isEqualTo(510) + assertThat(dp.hotseatProfile.barEndOffset).isEqualTo(510) assertThat(dp.numShownHotseatIcons).isEqualTo(6) assertThat(dp.hotseatBorderSpace).isEqualTo(70) assertThat(dp.hotseatColumnSpan).isEqualTo(6) @@ -63,7 +63,7 @@ class HotseatWidthCalculationTest : FakeInvariantDeviceProfileTest() { val dp = newDP() dp.isTaskbarPresentInApps = true - assertThat(dp.hotseatBarEndOffset).isEqualTo(510) + assertThat(dp.hotseatProfile.barEndOffset).isEqualTo(510) assertThat(dp.numShownHotseatIcons).isEqualTo(4) assertThat(dp.hotseatBorderSpace).isEqualTo(40) assertThat(dp.hotseatColumnSpan).isEqualTo(6) @@ -86,7 +86,7 @@ class HotseatWidthCalculationTest : FakeInvariantDeviceProfileTest() { val dp = newDP() dp.isTaskbarPresentInApps = true - assertThat(dp.hotseatBarEndOffset).isEqualTo(705) + assertThat(dp.hotseatProfile.barEndOffset).isEqualTo(705) assertThat(dp.numShownHotseatIcons).isEqualTo(6) assertThat(dp.hotseatBorderSpace).isEqualTo(54) assertThat(dp.hotseatColumnSpan).isEqualTo(6) @@ -110,7 +110,7 @@ class HotseatWidthCalculationTest : FakeInvariantDeviceProfileTest() { val dp = newDP() dp.isTaskbarPresentInApps = true - assertThat(dp.hotseatBarEndOffset).isEqualTo(660) + assertThat(dp.hotseatProfile.barEndOffset).isEqualTo(660) assertThat(dp.numShownHotseatIcons).isEqualTo(6) assertThat(dp.hotseatBorderSpace).isEqualTo(100) assertThat(dp.hotseatColumnSpan).isEqualTo(6) @@ -131,11 +131,11 @@ class HotseatWidthCalculationTest : FakeInvariantDeviceProfileTest() { val dp = newDP() dp.isTaskbarPresentInApps = true - assertThat(dp.hotseatBarEndOffset).isEqualTo(660) + assertThat(dp.hotseatProfile.barEndOffset).isEqualTo(660) assertThat(dp.numShownHotseatIcons).isEqualTo(6) assertThat(dp.hotseatBorderSpace).isEqualTo(34) assertThat(dp.hotseatColumnSpan).isEqualTo(4) - assertThat(dp.hotseatWidthPx).isEqualTo(1179) + assertThat(dp.hotseatWidthPx).isEqualTo(1182) assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(876) assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(694) @@ -155,7 +155,7 @@ class HotseatWidthCalculationTest : FakeInvariantDeviceProfileTest() { val dp = newDP() dp.isTaskbarPresentInApps = true - assertThat(dp.hotseatBarEndOffset).isEqualTo(660) + assertThat(dp.hotseatProfile.barEndOffset).isEqualTo(660) assertThat(dp.numShownHotseatIcons).isEqualTo(5) assertThat(dp.hotseatBorderSpace).isEqualTo(36) assertThat(dp.hotseatColumnSpan).isEqualTo(4) @@ -174,7 +174,7 @@ class HotseatWidthCalculationTest : FakeInvariantDeviceProfileTest() { val dp = newDP() dp.isTaskbarPresentInApps = true - assertThat(dp.hotseatBarEndOffset).isEqualTo(600) + assertThat(dp.hotseatProfile.barEndOffset).isEqualTo(600) assertThat(dp.numShownHotseatIcons).isEqualTo(6) assertThat(dp.hotseatBorderSpace).isEqualTo(48) assertThat(dp.hotseatColumnSpan).isEqualTo(8) diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherRestoreEventLoggerImplTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherRestoreEventLoggerImplTest.kt new file mode 100644 index 00000000000..d4d76c1e76e --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherRestoreEventLoggerImplTest.kt @@ -0,0 +1,130 @@ +package com.android.quickstep + +/* + * 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. + */ + +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.Flags +import com.android.launcher3.LauncherSettings.Favorites +import com.android.launcher3.util.SandboxApplication +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +@EnableFlags(Flags.FLAG_ENABLE_LAUNCHER_BR_METRICS_FIXED) +class LauncherRestoreEventLoggerImplTest { + + @get:Rule val setFlagsRule = SetFlagsRule() + @get:Rule val mSandboxContext = SandboxApplication() + + private lateinit var loggerUnderTest: LauncherRestoreEventLoggerImpl + + @Before + fun setup() { + loggerUnderTest = LauncherRestoreEventLoggerImpl(mSandboxContext) + } + + @Test + fun `logLauncherItemsRestoreFailed logs multiple items as failing restore`() { + // Given + val expectedDataType = "application" + val expectedError = "test_failure" + // When + loggerUnderTest.logLauncherItemsRestoreFailed( + dataType = expectedDataType, + count = 5, + error = expectedError, + ) + // Then + val actualResult = loggerUnderTest.restoreEventLogger.loggingResults.first() + assertThat(actualResult.dataType).isEqualTo(expectedDataType) + assertThat(actualResult.successCount).isEqualTo(0) + assertThat(actualResult.failCount).isEqualTo(5) + assertThat(actualResult.errors.keys).containsExactly(expectedError) + } + + @Test + fun `logLauncherItemsRestored logs multiple items as restored`() { + // Given + val expectedDataType = "application" + // When + loggerUnderTest.logLauncherItemsRestored(dataType = expectedDataType, count = 5) + // Then + val actualResult = loggerUnderTest.restoreEventLogger.loggingResults.first() + assertThat(actualResult.dataType).isEqualTo(expectedDataType) + assertThat(actualResult.successCount).isEqualTo(5) + assertThat(actualResult.failCount).isEqualTo(0) + assertThat(actualResult.errors.keys).isEmpty() + } + + @Test + fun `logSingleFavoritesItemRestored logs a single Favorites Item as restored`() { + // Given + val expectedDataType = "widget" + // When + loggerUnderTest.logSingleFavoritesItemRestored(favoritesId = Favorites.ITEM_TYPE_APPWIDGET) + // Then + val actualResult = loggerUnderTest.restoreEventLogger.loggingResults.first() + assertThat(actualResult.dataType).isEqualTo(expectedDataType) + assertThat(actualResult.successCount).isEqualTo(1) + assertThat(actualResult.failCount).isEqualTo(0) + assertThat(actualResult.errors.keys).isEmpty() + } + + @Test + fun `logSingleFavoritesItemRestoreFailed logs a single Favorites Item as failing restore`() { + // Given + val expectedDataType = "widget" + val expectedError = "test_failure" + // When + loggerUnderTest.logSingleFavoritesItemRestoreFailed( + favoritesId = Favorites.ITEM_TYPE_APPWIDGET, + error = expectedError, + ) + // Then + val actualResult = loggerUnderTest.restoreEventLogger.loggingResults.first() + assertThat(actualResult.dataType).isEqualTo(expectedDataType) + assertThat(actualResult.successCount).isEqualTo(0) + assertThat(actualResult.failCount).isEqualTo(1) + assertThat(actualResult.errors.keys).containsExactly(expectedError) + } + + @Test + fun `logFavoritesItemsRestoreFailed logs multiple Favorites Items as failing restore`() { + // Given + val expectedDataType = "deep_shortcut" + val expectedError = "test_failure" + // When + loggerUnderTest.logFavoritesItemsRestoreFailed( + favoritesId = Favorites.ITEM_TYPE_DEEP_SHORTCUT, + count = 5, + error = expectedError, + ) + // Then + val actualResult = loggerUnderTest.restoreEventLogger.loggingResults.first() + assertThat(actualResult.dataType).isEqualTo(expectedDataType) + assertThat(actualResult.successCount).isEqualTo(0) + assertThat(actualResult.failCount).isEqualTo(5) + assertThat(actualResult.errors.keys).containsExactly(expectedError) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2Test.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2Test.kt new file mode 100644 index 00000000000..8a7361f325d --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2Test.kt @@ -0,0 +1,148 @@ +/* + * 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.quickstep + +import android.graphics.PointF +import android.hardware.display.DisplayManager +import android.hardware.display.DisplayManagerGlobal +import android.view.Display +import android.view.Display.DEFAULT_DISPLAY +import android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS +import android.view.DisplayInfo +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.R +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppModule +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.MSDLPlayerWrapper +import com.android.launcher3.util.SandboxApplication +import com.android.systemui.contextualeducation.GestureType +import com.android.systemui.shared.system.InputConsumerController +import dagger.BindsInstance +import dagger.Component +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Answers.RETURNS_DEEP_STUBS +import org.mockito.Mock +import org.mockito.Mockito.spy +import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.eq +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +class LauncherSwipeHandlerV2Test { + + @Mock private lateinit var taskAnimationManager: TaskAnimationManager + + @Mock private lateinit var deviceState: RecentsAnimationDeviceState + + private lateinit var gestureState: GestureState + @Mock private lateinit var inputConsumerController: InputConsumerController + + @Mock(answer = RETURNS_DEEP_STUBS) private lateinit var systemUiProxy: SystemUiProxy + + @Mock(answer = RETURNS_DEEP_STUBS) private lateinit var recentsModel: RecentsModel + + @Mock private lateinit var msdlPlayerWrapper: MSDLPlayerWrapper + + @Mock private lateinit var rotationTouchHelper: RotationTouchHelper + + private lateinit var underTest: LauncherSwipeHandlerV2 + + @get:Rule val mockitoRule = MockitoJUnit.rule() + @get:Rule val sandboxContext = SandboxApplication() + + private val flingSpeed = + -(sandboxContext.resources.getDimension(R.dimen.quickstep_fling_threshold_speed) + 1) + + private lateinit var displayManager: DisplayManager + + @Before + fun setup() { + val display = + Display( + DisplayManagerGlobal.getInstance(), + DEFAULT_DISPLAY, + DisplayInfo(), + DEFAULT_DISPLAY_ADJUSTMENTS, + ) + displayManager = sandboxContext.spyService(DisplayManager::class.java) + whenever(displayManager.getDisplay(eq(DEFAULT_DISPLAY))).thenReturn(display) + whenever(displayManager.displays).thenReturn(arrayOf(display)) + + sandboxContext.initDaggerComponent( + DaggerTestComponent.builder() + .bindSystemUiProxy(systemUiProxy) + .bindRecentsModel(recentsModel) + ) + gestureState = + spy( + GestureState( + OverviewComponentObserver.INSTANCE.get(sandboxContext), + DEFAULT_DISPLAY, + 0, + ) + ) + + underTest = + LauncherSwipeHandlerV2( + sandboxContext, + taskAnimationManager, + deviceState, + rotationTouchHelper, + gestureState, + 0, + false, + inputConsumerController, + msdlPlayerWrapper, + ) + underTest.onGestureStarted(/* isLikelyToStartNewTask= */ false) + } + + @Test + fun goHomeFromAppByTrackpad_updateEduStats() { + gestureState.setTrackpadGestureType(GestureState.TrackpadGestureType.THREE_FINGER) + underTest.onGestureEnded(flingSpeed, PointF(), /* horizontalTouchSlopPassed= */ false) + verify(systemUiProxy) + .updateContextualEduStats(/* isTrackpadGesture= */ eq(true), eq(GestureType.HOME)) + } + + @Test + fun goHomeFromAppByTouch_updateEduStats() { + underTest.onGestureEnded(flingSpeed, PointF(), /* horizontalTouchSlopPassed= */ false) + verify(systemUiProxy) + .updateContextualEduStats(/* isTrackpadGesture= */ eq(false), eq(GestureType.HOME)) + } +} + +@LauncherAppSingleton +@Component(modules = [LauncherAppModule::class]) +interface TestComponent : LauncherAppComponent { + @Component.Builder + interface Builder : LauncherAppComponent.Builder { + @BindsInstance fun bindSystemUiProxy(systemUiProxy: SystemUiProxy): Builder + + @BindsInstance fun bindRecentsModel(recentsModel: RecentsModel): Builder + + override fun build(): TestComponent + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2TestCase.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2TestCase.java new file mode 100644 index 00000000000..0051a370dc8 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2TestCase.java @@ -0,0 +1,105 @@ +/* + * 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.quickstep; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.when; + +import androidx.annotation.NonNull; +import androidx.test.filters.SmallTest; + +import com.android.launcher3.Hotseat; +import com.android.launcher3.LauncherState; +import com.android.launcher3.Workspace; +import com.android.launcher3.WorkspaceStateTransitionAnimation; +import com.android.launcher3.statemanager.StateManager; +import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory; +import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.LauncherMultivalentJUnit; +import com.android.quickstep.views.RecentsView; + +import org.junit.Before; +import org.junit.Ignore; +import org.junit.runner.RunWith; +import org.mockito.Mock; + +@SmallTest +@RunWith(LauncherMultivalentJUnit.class) +@Ignore +public class LauncherSwipeHandlerV2TestCase extends AbsSwipeUpHandlerTestCase< + LauncherState, + QuickstepLauncher, + RecentsView, + LauncherSwipeHandlerV2, + LauncherActivityInterface> { + + @Mock private QuickstepLauncher mQuickstepLauncher; + @Mock private RecentsView mRecentsView; + @Mock private Workspace mWorkspace; + @Mock private Hotseat mHotseat; + @Mock private WorkspaceStateTransitionAnimation mTransitionAnimation; + + @Before + public void setUpQuickStepLauncher() { + when(mQuickstepLauncher.createAtomicAnimationFactory()) + .thenReturn(new AtomicAnimationFactory<>(0)); + when(mQuickstepLauncher.getHotseat()).thenReturn(mHotseat); + doReturn(mWorkspace).when(mQuickstepLauncher).getWorkspace(); + doReturn(new StateManager(mQuickstepLauncher, LauncherState.NORMAL)) + .when(mQuickstepLauncher).getStateManager(); + + } + + @Before + public void setUpWorkspace() { + when(mWorkspace.getStateTransitionAnimation()).thenReturn(mTransitionAnimation); + } + + @NonNull + @Override + protected LauncherSwipeHandlerV2 createSwipeHandler( + long touchTimeMs, boolean continuingLastGesture) { + return new LauncherSwipeHandlerV2( + mContext, + mTaskAnimationManager, + mDeviceState, + mRotationTouchHelper, + mGestureState, + touchTimeMs, + continuingLastGesture, + mInputConsumerController, + mMSDLPlayerWrapper); + } + + @NonNull + @Override + protected QuickstepLauncher getRecentsContainer() { + return mQuickstepLauncher; + } + + @NonNull + @Override + protected RecentsView getRecentsView() { + return mRecentsView; + } + + @NonNull + @Override + protected LauncherState getBaseState() { + return LauncherState.NORMAL; + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/MultiStateCallbackTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/MultiStateCallbackTest.java new file mode 100644 index 00000000000..0ff142a47b7 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/MultiStateCallbackTest.java @@ -0,0 +1,271 @@ +/* + * 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.quickstep; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; +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 androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.launcher3.util.LauncherMultivalentJUnit; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.function.Consumer; + +@SmallTest +@RunWith(LauncherMultivalentJUnit.class) +public class MultiStateCallbackTest { + + private int mFlagCount = 0; + private int getNextStateFlag() { + int index = 1 << mFlagCount; + mFlagCount++; + return index; + } + + private final MultiStateCallback mMultiStateCallback = new MultiStateCallback(new String[0]); + private final Runnable mCallback = spy(new Runnable() { + @Override + public void run() {} + }); + private final Consumer mListener = spy(new Consumer() { + @Override + public void accept(Boolean isOn) {} + }); + + @Test + public void testSetState_trackedProperly() { + int watchedAnime = getNextStateFlag(); + + assertThat(mMultiStateCallback.getState()).isEqualTo(0); + assertThat(mMultiStateCallback.hasStates(watchedAnime)).isFalse(); + + mMultiStateCallback.setState(watchedAnime); + + assertThat(mMultiStateCallback.getState()).isEqualTo(watchedAnime); + assertThat(mMultiStateCallback.hasStates(watchedAnime)).isTrue(); + } + + @Test + public void testSetState_withMultipleStates_trackedProperly() { + int watchedAnime = getNextStateFlag(); + int sharedMemes = getNextStateFlag(); + + mMultiStateCallback.setState(watchedAnime); + mMultiStateCallback.setState(sharedMemes); + + assertThat(mMultiStateCallback.getState()).isEqualTo(watchedAnime | sharedMemes); + assertThat(mMultiStateCallback.hasStates(watchedAnime)).isTrue(); + assertThat(mMultiStateCallback.hasStates(sharedMemes)).isTrue(); + assertThat(mMultiStateCallback.hasStates(watchedAnime | sharedMemes)).isTrue(); + } + + @Test + public void testClearState_trackedProperly() { + int lovedAnime = getNextStateFlag(); + + mMultiStateCallback.setState(lovedAnime); + mMultiStateCallback.clearState(lovedAnime); + + assertThat(mMultiStateCallback.getState()).isEqualTo(0); + assertThat(mMultiStateCallback.hasStates(lovedAnime)).isFalse(); + } + + @Test + public void testClearState_withMultipleState_trackedProperly() { + int lovedAnime = getNextStateFlag(); + int talkedAboutAnime = getNextStateFlag(); + + mMultiStateCallback.setState(lovedAnime); + mMultiStateCallback.setState(talkedAboutAnime); + mMultiStateCallback.clearState(talkedAboutAnime); + + assertThat(mMultiStateCallback.getState()).isEqualTo(lovedAnime); + assertThat(mMultiStateCallback.hasStates(lovedAnime)).isTrue(); + assertThat(mMultiStateCallback.hasStates(talkedAboutAnime)).isFalse(); + assertThat(mMultiStateCallback.hasStates(lovedAnime | talkedAboutAnime)).isFalse(); + } + + @Test + public void testCallbackDoesNotRun_withoutState() { + int watchedOnePiece = getNextStateFlag(); + + mMultiStateCallback.runOnceAtState(watchedOnePiece, mCallback); + + verify(mCallback, never()).run(); + } + + @Test + public void testCallbackDoesNotRun_whenNotTracked() { + int watchedJujutsuKaisen = getNextStateFlag(); + + mMultiStateCallback.setState(watchedJujutsuKaisen); + + verify(mCallback, never()).run(); + } + + @Test + public void testCallbackRuns_afterTrackedAndStateSet() { + int watchedHunterXHunter = getNextStateFlag(); + + mMultiStateCallback.runOnceAtState(watchedHunterXHunter, mCallback); + mMultiStateCallback.setState(watchedHunterXHunter); + + verify(mCallback, times(1)).run(); + } + + @Test + public void testCallbackRuns_onUiThread() { + int watchedHunterXHunter = getNextStateFlag(); + + mMultiStateCallback.runOnceAtState(watchedHunterXHunter, mCallback); + mMultiStateCallback.setStateOnUiThread(watchedHunterXHunter); + + runOnMainSync(() -> verify(mCallback, times(1)).run()); + } + + @Test + public void testCallbackRuns_agnosticallyToCallOrder() { + int watchedFullMetalAlchemist = getNextStateFlag(); + + mMultiStateCallback.setState(watchedFullMetalAlchemist); + mMultiStateCallback.runOnceAtState(watchedFullMetalAlchemist, mCallback); + + verify(mCallback, times(1)).run(); + } + + @Test + public void testCallbackRuns_onlyOnceAfterStateSet() { + int watchedBleach = getNextStateFlag(); + + mMultiStateCallback.runOnceAtState(watchedBleach, mCallback); + mMultiStateCallback.setState(watchedBleach); + mMultiStateCallback.setState(watchedBleach); + + verify(mCallback, times(1)).run(); + } + + @Test + public void testCallbackRuns_onlyOnceAfterClearState() { + int rememberedGreatShow = getNextStateFlag(); + + mMultiStateCallback.runOnceAtState(rememberedGreatShow, mCallback); + mMultiStateCallback.setState(rememberedGreatShow); + mMultiStateCallback.clearState(rememberedGreatShow); + mMultiStateCallback.setState(rememberedGreatShow); + + verify(mCallback, times(1)).run(); + } + + @Test + public void testCallbackDoesNotRun_withoutFullStateSet() { + int watchedMobPsycho = getNextStateFlag(); + int watchedVinlandSaga = getNextStateFlag(); + + mMultiStateCallback.runOnceAtState(watchedMobPsycho | watchedVinlandSaga, mCallback); + mMultiStateCallback.setState(watchedMobPsycho); + + verify(mCallback, times(0)).run(); + } + + @Test + public void testCallbackRuns_withFullStateSet_agnosticallyToCallOrder() { + int watchedReZero = getNextStateFlag(); + int watchedJojosBizareAdventure = getNextStateFlag(); + + mMultiStateCallback.setState(watchedJojosBizareAdventure); + mMultiStateCallback.runOnceAtState(watchedReZero | watchedJojosBizareAdventure, mCallback); + mMultiStateCallback.setState(watchedReZero); + + verify(mCallback, times(1)).run(); + } + + @Test + public void testCallbackRuns_withFullStateSet_asIntegerMask() { + int watchedPokemon = getNextStateFlag(); + int watchedDigimon = getNextStateFlag(); + + mMultiStateCallback.runOnceAtState(watchedPokemon | watchedDigimon, mCallback); + mMultiStateCallback.setState(watchedPokemon | watchedDigimon); + + verify(mCallback, times(1)).run(); + } + + @Test + public void testCallbackDoesNotRun_afterClearState() { + int watchedMonster = getNextStateFlag(); + int watchedPingPong = getNextStateFlag(); + + mMultiStateCallback.runOnceAtState(watchedMonster | watchedPingPong, mCallback); + mMultiStateCallback.setState(watchedMonster); + mMultiStateCallback.clearState(watchedMonster); + mMultiStateCallback.setState(watchedPingPong); + + verify(mCallback, times(0)).run(); + } + + @Test + public void testlistenerRuns_multipleTimes() { + int watchedSteinsGate = getNextStateFlag(); + + mMultiStateCallback.addChangeListener(watchedSteinsGate, mListener); + mMultiStateCallback.setState(watchedSteinsGate); + + // Called exactly one + verify(mListener, times(1)).accept(anyBoolean()); + // Called exactly once with isOn = true + verify(mListener, times(1)).accept(eq(true)); + // Never called with isOn = false + verify(mListener, times(0)).accept(eq(false)); + + mMultiStateCallback.clearState(watchedSteinsGate); + + // Called exactly twice + verify(mListener, times(2)).accept(anyBoolean()); + // Called exactly once with isOn = true + verify(mListener, times(1)).accept(eq(true)); + // Called exactly once with isOn = false + verify(mListener, times(1)).accept(eq(false)); + } + + @Test + public void testlistenerDoesNotRun_forUnchangedState() { + int watchedSteinsGate = getNextStateFlag(); + + mMultiStateCallback.addChangeListener(watchedSteinsGate, mListener); + mMultiStateCallback.setState(watchedSteinsGate); + mMultiStateCallback.setState(watchedSteinsGate); + + // State remained unchanged + verify(mListener, times(1)).accept(anyBoolean()); + // Called exactly once with isOn = true + verify(mListener, times(1)).accept(eq(true)); + } + + private static void runOnMainSync(Runnable runnable) { + InstrumentationRegistry.getInstrumentation().runOnMainSync(runnable); + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/NavigationBarRotationContextTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/NavigationBarRotationContextTest.java index de6740d3b3a..4c7142fbd53 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/NavigationBarRotationContextTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/NavigationBarRotationContextTest.java @@ -31,18 +31,24 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.systemui.rotation.RotationPolicyWrapper; import com.android.systemui.shared.rotation.RotationButton; import com.android.systemui.shared.rotation.RotationButtonController; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; /** SysUI equivalent */ @SmallTest @RunWith(AndroidJUnit4.class) public class NavigationBarRotationContextTest { + + @Rule + public MockitoRule mockitoRule = MockitoJUnit.rule(); private static final int DEFAULT_ROTATE = 0; private static final int DEFAULT_DISPLAY = 0; @@ -51,12 +57,11 @@ public class NavigationBarRotationContextTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); Context mTargetContext = InstrumentationRegistry.getTargetContext(); final View view = new View(mTargetContext); RotationButton rotationButton = mock(RotationButton.class); - mRotationButtonController = new RotationButtonController(mTargetContext, 0, 0, 0, 0, 0, 0, - () -> 0); + mRotationButtonController = new RotationButtonController(mock(RotationPolicyWrapper.class), + mTargetContext, 0, 0, 0, 0, 0, 0, () -> 0); mRotationButtonController.setRotationButton(rotationButton, null); // Due to a mockito issue, only spy the object after setting the initial state mRotationButtonController = spy(mRotationButtonController); diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/OverviewCommandHelperTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/OverviewCommandHelperTest.kt new file mode 100644 index 00000000000..e60eb0337dc --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/OverviewCommandHelperTest.kt @@ -0,0 +1,685 @@ +/* + * 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.quickstep + +import android.content.Intent +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.filters.SmallTest +import com.android.app.displaylib.DisplayRepository +import com.android.app.displaylib.fakes.FakePerDisplayRepository +import com.android.launcher3.LauncherState +import com.android.launcher3.statemanager.StateManager +import com.android.launcher3.statemanager.StatefulActivity +import com.android.launcher3.taskbar.TaskbarInteractor +import com.android.launcher3.taskbar.TaskbarManager +import com.android.launcher3.taskbar.TaskbarUIController +import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.RunnableList +import com.android.launcher3.util.TestDispatcherProvider +import com.android.quickstep.OverviewCommandHelper.CommandInfo +import com.android.quickstep.OverviewCommandHelper.CommandInfo.CommandStatus +import com.android.quickstep.OverviewCommandHelper.CommandType +import com.android.quickstep.OverviewCommandHelper.Companion.TOGGLE_PREVIOUS_TIMEOUT_MS +import com.android.quickstep.views.KeyboardFocusTask +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsViewUtils +import com.android.quickstep.views.TaskView +import com.android.window.flags.Flags as WindowFlags +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.advanceTimeBy +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.anyInt +import org.mockito.Mockito.spy +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(LauncherMultivalentJUnit::class) +@OptIn(ExperimentalCoroutinesApi::class) +class OverviewCommandHelperTest { + + @get:Rule val mSetFlagsRule: SetFlagsRule = SetFlagsRule() + + private lateinit var sut: OverviewCommandHelper + private val dispatcher = StandardTestDispatcher() + private val testScope = TestScope(dispatcher) + + private var pendingCallbacksWithDelays = mutableListOf() + + private val displayRepository: DisplayRepository = mock() + private val executeCommandDisplayIds = mutableListOf() + + private val recentView: RecentsView<*, *> = mock() + private val stateManager: StateManager> = mock() + private val containerInterface: BaseActivityInterface = mock() + private val taskAnimationManager: TaskAnimationManager = mock() + private val touchInteractionService: TouchInteractionService = mock() + private val taskbarManager: TaskbarManager = mock() + private val taskbarUIController: TaskbarUIController = mock() + private val taskbarInteractor: TaskbarInteractor = TaskbarInteractor(taskbarUIController) + private val launcher: QuickstepLauncher = mock() + private var elapsedRealtime = 100L + private val systemUiProxy: SystemUiProxy = mock() + + private fun setupDefaultDisplay() { + whenever(displayRepository.displayIds).thenReturn(MutableStateFlow(setOf(DEFAULT_DISPLAY))) + } + + private fun setupMultipleDisplays() { + whenever(displayRepository.displayIds) + .thenReturn(MutableStateFlow(setOf(DEFAULT_DISPLAY, 1))) + } + + @Suppress("UNCHECKED_CAST") + @Before + fun setup() { + setupDefaultDisplay() + + val overviewComponentObserver = mock() + whenever(overviewComponentObserver.getContainerInterface(any())) + .thenReturn(containerInterface) + whenever(overviewComponentObserver.getHomeIntent(any())).thenReturn(mock()) + whenever(recentView.getStateManager()).thenReturn(stateManager) + whenever(containerInterface.switchToRecentsIfVisible(any())).thenReturn(true) + whenever(launcher.getOverviewPanel>()).thenReturn(recentView) + whenever(containerInterface.createdContainer).thenReturn(launcher) + whenever(containerInterface.taskbarInteractor).thenReturn(taskbarInteractor) + whenever(taskbarInteractor.launchFocusedTask().get()) + .thenReturn(REQUESTED_KEYBOARD_FOCUS_TASK_IDS) + whenever(taskbarManager.getUIControllerForDisplay(anyInt())).thenReturn(taskbarUIController) + + sut = + spy( + OverviewCommandHelper( + touchInteractionService = touchInteractionService, + overviewComponentObserver = overviewComponentObserver, + dispatcherProvider = TestDispatcherProvider(dispatcher), + displayRepository = displayRepository, + taskbarManager = taskbarManager, + taskAnimationManagerRepository = + FakePerDisplayRepository { _ -> + taskAnimationManager + }, + elapsedRealtime = ::elapsedRealtime, + systemUiProxy = systemUiProxy, + ) + ) + } + + private fun addCallbackDelay(delayInMillis: Long = 0) { + pendingCallbacksWithDelays.add(delayInMillis) + } + + private fun mockExecuteCommand() { + doAnswer { invocation -> + val pendingCallback = invocation.arguments[1] as () -> Unit + + val delayInMillis = pendingCallbacksWithDelays.removeFirstOrNull() + if (delayInMillis != null) { + runBlocking { + testScope.backgroundScope.launch { + delay(delayInMillis) + pendingCallback.invoke() + } + } + } + val commandInfo = invocation.arguments[0] as CommandInfo + executeCommandDisplayIds.add(commandInfo.displayId) + delayInMillis == null // if no callback to execute, returns success + } + .`when`(sut) + .executeCommand(any(), any()) + } + + @Test + fun whenFirstCommandIsAdded_executeCommandImmediately() = + testScope.runTest { + mockExecuteCommand() + // Add command to queue + val commandInfo: CommandInfo = sut.addCommand(CommandType.HOME)!! + assertThat(commandInfo.status).isEqualTo(CommandStatus.IDLE) + runCurrent() + assertThat(commandInfo.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + fun whenFirstCommandIsAdded_executeCommandImmediately_WithCallbackDelay() = + testScope.runTest { + mockExecuteCommand() + addCallbackDelay(100) + + // Add command to queue + val commandType = CommandType.HOME + val commandInfo: CommandInfo = sut.addCommand(commandType)!! + assertThat(commandInfo.status).isEqualTo(CommandStatus.IDLE) + + runCurrent() + assertThat(commandInfo.status).isEqualTo(CommandStatus.PROCESSING) + + advanceTimeBy(200L) + assertThat(commandInfo.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + fun whenFirstCommandIsPendingCallback_NextCommandWillWait() = + testScope.runTest { + mockExecuteCommand() + // Add command to queue + addCallbackDelay(100) + val commandType1 = CommandType.HOME + val commandInfo1: CommandInfo = sut.addCommand(commandType1)!! + assertThat(commandInfo1.status).isEqualTo(CommandStatus.IDLE) + + addCallbackDelay(100) + val commandType2 = CommandType.SHOW_ALT_TAB + val commandInfo2: CommandInfo = sut.addCommand(commandType2)!! + assertThat(commandInfo2.status).isEqualTo(CommandStatus.IDLE) + + runCurrent() + assertThat(commandInfo1.status).isEqualTo(CommandStatus.PROCESSING) + assertThat(commandInfo2.status).isEqualTo(CommandStatus.IDLE) + + advanceTimeBy(101L) + assertThat(commandInfo1.status).isEqualTo(CommandStatus.COMPLETED) + assertThat(commandInfo2.status).isEqualTo(CommandStatus.PROCESSING) + + advanceTimeBy(101L) + assertThat(commandInfo2.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + fun whenCommandTakesTooLong_TriggerTimeout_AndExecuteNextCommand() = + testScope.runTest { + mockExecuteCommand() + // Add command to queue + addCallbackDelay(QUEUE_TIMEOUT) + val commandType1 = CommandType.HOME + val commandInfo1: CommandInfo = sut.addCommand(commandType1)!! + assertThat(commandInfo1.status).isEqualTo(CommandStatus.IDLE) + + addCallbackDelay(100) + val commandType2 = CommandType.SHOW_ALT_TAB + val commandInfo2: CommandInfo = sut.addCommand(commandType2)!! + assertThat(commandInfo2.status).isEqualTo(CommandStatus.IDLE) + + runCurrent() + assertThat(commandInfo1.status).isEqualTo(CommandStatus.PROCESSING) + assertThat(commandInfo2.status).isEqualTo(CommandStatus.IDLE) + + advanceTimeBy(QUEUE_TIMEOUT) + assertThat(commandInfo1.status).isEqualTo(CommandStatus.CANCELED) + assertThat(commandInfo2.status).isEqualTo(CommandStatus.PROCESSING) + + advanceTimeBy(101) + assertThat(commandInfo2.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + fun whenAllDisplaysCommandIsAdded_singleCommandProcessedForDefaultDisplay() = + testScope.runTest { + mockExecuteCommand() + executeCommandDisplayIds.clear() + // Add command to queue + val commandInfo: CommandInfo = sut.addCommandsForAllDisplays(CommandType.HOME)!! + assertThat(commandInfo.status).isEqualTo(CommandStatus.IDLE) + runCurrent() + assertThat(commandInfo.status).isEqualTo(CommandStatus.COMPLETED) + assertThat(executeCommandDisplayIds).containsExactly(DEFAULT_DISPLAY) + } + + @Test + fun whenAllDisplaysCommandIsAdded_multipleCommandsProcessedForMultipleDisplays() = + testScope.runTest { + mockExecuteCommand() + setupMultipleDisplays() + executeCommandDisplayIds.clear() + // Add command to queue + val commandInfo: CommandInfo = sut.addCommandsForAllDisplays(CommandType.HOME)!! + assertThat(commandInfo.status).isEqualTo(CommandStatus.IDLE) + runCurrent() + assertThat(commandInfo.status).isEqualTo(CommandStatus.COMPLETED) + assertThat(executeCommandDisplayIds) + .containsExactly(DEFAULT_DISPLAY, EXTERNAL_DISPLAY_ID) + } + + @Test + fun whenAllExceptDisplayCommandIsAdded_otherDisplayProcessed() = + testScope.runTest { + mockExecuteCommand() + setupMultipleDisplays() + executeCommandDisplayIds.clear() + // Add command to queue + val commandInfo: CommandInfo = + sut.addCommandsForDisplaysExcept(CommandType.HOME, DEFAULT_DISPLAY)!! + assertThat(commandInfo.status).isEqualTo(CommandStatus.IDLE) + runCurrent() + assertThat(commandInfo.status).isEqualTo(CommandStatus.COMPLETED) + assertThat(executeCommandDisplayIds).containsExactly(EXTERNAL_DISPLAY_ID) + } + + @Test + fun whenSingleDisplayCommandIsAdded_thatDisplayIsProcessed() = + testScope.runTest { + mockExecuteCommand() + executeCommandDisplayIds.clear() + val displayId = 5 + // Add command to queue + val commandInfo: CommandInfo = sut.addCommand(CommandType.HOME, displayId)!! + assertThat(commandInfo.status).isEqualTo(CommandStatus.IDLE) + runCurrent() + assertThat(commandInfo.status).isEqualTo(CommandStatus.COMPLETED) + assertThat(executeCommandDisplayIds).containsExactly(displayId) + } + + @Test + fun recentViewNotVisible_toggleOverviewPrev_goToOverview() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + sut.addCommand(CommandType.TOGGLE_OVERVIEW_PREVIOUS)!! + runCurrent() + verify(containerInterface).switchToRecentsIfVisible(any()) + } + + @Test + fun recentViewVisible_toggleOverviewPrev_goToHome() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + val commandInfo: CommandInfo = sut.addCommand(CommandType.TOGGLE_OVERVIEW_PREVIOUS)!! + + runCurrent() + verify(recentView).startHome() + + assertThat(commandInfo.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + fun recentViewVisible_hasRunningTask_toggleOverviewPrev_goToPrevTask() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + val mockTask = mock() + whenever(recentView.runningTaskView).thenReturn(mockTask) + val callbackList = RunnableList() + whenever(mockTask.launchWithAnimation()).thenReturn(callbackList) + + val commandInfo: CommandInfo = sut.addCommand(CommandType.TOGGLE_OVERVIEW_PREVIOUS)!! + runCurrent() + + verify(mockTask).launchWithAnimation() + verify(recentView, never()).startHome() + assertThat(commandInfo.status).isEqualTo(CommandStatus.PROCESSING) + + callbackList.executeAllAndDestroy() + runCurrent() + + assertThat(commandInfo.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + fun recentViewVisible_hasRunningTask_toggle() = + testScope.runTest { + val callbackList = RunnableList() + + fun getMockTask(vararg elements: Int) = + mock().apply { + whenever(taskIdSet).thenReturn(elements.toSet()) + whenever(recentView.getTaskViewByTaskIds(elements)).thenReturn(this) + whenever(launchWithAnimation()).thenReturn(callbackList) + } + val mockTask1 = getMockTask(1, 2, 3) + val mockTask2 = getMockTask(4, 5) + val mockTask3 = getMockTask(6, 7) + + // TOGGLE with a runningTaskView should go to nextTaskView + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + whenever(recentView.runningTaskView).thenReturn(mockTask1) + whenever(recentView.nextTaskView).thenReturn(mockTask2) + sut.addCommand(CommandType.TOGGLE) + runCurrent() + verify(mockTask2).launchWithAnimation() + callbackList.executeAllAndDestroy() + + // Next TOGGLE with runningTaskView will return to previous runningTaskView + whenever(recentView.runningTaskView).thenReturn(mockTask2) + whenever(recentView.nextTaskView).thenReturn(mockTask3) + sut.addCommand(CommandType.TOGGLE) + runCurrent() + verify(mockTask1).launchWithAnimation() + callbackList.executeAllAndDestroy() + + // After TOGGLE_PREVIOUS_TIMEOUT_MS has passed, subsequent TOGGLE will go to + // nextTaskView again. + whenever(recentView.runningTaskView).thenReturn(mockTask1) + whenever(recentView.nextTaskView).thenReturn(mockTask3) + sut.addCommand(CommandType.TOGGLE) + elapsedRealtime += TOGGLE_PREVIOUS_TIMEOUT_MS + runCurrent() + verify(mockTask3).launchWithAnimation() + } + + @Test + fun recentViewVisible_noRunningTask_toggle_goToFirstNonDesktopTaskView() = + testScope.runTest { + val firstNonDesktopTaskView = mock() + val lastDesktopTaskView = mock() + val previousTaskView = mock() + val nextTaskView = mock() + + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + whenever(recentView.runningTaskView).thenReturn(null) + whenever(recentView.firstNonDesktopTaskView).thenReturn(firstNonDesktopTaskView) + whenever(recentView.lastDesktopTaskView).thenReturn(lastDesktopTaskView) + whenever(recentView.previousTaskView).thenReturn(previousTaskView) + whenever(recentView.nextTaskView).thenReturn(nextTaskView) + sut.addCommand(CommandType.TOGGLE) + runCurrent() + verify(firstNonDesktopTaskView).launchWithAnimation() + } + + @Test + fun recentViewVisible_noRunningTask_toggle_goToLastDesktopTaskView() = + testScope.runTest { + val lastDesktopTaskView = mock() + val firstTaskView = mock() + val previousTaskView = mock() + val nextTaskView = mock() + + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + whenever(recentView.runningTaskView).thenReturn(null) + whenever(recentView.firstNonDesktopTaskView).thenReturn(null) + whenever(recentView.lastDesktopTaskView).thenReturn(lastDesktopTaskView) + whenever(recentView.firstTaskView).thenReturn(firstTaskView) + whenever(recentView.previousTaskView).thenReturn(previousTaskView) + whenever(recentView.nextTaskView).thenReturn(nextTaskView) + sut.addCommand(CommandType.TOGGLE) + runCurrent() + verify(lastDesktopTaskView).launchWithAnimation() + } + + @Test + fun recentViewVisible_hasRunningTask_toggle_goToPreviousTaskView() = + testScope.runTest { + val runningTaskView = mock() + val firstTaskView = mock() + val previousTaskView = mock() + + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + whenever(recentView.runningTaskView).thenReturn(runningTaskView) + whenever(recentView.firstTaskView).thenReturn(firstTaskView) + whenever(recentView.previousTaskView).thenReturn(previousTaskView) + whenever(recentView.nextTaskView).thenReturn(null) + sut.addCommand(CommandType.TOGGLE) + runCurrent() + verify(previousTaskView).launchWithAnimation() + } + + @Test + fun toggleWithFocus_recentViewNotVisible_goToOverview() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + sut.addCommand(CommandType.TOGGLE_WITH_FOCUS)!! + runCurrent() + verify(containerInterface).switchToRecentsIfVisible(any()) + } + + // TODO(b/385128447): add tests for when a TaskContentView is focused. + @Test + fun toggleWithFocus_recentViewVisible_windowTaskFocused_launchFocusedTask() = + testScope.runTest { + val mockFocusedTask = mock() + val mockTaskViewsIterable = mock() + + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + whenever(mockFocusedTask.isFocused).thenReturn(true) + whenever(mockTaskViewsIterable.iterator()) + .thenReturn(listOf(mockFocusedTask).iterator()) + whenever(recentView.taskViews).thenReturn(mockTaskViewsIterable) + sut.addCommand(CommandType.TOGGLE_WITH_FOCUS)!! + runCurrent() + verify(mockFocusedTask).launchWithAnimation() + } + + @Test + fun toggleWithFocus_recentViewVisible_windowTaskHovered_launchHoveredTask() = + testScope.runTest { + val mockFocusedTask = mock() + val mockTaskViewsIterable = mock() + + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + whenever(mockFocusedTask.isFocused).thenReturn(false) + whenever(mockFocusedTask.isHovered).thenReturn(true) + whenever(mockTaskViewsIterable.iterator()) + .thenReturn(listOf(mockFocusedTask).iterator()) + whenever(recentView.taskViews).thenReturn(mockTaskViewsIterable) + sut.addCommand(CommandType.TOGGLE_WITH_FOCUS)!! + runCurrent() + verify(mockFocusedTask).launchWithAnimation() + } + + @Test + fun toggleWithFocus_recentViewVisible_noTaskFocused_launchCurrentPageTaskView() = + testScope.runTest { + val mockTask = mock() + val mockTaskViewsIterable = mock() + + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + whenever(mockTaskViewsIterable.iterator()).thenReturn(emptyList().iterator()) + whenever(recentView.taskViews).thenReturn(mockTaskViewsIterable) + whenever(recentView.currentPageTaskView).thenReturn(mockTask) + sut.addCommand(CommandType.TOGGLE_WITH_FOCUS)!! + runCurrent() + verify(mockTask).launchWithAnimation() + } + + @Test + @EnableFlags(WindowFlags.FLAG_ENABLE_REJECT_HOME_TRANSITION) + fun whenHomeCommandIsAdded_executeRejectHomeActionOnExternalDisplay() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + val (swipeUpHandler, newGestureState) = setupGestureDependencies() + val command = sut.addCommand(CommandType.HOME, EXTERNAL_DISPLAY_ID)!! + + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.PROCESSING) + verify(touchInteractionService, never()).startActivity(any()) + verify(swipeUpHandler).onGestureStarted(any()) + verify(newGestureState) + .setHandlingAtomicEvent(GestureState.GestureEndTarget.REJECT_HOME) + + // Make sure we can transition to completed state once we see an end callback. + val gestureAnimationEndCallbackCaptor = argumentCaptor() + verify(swipeUpHandler) + .setGestureAnimationEndCallback(gestureAnimationEndCallbackCaptor.capture()) + gestureAnimationEndCallbackCaptor.firstValue.run() + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + fun whenHomeCommandIsAddedAndRecentsIsVisible_executeHomeActionOnMainDisplay() = + testScope.runTest { + val onHomeAnimationCompleteRunnableCaptor = argumentCaptor() + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + val command = sut.addCommand(CommandType.HOME)!! + runCurrent() + verify(recentView).startHome(onHomeAnimationCompleteRunnableCaptor.capture()) + + assertThat(command.status).isEqualTo(CommandStatus.PROCESSING) + onHomeAnimationCompleteRunnableCaptor.firstValue.run() + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + @EnableFlags(WindowFlags.FLAG_ENABLE_REJECT_HOME_TRANSITION) + fun whenHomeCommandIsAddedAndRecentsIsVisible_dontExecuteHomeActionOnExternalDisplay() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + val command = sut.addCommand(CommandType.HOME, EXTERNAL_DISPLAY_ID)!! + runCurrent() + verify(recentView, never()).startHome() + + assertThat(command.status).isEqualTo(CommandStatus.COMPLETED) + } + + @Test + fun whenHomeCommandIsAdded_executeHomeAction_withKeycodeHomeEnabled() = + testScope.runTest { + sut.addCommand(CommandType.HOME) + runCurrent() + verify(systemUiProxy).onKeyEvent(anyInt(), anyInt()) + } + + @Test + fun hideAltTabCommand_onSmallScreenDefaultDisplay_neverSetsKeyboardFocusTask() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + val command = sut.addCommand(CommandType.HIDE_ALT_TAB)!! + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.COMPLETED) + verify(taskbarUIController, never()).launchFocusedTask() + verify(recentView, never()).setKeyboardFocusTask(any()) + } + + @Test + fun hideAltTabCommand_onSmallScreenExternalDisplay_setsKeyboardFocusTaskToTaskViewWithIds() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + val command = sut.addCommand(CommandType.HIDE_ALT_TAB, EXTERNAL_DISPLAY_ID)!! + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.PROCESSING) + verify(taskbarUIController).launchFocusedTask() + verify(recentView) + .setKeyboardFocusTask( + KeyboardFocusTask.TaskViewWithIds(REQUESTED_KEYBOARD_FOCUS_TASK_IDS) + ) + } + + @Test + fun hideAltTabCommand_withoutRequestedKeyboardFocusTaskIds_neverSetsKeyboardFocusTask() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + whenever(taskbarUIController.launchFocusedTask()).thenReturn(null) + val command = sut.addCommand(CommandType.HIDE_ALT_TAB, EXTERNAL_DISPLAY_ID)!! + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.COMPLETED) + verify(taskbarUIController).launchFocusedTask() + verify(recentView, never()).setKeyboardFocusTask(any()) + } + + @Test + fun showAltTabCommand_onSmallScreenDefaultDisplay_opensOverviewWithCurrentPageFocus() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + val command = sut.addCommand(CommandType.SHOW_ALT_TAB)!! + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.PROCESSING) + verify(taskbarUIController, never()).openQuickSwitchView() + verify(recentView).setKeyboardFocusTask(KeyboardFocusTask.CurrentPageTaskView) + } + + @Test + fun showAltTabCommand_onSmallScreenExternalDisplay_opensQuickSwitchView() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + val command = sut.addCommand(CommandType.SHOW_ALT_TAB, EXTERNAL_DISPLAY_ID)!! + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.COMPLETED) + verify(taskbarUIController).openQuickSwitchView() + verify(recentView, never()).setKeyboardFocusTask(any()) + } + + @Test + fun showWithFocusCommand_setsKeyboardFocusTaskToCurrentTask() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + whenever(containerInterface.switchToRecentsIfVisible(any())).thenReturn(false) + val (swipeUpHandler, newGestureState) = setupGestureDependencies() + val command = sut.addCommand(CommandType.SHOW_WITH_FOCUS)!! + + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.PROCESSING) + verify(swipeUpHandler).onGestureStarted(any()) + verify(newGestureState).setHandlingAtomicEvent(GestureState.GestureEndTarget.RECENTS) + verify(recentView).setKeyboardFocusTask(KeyboardFocusTask.ExpectedCurrentTask) + + // Make sure we can transition to completed state once we see an end callback. + val gestureAnimationEndCallbackCaptor = argumentCaptor() + verify(swipeUpHandler) + .setGestureAnimationEndCallback(gestureAnimationEndCallbackCaptor.capture()) + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + gestureAnimationEndCallbackCaptor.firstValue.run() + + runCurrent() + assertThat(command.status).isEqualTo(CommandStatus.COMPLETED) + verify(recentView).setKeyboardFocusTask(KeyboardFocusTask.Unfocused) + } + + private fun setupGestureDependencies(): Pair, GestureState> { + val swipeUpHandlerFactory = mock() + val swipeUpHandler = mock>() + val newGestureState = mock() + whenever(touchInteractionService.getSwipeUpHandlerFactory(any())) + .thenReturn(swipeUpHandlerFactory) + whenever(swipeUpHandlerFactory.newHandler(any(), any())).thenReturn(swipeUpHandler) + whenever(swipeUpHandler.getLaunchIntent()).thenReturn(Intent()) + whenever(touchInteractionService.createGestureState(any(), any(), any())) + .thenReturn(newGestureState) + whenever(taskAnimationManager.isRecentsAnimationRunning).thenReturn(false) + whenever(taskAnimationManager.startRecentsAnimation(any(), any(), any())).thenReturn(mock()) + return Pair(swipeUpHandler, newGestureState) + } + + private companion object { + const val QUEUE_TIMEOUT = 5001L + const val EXTERNAL_DISPLAY_ID = 1 + const val TASK_ID = 10 + val REQUESTED_KEYBOARD_FOCUS_TASK_IDS = setOf(TASK_ID) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java new file mode 100644 index 00000000000..7093054ee0d --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java @@ -0,0 +1,368 @@ +/* + * 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.quickstep; + +import static android.view.Display.DEFAULT_DISPLAY; + +import static com.android.launcher3.Flags.FLAG_ENABLE_LATER_IS_LOCKED_CHECK; +import static com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND; + +import static com.google.common.truth.Truth.assertThat; + +import static junit.framework.TestCase.assertNull; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.ActivityManager; +import android.app.ActivityManager.RecentTaskInfo; +import android.app.KeyguardManager; +import android.app.TaskInfo; +import android.companion.virtual.VirtualDeviceManager; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Rect; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.internal.R; +import com.android.launcher3.util.DaggerSingletonTracker; +import com.android.launcher3.util.Executors; +import com.android.launcher3.util.LooperExecutor; +import com.android.quickstep.util.DesktopTask; +import com.android.quickstep.util.GroupTask; +import com.android.quickstep.views.TaskViewType; +import com.android.systemui.shared.recents.model.Task; +import com.android.wm.shell.shared.GroupedTaskInfo; +import com.android.wm.shell.shared.split.SplitBounds; +import com.android.wm.shell.shared.split.SplitScreenConstants; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class RecentTasksListTest { + + @Rule public MockitoRule mockitoRule = MockitoJUnit.rule(); + + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + + @Mock + private Context mContext; + @Mock + private Resources mResources; + @Mock + private SystemUiProxy mSystemUiProxy; + @Mock + private TopTaskTracker mTopTaskTracker; + @Mock + private KeyguardManager mKeyguardManager; + @Mock + private VirtualDeviceManager mVirtualDeviceManager; + + // Class under test + private RecentTasksList mRecentTasksList; + + @Before + public void setup() { + LooperExecutor mainThreadExecutor = Executors.MAIN_EXECUTOR; + + // Set desktop mode supported + when(mContext.getResources()).thenReturn(mResources); + when(mResources.getBoolean(R.bool.config_isDesktopModeSupported)).thenReturn(true); + when(mResources.getBoolean(R.bool.config_canInternalDisplayHostDesktops)) + .thenReturn(true); + when(mVirtualDeviceManager.getDeviceIdForDisplayId(anyInt())) + .thenReturn(Context.DEVICE_ID_DEFAULT); + + mRecentTasksList = new RecentTasksList(mContext, mainThreadExecutor, + mKeyguardManager, mVirtualDeviceManager, mSystemUiProxy, mTopTaskTracker, + mock(DaggerSingletonTracker.class)); + } + + @Test + public void onRecentTasksChanged_doesNotFetchTasks() throws Exception { + mRecentTasksList.onRecentTasksChanged(); + verify(mSystemUiProxy, times(0)) + .getRecentTasks(anyInt(), anyInt()); + } + + @Test + public void loadTasksInBackground_onlyKeys_noValidTaskDescription() throws Exception { + GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forSplitTasks( + new RecentTaskInfo(), new RecentTaskInfo(), new SplitBounds( + /* leftTopBounds = */ new Rect(), + /* rightBottomBounds = */ new Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_50_50)); + when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) + .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); + + List taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, + true); + + assertEquals(1, taskList.size()); + taskList.get(0).getTasks().forEach(t -> assertNull(t.taskDescription.getLabel())); + } + + @Test + public void loadTasksInBackground_VdmDisplay() throws Exception { + int virtualDeviceDisplayId = 10; + int nonVirtualDeviceDisplayId = 11; + int virtualDeviceId = 42; + when(mVirtualDeviceManager.getDeviceIdForDisplayId(virtualDeviceDisplayId)) + .thenReturn(virtualDeviceId); + when(mVirtualDeviceManager.getDeviceIdForDisplayId(nonVirtualDeviceDisplayId)) + .thenReturn(Context.DEVICE_ID_DEFAULT); + + GroupedTaskInfo virtualDeviceDisplayTaskInfo = GroupedTaskInfo.forFullscreenTasks( + createRecentTaskInfo(/* taskId= */ 1, /* displayId= */ virtualDeviceDisplayId)); + GroupedTaskInfo nonVirtualDeviceDisplayTaskInfo = GroupedTaskInfo.forFullscreenTasks( + createRecentTaskInfo(/* taskId= */ 2, /* displayId= */ nonVirtualDeviceDisplayId)); + when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())).thenReturn( + new ArrayList<>(List.of(virtualDeviceDisplayTaskInfo, + nonVirtualDeviceDisplayTaskInfo))); + List taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, + false); + + assertThat(taskList).hasSize(2); + assertThat(taskList.get(0).taskViewType).isEqualTo(TaskViewType.SINGLE); + assertThat(taskList.get(1).taskViewType).isEqualTo(TaskViewType.SINGLE); + + List virtualDeviceTasks = taskList.get(1).getTasks(); + assertThat(virtualDeviceTasks).hasSize(1); + assertThat(virtualDeviceTasks.get(0).key.displayId).isEqualTo(DEFAULT_DISPLAY); + + List nonVirtualDeviceTasks = taskList.get(0).getTasks(); + assertThat(nonVirtualDeviceTasks).hasSize(1); + assertThat(nonVirtualDeviceTasks.get(0).key.displayId).isEqualTo(nonVirtualDeviceDisplayId); + + // The displayIds are cached and there are no more calls to VDM. + mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, false); + verify(mVirtualDeviceManager, times(1)) + .getDeviceIdForDisplayId(virtualDeviceDisplayId); + verify(mVirtualDeviceManager, times(1)) + .getDeviceIdForDisplayId(nonVirtualDeviceDisplayId); + } + + @Test + public void loadTasksInBackground_GetRecentTasksException() throws Exception { + when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) + .thenThrow(new SystemUiProxy.GetRecentTasksException("task load failed")); + + RecentTasksList.TaskLoadResult taskList = mRecentTasksList.loadTasksInBackground( + Integer.MAX_VALUE, -1, false); + + assertThat(taskList.mRequestId).isEqualTo(-1); + assertThat(taskList).isEmpty(); + } + + @Test + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + public void loadTasksInBackground_freeformTask_multiDesksInMultiDisplays() throws Exception { + List tasksInDefaultDesk1 = Arrays.asList( + createRecentTaskInfo(/* taskId = */ 1, DEFAULT_DISPLAY), + createRecentTaskInfo(/* taskId = */ 4, DEFAULT_DISPLAY)); + List tasksInDefaultDesk2 = Arrays.asList( + createRecentTaskInfo(/* taskId = */ 2, DEFAULT_DISPLAY), + createRecentTaskInfo(/* taskId = */ 3, DEFAULT_DISPLAY)); + List tasksInExtend = Arrays.asList( + createRecentTaskInfo(/* taskId = */ 5, /* displayId = */ 1), + createRecentTaskInfo(/* taskId = */ 6, /* displayId = */ 1)); + GroupedTaskInfo recentTaskInfosOfDesk1 = GroupedTaskInfo.forDeskTasks(/* deskId = */1, + DEFAULT_DISPLAY, tasksInDefaultDesk1, /* minimizedTaskIds = */ + Collections.emptySet()); + GroupedTaskInfo recentTaskInfosOfDesk2 = GroupedTaskInfo.forDeskTasks(/* deskId = */2, + DEFAULT_DISPLAY, tasksInDefaultDesk2, /* minimizedTaskIds = */ + Collections.emptySet()); + GroupedTaskInfo recentTaskInfosOfDesk3 = GroupedTaskInfo.forDeskTasks(/* deskId = */3, + /* displayId = */ 1, tasksInExtend, /* minimizedTaskIds = */ + Collections.emptySet()); + when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())).thenReturn( + new ArrayList<>(Arrays.asList(recentTaskInfosOfDesk1, recentTaskInfosOfDesk2, + recentTaskInfosOfDesk3))); + + List taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, + false); + + assertThat(taskList).hasSize(3); + assertThat(taskList.get(2).taskViewType).isEqualTo(TaskViewType.DESKTOP); + List actualFreeformTasksInDesk1 = taskList.get(2).getTasks(); + assertThat(actualFreeformTasksInDesk1).hasSize(2); + assertThat(actualFreeformTasksInDesk1.get(0).key.id).isEqualTo(1); + assertThat(actualFreeformTasksInDesk1.get(0).isMinimized).isFalse(); + assertThat(actualFreeformTasksInDesk1.get(1).key.id).isEqualTo(4); + assertThat(actualFreeformTasksInDesk1.get(1).isMinimized).isFalse(); + assertThat(((DesktopTask) taskList.get(2)).getDeskId()).isEqualTo(1); + assertThat(((DesktopTask) taskList.get(2)).getDisplayId()).isEqualTo(DEFAULT_DISPLAY); + + assertThat(taskList.get(1).taskViewType).isEqualTo(TaskViewType.DESKTOP); + List actualFreeformTasksInDesk2 = taskList.get(1).getTasks(); + assertThat(actualFreeformTasksInDesk2).hasSize(2); + assertThat(actualFreeformTasksInDesk2.get(0).key.id).isEqualTo(2); + assertThat(actualFreeformTasksInDesk2.get(0).isMinimized).isFalse(); + assertThat(actualFreeformTasksInDesk2.get(1).key.id).isEqualTo(3); + assertThat(actualFreeformTasksInDesk2.get(1).isMinimized).isFalse(); + assertThat(((DesktopTask) taskList.get(1)).getDeskId()).isEqualTo(2); + assertThat(((DesktopTask) taskList.get(1)).getDisplayId()).isEqualTo(DEFAULT_DISPLAY); + + assertThat(taskList.get(0).taskViewType).isEqualTo(TaskViewType.DESKTOP); + List actualFreeformTasksInDesk3 = taskList.get(0).getTasks(); + assertThat(actualFreeformTasksInDesk3).hasSize(2); + assertThat(actualFreeformTasksInDesk3.get(0).key.id).isEqualTo(5); + assertThat(actualFreeformTasksInDesk3.get(0).isMinimized).isFalse(); + assertThat(actualFreeformTasksInDesk3.get(1).key.id).isEqualTo(6); + assertThat(actualFreeformTasksInDesk3.get(1).isMinimized).isFalse(); + assertThat(((DesktopTask) taskList.get(0)).getDeskId()).isEqualTo(3); + assertThat(((DesktopTask) taskList.get(0)).getDisplayId()).isEqualTo(1); + } + + @Test + public void loadTasksInBackground_moreThanKeys_hasValidTaskDescription() throws Exception { + String taskDescription = "Wheeee!"; + RecentTaskInfo task1 = new RecentTaskInfo(); + task1.taskDescription = new ActivityManager.TaskDescription(taskDescription); + RecentTaskInfo task2 = new RecentTaskInfo(); + task2.taskDescription = new ActivityManager.TaskDescription(); + GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forSplitTasks(task1, task2, + new SplitBounds( + /* leftTopBounds = */ new Rect(), + /* rightBottomBounds = */ new Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_50_50)); + when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) + .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); + + List taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, + false); + + assertEquals(1, taskList.size()); + var tasks = taskList.get(0).getTasks(); + assertEquals(2, tasks.size()); + assertEquals(taskDescription, tasks.get(0).taskDescription.getLabel()); + assertNull(tasks.get(1).taskDescription.getLabel()); + } + + @Test + @EnableFlags(FLAG_ENABLE_LATER_IS_LOCKED_CHECK) + public void loadTasksInBackground_moreThanKeys_doesNotCallIsDeviceLocked() throws Exception { + GroupedTaskInfo recentTaskInfos = + GroupedTaskInfo.forFullscreenTasks(createRecentTaskInfo(1, DEFAULT_DISPLAY)); + when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) + .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); + + mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, false); + + verify(mKeyguardManager, times(0)).isDeviceLocked(); + } + + @Test + @DisableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + public void loadTasksInBackground_freeformTask_createsDesktopTaskPerDisplay() throws Exception { + List tasks = Arrays.asList( + createRecentTaskInfo(1 /* taskId */, DEFAULT_DISPLAY), + createRecentTaskInfo(4 /* taskId */, DEFAULT_DISPLAY), + createRecentTaskInfo(5 /* taskId */, 1 /* displayId */), + createRecentTaskInfo(6 /* taskId */, 1 /* displayId */)); + GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forDeskTasks( + 0 /* deskId */, DEFAULT_DISPLAY, tasks, + Collections.emptySet() /* minimizedTaskIds */); + when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) + .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); + + List taskList = mRecentTasksList.loadTasksInBackground( + Integer.MAX_VALUE /* numTasks */, -1 /* requestId */, false /* loadKeysOnly */); + + assertEquals(2, taskList.size()); + assertEquals(TaskViewType.DESKTOP, taskList.get(0).taskViewType); + List actualFreeformTasksDefaultDisplay = taskList.get(0).getTasks(); + assertEquals(2, actualFreeformTasksDefaultDisplay.size()); + assertEquals(1, actualFreeformTasksDefaultDisplay.get(0).key.id); + assertFalse(actualFreeformTasksDefaultDisplay.get(0).isMinimized); + assertEquals(4, actualFreeformTasksDefaultDisplay.get(1).key.id); + assertFalse(actualFreeformTasksDefaultDisplay.get(1).isMinimized); + + List actualFreeformTasksExternalDisplay = taskList.get(1).getTasks(); + assertEquals(2, actualFreeformTasksExternalDisplay.size()); + assertEquals(5, actualFreeformTasksExternalDisplay.get(0).key.id); + assertFalse(actualFreeformTasksExternalDisplay.get(0).isMinimized); + assertEquals(6, actualFreeformTasksExternalDisplay.get(1).key.id); + assertFalse(actualFreeformTasksExternalDisplay.get(1).isMinimized); + } + + @Test + public void loadTasksInBackground_freeformTask_onlyMinimizedTasks_createDesktopTask() + throws Exception { + List tasks = Arrays.asList( + createRecentTaskInfo(1 /* taskId */, DEFAULT_DISPLAY), + createRecentTaskInfo(4 /* taskId */, DEFAULT_DISPLAY), + createRecentTaskInfo(5 /* taskId */, DEFAULT_DISPLAY)); + Set minimizedTaskIds = + Arrays.stream(new Integer[]{1, 4, 5}).collect(Collectors.toSet()); + GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forDeskTasks( + 0 /* deskId */, DEFAULT_DISPLAY, tasks, minimizedTaskIds); + when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) + .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); + + List taskList = mRecentTasksList.loadTasksInBackground( + Integer.MAX_VALUE /* numTasks */, -1 /* requestId */, false /* loadKeysOnly */); + + assertEquals(1, taskList.size()); + assertEquals(TaskViewType.DESKTOP, taskList.get(0).taskViewType); + List actualFreeformTasks = taskList.get(0).getTasks(); + assertEquals(3, actualFreeformTasks.size()); + assertEquals(1, actualFreeformTasks.get(0).key.id); + assertTrue(actualFreeformTasks.get(0).isMinimized); + assertEquals(4, actualFreeformTasks.get(1).key.id); + assertTrue(actualFreeformTasks.get(1).isMinimized); + assertEquals(5, actualFreeformTasks.get(2).key.id); + assertTrue(actualFreeformTasks.get(2).isMinimized); + } + + private TaskInfo createRecentTaskInfo(int taskId, int displayId) { + RecentTaskInfo recentTaskInfo = new RecentTaskInfo(); + recentTaskInfo.taskId = taskId; + recentTaskInfo.displayId = displayId; + return recentTaskInfo; + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt new file mode 100644 index 00000000000..7f70b18f620 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt @@ -0,0 +1,245 @@ +package com.android.quickstep + +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.annotation.UiThreadTest +import androidx.test.filters.SmallTest +import com.android.launcher3.dagger.LauncherComponentProvider +import com.android.launcher3.util.DisplayController.CHANGE_DENSITY +import com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE +import com.android.launcher3.util.DisplayController.CHANGE_ROTATION +import com.android.launcher3.util.DisplayController.Info +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.NavigationMode +import com.android.launcher3.util.SandboxApplication +import com.android.quickstep.util.GestureExclusionManager +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_MAGNIFICATION_OVERLAP +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING +import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.reset +import org.mockito.Mockito.verify +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.verifyNoMoreInteractions +import org.mockito.kotlin.whenever + +/** Unit test for [RecentsAnimationDeviceState]. */ +@SmallTest +@UiThreadTest +@RunWith(LauncherMultivalentJUnit::class) +class RecentsAnimationDeviceStateTest { + + @get:Rule val context = SandboxApplication() + + @get:Rule var mockitoRule: MockitoRule = MockitoJUnit.rule() + + @Mock private lateinit var exclusionManager: GestureExclusionManager + @Mock private lateinit var info: Info + @Mock private lateinit var rotationTouchHelper: RotationTouchHelper + + private lateinit var underTest: RecentsAnimationDeviceState + + @Before + fun setup() { + val component = LauncherComponentProvider.get(context) + underTest = + RecentsAnimationDeviceState( + context, + DEFAULT_DISPLAY, + rotationTouchHelper, + exclusionManager, + component.displayController, + component.contextualSearchStateManager, + component.settingsCache, + component.daggerSingletonTracker, + ) + } + + @After + fun tearDown() { + UI_HELPER_EXECUTOR.submit {}.get() + MAIN_EXECUTOR.submit {}.get() + } + + @Test + fun registerExclusionListener_success() { + underTest.registerExclusionListener() + + verify(exclusionManager).addListener(underTest) + } + + @Test + fun registerExclusionListener_again_fail() { + underTest.registerExclusionListener() + reset(exclusionManager) + + underTest.registerExclusionListener() + + verifyNoMoreInteractions(exclusionManager) + } + + @Test + fun unregisterExclusionListener_success() { + underTest.registerExclusionListener() + reset(exclusionManager) + + underTest.unregisterExclusionListener() + + verify(exclusionManager).removeListener(underTest) + } + + @Test + fun unregisterExclusionListener_again_fail() { + underTest.registerExclusionListener() + underTest.unregisterExclusionListener() + reset(exclusionManager) + + underTest.unregisterExclusionListener() + + verifyNoMoreInteractions(exclusionManager) + } + + @Test + fun onDisplayInfoChanged_noButton_registerExclusionListener() { + doReturn(NavigationMode.NO_BUTTON).whenever(info).getNavigationMode() + + underTest.onDisplayInfoChanged(context, info, CHANGE_ROTATION or CHANGE_NAVIGATION_MODE) + + verify(exclusionManager).addListener(underTest) + } + + @Test + fun onDisplayInfoChanged_twoButton_unregisterExclusionListener() { + underTest.registerExclusionListener() + whenever(info.getNavigationMode()).thenReturn(NavigationMode.TWO_BUTTONS) + reset(exclusionManager) + + underTest.onDisplayInfoChanged(context, info, CHANGE_ROTATION or CHANGE_NAVIGATION_MODE) + + verify(exclusionManager).removeListener(underTest) + } + + @Test + fun onDisplayInfoChanged_changeDensity_noOp() { + underTest.registerExclusionListener() + whenever(info.getNavigationMode()).thenReturn(NavigationMode.NO_BUTTON) + reset(exclusionManager) + + underTest.onDisplayInfoChanged(context, info, CHANGE_DENSITY) + + verifyNoMoreInteractions(exclusionManager) + } + + @Test + fun trackpadGesturesNotAllowedForSelectedStates() { + val disablingStates = + GESTURE_DISABLING_SYSUI_STATES + SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED + + allSysUiStates().forEach { state -> + val canStartGesture = !disablingStates.contains(state) + underTest.setSysUIStateFlags(state) + assertThat(underTest.canStartTrackpadGesture()).isEqualTo(canStartGesture) + } + } + + @Test + fun trackpadGesturesNotAllowedIfHomeAndOverviewIsDisabled() { + val stateToExpectedResult = + mapOf( + SYSUI_STATE_HOME_DISABLED to true, + SYSUI_STATE_OVERVIEW_DISABLED to true, + DEFAULT_STATE.enable(SYSUI_STATE_OVERVIEW_DISABLED) + .enable(SYSUI_STATE_HOME_DISABLED) to false, + ) + + stateToExpectedResult.forEach { (state, allowed) -> + underTest.setSysUIStateFlags(state) + assertThat(underTest.canStartTrackpadGesture()).isEqualTo(allowed) + } + } + + @Test + fun systemGesturesNotAllowedForSelectedStates() { + val disablingStates = GESTURE_DISABLING_SYSUI_STATES + SYSUI_STATE_NAV_BAR_HIDDEN + + allSysUiStates().forEach { state -> + val canStartGesture = !disablingStates.contains(state) + underTest.setSysUIStateFlags(state) + assertThat(underTest.canStartSystemGesture()).isEqualTo(canStartGesture) + } + } + + @Test + fun systemGesturesNotAllowedWhenGestureStateDisabledAndNavBarVisible() { + val stateToExpectedResult = + mapOf( + DEFAULT_STATE.enable(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) + .disable(SYSUI_STATE_NAV_BAR_HIDDEN) to true, + DEFAULT_STATE.enable(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) + .enable(SYSUI_STATE_NAV_BAR_HIDDEN) to true, + DEFAULT_STATE.disable(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) + .disable(SYSUI_STATE_NAV_BAR_HIDDEN) to true, + DEFAULT_STATE.disable(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) + .enable(SYSUI_STATE_NAV_BAR_HIDDEN) to false, + ) + + stateToExpectedResult.forEach { (state, gestureAllowed) -> + underTest.setSysUIStateFlags(state) + assertThat(underTest.canStartSystemGesture()).isEqualTo(gestureAllowed) + } + } + + @Test + fun startOverviewCommandForDisallowedSysUiState() { + val disallowedStates = GESTURE_DISABLING_SYSUI_STATES + SYSUI_STATE_OVERVIEW_DISABLED + + allSysUiStates().forEach { state -> + underTest.setSysUIStateFlags(state) + + val isAllowed = !disallowedStates.contains(state) + assertThat(underTest.canStartOverviewCommand()).isEqualTo(isAllowed) + } + } + + private fun allSysUiStates(): List { + // SYSUI_STATES_* are binary flags + return (0..SYSUI_STATES_COUNT).map { 1L shl it } + } + + companion object { + private val GESTURE_DISABLING_SYSUI_STATES = + listOf( + SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED, + SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING, + SYSUI_STATE_QUICK_SETTINGS_EXPANDED, + SYSUI_STATE_MAGNIFICATION_OVERLAP, + SYSUI_STATE_DEVICE_DREAMING, + SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION, + SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING, + ) + private const val SYSUI_STATES_COUNT = 33 + private const val DEFAULT_STATE = 0L + } + + private fun Long.enable(state: Long) = this or state + + private fun Long.disable(state: Long) = this and state.inv() +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsModelTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsModelTest.java new file mode 100644 index 00000000000..5f3f41e705c --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsModelTest.java @@ -0,0 +1,273 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.ActivityManager; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Rect; +import android.platform.test.flag.junit.SetFlagsRule; + +import androidx.test.annotation.UiThreadTest; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.launcher3.Flags; +import com.android.launcher3.R; +import com.android.launcher3.graphics.ThemeManager; +import com.android.launcher3.icons.IconChangeTracker; +import com.android.launcher3.util.DaggerSingletonTracker; +import com.android.launcher3.util.Executors; +import com.android.launcher3.util.LockedUserState; +import com.android.launcher3.util.MutableListenableStream; +import com.android.launcher3.util.PackageUserKey; +import com.android.quickstep.util.GroupTask; +import com.android.quickstep.util.SplitTask; +import com.android.systemui.shared.recents.model.Task; +import com.android.systemui.shared.system.TaskStackChangeListeners; +import com.android.wm.shell.shared.split.SplitBounds; +import com.android.wm.shell.shared.split.SplitScreenConstants; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.function.Consumer; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class RecentsModelTest { + @Mock + private Context mContext; + + @Mock + private TaskThumbnailCache mThumbnailCache; + + @Mock + private RecentTasksList mTasksList; + private RecentsModel.RecentTasksChangedListener mRegisteredTaskListListener = null; + + @Mock + private HighResLoadingState mHighResLoadingState; + + @Mock private IconChangeTracker mIconChangeTracker; + + @Mock + private LockedUserState mLockedUserState; + + @Mock + private ThemeManager mThemeManager; + + private RecentsModel mRecentsModel; + + private RecentTasksList.TaskLoadResult mTaskResult; + + private Resources mResource; + + @Rule public MockitoRule mockitoRule = MockitoJUnit.rule(); + + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + + @Before + public void setup() throws NoSuchFieldException { + mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW); + mTaskResult = getTaskResult(); + doAnswer(invocation-> { + Consumer> callback = invocation.getArgument(1); + callback.accept(mTaskResult); + return null; + }).when(mTasksList).getTaskKeys(anyInt(), any()); + doAnswer(invocation -> { + mRegisteredTaskListListener = invocation.getArgument(0); + return null; + }).when(mTasksList).registerRecentTasksChangedListener(any()); + doAnswer(invocation -> { + mRegisteredTaskListListener = null; + return null; + }).when(mTasksList).unregisterRecentTasksChangedListener(); + doAnswer(invocation -> { + if (mRegisteredTaskListListener != null) { + mRegisteredTaskListListener.onRecentTasksChanged(); + } + return null; + }).when(mTasksList).onRecentTasksChanged(); + + when(mHighResLoadingState.isEnabled()).thenReturn(true); + when(mThumbnailCache.getHighResLoadingState()).thenReturn(mHighResLoadingState); + when(mThumbnailCache.isPreloadingEnabled()).thenReturn(true); + + doReturn(new MutableListenableStream()) + .when(mIconChangeTracker).getChanges(); + mRecentsModel = new RecentsModel( + mContext, + mTasksList, + mock(TaskIconCache.class), + mThumbnailCache, + mock(TaskStackChangeListeners.class), + mLockedUserState, + () -> mThemeManager, + mock(DaggerSingletonTracker.class), + Executors.UI_HELPER_EXECUTOR, + mIconChangeTracker); + + mResource = mock(Resources.class); + when(mResource.getInteger((R.integer.recentsThumbnailCacheSize))).thenReturn(3); + when(mContext.getResources()).thenReturn(mResource); + } + + @Test + @UiThreadTest + public void preloadOnHighResolutionEnabled() { + mRecentsModel.preloadCacheIfNeeded(); + + ArgumentCaptor taskArgs = ArgumentCaptor.forClass(Task.class); + verify(mRecentsModel.getThumbnailCache(), times(2)) + .updateThumbnailInCache(taskArgs.capture(), /* lowResolution= */ eq(false)); + + GroupTask expectedGroupTask = mTaskResult.get(0); + var taskArgsValues = taskArgs.getAllValues(); + var expectedTasks = expectedGroupTask.getTasks(); + assertThat(taskArgsValues.size()).isEqualTo(expectedTasks.size()); + for (int i = 0; i < expectedTasks.size(); ++i) { + assertThat(taskArgsValues.get(i)).isEqualTo(expectedTasks.get(i)); + } + } + + @Test + public void notPreloadOnHighResolutionDisabled() { + when(mHighResLoadingState.isEnabled()).thenReturn(false); + when(mThumbnailCache.isPreloadingEnabled()).thenReturn(true); + mRecentsModel.preloadCacheIfNeeded(); + verify(mRecentsModel.getThumbnailCache(), never()) + .updateThumbnailInCache(any(), anyBoolean()); + } + + @Test + public void notPreloadOnPreloadDisabled() { + when(mThumbnailCache.isPreloadingEnabled()).thenReturn(false); + mRecentsModel.preloadCacheIfNeeded(); + verify(mRecentsModel.getThumbnailCache(), never()) + .updateThumbnailInCache(any(), anyBoolean()); + + } + + @Test + public void increaseCacheSizeAndPreload() { + // Mock to return preload is needed + when(mThumbnailCache.updateCacheSizeAndRemoveExcess()).thenReturn(true); + // Update cache size + mRecentsModel.updateCacheSizeAndPreloadIfNeeded(); + // Assert update cache is called + verify(mRecentsModel.getThumbnailCache(), times(2)) + .updateThumbnailInCache(any(), /* lowResolution= */ eq(false)); + } + + @Test + public void decreaseCacheSizeAndNotPreload() { + // Mock to return preload is not needed + when(mThumbnailCache.updateCacheSizeAndRemoveExcess()).thenReturn(false); + // Update cache size + mRecentsModel.updateCacheSizeAndPreloadIfNeeded(); + // Assert update cache is never called + verify(mRecentsModel.getThumbnailCache(), never()) + .updateThumbnailInCache(any(), anyBoolean()); + } + + @Test + public void themeCallbackAttachedOnUnlock() { + verify(mThemeManager, never()).addChangeListener(any()); + + ArgumentCaptor callbackCaptor = ArgumentCaptor.forClass(Runnable.class); + verify(mLockedUserState).runOnUserUnlocked(callbackCaptor.capture()); + + callbackCaptor.getAllValues().forEach(Runnable::run); + verify(mThemeManager, times(1)).addChangeListener(any()); + } + + @Test + public void recentTaskListChangesNotiftListeners() { + RecentsModel.RecentTasksChangedListener listener1 = mock( + RecentsModel.RecentTasksChangedListener.class); + RecentsModel.RecentTasksChangedListener listener2 = mock( + RecentsModel.RecentTasksChangedListener.class); + + mRecentsModel.registerRecentTasksChangedListener(listener1); + + mTasksList.onRecentTasksChanged(); + verify(listener1, times(1)).onRecentTasksChanged(); + verify(listener2, times(0)).onRecentTasksChanged(); + + mRecentsModel.registerRecentTasksChangedListener(listener2); + + mTasksList.onRecentTasksChanged(); + verify(listener1, times(2)).onRecentTasksChanged(); + verify(listener2, times(1)).onRecentTasksChanged(); + + mRecentsModel.unregisterRecentTasksChangedListener(listener1); + + mTasksList.onRecentTasksChanged(); + verify(listener1, times(2)).onRecentTasksChanged(); + verify(listener2, times(2)).onRecentTasksChanged(); + + mRecentsModel.unregisterRecentTasksChangedListener(listener2); + + mTasksList.onRecentTasksChanged(); + verify(listener1, times(2)).onRecentTasksChanged(); + verify(listener2, times(2)).onRecentTasksChanged(); + } + + private RecentTasksList.TaskLoadResult getTaskResult() { + RecentTasksList.TaskLoadResult allTasks = new RecentTasksList.TaskLoadResult(0, false, 1); + ActivityManager.RecentTaskInfo taskInfo1 = new ActivityManager.RecentTaskInfo(); + Task.TaskKey taskKey1 = new Task.TaskKey(taskInfo1); + Task task1 = Task.from(taskKey1, taskInfo1, false); + + ActivityManager.RecentTaskInfo taskInfo2 = new ActivityManager.RecentTaskInfo(); + Task.TaskKey taskKey2 = new Task.TaskKey(taskInfo2); + Task task2 = Task.from(taskKey2, taskInfo2, false); + + allTasks.add( + new SplitTask(task1, task2, new SplitBounds( + /* leftTopBounds = */ new Rect(), + /* rightBottomBounds = */ new Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_50_50))); + return allTasks; + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsWindowSwipeHandlerTestCase.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsWindowSwipeHandlerTestCase.java new file mode 100644 index 00000000000..63ea6f4b1dd --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsWindowSwipeHandlerTestCase.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep; + +import androidx.annotation.NonNull; +import androidx.test.filters.SmallTest; + +import com.android.launcher3.util.LauncherMultivalentJUnit; +import com.android.quickstep.fallback.FallbackRecentsView; +import com.android.quickstep.fallback.RecentsState; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.quickstep.window.RecentsWindowSwipeHandler; + +import org.junit.runner.RunWith; +import org.mockito.Mock; + +@SmallTest +@RunWith(LauncherMultivalentJUnit.class) +public class RecentsWindowSwipeHandlerTestCase extends AbsSwipeUpHandlerTestCase< + RecentsState, + RecentsWindowManager, + FallbackRecentsView, + RecentsWindowSwipeHandler, + FallbackWindowInterface> { + + @Mock private FallbackRecentsView mRecentsView; + @Mock private RecentsWindowManager mRecentsWindowManager; + + @NonNull + @Override + protected RecentsWindowSwipeHandler createSwipeHandler(long touchTimeMs, + boolean continuingLastGesture) { + return new RecentsWindowSwipeHandler( + mContext, + mTaskAnimationManager, + mDeviceState, + mRotationTouchHelper, + mRecentsWindowManager, + mGestureState, + touchTimeMs, + continuingLastGesture, + mInputConsumerController, + mMSDLPlayerWrapper); + } + + @NonNull + @Override + protected RecentsWindowManager getRecentsContainer() { + return mRecentsWindowManager; + } + + @NonNull + @Override + protected FallbackRecentsView getRecentsView() { + return mRecentsView; + } + + @NonNull + @Override + protected RecentsState getBaseState() { + return RecentsState.BG_LAUNCHER; + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java new file mode 100644 index 00000000000..ffbdaa6bb8d --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java @@ -0,0 +1,289 @@ +/* + * 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.quickstep; + +import static android.view.Display.DEFAULT_DISPLAY; + +import static com.android.quickstep.TaskAnimationManager.RECENTS_ANIMATION_START_TIMEOUT_MS; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +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.mockito.kotlin.OngoingStubbingKt.whenever; + +import android.app.ActivityManager; +import android.app.ActivityOptions; +import android.content.Context; +import android.content.Intent; +import android.content.res.Configuration; +import android.graphics.Rect; +import android.os.Bundle; +import android.os.SystemClock; +import android.view.RemoteAnimationTarget; +import android.view.SurfaceControl; +import android.window.TransitionInfo; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.app.displaylib.fakes.FakePerDisplayRepository; +import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.Executors; +import com.android.quickstep.views.RecentsView; +import com.android.systemui.shared.system.RecentsAnimationControllerCompat; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.concurrent.ExecutionException; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class TaskAnimationManagerTest { + private static final int EXTERNAL_DISPLAY_ID = 1; + protected final Context mContext = + InstrumentationRegistry.getInstrumentation().getTargetContext(); + + @Rule + public MockitoRule mockitoRule = MockitoJUnit.rule(); + + @Mock + private SystemUiProxy mSystemUiProxy; + + private TaskAnimationManager mTaskAnimationManager; + @Mock + private TaskAnimationManager mTaskAnimationManagerForExternalDisplay; + private FakePerDisplayRepository mPerDisplayRepository; + + @Before + public void setUp() { + DisplayController displayController = DisplayController.INSTANCE.get(mContext); + mPerDisplayRepository = new FakePerDisplayRepository<>(); + mTaskAnimationManager = spy(new TaskAnimationManager(mContext, DEFAULT_DISPLAY, + displayController, mPerDisplayRepository) { + @Override + SystemUiProxy getSystemUiProxy() { + return mSystemUiProxy; + } + }); + mPerDisplayRepository.add(DEFAULT_DISPLAY, mTaskAnimationManager); + } + + @Test + public void startRecentsActivity_allowBackgroundLaunch() { + final LauncherActivityInterface activityInterface = mock(LauncherActivityInterface.class); + final GestureState gestureState = mock(GestureState.class); + final RecentsAnimationCallbacks.RecentsAnimationListener listener = + mock(RecentsAnimationCallbacks.RecentsAnimationListener.class); + doReturn(activityInterface).when(gestureState).getContainerInterface(); + runOnMainSync(() -> + mTaskAnimationManager.startRecentsAnimation(gestureState, new Intent(), listener)); + final ArgumentCaptor optionsCaptor = + ArgumentCaptor.forClass(ActivityOptions.class); + verify(mSystemUiProxy) + .startRecentsTransition(any(), optionsCaptor.capture(), any(), anyBoolean(), + any(), anyInt()); + assertEquals(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS, + optionsCaptor.getValue().getPendingIntentBackgroundActivityStartMode()); + } + + @Test + public void startRecentsActivity_finishRecentsBeforeStartingAnother() { + final LauncherActivityInterface activityInterface = mock(LauncherActivityInterface.class); + final GestureState gestureState = mock(GestureState.class); + final RecentsAnimationCallbacks.RecentsAnimationListener listener = + mock(RecentsAnimationCallbacks.RecentsAnimationListener.class); + doReturn(activityInterface).when(gestureState).getContainerInterface(); + mPerDisplayRepository.add(EXTERNAL_DISPLAY_ID, mTaskAnimationManagerForExternalDisplay); + when(mTaskAnimationManager.isRecentsAnimationRunning()).thenReturn(true); + runOnMainSync(() -> + mTaskAnimationManager.startRecentsAnimation(gestureState, new Intent(), listener)); + ArgumentCaptor finishCallback = ArgumentCaptor.forClass(Runnable.class); + verify(mTaskAnimationManager, times(1)) + .finishRunningRecentsAnimation(anyBoolean(), anyBoolean(), finishCallback.capture(), + any()); + runOnMainSync(() -> finishCallback.getValue().run()); + verify(mSystemUiProxy).startRecentsTransition(any(), any(), any(), anyBoolean(), + any(), anyInt()); + verify(mTaskAnimationManagerForExternalDisplay, never()) + .finishRunningRecentsAnimation(anyBoolean(), anyBoolean(), any(), any()); + } + + @Test + public void startRecentsActivity_finishAllRecentsBeforeStartingAnother() { + final LauncherActivityInterface activityInterface = mock(LauncherActivityInterface.class); + final GestureState gestureState = mock(GestureState.class); + final RecentsAnimationCallbacks.RecentsAnimationListener listener = + mock(RecentsAnimationCallbacks.RecentsAnimationListener.class); + doReturn(activityInterface).when(gestureState).getContainerInterface(); + RecentsView recentsView = mock(RecentsView.class); + QuickstepLauncher quickstepLauncher = mock(QuickstepLauncher.class); + doReturn(quickstepLauncher).when(activityInterface).getCreatedContainer(); + doReturn(recentsView).when(quickstepLauncher).getOverviewPanel(); + whenever(recentsView.getRecentsAnimationController()).thenReturn( + mock(RecentsAnimationController.class)); + whenever(activityInterface.isInLiveTileMode()).thenReturn(true); + + // Start once on default display to make sure mLastGestureState is set. + runOnMainSync(() -> + mTaskAnimationManager.startRecentsAnimation(gestureState, new Intent(), listener)); + verify(mSystemUiProxy).startRecentsTransition(any(), any(), any(), anyBoolean(), + any(), eq(DEFAULT_DISPLAY)); + + mPerDisplayRepository.add(EXTERNAL_DISPLAY_ID, mTaskAnimationManagerForExternalDisplay); + whenever(mTaskAnimationManagerForExternalDisplay.isRecentsAnimationRunning()).thenReturn( + true); + whenever(mTaskAnimationManager.isRecentsAnimationRunning()).thenReturn( + true); + + runOnMainSync(() -> + mTaskAnimationManager.startRecentsAnimation(gestureState, new Intent(), listener)); + ArgumentCaptor screenshotFinishCaptor = ArgumentCaptor.forClass(Runnable.class); + verify(recentsView, times(1)).switchToScreenshot(any(), screenshotFinishCaptor.capture()); + screenshotFinishCaptor.getValue().run(); + ArgumentCaptor finishRecentsFinishCaptor = ArgumentCaptor.forClass( + Runnable.class); + verify(recentsView, times(1)).finishRecentsAnimation(anyBoolean(), anyBoolean(), + finishRecentsFinishCaptor.capture()); + finishRecentsFinishCaptor.getValue().run(); + ArgumentCaptor finishCallback = ArgumentCaptor.forClass(Runnable.class); + verify(mTaskAnimationManagerForExternalDisplay, times(1)) + .finishRunningRecentsAnimation(anyBoolean(), anyBoolean(), finishCallback.capture(), + any()); + + runOnMainSync(() -> finishCallback.getValue().run()); + verify(mSystemUiProxy, times(2)).startRecentsTransition(any(), any(), any(), anyBoolean(), + any(), eq(DEFAULT_DISPLAY)); + } + + @Test + public void testLauncherDestroyed_whileRecentsAnimationStartPending_finishesAnimation() { + final GestureState gestureState = buildMockGestureState(); + final ArgumentCaptor listenerCaptor = + ArgumentCaptor.forClass(RecentsAnimationCallbacks.class); + final RecentsAnimationControllerCompat controllerCompat = + mock(RecentsAnimationControllerCompat.class); + final RemoteAnimationTarget remoteAnimationTarget = new RemoteAnimationTarget( + /* taskId= */ 0, + /* mode= */ RemoteAnimationTarget.MODE_CLOSING, + /* leash= */ new SurfaceControl(), + /* isTranslucent= */ false, + /* clipRect= */ null, + /* contentInsets= */ null, + /* prefixOrderIndex= */ 0, + /* position= */ null, + /* localBounds= */ null, + /* screenSpaceBounds= */ null, + new Configuration().windowConfiguration, + /* isNotInRecents= */ false, + /* startLeash= */ null, + /* startBounds= */ null, + /* taskInfo= */ new ActivityManager.RunningTaskInfo(), + /* allowEnterPip= */ false); + + when(mSystemUiProxy + .startRecentsTransition(any(), any(), listenerCaptor.capture(), anyBoolean(), any(), + anyInt())) + .thenReturn(true); + + runOnMainSync(() -> { + mTaskAnimationManager.startRecentsAnimation( + gestureState, + new Intent(), + mock(RecentsAnimationCallbacks.RecentsAnimationListener.class)); + + // Simulate multiple launcher destroyed events before the recents animation start + mTaskAnimationManager.onLauncherDestroyed(); + mTaskAnimationManager.onLauncherDestroyed(); + mTaskAnimationManager.onLauncherDestroyed(); + listenerCaptor.getValue().onAnimationStart( + controllerCompat, + new RemoteAnimationTarget[] { remoteAnimationTarget }, + new RemoteAnimationTarget[] { remoteAnimationTarget }, + new Rect(), + new Bundle(), + new TransitionInfo(0, 0)); + }); + + // Verify checks that finish was only called once + runOnMainSync(() -> verify(controllerCompat) + .finish(/* toHome= */ eq(false), anyBoolean(), any())); + } + + @Test + public void testRecentsAnimationStartTimeout_cleansUpRecentsAnimation() { + final GestureState gestureState = buildMockGestureState(); + when(mSystemUiProxy + .startRecentsTransition(any(), any(), any(), anyBoolean(), any(), anyInt())) + .thenReturn(true); + + runOnMainSync(() -> { + assertNull("Recents animation was started prematurely:", + mTaskAnimationManager.getCurrentCallbacks()); + + mTaskAnimationManager.startRecentsAnimation( + gestureState, + new Intent(), + mock(RecentsAnimationCallbacks.RecentsAnimationListener.class)); + + assertNotNull("TaskAnimationManager was cleaned up prematurely:", + mTaskAnimationManager.getCurrentCallbacks()); + }); + + SystemClock.sleep(RECENTS_ANIMATION_START_TIMEOUT_MS); + + runOnMainSync(() -> assertNull("TaskAnimationManager was not cleaned up after the timeout:", + mTaskAnimationManager.getCurrentCallbacks())); + } + + protected static void runOnMainSync(Runnable runnable) { + InstrumentationRegistry.getInstrumentation().runOnMainSync(runnable); + try { + Executors.MAIN_EXECUTOR.submit(() -> null).get(); + } catch (InterruptedException | ExecutionException e) { + throw new RuntimeException(e); + } + } + + private GestureState buildMockGestureState() { + final GestureState gestureState = mock(GestureState.class); + + doReturn(mock(LauncherActivityInterface.class)).when(gestureState).getContainerInterface(); + when(gestureState.getRunningTaskIds(anyBoolean())).thenReturn(new int[0]); + + return gestureState; + } +} diff --git a/quickstep/tests/src/com/android/quickstep/TaskThumbnailCacheTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskThumbnailCacheTest.java similarity index 85% rename from quickstep/tests/src/com/android/quickstep/TaskThumbnailCacheTest.java rename to quickstep/tests/multivalentTests/src/com/android/quickstep/TaskThumbnailCacheTest.java index 4e04261e5ce..a3ec4097627 100644 --- a/quickstep/tests/src/com/android/quickstep/TaskThumbnailCacheTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskThumbnailCacheTest.java @@ -28,20 +28,29 @@ import android.content.Context; import android.content.res.Resources; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.launcher3.R; +import com.android.launcher3.util.coroutines.ProductionDispatchers; import com.android.quickstep.util.TaskKeyCache; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import java.util.concurrent.Executor; @SmallTest +@RunWith(AndroidJUnit4.class) public class TaskThumbnailCacheTest { + + @Rule + public MockitoRule mockitoRule = MockitoJUnit.rule(); @Mock private Context mContext; @@ -53,7 +62,6 @@ public class TaskThumbnailCacheTest { @Before public void setup() throws NoSuchFieldException { - MockitoAnnotations.initMocks(this); when(mContext.getResources()).thenReturn(mResource); } @@ -63,7 +71,7 @@ public void increaseCacheSize() { when(mTaskKeyCache.getMaxSize()).thenReturn(3); when(mResource.getInteger((R.integer.recentsThumbnailCacheSize))).thenReturn(8); TaskThumbnailCache thumbnailCache = new TaskThumbnailCache(mContext, mock(Executor.class), - mTaskKeyCache); + mTaskKeyCache, ProductionDispatchers.INSTANCE); // Preload is needed when increasing size assertTrue(thumbnailCache.updateCacheSizeAndRemoveExcess()); @@ -76,7 +84,7 @@ public void decreaseCacheSize() { when(mTaskKeyCache.getMaxSize()).thenReturn(8); when(mResource.getInteger((R.integer.recentsThumbnailCacheSize))).thenReturn(3); TaskThumbnailCache thumbnailCache = new TaskThumbnailCache(mContext, mock(Executor.class), - mTaskKeyCache); + mTaskKeyCache, ProductionDispatchers.INSTANCE); // Preload is not needed when decreasing size assertFalse(thumbnailCache.updateCacheSizeAndRemoveExcess()); verify(mTaskKeyCache, times(1)).updateCacheSizeAndRemoveExcess(3); @@ -87,7 +95,7 @@ public void keepSameCacheSize() { when(mTaskKeyCache.getMaxSize()).thenReturn(3); when(mResource.getInteger((R.integer.recentsThumbnailCacheSize))).thenReturn(3); TaskThumbnailCache thumbnailCache = new TaskThumbnailCache(mContext, mock(Executor.class), - mTaskKeyCache); + mTaskKeyCache, ProductionDispatchers.INSTANCE); // Preload is not needed when it has the same cache size assertFalse(thumbnailCache.updateCacheSizeAndRemoveExcess()); verify(mTaskKeyCache, never()).updateCacheSizeAndRemoveExcess(anyInt()); diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskViewTestDIHelpers.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskViewTestDIHelpers.kt new file mode 100644 index 00000000000..283010e63bd --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskViewTestDIHelpers.kt @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.content.Context +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.AllModulesMinusWMProxy +import com.android.launcher3.util.TestDispatcherProvider +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.recents.data.AppTimersRepository +import com.android.quickstep.recents.data.FakeAppTimersRepository +import com.android.quickstep.recents.data.FakeRecentsDeviceProfileRepository +import com.android.quickstep.recents.data.FakeRecentsRotationStateRepository +import com.android.quickstep.recents.data.RecentsDeviceProfileRepository +import com.android.quickstep.recents.data.RecentsRotationStateRepository +import com.android.quickstep.recents.di.RecentsDependencies.Companion.maybeInitialize +import dagger.BindsInstance +import dagger.Component +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +@LauncherAppSingleton +@Component(modules = [AllModulesMinusWMProxy::class]) +interface TaskViewTestComponent : LauncherAppComponent { + @Component.Builder + interface Builder : LauncherAppComponent.Builder { + @BindsInstance fun bindRecentsModel(recentsModel: RecentsModel): Builder + + override fun build(): TaskViewTestComponent + } +} + +object TaskViewTestDIHelpers { + /** [context] is used as if it is RecentsView's context. */ + @OptIn(ExperimentalCoroutinesApi::class) + @JvmStatic + fun initializeRecentsDependencies(context: Context) { + val dp: DispatcherProvider = TestDispatcherProvider(UnconfinedTestDispatcher()) + val recentsDependencies = maybeInitialize(context, dp) + recentsDependencies.createRecentsViewScope(context) + recentsDependencies + .getScope(context)[RecentsRotationStateRepository::class.java.simpleName] = + FakeRecentsRotationStateRepository() + recentsDependencies + .getScope(context)[RecentsDeviceProfileRepository::class.java.simpleName] = + FakeRecentsDeviceProfileRepository() + recentsDependencies.getScope(context)[AppTimersRepository::class.java.simpleName] = + FakeAppTimersRepository() + } + + @JvmStatic + fun mockRecentsModel(): RecentsModel { + val recentsModel: RecentsModel = mock() + val taskThumbnailCache: TaskThumbnailCache = mock() + whenever(taskThumbnailCache.highResLoadingState).thenReturn(HighResLoadingState()) + whenever(recentsModel.thumbnailCache).thenReturn(taskThumbnailCache) + whenever(recentsModel.iconCache).thenReturn(mock()) + return recentsModel + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/TopTaskTrackerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/TopTaskTrackerTest.kt new file mode 100644 index 00000000000..109bf005280 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TopTaskTrackerTest.kt @@ -0,0 +1,303 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.app.ActivityManager +import android.app.ActivityTaskManager.INVALID_TASK_ID +import android.app.TaskInfo +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD +import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM +import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN +import android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.res.Resources +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.internal.R +import com.android.launcher3.statehandlers.DesktopVisibilityController +import com.android.launcher3.statehandlers.DesktopVisibilityController.Companion.INACTIVE_DESK_ID +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.quickstep.TopTaskTracker.HISTORY_SIZE +import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND +import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND +import com.android.wm.shell.Flags.FLAG_ENABLE_SHELL_TOP_TASK_TRACKING +import com.android.wm.shell.shared.GroupedTaskInfo +import com.android.wm.shell.shared.GroupedTaskInfo.TYPE_DESK +import com.android.wm.shell.shared.GroupedTaskInfo.TYPE_FULLSCREEN +import com.android.wm.shell.shared.GroupedTaskInfo.TYPE_SPLIT +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +/** Test for [TopTaskTracker] */ +@RunWith(AndroidJUnit4::class) +class TopTaskTrackerTest { + + @get:Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) + + private val mockContext = mock() + private val mockResources = mock() + + private lateinit var topTaskTracker: TopTaskTracker + + @Before + fun setUp() { + doReturn(mockResources).whenever(mockContext).resources + + val mockDaggerSingletonTracker = mock() + val mockSystemUiProxy = mock() + val mockDesktopVisibilityController = mock() + + topTaskTracker = + TopTaskTracker( + mockContext, + mockDaggerSingletonTracker, + mockSystemUiProxy, + mockDesktopVisibilityController, + ) + } + + @Test + @EnableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + fun getPlaceholderGroupedTaskInfo_shellTopTaskTrackingEnabled_noVisibleTasks() { + val cachedTaskInfo = TopTaskTracker.CachedTaskInfo(null) + val result = cachedTaskInfo.getPlaceholderGroupedTaskInfo(null) + assertThat(result).isNull() + } + + @Test + @EnableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + fun getPlaceholderGroupedTaskInfo_shellTopTaskTrackingEnabled_withVisibleTasks() { + val taskInfo = createTaskInfo(1, DEFAULT_DISPLAY) + val groupedTaskInfo = GroupedTaskInfo.forFullscreenTasks(taskInfo) + val cachedTaskInfo = TopTaskTracker.CachedTaskInfo(groupedTaskInfo) + + val result = cachedTaskInfo.getPlaceholderGroupedTaskInfo(null) + assertThat(result).isEqualTo(groupedTaskInfo) + } + + @Test + @DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + fun getPlaceholderGroupedTaskInfo_shellTopTaskTrackingDisabled_noTasks() { + val cachedTaskInfo = + TopTaskTracker.CachedTaskInfo( + emptyList(), + mockContext, + DEFAULT_DISPLAY, + INACTIVE_DESK_ID, + ) + + val result = cachedTaskInfo.getPlaceholderGroupedTaskInfo(null) + + assertThat(result).isNull() + } + + @Test + @DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + fun getPlaceholderGroupedTaskInfo_shellTopTaskTrackingDisabled_withFullscreenTask() { + val taskInfo = createTaskInfo(1, DEFAULT_DISPLAY) + val tasks = listOf(taskInfo) + val cachedTaskInfo = + TopTaskTracker.CachedTaskInfo(tasks, mockContext, DEFAULT_DISPLAY, INACTIVE_DESK_ID) + + val result = cachedTaskInfo.getPlaceholderGroupedTaskInfo(null) + + assertThat(result).isNotNull() + assertThat(result!!.isBaseType(TYPE_FULLSCREEN)).isTrue() + assertThat(result.taskInfo1).isEqualTo(taskInfo) + } + + @Test + @DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + fun getPlaceholderGroupedTaskInfo_shellTopTaskTrackingDisabled_withSplitTasks() { + val taskInfo1 = createTaskInfo(1, DEFAULT_DISPLAY) + val taskInfo2 = createTaskInfo(2, DEFAULT_DISPLAY) + val tasks = listOf(taskInfo1, taskInfo2) + val splitTaskIds = intArrayOf(1, 2) + val cachedTaskInfo = + TopTaskTracker.CachedTaskInfo(tasks, mockContext, DEFAULT_DISPLAY, INACTIVE_DESK_ID) + + val result = cachedTaskInfo.getPlaceholderGroupedTaskInfo(splitTaskIds) + + assertThat(result).isNotNull() + assertThat(result!!.isBaseType(TYPE_SPLIT)).isTrue() + assertThat(result.taskInfo1).isEqualTo(taskInfo1) + assertThat(result.taskInfo2).isEqualTo(taskInfo2) + } + + @Test + @DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun getPlaceholderGroupedTaskInfo_shellTopTaskTrackingDisabled_withDesktopEnabled_noActiveDesk() { + doReturn(true).whenever(mockResources).getBoolean(eq(R.bool.config_isDesktopModeSupported)) + doReturn(true) + .whenever(mockResources) + .getBoolean(eq(R.bool.config_canInternalDisplayHostDesktops)) + val taskInfo = createDesktopTaskInfo(1, DEFAULT_DISPLAY) + val tasks = listOf(taskInfo) + val cachedTaskInfo = + TopTaskTracker.CachedTaskInfo(tasks, mockContext, DEFAULT_DISPLAY, INACTIVE_DESK_ID) + + val result = cachedTaskInfo.getPlaceholderGroupedTaskInfo(null) + + assertThat(result).isNotNull() + assertThat(result!!.isBaseType(TYPE_FULLSCREEN)).isTrue() + assertThat(result.deskId).isEqualTo(INACTIVE_DESK_ID) + assertThat(result.taskInfo1).isEqualTo(taskInfo) + } + + @Test + @DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun getPlaceholderGroupedTaskInfo_shellTopTaskTrackingDisabled_withDesktopEnabled_withActiveDesk() { + doReturn(true).whenever(mockResources).getBoolean(eq(R.bool.config_isDesktopModeSupported)) + doReturn(true) + .whenever(mockResources) + .getBoolean(eq(R.bool.config_canInternalDisplayHostDesktops)) + val activeDeskId = 10 + val taskInfo = createDesktopTaskInfo(1, DEFAULT_DISPLAY) + val tasks = listOf(taskInfo) + val cachedTaskInfo = + TopTaskTracker.CachedTaskInfo(tasks, mockContext, DEFAULT_DISPLAY, activeDeskId) + + val result = cachedTaskInfo.getPlaceholderGroupedTaskInfo(null) + + assertThat(result).isNotNull() + assertThat(result!!.isBaseType(TYPE_DESK)).isTrue() + assertThat(result.deskId).isEqualTo(activeDeskId) + assertThat(result.getTaskInfoList()).isEqualTo(tasks) + } + + @Test + @DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING, FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND) + fun getPlaceholderGroupedTaskInfo_shellTopTaskTrackingDisabled_withDesktopDisabled_withActiveDesk() { + doReturn(true).whenever(mockResources).getBoolean(eq(R.bool.config_isDesktopModeSupported)) + doReturn(true) + .whenever(mockResources) + .getBoolean(eq(R.bool.config_canInternalDisplayHostDesktops)) + val taskInfo = createDesktopTaskInfo(1, DEFAULT_DISPLAY) + val tasks = listOf(taskInfo) + val cachedTaskInfo = + TopTaskTracker.CachedTaskInfo(tasks, mockContext, DEFAULT_DISPLAY, INACTIVE_DESK_ID) + val result = cachedTaskInfo.getPlaceholderGroupedTaskInfo(null) + + assertThat(result).isNotNull() + assertThat(result!!.isBaseType(TYPE_DESK)).isTrue() + assertThat(result.deskId).isEqualTo(INACTIVE_DESK_ID) + assertThat(result.taskInfo1).isEqualTo(taskInfo) + } + + @Test + @DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + fun getCachedTopTask_filtersOutBubbleTask() { + val appBubbleTask = createBubbleTaskInfo(taskId = 100, appBubble = true) + val convoBubbleTask = createBubbleTaskInfo(taskId = 101, appBubble = false) + val normalTask = createTaskInfo(taskId = 102) + + topTaskTracker.handleTaskMovedToFront(normalTask) + topTaskTracker.handleTaskMovedToFront(appBubbleTask) + topTaskTracker.handleTaskMovedToFront(convoBubbleTask) + + val topTask = + topTaskTracker.getCachedTopTask(/* filterOnlyVisibleRecents= */ false, DEFAULT_DISPLAY) + + assertThat(topTask.taskId).isEqualTo(normalTask.taskId) + } + + @Test + @DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) + fun getCachedTopTask_allBubbles_noTopTask() { + val convoBubbleTask = createBubbleTaskInfo(taskId = 100, appBubble = false) + val appBubbleTask = createBubbleTaskInfo(taskId = 101, appBubble = true) + + topTaskTracker.handleTaskMovedToFront(convoBubbleTask) + topTaskTracker.handleTaskMovedToFront(appBubbleTask) + + val topTask = + topTaskTracker.getCachedTopTask(/* filterOnlyVisibleRecents= */ false, DEFAULT_DISPLAY) + + assertThat(topTask.taskId).isEqualTo(INVALID_TASK_ID) + } + + @Test + fun getAllTasks_tasksMoreThanHistorySize_onlyFreeFormTasksNotRemoved() { + val freeformTaskCount = HISTORY_SIZE * 2 + val fullScreenTaskCount = HISTORY_SIZE + 2 + var taskId = 0 + val freeformTasks = mutableListOf() + repeat(freeformTaskCount) { + val task = createTaskInfo(taskId = ++taskId, windowingMode = WINDOWING_MODE_FREEFORM) + freeformTasks.add(task) + topTaskTracker.handleTaskMovedToFront(task) + } + val fullScreenTasks = mutableListOf() + repeat(fullScreenTaskCount) { + val task = createTaskInfo(taskId = ++taskId, windowingMode = WINDOWING_MODE_FULLSCREEN) + fullScreenTasks.add(task) + topTaskTracker.handleTaskMovedToFront(task) + } + + val cachedInfo = + topTaskTracker.getCachedTopTask(/* filterOnlyVisibleRecents= */ false, DEFAULT_DISPLAY) + val tasks = cachedInfo.mAllCachedTasks + + val expectedTasks = freeformTasks + fullScreenTasks.takeLast(HISTORY_SIZE) + assertThat(tasks).containsExactlyElementsIn(expectedTasks) + } + + private fun createTaskInfo( + taskId: Int, + displayId: Int = DEFAULT_DISPLAY, + windowingMode: Int = WINDOWING_MODE_FULLSCREEN, + ) = + ActivityManager.RunningTaskInfo().apply { + this.taskId = taskId + this.displayId = displayId + this.baseIntent = Intent() + this.baseActivity = ComponentName("test", "test") + this.configuration.windowConfiguration.activityType = ACTIVITY_TYPE_STANDARD + this.configuration.windowConfiguration.windowingMode = windowingMode + } + + private fun createDesktopTaskInfo(taskId: Int, displayId: Int) = + createTaskInfo(taskId, displayId, WINDOWING_MODE_FREEFORM) + + private fun createBubbleTaskInfo( + taskId: Int, + appBubble: Boolean, + displayId: Int = DEFAULT_DISPLAY, + ): TaskInfo { + val taskInfo = createTaskInfo(taskId, displayId) + taskInfo.isAppBubble = appBubble + if (!appBubble) { + taskInfo.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_MULTI_WINDOW + taskInfo.configuration.windowConfiguration.isAlwaysOnTop = true + } + return taskInfo + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/actioncorner/ActionCornerHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/actioncorner/ActionCornerHandlerTest.kt new file mode 100644 index 00000000000..d84ef130c39 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/actioncorner/ActionCornerHandlerTest.kt @@ -0,0 +1,253 @@ +/* + * Copyright 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.actioncorner + +import android.app.ActivityManager.RecentTaskInfo +import android.graphics.Rect +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.Display.DEFAULT_DISPLAY +import android.window.IWindowContainerToken +import android.window.WindowContainerToken +import androidx.test.filters.SmallTest +import com.android.launcher3.Flags.FLAG_ENABLE_REVERSIBLE_HOME_ACTION_CORNER +import com.android.launcher3.LauncherState +import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.TestUtil +import com.android.quickstep.BaseActivityInterface +import com.android.quickstep.OverviewCommandHelper +import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE_OVERVIEW_PREVIOUS +import com.android.quickstep.OverviewComponentObserver +import com.android.quickstep.RecentsModel +import com.android.quickstep.TopTaskTracker +import com.android.quickstep.util.GroupTask +import com.android.quickstep.util.SingleTask +import com.android.quickstep.util.SplitSelectStateController +import com.android.quickstep.util.SplitTask +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.system.ActivityManagerWrapper +import com.android.systemui.shared.system.actioncorner.ActionCornerConstants.HOME +import com.android.systemui.shared.system.actioncorner.ActionCornerConstants.OVERVIEW +import com.android.wm.shell.Flags.FLAG_ENABLE_SHELL_TOP_TASK_TRACKING +import com.android.wm.shell.shared.GroupedTaskInfo +import com.android.wm.shell.shared.desktopmode.DesktopState +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants +import java.util.function.Consumer +import java.util.function.Predicate +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.eq +import org.mockito.Mockito +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(LauncherMultivalentJUnit::class) +@DisableFlags(FLAG_ENABLE_SHELL_TOP_TASK_TRACKING) +@EnableFlags(FLAG_ENABLE_REVERSIBLE_HOME_ACTION_CORNER) +class ActionCornerHandlerTest { + + @get:Rule val context = SandboxApplication() + @get:Rule val mSetFlagsRule = SetFlagsRule() + + private val externalDisplayId = 2 + private val overviewCommandHelper: OverviewCommandHelper = mock() + private val overviewComponentObserver: OverviewComponentObserver = mock() + private val containerInterface: BaseActivityInterface = mock() + private val recentsViewContainer: QuickstepLauncher = mock() + private val splitSelectStateController: SplitSelectStateController = mock() + + private val topTaskTracker: TopTaskTracker = mock() + + private val recentsModel: RecentsModel = mock() + private val desktopState: DesktopState = mock() + private val activityManagerWrapper: ActivityManagerWrapper = mock() + + private val bgExecutor = UI_HELPER_EXECUTOR + private val topTask: TopTaskTracker.CachedTaskInfo = mock() + private val actionCornerHandler: ActionCornerHandler = + ActionCornerHandler( + context, + overviewComponentObserver, + topTaskTracker, + recentsModel, + activityManagerWrapper, + desktopState, + bgExecutor, + overviewCommandHelper, + ) + + @Before + fun setup() { + whenever(topTaskTracker.getCachedTopTask(false, DEFAULT_DISPLAY)).thenReturn(topTask) + whenever(containerInterface.getCreatedContainer()).thenReturn(recentsViewContainer) + whenever(overviewComponentObserver.getContainerInterface(any())) + .thenReturn(containerInterface) + whenever(recentsViewContainer.lifecycle).thenReturn(mock()) + whenever(recentsViewContainer.splitSelectStateController) + .thenReturn(splitSelectStateController) + } + + @Test + fun inSingleTask_homeActionCornerTwice_goHomeThenGoBackToSingleTask() { + whenever(topTask.isHomeTask).thenReturn(false) + val taskInfo = createTaskInfo(1) + mockFullScreenTopTask(taskInfo) + + actionCornerHandler.handleAction(HOME, DEFAULT_DISPLAY) + + verify(overviewCommandHelper) + .addCommand(OverviewCommandHelper.CommandType.HOME, DEFAULT_DISPLAY) + + // Toggle back to the task from home + mockAtHome() + mockRecentsModelTasks(listOf(SingleTask(Task.from(taskInfo)))) + + actionCornerHandler.handleAction(HOME, DEFAULT_DISPLAY) + + TestUtil.runOnExecutorSync(bgExecutor) {} + verify(activityManagerWrapper).startActivityFromRecents(eq(1), any()) + } + + @Test + fun inSplitTask_homeActionCornerTwice_goHomeThenGoBackToSplitTask() { + whenever(topTask.isHomeTask).thenReturn(false) + val taskInfo1 = createTaskInfo(1) + val taskInfo2 = createTaskInfo(2) + mockSplitTopTask(taskInfo1, taskInfo2) + + actionCornerHandler.handleAction(HOME, DEFAULT_DISPLAY) + + verify(overviewCommandHelper) + .addCommand(OverviewCommandHelper.CommandType.HOME, DEFAULT_DISPLAY) + + actionCornerHandler.handleAction(HOME, DEFAULT_DISPLAY) + + mockAtHome() + val splitBounds = SplitBounds(Rect(), Rect(), 1, 2, SplitScreenConstants.SNAP_TO_2_33_66) + mockRecentsModelTasks( + listOf(SplitTask(Task.from(taskInfo1), Task.from(taskInfo2), splitBounds)) + ) + actionCornerHandler.handleAction(HOME, DEFAULT_DISPLAY) + + verify(splitSelectStateController) + .launchExistingSplitPair( + eq(null), + eq(taskInfo1.taskId), + eq(taskInfo2.taskId), + anyInt(), + any(), + eq(false), + eq(SplitScreenConstants.SNAP_TO_2_33_66), + ) + } + + @Test + fun atHome_homeActionCorner_doNothing() { + mockAtHome() + + actionCornerHandler.handleAction(HOME, DEFAULT_DISPLAY) + + verify(overviewCommandHelper, never()) + .addCommand(OverviewCommandHelper.CommandType.HOME, DEFAULT_DISPLAY) + verify(activityManagerWrapper, never()).startActivityFromRecents(eq(1), any()) + } + + @Test + fun inSingleTask_homeActionCorner_changeTask_goHome_homeActionCorner_doNothing() { + whenever(topTask.isHomeTask).thenReturn(false) + val taskInfo = createTaskInfo(1) + mockFullScreenTopTask(taskInfo) + actionCornerHandler.handleAction(HOME, DEFAULT_DISPLAY) + + // Change task + val taskInfo2 = createTaskInfo(2) + mockFullScreenTopTask(taskInfo2) + mockRecentsModelTasks(listOf(SingleTask(Task.from(taskInfo2)))) + mockAtHome() + + // Do not go back to any task because the latest task was changed after going home by + // action corner + actionCornerHandler.handleAction(HOME, DEFAULT_DISPLAY) + verify(activityManagerWrapper, never()).startActivityFromRecents(anyInt(), any()) + } + + @Test + fun inProjectedMode_overviewActionCorner_toggleOverviewForAllDisplaysExceptDefaultDisplay() { + whenever(desktopState.isProjectedMode()).thenReturn(true) + + actionCornerHandler.handleAction(OVERVIEW, externalDisplayId) + + verify(overviewCommandHelper) + .addCommandsForDisplaysExcept(TOGGLE_OVERVIEW_PREVIOUS, DEFAULT_DISPLAY) + } + + @Test + fun notInProjectedMode_overviewActionCorner_toggleOverviewForAllDisplays() { + whenever(desktopState.isProjectedMode()).thenReturn(false) + + actionCornerHandler.handleAction(OVERVIEW, externalDisplayId) + + verify(overviewCommandHelper).addCommandsForAllDisplays(TOGGLE_OVERVIEW_PREVIOUS) + } + + private fun mockFullScreenTopTask(taskInfo: RecentTaskInfo) { + val groupedTask = GroupedTaskInfo.forFullscreenTasks(taskInfo) + whenever(topTaskTracker.runningSplitTaskIds).thenReturn(intArrayOf()) + whenever(topTask.getPlaceholderGroupedTaskInfo(any())).thenReturn(groupedTask) + } + + private fun mockSplitTopTask(task1: RecentTaskInfo, task2: RecentTaskInfo) { + val splitGroupedTask = GroupedTaskInfo.forSplitTasks(task1, task2, null) + whenever(topTaskTracker.runningSplitTaskIds) + .thenReturn(intArrayOf(task1.getTaskId(), task2.getTaskId())) + whenever(topTask.getPlaceholderGroupedTaskInfo(any())).thenReturn(splitGroupedTask) + } + + private fun mockAtHome() { + whenever(topTask.isHomeTask).thenReturn(true) + whenever(recentsViewContainer.isRecentsViewVisible).thenReturn(false) + } + + private fun mockRecentsModelTasks(tasks: List) { + whenever(recentsModel.getTasks(any(), any>>())).thenAnswer { + invocation -> + val filter = invocation.getArgument>(0) + val callback = invocation.getArgument>>(1) + callback.accept(ArrayList(tasks.stream().filter(filter).toList())) + 0 + } + } + + private fun createTaskInfo(id: Int) = + RecentTaskInfo().apply { + taskId = id + displayId = DEFAULT_DISPLAY + token = WindowContainerToken(Mockito.mock(IWindowContainerToken::class.java)) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/fallback/RecentsStateUtilsTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/fallback/RecentsStateUtilsTest.kt new file mode 100644 index 00000000000..4e9dae8da07 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/fallback/RecentsStateUtilsTest.kt @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.fallback + +import com.android.launcher3.testing.shared.TestProtocol.BACKGROUND_APP_STATE_ORDINAL +import com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL +import com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_MODAL_TASK_STATE_ORDINAL +import com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_SPLIT_SELECT_ORDINAL +import com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_STATE_ORDINAL +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +@EmulatedDevices(["pixelTablet2023"]) +class RecentsStateUtilsTest { + + @Test + fun testRecentsStateDefault_toLauncherStateOrdinal_isOverviewStateOrdinal() { + assertThat(RecentsState.DEFAULT.toLauncherStateOrdinal()).isEqualTo(OVERVIEW_STATE_ORDINAL) + } + + @Test + fun testRecentsStateModal_toLauncherStateOrdinal_isModalTaskStateOrdinal() { + assertThat(RecentsState.MODAL_TASK.toLauncherStateOrdinal()) + .isEqualTo(OVERVIEW_MODAL_TASK_STATE_ORDINAL) + } + + @Test + fun testRecentsStateBackgroundApp_toLauncherStateOrdinal_isBackgroundAppStateOrdinal() { + assertThat(RecentsState.BACKGROUND_APP.toLauncherStateOrdinal()) + .isEqualTo(BACKGROUND_APP_STATE_ORDINAL) + } + + @Test + fun testRecentsStateHome_toLauncherStateOrdinal_isNormalStateOrdinal() { + assertThat(RecentsState.HOME.toLauncherStateOrdinal()).isEqualTo(NORMAL_STATE_ORDINAL) + } + + @Test + fun testRecentsStateBgLauncher_toLauncherStateOrdinal_isNormalStateOrdinal() { + assertThat(RecentsState.BG_LAUNCHER.toLauncherStateOrdinal()) + .isEqualTo(NORMAL_STATE_ORDINAL) + } + + @Test + fun testRecentsStateOverviewSplitSelect_toLauncherStateOrdinal_isOverviewSplitSelectStateOrdinal() { + assertThat(RecentsState.OVERVIEW_SPLIT_SELECT.toLauncherStateOrdinal()) + .isEqualTo(OVERVIEW_SPLIT_SELECT_ORDINAL) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt new file mode 100644 index 00000000000..a20c416c274 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt @@ -0,0 +1,669 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.input + +import android.Manifest.permission.MANAGE_KEY_GESTURES +import android.app.PendingIntent +import android.content.pm.PackageManager.PERMISSION_DENIED +import android.content.pm.PackageManager.PERMISSION_GRANTED +import android.hardware.input.InputManager +import android.hardware.input.KeyGestureEvent +import android.hardware.input.KeyGestureEvent.ACTION_GESTURE_COMPLETE +import android.hardware.input.KeyGestureEvent.ACTION_GESTURE_START +import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS +import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS +import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER +import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.SettingsCacheSandbox +import com.android.quickstep.OverviewCommandHelper +import com.android.quickstep.input.QuickstepKeyGestureEventsHandlerTest.FakeOverviewHandler.OverviewEvent +import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler +import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType +import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType.ALT_TAB +import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType.UNDEFINED +import com.android.window.flags2.Flags +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.KArgumentCaptor +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doNothing +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy +import org.mockito.kotlin.stub +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoInteractions +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +class QuickstepKeyGestureEventsHandlerTest { + @get:Rule + val context = + spy(SandboxApplication()) { + on { checkSelfPermission(eq(MANAGE_KEY_GESTURES)) } doReturn PERMISSION_GRANTED + } + + @get:Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) + + private val settingsCacheSandbox = SettingsCacheSandbox() + private val inputManager = + context.spyService(InputManager::class.java).stub { + doNothing().whenever(it).registerKeyGestureEventHandler(any(), any()) + doNothing().whenever(it).unregisterKeyGestureEventHandler(any()) + } + private val allAppsPendingIntent: PendingIntent = mock() + private val keyGestureEventsCaptor: KArgumentCaptor> = argumentCaptor() + private val fakeOverviewHandler = FakeOverviewHandler() + private val overviewCommandHelper = mock() + private lateinit var keyGestureEventsManager: QuickstepKeyGestureEventsManager + + @Before + fun setup() { + keyGestureEventsManager = + QuickstepKeyGestureEventsManager(context, settingsCacheSandbox.cache) + keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged(/* isEnabled= */ true) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun registerAllAppsHandler_flagEnabled_registerWithExpectedKeyGestureEvents() { + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + + verify(inputManager) + .registerKeyGestureEventHandler( + keyGestureEventsCaptor.capture(), + eq(keyGestureEventsManager.allAppsKeyGestureEventHandler), + ) + assertThat(keyGestureEventsCaptor.firstValue).containsExactly(KEY_GESTURE_TYPE_ALL_APPS) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun registerAllAppsHandlerTwice_flagEnabled_registerWithExpectedKeyGestureEventsOnce() { + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + + verify(inputManager) + .registerKeyGestureEventHandler( + keyGestureEventsCaptor.capture(), + eq(keyGestureEventsManager.allAppsKeyGestureEventHandler), + ) + assertThat(keyGestureEventsCaptor.firstValue).containsExactly(KEY_GESTURE_TYPE_ALL_APPS) + } + + @Test + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun registerAllAppsHandler_flagDisabled_noRegister() { + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + + verifyNoInteractions(inputManager) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun registerAllAppsHandler_noPermission_noRegister() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + + verifyNoInteractions(inputManager) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun registerOverviewHandler_flagEnabled_registerWithExpectedKeyGestureEvents() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + verify(inputManager) + .registerKeyGestureEventHandler( + keyGestureEventsCaptor.capture(), + eq(keyGestureEventsManager.overviewKeyGestureEventHandler), + ) + assertThat(keyGestureEventsCaptor.firstValue) + .containsExactly(KEY_GESTURE_TYPE_RECENT_APPS, KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun registerOverviewHandlerTwice_flagEnabled_registerWithExpectedKeyGestureEventsOnce() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + verify(inputManager) + .registerKeyGestureEventHandler( + keyGestureEventsCaptor.capture(), + eq(keyGestureEventsManager.overviewKeyGestureEventHandler), + ) + assertThat(keyGestureEventsCaptor.firstValue) + .containsExactly(KEY_GESTURE_TYPE_RECENT_APPS, KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + } + + @Test + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun registerOverviewHandler_flagDisabled_noRegister() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + verifyNoInteractions(inputManager) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun registerOverviewHandler_noPermission_unregisterHandler() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + verifyNoInteractions(inputManager) + } + + @Test + fun registerHomeGestureHandler_registerWithExpectedKeyGestureEvents() { + keyGestureEventsManager.registerHomeKeyGestureEvent(overviewCommandHelper) + + verify(inputManager) + .registerKeyGestureEventHandler( + keyGestureEventsCaptor.capture(), + eq(keyGestureEventsManager.homeKeyGestureEventHandler), + ) + assertThat(keyGestureEventsCaptor.firstValue) + .containsExactly(KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY) + } + + @Test + fun registerHomeGestureHandlerTwice_registerWithExpectedKeyGestureEventsOnce() { + keyGestureEventsManager.registerHomeKeyGestureEvent(overviewCommandHelper) + keyGestureEventsManager.registerHomeKeyGestureEvent(overviewCommandHelper) + + verify(inputManager) + .registerKeyGestureEventHandler( + keyGestureEventsCaptor.capture(), + eq(keyGestureEventsManager.homeKeyGestureEventHandler), + ) + assertThat(keyGestureEventsCaptor.firstValue) + .containsExactly(KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY) + } + + @Test + fun registerHomeGestureHandler_noPermission_unregisterHandler() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + + keyGestureEventsManager.registerHomeKeyGestureEvent(overviewCommandHelper) + + verifyNoInteractions(inputManager) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun unregisterAllAppsHandler_flagEnabled_unregisterHandler() { + keyGestureEventsManager.unregisterAllAppsKeyGestureEvent() + + verify(inputManager) + .unregisterKeyGestureEventHandler( + eq(keyGestureEventsManager.allAppsKeyGestureEventHandler) + ) + } + + @Test + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun unregisterAllAppsHandler_flagDisabled_noUnregister() { + keyGestureEventsManager.unregisterAllAppsKeyGestureEvent() + + verifyNoInteractions(inputManager) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun unregisterAllAppsHandler_noPermission_noUnregister() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + + keyGestureEventsManager.unregisterAllAppsKeyGestureEvent() + + verifyNoInteractions(inputManager) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun unregisterOverviewHandler_flagEnabled_unregisterHandler() { + keyGestureEventsManager.unregisterOverviewKeyGestureEvent() + + verify(inputManager) + .unregisterKeyGestureEventHandler( + eq(keyGestureEventsManager.overviewKeyGestureEventHandler) + ) + } + + @Test + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun unregisterOverviewHandler_flagDisabled_noUnregister() { + keyGestureEventsManager.unregisterOverviewKeyGestureEvent() + + verifyNoInteractions(inputManager) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun unregisterOverviewHandler_noPermission_noUnregister() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + + keyGestureEventsManager.unregisterOverviewKeyGestureEvent() + + verifyNoInteractions(inputManager) + } + + @Test + fun unregisterHomeGestureHandler_unregisterHandler() { + keyGestureEventsManager.unregisterHomeKeyGestureEvent() + + verify(inputManager) + .unregisterKeyGestureEventHandler( + eq(keyGestureEventsManager.homeKeyGestureEventHandler) + ) + } + + @Test + fun unregisterHomeGestureHandler_noPermission_noUnregister() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + + keyGestureEventsManager.unregisterHomeKeyGestureEvent() + + verifyNoInteractions(inputManager) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleAllAppsEvent_flagEnabled_toggleAllAppsSearch() { + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + + keyGestureEventsManager.allAppsKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_ALL_APPS) + .build(), + /* focusedToken= */ null, + ) + + verify(allAppsPendingIntent).send() + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleAllAppsEvent_flagEnabled_userSetupIncomplete_noInteractionWithTaskbar() { + keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( + /* isEnabled= */ false + ) + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + + keyGestureEventsManager.allAppsKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_ALL_APPS) + .build(), + /* focusedToken= */ null, + ) + + verifyNoInteractions(allAppsPendingIntent) + } + + @Test + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleAllAppsEvent_flagDisabled_noInteractionWithTaskbar() { + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + + keyGestureEventsManager.allAppsKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_ALL_APPS) + .build(), + /* focusedToken= */ null, + ) + + verifyNoInteractions(allAppsPendingIntent) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleAllAppsEvent_noPermission_noInteractionWithTaskbar() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) + + keyGestureEventsManager.allAppsKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_ALL_APPS) + .build(), + /* focusedToken= */ null, + ) + + verifyNoInteractions(allAppsPendingIntent) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsEvent_flagEnabled_showOverviewWithUndefinedType() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS) + .setAction(ACTION_GESTURE_COMPLETE) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent) + .isEqualTo(OverviewEvent(shouldShowOverview = true, type = UNDEFINED)) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsEvent_userSetupIncomplete_noOverviewEventInFake() { + keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( + /* isEnabled= */ false + ) + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS) + .setAction(ACTION_GESTURE_COMPLETE) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsEvent_flagDisabled_noOverviewEventInFake() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS) + .setAction(ACTION_GESTURE_COMPLETE) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsEvent_noPermission_noOverviewEventInFake() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS) + .setAction(ACTION_GESTURE_COMPLETE) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsSwitcherStartEvent_flagEnabled_showOverviewWithAltTabType() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + .setAction(ACTION_GESTURE_START) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent) + .isEqualTo(OverviewEvent(shouldShowOverview = true, type = ALT_TAB)) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsSwitcherStartEvent_userSetupIncomplete_noOverviewEventInFake() { + keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( + /* isEnabled= */ false + ) + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + .setAction(ACTION_GESTURE_START) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsSwitcherStartEvent_flagDisabled_noOverviewEventInFake() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + .setAction(ACTION_GESTURE_START) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsSwitcherStartEvent_noPermission_noOverviewEventInFake() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + .setAction(ACTION_GESTURE_START) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsSwitcherCompleteEvent_flagEnabled_hideOverviewWithAltTabType() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + .setAction(ACTION_GESTURE_COMPLETE) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent) + .isEqualTo(OverviewEvent(shouldShowOverview = false, type = ALT_TAB)) + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsSwitcherCompleteEvent_userSetupIncomplete_noOverviewEventInFake() { + keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( + /* isEnabled= */ false + ) + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + .setAction(ACTION_GESTURE_COMPLETE) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsSwitcherCompleteEvent_flagDisabled_noOverviewEventInFake() { + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + .setAction(ACTION_GESTURE_COMPLETE) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) + fun handleRecentAppsSwitcherCompleteEvent_noPermission_noOverviewEventInFake() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) + + keyGestureEventsManager.overviewKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER) + .setAction(ACTION_GESTURE_COMPLETE) + .build(), + /* focusedToken= */ null, + ) + + assertThat(fakeOverviewHandler.overviewEvent).isNull() + } + + @Test + fun handleHomeEvent_addHomeCommand() { + keyGestureEventsManager.registerHomeKeyGestureEvent(overviewCommandHelper) + + keyGestureEventsManager.homeKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY) + .build(), + /* focusedToken= */ null, + ) + + verify(overviewCommandHelper) + .addCommand(OverviewCommandHelper.CommandType.HOME, TEST_DISPLAY_ID) + } + + @Test + fun handleHomeEvent_userSetupIncomplete_noInteractionWithOverviewCommandHelper() { + keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( + /* isEnabled= */ false + ) + keyGestureEventsManager.registerHomeKeyGestureEvent(overviewCommandHelper) + + keyGestureEventsManager.homeKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY) + .build(), + /* focusedToken= */ null, + ) + + verifyNoInteractions(overviewCommandHelper) + } + + @Test + fun handleHomeEvent_noPermission_noInteractionWithOverviewCommandHelper() { + whenever(context.checkSelfPermission(eq(MANAGE_KEY_GESTURES))).thenReturn(PERMISSION_DENIED) + keyGestureEventsManager.registerHomeKeyGestureEvent(overviewCommandHelper) + + keyGestureEventsManager.homeKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_REJECT_HOME_ON_EXTERNAL_DISPLAY) + .build(), + /* focusedToken= */ null, + ) + + verifyNoInteractions(overviewCommandHelper) + } + + @Test + fun handleHomeEvent_wrongEventType_noInteractionWithOverviewCommandHelper() { + keyGestureEventsManager.registerHomeKeyGestureEvent(overviewCommandHelper) + + // Use a different key gesture type + keyGestureEventsManager.homeKeyGestureEventHandler.handleKeyGestureEvent( + KeyGestureEvent.Builder() + .setDisplayId(TEST_DISPLAY_ID) + .setKeyGestureType(KEY_GESTURE_TYPE_ALL_APPS) + .build(), + /* focusedToken= */ null, + ) + + verifyNoInteractions(overviewCommandHelper) + } + + private class FakeOverviewHandler : OverviewGestureHandler { + data class OverviewEvent(val shouldShowOverview: Boolean, val type: OverviewType) + + var overviewEvent: OverviewEvent? = null + private set + + override fun showOverview(type: OverviewType) { + overviewEvent = OverviewEvent(shouldShowOverview = true, type) + } + + override fun hideOverview(type: OverviewType) { + overviewEvent = OverviewEvent(shouldShowOverview = false, type) + } + } + + private companion object { + const val TEST_DISPLAY_ID = 6789 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandlerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandlerTest.java new file mode 100644 index 00000000000..f8a0c080a63 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandlerTest.java @@ -0,0 +1,98 @@ +/* + * 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.quickstep.inputconsumers; + +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.launcher3.logging.StatsLogManager; +import com.android.launcher3.util.VibratorWrapper; +import com.android.quickstep.DeviceConfigWrapper; +import com.android.quickstep.NavHandle; +import com.android.quickstep.TopTaskTracker; +import com.android.quickstep.util.ContextualSearchHapticManager; +import com.android.quickstep.util.ContextualSearchInvoker; +import com.android.quickstep.util.ContextualSearchStateManager; +import com.android.quickstep.util.TestExtensions; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class NavHandleLongPressHandlerTest { + + private NavHandleLongPressHandler mLongPressHandler; + @Mock private NavHandle mNavHandle; + @Mock VibratorWrapper mVibratorWrapper; + @Mock ContextualSearchHapticManager mContextualSearchHapticManager; + @Mock TopTaskTracker mTopTaskTracker; + @Mock StatsLogManager.StatsLogManagerFactory mStatsLogManagerFactory; + @Mock StatsLogManager mStatsLogManager; + @Mock ContextualSearchStateManager mContextualSearchStateManager; + @Mock ContextualSearchInvoker mContextualSearchInvoker; + + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + Context context = InstrumentationRegistry.getInstrumentation() + .getTargetContext().getApplicationContext(); + when(mStatsLogManagerFactory.create(context)).thenReturn(mStatsLogManager); + mLongPressHandler = new NavHandleLongPressHandler(context, mVibratorWrapper, + mContextualSearchHapticManager, mTopTaskTracker, mStatsLogManagerFactory, + mContextualSearchStateManager, mContextualSearchInvoker); + } + + @Test + public void testStartNavBarAnimation_flagDisabled() { + try (AutoCloseable flag = overrideAnimateLPNHFlag(false)) { + mLongPressHandler.startNavBarAnimation(mNavHandle); + verify(mNavHandle, never()) + .animateNavBarLongPress(anyBoolean(), anyBoolean(), anyLong()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Test + public void testStartNavBarAnimation_flagEnabled() { + try (AutoCloseable flag = overrideAnimateLPNHFlag(true)) { + mLongPressHandler.startNavBarAnimation(mNavHandle); + verify(mNavHandle).animateNavBarLongPress(anyBoolean(), anyBoolean(), anyLong()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private AutoCloseable overrideAnimateLPNHFlag(boolean value) { + return TestExtensions.overrideNavConfigFlag( + "ANIMATE_LPNH", value, () -> DeviceConfigWrapper.get().getAnimateLpnh()); + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java new file mode 100644 index 00000000000..b01d33ef46c --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java @@ -0,0 +1,601 @@ +/* + * 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.quickstep.inputconsumers; + +import static android.view.MotionEvent.ACTION_CANCEL; +import static android.view.MotionEvent.ACTION_DOWN; +import static android.view.MotionEvent.ACTION_HOVER_ENTER; +import static android.view.MotionEvent.ACTION_MOVE; +import static android.view.MotionEvent.ACTION_UP; + +import static androidx.test.core.app.ApplicationProvider.getApplicationContext; + +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LONG_PRESS_NAVBAR; +import static com.android.launcher3.logging.StatsLogManager.LauncherLatencyEvent.LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.quickstep.DeviceConfigWrapper.DEFAULT_LPNH_TIMEOUT_MS; +import static com.android.quickstep.inputconsumers.NavHandleLongPressInputConsumer.MIN_TIME_TO_LOG_ABANDON_MS; + +import static com.google.common.truth.Truth.assertThat; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import android.os.SystemClock; +import android.view.MotionEvent; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.launcher3.dagger.LauncherAppComponent; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.logging.StatsLogManager; +import com.android.launcher3.util.AllModulesForTest; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.SandboxContext; +import com.android.quickstep.DeviceConfigWrapper; +import com.android.quickstep.GestureState; +import com.android.quickstep.InputConsumer; +import com.android.quickstep.NavHandle; +import com.android.quickstep.RecentsAnimationDeviceState; +import com.android.quickstep.TopTaskTracker; +import com.android.quickstep.util.TestExtensions; +import com.android.systemui.shared.system.InputMonitorCompat; + +import dagger.BindsInstance; +import dagger.Component; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.concurrent.atomic.AtomicBoolean; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class NavHandleLongPressInputConsumerTest { + + private static final float TOUCH_SLOP = 10; + private static final float SQUARED_TOUCH_SLOP = 100; + + private final AtomicBoolean mLongPressTriggered = new AtomicBoolean(); + private final Runnable mLongPressRunnable = () -> mLongPressTriggered.set(true); + private NavHandleLongPressInputConsumer mUnderTest; + private SandboxContext mContext; + private float mScreenWidth; + private long mDownTimeMs; + @Mock InputConsumer mDelegate; + @Mock InputMonitorCompat mInputMonitor; + @Mock RecentsAnimationDeviceState mDeviceState; + @Mock NavHandle mNavHandle; + @Mock GestureState mGestureState; + @Mock NavHandleLongPressHandler mNavHandleLongPressHandler; + @Mock TopTaskTracker mTopTaskTracker; + @Mock TopTaskTracker.CachedTaskInfo mTaskInfo; + @Mock StatsLogManager mStatsLogManager; + @Mock StatsLogManager.StatsLogger mStatsLogger; + @Mock StatsLogManager.StatsLatencyLogger mStatsLatencyLogger; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(mTopTaskTracker.getCachedTopTask(anyBoolean(), anyInt())).thenReturn(mTaskInfo); + when(mDeviceState.getSquaredTouchSlop()).thenReturn(SQUARED_TOUCH_SLOP); + when(mDelegate.allowInterceptByParent()).thenReturn(true); + mLongPressTriggered.set(false); + when(mNavHandleLongPressHandler.getLongPressRunnable(any(), anyInt())).thenReturn( + mLongPressRunnable); + when(mStatsLogger.withPackageName(any())).thenReturn(mStatsLogger); + when(mStatsLatencyLogger.withInstanceId(any())).thenReturn(mStatsLatencyLogger); + when(mStatsLatencyLogger.withLatency(anyLong())).thenReturn(mStatsLatencyLogger); + when(mStatsLogManager.logger()).thenReturn(mStatsLogger); + when(mStatsLogManager.latencyLogger()).thenReturn(mStatsLatencyLogger); + initializeObjectUnderTest(); + } + + @After + public void tearDown() throws Exception { + MAIN_EXECUTOR.getHandler().removeCallbacks(mLongPressRunnable); + MAIN_EXECUTOR.submit(() -> null).get(); + mContext.onDestroy(); + } + + @Test + public void testGetType() { + assertThat(mUnderTest.getType() & InputConsumer.TYPE_NAV_HANDLE_LONG_PRESS).isNotEqualTo(0); + } + + @Test + public void testDelegateDisallowsTouchIntercept() { + when(mDelegate.allowInterceptByParent()).thenReturn(false); + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + + verify(mDelegate).onMotionEvent(any()); + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + verify(mNavHandleLongPressHandler, never()).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogManager); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + @Test + public void testDelegateDisallowsTouchInterceptAfterTouchDown() { + // Touch down and wait the minimum abandonment time. + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); + + // Delegate should still get touches unless long press is triggered. + verify(mDelegate).onMotionEvent(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + + // Child delegate blocks us from intercepting further motion events. + when(mDelegate.allowInterceptByParent()).thenReturn(false); + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_MOVE)); + + // Delegate should still get motion events unless long press is triggered. + verify(mDelegate, times(2)).onMotionEvent(any()); + // But our handler should be cancelled. + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_INTERCEPT_DISALLOWED)); + verifyNoMoreInteractions(mStatsLogger); + // Because we handled touch down before the child blocked additional events, log abandon. + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } + + @Test + public void testLongPressTriggered() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); + assertTrue(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); + + // Ensure abandon latency is still not logged after long press. + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_UP)); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + @Test + public void testLongPressTriggeredWithSlightVerticalMovement() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, 1)); + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); + assertTrue(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + @Test + public void testLongPressTriggeredWithSlightHorizontalMovement() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, mScreenWidth / 2f + 1, 0)); + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); + assertTrue(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + @Test + public void testLongPressTriggeredWithExtendedTwoStageDuration() { + try (AutoCloseable flag = overrideTwoStageFlag(true)) { + // Reinitialize to pick up updated flag state. + initializeObjectUnderTest(); + + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, + mScreenWidth / 2f - (TOUCH_SLOP - 1), 0)); + // We have entered the second stage, so the normal timeout shouldn't trigger. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + + // After an extended time, the long press should trigger. + float extendedDurationMultiplier = + (DeviceConfigWrapper.get().getTwoStageDurationPercentage() / 100f); + sleep((long) (DEFAULT_LPNH_TIMEOUT_MS + * (extendedDurationMultiplier - 1))); // -1 because we already waited 1x + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); + assertTrue(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Test + public void testLongPressTriggeredWithNormalDurationInFirstStage() { + try (AutoCloseable flag = overrideTwoStageFlag(true)) { + // Reinitialize to pick up updated flag state. + initializeObjectUnderTest(); + + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + // We have not entered the second stage, so the normal timeout should trigger. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); + assertTrue(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Test + public void testLongPressAbortedByTouchUp() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_UP)); + // Wait past the long press timeout, to be extra sure it wouldn't have triggered. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_TOUCH_UP)); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } + + @Test + public void testLongPressAbortedByTouchCancel() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_CANCEL)); + // Wait past the long press timeout, to be extra sure it wouldn't have triggered. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_TOUCH_CANCEL)); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } + + @Test + public void testLongPressAbortedByConsumerSwitch() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + // Wait a bit, but not enough to trigger long press. + sleep(MIN_TIME_TO_LOG_ABANDON_MS); + // Assume a motion event is sent after the abandon time so that the abandon gets logged + // (abandon time is based on the last motion event time compared to the touch down time). + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_MOVE)); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + + mUnderTest.onConsumerAboutToBeSwitched(); + // Wait past the long press timeout, to be extra sure it wouldn't have triggered. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_INPUT_CONSUMER_SWITCHED)); + verify(mStatsLogger, never()).log(LAUNCHER_LONG_PRESS_NAVBAR); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + verify(mDelegate).onConsumerAboutToBeSwitched(); + } + + @Test + public void testTouchCancelWithoutTouchDown() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_CANCEL)); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, never()).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_TOUCH_CANCEL)); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + @Test + public void testLongPressAbortedByTouchSlopPassedVertically() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + + mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, + -(TOUCH_SLOP + 1))); + // Wait past the long press timeout, to be extra sure it wouldn't have triggered. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_TOUCH_SLOP_PASSED)); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } + + @Test + public void testLongPressAbortedByTouchSlopPassedHorizontally() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + + mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, + mScreenWidth / 2f - (TOUCH_SLOP + 1), 0)); + // Wait past the long press timeout, to be extra sure it wouldn't have triggered. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_TOUCH_SLOP_PASSED)); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } + + @Test + public void testLongPressAbortedByTouchSlopPassedVertically_multipleTouchDowns() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + + mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, + -(TOUCH_SLOP + 1))); + // Wait past the long press timeout, to be extra sure it wouldn't have triggered. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(2)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_TOUCH_SLOP_PASSED)); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } + + @Test + public void testLongPressAbortedByTouchSlopPassedVertically_twoStageEnabled() { + try (AutoCloseable flag = overrideTwoStageFlag(true)) { + // Reinitialize to pick up updated flag state. + initializeObjectUnderTest(); + + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + // Enter the second stage. + mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, + -(TOUCH_SLOP - 1))); + // Normal duration shouldn't trigger. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + + // Move out of the second stage. + mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, + -(TOUCH_SLOP + 1))); + // Wait past the extended long press timeout, to be sure it wouldn't have triggered. + float extendedDurationMultiplier = + (DeviceConfigWrapper.get().getTwoStageDurationPercentage() / 100f); + sleep((long) (DEFAULT_LPNH_TIMEOUT_MS + * (extendedDurationMultiplier - 1))); // -1 because we already waited 1x + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_TOUCH_SLOP_PASSED)); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Test + public void testLongPressAbortedByTouchSlopPassedHorizontally_twoStageEnabled() { + try (AutoCloseable flag = overrideTwoStageFlag(true)) { + // Reinitialize to pick up updated flag state. + initializeObjectUnderTest(); + + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + // Enter the second stage. + mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, + mScreenWidth / 2f - (TOUCH_SLOP - 1), 0)); + // Normal duration shouldn't trigger. + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + + // Move out of the second stage. + mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, + mScreenWidth / 2f - (TOUCH_SLOP + 1), 0)); + // Wait past the extended long press timeout, to be sure it wouldn't have triggered. + float extendedDurationMultiplier = + (DeviceConfigWrapper.get().getTwoStageDurationPercentage() / 100f); + sleep((long) (DEFAULT_LPNH_TIMEOUT_MS + * (extendedDurationMultiplier - 1))); // -1 because we already waited 1x + + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), + eq(NavHandleLongPressInputConsumer.CANCEL_REASON_TOUCH_SLOP_PASSED)); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Test + public void testTouchOutsideNavHandleIgnored() { + // Touch the far left side of the screen. (y=0 is top of navbar region, picked arbitrarily) + mUnderTest.onMotionEvent(generateMotionEvent(ACTION_DOWN, 0, 0)); + sleep(DEFAULT_LPNH_TIMEOUT_MS); + + // Should be ignored because the x position was not centered in the navbar region. + assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); + assertFalse(mLongPressTriggered.get()); + verify(mNavHandleLongPressHandler, never()).onTouchStarted(any()); + verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogManager); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + @Test + public void testHoverPassedToDelegate() { + // Regardless of whether the delegate wants us to intercept, we tell it about hover events. + when(mDelegate.allowInterceptByParent()).thenReturn(false); + mUnderTest.onHoverEvent(generateCenteredMotionEvent(ACTION_HOVER_ENTER)); + + verify(mDelegate).onHoverEvent(any()); + + when(mDelegate.allowInterceptByParent()).thenReturn(true); + mUnderTest.onHoverEvent(generateCenteredMotionEvent(ACTION_HOVER_ENTER)); + + verify(mDelegate, times(2)).onHoverEvent(any()); + + verifyNoMoreInteractions(mStatsLogManager); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + @Test + public void testNoLogsForShortTouch() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(10); + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_UP)); + verifyNoMoreInteractions(mStatsLogManager); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + private void initializeObjectUnderTest() { + if (mContext != null) { + mContext.onDestroy(); + } + mContext = new SandboxContext(getApplicationContext()); + mContext.initDaggerComponent( + DaggerNavHandleLongPressInputConsumerTest_TopTaskTrackerComponent + .builder() + .bindTopTaskTracker(mTopTaskTracker)); + mScreenWidth = DisplayController.INSTANCE.get(mContext).getInfo().currentSize.x; + mUnderTest = new NavHandleLongPressInputConsumer(mContext, mDelegate, mInputMonitor, + mDeviceState, mNavHandle, mGestureState); + mUnderTest.setNavHandleLongPressHandler(mNavHandleLongPressHandler); + mUnderTest.setStatsLogManager(mStatsLogManager); + mDownTimeMs = 0; + } + + private static void sleep(long sleepMs) { + SystemClock.sleep(sleepMs); + InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + } + + /** Generate a motion event centered horizontally in the screen. */ + private MotionEvent generateCenteredMotionEvent(int motionAction) { + return generateCenteredMotionEventWithYOffset(motionAction, 0); + } + + /** Generate a motion event centered horizontally in the screen, with y offset. */ + private MotionEvent generateCenteredMotionEventWithYOffset(int motionAction, float y) { + return generateMotionEvent(motionAction, mScreenWidth / 2f, y); + } + + private MotionEvent generateMotionEvent(int motionAction, float x, float y) { + if (motionAction == ACTION_DOWN) { + mDownTimeMs = SystemClock.uptimeMillis(); + } + long eventTime = SystemClock.uptimeMillis(); + return MotionEvent.obtain(mDownTimeMs, eventTime, motionAction, x, y, 0); + } + + private static AutoCloseable overrideTwoStageFlag(boolean value) { + return TestExtensions.overrideNavConfigFlag( + "ENABLE_LPNH_TWO_STAGES", + value, + () -> DeviceConfigWrapper.get().getEnableLpnhTwoStages()); + } + + @LauncherAppSingleton + @Component(modules = AllModulesForTest.class) + public interface TopTaskTrackerComponent extends LauncherAppComponent { + @Component.Builder + interface Builder extends LauncherAppComponent.Builder { + @BindsInstance Builder bindTopTaskTracker(TopTaskTracker topTaskTracker); + + @Override + TopTaskTrackerComponent build(); + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/logging/SettingsChangeLoggerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/logging/SettingsChangeLoggerTest.kt new file mode 100644 index 00000000000..fced2cb7ebd --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/logging/SettingsChangeLoggerTest.kt @@ -0,0 +1,160 @@ +/* + * 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.quickstep.logging + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.LauncherPrefs +import com.android.launcher3.LauncherPrefs.Companion.ALLOW_ROTATION +import com.android.launcher3.SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.graphics.ThemeManager +import com.android.launcher3.logging.InstanceId +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_ENABLED +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALL_APPS_SUGGESTIONS_ENABLED +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_ROTATION_DISABLED +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_ROTATION_ENABLED +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NAVIGATION_MODE_GESTURE_BUTTON +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_ENABLED +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_THEMED_ICON_DISABLED +import com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY +import com.android.launcher3.util.AllModulesMinusApiWrapper +import com.android.launcher3.util.FakePrefsModule +import com.android.launcher3.util.SandboxApplication +import com.google.common.truth.Truth.assertThat +import dagger.BindsInstance +import dagger.Component +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Answers +import org.mockito.ArgumentCaptor +import org.mockito.Captor +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.atLeastOnce +import org.mockito.kotlin.capture +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +class SettingsChangeLoggerTest { + + @get:Rule val mockito = MockitoJUnit.rule() + @get:Rule val context = SandboxApplication() + + private val mInstanceId = InstanceId.fakeInstanceId(1) + + @Mock(answer = Answers.RETURNS_SELF) + private lateinit var mMockLogger: StatsLogManager.StatsLogger + + @Mock private lateinit var mStatsLogFactory: StatsLogManager.StatsLogManagerFactory + @Mock private lateinit var mStatsLogManager: StatsLogManager + + @Captor private lateinit var mEventCaptor: ArgumentCaptor + + @Before + fun setUp() { + whenever(mStatsLogFactory.create(context)).doReturn(mStatsLogManager) + whenever(mStatsLogManager.logger()).doReturn(mMockLogger) + context.initDaggerComponent( + DaggerSettingsChangeLoggerTest_TestComponent.builder() + .bindStatsLogManagerFactory(mStatsLogFactory) + ) + + // To match the default value of THEMED_ICONS + ThemeManager.INSTANCE.get(context).isMonoThemeEnabled = false + // To match the default value of ALLOW_ROTATION + LauncherPrefs.get(context).put(item = ALLOW_ROTATION, value = false) + } + + @Test + fun loggingPrefs_correctDefaultValue() { + val systemUnderTest = SettingsChangeLogger.INSTANCE.get(context) + + assertThat(systemUnderTest.loggingPrefs[ALLOW_ROTATION_PREFERENCE_KEY]!!.defaultValue) + .isFalse() + assertThat(systemUnderTest.loggingPrefs[ADD_ICON_PREFERENCE_KEY]!!.defaultValue).isTrue() + assertThat(systemUnderTest.loggingPrefs[OVERVIEW_SUGGESTED_ACTIONS]!!.defaultValue).isTrue() + assertThat(systemUnderTest.loggingPrefs[KEY_ENABLE_MINUS_ONE]!!.defaultValue).isTrue() + } + + @Test + fun logSnapshot_defaultValue() { + SettingsChangeLogger.INSTANCE.get(context).logSnapshot(mInstanceId) + + verify(mMockLogger, atLeastOnce()).log(capture(mEventCaptor)) + val capturedEvents = mEventCaptor.allValues + assertThat(capturedEvents.isNotEmpty()).isTrue() + verifyDefaultEvent(capturedEvents) + assertThat(capturedEvents.any { it.id == LAUNCHER_HOME_SCREEN_ROTATION_DISABLED.id }) + .isTrue() + } + + @Test + fun logSnapshot_updateAllowRotation() { + LauncherPrefs.get(context).put(item = ALLOW_ROTATION, value = true) + + // Create it after changing the launcher prefs so that mLoggablePrefs will be different + SettingsChangeLogger.INSTANCE.get(context).logSnapshot(mInstanceId) + + verify(mMockLogger, atLeastOnce()).log(capture(mEventCaptor)) + val capturedEvents = mEventCaptor.allValues + assertThat(capturedEvents.isNotEmpty()).isTrue() + verifyDefaultEvent(capturedEvents) + assertThat(capturedEvents.any { it.id == LAUNCHER_HOME_SCREEN_ROTATION_ENABLED.id }) + .isTrue() + } + + private fun verifyDefaultEvent(capturedEvents: MutableList) { + assertThat(capturedEvents.any { it.id == LAUNCHER_NOTIFICATION_DOT_ENABLED.id }).isTrue() + assertThat(capturedEvents.any { it.id == LAUNCHER_NAVIGATION_MODE_GESTURE_BUTTON.id }) + .isTrue() + assertThat(capturedEvents.any { it.id == LAUNCHER_THEMED_ICON_DISABLED.id }).isTrue() + assertThat(capturedEvents.any { it.id == LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_ENABLED.id }) + .isTrue() + assertThat(capturedEvents.any { it.id == LAUNCHER_ALL_APPS_SUGGESTIONS_ENABLED.id }) + .isTrue() + assertThat(capturedEvents.any { it.id == LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED.id }) + .isTrue() + assertThat(capturedEvents.any { it.id == LAUNCHER_GOOGLE_APP_SWIPE_LEFT_ENABLED }).isTrue() + } + + companion object { + private const val KEY_ENABLE_MINUS_ONE = "pref_enable_minus_one" + private const val OVERVIEW_SUGGESTED_ACTIONS = "pref_overview_action_suggestions" + + private const val LAUNCHER_GOOGLE_APP_SWIPE_LEFT_ENABLED = 617 + } + + @LauncherAppSingleton + @Component(modules = [AllModulesMinusApiWrapper::class, FakePrefsModule::class]) + interface TestComponent : LauncherAppComponent { + + @Component.Builder + interface Builder : LauncherAppComponent.Builder { + @BindsInstance + fun bindStatsLogManagerFactory(factory: StatsLogManager.StatsLogManagerFactory): Builder + + override fun build(): TestComponent + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/LandscapePagedViewHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/LandscapePagedViewHandlerTest.kt index ea52842e220..66b3b047d7a 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/LandscapePagedViewHandlerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/LandscapePagedViewHandlerTest.kt @@ -43,12 +43,12 @@ class LandscapePagedViewHandlerTest { if (isEnabled) { setFlagsRule.enableFlags( Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, - Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU + Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, ) } else { setFlagsRule.disableFlags( Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, - Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU + Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, ) } } @@ -62,6 +62,7 @@ class LandscapePagedViewHandlerTest { isRTL, OVERVIEW_TASK_MARGIN_PX, DIVIDER_SIZE_PX, + oneIconHiddenDueToSmallWidth = false, ) } @@ -107,14 +108,8 @@ class LandscapePagedViewHandlerTest { val (topLeftY, bottomRightY) = getSplitIconsPosition(isRTL = true) - // TODO(b/326377497): When started in fake seascape and rotated to landscape, - // the icon chips are in RTL and wrongly positioned at the right side of the snapshot. - // Top-Left app chip should be placed at the top left of the first snapshot, but because - // this issue, it's displayed at the top-right of the second snapshot. - // The Bottom-Right app chip is displayed at the top-right of the first snapshot because - // of this issue. - assertThat(topLeftY).isEqualTo(0) - assertThat(bottomRightY).isEqualTo(-316) + assertThat(topLeftY).isEqualTo(-316) + assertThat(bottomRightY).isEqualTo(0) } /** Test updateSplitIconsPosition */ diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/SeascapePagedViewHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/SeascapePagedViewHandlerTest.kt index 2bc182c02de..d455b0d1e93 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/SeascapePagedViewHandlerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/SeascapePagedViewHandlerTest.kt @@ -43,12 +43,12 @@ class SeascapePagedViewHandlerTest { if (isEnabled) { setFlagsRule.enableFlags( Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, - Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU + Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, ) } else { setFlagsRule.disableFlags( Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW, - Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU + Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU, ) } } @@ -62,6 +62,7 @@ class SeascapePagedViewHandlerTest { isRTL, OVERVIEW_TASK_MARGIN_PX, DIVIDER_SIZE_PX, + oneIconHiddenDueToSmallWidth = false, ) } @@ -109,12 +110,6 @@ class SeascapePagedViewHandlerTest { val (topLeftY, bottomRightY) = getSplitIconsPosition(isRTL = true) - // TODO(b/326377497): When started in fake seascape and rotated to landscape, - // the icon chips are in RTL and wrongly positioned at the right side of the snapshot. - // Top-Left app chip should be placed at the top left of the first snapshot, but because - // this issue, it's displayed at the top-right of the second snapshot. - // The Bottom-Right app chip is displayed at the top-right of the first snapshot because - // of this issue. assertThat(topLeftY).isEqualTo(316) assertThat(bottomRightY).isEqualTo(0) } @@ -166,7 +161,7 @@ class SeascapePagedViewHandlerTest { `when`(iconView.layoutParams).thenReturn(frameLayout) sut.updateSplitIconsPosition(iconView, expectedTranslationY, false) - assertThat(frameLayout.gravity).isEqualTo(Gravity.BOTTOM or Gravity.START) + assertThat(frameLayout.gravity).isEqualTo(Gravity.BOTTOM or Gravity.END) verify(iconView).setSplitTranslationX(0f) verify(iconView).setSplitTranslationY(expectedTranslationY.toFloat()) } @@ -181,7 +176,7 @@ class SeascapePagedViewHandlerTest { `when`(iconView.layoutParams).thenReturn(frameLayout) sut.updateSplitIconsPosition(iconView, expectedTranslationY, true) - assertThat(frameLayout.gravity).isEqualTo(Gravity.TOP or Gravity.END) + assertThat(frameLayout.gravity).isEqualTo(Gravity.TOP or Gravity.START) verify(iconView).setSplitTranslationX(0f) verify(iconView).setSplitTranslationY(expectedTranslationY.toFloat()) } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/AppTimersRepositoryTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/AppTimersRepositoryTest.kt new file mode 100644 index 00000000000..49ef67ce4a9 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/AppTimersRepositoryTest.kt @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.content.pm.LauncherApps +import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.util.TestDispatcherProvider +import com.google.common.truth.Truth.assertThat +import java.time.Duration +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +@OptIn(ExperimentalCoroutinesApi::class) +class AppTimersRepositoryTest { + private val launcherAppsMock: LauncherApps = mock() + private val testDispatcher = UnconfinedTestDispatcher() + private val testScope = TestScope(testDispatcher) + + private val systemUnderTest = + AppTimersRepositoryImpl(launcherAppsMock, TestDispatcherProvider(testDispatcher)) + + @Test + fun getRemainingDuration_noSetLimit_returnsNull() = + testScope.runTest { + whenever(launcherAppsMock.getAppUsageLimit(PACKAGE_NAME, USER_HANDLE)).thenReturn(null) + + val remainingDuration = systemUnderTest.getRemainingDuration(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isNull() + } + + @Test + fun getRemainingDuration_limitSet_returnsUsageRemaining() = + testScope.runTest { + val totalUsageLimit = Duration.ofMinutes(20) + val usageRemaining = Duration.ofMinutes(5).plusSeconds(10) + whenever(launcherAppsMock.getAppUsageLimit(PACKAGE_NAME, USER_HANDLE)) + .thenReturn( + LauncherApps.AppUsageLimit( + totalUsageLimit.toMillis(), + usageRemaining.toMillis(), + ) + ) + + val remainingDuration = systemUnderTest.getRemainingDuration(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(usageRemaining) + } + + companion object { + private const val PACKAGE_NAME = "com.test.1" + private val USER_HANDLE = UserHandle(0) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/DesktopTileBackgroundDataSourceTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/DesktopTileBackgroundDataSourceTest.kt new file mode 100644 index 00000000000..badf19a1910 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/DesktopTileBackgroundDataSourceTest.kt @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.graphics.Bitmap +import android.os.RemoteException +import android.view.IWallpaperVisibilityListener +import android.view.IWindowManager +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.quickstep.recents.di.DisplayId +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.ArgumentMatchers.eq +import org.mockito.Captor +import org.mockito.Mock +import org.mockito.Mockito.times +import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` +import org.mockito.MockitoAnnotations + +@RunWith(AndroidJUnit4::class) +class DesktopTileBackgroundDataSourceTest { + + @Mock private lateinit var mockWindowManager: IWindowManager + + private val testBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + + @Captor + private lateinit var wallpaperVisibilityListenerCaptor: + ArgumentCaptor + + private lateinit var dataSource: DesktopTileBackgroundDataSource + private val displayId = DisplayId(0) + + @Before + fun setUp() { + MockitoAnnotations.openMocks(this) + dataSource = DesktopTileBackgroundDataSource(mockWindowManager, displayId) + } + + @Test + fun getWallpaperBackgroundBitmap_windowManagerIsNull_returnsNull() = runTest { + dataSource = DesktopTileBackgroundDataSource(null, displayId) + + val result = dataSource.getWallpaperBackgroundBitmap(false) + + assertThat(result).isNull() + } + + @Test + fun getWallpaperBackgroundBitmap_cacheAvailable_returnsCache() = runTest { + `when`( + mockWindowManager.registerWallpaperVisibilityListener( + wallpaperVisibilityListenerCaptor.capture(), + eq(displayId.displayId), + ) + ) + .thenReturn(true) + `when`(mockWindowManager.screenshotWallpaper()).thenReturn(testBitmap) + + dataSource.getWallpaperBackgroundBitmap(false) + + val result = dataSource.getWallpaperBackgroundBitmap(false) + assertThat(testBitmap).isEqualTo(result) + verify(mockWindowManager, times(1)).screenshotWallpaper() + } + + @Test + fun getWallpaperBackgroundBitmap_forceRefreshRequested_capturesScreenshot() = runTest { + val recapturedBitmap = Bitmap.createBitmap(2, 2, Bitmap.Config.ARGB_8888) + `when`( + mockWindowManager.registerWallpaperVisibilityListener( + wallpaperVisibilityListenerCaptor.capture(), + eq(displayId.displayId), + ) + ) + .thenReturn(true) + `when`(mockWindowManager.screenshotWallpaper()).thenReturn(testBitmap) + dataSource.getWallpaperBackgroundBitmap(false) + `when`(mockWindowManager.screenshotWallpaper()).thenReturn(recapturedBitmap) + + val result = dataSource.getWallpaperBackgroundBitmap(true) + + assertThat(recapturedBitmap).isEqualTo(result) + verify(mockWindowManager, times(2)).screenshotWallpaper() + } + + @Test + fun getWallpaperBackgroundBitmap_wallpaperInitiallyVisible_capturesScreenshot() = runTest { + `when`( + mockWindowManager.registerWallpaperVisibilityListener( + wallpaperVisibilityListenerCaptor.capture(), + eq(displayId.displayId), + ) + ) + .thenReturn(true) + `when`(mockWindowManager.screenshotWallpaper()).thenReturn(testBitmap) + + val result = dataSource.getWallpaperBackgroundBitmap(false) + + assertThat(testBitmap).isEqualTo(result) + verify(mockWindowManager) + .registerWallpaperVisibilityListener( + wallpaperVisibilityListenerCaptor.value, + displayId.displayId, + ) + verify(mockWindowManager).screenshotWallpaper() + } + + @Test + fun getWallpaperBackgroundBitmap_remoteExceptionDuringRegistration_returnsNull() = runTest { + `when`( + mockWindowManager.registerWallpaperVisibilityListener( + wallpaperVisibilityListenerCaptor.capture(), + eq(displayId.displayId), + ) + ) + .thenThrow(RemoteException("Test Exception")) + + val result = dataSource.getWallpaperBackgroundBitmap(false) + assertThat(result).isNull() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/DesktopTileBackgroundRepositoryTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/DesktopTileBackgroundRepositoryTest.kt new file mode 100644 index 00000000000..3a49eaf61fd --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/DesktopTileBackgroundRepositoryTest.kt @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.graphics.Bitmap +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.quickstep.recents.data.DesktopTileBackgroundRepository.Companion.DESKTOP_BACKGROUND_FALLBACK_COLOR +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +class DesktopTileBackgroundRepositoryTest { + private val desktopTileBackgroundDataSource = mock() + private val desktopTileBackgroundRepository = + DesktopTileBackgroundRepository(desktopTileBackgroundDataSource) + + @Test + fun getBackground_dataSourceReturnsScreenshot_returnsBitmapBackground() = runTest { + val testBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + whenever(desktopTileBackgroundDataSource.getWallpaperBackgroundBitmap()) + .thenReturn(testBitmap) + + val expectedResult = desktopTileBackgroundRepository.getWallpaperBackground() + + assertThat(expectedResult) + .isInstanceOf(DesktopBackgroundResult.WallpaperBackground::class.java) + assertThat(testBitmap) + .isEqualTo((expectedResult as DesktopBackgroundResult.WallpaperBackground).background) + } + + @Test + fun getBackground_dataSourceReturnsNull_returnsColorBackground() = runTest { + whenever(desktopTileBackgroundDataSource.getWallpaperBackgroundBitmap()).thenReturn(null) + + val expectedResult = desktopTileBackgroundRepository.getWallpaperBackground() + + assertThat(expectedResult) + .isInstanceOf(DesktopBackgroundResult.FallbackBackground::class.java) + assertThat(DESKTOP_BACKGROUND_FALLBACK_COLOR) + .isEqualTo((expectedResult as DesktopBackgroundResult.FallbackBackground).background) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeAppTimersRepository.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeAppTimersRepository.kt new file mode 100644 index 00000000000..02dd9ba24dd --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeAppTimersRepository.kt @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.os.UserHandle +import java.time.Duration + +/** + * A fake implementation of [AppTimersRepository] that supports seeding the timer information for + * testing. + */ +class FakeAppTimersRepository : AppTimersRepository { + private val timers: MutableMap = mutableMapOf() + + override suspend fun getRemainingDuration( + packageName: String, + userHandle: UserHandle, + ): Duration? = timers[TimerKey(packageName, userHandle)] + + /** Seed timer info for an app identified by the provided [packageName] and [userHandle]. */ + fun setTimer(packageName: String, userHandle: UserHandle, remainingDuration: Duration) { + timers[TimerKey(packageName, userHandle)] = remainingDuration + } + + /** Clear timer for an app identified by the provided [packageName] and [userHandle]. */ + fun resetTimer(packageName: String, userHandle: UserHandle) { + timers.remove(TimerKey(packageName, userHandle)) + } + + private data class TimerKey(val packageName: String, val userHandle: UserHandle) +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeHighResLoadingStateNotifier.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeHighResLoadingStateNotifier.kt new file mode 100644 index 00000000000..4adf01ef346 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeHighResLoadingStateNotifier.kt @@ -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 com.android.quickstep.recents.data + +import com.android.quickstep.HighResLoadingState.HighResLoadingStateChangedCallback + +class FakeHighResLoadingStateNotifier : HighResLoadingStateNotifier { + val listeners = mutableListOf() + + override fun addCallback(callback: HighResLoadingStateChangedCallback) { + listeners.add(callback) + } + + override fun removeCallback(callback: HighResLoadingStateChangedCallback) { + listeners.remove(callback) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentTasksDataSource.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentTasksDataSource.kt index eaeb513ea5c..9e99a0bd62b 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentTasksDataSource.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentTasksDataSource.kt @@ -20,10 +20,12 @@ import com.android.quickstep.util.GroupTask import java.util.function.Consumer class FakeRecentTasksDataSource : RecentTasksDataSource { - var taskList: List = listOf() + private var taskList: List = listOf() override fun getTasks(callback: Consumer>?): Int { - callback?.accept(taskList) + // Makes a copy of the GroupTask to create a new GroupTask instance and to simulate + // RecentsModel::getTasks behavior. + callback?.accept(taskList.map { it.copy() }) return 0 } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentsDeviceProfileRepository.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentsDeviceProfileRepository.kt new file mode 100644 index 00000000000..4e909035bb2 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentsDeviceProfileRepository.kt @@ -0,0 +1,28 @@ +/* + * 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.quickstep.recents.data + +class FakeRecentsDeviceProfileRepository : RecentsDeviceProfileRepository { + private var recentsDeviceProfile = + RecentsDeviceProfile(isLargeScreen = false, canEnterDesktopMode = false) + + override fun getRecentsDeviceProfile() = recentsDeviceProfile + + fun setRecentsDeviceProfile(newValue: RecentsDeviceProfile) { + recentsDeviceProfile = newValue + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentsRotationStateRepository.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentsRotationStateRepository.kt new file mode 100644 index 00000000000..c328672d9dd --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeRecentsRotationStateRepository.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.quickstep.recents.data + +import android.view.Surface + +class FakeRecentsRotationStateRepository : RecentsRotationStateRepository { + private var recentsRotationState = + RecentsRotationState( + activityRotation = Surface.ROTATION_0, + orientationHandlerRotation = Surface.ROTATION_0 + ) + + override fun getRecentsRotationState() = recentsRotationState + + fun setRecentsRotationState(newValue: RecentsRotationState) { + recentsRotationState = newValue + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskIconDataSource.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskIconDataSource.kt new file mode 100644 index 00000000000..ce36715ad97 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskIconDataSource.kt @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.recents.data + +import android.graphics.drawable.Drawable +import com.android.quickstep.TaskIconCache.TaskCacheEntry +import com.android.quickstep.task.thumbnail.data.TaskIconDataSource +import com.android.systemui.shared.recents.model.Task +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.delay +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +class FakeTaskIconDataSource : TaskIconDataSource { + + val taskIdToDrawable: MutableMap = + (0..10).associateWith { mockCopyableDrawable() }.toMutableMap() + private val completionPrevented: MutableSet = mutableSetOf() + + /** Retrieves and sets an icon on [task] from [taskIdToDrawable]. */ + override suspend fun getIcon(task: Task): TaskCacheEntry { + while (task.key.id in completionPrevented) { + // yield doesn't work here with an UnconfinedTestDispatcher + delay(1L) + } + return TaskCacheEntry( + taskIdToDrawable.getValue(task.key.id), + "content desc ${task.key.id}", + "title ${task.key.id}", + ) + } + + fun preventIconLoad(taskId: Int) { + completionPrevented.add(taskId) + } + + fun completeLoadingForTask(taskId: Int) { + completionPrevented.remove(taskId) + } + + fun completeLoading() { + completionPrevented.clear() + } + + companion object { + fun mockCopyableDrawable(): Drawable { + val mutableDrawable = mock() + val immutableDrawable = + mock().apply { whenever(mutate()).thenReturn(mutableDrawable) } + val constantState = + mock().apply { + whenever(newDrawable()).thenReturn(immutableDrawable) + } + return mutableDrawable.apply { whenever(this.constantState).thenReturn(constantState) } + } + } +} + +fun Task.assertHasIconDataFromSource(fakeTaskIconDataSource: FakeTaskIconDataSource) { + assertThat(icon).isEqualTo(fakeTaskIconDataSource.taskIdToDrawable[key.id]) + assertThat(titleDescription).isEqualTo("content desc ${key.id}") + assertThat(title).isEqualTo("title ${key.id}") +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskThumbnailDataSource.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskThumbnailDataSource.kt index b66b7351bfd..71996c78358 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskThumbnailDataSource.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskThumbnailDataSource.kt @@ -17,36 +17,46 @@ package com.android.quickstep.recents.data import android.graphics.Bitmap -import com.android.launcher3.util.CancellableTask import com.android.quickstep.task.thumbnail.data.TaskThumbnailDataSource import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.ThumbnailData -import java.util.function.Consumer +import kotlinx.coroutines.delay import org.mockito.kotlin.mock -import org.mockito.kotlin.whenever class FakeTaskThumbnailDataSource : TaskThumbnailDataSource { - val taskIdToBitmap: Map = (0..10).associateWith { mock() } - val taskIdToUpdatingTask: MutableMap Unit> = mutableMapOf() - var shouldLoadSynchronously: Boolean = true + val taskIdToBitmap: MutableMap = + (0..10).associateWith { mock() }.toMutableMap() + private val completionPrevented: MutableSet = mutableSetOf() + private val getThumbnailCalls = mutableMapOf() + + var highResEnabled = true /** Retrieves and sets a thumbnail on [task] from [taskIdToBitmap]. */ - override fun updateThumbnailInBackground( - task: Task, - callback: Consumer - ): CancellableTask? { - val thumbnailData = mock() - whenever(thumbnailData.thumbnail).thenReturn(taskIdToBitmap[task.key.id]) - val wrappedCallback = { - task.thumbnail = thumbnailData - callback.accept(thumbnailData) - } - if (shouldLoadSynchronously) { - wrappedCallback() - } else { - taskIdToUpdatingTask[task.key.id] = wrappedCallback + override suspend fun getThumbnail(task: Task): ThumbnailData { + getThumbnailCalls[task.key.id] = (getThumbnailCalls[task.key.id] ?: 0) + 1 + + while (task.key.id in completionPrevented) { + // yield doesn't work here with an UnconfinedTestDispatcher + delay(1L) } - return null + return ThumbnailData( + thumbnail = taskIdToBitmap[task.key.id], + reducedResolution = !highResEnabled, + ) + } + + fun getNumberOfGetThumbnailCalls(taskId: Int): Int = getThumbnailCalls[taskId] ?: 0 + + fun preventThumbnailLoad(taskId: Int) { + completionPrevented.add(taskId) + } + + fun completeLoadingForTask(taskId: Int) { + completionPrevented.remove(taskId) + } + + fun completeLoading() { + completionPrevented.clear() } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskVisualsChangeNotifier.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskVisualsChangeNotifier.kt new file mode 100644 index 00000000000..765f0d1dfbc --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskVisualsChangeNotifier.kt @@ -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 com.android.quickstep.recents.data + +import com.android.quickstep.util.TaskVisualsChangeListener + +class FakeTaskVisualsChangeNotifier : TaskVisualsChangeNotifier { + val listeners = mutableListOf() + + override fun addThumbnailChangeListener(listener: TaskVisualsChangeListener) { + listeners.add(listener) + } + + override fun removeThumbnailChangeListener(listener: TaskVisualsChangeListener) { + listeners.remove(listener) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTasksRepository.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTasksRepository.kt index e160627d750..c00ff15cedc 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTasksRepository.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTasksRepository.kt @@ -16,25 +16,66 @@ package com.android.quickstep.recents.data +import android.graphics.drawable.Drawable +import androidx.core.util.forEach +import androidx.core.util.putAll import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.ThumbnailData import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.update class FakeTasksRepository : RecentTasksRepository { private var thumbnailDataMap: Map = emptyMap() + private var taskIconDataMap: Map = emptyMap() private var tasks: MutableStateFlow> = MutableStateFlow(emptyList()) - private var visibleTasks: MutableStateFlow> = MutableStateFlow(emptyList()) + private var visibleTasks: MutableStateFlow>> = MutableStateFlow(mapOf()) - override fun getAllTaskData(forceRefresh: Boolean): Flow> = tasks + override fun getAllTaskData(displayId: Int, forceRefresh: Boolean): Flow> = + tasks.map { it.filter { it.key.displayId == displayId }.toList() } override fun getTaskDataById(taskId: Int): Flow = - getAllTaskData().map { taskList -> taskList.firstOrNull { it.key.id == taskId } } + combine(tasks, visibleTasks) { taskList, visibleTasks -> + val allVisibleTasks = mutableSetOf() + visibleTasks.forEach { _, value -> allVisibleTasks.addAll(value) } + taskList.filter { allVisibleTasks.contains(it.key.id) } + } + .map { taskList -> + val task = taskList.firstOrNull { it.key.id == taskId } ?: return@map null + Task(task).apply { + thumbnail = task.thumbnail + icon = task.icon + titleDescription = task.titleDescription + title = task.title + } + } - override fun setVisibleTasks(visibleTaskIdList: List) { - visibleTasks.value = visibleTaskIdList - tasks.value = tasks.value.map { it.apply { thumbnail = thumbnailDataMap[it.key.id] } } + override fun getThumbnailById(taskId: Int): Flow = + getTaskDataById(taskId).map { it?.thumbnail } + + override fun getCurrentThumbnailById(taskId: Int): ThumbnailData? = + tasks.value.firstOrNull { it.key.id == taskId }?.thumbnail + + override fun setVisibleTasks(displayId: Int, visibleTaskIdList: Set) { + visibleTasks.update { + val newVisibleTasks = mutableMapOf>() + newVisibleTasks.putAll(it) + newVisibleTasks[displayId] = visibleTaskIdList + newVisibleTasks + } + tasks.value = + tasks.value.map { + it.apply { + thumbnail = thumbnailDataMap[it.key.id] + taskIconDataMap[it.key.id]?.let { data -> + title = data.title + titleDescription = data.titleDescription + icon = data.icon + } + } + } } fun seedTasks(tasks: List) { @@ -44,4 +85,15 @@ class FakeTasksRepository : RecentTasksRepository { fun seedThumbnailData(thumbnailDataMap: Map) { this.thumbnailDataMap = thumbnailDataMap } + + fun seedIconData(id: Int, title: String, contentDescription: String, icon: Drawable) { + val iconData = FakeIconData(icon, contentDescription, title) + this.taskIconDataMap = mapOf(id to iconData) + } + + private data class FakeIconData( + val icon: Drawable, + val titleDescription: String, + val title: String, + ) } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeUserLockedStateRepository.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeUserLockedStateRepository.kt new file mode 100644 index 00000000000..587bbddc1de --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeUserLockedStateRepository.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +class FakeUserLockedStateRepository : UserLockedStateRepository { + private var lockedStates = mapOf() + + override fun invalidateCachedValues() { + lockedStates = mapOf() + } + + override fun getIsUserLocked(userId: Int) = lockedStates[userId] ?: false + + fun setLockedStates(states: Map) { + lockedStates = states + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/PointerRepositoryTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/PointerRepositoryTest.kt new file mode 100644 index 00000000000..deebf87afe4 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/PointerRepositoryTest.kt @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.view.InputDevice +import android.view.InputDevice.SOURCE_KEYBOARD +import android.view.InputDevice.SOURCE_MOUSE +import android.view.InputDevice.SOURCE_TOUCHPAD +import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock + +@RunWith(AndroidJUnit4::class) +class PointerRepositoryTest { + private val fakeInputManager = FakeInputDeviceDataSource() + private val pointerRepository = PointerRepositoryImpl(fakeInputManager) + + @Before + fun tearDown() { + fakeInputManager.reset() + } + + @Test + fun noConnectedDevices_returnsFalse() { + fakeInputManager.reset() + + assertFalse(pointerRepository.isAnyPointerDeviceConnected()) + } + + @Test + fun disabledMouse_returnsFalse() { + fakeInputManager.addInputDevice(1, false, SOURCE_MOUSE) + + assertFalse(pointerRepository.isAnyPointerDeviceConnected()) + } + + @Test + fun connectedKeyboard_returnsFalse() { + fakeInputManager.addInputDevice(1, true, SOURCE_KEYBOARD) + + assertFalse(pointerRepository.isAnyPointerDeviceConnected()) + } + + @Test + fun connectedMouse_returnsTrue() { + fakeInputManager.addInputDevice(1, true, SOURCE_MOUSE) + + assertTrue(pointerRepository.isAnyPointerDeviceConnected()) + } + + @Test + fun connectedTouchpad_returnsTrue() { + fakeInputManager.addInputDevice(1, true, SOURCE_TOUCHPAD) + + assertTrue(pointerRepository.isAnyPointerDeviceConnected()) + } + + @Test + fun connectedMouseAndKeyboard_returnsTrue() { + fakeInputManager.addInputDevice(1, true, SOURCE_MOUSE) + fakeInputManager.addInputDevice(2, true, SOURCE_KEYBOARD) + + assertTrue(pointerRepository.isAnyPointerDeviceConnected()) + } +} + +class FakeInputDeviceDataSource : InputDeviceDataSource { + private val devices = mutableMapOf() + + override val inputDeviceIds: IntArray + get() = devices.keys.toIntArray() + + override fun getInputDevice(deviceId: Int): InputDevice? = devices[deviceId] + + fun addInputDevice(deviceId: Int, isEnabled: Boolean, sourceToSupport: Int? = null) { + devices[deviceId] = mock { + on { this.isEnabled } doReturn isEnabled + on { this.id } doReturn deviceId + + if (sourceToSupport != null) { + on { supportsSource(sourceToSupport) } doReturn true + } + } + } + + fun reset() { + devices.clear() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/RecentsRotationStateRepositoryImplTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/RecentsRotationStateRepositoryImplTest.kt new file mode 100644 index 00000000000..017f037fee4 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/RecentsRotationStateRepositoryImplTest.kt @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.recents.data + +import android.view.Surface.ROTATION_270 +import android.view.Surface.ROTATION_90 +import com.android.quickstep.orientation.SeascapePagedViewHandler +import com.android.quickstep.util.RecentsOrientedState +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +/** Test for [RecentsRotationStateRepositoryImpl] */ +class RecentsRotationStateRepositoryImplTest { + private val recentsOrientedState = mock() + + private val systemUnderTest = RecentsRotationStateRepositoryImpl(recentsOrientedState) + + @Test + fun orientedStateMappedCorrectly() { + whenever(recentsOrientedState.recentsActivityRotation).thenReturn(ROTATION_90) + whenever(recentsOrientedState.orientationHandler).thenReturn(SeascapePagedViewHandler()) + + assertThat(systemUnderTest.getRecentsRotationState()) + .isEqualTo( + RecentsRotationState( + activityRotation = ROTATION_90, + orientationHandlerRotation = ROTATION_270 + ) + ) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegateTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegateTest.kt new file mode 100644 index 00000000000..b91f8bd6fd8 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegateTest.kt @@ -0,0 +1,213 @@ +/* + * 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.quickstep.recents.data + +import android.content.ComponentName +import android.content.Intent +import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskIconChangedCallback +import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskThumbnailChangedCallback +import com.android.systemui.shared.recents.model.Task.TaskKey +import com.android.systemui.shared.recents.model.ThumbnailData +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions + +@RunWith(AndroidJUnit4::class) +class TaskVisualsChangedDelegateTest { + private val taskVisualsChangeNotifier = FakeTaskVisualsChangeNotifier() + private val highResLoadingStateNotifier = FakeHighResLoadingStateNotifier() + + val systemUnderTest = + TaskVisualsChangedDelegateImpl(taskVisualsChangeNotifier, highResLoadingStateNotifier) + + @Test + fun addingFirstListener_addsListenerToNotifiers() { + systemUnderTest.registerTaskThumbnailChangedCallback(createTaskKey(id = 1), mock()) + + assertThat(taskVisualsChangeNotifier.listeners.single()).isEqualTo(systemUnderTest) + assertThat(highResLoadingStateNotifier.listeners.single()).isEqualTo(systemUnderTest) + } + + @Test + fun addingAndRemovingListener_removesListenerFromNotifiers() { + systemUnderTest.registerTaskThumbnailChangedCallback(createTaskKey(id = 1), mock()) + systemUnderTest.unregisterTaskThumbnailChangedCallback(createTaskKey(id = 1)) + + assertThat(taskVisualsChangeNotifier.listeners).isEmpty() + assertThat(highResLoadingStateNotifier.listeners).isEmpty() + } + + @Test + fun addingTwoAndRemovingOneListener_doesNotRemoveListenerFromNotifiers() { + systemUnderTest.registerTaskThumbnailChangedCallback(createTaskKey(id = 1), mock()) + systemUnderTest.registerTaskThumbnailChangedCallback(createTaskKey(id = 2), mock()) + systemUnderTest.unregisterTaskThumbnailChangedCallback(createTaskKey(id = 1)) + + assertThat(taskVisualsChangeNotifier.listeners.single()).isEqualTo(systemUnderTest) + assertThat(highResLoadingStateNotifier.listeners.single()).isEqualTo(systemUnderTest) + } + + @Test + fun onTaskIconChangedWithTaskId_notifiesCorrectListenerOnly() { + val expectedListener = mock() + val additionalListener = mock() + systemUnderTest.registerTaskIconChangedCallback(createTaskKey(id = 1), expectedListener) + systemUnderTest.registerTaskIconChangedCallback(createTaskKey(id = 2), additionalListener) + + systemUnderTest.onTaskIconChanged(1) + + verify(expectedListener).onTaskIconChanged() + verifyNoMoreInteractions(additionalListener) + } + + @Test + fun onTaskIconChangedWithoutTaskId_notifiesCorrectListenerOnly() { + val expectedListener = mock() + val listener = mock() + // Correct match + systemUnderTest.registerTaskIconChangedCallback( + createTaskKey(id = 1, pkg = ALTERNATIVE_PACKAGE_NAME, userId = 1), + expectedListener, + ) + // 1 out of 2 match + systemUnderTest.registerTaskIconChangedCallback( + createTaskKey(id = 2, pkg = PACKAGE_NAME, userId = 1), + listener, + ) + systemUnderTest.registerTaskIconChangedCallback( + createTaskKey(id = 3, pkg = ALTERNATIVE_PACKAGE_NAME, userId = 2), + listener, + ) + // 0 out of 2 match + systemUnderTest.registerTaskIconChangedCallback( + createTaskKey(id = 4, pkg = PACKAGE_NAME, userId = 2), + listener, + ) + + systemUnderTest.onTaskIconChanged(ALTERNATIVE_PACKAGE_NAME, UserHandle(1)) + + verify(expectedListener).onTaskIconChanged() + verifyNoMoreInteractions(listener) + } + + @Test + fun replacedTaskIconChangedCallbacks_notCalled() { + val replacedListener = mock() + val newListener = mock() + systemUnderTest.registerTaskIconChangedCallback( + createTaskKey(id = 1, pkg = ALTERNATIVE_PACKAGE_NAME, userId = 1), + replacedListener, + ) + systemUnderTest.registerTaskIconChangedCallback( + createTaskKey(id = 1, pkg = ALTERNATIVE_PACKAGE_NAME, userId = 1), + newListener, + ) + + systemUnderTest.onTaskIconChanged(ALTERNATIVE_PACKAGE_NAME, UserHandle(1)) + + verifyNoMoreInteractions(replacedListener) + verify(newListener).onTaskIconChanged() + } + + @Test + fun onTaskThumbnailChanged_notifiesCorrectListenerOnly() { + val expectedListener = mock() + val additionalListener = mock() + val expectedThumbnailData = ThumbnailData(snapshotId = 12345) + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 1), + expectedListener, + ) + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 2), + additionalListener, + ) + + systemUnderTest.onTaskThumbnailChanged(1, expectedThumbnailData) + + verify(expectedListener).onTaskThumbnailChanged(expectedThumbnailData) + verifyNoMoreInteractions(additionalListener) + } + + @Test + fun onHighResLoadingStateChanged_toEnabled_notifiesAllListeners() { + val expectedListener = mock() + val additionalListener = mock() + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 1), + expectedListener, + ) + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 2), + additionalListener, + ) + + systemUnderTest.onHighResLoadingStateChanged(true) + + verify(expectedListener).onHighResLoadingStateChanged(true) + verify(additionalListener).onHighResLoadingStateChanged(true) + } + + @Test + fun onHighResLoadingStateChanged_toDisabled_notifiesAllListeners() { + val expectedListener = mock() + val additionalListener = mock() + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 1), + expectedListener, + ) + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 2), + additionalListener, + ) + + systemUnderTest.onHighResLoadingStateChanged(false) + + verify(expectedListener).onHighResLoadingStateChanged(false) + verify(additionalListener).onHighResLoadingStateChanged(false) + } + + @Test + fun replacedTaskThumbnailChangedCallbacks_notCalled() { + val replacedListener1 = mock() + val newListener1 = mock() + val expectedThumbnailData = ThumbnailData(snapshotId = 12345) + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 1), + replacedListener1, + ) + systemUnderTest.registerTaskThumbnailChangedCallback(createTaskKey(id = 1), newListener1) + + systemUnderTest.onTaskThumbnailChanged(1, expectedThumbnailData) + + verifyNoMoreInteractions(replacedListener1) + verify(newListener1).onTaskThumbnailChanged(expectedThumbnailData) + } + + private fun createTaskKey(id: Int = 1, pkg: String = PACKAGE_NAME, userId: Int = 1) = + TaskKey(id, 0, Intent().setPackage(pkg), ComponentName("", ""), userId, 0) + + private companion object { + const val PACKAGE_NAME = "com.test.test" + const val ALTERNATIVE_PACKAGE_NAME = "com.test.test2" + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TasksRepositoryTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TasksRepositoryTest.kt index c28a85a8f88..3be1348dc0e 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TasksRepositoryTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TasksRepositoryTest.kt @@ -16,135 +16,625 @@ package com.android.quickstep.recents.data +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD import android.content.ComponentName import android.content.Intent -import com.android.quickstep.TaskIconCache +import android.graphics.Bitmap +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.platform.test.annotations.EnableFlags +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.Flags +import com.android.launcher3.util.TestDispatcherProvider import com.android.quickstep.util.DesktopTask -import com.android.quickstep.util.GroupTask +import com.android.quickstep.util.SingleTask +import com.android.quickstep.util.SplitTask import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50 import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.toList import kotlinx.coroutines.launch +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.advanceUntilIdle import kotlinx.coroutines.test.runTest +import org.junit.Before import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.spy import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever @OptIn(ExperimentalCoroutinesApi::class) +@RunWith(AndroidJUnit4::class) class TasksRepositoryTest { private val tasks = (0..5).map(::createTaskWithId) + private val secondaryTasks = (6..11).map(::createTaskWithIdForSecondaryDisplay) private val defaultTaskList = listOf( - GroupTask(tasks[0]), - GroupTask(tasks[1], tasks[2], null), - DesktopTask(tasks.subList(3, 6)) + SingleTask(tasks[0]), + SplitTask( + tasks[1], + tasks[2], + SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* snapPosition = */ SNAP_TO_2_50_50, + ), + ), + DesktopTask(deskId = 0, DEFAULT_DISPLAY, tasks.subList(3, 6)), + ) + private val secondaryTaskList = + listOf( + SingleTask(secondaryTasks[0]), + SplitTask( + secondaryTasks[1], + secondaryTasks[2], + SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ 7, + /* rightBottomTaskId = */ 8, + /* snapPosition = */ SNAP_TO_2_50_50, + ), + ), + DesktopTask(deskId = 1, SECONDARY_DISPLAY, secondaryTasks.subList(3, 6)), ) private val recentsModel = FakeRecentTasksDataSource() private val taskThumbnailDataSource = FakeTaskThumbnailDataSource() - private val taskIconCache = mock() + private val taskIconDataSource = FakeTaskIconDataSource() + private val taskVisualsChangeNotifier = FakeTaskVisualsChangeNotifier() + private val highResLoadingStateNotifier = FakeHighResLoadingStateNotifier() + private val userLockedStateRepository = FakeUserLockedStateRepository() + private val taskVisualsChangedDelegate = + spy(TaskVisualsChangedDelegateImpl(taskVisualsChangeNotifier, highResLoadingStateNotifier)) + private val dispatcher = UnconfinedTestDispatcher() + private val testScope = TestScope(dispatcher) private val systemUnderTest = - TasksRepository(recentsModel, taskThumbnailDataSource, taskIconCache) + TasksRepository( + recentsModel, + taskThumbnailDataSource, + taskIconDataSource, + userLockedStateRepository, + taskVisualsChangedDelegate, + testScope.backgroundScope, + TestDispatcherProvider(dispatcher), + ) + + @Before + fun cleanupDataSources() { + taskThumbnailDataSource.completeLoading() + taskIconDataSource.completeLoading() + } @Test - fun getAllTaskDataReturnsFlattenedListOfTasks() = runTest { - recentsModel.seedTasks(defaultTaskList) + fun getAllTaskDataReturnsFlattenedListOfTasks() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + assertThat(systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true).first()) + .isEqualTo(tasks) + } - assertThat(systemUnderTest.getAllTaskData(forceRefresh = true).first()).isEqualTo(tasks) - } + @Test + @EnableFlags(Flags.FLAG_ENABLE_LATER_IS_LOCKED_CHECK) + fun getAllTaskDataInvalidatesUserLockedCache() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + userLockedStateRepository.setLockedStates(mapOf(1 to true)) + + assertThat(userLockedStateRepository.getIsUserLocked(1)).isTrue() + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + assertThat(userLockedStateRepository.getIsUserLocked(1)).isFalse() + } @Test - fun getTaskDataByIdReturnsSpecificTask() = runTest { - recentsModel.seedTasks(defaultTaskList) - systemUnderTest.getAllTaskData(forceRefresh = true) + fun getTaskDataByIdReturnsSpecificTask() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) - assertThat(systemUnderTest.getTaskDataById(2).first()).isEqualTo(tasks[2]) - } + assertThat(systemUnderTest.getTaskDataById(2).first()).isEqualTo(tasks[2]) + } @Test - fun setVisibleTasksPopulatesThumbnails() = runTest { - recentsModel.seedTasks(defaultTaskList) - val bitmap1 = taskThumbnailDataSource.taskIdToBitmap[1] - val bitmap2 = taskThumbnailDataSource.taskIdToBitmap[2] - systemUnderTest.getAllTaskData(forceRefresh = true) + fun getThumbnailByIdReturnsNullWithNoLoadedThumbnails() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) - systemUnderTest.setVisibleTasks(listOf(1, 2)) + assertThat(systemUnderTest.getThumbnailById(1).first()).isNull() + } - // .drop(1) to ignore initial null content before from thumbnail was loaded. - assertThat(systemUnderTest.getTaskDataById(1).drop(1).first()!!.thumbnail!!.thumbnail) - .isEqualTo(bitmap1) - assertThat(systemUnderTest.getTaskDataById(2).first()!!.thumbnail!!.thumbnail) - .isEqualTo(bitmap2) - } + @Test + fun getCurrentThumbnailByIdReturnsNullWithNoLoadedThumbnails() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + assertThat(systemUnderTest.getCurrentThumbnailById(1)).isNull() + } @Test - fun changingVisibleTasksContainsAlreadyPopulatedThumbnails() = runTest { - recentsModel.seedTasks(defaultTaskList) - val bitmap2 = taskThumbnailDataSource.taskIdToBitmap[2] - systemUnderTest.getAllTaskData(forceRefresh = true) + fun getThumbnailByIdReturnsThumbnailWithLoadedThumbnails() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + val bitmap1 = taskThumbnailDataSource.taskIdToBitmap[1] - systemUnderTest.setVisibleTasks(listOf(1, 2)) + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) - // .drop(1) to ignore initial null content before from thumbnail was loaded. - assertThat(systemUnderTest.getTaskDataById(2).drop(1).first()!!.thumbnail!!.thumbnail) - .isEqualTo(bitmap2) + assertThat(systemUnderTest.getThumbnailById(1).first()!!.thumbnail).isEqualTo(bitmap1) + } - // Prevent new loading of Bitmaps - taskThumbnailDataSource.shouldLoadSynchronously = false - systemUnderTest.setVisibleTasks(listOf(2, 3)) + @Test + fun whenThumbnailIsLoaded_getAllTaskData_usesPreviousLoadedThumbnailAndIcon() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + val bitmap1 = taskThumbnailDataSource.taskIdToBitmap[1] - assertThat(systemUnderTest.getTaskDataById(2).first()!!.thumbnail!!.thumbnail) - .isEqualTo(bitmap2) - } + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + assertThat(systemUnderTest.getThumbnailById(1).first()!!.thumbnail).isEqualTo(bitmap1) + + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + assertThat(systemUnderTest.getThumbnailById(1).first()!!.thumbnail).isEqualTo(bitmap1) + } @Test - fun retrievedThumbnailsAreDiscardedWhenTaskBecomesInvisible() = runTest { - recentsModel.seedTasks(defaultTaskList) - val bitmap2 = taskThumbnailDataSource.taskIdToBitmap[2] - systemUnderTest.getAllTaskData(forceRefresh = true) + fun getAllTaskData_copiesPreviouslyLoadedImagesForTasksStillPresent() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(0, 1)) - systemUnderTest.setVisibleTasks(listOf(1, 2)) + // Seed new task with same id + val newTask0 = SingleTask(createTaskWithId(0)) + val newSeededTasks = + defaultTaskList.map { + if (it is SingleTask && it.task.key.id == 0) newTask0 else it + } + recentsModel.seedTasks(newSeededTasks) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) - // .drop(1) to ignore initial null content before from thumbnail was loaded. - assertThat(systemUnderTest.getTaskDataById(2).drop(1).first()!!.thumbnail!!.thumbnail) - .isEqualTo(bitmap2) + // Assert no additional loads, assert images present + assertThat(systemUnderTest.getThumbnailById(0).first()?.thumbnail) + .isEqualTo(taskThumbnailDataSource.taskIdToBitmap[0]) + assertThat(taskThumbnailDataSource.getNumberOfGetThumbnailCalls(0)).isEqualTo(1) + } + + @Test + fun getAllTaskData_clearsPreviouslyLoadedImagesForRemovedTasks() = + testScope.runTest { + // Setup data + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + val bitmap1 = taskThumbnailDataSource.taskIdToBitmap[1] - // Prevent new loading of Bitmaps - taskThumbnailDataSource.shouldLoadSynchronously = false - systemUnderTest.setVisibleTasks(listOf(0, 1)) + // Load images for task 1 + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + assertThat(systemUnderTest.getThumbnailById(1).first()!!.thumbnail).isEqualTo(bitmap1) - assertThat(systemUnderTest.getTaskDataById(2).first()!!.thumbnail).isNull() - } + // Remove task 1 from "all data" + recentsModel.seedTasks( + defaultTaskList.filterNot { groupTask -> groupTask.tasks.any { it.key.id == 1 } } + ) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + // Assert task 1 was fully removed + assertThat(systemUnderTest.getThumbnailById(1).first()?.thumbnail).isNull() + verify(taskVisualsChangedDelegate).unregisterTaskThumbnailChangedCallback(tasks[1].key) + } @Test - fun retrievedThumbnailsCauseEmissionOnTaskDataFlow() = runTest { - // Setup fakes - recentsModel.seedTasks(defaultTaskList) - val bitmap2 = taskThumbnailDataSource.taskIdToBitmap[2] - taskThumbnailDataSource.shouldLoadSynchronously = false + fun getCurrentThumbnailByIdReturnsThumbnailWithLoadedThumbnails() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + val bitmap1 = taskThumbnailDataSource.taskIdToBitmap[1] - // Setup TasksRepository - systemUnderTest.getAllTaskData(forceRefresh = true) - systemUnderTest.setVisibleTasks(listOf(1, 2)) + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) - // Assert there is no bitmap in first emission - val taskFlow = systemUnderTest.getTaskDataById(2) - val taskFlowValuesList = mutableListOf() - backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) { - taskFlow.toList(taskFlowValuesList) + assertThat(systemUnderTest.getCurrentThumbnailById(1)?.thumbnail).isEqualTo(bitmap1) } - assertThat(taskFlowValuesList[0]!!.thumbnail).isNull() - // Simulate bitmap loading after first emission - taskThumbnailDataSource.taskIdToUpdatingTask.getValue(2).invoke() + @Test + fun setVisibleTasksPopulatesThumbnails() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + val bitmap1 = taskThumbnailDataSource.taskIdToBitmap[1] + val bitmap2 = taskThumbnailDataSource.taskIdToBitmap[2] + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) - // Check for second emission - assertThat(taskFlowValuesList[1]!!.thumbnail!!.thumbnail).isEqualTo(bitmap2) - } + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1, 2)) + + assertThat(systemUnderTest.getTaskDataById(1).first()!!.thumbnail!!.thumbnail) + .isEqualTo(bitmap1) + assertThat(systemUnderTest.getTaskDataById(2).first()!!.thumbnail!!.thumbnail) + .isEqualTo(bitmap2) + } + + @Test + fun setVisibleTasksPopulatesIcons() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1, 2)) + + systemUnderTest + .getTaskDataById(1) + .first()!! + .assertHasIconDataFromSource(taskIconDataSource) + systemUnderTest + .getTaskDataById(2) + .first()!! + .assertHasIconDataFromSource(taskIconDataSource) + } + + @Test + fun changingVisibleTasksContainsAlreadyPopulatedThumbnails() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + val bitmap2 = taskThumbnailDataSource.taskIdToBitmap[2] + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1, 2)) + + assertThat(systemUnderTest.getTaskDataById(2).first()!!.thumbnail!!.thumbnail) + .isEqualTo(bitmap2) + + // Prevent new loading of Bitmaps + taskThumbnailDataSource.preventThumbnailLoad(2) + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(2, 3)) + + assertThat(systemUnderTest.getTaskDataById(2).first()!!.thumbnail!!.thumbnail) + .isEqualTo(bitmap2) + } + + @Test + fun changingVisibleTasksContainsAlreadyPopulatedIcons() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1, 2)) + + systemUnderTest + .getTaskDataById(2) + .first()!! + .assertHasIconDataFromSource(taskIconDataSource) + + // Prevent new loading of Drawables + taskIconDataSource.preventIconLoad(2) + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(2, 3)) + + systemUnderTest + .getTaskDataById(2) + .first()!! + .assertHasIconDataFromSource(taskIconDataSource) + } + + @Test + fun retrievedImagesAreDiscardedWhenTaskBecomesInvisible() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + val bitmap2 = taskThumbnailDataSource.taskIdToBitmap[2] + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1, 2)) + + val task2 = systemUnderTest.getTaskDataById(2).first()!! + assertThat(task2.thumbnail!!.thumbnail).isEqualTo(bitmap2) + task2.assertHasIconDataFromSource(taskIconDataSource) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(0, 1)) + + val task2AfterVisibleTasksChanged = systemUnderTest.getTaskDataById(2).first()!! + assertThat(task2AfterVisibleTasksChanged.thumbnail).isNull() + assertThat(task2AfterVisibleTasksChanged.icon).isNull() + assertThat(task2AfterVisibleTasksChanged.titleDescription).isNull() + assertThat(task2AfterVisibleTasksChanged.title).isNull() + } + + @Test + fun retrievedThumbnailsCauseEmissionOnTaskDataFlow() = + testScope.runTest { + // Setup fakes + recentsModel.seedTasks(defaultTaskList) + val bitmap2 = taskThumbnailDataSource.taskIdToBitmap[2] + + // Setup TasksRepository + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + val task2DataFlow = systemUnderTest.getTaskDataById(2) + val task2BitmapValues = mutableListOf() + testScope.backgroundScope.launch { + task2DataFlow.map { it?.thumbnail?.thumbnail }.toList(task2BitmapValues) + } + + // Check for first emission + assertThat(task2BitmapValues.single()).isNull() + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(2)) + // Check for second emission + assertThat(task2BitmapValues).isEqualTo(listOf(null, bitmap2)) + } + + @Test + fun onTaskThumbnailChanged_setsNewThumbnailDataOnTask() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + + val expectedThumbnailData = createThumbnailData() + val expectedPreviousBitmap = taskThumbnailDataSource.taskIdToBitmap[1] + val taskDataFlow = systemUnderTest.getTaskDataById(1) + + val task1ThumbnailValues = mutableListOf() + testScope.backgroundScope.launch { + taskDataFlow.map { it?.thumbnail }.toList(task1ThumbnailValues) + } + taskVisualsChangedDelegate.onTaskThumbnailChanged(1, expectedThumbnailData) + + assertThat(task1ThumbnailValues.first()!!.thumbnail).isEqualTo(expectedPreviousBitmap) + assertThat(task1ThumbnailValues.last()).isEqualTo(expectedThumbnailData) + } + + @Test + fun onHighResLoadingStateChanged_highResReplacesLowResThumbnail() = + testScope.runTest { + taskThumbnailDataSource.highResEnabled = false + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + + val expectedBitmap = mock() + val expectedPreviousBitmap = taskThumbnailDataSource.taskIdToBitmap[1] + val taskDataFlow = systemUnderTest.getTaskDataById(1) + + val task1ThumbnailValues = mutableListOf() + testScope.backgroundScope.launch { + taskDataFlow.map { it?.thumbnail }.toList(task1ThumbnailValues) + } + + taskThumbnailDataSource.taskIdToBitmap[1] = expectedBitmap + taskThumbnailDataSource.highResEnabled = true + taskVisualsChangedDelegate.onHighResLoadingStateChanged(true) + + val firstThumbnailValue = task1ThumbnailValues.first()!! + assertThat(firstThumbnailValue.thumbnail).isEqualTo(expectedPreviousBitmap) + assertThat(firstThumbnailValue.reducedResolution).isTrue() + + val lastThumbnailValue = task1ThumbnailValues.last()!! + assertThat(lastThumbnailValue.thumbnail).isEqualTo(expectedBitmap) + assertThat(lastThumbnailValue.reducedResolution).isFalse() + } + + @Test + fun onHighResLoadingStateChanged_invisibleTaskIgnored() = + testScope.runTest { + taskThumbnailDataSource.highResEnabled = false + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + + val invisibleTaskId = 2 + val taskDataFlow = systemUnderTest.getTaskDataById(invisibleTaskId) + + val task2ThumbnailValues = mutableListOf() + testScope.backgroundScope.launch { + taskDataFlow.map { it?.thumbnail }.toList(task2ThumbnailValues) + } + + taskThumbnailDataSource.highResEnabled = true + taskVisualsChangedDelegate.onHighResLoadingStateChanged(true) + + assertThat(task2ThumbnailValues.filterNotNull()).isEmpty() + assertThat(taskThumbnailDataSource.getNumberOfGetThumbnailCalls(2)).isEqualTo(0) + } + + @Test + fun onHighResLoadingStateChanged_lowResDoesNotReplaceHighResThumbnail() = + testScope.runTest { + taskThumbnailDataSource.highResEnabled = true + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + + val expectedBitmap = mock() + val expectedPreviousBitmap = taskThumbnailDataSource.taskIdToBitmap[1] + val taskDataFlow = systemUnderTest.getTaskDataById(1) + + val task1ThumbnailValues = mutableListOf() + testScope.backgroundScope.launch { + taskDataFlow.map { it?.thumbnail }.toList(task1ThumbnailValues) + } + + taskThumbnailDataSource.taskIdToBitmap[1] = expectedBitmap + taskThumbnailDataSource.highResEnabled = false + taskVisualsChangedDelegate.onHighResLoadingStateChanged(false) + + val firstThumbnailValue = task1ThumbnailValues.first()!! + assertThat(firstThumbnailValue.thumbnail).isEqualTo(expectedPreviousBitmap) + assertThat(firstThumbnailValue.reducedResolution).isFalse() + + val lastThumbnailValue = task1ThumbnailValues.last()!! + assertThat(lastThumbnailValue.thumbnail).isEqualTo(expectedPreviousBitmap) + assertThat(lastThumbnailValue.reducedResolution).isFalse() + } + + @Test + fun onTaskIconChanged_setsNewIconOnTask() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + + val expectedIcon = FakeTaskIconDataSource.mockCopyableDrawable() + val expectedPreviousIcon = taskIconDataSource.taskIdToDrawable[1] + val taskDataFlow = systemUnderTest.getTaskDataById(1) + + val task1IconValues = mutableListOf() + testScope.backgroundScope.launch { + taskDataFlow.map { it?.icon }.toList(task1IconValues) + } + taskIconDataSource.taskIdToDrawable[1] = expectedIcon + taskVisualsChangedDelegate.onTaskIconChanged(1) + + assertThat(task1IconValues.first()).isEqualTo(expectedPreviousIcon) + assertThat(task1IconValues.last()).isEqualTo(expectedIcon) + } + + @Test + fun setVisibleTasks_multipleTimesWithDifferentTasks_reusesThumbnailRequests() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + + val taskDataFlow = systemUnderTest.getTaskDataById(1) + val task1IconValues = mutableListOf() + testScope.backgroundScope.launch { + taskDataFlow.map { it?.icon }.toList(task1IconValues) + } + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + assertThat(taskThumbnailDataSource.getNumberOfGetThumbnailCalls(1)).isEqualTo(1) + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1, 2)) + assertThat(taskThumbnailDataSource.getNumberOfGetThumbnailCalls(1)).isEqualTo(1) + } + + @Test + fun getTaskData_forSecondaryDisplay() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList + secondaryTaskList) + + assertThat(systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true).first()) + .isEqualTo(tasks) + assertThat( + systemUnderTest.getAllTaskData(SECONDARY_DISPLAY, forceRefresh = true).first() + ) + .isEqualTo(secondaryTasks) + } + + @Test + fun setVisibleTasks_secondaryDisplayConnected() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList + secondaryTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + systemUnderTest.getAllTaskData(SECONDARY_DISPLAY, forceRefresh = true) + val bitmap1 = taskThumbnailDataSource.taskIdToBitmap[1] + val bitmap6 = taskThumbnailDataSource.taskIdToBitmap[6] + + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + systemUnderTest.setVisibleTasks(SECONDARY_DISPLAY, setOf(6)) + + val actualThumbnails = + (0..11).map { systemUnderTest.getThumbnailById(it).first()?.thumbnail }.toList() + val expectedThumbnails = + arrayOfNulls(12) + .apply { + set(1, bitmap1) + set(6, bitmap6) + } + .toList() + assertThat(actualThumbnails).isEqualTo(expectedThumbnails) + } + + @Test + fun setVisibleTasks_displayDisconnectedBeforeImageReturns_doesNotPopulateThumbnailOrIcon() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList + secondaryTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + systemUnderTest.getAllTaskData(SECONDARY_DISPLAY, forceRefresh = true) + taskThumbnailDataSource.preventThumbnailLoad(6) + taskIconDataSource.preventIconLoad(6) + + val task6DataFlow = systemUnderTest.getTaskDataById(6) + val task6Values = mutableListOf>() + testScope.backgroundScope.launch { + task6DataFlow.map { Pair(it?.thumbnail?.thumbnail, it?.icon) }.toList(task6Values) + } + + launch { systemUnderTest.setVisibleTasks(SECONDARY_DISPLAY, setOf(6)) } + // Check we prevented the resources from loading + assertThat(task6Values.distinct()).isEqualTo(listOf(Pair(null, null))) + // Display disconnects + launch { systemUnderTest.setVisibleTasks(SECONDARY_DISPLAY, emptySet()) } + taskThumbnailDataSource.completeLoadingForTask(6) + taskIconDataSource.completeLoadingForTask(6) + testScope.advanceUntilIdle() + // Still should not be loaded + assertThat(task6Values.distinct()).isEqualTo(listOf(Pair(null, null))) + } + + @Test + fun onDisplayRemoved_removesAllDataForDisplay() = + testScope.runTest { + recentsModel.seedTasks(defaultTaskList + secondaryTaskList) + systemUnderTest.getAllTaskData(DEFAULT_DISPLAY, forceRefresh = true) + systemUnderTest.getAllTaskData(SECONDARY_DISPLAY, forceRefresh = true) + systemUnderTest.setVisibleTasks(DEFAULT_DISPLAY, setOf(1)) + systemUnderTest.setVisibleTasks(SECONDARY_DISPLAY, setOf(6)) + + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.setVisibleTasks(SECONDARY_DISPLAY, emptySet()) + + for (t in 6..11) { + assertThat(systemUnderTest.getThumbnailById(t).first()?.thumbnail).isNull() + assertThat(systemUnderTest.getTaskDataById(t).first()?.icon).isNull() + } + } private fun createTaskWithId(taskId: Int) = Task(Task.TaskKey(taskId, 0, Intent(), ComponentName("", ""), 0, 2000)) + + private fun createTaskWithIdForSecondaryDisplay(taskId: Int) = + Task( + Task.TaskKey( + taskId, + 0, + Intent(), + ComponentName("", ""), + 0, + 2000, + SECONDARY_DISPLAY, + null, + 0, + false, + false, + ACTIVITY_TYPE_STANDARD, + false, + ) + ) + + private fun createThumbnailData(): ThumbnailData { + val bitmap = mock() + whenever(bitmap.width).thenReturn(THUMBNAIL_WIDTH) + whenever(bitmap.height).thenReturn(THUMBNAIL_HEIGHT) + + return ThumbnailData(thumbnail = bitmap) + } + + companion object { + const val THUMBNAIL_WIDTH = 100 + const val THUMBNAIL_HEIGHT = 200 + const val SECONDARY_DISPLAY = 1 + } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/UserLockedRepositoryTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/UserLockedRepositoryTest.kt new file mode 100644 index 00000000000..662dc6d18e1 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/UserLockedRepositoryTest.kt @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.data + +import android.app.KeyguardManager +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +class UserLockedRepositoryTest { + private val keyguardManager = mock() + + val systemUnderTest: UserLockedRepository = UserLockedRepository(keyguardManager) + + @Test + fun getIsUserLocked_callsKeyguardManager_returnsTrue() { + whenever(keyguardManager.isDeviceLocked(USER_ID)).thenReturn(true) + + assertThat(systemUnderTest.getIsUserLocked(USER_ID)).isTrue() + verify(keyguardManager).isDeviceLocked(USER_ID) + } + + @Test + fun getIsUserLocked_callsKeyguardManager_returnsFalse() { + whenever(keyguardManager.isDeviceLocked(USER_ID)).thenReturn(false) + + assertThat(systemUnderTest.getIsUserLocked(USER_ID)).isFalse() + verify(keyguardManager).isDeviceLocked(USER_ID) + } + + @Test + fun getIsUserLocked_multipleTimes_returnsCachedValue() { + // Populate cache + whenever(keyguardManager.isDeviceLocked(USER_ID)).thenReturn(true) + assertThat(systemUnderTest.getIsUserLocked(USER_ID)).isTrue() + verify(keyguardManager).isDeviceLocked(USER_ID) + + // Change value without invalidating + whenever(keyguardManager.isDeviceLocked(USER_ID)).thenReturn(false) + + assertThat(systemUnderTest.getIsUserLocked(USER_ID)).isTrue() + verifyNoMoreInteractions(keyguardManager) + } + + @Test + fun getIsUserLocked_holdsMultipleValuesInCache() { + whenever(keyguardManager.isDeviceLocked(USER_ID)).thenReturn(true) + whenever(keyguardManager.isDeviceLocked(USER_ID_ALT)).thenReturn(false) + + assertThat(systemUnderTest.getIsUserLocked(USER_ID)).isTrue() + assertThat(systemUnderTest.getIsUserLocked(USER_ID_ALT)).isFalse() + assertThat(systemUnderTest.getIsUserLocked(USER_ID)).isTrue() + + verify(keyguardManager, times(1)).isDeviceLocked(USER_ID) + verify(keyguardManager, times(1)).isDeviceLocked(USER_ID_ALT) + } + + @Test + fun invalidateCachedValues_newValuesAreApplied() { + // Populate cache + whenever(keyguardManager.isDeviceLocked(USER_ID)).thenReturn(true) + whenever(keyguardManager.isDeviceLocked(USER_ID_ALT)).thenReturn(false) + assertThat(systemUnderTest.getIsUserLocked(USER_ID)).isTrue() + assertThat(systemUnderTest.getIsUserLocked(USER_ID_ALT)).isFalse() + + // Change data source values + whenever(keyguardManager.isDeviceLocked(USER_ID)).thenReturn(false) + whenever(keyguardManager.isDeviceLocked(USER_ID_ALT)).thenReturn(true) + + // Invalidate and check values + systemUnderTest.invalidateCachedValues() + assertThat(systemUnderTest.getIsUserLocked(USER_ID)).isFalse() + assertThat(systemUnderTest.getIsUserLocked(USER_ID_ALT)).isTrue() + + // Check data source was accessed after invalidating cache + verify(keyguardManager, times(2)).isDeviceLocked(USER_ID) + verify(keyguardManager, times(2)).isDeviceLocked(USER_ID_ALT) + } + + companion object { + const val USER_ID = 1 + const val USER_ID_ALT = 2 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/DesktopLayoutUtilsTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/DesktopLayoutUtilsTest.kt new file mode 100644 index 00000000000..8b5061744f8 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/DesktopLayoutUtilsTest.kt @@ -0,0 +1,209 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Rect +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.quickstep.recents.domain.model.DesktopLayoutConfig +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.RenderedDesktopTaskBoundsData +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +/** Test for [DesktopLayoutUtils] */ +@RunWith(AndroidJUnit4::class) +class DesktopLayoutUtilsTest { + + @Test + fun getRequiredHeightForMinWidth_minTaskWidthIsZero_returnsDefaultMinHeight() { + val taskBounds = listOf(RenderedDesktopTaskBoundsData(1, Rect(0, 0, 200, 300))) + val config = TEST_LAYOUT_CONFIG.copy(minTaskWidth = 0, verticalPaddingBetweenTasks = 50) + val expectedHeight = config.verticalPaddingBetweenTasks + + val resultHeight = DesktopLayoutUtils.getRequiredHeightForMinWidth(taskBounds, config) + + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getRequiredHeightForMinWidth_singleTask_calculatesHeight() { + // Task: 200x300, minWidth: 100. Expected height: (100 * 300) / 200 = 150 + val taskBounds = listOf(RenderedDesktopTaskBoundsData(1, Rect(0, 0, 200, 300))) + val config = TEST_LAYOUT_CONFIG.copy(minTaskWidth = 100, verticalPaddingBetweenTasks = 10) + val expectedHeight = 150 + + val resultHeight = DesktopLayoutUtils.getRequiredHeightForMinWidth(taskBounds, config) + + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getRequiredHeightForMinWidth_multipleTasks_calculatesMaxHeight() { + val taskBounds = + listOf( + RenderedDesktopTaskBoundsData( + 1, + Rect(0, 0, 200, 300), + ), // req height for 100 width: 150 + RenderedDesktopTaskBoundsData( + 2, + Rect(0, 0, 100, 200), + ), // req height for 100 width: 200 + RenderedDesktopTaskBoundsData( + 3, + Rect(0, 0, 400, 400), + ), // req height for 100 width: 100 + ) + val config = TEST_LAYOUT_CONFIG.copy(minTaskWidth = 100, verticalPaddingBetweenTasks = 10) + val expectedHeight = 200 // Max of 150, 200, 100 + + val resultHeight = DesktopLayoutUtils.getRequiredHeightForMinWidth(taskBounds, config) + + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getRequiredHeightForMinWidth_taskWithZeroDimension_usesDefaultMinHeightIfAllInvalid() { + val taskBounds = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 0, 0, 100)), // Invalid width + RenderedDesktopTaskBoundsData(2, Rect(0, 0, 100, 0)), // Invalid height + ) + val config = TEST_LAYOUT_CONFIG.copy(minTaskWidth = 100, verticalPaddingBetweenTasks = 50) + val expectedHeight = config.verticalPaddingBetweenTasks // 50 + + val resultHeight = DesktopLayoutUtils.getRequiredHeightForMinWidth(taskBounds, config) + + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getRequiredHeightForMinWidth_taskWithZeroDimension_ignoredIfOthersValid() { + val taskBounds = + listOf( + RenderedDesktopTaskBoundsData( + 1, + Rect(0, 0, 200, 300), + ), // req height for 100 width: 150 + RenderedDesktopTaskBoundsData(2, Rect(0, 0, 0, 100)), // Invalid width, ignored + RenderedDesktopTaskBoundsData(3, Rect(0, 0, 100, 0)), // Invalid height, ignored + ) + val config = TEST_LAYOUT_CONFIG.copy(minTaskWidth = 100, verticalPaddingBetweenTasks = 10) + val expectedHeight = 150 + + val resultHeight = DesktopLayoutUtils.getRequiredHeightForMinWidth(taskBounds, config) + + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getRequiredHeightForMinWidth_calculatedHeightLessThanDefault_returnsDefault() { + // Task: 1000x100, minWidth: 100. Expected height: (100 * 100) / 1000 = 10 + // But verticalPaddingBetweenTasks is 50, so 50 should be returned. + val taskBounds = listOf(RenderedDesktopTaskBoundsData(1, Rect(0, 0, 1000, 100))) + val config = TEST_LAYOUT_CONFIG.copy(minTaskWidth = 100, verticalPaddingBetweenTasks = 50) + val expectedHeight = 50 + + val resultHeight = DesktopLayoutUtils.getRequiredHeightForMinWidth(taskBounds, config) + + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getMinTaskHeightGivenMaxRows_maxRowsIsZero_returnsVerticalPadding() { + val availableBounds = Rect(0, 0, 1000, 1000) + val config = TEST_LAYOUT_CONFIG.copy(maxRows = 0, verticalPaddingBetweenTasks = 15) + val resultHeight = DesktopLayoutUtils.getMinTaskHeightGivenMaxRows(availableBounds, config) + + assertThat(resultHeight).isEqualTo(config.verticalPaddingBetweenTasks) + } + + @Test + fun getMinTaskHeightGivenMaxRows_standardCase_calculatesCorrectHeight() { + val availableBounds = Rect(0, 0, 1000, 1000) + val config = TEST_LAYOUT_CONFIG.copy(maxRows = 3, verticalPaddingBetweenTasks = 10) + // totalPadding = 3 * 10 = 30 + // heightForTaskContents = 1000 - 30 = 970 + // result = (970 / (3 + 1) + 1).toInt() = (970 / 4 + 1).toInt() = (242.5 + 1).toInt() = 243 + val expectedHeight = 243 + + val resultHeight = DesktopLayoutUtils.getMinTaskHeightGivenMaxRows(availableBounds, config) + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getMinTaskHeightGivenMaxRows_calculatedHeightLessThanPadding_returnsVerticalPadding() { + val availableBounds = Rect(0, 0, 1000, 100) + val config = TEST_LAYOUT_CONFIG.copy(maxRows = 4, verticalPaddingBetweenTasks = 20) + // totalPadding = 4 * 20 = 80 + // heightForTaskContents = 100 - 80 = 20 + // result = (20 / (4 + 1) + 1).toInt() = (20 / 5 + 1).toInt() = (4 + 1).toInt() = 5 + // max(result, 20) = 20 + val expectedHeight = 20 + + val resultHeight = DesktopLayoutUtils.getMinTaskHeightGivenMaxRows(availableBounds, config) + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getMinTaskHeightGivenMaxRows_exactFitForMaxRowsPlusOne_returnsHeightPlusOne() { + // Test the +1 logic carefully. + // If heightForTaskContents / (maxRows + 1) is an integer, e.g., 25. + // Then result should be 25 + 1 = 26. + val availableBounds = Rect(0, 0, 1000, 130) // height = 130 + val config = TEST_LAYOUT_CONFIG.copy(maxRows = 3, verticalPaddingBetweenTasks = 10) + // totalPadding = 3 * 10 = 30 + // heightForTaskContents = 130 - 30 = 100 + // result = (100 / (3 + 1) + 1).toInt() = (100 / 4 + 1).toInt() = (25 + 1).toInt() = 26 + // max(result, 10) = 26 + val expectedHeight = 26 + + val resultHeight = DesktopLayoutUtils.getMinTaskHeightGivenMaxRows(availableBounds, config) + + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + @Test + fun getMinTaskHeightGivenMaxRows_zeroVerticalPadding_calculatesCorrectHeight() { + val availableBounds = Rect(0, 0, 1000, 100) + val config = TEST_LAYOUT_CONFIG.copy(maxRows = 3, verticalPaddingBetweenTasks = 0) + // totalPadding = 0 + // heightForTaskContents = 100 - 0 = 100 + // result = (100 / (3 + 1) + 1).toInt() = (100 / 4 + 1).toInt() = (25 + 1).toInt() = 26 + // max(result, 0) = 26 + val expectedHeight = 26 + + val resultHeight = DesktopLayoutUtils.getMinTaskHeightGivenMaxRows(availableBounds, config) + assertThat(resultHeight).isEqualTo(expectedHeight) + } + + companion object { + private val TEST_LAYOUT_CONFIG = + DesktopLayoutConfig( + desktopBounds = Rect(0, 0, 1000, 2000), + topBottomMarginOneRow = 20, + topMarginMultiRows = 20, + bottomMarginMultiRows = 20, + leftRightMarginOneRow = 20, + leftRightMarginMultiRows = 20, + horizontalPaddingBetweenTasks = 10, + verticalPaddingBetweenTasks = 10, + minTaskWidth = 100, + maxRows = 4, + ) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetObscuredDesktopTaskIdsUseCaseTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetObscuredDesktopTaskIdsUseCaseTest.kt new file mode 100644 index 00000000000..c078d61b997 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetObscuredDesktopTaskIdsUseCaseTest.kt @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Rect +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.quickstep.recents.ui.viewmodel.DesktopTaskViewModel.TaskPosition +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +/** Test for [GetObscuredDesktopTaskIdsUseCase] */ +@RunWith(AndroidJUnit4::class) +class GetObscuredDesktopTaskIdsUseCaseTest { + + private val useCase: GetObscuredDesktopTaskIdsUseCase = GetObscuredDesktopTaskIdsUseCase() + + @Test + fun test_emptyTasks_returnsEmptyList() { + val taskPositions = emptyList() + + val result = useCase.invoke(taskPositions) + + assertThat(result).isEmpty() + } + + @Test + fun test_singleTask_returnsEmptyList() { + val singleTask = TaskPosition(taskId = 1, isMinimized = false, bounds = Rect(0, 0, 10, 10)) + val taskPositions = listOf(singleTask) + + val result = useCase.invoke(taskPositions) + + assertThat(result).isEmpty() + } + + @Test + fun test_smallerTaskAboveLargerTask_returnsEmptyList() { + val task1 = TaskPosition(taskId = 1, isMinimized = false, bounds = Rect(50, 50, 150, 150)) + val task2 = TaskPosition(taskId = 2, isMinimized = false, bounds = Rect(0, 0, 200, 200)) + // Tasks at the front of the list are higher in the z-order. + val taskPositions = listOf(task1, task2) + + val result = useCase.invoke(taskPositions) + + assertThat(result).isEmpty() + } + + @Test + fun test_largerTaskAboveSmallerTask_returnsSingleId() { + val task1 = TaskPosition(taskId = 1, isMinimized = false, bounds = Rect(0, 0, 200, 200)) + val task2 = TaskPosition(taskId = 2, isMinimized = false, bounds = Rect(50, 50, 150, 150)) + // Tasks at the front of the list are higher in the z-order. + val taskPositions = listOf(task1, task2) + + val result = useCase.invoke(taskPositions) + + assertThat(result).contains(2) + } + + @Test + fun test_minimizedTask_returnsEmptyList() { + // Task 1 completely envelops Task 2, but is minimized. + val task1 = TaskPosition(taskId = 1, isMinimized = true, bounds = Rect(0, 0, 200, 200)) + val task2 = TaskPosition(taskId = 2, isMinimized = false, bounds = Rect(50, 50, 150, 150)) + // Tasks at the front of the list are higher in the z-order. + val taskPositions = listOf(task1, task2) + + val result = useCase.invoke(taskPositions) + + assertThat(result).isEmpty() + } + + @Test + fun test_successiveOverlappingTasks_returnsMultipleIds() { + val task1 = TaskPosition(taskId = 1, isMinimized = false, bounds = Rect(0, 0, 300, 300)) + val task2 = TaskPosition(taskId = 2, isMinimized = false, bounds = Rect(0, 0, 200, 200)) + val task3 = TaskPosition(taskId = 3, isMinimized = false, bounds = Rect(0, 0, 100, 100)) + // Tasks at the front of the list are higher in the z-order. + val taskPositions = listOf(task1, task2, task3) + + val result = useCase.invoke(taskPositions) + + assertThat(result).contains(2) + assertThat(result).contains(3) + } + + @Test + fun test_partiallyOverlappingTasks_returnsEmptyList() { + val task1 = TaskPosition(taskId = 1, isMinimized = false, bounds = Rect(0, 0, 100, 100)) + val task2 = TaskPosition(taskId = 2, isMinimized = false, bounds = Rect(50, 0, 150, 100)) + // Tasks at the front of the list are higher in the z-order. + val taskPositions = listOf(task1, task2) + + val result = useCase.invoke(taskPositions) + + assertThat(result).isEmpty() + } + + @Test + fun test_complexOverlappingRegionObscuresTask_returnsSingleId() { + val obscuredTask = + TaskPosition(taskId = 0, isMinimized = false, bounds = Rect(100, 100, 200, 200)) + + // Construct a complex region that completely overlaps the obscuredTask. + val task1 = TaskPosition(taskId = 1, isMinimized = false, bounds = Rect(90, 90, 160, 210)) + val task2 = TaskPosition(taskId = 2, isMinimized = false, bounds = Rect(140, 90, 210, 160)) + val task3 = TaskPosition(taskId = 2, isMinimized = false, bounds = Rect(140, 140, 210, 210)) + + // Tasks at the front of the list are higher in the z-order. + val taskPositions = listOf(task1, task2, task3, obscuredTask) + + val result = useCase.invoke(taskPositions) + + assertThat(result).contains(0) + } + + @Test + fun test_cornersObscuredButCenterNotObscured_returnsEmptyList() { + // Construct a layout where all four corners of a window (task5) are covered, but the center + // is not. + val task1 = TaskPosition(taskId = 1, isMinimized = false, bounds = Rect(0, 0, 50, 50)) + val task2 = TaskPosition(taskId = 2, isMinimized = false, bounds = Rect(150, 0, 200, 50)) + val task3 = TaskPosition(taskId = 3, isMinimized = false, bounds = Rect(0, 150, 50, 200)) + val task4 = TaskPosition(taskId = 4, isMinimized = false, bounds = Rect(150, 150, 200, 200)) + val task5 = TaskPosition(taskId = 5, isMinimized = false, bounds = Rect(25, 25, 175, 175)) + + // Tasks at the front of the list are higher in the z-order. + val taskPositions = listOf(task1, task2, task3, task4, task5) + + val result = useCase.invoke(taskPositions) + + assertThat(result).isEmpty() + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetRemainingAppTimerDurationUseCaseTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetRemainingAppTimerDurationUseCaseTest.kt new file mode 100644 index 00000000000..f6ab1b983c5 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetRemainingAppTimerDurationUseCaseTest.kt @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.quickstep.recents.data.FakeAppTimersRepository +import com.google.common.truth.Truth.assertThat +import java.time.Duration +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +/** Tests for [GetRemainingAppTimerDurationUseCase]. */ +@RunWith(AndroidJUnit4::class) +class GetRemainingAppTimerDurationUseCaseTest { + private val appTimersRepository = FakeAppTimersRepository() + + @OptIn(ExperimentalCoroutinesApi::class) + private val testScope = TestScope(UnconfinedTestDispatcher()) + + private val systemUnderTest = GetRemainingAppTimerDurationUseCase(appTimersRepository) + + @Test + fun noSetLimit_returnsNull() = + testScope.runTest { + appTimersRepository.resetTimer(PACKAGE_NAME, USER_HANDLE) + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isNull() + } + + @Test + fun lessThanMinuteRemaining_aMilliSecondLess_noRounding() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(1).minusMillis(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(usageRemaining) + } + + @Test + fun lessThanMinuteRemaining_aSecondLess_noRounding() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(1).minusSeconds(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(usageRemaining) + } + + @Test + fun aWholeMinuteRemaining_returnsAMinute() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(usageRemaining) + } + + @Test + fun littleOverAMinuteRemaining_aMilliSecondMore_roundsToTwoMinutes() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(1).plusMillis(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofMinutes(2)) + } + + @Test + fun littleOverAMinuteRemaining_aSecondMore_roundsToTwoMinutes() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(1).plusSeconds(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofMinutes(2)) + } + + @Test + fun littleUnderTwoMinuteRemaining_aMilliSecondLess_roundsToTwoMinutes() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(2).minusMillis(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofMinutes(2)) + } + + @Test + fun littleUnderTwoMinuteRemaining_aSecondLess_roundsToTwoMinutes() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(2).minusSeconds(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofMinutes(2)) + } + + @Test + fun severalMinutesAndLittleOverRemaining_aMilliSecondMore_returnsRoundedMinutes() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(5).plusMillis(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofMinutes(6)) + } + + @Test + fun severalMinutesAndLittleOverRemaining_aSecondMore_returnsRoundedMinutes() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(5).plusSeconds(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofMinutes(6)) + } + + @Test + fun multipleWholeMinutesRemaining_noRounding() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(5) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofMinutes(5)) + } + + @Test + fun multipleHoursAndASecondOver_roundsSecondToAMinute() = + testScope.runTest { + val usageRemaining = Duration.ofHours(5).plusSeconds(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofHours(5).plusMinutes(1)) + } + + @Test + fun multipleHoursAndAMilliSecondOver_roundsMillisecondToAMinute() = + testScope.runTest { + val usageRemaining = Duration.ofHours(5).plusMillis(1) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofHours(5).plusMinutes(1)) + } + + @Test + fun returnsCorrectRemainingTimeOnEachInvocation() = + testScope.runTest { + val usageRemaining = Duration.ofMinutes(5).plusSeconds(10) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemaining) + + val remainingDuration = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(remainingDuration).isEqualTo(Duration.ofMinutes(6)) + + appTimersRepository.resetTimer(PACKAGE_NAME, USER_HANDLE) + val newRemainingTime = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + + assertThat(newRemainingTime).isNull() + } + + @Test + fun differentApps_returnsCorrectRemainingTime() = + testScope.runTest { + val usageRemainingAppOne = Duration.ofMinutes(5) + val usageRemainingAppTwo = Duration.ofMinutes(2) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemainingAppOne) + appTimersRepository.setTimer(PACKAGE_NAME_TWO, USER_HANDLE, usageRemainingAppTwo) + + val remainingDurationAppOne = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + val remainingDurationAppTwo = systemUnderTest.invoke(PACKAGE_NAME_TWO, USER_HANDLE) + + assertThat(remainingDurationAppOne).isEqualTo(usageRemainingAppOne) + assertThat(remainingDurationAppTwo).isEqualTo(usageRemainingAppTwo) + } + + @Test + fun appInMultipleUsers_returnsCorrectRemainingTime() = + testScope.runTest { + val usageRemainingUserOne = Duration.ofMinutes(5) + val usageRemainingUserTwo = Duration.ofMinutes(2) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE, usageRemainingUserOne) + appTimersRepository.setTimer(PACKAGE_NAME, USER_HANDLE_TWO, usageRemainingUserTwo) + + val remainingDurationUserOne = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE) + val remainingDurationUserTwo = systemUnderTest.invoke(PACKAGE_NAME, USER_HANDLE_TWO) + + assertThat(remainingDurationUserOne).isEqualTo(usageRemainingUserOne) + assertThat(remainingDurationUserTwo).isEqualTo(usageRemainingUserTwo) + } + + companion object { + private const val PACKAGE_NAME = "com.test.1" + private val USER_HANDLE = UserHandle(0) + + private const val PACKAGE_NAME_TWO = "com.test.2" + private val USER_HANDLE_TWO = UserHandle(2) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetSysUiStatusNavFlagsUseCaseTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetSysUiStatusNavFlagsUseCaseTest.kt new file mode 100644 index 00000000000..d3842562d17 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetSysUiStatusNavFlagsUseCaseTest.kt @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.view.WindowInsetsController.APPEARANCE_LIGHT_CAPTION_BARS +import android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS +import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS +import com.android.launcher3.util.SystemUiController.FLAG_DARK_NAV +import com.android.launcher3.util.SystemUiController.FLAG_DARK_STATUS +import com.android.launcher3.util.SystemUiController.FLAG_LIGHT_NAV +import com.android.launcher3.util.SystemUiController.FLAG_LIGHT_STATUS +import com.android.systemui.shared.recents.model.ThumbnailData +import com.google.common.truth.Truth.assertThat +import org.junit.Test + +class GetSysUiStatusNavFlagsUseCaseTest { + private val sut: GetSysUiStatusNavFlagsUseCase = GetSysUiStatusNavFlagsUseCase() + + @Test + fun onLightStatusBarAppearance_returns_LightTheme() { + val thumbnailData = ThumbnailData(appearance = APPEARANCE_LIGHT_STATUS_BARS) + val flag = sut.invoke(thumbnailData) // 6 + flag.assertContainsFlag(FLAG_LIGHT_STATUS) + flag.assertContainsFlag(FLAG_DARK_NAV) + flag.assertDoesNotContainsFlag(FLAG_DARK_STATUS) + flag.assertDoesNotContainsFlag(FLAG_LIGHT_NAV) + } + + @Test + fun onLightNavBarsAppearance_returns_LightTheme() { + val thumbnailData = ThumbnailData(appearance = APPEARANCE_LIGHT_NAVIGATION_BARS) + val flag = sut.invoke(thumbnailData) + flag.assertContainsFlag(FLAG_DARK_STATUS) + flag.assertContainsFlag(FLAG_LIGHT_NAV) + flag.assertDoesNotContainsFlag(FLAG_LIGHT_STATUS) + flag.assertDoesNotContainsFlag(FLAG_DARK_NAV) + } + + @Test + fun onLightStatusBarAndNavBarAppearance_returns_LightTheme() { + val thumbnailData = + ThumbnailData( + appearance = APPEARANCE_LIGHT_STATUS_BARS or APPEARANCE_LIGHT_NAVIGATION_BARS + ) + val flag = sut.invoke(thumbnailData) + flag.assertContainsFlag(FLAG_LIGHT_NAV) + flag.assertContainsFlag(FLAG_LIGHT_STATUS) + flag.assertDoesNotContainsFlag(FLAG_DARK_STATUS) + flag.assertDoesNotContainsFlag(FLAG_DARK_NAV) + } + + @Test + fun onLightAppearance_returns_LightTheme() { + val thumbnailData = + ThumbnailData( + appearance = + APPEARANCE_LIGHT_CAPTION_BARS or + APPEARANCE_LIGHT_STATUS_BARS or + APPEARANCE_LIGHT_NAVIGATION_BARS + ) + val flag = sut.invoke(thumbnailData) + flag.assertContainsFlag(FLAG_LIGHT_NAV) + flag.assertContainsFlag(FLAG_LIGHT_STATUS) + flag.assertDoesNotContainsFlag(FLAG_DARK_STATUS) + flag.assertDoesNotContainsFlag(FLAG_DARK_NAV) + } + + @Test + fun onDarkAppearance_returns_DarkTheme() { + val thumbnailData = ThumbnailData(appearance = 0) + val flag = sut.invoke(thumbnailData) + flag.assertContainsFlag(FLAG_DARK_STATUS) + flag.assertContainsFlag(FLAG_DARK_NAV) + flag.assertDoesNotContainsFlag(FLAG_LIGHT_NAV) + flag.assertDoesNotContainsFlag(FLAG_LIGHT_STATUS) + } + + @Test + fun onUnrelatedDarkAppearance_returns_DarkTheme() { + val thumbnailData = ThumbnailData(appearance = 1) + val flag = sut.invoke(thumbnailData) + flag.assertContainsFlag(FLAG_DARK_STATUS) + flag.assertContainsFlag(FLAG_DARK_NAV) + flag.assertDoesNotContainsFlag(FLAG_LIGHT_NAV) + flag.assertDoesNotContainsFlag(FLAG_LIGHT_STATUS) + } + + @Test + fun whenThumbnailIsNull_returns_default() { + val flag = sut.invoke(null) + flag.assertDoesNotContainsFlag(FLAG_DARK_STATUS) + flag.assertDoesNotContainsFlag(FLAG_LIGHT_NAV) + flag.assertDoesNotContainsFlag(FLAG_LIGHT_STATUS) + flag.assertDoesNotContainsFlag(FLAG_DARK_NAV) + } + + private fun Int.assertContainsFlag(flag: Int) { + assertThat(this and flag).isNotEqualTo(0) + } + + private fun Int.assertDoesNotContainsFlag(flag: Int) { + assertThat(this and flag).isEqualTo(0) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetTaskUseCaseTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetTaskUseCaseTest.kt new file mode 100644 index 00000000000..310b245fbe3 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetTaskUseCaseTest.kt @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.content.ComponentName +import android.content.Intent +import android.graphics.Color +import android.graphics.drawable.ShapeDrawable +import android.os.UserHandle +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.Flags +import com.android.quickstep.recents.data.FakeAppTimersRepository +import com.android.quickstep.recents.data.FakeTasksRepository +import com.android.quickstep.recents.data.FakeUserLockedStateRepository +import com.android.quickstep.recents.domain.model.TaskModel +import com.android.systemui.shared.recents.model.Task +import com.google.common.truth.Truth.assertThat +import java.time.Duration +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.firstOrNull +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.anyString +import org.mockito.Mockito.spy +import org.mockito.Mockito.times +import org.mockito.Mockito.verify +import org.mockito.kotlin.any + +@OptIn(ExperimentalCoroutinesApi::class) +@RunWith(AndroidJUnit4::class) +class GetTaskUseCaseTest { + @get:Rule val setFlagsRule = SetFlagsRule() + + private val unconfinedTestDispatcher = UnconfinedTestDispatcher() + private val testScope = TestScope(unconfinedTestDispatcher) + + private val tasksRepository = FakeTasksRepository() + private val timersRepository = FakeAppTimersRepository() + private val userLockedStateRepository = FakeUserLockedStateRepository() + private val getRemainingAppTimerDurationUseCase = + spy(GetRemainingAppTimerDurationUseCase(timersRepository)) + private val sut = + GetTaskUseCase( + tasksRepository = tasksRepository, + userLockedStateRepository = userLockedStateRepository, + getRemainingAppTimerDurationUseCase = getRemainingAppTimerDurationUseCase, + ) + + @Before + fun setUp() { + tasksRepository.seedTasks(listOf(TASK_1)) + timersRepository.setTimer(PACKAGE_1, UserHandle(USER_1), REMAINING_APP_DURATION) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST) + fun taskNotSeeded_returnsNull() = + testScope.runTest { + val result = sut.invoke(NOT_FOUND_TASK_ID).firstOrNull() + + assertThat(result).isNull() + verify(getRemainingAppTimerDurationUseCase, times(0)) + .invoke(anyString(), any()) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST) + fun taskNotVisible_returnsNull() = + testScope.runTest { + val result = sut.invoke(TASK_1_ID).firstOrNull() + + assertThat(result).isNull() + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST) + fun taskVisible_returnsData() = + testScope.runTest { + tasksRepository.setVisibleTasks(DEFAULT_DISPLAY, setOf(TASK_1_ID)) + + val result = sut.invoke(TASK_1_ID).firstOrNull() + + assertThat(result) + .isEqualTo( + TaskModel( + id = TASK_1_ID, + packageName = PACKAGE_1, + title = "Title $TASK_1_ID", + titleDescription = "Content Description $TASK_1_ID", + icon = TASK_1_ICON, + thumbnail = null, + backgroundColor = Color.BLACK, + isLocked = false, + isMinimized = false, + remainingAppDuration = ROUNDED_REMAINING_APP_DURATION, + ) + ) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST) + fun taskVisible_noAppTimer_returnsDataWithoutTimer() = + testScope.runTest { + tasksRepository.setVisibleTasks(DEFAULT_DISPLAY, setOf(TASK_1_ID)) + timersRepository.resetTimer(PACKAGE_1, UserHandle(USER_1)) + + val result = sut.invoke(TASK_1_ID).firstOrNull() + + assertThat(result) + .isEqualTo( + TaskModel( + id = TASK_1_ID, + packageName = PACKAGE_1, + title = "Title $TASK_1_ID", + titleDescription = "Content Description $TASK_1_ID", + icon = TASK_1_ICON, + thumbnail = null, + backgroundColor = Color.BLACK, + isLocked = false, + isMinimized = false, + remainingAppDuration = null, + ) + ) + verify(getRemainingAppTimerDurationUseCase, times(1)) + .invoke(anyString(), any()) + } + + @Test + @DisableFlags(Flags.FLAG_ENABLE_REFACTOR_DIGITAL_WELLBEING_TOAST) + fun taskVisible_dwbFlagOff_doesNotFetchTimer() = + testScope.runTest { + tasksRepository.setVisibleTasks(DEFAULT_DISPLAY, setOf(TASK_1_ID)) + + val result = sut.invoke(TASK_1_ID).firstOrNull() + + assertThat(result) + .isEqualTo( + TaskModel( + id = TASK_1_ID, + packageName = PACKAGE_1, + title = "Title $TASK_1_ID", + titleDescription = "Content Description $TASK_1_ID", + icon = TASK_1_ICON, + thumbnail = null, + backgroundColor = Color.BLACK, + isLocked = false, + isMinimized = false, + remainingAppDuration = null, + ) + ) + verify(getRemainingAppTimerDurationUseCase, times(0)) + .invoke(anyString(), any()) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_LATER_IS_LOCKED_CHECK) + fun taskUserIsLocked_getsValueFromRepository() = + testScope.runTest { + tasksRepository.setVisibleTasks(DEFAULT_DISPLAY, setOf(TASK_1_ID)) + userLockedStateRepository.setLockedStates(mapOf(USER_1 to true)) + + val result = sut.invoke(TASK_1_ID).firstOrNull() + + assertThat(result!!.isLocked).isTrue() + } + + private companion object { + const val NOT_FOUND_TASK_ID = 404 + private const val TASK_1_ID = 1 + private const val PACKAGE_1 = "com.test.1" + private const val USER_1 = 1 + private val TASK_1_ICON = ShapeDrawable() + private val REMAINING_APP_DURATION = Duration.ofHours(2).plusMillis(10) + private val ROUNDED_REMAINING_APP_DURATION = Duration.ofHours(2).plusMinutes(1) + private val TASK_1 = + Task( + Task.TaskKey( + /* id = */ TASK_1_ID, + /* windowingMode = */ 0, + /* intent = */ Intent(), + /* sourceComponent = */ ComponentName("", ""), + /* userId = */ USER_1, + /* lastActiveTime = */ 2000, + ) + ) + .apply { + title = "Title 1" + titleDescription = "Content Description 1" + colorBackground = Color.BLACK + icon = TASK_1_ICON + thumbnail = null + isLocked = false + isMinimized = false + topActivity = ComponentName(PACKAGE_1, "SomeClass") + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetThumbnailPositionUseCaseTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetThumbnailPositionUseCaseTest.kt new file mode 100644 index 00000000000..3bc2ea1dcd2 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/GetThumbnailPositionUseCaseTest.kt @@ -0,0 +1,227 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Bitmap +import android.graphics.Matrix +import android.graphics.Rect +import android.view.Surface.ROTATION_90 +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.quickstep.recents.data.FakeRecentsDeviceProfileRepository +import com.android.quickstep.recents.data.FakeRecentsRotationStateRepository +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.systemui.shared.recents.utilities.PreviewPositionHelper +import com.android.systemui.shared.recents.utilities.PreviewPositionHelper.PreviewPositionHelperFactory +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** Test for [GetThumbnailPositionUseCase] */ +@RunWith(AndroidJUnit4::class) +class GetThumbnailPositionUseCaseTest { + private val deviceProfileRepository = FakeRecentsDeviceProfileRepository() + private val rotationStateRepository = FakeRecentsRotationStateRepository() + private val previewPositionHelperFactoryMock = mock() + private val previewPositionHelper = mock() + + private val systemUnderTest = + GetThumbnailPositionUseCase( + deviceProfileRepository = deviceProfileRepository, + rotationStateRepository = rotationStateRepository, + previewPositionHelperFactory = previewPositionHelperFactoryMock, + ) + + @Before + fun setUp() { + whenever(previewPositionHelperFactoryMock.create()).thenReturn(previewPositionHelper) + } + + @Test + fun nullThumbnailData_returnsIdentityMatrix() = runTest { + val expectedResult = ThumbnailPosition(Matrix.IDENTITY_MATRIX, false) + val result = + systemUnderTest.invoke( + null, + CANVAS_WIDTH, + CANVAS_HEIGHT, + isRtl = true, + splitBounds = null, + splitPosition = 0, + densityDpi = DEFAULT_DISPLAY_DENSITY, + ) + assertThat(result).isEqualTo(expectedResult) + } + + @Test + fun withoutThumbnail_returnsIdentityMatrix() = runTest { + val expectedResult = ThumbnailPosition(Matrix.IDENTITY_MATRIX, false) + val result = + systemUnderTest.invoke( + ThumbnailData(), + CANVAS_WIDTH, + CANVAS_HEIGHT, + isRtl = true, + splitBounds = null, + splitPosition = 0, + densityDpi = DEFAULT_DISPLAY_DENSITY, + ) + assertThat(result).isEqualTo(expectedResult) + } + + @Test + fun visibleTaskWithThumbnailData_returnsTransformedMatrix() = runTest { + val isLargeScreen = true + deviceProfileRepository.setRecentsDeviceProfile( + deviceProfileRepository.getRecentsDeviceProfile().copy(isLargeScreen = isLargeScreen) + ) + val activityRotation = ROTATION_90 + rotationStateRepository.setRecentsRotationState( + rotationStateRepository + .getRecentsRotationState() + .copy(activityRotation = activityRotation) + ) + val isRtl = true + val isRotated = true + + whenever(previewPositionHelper.matrix).thenReturn(MATRIX) + whenever(previewPositionHelper.isOrientationChanged).thenReturn(isRotated) + + val result = + systemUnderTest.invoke( + THUMBNAIL_DATA, + CANVAS_WIDTH, + CANVAS_HEIGHT, + isRtl, + splitBounds = null, + splitPosition = 0, + densityDpi = DEFAULT_DISPLAY_DENSITY, + ) + val expectedResult = ThumbnailPosition(MATRIX, isRotated) + assertThat(result).isEqualTo(expectedResult) + + verify(previewPositionHelper) + .updateThumbnailMatrix( + Rect(0, 0, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT), + THUMBNAIL_DATA, + CANVAS_WIDTH, + CANVAS_HEIGHT, + isLargeScreen, + activityRotation, + isRtl, + DEFAULT_DISPLAY_DENSITY, + ) + } + + @Test + fun multipleInvocations_usesPreviewPositionHelperFactoryEachTime() = runTest { + whenever(previewPositionHelper.matrix).thenReturn(MATRIX) + + val sut = + GetThumbnailPositionUseCase( + deviceProfileRepository = deviceProfileRepository, + rotationStateRepository = rotationStateRepository, + previewPositionHelperFactory = previewPositionHelperFactoryMock, + ) + verify(previewPositionHelperFactoryMock, times(0)).create() + + sut.invoke( + THUMBNAIL_DATA, + CANVAS_WIDTH, + CANVAS_HEIGHT, + /* isRtl= */ true, + splitBounds = null, + splitPosition = 0, + densityDpi = DEFAULT_DISPLAY_DENSITY, + ) + sut.invoke( + THUMBNAIL_DATA, + CANVAS_WIDTH, + CANVAS_HEIGHT, + /* isRtl= */ false, + splitBounds = null, + splitPosition = 0, + densityDpi = DEFAULT_DISPLAY_DENSITY, + ) + + // Each invocation of use case should use a fresh position helper acquired by the factory. + verify(previewPositionHelperFactoryMock, times(2)).create() + } + + @Test + fun withSplitBoundsAndPosition_passesToPreviewPositionHelper() = runTest { + val splitBounds = mock() + val splitPosition = SPLIT_POSITION_TOP_OR_LEFT + val isRotated = true + whenever(previewPositionHelper.matrix).thenReturn(MATRIX) + whenever(previewPositionHelper.isOrientationChanged).thenReturn(isRotated) + val result = + systemUnderTest.invoke( + THUMBNAIL_DATA, + CANVAS_WIDTH, + CANVAS_HEIGHT, + /* isRtl= */ true, + splitBounds, + splitPosition, + DEFAULT_DISPLAY_DENSITY, + ) + val expectedResult = ThumbnailPosition(MATRIX, isRotated) + assertThat(result).isEqualTo(expectedResult) + + verify(previewPositionHelper).setSplitBounds(splitBounds, splitPosition) + verify(previewPositionHelper) + .updateThumbnailMatrix( + Rect(0, 0, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT), + THUMBNAIL_DATA, + CANVAS_WIDTH, + CANVAS_HEIGHT, + false, + 0, + true, + DEFAULT_DISPLAY_DENSITY, + ) + } + + private companion object { + const val THUMBNAIL_WIDTH = 100 + const val THUMBNAIL_HEIGHT = 200 + const val CANVAS_WIDTH = 300 + const val CANVAS_HEIGHT = 600 + val MATRIX = + Matrix().apply { + setValues(floatArrayOf(2.3f, 4.5f, 2.6f, 7.4f, 3.4f, 2.3f, 2.5f, 6.0f, 3.4f)) + } + + val THUMBNAIL_DATA = + ThumbnailData( + thumbnail = + mock().apply { + whenever(width).thenReturn(THUMBNAIL_WIDTH) + whenever(height).thenReturn(THUMBNAIL_HEIGHT) + } + ) + + const val DEFAULT_DISPLAY_DENSITY = 320 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/IsThumbnailValidUseCaseTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/IsThumbnailValidUseCaseTest.kt new file mode 100644 index 00000000000..e6492c94a51 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/IsThumbnailValidUseCaseTest.kt @@ -0,0 +1,184 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Bitmap +import android.graphics.Rect +import android.view.Surface +import android.view.Surface.ROTATION_90 +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED +import com.android.quickstep.recents.data.FakeRecentsRotationStateRepository +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants +import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT +import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +class IsThumbnailValidUseCaseTest { + private val recentsRotationStateRepository = FakeRecentsRotationStateRepository() + private val systemUnderTest = IsThumbnailValidUseCase(recentsRotationStateRepository) + + @Test + fun withNullThumbnail_returnsInvalid() = runTest { + val isThumbnailValid = systemUnderTest( + thumbnailData = null, + viewWidth = 0, + viewHeight = 0, + splitBounds = null, + stagePosition = STAGE_POSITION_UNDEFINED,) + assertThat(isThumbnailValid).isEqualTo(false) + } + + @Test + fun sameAspectRatio_sameRotation_returnsValid() = runTest { + val isThumbnailValid = + systemUnderTest.invoke( + thumbnailData = createThumbnailData(), + viewWidth = THUMBNAIL_WIDTH * 2, + viewHeight = THUMBNAIL_HEIGHT * 2, + splitBounds = null, + stagePosition = STAGE_POSITION_UNDEFINED, + ) + assertThat(isThumbnailValid).isEqualTo(true) + } + + @Test + fun differentAspectRatio_sameRotation_returnsInvalid() = runTest { + val isThumbnailValid = + systemUnderTest.invoke( + thumbnailData = createThumbnailData(), + viewWidth = THUMBNAIL_WIDTH, + viewHeight = THUMBNAIL_HEIGHT * 2, + splitBounds = null, + stagePosition = STAGE_POSITION_UNDEFINED, + ) + assertThat(isThumbnailValid).isEqualTo(false) + } + + @Test + fun sameAspectRatio_differentRotation_returnsInvalid() = runTest { + val isThumbnailValid = + systemUnderTest.invoke( + thumbnailData = createThumbnailData(rotation = ROTATION_90), + viewWidth = THUMBNAIL_WIDTH * 2, + viewHeight = THUMBNAIL_HEIGHT * 2, + splitBounds = null, + stagePosition = STAGE_POSITION_UNDEFINED, + ) + assertThat(isThumbnailValid).isEqualTo(false) + } + + @Test + fun differentAspectRatio_differentRotation_returnsInvalid() = runTest { + val isThumbnailValid = + systemUnderTest.invoke( + thumbnailData = createThumbnailData(rotation = ROTATION_90), + viewWidth = THUMBNAIL_WIDTH, + viewHeight = THUMBNAIL_HEIGHT * 2, + splitBounds = null, + stagePosition = STAGE_POSITION_UNDEFINED, + ) + assertThat(isThumbnailValid).isEqualTo(false) + } + + @Test + fun differentAspectRatio_9010split_bottomRight_returnsValid() = runTest { + val splitBounds = SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* leftTopTaskIds = */ listOf(1), + /* rightBottomTaskIds = */ listOf(2), + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_90_10, + ) + val isBottomRightThumbnailValid = + systemUnderTest.invoke( + thumbnailData = createThumbnailData(), + viewWidth = THUMBNAIL_WIDTH, + viewHeight = THUMBNAIL_HEIGHT * 2, + splitBounds = splitBounds, + stagePosition = SPLIT_POSITION_BOTTOM_OR_RIGHT, + ) + assertThat(isBottomRightThumbnailValid).isEqualTo(true) + } + + @Test + fun differentAspectRatio_1090split_leftTop_returnsValid() = runTest { + val splitBounds = SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* leftTopTaskIds = */ listOf(1), + /* rightBottomTaskIds = */ listOf(2), + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_10_90, + ) + val isTopLeftThumbnailValid = + systemUnderTest.invoke( + thumbnailData = createThumbnailData(), + viewWidth = THUMBNAIL_WIDTH, + viewHeight = THUMBNAIL_HEIGHT * 2, + splitBounds = splitBounds, + stagePosition = SPLIT_POSITION_TOP_OR_LEFT, + ) + assertThat(isTopLeftThumbnailValid).isEqualTo(true) + } + + @Test + fun differentAspectRatio_9010split_rotated_returnsInvalid() = runTest { + val splitBounds = SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* leftTopTaskIds = */ listOf(1), + /* rightBottomTaskIds = */ listOf(2), + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_90_10, + ) + val isBottomRightThumbnailValid = + systemUnderTest.invoke( + thumbnailData = createThumbnailData(rotation = ROTATION_90), + viewWidth = THUMBNAIL_WIDTH, + viewHeight = THUMBNAIL_HEIGHT * 2, + splitBounds = splitBounds, + stagePosition = SPLIT_POSITION_TOP_OR_LEFT, + ) + assertThat(isBottomRightThumbnailValid).isEqualTo(false) + } + + private fun createThumbnailData( + rotation: Int = Surface.ROTATION_0, + width: Int = THUMBNAIL_WIDTH, + height: Int = THUMBNAIL_HEIGHT, + ): ThumbnailData { + val bitmap = mock() + whenever(bitmap.width).thenReturn(width) + whenever(bitmap.height).thenReturn(height) + return ThumbnailData(thumbnail = bitmap, rotation = rotation) + } + + companion object { + const val THUMBNAIL_WIDTH = 100 + const val THUMBNAIL_HEIGHT = 200 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/OrganizeDesktopTasksUseCaseTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/OrganizeDesktopTasksUseCaseTest.kt new file mode 100644 index 00000000000..d003c591e9f --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/domain/usecase/OrganizeDesktopTasksUseCaseTest.kt @@ -0,0 +1,676 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.domain.usecase + +import android.graphics.Rect +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.quickstep.recents.domain.model.DesktopLayoutConfig +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.HiddenDesktopTaskBoundsData +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.RenderedDesktopTaskBoundsData +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +/** Test for [OrganizeDesktopTasksUseCase] */ +@RunWith(AndroidJUnit4::class) +class OrganizeDesktopTasksUseCaseTest { + + private val useCase: OrganizeDesktopTasksUseCase = OrganizeDesktopTasksUseCase() + + @Test + fun test_emptyTaskBounds_returnsEmptyList() { + val taskBounds = emptyList() + + val result = useCase.invoke(taskBounds, TEST_LAYOUT_CONFIG) + + assertThat(result).isEmpty() + } + + @Test + fun test_emptyDesktopBounds_returnsHiddenTaskData() { + val desktopBounds = Rect(0, 0, 0, 0) + val taskBounds = listOf(RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 100))) + val expected = listOf(HiddenDesktopTaskBoundsData(1)) + val layoutConfig = TEST_LAYOUT_CONFIG.copy(desktopBounds = desktopBounds) + + val result = useCase.invoke(taskBounds, layoutConfig) + + assertThat(result).isEqualTo(expected) + } + + @Test + fun test_singleTask_isCenteredAndScaled() { + val originalAppRect = Rect(0, 0, 800, 1200) + val taskBounds = listOf(RenderedDesktopTaskBoundsData(1, originalAppRect)) + + val result = useCase.invoke(taskBounds, TEST_LAYOUT_CONFIG) + + assertThat(result).hasSize(1) + val renderedTask = result[0] as RenderedDesktopTaskBoundsData + val resultBounds = renderedTask.bounds + assertThat(resultBounds.width()).isGreaterThan(0) + assertThat(resultBounds.height()).isGreaterThan(0) + + // Check aspect ratio is roughly preserved + val originalAspectRatio = originalAppRect.width().toFloat() / originalAppRect.height() + val resultAspectRatio = resultBounds.width().toFloat() / resultBounds.height() + assertThat(resultAspectRatio).isWithin(0.1f).of(originalAspectRatio) + + // availableLayoutBounds will be Rect(20, 20, 980, 1980) after subtracting the margins. + // Check if the task is centered within effective layout bounds + val expectedTaskRect = Rect(25, 287, 975, 1713) + assertThat(result) + .isEqualTo(listOf(RenderedDesktopTaskBoundsData(taskId = 1, bounds = expectedTaskRect))) + } + + @Test + fun test_multiTasks_formRows() { + // Make tasks wide enough so they likely won't all fit in one row + val taskRect = Rect(0, 0, 600, 400) + val taskBounds = + listOf( + RenderedDesktopTaskBoundsData(1, taskRect), + RenderedDesktopTaskBoundsData(2, taskRect), + RenderedDesktopTaskBoundsData(3, taskRect), + ) + + val result = useCase.invoke(taskBounds, TEST_LAYOUT_CONFIG) + assertThat(result).hasSize(3) + val bounds1 = (result[0] as RenderedDesktopTaskBoundsData).bounds + + // Basic checks: positive dimensions, aspect ratio + result.forEachIndexed { index, data -> + val renderedData = data as RenderedDesktopTaskBoundsData + assertThat(renderedData.bounds.width()).isGreaterThan(0) + assertThat(renderedData.bounds.height()).isGreaterThan(0) + val originalAspectRatio = taskRect.width().toFloat() / taskRect.height() + val resultAspectRatio = + renderedData.bounds.width().toFloat() / renderedData.bounds.height() + assertThat(resultAspectRatio).isWithin(0.1f).of(originalAspectRatio) + } + + // Expected bounds, based on the current implementation. + // The tasks are expected to be arranged in 3 rows. + val expectedTask1Bounds = Rect(20, 30, 980, 670) + val expectedTask2Bounds = Rect(20, 680, 980, 1320) + val expectedTask3Bounds = Rect(20, 1330, 980, 1970) + val expectedResult = + listOf( + RenderedDesktopTaskBoundsData(1, expectedTask1Bounds), + RenderedDesktopTaskBoundsData(2, expectedTask2Bounds), + RenderedDesktopTaskBoundsData(3, expectedTask3Bounds), + ) + assertThat(result).isEqualTo(expectedResult) + } + + @Test + fun test_maxRows_limitsNumberOfRowsEffectively() { + val desktopBounds = Rect(0, 0, 1000, 550) // Height is somewhat constrained + val taskRect = Rect(0, 0, 200, 100) // Aspect ratio 2:1 + val tasks = + listOf( + RenderedDesktopTaskBoundsData(1, taskRect), + RenderedDesktopTaskBoundsData(2, taskRect), + RenderedDesktopTaskBoundsData(3, taskRect), + ) + + // For simplicity, configure maxRows = 1. + // Effective layout height for multi-row (or single-row if margins are same): + // 550 - 20 (topMargin) - 20 (bottomMargin) = 510 + // Effective layout width for multi-row: + // 1000 - 20 (leftMargin) - (20-10) (rightNetMargin from leftRightMarginMultiRows - + // horizontalPadding) = 970 + // availableLayoutBounds for the main layout logic will be Rect(20, 20, 990, 530) + // + // With maxRows = 1, verticalPaddingBetweenTasks = 10: + // getMinTaskHeightGivenMaxRows = ((510 - 1*10) / (1+1)) + 1 = (500/2) + 1 = 251. + // This acts as a lower bound for the optimalHeight bisection. + // + // If optimalHeight is determined to be 251 (original task aspect ratio 200:100): + // Scaled task width = 251 * (200/100) = 502. + // Horizontally, in fitWindowRectsInBounds, for the first task: + // left (20) + width (502) + horizontalPadding (10) = 532. This fits within + // layoutBounds.right (990). + // For the second task on the same row: + // new_left (532) + width (502) + horizontalPadding (10) = 1044. This exceeds + // layoutBounds.right (990). + // So, second task attempts to move to a new row. + // New row top = old_top (20) + optimalWindowHeight (251) + verticalPadding (10) = 281. + // Check if new row fits vertically: (new_row_top + optimalWindowHeight) > + // layoutBounds.bottom + // (281 + 251) > 530 => 532 > 530. It does NOT fit. + // Thus, fitWindowRectsInBounds sets allWindowsFit = false and only Task 1 gets bounds. + // + // Expected: Task 1 gets bounds and centered, Tasks 2 and 3 get a small bounds in the center + // of the screen. + // Expected Rect for Task 1: Rect(25, 37 - 975, 513) after relayout to calculate the optimal + // height to fit one window. + val config = + TEST_LAYOUT_CONFIG.copy( + desktopBounds = desktopBounds, + // testLayoutConfig has topBottomMarginOneRow = 20 + maxRows = 1, + minTaskWidth = 50, // Low enough not to dominate height calculation + verticalPaddingBetweenTasks = 10, + topMarginMultiRows = 20, + bottomMarginMultiRows = 20, + leftRightMarginMultiRows = 20, + horizontalPaddingBetweenTasks = 10, + ) + + val result = useCase.invoke(tasks, config) + + val expected = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(25, 37, 975, 513)), + HiddenDesktopTaskBoundsData(2), + HiddenDesktopTaskBoundsData(3), + ) + assertThat(result).isEqualTo(expected) + } + + @Test + fun removeTask_fromEmptyLayout_returnsEmptyList_merged() { + val currentLayout = emptyList() + val taskIdToRemove = 1 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = null, + dismissedTaskId = taskIdToRemove, + ) + assertThat(result).isEmpty() + } + + @Test + fun removeTask_whenTaskNotFoundInSingleItemLayout_returnsOriginalLayout_merged() { + val currentLayout = listOf(RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 200))) + val taskIdToRemove = 2 // Task not in currentLayout + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + dismissedTaskId = taskIdToRemove, + ) + // The new invoke logic might return a full re-organization if task not found for reflow. + // If task to remove is not found, performReflowRebalance returns currentLayout. + // The orchestrator invoke will call performFullOrganization on currentLayout (all tasks). + // So, the result should be the organized version of currentLayout. + val expectedResult = + useCase.invoke(currentLayout, DEFAULT_LAYOUT_CONFIG, dismissedTaskId = null) + assertThat(result).isEqualTo(expectedResult) + } + + // Before: + // [ T1 ] + // [ T2 ] + // [ T3 ] + // After (removing T1): + // [ T2 ] + // [ T3 ] + @Test + fun removeFirstRow_fromLayoutWithThreeRowsSingleColumn_rebalancesRemainingTwo_merged() { + val currentLayout = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 200)), + RenderedDesktopTaskBoundsData(2, Rect(0, 210, 100, 410)), + RenderedDesktopTaskBoundsData(3, Rect(0, 420, 100, 620)), + ) + val taskIdToRemove = 1 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = currentLayout, + dismissedTaskId = taskIdToRemove, + ) + + val expectedResult = + listOf( + RenderedDesktopTaskBoundsData(2, Rect(0, 105, 100, 305)), + RenderedDesktopTaskBoundsData(3, Rect(0, 315, 100, 515)), + ) + assertThat(result).isEqualTo(expectedResult) + } + + // Before: + // [ T1 ] + // [ T2 ] + // [ T3 ] + // After (removing T2): + // [ T1 ] + // [ T3 ] + @Test + fun removeMiddleRow_fromLayoutWithThreeRowsSingleColumn_rebalancesRemainingTwo_merged() { + val currentLayout = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 200)), + RenderedDesktopTaskBoundsData(2, Rect(0, 210, 100, 410)), + RenderedDesktopTaskBoundsData(3, Rect(0, 420, 100, 620)), + ) + val taskIdToRemove = 2 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = currentLayout, + dismissedTaskId = taskIdToRemove, + ) + + val expectedResult = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 105, 100, 305)), + RenderedDesktopTaskBoundsData(3, Rect(0, 315, 100, 515)), + ) + assertThat(result).isEqualTo(expectedResult) + } + + // Before: + // [ T1 ] + // [ T2 ] + // [ T3 ] + // After (removing T3): + // [ T1 ] + // [ T2 ] + @Test + fun removeLastRow_fromLayoutWithThreeRowsSingleColumn_rebalancesRemainingTwo_merged() { + val currentLayout = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 200)), + RenderedDesktopTaskBoundsData(2, Rect(0, 210, 100, 410)), + RenderedDesktopTaskBoundsData(3, Rect(0, 420, 100, 620)), + ) + val taskIdToRemove = 3 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = currentLayout, + dismissedTaskId = taskIdToRemove, + ) + + val expectedResult = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 105, 100, 305)), + RenderedDesktopTaskBoundsData(2, Rect(0, 315, 100, 515)), + ) + assertThat(result).isEqualTo(expectedResult) + } + + // Before: + // [ T1 ] [ T2 ] + // [ T3 ] + // [ T4 ] [ T5 ] + // After (removing T3): + // [ T1 ] [ T2 ] + // [ T4 ] [ T5 ] + @Test + fun removeMiddleRowWithSingleTask_fromLayoutWithThreeRowsMixedColumns_rebalancesRemainingTwoRows_merged() { + val currentLayout = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 200)), + RenderedDesktopTaskBoundsData(2, Rect(110, 0, 210, 200)), + RenderedDesktopTaskBoundsData(3, Rect(0, 210, 100, 410)), + RenderedDesktopTaskBoundsData(4, Rect(0, 420, 100, 620)), + RenderedDesktopTaskBoundsData(5, Rect(110, 420, 210, 620)), + ) + val taskIdToRemove = 3 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = currentLayout, + dismissedTaskId = taskIdToRemove, + ) + + val expectedResult = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 105, 100, 305)), + RenderedDesktopTaskBoundsData(2, Rect(110, 105, 210, 305)), + RenderedDesktopTaskBoundsData(4, Rect(0, 315, 100, 515)), + RenderedDesktopTaskBoundsData(5, Rect(110, 315, 210, 515)), + ) + assertThat(result).isEqualTo(expectedResult) + } + + // Before: + // [ T1 ] [ T2 ] [ T3 ] + // After (removing T1): + // [ T2 ] [ T3 ] + @Test + fun removeFirstTask_fromLayoutWithSingleRowThreeColumns_rebalancesRemainingTwo_merged() { + val currentLayout = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 200)), + RenderedDesktopTaskBoundsData(2, Rect(110, 0, 210, 200)), + RenderedDesktopTaskBoundsData(3, Rect(220, 0, 320, 200)), + ) + val taskIdToRemove = 1 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = currentLayout, + dismissedTaskId = taskIdToRemove, + ) + + val expectedResult = + listOf( + RenderedDesktopTaskBoundsData(2, Rect(55, 0, 155, 200)), + RenderedDesktopTaskBoundsData(3, Rect(165, 0, 265, 200)), + ) + assertThat(result).isEqualTo(expectedResult) + } + + // Before: + // [ T1 ] [ T2 ] [ T3 ] + // After (removing T2): + // [ T1 ] [ T3 ] + @Test + fun removeMiddleTask_fromLayoutWithSingleRowThreeColumns_rebalancesRemainingTwo_merged() { + val currentLayout = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 200)), + RenderedDesktopTaskBoundsData(2, Rect(110, 0, 210, 200)), + RenderedDesktopTaskBoundsData(3, Rect(220, 0, 320, 200)), + ) + val taskIdToRemove = 2 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = currentLayout, + dismissedTaskId = taskIdToRemove, + ) + + val expectedResult = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(55, 0, 155, 200)), + RenderedDesktopTaskBoundsData(3, Rect(165, 0, 265, 200)), + ) + assertThat(result).isEqualTo(expectedResult) + } + + // Before: + // [ T1 ] [ T2 ] [ T3 ] + // After (removing T3): + // [ T1 ] [ T2 ] + @Test + fun removeLastTask_fromLayoutWithSingleRowThreeColumns_rebalancesRemainingTwo_merged() { + val currentLayout = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(0, 0, 100, 200)), + RenderedDesktopTaskBoundsData(2, Rect(110, 0, 210, 200)), + RenderedDesktopTaskBoundsData(3, Rect(220, 0, 320, 200)), + ) + val taskIdToRemove = 3 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = currentLayout, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = currentLayout, + dismissedTaskId = taskIdToRemove, + ) + + val expectedResult = + listOf( + RenderedDesktopTaskBoundsData(1, Rect(55, 0, 155, 200)), + RenderedDesktopTaskBoundsData(2, Rect(165, 0, 265, 200)), + ) + assertThat(result).isEqualTo(expectedResult) + } + + // Helper for creating RenderedDesktopTaskBoundsData + private fun createRenderedData(taskId: Int, l: Int, t: Int, r: Int, b: Int) = + RenderedDesktopTaskBoundsData(taskId, Rect(l, t, r, b)) + + // Helper for creating HiddenDesktopTaskBoundsData + private fun createHiddenData(taskId: Int) = HiddenDesktopTaskBoundsData(taskId) + + @Test + fun dismissOnlyTask_resultsInEmptyLayout() { + val task1Orig = createRenderedData(1, 0, 0, 100, 100) + val allOriginalTasks = listOf(task1Orig) + val previousLayout = + listOf(createRenderedData(1, 10, 10, 110, 110)) // Organized version of task1Orig + val dismissedTaskId = 1 + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = allOriginalTasks, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = previousLayout, + dismissedTaskId = dismissedTaskId, + ) + + assertThat(result).isEmpty() + } + + @Test + fun dismissTask_whenPreviousLayoutIsEmpty_performsFullOrganizationOnRemaining() { + val task1Orig = createRenderedData(1, 0, 0, 100, 100) + val task2Orig = createRenderedData(2, 100, 0, 200, 100) + val allOriginalTasks = listOf(task1Orig, task2Orig) + val dismissedTaskId = 1 + + val remainingOriginalTaskBounds = listOf(task2Orig) + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = allOriginalTasks, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = null, + dismissedTaskId = dismissedTaskId, + ) + + // Expected: performFullOrganization on remainingOriginalTaskBounds ([task2Orig]) + val expectedResultByFullOrganization = + useCase.invoke( + allCurrentOriginalTaskBounds = remainingOriginalTaskBounds, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = null, + dismissedTaskId = null, + ) + assertThat(result).isEqualTo(expectedResultByFullOrganization) + } + + @Test + fun dismissHiddenTask_returnsRemainingPreviousLayoutWithoutRelayout() { + val task1Orig = createRenderedData(1, 0, 0, 200, 200) // Will be rendered + val task2Orig = createRenderedData(2, 0, 0, 100, 100) // Will be hidden in previousLayout + + val allOriginalTasks = listOf(task1Orig, task2Orig) + // Assume task2 was hidden in the previous layout + val previousLayout = listOf(createRenderedData(1, 10, 10, 510, 510), createHiddenData(2)) + val dismissedTaskId = 2 // Dismissing the hidden task + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = allOriginalTasks, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = previousLayout, + dismissedTaskId = dismissedTaskId, + ) + + // Expected: remainingPreviousOrganizedTaskPosition, which is [r(1, 10, 10, 510, 510)] + assertThat(result).containsExactly(createRenderedData(1, 10, 10, 510, 510)) + } + + @Test + fun dismissRenderedTask_previousHadHidden_relayoutChangesVisibility_performsFullOrganization() { + // T1 (small), T2 (small), T3 (large enough to be hidden with T1, T2 present) + // Previous: R_T1, R_T2, H_T3. Dismiss T1. + // Remaining original: T2, T3. Full org on (T2, T3) should render both. + val task1Orig = createRenderedData(1, 0, 0, 100, 100) + val task2Orig = createRenderedData(2, 100, 0, 200, 100) + val task3Orig = createRenderedData(3, 0, 100, 300, 400) // Large task + + val allOriginalTasks = listOf(task1Orig, task2Orig, task3Orig) + + // Setup previousLayout: T1, T2 are rendered, T3 is hidden. + // This requires a desktopBound that would actually hide T3 if T1,T2 are present. + // For simplicity, we manually construct previousOrganizedDesktopTaskPositions. + // Let's assume T1 and T2 took up all space, forcing T3 to be hidden. + val prevRenderedT1 = createRenderedData(1, 10, 10, 110, 110) + val prevRenderedT2 = createRenderedData(2, 120, 10, 220, 110) + val prevHiddenT3 = createHiddenData(3) + val previousLayout = listOf(prevRenderedT1, prevRenderedT2, prevHiddenT3) + + val dismissedTaskId = 1 + val remainingOriginalTasks = listOf(task2Orig, task3Orig) + + // Mocking the behavior of performFullOrganization for this specific scenario: + // Assume that when only T2 and T3 are present, they can both be rendered. + // This means the set of rendered tasks changes from {T2} (in remainingPrevious) to {T2, + // T3}. + // So, the use case should return the result of full organization on remainingOriginalTasks. + + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = allOriginalTasks, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = previousLayout, + dismissedTaskId = dismissedTaskId, + ) + + // Expected: result of performFullOrganization on remainingOriginalTasks ([task2Orig, + // task3Orig]) + val expectedResultByFullOrganization = + useCase.invoke( + allCurrentOriginalTaskBounds = remainingOriginalTasks, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = null, // Not used for this call path + dismissedTaskId = null, + ) + + assertThat(result).isEqualTo(expectedResultByFullOrganization) + // Additionally, verify that T3 is now rendered. + assertThat(result.any { it.taskId == 3 && it is RenderedDesktopTaskBoundsData }).isTrue() + } + + @Test + fun dismissRenderedTask_previousHadHidden_relayoutKeepsSameVisibility_performsReflowAndPreservesHidden() { + // T1 (small), T2 (small), T3 (very large, will stay hidden even if T1 is dismissed) + // Previous: R_T1, R_T2, H_T3. Dismiss T1. + // Remaining original: T2, T3. Full org on (T2, T3) should be R_T2, H_T3. + // Rendered set {T2} is same as in remainingPrevious. So, reflow R_T1, R_T2, removing T1. + // H_T3 should now be preserved. + + val task1Orig = createRenderedData(1, 0, 0, 100, 100) // Small, will be rendered + val task2Orig = createRenderedData(2, 100, 0, 200, 100) // Small, will be rendered + // Task3 is very large, assume it will be hidden if T2 is present, even if T1 is gone. + val task3Orig = createRenderedData(3, 0, 0, 0, 0) // Force hidden by empty bounds + + val allOriginalTasks = listOf(task1Orig, task2Orig, task3Orig) + + val prevRenderedT1 = createRenderedData(1, 10, 10, 110, 110) // Example organized bounds + val prevRenderedT2 = createRenderedData(2, 120, 10, 220, 110) // Example organized bounds + val prevHiddenT3 = createHiddenData(3) + val previousLayout = listOf(prevRenderedT1, prevRenderedT2, prevHiddenT3) + + val dismissedTaskId = 1 + val result = + useCase.invoke( + allCurrentOriginalTaskBounds = allOriginalTasks, + layoutConfig = DEFAULT_LAYOUT_CONFIG, + taskPositionsHint = previousLayout, + dismissedTaskId = dismissedTaskId, + ) + + // Expected: Result of performReflowRebalance on [prevRenderedT1, prevRenderedT2] removing + // T1. + // This would be prevRenderedT2, possibly re-centered. + // For this setup (T1 and T2 on same row), T2 should be re-centered. + // Original prevRenderedT2: Rect(120, 10, 220, 110) (width 100, height 100) + // If T1 (width 100) is removed, T2 (width 100) should be centered in the space previously + // occupied by T1 and T2. + // Overall bounds of [prevRenderedT1, prevRenderedT2] before removal: union is + // Rect(10,10,220,110) + // CenterX of this is (10+220)/2 = 115. + // T2 width is 100. So new T2 bounds: left = 115 - 100/2 = 65. right = 65 + 100 = 165. + // Top, height remain same. So, Rect(65, 10, 165, 110). + val expectedReflowedT2 = createRenderedData(2, 65, 10, 165, 110) + + // Verify that the result contains the reflowed T2 and the preserved hidden T3. + assertThat(result).hasSize(2) + assertThat(result).contains(expectedReflowedT2) + assertThat(result).contains(prevHiddenT3) + } + + @Test + fun layoutWithHiddenTasks_relayoutsVisibleTasksOptimally() { + val taskRect = Rect(0, 0, 200, 100) // Same size for all tasks + + val tasks = + listOf( + RenderedDesktopTaskBoundsData(1, taskRect), + RenderedDesktopTaskBoundsData(2, taskRect), + RenderedDesktopTaskBoundsData(3, taskRect), + ) + + val constrainedConfig = + TEST_LAYOUT_CONFIG.copy(desktopBounds = Rect(0, 0, 1000, 400), maxRows = 1) + + // With the constrained config, only 2 tasks should fit, so task 3 will be hidden. + val visibleTasks = tasks.take(2) + + // 1. Get layout for all tasks (where one should be hidden due to constraints) + val resultWithHidden = useCase.invoke(tasks, constrainedConfig) + + // 2. Get layout for only the tasks that are expected to be visible + val resultVisibleOnly = useCase.invoke(visibleTasks, constrainedConfig) + + // 3. Filter out the hidden task from the first result + val renderedTasksFromResultWithHidden = + resultWithHidden.filterIsInstance() + + // 4. Assert that the layouts are the same + assertThat(renderedTasksFromResultWithHidden).isEqualTo(resultVisibleOnly) + // Also assert that task 3 was indeed hidden + assertThat(resultWithHidden.find { it.taskId == 3 }) + .isInstanceOf(HiddenDesktopTaskBoundsData::class.java) + } + + companion object { + private val TEST_LAYOUT_CONFIG = + DesktopLayoutConfig( + desktopBounds = Rect(0, 0, 1000, 2000), + topBottomMarginOneRow = 20, + topMarginMultiRows = 20, + bottomMarginMultiRows = 20, + leftRightMarginOneRow = 20, + leftRightMarginMultiRows = 20, + horizontalPaddingBetweenTasks = 10, + verticalPaddingBetweenTasks = 10, + minTaskWidth = 100, + maxRows = 4, + ) + private val DEFAULT_DESKTOP_BOUNDS = Rect(0, 0, 10000, 10000) + private val DEFAULT_LAYOUT_CONFIG = + TEST_LAYOUT_CONFIG.copy(desktopBounds = DEFAULT_DESKTOP_BOUNDS) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapperTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapperTest.kt new file mode 100644 index 00000000000..51648ea9dd4 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapperTest.kt @@ -0,0 +1,383 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.ui.mapper + +import android.graphics.Bitmap +import android.graphics.Color +import android.graphics.drawable.ShapeDrawable +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.Surface +import android.view.View +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.Flags +import com.android.launcher3.R +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT +import com.android.quickstep.recents.ui.viewmodel.TaskData +import com.android.quickstep.task.TaskDismissButtonState +import com.android.quickstep.task.apptimer.TaskAppTimerUiState +import com.android.quickstep.task.thumbnail.TaskHeaderUiState +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.LiveTile +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Snapshot +import com.android.systemui.shared.recents.model.ThumbnailData +import com.google.common.truth.Truth.assertThat +import java.time.Duration +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class TaskUiStateMapperTest { + + @get:Rule val mSetFlagsRule = SetFlagsRule() + + /** TaskHeaderUiState */ + @Test + fun taskData_isNull_returns_HideHeader() { + val result = + TaskUiStateMapper.toTaskHeaderState( + taskData = null, + hasHeader = false, + clickCloseListener = null, + ) + assertThat(result).isEqualTo(TaskHeaderUiState.HideHeader) + } + + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_EXPLODED_VIEW) + @Test + fun explodedFlagDisabled_returnsHideHeader() { + val inputs = + listOf( + TASK_DATA, + TASK_DATA.copy(thumbnailData = null), + TASK_DATA.copy(isLocked = true), + TASK_DATA.copy(title = null), + ) + val closeCallback = View.OnClickListener {} + val expected = TaskHeaderUiState.HideHeader + inputs.forEach { taskData -> + val result = + TaskUiStateMapper.toTaskHeaderState( + taskData = taskData, + hasHeader = true, + clickCloseListener = closeCallback, + ) + assertThat(result).isEqualTo(expected) + } + } + + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_EXPLODED_VIEW) + @Test + fun taskData_hasHeader_and_taskData_returnsShowHeader() { + val inputs = + listOf( + TASK_DATA.copy(isLiveTile = true), + TASK_DATA.copy(isLiveTile = true, thumbnailData = null), + TASK_DATA.copy(isLiveTile = true, isLocked = true), + TASK_DATA.copy(isLiveTile = true, title = null), + ) + val closeCallback = View.OnClickListener {} + val expected = + TaskHeaderUiState.ShowHeader( + header = + TaskHeaderUiState.ThumbnailHeader( + TASK_ICON, + TASK_TITLE_DESCRIPTION, + closeCallback, + ) + ) + inputs.forEach { taskData -> + val result = + TaskUiStateMapper.toTaskHeaderState( + taskData = taskData, + hasHeader = true, + clickCloseListener = closeCallback, + ) + assertThat(result).isEqualTo(expected) + } + } + + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_EXPLODED_VIEW) + @Test + fun taskData_hasHeader_noIcon_returns_ShowHeader() { + val closeCallback = View.OnClickListener {} + val result = + TaskUiStateMapper.toTaskHeaderState( + taskData = TASK_DATA.copy(isLiveTile = true, icon = null), + hasHeader = true, + clickCloseListener = closeCallback, + ) + val expected = + TaskHeaderUiState.ShowHeader( + header = + TaskHeaderUiState.ThumbnailHeader( + icon = null, + title = TASK_TITLE_DESCRIPTION, + clickCloseListener = closeCallback, + ) + ) + assertThat(result).isEqualTo(expected) + } + + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_EXPLODED_VIEW) + @Test + fun taskData_hasHeader_noTitle_returns_ShowHeader() { + val closeCallback = View.OnClickListener {} + val result = + TaskUiStateMapper.toTaskHeaderState( + taskData = TASK_DATA.copy(isLiveTile = true, titleDescription = null), + hasHeader = true, + clickCloseListener = closeCallback, + ) + val expected = + TaskHeaderUiState.ShowHeader( + header = + TaskHeaderUiState.ThumbnailHeader( + icon = TASK_ICON, + title = null, + clickCloseListener = closeCallback, + ) + ) + assertThat(result).isEqualTo(expected) + } + + /** TaskThumbnailUiState */ + @Test + fun taskData_isNull_returns_Uninitialized() { + val result = TaskUiStateMapper.toTaskThumbnailUiState(taskData = null) + assertThat(result).isEqualTo(TaskThumbnailUiState.Uninitialized) + } + + @Test + fun taskData_isLiveTile_returns_LiveTile() { + val inputs = + listOf( + TASK_DATA.copy(isLiveTile = true), + TASK_DATA.copy(isLiveTile = true, thumbnailData = null), + TASK_DATA.copy(isLiveTile = true, isLocked = true), + ) + inputs.forEach { input -> + val result = TaskUiStateMapper.toTaskThumbnailUiState(taskData = input) + assertThat(result).isEqualTo(LiveTile) + } + } + + @Test + fun taskData_isStaticTile_returns_SnapshotSplash() { + val result = TaskUiStateMapper.toTaskThumbnailUiState(taskData = TASK_DATA) + + val expected = + TaskThumbnailUiState.SnapshotSplash( + snapshot = + Snapshot( + backgroundColor = TASK_BACKGROUND_COLOR, + bitmap = TASK_THUMBNAIL, + thumbnailRotation = Surface.ROTATION_0, + ), + splash = TASK_ICON, + ) + + assertThat(result).isEqualTo(expected) + } + + @Test + fun taskData_thumbnailDataIsNull_returns_BackgroundOnly() { + val result = + TaskUiStateMapper.toTaskThumbnailUiState( + taskData = TASK_DATA.copy(thumbnailData = null) + ) + + val expected = TaskThumbnailUiState.BackgroundOnly(TASK_BACKGROUND_COLOR) + assertThat(result).isEqualTo(expected) + } + + @Test + fun taskData_thumbnailIsNull_returns_BackgroundOnly() { + val result = + TaskUiStateMapper.toTaskThumbnailUiState( + taskData = + TASK_DATA.copy(thumbnailData = TASK_THUMBNAIL_DATA.copy(thumbnail = null)) + ) + + val expected = TaskThumbnailUiState.BackgroundOnly(TASK_BACKGROUND_COLOR) + assertThat(result).isEqualTo(expected) + } + + @Test + fun taskData_isLocked_returns_BackgroundOnly() { + val result = + TaskUiStateMapper.toTaskThumbnailUiState(taskData = TASK_DATA.copy(isLocked = true)) + + val expected = TaskThumbnailUiState.BackgroundOnly(TASK_BACKGROUND_COLOR) + assertThat(result).isEqualTo(expected) + } + + @Test + fun toTaskAppTimer_nullTaskData_returnsUninitialized() { + val result = + TaskUiStateMapper.toTaskAppTimerUiState( + canShowAppTimer = true, + stagePosition = STAGE_POSITION_DEFAULT, + taskData = null, + ) + + val expected = TaskAppTimerUiState.Uninitialized + assertThat(result).isEqualTo(expected) + } + + @Test + fun toTaskAppTimer_noTaskData_returnsUninitialized() { + val result = + TaskUiStateMapper.toTaskAppTimerUiState( + canShowAppTimer = true, + stagePosition = STAGE_POSITION_DEFAULT, + taskData = TaskData.NoData(TASK_ID), + ) + + val expected = TaskAppTimerUiState.Uninitialized + assertThat(result).isEqualTo(expected) + } + + @Test + fun toTaskAppTimer_canShowAppTimerFalse_returnsNoTimer() { + val result = + TaskUiStateMapper.toTaskAppTimerUiState( + canShowAppTimer = false, + stagePosition = STAGE_POSITION_DEFAULT, + taskData = TASK_DATA, + ) + + val expected = TaskAppTimerUiState.NoTimer(taskDescription = TASK_TITLE_DESCRIPTION) + assertThat(result).isEqualTo(expected) + } + + @Test + fun toTaskAppTimer_timerNullAndCanShow_returnsNoTimer() { + val result = + TaskUiStateMapper.toTaskAppTimerUiState( + canShowAppTimer = false, + stagePosition = STAGE_POSITION_DEFAULT, + taskData = TASK_DATA.copy(remainingAppTimerDuration = null), + ) + + val expected = TaskAppTimerUiState.NoTimer(taskDescription = TASK_TITLE_DESCRIPTION) + assertThat(result).isEqualTo(expected) + } + + @Test + fun toTaskAppTimer_timerPresentAndCanShow_returnsTimer() { + val result = + TaskUiStateMapper.toTaskAppTimerUiState( + canShowAppTimer = true, + stagePosition = STAGE_POSITION_DEFAULT, + taskData = TASK_DATA.copy(remainingAppTimerDuration = TASK_APP_TIMER_DURATION), + ) + + val expected = + TaskAppTimerUiState.Timer( + timeRemaining = TASK_APP_TIMER_DURATION, + taskDescription = TASK_DATA.titleDescription, + taskPackageName = TASK_DATA.packageName, + accessibilityActionId = R.id.action_digital_wellbeing_top_left, + ) + assertThat(result).isEqualTo(expected) + } + + @Test + fun toTaskAppTimer_stagePositionBottomOrRight_returnsTimerWithCorrectActionId() { + val result = + TaskUiStateMapper.toTaskAppTimerUiState( + canShowAppTimer = true, + stagePosition = STAGE_POSITION_BOTTOM_OR_RIGHT, + taskData = TASK_DATA.copy(remainingAppTimerDuration = TASK_APP_TIMER_DURATION), + ) + + val expected = + TaskAppTimerUiState.Timer( + timeRemaining = TASK_APP_TIMER_DURATION, + taskDescription = TASK_DATA.titleDescription, + taskPackageName = TASK_DATA.packageName, + accessibilityActionId = R.id.action_digital_wellbeing_bottom_right, + ) + assertThat(result).isEqualTo(expected) + } + + @DisableFlags(Flags.FLAG_SHOW_CLOSE_BUTTON_ON_TASKVIEW_HOVER) + @Test + fun toTaskDismissButtonState_flagDisabled_hideDismissButton() { + val result = + TaskUiStateMapper.toTaskDismissButtonState( + isDesktopTaskView = false, + clickCloseListener = CLOSE_CALLBACK, + ) + + assertThat(result).isEqualTo(TaskDismissButtonState.Disabled) + } + + @EnableFlags(Flags.FLAG_SHOW_CLOSE_BUTTON_ON_TASKVIEW_HOVER) + @Test + fun toTaskDismissButtonState_showDismissButton() { + val result = + TaskUiStateMapper.toTaskDismissButtonState( + isDesktopTaskView = false, + clickCloseListener = CLOSE_CALLBACK, + ) + + assertThat(result).isEqualTo(TaskDismissButtonState.Enabled(CLOSE_CALLBACK)) + } + + @EnableFlags(Flags.FLAG_SHOW_CLOSE_BUTTON_ON_TASKVIEW_HOVER) + @Test + fun toTaskDismissButtonState_isDesktopTaskView_hideDismissButton() { + val result = + TaskUiStateMapper.toTaskDismissButtonState( + isDesktopTaskView = true, + clickCloseListener = CLOSE_CALLBACK, + ) + assertThat(result).isEqualTo(TaskDismissButtonState.Disabled) + } + + private companion object { + const val TASK_TITLE_DESCRIPTION = "Title Description 1" + var TASK_ID = 1 + var PACKAGE_NAME = "com.test" + val TASK_ICON = ShapeDrawable() + val TASK_THUMBNAIL = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + val TASK_THUMBNAIL_DATA = + ThumbnailData(thumbnail = TASK_THUMBNAIL, rotation = Surface.ROTATION_0) + val TASK_BACKGROUND_COLOR = Color.rgb(1, 2, 3) + val TASK_APP_TIMER_DURATION: Duration = Duration.ofMillis(30) + val STAGE_POSITION_DEFAULT = STAGE_POSITION_TOP_OR_LEFT + val TASK_DATA = + TaskData.Data( + TASK_ID, + packageName = PACKAGE_NAME, + title = "Task 1", + titleDescription = TASK_TITLE_DESCRIPTION, + icon = TASK_ICON, + thumbnailData = TASK_THUMBNAIL_DATA, + backgroundColor = TASK_BACKGROUND_COLOR, + isLocked = false, + isLiveTile = false, + remainingAppTimerDuration = TASK_APP_TIMER_DURATION, + ) + val CLOSE_CALLBACK = View.OnClickListener {} + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModelTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModelTest.kt new file mode 100644 index 00000000000..4bde635c425 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModelTest.kt @@ -0,0 +1,469 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.ui.viewmodel + +import android.graphics.Color +import android.graphics.Rect +import android.graphics.drawable.ShapeDrawable +import android.view.WindowInsetsController.APPEARANCE_LIGHT_CAPTION_BARS +import android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS +import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT +import com.android.launcher3.util.SystemUiController.FLAG_LIGHT_NAV +import com.android.launcher3.util.SystemUiController.FLAG_LIGHT_STATUS +import com.android.launcher3.util.TestDispatcherProvider +import com.android.quickstep.recents.data.FakeRecentsRotationStateRepository +import com.android.quickstep.recents.domain.model.TaskModel +import com.android.quickstep.recents.domain.usecase.GetSysUiStatusNavFlagsUseCase +import com.android.quickstep.recents.domain.usecase.GetTaskUseCase +import com.android.quickstep.recents.domain.usecase.GetThumbnailPositionUseCase +import com.android.quickstep.recents.domain.usecase.IsThumbnailValidUseCase +import com.android.quickstep.recents.viewmodel.RecentsViewData +import com.android.quickstep.views.TaskViewType +import com.android.systemui.shared.recents.model.ThumbnailData +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants +import com.google.common.truth.Truth.assertThat +import java.time.Duration +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.anyInt +import org.mockito.Mockito.spy +import org.mockito.Mockito.verify +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +@OptIn(ExperimentalCoroutinesApi::class) +@RunWith(AndroidJUnit4::class) +class TaskViewModelTest { + private val unconfinedTestDispatcher = UnconfinedTestDispatcher() + private val testScope = TestScope(unconfinedTestDispatcher) + + private val recentsViewData = RecentsViewData() + private val getTaskUseCase = mock() + private val getThumbnailPositionUseCase = mock() + private val isThumbnailValidUseCase = + spy(IsThumbnailValidUseCase(FakeRecentsRotationStateRepository())) + private lateinit var sut: TaskViewModel + + @Before + fun setUp() { + sut = createTaskViewModel() + whenever(getTaskUseCase.invoke(TASK_MODEL_1.id)).thenReturn(flow { emit(TASK_MODEL_1) }) + whenever(getTaskUseCase.invoke(TASK_MODEL_2.id)).thenReturn(flow { emit(TASK_MODEL_2) }) + whenever(getTaskUseCase.invoke(TASK_MODEL_3.id)).thenReturn(flow { emit(TASK_MODEL_3) }) + whenever(getTaskUseCase.invoke(TASK_MODEL_MINIMIZED.id)) + .thenReturn(flow { emit(TASK_MODEL_MINIMIZED) }) + whenever(getTaskUseCase.invoke(INVALID_TASK_ID)).thenReturn(flow { emit(null) }) + recentsViewData.runningTaskIds.value = emptySet() + } + + @Test + fun singleTaskRetrieved_when_validTaskId() = + testScope.runTest { + sut.bind(TaskViewType.SINGLE, TASK_MODEL_1.id) + val expectedResult = + TaskTileUiState( + tasks = listOf(TASK_MODEL_1.toUiState()), + hasHeader = false, + sysUiStatusNavFlags = FLAGS_APPEARANCE_LIGHT_THEME, + taskOverlayEnabled = false, + isCentralTask = false, + ) + assertThat(sut.state.first()).isEqualTo(expectedResult) + } + + @Test + fun hasHeader_when_taskViewTypeIsDesktop() = + testScope.runTest { + val expectedResults = + mapOf( + TaskViewType.SINGLE to false, + TaskViewType.GROUPED to false, + TaskViewType.DESKTOP to true, + ) + + expectedResults.forEach { (type, expectedResult) -> + sut = + TaskViewModel( + recentsViewData = recentsViewData, + getTaskUseCase = getTaskUseCase, + getSysUiStatusNavFlagsUseCase = GetSysUiStatusNavFlagsUseCase(), + isThumbnailValidUseCase = isThumbnailValidUseCase, + getThumbnailPositionUseCase = getThumbnailPositionUseCase, + dispatcherProvider = TestDispatcherProvider(unconfinedTestDispatcher), + ) + sut.bind(type, TASK_MODEL_1.id) + assertThat(sut.state.first().hasHeader).isEqualTo(expectedResult) + } + } + + @Test + fun multipleTasksRetrieved_when_validTaskIds() = + testScope.runTest { + sut.bind( + TaskViewType.DESKTOP, + TASK_MODEL_1.id, + TASK_MODEL_2.id, + TASK_MODEL_3.id, + INVALID_TASK_ID, + ) + val expectedResult = + TaskTileUiState( + tasks = + listOf( + TASK_MODEL_1.toUiState(), + TASK_MODEL_2.toUiState(), + TASK_MODEL_3.toUiState(), + TaskData.NoData(INVALID_TASK_ID), + ), + hasHeader = true, + sysUiStatusNavFlags = FLAGS_APPEARANCE_LIGHT_THEME, + taskOverlayEnabled = false, + isCentralTask = false, + ) + assertThat(sut.state.first()).isEqualTo(expectedResult) + } + + @Test + fun isLiveTile_when_runningTasksMatchTasks() = + testScope.runTest { + recentsViewData.runningTaskShowScreenshot.value = false + recentsViewData.runningTaskIds.value = + setOf(TASK_MODEL_1.id, TASK_MODEL_2.id, TASK_MODEL_3.id) + sut.bind(TaskViewType.DESKTOP, TASK_MODEL_1.id, TASK_MODEL_2.id, TASK_MODEL_3.id) + val expectedResult = + TaskTileUiState( + tasks = + listOf( + TASK_MODEL_1.toUiState(isLiveTile = true), + TASK_MODEL_2.toUiState(isLiveTile = true), + TASK_MODEL_3.toUiState(isLiveTile = true), + ), + hasHeader = true, + sysUiStatusNavFlags = FLAGS_APPEARANCE_LIGHT_THEME, + taskOverlayEnabled = false, + isCentralTask = false, + ) + assertThat(sut.state.first()).isEqualTo(expectedResult) + } + + @Test + fun isMixedLiveTile_when_oneTaskIsMinimized() = + testScope.runTest { + recentsViewData.runningTaskShowScreenshot.value = false + recentsViewData.runningTaskIds.value = + setOf(TASK_MODEL_1.id, TASK_MODEL_2.id, TASK_MODEL_3.id, TASK_MODEL_MINIMIZED.id) + sut.bind( + TaskViewType.DESKTOP, + TASK_MODEL_1.id, + TASK_MODEL_2.id, + TASK_MODEL_3.id, + TASK_MODEL_MINIMIZED.id, + ) + val expectedResult = + TaskTileUiState( + tasks = + listOf( + TASK_MODEL_1.toUiState(isLiveTile = true), + TASK_MODEL_2.toUiState(isLiveTile = true), + TASK_MODEL_3.toUiState(isLiveTile = true), + TASK_MODEL_MINIMIZED.toUiState(isLiveTile = false), + ), + hasHeader = true, + sysUiStatusNavFlags = FLAGS_APPEARANCE_LIGHT_THEME, + taskOverlayEnabled = false, + isCentralTask = false, + ) + assertThat(sut.state.first()).isEqualTo(expectedResult) + } + + @Test + fun isNotLiveTile_when_runningTaskShowScreenshotIsTrue() = + testScope.runTest { + recentsViewData.runningTaskShowScreenshot.value = true + recentsViewData.runningTaskIds.value = + setOf(TASK_MODEL_1.id, TASK_MODEL_2.id, TASK_MODEL_3.id) + sut.bind(TaskViewType.DESKTOP, TASK_MODEL_1.id, TASK_MODEL_2.id, TASK_MODEL_3.id) + val expectedResult = + TaskTileUiState( + tasks = + listOf( + TASK_MODEL_1.toUiState(), + TASK_MODEL_2.toUiState(), + TASK_MODEL_3.toUiState(), + ), + hasHeader = true, + sysUiStatusNavFlags = FLAGS_APPEARANCE_LIGHT_THEME, + taskOverlayEnabled = false, + isCentralTask = false, + ) + assertThat(sut.state.first()).isEqualTo(expectedResult) + } + + @Test + fun isNotLiveTile_when_runningTasksMatchPartialTasks_lessRunningTasks() = + testScope.runTest { + recentsViewData.runningTaskShowScreenshot.value = false + recentsViewData.runningTaskIds.value = setOf(TASK_MODEL_1.id, TASK_MODEL_2.id) + sut.bind(TaskViewType.DESKTOP, TASK_MODEL_1.id, TASK_MODEL_2.id, TASK_MODEL_3.id) + val expectedResult = + TaskTileUiState( + tasks = + listOf( + TASK_MODEL_1.toUiState(), + TASK_MODEL_2.toUiState(), + TASK_MODEL_3.toUiState(), + ), + hasHeader = true, + sysUiStatusNavFlags = FLAGS_APPEARANCE_LIGHT_THEME, + taskOverlayEnabled = false, + isCentralTask = false, + ) + assertThat(sut.state.first()).isEqualTo(expectedResult) + } + + @Test + fun isNotLiveTile_when_runningTasksMatchPartialTasks_moreRunningTasks() = + testScope.runTest { + recentsViewData.runningTaskShowScreenshot.value = false + recentsViewData.runningTaskIds.value = + setOf(TASK_MODEL_1.id, TASK_MODEL_2.id, TASK_MODEL_3.id) + sut.bind(TaskViewType.DESKTOP, TASK_MODEL_1.id, TASK_MODEL_2.id) + val expectedResult = + TaskTileUiState( + tasks = listOf(TASK_MODEL_1.toUiState(), TASK_MODEL_2.toUiState()), + hasHeader = true, + sysUiStatusNavFlags = FLAGS_APPEARANCE_LIGHT_THEME, + taskOverlayEnabled = false, + isCentralTask = false, + ) + assertThat(sut.state.first()).isEqualTo(expectedResult) + } + + @Test + fun noDataAvailable_when_InvalidTaskId() = + testScope.runTest { + sut.bind(TaskViewType.SINGLE, INVALID_TASK_ID) + val expectedResult = + TaskTileUiState( + listOf(TaskData.NoData(INVALID_TASK_ID)), + hasHeader = false, + sysUiStatusNavFlags = FLAGS_APPEARANCE_DEFAULT, + taskOverlayEnabled = false, + isCentralTask = false, + ) + assertThat(sut.state.first()).isEqualTo(expectedResult) + } + + @Test + fun taskOverlayEnabled_when_OverlayIsEnabledForVisibleSingleTask() = + testScope.runTest { + sut.bind(TaskViewType.SINGLE, TASK_MODEL_1.id) + recentsViewData.overlayEnabled.value = true + recentsViewData.settledFullyVisibleTaskIds.value = setOf(1) + + assertThat(sut.state.first().taskOverlayEnabled).isTrue() + } + + @Test + fun taskOverlayDisabled_when_OverlayIsEnabledForInvisibleTask() = + testScope.runTest { + sut.bind(TaskViewType.SINGLE, TASK_MODEL_1.id) + recentsViewData.overlayEnabled.value = true + recentsViewData.settledFullyVisibleTaskIds.value = setOf(2) + + assertThat(sut.state.first().taskOverlayEnabled).isFalse() + } + + @Test + fun taskOverlayDisabled_when_OverlayIsDisabledForVisibleTask() = + testScope.runTest { + sut.bind(TaskViewType.SINGLE, TASK_MODEL_1.id) + recentsViewData.overlayEnabled.value = false + recentsViewData.settledFullyVisibleTaskIds.value = setOf(1) + + assertThat(sut.state.first().taskOverlayEnabled).isFalse() + } + + @Test + fun taskOverlayDisabled_when_OverlayIsEnabledForVisibleDesktopTask() = + testScope.runTest { + sut = createTaskViewModel() + sut.bind(TaskViewType.DESKTOP, TASK_MODEL_1.id) + recentsViewData.overlayEnabled.value = true + recentsViewData.settledFullyVisibleTaskIds.value = setOf(1) + + assertThat(sut.state.first().taskOverlayEnabled).isFalse() + } + + @Test + fun taskOverlayDisabled_when_OverlayIsEnabledForVisibleGroupedTask() = + testScope.runTest { + sut = createTaskViewModel() + sut.bind(TaskViewType.GROUPED, TASK_MODEL_1.id) + recentsViewData.overlayEnabled.value = true + recentsViewData.settledFullyVisibleTaskIds.value = setOf(1) + + assertThat(sut.state.first().taskOverlayEnabled).isFalse() + } + + @Test + fun isCentralTask_when_CentralTaskIdsMatchTaskIds() = + testScope.runTest { + sut.bind(TaskViewType.GROUPED, TASK_MODEL_1.id, TASK_MODEL_2.id) + recentsViewData.centralTaskIds.value = setOf(TASK_MODEL_1.id, TASK_MODEL_2.id) + + assertThat(sut.state.first().isCentralTask).isTrue() + } + + @Test + fun isNotCentralTask_when_CentralTaskIdsDoMatchTaskIds() = + testScope.runTest { + sut.bind(TaskViewType.GROUPED, TASK_MODEL_1.id, TASK_MODEL_2.id) + recentsViewData.centralTaskIds.value = setOf(TASK_MODEL_3.id) + + assertThat(sut.state.first().isCentralTask).isFalse() + } + + @Test + fun shouldShowSplash_calls_useCase() { + val splitBounds = + SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ 1, + /* rightBottomTaskId = */ 2, + /* leftTopTaskIds = */ listOf(1), + /* rightBottomTaskIds = */ listOf(2), + /* snapPosition = */ SplitScreenConstants.SNAP_TO_2_90_10, + ) + sut.isThumbnailValid( + thumbnail = null, + width = 0, + height = 0, + splitBounds = splitBounds, + stagePosition = STAGE_POSITION_BOTTOM_OR_RIGHT, + ) + verify(isThumbnailValidUseCase) + .invoke( + anyOrNull(), + anyInt(), + anyInt(), + eq(splitBounds), + eq(STAGE_POSITION_BOTTOM_OR_RIGHT), + ) + } + + private fun TaskModel.toUiState(isLiveTile: Boolean = false) = + TaskData.Data( + taskId = id, + packageName = packageName, + title = title, + titleDescription = titleDescription, + icon = icon!!, + thumbnailData = thumbnail, + backgroundColor = backgroundColor, + isLocked = isLocked, + isLiveTile = isLiveTile, + remainingAppTimerDuration = remainingAppDuration, + ) + + private fun createTaskViewModel() = + TaskViewModel( + recentsViewData = recentsViewData, + getTaskUseCase = getTaskUseCase, + getSysUiStatusNavFlagsUseCase = GetSysUiStatusNavFlagsUseCase(), + isThumbnailValidUseCase = isThumbnailValidUseCase, + getThumbnailPositionUseCase = getThumbnailPositionUseCase, + dispatcherProvider = TestDispatcherProvider(unconfinedTestDispatcher), + ) + + private companion object { + const val PACKAGE_NAME = "com.test" + const val INVALID_TASK_ID = -1 + const val FLAGS_APPEARANCE_LIGHT_THEME = FLAG_LIGHT_STATUS or FLAG_LIGHT_NAV + const val FLAGS_APPEARANCE_DEFAULT = 0 + const val APPEARANCE_LIGHT_THEME = + APPEARANCE_LIGHT_CAPTION_BARS or + APPEARANCE_LIGHT_STATUS_BARS or + APPEARANCE_LIGHT_NAVIGATION_BARS + + val TASK_MODEL_1 = + TaskModel( + 1, + PACKAGE_NAME, + "Title 1", + "Content Description 1", + ShapeDrawable(), + ThumbnailData(appearance = APPEARANCE_LIGHT_THEME), + Color.BLACK, + isLocked = false, + isMinimized = false, + remainingAppDuration = Duration.ofMillis(30), + ) + val TASK_MODEL_2 = + TaskModel( + 2, + PACKAGE_NAME, + "Title 2", + "Content Description 2", + ShapeDrawable(), + ThumbnailData(appearance = APPEARANCE_LIGHT_THEME), + Color.RED, + isLocked = true, + isMinimized = false, + remainingAppDuration = Duration.ofHours(5).plusMinutes(2), + ) + val TASK_MODEL_3 = + TaskModel( + 3, + PACKAGE_NAME, + "Title 3", + "Content Description 3", + ShapeDrawable(), + ThumbnailData(appearance = APPEARANCE_LIGHT_THEME), + Color.BLUE, + isLocked = false, + isMinimized = false, + remainingAppDuration = null, + ) + val TASK_MODEL_MINIMIZED = + TaskModel( + 4, + PACKAGE_NAME, + "Title 4", + "Content Description 4", + ShapeDrawable(), + ThumbnailData(appearance = APPEARANCE_LIGHT_THEME), + Color.BLUE, + isLocked = false, + isMinimized = true, + remainingAppDuration = null, + ) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/viewmodel/DesktopTaskViewModelTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/viewmodel/DesktopTaskViewModelTest.kt new file mode 100644 index 00000000000..a6567778eb4 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/viewmodel/DesktopTaskViewModelTest.kt @@ -0,0 +1,465 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.recents.viewmodel + +import android.content.ComponentName +import android.content.Intent +import android.graphics.Rect +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.util.coroutines.DispatcherProvider +import com.android.quickstep.recents.data.DesktopTileBackgroundRepository +import com.android.quickstep.recents.domain.model.DesktopLayoutConfig +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.HiddenDesktopTaskBoundsData +import com.android.quickstep.recents.domain.model.DesktopTaskBoundsData.RenderedDesktopTaskBoundsData +import com.android.quickstep.recents.domain.model.DesktopTaskVisibilityData.HiddenDesktopTaskVisibilityData +import com.android.quickstep.recents.domain.model.DesktopTaskVisibilityData.RenderedDesktopTaskVisibilityData +import com.android.quickstep.recents.domain.usecase.GetObscuredDesktopTaskIdsUseCase +import com.android.quickstep.recents.domain.usecase.OrganizeDesktopTasksUseCase +import com.android.quickstep.recents.ui.viewmodel.DesktopTaskViewModel +import com.android.quickstep.recents.ui.viewmodel.DesktopTaskViewModel.TaskPosition +import com.android.quickstep.util.DesktopTask +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.Task.TaskKey +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.isNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** Test for [DesktopTaskViewModel] */ +@RunWith(AndroidJUnit4::class) +class DesktopTaskViewModelTest { + private val organizeDesktopTasksUseCase = mock() + private val getObscuredDesktopTaskIdsUseCase = mock() + private val desktopTileBackgroundRepository = mock() + private val dispatcherProvider = mock() + + private lateinit var systemUnderTest: DesktopTaskViewModel + + @Before + fun setUp() { + systemUnderTest = + DesktopTaskViewModel( + organizeDesktopTasksUseCase, + getObscuredDesktopTaskIdsUseCase, + desktopTileBackgroundRepository, + dispatcherProvider, + ) + } + + @Test + fun emptyTaskPositions() { + whenever(getObscuredDesktopTaskIdsUseCase.invoke(any())).thenReturn(emptySet()) + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), isNull())) + .thenReturn(emptyList()) + + systemUnderTest.bind(createDesktopTask(emptyList())) + systemUnderTest.organizeDesktopTasks(layoutConfig = TEST_LAYOUT_CONFIG) + + val result = systemUnderTest.organizedDesktopTaskVisibilityDataMap + assertThat(result).isEmpty() + + verify(getObscuredDesktopTaskIdsUseCase).invoke(emptyList()) + verify(organizeDesktopTasksUseCase) + .invoke(eq(emptyList()), any(), eq(emptyList()), isNull()) + } + + @Test + fun singleRenderedAndObscuredTaskPosition() { + whenever(getObscuredDesktopTaskIdsUseCase.invoke(any())).thenReturn(setOf(NEW_TASK_ID_1)) + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), isNull())) + .thenReturn(listOf(ORGANIZED_RENDERED_TASK_BOUNDS_DATA)) + + systemUnderTest.bind( + createDesktopTask(listOf(createTask(NEW_TASK_ID_1, NEW_TASK_BOUNDS_1))) + ) + systemUnderTest.organizeDesktopTasks(layoutConfig = TEST_LAYOUT_CONFIG) + + val result = systemUnderTest.organizedDesktopTaskVisibilityDataMap + assertThat(result) + .containsExactly( + NEW_TASK_ID_1, + RenderedDesktopTaskVisibilityData( + isObscured = true, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ), + ) + + verify(getObscuredDesktopTaskIdsUseCase).invoke(listOf(NEW_TASK_POSITION_1)) + + val allCurrentOriginalTaskBounds = + listOf( + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_1, bounds = NEW_TASK_BOUNDS_1) + ) + verify(organizeDesktopTasksUseCase) + .invoke(eq(allCurrentOriginalTaskBounds), any(), eq(emptyList()), isNull()) + } + + @Test + fun singleHiddenAndObscuredTaskPosition() { + whenever(getObscuredDesktopTaskIdsUseCase.invoke(any())).thenReturn(setOf(NEW_TASK_ID_2)) + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), isNull())) + .thenReturn(listOf(ORGANIZED_HIDDEN_TASK_BOUNDS_DATA)) + + systemUnderTest.bind( + createDesktopTask(listOf(createTask(NEW_TASK_ID_2, NEW_TASK_BOUNDS_2))) + ) + systemUnderTest.organizeDesktopTasks(layoutConfig = TEST_LAYOUT_CONFIG) + + val result = systemUnderTest.organizedDesktopTaskVisibilityDataMap + assertThat(result) + .containsExactly(NEW_TASK_ID_2, HiddenDesktopTaskVisibilityData(isObscured = true)) + + verify(getObscuredDesktopTaskIdsUseCase).invoke(listOf(NEW_TASK_POSITION_2)) + + val allCurrentOriginalTaskBounds = + listOf( + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_2, bounds = NEW_TASK_BOUNDS_2) + ) + verify(organizeDesktopTasksUseCase) + .invoke(eq(allCurrentOriginalTaskBounds), any(), eq(emptyList()), isNull()) + } + + @Test + fun oneRenderedTaskOneHiddenTask() { + whenever(getObscuredDesktopTaskIdsUseCase.invoke(any())).thenReturn(emptySet()) + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), isNull())) + .thenReturn( + listOf(ORGANIZED_RENDERED_TASK_BOUNDS_DATA, ORGANIZED_HIDDEN_TASK_BOUNDS_DATA) + ) + + systemUnderTest.bind( + createDesktopTask( + listOf( + createTask(NEW_TASK_ID_1, NEW_TASK_BOUNDS_1), + createTask(NEW_TASK_ID_2, NEW_TASK_BOUNDS_2), + ) + ) + ) + systemUnderTest.organizeDesktopTasks(layoutConfig = TEST_LAYOUT_CONFIG) + + val result = systemUnderTest.organizedDesktopTaskVisibilityDataMap + assertThat(result) + .containsExactly( + NEW_TASK_ID_1, + RenderedDesktopTaskVisibilityData( + isObscured = false, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ), + NEW_TASK_ID_2, + HiddenDesktopTaskVisibilityData(isObscured = false), + ) + + verify(getObscuredDesktopTaskIdsUseCase) + .invoke(listOf(NEW_TASK_POSITION_1, NEW_TASK_POSITION_2)) + + val allCurrentOriginalTaskBounds = + listOf( + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_1, bounds = NEW_TASK_BOUNDS_1), + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_2, bounds = NEW_TASK_BOUNDS_2), + ) + verify(organizeDesktopTasksUseCase) + .invoke(eq(allCurrentOriginalTaskBounds), any(), eq(emptyList()), isNull()) + } + + @Test + fun oldOrganizedVisibilityData() { + whenever(getObscuredDesktopTaskIdsUseCase.invoke(any())).thenReturn(emptySet()) + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), isNull())) + .thenReturn(listOf(ORGANIZED_RENDERED_TASK_BOUNDS_DATA)) + + // Store data in the system before asking it to organize tasks to see if the data is + // converted properly. + systemUnderTest.organizedDesktopTaskVisibilityDataMap = + mapOf(OLD_RENDERED_TASK_VISIBILITY_DATA_PAIR, OLD_HIDDEN_TASK_VISIBILITY_DATA_PAIR) + + systemUnderTest.bind( + createDesktopTask(listOf(createTask(NEW_TASK_ID_1, NEW_TASK_BOUNDS_1))) + ) + systemUnderTest.organizeDesktopTasks(layoutConfig = TEST_LAYOUT_CONFIG) + + val result = systemUnderTest.organizedDesktopTaskVisibilityDataMap + assertThat(result) + .containsExactly( + NEW_TASK_ID_1, + RenderedDesktopTaskVisibilityData( + isObscured = false, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ), + ) + + verify(getObscuredDesktopTaskIdsUseCase).invoke(listOf(NEW_TASK_POSITION_1)) + + val allCurrentOriginalTaskBounds = + listOf( + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_1, bounds = NEW_TASK_BOUNDS_1) + ) + val taskPositionsHint = + listOf( + RenderedDesktopTaskBoundsData( + taskId = OLD_RENDERED_TASK_ID, + bounds = OLD_RENDERED_TASK_BOUNDS, + ), + HiddenDesktopTaskBoundsData(taskId = OLD_HIDDEN_TASK_ID), + ) + verify(organizeDesktopTasksUseCase) + .invoke(eq(allCurrentOriginalTaskBounds), any(), eq(taskPositionsHint), isNull()) + } + + @Test + fun validDismissTaskId() { + // NEW_TASK_ID_2 will be used as the dismissed ID, so the GetObscuredDesktopTaskIdsUseCase + // should only be invoked on the first task. + whenever(getObscuredDesktopTaskIdsUseCase.invoke(any())).thenReturn(setOf(NEW_TASK_ID_1)) + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), any())) + .thenReturn(listOf(ORGANIZED_RENDERED_TASK_BOUNDS_DATA)) + + systemUnderTest.bind( + createDesktopTask( + listOf( + createTask(NEW_TASK_ID_1, NEW_TASK_BOUNDS_1), + createTask(NEW_TASK_ID_2, NEW_TASK_BOUNDS_2), + ) + ) + ) + systemUnderTest.organizeDesktopTasks( + layoutConfig = TEST_LAYOUT_CONFIG, + dismissedTaskId = NEW_TASK_ID_2, + ) + + val result = systemUnderTest.organizedDesktopTaskVisibilityDataMap + assertThat(result) + .containsExactly( + NEW_TASK_ID_1, + RenderedDesktopTaskVisibilityData( + isObscured = true, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ), + ) + + verify(getObscuredDesktopTaskIdsUseCase).invoke(listOf(NEW_TASK_POSITION_1)) + + val allCurrentOriginalTaskBounds = + listOf( + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_1, bounds = NEW_TASK_BOUNDS_1), + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_2, bounds = NEW_TASK_BOUNDS_2), + ) + verify(organizeDesktopTasksUseCase) + .invoke(eq(allCurrentOriginalTaskBounds), any(), eq(emptyList()), eq(NEW_TASK_ID_2)) + } + + @Test + fun organizeDesktopTasks_minimizedTask_taskPositionMinimized() { + whenever(getObscuredDesktopTaskIdsUseCase.invoke(any())).thenReturn(emptySet()) + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), isNull())) + .thenReturn(emptyList()) + + systemUnderTest.bind( + createDesktopTask( + listOf(createTask(NEW_TASK_ID_1, NEW_TASK_BOUNDS_1, isMinimized = true)) + ) + ) + systemUnderTest.organizeDesktopTasks(layoutConfig = TEST_LAYOUT_CONFIG) + + verify(getObscuredDesktopTaskIdsUseCase).invoke(listOf(NEW_TASK_POSITION_1_MINIMIZED)) + } + + @Test + fun organizeDesktopTasks_transparentActivityTransparentActivityStackTaskInDesktop_isHidden() { + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), isNull())) + .thenReturn(listOf(ORGANIZED_RENDERED_TASK_BOUNDS_DATA)) + + systemUnderTest.bind( + createDesktopTask( + listOf( + createTask(NEW_TASK_ID_1, NEW_TASK_BOUNDS_1), + createTask( + TRANSPARENT_TASK_ID, + TRANSPARENT_TASK_BOUNDS, + isTopActivityTransparent = true, + isActivityStackTransparent = true, + ), + ) + ) + ) + systemUnderTest.organizeDesktopTasks(layoutConfig = TEST_LAYOUT_CONFIG) + + val result = systemUnderTest.organizedDesktopTaskVisibilityDataMap + assertThat(result) + .containsExactly( + NEW_TASK_ID_1, + RenderedDesktopTaskVisibilityData( + isObscured = false, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ), + TRANSPARENT_TASK_ID, + HiddenDesktopTaskVisibilityData(isObscured = false), + ) + + val allCurrentOriginalTaskBounds = + listOf( + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_1, bounds = NEW_TASK_BOUNDS_1) + ) + verify(organizeDesktopTasksUseCase) + .invoke(eq(allCurrentOriginalTaskBounds), any(), eq(emptyList()), isNull()) + } + + @Test + fun organizeDesktopTasks_transparentActivityNonTransparentActivityStackTaskInDesktop_isShown() { + whenever(organizeDesktopTasksUseCase.invoke(any(), any(), any(), isNull())) + .thenReturn( + listOf( + ORGANIZED_RENDERED_TASK_BOUNDS_DATA, + ORGANIZED_RENDERED_TASK_BOUNDS_DATA_FOR_SEMITRANSPARENT_TASK, + ) + ) + + systemUnderTest.bind( + createDesktopTask( + listOf( + createTask(NEW_TASK_ID_1, NEW_TASK_BOUNDS_1), + createTask( + SEMI_TRANSPARENT_TASK_ID, + SEMI_TRANSPARENT_TASK_BOUNDS, + isTopActivityTransparent = true, + ), + ) + ) + ) + systemUnderTest.organizeDesktopTasks(layoutConfig = TEST_LAYOUT_CONFIG) + + val result = systemUnderTest.organizedDesktopTaskVisibilityDataMap + assertThat(result) + .containsExactly( + NEW_TASK_ID_1, + RenderedDesktopTaskVisibilityData( + isObscured = false, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ), + SEMI_TRANSPARENT_TASK_ID, + RenderedDesktopTaskVisibilityData( + isObscured = false, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ), + ) + + val allCurrentOriginalTaskBounds = + listOf( + RenderedDesktopTaskBoundsData(taskId = NEW_TASK_ID_1, bounds = NEW_TASK_BOUNDS_1), + RenderedDesktopTaskBoundsData( + taskId = SEMI_TRANSPARENT_TASK_ID, + bounds = SEMI_TRANSPARENT_TASK_BOUNDS, + ), + ) + + verify(organizeDesktopTasksUseCase) + .invoke(eq(allCurrentOriginalTaskBounds), any(), eq(emptyList()), isNull()) + } + + private fun createTask( + id: Int, + appBounds: Rect, + isTopActivityTransparent: Boolean = false, + isMinimized: Boolean = false, + isActivityStackTransparent: Boolean = false, + ) = + Task().apply { + key = + TaskKey( + id, + /* windowingMode= */ 0, + Intent(), + ComponentName("", ""), + /* userId */ 0, + /* lastActiveTime */ 0, + ) + this.appBounds = appBounds + this.key.isTopActivityTransparent = isTopActivityTransparent + this.key.isActivityStackTransparent = isActivityStackTransparent + this.isMinimized = isMinimized + } + + private fun createDesktopTask(tasks: List) = + DesktopTask(deskId = 0, desktopDisplayId = 0, tasks = tasks) + + companion object { + private val TEST_LAYOUT_CONFIG = + DesktopLayoutConfig( + desktopBounds = Rect(0, 0, 1000, 2000), + topBottomMarginOneRow = 20, + topMarginMultiRows = 20, + bottomMarginMultiRows = 20, + leftRightMarginOneRow = 20, + leftRightMarginMultiRows = 20, + horizontalPaddingBetweenTasks = 10, + verticalPaddingBetweenTasks = 10, + minTaskWidth = 100, + maxRows = 4, + ) + + val NEW_TASK_ID_1 = 1 + val NEW_TASK_BOUNDS_1 = Rect(0, 0, 1, 1) + val NEW_TASK_POSITION_1 = + TaskPosition(taskId = NEW_TASK_ID_1, isMinimized = false, bounds = NEW_TASK_BOUNDS_1) + val NEW_TASK_POSITION_1_MINIMIZED = + TaskPosition(taskId = NEW_TASK_ID_1, isMinimized = true, bounds = NEW_TASK_BOUNDS_1) + + val NEW_TASK_ID_2 = 2 + val NEW_TASK_BOUNDS_2 = Rect(0, 0, 2, 2) + val NEW_TASK_POSITION_2 = + TaskPosition(taskId = NEW_TASK_ID_2, isMinimized = false, bounds = NEW_TASK_BOUNDS_2) + + val OLD_RENDERED_TASK_ID = -1 + val OLD_RENDERED_TASK_BOUNDS = Rect(-1, -1, 0, 0) + val OLD_RENDERED_TASK_VISIBILITY_DATA_PAIR = + Pair( + OLD_RENDERED_TASK_ID, + RenderedDesktopTaskVisibilityData( + isObscured = false, + bounds = OLD_RENDERED_TASK_BOUNDS, + ), + ) + + val OLD_HIDDEN_TASK_ID = -2 + val OLD_HIDDEN_TASK_VISIBILITY_DATA_PAIR = + Pair(OLD_HIDDEN_TASK_ID, HiddenDesktopTaskVisibilityData(isObscured = false)) + + val ORGANIZED_RENDERED_TASK_BOUNDS = Rect(0, 0, 10, 10) + val ORGANIZED_RENDERED_TASK_BOUNDS_DATA = + RenderedDesktopTaskBoundsData( + taskId = NEW_TASK_ID_1, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ) + val ORGANIZED_HIDDEN_TASK_BOUNDS_DATA = HiddenDesktopTaskBoundsData(taskId = NEW_TASK_ID_2) + + val TRANSPARENT_TASK_ID = 3 + val TRANSPARENT_TASK_BOUNDS = Rect(0, 0, 3, 3) + + val SEMI_TRANSPARENT_TASK_ID = 4 + val SEMI_TRANSPARENT_TASK_BOUNDS = Rect(0, 0, 4, 4) + val ORGANIZED_RENDERED_TASK_BOUNDS_DATA_FOR_SEMITRANSPARENT_TASK = + RenderedDesktopTaskBoundsData( + taskId = SEMI_TRANSPARENT_TASK_ID, + bounds = ORGANIZED_RENDERED_TASK_BOUNDS, + ) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/viewmodel/RecentsViewModelTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/viewmodel/RecentsViewModelTest.kt new file mode 100644 index 00000000000..c53f20ffdc2 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/viewmodel/RecentsViewModelTest.kt @@ -0,0 +1,140 @@ +/* + * 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.quickstep.recents.viewmodel + +import android.content.ComponentName +import android.content.Intent +import android.graphics.Bitmap +import android.graphics.Color +import android.view.Display.DEFAULT_DISPLAY +import android.view.Surface +import com.android.quickstep.recents.data.FakeTasksRepository +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.ThumbnailData +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +class RecentsViewModelTest { + private val tasksRepository = FakeTasksRepository() + private val recentsViewData = RecentsViewData() + private val systemUnderTest = + RecentsViewModel(tasksRepository, recentsViewData, DEFAULT_DISPLAY) + + private val tasks = (0..5).map(::createTaskWithId) + + @Test + fun taskVisibilityControlThumbnailsAvailability() = runTest { + val thumbnailData1 = createThumbnailData() + val thumbnailData2 = createThumbnailData() + tasksRepository.seedTasks(tasks) + tasksRepository.seedThumbnailData(mapOf(1 to thumbnailData1, 2 to thumbnailData2)) + + val thumbnailDataFlow1 = tasksRepository.getThumbnailById(1) + val thumbnailDataFlow2 = tasksRepository.getThumbnailById(2) + + systemUnderTest.refreshAllTaskData() + + assertThat(thumbnailDataFlow1.first()).isNull() + assertThat(thumbnailDataFlow2.first()).isNull() + + systemUnderTest.updateVisibleTasks(listOf(1, 2)) + + assertThat(thumbnailDataFlow1.first()).isEqualTo(thumbnailData1) + assertThat(thumbnailDataFlow2.first()).isEqualTo(thumbnailData2) + + systemUnderTest.updateVisibleTasks(listOf(1)) + + assertThat(thumbnailDataFlow1.first()).isEqualTo(thumbnailData1) + assertThat(thumbnailDataFlow2.first()).isNull() + + systemUnderTest.onReset() + + assertThat(thumbnailDataFlow1.first()).isNull() + assertThat(thumbnailDataFlow2.first()).isNull() + } + + @Test + fun updatesRunningTaskShowScreenshot() = runTest { + systemUnderTest.setRunningTaskShowScreenshot(true) + systemUnderTest.waitForRunningTaskShowScreenshotToUpdate() + } + + @Test + fun waitForThumbnailsToUpdate() = runTest { + // Given taskRepository with visible 2 tasks containing thumbnailData + val thumbnailData1 = createThumbnailData().apply { snapshotId = 1 } + val thumbnailData2 = createThumbnailData().apply { snapshotId = 2 } + tasksRepository.seedTasks(tasks) + tasksRepository.seedThumbnailData(mapOf(1 to thumbnailData1, 2 to thumbnailData2)) + systemUnderTest.updateVisibleTasks(listOf(1, 2)) + + val thumbnailDataFlow1 = tasksRepository.getThumbnailById(1) + val thumbnailDataFlow2 = tasksRepository.getThumbnailById(2) + + // Then getThumbnailById should initially contains correct thumbnailData + assertThat(thumbnailDataFlow1.first()).isEqualTo(thumbnailData1) + assertThat(thumbnailDataFlow2.first()).isEqualTo(thumbnailData2) + + // When thumbnailData is updated in taskRepository + tasksRepository.seedThumbnailData( + mapOf(1 to thumbnailData1, 2 to createThumbnailData().apply { snapshotId = 3 }) + ) + // setVisibleTasks forces FakeTasksRepository to update the flows returned by + // getThumbnailById + tasksRepository.setVisibleTasks(DEFAULT_DISPLAY, setOf(1, 2)) + + // Then wait for thumbnailData should complete, and the previous getThumbnailById flow + // should return updated values + systemUnderTest.waitForThumbnailsToUpdate( + mapOf(2 to createThumbnailData().apply { snapshotId = 3 }) + ) + assertThat(thumbnailDataFlow1.first()).isEqualTo(thumbnailData1) + assertThat(thumbnailDataFlow2.first()?.snapshotId).isEqualTo(3) + } + + @Test + fun waitForThumbnailsToUpdate_emptyMap() = runTest { + systemUnderTest.waitForThumbnailsToUpdate(emptyMap()) + } + + @Test + fun waitForThumbnailsToUpdate_null() = runTest { + systemUnderTest.waitForThumbnailsToUpdate(null) + } + + private fun createTaskWithId(taskId: Int) = + Task(Task.TaskKey(taskId, 0, Intent(), ComponentName("", ""), 0, 2000)).apply { + colorBackground = Color.argb(taskId, taskId, taskId, taskId) + } + + private fun createThumbnailData(rotation: Int = Surface.ROTATION_0): ThumbnailData { + val bitmap = mock() + whenever(bitmap.width).thenReturn(THUMBNAIL_WIDTH) + whenever(bitmap.height).thenReturn(THUMBNAIL_HEIGHT) + + return ThumbnailData(thumbnail = bitmap, rotation = rotation) + } + + companion object { + const val THUMBNAIL_WIDTH = 100 + const val THUMBNAIL_HEIGHT = 200 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/task/apptimer/DurationFormatterTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/task/apptimer/DurationFormatterTest.kt new file mode 100644 index 00000000000..685927fadaf --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/task/apptimer/DurationFormatterTest.kt @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.task.apptimer + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.R +import com.android.launcher3.util.SandboxApplication +import com.google.common.truth.Truth.assertThat +import java.time.Duration +import java.util.Locale +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class DurationFormatterTest { + @get:Rule val context = SandboxApplication() + + private var systemLocale: Locale? = null + + @Before + fun setup() { + systemLocale = Locale.getDefault() + val testLocale = Locale("en", "us") + Locale.setDefault(testLocale) + } + + @Test + fun getReadableDuration_hasHoursAndMinutes_returnsNarrowString() { + val result = + DurationFormatter.format( + context, + Duration.ofHours(12).plusMinutes(55), + durationLessThanOneMinuteStringId = R.string.shorter_duration_less_than_one_minute, + ) + + val expected = "12h 55m" + assertThat(result).isEqualTo(expected) + } + + @Test + fun getReadableDuration_hasFullHours_returnsWideString() { + val result = + DurationFormatter.format( + context = context, + duration = Duration.ofHours(12), + durationLessThanOneMinuteStringId = R.string.shorter_duration_less_than_one_minute, + ) + + val expected = "12 hours" + assertThat(result).isEqualTo(expected) + } + + @Test + fun getReadableDuration_hasFullMinutesNoHours_returnsWideString() { + val result = + DurationFormatter.format( + context = context, + duration = Duration.ofMinutes(50), + durationLessThanOneMinuteStringId = R.string.shorter_duration_less_than_one_minute, + ) + + val expected = "50 minutes" + assertThat(result).isEqualTo(expected) + } + + @After + fun tearDown() { + Locale.setDefault(systemLocale) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewModelTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewModelTest.kt deleted file mode 100644 index 3b8754c200b..00000000000 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewModelTest.kt +++ /dev/null @@ -1,178 +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.quickstep.task.thumbnail - -import android.content.ComponentName -import android.content.Intent -import android.graphics.Bitmap -import android.graphics.Color -import android.graphics.Rect -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.android.quickstep.recents.data.FakeTasksRepository -import com.android.quickstep.recents.viewmodel.RecentsViewData -import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly -import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.LiveTile -import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Snapshot -import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Uninitialized -import com.android.quickstep.task.viewmodel.TaskViewData -import com.android.systemui.shared.recents.model.Task -import com.android.systemui.shared.recents.model.ThumbnailData -import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.flow.first -import kotlinx.coroutines.test.runTest -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.kotlin.mock -import org.mockito.kotlin.whenever - -@RunWith(AndroidJUnit4::class) -class TaskThumbnailViewModelTest { - private val recentsViewData = RecentsViewData() - private val taskViewData = TaskViewData() - private val tasksRepository = FakeTasksRepository() - private val systemUnderTest = - TaskThumbnailViewModel(recentsViewData, taskViewData, tasksRepository) - - private val tasks = (0..5).map(::createTaskWithId) - - @Test - fun initialStateIsUninitialized() = runTest { - assertThat(systemUnderTest.uiState.first()).isEqualTo(Uninitialized) - } - - @Test - fun bindRunningTask_thenStateIs_LiveTile() = runTest { - tasksRepository.seedTasks(tasks) - val taskThumbnail = TaskThumbnail(taskId = 1, isRunning = true) - systemUnderTest.bind(taskThumbnail) - - assertThat(systemUnderTest.uiState.first()).isEqualTo(LiveTile) - } - - @Test - fun setRecentsFullscreenProgress_thenProgressIsPassedThrough() = runTest { - recentsViewData.fullscreenProgress.value = 0.5f - - assertThat(systemUnderTest.recentsFullscreenProgress.first()).isEqualTo(0.5f) - - recentsViewData.fullscreenProgress.value = 0.6f - - assertThat(systemUnderTest.recentsFullscreenProgress.first()).isEqualTo(0.6f) - } - - @Test - fun setAncestorScales_thenScaleIsCalculated() = runTest { - recentsViewData.scale.value = 0.5f - taskViewData.scale.value = 0.6f - - assertThat(systemUnderTest.inheritedScale.first()).isEqualTo(0.3f) - } - - @Test - fun bindRunningTaskThenStoppedTaskWithoutThumbnail_thenStateChangesToBackgroundOnly() = - runTest { - tasksRepository.seedTasks(tasks) - val runningTask = TaskThumbnail(taskId = 1, isRunning = true) - val stoppedTask = TaskThumbnail(taskId = 2, isRunning = false) - systemUnderTest.bind(runningTask) - assertThat(systemUnderTest.uiState.first()).isEqualTo(LiveTile) - - systemUnderTest.bind(stoppedTask) - assertThat(systemUnderTest.uiState.first()) - .isEqualTo(BackgroundOnly(backgroundColor = Color.rgb(2, 2, 2))) - } - - @Test - fun bindStoppedTaskWithoutThumbnail_thenStateIs_BackgroundOnly_withAlphaRemoved() = runTest { - tasksRepository.seedTasks(tasks) - val stoppedTask = TaskThumbnail(taskId = 2, isRunning = false) - - systemUnderTest.bind(stoppedTask) - assertThat(systemUnderTest.uiState.first()) - .isEqualTo(BackgroundOnly(backgroundColor = Color.rgb(2, 2, 2))) - } - - @Test - fun bindLockedTaskWithThumbnail_thenStateIs_BackgroundOnly() = runTest { - tasksRepository.seedThumbnailData(mapOf(2 to createThumbnailData())) - tasks[2].isLocked = true - tasksRepository.seedTasks(tasks) - val recentTask = TaskThumbnail(taskId = 2, isRunning = false) - - systemUnderTest.bind(recentTask) - assertThat(systemUnderTest.uiState.first()) - .isEqualTo(BackgroundOnly(backgroundColor = Color.rgb(2, 2, 2))) - } - - @Test - fun bindStoppedTaskWithThumbnail_thenStateIs_Snapshot_withAlphaRemoved() = runTest { - val expectedThumbnailData = createThumbnailData() - tasksRepository.seedThumbnailData(mapOf(2 to expectedThumbnailData)) - tasksRepository.seedTasks(tasks) - tasksRepository.setVisibleTasks(listOf(2)) - val recentTask = TaskThumbnail(taskId = 2, isRunning = false) - - systemUnderTest.bind(recentTask) - assertThat(systemUnderTest.uiState.first()) - .isEqualTo( - Snapshot( - backgroundColor = Color.rgb(2, 2, 2), - bitmap = expectedThumbnailData.thumbnail!!, - drawnRect = Rect(0, 0, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT) - ) - ) - } - - @Test - fun bindNonVisibleStoppedTask_whenMadeVisible_thenStateIsSnapshot() = runTest { - val expectedThumbnailData = createThumbnailData() - tasksRepository.seedThumbnailData(mapOf(2 to expectedThumbnailData)) - tasksRepository.seedTasks(tasks) - val recentTask = TaskThumbnail(taskId = 2, isRunning = false) - - systemUnderTest.bind(recentTask) - assertThat(systemUnderTest.uiState.first()) - .isEqualTo(BackgroundOnly(backgroundColor = Color.rgb(2, 2, 2))) - tasksRepository.setVisibleTasks(listOf(2)) - assertThat(systemUnderTest.uiState.first()) - .isEqualTo( - Snapshot( - backgroundColor = Color.rgb(2, 2, 2), - bitmap = expectedThumbnailData.thumbnail!!, - drawnRect = Rect(0, 0, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT) - ) - ) - } - - private fun createTaskWithId(taskId: Int) = - Task(Task.TaskKey(taskId, 0, Intent(), ComponentName("", ""), 0, 2000)).apply { - colorBackground = Color.argb(taskId, taskId, taskId, taskId) - } - - private fun createThumbnailData(): ThumbnailData { - val bitmap = mock() - whenever(bitmap.width).thenReturn(THUMBNAIL_WIDTH) - whenever(bitmap.height).thenReturn(THUMBNAIL_HEIGHT) - - return ThumbnailData(thumbnail = bitmap) - } - - companion object { - const val THUMBNAIL_WIDTH = 100 - const val THUMBNAIL_HEIGHT = 200 - } -} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt new file mode 100644 index 00000000000..f95d2f7d226 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.taskbar.controllers + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.view.View +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.LauncherPrefs +import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING +import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING_IN_DESKTOP_MODE +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_DIVIDER_MENU_CLOSE +import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_DIVIDER_MENU_OPEN +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.TaskbarBaseTestCase +import com.android.launcher3.taskbar.TaskbarDividerPopupView +import com.android.launcher3.taskbar.TaskbarDragLayer +import com.android.launcher3.taskbar.TaskbarPinningController +import com.android.launcher3.taskbar.TaskbarPinningController.Companion.PINNING_PERSISTENT +import com.android.launcher3.taskbar.TaskbarPinningController.Companion.PINNING_TRANSIENT +import com.android.launcher3.taskbar.TaskbarSharedState +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doNothing +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +class TaskbarPinningControllerTest : TaskbarBaseTestCase() { + private val taskbarDragLayer = mock() + private val taskbarSharedState = mock() + private var isInDesktopMode = false + private val launcherPrefs = + mock().apply { + doReturn(false).whenever(this).get(TASKBAR_PINNING) + doReturn(false).whenever(this).get(TASKBAR_PINNING_IN_DESKTOP_MODE) + } + private val statsLogger = mock() + private val statsLogManager = mock { on { logger() } doReturn statsLogger } + private lateinit var pinningController: TaskbarPinningController + + @Before + override fun setup() { + super.setup() + whenever(taskbarActivityContext.launcherPrefs).thenReturn(launcherPrefs) + whenever(taskbarActivityContext.dragLayer).thenReturn(taskbarDragLayer) + whenever(taskbarActivityContext.statsLogManager).thenReturn(statsLogManager) + whenever( + taskbarControllers.taskbarDesktopModeController.isInDesktopModeAndNotInOverview( + taskbarActivityContext.displayId + ) + ) + .thenAnswer { _ -> isInDesktopMode } + whenever( + taskbarControllers.taskbarDesktopModeController.isInDesktopMode( + taskbarActivityContext.displayId + ) + ) + .thenAnswer { _ -> isInDesktopMode } + whenever( + taskbarControllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar( + taskbarActivityContext.displayId + ) + ) + .thenAnswer { _ -> isInDesktopMode } + + pinningController = spy(TaskbarPinningController(taskbarActivityContext)) + pinningController.init(taskbarControllers, taskbarSharedState) + } + + @Test + fun testOnCloseCallback_whenClosingPopupView_shouldLogStatsForClosingPopupMenu() { + pinningController.onCloseCallback(false) + verify(statsLogger, times(1)).log(LAUNCHER_TASKBAR_DIVIDER_MENU_CLOSE) + } + + @Test + fun testOnCloseCallback_whenClosingPopupView_shouldPostVisibilityChangedToDragLayer() { + val argumentCaptor = argumentCaptor() + pinningController.onCloseCallback(false) + verify(taskbarDragLayer, times(1)).post(argumentCaptor.capture()) + + val runnable = argumentCaptor.lastValue + assertThat(runnable).isNotNull() + + runnable.run() + verify(taskbarActivityContext, times(1)).onPopupVisibilityChanged(false) + } + + @Test + fun testOnCloseCallback_whenPreferenceUnchanged_shouldNotAnimateTaskbarPinning() { + pinningController.onCloseCallback(false) + verify(taskbarSharedState, never()).taskbarWasPinned = true + verify(pinningController, never()).animateTaskbarPinning(any()) + } + + @Test + fun testOnCloseCallback_whenLauncherPreferenceChanged_shouldAnimateToPinnedTaskbar() { + whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(false) + doNothing().whenever(pinningController).animateTaskbarPinning(any()) + + pinningController.onCloseCallback(true) + + verify(taskbarSharedState, times(1)).taskbarWasPinned = false + verify(pinningController, times(1)).animateTaskbarPinning(PINNING_PERSISTENT) + } + + @Test + fun testOnCloseCallback_whenLauncherPreferenceChanged_shouldNotAnimateToTaskbarInDesktopMode() { + isInDesktopMode = true + whenever(launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE)).thenReturn(false) + pinningController.onCloseCallback(true) + verify(pinningController, never()).animateTaskbarPinning(any()) + } + + @Test + fun testOnCloseCallback_whenLauncherPreferenceChanged_shouldAnimateToTransientTaskbar() { + whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(true) + doNothing().whenever(pinningController).animateTaskbarPinning(any()) + + pinningController.onCloseCallback(true) + + verify(taskbarSharedState, times(1)).taskbarWasPinned = true + verify(pinningController, times(1)).animateTaskbarPinning(PINNING_TRANSIENT) + } + + @Test + fun testShowPinningView_whenShowingPinningView_shouldSetTaskbarWindowFullscreenAndPostRunnableToView() { + val popupView = + mock> { + on { requestFocus() } doReturn true + } + val view = mock() + val argumentCaptor = argumentCaptor() + doReturn(popupView).whenever(pinningController).getPopupView(view) + + pinningController.showPinningView(view) + + verify(view, times(1)).post(argumentCaptor.capture()) + + val runnable = argumentCaptor.lastValue + assertThat(runnable).isNotNull() + runnable.run() + + verify(pinningController, times(1)).getPopupView(view) + verify(popupView, times(1)).requestFocus() + verify(popupView, times(1)).onCloseCallback = any() + verify(taskbarActivityContext, times(1)).onPopupVisibilityChanged(true) + verify(popupView, times(1)).show() + verify(statsLogger, times(1)).log(LAUNCHER_TASKBAR_DIVIDER_MENU_OPEN) + } + + @Test + fun testAnimateTaskbarPinning_whenAnimationEnds_shouldInvokeCallbackDoOnEnd() { + val animatorSet = spy(AnimatorSet()) + doReturn(animatorSet) + .whenever(pinningController) + .getAnimatorSetForTaskbarPinningAnimation(PINNING_PERSISTENT) + doNothing().whenever(animatorSet).start() + pinningController.animateTaskbarPinning(PINNING_PERSISTENT) + animatorSet.listeners[0].onAnimationEnd(ObjectAnimator()) + verify(pinningController, times(1)).recreateTaskbarAndUpdatePinningValue() + } + + @Test + fun testAnimateTaskbarPinning_whenAnimatingToPersistentTaskbar_shouldAnimateToPinnedTaskbar() { + val animatorSet = spy(AnimatorSet()) + doReturn(animatorSet) + .whenever(pinningController) + .getAnimatorSetForTaskbarPinningAnimation(PINNING_PERSISTENT) + doNothing().whenever(animatorSet).start() + pinningController.animateTaskbarPinning(PINNING_PERSISTENT) + + verify(taskbarOverlayController, times(1)).hideWindow() + verify(pinningController, times(1)) + .getAnimatorSetForTaskbarPinningAnimation(PINNING_PERSISTENT) + verify(taskbarViewController, times(1)) + .animateAwayNotificationDotsDuringTaskbarPinningAnimation() + verify(taskbarDragLayer, times(1)).setAnimatingTaskbarPinning(true) + assertThat(pinningController.isAnimatingTaskbarPinning).isTrue() + assertThat(animatorSet.listeners).isNotNull() + } + + @Test + fun testAnimateTaskbarPinning_whenAnimatingToTransientTaskbar_shouldAnimateToTransientTaskbar() { + val animatorSet = spy(AnimatorSet()) + doReturn(animatorSet) + .whenever(pinningController) + .getAnimatorSetForTaskbarPinningAnimation(PINNING_TRANSIENT) + doNothing().whenever(animatorSet).start() + pinningController.animateTaskbarPinning(PINNING_TRANSIENT) + + verify(taskbarOverlayController, times(1)).hideWindow() + verify(pinningController, times(1)) + .getAnimatorSetForTaskbarPinningAnimation(PINNING_TRANSIENT) + verify(taskbarDragLayer, times(1)).setAnimatingTaskbarPinning(true) + assertThat(pinningController.isAnimatingTaskbarPinning).isTrue() + verify(taskbarViewController, times(1)) + .animateAwayNotificationDotsDuringTaskbarPinningAnimation() + assertThat(animatorSet.listeners).isNotNull() + } + + @Test + fun testRecreateTaskbarAndUpdatePinningValue_whenAnimationEnds_shouldUpdateTaskbarPinningLauncherPref() { + pinningController.recreateTaskbarAndUpdatePinningValue() + verify(taskbarDragLayer, times(1)).setAnimatingTaskbarPinning(false) + assertThat(pinningController.isAnimatingTaskbarPinning).isFalse() + verify(launcherPrefs, times(1)).put(TASKBAR_PINNING, true) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt new file mode 100644 index 00000000000..9b4576bbe57 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt @@ -0,0 +1,122 @@ +/* + * 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.quickstep.taskbar.customization + +import com.android.launcher3.DeviceProfile +import com.android.launcher3.deviceprofile.DeviceProperties +import com.android.launcher3.taskbar.TaskbarActivityContext +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator +import com.android.launcher3.taskbar.customization.TaskbarIconSpecs +import com.android.launcher3.taskbar.customization.TaskbarSpecsEvaluator +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy +import org.mockito.kotlin.whenever + +@RunWith(LauncherMultivalentJUnit::class) +class TaskbarSpecsEvaluatorTest { + + private val taskbarFeatureEvaluator = mock() + private val taskbarActivityContext = mock() + private val deviceProfile = mock() + private val deviceProperties = mock() + private var taskbarSpecsEvaluator = + spy(TaskbarSpecsEvaluator(taskbarActivityContext, taskbarFeatureEvaluator, 0, 0)) + + @Test + fun testGetIconSizeByGrid_whenTaskbarIsTransient_withValidRowAndColumnInLandscape() { + doReturn(true).whenever(taskbarFeatureEvaluator).isTransient + doReturn(deviceProfile).whenever(taskbarActivityContext).deviceProfile + doReturn(deviceProperties).whenever(deviceProfile).deviceProperties + doReturn(true).whenever(deviceProperties).isLandscape + assertThat(taskbarSpecsEvaluator.getIconSizeByGrid(4, 4)) + .isEqualTo(TaskbarIconSpecs.iconSize52dp) + } + + @Test + fun testGetIconSizeByGrid_whenTaskbarIsTransient_withValidRowAndColumnInPortrait() { + doReturn(true).whenever(taskbarFeatureEvaluator).isTransient + doReturn(deviceProfile).whenever(taskbarActivityContext).deviceProfile + doReturn(deviceProperties).whenever(deviceProfile).deviceProperties + doReturn(false).whenever(deviceProperties).isLandscape + assertThat(taskbarSpecsEvaluator.getIconSizeByGrid(4, 4)) + .isEqualTo(TaskbarIconSpecs.iconSize48dp) + } + + @Test + fun testGetIconSizeByGrid_whenTaskbarIsTransient_withInvalidRowAndColumn() { + doReturn(true).whenever(taskbarFeatureEvaluator).isTransient + doReturn(deviceProfile).whenever(taskbarActivityContext).deviceProfile + doReturn(deviceProperties).whenever(deviceProfile).deviceProperties + doReturn(true).whenever(deviceProperties).isLandscape + assertThat(taskbarSpecsEvaluator.getIconSizeByGrid(1, 2)) + .isEqualTo(TaskbarIconSpecs.defaultTransientIconSize) + } + + @Test + fun testGetIconSizeByGrid_whenTaskbarIsPersistent() { + doReturn(false).whenever(taskbarFeatureEvaluator).isTransient + assertThat(taskbarSpecsEvaluator.getIconSizeByGrid(6, 5)) + .isEqualTo(TaskbarIconSpecs.defaultPersistentIconSize) + } + + @Test + fun testGetIconSizeStepDown_whenTaskbarIsPersistent() { + doReturn(false).whenever(taskbarFeatureEvaluator).isTransient + assertThat(taskbarSpecsEvaluator.getIconSizeStepDown(TaskbarIconSpecs.iconSize44dp)) + .isEqualTo(TaskbarIconSpecs.defaultPersistentIconSize) + } + + @Test + fun testGetIconSizeStepDown_whenTaskbarIsTransientAndIconSizeAreInBound() { + doReturn(true).whenever(taskbarFeatureEvaluator).isTransient + assertThat(taskbarSpecsEvaluator.getIconSizeStepDown(TaskbarIconSpecs.iconSize52dp)) + .isEqualTo(TaskbarIconSpecs.iconSize48dp) + } + + @Test + fun testGetIconSizeStepDown_whenTaskbarIsTransientAndIconSizeAreOutOfBound() { + doReturn(true).whenever(taskbarFeatureEvaluator).isTransient + assertThat(taskbarSpecsEvaluator.getIconSizeStepDown(TaskbarIconSpecs.iconSize44dp)) + .isEqualTo(TaskbarIconSpecs.iconSize44dp) + } + + @Test + fun testGetIconSizeStepUp_whenTaskbarIsPersistent() { + doReturn(false).whenever(taskbarFeatureEvaluator).isTransient + assertThat(taskbarSpecsEvaluator.getIconSizeStepUp(TaskbarIconSpecs.iconSize40dp)) + .isEqualTo(TaskbarIconSpecs.iconSize40dp) + } + + @Test + fun testGetIconSizeStepUp_whenTaskbarIsTransientAndIconSizeAreInBound() { + doReturn(true).whenever(taskbarFeatureEvaluator).isTransient + assertThat(taskbarSpecsEvaluator.getIconSizeStepUp(TaskbarIconSpecs.iconSize44dp)) + .isEqualTo(TaskbarIconSpecs.iconSize48dp) + } + + @Test + fun testGetIconSizeStepUp_whenTaskbarIsTransientAndIconSizeAreOutOfBound() { + doReturn(true).whenever(taskbarFeatureEvaluator).isTransient + assertThat(taskbarSpecsEvaluator.getIconSizeStepUp(TaskbarIconSpecs.iconSize52dp)) + .isEqualTo(TaskbarIconSpecs.iconSize52dp) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/ActiveTrackpadListTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/ActiveTrackpadListTest.kt new file mode 100644 index 00000000000..97336e06f89 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/ActiveTrackpadListTest.kt @@ -0,0 +1,162 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.hardware.input.InputManager +import android.view.InputDevice +import android.view.InputDevice.SOURCE_MOUSE +import android.view.InputDevice.SOURCE_TOUCHPAD +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.launcher3.util.IntArray +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.TestUtil +import junit.framework.Assert.assertEquals +import junit.framework.Assert.assertFalse +import junit.framework.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.eq +import org.mockito.Mockito.mock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +class ActiveTrackpadListTest { + + @get:Rule var mockitoRule: MockitoRule = MockitoJUnit.rule() + + @get:Rule val context = SandboxApplication() + + private val inputDeviceIds = IntArray() + private lateinit var inputManager: InputManager + + @Before + fun setup() { + inputManager = context.spyService(InputManager::class.java) + doAnswer { inputDeviceIds.toArray() }.whenever(inputManager).inputDeviceIds + + doReturn(null).whenever(inputManager).getInputDevice(eq(1)) + doReturn(mockDevice(SOURCE_MOUSE or SOURCE_TOUCHPAD)) + .whenever(inputManager) + .getInputDevice(eq(2)) + doReturn(mockDevice(SOURCE_MOUSE or SOURCE_TOUCHPAD)) + .whenever(inputManager) + .getInputDevice(eq(3)) + doReturn(mockDevice(SOURCE_MOUSE)).whenever(inputManager).getInputDevice(eq(4)) + } + + @Test + fun `initialize correct devices`() { + inputDeviceIds.addAll(IntArray.wrap(1, 2, 3, 4)) + + val list = ActiveTrackpadList(context) {} + assertEquals(2, list.size()) + assertTrue(list.contains(2)) + assertTrue(list.contains(3)) + } + + @Test + fun `update callback not called in constructor`() { + inputDeviceIds.addAll(IntArray.wrap(2, 3)) + + var updateCalled = false + val list = ActiveTrackpadList(context) { updateCalled = true } + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + + assertEquals(2, list.size()) + assertFalse(updateCalled) + } + + @Test + fun `update called on add only once`() { + var updateCalled = 0 + val list = ActiveTrackpadList(context) { updateCalled++ } + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + + assertEquals(0, updateCalled) + assertEquals(0, list.size()) + + list.onInputDeviceAdded(1) + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(0, updateCalled) + assertEquals(0, list.size()) + + list.onInputDeviceAdded(2) + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(1, updateCalled) + assertEquals(1, list.size()) + + list.onInputDeviceAdded(3) + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(1, updateCalled) + assertEquals(2, list.size()) + } + + @Test + fun `update called on remove only once`() { + var updateCalled = 0 + inputDeviceIds.addAll(IntArray.wrap(1, 2, 3, 4)) + val list = ActiveTrackpadList(context) { updateCalled++ } + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(2, list.size()) + + list.onInputDeviceRemoved(2) + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(1, list.size()) + assertEquals(0, updateCalled) + + list.onInputDeviceRemoved(3) + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(0, list.size()) + assertEquals(1, updateCalled) + + // Removing non-trackpad device should have no effect. + list.onInputDeviceRemoved(4) + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(0, list.size()) + assertEquals(1, updateCalled) + } + + @Test + fun `update not called on add and remove non-trackpad device`() { + var updateCalled = 0 + val list = ActiveTrackpadList(context) { updateCalled++ } + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + + assertEquals(0, updateCalled) + assertEquals(0, list.size()) + + list.onInputDeviceAdded(1) + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(0, updateCalled) + assertEquals(0, list.size()) + + list.onInputDeviceRemoved(1) + TestUtil.runOnExecutorSync(MAIN_EXECUTOR) {} + assertEquals(0, updateCalled) + assertEquals(0, list.size()) + } + + private fun mockDevice(sources: Int) = + mock(InputDevice::class.java).apply { doReturn(sources).whenever(this).sources } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt index ece67aff62c..895d5af7788 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt @@ -16,30 +16,38 @@ package com.android.quickstep.util -import android.content.Context +import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM +import android.content.res.Resources +import android.view.Display +import android.view.Display.DEFAULT_DISPLAY import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.apppairs.AppPairIcon import com.android.launcher3.logging.StatsLogManager import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.ResolvedTargetInfo import com.android.launcher3.taskbar.TaskbarActivityContext import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT +import com.android.launcher3.views.ActivityContext import com.android.quickstep.TopTaskTracker import com.android.quickstep.TopTaskTracker.CachedTaskInfo import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.Task.TaskKey -import com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_30_70 -import com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50 -import com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_70_30 +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_33_66 +import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50 +import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_66_33 import java.util.function.Consumer import org.junit.Assert.assertEquals import org.junit.Before +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Captor import org.mockito.Mock -import org.mockito.MockitoAnnotations +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule import org.mockito.kotlin.any import org.mockito.kotlin.anyOrNull import org.mockito.kotlin.doNothing @@ -53,37 +61,43 @@ import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) class AppPairsControllerTest { - @Mock lateinit var context: Context + @Mock lateinit var context: ActivityContext + @Mock lateinit var resources: Resources @Mock lateinit var splitSelectStateController: SplitSelectStateController @Mock lateinit var statsLogManager: StatsLogManager private lateinit var appPairsController: AppPairsController - private val left30: Int by lazy { - appPairsController.encodeRank(STAGE_POSITION_TOP_OR_LEFT, SNAP_TO_30_70) + private val left33: Int by lazy { + appPairsController.encodeRank(STAGE_POSITION_TOP_OR_LEFT, SNAP_TO_2_33_66) } private val left50: Int by lazy { - appPairsController.encodeRank(STAGE_POSITION_TOP_OR_LEFT, SNAP_TO_50_50) + appPairsController.encodeRank(STAGE_POSITION_TOP_OR_LEFT, SNAP_TO_2_50_50) } - private val left70: Int by lazy { - appPairsController.encodeRank(STAGE_POSITION_TOP_OR_LEFT, SNAP_TO_70_30) + private val left66: Int by lazy { + appPairsController.encodeRank(STAGE_POSITION_TOP_OR_LEFT, SNAP_TO_2_66_33) } - private val right30: Int by lazy { - appPairsController.encodeRank(STAGE_POSITION_BOTTOM_OR_RIGHT, SNAP_TO_30_70) + private val right33: Int by lazy { + appPairsController.encodeRank(STAGE_POSITION_BOTTOM_OR_RIGHT, SNAP_TO_2_33_66) } private val right50: Int by lazy { - appPairsController.encodeRank(STAGE_POSITION_BOTTOM_OR_RIGHT, SNAP_TO_50_50) + appPairsController.encodeRank(STAGE_POSITION_BOTTOM_OR_RIGHT, SNAP_TO_2_50_50) } - private val right70: Int by lazy { - appPairsController.encodeRank(STAGE_POSITION_BOTTOM_OR_RIGHT, SNAP_TO_70_30) + private val right66: Int by lazy { + appPairsController.encodeRank(STAGE_POSITION_BOTTOM_OR_RIGHT, SNAP_TO_2_66_33) } + @get:Rule var mockitoRule: MockitoRule = MockitoJUnit.rule() + @Mock lateinit var mockAppPairIcon: AppPairIcon + @Mock lateinit var mockDisplay: Display @Mock lateinit var mockTaskbarActivityContext: TaskbarActivityContext @Mock lateinit var mockTopTaskTracker: TopTaskTracker @Mock lateinit var mockCachedTaskInfo: CachedTaskInfo @Mock lateinit var mockItemInfo1: ItemInfo @Mock lateinit var mockItemInfo2: ItemInfo + @Mock lateinit var mockResolvedTargetInfo1: ResolvedTargetInfo + @Mock lateinit var mockResolvedTargetInfo2: ResolvedTargetInfo @Mock lateinit var mockTask1: Task @Mock lateinit var mockTask2: Task @Mock lateinit var mockTaskKey1: TaskKey @@ -94,45 +108,50 @@ class AppPairsControllerTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) appPairsController = AppPairsController(context, splitSelectStateController, statsLogManager) // Stub methods on appPairsController so that they return mocks spyAppPairsController = spy(appPairsController) whenever(mockAppPairIcon.context).thenReturn(mockTaskbarActivityContext) + whenever(mockAppPairIcon.display).thenReturn(mockDisplay) + whenever(mockDisplay.displayId).thenReturn(DEFAULT_DISPLAY) doReturn(mockTopTaskTracker).whenever(spyAppPairsController).topTaskTracker - whenever(mockTopTaskTracker.getCachedTopTask(any())).thenReturn(mockCachedTaskInfo) + whenever(mockTopTaskTracker.getCachedTopTask(any(), any())).thenReturn(mockCachedTaskInfo) whenever(mockTask1.getKey()).thenReturn(mockTaskKey1) whenever(mockTask2.getKey()).thenReturn(mockTaskKey2) + whenever(mockItemInfo1.resolvedTargetInfo).thenReturn(mockResolvedTargetInfo1) + whenever(mockItemInfo2.resolvedTargetInfo).thenReturn(mockResolvedTargetInfo2) doNothing().whenever(spyAppPairsController).launchAppPair(any(), any()) doNothing() .whenever(spyAppPairsController) .launchToSide(anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()) + whenever(mockAppPairIcon.context.resources).thenReturn(resources) + whenever(DesktopModeStatus.canEnterDesktopMode(mockAppPairIcon.context)).thenReturn(false) } @Test fun shouldEncodeRankCorrectly() { - assertEquals("left + 30-70 should encode as 0 (0b0)", 0, left30) + assertEquals("left + 33-66 should encode as 0 (0b0)", 0, left33) assertEquals("left + 50-50 should encode as 1 (0b1)", 1, left50) - assertEquals("left + 70-30 should encode as 2 (0b10)", 2, left70) + assertEquals("left + 66-33 should encode as 2 (0b10)", 2, left66) // See AppPairsController#BITMASK_SIZE and BITMASK_FOR_SNAP_POSITION for context - assertEquals("right + 30-70 should encode as 1 followed by 16 0s", 1 shl 16, right30) + assertEquals("right + 33-66 should encode as 1 followed by 16 0s", 1 shl 16, right33) assertEquals("right + 50-50 should encode as the above value + 1", (1 shl 16) + 1, right50) - assertEquals("right + 70-30 should encode as the above value + 2", (1 shl 16) + 2, right70) + assertEquals("right + 66-33 should encode as the above value + 2", (1 shl 16) + 2, right66) } @Test fun shouldDecodeRankCorrectly() { assertEquals( - "left + 30-70 should decode to left", + "left + 33-66 should decode to left", STAGE_POSITION_TOP_OR_LEFT, - AppPairsController.convertRankToStagePosition(left30), + AppPairsController.convertRankToStagePosition(left33), ) assertEquals( - "left + 30-70 should decode to 30-70", - SNAP_TO_30_70, - AppPairsController.convertRankToSnapPosition(left30), + "left + 33-66 should decode to 33-66", + SNAP_TO_2_33_66, + AppPairsController.convertRankToSnapPosition(left33), ) assertEquals( @@ -142,30 +161,30 @@ class AppPairsControllerTest { ) assertEquals( "left + 50-50 should decode to 50-50", - SNAP_TO_50_50, + SNAP_TO_2_50_50, AppPairsController.convertRankToSnapPosition(left50), ) assertEquals( - "left + 70-30 should decode to left", + "left + 66-33 should decode to left", STAGE_POSITION_TOP_OR_LEFT, - AppPairsController.convertRankToStagePosition(left70), + AppPairsController.convertRankToStagePosition(left66), ) assertEquals( - "left + 70-30 should decode to 70-30", - SNAP_TO_70_30, - AppPairsController.convertRankToSnapPosition(left70), + "left + 66-33 should decode to 66-33", + SNAP_TO_2_66_33, + AppPairsController.convertRankToSnapPosition(left66), ) assertEquals( - "right + 30-70 should decode to right", + "right + 33-66 should decode to right", STAGE_POSITION_BOTTOM_OR_RIGHT, - AppPairsController.convertRankToStagePosition(right30), + AppPairsController.convertRankToStagePosition(right33), ) assertEquals( - "right + 30-70 should decode to 30-70", - SNAP_TO_30_70, - AppPairsController.convertRankToSnapPosition(right30), + "right + 33-66 should decode to 33-66", + SNAP_TO_2_33_66, + AppPairsController.convertRankToSnapPosition(right33), ) assertEquals( @@ -175,19 +194,19 @@ class AppPairsControllerTest { ) assertEquals( "right + 50-50 should decode to 50-50", - SNAP_TO_50_50, + SNAP_TO_2_50_50, AppPairsController.convertRankToSnapPosition(right50), ) assertEquals( - "right + 70-30 should decode to right", + "right + 66-33 should decode to right", STAGE_POSITION_BOTTOM_OR_RIGHT, - AppPairsController.convertRankToStagePosition(right70), + AppPairsController.convertRankToStagePosition(right66), ) assertEquals( - "right + 70-30 should decode to 70-30", - SNAP_TO_70_30, - AppPairsController.convertRankToSnapPosition(right70), + "right + 66-33 should decode to 66-33", + SNAP_TO_2_66_33, + AppPairsController.convertRankToSnapPosition(right66), ) } @@ -202,7 +221,7 @@ class AppPairsControllerTest { // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) @@ -226,7 +245,7 @@ class AppPairsControllerTest { // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) @@ -250,7 +269,7 @@ class AppPairsControllerTest { // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) @@ -274,7 +293,7 @@ class AppPairsControllerTest { // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) @@ -298,7 +317,7 @@ class AppPairsControllerTest { // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) @@ -322,7 +341,7 @@ class AppPairsControllerTest { // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) @@ -341,12 +360,16 @@ class AppPairsControllerTest { whenever(mockTaskKey1.getId()).thenReturn(1) whenever(mockTaskKey2.getId()).thenReturn(2) // ... with app 1 already on screen - whenever(mockCachedTaskInfo.taskId).thenReturn(1) + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + whenever(mockCachedTaskInfo.topGroupedTaskContainsTask(eq(1))).thenReturn(true) + } else { + whenever(mockCachedTaskInfo.taskId).thenReturn(1) + } // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) @@ -365,12 +388,16 @@ class AppPairsControllerTest { whenever(mockTaskKey1.getId()).thenReturn(1) whenever(mockTaskKey2.getId()).thenReturn(2) // ... with app 2 already on screen - whenever(mockCachedTaskInfo.taskId).thenReturn(2) + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + whenever(mockCachedTaskInfo.topGroupedTaskContainsTask(eq(2))).thenReturn(true) + } else { + whenever(mockCachedTaskInfo.taskId).thenReturn(2) + } // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) @@ -383,18 +410,84 @@ class AppPairsControllerTest { .launchToSide(anyOrNull(), anyOrNull(), anyOrNull(), eq(STAGE_POSITION_TOP_OR_LEFT)) } + @Test + fun handleAppPairLaunchInApp_freeformTask1IsOnScreen_shouldLaunchAppPair() { + whenever(DesktopModeStatus.canEnterDesktopMode(mockAppPairIcon.context)).thenReturn(true) + /// Test launching apps 1 and 2 from app pair + whenever(mockTaskKey1.getId()).thenReturn(1) + whenever(mockTaskKey2.getId()).thenReturn(2) + // Task 1 is in freeform windowing mode + mockTaskKey1.windowingMode = WINDOWING_MODE_FREEFORM + // ... and app 1 is already on screen + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + whenever(mockCachedTaskInfo.topGroupedTaskContainsTask(eq(1))).thenReturn(true) + } else { + whenever(mockCachedTaskInfo.taskId).thenReturn(1) + } + + // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback + spyAppPairsController.handleAppPairLaunchInApp( + mockAppPairIcon, + listOf(mockItemInfo1, mockItemInfo2), + ) + verify(splitSelectStateController) + .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) + val callback: Consumer> = callbackCaptor.value + callback.accept(arrayOf(mockTask1, mockTask2)) + + // Verify that launchAppPair was called + verify(spyAppPairsController, times(1)).launchAppPair(any(), any()) + verify(spyAppPairsController, never()) + .launchToSide(anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()) + } + + @Test + fun handleAppPairLaunchInApp_freeformTask2IsOnScreen_shouldLaunchAppPair() { + whenever(DesktopModeStatus.canEnterDesktopMode(mockAppPairIcon.context)).thenReturn(true) + /// Test launching apps 1 and 2 from app pair + whenever(mockTaskKey1.getId()).thenReturn(1) + whenever(mockTaskKey2.getId()).thenReturn(2) + // Task 2 is in freeform windowing mode + mockTaskKey1.windowingMode = WINDOWING_MODE_FREEFORM + // ... and app 2 is already on screen + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + whenever(mockCachedTaskInfo.topGroupedTaskContainsTask(eq(2))).thenReturn(true) + } else { + whenever(mockCachedTaskInfo.taskId).thenReturn(2) + } + + // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback + spyAppPairsController.handleAppPairLaunchInApp( + mockAppPairIcon, + listOf(mockItemInfo1, mockItemInfo2), + ) + verify(splitSelectStateController) + .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) + val callback: Consumer> = callbackCaptor.value + callback.accept(arrayOf(mockTask1, mockTask2)) + + // Verify that launchAppPair was called + verify(spyAppPairsController, times(1)).launchAppPair(any(), any()) + verify(spyAppPairsController, never()) + .launchToSide(anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()) + } + @Test fun handleAppPairLaunchInApp_shouldLaunchAppPairNormallyWhenUnrelatedSingleAppIsFullscreen() { // Test launching apps 1 and 2 from app pair whenever(mockTaskKey1.getId()).thenReturn(1) whenever(mockTaskKey2.getId()).thenReturn(2) // ... with app 3 already on screen - whenever(mockCachedTaskInfo.taskId).thenReturn(3) + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + whenever(mockCachedTaskInfo.topGroupedTaskContainsTask(eq(3))).thenReturn(true) + } else { + whenever(mockCachedTaskInfo.taskId).thenReturn(3) + } // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback spyAppPairsController.handleAppPairLaunchInApp( mockAppPairIcon, - listOf(mockItemInfo1, mockItemInfo2) + listOf(mockItemInfo1, mockItemInfo2), ) verify(splitSelectStateController) .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/CachedEventDispatcherTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/CachedEventDispatcherTest.kt new file mode 100644 index 00000000000..fbc2f8bfbe7 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/CachedEventDispatcherTest.kt @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.os.SystemClock +import android.view.MotionEvent +import androidx.test.ext.junit.runners.AndroidJUnit4 +import java.util.function.Consumer +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.Captor +import org.mockito.Mock +import org.mockito.Mockito.reset +import org.mockito.Mockito.verify +import org.mockito.Mockito.verifyNoMoreInteractions +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule + +@RunWith(AndroidJUnit4::class) +class CachedEventDispatcherTest { + + private lateinit var underTest: CachedEventDispatcher + + @get:Rule var mockitoRule: MockitoRule = MockitoJUnit.rule() + + @Mock private lateinit var consumer: Consumer + @Captor private lateinit var motionEventCaptor: ArgumentCaptor + + private lateinit var motionEvent: MotionEvent + + @Before + fun setUp() { + motionEvent = + MotionEvent.obtain( + 0L, + SystemClock.elapsedRealtime(), + MotionEvent.ACTION_DOWN, + 0f, + 0f, + 0, + ) + underTest = CachedEventDispatcher() + } + + @Test + fun testInitialState() { + assertFalse(underTest.hasConsumer()) + } + + @Test + fun dispatchMotionEvents() { + underTest.setConsumer(consumer) + + underTest.dispatchEvent(motionEvent) + + assertTrue(underTest.hasConsumer()) + verify(consumer).accept(motionEventCaptor.capture()) + assertTrue(isMotionEventSame(motionEventCaptor.value, motionEvent)) + } + + @Test + fun dispatchMotionEvents_after_settingConsumer() { + underTest.dispatchEvent(motionEvent) + + underTest.setConsumer(consumer) + + verify(consumer).accept(motionEventCaptor.capture()) + assertTrue(isMotionEventSame(motionEventCaptor.value, motionEvent)) + } + + @Test + fun clearConsumer_notDispatchToConsumer() { + underTest.setConsumer(consumer) + underTest.dispatchEvent(motionEvent) + reset(consumer) + + underTest.clearConsumer() + + assertFalse(underTest.hasConsumer()) + underTest.dispatchEvent(motionEvent) + verifyNoMoreInteractions(consumer) + } + + private fun isMotionEventSame(e1: MotionEvent, e2: MotionEvent): Boolean { + return e1.action == e2.action && + e1.eventTime == e2.eventTime && + e1.x == e2.x && + e1.y == e2.y + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/ContextualSearchInvokerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/ContextualSearchInvokerTest.java new file mode 100644 index 00000000000..1b0c8f5dab1 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/ContextualSearchInvokerTest.java @@ -0,0 +1,331 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.quickstep.util; + +import static android.app.contextualsearch.ContextualSearchManager.FEATURE_CONTEXTUAL_SEARCH; + +import static androidx.test.core.app.ApplicationProvider.getApplicationContext; + +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_ASSISTANT_FAILED_SERVICE_ERROR; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_ATTEMPTED_OVER_KEYGUARD; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_ATTEMPTED_OVER_NOTIFICATION_SHADE; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_ATTEMPTED_SPLITSCREEN; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_FAILED_NOT_AVAILABLE; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LAUNCH_OMNI_FAILED_SETTING_DISABLED; +import static com.android.quickstep.util.ContextualSearchInvoker.KEYGUARD_SHOWING_SYSUI_FLAGS; +import static com.android.quickstep.util.ContextualSearchInvoker.SHADE_EXPANDED_SYSUI_FLAGS; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import android.app.contextualsearch.ContextualSearchManager; +import android.content.Context; +import android.content.pm.PackageManager; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.launcher3.logging.StatsLogManager; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.DeviceConfigWrapper; +import com.android.quickstep.SystemUiProxy; +import com.android.quickstep.TopTaskTracker; +import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +/** + * Robolectric unit tests for {@link ContextualSearchInvoker} + */ +@SmallTest +@RunWith(AndroidJUnit4.class) +public class ContextualSearchInvokerTest { + + private static final int CONTEXTUAL_SEARCH_ENTRY_POINT = 123; + + @Rule + public MockitoRule mockitoRule = MockitoJUnit.rule(); + private @Mock PackageManager mMockPackageManager; + private @Mock ContextualSearchStateManager mMockStateManager; + private @Mock TopTaskTracker mMockTopTaskTracker; + private @Mock SystemUiProxy mMockSystemUiProxy; + private @Mock StatsLogManager mMockStatsLogManager; + private @Mock StatsLogManager.StatsLogger mMockStatsLogger; + private @Mock ContextualSearchHapticManager mMockContextualSearchHapticManager; + private @Mock ContextualSearchManager mMockContextualSearchManager; + private @Mock BaseContainerInterface mMockContainerInterface; + private @Mock RecentsViewContainer mMockRecentsViewContainer; + private @Mock RecentsView mMockRecentsView; + private ContextualSearchInvoker mContextualSearchInvoker; + + @Before + public void setUp() { + when(mMockPackageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)).thenReturn(true); + Context context = spy(getApplicationContext()); + doReturn(mMockPackageManager).when(context).getPackageManager(); + when(mMockSystemUiProxy.getLastSystemUiStateFlags()).thenReturn(0L); + when(mMockTopTaskTracker.getRunningSplitTaskIds()).thenReturn(new int[]{}); + when(mMockStateManager.isContextualSearchIntentAvailable()).thenReturn(true); + when(mMockStateManager.isContextualSearchSettingEnabled()).thenReturn(true); + when(mMockStatsLogManager.logger()).thenReturn(mMockStatsLogger); + when(mMockContainerInterface.getCreatedContainer()).thenReturn(mMockRecentsViewContainer); + when(mMockRecentsViewContainer.getOverviewPanel()).thenReturn(mMockRecentsView); + + mContextualSearchInvoker = spy(new ContextualSearchInvoker(context, mMockStateManager, + mMockTopTaskTracker, mMockSystemUiProxy, mMockStatsLogManager, + mMockContextualSearchHapticManager, mMockContextualSearchManager + )); + doReturn(mMockContainerInterface).when(mContextualSearchInvoker) + .getRecentsContainerInterface(); + } + + @Test + public void runContextualSearchInvocationChecksAndLogFailures_contextualSearchFeatureIsNotAvailable() { + when(mMockPackageManager.hasSystemFeature(FEATURE_CONTEXTUAL_SEARCH)).thenReturn(false); + + assertFalse("Expected invocation to fail when feature is unavailable", + mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()); + + verify(mMockStatsLogger).log(LAUNCHER_LAUNCH_ASSISTANT_FAILED_SERVICE_ERROR); + } + + @Test + public void runContextualSearchInvocationChecksAndLogFailures_contextualSearchIntentIsAvailable() { + assertTrue("Expected invocation checks to succeed", + mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()); + + verifyNoMoreInteractions(mMockStatsLogManager); + } + + @Test + public void runContextualSearchInvocationChecksAndLogFailures_contextualSearchIntentIsNotAvailable() { + when(mMockStateManager.isContextualSearchIntentAvailable()).thenReturn(false); + + assertFalse("Expected invocation to fail when feature is unavailable", + mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()); + + verify(mMockStatsLogger).log(LAUNCHER_LAUNCH_OMNI_FAILED_NOT_AVAILABLE); + } + + @Test + public void runContextualSearchInvocationChecksAndLogFailures_settingDisabled() { + when(mMockStateManager.isContextualSearchSettingEnabled()).thenReturn(false); + + assertFalse("Expected invocation checks to fail when setting is disabled", + mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()); + + verify(mMockStatsLogger).log(LAUNCHER_LAUNCH_OMNI_FAILED_SETTING_DISABLED); + } + + @Test + public void runContextualSearchInvocationChecksAndLogFailures_notificationShadeIsShowing() { + when(mMockSystemUiProxy.getLastSystemUiStateFlags()).thenReturn(SHADE_EXPANDED_SYSUI_FLAGS); + + assertFalse("Expected invocation checks to fail when notification shade is showing", + mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()); + + verify(mMockStatsLogger).log(LAUNCHER_LAUNCH_OMNI_ATTEMPTED_OVER_NOTIFICATION_SHADE); + } + + @Test + public void runContextualSearchInvocationChecksAndLogFailures_keyguardIsShowing() { + when(mMockSystemUiProxy.getLastSystemUiStateFlags()).thenReturn( + KEYGUARD_SHOWING_SYSUI_FLAGS); + + assertFalse("Expected invocation checks to fail when keyguard is showing", + mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()); + + verify(mMockStatsLogger).log(LAUNCHER_LAUNCH_OMNI_ATTEMPTED_OVER_KEYGUARD); + } + + @Test + public void runContextualSearchInvocationChecksAndLogFailures_isInSplitScreen_disallowed() { + when(mMockStateManager.isInvocationAllowedInSplitscreen()).thenReturn(false); + when(mMockTopTaskTracker.getRunningSplitTaskIds()).thenReturn(new int[]{1, 2, 3}); + + assertFalse("Expected invocation checks to fail over split screen", + mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()); + + // Attempt is logged regardless. + verify(mMockStatsLogger).log(LAUNCHER_LAUNCH_OMNI_ATTEMPTED_SPLITSCREEN); + } + + @Test + public void runContextualSearchInvocationChecksAndLogFailures_isInSplitScreen_allowed() { + when(mMockStateManager.isInvocationAllowedInSplitscreen()).thenReturn(true); + when(mMockTopTaskTracker.getRunningSplitTaskIds()).thenReturn(new int[]{1, 2, 3}); + + assertTrue("Expected invocation checks to succeed over split screen", + mContextualSearchInvoker.runContextualSearchInvocationChecksAndLogFailures()); + + // Attempt is logged regardless. + verify(mMockStatsLogger).log(LAUNCHER_LAUNCH_OMNI_ATTEMPTED_SPLITSCREEN); + } + + @Test + public void invokeContextualSearchUncheckedWithHaptic_cssIsAvailable_commitHapticEnabled() { + try (AutoCloseable flag = overrideSearchHapticCommitFlag(true)) { + assertTrue("Expected invocation unchecked to succeed", + mContextualSearchInvoker.invokeContextualSearchUncheckedWithHaptic( + CONTEXTUAL_SEARCH_ENTRY_POINT)); + verify(mMockContextualSearchHapticManager).vibrateForSearch(); + verify(mMockContextualSearchManager).startContextualSearch( + eq(CONTEXTUAL_SEARCH_ENTRY_POINT), any()); + verifyNoMoreInteractions(mMockStatsLogManager); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Test + public void invokeContextualSearchUncheckedWithHaptic_cssIsAvailable_commitHapticDisabled() { + try (AutoCloseable flag = overrideSearchHapticCommitFlag(false)) { + assertTrue("Expected invocation unchecked to succeed", + mContextualSearchInvoker.invokeContextualSearchUncheckedWithHaptic( + CONTEXTUAL_SEARCH_ENTRY_POINT)); + verify(mMockContextualSearchHapticManager, never()).vibrateForSearch(); + verify(mMockContextualSearchManager).startContextualSearch( + eq(CONTEXTUAL_SEARCH_ENTRY_POINT), any()); + verifyNoMoreInteractions(mMockStatsLogManager); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Test + public void invokeContextualSearchUncheckedWithHaptic_cssIsNotAvailable_commitHapticEnabled() { + when(mMockStateManager.isContextualSearchIntentAvailable()).thenReturn(false); + + try (AutoCloseable flag = overrideSearchHapticCommitFlag(true)) { + // Still expect true since this method doesn't run the checks. + assertTrue("Expected invocation unchecked to succeed", + mContextualSearchInvoker.invokeContextualSearchUncheckedWithHaptic( + CONTEXTUAL_SEARCH_ENTRY_POINT)); + // Still vibrate based on the flag. + verify(mMockContextualSearchHapticManager).vibrateForSearch(); + verify(mMockContextualSearchManager).startContextualSearch( + eq(CONTEXTUAL_SEARCH_ENTRY_POINT), any()); + verifyNoMoreInteractions(mMockStatsLogManager); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + + @Test + public void invokeContextualSearchUncheckedWithHaptic_cssIsNotAvailable_commitHapticDisabled() { + when(mMockStateManager.isContextualSearchIntentAvailable()).thenReturn(false); + + try (AutoCloseable flag = overrideSearchHapticCommitFlag(false)) { + // Still expect true since this method doesn't run the checks. + assertTrue("Expected ContextualSearch invocation unchecked to succeed", + mContextualSearchInvoker.invokeContextualSearchUncheckedWithHaptic( + CONTEXTUAL_SEARCH_ENTRY_POINT)); + // Still don't vibrate based on the flag. + verify(mMockContextualSearchHapticManager, never()).vibrateForSearch(); + verify(mMockContextualSearchManager).startContextualSearch( + eq(CONTEXTUAL_SEARCH_ENTRY_POINT), any()); + verifyNoMoreInteractions(mMockStatsLogManager); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Test + public void invokeContextualSearchUncheckedWithHaptic_liveTile() { + when(mMockContainerInterface.isInLiveTileMode()).thenReturn(true); + ArgumentCaptor switchToScreenshotCaptor = ArgumentCaptor.forClass(Runnable.class); + ArgumentCaptor finishRecentsAnimationCaptor = + ArgumentCaptor.forClass(Runnable.class); + + assertTrue("Expected invocation unchecked to succeed", + mContextualSearchInvoker.invokeContextualSearchUncheckedWithHaptic( + CONTEXTUAL_SEARCH_ENTRY_POINT)); + verify(mMockRecentsView).switchToScreenshot(switchToScreenshotCaptor.capture()); + switchToScreenshotCaptor.getValue().run(); + verify(mMockRecentsView).finishRecentsAnimation(anyBoolean(), anyBoolean(), + finishRecentsAnimationCaptor.capture()); + finishRecentsAnimationCaptor.getValue().run(); + verify(mMockContextualSearchManager).startContextualSearch( + eq(CONTEXTUAL_SEARCH_ENTRY_POINT), any()); + verifyNoMoreInteractions(mMockStatsLogManager); + } + + @Test + public void invokeContextualSearchUncheckedWithHaptic_liveTile_failsToSwitchToScreenshot() { + when(mMockContainerInterface.isInLiveTileMode()).thenReturn(true); + ArgumentCaptor switchToScreenshotCaptor = ArgumentCaptor.forClass(Runnable.class); + ArgumentCaptor finishRecentsAnimationCaptor = + ArgumentCaptor.forClass(Runnable.class); + + assertTrue("Expected invocation unchecked to succeed", + mContextualSearchInvoker.invokeContextualSearchUncheckedWithHaptic( + CONTEXTUAL_SEARCH_ENTRY_POINT)); + verify(mMockRecentsView).switchToScreenshot(switchToScreenshotCaptor.capture()); + + // Don't run switchToScreenshot's callback. Therefore, recents animation should not finish. + verify(mMockRecentsView, never()).finishRecentsAnimation(anyBoolean(), anyBoolean(), + finishRecentsAnimationCaptor.capture()); + // And ContextualSearch should not start. + verify(mMockContextualSearchManager, never()).startContextualSearch(anyInt(), any()); + verifyNoMoreInteractions(mMockStatsLogManager); + } + + @Test + public void invokeContextualSearchUncheckedWithHaptic_liveTile_failsToFinishRecentsAnimation() { + when(mMockContainerInterface.isInLiveTileMode()).thenReturn(true); + ArgumentCaptor switchToScreenshotCaptor = ArgumentCaptor.forClass(Runnable.class); + ArgumentCaptor finishRecentsAnimationCaptor = + ArgumentCaptor.forClass(Runnable.class); + + assertTrue("Expected invocation unchecked to succeed", + mContextualSearchInvoker.invokeContextualSearchUncheckedWithHaptic( + CONTEXTUAL_SEARCH_ENTRY_POINT)); + verify(mMockRecentsView).switchToScreenshot(switchToScreenshotCaptor.capture()); + switchToScreenshotCaptor.getValue().run(); + verify(mMockRecentsView).finishRecentsAnimation(anyBoolean(), anyBoolean(), + finishRecentsAnimationCaptor.capture()); + // Don't run finishRecentsAnimation's callback. Therefore ContextualSearch should not start. + verify(mMockContextualSearchManager, never()).startContextualSearch(anyInt(), any()); + verifyNoMoreInteractions(mMockStatsLogManager); + } + + private AutoCloseable overrideSearchHapticCommitFlag(boolean value) { + return TestExtensions.overrideNavConfigFlag( + "ENABLE_SEARCH_HAPTIC_COMMIT", + value, + () -> DeviceConfigWrapper.get().getEnableSearchHapticCommit()); + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/CrossDisplayMoveTransitionTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/CrossDisplayMoveTransitionTest.kt new file mode 100644 index 00000000000..3b70d30f93d --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/CrossDisplayMoveTransitionTest.kt @@ -0,0 +1,296 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.app.ActivityManager +import android.app.WindowConfiguration +import android.content.ComponentName +import android.view.SurfaceControl +import android.view.WindowManager +import android.window.IRemoteTransitionFinishedCallback +import android.window.TransitionInfo +import android.window.TransitionInfo.Change +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.uioverrides.QuickstepLauncher +import org.junit.Assert.* +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.atLeastOnce +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@RunWith(AndroidJUnit4::class) +class CrossDisplayMoveTransitionTest { + private val LAUNCHING_TRANSITION_DURATION_MS = 500L + private val UNLAUNCHING_TRANSITION_DURATION_MS = 250L + + @get:Rule + val mockitoRule: MockitoRule = MockitoJUnit.rule() + + private val mockLauncher = mock() + private val mockTransaction = mock() + private val mockFinishCallback = mock() + + private lateinit var transition: CrossDisplayMoveTransition + + private inner class TransitionInfoBuilder( + type: Int = WindowManager.TRANSIT_NONE, + flags: Int = 0 + ) { + private val info: TransitionInfo = TransitionInfo(type, flags) + private var srcDisplayId: Int = 0 + private var dstDisplayId: Int = 1 + + var srcRoot: TransitionInfo.Root? = null + private set + var dstRoot: TransitionInfo.Root? = null + private set + var crossDisplayTask: Change? = null + private set + var crossDisplayTaskHasSnapshot: Boolean = false + private set + var launcherChange: Change? = null + private set + + fun setDisplayDirectionality(src: Int, dst: Int): TransitionInfoBuilder { + srcDisplayId = src + dstDisplayId = dst + return this + } + + private fun addChange(config: (Change) -> Unit): Change { + val leash = mock() + val change = TransitionInfo.Change(null /* container */, leash) + config(change) + info.addChange(change) + return change + } + + fun addRoot(isSrc: Boolean): TransitionInfoBuilder { + val displayId = if (isSrc) srcDisplayId else dstDisplayId + val leash = mock() + val root = TransitionInfo.Root(displayId, leash, 0 /* offsetLeft */, 0 /* offsetTop */) + if (isSrc) { + srcRoot = root + } else { + dstRoot = root + } + info.addRoot(root) + return this + } + + fun addCrossDisplayTask(hasSnapshot: Boolean = true): TransitionInfoBuilder { + crossDisplayTaskHasSnapshot = hasSnapshot + crossDisplayTask = addChange { change -> + val taskInfo = ActivityManager.RunningTaskInfo() + taskInfo.topActivity = ComponentName("app.pkg", "App") + change.taskInfo = taskInfo + change.setDisplayId(srcDisplayId, dstDisplayId) + if (hasSnapshot) { + change.setSnapshot(mock(), 0f /* luma */) + } + } + return this + } + + fun addGenericTask(mode: Int): Change { + return addChange { change -> + change.mode = mode + val taskInfo = ActivityManager.RunningTaskInfo() + taskInfo.topActivity = ComponentName("com.generic", "GenericActivity") + change.taskInfo = taskInfo + } + } + + fun addLauncherChange(mode: Int = WindowManager.TRANSIT_TO_FRONT): TransitionInfoBuilder { + launcherChange = addChange { change -> + val taskInfo: ActivityManager.RunningTaskInfo = mock() + val componentName = mockLauncher.componentName + whenever(taskInfo.topActivity).thenReturn(componentName) + whenever(taskInfo.activityType) + .thenReturn(WindowConfiguration.ACTIVITY_TYPE_HOME) + change.taskInfo = taskInfo + change.mode = mode + } + return this + } + + fun build(): TransitionInfo = info + } + + @Before + fun setup() { + transition = CrossDisplayMoveTransition(mockLauncher, + LAUNCHING_TRANSITION_DURATION_MS, UNLAUNCHING_TRANSITION_DURATION_MS) + } + + @Test + fun isCrossDisplayMove_withEmptyInfo_returnsFalse() { + val info = TransitionInfoBuilder().build() + assertFalse(CrossDisplayMoveTransition.isCrossDisplayMove(info)) + } + + @Test + fun isCrossDisplayMove_withCrossDisplayTask_returnsTrue() { + val info = TransitionInfoBuilder().addCrossDisplayTask().build() + assertTrue(CrossDisplayMoveTransition.isCrossDisplayMove(info)) + } + + @Test + fun startAnimation_withEmptyInfo_doesNotCrash() { + val info = TransitionInfoBuilder().build() + transition.startCrossDisplayMoveAnimation( + info, + mockTransaction, + mockFinishCallback + ) + // No crash is a pass + } + + private fun assertValidMoveInfo( + builder: TransitionInfoBuilder, + moveInfo: CrossDisplayMoveTransitionInfo? + ) { + assertNotNull(moveInfo) + moveInfo!! + + val crossDisplayTask = builder.crossDisplayTask + assertNotNull(crossDisplayTask) + assertEquals(crossDisplayTask!!.startDisplayId, moveInfo.srcDisplayId) + assertEquals(crossDisplayTask.endDisplayId, moveInfo.dstDisplayId) + assertEquals(builder.crossDisplayTask, moveInfo.taskMovingBetweenDisplays) + assertEquals(builder.srcRoot, moveInfo.srcRoot) + assertEquals(builder.dstRoot, moveInfo.dstRoot) + assertEquals(builder.launcherChange, moveInfo.launcherToFront) + if (builder.srcRoot == null) { + // If there is no srcRoot, then there should never be a srcTaskLeash + assertNull(moveInfo.srcTaskLeash) + } else { + // Otherwise, we should have a srcTaskLeash iff we have a snapshot + assertEquals(builder.crossDisplayTaskHasSnapshot, moveInfo.srcTaskLeash != null) + } + } + + @Test + fun create_happyPath_returnsValidInfo() { + val builder = TransitionInfoBuilder() + .addRoot(isSrc = true) + .addRoot(isSrc = false) + .addCrossDisplayTask() + .addLauncherChange() + val info = builder.build() + val moveInfo = CrossDisplayMoveTransitionInfo.create(info) + assertValidMoveInfo(builder, moveInfo) + } + + @Test + fun create_noSrcRoot_returnsValidInfo() { + val builder = TransitionInfoBuilder() + .addRoot(isSrc = false) + .addCrossDisplayTask() + val info = builder.build() + val moveInfo = CrossDisplayMoveTransitionInfo.create(info) + assertValidMoveInfo(builder, moveInfo) + } + + @Test + fun create_noLauncherChange_returnsValidInfo() { + val builder = TransitionInfoBuilder() + .addRoot(isSrc = true) + .addRoot(isSrc = false) + .addCrossDisplayTask() + val info = builder.build() + val moveInfo = CrossDisplayMoveTransitionInfo.create(info) + assertValidMoveInfo(builder, moveInfo) + } + + @Test + fun create_missingRequiredInfo_returnsNull() { + val invalidBuilders = + listOf( + // Nothing + TransitionInfoBuilder(), + // No task moving between displays + TransitionInfoBuilder() + .addRoot(isSrc = true) + .addRoot(isSrc = false) + .addLauncherChange(), + // No destination root + TransitionInfoBuilder().addRoot(isSrc = true).addCrossDisplayTask() + ) + + invalidBuilders.forEach { builder -> + val info = builder.build() + assertNull(CrossDisplayMoveTransitionInfo.create(info)) + } + } + + private fun verifyInitializedAsVisible(leash: SurfaceControl) { + verify(mockTransaction, atLeastOnce()).setAlpha(leash, 1f) + verify(mockTransaction, atLeastOnce()).setPosition(eq(leash), any(), any()) + verify(mockTransaction, atLeastOnce()).show(leash) + } + + @Test + fun setupInitialAnimationState_happyPath_reparentsLeashes() { + val builder = TransitionInfoBuilder() + .addRoot(isSrc = true) + .addRoot(isSrc = false) + .addCrossDisplayTask() + .addLauncherChange() + val toFrontChange = builder.addGenericTask(mode = WindowManager.TRANSIT_TO_FRONT) + val info = builder.build() + val moveInfo = CrossDisplayMoveTransitionInfo.create(info)!! + + transition.setupInitialAnimationState(info, moveInfo, mockTransaction) + + // Verify reparenting + verify(mockTransaction).reparent(moveInfo.srcTaskLeash!!, moveInfo.srcRoot!!.leash) + verify(mockTransaction).reparent(moveInfo.dstTaskLeash, moveInfo.dstRoot.leash) + + // Verify visibility initialization + verifyInitializedAsVisible(moveInfo.launcherToFront!!.leash) + verifyInitializedAsVisible(moveInfo.dstTaskLeash) + verifyInitializedAsVisible(moveInfo.srcTaskLeash!!) + verifyInitializedAsVisible(toFrontChange.leash) + } + + @Test + fun setupInitialAnimationState_noSrcRoot_srcTaskLeashIsNull() { + val builder = TransitionInfoBuilder() + .addRoot(isSrc = false) + .addCrossDisplayTask(hasSnapshot = true) + val info = builder.build() + val moveInfo = CrossDisplayMoveTransitionInfo.create(info)!! + + transition.setupInitialAnimationState(info, moveInfo, mockTransaction) + + // Verify reparenting + verify(mockTransaction).reparent(moveInfo.dstTaskLeash, moveInfo.dstRoot.leash) + + // Null src leash means the src screenshot should have been set to null + assertNull(moveInfo.srcTaskLeash) + } +} \ No newline at end of file diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/DesktopTaskTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/DesktopTaskTest.kt new file mode 100644 index 00000000000..15da4d4deff --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/DesktopTaskTest.kt @@ -0,0 +1,75 @@ +/* + * 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.quickstep.util + +import android.content.ComponentName +import android.content.Intent +import android.view.Display.DEFAULT_DISPLAY +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.systemui.shared.recents.model.Task +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +class DesktopTaskTest { + + @Test + fun testDesktopTask_sameInstance_isEqual() { + val task = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(1)) + assertThat(task).isEqualTo(task) + } + + @Test + fun testDesktopTask_identicalConstructor_isEqual() { + val task1 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(1)) + val task2 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(1)) + assertThat(task1).isEqualTo(task2) + } + + @Test + fun testDesktopTask_copy_isEqual() { + val task1 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(1)) + val task2 = task1.copy() + assertThat(task1).isEqualTo(task2) + } + + @Test + fun testDesktopTask_differentDeskIds_isNotEqual() { + val task1 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(1)) + val task2 = DesktopTask(deskId = 1, DEFAULT_DISPLAY, createTasks(1)) + assertThat(task1).isNotEqualTo(task2) + } + + @Test + fun testDesktopTask_differentTaskIds_isNotEqual() { + val task1 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(1)) + val task2 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(2)) + assertThat(task1).isNotEqualTo(task2) + } + + @Test + fun testDesktopTask_differentLength_isNotEqual() { + val task1 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(1)) + val task2 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, createTasks(1, 2)) + assertThat(task1).isNotEqualTo(task2) + } + + private fun createTasks(vararg ids: Int): List { + return ids.map { Task(Task.TaskKey(it, 0, Intent(), ComponentName("", ""), 0, 0)) } + } +} diff --git a/quickstep/tests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt similarity index 84% rename from quickstep/tests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt index c190cfebab9..0559b6db58e 100644 --- a/quickstep/tests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt @@ -18,26 +18,32 @@ package com.android.quickstep.util import android.graphics.Rect import android.graphics.Region -import android.testing.AndroidTestingRunner import android.view.Display.DEFAULT_DISPLAY import android.view.IWindowManager +import androidx.test.annotation.UiThreadTest import androidx.test.filters.SmallTest import com.android.launcher3.util.Executors +import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.quickstep.util.GestureExclusionManager.ExclusionListener import org.junit.Before +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock -import org.mockito.MockitoAnnotations +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule import org.mockito.kotlin.reset import org.mockito.kotlin.verify -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoMoreInteractions /** Unit test for [GestureExclusionManager]. */ @SmallTest -@RunWith(AndroidTestingRunner::class) +@UiThreadTest +@RunWith(LauncherMultivalentJUnit::class) class GestureExclusionManagerTest { + @get:Rule var mockitoRule: MockitoRule = MockitoJUnit.rule() + @Mock private lateinit var windowManager: IWindowManager @Mock private lateinit var listener1: ExclusionListener @@ -50,7 +56,6 @@ class GestureExclusionManagerTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) underTest = GestureExclusionManager(windowManager) } @@ -72,7 +77,7 @@ class GestureExclusionManagerTest { underTest.addListener(listener2) awaitTasksCompleted() - verifyZeroInteractions(windowManager) + verifyNoMoreInteractions(windowManager) } @Test @@ -98,7 +103,7 @@ class GestureExclusionManagerTest { underTest.removeListener(listener1) awaitTasksCompleted() - verifyZeroInteractions(windowManager) + verifyNoMoreInteractions(windowManager) } @Test @@ -119,17 +124,17 @@ class GestureExclusionManagerTest { awaitTasksCompleted() underTest.addListener(listener1) awaitTasksCompleted() - verifyZeroInteractions(listener1) + verifyNoMoreInteractions(listener1) underTest.addListener(listener2) awaitTasksCompleted() - verifyZeroInteractions(listener1) + verifyNoMoreInteractions(listener1) verify(listener2).onGestureExclusionChanged(r1, r2) } private fun awaitTasksCompleted() { - Executors.UI_HELPER_EXECUTOR.submit { null }.get() - Executors.MAIN_EXECUTOR.submit { null }.get() + Executors.UI_HELPER_EXECUTOR.submit { null }.get() + Executors.MAIN_EXECUTOR.submit { null }.get() } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GroupTaskTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GroupTaskTest.kt new file mode 100644 index 00000000000..f5567fe27e7 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GroupTaskTest.kt @@ -0,0 +1,164 @@ +/* + * 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.quickstep.util + +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD +import android.content.ComponentName +import android.content.Intent +import android.graphics.Rect +import android.view.Display.DEFAULT_DISPLAY +import android.view.Display.INVALID_DISPLAY +import com.android.launcher3.util.LauncherMultivalentJUnit +import com.android.systemui.shared.recents.model.Task +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(LauncherMultivalentJUnit::class) +class GroupTaskTest { + + @Test + fun testGroupTask_sameInstance_isEqual() { + val task = SingleTask(createTask(1)) + assertThat(task).isEqualTo(task) + } + + @Test + fun testGroupTask_identicalConstructor_isEqual() { + val task1 = SingleTask(createTask(1)) + val task2 = SingleTask(createTask(1)) + assertThat(task1).isEqualTo(task2) + } + + @Test + fun testGroupTask_copy_isEqual() { + val task1 = SingleTask(createTask(1)) + val task2 = task1.copy() + assertThat(task1).isEqualTo(task2) + } + + @Test + fun testGroupTask_differentId_isNotEqual() { + val task1 = SingleTask(createTask(1)) + val task2 = SingleTask(createTask(2)) + assertThat(task1).isNotEqualTo(task2) + } + + @Test + fun testGroupTask_equalSplitTasks_isEqual() { + val splitBounds = SplitBounds(Rect(), Rect(), 1, 2, SplitScreenConstants.SNAP_TO_2_50_50) + val task1 = SplitTask(createTask(1), createTask(2), splitBounds) + val task2 = SplitTask(createTask(1), createTask(2), splitBounds) + assertThat(task1).isEqualTo(task2) + } + + @Test + fun testGroupTask_differentSplitTasks_isNotEqual() { + val splitBounds1 = SplitBounds(Rect(), Rect(), 1, 2, SplitScreenConstants.SNAP_TO_2_50_50) + val splitBounds2 = SplitBounds(Rect(), Rect(), 1, 2, SplitScreenConstants.SNAP_TO_2_33_66) + val task1 = SplitTask(createTask(1), createTask(2), splitBounds1) + val task2 = SplitTask(createTask(1), createTask(2), splitBounds2) + assertThat(task1).isNotEqualTo(task2) + } + + @Test + fun testGroupTask_differentType_isNotEqual() { + val task1 = SingleTask(createTask(1)) + val task2 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, listOf(createTask(1))) + assertThat(task1).isNotEqualTo(task2) + } + + @Test + fun testDesktopTask_matchesDisplayId() { + val task1 = DesktopTask(deskId = 0, DEFAULT_DISPLAY, listOf(createTask(1, INVALID_DISPLAY))) + assertThat(task1.matchesDisplayId(DEFAULT_DISPLAY)).isTrue() + assertThat(task1.matchesDisplayId(DISPLAY_2)).isFalse() + val task2 = DesktopTask(deskId = 0, DISPLAY_2, listOf(createTask(1, DISPLAY_2))) + assertThat(task2.matchesDisplayId(DEFAULT_DISPLAY)).isFalse() + assertThat(task2.matchesDisplayId(DISPLAY_2)).isTrue() + val task3 = DesktopTask(deskId = 0, DISPLAY_2, listOf(createTask(1, INVALID_DISPLAY))) + assertThat(task3.matchesDisplayId(DEFAULT_DISPLAY)).isFalse() + assertThat(task3.matchesDisplayId(DISPLAY_2)).isTrue() + } + + @Test + fun testSingleTask_matchesDisplayId() { + val task1 = SingleTask(createTask(1, INVALID_DISPLAY)) + assertThat(task1.matchesDisplayId(DEFAULT_DISPLAY)).isTrue() + assertThat(task1.matchesDisplayId(DISPLAY_2)).isFalse() + val task2 = SingleTask(createTask(1, DISPLAY_2)) + assertThat(task2.matchesDisplayId(DEFAULT_DISPLAY)).isFalse() + assertThat(task2.matchesDisplayId(DISPLAY_2)).isTrue() + val task3 = SingleTask(createTask(1, DEFAULT_DISPLAY)) + assertThat(task3.matchesDisplayId(DEFAULT_DISPLAY)).isTrue() + assertThat(task3.matchesDisplayId(DISPLAY_2)).isFalse() + } + + @Test + fun testSplitTask_matchesDisplayId() { + val splitBounds = SplitBounds(Rect(), Rect(), 1, 2, SplitScreenConstants.SNAP_TO_2_50_50) + val task1 = + SplitTask(createTask(1, INVALID_DISPLAY), createTask(2, INVALID_DISPLAY), splitBounds) + assertThat(task1.matchesDisplayId(DEFAULT_DISPLAY)).isTrue() + assertThat(task1.matchesDisplayId(DISPLAY_2)).isFalse() + val task2 = SplitTask(createTask(1, INVALID_DISPLAY), createTask(2, DISPLAY_2), splitBounds) + assertThat(task2.matchesDisplayId(DEFAULT_DISPLAY)).isTrue() + assertThat(task2.matchesDisplayId(DISPLAY_2)).isFalse() + val task3 = SplitTask(createTask(1, DISPLAY_2), createTask(2, INVALID_DISPLAY), splitBounds) + assertThat(task3.matchesDisplayId(DEFAULT_DISPLAY)).isFalse() + assertThat(task3.matchesDisplayId(DISPLAY_2)).isTrue() + val task4 = + SplitTask(createTask(1, DEFAULT_DISPLAY), createTask(2, DEFAULT_DISPLAY), splitBounds) + assertThat(task4.matchesDisplayId(DEFAULT_DISPLAY)).isTrue() + assertThat(task4.matchesDisplayId(DISPLAY_2)).isFalse() + val task5 = SplitTask(createTask(1, DEFAULT_DISPLAY), createTask(2, DISPLAY_2), splitBounds) + assertThat(task5.matchesDisplayId(DEFAULT_DISPLAY)).isTrue() + assertThat(task5.matchesDisplayId(DISPLAY_2)).isFalse() + val task6 = SplitTask(createTask(1, DISPLAY_2), createTask(2, DEFAULT_DISPLAY), splitBounds) + assertThat(task6.matchesDisplayId(DEFAULT_DISPLAY)).isFalse() + assertThat(task6.matchesDisplayId(DISPLAY_2)).isTrue() + } + + private fun createTask(id: Int, displayId: Int = INVALID_DISPLAY, pkg: String? = null): Task { + val intent = Intent() + pkg.let { intent.setPackage(it) } + return Task( + Task.TaskKey( + id, + 0, + intent, + ComponentName(pkg ?: "", ""), + 0, + 0, + displayId, + null, + 0, + false, + false, + ACTIVITY_TYPE_STANDARD, + false, + ) + ) + } + + companion object { + const val DISPLAY_2 = 2 + const val PACKAGE = "com.android.launcher3" + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/RecentOrientedStateTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/RecentOrientedStateTest.kt new file mode 100644 index 00000000000..137603f79b6 --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/RecentOrientedStateTest.kt @@ -0,0 +1,325 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.view.Surface +import android.view.Surface.ROTATION_0 +import android.view.Surface.ROTATION_180 +import android.view.Surface.ROTATION_90 +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.quickstep.FallbackActivityInterface +import com.android.quickstep.orientation.RecentsPagedOrientationHandler +import com.android.quickstep.orientation.RecentsPagedOrientationHandler.Companion.PORTRAIT +import com.google.common.truth.Truth.assertWithMessage +import junit.framework.TestCase.assertEquals +import org.junit.Assert.assertNotEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.spy +import org.mockito.kotlin.whenever + +data class HideActionsTestCase( + val recentsRotation: Int, + val touchRotation: Int, + val isRotationAllowed: Boolean, + val isFixedLandscape: Boolean, +) + +data class RotationHandlerTestCase( + val displayRotation: Int, + val touchRotation: Int, + val isRotationAllowed: Boolean, + val isFixedLandscape: Boolean, +) { + override fun toString(): String { + return "TestCase(displayRotation=${Surface.rotationToString(displayRotation)}, " + + "touchRotation=${Surface.rotationToString(touchRotation)}, " + + "isRotationAllowed=$isRotationAllowed, " + + "isFixedLandscape=$isFixedLandscape)" + } +} + +/** + * Test all possible inputs to RecentsOrientedState.updateHandler. It tests all possible + * combinations of rotations and relevant methods (two methods that return boolean values) but it + * only provides the expected result when the final rotation is different from ROTATION_0 for + * simplicity. So any case not shown in resultMap you can assume results in ROTATION_0. + */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class RecentOrientedStateTest { + + companion object { + const val INVALID_ROTATION = -1 + } + + private fun createRecentOrientedState() = + spy( + RecentsOrientedState( + ApplicationProvider.getApplicationContext(), + FallbackActivityInterface.INSTANCE, + ) {} + ) + + private fun rotationHandlerTest( + testCase: RotationHandlerTestCase, + expectedHandler: RecentsPagedOrientationHandler, + ) { + val recentOrientedState = createRecentOrientedState() + whenever(recentOrientedState.isRecentsActivityRotationAllowed) + .thenReturn(testCase.isRotationAllowed) + whenever(recentOrientedState.isLauncherFixedLandscape).thenReturn(testCase.isFixedLandscape) + + recentOrientedState.update(testCase.displayRotation, testCase.touchRotation) + val rotation = recentOrientedState.orientationHandler.rotation + assertWithMessage("$testCase to ${Surface.rotationToString(rotation)},") + .that(rotation) + .isEqualTo(expectedHandler.rotation) + } + + private fun shouldHideActionButtonTest( + testCase: HideActionsTestCase, + hideActionButtonsExpected: Boolean, + ) { + val recentOrientedState = createRecentOrientedState() + whenever(recentOrientedState.recentsActivityRotation).thenReturn(testCase.recentsRotation) + whenever(recentOrientedState.touchRotation).thenReturn(testCase.touchRotation) + whenever(recentOrientedState.isRecentsActivityRotationAllowed) + .thenReturn(testCase.isRotationAllowed) + whenever(recentOrientedState.isLauncherFixedLandscape).thenReturn(testCase.isFixedLandscape) + val res = recentOrientedState.shouldHideActionButtons() + assertWithMessage( + "Test case $testCase generated $res but should be $hideActionButtonsExpected" + ) + .that(res) + .isEqualTo(hideActionButtonsExpected) + } + + @Test + fun `stateId changes with flags`() { + val recentOrientedState1 = createRecentOrientedState() + val recentOrientedState2 = createRecentOrientedState() + assertEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + + recentOrientedState1.setGestureActive(true) + recentOrientedState2.setGestureActive(false) + assertNotEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + + recentOrientedState2.setGestureActive(true) + assertEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + } + + @Test + fun `stateId changes with recents rotation`() { + val recentOrientedState1 = createRecentOrientedState() + val recentOrientedState2 = createRecentOrientedState() + recentOrientedState1.setRecentsRotation(ROTATION_90) + recentOrientedState2.setRecentsRotation(ROTATION_180) + assertNotEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + + recentOrientedState2.setRecentsRotation(ROTATION_90) + assertEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + } + + @Test + fun `stateId changes with display rotation`() { + val recentOrientedState1 = createRecentOrientedState() + val recentOrientedState2 = createRecentOrientedState() + recentOrientedState1.update(ROTATION_0, ROTATION_90) + recentOrientedState2.update(ROTATION_0, ROTATION_180) + assertNotEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + + recentOrientedState2.update(ROTATION_90, ROTATION_90) + assertNotEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + + recentOrientedState2.update(ROTATION_90, ROTATION_0) + assertNotEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + + recentOrientedState2.update(ROTATION_0, ROTATION_90) + assertEquals(recentOrientedState1.stateId, recentOrientedState2.stateId) + } + + @Test + fun `rotation handler test fixed landscape when device is portrait`() { + rotationHandlerTest( + testCase = + RotationHandlerTestCase( + displayRotation = INVALID_ROTATION, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = true, + ), + expectedHandler = PORTRAIT, + ) + } + + @Test + fun `rotation handler test fixed landscape when device is landscape`() { + rotationHandlerTest( + testCase = + RotationHandlerTestCase( + displayRotation = INVALID_ROTATION, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = true, + ), + expectedHandler = PORTRAIT, + ) + } + + @Test + fun `rotation handler test fixed landscape when device is seascape`() { + rotationHandlerTest( + testCase = + RotationHandlerTestCase( + displayRotation = INVALID_ROTATION, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = true, + ), + expectedHandler = PORTRAIT, + ) + } + + @Test + fun `rotation handler test fixed landscape when device is portrait and display rotation is portrait`() { + rotationHandlerTest( + testCase = + RotationHandlerTestCase( + displayRotation = ROTATION_0, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = true, + ), + expectedHandler = PORTRAIT, + ) + } + + @Test + fun `rotation handler test fixed landscape when device is landscape and display rotation is landscape `() { + rotationHandlerTest( + testCase = + RotationHandlerTestCase( + displayRotation = ROTATION_90, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = true, + ), + expectedHandler = PORTRAIT, + ) + } + + @Test + fun `rotation handler test fixed landscape when device is seascape and display rotation is seascape`() { + rotationHandlerTest( + testCase = + RotationHandlerTestCase( + displayRotation = ROTATION_180, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = true, + ), + expectedHandler = PORTRAIT, + ) + } + + @Test + fun `should hide actions fixed landscape no rotation`() { + shouldHideActionButtonTest( + testCase = + HideActionsTestCase( + recentsRotation = ROTATION_0, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = true, + ), + hideActionButtonsExpected = false, + ) + } + + @Test + fun `should hide actions fixed landscape rotation 90`() { + shouldHideActionButtonTest( + testCase = + HideActionsTestCase( + recentsRotation = ROTATION_90, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = true, + ), + hideActionButtonsExpected = false, + ) + } + + @Test + fun `should hide actions recent rotation 180`() { + shouldHideActionButtonTest( + testCase = + HideActionsTestCase( + recentsRotation = ROTATION_180, + touchRotation = ROTATION_0, + isRotationAllowed = false, + isFixedLandscape = false, + ), + hideActionButtonsExpected = true, + ) + } + + @Test + fun `should hide actions touch rotation 180`() { + shouldHideActionButtonTest( + testCase = + HideActionsTestCase( + recentsRotation = ROTATION_0, + touchRotation = ROTATION_180, + isRotationAllowed = false, + isFixedLandscape = false, + ), + hideActionButtonsExpected = true, + ) + } + + @Test + fun `should hide actions rotation allowed`() { + shouldHideActionButtonTest( + testCase = + HideActionsTestCase( + recentsRotation = ROTATION_90, + touchRotation = ROTATION_180, + isRotationAllowed = true, + isFixedLandscape = false, + ), + hideActionButtonsExpected = false, + ) + } + + @Test + fun `should hide actions fixed landscape rotations and not allowed`() { + shouldHideActionButtonTest( + testCase = + HideActionsTestCase( + recentsRotation = ROTATION_180, + touchRotation = ROTATION_90, + isRotationAllowed = false, + isFixedLandscape = true, + ), + hideActionButtonsExpected = false, + ) + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/RecentsOrientedStateTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/RecentsOrientedStateTest.java deleted file mode 100644 index 47ef13b42f3..00000000000 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/RecentsOrientedStateTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.util; - -import static android.view.Surface.ROTATION_0; -import static android.view.Surface.ROTATION_180; -import static android.view.Surface.ROTATION_90; - -import static androidx.test.core.app.ApplicationProvider.getApplicationContext; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; - -import android.content.Context; - -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.filters.SmallTest; - -import com.android.quickstep.FallbackActivityInterface; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Tests for {@link RecentsOrientedState} - */ -@SmallTest -@RunWith(AndroidJUnit4.class) -public class RecentsOrientedStateTest { - - private RecentsOrientedState mR1, mR2; - - @Before - public void setup() { - Context context = getApplicationContext(); - mR1 = new RecentsOrientedState(context, FallbackActivityInterface.INSTANCE, i -> { }); - mR2 = new RecentsOrientedState(context, FallbackActivityInterface.INSTANCE, i -> { }); - assertEquals(mR1.getStateId(), mR2.getStateId()); - } - - @Test - public void stateId_changesWithFlags() { - mR1.setGestureActive(true); - mR2.setGestureActive(false); - assertNotEquals(mR1.getStateId(), mR2.getStateId()); - - mR2.setGestureActive(true); - assertEquals(mR1.getStateId(), mR2.getStateId()); - } - - @Test - public void stateId_changesWithRecentsRotation() { - mR1.setRecentsRotation(ROTATION_90); - mR2.setRecentsRotation(ROTATION_180); - assertNotEquals(mR1.getStateId(), mR2.getStateId()); - - mR2.setRecentsRotation(ROTATION_90); - assertEquals(mR1.getStateId(), mR2.getStateId()); - } - - @Test - public void stateId_changesWithDisplayRotation() { - mR1.update(ROTATION_0, ROTATION_90); - mR2.update(ROTATION_0, ROTATION_180); - assertNotEquals(mR1.getStateId(), mR2.getStateId()); - - mR2.update(ROTATION_90, ROTATION_90); - assertNotEquals(mR1.getStateId(), mR2.getStateId()); - - mR2.update(ROTATION_90, ROTATION_0); - assertNotEquals(mR1.getStateId(), mR2.getStateId()); - - mR2.update(ROTATION_0, ROTATION_90); - assertEquals(mR1.getStateId(), mR2.getStateId()); - } -} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt index d40f8ab389a..c9d7e1dee9f 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt @@ -27,15 +27,15 @@ import android.view.View import android.window.TransitionInfo import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.apppairs.AppPairIcon +import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.statehandlers.DepthController import com.android.launcher3.statemanager.StateManager import com.android.launcher3.taskbar.TaskbarActivityContext import com.android.launcher3.util.SplitConfigurationOptions import com.android.quickstep.views.GroupedTaskView import com.android.quickstep.views.IconView -import com.android.quickstep.views.TaskThumbnailViewDeprecated +import com.android.quickstep.views.TaskContainer import com.android.quickstep.views.TaskView -import com.android.quickstep.views.TaskView.TaskContainer import com.android.systemui.shared.recents.model.Task import org.junit.Assert.assertEquals import org.junit.Before @@ -59,7 +59,7 @@ class SplitAnimationControllerTest { private val mockSplitSelectStateController: SplitSelectStateController = mock() // TaskView private val mockTaskView: TaskView = mock() - private val mockThumbnailView: TaskThumbnailViewDeprecated = mock() + private val mockSnapshotView: View = mock() private val mockBitmap: Bitmap = mock() private val mockIconView: IconView = mock() private val mockTaskViewDrawable: Drawable = mock() @@ -77,6 +77,7 @@ class SplitAnimationControllerTest { private val splitSelectSource: SplitConfigurationOptions.SplitSelectSource = mock() private val mockSplitSourceDrawable: Drawable = mock() private val mockSplitSourceView: View = mock() + private val mockItemInfo: ItemInfo = mock() private val stateManager: StateManager<*, *> = mock() private val depthController: DepthController = mock() @@ -87,14 +88,17 @@ class SplitAnimationControllerTest { @Before fun setup() { - whenever(mockTaskContainer.thumbnailViewDeprecated).thenReturn(mockThumbnailView) - whenever(mockThumbnailView.thumbnail).thenReturn(mockBitmap) + whenever(mockTaskContainer.snapshotView).thenReturn(mockSnapshotView) + whenever(mockTaskContainer.thumbnail).thenReturn(mockBitmap) whenever(mockTaskContainer.iconView).thenReturn(mockIconView) + whenever(mockTaskContainer.task).thenReturn(mockTask) whenever(mockIconView.drawable).thenReturn(mockTaskViewDrawable) whenever(mockTaskView.taskContainers).thenReturn(List(1) { mockTaskContainer }) + whenever(mockTaskView.firstTaskContainer).thenReturn(mockTaskContainer) whenever(splitSelectSource.drawable).thenReturn(mockSplitSourceDrawable) whenever(splitSelectSource.view).thenReturn(mockSplitSourceView) + whenever(splitSelectSource.itemInfo).thenReturn(mockItemInfo) splitAnimationController = SplitAnimationController(mockSplitSelectStateController) } @@ -114,7 +118,7 @@ class SplitAnimationControllerTest { assertEquals( "Did not fallback to use splitSource icon drawable", mockSplitSourceDrawable, - splitAnimInitProps.iconDrawable + splitAnimInitProps.iconDrawable, ) } @@ -130,7 +134,7 @@ class SplitAnimationControllerTest { assertEquals( "Did not use taskView icon drawable", mockTaskViewDrawable, - splitAnimInitProps.iconDrawable + splitAnimInitProps.iconDrawable, ) } @@ -149,7 +153,7 @@ class SplitAnimationControllerTest { assertEquals( "Did not use taskView icon drawable", mockTaskViewDrawable, - splitAnimInitProps.iconDrawable + splitAnimInitProps.iconDrawable, ) } @@ -165,7 +169,7 @@ class SplitAnimationControllerTest { assertEquals( "Did not use splitSource icon drawable", mockSplitSourceDrawable, - splitAnimInitProps.iconDrawable + splitAnimInitProps.iconDrawable, ) } @@ -180,7 +184,6 @@ class SplitAnimationControllerTest { whenever(mockTaskContainer.task).thenReturn(mockTask) whenever(mockTaskContainer.iconView).thenReturn(mockIconView) - whenever(mockTaskContainer.thumbnailViewDeprecated).thenReturn(mockThumbnailView) whenever(mockTask.getKey()).thenReturn(mockTaskKey) whenever(mockTaskKey.getId()).thenReturn(taskId) whenever(mockSplitSelectStateController.initialTaskId).thenReturn(taskId) @@ -188,13 +191,13 @@ class SplitAnimationControllerTest { val splitAnimInitProps: SplitAnimationController.Companion.SplitAnimInitProps = splitAnimationController.getFirstAnimInitViews( { mockGroupedTaskView }, - { splitSelectSource } + { splitSelectSource }, ) assertEquals( "Did not use splitSource icon drawable", mockSplitSourceDrawable, - splitAnimInitProps.iconDrawable + splitAnimInitProps.iconDrawable, ) } @@ -212,7 +215,7 @@ class SplitAnimationControllerTest { any(), any(), any(), - any() + any(), ) spySplitAnimationController.playSplitLaunchAnimation( @@ -227,7 +230,8 @@ class SplitAnimationControllerTest { depthController, null /* info */, null /* t */, - {} /* finishCallback */ + {} /* finishCallback */, + 1f, /* cornerRadius */ ) verify(spySplitAnimationController) @@ -240,7 +244,7 @@ class SplitAnimationControllerTest { any(), any(), any(), - any() + any(), ) } @@ -263,7 +267,8 @@ class SplitAnimationControllerTest { depthController, transitionInfo, transaction, - {} /* finishCallback */ + {} /* finishCallback */, + 1f, /* cornerRadius */ ) verify(spySplitAnimationController) @@ -276,7 +281,7 @@ class SplitAnimationControllerTest { whenever(mockAppPairIcon.context).thenReturn(mockContextThemeWrapper) doNothing() .whenever(spySplitAnimationController) - .composeIconSplitLaunchAnimator(any(), any(), any(), any()) + .composeIconSplitLaunchAnimator(any(), any(), any(), any(), any()) doReturn(-1).whenever(spySplitAnimationController).hasChangesForBothAppPairs(any(), any()) spySplitAnimationController.playSplitLaunchAnimation( @@ -291,11 +296,12 @@ class SplitAnimationControllerTest { depthController, transitionInfo, transaction, - {} /* finishCallback */ + {} /* finishCallback */, + 1f, /* cornerRadius */ ) verify(spySplitAnimationController) - .composeIconSplitLaunchAnimator(any(), any(), any(), any()) + .composeIconSplitLaunchAnimator(any(), any(), any(), any(), any()) } @Test @@ -319,7 +325,8 @@ class SplitAnimationControllerTest { depthController, transitionInfo, transaction, - {} /* finishCallback */ + {} /* finishCallback */, + 1f, /* cornerRadius */ ) verify(spySplitAnimationController) @@ -346,7 +353,8 @@ class SplitAnimationControllerTest { depthController, transitionInfo, transaction, - {} /* finishCallback */ + {} /* finishCallback */, + 1f, /* cornerRadius */ ) verify(spySplitAnimationController) @@ -373,7 +381,8 @@ class SplitAnimationControllerTest { depthController, transitionInfo, transaction, - {} /* finishCallback */ + {} /* finishCallback */, + 1f, /* cornerRadius */ ) verify(spySplitAnimationController) @@ -385,7 +394,7 @@ class SplitAnimationControllerTest { val spySplitAnimationController = spy(splitAnimationController) doNothing() .whenever(spySplitAnimationController) - .composeFadeInSplitLaunchAnimator(any(), any(), any(), any(), any()) + .composeFadeInSplitLaunchAnimator(any(), any(), any(), any(), any(), any()) spySplitAnimationController.playSplitLaunchAnimation( null /* launchingTaskView */, @@ -399,10 +408,11 @@ class SplitAnimationControllerTest { depthController, transitionInfo, transaction, - {} /* finishCallback */ + {} /* finishCallback */, + 1f, /* cornerRadius */ ) verify(spySplitAnimationController) - .composeFadeInSplitLaunchAnimator(any(), any(), any(), any(), any()) + .composeFadeInSplitLaunchAnimator(any(), any(), any(), any(), any(), any()) } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt index bab84ef28b7..3645d8bc81f 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt @@ -22,24 +22,24 @@ import android.app.PendingIntent import android.content.ComponentName import android.content.Intent import android.graphics.Rect -import android.os.Handler import android.os.UserHandle import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.LauncherState import com.android.launcher3.logging.StatsLogManager import com.android.launcher3.logging.StatsLogManager.StatsLogger import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.ResolvedTargetInfo import com.android.launcher3.statehandlers.DepthController import com.android.launcher3.statemanager.StateManager import com.android.launcher3.statemanager.StatefulActivity -import com.android.launcher3.util.ComponentKey -import com.android.launcher3.util.SplitConfigurationOptions import com.android.quickstep.RecentsModel import com.android.quickstep.SystemUiProxy import com.android.quickstep.util.SplitSelectStateController.SplitFromDesktopController +import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsViewContainer import com.android.systemui.shared.recents.model.Task -import com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50 +import com.android.wm.shell.shared.split.SplitBounds +import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50 import java.util.function.Consumer import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -52,6 +52,7 @@ import org.mockito.Mockito.any import org.mockito.Mockito.`when` import org.mockito.kotlin.argumentCaptor import org.mockito.kotlin.mock +import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @@ -63,11 +64,11 @@ class SplitSelectStateControllerTest { private val statsLogManager: StatsLogManager = mock() private val statsLogger: StatsLogger = mock() private val stateManager: StateManager> = mock() - private val handler: Handler = mock() private val context: RecentsViewContainer = mock() private val recentsModel: RecentsModel = mock() private val pendingIntent: PendingIntent = mock() private val splitFromDesktopController: SplitFromDesktopController = mock() + private val recentsView: RecentsView<*, *> = mock() private lateinit var splitSelectStateController: SplitSelectStateController @@ -75,6 +76,7 @@ class SplitSelectStateControllerTest { private val nonPrimaryUserHandle = UserHandle(ActivityManager.RunningTaskInfo().userId + 10) private var taskIdCounter = 0 + private fun getUniqueId(): Int { return ++taskIdCounter } @@ -87,28 +89,28 @@ class SplitSelectStateControllerTest { splitSelectStateController = SplitSelectStateController( context, - handler, stateManager, depthController, statsLogManager, systemUiProxy, recentsModel, - null /*activityBackCallback*/ + null, /*activityBackCallback*/ ) } @Test fun activeTasks_noMatchingTasks() { - val nonMatchingComponent = ComponentKey(ComponentName("no", "match"), primaryUserHandle) + val nonMatchingResolvedTargetInfo = + ResolvedTargetInfo(null, ComponentName("no", "match"), primaryUserHandle) val groupTask1 = - generateGroupTask( + generateSplitTask( ComponentName("pomegranate", "juice"), - ComponentName("pumpkin", "pie") + ComponentName("pumpkin", "pie"), ) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName("hotdog", "juice"), - ComponentName("personal", "computer") + ComponentName("personal", "computer"), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask1) @@ -123,9 +125,9 @@ class SplitSelectStateControllerTest { val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(nonMatchingComponent), + listOf(nonMatchingResolvedTargetInfo), false /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -139,17 +141,21 @@ class SplitSelectStateControllerTest { fun activeTasks_singleMatchingTask() { val matchingPackage = "hotdog" val matchingClass = "juice" - val matchingComponent = - ComponentKey(ComponentName(matchingPackage, matchingClass), primaryUserHandle) + val matchingResolvedTargetInfo = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage, matchingClass), + primaryUserHandle, + ) val groupTask1 = - generateGroupTask( + generateSplitTask( ComponentName(matchingPackage, matchingClass), - ComponentName("pomegranate", "juice") + ComponentName("pomegranate", "juice"), ) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName("pumpkin", "pie"), - ComponentName("personal", "computer") + ComponentName("personal", "computer"), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask1) @@ -162,23 +168,23 @@ class SplitSelectStateControllerTest { assertEquals( "ComponentName package mismatched", it[0].key.baseIntent.component?.packageName, - matchingPackage + matchingPackage, ) assertEquals( "ComponentName class mismatched", it[0].key.baseIntent.component?.className, - matchingClass + matchingClass, ) - assertEquals(it[0], groupTask1.task1) + assertEquals(it[0], groupTask1.topLeftTask) } // Capture callback from recentsModel#getTasks() val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(matchingComponent), + listOf(matchingResolvedTargetInfo), false /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -192,17 +198,21 @@ class SplitSelectStateControllerTest { fun activeTasks_skipTaskWithDifferentUser() { val matchingPackage = "hotdog" val matchingClass = "juice" - val nonPrimaryUserComponent = - ComponentKey(ComponentName(matchingPackage, matchingClass), nonPrimaryUserHandle) + val nonPrimaryUserResolvedTargetInfo = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage, matchingClass), + nonPrimaryUserHandle, + ) val groupTask1 = - generateGroupTask( + generateSplitTask( ComponentName(matchingPackage, matchingClass), - ComponentName("pomegranate", "juice") + ComponentName("pomegranate", "juice"), ) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName("pumpkin", "pie"), - ComponentName("personal", "computer") + ComponentName("personal", "computer"), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask1) @@ -217,9 +227,9 @@ class SplitSelectStateControllerTest { val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(nonPrimaryUserComponent), + listOf(nonPrimaryUserResolvedTargetInfo), false /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -233,19 +243,23 @@ class SplitSelectStateControllerTest { fun activeTasks_findTaskAsNonPrimaryUser() { val matchingPackage = "hotdog" val matchingClass = "juice" - val nonPrimaryUserComponent = - ComponentKey(ComponentName(matchingPackage, matchingClass), nonPrimaryUserHandle) + val nonPrimaryUserResolvedTargetInfo = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage, matchingClass), + nonPrimaryUserHandle, + ) val groupTask1 = - generateGroupTask( + generateSplitTask( ComponentName(matchingPackage, matchingClass), nonPrimaryUserHandle, ComponentName("pomegranate", "juice"), - nonPrimaryUserHandle + nonPrimaryUserHandle, ) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName("pumpkin", "pie"), - ComponentName("personal", "computer") + ComponentName("personal", "computer"), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask1) @@ -258,24 +272,24 @@ class SplitSelectStateControllerTest { assertEquals( "ComponentName package mismatched", it[0].key.baseIntent.component?.packageName, - matchingPackage + matchingPackage, ) assertEquals( "ComponentName class mismatched", it[0].key.baseIntent.component?.className, - matchingClass + matchingClass, ) assertEquals("userId mismatched", it[0].key.userId, nonPrimaryUserHandle.identifier) - assertEquals(it[0], groupTask1.task1) + assertEquals(it[0], groupTask1.topLeftTask) } // Capture callback from recentsModel#getTasks() val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(nonPrimaryUserComponent), + listOf(nonPrimaryUserResolvedTargetInfo), false /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -289,17 +303,21 @@ class SplitSelectStateControllerTest { fun activeTasks_multipleMatchMostRecentTask() { val matchingPackage = "hotdog" val matchingClass = "juice" - val matchingComponent = - ComponentKey(ComponentName(matchingPackage, matchingClass), primaryUserHandle) + val matchingResolvedTargetInfo = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage, matchingClass), + primaryUserHandle, + ) val groupTask1 = - generateGroupTask( + generateSplitTask( ComponentName(matchingPackage, matchingClass), - ComponentName("pumpkin", "pie") + ComponentName("pumpkin", "pie"), ) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName("pomegranate", "juice"), - ComponentName(matchingPackage, matchingClass) + ComponentName(matchingPackage, matchingClass), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask2) @@ -312,23 +330,23 @@ class SplitSelectStateControllerTest { assertEquals( "ComponentName package mismatched", it[0].key.baseIntent.component?.packageName, - matchingPackage + matchingPackage, ) assertEquals( "ComponentName class mismatched", it[0].key.baseIntent.component?.className, - matchingClass + matchingClass, ) - assertEquals(it[0], groupTask1.task1) + assertEquals(it[0], groupTask1.topLeftTask) } // Capture callback from recentsModel#getTasks() val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(matchingComponent), + listOf(matchingResolvedTargetInfo), false /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -340,18 +358,23 @@ class SplitSelectStateControllerTest { @Test fun activeTasks_multipleSearchShouldFindTask() { - val nonMatchingComponent = ComponentKey(ComponentName("no", "match"), primaryUserHandle) + val noMatchingResolvedTargetInfo = + ResolvedTargetInfo(null, ComponentName("no", "match"), primaryUserHandle) val matchingPackage = "hotdog" val matchingClass = "juice" - val matchingComponent = - ComponentKey(ComponentName(matchingPackage, matchingClass), primaryUserHandle) + val matchingResolvedTargetInfo = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage, matchingClass), + primaryUserHandle, + ) val groupTask1 = - generateGroupTask(ComponentName("hotdog", "pie"), ComponentName("pumpkin", "pie")) + generateSplitTask(ComponentName("hotdog", "pie"), ComponentName("pumpkin", "pie")) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName("pomegranate", "juice"), - ComponentName(matchingPackage, matchingClass) + ComponentName(matchingPackage, matchingClass), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask2) @@ -366,23 +389,23 @@ class SplitSelectStateControllerTest { assertEquals( "ComponentName package mismatched", it[1].key.baseIntent.component?.packageName, - matchingPackage + matchingPackage, ) assertEquals( "ComponentName class mismatched", it[1].key.baseIntent.component?.className, - matchingClass + matchingClass, ) - assertEquals(it[1], groupTask2.task2) + assertEquals(it[1], groupTask2.bottomRightTask) } // Capture callback from recentsModel#getTasks() val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(nonMatchingComponent, matchingComponent), + listOf(noMatchingResolvedTargetInfo, matchingResolvedTargetInfo), false /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -396,15 +419,19 @@ class SplitSelectStateControllerTest { fun activeTasks_multipleSearchShouldNotFindSameTaskTwice() { val matchingPackage = "hotdog" val matchingClass = "juice" - val matchingComponent = - ComponentKey(ComponentName(matchingPackage, matchingClass), primaryUserHandle) + val matchingResolvedTargetInfo = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage, matchingClass), + primaryUserHandle, + ) val groupTask1 = - generateGroupTask(ComponentName("hotdog", "pie"), ComponentName("pumpkin", "pie")) + generateSplitTask(ComponentName("hotdog", "pie"), ComponentName("pumpkin", "pie")) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName("pomegranate", "juice"), - ComponentName(matchingPackage, matchingClass) + ComponentName(matchingPackage, matchingClass), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask2) @@ -418,14 +445,14 @@ class SplitSelectStateControllerTest { assertEquals( "ComponentName package mismatched", it[0].key.baseIntent.component?.packageName, - matchingPackage + matchingPackage, ) assertEquals( "ComponentName class mismatched", it[0].key.baseIntent.component?.className, - matchingClass + matchingClass, ) - assertEquals(it[0], groupTask2.task2) + assertEquals(it[0], groupTask2.bottomRightTask) assertNull("No tasks should have matched", it[1] /*task*/) } @@ -433,9 +460,9 @@ class SplitSelectStateControllerTest { val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(matchingComponent, matchingComponent), + listOf(matchingResolvedTargetInfo, matchingResolvedTargetInfo), false /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -449,18 +476,22 @@ class SplitSelectStateControllerTest { fun activeTasks_multipleSearchShouldFindDifferentInstancesOfSameTask() { val matchingPackage = "hotdog" val matchingClass = "juice" - val matchingComponent = - ComponentKey(ComponentName(matchingPackage, matchingClass), primaryUserHandle) + val matchingResolvedTargetInfo = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage, matchingClass), + primaryUserHandle, + ) val groupTask1 = - generateGroupTask( + generateSplitTask( ComponentName(matchingPackage, matchingClass), - ComponentName("pumpkin", "pie") + ComponentName("pumpkin", "pie"), ) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName("pomegranate", "juice"), - ComponentName(matchingPackage, matchingClass) + ComponentName(matchingPackage, matchingClass), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask2) @@ -474,34 +505,34 @@ class SplitSelectStateControllerTest { assertEquals( "ComponentName package mismatched", it[0].key.baseIntent.component?.packageName, - matchingPackage + matchingPackage, ) assertEquals( "ComponentName class mismatched", it[0].key.baseIntent.component?.className, - matchingClass + matchingClass, ) - assertEquals(it[0], groupTask1.task1) + assertEquals(it[0], groupTask1.topLeftTask) assertEquals( "ComponentName package mismatched", it[1].key.baseIntent.component?.packageName, - matchingPackage + matchingPackage, ) assertEquals( "ComponentName class mismatched", it[1].key.baseIntent.component?.className, - matchingClass + matchingClass, ) - assertEquals(it[1], groupTask2.task2) + assertEquals(it[1], groupTask2.bottomRightTask) } // Capture callback from recentsModel#getTasks() val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(matchingComponent, matchingComponent), + listOf(matchingResolvedTargetInfo, matchingResolvedTargetInfo), false /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -515,24 +546,33 @@ class SplitSelectStateControllerTest { fun activeTasks_multipleSearchShouldFindExactPairMatch() { val matchingPackage = "hotdog" val matchingClass = "juice" - val matchingComponent = - ComponentKey(ComponentName(matchingPackage, matchingClass), primaryUserHandle) + val matchingResolvedTargetInfo = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage, matchingClass), + primaryUserHandle, + ) + val matchingPackage2 = "pomegranate" val matchingClass2 = "juice" - val matchingComponent2 = - ComponentKey(ComponentName(matchingPackage2, matchingClass2), primaryUserHandle) + val matchingResolvedTargetInfo2 = + ResolvedTargetInfo( + null, + ComponentName(matchingPackage2, matchingClass2), + primaryUserHandle, + ) val groupTask1 = - generateGroupTask(ComponentName("hotdog", "pie"), ComponentName("pumpkin", "pie")) + generateSplitTask(ComponentName("hotdog", "pie"), ComponentName("pumpkin", "pie")) val groupTask2 = - generateGroupTask( + generateSplitTask( ComponentName(matchingPackage2, matchingClass2), - ComponentName(matchingPackage, matchingClass) + ComponentName(matchingPackage, matchingClass), ) val groupTask3 = - generateGroupTask( + generateSplitTask( ComponentName("hotdog", "pie"), - ComponentName(matchingPackage, matchingClass) + ComponentName(matchingPackage, matchingClass), ) val tasks: ArrayList = ArrayList() tasks.add(groupTask3) @@ -544,16 +584,16 @@ class SplitSelectStateControllerTest { val taskConsumer = Consumer> { assertEquals("Expected array length 2", 2, it.size) - assertEquals("Found wrong task", it[0], groupTask2.task1) + assertEquals("Found wrong task", it[0], groupTask2.topLeftTask) } // Capture callback from recentsModel#getTasks() val consumer = argumentCaptor>> { splitSelectStateController.findLastActiveTasksAndRunCallback( - listOf(matchingComponent2, matchingComponent), + listOf(matchingResolvedTargetInfo2, matchingResolvedTargetInfo), true /* findExactPairMatch */, - taskConsumer + taskConsumer, ) verify(recentsModel).getTasks(capture()) } @@ -570,7 +610,7 @@ class SplitSelectStateControllerTest { -1 /*stagePosition*/, ItemInfo(), null /*splitEvent*/, - 10 /*alreadyRunningTask*/ + 10, /*alreadyRunningTask*/ ) assertTrue(splitSelectStateController.isSplitSelectActive) } @@ -582,21 +622,23 @@ class SplitSelectStateControllerTest { -1 /*stagePosition*/, ItemInfo(), null /*splitEvent*/, - -1 /*alreadyRunningTask*/ + -1, /*alreadyRunningTask*/ ) assertTrue(splitSelectStateController.isSplitSelectActive) } @Test fun resetAfterInitial() { + whenever(context.getOverviewPanel>()).thenReturn(recentsView) splitSelectStateController.setInitialTaskSelect( Intent() /*intent*/, -1 /*stagePosition*/, ItemInfo(), null /*splitEvent*/, - -1 + -1, ) splitSelectStateController.resetState() + verify(recentsView, times(1)).resetDesktopTaskFromSplitSelectState() assertFalse(splitSelectStateController.isSplitSelectActive) } @@ -622,11 +664,26 @@ class SplitSelectStateControllerTest { verify(splitFromDesktopController).onDestroy() } - // Generate GroupTask with default userId. - private fun generateGroupTask( + @Test + fun splitSelectStateControllerDestroyed_doNotResetDeskTopTasks() { + whenever(context.getOverviewPanel>()).thenReturn(recentsView) + splitSelectStateController.setInitialTaskSelect( + Intent(), /*intent*/ + -1, /*stagePosition*/ + ItemInfo(), + null, /*splitEvent*/ + -1, + ) + splitSelectStateController.onDestroy() + splitSelectStateController.resetState() + verify(recentsView, times(0)).resetDesktopTaskFromSplitSelectState() + } + + /** Generates a [SplitTask] with default userId. */ + private fun generateSplitTask( task1ComponentName: ComponentName, - task2ComponentName: ComponentName - ): GroupTask { + task2ComponentName: ComponentName, + ): SplitTask { val task1 = Task() var taskInfo = ActivityManager.RunningTaskInfo() taskInfo.taskId = getUniqueId() @@ -642,20 +699,26 @@ class SplitSelectStateControllerTest { intent.component = task2ComponentName taskInfo.baseIntent = intent task2.key = Task.TaskKey(taskInfo) - return GroupTask( + return SplitTask( task1, task2, - SplitConfigurationOptions.SplitBounds(Rect(), Rect(), -1, -1, SNAP_TO_50_50) + SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ task1.key.id, + /* rightBottomTaskId = */ task2.key.id, + /* snapPosition = */ SNAP_TO_2_50_50, + ), ) } - // Generate GroupTask with custom user handles. - private fun generateGroupTask( + /** Generates a [SplitTask] with custom user handles. */ + private fun generateSplitTask( task1ComponentName: ComponentName, userHandle1: UserHandle, task2ComponentName: ComponentName, - userHandle2: UserHandle - ): GroupTask { + userHandle2: UserHandle, + ): SplitTask { val task1 = Task() var taskInfo = ActivityManager.RunningTaskInfo() taskInfo.taskId = getUniqueId() @@ -674,10 +737,16 @@ class SplitSelectStateControllerTest { intent.component = task2ComponentName taskInfo.baseIntent = intent task2.key = Task.TaskKey(taskInfo) - return GroupTask( + return SplitTask( task1, task2, - SplitConfigurationOptions.SplitBounds(Rect(), Rect(), -1, -1, SNAP_TO_50_50) + SplitBounds( + /* leftTopBounds = */ Rect(), + /* rightBottomBounds = */ Rect(), + /* leftTopTaskId = */ task1.key.id, + /* rightBottomTaskId = */ task2.key.id, + /* snapPosition = */ SNAP_TO_2_50_50, + ), ) } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskGridNavHelperTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskGridNavHelperTest.java deleted file mode 100644 index 7ef4910ce52..00000000000 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskGridNavHelperTest.java +++ /dev/null @@ -1,510 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.quickstep.util; - -import static com.android.quickstep.util.TaskGridNavHelper.CLEAR_ALL_PLACEHOLDER_ID; -import static com.android.quickstep.util.TaskGridNavHelper.INVALID_FOCUSED_TASK_ID; - -import static org.junit.Assert.assertEquals; - -import com.android.launcher3.util.IntArray; - -import org.junit.Test; - -public class TaskGridNavHelperTest { - - @Test - public void equalLengthRows_noFocused_onTop_pressDown_goesToBottom() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 1; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_DOWN; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 2, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onTop_pressUp_goesToBottom() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 1; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_UP; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 2, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onBottom_pressDown_goesToTop() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 2; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_DOWN; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 1, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onBottom_pressUp_goesToTop() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 2; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_UP; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 1, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onTop_pressLeft_goesLeft() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 1; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_LEFT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 3, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onBottom_pressLeft_goesLeft() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 2; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_LEFT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 4, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onTop_secondItem_pressRight_goesRight() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 3; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_RIGHT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 1, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onBottom_secondItem_pressRight_goesRight() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 4; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_RIGHT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 2, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onTop_pressRight_cycleToClearAll() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 1; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_RIGHT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", CLEAR_ALL_PLACEHOLDER_ID, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onBottom_pressRight_cycleToClearAll() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 2; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_RIGHT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", CLEAR_ALL_PLACEHOLDER_ID, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onTop_lastItem_pressLeft_toClearAll() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 5; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_LEFT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", CLEAR_ALL_PLACEHOLDER_ID, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onBottom_lastItem_pressLeft_toClearAll() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 6; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_LEFT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", CLEAR_ALL_PLACEHOLDER_ID, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onClearAll_pressLeft_cycleToFirst() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_LEFT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 1, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onClearAll_pressRight_toLastInBottom() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_RIGHT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 6, nextGridPage); - } - - @Test - public void equalLengthRows_withFocused_onFocused_pressLeft_toTop() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int focusedTaskId = 99; - int currentPageTaskViewId = focusedTaskId; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_LEFT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, focusedTaskId); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 1, nextGridPage); - } - - @Test - public void equalLengthRows_withFocused_onFocused_pressUp_stayOnFocused() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int focusedTaskId = 99; - int currentPageTaskViewId = focusedTaskId; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_UP; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, focusedTaskId); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", focusedTaskId, nextGridPage); - } - - @Test - public void equalLengthRows_withFocused_onFocused_pressDown_stayOnFocused() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int focusedTaskId = 99; - int currentPageTaskViewId = focusedTaskId; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_DOWN; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, focusedTaskId); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", focusedTaskId, nextGridPage); - } - - @Test - public void equalLengthRows_withFocused_onFocused_pressRight_cycleToClearAll() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int focusedTaskId = 99; - int currentPageTaskViewId = focusedTaskId; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_RIGHT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, focusedTaskId); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", CLEAR_ALL_PLACEHOLDER_ID, nextGridPage); - } - - @Test - public void equalLengthRows_withFocused_onClearAll_pressLeft_cycleToFocusedTask() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int focusedTaskId = 99; - int currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_LEFT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, focusedTaskId); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", focusedTaskId, nextGridPage); - } - - @Test - public void longerTopRow_noFocused_atEndTopBeyondBottom_pressDown_stayTop() { - IntArray topIds = IntArray.wrap(1, 3, 5, 7); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 7; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_DOWN; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 7, nextGridPage); - } - - @Test - public void longerTopRow_noFocused_atEndTopBeyondBottom_pressUp_stayTop() { - IntArray topIds = IntArray.wrap(1, 3, 5, 7); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 7; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_UP; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 7, nextGridPage); - } - - @Test - public void longerTopRow_noFocused_atEndBottom_pressLeft_goToTop() { - IntArray topIds = IntArray.wrap(1, 3, 5, 7); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 6; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_LEFT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 7, nextGridPage); - } - - @Test - public void longerTopRow_noFocused_atClearAll_pressRight_goToLonger() { - IntArray topIds = IntArray.wrap(1, 3, 5, 7); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_RIGHT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 7, nextGridPage); - } - - @Test - public void longerBottomRow_noFocused_atClearAll_pressRight_goToLonger() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6, 7); - int currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_RIGHT; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 7, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onTop_pressTab_goesToBottom() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 1; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_TAB; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 2, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onBottom_pressTab_goesToNextTop() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 2; - int delta = 1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_TAB; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 3, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onTop_pressTabWithShift_goesToPreviousBottom() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 3; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_TAB; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 2, nextGridPage); - } - - @Test - public void equalLengthRows_noFocused_onBottom_pressTabWithShift_goesToTop() { - IntArray topIds = IntArray.wrap(1, 3, 5); - IntArray bottomIds = IntArray.wrap(2, 4, 6); - int currentPageTaskViewId = 2; - int delta = -1; - @TaskGridNavHelper.TASK_NAV_DIRECTION int direction = TaskGridNavHelper.DIRECTION_TAB; - boolean cycle = true; - TaskGridNavHelper taskGridNavHelper = - new TaskGridNavHelper(topIds, bottomIds, INVALID_FOCUSED_TASK_ID); - - int nextGridPage = - taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle); - - assertEquals("Wrong next page returned.", 1, nextGridPage); - } -} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskGridNavHelperTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskGridNavHelperTest.kt new file mode 100644 index 00000000000..f776b94cd0c --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskGridNavHelperTest.kt @@ -0,0 +1,869 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.util + +import com.android.launcher3.util.IntArray +import com.android.quickstep.util.TaskGridNavHelper.Companion.ADD_DESK_PLACEHOLDER_ID +import com.android.quickstep.util.TaskGridNavHelper.Companion.CLEAR_ALL_PLACEHOLDER_ID +import com.android.quickstep.util.TaskGridNavHelper.TaskNavDirection.DOWN +import com.android.quickstep.util.TaskGridNavHelper.TaskNavDirection.LEFT +import com.android.quickstep.util.TaskGridNavHelper.TaskNavDirection.RIGHT +import com.android.quickstep.util.TaskGridNavHelper.TaskNavDirection.TAB +import com.android.quickstep.util.TaskGridNavHelper.TaskNavDirection.UP +import com.google.common.truth.Truth.assertThat +import org.junit.Test + +class TaskGridNavHelperTest { + + /* + 5 3 1 + CLEAR_ALL ↓ + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onTop_pressDown_goesToBottom() { + assertThat(getNextGridPage(currentPageTaskViewId = 1, DOWN, delta = 1)).isEqualTo(2) + } + + /* ↑----→ + 5 3 1 | + CLEAR_ALL | + 6 4 2←---| + */ + @Test + fun equalLengthRows_noFocused_onTop_pressUp_goesToBottom() { + assertThat(getNextGridPage(currentPageTaskViewId = 1, UP, delta = 1)).isEqualTo(2) + } + + /* ↓----↑ + 5 3 1 | + CLEAR_ALL | + 6 4 2 | + ↓----→ + */ + @Test + fun equalLengthRows_noFocused_onBottom_pressDown_goesToTop() { + assertThat(getNextGridPage(currentPageTaskViewId = 2, DOWN, delta = 1)).isEqualTo(1) + } + + /* + 5 3 1 + CLEAR_ALL ↑ + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onBottom_pressUp_goesToTop() { + assertThat(getNextGridPage(currentPageTaskViewId = 2, UP, delta = 1)).isEqualTo(1) + } + + /* + 5 3<--1 + CLEAR_ALL + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onTop_pressLeft_goesLeft() { + assertThat(getNextGridPage(currentPageTaskViewId = 1, LEFT, delta = 1)).isEqualTo(3) + } + + /* + 5 3 1 + CLEAR_ALL + 6 4<--2 + */ + @Test + fun equalLengthRows_noFocused_onBottom_pressLeft_goesLeft() { + assertThat(getNextGridPage(currentPageTaskViewId = 2, LEFT, delta = 1)).isEqualTo(4) + } + + /* + 5 3-->1 + CLEAR_ALL + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onTop_secondItem_pressRight_goesRight() { + assertThat(getNextGridPage(currentPageTaskViewId = 3, RIGHT, delta = -1)).isEqualTo(1) + } + + /* + 5 3 1 + CLEAR_ALL + 6 4-->2 + */ + @Test + fun equalLengthRows_noFocused_onBottom_secondItem_pressRight_goesRight() { + assertThat(getNextGridPage(currentPageTaskViewId = 4, RIGHT, delta = -1)).isEqualTo(2) + } + + /* + ↓------------------← + | | + ↓ 5 3 1---→ + CLEAR_ALL + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onTop_pressRight_cycleToClearAll() { + assertThat(getNextGridPage(currentPageTaskViewId = 1, RIGHT, delta = -1)) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + ↓------------------← + | ↑ + ↓ 5 3 1 | + CLEAR_ALL ↑ + 6 4 2---→ + */ + @Test + fun equalLengthRows_noFocused_onBottom_pressRight_cycleToClearAll() { + assertThat(getNextGridPage(currentPageTaskViewId = 2, RIGHT, delta = -1)) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + ←----5 3 1 + ↓ + CLEAR_ALL + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onTop_lastItem_pressLeft_toClearAll() { + assertThat(getNextGridPage(currentPageTaskViewId = 5, LEFT, delta = 1)) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + 5 3 1 + CLEAR_ALL + ↑ + ←---6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onBottom_lastItem_pressLeft_toClearAll() { + assertThat(getNextGridPage(currentPageTaskViewId = 6, LEFT, delta = 1)) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + |→-----------------------| + | ↓ + ↑ 5 3 1 + ←------CLEAR_ALL + + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onClearAll_pressLeft_cycleToFirst() { + assertThat( + getNextGridPage(currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID, LEFT, delta = 1) + ) + .isEqualTo(1) + } + + /* + 5 3 1 + CLEAR_ALL--↓ + | + |--→6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onClearAll_pressRight_toLastInBottom() { + assertThat( + getNextGridPage(currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID, RIGHT, delta = -1) + ) + .isEqualTo(6) + } + + /* + 5 3 1←--- + ↑ + CLEAR_ALL ←--FOCUSED_TASK + 6 4 2 + */ + @Test + fun equalLengthRows_withFocused_onFocused_pressLeft_toTop() { + assertThat( + getNextGridPage( + currentPageTaskViewId = FOCUSED_TASK_ID, + LEFT, + delta = 1, + largeTileIds = listOf(FOCUSED_TASK_ID), + ) + ) + .isEqualTo(1) + } + + /* + 5 3 1 + ←--↑ + CLEAR_ALL ↓-→FOCUSED_TASK + 6 4 2 + */ + @Test + fun equalLengthRows_withFocused_onFocused_pressUp_stayOnFocused() { + assertThat( + getNextGridPage( + currentPageTaskViewId = FOCUSED_TASK_ID, + UP, + delta = 1, + largeTileIds = listOf(FOCUSED_TASK_ID), + ) + ) + .isEqualTo(FOCUSED_TASK_ID) + } + + /* + 5 3 1 + CLEAR_ALL ↑--→FOCUSED_TASK + ↑←--↓ + 6 4 2 + */ + + @Test + fun equalLengthRows_withFocused_onFocused_pressDown_stayOnFocused() { + + assertThat( + getNextGridPage( + currentPageTaskViewId = FOCUSED_TASK_ID, + DOWN, + delta = 1, + largeTileIds = listOf(FOCUSED_TASK_ID), + ) + ) + .isEqualTo(FOCUSED_TASK_ID) + } + + /* + ↓-------------------------------←| + | ↑ + ↓ 5 3 1 | + CLEAR_ALL FOCUSED_TASK--→ + 6 4 2 + */ + @Test + fun equalLengthRows_withFocused_onFocused_pressRight_cycleToClearAll() { + + assertThat( + getNextGridPage( + currentPageTaskViewId = FOCUSED_TASK_ID, + RIGHT, + delta = -1, + largeTileIds = listOf(FOCUSED_TASK_ID), + ) + ) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + |→---------------------------| + | | + ↑ 5 3 1 ↓ + ←------CLEAR_ALL FOCUSED_TASK + + 6 4 2 + */ + @Test + fun equalLengthRows_withFocused_onClearAll_pressLeft_cycleToFocusedTask() { + + assertThat( + getNextGridPage( + currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID, + LEFT, + delta = 1, + largeTileIds = listOf(FOCUSED_TASK_ID), + ) + ) + .isEqualTo(FOCUSED_TASK_ID) + } + + /* + 7←-↑ 5 3 1 + ↓--→ + CLEAR_ALL + 6 4 2 + */ + @Test + fun longerTopRow_noFocused_atEndTopBeyondBottom_pressDown_stayTop() { + assertThat( + getNextGridPage( + currentPageTaskViewId = 7, + DOWN, + delta = 1, + topIds = IntArray.wrap(1, 3, 5, 7), + ) + ) + .isEqualTo(7) + } + + /* + ←--↑ + ↓-→7 5 3 1 + CLEAR_ALL + 6 4 2 + */ + @Test + fun longerTopRow_noFocused_atEndTopBeyondBottom_pressUp_stayTop() { + assertThat( + getNextGridPage( + /* topIds = */ currentPageTaskViewId = 7, + UP, + delta = 1, + topIds = IntArray.wrap(1, 3, 5, 7), + ) + ) + .isEqualTo(7) + } + + /* + 7 5 3 1 + CLEAR_ALL ↑ + ←----6 4 2 + */ + @Test + fun longerTopRow_noFocused_atEndBottom_pressLeft_goToTop() { + assertThat( + getNextGridPage( + /* topIds = */ currentPageTaskViewId = 6, + LEFT, + delta = 1, + topIds = IntArray.wrap(1, 3, 5, 7), + ) + ) + .isEqualTo(7) + } + + /* + 7 5 3 1 + ↑ + CLEAR_ALL-----→ + 6 4 2 + */ + @Test + fun longerTopRow_noFocused_atClearAll_pressRight_goToLonger() { + assertThat( + getNextGridPage( + /* topIds = */ currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID, + RIGHT, + delta = -1, + topIds = IntArray.wrap(1, 3, 5, 7), + ) + ) + .isEqualTo(7) + } + + /* + 5 3 1 + CLEAR_ALL-----→ + ↓ + 7 6 4 2 + */ + @Test + fun longerBottomRow_noFocused_atClearAll_pressRight_goToLonger() { + assertThat( + getNextGridPage( + currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID, + RIGHT, + delta = -1, + bottomIds = IntArray.wrap(2, 4, 6, 7), + ) + ) + .isEqualTo(7) + } + + /* + 5 3 1 + CLEAR_ALL ↓ + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onTop_pressTab_goesToBottom() { + assertThat(getNextGridPage(currentPageTaskViewId = 1, TAB, delta = 1)).isEqualTo(2) + } + + /* + 5 3 1 + CLEAR_ALL ↑ + ←---↑ + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onBottom_pressTab_goesToNextTop() { + assertThat(getNextGridPage(currentPageTaskViewId = 2, TAB, delta = 1)).isEqualTo(3) + } + + /* + 5 3 1 + CLEAR_ALL ↓ + ----→ + ↓ + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onTop_pressTabWithShift_goesToPreviousBottom() { + assertThat(getNextGridPage(currentPageTaskViewId = 3, TAB, delta = -1)).isEqualTo(2) + } + + /* + 5 3 1 + CLEAR_ALL ↑ + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onBottom_pressTabWithShift_goesToTop() { + assertThat(getNextGridPage(currentPageTaskViewId = 2, TAB, delta = -1)).isEqualTo(1) + } + + /* + 5 3 [1] + CLEAR_ALL + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onTop_pressTabWithShift_noCycle_staysOnTop() { + assertThat(getNextGridPage(currentPageTaskViewId = 1, TAB, delta = -1, cycle = false)) + .isEqualTo(1) + } + + /* + 5 3 1 + [CLEAR_ALL] + 6 4 2 + */ + @Test + fun equalLengthRows_noFocused_onClearAll_pressTab_noCycle_staysOnClearAll() { + assertThat( + getNextGridPage( + currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID, + TAB, + delta = 1, + cycle = false, + ) + ) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + 5 3 1 + CLEAR_ALL FOCUSED_TASK←--DESKTOP + 6 4 2 + */ + @Test + fun withLargeTile_pressLeftFromDesktopTask_goesToFocusedTask() { + assertThat( + getNextGridPage( + currentPageTaskViewId = DESKTOP_TASK_ID, + LEFT, + delta = 1, + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(FOCUSED_TASK_ID) + } + + /* + 5 3 1 + CLEAR_ALL FOCUSED_TASK--→DESKTOP + 6 4 2 + */ + @Test + fun withLargeTile_pressRightFromFocusedTask_goesToDesktopTask() { + assertThat( + getNextGridPage( + currentPageTaskViewId = FOCUSED_TASK_ID, + RIGHT, + delta = -1, + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(DESKTOP_TASK_ID) + } + + /* + ↓-----------------------------------------←| + | | + ↓ 5 3 1 ↑ + CLEAR_ALL FOCUSED_TASK DESKTOP--→ + 6 4 2 + */ + @Test + fun withLargeTile_pressRightFromDesktopTask_goesToClearAll() { + assertThat( + getNextGridPage( + currentPageTaskViewId = DESKTOP_TASK_ID, + RIGHT, + delta = -1, + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + |→-------------------------------------------| + | | + ↑ 5 3 1 ↓ + ←------CLEAR_ALL FOCUSED_TASK DESKTOP + + 6 4 2 + */ + @Test + fun withLargeTile_pressLeftFromClearAll_goesToDesktopTask() { + assertThat( + getNextGridPage( + currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID, + LEFT, + delta = 1, + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(DESKTOP_TASK_ID) + } + + /* + 5 3 1 + CLEAR_ALL FOCUSED_TASK DESKTOP + ↑ + 6 4 2→----↑ + */ + @Test + fun withLargeTile_pressRightFromBottom_goesToLargeTile() { + assertThat( + getNextGridPage( + currentPageTaskViewId = 2, + RIGHT, + delta = -1, + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(FOCUSED_TASK_ID) + } + + /* + 5 3 1→----| + ↓ + CLEAR_ALL FOCUSED_TASK DESKTOP + 6 4 2 + */ + @Test + fun withLargeTile_pressRightFromTop_goesToLargeTile() { + assertThat( + getNextGridPage( + currentPageTaskViewId = 1, + RIGHT, + delta = -1, + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(FOCUSED_TASK_ID) + } + + /* + 5 3 1 + + CLEAR_ALL FOCUSED_TASK←---DESKTOP + 6 4 2 + */ + @Test + fun withLargeTile_pressTabFromDeskTop_goesToFocusedTask() { + assertThat( + getNextGridPage( + currentPageTaskViewId = DESKTOP_TASK_ID, + TAB, + delta = 1, + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(FOCUSED_TASK_ID) + } + + /* + CLEAR_ALL FOCUSED_TASK DESKTOP + ↓ + 2←----↓ + */ + @Test + fun withLargeTile_pressLeftFromLargeTile_goesToBottom() { + assertThat( + getNextGridPage( + currentPageTaskViewId = FOCUSED_TASK_ID, + LEFT, + delta = 1, + topIds = IntArray(), + bottomIds = IntArray.wrap(2), + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(2) + } + + /* + ↓-----------------------------------------←| + | | + ↓ 5 3 1 ↑ + CLEAR_ALL FOCUSED_TASK DESKTOP--→ + 6 4 2 + */ + @Test + fun withLargeTile_pressShiftTabFromDeskTop_goesToClearAll() { + assertThat( + getNextGridPage( + currentPageTaskViewId = DESKTOP_TASK_ID, + TAB, + delta = -1, + largeTileIds = listOf(DESKTOP_TASK_ID, FOCUSED_TASK_ID), + ) + ) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + 5 3 1→----| + ↓ + CLEAR_ALL ADD_DESKTOP + 6 4 2 + */ + @Test + fun withAddDesktopButton_pressRightFromTop_goesToAddDesktopButton() { + assertThat( + getNextGridPage( + currentPageTaskViewId = 1, + RIGHT, + delta = -1, + hasAddDesktopButton = true, + ) + ) + .isEqualTo(ADD_DESK_PLACEHOLDER_ID) + } + + /* + 5 3 1 + CLEAR_ALL ADD_DESKTOP + ↑ + 6 4 2→----↑ + */ + @Test + fun withAddDesktopButton_pressRightFromBottom_goesToAddDesktopButton() { + assertThat( + getNextGridPage( + currentPageTaskViewId = 2, + RIGHT, + delta = -1, + hasAddDesktopButton = true, + ) + ) + .isEqualTo(ADD_DESK_PLACEHOLDER_ID) + } + + /* + ↓-------------------------------←| + | ↑ + ↓ 5 3 1 | + CLEAR_ALL ADD_DESKTOP--→ + 6 4 2 + */ + @Test + fun withAddDesktopButton_pressRightFromAddDesktopButton_goesToClearAllButton() { + assertThat( + getNextGridPage( + currentPageTaskViewId = ADD_DESK_PLACEHOLDER_ID, + RIGHT, + delta = -1, + hasAddDesktopButton = true, + ) + ) + .isEqualTo(CLEAR_ALL_PLACEHOLDER_ID) + } + + /* + |→--------------------------------| + | | + ↑ 5 3 1 ↓ + ←------CLEAR_ALL ADD_DESKTOP + + 6 4 2 + */ + @Test + fun withAddDesktopButton_pressLeftFromClearAllButton_goesToAddDesktopButton() { + assertThat( + getNextGridPage( + currentPageTaskViewId = CLEAR_ALL_PLACEHOLDER_ID, + LEFT, + delta = 1, + hasAddDesktopButton = true, + ) + ) + .isEqualTo(ADD_DESK_PLACEHOLDER_ID) + } + + /* + 5 3 1 + ←--↑ + CLEAR_ALL ↓-→ADD_DESKTOP + 6 4 2 + */ + @Test + fun withAddDesktopButton_pressUpOnAddDesktop_stayOnAddDesktopButton() { + assertThat( + getNextGridPage( + currentPageTaskViewId = ADD_DESK_PLACEHOLDER_ID, + UP, + delta = 1, + hasAddDesktopButton = true, + ) + ) + .isEqualTo(ADD_DESK_PLACEHOLDER_ID) + } + + /* + 5 3 1 + CLEAR_ALL ↑--→ADD_DESKTOP + ↑←--↓ + 6 4 2 + */ + @Test + fun withAddDesktopButton_pressDownOnAddDesktop_stayOnAddDesktopButton() { + assertThat( + getNextGridPage( + currentPageTaskViewId = ADD_DESK_PLACEHOLDER_ID, + DOWN, + delta = 1, + hasAddDesktopButton = true, + ) + ) + .isEqualTo(ADD_DESK_PLACEHOLDER_ID) + } + + /* + 5 3 1 + CLEAR_ALL DESKTOP--→ADD_DESKTOP + 6 4 2 + */ + @Test + fun withAddDesktopButton_pressRightFromDesktopTask_goesToAddDesktopButton() { + assertThat( + getNextGridPage( + currentPageTaskViewId = ADD_DESK_PLACEHOLDER_ID, + LEFT, + delta = 1, + largeTileIds = listOf(DESKTOP_TASK_ID), + hasAddDesktopButton = true, + ) + ) + .isEqualTo(DESKTOP_TASK_ID) + } + + /* + 5 3 1 + CLEAR_ALL DESKTOP←--ADD_DESKTOP + 6 4 2 + */ + @Test + fun withAddDesktopButton_pressLeftFromAddDesktopButton_goesToDesktopTask() { + assertThat( + getNextGridPage( + currentPageTaskViewId = DESKTOP_TASK_ID, + RIGHT, + delta = -1, + largeTileIds = listOf(DESKTOP_TASK_ID), + hasAddDesktopButton = true, + ) + ) + .isEqualTo(ADD_DESK_PLACEHOLDER_ID) + } + + /* + 5 3 1 | + CLEAR_ALL | Invalid ID: + 6 4 2 | [25] --> [25] + */ + @Test + fun nextGridPage_invalidId_pressTab_noCycle_returnsCurrentPage() { + assertThat(getNextGridPage(currentPageTaskViewId = 25, TAB, delta = -1, cycle = false)) + .isEqualTo(25) + } + + // Col offset: 0 1 2 + // ----------- + // ID grid: 4 2 0 start + // end [5] 3 1 + @Test + fun gridTaskViewIdOffsetPairInTabOrderSequence_towardsStart() { + val expected = listOf(Pair(4, 0), Pair(3, 1), Pair(2, 1), Pair(1, 2), Pair(0, 2)) + assertThat( + gridTaskViewIdOffsetPairInTabOrderSequence( + initialTaskViewId = 5, + towardsStart = true, + ) + .toList() + ) + .isEqualTo(expected) + } + + // Col offset: 2 1 0 + // ----------- + // ID grid: 4 2 [0] start + // end 5 3 1 + @Test + fun gridTaskViewIdOffsetPairInTabOrderSequence_towardsEnd() { + val expected = listOf(Pair(1, 0), Pair(2, 1), Pair(3, 1), Pair(4, 2), Pair(5, 2)) + assertThat( + gridTaskViewIdOffsetPairInTabOrderSequence( + initialTaskViewId = 0, + towardsStart = false, + ) + .toList() + ) + .isEqualTo(expected) + } + + private fun getNextGridPage( + currentPageTaskViewId: Int, + direction: TaskGridNavHelper.TaskNavDirection, + delta: Int, + topIds: IntArray = IntArray.wrap(1, 3, 5), + bottomIds: IntArray = IntArray.wrap(2, 4, 6), + largeTileIds: List = emptyList(), + hasAddDesktopButton: Boolean = false, + cycle: Boolean = true, + ): Int { + val taskGridNavHelper = + TaskGridNavHelper(topIds, bottomIds, largeTileIds, hasAddDesktopButton) + return taskGridNavHelper.getNextGridPage(currentPageTaskViewId, delta, direction, cycle) + } + + private fun gridTaskViewIdOffsetPairInTabOrderSequence( + initialTaskViewId: Int, + towardsStart: Boolean, + topIds: IntArray = IntArray.wrap(0, 2, 4), + bottomIds: IntArray = IntArray.wrap(1, 3, 5), + largeTileIds: List = emptyList(), + hasAddDesktopButton: Boolean = false, + ): Sequence> { + val taskGridNavHelper = + TaskGridNavHelper(topIds, bottomIds, largeTileIds, hasAddDesktopButton) + return taskGridNavHelper.gridTaskViewIdOffsetPairInTabOrderSequence( + initialTaskViewId, + towardsStart, + ) + } + + private companion object { + const val FOCUSED_TASK_ID = 99 + const val DESKTOP_TASK_ID = 100 + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskViewSimulatorTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskViewSimulatorTest.java index 72cfd92b867..060f13f1e2a 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskViewSimulatorTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TaskViewSimulatorTest.java @@ -35,20 +35,27 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.dagger.LauncherAppComponent; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.util.AllModulesMinusWMProxy; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.DisplayController.Info; -import com.android.launcher3.util.LauncherModelHelper; import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.RotationUtils; +import com.android.launcher3.util.SandboxApplication; import com.android.launcher3.util.WindowBounds; import com.android.launcher3.util.window.CachedDisplayInfo; import com.android.launcher3.util.window.WindowManagerProxy; import com.android.quickstep.FallbackActivityInterface; import com.android.quickstep.util.SurfaceTransaction.MockProperties; +import dagger.BindsInstance; +import dagger.Component; + import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -59,6 +66,8 @@ @RunWith(AndroidJUnit4.class) public class TaskViewSimulatorTest { + @Rule public final SandboxApplication app = new SandboxApplication(); + @Test public void taskProperlyScaled_portrait_noRotation_sameInsets1() { new TaskMatrixVerifier() @@ -117,7 +126,7 @@ public void taskProperlyScaled_landscape_rotated() { .verifyNoTransforms(); } - private static class TaskMatrixVerifier extends TransformParams { + private class TaskMatrixVerifier extends TransformParams { private Point mDisplaySize = new Point(); private int mDensityDpi = DisplayMetrics.DENSITY_DEFAULT; @@ -157,71 +166,67 @@ TaskMatrixVerifier withAppBounds(Rect bounds, Rect insets, int appRotation) { } void verifyNoTransforms() { - LauncherModelHelper helper = new LauncherModelHelper(); - try { - int rotation = mDisplaySize.x > mDisplaySize.y - ? Surface.ROTATION_90 : Surface.ROTATION_0; - CachedDisplayInfo cdi = new CachedDisplayInfo(mDisplaySize, rotation); - WindowBounds wm = new WindowBounds( - new Rect(0, 0, mDisplaySize.x, mDisplaySize.y), - mDisplayInsets); - List allBounds = new ArrayList<>(4); - for (int i = 0; i < 4; i++) { - Rect boundsR = new Rect(wm.bounds); - Rect insetsR = new Rect(wm.insets); - - RotationUtils.rotateRect(insetsR, RotationUtils.deltaRotation(rotation, i)); - RotationUtils.rotateRect(boundsR, RotationUtils.deltaRotation(rotation, i)); - boundsR.set(0, 0, Math.abs(boundsR.width()), Math.abs(boundsR.height())); - allBounds.add(new WindowBounds(boundsR, insetsR)); - } - - WindowManagerProxy wmProxy = mock(WindowManagerProxy.class); - doReturn(cdi).when(wmProxy).getDisplayInfo(any()); - doReturn(wm).when(wmProxy).getRealBounds(any(), any()); - doReturn(NavigationMode.NO_BUTTON).when(wmProxy).getNavigationMode(any()); - - ArrayMap> perDisplayBoundsCache = - new ArrayMap<>(); - perDisplayBoundsCache.put(cdi.normalize(wmProxy), allBounds); - - Configuration configuration = new Configuration(); - configuration.densityDpi = mDensityDpi; - Context configurationContext = helper.sandboxContext.createConfigurationContext( - configuration); - - DisplayController.Info info = new Info( - configurationContext, wmProxy, perDisplayBoundsCache); - - DisplayController mockController = mock(DisplayController.class); - when(mockController.getInfo()).thenReturn(info); - helper.sandboxContext.putObject(DisplayController.INSTANCE, mockController); - - mDeviceProfile = InvariantDeviceProfile.INSTANCE.get(helper.sandboxContext) - .getBestMatch(mAppBounds.width(), mAppBounds.height(), rotation); - mDeviceProfile.updateInsets(mLauncherInsets); - - TaskViewSimulator tvs = new TaskViewSimulator(helper.sandboxContext, - FallbackActivityInterface.INSTANCE); - tvs.setDp(mDeviceProfile); - - int launcherRotation = info.rotation; - if (mAppRotation < 0) { - mAppRotation = launcherRotation; - } - - tvs.getOrientationState().update(launcherRotation, mAppRotation); - if (mAppInsets == null) { - mAppInsets = new Rect(mLauncherInsets); - } - tvs.setPreviewBounds(mAppBounds, mAppInsets); - - tvs.fullScreenProgress.value = 1; - tvs.recentsViewScale.value = tvs.getFullScreenScale(); - tvs.apply(this); - } finally { - helper.destroy(); + DisplayController mockController = mock(DisplayController.class); + + app.initDaggerComponent( + DaggerTaskViewSimulatorTest_TaskViewSimulatorTestComponent.builder() + .bindDisplayController(mockController)); + int rotation = mDisplaySize.x > mDisplaySize.y + ? Surface.ROTATION_90 : Surface.ROTATION_0; + CachedDisplayInfo cdi = new CachedDisplayInfo(mDisplaySize, rotation); + WindowBounds wm = new WindowBounds( + new Rect(0, 0, mDisplaySize.x, mDisplaySize.y), + mDisplayInsets); + List allBounds = new ArrayList<>(4); + for (int i = 0; i < 4; i++) { + Rect boundsR = new Rect(wm.bounds); + Rect insetsR = new Rect(wm.insets); + + RotationUtils.rotateRect(insetsR, RotationUtils.deltaRotation(rotation, i)); + RotationUtils.rotateRect(boundsR, RotationUtils.deltaRotation(rotation, i)); + boundsR.set(0, 0, Math.abs(boundsR.width()), Math.abs(boundsR.height())); + allBounds.add(new WindowBounds(boundsR, insetsR)); + } + + WindowManagerProxy wmProxy = mock(WindowManagerProxy.class); + doReturn(cdi).when(wmProxy).getDisplayInfo(any()); + doReturn(wm).when(wmProxy).getRealBounds(any(), any()); + doReturn(NavigationMode.NO_BUTTON).when(wmProxy).getNavigationMode(any()); + + ArrayMap> perDisplayBoundsCache = + new ArrayMap<>(); + perDisplayBoundsCache.put(cdi.normalize(wmProxy), allBounds); + + Configuration configuration = new Configuration(); + configuration.densityDpi = mDensityDpi; + Context configurationContext = app.createConfigurationContext(configuration); + + DisplayController.Info info = new Info( + configurationContext, false, wmProxy, perDisplayBoundsCache, mDensityDpi); + when(mockController.getInfo()).thenReturn(info); + + mDeviceProfile = InvariantDeviceProfile.INSTANCE.get(app) + .getBestMatch(mAppBounds.width(), mAppBounds.height(), rotation); + mDeviceProfile.updateInsets(mLauncherInsets); + + TaskViewSimulator tvs = new TaskViewSimulator(app, + FallbackActivityInterface.INSTANCE, false, 0); + tvs.setDp(mDeviceProfile); + + int launcherRotation = info.rotation; + if (mAppRotation < 0) { + mAppRotation = launcherRotation; } + + tvs.getOrientationState().update(launcherRotation, mAppRotation); + if (mAppInsets == null) { + mAppInsets = new Rect(mLauncherInsets); + } + tvs.setPreviewBounds(mAppBounds, mAppInsets); + + tvs.fullScreenProgress.value = 1; + tvs.recentsViewScale.value = tvs.getFullScreenScale(); + tvs.apply(this); } @Override @@ -271,4 +276,18 @@ public void describeTo(Description description) { description.appendValue(mExpected); } } + + @LauncherAppSingleton + @Component(modules = {AllModulesMinusWMProxy.class}) + interface TaskViewSimulatorTestComponent extends LauncherAppComponent { + + @Component.Builder + interface Builder extends LauncherAppComponent.Builder { + + @BindsInstance + Builder bindDisplayController(DisplayController controller); + + TaskViewSimulatorTestComponent build(); + } + } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TestExtensions.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TestExtensions.kt new file mode 100644 index 00000000000..6c526a4855b --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TestExtensions.kt @@ -0,0 +1,65 @@ +/* + * 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.quickstep.util + +import com.android.launcher3.BuildConfig +import com.android.launcher3.util.SafeCloseable +import com.android.quickstep.DeviceConfigWrapper.Companion.configHelper +import com.android.quickstep.util.DeviceConfigHelper.Companion.prefs +import java.util.concurrent.CountDownLatch +import java.util.function.BooleanSupplier +import org.junit.Assert +import org.junit.Assume + +/** Helper methods for testing */ +object TestExtensions { + + @JvmStatic + fun overrideNavConfigFlag( + key: String, + value: Boolean, + targetValue: BooleanSupplier + ): AutoCloseable { + Assume.assumeTrue(BuildConfig.IS_DEBUG_DEVICE) + if (targetValue.asBoolean == value) { + return AutoCloseable {} + } + + navConfigEditWatcher().let { + prefs.edit().putBoolean(key, value).commit() + it.close() + } + Assert.assertEquals(value, targetValue.asBoolean) + + val watcher = navConfigEditWatcher() + return AutoCloseable { + prefs.edit().remove(key).commit() + watcher.close() + } + } + + private fun navConfigEditWatcher(): SafeCloseable { + val wait = CountDownLatch(1) + val listener = Runnable { wait.countDown() } + configHelper.addChangeListener(listener) + + return SafeCloseable { + wait.await() + configHelper.removeChangeListener(listener) + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TransformParamsTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TransformParamsTest.kt new file mode 100644 index 00000000000..e1b31543a8a --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TransformParamsTest.kt @@ -0,0 +1,191 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.util + +import android.app.ActivityManager.RunningTaskInfo +import android.app.WindowConfiguration +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD +import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM +import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.RemoteAnimationTarget +import android.view.SurfaceControl +import android.view.WindowManager.TRANSIT_OPEN +import android.window.TransitionInfo +import android.window.TransitionInfo.Change +import android.window.TransitionInfo.FLAG_NONE +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.quickstep.RemoteAnimationTargets +import com.android.quickstep.util.TransformParams.BuilderProxy.NO_OP +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +class TransformParamsTest { + private val surfaceTransaction = mock() + private val transaction = mock() + private val transformParams = TransformParams(::surfaceTransaction) + + private val freeformTaskInfo1 = + createTaskInfo(taskId = 1, windowingMode = WINDOWING_MODE_FREEFORM) + private val freeformTaskInfo2 = + createTaskInfo(taskId = 2, windowingMode = WINDOWING_MODE_FREEFORM) + private val fullscreenTaskInfo1 = + createTaskInfo(taskId = 1, windowingMode = WINDOWING_MODE_FULLSCREEN) + + @get:Rule val setFlagsRule: SetFlagsRule = SetFlagsRule() + + @Before + fun setUp() { + whenever(surfaceTransaction.transaction).thenReturn(transaction) + whenever(surfaceTransaction.forSurface(anyOrNull())) + .thenReturn(mock()) + transformParams.setCornerRadius(CORNER_RADIUS) + } + + @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX) + fun createSurfaceParams_freeformTasks_overridesCornerRadius() { + val transitionInfo = TransitionInfo(TRANSIT_OPEN, FLAG_NONE) + val leash1 = mock() + val leash2 = mock() + transitionInfo.addChange(createChange(freeformTaskInfo1, leash = leash1)) + transitionInfo.addChange(createChange(freeformTaskInfo2, leash = leash2)) + transformParams.setTransitionInfo(transitionInfo) + transformParams.setTargetSet(createTargetSet(listOf(freeformTaskInfo1, freeformTaskInfo2))) + + transformParams.createSurfaceParams(NO_OP) + + verify(transaction).setCornerRadius(leash1, 0f) + verify(transaction).setCornerRadius(leash2, 0f) + } + + @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX) + fun createSurfaceParams_freeformTasks_overridesCornerRadiusOnlyOnce() { + val transitionInfo = TransitionInfo(TRANSIT_OPEN, FLAG_NONE) + val leash1 = mock() + val leash2 = mock() + transitionInfo.addChange(createChange(freeformTaskInfo1, leash = leash1)) + transitionInfo.addChange(createChange(freeformTaskInfo2, leash = leash2)) + transformParams.setTransitionInfo(transitionInfo) + transformParams.setTargetSet(createTargetSet(listOf(freeformTaskInfo1, freeformTaskInfo2))) + transformParams.createSurfaceParams(NO_OP) + + transformParams.createSurfaceParams(NO_OP) + + verify(transaction).setCornerRadius(leash1, 0f) + verify(transaction).setCornerRadius(leash2, 0f) + } + + @Test + @DisableFlags(FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX) + fun createSurfaceParams_flagDisabled_doesntOverrideCornerRadius() { + val transitionInfo = TransitionInfo(TRANSIT_OPEN, FLAG_NONE) + val leash1 = mock() + val leash2 = mock() + transitionInfo.addChange(createChange(freeformTaskInfo1, leash = leash1)) + transitionInfo.addChange(createChange(freeformTaskInfo2, leash = leash2)) + transformParams.setTransitionInfo(transitionInfo) + transformParams.setTargetSet(createTargetSet(listOf(freeformTaskInfo1, freeformTaskInfo2))) + + transformParams.createSurfaceParams(NO_OP) + + verify(transaction, never()).setCornerRadius(leash1, 0f) + verify(transaction, never()).setCornerRadius(leash2, 0f) + } + + @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX) + fun createSurfaceParams_fullscreenTasks_doesntOverrideCornerRadius() { + val transitionInfo = TransitionInfo(TRANSIT_OPEN, FLAG_NONE) + val leash = mock() + transitionInfo.addChange(createChange(fullscreenTaskInfo1, leash = leash)) + transformParams.setTransitionInfo(transitionInfo) + transformParams.setTargetSet(createTargetSet(listOf(fullscreenTaskInfo1))) + + transformParams.createSurfaceParams(NO_OP) + + verify(transaction, never()).setCornerRadius(leash, 0f) + } + + private fun createTargetSet(taskInfos: List): RemoteAnimationTargets { + val remoteAnimationTargets = mutableListOf() + taskInfos.map { remoteAnimationTargets.add(createRemoteAnimationTarget(it)) } + return RemoteAnimationTargets( + remoteAnimationTargets.toTypedArray(), + /* wallpapers= */ null, + /* nonApps= */ null, + /* targetMode= */ TRANSIT_OPEN, + ) + } + + private fun createRemoteAnimationTarget(taskInfo: RunningTaskInfo): RemoteAnimationTarget { + val windowConfig = mock() + whenever(windowConfig.activityType).thenReturn(ACTIVITY_TYPE_STANDARD) + return RemoteAnimationTarget( + taskInfo.taskId, + /* mode= */ TRANSIT_OPEN, + /* leash= */ null, + /* isTranslucent= */ false, + /* clipRect= */ null, + /* contentInsets= */ null, + /* prefixOrderIndex= */ 0, + /* position= */ null, + /* localBounds= */ null, + /* screenSpaceBounds= */ null, + windowConfig, + /* isNotInRecents= */ false, + /* startLeash= */ null, + /* startBounds= */ null, + taskInfo, + /* allowEnterPip= */ false, + ) + } + + private fun createTaskInfo(taskId: Int, windowingMode: Int): RunningTaskInfo { + val taskInfo = RunningTaskInfo() + taskInfo.taskId = taskId + taskInfo.configuration.windowConfiguration.windowingMode = windowingMode + return taskInfo + } + + private fun createChange(taskInfo: RunningTaskInfo, leash: SurfaceControl): Change { + val taskInfo = createTaskInfo(taskInfo.taskId, taskInfo.windowingMode) + val change = Change(taskInfo.token, mock()) + change.mode = TRANSIT_OPEN + change.taskInfo = taskInfo + change.leash = leash + return change + } + + private companion object { + private const val CORNER_RADIUS = 30f + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/views/FloatingDesktopTaskViewTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/views/FloatingDesktopTaskViewTest.kt new file mode 100644 index 00000000000..319123ffccc --- /dev/null +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/views/FloatingDesktopTaskViewTest.kt @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.views + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.RectF +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.launcher3.DeviceProfile +import com.android.launcher3.InsettableFrameLayout +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.Workspace +import com.android.launcher3.anim.PendingAnimation +import com.android.launcher3.dragndrop.DragLayer +import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.util.SandboxApplication +import com.android.launcher3.util.TestActivityContext +import com.android.launcher3.views.BaseDragLayer +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` +import org.mockito.kotlin.any +import org.mockito.kotlin.mock + +@RunWith(AndroidJUnit4::class) +class FloatingDesktopTaskViewTest { + + @get:Rule val context = SandboxApplication() + @get:Rule val uiContext = TestActivityContext(context) + + private lateinit var deviceProfile: DeviceProfile + private val launcher: QuickstepLauncher = mock() + private val workspace: Workspace<*> = mock() + private val dragLayer: DragLayer = mock() + + @Before + fun setUp() { + deviceProfile = InvariantDeviceProfile.INSTANCE[context].getDeviceProfile(context).copy() + `when`(launcher.workspace).thenReturn(workspace) + `when`(launcher.dragLayer).thenReturn(dragLayer) + `when`(launcher.deviceProfile).thenReturn(deviceProfile) + `when`(dragLayer.generateLayoutParams(any(), any())).thenAnswer { invocation -> + BaseDragLayer.LayoutParams( + invocation.arguments[0] as Context, + invocation.arguments[1] as AttributeSet, + ) + } + `when`(launcher.layoutInflater).thenReturn(LayoutInflater.from(uiContext)) + `when`(dragLayer.indexOfChild(null)).thenReturn(-1) + } + + @Test + fun create_marginsSameAsStartPos() { + val startBounds = RectF(10f, 20f, 110f, 220f) + val taskView = FloatingDesktopTaskView.create(launcher, startBounds, BITMAP) + + val layoutParams = taskView.layoutParams as InsettableFrameLayout.LayoutParams + assertThat(layoutParams.leftMargin).isEqualTo(10) + assertThat(layoutParams.topMargin).isEqualTo(20) + } + + @Test + fun create_addsViewOnTopOfExistingViews() { + `when`(dragLayer.childCount).thenReturn(2) + val taskView = FloatingDesktopTaskView.create(launcher, START_BOUNDS, BITMAP) + + verify(dragLayer).addView(taskView, 2) + } + + @Test + fun addClosingAnimation_pivotsWithWorkspace() { + val taskView = FloatingDesktopTaskView.create(launcher, START_BOUNDS, BITMAP) + val animation = PendingAnimation(/* duration= */ 100) + + taskView.addClosingAnimation(launcher, animation) + + verify(launcher.workspace).setPivotToScaleWithSelf(taskView) + } + + companion object { + private val START_BOUNDS = RectF(0f, 1f, 2f, 3f) + private val BITMAP = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888) + } +} diff --git a/quickstep/tests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt b/quickstep/tests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt deleted file mode 100644 index a5327628d16..00000000000 --- a/quickstep/tests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt +++ /dev/null @@ -1,127 +0,0 @@ -package com.android.launcher3.model - -import android.app.prediction.AppPredictor -import android.app.prediction.AppTarget -import android.app.prediction.AppTargetEvent -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.android.launcher3.LauncherAppState -import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION -import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION -import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WALLPAPERS -import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION -import com.android.launcher3.util.LauncherModelHelper -import org.junit.After -import org.junit.Assert.assertNotSame -import org.junit.Assert.assertSame -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.Mockito.never -import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions -import org.mockito.MockitoAnnotations - -/** Unit tests for [QuickstepModelDelegate]. */ -@RunWith(AndroidJUnit4::class) -class QuickstepModelDelegateTest { - - private lateinit var underTest: QuickstepModelDelegate - private lateinit var modelHelper: LauncherModelHelper - - @Mock private lateinit var target: AppTarget - @Mock private lateinit var mockedAppTargetEvent: AppTargetEvent - @Mock private lateinit var allAppsPredictor: AppPredictor - @Mock private lateinit var hotseatPredictor: AppPredictor - @Mock private lateinit var widgetRecommendationPredictor: AppPredictor - - @Before - fun setUp() { - MockitoAnnotations.initMocks(this) - modelHelper = LauncherModelHelper() - underTest = QuickstepModelDelegate(modelHelper.sandboxContext) - underTest.mAllAppsState.predictor = allAppsPredictor - underTest.mHotseatState.predictor = hotseatPredictor - underTest.mWidgetsRecommendationState.predictor = widgetRecommendationPredictor - underTest.mApp = LauncherAppState.getInstance(modelHelper.sandboxContext) - underTest.mDataModel = BgDataModel() - } - - @After - fun tearDown() { - modelHelper.destroy() - } - - @Test - fun onAppTargetEvent_notifyTarget() { - underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_PREDICTION) - - verify(allAppsPredictor).notifyAppTargetEvent(mockedAppTargetEvent) - verifyZeroInteractions(hotseatPredictor) - verifyZeroInteractions(widgetRecommendationPredictor) - } - - @Test - fun onWidgetPrediction_notifyWidgetRecommendationPredictor() { - underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_WIDGETS_PREDICTION) - - verifyZeroInteractions(allAppsPredictor) - verify(widgetRecommendationPredictor).notifyAppTargetEvent(mockedAppTargetEvent) - verifyZeroInteractions(hotseatPredictor) - } - - @Test - fun onHotseatPrediction_notifyHotseatPredictor() { - underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_HOTSEAT_PREDICTION) - - verifyZeroInteractions(allAppsPredictor) - verifyZeroInteractions(widgetRecommendationPredictor) - verify(hotseatPredictor).notifyAppTargetEvent(mockedAppTargetEvent) - } - - @Test - fun onOtherClient_notifyHotseatPredictor() { - underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_WALLPAPERS) - - verifyZeroInteractions(allAppsPredictor) - verifyZeroInteractions(widgetRecommendationPredictor) - verify(hotseatPredictor).notifyAppTargetEvent(mockedAppTargetEvent) - } - - @Test - fun hotseatActionPin_recreateHotSeat() { - assertSame(underTest.mHotseatState.predictor, hotseatPredictor) - val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_PIN).build() - underTest.markActive() - - underTest.onAppTargetEvent(appTargetEvent, CONTAINER_HOTSEAT_PREDICTION) - - verify(hotseatPredictor).destroy() - assertNotSame(underTest.mHotseatState.predictor, hotseatPredictor) - } - - @Test - fun hotseatActionUnpin_recreateHotSeat() { - assertSame(underTest.mHotseatState.predictor, hotseatPredictor) - underTest.markActive() - val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_UNPIN).build() - - underTest.onAppTargetEvent(appTargetEvent, CONTAINER_HOTSEAT_PREDICTION) - - verify(hotseatPredictor).destroy() - assertNotSame(underTest.mHotseatState.predictor, hotseatPredictor) - } - - @Test - fun container_actionPin_notRecreateHotSeat() { - assertSame(underTest.mHotseatState.predictor, hotseatPredictor) - val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_UNPIN).build() - underTest.markActive() - - underTest.onAppTargetEvent(appTargetEvent, CONTAINER_PREDICTION) - - verify(allAppsPredictor, never()).destroy() - verify(hotseatPredictor, never()).destroy() - assertSame(underTest.mHotseatState.predictor, hotseatPredictor) - } -} diff --git a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java b/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java deleted file mode 100644 index 7b57c81b74c..00000000000 --- a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.model; - -import static android.content.pm.ApplicationInfo.CATEGORY_PRODUCTIVITY; -import static android.content.pm.ApplicationInfo.FLAG_INSTALLED; -import static android.os.Process.myUserHandle; - -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; -import static com.android.launcher3.util.TestUtil.runOnExecutorSync; -import static com.android.launcher3.util.WidgetUtils.createAppWidgetProviderInfo; - -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.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; - -import android.app.prediction.AppTarget; -import android.app.prediction.AppTargetId; -import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProviderInfo; -import android.content.ComponentName; -import android.content.pm.ApplicationInfo; -import android.content.pm.LauncherApps; -import android.os.UserHandle; -import android.platform.test.flag.junit.SetFlagsRule; -import android.text.TextUtils; - -import androidx.test.core.content.pm.ApplicationInfoBuilder; -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.filters.SmallTest; - -import com.android.launcher3.Flags; -import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.QuickstepModelDelegate.PredictorState; -import com.android.launcher3.util.LauncherLayoutBuilder; -import com.android.launcher3.util.LauncherModelHelper; -import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; -import com.android.launcher3.widget.PendingAddWidgetInfo; - -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -@SmallTest -@RunWith(AndroidJUnit4.class) -public final class WidgetsPredicationUpdateTaskTest { - - @Rule - public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); - - private AppWidgetProviderInfo mApp1Provider1; - private AppWidgetProviderInfo mApp1Provider2; - private AppWidgetProviderInfo mApp2Provider1; - private AppWidgetProviderInfo mApp4Provider1; - private AppWidgetProviderInfo mApp4Provider2; - private AppWidgetProviderInfo mApp5Provider1; - private List allWidgets; - - private FakeBgDataModelCallback mCallback = new FakeBgDataModelCallback(); - private LauncherModelHelper mModelHelper; - private UserHandle mUserHandle; - private LauncherApps mLauncherApps; - - - @Before - public void setup() throws Exception { - mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_CATEGORIZED_WIDGET_SUGGESTIONS); - mModelHelper = new LauncherModelHelper(); - - mUserHandle = myUserHandle(); - mApp1Provider1 = createAppWidgetProviderInfo( - ComponentName.createRelative("app1", "provider1")); - mApp1Provider2 = createAppWidgetProviderInfo( - ComponentName.createRelative("app1", "provider2")); - mApp2Provider1 = createAppWidgetProviderInfo( - ComponentName.createRelative("app2", "provider1")); - mApp4Provider1 = createAppWidgetProviderInfo( - ComponentName.createRelative("app4", "provider1")); - mApp4Provider2 = createAppWidgetProviderInfo( - ComponentName.createRelative("app4", ".provider2")); - mApp5Provider1 = createAppWidgetProviderInfo( - ComponentName.createRelative("app5", "provider1")); - allWidgets = Arrays.asList(mApp1Provider1, mApp1Provider2, mApp2Provider1, - mApp4Provider1, mApp4Provider2, mApp5Provider1); - - mLauncherApps = mModelHelper.sandboxContext.spyService(LauncherApps.class); - doAnswer(i -> { - String pkg = i.getArgument(0); - ApplicationInfo applicationInfo = ApplicationInfoBuilder.newBuilder() - .setPackageName(pkg) - .setName("App " + pkg) - .build(); - applicationInfo.category = CATEGORY_PRODUCTIVITY; - applicationInfo.flags = FLAG_INSTALLED; - return applicationInfo; - }).when(mLauncherApps).getApplicationInfo(anyString(), anyInt(), any()); - - AppWidgetManager manager = mModelHelper.sandboxContext.spyService(AppWidgetManager.class); - doReturn(allWidgets).when(manager).getInstalledProviders(); - doReturn(allWidgets).when(manager).getInstalledProvidersForProfile(eq(myUserHandle())); - doAnswer(i -> { - String pkg = i.getArgument(0); - return TextUtils.isEmpty(pkg) ? allWidgets : allWidgets.stream() - .filter(a -> pkg.equals(a.provider.getPackageName())) - .collect(Collectors.toList()); - }).when(manager).getInstalledProvidersForPackage(any(), eq(myUserHandle())); - - LauncherLayoutBuilder builder = new LauncherLayoutBuilder() - .atWorkspace(0, 1, 2).putWidget("app4", "provider1", 1, 1) - .atWorkspace(0, 1, 3).putWidget("app5", "provider1", 1, 1); - mModelHelper.setupDefaultLayoutProvider(builder); - MAIN_EXECUTOR.submit(() -> mModelHelper.getModel().addCallbacks(mCallback)).get(); - mModelHelper.loadModelSync(); - } - - @After - public void tearDown() { - mModelHelper.destroy(); - } - - @Test - public void widgetsRecommendationRan_shouldOnlyReturnNotAddedWidgetsInAppPredictionOrder() { - // Run on model executor so that no other task runs in the middle. - runOnExecutorSync(MODEL_EXECUTOR, () -> { - // WHEN newPredicationTask is executed with app predication of 5 apps. - AppTarget app1 = new AppTarget(new AppTargetId("app1"), "app1", "provider1", - mUserHandle); - AppTarget app2 = new AppTarget(new AppTargetId("app2"), "app2", "provider1", - mUserHandle); - AppTarget app3 = new AppTarget(new AppTargetId("app3"), "app3", "className", - mUserHandle); - AppTarget app4 = new AppTarget(new AppTargetId("app4"), "app4", "provider1", - mUserHandle); - AppTarget app5 = new AppTarget(new AppTargetId("app5"), "app5", "provider1", - mUserHandle); - mCallback.mRecommendedWidgets = null; - mModelHelper.getModel().enqueueModelUpdateTask( - newWidgetsPredicationTask(List.of(app5, app3, app2, app4, app1))); - runOnExecutorSync(MAIN_EXECUTOR, () -> { }); - - // THEN only 2 widgets are returned because - // 1. app5/provider1 & app4/provider1 have already been added to workspace. They are - // excluded from the result. - // 2. app3 doesn't have a widget. - // 3. only 1 widget is picked from app1 because we only want to promote one widget - // per app. - List recommendedWidgets = mCallback.mRecommendedWidgets.items - .stream() - .map(itemInfo -> (PendingAddWidgetInfo) itemInfo) - .collect(Collectors.toList()); - assertThat(recommendedWidgets).hasSize(2); - recommendedWidgets.forEach(pendingAddWidgetInfo -> - assertThat(pendingAddWidgetInfo.recommendationCategory).isNotNull() - ); - assertWidgetInfo(recommendedWidgets.get(0).info, mApp2Provider1); - assertWidgetInfo(recommendedWidgets.get(1).info, mApp1Provider1); - }); - } - - @Test - public void widgetsRecommendationRan_shouldReturnEmptyWidgetsWhenEmpty() { - runOnExecutorSync(MODEL_EXECUTOR, () -> { - - // Not installed widget - AppTarget widget1 = new AppTarget(new AppTargetId("app1"), "app1", "provider3", - mUserHandle); - // Not installed app - AppTarget widget3 = new AppTarget(new AppTargetId("app2"), "app3", "provider1", - mUserHandle); - // Workspace added widgets - AppTarget widget4 = new AppTarget(new AppTargetId("app4"), "app4", "provider1", - mUserHandle); - AppTarget widget5 = new AppTarget(new AppTargetId("app5"), "app5", "provider1", - mUserHandle); - - mCallback.mRecommendedWidgets = null; - mModelHelper.getModel().enqueueModelUpdateTask( - newWidgetsPredicationTask(List.of(widget5, widget3, widget4, widget1))); - runOnExecutorSync(MAIN_EXECUTOR, () -> { }); - - // Only widgets suggested by prediction system are returned. - List recommendedWidgets = mCallback.mRecommendedWidgets.items - .stream() - .map(itemInfo -> (PendingAddWidgetInfo) itemInfo) - .collect(Collectors.toList()); - assertThat(recommendedWidgets).hasSize(0); - }); - } - - private void assertWidgetInfo( - LauncherAppWidgetProviderInfo actual, AppWidgetProviderInfo expected) { - assertThat(actual.provider).isEqualTo(expected.provider); - assertThat(actual.getUser()).isEqualTo(expected.getProfile()); - } - - private WidgetsPredictionUpdateTask newWidgetsPredicationTask(List appTargets) { - return new WidgetsPredictionUpdateTask( - new PredictorState(CONTAINER_WIDGETS_PREDICTION, "test_widgets_prediction"), - appTargets); - } - - private final class FakeBgDataModelCallback implements BgDataModel.Callbacks { - - private FixedContainerItems mRecommendedWidgets = null; - - @Override - public void bindExtraContainerItems(FixedContainerItems item) { - mRecommendedWidgets = item; - } - } -} diff --git a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt b/quickstep/tests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt deleted file mode 100644 index 5c7b4aba4da..00000000000 --- a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt +++ /dev/null @@ -1,221 +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.launcher3.model - -import android.app.prediction.AppTarget -import android.app.prediction.AppTargetEvent -import android.app.prediction.AppTargetId -import android.appwidget.AppWidgetProviderInfo -import android.content.ComponentName -import android.content.Context -import android.os.Process.myUserHandle -import android.os.UserHandle -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.android.launcher3.DeviceProfile -import com.android.launcher3.InvariantDeviceProfile -import com.android.launcher3.LauncherAppState -import com.android.launcher3.icons.IconCache -import com.android.launcher3.model.WidgetPredictionsRequester.buildBundleForPredictionSession -import com.android.launcher3.model.WidgetPredictionsRequester.filterPredictions -import com.android.launcher3.model.WidgetPredictionsRequester.notOnUiSurfaceFilter -import com.android.launcher3.util.ActivityContextWrapper -import com.android.launcher3.util.PackageUserKey -import com.android.launcher3.util.WidgetUtils.createAppWidgetProviderInfo -import com.android.launcher3.widget.LauncherAppWidgetProviderInfo -import com.google.common.truth.Truth.assertThat -import java.util.function.Predicate -import junit.framework.Assert.assertNotNull -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.MockitoAnnotations - -@RunWith(AndroidJUnit4::class) -class WidgetsPredictionsRequesterTest { - - private lateinit var mUserHandle: UserHandle - private lateinit var context: Context - private lateinit var deviceProfile: DeviceProfile - private lateinit var testInvariantProfile: InvariantDeviceProfile - - private lateinit var widget1aInfo: AppWidgetProviderInfo - private lateinit var widget1bInfo: AppWidgetProviderInfo - private lateinit var widget2Info: AppWidgetProviderInfo - - private lateinit var widgetItem1a: WidgetItem - private lateinit var widgetItem1b: WidgetItem - private lateinit var widgetItem2: WidgetItem - - private lateinit var allWidgets: Map> - - @Mock private lateinit var iconCache: IconCache - - @Before - fun setUp() { - MockitoAnnotations.initMocks(this) - mUserHandle = myUserHandle() - context = ActivityContextWrapper(ApplicationProvider.getApplicationContext()) - testInvariantProfile = LauncherAppState.getIDP(context) - deviceProfile = testInvariantProfile.getDeviceProfile(context).copy(context) - - widget1aInfo = - createAppWidgetProviderInfo( - ComponentName.createRelative(APP_1_PACKAGE_NAME, APP_1_PROVIDER_A_CLASS_NAME) - ) - widget1bInfo = - createAppWidgetProviderInfo( - ComponentName.createRelative(APP_1_PACKAGE_NAME, APP_1_PROVIDER_B_CLASS_NAME) - ) - widgetItem1a = createWidgetItem(widget1aInfo) - widgetItem1b = createWidgetItem(widget1bInfo) - - widget2Info = - createAppWidgetProviderInfo( - ComponentName.createRelative(APP_2_PACKAGE_NAME, APP_2_PROVIDER_1_CLASS_NAME) - ) - widgetItem2 = createWidgetItem(widget2Info) - - allWidgets = - mapOf( - PackageUserKey(APP_1_PACKAGE_NAME, mUserHandle) to - listOf(widgetItem1a, widgetItem1b), - PackageUserKey(APP_2_PACKAGE_NAME, mUserHandle) to listOf(widgetItem2), - ) - } - - @Test - fun buildBundleForPredictionSession_includesAddedAppWidgets() { - val existingWidgets = arrayListOf(widget1aInfo, widget1bInfo, widget2Info) - - val bundle = buildBundleForPredictionSession(existingWidgets, TEST_UI_SURFACE) - val addedWidgetsBundleExtra = - bundle.getParcelableArrayList(BUNDLE_KEY_ADDED_APP_WIDGETS, AppTarget::class.java) - - assertNotNull(addedWidgetsBundleExtra) - assertThat(addedWidgetsBundleExtra) - .containsExactly( - buildExpectedAppTargetEvent( - /*pkg=*/ APP_1_PACKAGE_NAME, - /*providerClassName=*/ APP_1_PROVIDER_A_CLASS_NAME, - /*user=*/ mUserHandle - ), - buildExpectedAppTargetEvent( - /*pkg=*/ APP_1_PACKAGE_NAME, - /*providerClassName=*/ APP_1_PROVIDER_B_CLASS_NAME, - /*user=*/ mUserHandle - ), - buildExpectedAppTargetEvent( - /*pkg=*/ APP_2_PACKAGE_NAME, - /*providerClassName=*/ APP_2_PROVIDER_1_CLASS_NAME, - /*user=*/ mUserHandle - ) - ) - } - - @Test - fun filterPredictions_notOnUiSurfaceFilter_returnsOnlyEligiblePredictions() { - val widgetsAlreadyOnSurface = arrayListOf(widget1bInfo) - val filter: Predicate = notOnUiSurfaceFilter(widgetsAlreadyOnSurface) - - val predictions = - listOf( - // already on surface - AppTarget( - AppTargetId(APP_1_PACKAGE_NAME), - APP_1_PACKAGE_NAME, - APP_1_PROVIDER_B_CLASS_NAME, - mUserHandle - ), - // eligible - AppTarget( - AppTargetId(APP_2_PACKAGE_NAME), - APP_2_PACKAGE_NAME, - APP_2_PROVIDER_1_CLASS_NAME, - mUserHandle - ) - ) - - // only 2 was eligible - assertThat(filterPredictions(predictions, allWidgets, filter)).containsExactly(widgetItem2) - } - - @Test - fun filterPredictions_appPredictions_returnsWidgetFromPackage() { - val widgetsAlreadyOnSurface = arrayListOf(widget1bInfo) - val filter: Predicate = notOnUiSurfaceFilter(widgetsAlreadyOnSurface) - - val predictions = - listOf( - AppTarget( - AppTargetId(APP_1_PACKAGE_NAME), - APP_1_PACKAGE_NAME, - "$APP_1_PACKAGE_NAME.SomeActivity", - mUserHandle - ), - AppTarget( - AppTargetId(APP_2_PACKAGE_NAME), - APP_2_PACKAGE_NAME, - "$APP_2_PACKAGE_NAME.SomeActivity2", - mUserHandle - ), - ) - - assertThat(filterPredictions(predictions, allWidgets, filter)) - .containsExactly(widgetItem1a, widgetItem2) - } - - private fun createWidgetItem( - providerInfo: AppWidgetProviderInfo, - ): WidgetItem { - val widgetInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(context, providerInfo) - return WidgetItem(widgetInfo, testInvariantProfile, iconCache, context) - } - - companion object { - const val TEST_UI_SURFACE = "widgets_test" - const val BUNDLE_KEY_ADDED_APP_WIDGETS = "added_app_widgets" - - const val APP_1_PACKAGE_NAME = "com.example.app1" - const val APP_1_PROVIDER_A_CLASS_NAME = "app1Provider1" - const val APP_1_PROVIDER_B_CLASS_NAME = "app1Provider2" - - const val APP_2_PACKAGE_NAME = "com.example.app2" - const val APP_2_PROVIDER_1_CLASS_NAME = "app2Provider1" - - const val TEST_PACKAGE = "pkg" - - private fun buildExpectedAppTargetEvent( - pkg: String, - providerClassName: String, - userHandle: UserHandle - ): AppTargetEvent { - val appTarget = - AppTarget.Builder( - /*id=*/ AppTargetId("widget:$pkg"), - /*packageName=*/ pkg, - /*user=*/ userHandle - ) - .setClassName(providerClassName) - .build() - return AppTargetEvent.Builder(appTarget, AppTargetEvent.ACTION_PIN) - .setLaunchLocation(TEST_UI_SURFACE) - .build() - } - } -} diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarHoverToolTipControllerTest.java b/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarHoverToolTipControllerTest.java deleted file mode 100644 index 9ed39066ddd..00000000000 --- a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarHoverToolTipControllerTest.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.taskbar; - -import static androidx.test.core.app.ApplicationProvider.getApplicationContext; - -import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS; - -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.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.testing.AndroidTestingRunner; -import android.testing.TestableLooper; -import android.view.Display; -import android.view.MotionEvent; - -import androidx.test.filters.SmallTest; - -import com.android.launcher3.BubbleTextView; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderIcon; -import com.android.launcher3.model.data.FolderInfo; -import com.android.launcher3.util.ActivityContextWrapper; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.mockito.stubbing.Answer; - -/** - * Tests for TaskbarHoverToolTipController. - */ -@SmallTest -@RunWith(AndroidTestingRunner.class) -@TestableLooper.RunWithLooper(setAsMainLooper = true) -public class TaskbarHoverToolTipControllerTest extends TaskbarBaseTestCase { - - private TaskbarHoverToolTipController mTaskbarHoverToolTipController; - private TestableLooper mTestableLooper; - - @Mock private TaskbarView mTaskbarView; - @Mock private MotionEvent mMotionEvent; - @Mock private BubbleTextView mHoverBubbleTextView; - @Mock private FolderIcon mHoverFolderIcon; - @Mock private Display mDisplay; - @Mock private TaskbarDragLayer mTaskbarDragLayer; - private Folder mSpyFolderView; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - - Context context = getApplicationContext(); - - doAnswer((Answer) invocation -> context.getSystemService( - (String) invocation.getArgument(0))) - .when(taskbarActivityContext).getSystemService(anyString()); - when(taskbarActivityContext.getResources()).thenReturn(context.getResources()); - when(taskbarActivityContext.getApplicationInfo()).thenReturn( - context.getApplicationInfo()); - when(taskbarActivityContext.getDragLayer()).thenReturn(mTaskbarDragLayer); - when(taskbarActivityContext.getMainLooper()).thenReturn(context.getMainLooper()); - when(taskbarActivityContext.getDisplay()).thenReturn(mDisplay); - - when(mTaskbarDragLayer.getChildCount()).thenReturn(1); - mSpyFolderView = spy(new Folder(new ActivityContextWrapper(context), null)); - when(mTaskbarDragLayer.getChildAt(anyInt())).thenReturn(mSpyFolderView); - doReturn(false).when(mSpyFolderView).isOpen(); - - when(mHoverBubbleTextView.getText()).thenReturn("tooltip"); - doAnswer((Answer) invocation -> { - Object[] args = invocation.getArguments(); - ((int[]) args[0])[0] = 0; - ((int[]) args[0])[1] = 0; - return null; - }).when(mHoverBubbleTextView).getLocationOnScreen(any(int[].class)); - when(mHoverBubbleTextView.getWidth()).thenReturn(100); - when(mHoverBubbleTextView.getHeight()).thenReturn(100); - - mHoverFolderIcon.mInfo = new FolderInfo(); - mHoverFolderIcon.mInfo.title = "tooltip"; - doAnswer((Answer) invocation -> { - Object[] args = invocation.getArguments(); - ((int[]) args[0])[0] = 0; - ((int[]) args[0])[1] = 0; - return null; - }).when(mHoverFolderIcon).getLocationOnScreen(any(int[].class)); - when(mHoverFolderIcon.getWidth()).thenReturn(100); - when(mHoverFolderIcon.getHeight()).thenReturn(100); - - when(mTaskbarView.getTop()).thenReturn(200); - - mTaskbarHoverToolTipController = new TaskbarHoverToolTipController( - taskbarActivityContext, mTaskbarView, mHoverBubbleTextView); - mTestableLooper = TestableLooper.get(this); - } - - @Test - public void onHover_hoverEnterIcon_revealToolTip() { - when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_ENTER); - when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_ENTER); - - boolean hoverHandled = - mTaskbarHoverToolTipController.onHover(mHoverBubbleTextView, mMotionEvent); - waitForIdleSync(); - - assertThat(hoverHandled).isTrue(); - verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, - true); - } - - @Test - public void onHover_hoverExitIcon_closeToolTip() { - when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_EXIT); - when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_EXIT); - - boolean hoverHandled = - mTaskbarHoverToolTipController.onHover(mHoverBubbleTextView, mMotionEvent); - waitForIdleSync(); - - assertThat(hoverHandled).isTrue(); - verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, - false); - } - - @Test - public void onHover_hoverEnterFolderIcon_revealToolTip() { - when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_ENTER); - when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_ENTER); - - boolean hoverHandled = - mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent); - waitForIdleSync(); - - assertThat(hoverHandled).isTrue(); - verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, - true); - } - - @Test - public void onHover_hoverExitFolderIcon_closeToolTip() { - when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_EXIT); - when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_EXIT); - - boolean hoverHandled = - mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent); - waitForIdleSync(); - - assertThat(hoverHandled).isTrue(); - verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, - false); - } - - @Test - public void onHover_hoverExitFolderOpen_closeToolTip() { - when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_EXIT); - when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_EXIT); - doReturn(true).when(mSpyFolderView).isOpen(); - - boolean hoverHandled = - mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent); - waitForIdleSync(); - - assertThat(hoverHandled).isTrue(); - verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, - false); - } - - @Test - public void onHover_hoverEnterFolderOpen_noToolTip() { - when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_ENTER); - when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_ENTER); - doReturn(true).when(mSpyFolderView).isOpen(); - - boolean hoverHandled = - mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent); - - assertThat(hoverHandled).isFalse(); - } - - @Test - public void onHover_hoverMove_noUpdate() { - when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_MOVE); - when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_MOVE); - - boolean hoverHandled = - mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent); - - assertThat(hoverHandled).isFalse(); - } - - private void waitForIdleSync() { - mTestableLooper.processAllMessages(); - } -} diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt b/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt deleted file mode 100644 index 104263af5b0..00000000000 --- a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt +++ /dev/null @@ -1,242 +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.launcher3.taskbar - -import android.app.ActivityManager.RunningTaskInfo -import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM -import android.content.ComponentName -import android.content.Intent -import android.os.Process -import android.os.UserHandle -import android.testing.AndroidTestingRunner -import com.android.launcher3.model.data.AppInfo -import com.android.launcher3.model.data.ItemInfo -import com.android.launcher3.statehandlers.DesktopVisibilityController -import com.android.quickstep.RecentsModel -import com.google.common.truth.Truth.assertThat -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.junit.MockitoJUnit -import org.mockito.kotlin.whenever - -@RunWith(AndroidTestingRunner::class) -class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { - - @get:Rule val mockitoRule = MockitoJUnit.rule() - - @Mock private lateinit var mockRecentsModel: RecentsModel - @Mock private lateinit var mockDesktopVisibilityController: DesktopVisibilityController - - private var nextTaskId: Int = 500 - - private lateinit var recentAppsController: TaskbarRecentAppsController - private lateinit var userHandle: UserHandle - - @Before - fun setUp() { - super.setup() - userHandle = Process.myUserHandle() - recentAppsController = - TaskbarRecentAppsController(mockRecentsModel) { mockDesktopVisibilityController } - recentAppsController.init(taskbarControllers) - recentAppsController.isEnabled = true - recentAppsController.setApps( - ALL_APP_PACKAGES.map { createTestAppInfo(packageName = it) }.toTypedArray() - ) - } - - @Test - fun updateHotseatItemInfos_notInDesktopMode_returnsExistingHotseatItems() { - setInDesktopMode(false) - val hotseatItems = - createHotseatItemsFromPackageNames(listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2)) - - assertThat(recentAppsController.updateHotseatItemInfos(hotseatItems.toTypedArray())) - .isEqualTo(hotseatItems.toTypedArray()) - } - - @Test - fun updateHotseatItemInfos_notInDesktopMode_runningApps_returnsExistingHotseatItems() { - setInDesktopMode(false) - val hotseatPackages = listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2) - val hotseatItems = createHotseatItemsFromPackageNames(hotseatPackages) - val runningTasks = - createDesktopTasksFromPackageNames(listOf(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2)) - whenever(mockRecentsModel.runningTasks).thenReturn(runningTasks) - recentAppsController.updateRunningApps() - - val newHotseatItems = - recentAppsController.updateHotseatItemInfos(hotseatItems.toTypedArray()) - - assertThat(newHotseatItems.map { it?.targetPackage }) - .containsExactlyElementsIn(hotseatPackages) - } - - @Test - fun updateHotseatItemInfos_noRunningApps_returnsExistingHotseatItems() { - setInDesktopMode(true) - val hotseatItems = - createHotseatItemsFromPackageNames(listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2)) - - assertThat(recentAppsController.updateHotseatItemInfos(hotseatItems.toTypedArray())) - .isEqualTo(hotseatItems.toTypedArray()) - } - - @Test - fun updateHotseatItemInfos_returnsExistingHotseatItemsAndRunningApps() { - setInDesktopMode(true) - val hotseatItems = - createHotseatItemsFromPackageNames(listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2)) - val runningTasks = - createDesktopTasksFromPackageNames(listOf(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2)) - whenever(mockRecentsModel.runningTasks).thenReturn(runningTasks) - recentAppsController.updateRunningApps() - - val newHotseatItems = - recentAppsController.updateHotseatItemInfos(hotseatItems.toTypedArray()) - - val expectedPackages = - listOf( - HOTSEAT_PACKAGE_1, - HOTSEAT_PACKAGE_2, - RUNNING_APP_PACKAGE_1, - RUNNING_APP_PACKAGE_2, - ) - assertThat(newHotseatItems.map { it?.targetPackage }) - .containsExactlyElementsIn(expectedPackages) - } - - @Test - fun updateHotseatItemInfos_runningAppIsHotseatItem_returnsDistinctItems() { - setInDesktopMode(true) - val hotseatItems = - createHotseatItemsFromPackageNames(listOf(HOTSEAT_PACKAGE_1, HOTSEAT_PACKAGE_2)) - val runningTasks = - createDesktopTasksFromPackageNames( - listOf(HOTSEAT_PACKAGE_1, RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2) - ) - whenever(mockRecentsModel.runningTasks).thenReturn(runningTasks) - recentAppsController.updateRunningApps() - - val newHotseatItems = - recentAppsController.updateHotseatItemInfos(hotseatItems.toTypedArray()) - - val expectedPackages = - listOf( - HOTSEAT_PACKAGE_1, - HOTSEAT_PACKAGE_2, - RUNNING_APP_PACKAGE_1, - RUNNING_APP_PACKAGE_2, - ) - assertThat(newHotseatItems.map { it?.targetPackage }) - .containsExactlyElementsIn(expectedPackages) - } - - @Test - fun getRunningApps_notInDesktopMode_returnsEmptySet() { - setInDesktopMode(false) - val runningTasks = - createDesktopTasksFromPackageNames(listOf(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2)) - whenever(mockRecentsModel.runningTasks).thenReturn(runningTasks) - recentAppsController.updateRunningApps() - - assertThat(recentAppsController.runningApps).isEmpty() - assertThat(recentAppsController.minimizedApps).isEmpty() - } - - @Test - fun getRunningApps_inDesktopMode_returnsRunningApps() { - setInDesktopMode(true) - val runningTasks = - createDesktopTasksFromPackageNames(listOf(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2)) - whenever(mockRecentsModel.runningTasks).thenReturn(runningTasks) - recentAppsController.updateRunningApps() - - assertThat(recentAppsController.runningApps) - .containsExactly(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2) - assertThat(recentAppsController.minimizedApps).isEmpty() - } - - @Test - fun getMinimizedApps_inDesktopMode_returnsAllAppsRunningAndInvisibleAppsMinimized() { - setInDesktopMode(true) - val runningTasks = - ArrayList( - listOf( - createDesktopTaskInfo(RUNNING_APP_PACKAGE_1) { isVisible = true }, - createDesktopTaskInfo(RUNNING_APP_PACKAGE_2) { isVisible = true }, - createDesktopTaskInfo(RUNNING_APP_PACKAGE_3) { isVisible = false }, - ) - ) - whenever(mockRecentsModel.runningTasks).thenReturn(runningTasks) - recentAppsController.updateRunningApps() - - assertThat(recentAppsController.runningApps) - .containsExactly(RUNNING_APP_PACKAGE_1, RUNNING_APP_PACKAGE_2, RUNNING_APP_PACKAGE_3) - assertThat(recentAppsController.minimizedApps).containsExactly(RUNNING_APP_PACKAGE_3) - } - - private fun createHotseatItemsFromPackageNames(packageNames: List): List { - return packageNames.map { createTestAppInfo(packageName = it) } - } - - private fun createDesktopTasksFromPackageNames( - packageNames: List - ): ArrayList { - return ArrayList(packageNames.map { createDesktopTaskInfo(packageName = it) }) - } - - private fun createDesktopTaskInfo( - packageName: String, - init: RunningTaskInfo.() -> Unit = { isVisible = true }, - ): RunningTaskInfo { - return RunningTaskInfo().apply { - taskId = nextTaskId++ - configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FREEFORM - realActivity = ComponentName(packageName, "TestActivity") - init() - } - } - - private fun createTestAppInfo( - packageName: String = "testPackageName", - className: String = "testClassName" - ) = AppInfo(ComponentName(packageName, className), className /* title */, userHandle, Intent()) - - private fun setInDesktopMode(inDesktopMode: Boolean) { - whenever(mockDesktopVisibilityController.areDesktopTasksVisible()).thenReturn(inDesktopMode) - } - - private companion object { - const val HOTSEAT_PACKAGE_1 = "hotseat1" - const val HOTSEAT_PACKAGE_2 = "hotseat2" - const val RUNNING_APP_PACKAGE_1 = "running1" - const val RUNNING_APP_PACKAGE_2 = "running2" - const val RUNNING_APP_PACKAGE_3 = "running3" - val ALL_APP_PACKAGES = - listOf( - HOTSEAT_PACKAGE_1, - HOTSEAT_PACKAGE_2, - RUNNING_APP_PACKAGE_1, - RUNNING_APP_PACKAGE_2, - RUNNING_APP_PACKAGE_3, - ) - } -} diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/OWNERS b/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/OWNERS new file mode 100644 index 00000000000..63c14984b90 --- /dev/null +++ b/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/OWNERS @@ -0,0 +1,4 @@ +atsjenk@google.com +liranb@google.com +madym@google.com +mpodolian@google.com diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt b/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt new file mode 100644 index 00000000000..2c77ed09769 --- /dev/null +++ b/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt @@ -0,0 +1,1793 @@ +/* + * 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.launcher3.taskbar.bubbles.animation + +import android.content.Context +import android.graphics.Color +import android.graphics.PointF +import android.graphics.Rect +import android.graphics.drawable.ColorDrawable +import android.view.LayoutInflater +import android.view.MotionEvent +import android.view.View +import android.view.View.INVISIBLE +import android.view.View.VISIBLE +import android.widget.FrameLayout +import android.widget.TextView +import androidx.core.animation.AnimatorTestRule +import androidx.core.graphics.drawable.toBitmap +import androidx.dynamicanimation.animation.DynamicAnimation +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.launcher3.R +import com.android.launcher3.icons.BitmapInfo +import com.android.launcher3.taskbar.TaskbarInsetsController +import com.android.launcher3.taskbar.bubbles.BubbleBarBubble +import com.android.launcher3.taskbar.bubbles.BubbleBarOverflow +import com.android.launcher3.taskbar.bubbles.BubbleBarParentViewHeightUpdateNotifier +import com.android.launcher3.taskbar.bubbles.BubbleBarView +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController +import com.android.launcher3.taskbar.bubbles.BubbleStashedHandleViewController +import com.android.launcher3.taskbar.bubbles.BubbleView +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutController +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutMessage +import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutPositioner +import com.android.launcher3.taskbar.bubbles.flyout.FlyoutCallbacks +import com.android.launcher3.taskbar.bubbles.flyout.FlyoutScheduler +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.BubbleLauncherState +import com.android.wm.shell.shared.animation.PhysicsAnimator +import com.android.wm.shell.shared.animation.PhysicsAnimatorTestUtils +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import com.android.wm.shell.shared.bubbles.BubbleInfo +import com.google.common.truth.Truth.assertThat +import java.util.concurrent.Semaphore +import java.util.concurrent.TimeUnit +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class BubbleBarViewAnimatorTest { + + @get:Rule val animatorTestRule = AnimatorTestRule() + + private val context = ApplicationProvider.getApplicationContext() + private lateinit var animatorScheduler: TestBubbleBarViewAnimatorScheduler + private lateinit var bubbleBarParentViewController: TestBubbleBarParentViewHeightUpdateNotifier + private lateinit var overflowView: BubbleView + private lateinit var bubbleView: BubbleView + private lateinit var bubble: BubbleBarBubble + private lateinit var bubbleBarView: BubbleBarView + private lateinit var flyoutContainer: FrameLayout + private lateinit var bubbleStashController: FakeBubbleStashController + private lateinit var flyoutController: BubbleBarFlyoutController + private val emptyRunnable = Runnable {} + + private val flyoutView: View? + get() = flyoutContainer.findViewById(R.id.bubble_bar_flyout_view) + + private var animationEnded = false + private val onAnimationEnded = { animationEnded = true } + + @Before + fun setUp() { + animatorScheduler = TestBubbleBarViewAnimatorScheduler() + bubbleBarParentViewController = TestBubbleBarParentViewHeightUpdateNotifier() + bubbleStashController = FakeBubbleStashController() + PhysicsAnimatorTestUtils.prepareForTest() + setupFlyoutController() + } + + @Test + fun animateBubbleInForStashed() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + // execute the hide bubble animation + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(handle.alpha).isEqualTo(1) + assertThat(handle.translationY).isEqualTo(0) + assertThat(bubbleBarView.alpha).isEqualTo(0) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.isStashed).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleInForStashed_tapAnimatingBubble() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isTrue() + + assertThat(bubbleStashController.taskbarTouchRegionUpdated).isTrue() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.interruptForTouch() } + + waitForFlyoutToHide() + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(animatorScheduler.delayedBlock).isNull() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isFalse() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleInForStashed_touchTaskbarArea_whileShowing() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // wait for the animation to start + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(handleAnimator) { true } + + handleAnimator.assertIsRunning() + assertThat(animator.isAnimating).isTrue() + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.onStashStateChangingWhileAnimating() + } + + // wait for the animation to cancel + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd( + handleAnimator, + DynamicAnimation.TRANSLATION_Y, + ) + + // verify that the hide animation was canceled + assertThat(animatorScheduler.delayedBlock).isNull() + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.animationInterrupted).isTrue() + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleStashController.isStashed).isTrue() + + // PhysicsAnimatorTestUtils posts the cancellation to the main thread so we need to wait + // again + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + handleAnimator.assertIsNotRunning() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleInForStashed_touchTaskbarArea_whileHiding() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + // execute the hide bubble animation + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + // wait for the hide animation to start + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + handleAnimator.assertIsRunning() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.onStashStateChangingWhileAnimating() + } + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.animationInterrupted).isTrue() + + // PhysicsAnimatorTestUtils posts the cancellation to the main thread so we need to wait + // again + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + handleAnimator.assertIsNotRunning() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleInForStashed_autoExpanding() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + var notifiedExpanded = false + val onExpanded = Runnable { notifiedExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = true) + } + + // wait for the animation to start + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.isExpanded).isTrue() + + // verify there is no hide animation + assertThat(animatorScheduler.delayedBlock).isNull() + + assertThat(bubbleStashController.isStashed).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleInForStashed_expandedWhileAnimatingIn() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + var notifiedExpanded = false + val onExpanded = Runnable { notifiedExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // wait for the animation to start + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(handleAnimator) { true } + + handleAnimator.assertIsRunning() + assertThat(animator.isAnimating).isTrue() + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.expandedWhileAnimating() + } + + // let the animation finish + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + // verify that the hide animation was canceled + assertThat(animatorScheduler.delayedBlock).isNull() + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + verifyBubbleBarIsExpandedWithTranslation(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleInForStashed_expandedWhileFullyIn() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + var notifiedExpanded = false + val onExpanded = Runnable { notifiedExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // wait for the animation to start + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + // wait for the animation to end + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.expandedWhileAnimating() + } + + // verify that the hide animation was canceled + assertThat(animatorScheduler.delayedBlock).isNull() + + waitForFlyoutToHide() + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + verifyBubbleBarIsExpandedWithTranslation(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateToInitialState_inApp() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.IN_APP + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + var notifiedBubbleBarVisible = false + val onBubbleBarVisible = Runnable { notifiedBubbleBarVisible = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = onBubbleBarVisible, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleBarView.visibility = INVISIBLE + animator.animateToInitialState(bubble, isInApp = true, isExpanding = false) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + barAnimator.assertIsNotRunning() + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.alpha).isEqualTo(0) + assertThat(handle.translationY).isEqualTo(0) + assertThat(handle.alpha).isEqualTo(1) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(notifiedBubbleBarVisible).isTrue() + assertThat(bubbleStashController.isStashed).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateToInitialState_whileDragging_inApp() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.IN_APP + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + var notifiedBubbleBarVisible = false + val onBubbleBarVisible = Runnable { notifiedBubbleBarVisible = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = onBubbleBarVisible, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleBarView.visibility = INVISIBLE + animator.animateToInitialState( + bubble, + isInApp = true, + isExpanding = false, + isDragging = true, + ) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + barAnimator.assertIsNotRunning() + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(handle.translationY).isEqualTo(0) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(notifiedBubbleBarVisible).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateToInitialState_inApp_autoExpanding() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.IN_APP + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + var notifiedExpanded = false + val onExpanded = Runnable { notifiedExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateToInitialState(bubble, isInApp = true, isExpanding = true) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + barAnimator.assertIsNotRunning() + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + + assertThat(animatorScheduler.delayedBlock).isNull() + assertThat(bubbleStashController.isStashed).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateToInitialState_inHome() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.HOME + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateToInitialState(bubble, isInApp = false, isExpanding = false) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + barAnimator.assertIsNotRunning() + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(bubbleStashController.isStashed).isFalse() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateToInitialState_expandedWhileAnimatingIn() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.HOME + + var notifiedExpanded = false + val onExpanded = Runnable { notifiedExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateToInitialState(bubble, isInApp = false, isExpanding = false) + } + + val bubbleBarAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + // wait for the animation to start + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(bubbleBarAnimator) { true } + + bubbleBarAnimator.assertIsRunning() + assertThat(animator.isAnimating).isTrue() + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.expandedWhileAnimating() + } + + // let the animation finish + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + // verify that the hide animation was canceled + assertThat(animatorScheduler.delayedBlock).isNull() + + verifyBubbleBarIsExpandedWithTranslation(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.isStashed).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateToInitialState_expandedWhileFullyIn() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.HOME + + var notifiedExpanded = false + val onExpanded = Runnable { notifiedExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateToInitialState(bubble, isInApp = false, isExpanding = false) + } + + // wait for the animation to start + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(animator.isAnimating).isTrue() + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.expandedWhileAnimating() + } + + waitForFlyoutToHide() + + // verify that the hide animation was canceled + assertThat(animatorScheduler.delayedBlock).isNull() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + + verifyBubbleBarIsExpandedWithTranslation(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(animator.isAnimating).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleBarForCollapsed() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.HOME + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleBarForCollapsed(bubble, isExpanding = false) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + // verify we started animating + assertThat(animator.isAnimating).isTrue() + + // advance the animation handler by the duration of the initial lift + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(250) + } + + // the lift animation is complete; the spring back animation should start now + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + barAnimator.assertIsRunning() + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + // the bubble bar translation y should be back to its initial value + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(bubbleStashController.isStashed).isFalse() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleBarForCollapsed_autoExpanding() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.HOME + + val semaphore = Semaphore(0) + var notifiedExpanded = false + val onExpanded = Runnable { + notifiedExpanded = true + semaphore.release() + } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleBarForCollapsed(bubble, isExpanding = true) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + // verify we started animating + assertThat(animator.isAnimating).isTrue() + + // advance the animation handler by the duration of the initial lift + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(250) + } + + // the lift animation is complete; the spring back animation should start now + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + + assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue() + // we should be expanded now + assertThat(bubbleBarView.isExpanded).isTrue() + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + // verify there is no hide animation + assertThat(animatorScheduler.delayedBlock).isNull() + + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(bubbleStashController.isStashed).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleBarForCollapsed_expandingWhileAnimatingIn() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.HOME + + val semaphore = Semaphore(0) + var notifiedExpanded = false + val onExpanded = Runnable { + notifiedExpanded = true + semaphore.release() + } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleBarForCollapsed(bubble, isExpanding = false) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + // verify we started animating + assertThat(animator.isAnimating).isTrue() + + // advance the animation handler by the duration of the initial lift + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(100) + } + + // verify there is a pending hide animation + assertThat(animatorScheduler.delayedBlock).isNotNull() + assertThat(animator.isAnimating).isTrue() + + // send the expand signal in the middle of the lift animation + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.expandedWhileAnimating() + } + + // let the lift animation complete + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(150) + } + + // the lift animation is complete; the spring back animation should start now. wait for it + // to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + + assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue() + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + // verify that the hide animation was canceled + assertThat(animatorScheduler.delayedBlock).isNull() + + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(bubbleBarView.isExpanded).isTrue() + assertThat(bubbleStashController.isStashed).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun animateBubbleBarForCollapsed_expandingWhileFullyIn() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.HOME + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + var notifiedExpanded = false + val onExpanded = Runnable { notifiedExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleBarForCollapsed(bubble, isExpanding = false) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + // verify we started animating + assertThat(animator.isAnimating).isTrue() + + // advance the animation handler by the duration of the initial lift + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(250) + } + + // the lift animation is complete; the spring back animation should start now + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + barAnimator.assertIsRunning() + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + // verify there is a pending hide animation + assertThat(animatorScheduler.delayedBlock).isNotNull() + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.expandedWhileAnimating() + } + + // verify that the hide animation was canceled + assertThat(animatorScheduler.delayedBlock).isNull() + + waitForFlyoutToHide() + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(bubbleBarView.isExpanded).isTrue() + assertThat(bubbleStashController.isStashed).isFalse() + assertThat(notifiedExpanded).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun interruptAnimation_whileAnimatingIn() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // let the animation start and wait until the first frame + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(handleAnimator) { true } + + handleAnimator.assertIsRunning() + assertThat(animator.isAnimating).isTrue() + + val updatedBubble = + bubble.copy(flyoutMessage = bubble.flyoutMessage!!.copy(message = "updated message")) + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleView.setBubble(updatedBubble) + animator.animateBubbleInForStashed(updatedBubble, isExpanding = false) + } + + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + assertThat(flyoutView!!.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("updated message") + + // run the hide animation + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(handle.alpha).isEqualTo(1) + assertThat(handle.translationY).isEqualTo(0) + assertThat(bubbleBarView.alpha).isEqualTo(0) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.isStashed).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun interruptAnimation_whileIn() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(flyoutView!!.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("message") + + // verify the hide animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + val updatedBubble = + bubble.copy(flyoutMessage = bubble.flyoutMessage!!.copy(message = "updated message")) + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleView.setBubble(updatedBubble) + animator.animateBubbleInForStashed(updatedBubble, isExpanding = false) + } + + // verify the hide animation was rescheduled + assertThat(animatorScheduler.canceledBlock).isNotNull() + assertThat(animatorScheduler.delayedBlock).isNotNull() + + waitForFlyoutToFadeOutAndBackIn() + + assertThat(flyoutView!!.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("updated message") + + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(handle.alpha).isEqualTo(1) + assertThat(handle.translationY).isEqualTo(0) + assertThat(bubbleBarView.alpha).isEqualTo(0) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.isStashed).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun interruptAnimation_whileAnimatingOut_whileCollapsingFlyout() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(flyoutView!!.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("message") + + // run the hide animation + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + // interrupt the animation while the flyout is collapsing + val updatedBubble = + bubble.copy(flyoutMessage = bubble.flyoutMessage!!.copy(message = "updated message")) + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(100) + bubbleView.setBubble(updatedBubble) + animator.animateBubbleInForStashed(updatedBubble, isExpanding = false) + + // the flyout should now reverse and expand + animatorTestRule.advanceTimeBy(400) + } + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + + assertThat(flyoutView!!.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("updated message") + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + + // verify the hide animation was rescheduled and run it + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(3) + assertThat(handle.alpha).isEqualTo(1) + assertThat(handle.translationY).isEqualTo(0) + assertThat(bubbleBarView.alpha).isEqualTo(0) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.isStashed).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun interruptAnimation_whileAnimatingOut_barToHandle() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(flyoutView!!.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("message") + + // run the hide animation + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + // interrupt the animation while the bar is animating to the handle + PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(handleAnimator) { + bubbleBarView.alpha < 0.5 + } + // we're about to interrupt the animation which will cancel the current animation and start + // a new one. pause the scheduler to delay starting the new animation. this allows us to run + // the test deterministically + animatorScheduler.pauseScheduler = true + + val updatedBubble = + bubble.copy(flyoutMessage = bubble.flyoutMessage!!.copy(message = "updated message")) + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleView.setBubble(updatedBubble) + animator.animateBubbleInForStashed(updatedBubble, isExpanding = false) + } + + // since animation was interrupted there shouldn't be additional calls to adjust window + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + // verify there's a new job scheduled and start it. this is starting the animation from the + // handle back to the bar + assertThat(animatorScheduler.pausedBlock).isNotNull() + animatorScheduler.pauseScheduler = false + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.pausedBlock!!) + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + waitForFlyoutToShow() + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(flyoutView!!.findViewById(R.id.bubble_flyout_text).text) + .isEqualTo("updated message") + assertThat(handle.alpha).isEqualTo(0) + assertThat(handle.translationY) + .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + + // run the hide animation + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + // verify the hide animation was rescheduled and run it + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + // let the animation start and wait for it to complete + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(3) + assertThat(handle.alpha).isEqualTo(1) + assertThat(handle.translationY).isEqualTo(0) + assertThat(bubbleBarView.alpha).isEqualTo(0) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.isStashed).isTrue() + assertThat(animationEnded).isTrue() + } + + @Test + fun interruptForIme() { + setUpBubbleBar() + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + bubbleStashController.handleAnimator = handleAnimator + + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateBubbleInForStashed(bubble, isExpanding = false) + } + + // wait for the animation to start + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(handleAnimator) { true } + + handleAnimator.assertIsRunning() + assertThat(animator.isAnimating).isTrue() + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.interruptForIme() } + + // verify that the hide animation was canceled + assertThat(animatorScheduler.delayedBlock).isNull() + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleStashController.animationInterrupted).isTrue() + assertThat(bubbleStashController.isStashed).isTrue() + + // PhysicsAnimatorTestUtils posts the cancellation to the main thread so we need to wait + // again + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + handleAnimator.assertIsNotRunning() + assertThat(animationEnded).isTrue() + } + + @Test + fun collapseWhileAnimating_onHome() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.HOME + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + var bubbleBarExpanded = false + val onExpanded = { bubbleBarExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateToInitialState(bubble, isInApp = false, isExpanding = true) + } + + PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(barAnimator) { true } + + barAnimator.assertIsRunning() + assertThat(animator.isAnimating).isTrue() + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.collapsedWhileAnimating() + } + + barAnimator.assertIsNotRunning() + assertThat(animator.isAnimating).isFalse() + assertThat(animatorScheduler.delayedBlock).isNull() + // wait for the bubble bar translation animation + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(250) + } + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) + assertThat(bubbleBarExpanded).isFalse() + assertThat(bubbleBarView.isExpanded).isFalse() + assertThat(animationEnded).isTrue() + } + + @Test + fun collapseWhileAnimating_inApp() { + setUpBubbleBar() + bubbleStashController.launcherState = BubbleLauncherState.IN_APP + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + var bubbleBarExpanded = false + val onExpanded = { bubbleBarExpanded = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = onExpanded, + onBubbleBarVisible = emptyRunnable, + onAnimationEnded = onAnimationEnded, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.animateToInitialState(bubble, isInApp = true, isExpanding = true) + } + + PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(barAnimator) { true } + + barAnimator.assertIsRunning() + assertThat(animator.isAnimating).isTrue() + // verify the hide bubble animation is pending + assertThat(animatorScheduler.delayedBlock).isNotNull() + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animator.collapsedWhileAnimating() + } + + barAnimator.assertIsNotRunning() + assertThat(animator.isAnimating).isFalse() + assertThat(animatorScheduler.delayedBlock).isNull() + assertThat(bubbleStashController.isStashed).isTrue() + assertThat(bubbleBarExpanded).isFalse() + assertThat(bubbleBarView.isExpanded).isFalse() + assertThat(animationEnded).isTrue() + } + + private fun setUpBubbleBar() { + bubbleBarView = BubbleBarView(context) + bubbleBarView.setController( + object : BubbleBarView.Controller { + override fun getBubbleBarTranslationY(): Float = 0f + + override fun onBubbleBarTouched() {} + + override fun expandBubbleBar() {} + + override fun dismissBubbleBar() {} + + override fun updateBubbleBarLocation(location: BubbleBarLocation?, source: Int) {} + + override fun setIsDragging(dragging: Boolean) {} + + override fun onBubbleBarExpandedStateChanged(expanded: Boolean) {} + } + ) + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleBarView.layoutParams = FrameLayout.LayoutParams(0, 0) + val inflater = LayoutInflater.from(context) + + val bitmap = ColorDrawable(Color.WHITE).toBitmap(width = 20, height = 20) + overflowView = + inflater.inflate(R.layout.bubblebar_item_view, bubbleBarView, false) as BubbleView + overflowView.setOverflow(BubbleBarOverflow(overflowView), bitmap) + bubbleBarView.addView(overflowView) + + val bubbleInfo = + BubbleInfo( + "key", + 0, + null, + null, + 0, + context.packageName, + null, + null, + false, + true, + null, + ) + bubbleView = + inflater.inflate(R.layout.bubblebar_item_view, bubbleBarView, false) as BubbleView + bubble = + BubbleBarBubble( + bubbleInfo, + bubbleView, + BitmapInfo.of(bitmap, Color.WHITE), + bitmap, + Color.WHITE, + "", + BubbleBarFlyoutMessage(icon = null, title = "title", message = "message"), + ) + bubbleView.setBubble(bubble) + bubbleBarView.addView(bubbleView) + } + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + } + + private fun setupFlyoutController() { + flyoutContainer = FrameLayout(context) + val flyoutPositioner = + object : BubbleBarFlyoutPositioner { + override val isOnLeft = true + override val targetTy = 100f + override val distanceToCollapsedPosition = PointF(0f, 0f) + override val collapsedSize = 30f + override val collapsedColor = Color.BLUE + override val collapsedElevation = 1f + override val distanceToRevealTriangle = 10f + } + val flyoutCallbacks = + object : FlyoutCallbacks { + override fun flyoutClicked() {} + } + val flyoutScheduler = FlyoutScheduler { block -> block.invoke() } + flyoutController = + BubbleBarFlyoutController( + flyoutContainer, + flyoutPositioner, + flyoutCallbacks, + flyoutScheduler, + ) + } + + private fun verifyBubbleBarIsExpandedWithTranslation(ty: Float) { + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(bubbleBarView.scaleX).isEqualTo(1) + assertThat(bubbleBarView.scaleY).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(ty) + assertThat(bubbleBarView.isExpanded).isTrue() + } + + private fun waitForFlyoutToShow() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(400) + } + assertThat(flyoutView).isNotNull() + } + + private fun waitForFlyoutToHide() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(350) + } + assertThat(flyoutView).isNull() + } + + private fun waitForFlyoutToFadeOutAndBackIn() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + animatorTestRule.advanceTimeBy(750) + } + assertThat(flyoutView).isNotNull() + } + + private fun PhysicsAnimator.assertIsRunning() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + assertThat(isRunning()).isTrue() + } + } + + private fun PhysicsAnimator.assertIsNotRunning() { + InstrumentationRegistry.getInstrumentation().runOnMainSync { + assertThat(isRunning()).isFalse() + } + } + + private class TestBubbleBarViewAnimatorScheduler : BubbleBarViewAnimator.Scheduler { + + var pauseScheduler = false + var pausedBlock: Runnable? = null + private set + + var delayedBlock: Runnable? = null + private set + + var canceledBlock: Runnable? = null + private set + + override fun post(block: Runnable) { + if (pauseScheduler) { + pausedBlock = block + return + } + block.run() + } + + override fun postDelayed(delayMillis: Long, block: Runnable) { + delayedBlock = block + } + + override fun cancel(block: Runnable) { + canceledBlock = delayedBlock + delayedBlock = null + } + } + + private class TestBubbleBarParentViewHeightUpdateNotifier : + BubbleBarParentViewHeightUpdateNotifier { + + var timesInvoked: Int = 0 + + override fun updateTopBoundary() { + timesInvoked++ + } + } + + private class FakeBubbleStashController : BubbleStashController { + + var handleAnimator: PhysicsAnimator? = null + var taskbarTouchRegionUpdated = false + private set + + var animationInterrupted = false + private set + + private var _isStashed = true + + override var launcherState = BubbleLauncherState.HOME + override val isStashed: Boolean + get() = _isStashed + + override var bubbleBarVerticalCenterForHome = 0 + override var isSysuiLocked = false + override val isTransientTaskBar = true + override val hasHandleView = true + override val bubbleBarTranslationYForTaskbar = BAR_TRANSLATION_Y_FOR_TASKBAR + override val bubbleBarTranslationYForHotseat = BAR_TRANSLATION_Y_FOR_HOTSEAT + override var inAppDisplayOverrideProgress = 0f + + override fun init( + taskbarInsetsController: TaskbarInsetsController, + bubbleBarViewController: BubbleBarViewController, + bubbleStashedHandleViewController: BubbleStashedHandleViewController?, + controllersAfterInitAction: BubbleStashController.ControllersAfterInitAction, + ) {} + + override fun showBubbleBarImmediate() { + _isStashed = false + } + + override fun showBubbleBarImmediate(bubbleBarTranslationY: Float) { + _isStashed = false + } + + override fun stashBubbleBarImmediate() { + _isStashed = true + } + + override fun getTouchableHeight() = 100 + + override fun isBubbleBarVisible() = true + + override fun onNewBubbleAnimationInterrupted( + isStashed: Boolean, + bubbleBarTranslationY: Float, + ) { + _isStashed = isStashed + animationInterrupted = true + } + + override fun isEventOverBubbleBarViews(ev: MotionEvent) = false + + override fun setBubbleBarLocation(bubbleBarLocation: BubbleBarLocation) {} + + override fun stashBubbleBar() { + _isStashed = true + } + + override fun showBubbleBar(expandBubbles: Boolean, bubbleBarGesture: Boolean) { + _isStashed = false + } + + override fun getDiffBetweenHandleAndBarCenters() = DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + + override fun getStashedHandleTranslationForNewBubbleAnimation() = HANDLE_TRANSLATION + + override fun getStashedHandlePhysicsAnimator(): PhysicsAnimator? { + return handleAnimator + } + + override fun updateTaskbarTouchRegion() { + taskbarTouchRegionUpdated = true + } + + override fun setHandleTranslationY(translationY: Float) {} + + override fun getHandleTranslationY() = 0f + + override fun getHandleBounds(bounds: Rect) {} + } +} + +private const val DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS = -20f +private const val HANDLE_TRANSLATION = -30f +private const val BAR_TRANSLATION_Y_FOR_TASKBAR = -50f +private const val BAR_TRANSLATION_Y_FOR_HOTSEAT = -40f diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java index 44c23ba9a2c..2f4e24980e1 100644 --- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java +++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java @@ -16,27 +16,40 @@ package com.android.quickstep; -import static org.junit.Assert.assertTrue; +import static com.android.quickstep.fallback.RecentsStateUtilsKt.hasEquivalentRecentsState; +import static com.android.quickstep.fallback.RecentsStateUtilsKt.toLauncherState; -import android.os.SystemProperties; +import static org.junit.Assert.assertTrue; +import androidx.annotation.Nullable; import androidx.test.uiautomator.By; import androidx.test.uiautomator.Until; +import com.android.launcher3.LauncherState; import com.android.launcher3.tapl.LaunchedAppState; -import com.android.launcher3.ui.AbstractLauncherUiTest; +import com.android.launcher3.tapl.TestHelpers; import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.TestUtil; +import com.android.launcher3.util.Wait; +import com.android.launcher3.util.ui.AbstractLauncherUiTest; import com.android.quickstep.views.RecentsView; +import com.android.quickstep.window.RecentsWindowFlags; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.quickstep.window.RecentsWindowTracker; import org.junit.rules.RuleChain; import org.junit.rules.TestRule; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; + /** * Base class for all instrumentation tests that deal with Quickstep. */ -public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest { - public static final boolean ENABLE_SHELL_TRANSITIONS = - SystemProperties.getBoolean("persist.wm.debug.shell_transit", true); +public abstract class AbstractQuickStepTest + extends AbstractLauncherUiTest> { + @Override protected TestRule getRulesInsideActivityMonitor() { return RuleChain. @@ -47,16 +60,106 @@ protected TestRule getRulesInsideActivityMonitor() { @Override protected void onLauncherActivityClose(QuickstepLauncher launcher) { + super.onLauncherActivityClose(launcher); + if (RecentsWindowFlags.enableLauncherOverviewInWindow.isTrue()) { + executeOnRecentsWindowIfPresent(RecentsWindowManager::hideRecentsWindow); + } RecentsView recentsView = launcher.getOverviewPanel(); if (recentsView != null) { - recentsView.finishRecentsAnimation(false /* toRecents */, null); + recentsView.finishRecentsAnimation(false /* toHome */, null); + } + } + + @Nullable + private RecentsWindowManager getRecentsWindowManager() { + RecentsWindowTracker recentsWindowTracker = + RecentsWindowTracker.REPOSITORY_INSTANCE.get(mTargetContext).get(mDisplayId); + return recentsWindowTracker == null ? null : recentsWindowTracker.getCreatedContext(); + } + + // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide + // flakiness. + protected void waitForRecentsWindowCondition(String + message, Function condition) { + waitForRecentsWindowCondition(message, condition, TestUtil.DEFAULT_UI_TIMEOUT); + } + + // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide + // flakiness. + protected void waitForRecentsWindowCondition( + String message, Function condition, long timeout) { + verifyKeyguardInvisible(); + if (!TestHelpers.isInLauncherProcess()) return; + Wait.atMost(message, () -> getFromRecentsWindow(condition), mLauncher, timeout); + } + + protected T getFromRecentsWindowIfPresent(Function f) { + if (!TestHelpers.isInLauncherProcess()) return null; + return getFromRecentsWindow(recentsWindowManager -> + recentsWindowManager == null ? null : f.apply(recentsWindowManager)); + } + + protected T getFromRecentsWindow(Function f) { + if (!TestHelpers.isInLauncherProcess()) return null; + return getOnUiThread(() -> f.apply(getRecentsWindowManager())); + } + + protected void executeOnRecentsWindowIfPresent(Consumer f) { + if (!TestHelpers.isInLauncherProcess()) return; + getFromRecentsWindowIfPresent(recentsWindowManager -> { + f.accept(recentsWindowManager); + return null; + }); + } + + @Override + protected boolean isInState(Supplier state) { + if (!TestHelpers.isInLauncherProcess()) return true; + if (!RecentsWindowFlags.enableLauncherOverviewInWindow.isTrue() + || !hasEquivalentRecentsState(state.get())) { + return super.isInState(state); + } + return getFromRecentsWindow(recentsWindowManager -> + recentsWindowManager != null && toLauncherState( + recentsWindowManager.getStateManager().getState()) == state.get()); + } + + @Override + protected void waitForState( + boolean forInitialization, String message, Supplier state) { + if (!TestHelpers.isInLauncherProcess()) return; + if (!RecentsWindowFlags.enableLauncherOverviewInWindow.isTrue() + || !hasEquivalentRecentsState(state.get()) + || (forInitialization + && getRecentsWindowManager() == null)) { + super.waitForState(forInitialization, message, state); + return; + } + waitForRecentsWindowCondition(message, recentsWindowManager -> + recentsWindowManager != null && toLauncherState( + recentsWindowManager.getStateManager().getState()) == state.get()); + } + + @Override + @Nullable + protected RecentsView getOverviewPanel() { + if (!TestHelpers.isInLauncherProcess()) return null; + if (!RecentsWindowFlags.enableLauncherOverviewInWindow.isTrue()) { + return super.getOverviewPanel(); } + return getFromRecentsWindowIfPresent(RecentsWindowManager::getOverviewPanel); + } + + @Override + protected boolean useNullOverview() { + return super.useNullOverview() + && !RecentsWindowFlags.enableLauncherOverviewInWindow.isTrue(); } protected void assertTestActivityIsRunning(int activityNumber, String message) { assertTrue(message, mDevice.wait( Until.hasObject(By.pkg(getAppPackageName()).text("TestActivity" + activityNumber)), - DEFAULT_UI_TIMEOUT)); + TestUtil.DEFAULT_UI_TIMEOUT)); } protected LaunchedAppState getAndAssertLaunchedApp() { diff --git a/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java b/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java index fc757b44c9d..c5bb192ceef 100644 --- a/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java +++ b/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java @@ -17,6 +17,8 @@ import static androidx.test.InstrumentationRegistry.getInstrumentation; +import static com.android.launcher3.Flags.enableRecentsInTaskbar; + import static junit.framework.TestCase.assertEquals; import android.content.Context; @@ -24,10 +26,10 @@ import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.tapl.Taskbar; -import com.android.launcher3.ui.AbstractLauncherUiTest; -import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.LauncherLayoutBuilder; +import com.android.launcher3.util.TaskbarModeUtil; import com.android.launcher3.util.TestUtil; +import com.android.launcher3.util.ui.AbstractLauncherUiTest; import org.junit.After; import org.junit.Assume; @@ -38,6 +40,7 @@ public class AbstractTaplTestsTaskbar extends AbstractQuickStepTest { protected static final String TEST_APP_PACKAGE = getInstrumentation().getContext().getPackageName(); + protected static final String CALCULATOR_APP_NAME = "Calculator"; protected static final String CALCULATOR_APP_PACKAGE = resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR); @@ -47,7 +50,7 @@ public class AbstractTaplTestsTaskbar extends AbstractQuickStepTest { @Override public void setUp() throws Exception { - Assume.assumeTrue(mLauncher.isTablet()); + Assume.assumeTrue("Ignoring test because device is not a tablet", mLauncher.isTablet()); super.setUp(); LauncherLayoutBuilder layoutBuilder = new LauncherLayoutBuilder().atHotseat(0).putApp( @@ -55,7 +58,9 @@ public void setUp() throws Exception { "com.android.launcher3.testcomponent.BaseTestingActivity"); mLauncherLayout = TestUtil.setLauncherDefaultLayout(mTargetContext, layoutBuilder); AbstractLauncherUiTest.initialize(this); - startAppFast(CALCULATOR_APP_PACKAGE); + if (startCalendarAppDuringSetup()) { + startAppFast(CALCULATOR_APP_PACKAGE); + } mLauncher.enableBlockTimeout(true); mLauncher.showTaskbarIfHidden(); } @@ -69,20 +74,35 @@ public void tearDown() throws Exception { } protected static boolean isTaskbarInTransientMode(Context context) { - return DisplayController.isTransientTaskbar(context); + return TaskbarModeUtil.INSTANCE.get(context).isTransient(); + } + + protected boolean startCalendarAppDuringSetup() { + return true; + } + + protected boolean expectTaskbarIconsMatchHotseat() { + return true; } protected Taskbar getTaskbar() { Taskbar taskbar = mLauncher.getLaunchedAppState().getTaskbar(); + if (!expectTaskbarIconsMatchHotseat()) { + return taskbar; + } + List taskbarIconNames = taskbar.getIconNames(); List hotseatIconNames = mLauncher.getHotseatIconNames(); - assertEquals("Taskbar and hotseat icon counts do not match", - taskbarIconNames.size(), hotseatIconNames.size()); + // TODO(b/343522351): Re-enable asserts when recents are on home screen too. + if (!enableRecentsInTaskbar()) { + assertEquals("Taskbar and hotseat icon counts do not match", + taskbarIconNames.size(), hotseatIconNames.size()); - for (int i = 0; i < taskbarIconNames.size(); i++) { - assertEquals("Taskbar and Hotseat icons do not match", - taskbarIconNames, hotseatIconNames); + for (int i = 0; i < taskbarIconNames.size(); i++) { + assertEquals("Taskbar and Hotseat icons do not match", + taskbarIconNames, hotseatIconNames); + } } return taskbar; @@ -93,6 +113,6 @@ protected static void setTaskbarMode(LauncherInstrumentation launcher, launcher.enableTransientTaskbar(expectTransientTaskbar); launcher.recreateTaskbar(); launcher.checkForAnomaly(true, true); - AbstractLauncherUiTest.checkDetectedLeaks(launcher, true); + AbstractLauncherUiTest.checkDetectedLeaks(launcher); } } diff --git a/quickstep/tests/src/com/android/quickstep/AspectRatioSystemShortcutTests.kt b/quickstep/tests/src/com/android/quickstep/AspectRatioSystemShortcutTests.kt new file mode 100644 index 00000000000..515bcd14b1a --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/AspectRatioSystemShortcutTests.kt @@ -0,0 +1,289 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD +import android.content.ComponentName +import android.content.Context +import android.content.ContextWrapper +import android.content.Intent +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.provider.Settings +import android.view.Display.DEFAULT_DISPLAY +import android.view.LayoutInflater +import android.view.Surface +import android.view.View +import android.view.ViewGroup +import android.view.ViewGroup.LayoutParams.MATCH_PARENT +import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.AbstractFloatingViewHelper +import com.android.launcher3.Flags.enableRefactorTaskContentView +import com.android.launcher3.Flags.enableRefactorTaskThumbnail +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.R +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.logging.StatsLogManager.LauncherEvent +import com.android.launcher3.logging.StatsLogManager.StatsLogger +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.TaskViewItemInfo +import com.android.launcher3.util.RunnableList +import com.android.launcher3.util.SandboxContext +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.launcher3.util.TransformingTouchDelegate +import com.android.launcher3.util.WindowBounds +import com.android.quickstep.TaskViewTestDIHelpers.initializeRecentsDependencies +import com.android.quickstep.TaskViewTestDIHelpers.mockRecentsModel +import com.android.quickstep.orientation.LandscapePagedViewHandler +import com.android.quickstep.recents.di.RecentsDependencies +import com.android.quickstep.task.thumbnail.TaskContentView +import com.android.quickstep.task.thumbnail.TaskThumbnailView +import com.android.quickstep.util.RecentsOrientedState +import com.android.quickstep.util.SingleTask +import com.android.quickstep.views.LauncherRecentsView +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.TaskContainer +import com.android.quickstep.views.TaskThumbnailViewDeprecated +import com.android.quickstep.views.TaskView +import com.android.quickstep.views.TaskViewIcon +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.Task.TaskKey +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.mockito.Mockito +import org.mockito.Mockito.eq +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +/** Test for [AspectRatioSystemShortcut] */ +class AspectRatioSystemShortcutTests { + + @get:Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) + + /** Spy on a concrete Context so we can reference real View, Layout, and Display properties. */ + private val context: Context = spy(InstrumentationRegistry.getInstrumentation().targetContext) + private val applicationContext = SandboxContext(context) + + /** + * RecentsViewContainer and its super-interface ActivityContext contain methods to convert + * themselves to a Context at runtime, and static methods to convert a Context back to + * themselves by traversing ContextWrapper layers. + * + * Thus there is an undocumented assumption that a RecentsViewContainer always extends Context. + * We need to mock all of the RecentsViewContainer methods but leave the Context-under-test + * intact. + * + * The simplest way is to extend ContextWrapper and delegate the RecentsViewContainer interface + * to a mock. + */ + class RecentsViewContainerContextWrapper(base: Context) : + ContextWrapper(base), RecentsViewContainer by mock() { + + private val statsLogManager: StatsLogManager = mock() + + override fun getStatsLogManager(): StatsLogManager = statsLogManager + + override fun startActivitySafely(v: View, intent: Intent, item: ItemInfo?): RunnableList? = + null + } + + /** + * This is implicitly required in many parts of Launcher that + * require a Context. See RecentsViewContainerContextWrapper. + */ + private val launcher: RecentsViewContainerContextWrapper = + spy(RecentsViewContainerContextWrapper(context)) + + private val recentsView: LauncherRecentsView = mock() + private val abstractFloatingViewHelper: AbstractFloatingViewHelper = mock() + private val taskOverlayFactory: TaskOverlayFactory = + mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS) + private val factory: TaskShortcutFactory = + AspectRatioSystemShortcut.createFactory(abstractFloatingViewHelper) + private val statsLogger = mock() + private val orientedState: RecentsOrientedState = + mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS) + private lateinit var taskView: TaskView + + @Before + fun setUp() { + whenever(launcher.getOverviewPanel()).thenReturn(recentsView) + + val statsLogManager = launcher.getStatsLogManager() + whenever(statsLogManager.logger()).thenReturn(statsLogger) + whenever(statsLogger.withItemInfo(any())).thenReturn(statsLogger) + + whenever(orientedState.orientationHandler).thenReturn(LandscapePagedViewHandler()) + + if (enableRefactorTaskThumbnail()) { + applicationContext.initDaggerComponent( + DaggerTaskViewTestComponent.builder().bindRecentsModel(mockRecentsModel()) + ) + initializeRecentsDependencies(launcher) + } + taskView = + LayoutInflater.from(context).cloneInContext(launcher).inflate(R.layout.task, null) + as TaskView + taskView.setLayoutParams(ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)) + } + + @After + fun tearDown() { + if (enableRefactorTaskThumbnail()) { + RecentsDependencies.destroy(launcher) + } + } + + /** + * When the corresponding feature flag is off, there will not be an option to open aspect ratio + * settings. + */ + @DisableFlags(com.android.window.flags2.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) + @Test + fun createShortcut_flaggedOff_notCreated() { + val task = createTask() + val taskContainer = createTaskContainer(task) + + setScreenSizeDp(widthDp = 1200, heightDp = 800) + taskView.bind(SingleTask(task), orientedState, taskOverlayFactory) + + assertThat(factory.getShortcuts(launcher, taskContainer)).isNull() + } + + /** + * When the screen doesn't meet or exceed sw600dp (eg. phone, watch), there will not be an + * option to open aspect ratio settings. + */ + @EnableFlags(com.android.window.flags2.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) + @Test + fun createShortcut_sw599dp_notCreated() { + val task = createTask() + val taskContainer = createTaskContainer(task) + + setScreenSizeDp(widthDp = 599, heightDp = 599) + taskView.bind(SingleTask(task), orientedState, taskOverlayFactory) + + assertThat(factory.getShortcuts(launcher, taskContainer)).isNull() + } + + /** + * When the screen does meet or exceed sw600dp (eg. tablet, inner foldable screen, home cinema) + * there will be an option to open aspect ratio settings. + */ + @EnableFlags(com.android.window.flags2.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) + @Test + fun createShortcut_sw800dp_created_andOpensSettings() { + val task = createTask() + val taskContainer = spy(createTaskContainer(task)) + val taskViewItemInfo = mock() + doReturn(taskViewItemInfo).whenever(taskContainer).itemInfo + + setScreenSizeDp(widthDp = 1200, heightDp = 800) + taskView.bind(SingleTask(task), orientedState, taskOverlayFactory) + + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).hasSize(1) + + // On clicking the shortcut: + val shortcut = shortcuts!!.first() as AspectRatioSystemShortcut + shortcut.onClick(taskView) + + // 1) Panel should be closed + val allTypesExceptRebindSafe = + AbstractFloatingView.TYPE_ALL and AbstractFloatingView.TYPE_REBIND_SAFE.inv() + verify(abstractFloatingViewHelper).closeOpenViews(launcher, true, allTypesExceptRebindSafe) + + // 2) Compat mode settings activity should be launched + val intentCaptor = argumentCaptor() + verify(launcher) + .startActivitySafely(any(), intentCaptor.capture(), eq(taskViewItemInfo)) + val intent = intentCaptor.firstValue!! + assertThat(intent.action).isEqualTo(Settings.ACTION_MANAGE_USER_ASPECT_RATIO_SETTINGS) + + // 3) Shortcut tap event should be reported + verify(statsLogger).withItemInfo(taskViewItemInfo) + verify(statsLogger).log(LauncherEvent.LAUNCHER_ASPECT_RATIO_SETTINGS_SYSTEM_SHORTCUT_TAP) + } + + /** + * Overrides the screen size reported in the DeviceProfile, keeping the same pixel density as + * the underlying device and adjusting the pixel width/height to match what is required. + */ + private fun setScreenSizeDp(widthDp: Int, heightDp: Int) { + val density = context.resources.configuration.densityDpi + val widthPx = widthDp * density / 160 + val heightPx = heightDp * density / 160 + + val screenBounds = WindowBounds(widthPx, heightPx, widthPx, heightPx, Surface.ROTATION_0) + val deviceProfile = + InvariantDeviceProfile.INSTANCE[context].getDeviceProfile(context) + .toBuilder() + .setWindowBounds(screenBounds) + .build() + whenever(launcher.getDeviceProfile()).thenReturn(deviceProfile) + } + + /** Create a (very) fake task for testing. */ + private fun createTask() = + Task( + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + ComponentName("", ""), + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + ComponentName("", ""), + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + ) + + /** Create TaskContainer out of a given Task and fill in the rest with mocks. */ + private fun createTaskContainer(task: Task) = + TaskContainer( + taskView, + task, + when { + enableRefactorTaskContentView() -> mock() + enableRefactorTaskThumbnail() -> mock() + else -> mock() + }, + if (enableRefactorTaskThumbnail()) mock() + else mock(), + mock(), + mock(), + SplitConfigurationOptions.STAGE_POSITION_UNDEFINED, + digitalWellBeingToast = null, + showWindowsView = null, + taskOverlayFactory, + ) +} diff --git a/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt b/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt index 50b5df13f2e..7a14c42a125 100644 --- a/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt @@ -16,35 +16,52 @@ package com.android.quickstep +import android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD import android.content.ComponentName +import android.content.Context import android.content.Intent +import android.content.pm.PackageManager +import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.SetFlagsRule -import com.android.dx.mockito.inline.extended.ExtendedMockito +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.platform.app.InstrumentationRegistry import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession import com.android.dx.mockito.inline.extended.StaticMockitoSession +import com.android.internal.R import com.android.launcher3.AbstractFloatingView import com.android.launcher3.AbstractFloatingViewHelper +import com.android.launcher3.Flags.enableRefactorTaskContentView +import com.android.launcher3.Flags.enableRefactorTaskThumbnail import com.android.launcher3.logging.StatsLogManager import com.android.launcher3.logging.StatsLogManager.LauncherEvent -import com.android.launcher3.model.data.WorkspaceItemInfo -import com.android.launcher3.uioverrides.QuickstepLauncher +import com.android.launcher3.model.data.TaskViewItemInfo import com.android.launcher3.util.SplitConfigurationOptions import com.android.launcher3.util.TransformingTouchDelegate import com.android.quickstep.TaskOverlayFactory.TaskOverlay +import com.android.quickstep.task.thumbnail.TaskContentView +import com.android.quickstep.task.thumbnail.TaskThumbnailView import com.android.quickstep.views.LauncherRecentsView +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.TaskContainer import com.android.quickstep.views.TaskThumbnailViewDeprecated import com.android.quickstep.views.TaskView import com.android.quickstep.views.TaskViewIcon +import com.android.quickstep.views.TaskViewType import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.Task.TaskKey -import com.android.window.flags.Flags -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource -import com.android.wm.shell.shared.DesktopModeStatus +import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY +import com.android.window.flags.Flags.FLAG_ENABLE_DREAM_ACTIVITY_WINDOWING_EXCLUSION +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource import com.google.common.truth.Truth.assertThat +import kotlin.test.assertIs +import kotlin.test.assertNotNull import org.junit.After import org.junit.Before import org.junit.Rule import org.junit.Test +import org.mockito.Mockito.`when` import org.mockito.kotlin.any import org.mockito.kotlin.doReturn import org.mockito.kotlin.eq @@ -54,25 +71,22 @@ import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.mockito.quality.Strictness -/** Test for DesktopSystemShortcut */ +/** Test for [DesktopSystemShortcut] */ +// TODO(b/403558856): Improve test coverage for DesktopModeCompatPolicy integration. class DesktopSystemShortcutTest { @get:Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) - private val launcher: QuickstepLauncher = mock() + private val launcher: RecentsViewContainer = mock() private val statsLogManager: StatsLogManager = mock() private val statsLogger: StatsLogManager.StatsLogger = mock() private val recentsView: LauncherRecentsView = mock() - private val taskView: TaskView = mock() - private val workspaceItemInfo: WorkspaceItemInfo = mock() private val abstractFloatingViewHelper: AbstractFloatingViewHelper = mock() - private val thumbnailViewDeprecated: TaskThumbnailViewDeprecated = mock() - private val iconView: TaskViewIcon = mock() - private val transformingTouchDelegate: TransformingTouchDelegate = mock() + private val overlayFactory: TaskOverlayFactory = mock() private val factory: TaskShortcutFactory = DesktopSystemShortcut.createFactory(abstractFloatingViewHelper) - private val overlayFactory: TaskOverlayFactory = mock() - private val overlay: TaskOverlay<*> = mock() + private val context: Context = spy(InstrumentationRegistry.getInstrumentation().targetContext) + private val taskView: TaskView = createTaskViewMock() private lateinit var mockitoSession: StaticMockitoSession @@ -81,11 +95,12 @@ class DesktopSystemShortcutTest { mockitoSession = mockitoSession() .strictness(Strictness.LENIENT) - .spyStatic(DesktopModeStatus::class.java) + .mockStatic(DesktopModeStatus::class.java) .startMocking() - ExtendedMockito.doReturn(true).`when` { DesktopModeStatus.enforceDeviceRestrictions() } - ExtendedMockito.doReturn(true).`when` { DesktopModeStatus.isDesktopModeSupported(any()) } - whenever(overlayFactory.createOverlay(any())).thenReturn(overlay) + whenever(DesktopModeStatus.canEnterDesktopMode(any())).thenReturn(true) + whenever(overlayFactory.createOverlay(any())).thenReturn(mock>()) + doReturn(DEFAULT_DISPLAY).whenever(context).displayId + whenever(launcher.asContext()).thenReturn(context) } @After @@ -95,46 +110,147 @@ class DesktopSystemShortcutTest { @Test fun createDesktopTaskShortcutFactory_desktopModeDisabled() { - setFlagsRule.disableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE) + `when`(DesktopModeStatus.canEnterDesktopMode(any())).thenReturn(false) - val task = - Task(TaskKey(1, 0, Intent(), ComponentName("", ""), 0, 2000)).apply { - isDockable = true - } - val taskContainer = createTaskContainer(task) + val taskContainer = createTaskContainer(createTask()) val shortcuts = factory.getShortcuts(launcher, taskContainer) assertThat(shortcuts).isNull() } @Test - fun createDesktopTaskShortcutFactory_desktopModeEnabled_DeviceNotSupported() { - setFlagsRule.enableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE) - ExtendedMockito.doReturn(false).`when` { DesktopModeStatus.isDesktopModeSupported(any()) } - - val taskContainer = createTaskContainer(createTask()) + @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY) + fun createDesktopTaskShortcutFactory_noDisplayActivity() { + val baseComponent = ComponentName("", /* class */ "") + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + baseComponent, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + baseComponent, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ true, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey)) + val shortcuts = factory.getShortcuts(launcher, taskContainer) + } + @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY) + fun createDesktopTaskShortcutFactory_transparentTask() { + val baseComponent = ComponentName("", /* class */ "") + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + baseComponent, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + baseComponent, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ true, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey)) val shortcuts = factory.getShortcuts(launcher, taskContainer) assertThat(shortcuts).isNull() } @Test - fun createDesktopTaskShortcutFactory_desktopModeEnabled_DeviceNotSupported_OverrideEnabled() { - setFlagsRule.enableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE) - ExtendedMockito.doReturn(false).`when` { DesktopModeStatus.isDesktopModeSupported(any()) } - ExtendedMockito.doReturn(false).`when` { DesktopModeStatus.enforceDeviceRestrictions() } + @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY) + fun createDesktopTaskShortcutFactory_systemUiTask() { + val sysUiPackageName: String = context.resources.getString(R.string.config_systemUi) + val baseComponent = ComponentName(sysUiPackageName, /* class */ "") + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + baseComponent, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + baseComponent, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey)) + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).isNull() + } - val taskContainer = spy(createTaskContainer(createTask())) - doReturn(workspaceItemInfo).whenever(taskContainer).itemInfo + @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY) + fun createDesktopTaskShortcutFactory_defaultHomeTask() { + val packageManager: PackageManager = mock() + whenever(context.packageManager).thenReturn(packageManager) + val homeActivities = ComponentName("defaultHomePackage", /* class */ "") + whenever(packageManager.getHomeActivities(any())).thenReturn(homeActivities) + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + homeActivities, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + homeActivities, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey).apply { isDockable = true }) + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).isNull() + } + @Test + @EnableFlags( + FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + FLAG_ENABLE_DREAM_ACTIVITY_WINDOWING_EXCLUSION, + ) + fun createDesktopTaskShortcutFactory_dreamActivity() { + val baseComponent = ComponentName("", /* class */ "") + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + baseComponent, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + baseComponent, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_DREAM, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey)) val shortcuts = factory.getShortcuts(launcher, taskContainer) - assertThat(shortcuts).isNotNull() + assertThat(shortcuts).isNull() } @Test fun createDesktopTaskShortcutFactory_undockable() { - setFlagsRule.enableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE) - val unDockableTask = createTask().apply { isDockable = false } val taskContainer = createTaskContainer(unDockableTask) @@ -143,27 +259,47 @@ class DesktopSystemShortcutTest { } @Test - fun desktopSystemShortcutClicked() { - setFlagsRule.enableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE) - + fun desktopSystemShortcutClickedWithoutDesktopModeOnDisplay() { val task = createTask() val taskContainer = spy(createTaskContainer(task)) + whenever(DesktopModeStatus.isDesktopModeSupportedOnDisplay(any(), any())).thenReturn(false) whenever(launcher.getOverviewPanel()).thenReturn(recentsView) whenever(launcher.statsLogManager).thenReturn(statsLogManager) whenever(statsLogManager.logger()).thenReturn(statsLogger) whenever(statsLogger.withItemInfo(any())).thenReturn(statsLogger) + whenever(taskView.context).thenReturn(context) whenever(recentsView.moveTaskToDesktop(any(), any(), any())).thenAnswer { val successCallback = it.getArgument(2) successCallback.run() } - doReturn(workspaceItemInfo).whenever(taskContainer).itemInfo + val taskViewItemInfo = mock() + doReturn(taskViewItemInfo).whenever(taskContainer).itemInfo val shortcuts = factory.getShortcuts(launcher, taskContainer) - assertThat(shortcuts).hasSize(1) - assertThat(shortcuts!!.first()).isInstanceOf(DesktopSystemShortcut::class.java) + assertThat(shortcuts).isNull() + } + + @Test + fun desktopSystemShortcutClickedWithDesktopModeOnDisplay() { + val task = createTask() + val taskContainer = spy(createTaskContainer(task)) + + whenever(DesktopModeStatus.isDesktopModeSupportedOnDisplay(any(), any())).thenReturn(true) + whenever(launcher.getOverviewPanel()).thenReturn(recentsView) + whenever(launcher.statsLogManager).thenReturn(statsLogManager) + whenever(statsLogManager.logger()).thenReturn(statsLogger) + whenever(statsLogger.withItemInfo(any())).thenReturn(statsLogger) + whenever(taskView.context).thenReturn(context) + whenever(recentsView.moveTaskToDesktop(any(), any(), any())).thenAnswer { + val successCallback = it.getArgument(2) + successCallback.run() + } + val taskViewItemInfo = mock() + doReturn(taskViewItemInfo).whenever(taskContainer).itemInfo - val desktopShortcut = shortcuts.first() as DesktopSystemShortcut + val shortcuts = assertNotNull(factory.getShortcuts(launcher, taskContainer)) + val desktopShortcut = assertIs(shortcuts.single()) desktopShortcut.onClick(taskView) @@ -173,30 +309,60 @@ class DesktopSystemShortcutTest { verify(recentsView) .moveTaskToDesktop( eq(taskContainer), - eq(DesktopModeTransitionSource.APP_FROM_OVERVIEW), - any() + eq(DesktopModeTransitionSource.OVERVIEW_TASK_MENU), + any(), ) - verify(statsLogger).withItemInfo(workspaceItemInfo) + verify(statsLogger).withItemInfo(taskViewItemInfo) verify(statsLogger).log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_DESKTOP_TAP) } - private fun createTask(): Task { - return Task(TaskKey(1, 0, Intent(), ComponentName("", ""), 0, 2000)).apply { - isDockable = true - } - } + private fun createTask(displayId: Int = DEFAULT_DISPLAY) = + Task( + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + ComponentName("", ""), + /* userId */ 0, + /* lastActiveTime */ 2000, + displayId, + ComponentName("", ""), + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + ) + .apply { isDockable = true } - private fun createTaskContainer(task: Task): TaskView.TaskContainer { - return taskView.TaskContainer( + private fun createTaskContainer(task: Task) = + TaskContainer( + taskView, task, - thumbnailView = null, - thumbnailViewDeprecated, - iconView, - transformingTouchDelegate, + when { + enableRefactorTaskContentView() -> mock() + enableRefactorTaskThumbnail() -> mock() + else -> mock() + }, + if (enableRefactorTaskThumbnail()) mock() + else mock(), + mock(), + mock(), SplitConfigurationOptions.STAGE_POSITION_UNDEFINED, digitalWellBeingToast = null, showWindowsView = null, - overlayFactory + overlayFactory, ) + + private fun createTaskViewMock(): TaskView { + val taskView: TaskView = mock() + whenever(taskView.type).thenReturn(TaskViewType.SINGLE) + whenever(taskView.context).thenReturn(context) + return taskView + } + + private companion object { + const val SECONDARY_DISPLAY = 13 } } diff --git a/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt b/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt new file mode 100644 index 00000000000..2a718402ea3 --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt @@ -0,0 +1,336 @@ +/* + * 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.quickstep + +import android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM +import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.view.Display.DEFAULT_DISPLAY +import androidx.test.platform.app.InstrumentationRegistry +import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession +import com.android.dx.mockito.inline.extended.StaticMockitoSession +import com.android.internal.R +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.AbstractFloatingViewHelper +import com.android.launcher3.Flags.enableRefactorTaskContentView +import com.android.launcher3.Flags.enableRefactorTaskThumbnail +import com.android.launcher3.logging.StatsLogManager +import com.android.launcher3.logging.StatsLogManager.LauncherEvent +import com.android.launcher3.model.data.TaskViewItemInfo +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.launcher3.util.TransformingTouchDelegate +import com.android.quickstep.TaskOverlayFactory.TaskOverlay +import com.android.quickstep.task.thumbnail.TaskContentView +import com.android.quickstep.task.thumbnail.TaskThumbnailView +import com.android.quickstep.views.LauncherRecentsView +import com.android.quickstep.views.RecentsViewContainer +import com.android.quickstep.views.TaskContainer +import com.android.quickstep.views.TaskThumbnailViewDeprecated +import com.android.quickstep.views.TaskView +import com.android.quickstep.views.TaskViewIcon +import com.android.systemui.shared.recents.model.Task +import com.android.systemui.shared.recents.model.Task.TaskKey +import com.android.window.flags2.Flags +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.mockito.Mockito.`when` +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever +import org.mockito.quality.Strictness + +/** Test for [ExternalDisplaySystemShortcut] */ +class ExternalDisplaySystemShortcutTest { + + @get:Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) + + private val launcher: RecentsViewContainer = mock() + private val statsLogManager: StatsLogManager = mock() + private val statsLogger: StatsLogManager.StatsLogger = mock() + private val recentsView: LauncherRecentsView = mock() + private val taskView: TaskView = mock() + private val abstractFloatingViewHelper: AbstractFloatingViewHelper = mock() + private val overlayFactory: TaskOverlayFactory = mock() + private val factory: TaskShortcutFactory = + ExternalDisplaySystemShortcut.createFactory(abstractFloatingViewHelper) + private val context: Context = spy(InstrumentationRegistry.getInstrumentation().targetContext) + + private lateinit var mockitoSession: StaticMockitoSession + + @Before + fun setUp() { + mockitoSession = + mockitoSession() + .strictness(Strictness.LENIENT) + .mockStatic(DesktopModeStatus::class.java) + .startMocking() + whenever(DesktopModeStatus.canEnterDesktopMode(any())).thenReturn(true) + whenever(overlayFactory.createOverlay(any())).thenReturn(mock>()) + whenever(launcher.asContext()).thenReturn(context) + } + + @After + fun tearDown() { + mockitoSession.finishMocking() + } + + @Test + @EnableFlags(Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT) + fun createExternalDisplayTaskShortcut_desktopModeDisabled() { + `when`(DesktopModeStatus.canEnterDesktopMode(any())).thenReturn(false) + + val taskContainer = createTaskContainer(createTask()) + + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).isNull() + } + + @Test + @EnableFlags( + Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + ) + fun createExternalDisplayTaskShortcut_noDisplayActivity() { + val baseComponent = ComponentName("", /* class */ "") + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + baseComponent, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + baseComponent, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ true, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey)) + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).isNull() + } + + @Test + @EnableFlags( + Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + ) + fun createExternalDisplayTaskShortcut_transparentTask() { + val baseComponent = ComponentName("", /* class */ "") + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + baseComponent, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + baseComponent, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ true, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey)) + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).isNull() + } + + @Test + @EnableFlags( + Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + ) + fun createExternalDisplayTaskShortcut_systemUiTask() { + val sysUiPackageName: String = context.resources.getString(R.string.config_systemUi) + val baseComponent = ComponentName(sysUiPackageName, /* class */ "") + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + baseComponent, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + baseComponent, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey)) + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).isNull() + } + + @Test + @EnableFlags( + Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + ) + fun createExternalDisplayTaskShortcut_defaultHomeTask() { + val packageManager: PackageManager = mock() + val homeActivities = ComponentName("defaultHomePackage", /* class */ "") + whenever(context.packageManager).thenReturn(packageManager) + whenever(packageManager.getHomeActivities(any())).thenReturn(homeActivities) + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + homeActivities, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + homeActivities, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey).apply { isDockable = true }) + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).isNull() + } + + @Test + @EnableFlags( + Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, + Flags.FLAG_ENABLE_DREAM_ACTIVITY_WINDOWING_EXCLUSION, + ) + fun createExternalDisplayTaskShortcut_dreamActivity() { + val baseComponent = ComponentName("", /* class */ "") + val taskKey = + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + baseComponent, + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + baseComponent, + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_DREAM, + /* isTopActivityTransparent */ false, + ) + val taskContainer = createTaskContainer(Task(taskKey)) + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).isNull() + } + + @Test + @EnableFlags(Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT) + fun externalDisplaySystemShortcutClicked() { + val task = createTask() + val taskContainer = spy(createTaskContainer(task)) + + whenever(launcher.getOverviewPanel()).thenReturn(recentsView) + whenever(launcher.statsLogManager).thenReturn(statsLogManager) + whenever(statsLogManager.logger()).thenReturn(statsLogger) + whenever(statsLogger.withItemInfo(any())).thenReturn(statsLogger) + whenever(recentsView.moveTaskToExternalDisplay(any(), any(), any())).thenAnswer { + val successCallback = it.getArgument(2) + successCallback.run() + } + val taskViewItemInfo = mock() + doReturn(taskViewItemInfo).whenever(taskContainer).itemInfo + + val shortcuts = factory.getShortcuts(launcher, taskContainer) + assertThat(shortcuts).hasSize(1) + assertThat(shortcuts!!.first()).isInstanceOf(ExternalDisplaySystemShortcut::class.java) + + val externalDisplayShortcut = shortcuts.first() as ExternalDisplaySystemShortcut + + externalDisplayShortcut.onClick(taskView) + + val allTypesExceptRebindSafe = + AbstractFloatingView.TYPE_ALL and AbstractFloatingView.TYPE_REBIND_SAFE.inv() + verify(abstractFloatingViewHelper).closeOpenViews(launcher, true, allTypesExceptRebindSafe) + verify(recentsView) + .moveTaskToExternalDisplay( + eq(taskContainer), + eq(DesktopModeTransitionSource.OVERVIEW_TASK_MENU), + any(), + ) + verify(statsLogger).withItemInfo(taskViewItemInfo) + verify(statsLogger).log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_EXTERNAL_DISPLAY_TAP) + } + + private fun createTask() = + Task( + TaskKey( + /* id */ 1, + /* windowingMode */ 0, + Intent(), + ComponentName("", ""), + /* userId */ 0, + /* lastActiveTime */ 2000, + DEFAULT_DISPLAY, + ComponentName("", ""), + /* numActivities */ 1, + /* isTopActivityNoDisplay */ false, + /* isActivityStackTransparent */ false, + /* topActivityType */ ACTIVITY_TYPE_STANDARD, + /* isTopActivityTransparent */ false, + ) + ) + + private fun createTaskContainer(task: Task) = + TaskContainer( + taskView, + task, + when { + enableRefactorTaskContentView() -> mock() + enableRefactorTaskThumbnail() -> mock() + else -> mock() + }, + if (enableRefactorTaskThumbnail()) mock() + else mock(), + mock(), + mock(), + SplitConfigurationOptions.STAGE_POSITION_UNDEFINED, + digitalWellBeingToast = null, + showWindowsView = null, + overlayFactory, + ) +} diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index 28589291fdf..d9459b8ceb1 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -16,22 +16,21 @@ package com.android.quickstep; import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; +import static android.view.Display.DEFAULT_DISPLAY; import static androidx.test.InstrumentationRegistry.getInstrumentation; import static com.android.launcher3.tapl.LauncherInstrumentation.WAIT_TIME_MS; import static com.android.launcher3.tapl.TestHelpers.getHomeIntentInPackage; import static com.android.launcher3.tapl.TestHelpers.getLauncherInMyProcess; -import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_ACTIVITY_TIMEOUT; -import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_BROADCAST_TIMEOUT_SECS; -import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_UI_TIMEOUT; -import static com.android.launcher3.ui.AbstractLauncherUiTest.resolveSystemApp; -import static com.android.launcher3.ui.AbstractLauncherUiTest.startAppFast; -import static com.android.launcher3.ui.AbstractLauncherUiTest.startTestActivity; import static com.android.launcher3.ui.TaplTestsLauncher3Test.getAppPackageName; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.rule.ShellCommandRule.disableHeadsUpNotification; import static com.android.launcher3.util.rule.ShellCommandRule.getLauncherCommand; +import static com.android.launcher3.util.ui.AbstractLauncherUiTest.DEFAULT_BROADCAST_TIMEOUT_SECS; +import static com.android.launcher3.util.ui.AbstractLauncherUiTest.resolveSystemApp; +import static com.android.launcher3.util.ui.AbstractLauncherUiTest.startAppFast; +import static com.android.launcher3.util.ui.AbstractLauncherUiTest.startTestActivity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -41,8 +40,11 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; +import android.os.Process; import android.os.RemoteException; +import android.platform.test.rule.ExtendedLongPressTimeoutRule; +import androidx.annotation.Nullable; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import androidx.test.uiautomator.By; @@ -55,16 +57,21 @@ import com.android.launcher3.tapl.OverviewTask; import com.android.launcher3.tapl.TestHelpers; import com.android.launcher3.testcomponent.TestCommandReceiver; -import com.android.launcher3.ui.AbstractLauncherUiTest; +import com.android.launcher3.util.TestUtil; import com.android.launcher3.util.Wait; -import com.android.launcher3.util.rule.ExtendedLongPressTimeoutRule; import com.android.launcher3.util.rule.FailureWatcher; import com.android.launcher3.util.rule.SamplerRule; import com.android.launcher3.util.rule.ScreenRecordRule; +import com.android.launcher3.util.rule.SkipAfterTimeOutRule; import com.android.launcher3.util.rule.TestIsolationRule; import com.android.launcher3.util.rule.TestStabilityRule; -import com.android.launcher3.util.rule.ViewCaptureRule; +import com.android.launcher3.util.ui.AbstractLauncherUiTest; +import com.android.quickstep.OverviewComponentObserver.OverviewChangeListener; import com.android.quickstep.views.RecentsView; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.quickstep.window.RecentsWindowFlags; +import com.android.quickstep.window.RecentsWindowManager; +import com.android.quickstep.window.RecentsWindowTracker; import org.junit.After; import org.junit.Before; @@ -75,7 +82,6 @@ import org.junit.runner.RunWith; import org.junit.runners.model.Statement; -import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -107,6 +113,11 @@ public class FallbackRecentsTest { @Rule public ExtendedLongPressTimeoutRule mLongPressTimeoutRule = new ExtendedLongPressTimeoutRule(); + @Rule(order = -1000) // This should be the outermost rule + public SkipAfterTimeOutRule mSkipAfterTimeOutRule = new SkipAfterTimeOutRule(); + + private int mDisplayId = DEFAULT_DISPLAY; + public FallbackRecentsTest() throws RemoteException { Instrumentation instrumentation = getInstrumentation(); Context context = instrumentation.getContext(); @@ -129,6 +140,7 @@ public void evaluate() throws Throwable { getLauncherCommand(mOtherLauncherActivity)); updateHandler.mChangeCounter .await(DEFAULT_BROADCAST_TIMEOUT_SECS, TimeUnit.SECONDS); + mLauncher.setTestLauncherPackage(mOtherLauncherActivity.packageName); try { base.evaluate(); } finally { @@ -136,19 +148,17 @@ public void evaluate() throws Throwable { TestCommandReceiver.callCommand(TestCommandReceiver.DISABLE_TEST_LAUNCHER); UiDevice.getInstance(getInstrumentation()).executeShellCommand( getLauncherCommand(getLauncherInMyProcess())); + mLauncher.setTestLauncherPackage(null); pressHomeAndWaitForOverviewClose(); } } }; - final ViewCaptureRule viewCaptureRule = new ViewCaptureRule( - RecentsActivity.ACTIVITY_TRACKER::getCreatedActivity); mOrderSensitiveRules = RuleChain .outerRule(new SamplerRule()) .around(new TestStabilityRule()) .around(new NavigationModeSwitchRule(mLauncher)) - .around(new FailureWatcher(mLauncher, viewCaptureRule::getViewCaptureData)) - // .around(viewCaptureRule) b/315482167 + .around(new FailureWatcher(mLauncher)) .around(new TestIsolationRule(mLauncher, false)) .around(setLauncherCommand); @@ -173,7 +183,7 @@ public void setUp() { public void tearDown() { try { // Limits UI tests affecting tests running after them. - AbstractQuickStepTest.checkDetectedLeaks(mLauncher, true); + AbstractQuickStepTest.checkDetectedLeaks(mLauncher); } finally { mLauncher.onTestFinish(); } @@ -192,29 +202,39 @@ public void goToOverviewFromHome() { @Test public void goToOverviewFromApp() { startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); - waitForRecentsActivityStop(); + waitForRecentsClosed(); mLauncher.getLaunchedAppState().switchToOverview(); } - protected void executeOnRecents(Consumer f) { + protected void executeOnRecents(Consumer f) { getFromRecents(r -> { f.accept(r); return true; }); } - protected T getFromRecents(Function f) { + @Nullable + private RecentsWindowManager getRecentsWindowManager() { + RecentsWindowTracker recentsWindowTracker = RecentsWindowTracker.REPOSITORY_INSTANCE + .get(getInstrumentation().getTargetContext()).get(mDisplayId); + return recentsWindowTracker == null ? null : recentsWindowTracker.getCreatedContext(); + } + + protected T getFromRecents(Function f) { if (!TestHelpers.isInLauncherProcess()) return null; Object[] result = new Object[1]; Wait.atMost("Failed to get from recents", () -> MAIN_EXECUTOR.submit(() -> { - RecentsActivity activity = RecentsActivity.ACTIVITY_TRACKER.getCreatedActivity(); - if (activity == null) { + RecentsViewContainer recentsViewContainer = + RecentsWindowFlags.enableFallbackOverviewInWindow.isTrue() + ? getRecentsWindowManager() + : RecentsActivity.ACTIVITY_TRACKER.getCreatedContext(); + if (recentsViewContainer == null) { return false; } - result[0] = f.apply(activity); + result[0] = f.apply(recentsViewContainer); return true; - }).get(), DEFAULT_UI_TIMEOUT, mLauncher); + }).get(), mLauncher); return (T) result[0]; } @@ -225,14 +245,20 @@ private BaseOverview pressHomeAndGoToOverview() { private void pressHomeAndWaitForOverviewClose() { mDevice.pressHome(); - waitForRecentsActivityStop(); + waitForRecentsClosed(); } - private void waitForRecentsActivityStop() { + private void waitForRecentsClosed() { try { - final boolean recentsActivityIsNull = MAIN_EXECUTOR.submit( - () -> RecentsActivity.ACTIVITY_TRACKER.getCreatedActivity() == null).get(); - if (recentsActivityIsNull) { + final boolean isRecentsContainerNUll = MAIN_EXECUTOR.submit(() -> { + RecentsViewContainer recentsViewContainer = + RecentsWindowFlags.enableFallbackOverviewInWindow.isTrue() + ? getRecentsWindowManager() + : RecentsActivity.ACTIVITY_TRACKER.getCreatedContext(); + + return recentsViewContainer == null; + }).get(); + if (isRecentsContainerNUll) { // Null activity counts as a "stopped" one. return; } @@ -242,19 +268,20 @@ private void waitForRecentsActivityStop() { throw new RuntimeException(e); } - Wait.atMost("Recents activity didn't stop", + Wait.atMost("Recents view container didn't close", () -> getFromRecents(recents -> !recents.isStarted()), - DEFAULT_UI_TIMEOUT, mLauncher); + mLauncher); } @Test - public void testOverview() throws IOException { + public void testOverview() throws Exception { startAppFast(getAppPackageName()); startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); startTestActivity(2); - waitForRecentsActivityStop(); + waitForRecentsClosed(); Wait.atMost("Expected three apps in the task list", - () -> mLauncher.getRecentTasks().size() >= 3, DEFAULT_ACTIVITY_TIMEOUT, mLauncher); + () -> mLauncher.getRecentTasks().size() >= 3, + mLauncher); checkTestLauncher(); BaseOverview overview = mLauncher.getLaunchedAppState().switchToOverview(); @@ -282,7 +309,7 @@ public void testOverview() throws IOException { assertNotNull("OverviewTask.open returned null", task.open()); assertTrue("Test activity didn't open from Overview", TestHelpers.wait(Until.hasObject( By.pkg(getAppPackageName()).text("TestActivity2")), - DEFAULT_UI_TIMEOUT)); + TestUtil.DEFAULT_UI_TIMEOUT)); // Test dismissing a task. @@ -301,9 +328,11 @@ public void testOverview() throws IOException { mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS)); } - private void checkTestLauncher() throws IOException { + private void checkTestLauncher() throws Exception { + String launcherCmdForMainUser = String.format("cmd shortcut get-default-launcher --user %d", + Process.myUserHandle().getIdentifier()); final Matcher matcher = COMPONENT_INFO_REGEX.matcher( - mDevice.executeShellCommand("cmd shortcut get-default-launcher")); + mDevice.executeShellCommand(launcherCmdForMainUser)); assertTrue("Incorrect output from get-default-launcher", matcher.find()); assertEquals("Current Launcher activity is incorrect", "com.google.android.apps.nexuslauncher.tests/com.android" @@ -312,37 +341,39 @@ private void checkTestLauncher() throws IOException { ); } - private int getCurrentOverviewPage(RecentsActivity recents) { - return recents.getOverviewPanel().getCurrentPage(); + private int getCurrentOverviewPage(RecentsViewContainer recentsViewContainer) { + return recentsViewContainer.getOverviewPanel().getCurrentPage(); } - private int getTaskCount(RecentsActivity recents) { - return recents.getOverviewPanel().getTaskViewCount(); + private int getTaskCount(RecentsViewContainer recentsViewContainer) { + return recentsViewContainer.getOverviewPanel().getTaskViewCount(); } - private class OverviewUpdateHandler { + private class OverviewUpdateHandler implements OverviewChangeListener { - final RecentsAnimationDeviceState mRads; final OverviewComponentObserver mObserver; final CountDownLatch mChangeCounter; OverviewUpdateHandler() { Context ctx = getInstrumentation().getTargetContext(); - mRads = new RecentsAnimationDeviceState(ctx); - mObserver = new OverviewComponentObserver(ctx, mRads); + mObserver = OverviewComponentObserver.INSTANCE.get(ctx); mChangeCounter = new CountDownLatch(1); - if (mObserver.getHomeIntent().getComponent() + if (mObserver.getHomeIntent(mDisplayId).getComponent() .getPackageName().equals(mOtherLauncherActivity.packageName)) { // Home already same mChangeCounter.countDown(); } else { - mObserver.setOverviewChangeListener(b -> mChangeCounter.countDown()); + mObserver.addOverviewChangeListener(this); } } + @Override + public void onOverviewTargetChange(boolean isHomeAndOverviewSame) { + mChangeCounter.countDown(); + } + void destroy() { - mObserver.onDestroy(); - mRads.destroy(); + mObserver.removeOverviewChangeListener(this); } } } diff --git a/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java b/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java new file mode 100644 index 00000000000..835a4a65c7e --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java @@ -0,0 +1,726 @@ +/* + * 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.quickstep; + +import static com.android.launcher3.Flags.FLAG_ENABLE_MOUSE_INTERACTION_CHANGES; +import static com.android.quickstep.InputConsumerUtils.newBaseConsumer; +import static com.android.quickstep.InputConsumerUtils.newConsumer; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; +import static org.mockito.kotlin.StubberKt.doCallRealMethod; + +import android.annotation.NonNull; +import android.content.Context; +import android.content.res.Resources; +import android.os.Looper; +import android.platform.test.annotations.EnableFlags; +import android.view.Choreographer; +import android.view.Display; +import android.view.InputDevice; +import android.view.MotionEvent; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.app.displaylib.fakes.FakePerDisplayRepository; +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.R; +import com.android.launcher3.anim.AnimatedFloat; +import com.android.launcher3.dagger.LauncherAppComponent; +import com.android.launcher3.dagger.LauncherAppModule; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.taskbar.TaskbarActivityContext; +import com.android.launcher3.taskbar.TaskbarManager; +import com.android.launcher3.taskbar.bubbles.BubbleBarController; +import com.android.launcher3.taskbar.bubbles.BubbleBarSwipeController; +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController; +import com.android.launcher3.taskbar.bubbles.BubbleControllers; +import com.android.launcher3.taskbar.bubbles.BubbleCreator; +import com.android.launcher3.taskbar.bubbles.BubbleDismissController; +import com.android.launcher3.taskbar.bubbles.BubbleDragController; +import com.android.launcher3.taskbar.bubbles.BubbleStashedHandleViewController; +import com.android.launcher3.taskbar.bubbles.DragToBubbleController; +import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController; +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator; +import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.LockedUserState; +import com.android.launcher3.util.SandboxApplication; +import com.android.launcher3.views.BaseDragLayer; +import com.android.quickstep.inputconsumers.AccessibilityInputConsumer; +import com.android.quickstep.inputconsumers.BubbleBarInputConsumer; +import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer; +import com.android.quickstep.inputconsumers.LauncherInputConsumer; +import com.android.quickstep.inputconsumers.LauncherWithoutFocusInputConsumer; +import com.android.quickstep.inputconsumers.NavHandleLongPressInputConsumer; +import com.android.quickstep.inputconsumers.OneHandedModeInputConsumer; +import com.android.quickstep.inputconsumers.OtherActivityInputConsumer; +import com.android.quickstep.inputconsumers.ProgressDelegateInputConsumer; +import com.android.quickstep.inputconsumers.ResetGestureInputConsumer; +import com.android.quickstep.inputconsumers.ScreenPinnedInputConsumer; +import com.android.quickstep.inputconsumers.SysUiOverlayInputConsumer; +import com.android.quickstep.inputconsumers.TrackpadStatusBarInputConsumer; +import com.android.quickstep.util.ActiveGestureLog; +import com.android.quickstep.util.NavBarPosition; +import com.android.quickstep.views.RecentsViewContainer; +import com.android.systemui.shared.system.InputChannelCompat; +import com.android.systemui.shared.system.InputMonitorCompat; +import com.android.wm.shell.shared.desktopmode.DesktopState; + +import dagger.BindsInstance; +import dagger.Component; + +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.Optional; +import java.util.function.Function; + +import javax.inject.Provider; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class InputConsumerUtilsTest { + + @Rule public final SandboxApplication mContext = new SandboxApplication(); + + private final int mDisplayId = Display.DEFAULT_DISPLAY; + @NonNull private final InputMonitorCompat mInputMonitorCompat = + new InputMonitorCompat("", mDisplayId); + + private TaskAnimationManager mTaskAnimationManager; + private InputChannelCompat.InputEventReceiver mInputEventReceiver; + private boolean mUserUnlocked = true; + @NonNull private Function mSwipeUpProxyProvider = (state) -> null; + + @NonNull @Mock private TaskbarActivityContext mTaskbarActivityContext; + @NonNull @Mock private TaskbarFeatureEvaluator mTaskbarFeatureEvaluator; + @NonNull @Mock private OverviewComponentObserver mOverviewComponentObserver; + @NonNull @Mock private RecentsAnimationDeviceState mDeviceState; + @NonNull @Mock private RotationTouchHelper mRotationTouchHelper; + @NonNull @Mock private AbsSwipeUpHandler.Factory mSwipeUpHandlerFactory; + @NonNull @Mock private TaskbarManager mTaskbarManager; + @NonNull @Mock private OverviewCommandHelper mOverviewCommandHelper; + @NonNull @Mock private GestureState mPreviousGestureState; + @NonNull @Mock private GestureState mCurrentGestureState; + @NonNull @Mock private LockedUserState mLockedUserState; + @NonNull @Mock private TopTaskTracker.CachedTaskInfo mRunningTask; + @NonNull @Mock private BaseContainerInterface mContainerInterface; + @NonNull @Mock private BaseDragLayer mBaseDragLayer; + @NonNull @Mock private DesktopState mDesktopState; + + @Rule + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Before + public void setupTaskAnimationManager() { + DisplayController displayController = DisplayController.INSTANCE.get(mContext); + FakePerDisplayRepository fakePerDisplayRepository = + new FakePerDisplayRepository<>(); + mTaskAnimationManager = new TaskAnimationManager(mContext, mDisplayId, displayController, + fakePerDisplayRepository); + fakePerDisplayRepository.add(mDisplayId, mTaskAnimationManager); + } + + @Before + public void setupDaggerGraphOverrides() { + mContext.initDaggerComponent(DaggerInputConsumerUtilsTest_TestComponent + .builder() + .bindLockedState(mLockedUserState) + ); + } + + @Before + public void setUpInputEventReceiver() { + runOnMainSync(() -> + mInputEventReceiver = mInputMonitorCompat.getInputReceiver( + Looper.getMainLooper(), + Choreographer.getInstance(), + event -> {})); + } + + @Before + public void setUpTaskbarActivityContext() { + NavHandle navHandle = mock(NavHandle.class); + + when(navHandle.canNavHandleBeLongPressed()).thenReturn(true); + + when(mTaskbarActivityContext.getDeviceProfile()).thenReturn(new DeviceProfile()); + when(mTaskbarActivityContext.getNavHandle()).thenReturn(navHandle); + when(mTaskbarActivityContext.getResources()).thenReturn(mContext.getResources()); + } + + @Before + public void setUpTaskbarManager() { + when(mTaskbarManager.getTaskbarForDisplay(mDisplayId)).thenReturn(mTaskbarActivityContext); + } + + @Before + public void setupLockedUserState() { + when(mLockedUserState.isUserUnlocked()).thenReturn(true); + } + + @Before + public void setupGestureStates() { + when(mCurrentGestureState.getRunningTask()).thenReturn(mRunningTask); + doReturn(mContainerInterface).when(mCurrentGestureState).getContainerInterface(); + } + + @Before + public void setUpContainerInterface() { + RecentsViewContainer recentsViewContainer = mock(RecentsViewContainer.class); + + when(recentsViewContainer.getDragLayer()).thenReturn(mBaseDragLayer); + when(recentsViewContainer.getRootView()).thenReturn(mBaseDragLayer); + when(recentsViewContainer.asContext()).thenReturn(mContext); + + doReturn(recentsViewContainer).when(mContainerInterface).getCreatedContainer(); + } + + @Before + public void setupBaseDragLayer() { + when(mBaseDragLayer.hasWindowFocus()).thenReturn(true); + } + + @Before + public void setupDeviceState() { + when(mDeviceState.canStartTrackpadGesture()).thenReturn(true); + when(mDeviceState.canStartSystemGesture()).thenReturn(true); + when(mDeviceState.isFullyGesturalNavMode()).thenReturn(true); + when(mDeviceState.getNavBarPosition()).thenReturn(mock(NavBarPosition.class)); + } + + @After + public void cleanUp() { + runOnMainSync(() -> { + mInputMonitorCompat.dispose(); + mInputEventReceiver.dispose(); + }); + } + + @Test + public void testNewBaseConsumer_onKeyguard_returnsDeviceLockedInputConsumer() { + when(mDeviceState.isKeyguardShowingOccluded()).thenReturn(true); + + assertCorrectInputConsumer( + this::createBaseInputConsumer, + DeviceLockedInputConsumer.class, + InputConsumer.TYPE_DEVICE_LOCKED); + } + + @Test + public void testNewBaseConsumer_onLiveTileModeWithNoContainer_returnsDefaultInputConsumer() { + when(mContainerInterface.isInLiveTileMode()).thenReturn(true); + when(mContainerInterface.getCreatedContainer()).thenReturn(null); + + assertEqualsDefaultInputConsumer(this::createBaseInputConsumer); + } + + @Test + public void testNewBaseConsumer_onLiveTileMode_returnsLauncherInputConsumer() { + when(mContainerInterface.isInLiveTileMode()).thenReturn(true); + + assertCorrectInputConsumer( + this::createBaseInputConsumer, + LauncherInputConsumer.class, + InputConsumer.TYPE_LAUNCHER); + } + + @Test + public void testNewBaseConsumer_withNoRunningTask_returnsDefaultInputConsumer() { + when(mCurrentGestureState.getRunningTask()).thenReturn(null); + + assertEqualsDefaultInputConsumer(this::createBaseInputConsumer); + } + + @Test + public void testNewBaseConsumer_prevGestureAnimatingToLauncher_returnsLauncherInputConsumer() { + when(mPreviousGestureState.isRunningAnimationToLauncher()).thenReturn(true); + + assertCorrectInputConsumer( + this::createBaseInputConsumer, + LauncherInputConsumer.class, + InputConsumer.TYPE_LAUNCHER); + } + + @Test + public void testNewBaseConsumer_predictiveBackToHomeInProgress_returnsLauncherInputConsumer() { + when(mDeviceState.isPredictiveBackToHomeInProgress()).thenReturn(true); + + assertCorrectInputConsumer( + this::createBaseInputConsumer, + LauncherInputConsumer.class, + InputConsumer.TYPE_LAUNCHER); + } + + @Test + public void testNewBaseConsumer_resumedThroughShellTransition_returnsLauncherInputConsumer() { + when(mContainerInterface.isResumed()).thenReturn(true); + + assertCorrectInputConsumer( + this::createBaseInputConsumer, + LauncherInputConsumer.class, + InputConsumer.TYPE_LAUNCHER); + } + + @Test + public void testNewBaseConsumer_shellNoWindowFocus_returnsLauncherWithoutFocusInputConsumer() { + when(mContainerInterface.isResumed()).thenReturn(true); + when(mBaseDragLayer.hasWindowFocus()).thenReturn(false); + + assertCorrectInputConsumer( + this::createBaseInputConsumer, + LauncherWithoutFocusInputConsumer.class, + InputConsumer.TYPE_LAUNCHER_WITHOUT_FOCUS); + } + + @Test + public void testNewBaseConsumer_forceLauncherInputConsumer_returnsLauncherInputConsumer() { + when(mContainerInterface.isResumed()).thenReturn(true); + when(mRunningTask.isRootChooseActivity()).thenReturn(true); + + assertCorrectInputConsumer( + this::createBaseInputConsumer, + LauncherInputConsumer.class, + InputConsumer.TYPE_LAUNCHER); + } + + @Test + public void testNewBaseConsumer_launcherChildActivityResumed_returnsDefaultInputConsumer() { + when(mRunningTask.isHomeTask()).thenReturn(true); + when(mOverviewComponentObserver.isHomeAndOverviewSame()).thenReturn(true); + when(mContainerInterface.isLauncherOverlayShowing()).thenReturn(true); + + assertEqualsDefaultInputConsumer(this::createBaseInputConsumer); + } + + @Test + public void testNewBaseConsumer_onGestureBlockedTask_returnsDefaultInputConsumer() { + when(mDeviceState.isGestureBlockedTask(any())).thenReturn(true); + + assertEqualsDefaultInputConsumer(this::createBaseInputConsumer); + } + + @Test + @EnableFlags(FLAG_ENABLE_MOUSE_INTERACTION_CHANGES) + public void testNewBaseConsumer_nonTrackpadMouseEvent_desktop_returnsDefaultInputConsumer() { + Resources res = spy(mContext.getResources()); + doReturn(true).when(res).getBoolean(R.bool.desktop_form_factor); + Context context = spy(mContext); + when(context.getResources()).thenReturn(res); + when(mCurrentGestureState.isTrackpadGesture()).thenReturn(false); + MotionEvent mouseEvent = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0); + mouseEvent.setSource(InputDevice.SOURCE_MOUSE); + + assertEqualsDefaultInputConsumer( + () -> + newBaseConsumer( + context, + mUserUnlocked, + mTaskbarManager, + mOverviewComponentObserver, + mDeviceState, + mPreviousGestureState, + mCurrentGestureState, + mTaskAnimationManager, + mInputMonitorCompat, + mSwipeUpHandlerFactory, + otherActivityInputConsumer -> {}, + mInputEventReceiver, + mouseEvent, + ActiveGestureLog.CompoundString.NO_OP, + mRotationTouchHelper, + mDesktopState)); + + mouseEvent.recycle(); + } + + @Test + @EnableFlags(FLAG_ENABLE_MOUSE_INTERACTION_CHANGES) + public void testNewBaseConsumer_nonTrackpadMouseEvent_nonDesktop_returnsDefaultInputConsumer() { + when(mCurrentGestureState.isTrackpadGesture()).thenReturn(false); + MotionEvent mouseEvent = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0); + mouseEvent.setSource(InputDevice.SOURCE_MOUSE); + + assertCorrectInputConsumer( + () -> + newBaseConsumer( + mContext, + mUserUnlocked, + mTaskbarManager, + mOverviewComponentObserver, + mDeviceState, + mPreviousGestureState, + mCurrentGestureState, + mTaskAnimationManager, + mInputMonitorCompat, + mSwipeUpHandlerFactory, + otherActivityInputConsumer -> {}, + mInputEventReceiver, + mouseEvent, + ActiveGestureLog.CompoundString.NO_OP, + mRotationTouchHelper, + mDesktopState), + OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY); + + mouseEvent.recycle(); + } + + @Test + public void testNewBaseConsumer_noGestureBlockedTask_returnsOtherActivityInputConsumer() { + doCallRealMethod().when(mDeviceState).setGestureBlockingTaskId(anyInt()); + mDeviceState.setGestureBlockingTaskId(-1); + when(mDeviceState.isGestureBlockedTask(any())).thenCallRealMethod(); + + assertCorrectInputConsumer(this::createBaseInputConsumer, OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY); + } + + @Test + public void testNewBaseConsumer_containsOtherActivityInputConsumer() { + assertCorrectInputConsumer( + this::createBaseInputConsumer, + OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY); + } + + @Test + public void testNewConsumer_containsOtherActivityInputConsumer() { + assertCorrectInputConsumer( + this::createInputConsumer, + NavHandleLongPressInputConsumer.class, + OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY | InputConsumer.TYPE_NAV_HANDLE_LONG_PRESS); + } + + @Test + public void testNewConsumer_eventCanTriggerAssistantAction_containsAssistantInputConsumer() { + when(mDeviceState.canTriggerAssistantAction(any())).thenReturn(true); + + assertCorrectInputConsumer( + this::createInputConsumer, + NavHandleLongPressInputConsumer.class, + OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY + | InputConsumer.TYPE_NAV_HANDLE_LONG_PRESS + | InputConsumer.TYPE_ASSISTANT); + } + + @Test + public void testNewConsumer_taskbarIsPresent_containsTaskbarUnstashInputConsumer() { + DeviceProfile deviceProfile = new DeviceProfile(); + deviceProfile.isTaskbarPresent = true; + when(mTaskbarActivityContext.getDeviceProfile()).thenReturn(deviceProfile); + when(mTaskbarActivityContext.getTaskbarFeatureEvaluator()) + .thenReturn(mTaskbarFeatureEvaluator); + when(mTaskbarFeatureEvaluator.isTransient()).thenReturn(true); + + assertCorrectInputConsumer( + this::createInputConsumer, + NavHandleLongPressInputConsumer.class, + OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY + | InputConsumer.TYPE_TASKBAR_STASH + | InputConsumer.TYPE_NAV_HANDLE_LONG_PRESS + | InputConsumer.TYPE_CURSOR_HOVER); + } + + @Test + public void testNewConsumer_whileSystemUiDialogShowing_returnsSysUiOverlayInputConsumer() { + when(mDeviceState.isSystemUiDialogShowing()).thenReturn(true); + + assertCorrectInputConsumer( + this::createInputConsumer, + SysUiOverlayInputConsumer.class, + InputConsumer.TYPE_SYSUI_OVERLAY); + } + + @Test + public void testNewConsumer_onTrackpadGesture_returnsTrackpadStatusBarInputConsumer() { + when(mCurrentGestureState.isTrackpadGesture()).thenReturn(true); + + assertCorrectInputConsumer( + this::createInputConsumer, + TrackpadStatusBarInputConsumer.class, + OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY + | InputConsumer.TYPE_NAV_HANDLE_LONG_PRESS + | InputConsumer.TYPE_STATUS_BAR); + } + + @Test + public void testNewConsumer_whileScreenPinningActive_returnsScreenPinnedInputConsumer() { + when(mDeviceState.isScreenPinningActive()).thenReturn(true); + + assertCorrectInputConsumer( + this::createInputConsumer, + ScreenPinnedInputConsumer.class, + InputConsumer.TYPE_SCREEN_PINNED); + } + + @Test + public void testNewConsumer_canTriggerOneHandedAction_returnsOneHandedModeInputConsumer() { + when(mDeviceState.canTriggerOneHandedAction(any())).thenReturn(true); + + assertCorrectInputConsumer( + this::createInputConsumer, + OneHandedModeInputConsumer.class, + OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY + | InputConsumer.TYPE_NAV_HANDLE_LONG_PRESS + | InputConsumer.TYPE_ONE_HANDED); + } + + @Test + public void testNewConsumer_accessibilityMenuAvailable_returnsAccessibilityInputConsumer() { + when(mDeviceState.isAccessibilityMenuAvailable()).thenReturn(true); + + assertCorrectInputConsumer( + this::createInputConsumer, + AccessibilityInputConsumer.class, + OtherActivityInputConsumer.class, + InputConsumer.TYPE_OTHER_ACTIVITY + | InputConsumer.TYPE_NAV_HANDLE_LONG_PRESS + | InputConsumer.TYPE_ACCESSIBILITY); + } + + @Test + public void testNewConsumer_onStashedBubbleBar_returnsBubbleBarInputConsumer() { + BubbleControllers bubbleControllers = createBubbleControllers(/* isStashed= */ true); + + when(mTaskbarActivityContext.isBubbleBarEnabled()).thenReturn(true); + when(mTaskbarActivityContext.getBubbleControllers()).thenReturn(bubbleControllers); + + assertCorrectInputConsumer( + this::createInputConsumer, + BubbleBarInputConsumer.class, + InputConsumer.TYPE_BUBBLE_BAR); + } + + @Test + public void testNewConsumer_onVisibleBubbleBar_returnsBubbleBarInputConsumer() { + BubbleControllers bubbleControllers = createBubbleControllers(/* isStashed= */ false); + + when(mTaskbarActivityContext.isBubbleBarEnabled()).thenReturn(true); + when(mTaskbarActivityContext.getBubbleControllers()).thenReturn(bubbleControllers); + + assertCorrectInputConsumer( + this::createInputConsumer, + BubbleBarInputConsumer.class, + InputConsumer.TYPE_BUBBLE_BAR); + } + + @Test + public void testNewConsumer_withSwipeUpProxyProvider_returnsProgressDelegateInputConsumer() { + mSwipeUpProxyProvider = (state) -> new AnimatedFloat(); + + assertCorrectInputConsumer( + this::createInputConsumer, + ProgressDelegateInputConsumer.class, + InputConsumer.TYPE_PROGRESS_DELEGATE); + } + + @Test + public void testNewConsumer_onLockedState_returnsDeviceLockedInputConsumer() { + when(mLockedUserState.isUserUnlocked()).thenReturn(false); + + assertCorrectInputConsumer( + this::createInputConsumer, + DeviceLockedInputConsumer.class, + InputConsumer.TYPE_DEVICE_LOCKED); + } + + @Test + public void testNewConsumer_cannotStartSysGestureOnLockedState_returnsDefaultInputConsumer() { + when(mLockedUserState.isUserUnlocked()).thenReturn(false); + when(mDeviceState.canStartSystemGesture()).thenReturn(false); + + assertEqualsDefaultInputConsumer(this::createInputConsumer); + } + + @Test + public void testNewConsumer_cannotStartTrackGestureOnLockedState_returnsDefaultInputConsumer() { + when(mLockedUserState.isUserUnlocked()).thenReturn(false); + when(mCurrentGestureState.isTrackpadGesture()).thenReturn(true); + when(mDeviceState.canStartTrackpadGesture()).thenReturn(false); + + assertEqualsDefaultInputConsumer(this::createInputConsumer); + } + + private InputConsumer createInputConsumer() { + MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0); + event.setDisplayId(mDisplayId); + InputConsumer inputConsumer = newConsumer( + mContext, + mUserUnlocked, + mOverviewComponentObserver, + mDeviceState, + mPreviousGestureState, + mCurrentGestureState, + mTaskAnimationManager, + mInputMonitorCompat, + mSwipeUpHandlerFactory, + otherActivityInputConsumer -> {}, + mInputEventReceiver, + mTaskbarManager, + mSwipeUpProxyProvider, + mOverviewCommandHelper, + event, + mRotationTouchHelper, + mDesktopState); + + event.recycle(); + + return inputConsumer; + } + + private InputConsumer createBaseInputConsumer() { + MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0); + InputConsumer inputConsumer = newBaseConsumer( + mContext, + mUserUnlocked, + mTaskbarManager, + mOverviewComponentObserver, + mDeviceState, + mPreviousGestureState, + mCurrentGestureState, + mTaskAnimationManager, + mInputMonitorCompat, + mSwipeUpHandlerFactory, + otherActivityInputConsumer -> {}, + mInputEventReceiver, + event, + ActiveGestureLog.CompoundString.NO_OP, + mRotationTouchHelper, + mDesktopState); + + event.recycle(); + + return inputConsumer; + } + + private void assertEqualsDefaultInputConsumer( + @NonNull Provider inputConsumerProvider) { + assertCorrectInputConsumer( + inputConsumerProvider, + ResetGestureInputConsumer.class, + InputConsumer.TYPE_RESET_GESTURE); + + mUserUnlocked = false; + + assertCorrectInputConsumer( + inputConsumerProvider, + InputConsumer.class, + InputConsumer.TYPE_NO_OP); + } + + private void assertCorrectInputConsumer( + @NonNull Provider inputConsumerProvider, + @NonNull Class expectedOutputConsumer, + int expectedType) { + assertCorrectInputConsumer( + inputConsumerProvider, + expectedOutputConsumer, + expectedOutputConsumer, + expectedType); + } + + private void assertCorrectInputConsumer( + @NonNull Provider inputConsumerProvider, + @NonNull Class expectedOutputConsumer, + @NonNull Class expectedActiveConsumer, + int expectedType) { + when(mCurrentGestureState.getDisplayId()).thenReturn(mDisplayId); + + runOnMainSync(() -> { + InputConsumer inputConsumer = inputConsumerProvider.get(); + + assertThat(inputConsumer).isInstanceOf(expectedOutputConsumer); + assertThat(inputConsumer.getActiveConsumerInHierarchy()) + .isInstanceOf(expectedActiveConsumer); + assertThat(inputConsumer.getType()).isEqualTo(expectedType); + assertThat(inputConsumer.getDisplayId()).isEqualTo(mDisplayId); + }); + int expectedDisplayId = mDisplayId + 1; + + when(mCurrentGestureState.getDisplayId()).thenReturn(expectedDisplayId); + + runOnMainSync(() -> assertThat(inputConsumerProvider.get().getDisplayId()) + .isEqualTo(expectedDisplayId)); + } + + private static void runOnMainSync(@NonNull Runnable runnable) { + InstrumentationRegistry.getInstrumentation().runOnMainSync(runnable); + } + + private static BubbleControllers createBubbleControllers(boolean isStashed) { + BubbleBarController bubbleBarController = mock(BubbleBarController.class); + BubbleBarViewController bubbleBarViewController = mock(BubbleBarViewController.class); + BubbleStashController bubbleStashController = mock(BubbleStashController.class); + BubbleStashedHandleViewController bubbleStashedHandleViewController = + mock(BubbleStashedHandleViewController.class); + BubbleDragController bubbleDragController = mock(BubbleDragController.class); + BubbleDismissController bubbleDismissController = mock(BubbleDismissController.class); + BubbleBarSwipeController bubbleBarSwipeController = mock(BubbleBarSwipeController.class); + DragToBubbleController dragToBubbleController = mock(DragToBubbleController.class); + BubbleCreator bubbleCreator = mock(BubbleCreator.class); + BubbleControllers bubbleControllers = new BubbleControllers( + bubbleBarController, + bubbleBarViewController, + bubbleStashController, + Optional.of(bubbleStashedHandleViewController), + bubbleDragController, + bubbleDismissController, + Optional.of(bubbleBarSwipeController), + dragToBubbleController, + bubbleCreator); + + when(bubbleBarViewController.hasBubbles()).thenReturn(true); + when(bubbleStashController.isStashed()).thenReturn(isStashed); + when(bubbleStashedHandleViewController.isEventOverHandle(any())).thenReturn(true); + when(bubbleBarViewController.isBubbleBarVisible()).thenReturn(!isStashed); + when(bubbleBarViewController.isEventOverBubbleBar(any())).thenReturn(true); + + return bubbleControllers; + } + + @LauncherAppSingleton + @Component(modules = {LauncherAppModule.class}) + interface TestComponent extends LauncherAppComponent { + @Component.Builder + interface Builder extends LauncherAppComponent.Builder { + @BindsInstance Builder bindLockedState(LockedUserState state); + + @Override + TestComponent build(); + } + } +} diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java index 4459ed69447..01b7bbb38a3 100644 --- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java @@ -16,7 +16,7 @@ package com.android.quickstep; -import static androidx.test.InstrumentationRegistry.getInstrumentation; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static com.android.quickstep.NavigationModeSwitchRule.Mode.ALL; import static com.android.quickstep.NavigationModeSwitchRule.Mode.THREE_BUTTON; @@ -26,16 +26,17 @@ import android.content.Context; import android.content.pm.PackageManager; +import android.os.Process; import android.util.Log; import androidx.test.uiautomator.UiDevice; import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.tapl.TestHelpers; -import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.Wait; import com.android.launcher3.util.rule.FailureWatcher; +import com.android.launcher3.util.ui.AbstractLauncherUiTest; import com.android.systemui.shared.system.QuickStepContract; import org.junit.rules.TestRule; @@ -57,8 +58,6 @@ public class NavigationModeSwitchRule implements TestRule { static final String TAG = "QuickStepOnOffRule"; - public static final int WAIT_TIME_MS = 10000; - public enum Mode { THREE_BUTTON, ZERO_BUTTON, ALL } @@ -155,7 +154,9 @@ public static boolean setActiveOverlay(LauncherInstrumentation launcher, String Log.d(TAG, "setActiveOverlay: " + overlayPackage + "..."); UiDevice.getInstance(getInstrumentation()).executeShellCommand( - "cmd overlay enable-exclusive --category " + overlayPackage); + String.format("cmd overlay enable-exclusive --user %d --category %s", + Process.myUserHandle().getIdentifier(), + overlayPackage)); if (currentSysUiNavigationMode() != expectedMode) { final CountDownLatch latch = new CountDownLatch(1); @@ -179,13 +180,14 @@ public static boolean setActiveOverlay(LauncherInstrumentation launcher, String } Wait.atMost("Couldn't switch to " + overlayPackage, - () -> launcher.getNavigationModel() == expectedMode, WAIT_TIME_MS, launcher); + () -> launcher.getNavigationModel() == expectedMode, + launcher); Wait.atMost(() -> "Switching nav mode: " + launcher.getNavigationModeMismatchError(false), () -> launcher.getNavigationModeMismatchError(false) == null, - WAIT_TIME_MS, launcher); - AbstractLauncherUiTest.checkDetectedLeaks(launcher, false); + launcher); + AbstractLauncherUiTest.checkDetectedLeaks(launcher); return true; } @@ -203,12 +205,16 @@ private static boolean packageExists(String packageName) { private static void assertTrue(LauncherInstrumentation launcher, String message, boolean condition, Description description) { - launcher.checkForAnomaly(true, true); - if (!condition) { + try { + launcher.checkForAnomaly(true, true); + if (!condition) { + throw new AssertionError(message); + } + } catch (Throwable e) { if (description != null) { FailureWatcher.onError(launcher, description); } - throw new AssertionError(message); + throw e; } } } diff --git a/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java b/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java index a738e768336..3bb7642f1ee 100644 --- a/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java +++ b/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java @@ -21,6 +21,7 @@ import static com.android.launcher3.util.NavigationMode.NO_BUTTON; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -41,6 +42,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; +import com.android.launcher3.testing.shared.ResourceUtils; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.RotationUtils; import com.android.launcher3.util.WindowBounds; @@ -48,9 +51,11 @@ import com.android.launcher3.util.window.WindowManagerProxy; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import java.util.List; @@ -58,6 +63,9 @@ @RunWith(AndroidJUnit4.class) public class OrientationTouchTransformerTest { + @Rule + public MockitoRule mockitoRule = MockitoJUnit.rule(); + private static final Size NORMAL_SCREEN_SIZE = new Size(1080, 2280); private static final Size LARGE_SCREEN_SIZE = new Size(1080, 3280); private static final float DENSITY_DISPLAY_METRICS = 3.0f; @@ -69,7 +77,6 @@ public class OrientationTouchTransformerTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); mResources = mock(Resources.class); when(mResources.getBoolean(anyInt())).thenReturn(true); when(mResources.getDimension(anyInt())).thenReturn(10.0f); @@ -88,7 +95,7 @@ public void disabledMultipleRegions_shouldOverrideFirstRegion() { float landscapeRegionY = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1; - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); tapAndAssertTrue(100, portraitRegionY, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); tapAndAssertFalse(100, landscapeRegionY, @@ -100,7 +107,8 @@ public void disabledMultipleRegions_shouldOverrideFirstRegion() { // Override region mTouchTransformer - .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90)); + .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90), + "test"); tapAndAssertFalse(100, portraitRegionY, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); tapAndAssertTrue(100, landscapeRegionY, @@ -111,7 +119,7 @@ public void disabledMultipleRegions_shouldOverrideFirstRegion() { event -> mTouchTransformer.touchInAssistantRegion(event)); // Override region again - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); tapAndAssertTrue(100, portraitRegionY, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); tapAndAssertFalse(100, landscapeRegionY, @@ -130,7 +138,8 @@ public void enableMultipleRegions_shouldOverrideFirstRegion() { generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1; mTouchTransformer - .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90)); + .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90), + "test"); tapAndAssertFalse(100, portraitRegionY, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); tapAndAssertTrue(100, landscapeRegionY, @@ -142,7 +151,7 @@ public void enableMultipleRegions_shouldOverrideFirstRegion() { // We have to add 0 rotation second so that gets set as the current rotation, otherwise // matrix transform will fail (tests only work in Portrait at the moment) mTouchTransformer.enableMultipleRegions(true, mInfo); - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); tapAndAssertTrue(100, portraitRegionY, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); @@ -163,8 +172,9 @@ public void enableMultipleRegions_assistantTriggersInMostRecent() { mTouchTransformer.enableMultipleRegions(true, mInfo); mTouchTransformer - .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90)); - mTouchTransformer.createOrAddTouchRegion(mInfo); + .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90), + "test"); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); tapAndAssertTrue(0, portraitRegionY, event -> mTouchTransformer.touchInAssistantRegion(event)); tapAndAssertFalse(0, landscapeRegionY, @@ -179,9 +189,10 @@ public void enableMultipleRegions_assistantTriggersInCurrentOrientationAfterDisa generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1; mTouchTransformer.enableMultipleRegions(true, mInfo); - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); mTouchTransformer - .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90)); + .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90), + "test"); mTouchTransformer.enableMultipleRegions(false, mInfo); tapAndAssertTrue(0, portraitRegionY, event -> mTouchTransformer.touchInAssistantRegion(event)); @@ -211,14 +222,14 @@ public void assistantTriggersInCurrentScreenAfterScreenSizeChange() { @Test public void applyTransform_taskNotFrozen_notInRegion() { - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); tapAndAssertFalse(100, 100, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); } @Test public void applyTransform_taskFrozen_noRotate_outOfRegion() { - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); mTouchTransformer.enableMultipleRegions(true, mInfo); tapAndAssertFalse(100, 100, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); @@ -226,7 +237,7 @@ public void applyTransform_taskFrozen_noRotate_outOfRegion() { @Test public void applyTransform_taskFrozen_noRotate_inRegion() { - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); mTouchTransformer.enableMultipleRegions(true, mInfo); float y = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1; tapAndAssertTrue(100, y, @@ -235,7 +246,7 @@ public void applyTransform_taskFrozen_noRotate_inRegion() { @Test public void applyTransform_taskNotFrozen_noRotate_inDefaultRegion() { - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); float y = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1; tapAndAssertTrue(100, y, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); @@ -244,7 +255,8 @@ public void applyTransform_taskNotFrozen_noRotate_inDefaultRegion() { @Test public void applyTransform_taskNotFrozen_90Rotate_inRegion() { mTouchTransformer - .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90)); + .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90), + "test"); float y = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1; tapAndAssertTrue(100, y, event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY())); @@ -252,10 +264,11 @@ public void applyTransform_taskNotFrozen_90Rotate_inRegion() { @Test public void applyTransform_taskNotFrozen_90Rotate_withTwoRegions() { - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); mTouchTransformer.enableMultipleRegions(true, mInfo); mTouchTransformer - .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90)); + .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90), + "test"); // Landscape point float y1 = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1; MotionEvent inRegion1_down = generateMotionEvent(MotionEvent.ACTION_DOWN, 10, y1); @@ -276,10 +289,11 @@ public void applyTransform_taskNotFrozen_90Rotate_withTwoRegions() { @Test public void applyTransform_90Rotate_inRotatedRegion() { // Create regions for both 0 Rotation and 90 Rotation - mTouchTransformer.createOrAddTouchRegion(mInfo); + mTouchTransformer.createOrAddTouchRegion(mInfo, "test"); mTouchTransformer.enableMultipleRegions(true, mInfo); mTouchTransformer - .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90)); + .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90), + "test"); // Portrait point in landscape orientation axis float x1 = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0); // bottom of screen, from landscape perspective right side of screen @@ -287,6 +301,35 @@ public void applyTransform_90Rotate_inRotatedRegion() { assertTrue(mTouchTransformer.touchInValidSwipeRegions(inRegion2.getX(), inRegion2.getY())); } + @Test + public void testSimpleOrientationTouchTransformer() { + final DisplayController displayController = mock(DisplayController.class); + doReturn(mInfo).when(displayController).getInfoForDisplay(anyInt()); + final SimpleOrientationTouchTransformer transformer = + new SimpleOrientationTouchTransformer(getApplicationContext(), displayController, + mock(DaggerSingletonTracker.class)); + final MotionEvent move1 = generateMotionEvent(MotionEvent.ACTION_MOVE, 100, 10); + transformer.transform(move1, Surface.ROTATION_90); + // The position is transformed to 90 degree. + assertEquals(10, move1.getX(), 0f /* delta */); + assertEquals(NORMAL_SCREEN_SIZE.getWidth() - 100, move1.getY(), 0f /* delta */); + + // If the touching state is specified, the position is still transformed to 90 degree even + // if the given rotation is changed. + final MotionEvent move2 = generateMotionEvent(MotionEvent.ACTION_MOVE, 100, 10); + transformer.updateTouchingOrientation(Surface.ROTATION_90); + transformer.transform(move2, Surface.ROTATION_0); + assertEquals(move1.getX(), move2.getX(), 0f /* delta */); + assertEquals(move1.getY(), move2.getY(), 0f /* delta */); + + // If the touching state is cleared, it restores to use the given rotation. + final MotionEvent move3 = generateMotionEvent(MotionEvent.ACTION_MOVE, 100, 10); + transformer.clearTouchingOrientation(); + transformer.transform(move3, Surface.ROTATION_0); + assertEquals(100, move3.getX(), 0f /* delta */); + assertEquals(10, move3.getY(), 0f /* delta */); + } + private DisplayController.Info createDisplayInfo(Size screenSize, int rotation) { Point displaySize = new Point(screenSize.getWidth(), screenSize.getHeight()); RotationUtils.rotateSize(displaySize, rotation); @@ -300,7 +343,8 @@ private DisplayController.Info createDisplayInfo(Size screenSize, int rotation) ArrayMap> internalDisplayBounds = new ArrayMap<>(); doReturn(internalDisplayBounds).when(wmProxy).estimateInternalDisplayBounds(any()); return new DisplayController.Info( - getApplicationContext(), wmProxy, new ArrayMap<>()); + getApplicationContext(), false, wmProxy, new ArrayMap<>(), + DisplayMetrics.DENSITY_DEFAULT); } private float generateTouchRegionHeight(Size screenSize, int rotation) { diff --git a/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java b/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java deleted file mode 100644 index 03244eb0bf8..00000000000 --- a/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java +++ /dev/null @@ -1,107 +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.quickstep; - -import static junit.framework.TestCase.assertNull; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.ActivityManager; -import android.app.KeyguardManager; - -import androidx.test.filters.SmallTest; - -import com.android.launcher3.util.LooperExecutor; -import com.android.quickstep.util.GroupTask; -import com.android.wm.shell.util.GroupedRecentTaskInfo; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -@SmallTest -public class RecentTasksListTest { - - @Mock - private SystemUiProxy mockSystemUiProxy; - @Mock - private TopTaskTracker mTopTaskTracker; - - // Class under test - private RecentTasksList mRecentTasksList; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - LooperExecutor mockMainThreadExecutor = mock(LooperExecutor.class); - KeyguardManager mockKeyguardManager = mock(KeyguardManager.class); - mRecentTasksList = new RecentTasksList(mockMainThreadExecutor, mockKeyguardManager, - mockSystemUiProxy, mTopTaskTracker); - } - - @Test - public void onRecentTasksChanged_doesNotFetchTasks() { - mRecentTasksList.onRecentTasksChanged(); - verify(mockSystemUiProxy, times(0)) - .getRecentTasks(anyInt(), anyInt()); - } - - @Test - public void loadTasksInBackground_onlyKeys_noValidTaskDescription() { - GroupedRecentTaskInfo recentTaskInfos = GroupedRecentTaskInfo.forSplitTasks( - new ActivityManager.RecentTaskInfo(), new ActivityManager.RecentTaskInfo(), null); - when(mockSystemUiProxy.getRecentTasks(anyInt(), anyInt())) - .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); - - List taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, - true); - - assertEquals(1, taskList.size()); - assertNull(taskList.get(0).task1.taskDescription.getLabel()); - assertNull(taskList.get(0).task2.taskDescription.getLabel()); - } - - @Test - public void loadTasksInBackground_moreThanKeys_hasValidTaskDescription() { - String taskDescription = "Wheeee!"; - ActivityManager.RecentTaskInfo task1 = new ActivityManager.RecentTaskInfo(); - task1.taskDescription = new ActivityManager.TaskDescription(taskDescription); - ActivityManager.RecentTaskInfo task2 = new ActivityManager.RecentTaskInfo(); - task2.taskDescription = new ActivityManager.TaskDescription(); - GroupedRecentTaskInfo recentTaskInfos = GroupedRecentTaskInfo.forSplitTasks(task1, task2, - null); - when(mockSystemUiProxy.getRecentTasks(anyInt(), anyInt())) - .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); - - List taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, - false); - - assertEquals(1, taskList.size()); - assertEquals(taskDescription, taskList.get(0).task1.taskDescription.getLabel()); - assertNull(taskList.get(0).task2.taskDescription.getLabel()); - } -} diff --git a/quickstep/tests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt b/quickstep/tests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt deleted file mode 100644 index 80fbce72655..00000000000 --- a/quickstep/tests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt +++ /dev/null @@ -1,205 +0,0 @@ -package com.android.quickstep - -import android.content.Context -import android.testing.AndroidTestingRunner -import androidx.test.core.app.ApplicationProvider -import androidx.test.filters.SmallTest -import com.android.launcher3.util.DisplayController.CHANGE_DENSITY -import com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE -import com.android.launcher3.util.DisplayController.CHANGE_ROTATION -import com.android.launcher3.util.DisplayController.Info -import com.android.launcher3.util.NavigationMode -import com.android.quickstep.util.GestureExclusionManager -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_MAGNIFICATION_OVERLAP -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING -import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED -import com.google.common.truth.Truth.assertThat -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.Mockito.reset -import org.mockito.Mockito.verify -import org.mockito.MockitoAnnotations -import org.mockito.kotlin.doReturn -import org.mockito.kotlin.verifyZeroInteractions -import org.mockito.kotlin.whenever - -/** Unit test for [RecentsAnimationDeviceState]. */ -@SmallTest -@RunWith(AndroidTestingRunner::class) -class RecentsAnimationDeviceStateTest { - - @Mock private lateinit var exclusionManager: GestureExclusionManager - @Mock private lateinit var info: Info - - private val context = ApplicationProvider.getApplicationContext() as Context - private lateinit var underTest: RecentsAnimationDeviceState - - @Before - fun setup() { - MockitoAnnotations.initMocks(this) - underTest = RecentsAnimationDeviceState(context, exclusionManager) - } - - @Test - fun registerExclusionListener_success() { - underTest.registerExclusionListener() - - verify(exclusionManager).addListener(underTest) - } - - @Test - fun registerExclusionListener_again_fail() { - underTest.registerExclusionListener() - reset(exclusionManager) - - underTest.registerExclusionListener() - - verifyZeroInteractions(exclusionManager) - } - - @Test - fun unregisterExclusionListener_success() { - underTest.registerExclusionListener() - reset(exclusionManager) - - underTest.unregisterExclusionListener() - - verify(exclusionManager).removeListener(underTest) - } - - @Test - fun unregisterExclusionListener_again_fail() { - underTest.registerExclusionListener() - underTest.unregisterExclusionListener() - reset(exclusionManager) - - underTest.unregisterExclusionListener() - - verifyZeroInteractions(exclusionManager) - } - - @Test - fun onDisplayInfoChanged_noButton_registerExclusionListener() { - doReturn(NavigationMode.NO_BUTTON).whenever(info).getNavigationMode() - - underTest.onDisplayInfoChanged(context, info, CHANGE_ROTATION or CHANGE_NAVIGATION_MODE) - - verify(exclusionManager).addListener(underTest) - } - - @Test - fun onDisplayInfoChanged_twoButton_unregisterExclusionListener() { - underTest.registerExclusionListener() - whenever(info.getNavigationMode()).thenReturn(NavigationMode.TWO_BUTTONS) - reset(exclusionManager) - - underTest.onDisplayInfoChanged(context, info, CHANGE_ROTATION or CHANGE_NAVIGATION_MODE) - - verify(exclusionManager).removeListener(underTest) - } - - @Test - fun onDisplayInfoChanged_changeDensity_noOp() { - underTest.registerExclusionListener() - whenever(info.getNavigationMode()).thenReturn(NavigationMode.NO_BUTTON) - reset(exclusionManager) - - underTest.onDisplayInfoChanged(context, info, CHANGE_DENSITY) - - verifyZeroInteractions(exclusionManager) - } - - @Test - fun trackpadGesturesNotAllowedForSelectedStates() { - val disablingStates = GESTURE_DISABLING_SYSUI_STATES + - SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED - - allSysUiStates().forEach { state -> - val canStartGesture = !disablingStates.contains(state) - underTest.setSystemUiFlags(state) - assertThat(underTest.canStartTrackpadGesture()).isEqualTo(canStartGesture) - } - } - - @Test - fun trackpadGesturesNotAllowedIfHomeAndOverviewIsDisabled() { - val stateToExpectedResult = mapOf( - SYSUI_STATE_HOME_DISABLED to true, - SYSUI_STATE_OVERVIEW_DISABLED to true, - DEFAULT_STATE - .enable(SYSUI_STATE_OVERVIEW_DISABLED) - .enable(SYSUI_STATE_HOME_DISABLED) to false - ) - - stateToExpectedResult.forEach { (state, allowed) -> - underTest.setSystemUiFlags(state) - assertThat(underTest.canStartTrackpadGesture()).isEqualTo(allowed) - } - } - - @Test - fun systemGesturesNotAllowedForSelectedStates() { - val disablingStates = GESTURE_DISABLING_SYSUI_STATES + SYSUI_STATE_NAV_BAR_HIDDEN - - allSysUiStates().forEach { state -> - val canStartGesture = !disablingStates.contains(state) - underTest.setSystemUiFlags(state) - assertThat(underTest.canStartSystemGesture()).isEqualTo(canStartGesture) - } - } - - @Test - fun systemGesturesNotAllowedWhenGestureStateDisabledAndNavBarVisible() { - val stateToExpectedResult = mapOf( - DEFAULT_STATE - .enable(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) - .disable(SYSUI_STATE_NAV_BAR_HIDDEN) to true, - DEFAULT_STATE - .enable(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) - .enable(SYSUI_STATE_NAV_BAR_HIDDEN) to true, - DEFAULT_STATE - .disable(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) - .disable(SYSUI_STATE_NAV_BAR_HIDDEN) to true, - DEFAULT_STATE - .disable(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) - .enable(SYSUI_STATE_NAV_BAR_HIDDEN) to false, - ) - - stateToExpectedResult.forEach {(state, gestureAllowed) -> - underTest.setSystemUiFlags(state) - assertThat(underTest.canStartSystemGesture()).isEqualTo(gestureAllowed) - } - } - - private fun allSysUiStates(): List { - // SYSUI_STATES_* are binary flags - return (0..SYSUI_STATES_COUNT).map { 1L shl it } - } - - companion object { - private val GESTURE_DISABLING_SYSUI_STATES = listOf( - SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED, - SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING, - SYSUI_STATE_QUICK_SETTINGS_EXPANDED, - SYSUI_STATE_MAGNIFICATION_OVERLAP, - SYSUI_STATE_DEVICE_DREAMING, - SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION, - ) - private const val SYSUI_STATES_COUNT = 33 - private const val DEFAULT_STATE = 0L - } - - private fun Long.enable(state: Long) = this or state - - private fun Long.disable(state: Long) = this and state.inv() -} diff --git a/quickstep/tests/src/com/android/quickstep/RecentsDeviceProfileRepositoryImplTest.kt b/quickstep/tests/src/com/android/quickstep/RecentsDeviceProfileRepositoryImplTest.kt new file mode 100644 index 00000000000..418d66c6161 --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/RecentsDeviceProfileRepositoryImplTest.kt @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession +import com.android.dx.mockito.inline.extended.StaticMockitoSession +import com.android.launcher3.FakeInvariantDeviceProfileTest +import com.android.quickstep.recents.data.RecentsDeviceProfile +import com.android.quickstep.recents.data.RecentsDeviceProfileRepositoryImpl +import com.android.quickstep.views.RecentsViewContainer +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever +import org.mockito.quality.Strictness + +class RecentsDeviceProfileRepositoryImplTest : FakeInvariantDeviceProfileTest() { + private val recentsViewContainer: RecentsViewContainer = mock() + + private lateinit var mockitoSession: StaticMockitoSession + + @Before + override fun setUp() { + super.setUp() + mockitoSession = + mockitoSession() + .strictness(Strictness.LENIENT) + .mockStatic(DesktopModeStatus::class.java) + .startMocking() + whenever(recentsViewContainer.asContext()).thenReturn(context) + } + + @After + fun tearDown() { + mockitoSession.finishMocking() + } + + @Test + fun deviceProfileMappedCorrectlyForPhone() { + val deviceProfileRepo = RecentsDeviceProfileRepositoryImpl(recentsViewContainer) + initializeVarsForPhone() + val phoneDeviceProfile = newDP() + whenever(recentsViewContainer.deviceProfile).thenReturn(phoneDeviceProfile) + + whenever(DesktopModeStatus.canEnterDesktopMode(any())).thenReturn(false) + assertThat(deviceProfileRepo.getRecentsDeviceProfile()) + .isEqualTo(RecentsDeviceProfile(isLargeScreen = false, canEnterDesktopMode = false)) + } + + @Test + fun deviceProfileMappedCorrectlyForTablet() { + val deviceProfileRepo = RecentsDeviceProfileRepositoryImpl(recentsViewContainer) + initializeVarsForTablet() + val tabletDeviceProfile = newDP() + whenever(recentsViewContainer.deviceProfile).thenReturn(tabletDeviceProfile) + + whenever(DesktopModeStatus.canEnterDesktopMode(any())).thenReturn(true) + assertThat(deviceProfileRepo.getRecentsDeviceProfile()) + .isEqualTo(RecentsDeviceProfile(isLargeScreen = true, canEnterDesktopMode = true)) + } +} diff --git a/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java b/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java deleted file mode 100644 index 648fa932a60..00000000000 --- a/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.quickstep; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.ActivityManager; -import android.content.Context; -import android.content.res.Resources; -import android.platform.test.flag.junit.SetFlagsRule; - -import androidx.test.annotation.UiThreadTest; -import androidx.test.filters.SmallTest; - -import com.android.launcher3.Flags; -import com.android.launcher3.R; -import com.android.launcher3.icons.IconProvider; -import com.android.quickstep.util.GroupTask; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.system.TaskStackChangeListeners; - -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.util.ArrayList; -import java.util.function.Consumer; - -@SmallTest -public class RecentsModelTest { - @Mock - private Context mContext; - - @Mock - private TaskThumbnailCache mThumbnailCache; - - @Mock - private RecentTasksList mTasksList; - - @Mock - private TaskThumbnailCache.HighResLoadingState mHighResLoadingState; - - private RecentsModel mRecentsModel; - - private RecentTasksList.TaskLoadResult mTaskResult; - - private Resources mResource; - - @Rule - public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); - - @Before - public void setup() throws NoSuchFieldException { - MockitoAnnotations.initMocks(this); - mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW); - mTaskResult = getTaskResult(); - doAnswer(invocation-> { - Consumer> callback = invocation.getArgument(1); - callback.accept(mTaskResult); - return null; - }).when(mTasksList).getTaskKeys(anyInt(), any()); - - when(mHighResLoadingState.isEnabled()).thenReturn(true); - when(mThumbnailCache.getHighResLoadingState()).thenReturn(mHighResLoadingState); - when(mThumbnailCache.isPreloadingEnabled()).thenReturn(true); - - mRecentsModel = new RecentsModel(mContext, mTasksList, mock(TaskIconCache.class), - mThumbnailCache, mock(IconProvider.class), mock(TaskStackChangeListeners.class)); - - mResource = mock(Resources.class); - when(mResource.getInteger((R.integer.recentsThumbnailCacheSize))).thenReturn(3); - when(mContext.getResources()).thenReturn(mResource); - } - - @Test - @UiThreadTest - public void preloadOnHighResolutionEnabled() { - mRecentsModel.preloadCacheIfNeeded(); - - ArgumentCaptor taskArgs = ArgumentCaptor.forClass(Task.class); - verify(mRecentsModel.getThumbnailCache(), times(2)) - .updateThumbnailInCache(taskArgs.capture(), /* lowResolution= */ eq(false)); - - GroupTask expectedGroupTask = mTaskResult.get(0); - assertThat(taskArgs.getAllValues().get(0)).isEqualTo( - expectedGroupTask.task1); - assertThat(taskArgs.getAllValues().get(1)).isEqualTo( - expectedGroupTask.task2); - } - - @Test - public void notPreloadOnHighResolutionDisabled() { - when(mHighResLoadingState.isEnabled()).thenReturn(false); - when(mThumbnailCache.isPreloadingEnabled()).thenReturn(true); - mRecentsModel.preloadCacheIfNeeded(); - verify(mRecentsModel.getThumbnailCache(), never()) - .updateThumbnailInCache(any(), anyBoolean()); - } - - @Test - public void notPreloadOnPreloadDisabled() { - when(mThumbnailCache.isPreloadingEnabled()).thenReturn(false); - mRecentsModel.preloadCacheIfNeeded(); - verify(mRecentsModel.getThumbnailCache(), never()) - .updateThumbnailInCache(any(), anyBoolean()); - - } - - @Test - public void increaseCacheSizeAndPreload() { - // Mock to return preload is needed - when(mThumbnailCache.updateCacheSizeAndRemoveExcess()).thenReturn(true); - // Update cache size - mRecentsModel.updateCacheSizeAndPreloadIfNeeded(); - // Assert update cache is called - verify(mRecentsModel.getThumbnailCache(), times(2)) - .updateThumbnailInCache(any(), /* lowResolution= */ eq(false)); - } - - @Test - public void decreaseCacheSizeAndNotPreload() { - // Mock to return preload is not needed - when(mThumbnailCache.updateCacheSizeAndRemoveExcess()).thenReturn(false); - // Update cache size - mRecentsModel.updateCacheSizeAndPreloadIfNeeded(); - // Assert update cache is never called - verify(mRecentsModel.getThumbnailCache(), never()) - .updateThumbnailInCache(any(), anyBoolean()); - } - - private RecentTasksList.TaskLoadResult getTaskResult() { - RecentTasksList.TaskLoadResult allTasks = new RecentTasksList.TaskLoadResult(0, false, 1); - ActivityManager.RecentTaskInfo taskInfo1 = new ActivityManager.RecentTaskInfo(); - Task.TaskKey taskKey1 = new Task.TaskKey(taskInfo1); - Task task1 = Task.from(taskKey1, taskInfo1, false); - - ActivityManager.RecentTaskInfo taskInfo2 = new ActivityManager.RecentTaskInfo(); - Task.TaskKey taskKey2 = new Task.TaskKey(taskInfo2); - Task task2 = Task.from(taskKey2, taskInfo2, false); - - allTasks.add(new GroupTask(task1, task2, null)); - return allTasks; - } -} diff --git a/quickstep/tests/src/com/android/quickstep/TaplDigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/TaplDigitalWellBeingToastTest.java deleted file mode 100644 index 07d8f61992f..00000000000 --- a/quickstep/tests/src/com/android/quickstep/TaplDigitalWellBeingToastTest.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep; - -import static androidx.test.InstrumentationRegistry.getInstrumentation; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import android.app.PendingIntent; -import android.app.usage.UsageStatsManager; -import android.content.Intent; - -import androidx.test.filters.LargeTest; -import androidx.test.runner.AndroidJUnit4; - -import com.android.launcher3.Launcher; -import com.android.quickstep.views.DigitalWellBeingToast; -import com.android.quickstep.views.RecentsView; -import com.android.quickstep.views.TaskView; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.time.Duration; - -@LargeTest -@RunWith(AndroidJUnit4.class) -public class TaplDigitalWellBeingToastTest extends AbstractQuickStepTest { - private static final String CALCULATOR_PACKAGE = - resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR); - - @Test - public void testToast() throws Exception { - startAppFast(CALCULATOR_PACKAGE); - - final UsageStatsManager usageStatsManager = - mTargetContext.getSystemService(UsageStatsManager.class); - final int observerId = 0; - - try { - final String[] packages = new String[]{CALCULATOR_PACKAGE}; - - // Set time limit for app. - runWithShellPermission(() -> - usageStatsManager.registerAppUsageLimitObserver(observerId, packages, - Duration.ofSeconds(600), Duration.ofSeconds(300), - PendingIntent.getActivity(mTargetContext, -1, new Intent() - .setPackage(mTargetContext.getPackageName()), - PendingIntent.FLAG_MUTABLE))); - - mLauncher.goHome(); - final DigitalWellBeingToast toast = getToast(); - - waitForLauncherCondition("Toast is not visible", launcher -> toast.hasLimit()); - assertEquals("Toast text: ", "5 minutes left today", toast.getText()); - - // Unset time limit for app. - runWithShellPermission( - () -> usageStatsManager.unregisterAppUsageLimitObserver(observerId)); - - mLauncher.goHome(); - assertFalse("Toast is visible", getToast().hasLimit()); - } finally { - runWithShellPermission( - () -> usageStatsManager.unregisterAppUsageLimitObserver(observerId)); - } - } - - private DigitalWellBeingToast getToast() { - mLauncher.getWorkspace().switchToOverview(); - final TaskView task = getOnceNotNull("No latest task", launcher -> getLatestTask(launcher)); - - return getFromLauncher(launcher -> { - TaskView.TaskContainer taskContainer = task.getTaskContainers().get(0); - assertTrue("Latest task is not Calculator", CALCULATOR_PACKAGE.equals( - taskContainer.getTask().getTopComponent().getPackageName())); - return taskContainer.getDigitalWellBeingToast(); - }); - } - - private TaskView getLatestTask(Launcher launcher) { - return launcher.getOverviewPanel().getTaskViewAt(0); - } - - private void runWithShellPermission(Runnable action) { - getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(); - try { - action.run(); - } finally { - getInstrumentation().getUiAutomation().dropShellPermissionIdentity(); - } - - } -} diff --git a/quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java b/quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java index b7fd8be3118..7aa4fb65f96 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java +++ b/quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java @@ -15,20 +15,16 @@ */ package com.android.quickstep; -import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; -import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import android.content.Intent; import android.platform.test.annotations.PlatinumTest; -import com.android.launcher3.tapl.OverviewTask.OverviewSplitTask; +import com.android.launcher3.tapl.Overview; +import com.android.launcher3.tapl.OverviewTask.OverviewTaskContainer; import com.android.launcher3.tapl.OverviewTaskMenu; -import com.android.launcher3.ui.AbstractLauncherUiTest; -import com.android.launcher3.uioverrides.QuickstepLauncher; -import com.android.launcher3.util.rule.TestStabilityRule; +import com.android.quickstep.util.SplitScreenTestUtils; import org.junit.Test; @@ -36,7 +32,7 @@ * This test run in both Out of process (Oop) and in-process (Ipc). * Tests the app Icon in overview. */ -public class TaplOverviewIconTest extends AbstractLauncherUiTest { +public class TaplOverviewIconTest extends AbstractQuickStepTest { private static final String CALCULATOR_APP_PACKAGE = resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR); @@ -69,41 +65,18 @@ private void startTestApps() { } @Test - @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/288939273 public void testSplitTaskTapBothIconMenus() { - createAndLaunchASplitPair(); + Overview overview = SplitScreenTestUtils.createAndLaunchASplitPairInOverview(mLauncher); - OverviewTaskMenu taskMenu = - mLauncher.goHome().switchToOverview().getCurrentTask().tapMenu(); + OverviewTaskMenu taskMenu = overview.getCurrentTask().tapMenu(); assertTrue("App info item not appearing in expanded task menu.", taskMenu.hasMenuItem("App info")); taskMenu.touchOutsideTaskMenuToDismiss(); - OverviewTaskMenu splitMenu = - mLauncher.goHome().switchToOverview().getCurrentTask().tapMenu( - OverviewSplitTask.SPLIT_BOTTOM_OR_RIGHT); + OverviewTaskMenu splitMenu = overview.getCurrentTask().tapMenu( + OverviewTaskContainer.SPLIT_BOTTOM_OR_RIGHT); assertTrue("App info item not appearing in expanded split task's menu.", splitMenu.hasMenuItem("App info")); splitMenu.touchOutsideTaskMenuToDismiss(); } - - private void createAndLaunchASplitPair() { - clearAllRecentTasks(); - - startTestActivity(2); - startTestActivity(3); - - if (mLauncher.isTablet() && !mLauncher.isGridOnlyOverviewEnabled()) { - mLauncher.goHome().switchToOverview().getOverviewActions() - .clickSplit() - .getTestActivityTask(2) - .open(); - } else { - mLauncher.goHome().switchToOverview().getCurrentTask() - .tapMenu() - .tapSplitMenuItem() - .getCurrentTask() - .open(); - } - } -} +} \ No newline at end of file diff --git a/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java b/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java index 23a29f78406..4cb9c44cd8d 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java +++ b/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java @@ -21,7 +21,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; +import android.os.Process; import android.util.Log; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -55,8 +57,6 @@ public class TaplPrivateSpaceTest extends AbstractQuickStepTest { @Override public void setUp() throws Exception { super.setUp(); - initialize(this); - createAndStartPrivateProfileUser(); mDevice.pressHome(); @@ -75,8 +75,9 @@ public void setUp() throws Exception { } private void createAndStartPrivateProfileUser() { - String createUserOutput = executeShellCommand("pm create-user --profileOf 0 --user-type " - + "android.os.usertype.profile.PRIVATE " + PRIVATE_PROFILE_NAME); + int myUserId = Process.myUserHandle().getIdentifier(); + String createUserOutput = executeShellCommand("pm create-user --profileOf " + myUserId + + " --user-type android.os.usertype.profile.PRIVATE " + PRIVATE_PROFILE_NAME); updatePrivateProfileSetupSuccessful("pm create-user", createUserOutput); String[] tokens = createUserOutput.split("\\s+"); mProfileUserId = Integer.parseInt(tokens[tokens.length - 1]); @@ -117,7 +118,6 @@ public void testPrivateSpaceContainerIsPresent() { } @Test - @ScreenRecordRule.ScreenRecord // b/334946529 public void testUserInstalledAppIsShownAboveDivider() throws IOException { // Ensure that the App is not installed in main user otherwise, it may not be found in // PS container. @@ -142,7 +142,6 @@ public void testUserInstalledAppIsShownAboveDivider() throws IOException { } @Test - @ScreenRecordRule.ScreenRecord // b/334946529 public void testPrivateSpaceAppLongPressUninstallMenu() throws IOException { // Ensure that the App is not installed in main user otherwise, it may not be found in // PS container. @@ -166,8 +165,9 @@ public void testPrivateSpaceAppLongPressUninstallMenu() throws IOException { } @Test - @ScreenRecordRule.ScreenRecord // b/334946529 public void testPrivateSpaceLockingBehaviour() throws IOException { + assumeFalse("Ignoring test because device is tablet", + mLauncher.isTablet()); // b/367258373 // Scroll to the bottom of All Apps executeOnLauncher(launcher -> launcher.getAppsView().resetAndScrollToPrivateSpaceHeader()); HomeAllApps homeAllApps = mLauncher.getAllApps(); diff --git a/quickstep/tests/src/com/android/quickstep/TaplStartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/TaplStartLauncherViaGestureTests.java index 1886ce671a8..d09b7619c8b 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplStartLauncherViaGestureTests.java +++ b/quickstep/tests/src/com/android/quickstep/TaplStartLauncherViaGestureTests.java @@ -16,9 +16,16 @@ package com.android.quickstep; +import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; +import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; +import static com.android.launcher3.util.rule.TestStabilityRule.Stability; + +import android.util.Log; + import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; +import com.android.launcher3.util.rule.ScreenRecordRule; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import org.junit.Before; @@ -29,8 +36,14 @@ @RunWith(AndroidJUnit4.class) public class TaplStartLauncherViaGestureTests extends AbstractQuickStepTest { + public static final String TAG = "TaplStartLauncherViaGestureTests"; + static final int STRESS_REPEAT_COUNT = 10; + private enum TestCase { + TO_HOME, TO_OVERVIEW, + } + @Override @Before public void setUp() throws Exception { @@ -41,28 +54,62 @@ public void setUp() throws Exception { } @Test - @NavigationModeSwitch + @NavigationModeSwitch(mode = NavigationModeSwitchRule.Mode.THREE_BUTTON) + @Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/435425092 public void testStressPressHome() { - for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) { - // Destroy Launcher activity. - closeLauncherActivity(); + runTest(TestCase.TO_HOME); + } - // The test action. - mLauncher.goHome(); - } + @Test + @NavigationModeSwitch(mode = NavigationModeSwitchRule.Mode.ZERO_BUTTON) + public void testStressSwipeHome() { + runTest(TestCase.TO_HOME); + } + + @Test + @NavigationModeSwitch(mode = NavigationModeSwitchRule.Mode.THREE_BUTTON) + public void testStressPressOverview() { + runTest(TestCase.TO_OVERVIEW); } @Test - @NavigationModeSwitch + @NavigationModeSwitch(mode = NavigationModeSwitchRule.Mode.ZERO_BUTTON) + @ScreenRecordRule.ScreenRecord // b/417727096 public void testStressSwipeToOverview() { + runTest(TestCase.TO_OVERVIEW); + } + + private void runTest(TestCase testCase) { + long testStartTime = System.currentTimeMillis(); for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) { + long loopStartTime = System.currentTimeMillis(); // Destroy Launcher activity. closeLauncherActivity(); // The test action. - mLauncher.getLaunchedAppState().switchToOverview(); + switch (testCase) { + case TO_OVERVIEW: + mLauncher.getLaunchedAppState().switchToOverview(); + break; + case TO_HOME: + mLauncher.goHome(); + break; + default: + throw new IllegalStateException("Cannot run test case: " + testCase); + } + Log.d(TAG, "Loop " + (i + 1) + " runtime=" + + (System.currentTimeMillis() - loopStartTime) + "ms"); + } + Log.d(TAG, "Test runtime=" + (System.currentTimeMillis() - testStartTime) + "ms"); + switch (testCase) { + case TO_OVERVIEW: + closeLauncherActivity(); + mLauncher.goHome(); + break; + case TO_HOME: + default: + // No-Op + break; } - closeLauncherActivity(); - mLauncher.goHome(); } } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTaskbarPinningTest.kt b/quickstep/tests/src/com/android/quickstep/TaplTaskbarPinningTest.kt new file mode 100644 index 00000000000..cdb0a0afbfc --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/TaplTaskbarPinningTest.kt @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.platform.test.rule.AllowedDevices +import android.platform.test.rule.DeviceProduct +import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator +import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch +import com.google.common.truth.Truth.assertThat +import org.junit.Test + +@AllowedDevices(allowed = [DeviceProduct.TANGORPRO, DeviceProduct.CF_TABLET]) +class TaplTaskbarPinningTest : AbstractTaplTestsTaskbar() { + + private lateinit var taskbarFeatureEvaluator: TaskbarFeatureEvaluator + + override fun setUp() { + super.setUp() + taskbarFeatureEvaluator = TaskbarFeatureEvaluator.INSTANCE[mTargetContext] + } + + override fun tearDown() { + mLauncher.clearLauncherData() + super.tearDown() + } + + @Test + @TaskbarModeSwitch(mode = TaskbarModeSwitchRule.Mode.TRANSIENT) + fun testPinningUnpinningTransientTaskbar_whenInOverview() { + assertThat(taskbarFeatureEvaluator.isTransient).isTrue() + mLauncher.goHome().switchToOverview() + // Pinning + taskbar.toggleAlwaysShowTaskbarOption() + mLauncher.goHome() + + assertThat(taskbarFeatureEvaluator.isTransient).isFalse() + assertThat(taskbarFeatureEvaluator.isPinned).isTrue() + + // unpinning + mLauncher.goHome().switchToOverview() + taskbar.toggleAlwaysShowTaskbarOption() + mLauncher.goHome() + + assertThat(taskbarFeatureEvaluator.isTransient).isTrue() + assertThat(taskbarFeatureEvaluator.isPinned).isFalse() + } + + @Test + @TaskbarModeSwitch(mode = TaskbarModeSwitchRule.Mode.TRANSIENT) + fun testPinningUnpinningTransientTaskbar_whenInApp() { + startAppFast(TEST_APP_PACKAGE) + assertThat(taskbarFeatureEvaluator.isTransient).isTrue() + + mLauncher.launchedAppState.assertTaskbarVisible() + + // Pinning + taskbar.toggleAlwaysShowTaskbarOption() + mLauncher.goHome() + + assertThat(taskbarFeatureEvaluator.isTransient).isFalse() + assertThat(taskbarFeatureEvaluator.isPinned).isTrue() + + // unpinning + startAppFast(TEST_APP_PACKAGE) + taskbar.toggleAlwaysShowTaskbarOption() + mLauncher.goHome() + + assertThat(taskbarFeatureEvaluator.isTransient).isTrue() + assertThat(taskbarFeatureEvaluator.isPinned).isFalse() + } + + @Test + @TaskbarModeSwitch(mode = TaskbarModeSwitchRule.Mode.TRANSIENT) + fun testPinningUnpinningTransientTaskbar_whenInDesktopMode() { + startAppFast(CALCULATOR_APP_PACKAGE) + assertThat(taskbarFeatureEvaluator.isTransient).isTrue() + mLauncher.goHome().switchToOverview().currentTask.tapMenu().tapDesktopMenuItem() + mLauncher.launchedAppState.assertTaskbarVisible() + assertThat(taskbarFeatureEvaluator.isPinned).isTrue() + + // unpinning + mLauncher.launchedAppState.taskbar.toggleAlwaysShowTaskbarOption() + mLauncher.launchedAppState.assertTaskbarHidden() + + // pinning + mLauncher.launchedAppState.hoverScreenBottomEdgeToUnstashTaskbar() + mLauncher.launchedAppState.taskbar.toggleAlwaysShowTaskbarOption() + mLauncher.launchedAppState.assertTaskbarVisible() + } +} diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestTaskbarIconDrag.kt b/quickstep/tests/src/com/android/quickstep/TaplTestTaskbarIconDrag.kt new file mode 100644 index 00000000000..e49b6730c5d --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/TaplTestTaskbarIconDrag.kt @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep + +import android.platform.test.annotations.RequiresFlagsEnabled +import android.platform.test.flag.junit.DeviceFlagsValueProvider +import android.platform.test.rule.ScreenRecordRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.LargeTest +import com.android.launcher3.util.LauncherLayoutBuilder +import com.android.launcher3.util.TestConstants.AppNames.TEST_APP_NAME +import com.android.launcher3.util.TestUtil +import com.android.wm.shell.Flags +import org.junit.After +import org.junit.Assume +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +// TODO(b/418015387) remove once issues like b/418015387 disappear completely +@ScreenRecordRule.ScreenRecord +@LargeTest +@RunWith(AndroidJUnit4::class) +@RequiresFlagsEnabled(Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE) +class TaplTestTaskbarIconDrag : AbstractQuickStepTest() { + + @get:Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + + private var launcherLayout: AutoCloseable? = null + + override fun setUp() { + Assume.assumeTrue("Ignoring test because device is not a tablet", mLauncher.isTablet) + super.setUp() + val layoutBuilder = + LauncherLayoutBuilder() + .atHotseat(0) + .putApp( + "com.google.android.apps.nexuslauncher.tests", + "com.android.launcher3.testcomponent.BaseTestingActivity", + ) + launcherLayout = TestUtil.setLauncherDefaultLayout(mTargetContext, layoutBuilder) + performInitialization() + mLauncher.enableBlockTimeout(true) + } + + @After + fun tearDown() { + mLauncher.removeAllBubbles() + mLauncher.enableBlockTimeout(false) + launcherLayout?.close() + } + + @Test + fun testAppIconDragOnOverviewFromTaskBarToBubbleBar() { + val overview = mLauncher.workspace.switchToOverview() + // test left drop target + overview.taskbar!! + .getAppIcon(TEST_APP_NAME) + .dragToBubbleBarLocation(/* isBubbleBarLeftDropTarget= */ true) + } + + @Test + fun testAppIconDragInRunningAppFromTaskBarToBubbleBar() { + startAppFast(AbstractTaplTestsTaskbar.CALCULATOR_APP_PACKAGE) + val launchedAppState = mLauncher.launchedAppState + mLauncher.showTaskbarIfHidden() + // test right drop target + launchedAppState.taskbar + .getAppIcon(TEST_APP_NAME) + .dragToBubbleBarLocation(/* isBubbleBarLeftDropTarget= */ false) + } + + @Test + fun testAppIconDragOnOverviewFromTaskBarAllAppsToBubbleBar() { + val overview = mLauncher.workspace.switchToOverview() + // test right drop target + overview.taskbar!! + .openAllApps() + .getAppIcon(TEST_APP_NAME) + .dragToBubbleBarLocation(/* isBubbleBarLeftDropTarget= */ false) + } + + @Test + fun testAppIconDragInRunningAppFromTaskBarAllAppsToBubbleBar() { + startAppFast(AbstractTaplTestsTaskbar.CALCULATOR_APP_PACKAGE) + val launchedAppState = mLauncher.launchedAppState + mLauncher.showTaskbarIfHidden() + // test left drop target + launchedAppState.taskbar + .openAllApps() + .getAppIcon(TEST_APP_NAME) + .dragToBubbleBarLocation(/* isBubbleBarLeftDropTarget= */ true) + } +} diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsDesktopFirstTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsDesktopFirstTaskbar.java new file mode 100644 index 00000000000..4f6f8b6615d --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsDesktopFirstTaskbar.java @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep; + +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; +import static android.view.Display.DEFAULT_DISPLAY; + +import static androidx.test.InstrumentationRegistry.getTargetContext; + +import static com.android.launcher3.util.TestConstants.AppNames.TEST_APP_NAME; +import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT; +import static com.android.wm.shell.shared.desktopmode.DesktopModeStatus.ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAY_SYS_PROP; + +import static com.google.common.truth.Truth.assertThat; + +import android.os.RemoteException; +import android.util.Log; +import android.view.WindowManagerGlobal; + +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + +import com.android.launcher3.tapl.HomeAllApps; +import com.android.launcher3.util.rule.SetPropRule; +import com.android.launcher3.util.ui.PortraitLandscapeRunner.PortraitLandscape; +import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; +import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch; +import com.android.window.flags2.Flags; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; + +import org.junit.Assume; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExternalResource; +import org.junit.runner.RunWith; + +/** + * Test taskbar behavior on desktop devices, and more generally, freeform windowing mode displays + * where launching an app opens enters desktop windowing by default. + */ +@LargeTest +@RunWith(AndroidJUnit4.class) +public class TaplTestsDesktopFirstTaskbar extends AbstractTaplTestsTaskbar { + private static final String TAG = "TaplTestsDesktopFirstTaskbar"; + + @Rule + public SetPropRule mSetPropRule = + new SetPropRule(ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAY_SYS_PROP, "true"); + + // Default-to-desktop feature requires the display to be freeform mode. + @Rule + public ExternalResource mFreeformDisplayRule = new ExternalResource() { + private int mOriginalWindowingMode = WINDOWING_MODE_UNDEFINED; + + @Override + protected void before() { + mOriginalWindowingMode = setDisplayWindowingMode(WINDOWING_MODE_FREEFORM); + } + + @Override + protected void after() { + if (mOriginalWindowingMode != WINDOWING_MODE_UNDEFINED) { + setDisplayWindowingMode(mOriginalWindowingMode); + } + } + }; + + @Override + public void setUp() throws Exception { + Assume.assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); + Assume.assumeTrue(Flags.enterDesktopByDefaultOnFreeformDisplays()); + Assume.assumeTrue( + "Ignoring test because device does not support desktop mode", + DesktopModeStatus.canEnterDesktopMode(getTargetContext())); + super.setUp(); + } + + @Override + protected boolean startCalendarAppDuringSetup() { + return false; + } + + @Override + protected boolean expectTaskbarIconsMatchHotseat() { + return false; + } + + @Test + @PortraitLandscape + @NavigationModeSwitch + @TaskbarModeSwitch(mode = PERSISTENT) + public void testTaskbarOnHome() { + // Go home - taskbar should be visible in desktop-first display context. + mDevice.pressHome(); + waitForResumed("Launcher internal state is still Background"); + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + + // Open an app, and go back home. + startAppFast(CALCULATOR_APP_PACKAGE); + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + mDevice.pressHome(); + waitForResumed("Launcher internal state is still Background"); + + // Verify that taskbar is still visible, and contains an icon associated with a running app, + // which is expected in desktop-first display context. + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + getTaskbar().getAppIconForRunningApp(CALCULATOR_APP_NAME).launch(CALCULATOR_APP_PACKAGE); + + // Activating the running app icon on desktop-fist taskbar opens the app in desktop. + mLauncher.getLaunchedAppState().assertAppInDesktop(CALCULATOR_APP_PACKAGE); + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + } + + @Test + @PortraitLandscape + @NavigationModeSwitch + @TaskbarModeSwitch(mode = PERSISTENT) + public void testTaskbarForFullscreenApp() { + clearAllRecentTasks(); + mDevice.pressHome(); + waitForResumed("Launcher internal state is still Background"); + + // Open two apps - they are both expected to open in desktop windowing on desktop-first + // display, then move the second one into fullscreen. + startAppFast(CALCULATOR_APP_PACKAGE); + startTestActivity(2); + mLauncher.getLaunchedAppState().moveFocusedActivityToFullscreen(getAppPackageName(), + "TestActivity2"); + + // Verify that taskbar is still visible, and contains an icon associated with a running app, + // which is expected in desktop-first display context. + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + getTaskbar().getAppIconForRunningApp(CALCULATOR_APP_NAME).launch(CALCULATOR_APP_PACKAGE); + + // Activating the running app icon on desktop-fist taskbar opens the app in desktop. + mLauncher.getLaunchedAppState().assertAppInDesktop(CALCULATOR_APP_PACKAGE); + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + } + + @Test + @PortraitLandscape + @NavigationModeSwitch + @TaskbarModeSwitch(mode = PERSISTENT) + public void testTaskbarForDesktopMode() { + clearAllRecentTasks(); + mDevice.pressHome(); + waitForResumed("Launcher internal state is still Background"); + + // Start two apps - they are both expected to open in desktop windowing on desktop-first + // display. + startAppFast(CALCULATOR_APP_PACKAGE); + startTestActivity(2); + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + + // Verify that taskbar is still visible, and contains an icon associated with a running app, + // which is expected in desktop-first display context. + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + getTaskbar().getAppIconForRunningApp(CALCULATOR_APP_NAME).launch(CALCULATOR_APP_PACKAGE); + + // Activating the running app icon on desktop-fist taskbar opens the app in desktop. + mLauncher.getLaunchedAppState().assertAppInDesktop(CALCULATOR_APP_PACKAGE); + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + } + + @Test + @PortraitLandscape + @NavigationModeSwitch + @TaskbarModeSwitch(mode = PERSISTENT) + public void testDragFromAllAppsToWorspace() { + mDevice.pressHome(); + waitForResumed("Launcher internal state is still Background"); + + final HomeAllApps allApps = getTaskbar().openAllAppsOnHome(); + allApps.freeze(); + try { + allApps.getAppIcon(TEST_APP_NAME).dragToWorkspace(false, false); + assertThat(mLauncher.getWorkspace().getWorkspaceAppIcon(TEST_APP_NAME)).isNotNull(); + } finally { + allApps.unfreeze(); + } + } + + private int setDisplayWindowingMode(int windowingMode) { + try { + int originalWindowingMode = + WindowManagerGlobal.getWindowManagerService().getWindowingMode(DEFAULT_DISPLAY); + WindowManagerGlobal.getWindowManagerService().setWindowingMode( + DEFAULT_DISPLAY, windowingMode); + return originalWindowingMode; + } catch (RemoteException e) { + Log.e(TAG, "error setting windowing mode", e); + throw new RuntimeException(e); + } + } +} diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java b/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java index 43ebb1752ae..2b047bcabf6 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java @@ -16,11 +16,14 @@ package com.android.quickstep; import android.content.Intent; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; import androidx.annotation.NonNull; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; +import com.android.launcher3.Flags; import com.android.launcher3.tapl.KeyboardQuickSwitch; import com.android.launcher3.taskbar.KeyboardQuickSwitchController; @@ -49,7 +52,9 @@ private enum TestCase { DISMISS(0), LAUNCH_LAST_APP(0), LAUNCH_SELECTED_APP(1), - LAUNCH_OVERVIEW(KeyboardQuickSwitchController.MAX_TASKS - 1); + DISMISS_WHEN_GOING_HOME(1), + LAUNCH_OVERVIEW(KeyboardQuickSwitchController.MAX_TASKS - 1), + LAUNCH_LAST_MAX_TASK_NOT_OVERVIEW(KeyboardQuickSwitchController.MAX_TASKS); private final int mNumAdditionalRunningTasks; @@ -63,7 +68,8 @@ private enum TestCase { @Override public void setUp() throws Exception { - Assume.assumeTrue(mLauncher.isTablet()); + Assume.assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); super.setUp(); startAppFast(CALCULATOR_APP_PACKAGE); startTestActivity(2); @@ -85,6 +91,7 @@ public void testDismiss_fromHomeAllApps() { } @Test + @DisableFlags(value = Flags.FLAG_ENABLE_WIDGET_PICKER_REFACTOR) public void testDismiss_fromWidgets() { runTest(TestSurface.WIDGETS, TestCase.DISMISS); } @@ -105,6 +112,7 @@ public void testLaunchLastTask_fromHomeAllApps() { } @Test + @DisableFlags(value = Flags.FLAG_ENABLE_WIDGET_PICKER_REFACTOR) public void testLaunchLastTask_fromWidgets() { runTest(TestSurface.WIDGETS, TestCase.LAUNCH_LAST_APP); } @@ -125,37 +133,54 @@ public void testLaunchSelectedTask_fromHomeAllApps() { } @Test + @DisableFlags(value = Flags.FLAG_ENABLE_WIDGET_PICKER_REFACTOR) public void testLaunchSelectedTask_fromWidgets() { runTest(TestSurface.WIDGETS, TestCase.LAUNCH_SELECTED_APP); } @Test + @DisableFlags(value = Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) public void testLaunchOverviewTask_fromHome() { runTest(TestSurface.HOME, TestCase.LAUNCH_OVERVIEW); } @Test + @DisableFlags(value = Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) public void testLaunchOverviewTask_fromApp() { runTest(TestSurface.LAUNCHED_APP, TestCase.LAUNCH_OVERVIEW); } @Test + @DisableFlags(value = Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) public void testLaunchOverviewTask_fromHomeAllApps() { runTest(TestSurface.HOME_ALL_APPS, TestCase.LAUNCH_OVERVIEW); } @Test + @DisableFlags(value = {Flags.FLAG_ENABLE_WIDGET_PICKER_REFACTOR, + Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING}) public void testLaunchOverviewTask_fromWidgets() { runTest(TestSurface.WIDGETS, TestCase.LAUNCH_OVERVIEW); } @Test public void testLaunchSingleRecentTask() { - mLauncher.getLaunchedAppState().switchToOverview().dismissAllTasks(); + clearAllRecentTasks(); startAppFast(CALCULATOR_APP_PACKAGE); mLauncher.goHome().showQuickSwitchView().launchFocusedAppTask(CALCULATOR_APP_PACKAGE); } + @Test + public void testDismissedWhenGoingHome() { + runTest(TestSurface.LAUNCHED_APP, TestCase.DISMISS_WHEN_GOING_HOME); + } + + @Test + @EnableFlags(value = Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) + public void testLaunchLastTaskAfterMaxNotOverview_fromHome() { + runTest(TestSurface.HOME, TestCase.LAUNCH_LAST_MAX_TASK_NOT_OVERVIEW); + } + private void runTest(@NonNull TestSurface testSurface, @NonNull TestCase testCase) { for (int i = 0; i < testCase.mNumAdditionalRunningTasks; i++) { startTestActivity(3 + i); @@ -197,6 +222,9 @@ private void runTest(@NonNull TestSurface testSurface, @NonNull TestCase testCas } kqs.launchFocusedAppTask(CALCULATOR_APP_PACKAGE); break; + case DISMISS_WHEN_GOING_HOME: + kqs.dismissByGoingHome(); + break; case LAUNCH_OVERVIEW: kqs.moveFocusBackward(); if (!testSurface.mInitialFocusAtZero) { @@ -206,6 +234,13 @@ private void runTest(@NonNull TestSurface testSurface, @NonNull TestCase testCas // Check that the correct task was focused .launchFocusedTaskByEnterKey(CALCULATOR_APP_PACKAGE); break; + case LAUNCH_LAST_MAX_TASK_NOT_OVERVIEW: + kqs.moveFocusBackward(); + if (!testSurface.mInitialFocusAtZero) { + kqs.moveFocusBackward(); + } + kqs.launchFocusedAppTask(CALCULATOR_APP_PACKAGE); + break; default: throw new IllegalStateException("Cannot run test case: " + testCase); } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsOverviewDesktop.kt b/quickstep/tests/src/com/android/quickstep/TaplTestsOverviewDesktop.kt new file mode 100644 index 00000000000..fc7bdb5c5af --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsOverviewDesktop.kt @@ -0,0 +1,448 @@ +/* + * 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.quickstep + +import android.platform.test.annotations.EnableFlags +import android.platform.test.rule.AllowedDevices +import android.platform.test.rule.DeviceProduct +import android.platform.test.rule.IgnoreLimit +import androidx.test.uiautomator.By +import androidx.test.uiautomator.Until +import com.android.launcher3.BuildConfig +import com.android.launcher3.Flags.FLAG_ENABLE_DESKTOP_EXPLODED_VIEW +import com.android.launcher3.LauncherState +import com.android.launcher3.tapl.BaseOverview +import com.android.launcher3.tapl.LaunchedAppState +import com.android.launcher3.tapl.OverviewTask +import com.android.launcher3.util.TestUtil +import com.android.launcher3.util.ui.PortraitLandscapeRunner.PortraitLandscape +import com.android.quickstep.AbstractTaplTestsTaskbar.CALCULATOR_APP_NAME +import com.android.quickstep.AbstractTaplTestsTaskbar.CALCULATOR_APP_PACKAGE +import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND +import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND +import com.google.common.truth.Truth.assertThat +import com.google.common.truth.Truth.assertWithMessage +import java.util.function.Supplier +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test + +/** Test Desktop windowing in Overview. */ +@AllowedDevices(allowed = [DeviceProduct.CF_TABLET, DeviceProduct.TANGORPRO]) +@IgnoreLimit(ignoreLimit = BuildConfig.IS_STUDIO_BUILD) +class TaplTestsOverviewDesktop : AbstractQuickStepTest() { + @Before + fun setup() { + clearAllRecentTasks() + startTestAppsWithCheck() + mLauncher.goHome() + } + + @EnableFlags(FLAG_ENABLE_DESKTOP_EXPLODED_VIEW) + @Test + fun testAllTasksRemovalFromCloseButtonInExplodedView() { + val desktopTaskView = + mLauncher.workspace + .switchToOverview() + // Move last launched TEST_ACTIVITY_2 into Desktop + .moveTaskToDesktop(TEST_ACTIVITY_2) + .switchToOverview() + // Scroll back to TEST_ACTIVITY_1, then move it into Desktop + .apply { flingForward() } + .moveTaskToDesktop(TEST_ACTIVITY_1) + .switchToOverview() + .currentTask + + // There should be two desktop thumbnail views in Overview. + assertThat(desktopTaskView.getDesktopThumbnailViewCount()).isEqualTo(2) + + // Tap on the close button of [TEST_ACTIVITY_1]'s thumbnail view header. + desktopTaskView.tapCloseDesktopThumbnailView("TestActivity$TEST_ACTIVITY_1") + assertThat(desktopTaskView.getDesktopThumbnailViewCount()).isEqualTo(1) + + // Tap on the second close button. Since there will be no thumbnail windows and no other + // task view tiles, Overview should have dismissed. + desktopTaskView.tapCloseDesktopThumbnailView("TestActivity$TEST_ACTIVITY_2") + assertTrue( + "Launcher internal state is not Workspace", + isInState(Supplier { LauncherState.NORMAL }), + ) + } + + @EnableFlags(FLAG_ENABLE_DESKTOP_EXPLODED_VIEW) + @Test + fun testActivateIndividualTaskFromExplodedView() { + var desktopTaskView = + mLauncher.workspace + .switchToOverview() + // Move last launched TEST_ACTIVITY_2 into Desktop + .moveTaskToDesktop(TEST_ACTIVITY_2) + .switchToOverview() + // Scroll back to TEST_ACTIVITY_1, then move it into Desktop + .apply { flingForward() } + .moveTaskToDesktop(TEST_ACTIVITY_1) + .switchToOverview() + .currentTask + + // There should be two desktop thumbnail views in Overview. + assertThat(desktopTaskView.getDesktopThumbnailViewCount()).isEqualTo(2) + + // Tap on the thumbnail of [TEST_ACTIVITY_2] to activate its window. + desktopTaskView.tapOnDesktopThumbnailView("TestActivity$TEST_ACTIVITY_2") + TEST_ACTIVITIES.forEach { assertTestAppLaunched(it) } + + // Tap on the thumbnail of [TEST_ACTIVITY_1] to activate its window. + desktopTaskView = mLauncher.goHome().switchToOverview().currentTask + desktopTaskView.tapOnDesktopThumbnailView("TestActivity$TEST_ACTIVITY_1") + TEST_ACTIVITIES.forEach { assertTestAppLaunched(it) } + + // Tap on the empty space in overview should not bring back [TEST_ACTIVITY_2] + desktopTaskView = mLauncher.goHome().switchToOverview().currentTask + desktopTaskView.tapOnEmptySpaceInDesktopTaskView() + TEST_ACTIVITIES.forEach { assertTestAppLaunched(it) } + } + + @Test + @PortraitLandscape + fun enterDesktopViaOverviewMenu() { + // Move last launched TEST_ACTIVITY_2 into Desktop + mLauncher.workspace.switchToOverview().moveTaskToDesktop(TEST_ACTIVITY_2) + // Scroll back to TEST_ACTIVITY_1, then move it into Desktop + mLauncher + .goHome() + .switchToOverview() + .apply { flingForward() } + .moveTaskToDesktop(TEST_ACTIVITY_1) + TEST_ACTIVITIES.forEach { assertTestAppLaunched(it) } + + // Launch static DesktopTaskView without live tile in Overview + val desktopTask = + mLauncher.goHome().switchToOverview().getTestActivityTask(TEST_ACTIVITIES).open() + TEST_ACTIVITIES.forEach { assertTestAppLaunched(it) } + + // Launch live-tile DesktopTaskView + desktopTask.switchToOverview().getTestActivityTask(TEST_ACTIVITIES).open() + TEST_ACTIVITIES.forEach { assertTestAppLaunched(it) } + + // Launch static DesktopTaskView with live tile in Overview + mLauncher.goHome() + startTestActivity(TEST_ACTIVITY_EXTRA) + mLauncher.launchedAppState + .switchToOverview() + .apply { flingBackward() } + .getTestActivityTask(TEST_ACTIVITIES) + .open() + TEST_ACTIVITIES.forEach { assertTestAppLaunched(it) } + } + + @Test + @PortraitLandscape + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun testCreateMultiDesktopsViaAddDesktopButton() { + // Tap add desk button to create a desk. + val overview = mLauncher.workspace.switchToOverview().createDeskViaClickAddDesktopButton() + + // Fling and tap add desk button again to create one more desk. + overview.createDeskViaClickAddDesktopButton() + } + + @Test + @PortraitLandscape + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun testEmptyDesk() { + mLauncher.workspace + .switchToOverview() + // Create an empty desk + .createDeskViaClickAddDesktopButton() + .apply { flingBackward() } + .currentTask + // Launch the empty desk + .open() + // Go back to Overview from the empty desk + .switchToOverview() + // Relaunch it + .currentTask + .open() + // Launch an app from the taskbar + .taskbar + .openAllApps() + .getAppIcon(CALCULATOR_APP_NAME) + .launch(CALCULATOR_APP_PACKAGE) + // Verify that the app is now running inside the desktop. + .assertAppInDesktop(CALCULATOR_APP_PACKAGE) + } + + @Test + @PortraitLandscape + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun testSwitchMultiDesktopsViaOverview() { + val overview = + mLauncher.workspace + .switchToOverview() + // Create an empty desk + .createDeskViaClickAddDesktopButton() + // Create one non-empty desk + .createAnNonEmptyDesk() + // Create one more empty desk + .createDeskViaClickAddDesktopButton() + + // From each desk, launch it and switch to Overview and then tap a different desktop tile + // to switch between the desks, and verify the correct desk is launched. + val deskCount = overview.desktopTasksCount + // Fling to the right-most desk, and enumerate desks from it. + var currentOverview = overview.apply { flingBackward() } + for (i in 0 until deskCount) { + val task = currentOverview.currentTask + assertTrue("Current task should be a desktop", task.isDesktop) + val launchedDesk = task.open() + // Go back to overview and scroll the distance of one task for the next iteration + if (i < deskCount - 1) { + currentOverview = launchedDesk.switchToOverview().scrollForwardByOneTask() + } + } + } + + @Test + @PortraitLandscape + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun testQuickSwitchBetweenDesksForwardAndBackward() { + // Create two empty desks and 1 non-empty desk, and keep record of deskId. + var overview = + mLauncher.workspace + .switchToOverview() + .createDeskViaClickAddDesktopButton() + .apply { flingBackward() } + .currentTask + .open() + .switchToOverview() + val desk1Id = overview.currentTask.deskId + + overview = + overview + .createDeskViaClickAddDesktopButton() + .apply { flingBackward() } + .currentTask + .open() + .switchToOverview() + val desk2Id = overview.currentTask.deskId + + overview = overview.createAnNonEmptyDesk() + val desk3Id = overview.currentTask.deskId + + // Start from Desk 3 + overview = mLauncher.goHome().switchToOverview().apply { flingBackward() } + var launchedDesk = overview.currentTask.open() + assertWithMessage("The active desk should be Desk 3") + .that(mLauncher.activeDeskId) + .isEqualTo(desk3Id) + + // Quick switch backward + launchedDesk = launchedDesk.quickSwitchToPreviousApp() + assertWithMessage("The active desk should be Desk 2 after switching backward") + .that(mLauncher.activeDeskId) + .isEqualTo(desk2Id) + launchedDesk = launchedDesk.quickSwitchToPreviousApp() + assertWithMessage("The active desk should be Desk 1 after switching backward") + .that(mLauncher.activeDeskId) + .isEqualTo(desk1Id) + + // Quick switch forward + launchedDesk = launchedDesk.quickSwitchToPreviousAppSwipeLeft() + assertWithMessage("The active desk should be Desk 2 after switching forward") + .that(mLauncher.activeDeskId) + .isEqualTo(desk2Id) + launchedDesk.quickSwitchToPreviousAppSwipeLeft() + assertWithMessage("The active desk should be Desk 3 after switching forward") + .that(mLauncher.activeDeskId) + .isEqualTo(desk3Id) + + // Cleanup: Go to overview and dismiss all tasks to prevent memory leak. + mLauncher.launchedAppState.switchToOverview().dismissAllTasks() + } + + @Test + @PortraitLandscape + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun testDismissMultipleDesksViaSwipeUpGesture() { + var overview = + mLauncher.workspace + .switchToOverview() + // Create one non-empty desk + .createAnNonEmptyDesk() + // Create an empty desk + .createDeskViaClickAddDesktopButton() + + // Fling to the right-most desk to start dismissing via swipe-up gesture + overview = overview.apply { flingBackward() } + for (i in 0 until 2) { + val task = overview.currentTask + assertThat(task.isDesktop).isTrue() + task.dismiss() + } + } + + @Test + @PortraitLandscape + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun testDismissDeskViaTaskMenuClearButton() { + var overview = + mLauncher.workspace + .switchToOverview() + // Create an empty desk + .createDeskViaClickAddDesktopButton() + // Create a non-empty desk + .createAnNonEmptyDesk() + + // Fling to the right-most desk to start dismissing via task menu + overview = overview.apply { flingBackward() } + for (i in 0 until 2) { + val task = overview.currentTask + assertThat(task.isDesktop).isTrue() + task.dismissViaMenu() + overview = mLauncher.overview + } + } + + @Test + @PortraitLandscape + fun dismissFocusedTasks_thenDesktopIsCentered() { + // Create DesktopTaskView + mLauncher.goHome().switchToOverview().moveTaskToDesktop(TEST_ACTIVITY_2) + + // Create a new task activity to be the focused task + mLauncher.goHome() + startTestActivity(TEST_ACTIVITY_EXTRA) + + val overview = mLauncher.goHome().switchToOverview() + + // Dismiss focused task + val focusedTask1 = overview.currentTask + assertTaskContentDescription(focusedTask1, TEST_ACTIVITY_EXTRA) + focusedTask1.dismiss() + + // Dismiss new focused task + val focusedTask2 = overview.currentTask + assertTaskContentDescription(focusedTask2, TEST_ACTIVITY_1) + focusedTask2.dismiss() + + // Dismiss DesktopTaskView + val desktopTask = overview.currentTask + assertWithMessage("The current task is not a Desktop.").that(desktopTask.isDesktop).isTrue() + desktopTask.dismiss() + + assertWithMessage("Still have tasks after dismissing all the tasks") + .that(mLauncher.workspace.switchToOverview().hasTasks()) + .isFalse() + } + + @Test + @PortraitLandscape + fun dismissTasks_whenDesktopTask_IsInTheCenter() { + // Create extra activity to be DesktopTaskView + startTestActivity(TEST_ACTIVITY_EXTRA) + + // Open first fullscreen task and go back to Overview to validate whether it has adjacent + // tasks in its both sides (grid task on left and desktop tasks at its right side) + val firstFullscreenTaskOpened = + mLauncher + .goHome() + .switchToOverview() + .moveTaskToDesktop(TEST_ACTIVITY_EXTRA) + .switchToOverview() + .getTestActivityTask(TEST_ACTIVITY_2) + .open() + + // Fling to desktop task and dismiss the first fullscreen task to check repositioning of + // grid tasks. + val overview = firstFullscreenTaskOpened.switchToOverview().apply { flingBackward() } + val desktopTask = overview.currentTask + assertWithMessage("The current task is not a Desktop.").that(desktopTask.isDesktop).isTrue() + + // Get first fullscreen task (previously opened task) then dismiss this task + val firstFullscreenTaskInOverview = overview.getTestActivityTask(TEST_ACTIVITY_2) + assertTaskContentDescription(firstFullscreenTaskInOverview, TEST_ACTIVITY_2) + firstFullscreenTaskInOverview.dismiss() + + // Dismiss DesktopTask to validate whether the new task will take its position + desktopTask.dismiss() + + // Dismiss last fullscreen task + val lastFocusedTask = overview.currentTask + assertTaskContentDescription(lastFocusedTask, TEST_ACTIVITY_1) + lastFocusedTask.dismiss() + + assertWithMessage("Still have tasks after dismissing all the tasks") + .that(mLauncher.workspace.switchToOverview().hasTasks()) + .isFalse() + } + + private fun assertTaskContentDescription(task: OverviewTask, activityIndex: Int) { + assertWithMessage("The current task content description is not TestActivity$activityIndex.") + .that(task.containsContentDescription("TestActivity$activityIndex")) + .isTrue() + } + + private fun startTestAppsWithCheck() { + TEST_ACTIVITIES.forEach { + startTestActivity(it) + executeOnLauncher { launcher -> + assertWithMessage( + "Launcher activity is the top activity; expecting TestActivity$it" + ) + .that(isInLaunchedApp(launcher)) + .isTrue() + } + } + } + + private fun assertTestAppLaunched(index: Int) { + assertWithMessage("TestActivity$index not opened in Desktop") + .that( + mDevice.wait( + Until.hasObject(By.pkg(getAppPackageName()).text("TestActivity$index")), + TestUtil.DEFAULT_UI_TIMEOUT, + ) + ) + .isTrue() + } + + private fun BaseOverview.moveTaskToDesktop(activityIndex: Int): LaunchedAppState { + return mLauncher.overview + .getTestActivityTask(activityIndex) + .tapMenu() + .tapDesktopMenuItem() + .also { assertTestAppLaunched(activityIndex) } + } + + private fun BaseOverview.createAnNonEmptyDesk(): BaseOverview { + return this.createDeskViaClickAddDesktopButton() + .apply { flingBackward() } + .currentTask + .open() + .taskbar + .openAllApps() + .getAppIcon(CALCULATOR_APP_NAME) + .launch(CALCULATOR_APP_PACKAGE) + .switchToOverview() + } + + companion object { + const val TEST_ACTIVITY_1 = 2 + const val TEST_ACTIVITY_2 = 3 + const val TEST_ACTIVITY_EXTRA = 4 + val TEST_ACTIVITIES = listOf(TEST_ACTIVITY_1, TEST_ACTIVITY_2) + } +} diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java index df73e0913e3..a16811efaf8 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java @@ -15,16 +15,12 @@ */ package com.android.quickstep; -import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT; - import android.graphics.Rect; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; -import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch; import org.junit.Assert; import org.junit.Test; @@ -35,8 +31,6 @@ public class TaplTestsPersistentTaskbar extends AbstractTaplTestsTaskbar { @Test - @TaskbarModeSwitch(mode = PERSISTENT) - @PortraitLandscape @NavigationModeSwitch public void testTaskbarFillsWidth() { // Width check is performed inside TAPL whenever getTaskbar() is called. diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 7877e8ac22b..d04bff89365 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -16,12 +16,11 @@ package com.android.quickstep; -import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; -import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; import static com.android.quickstep.TaskbarModeSwitchRule.Mode.TRANSIENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; @@ -29,14 +28,17 @@ import android.content.Intent; import android.content.res.Configuration; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; +import androidx.annotation.NonNull; import androidx.test.filters.LargeTest; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; import androidx.test.uiautomator.By; import androidx.test.uiautomator.Until; -import com.android.launcher3.Launcher; +import com.android.launcher3.Flags; import com.android.launcher3.LauncherState; import com.android.launcher3.tapl.BaseOverview; import com.android.launcher3.tapl.LaunchedAppState; @@ -46,20 +48,22 @@ import com.android.launcher3.tapl.OverviewTask; import com.android.launcher3.tapl.SelectModeButtons; import com.android.launcher3.tapl.Workspace; -import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; +import com.android.launcher3.util.TestUtil; import com.android.launcher3.util.Wait; -import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord; -import com.android.launcher3.util.rule.TestStabilityRule; +import com.android.launcher3.util.rule.ScreenRecordRule; +import com.android.launcher3.util.ui.PortraitLandscapeRunner.PortraitLandscape; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch; import com.android.quickstep.views.RecentsView; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.Comparator; +import java.util.Optional; + @LargeTest @RunWith(AndroidJUnit4.class) public class TaplTestsQuickstep extends AbstractQuickStepTest { @@ -72,18 +76,15 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @Before public void setUp() throws Exception { super.setUp(); - executeOnLauncher(launcher -> { - RecentsView recentsView = launcher.getOverviewPanel(); - recentsView.getPagedViewOrientedState().forceAllowRotationForTesting(true); - }); + executeOnOverview(recentsView -> + recentsView.getPagedViewOrientedState().forceAllowRotationForTesting(true)); + clearAllRecentTasks(); } @After public void tearDown() { - executeOnLauncherInTearDown(launcher -> { - RecentsView recentsView = launcher.getOverviewPanel(); - recentsView.getPagedViewOrientedState().forceAllowRotationForTesting(false); - }); + executeOnOverview(/* forTearDown= */ true, recentsView -> + recentsView.getPagedViewOrientedState().forceAllowRotationForTesting(false)); } public static void startTestApps() throws Exception { @@ -92,14 +93,6 @@ public static void startTestApps() throws Exception { startTestActivity(2); } - private void startTestAppsWithCheck() throws Exception { - startTestApps(); - executeOnLauncher(launcher -> assertTrue( - "Launcher activity is the top activity; expecting another activity to be the top " - + "one", - isInLaunchedApp(launcher))); - } - @Test @NavigationModeSwitch @PortraitLandscape @@ -116,28 +109,28 @@ public void testOverview() throws Exception { startTestAppsWithCheck(); // mLauncher.pressHome() also tests an important case of pressing home while in background. Overview overview = mLauncher.goHome().switchToOverview(); - assertTrue("Launcher internal state didn't switch to Overview", - isInState(() -> LauncherState.OVERVIEW)); - executeOnLauncher( - launcher -> assertTrue("Don't have at least 3 tasks", getTaskCount(launcher) >= 3)); + assertIsInState( + "Launcher internal state didn't switch to Overview", LauncherState.OVERVIEW); + executeOnOverview(recentsView -> assertTrue("Don't have at least 3 tasks", + recentsView.getTaskViewCount() >= 3)); // Test flinging forward and backward. - executeOnLauncher(launcher -> assertEquals("Current task in Overview is not 0", - 0, getCurrentOverviewPage(launcher))); + executeOnOverview(recentsView -> assertEquals("Current task in Overview is not first", + recentsView.indexOfChild(recentsView.getFirstTaskView()), + recentsView.getCurrentPage())); overview.flingForward(); - assertTrue("Launcher internal state is not Overview", - isInState(() -> LauncherState.OVERVIEW)); - final Integer currentTaskAfterFlingForward = getFromLauncher( - launcher -> getCurrentOverviewPage(launcher)); - executeOnLauncher(launcher -> assertTrue("Current task in Overview is still 0", - currentTaskAfterFlingForward > 0)); + assertIsInState("Launcher internal state is not Overview", LauncherState.OVERVIEW); + final Integer currentTaskAfterFlingForward = + getFromOverview(RecentsView::getCurrentPage); + executeOnOverview(recentsView -> assertTrue("Current task in Overview is still 0", + currentTaskAfterFlingForward > recentsView.indexOfChild( + recentsView.getFirstTaskView()))); overview.flingBackward(); - assertTrue("Launcher internal state is not Overview", - isInState(() -> LauncherState.OVERVIEW)); - executeOnLauncher(launcher -> assertTrue("Flinging back in Overview did nothing", - getCurrentOverviewPage(launcher) < currentTaskAfterFlingForward)); + assertIsInState("Launcher internal state is not Overview", LauncherState.OVERVIEW); + executeOnOverview(recentsView -> assertTrue("Flinging back in Overview did nothing", + recentsView.getCurrentPage() < currentTaskAfterFlingForward)); // Test opening a task. OverviewTask task = mLauncher.goHome().switchToOverview().getCurrentTask(); @@ -145,31 +138,26 @@ public void testOverview() throws Exception { assertNotNull("OverviewTask.open returned null", task.open()); assertTrue("Test activity didn't open from Overview", mDevice.wait(Until.hasObject( By.pkg(getAppPackageName()).text("TestActivity2")), - DEFAULT_UI_TIMEOUT)); - executeOnLauncher(launcher -> assertTrue( - "Launcher activity is the top activity; expecting another activity to be the top " - + "one", - isInLaunchedApp(launcher))); + TestUtil.DEFAULT_UI_TIMEOUT)); + expectLaunchedAppState(); // Test dismissing a task. overview = mLauncher.goHome().switchToOverview(); - assertTrue("Launcher internal state didn't switch to Overview", - isInState(() -> LauncherState.OVERVIEW)); - final Integer numTasks = getFromLauncher(launcher -> getTaskCount(launcher)); + assertIsInState("Launcher internal state didn't switch to Overview", + LauncherState.OVERVIEW); + final Integer numTasks = getFromOverview(RecentsView::getTaskViewCount); task = overview.getCurrentTask(); assertNotNull("overview.getCurrentTask() returned null (2)", task); task.dismiss(); - executeOnLauncher( - launcher -> assertEquals("Dismissing a task didn't remove 1 task from Overview", - numTasks - 1, getTaskCount(launcher))); + executeOnOverview(recentsView -> assertEquals( + "Dismissing a task didn't remove 1 task from Overview", + numTasks - 1, recentsView.getTaskViewCount())); // Test dismissing all tasks. mLauncher.goHome().switchToOverview().dismissAllTasks(); - assertTrue("Launcher internal state is not Home", - isInState(() -> LauncherState.NORMAL)); - executeOnLauncher( - launcher -> assertEquals("Still have tasks after dismissing all", - 0, getTaskCount(launcher))); + assertIsInState("Launcher internal state is not Home", LauncherState.NORMAL); + executeOnOverview(recentsView -> assertEquals("Still have tasks after dismissing all", + 0, recentsView.getTaskViewCount())); } /** @@ -191,12 +179,10 @@ public void testOverviewActions() throws Exception { public void testDismissOverviewWithEscKey() throws Exception { startTestAppsWithCheck(); final Overview overview = mLauncher.goHome().switchToOverview(); - assertTrue("Launcher internal state is not Overview", - isInState(() -> LauncherState.OVERVIEW)); + assertIsInState("Launcher internal state is not Overview", LauncherState.OVERVIEW); overview.dismissByEscKey(); - assertTrue("Launcher internal state is not Home", - isInState(() -> LauncherState.NORMAL)); + assertIsInState("Launcher internal state is not Home", LauncherState.NORMAL); } @Test @@ -212,28 +198,28 @@ public void testDismissModalTaskAndOverviewWithEscKey() throws Exception { selectModeButtons = overview.getOverviewActions().clickSelect(); } - assertTrue("Launcher internal state is not Overview Modal Task", - isInState(() -> LauncherState.OVERVIEW_MODAL_TASK)); + assertIsInState( + "Launcher internal state is not Overview Modal Task", + LauncherState.OVERVIEW_MODAL_TASK); selectModeButtons.dismissByEscKey(); - assertTrue("Launcher internal state is not Overview", - isInState(() -> LauncherState.OVERVIEW)); + assertIsInState("Launcher internal state is not Overview", LauncherState.OVERVIEW); overview.dismissByEscKey(); - assertTrue("Launcher internal state is not Home", - isInState(() -> LauncherState.NORMAL)); + assertIsInState("Launcher internal state is not Home", LauncherState.NORMAL); } @Test + @DisableFlags(Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING) public void testOpenOverviewWithActionPlusTabKeys() throws Exception { startTestAppsWithCheck(); startAppFast(CALCULATOR_APP_PACKAGE); // Ensure Calculator is last opened app. Workspace home = mLauncher.goHome(); - assertTrue("Launcher state is not Home", isInState(() -> LauncherState.NORMAL)); + assertIsInState("Launcher state is not Home", LauncherState.NORMAL); Overview overview = home.openOverviewFromActionPlusTabKeyboardShortcut(); - assertTrue("Launcher state is not Overview", isInState(() -> LauncherState.OVERVIEW)); + assertIsInState("Launcher state is not Overview", LauncherState.OVERVIEW); overview.launchFocusedTaskByEnterKey(CALCULATOR_APP_PACKAGE); // Assert app is focused. } @@ -242,33 +228,14 @@ public void testOpenOverviewWithRecentsKey() throws Exception { startTestAppsWithCheck(); startAppFast(CALCULATOR_APP_PACKAGE); // Ensure Calculator is last opened app. Workspace home = mLauncher.goHome(); - assertTrue("Launcher state is not Home", isInState(() -> LauncherState.NORMAL)); + assertIsInState("Launcher state is not Home", LauncherState.NORMAL); Overview overview = home.openOverviewFromRecentsKeyboardShortcut(); - assertTrue("Launcher state is not Overview", isInState(() -> LauncherState.OVERVIEW)); + assertIsInState("Launcher state is not Overview", LauncherState.OVERVIEW); overview.launchFocusedTaskByEnterKey(CALCULATOR_APP_PACKAGE); // Assert app is focused. } - private int getCurrentOverviewPage(Launcher launcher) { - return launcher.getOverviewPanel().getCurrentPage(); - } - - private int getTaskCount(Launcher launcher) { - return launcher.getOverviewPanel().getTaskViewCount(); - } - - private int getTopRowTaskCountForTablet(Launcher launcher) { - return launcher.getOverviewPanel().getTopRowTaskCountForTablet(); - } - - private int getBottomRowTaskCountForTablet(Launcher launcher) { - return launcher.getOverviewPanel().getBottomRowTaskCountForTablet(); - } - - // Staging; will be promoted to presubmit if stable - @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) - @Test @NavigationModeSwitch @PortraitLandscape @@ -276,8 +243,8 @@ public void testSwitchToOverview() throws Exception { startTestAppsWithCheck(); assertNotNull("Workspace.switchToOverview() returned null", mLauncher.goHome().switchToOverview()); - assertTrue("Launcher internal state didn't switch to Overview", - isInState(() -> LauncherState.OVERVIEW)); + assertIsInState( + "Launcher internal state didn't switch to Overview", LauncherState.OVERVIEW); } @Test @@ -293,9 +260,6 @@ public void testSwitchToOverviewWithStashedTaskbar() throws Exception { } } - // Staging; will be promoted to presubmit if stable - @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) - @Test @NavigationModeSwitch @PortraitLandscape @@ -305,28 +269,14 @@ public void testBackground() throws Exception { assertNotNull("Background.switchToOverview() returned null", launchedAppState.switchToOverview()); - assertTrue("Launcher internal state didn't switch to Overview", - isInState(() -> LauncherState.OVERVIEW)); - } - - private void quickSwitchToPreviousAppAndAssert(boolean toRight) { - final LaunchedAppState launchedAppState = getAndAssertLaunchedApp(); - if (toRight) { - launchedAppState.quickSwitchToPreviousApp(); - } else { - launchedAppState.quickSwitchToPreviousAppSwipeLeft(); - } - - // While enable shell transition, Launcher can be resumed due to transient launch. - waitForLauncherCondition("Launcher shouldn't stay in resume forever", - this::isInLaunchedApp, 3000 /* timeout */); + assertIsInState( + "Launcher internal state didn't switch to Overview", LauncherState.OVERVIEW); } @Test @NavigationModeSwitch @PortraitLandscape - @ScreenRecord // b/313464374 - @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/325659406 + @ScreenRecordRule.ScreenRecord // b/415877373 public void testQuickSwitchFromApp() throws Exception { startTestActivity(2); startTestActivity(3); @@ -357,7 +307,8 @@ public void testQuickSwitchFromApp() throws Exception { @Test @TaskbarModeSwitch public void testQuickSwitchToPreviousAppForTablet() throws Exception { - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); startTestActivity(2); startImeTestActivity(); @@ -393,11 +344,6 @@ public void testQuickSwitchToPreviousAppForTablet() throws Exception { } } - private boolean isHardwareKeyboard() { - return Configuration.KEYBOARD_QWERTY - == mTargetContext.getResources().getConfiguration().keyboard; - } - @Test @NavigationModeSwitch @PortraitLandscape @@ -418,81 +364,13 @@ public void testPressBack() throws Exception { // Debug if we need to goHome to prevent wrong previous state b/315525621 mLauncher.goHome(); mLauncher.getWorkspace().switchToAllApps().pressBackToWorkspace(); - waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL); + waitForLauncherCondition("Launcher internal state didn't switch to Home", launcher -> + launcher.getStateManager().getCurrentStableState() == LauncherState.NORMAL); startAppFast(CALCULATOR_APP_PACKAGE); mLauncher.getLaunchedAppState().pressBackToWorkspace(); - waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL); - } - - @Test - @PortraitLandscape - @TaskbarModeSwitch() - @Ignore("b/315376057") - public void testOverviewForTablet() throws Exception { - assumeTrue(mLauncher.isTablet()); - - for (int i = 2; i <= 14; i++) { - startTestActivity(i); - } - - Overview overview = mLauncher.goHome().switchToOverview(); - executeOnLauncher( - launcher -> assertTrue("Don't have at least 13 tasks", - getTaskCount(launcher) >= 13)); - - // Test scroll the first task off screen - overview.scrollCurrentTaskOffScreen(); - assertTrue("Launcher internal state is not Overview", - isInState(() -> LauncherState.OVERVIEW)); - executeOnLauncher(launcher -> assertTrue("Current task in Overview is still 0", - getCurrentOverviewPage(launcher) > 0)); - - // Test opening the task. - overview.getCurrentTask().open(); - assertTrue("Test activity didn't open from Overview", - mDevice.wait(Until.hasObject(By.pkg(getAppPackageName()).text( - mLauncher.isGridOnlyOverviewEnabled() ? "TestActivity12" - : "TestActivity13")), - DEFAULT_UI_TIMEOUT)); - - // Scroll the task offscreen as it is now first - overview = mLauncher.goHome().switchToOverview(); - overview.scrollCurrentTaskOffScreen(); - assertTrue("Launcher internal state is not Overview", - isInState(() -> LauncherState.OVERVIEW)); - executeOnLauncher(launcher -> assertTrue("Current task in Overview is still 0", - getCurrentOverviewPage(launcher) > 0)); - - // Test dismissing the later task. - final Integer numTasks = getFromLauncher(this::getTaskCount); - overview.getCurrentTask().dismiss(); - executeOnLauncher( - launcher -> assertEquals("Dismissing a task didn't remove 1 task from Overview", - numTasks - 1, getTaskCount(launcher))); - executeOnLauncher(launcher -> assertTrue("Grid did not rebalance after dismissal", - (Math.abs(getTopRowTaskCountForTablet(launcher) - getBottomRowTaskCountForTablet( - launcher)) <= 1))); - - // TODO(b/308841019): Re-enable after fixing Overview jank when dismiss -// // Test dismissing more tasks. -// assertTrue("Launcher internal state didn't remain in Overview", -// isInState(() -> LauncherState.OVERVIEW)); -// overview.getCurrentTask().dismiss(); -// assertTrue("Launcher internal state didn't remain in Overview", -// isInState(() -> LauncherState.OVERVIEW)); -// overview.getCurrentTask().dismiss(); -// executeOnLauncher(launcher -> assertTrue("Grid did not rebalance after multiple dismissals", -// (Math.abs(getTopRowTaskCountForTablet(launcher) - getBottomRowTaskCountForTablet( -// launcher)) <= 1))); - - // Test dismissing all tasks. - mLauncher.goHome().switchToOverview().dismissAllTasks(); - assertTrue("Launcher internal state is not Home", - isInState(() -> LauncherState.NORMAL)); - executeOnLauncher( - launcher -> assertEquals("Still have tasks after dismissing all", - 0, getTaskCount(launcher))); + waitForLauncherCondition("Launcher internal state didn't switch to Home", launcher -> + launcher.getStateManager().getCurrentStableState() == LauncherState.NORMAL); } @Test @@ -501,74 +379,66 @@ public void testOverviewDeadzones() throws Exception { startTestAppsWithCheck(); Overview overview = mLauncher.goHome().switchToOverview(); - assertTrue("Launcher internal state should be Overview", - isInState(() -> LauncherState.OVERVIEW)); - executeOnLauncher( - launcher -> assertTrue("Should have at least 3 tasks", - getTaskCount(launcher) >= 3)); + assertIsInState("Launcher internal state should be Overview", LauncherState.OVERVIEW); + executeOnOverview(recentsView -> assertTrue("Should have at least 3 tasks", + recentsView.getTaskViewCount() >= 3)); // It should not dismiss overview when tapping between tasks overview.touchBetweenTasks(); overview = mLauncher.getOverview(); - assertTrue("Launcher internal state should be Overview", - isInState(() -> LauncherState.OVERVIEW)); + assertIsInState("Launcher internal state should be Overview", LauncherState.OVERVIEW); // Dismiss when tapping to the right of the focused task overview.touchOutsideFirstTask(); - assertTrue("Launcher internal state should be Home", - isInState(() -> LauncherState.NORMAL)); + assertIsInState("Launcher internal state should be Home", LauncherState.NORMAL); } @Test @PortraitLandscape @TaskbarModeSwitch public void testTaskbarDeadzonesForTablet() throws Exception { - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); startTestAppsWithCheck(); Overview overview = mLauncher.goHome().switchToOverview(); - assertTrue("Launcher internal state should be Overview", - isInState(() -> LauncherState.OVERVIEW)); - executeOnLauncher( - launcher -> assertTrue("Should have at least 3 tasks", - getTaskCount(launcher) >= 3)); + assertIsInState("Launcher internal state should be Overview", LauncherState.OVERVIEW); + executeOnOverview(recentsView -> assertTrue("Should have at least 3 tasks", + recentsView.getTaskViewCount() >= 3)); if (mLauncher.isTransientTaskbar()) { // On transient taskbar, it should dismiss when tapping outside taskbar bounds. overview.touchTaskbarBottomCorner(/* tapRight= */ false); - assertTrue("Launcher internal state should be Normal", - isInState(() -> LauncherState.NORMAL)); + assertIsInState("Launcher internal state should be Normal", LauncherState.NORMAL); overview = mLauncher.getWorkspace().switchToOverview(); // On transient taskbar, it should dismiss when tapping outside taskbar bounds. overview.touchTaskbarBottomCorner(/* tapRight= */ true); - assertTrue("Launcher internal state should be Normal", - isInState(() -> LauncherState.NORMAL)); + assertIsInState("Launcher internal state should be Normal", LauncherState.NORMAL); } else { // On persistent taskbar, it should not dismiss when tapping the taskbar overview.touchTaskbarBottomCorner(/* tapRight= */ false); - assertTrue("Launcher internal state should be Overview", - isInState(() -> LauncherState.OVERVIEW)); + assertIsInState("Launcher internal state should be Overview", LauncherState.OVERVIEW); // On persistent taskbar, it should not dismiss when tapping the taskbar overview.touchTaskbarBottomCorner(/* tapRight= */ true); - assertTrue("Launcher internal state should be Overview", - isInState(() -> LauncherState.OVERVIEW)); + assertIsInState("Launcher internal state should be Overview", LauncherState.OVERVIEW); } } @Test public void testDisableRotationCheckForPhone() throws Exception { - assumeFalse(mLauncher.isTablet()); + assumeFalse("Ignoring test because device is not a phone", + mLauncher.isTablet()); try { mLauncher.setExpectedRotationCheckEnabled(false); mLauncher.setEnableRotation(false); mLauncher.getDevice().setOrientationLeft(); startTestActivity(7); Wait.atMost("Device should not be in natural orientation", - () -> !mDevice.isNaturalOrientation(), DEFAULT_UI_TIMEOUT, mLauncher); + () -> !mDevice.isNaturalOrientation(), mLauncher); mLauncher.goHome(); } finally { mLauncher.setExpectedRotationCheckEnabled(true); @@ -581,20 +451,207 @@ public void testDisableRotationCheckForPhone() throws Exception { public void testExcludeFromRecents() throws Exception { startExcludeFromRecentsTestActivity(); OverviewTask currentTask = getAndAssertLaunchedApp().switchToOverview().getCurrentTask(); - // TODO(b/326565120): the expected content description shouldn't be null but for now there - // is a bug that causes it to sometimes be for excludeForRecents tasks. assertTrue("Can't find ExcludeFromRecentsTestActivity after entering Overview from it", - currentTask.containsContentDescription("ExcludeFromRecents") - || currentTask.containsContentDescription(null)); + currentTask.containsContentDescription("ExcludeFromRecents")); // Going home should clear out the excludeFromRecents task. BaseOverview overview = mLauncher.goHome().switchToOverview(); if (overview.hasTasks()) { currentTask = overview.getCurrentTask(); assertFalse("Found ExcludeFromRecentsTestActivity after entering Overview from Home", - currentTask.containsContentDescription("ExcludeFromRecents") - || currentTask.containsContentDescription(null)); + currentTask.containsContentDescription("ExcludeFromRecents")); } else { // Presumably the test started with 0 tasks and remains that way after going home. } } + + @Test + @PortraitLandscape + public void testDismissCancel() throws Exception { + startTestAppsWithCheck(); + Overview overview = mLauncher.goHome().switchToOverview(); + assertIsInState("Launcher internal state didn't switch to Overview", + LauncherState.OVERVIEW); + final Integer numTasks = getFromOverview(RecentsView::getTaskViewCount); + OverviewTask task = overview.getCurrentTask(); + assertNotNull("overview.getCurrentTask() returned null (2)", task); + + task.dismissCancel(); + + executeOnOverview(recentsView -> assertEquals( + "Canceling dismissing a task removed a task from Overview", + numTasks == null ? 0 : numTasks, recentsView.getTaskViewCount())); + } + + @Test + @PortraitLandscape + @EnableFlags(value = Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW) + @ScreenRecordRule.ScreenRecord // TODO(b/415092715) + public void testDismissBottomRow() throws Exception { + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); + startTestAppsWithCheck(); + + Overview overview = mLauncher.goHome().switchToOverview(); + assertIsInState("Launcher internal state didn't switch to Overview", + LauncherState.OVERVIEW); + final Integer numTasks = getFromOverview(RecentsView::getTaskViewCount); + Optional bottomTask = overview.getCurrentTasksForTablet().stream().max( + Comparator.comparingInt(OverviewTask::getTaskCenterY)); + assertTrue("bottomTask null", bottomTask.isPresent()); + + bottomTask.get().dismiss(); + executeOnOverview(recentsView -> assertEquals( + "Dismissing a bottomTask didn't remove 1 bottomTask from Overview", + numTasks - 1, recentsView.getTaskViewCount())); + } + + @Test + @PortraitLandscape + @EnableFlags(value = Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW) + public void testDismissLastGridRow() throws Exception { + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); + startTestAppsWithCheck(); + startTestActivity(3); + startTestActivity(4); + Overview overview = mLauncher.goHome().switchToOverview(); + assertIsInState("Launcher internal state didn't switch to Overview", + LauncherState.OVERVIEW); + executeOnOverview(recentsView -> assertNotEquals( + "Grid overview should have unequal row counts", + recentsView.getTopRowTaskCountForTablet(), + recentsView.getBottomRowTaskCountForTablet())); + + overview.flingForwardUntilClearAllVisible(); + assertTrue("Clear All not visible.", overview.isClearAllVisible()); + final Integer numTasks = getFromOverview(RecentsView::getTaskViewCount); + Optional lastGridTask = overview.getCurrentTasksForTablet().stream().min( + Comparator.comparingInt(OverviewTask::getTaskCenterX)); + assertTrue("lastGridTask null.", lastGridTask.isPresent()); + + lastGridTask.get().dismiss(); + executeOnOverview(recentsView -> { + assertEquals( + "Dismissing a lastGridTask didn't remove 1 lastGridTask from Overview", + numTasks - 1, recentsView.getTaskViewCount()); + assertEquals( + "Grid overview should have equal row counts.", + recentsView.getTopRowTaskCountForTablet(), + recentsView.getBottomRowTaskCountForTablet()); + }); + assertTrue("Clear All not visible.", overview.isClearAllVisible()); + } + + @Test + @PortraitLandscape + @EnableFlags(value = Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW) + // When dismissing multiple apps, the apps off screen should "re-balance" i.e. re-arrange + // themselves evenly across both top and bottom rows. + public void gridRebalancesOffScreenAfterDismissingMultipleApps() throws Exception { + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); + // Launch enough apps so some are offscreen. + for (int i = 2; i <= 12; i++) { + startTestActivity(i); + } + Overview overview = mLauncher.goHome().switchToOverview(); + executeOnOverview(recentsView -> assertTrue("11 tasks should be open", + recentsView.getTaskViewCount() >= 11)); + + // Dismiss 2 tasks from the top row. + assertIsInState( + "Launcher internal state didn't remain in Overview", LauncherState.OVERVIEW); + overview.getCurrentTask().dismiss(); + assertIsInState( + "Launcher internal state didn't remain in Overview", LauncherState.OVERVIEW); + overview.getCurrentTask().dismiss(); + + // Assert that the two row counts are no more than 1 apart, therefore were re-balanced. + executeOnOverview(recentsView -> assertTrue( + "Grid did not re-balance after multiple dismissals", + (Math.abs(recentsView.getTopRowTaskCountForTablet() + - recentsView.getBottomRowTaskCountForTablet()) <= 1))); + } + + @Test + @PortraitLandscape + @EnableFlags(value = Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW) + // When dismissing multiple apps, the apps on screen should not "re-balance" i.e. dismissing + // 2 apps from the top row, will move the top row along 2 and so it will not be balanced + // across the bottom row. + public void gridDoesNotRebalanceOnScreenAfterDismissingMultipleApps() throws Exception { + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); + // Launch 6 apps so 3 are in each row. + int appsInBothRowsCount = 6; + int appsInEachRowCount = appsInBothRowsCount / 2; + for (int i = 2; i <= appsInBothRowsCount + 1; i++) { + startTestActivity(i); + } + Overview overview = mLauncher.goHome().switchToOverview(); + executeOnOverview(recentsView -> { + assertEquals(appsInBothRowsCount + " tasks should be open", + appsInBothRowsCount, recentsView.getTaskViewCount()); + assertEquals("Grid should have " + appsInEachRowCount + " tasks on the top row", + appsInEachRowCount, + recentsView.getTopRowTaskCountForTablet()); + assertEquals("Grid should have " + appsInEachRowCount + " tasks on the bottom row", + appsInEachRowCount, + recentsView.getBottomRowTaskCountForTablet()); + }); + + // Dismiss 2 tasks from the top row. + assertIsInState("Launcher internal state didn't remain in Overview", + LauncherState.OVERVIEW); + overview.getCurrentTask().dismiss(); + assertIsInState("Launcher internal state didn't remain in Overview", + LauncherState.OVERVIEW); + overview.getCurrentTask().dismiss(); + + executeOnOverview(recentsView -> { + int expectedTopRowCount = appsInEachRowCount - 2; + assertEquals( + "Grid should have " + expectedTopRowCount + " tasks on the top row", + expectedTopRowCount, + recentsView.getTopRowTaskCountForTablet()); + assertEquals("Grid should have " + appsInEachRowCount + " tasks on the bottom row", + appsInEachRowCount, + recentsView.getBottomRowTaskCountForTablet()); + }); + } + + private void startTestAppsWithCheck() throws Exception { + startTestApps(); + expectLaunchedAppState(); + } + + private void quickSwitchToPreviousAppAndAssert(boolean toRight) { + final LaunchedAppState launchedAppState = getAndAssertLaunchedApp(); + if (toRight) { + launchedAppState.quickSwitchToPreviousApp(); + } else { + launchedAppState.quickSwitchToPreviousAppSwipeLeft(); + } + + // While enable shell transition, Launcher can be resumed due to transient launch. + waitForLauncherCondition("Launcher shouldn't stay in resume forever", + this::isInLaunchedApp, 3000 /* timeout */); + } + + private boolean isHardwareKeyboard() { + return Configuration.KEYBOARD_QWERTY + == mTargetContext.getResources().getConfiguration().keyboard; + } + + private void assertIsInState( + @NonNull String failureMessage, @NonNull LauncherState expectedState) { + assertTrue(failureMessage, isInState(() -> expectedState)); + } + + private void expectLaunchedAppState() { + executeOnLauncher(launcher -> assertTrue( + "Launcher activity is the top activity; expecting another activity to be the top " + + "one", + isInLaunchedApp(launcher))); + } } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java b/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java index 8adf79318ba..9462a197ff5 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java @@ -16,10 +16,6 @@ package com.android.quickstep; -import static com.android.launcher3.config.FeatureFlags.enableSplitContextually; -import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; -import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; @@ -33,8 +29,7 @@ import com.android.launcher3.tapl.Overview; import com.android.launcher3.tapl.Taskbar; import com.android.launcher3.tapl.TaskbarAppIcon; -import com.android.launcher3.util.rule.TestStabilityRule; -import com.android.wm.shell.Flags; +import com.android.quickstep.util.SplitScreenTestUtils; import org.junit.After; import org.junit.Before; @@ -72,10 +67,10 @@ public void tearDown() { } @Test - @TestStabilityRule.Stability(flavors = PLATFORM_POSTSUBMIT | LOCAL) // b/295225524 public void testSplitAppFromHomeWithItself() throws Exception { // Currently only tablets have Taskbar in Overview, so test is only active on tablets - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); mLauncher.getWorkspace() .deleteAppIcon(mLauncher.getWorkspace().getHotseatAppIcon(0)) @@ -92,28 +87,16 @@ public void testSplitAppFromHomeWithItself() throws Exception { .getSplitScreenMenuItem() .click(); - if (enableSplitContextually()) { - // We're staying in all apps, use same instance - mLauncher.getAllApps() - .getAppIcon(CALCULATOR_APP_NAME) - .launchIntoSplitScreen(); - } else { - // We're in overview, use taskbar instance - mLauncher.getLaunchedAppState() - .getTaskbar() - .getAppIcon(CALCULATOR_APP_NAME) - .launchIntoSplitScreen(); - } + // We're staying in all apps, use same instance + mLauncher.getAllApps() + .getAppIcon(CALCULATOR_APP_NAME) + .launchIntoSplitScreen(); } @Test public void testSaveAppPairMenuItemOrActionExistsOnSplitPair() { - assumeTrue("App pairs feature is currently not enabled, no test needed", - Flags.enableAppPairs()); + Overview overview = SplitScreenTestUtils.createAndLaunchASplitPairInOverview(mLauncher); - createAndLaunchASplitPair(); - - Overview overview = mLauncher.goHome().switchToOverview(); if (mLauncher.isGridOnlyOverviewEnabled() || !mLauncher.isTablet()) { assertTrue("Save app pair menu item is missing", overview.getCurrentTask() @@ -124,9 +107,6 @@ public void testSaveAppPairMenuItemOrActionExistsOnSplitPair() { @Test public void testSaveAppPairMenuItemDoesNotExistOnSingleTask() throws Exception { - assumeTrue("App pairs feature is currently not enabled, no test needed", - Flags.enableAppPairs()); - startAppFast(CALCULATOR_APP_PACKAGE); assertFalse("Save app pair menu item is erroneously appearing on single task", @@ -140,7 +120,8 @@ public void testSaveAppPairMenuItemDoesNotExistOnSingleTask() throws Exception { @Test public void testSplitSingleTaskFromTaskbar() { // Currently only tablets have Taskbar in Overview, so test is only active on tablets - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); clearAllRecentTasks(); startAppFast(getAppPackageName()); @@ -157,24 +138,4 @@ public void testSplitSingleTaskFromTaskbar() { TaskbarAppIcon firstApp = taskbar.getAppIcon(firstAppName); firstApp.launchIntoSplitScreen(); } - - private void createAndLaunchASplitPair() { - clearAllRecentTasks(); - - startTestActivity(2); - startTestActivity(3); - - if (mLauncher.isTablet() && !mLauncher.isGridOnlyOverviewEnabled()) { - mLauncher.goHome().switchToOverview().getOverviewActions() - .clickSplit() - .getTestActivityTask(2) - .open(); - } else { - mLauncher.goHome().switchToOverview().getCurrentTask() - .tapMenu() - .tapSplitMenuItem() - .getCurrentTask() - .open(); - } - } } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java index ec245ee0f3f..f3bd837944f 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java @@ -23,7 +23,8 @@ import androidx.test.filters.LargeTest; -import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; +import com.android.launcher3.util.ui.PortraitLandscapeRunner.PortraitLandscape; +import com.android.launcher3.util.rule.ScreenRecordRule; import org.junit.Test; import org.junit.runner.RunWith; @@ -92,6 +93,7 @@ public void testLaunchShortcut() { @Test @PortraitLandscape + @ScreenRecordRule.ScreenRecord // b/414900465 public void testLaunchAppInSplitscreen() { getTaskbar().getAppIcon(TEST_APP_NAME).dragToSplitscreen( TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE); @@ -105,6 +107,7 @@ public void testLaunchAppInSplitscreen() { @Test @PortraitLandscape + @ScreenRecordRule.ScreenRecord // b/414900465 public void testLaunchShortcutInSplitscreen() { getTaskbar().getAppIcon(TEST_APP_NAME) .openDeepShortcutMenu() diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsTrackpad.java b/quickstep/tests/src/com/android/quickstep/TaplTestsTrackpad.java index 2c23f867cbb..aa93161f5e8 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsTrackpad.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsTrackpad.java @@ -16,8 +16,6 @@ package com.android.quickstep; -import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; -import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; import static com.android.quickstep.NavigationModeSwitchRule.Mode.ZERO_BUTTON; import static org.junit.Assert.assertNotNull; @@ -31,13 +29,13 @@ import com.android.launcher3.tapl.LauncherInstrumentation.TrackpadGestureType; import com.android.launcher3.tapl.Workspace; -import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; -import com.android.launcher3.util.rule.ScreenRecordRule; -import com.android.launcher3.util.rule.TestStabilityRule; +import com.android.launcher3.util.rule.ShellCommandRule; +import com.android.launcher3.util.ui.PortraitLandscapeRunner.PortraitLandscape; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,6 +46,10 @@ public class TaplTestsTrackpad extends AbstractQuickStepTest { private static final String READ_DEVICE_CONFIG_PERMISSION = "android.permission.READ_DEVICE_CONFIG"; + @Rule public ShellCommandRule settingsRule = new ShellCommandRule( + "settings put system touchpad_natural_scrolling 1", + "settings put system touchpad_natural_scrolling 0"); + @Before public void setup() { mLauncher.injectFakeTrackpad(); @@ -63,7 +65,8 @@ public void tearDown() { @PortraitLandscape @NavigationModeSwitch public void goHome() throws Exception { - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); mLauncher.setTrackpadGestureType(TrackpadGestureType.THREE_FINGER); startTestActivity(2); @@ -77,7 +80,8 @@ public void goHome() throws Exception { // need to figure out a way to emulate that in the test, or bypass the logic altogether. @NavigationModeSwitch(mode = ZERO_BUTTON) public void pressBack() throws Exception { - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); try { @@ -95,10 +99,9 @@ public void pressBack() throws Exception { @Test @PortraitLandscape @NavigationModeSwitch - @ScreenRecordRule.ScreenRecord // b/336606166 - @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/336606166 public void switchToOverview() throws Exception { - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); mLauncher.setTrackpadGestureType(TrackpadGestureType.THREE_FINGER); startTestActivity(2); @@ -109,18 +112,36 @@ public void switchToOverview() throws Exception { @PortraitLandscape @NavigationModeSwitch public void testAllAppsFromHome() throws Exception { - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); mLauncher.setTrackpadGestureType(TrackpadGestureType.TWO_FINGER); assertNotNull("switchToAllApps() returned null", mLauncher.getWorkspace().switchToAllApps()); } + @Test + @PortraitLandscape + @NavigationModeSwitch + public void testQuickSwitchFromApp() throws Exception { + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); + + startTestActivity(2); + startTestActivity(3); + mLauncher.setTrackpadGestureType(TrackpadGestureType.FOUR_FINGER); + mLauncher.getLaunchedAppState().quickSwitchToPreviousApp(); + assertTestActivityIsRunning(2, + "The most recent task is not running after quick switching from app"); + getAndAssertLaunchedApp(); + } + @Test @PortraitLandscape @NavigationModeSwitch public void testQuickSwitchFromHome() throws Exception { - assumeTrue(mLauncher.isTablet()); + assumeTrue("Ignoring test because device is not a tablet", + mLauncher.isTablet()); startTestActivity(2); Workspace workspace = mLauncher.goHome(); diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java index 4b20d600dc3..703b4e107e9 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java @@ -15,9 +15,9 @@ */ package com.android.quickstep; -import static com.android.launcher3.Flags.enableCursorHoverStates; import static com.android.launcher3.util.TestConstants.AppNames.TEST_APP_NAME; import static com.android.quickstep.TaskbarModeSwitchRule.Mode.TRANSIENT; +import static com.android.systemui.shared.Flags.cursorHotCorner; import static org.junit.Assume.assumeTrue; @@ -36,23 +36,13 @@ public class TaplTestsTransientTaskbar extends AbstractTaplTestsTaskbar { @Test @TaskbarModeSwitch(mode = TRANSIENT) public void testShowTaskbarUnstashHintOnHover() { - assumeTrue(enableCursorHoverStates()); getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE); mLauncher.getLaunchedAppState().hoverToShowTaskbarUnstashHint(); } - @Test - @TaskbarModeSwitch(mode = TRANSIENT) - public void testUnstashTaskbarOnScreenBottomEdgeHover() { - assumeTrue(enableCursorHoverStates()); - getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE); - mLauncher.getLaunchedAppState().hoverScreenBottomEdgeToUnstashTaskbar(); - } - @Test @TaskbarModeSwitch(mode = TRANSIENT) public void testHoverBelowHintedTaskbarToUnstash() { - assumeTrue(enableCursorHoverStates()); getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE); mLauncher.getLaunchedAppState().hoverBelowHintedTaskbarToUnstash(); } @@ -60,7 +50,6 @@ public void testHoverBelowHintedTaskbarToUnstash() { @Test @TaskbarModeSwitch(mode = TRANSIENT) public void testClickHoveredTaskbarToGoHome() throws Exception { - assumeTrue(enableCursorHoverStates()); getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE); mLauncher.getLaunchedAppState().clickStashedTaskbarToGoHome(); } @@ -71,4 +60,30 @@ public void testSwipeToStashAndUnstash() { getTaskbar().swipeDownToStash(); mLauncher.getLaunchedAppState().swipeUpToUnstashTaskbar(); } + + @Test + @TaskbarModeSwitch(mode = TRANSIENT) + public void testUnstashTaskbarOnScreenBottomEdgeHover() { + getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE); + mLauncher.getLaunchedAppState().hoverScreenBottomEdgeToUnstashTaskbar(); + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + } + + @Test + @TaskbarModeSwitch(mode = TRANSIENT) + public void testUnstashTaskbarOnScreenBottomEdgeOutsideActionCornerHover() { + assumeTrue(cursorHotCorner()); + getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE); + mLauncher.getLaunchedAppState().hoverScreenBottomEdgeOutsideActionCornerToUnstashTaskbar(); + mLauncher.getLaunchedAppState().assertTaskbarVisible(); + } + + @Test + @TaskbarModeSwitch(mode = TRANSIENT) + public void testNotShowTaskbarOnActionCornerPaddingHover() { + assumeTrue(cursorHotCorner()); + getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE); + mLauncher.getLaunchedAppState().hoverScreenBottomCornerToTryUnstashTaskbar(); + mLauncher.getLaunchedAppState().assertTaskbarHidden(); + } } diff --git a/quickstep/tests/src/com/android/quickstep/TaskViewTest.java b/quickstep/tests/src/com/android/quickstep/TaskViewTest.java index 512557bf3a0..326206fd920 100644 --- a/quickstep/tests/src/com/android/quickstep/TaskViewTest.java +++ b/quickstep/tests/src/com/android/quickstep/TaskViewTest.java @@ -16,6 +16,9 @@ package com.android.quickstep; +import static com.android.quickstep.TaskViewTestDIHelpers.initializeRecentsDependencies; +import static com.android.quickstep.TaskViewTestDIHelpers.mockRecentsModel; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -35,19 +38,30 @@ import android.view.MotionEvent; import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; import com.android.launcher3.uioverrides.QuickstepLauncher; +import com.android.launcher3.util.SandboxContext; +import com.android.quickstep.recents.di.RecentsDependencies; import com.android.quickstep.util.BorderAnimator; import com.android.quickstep.views.TaskView; +import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; @SmallTest public class TaskViewTest { + private final SandboxContext mApplicationContext = + new SandboxContext(InstrumentationRegistry.getInstrumentation().getTargetContext()); + + @Rule + public MockitoRule mockitoRule = MockitoJUnit.rule(); @Mock private QuickstepLauncher mContext; @Mock @@ -60,7 +74,6 @@ public class TaskViewTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); when(mResource.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class)); when(mResource.getConfiguration()).thenReturn(new Configuration()); @@ -69,10 +82,19 @@ public void setup() { when(mContext.getApplicationInfo()).thenReturn(mock(ApplicationInfo.class)); when(mContext.obtainStyledAttributes(any(), any(), anyInt(), anyInt())).thenReturn( mock(TypedArray.class)); + when(mContext.getApplicationContext()).thenReturn(mApplicationContext); + mApplicationContext.initDaggerComponent( + DaggerTaskViewTestComponent.builder().bindRecentsModel(mockRecentsModel())); + initializeRecentsDependencies(mContext); mTaskView = new TaskView(mContext, null, 0, 0, mFocusAnimator, mHoverAnimator); } + @After + public void tearDown() { + RecentsDependencies.destroy(mContext); + } + @Test public void notShowBorderOnBorderDisabled() { presetBorderStatus(/* enabled= */ true); @@ -87,18 +109,6 @@ public void notShowBorderOnBorderDisabled() { true); } - @Test - public void showBorderOnHoverEvent() { - mTaskView.setBorderEnabled(/* enabled= */ true); - MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_HOVER_ENTER, 0.0f, 0.0f, 0); - mTaskView.onHoverEvent(MotionEvent.obtain(event)); - verify(mHoverAnimator, times(1)).setBorderVisibility(/* visible= */ true, /* animated= */ - true); - mTaskView.onFocusChanged(true, 0, new Rect()); - verify(mFocusAnimator, times(1)).setBorderVisibility(/* visible= */ true, /* animated= */ - true); - } - @Test public void showBorderOnBorderEnabled() { presetBorderStatus(/* enabled= */ false); diff --git a/quickstep/tests/src/com/android/quickstep/TaskbarModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/TaskbarModeSwitchRule.java index 84ceb332d90..35aa80af412 100644 --- a/quickstep/tests/src/com/android/quickstep/TaskbarModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/TaskbarModeSwitchRule.java @@ -27,9 +27,9 @@ import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.tapl.TestHelpers; -import com.android.launcher3.ui.AbstractLauncherUiTest; -import com.android.launcher3.util.DisplayController; +import com.android.launcher3.util.TaskbarModeUtil; import com.android.launcher3.util.rule.FailureWatcher; +import com.android.launcher3.util.ui.AbstractLauncherUiTest; import org.junit.rules.TestRule; import org.junit.runner.Description; @@ -111,7 +111,7 @@ private void evaluateWithTransientTaskbar() throws Throwable { } private static boolean isTaskbarTransientMode(Context context) { - return DisplayController.isTransientTaskbar(context); + return TaskbarModeUtil.INSTANCE.get(context).isTransient(); } public static void setTaskbarMode(LauncherInstrumentation launcher, @@ -123,7 +123,7 @@ public static void setTaskbarMode(LauncherInstrumentation launcher, assertTrue(launcher, "Couldn't set taskbar=" + expectTransientTaskbar, isTaskbarTransientMode(context) == expectTransientTaskbar, description); - AbstractLauncherUiTest.checkDetectedLeaks(launcher, true); + AbstractLauncherUiTest.checkDetectedLeaks(launcher); } private static void assertTrue(LauncherInstrumentation launcher, String message, diff --git a/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt b/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt new file mode 100644 index 00000000000..3a889062590 --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt @@ -0,0 +1,347 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.quickstep.desktop + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ValueAnimator +import android.app.ActivityManager +import android.app.WindowConfiguration +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.res.Resources +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.util.DisplayMetrics +import android.view.SurfaceControl +import android.view.WindowManager +import android.window.TransitionInfo +import android.window.TransitionInfo.Change +import androidx.core.util.Supplier +import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread +import com.android.app.animation.Interpolators +import com.android.internal.jank.Cuj +import com.android.launcher3.desktop.DesktopAppLaunchAnimatorHelper +import com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.window.flags2.Flags +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.mockito.ArgumentMatchers.anyFloat +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +class DesktopAppLaunchAnimatorHelperTest { + + @get:Rule val setFlagsRule = SetFlagsRule() + + private val context = mock() + private val resources = mock() + private val displayContext = mock() + private val displayResources = mock() + + private val displayController = mock() + private val displayInfo = mock() + private val transaction = mock() + private val transactionSupplier = mock>() + + private lateinit var helper: DesktopAppLaunchAnimatorHelper + + @Before + fun setUp() { + whenever(context.resources).thenReturn(resources) + whenever(resources.getDimensionPixelSize(any())).thenReturn(CONTEXT_CORNER_RADIUS) + + whenever(displayController.getInfoForDisplay(any())).thenReturn(displayInfo) + whenever(displayInfo.getContext()).thenReturn(displayContext) + whenever(displayContext.resources).thenReturn(displayResources) + whenever(displayResources.getDimensionPixelSize(any())) + .thenReturn(DISPLAY_CONTEXT_CORNER_RADIUS) + + helper = + DesktopAppLaunchAnimatorHelper( + context = context, + displayController = displayController, + launchType = AppLaunchType.LAUNCH, + cujType = Cuj.CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_INTENT, + transactionSupplier = transactionSupplier, + ) + whenever(transactionSupplier.get()).thenReturn(transaction) + whenever(transaction.setCrop(any(), any())).thenReturn(transaction) + whenever(transaction.setCornerRadius(any(), anyFloat())).thenReturn(transaction) + whenever(transaction.setScale(any(), any(), any())).thenReturn(transaction) + whenever(transaction.setPosition(any(), any(), any())).thenReturn(transaction) + whenever(transaction.setAlpha(any(), any())).thenReturn(transaction) + whenever(transaction.setFrameTimeline(any())).thenReturn(transaction) + + whenever(resources.displayMetrics).thenReturn(DisplayMetrics()) + whenever(context.mainThreadHandler).thenReturn(MAIN_EXECUTOR.handler) + } + + @Test + fun launchTransition_returnsLaunchAnimator() = runOnUiThread { + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE)) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(1) + assertLaunchAnimator(actual[0]) + } + + @Test + fun launchTransition_callsAnimationEndListener() = runOnUiThread { + val finishCallback = mock>() + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE)) + + val animators = helper.createAnimators(transitionInfo, finishCallback = finishCallback) + + animators.forEach { animator -> + animator.start() + animator.end() + verify(finishCallback).invoke(animator) + } + } + + @Test + fun noLaunchTransition_returnsEmptyAnimatorsList() = runOnUiThread { + val pipChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_PIP + taskInfo = TASK_INFO_FREEFORM + } + val transitionInfo = createTransitionInfo(listOf(pipChange)) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(0) + } + + @Test + fun minimizeTransition_returnsLaunchAndMinimizeAnimator() = runOnUiThread { + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE, MINIMIZE_CHANGE)) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(2) + assertLaunchAnimator(actual[0]) + assertMinimizeAnimator(actual[1]) + } + + @Test + fun minimizeTransition_callsAnimationEndListener() = runOnUiThread { + val finishCallback = mock>() + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE, MINIMIZE_CHANGE)) + + val animators = helper.createAnimators(transitionInfo, finishCallback = finishCallback) + + animators.forEach { animator -> + animator.start() + animator.end() + verify(finishCallback).invoke(animator) + } + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagEnabled_returnsLaunchAndCloseAnimator() = runOnUiThread { + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE, CLOSE_CHANGE)) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(2) + assertTrampolineLaunchAnimator(actual[0]) + assertCloseAnimator(actual[1]) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagEnabled_callsAnimationEndListener() = runOnUiThread { + val finishCallback = mock>() + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE, CLOSE_CHANGE)) + + val animators = helper.createAnimators(transitionInfo, finishCallback = finishCallback) + + animators.forEach { animator -> + animator.start() + animator.end() + verify(finishCallback).invoke(animator) + } + } + + @Test + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagDisabled_returnsLaunchAnimator() = runOnUiThread { + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE, CLOSE_CHANGE)) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(1) + assertLaunchAnimator(actual[0]) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagEnabled_hitDesktopWindowLimit_returnsLaunchMinimizeCloseAnimator() = + runOnUiThread { + val transitionInfo = + createTransitionInfo(listOf(OPEN_CHANGE, MINIMIZE_CHANGE, CLOSE_CHANGE)) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(3) + assertTrampolineLaunchAnimator(actual[0]) + assertMinimizeAnimator(actual[1]) + assertCloseAnimator(actual[2]) + } + + @Test + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagDisabled_hitDesktopWindowLimit_returnsLaunchMinimizeAnimator() = + runOnUiThread { + val transitionInfo = + createTransitionInfo(listOf(OPEN_CHANGE, MINIMIZE_CHANGE, CLOSE_CHANGE)) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(2) + assertLaunchAnimator(actual[0]) + assertMinimizeAnimator(actual[1]) + } + + @Test + fun createLaunchAnimator_usesDisplayContextResources() = runOnUiThread { + whenever(displayController.getInfoForDisplay(OPEN_CHANGE.endDisplayId)) + .thenReturn(displayInfo) + whenever(displayInfo.getContext()).thenReturn(displayContext) + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE)) + + helper.createAnimators(transitionInfo, finishCallback = {}) + + verify(transaction) + .setCornerRadius(OPEN_CHANGE.leash, DISPLAY_CONTEXT_CORNER_RADIUS.toFloat()) + } + + @Test + fun createLaunchAnimator_displayInfoNull_usesFallbackContextResources() = runOnUiThread { + whenever(displayController.getInfoForDisplay(OPEN_CHANGE.endDisplayId)).thenReturn(null) + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE)) + + helper.createAnimators(transitionInfo, finishCallback = {}) + + verify(transaction).setCornerRadius(OPEN_CHANGE.leash, CONTEXT_CORNER_RADIUS.toFloat()) + } + + @Test + fun createLaunchAnimator_displayContextNull_usesFallbackContextResources() = runOnUiThread { + whenever(displayController.getInfoForDisplay(OPEN_CHANGE.endDisplayId)) + .thenReturn(displayInfo) + whenever(displayInfo.getContext()).thenReturn(null) + val transitionInfo = createTransitionInfo(listOf(OPEN_CHANGE)) + + helper.createAnimators(transitionInfo, finishCallback = {}) + + verify(transaction).setCornerRadius(OPEN_CHANGE.leash, CONTEXT_CORNER_RADIUS.toFloat()) + } + + private fun assertLaunchAnimator(animator: Animator) { + assertThat(animator).isInstanceOf(AnimatorSet::class.java) + assertThat((animator as AnimatorSet).childAnimations.size).isEqualTo(2) + assertThat(animator.childAnimations[0]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[0].interpolator) + .isEqualTo(AppLaunchType.LAUNCH.boundsAnimationParams.interpolator) + assertThat(animator.childAnimations[0].duration) + .isEqualTo(AppLaunchType.LAUNCH.boundsAnimationParams.durationMs) + assertThat(animator.childAnimations[1]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[1].interpolator).isEqualTo(Interpolators.LINEAR) + assertThat(animator.childAnimations[1].duration) + .isEqualTo(AppLaunchType.LAUNCH.alphaDurationMs) + } + + private fun assertTrampolineLaunchAnimator(animator: Animator) { + assertThat(animator).isInstanceOf(AnimatorSet::class.java) + assertThat((animator as AnimatorSet).childAnimations.size).isEqualTo(1) + assertThat(animator.childAnimations[0]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[0].interpolator).isEqualTo(Interpolators.LINEAR) + assertThat(animator.childAnimations[0].duration) + .isEqualTo(AppLaunchType.LAUNCH.alphaDurationMs) + } + + private fun assertMinimizeAnimator(animator: Animator) { + assertThat(animator).isInstanceOf(AnimatorSet::class.java) + assertThat((animator as AnimatorSet).childAnimations.size).isEqualTo(2) + assertThat(animator.childAnimations[0]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[0].interpolator) + .isInstanceOf(Interpolators.STANDARD_ACCELERATE::class.java) + assertThat(animator.childAnimations[0].duration).isEqualTo(200) + assertThat(animator.childAnimations[1]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[1].interpolator) + .isInstanceOf(Interpolators.LINEAR::class.java) + assertThat(animator.childAnimations[1].duration).isEqualTo(100) + } + + private fun assertCloseAnimator(animator: Animator) { + assertThat(animator).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.interpolator).isInstanceOf(Interpolators.LINEAR::class.java) + assertThat(animator.duration).isEqualTo(100) + } + + private fun createTransitionInfo(changes: List): TransitionInfo { + val transitionInfo = TransitionInfo(WindowManager.TRANSIT_NONE, 0) + changes.forEach { transitionInfo.addChange(it) } + return transitionInfo + } + + private companion object { + const val CONTEXT_CORNER_RADIUS = 42 + const val DISPLAY_CONTEXT_CORNER_RADIUS = 99 + + val TASK_INFO_FREEFORM = + ActivityManager.RunningTaskInfo().apply { + baseIntent = + Intent().apply { + component = ComponentName("com.example.app", "com.example.app.MainActivity") + } + configuration.windowConfiguration.windowingMode = + WindowConfiguration.WINDOWING_MODE_FREEFORM + } + + val OPEN_CHANGE = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_OPEN + taskInfo = TASK_INFO_FREEFORM + } + + val CLOSE_CHANGE = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_CLOSE + taskInfo = TASK_INFO_FREEFORM + } + + val MINIMIZE_CHANGE = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_TO_BACK + taskInfo = TASK_INFO_FREEFORM + } + } +} diff --git a/quickstep/tests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt b/quickstep/tests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt deleted file mode 100644 index 4d10f0f51e4..00000000000 --- a/quickstep/tests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.taskbar.controllers - -import android.animation.AnimatorSet -import android.animation.ObjectAnimator -import android.view.View -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.filters.SmallTest -import com.android.launcher3.LauncherPrefs -import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING -import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING_IN_DESKTOP_MODE -import com.android.launcher3.logging.StatsLogManager -import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_DIVIDER_MENU_CLOSE -import com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_DIVIDER_MENU_OPEN -import com.android.launcher3.taskbar.TaskbarActivityContext -import com.android.launcher3.taskbar.TaskbarBaseTestCase -import com.android.launcher3.taskbar.TaskbarDividerPopupView -import com.android.launcher3.taskbar.TaskbarDragLayer -import com.android.launcher3.taskbar.TaskbarPinningController -import com.android.launcher3.taskbar.TaskbarPinningController.Companion.PINNING_PERSISTENT -import com.android.launcher3.taskbar.TaskbarPinningController.Companion.PINNING_TRANSIENT -import com.android.launcher3.taskbar.TaskbarSharedState -import com.google.common.truth.Truth.assertThat -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.kotlin.any -import org.mockito.kotlin.argumentCaptor -import org.mockito.kotlin.doNothing -import org.mockito.kotlin.doReturn -import org.mockito.kotlin.mock -import org.mockito.kotlin.never -import org.mockito.kotlin.spy -import org.mockito.kotlin.times -import org.mockito.kotlin.verify -import org.mockito.kotlin.whenever - -@SmallTest -@RunWith(AndroidJUnit4::class) -class TaskbarPinningControllerTest : TaskbarBaseTestCase() { - private val taskbarDragLayer = mock() - private val taskbarSharedState = mock() - private var isInDesktopMode = false - private val isInDesktopModeProvider = { isInDesktopMode } - private val launcherPrefs = - mock { - on { get(TASKBAR_PINNING) } doReturn false - on { get(TASKBAR_PINNING_IN_DESKTOP_MODE) } doReturn false - } - private val statsLogger = mock() - private val statsLogManager = mock { on { logger() } doReturn statsLogger } - private lateinit var pinningController: TaskbarPinningController - - @Before - override fun setup() { - super.setup() - whenever(taskbarActivityContext.launcherPrefs).thenReturn(launcherPrefs) - whenever(taskbarActivityContext.dragLayer).thenReturn(taskbarDragLayer) - whenever(taskbarActivityContext.statsLogManager).thenReturn(statsLogManager) - pinningController = - spy(TaskbarPinningController(taskbarActivityContext, isInDesktopModeProvider)) - pinningController.init(taskbarControllers, taskbarSharedState) - } - - @Test - fun testOnCloseCallback_whenClosingPopupView_shouldLogStatsForClosingPopupMenu() { - pinningController.onCloseCallback(false) - verify(statsLogger, times(1)).log(LAUNCHER_TASKBAR_DIVIDER_MENU_CLOSE) - } - - @Test - fun testOnCloseCallback_whenClosingPopupView_shouldPostVisibilityChangedToDragLayer() { - val argumentCaptor = argumentCaptor() - pinningController.onCloseCallback(false) - verify(taskbarDragLayer, times(1)).post(argumentCaptor.capture()) - - val runnable = argumentCaptor.lastValue - assertThat(runnable).isNotNull() - - runnable.run() - verify(taskbarActivityContext, times(1)).onPopupVisibilityChanged(false) - } - - @Test - fun testOnCloseCallback_whenPreferenceUnchanged_shouldNotAnimateTaskbarPinning() { - pinningController.onCloseCallback(false) - verify(taskbarSharedState, never()).taskbarWasPinned = true - verify(pinningController, never()).animateTaskbarPinning(any()) - } - - @Test - fun testOnCloseCallback_whenLauncherPreferenceChanged_shouldAnimateToPinnedTaskbar() { - whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(false) - doNothing().whenever(pinningController).animateTaskbarPinning(any()) - - pinningController.onCloseCallback(true) - - verify(taskbarSharedState, times(1)).taskbarWasPinned = false - verify(pinningController, times(1)).animateTaskbarPinning(PINNING_PERSISTENT) - } - - @Test - fun testOnCloseCallback_whenLauncherPreferenceChanged_shouldAnimateToTransientTaskbar() { - whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(true) - doNothing().whenever(pinningController).animateTaskbarPinning(any()) - - pinningController.onCloseCallback(true) - - verify(taskbarSharedState, times(1)).taskbarWasPinned = true - verify(pinningController, times(1)).animateTaskbarPinning(PINNING_TRANSIENT) - } - - @Test - fun testShowPinningView_whenShowingPinningView_shouldSetTaskbarWindowFullscreenAndPostRunnableToView() { - val popupView = - mock> { - on { requestFocus() } doReturn true - } - val view = mock() - val argumentCaptor = argumentCaptor() - doReturn(popupView).whenever(pinningController).getPopupView(view) - - pinningController.showPinningView(view) - - verify(view, times(1)).post(argumentCaptor.capture()) - - val runnable = argumentCaptor.lastValue - assertThat(runnable).isNotNull() - runnable.run() - - verify(pinningController, times(1)).getPopupView(view) - verify(popupView, times(1)).requestFocus() - verify(popupView, times(1)).onCloseCallback = any() - verify(taskbarActivityContext, times(1)).onPopupVisibilityChanged(true) - verify(popupView, times(1)).show() - verify(statsLogger, times(1)).log(LAUNCHER_TASKBAR_DIVIDER_MENU_OPEN) - } - - @Test - fun testAnimateTaskbarPinning_whenAnimationEnds_shouldInvokeCallbackDoOnEnd() { - val animatorSet = spy(AnimatorSet()) - doReturn(animatorSet) - .whenever(pinningController) - .getAnimatorSetForTaskbarPinningAnimation(PINNING_PERSISTENT) - doNothing().whenever(animatorSet).start() - pinningController.animateTaskbarPinning(PINNING_PERSISTENT) - animatorSet.listeners[0].onAnimationEnd(ObjectAnimator()) - verify(pinningController, times(1)).recreateTaskbarAndUpdatePinningValue() - } - - @Test - fun testAnimateTaskbarPinning_whenAnimatingToPersistentTaskbar_shouldAnimateToPinnedTaskbar() { - val animatorSet = spy(AnimatorSet()) - doReturn(animatorSet) - .whenever(pinningController) - .getAnimatorSetForTaskbarPinningAnimation(PINNING_PERSISTENT) - doNothing().whenever(animatorSet).start() - pinningController.animateTaskbarPinning(PINNING_PERSISTENT) - - verify(taskbarOverlayController, times(1)).hideWindow() - verify(pinningController, times(1)) - .getAnimatorSetForTaskbarPinningAnimation(PINNING_PERSISTENT) - verify(taskbarViewController, times(1)) - .animateAwayNotificationDotsDuringTaskbarPinningAnimation() - verify(taskbarDragLayer, times(1)).setAnimatingTaskbarPinning(true) - assertThat(pinningController.isAnimatingTaskbarPinning).isTrue() - assertThat(animatorSet.listeners).isNotNull() - } - - @Test - fun testAnimateTaskbarPinning_whenAnimatingToTransientTaskbar_shouldAnimateToTransientTaskbar() { - val animatorSet = spy(AnimatorSet()) - doReturn(animatorSet) - .whenever(pinningController) - .getAnimatorSetForTaskbarPinningAnimation(PINNING_TRANSIENT) - doNothing().whenever(animatorSet).start() - pinningController.animateTaskbarPinning(PINNING_TRANSIENT) - - verify(taskbarOverlayController, times(1)).hideWindow() - verify(pinningController, times(1)) - .getAnimatorSetForTaskbarPinningAnimation(PINNING_TRANSIENT) - verify(taskbarDragLayer, times(1)).setAnimatingTaskbarPinning(true) - assertThat(pinningController.isAnimatingTaskbarPinning).isTrue() - verify(taskbarViewController, times(1)) - .animateAwayNotificationDotsDuringTaskbarPinningAnimation() - assertThat(animatorSet.listeners).isNotNull() - } - - @Test - fun testRecreateTaskbarAndUpdatePinningValue_whenAnimationEnds_shouldUpdateTaskbarPinningLauncherPref() { - pinningController.recreateTaskbarAndUpdatePinningValue() - verify(taskbarDragLayer, times(1)).setAnimatingTaskbarPinning(false) - assertThat(pinningController.isAnimatingTaskbarPinning).isFalse() - verify(launcherPrefs, times(1)).put(TASKBAR_PINNING, true) - } - - @Test - fun testRecreateTaskbarAndUpdatePinningValue_whenAnimationEnds_shouldUpdateTaskbarPinningDesktopModePref() { - isInDesktopMode = true - pinningController.recreateTaskbarAndUpdatePinningValue() - verify(taskbarDragLayer, times(1)).setAnimatingTaskbarPinning(false) - assertThat(pinningController.isAnimatingTaskbarPinning).isFalse() - verify(launcherPrefs, times(1)).put(TASKBAR_PINNING_IN_DESKTOP_MODE, true) - } -} diff --git a/quickstep/tests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt b/quickstep/tests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt deleted file mode 100644 index b637e7d4cf4..00000000000 --- a/quickstep/tests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt +++ /dev/null @@ -1,99 +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.quickstep.taskbar.customization - -import com.android.launcher3.taskbar.customization.TaskbarFeatureEvaluator -import com.android.launcher3.taskbar.customization.TaskbarIconSpecs -import com.android.launcher3.taskbar.customization.TaskbarSpecsEvaluator -import com.android.launcher3.util.LauncherMultivalentJUnit -import com.google.common.truth.Truth.assertThat -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.kotlin.doReturn -import org.mockito.kotlin.mock -import org.mockito.kotlin.spy -import org.mockito.kotlin.whenever - -@RunWith(LauncherMultivalentJUnit::class) -class TaskbarSpecsEvaluatorTest { - - private val taskbarFeatureEvaluator = mock() - private val taskbarSpecsEvaluator = spy(TaskbarSpecsEvaluator(taskbarFeatureEvaluator)) - - @Test - fun testGetIconSizeByGrid_whenTaskbarIsTransient_withValidRowAndColumn() { - doReturn(true).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeByGrid(6, 5)) - .isEqualTo(TaskbarIconSpecs.iconSize52dp) - } - - @Test - fun testGetIconSizeByGrid_whenTaskbarIsTransient_withInvalidRowAndColumn() { - doReturn(true).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeByGrid(1, 2)) - .isEqualTo(TaskbarIconSpecs.defaultTransientIconSize) - } - - @Test - fun testGetIconSizeByGrid_whenTaskbarIsPersistent() { - doReturn(false).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeByGrid(6, 5)) - .isEqualTo(TaskbarIconSpecs.defaultPersistentIconSize) - } - - @Test - fun testGetIconSizeStepDown_whenTaskbarIsPersistent() { - doReturn(false).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeStepDown(TaskbarIconSpecs.iconSize44dp)) - .isEqualTo(TaskbarIconSpecs.defaultPersistentIconSize) - } - - @Test - fun testGetIconSizeStepDown_whenTaskbarIsTransientAndIconSizeAreInBound() { - doReturn(true).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeStepDown(TaskbarIconSpecs.iconSize52dp)) - .isEqualTo(TaskbarIconSpecs.iconSize48dp) - } - - @Test - fun testGetIconSizeStepDown_whenTaskbarIsTransientAndIconSizeAreOutOfBound() { - doReturn(true).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeStepDown(TaskbarIconSpecs.iconSize44dp)) - .isEqualTo(TaskbarIconSpecs.iconSize44dp) - } - - @Test - fun testGetIconSizeStepUp_whenTaskbarIsPersistent() { - doReturn(false).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeStepUp(TaskbarIconSpecs.iconSize40dp)) - .isEqualTo(TaskbarIconSpecs.iconSize40dp) - } - - @Test - fun testGetIconSizeStepUp_whenTaskbarIsTransientAndIconSizeAreInBound() { - doReturn(true).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeStepUp(TaskbarIconSpecs.iconSize44dp)) - .isEqualTo(TaskbarIconSpecs.iconSize48dp) - } - - @Test - fun testGetIconSizeStepUp_whenTaskbarIsTransientAndIconSizeAreOutOfBound() { - doReturn(true).whenever(taskbarFeatureEvaluator).isTransient - assertThat(taskbarSpecsEvaluator.getIconSizeStepUp(TaskbarIconSpecs.iconSize52dp)) - .isEqualTo(TaskbarIconSpecs.iconSize52dp) - } -} diff --git a/quickstep/tests/src/com/android/quickstep/util/SplitScreenTestUtils.kt b/quickstep/tests/src/com/android/quickstep/util/SplitScreenTestUtils.kt new file mode 100644 index 00000000000..15fa84c6b19 --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/util/SplitScreenTestUtils.kt @@ -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.quickstep.util + +import androidx.test.uiautomator.By +import com.android.launcher3.tapl.LauncherInstrumentation +import com.android.launcher3.tapl.Overview +import com.android.launcher3.tapl.OverviewTask +import com.android.launcher3.util.ui.AbstractLauncherUiTest + +object SplitScreenTestUtils { + + /** Creates 2 tasks and makes a split mode pair. Also asserts the accessibility labels. */ + @JvmStatic + fun createAndLaunchASplitPairInOverview(launcher: LauncherInstrumentation): Overview { + clearAllRecentTasks(launcher) + + AbstractLauncherUiTest.startTestActivity(2) + AbstractLauncherUiTest.startTestActivity(3) + + val overView = launcher.goHome().switchToOverview() + if (launcher.isTablet && !launcher.isGridOnlyOverviewEnabled) { + overView.overviewActions.clickSplit().getTestActivityTask(2).open() + } else { + overView.currentTask.tapMenu().tapSplitMenuItem().currentTask.open() + } + + val overviewWithSplitPair = launcher.goHome().switchToOverview() + val currentTask = overviewWithSplitPair.currentTask + currentTask.containsContentDescription( + By.pkg(AbstractLauncherUiTest.getAppPackageName()).text("TestActivity3").toString(), + OverviewTask.OverviewTaskContainer.SPLIT_TOP_OR_LEFT, + ) + currentTask.containsContentDescription( + By.pkg(AbstractLauncherUiTest.getAppPackageName()).text("TestActivity2").toString(), + OverviewTask.OverviewTaskContainer.SPLIT_BOTTOM_OR_RIGHT, + ) + return overviewWithSplitPair + } + + private fun clearAllRecentTasks(launcher: LauncherInstrumentation) { + if (launcher.recentTasks.isNotEmpty()) { + launcher.goHome().switchToOverview().dismissAllTasks() + } + } +} diff --git a/quickstep/tests/src/com/android/quickstep/util/SplitSelectDataHolderTest.kt b/quickstep/tests/src/com/android/quickstep/util/SplitSelectDataHolderTest.kt index b4f16926048..b0764c75818 100644 --- a/quickstep/tests/src/com/android/quickstep/util/SplitSelectDataHolderTest.kt +++ b/quickstep/tests/src/com/android/quickstep/util/SplitSelectDataHolderTest.kt @@ -22,12 +22,14 @@ import android.app.ActivityTaskManager.INVALID_TASK_ID import android.content.Context import android.content.ContextWrapper import android.content.Intent +import android.os.Process import android.os.UserHandle import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.LauncherUiState import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.shortcuts.ShortcutKey -import com.android.launcher3.ui.AbstractLauncherUiTest import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT +import com.android.launcher3.util.ui.AbstractLauncherUiTest import com.android.quickstep.util.SplitSelectDataHolder.Companion.SPLIT_PENDINGINTENT_PENDINGINTENT import com.android.quickstep.util.SplitSelectDataHolder.Companion.SPLIT_PENDINGINTENT_TASK import com.android.quickstep.util.SplitSelectDataHolder.Companion.SPLIT_SHORTCUT_TASK @@ -54,7 +56,7 @@ class SplitSelectDataHolderTest { private val sampleTaskInfo = RunningTaskInfo() private val sampleTaskId = 10 private val sampleTaskId2 = 11 - private val sampleUser = UserHandle(0) + private val sampleUser = UserHandle(Process.myUserHandle().identifier) private val sampleIntent = Intent() private val sampleIntent2 = Intent() private val sampleShortcut = Intent() @@ -63,6 +65,7 @@ class SplitSelectDataHolderTest { private val sampleItemInfo2 = ItemInfo() private val samplePackage = AbstractLauncherUiTest.resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR) + private val launcherUiState = LauncherUiState() @Before fun setup() { @@ -76,6 +79,7 @@ class SplitSelectDataHolderTest { sampleShortcut2.setPackage(samplePackage) sampleShortcut.putExtra(ShortcutKey.EXTRA_SHORTCUT_ID, "sampleShortcut") sampleShortcut2.putExtra(ShortcutKey.EXTRA_SHORTCUT_ID, "sampleShortcut2") + splitSelectDataHolder.setLauncherUiState(launcherUiState) } @Test @@ -84,9 +88,10 @@ class SplitSelectDataHolderTest { sampleTaskInfo, STAGE_POSITION_TOP_OR_LEFT, null, - null + null, ) assertTrue(splitSelectDataHolder.isSplitSelectActive()) + assertTrue(launcherUiState.isSplitSelectActiveRef.value) } @Test @@ -96,9 +101,10 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) assertTrue(splitSelectDataHolder.isSplitSelectActive()) + assertTrue(launcherUiState.isSplitSelectActiveRef.value) } @Test @@ -108,9 +114,10 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - sampleTaskId + sampleTaskId, ) assertTrue(splitSelectDataHolder.isSplitSelectActive()) + assertTrue(launcherUiState.isSplitSelectActiveRef.value) } @Test @@ -120,9 +127,10 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) assertTrue(splitSelectDataHolder.isSplitSelectActive()) + assertTrue(launcherUiState.isSplitSelectActiveRef.value) } @Test @@ -132,7 +140,7 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) splitSelectDataHolder.setSecondTask(sampleTaskId, sampleItemInfo2) assertTrue(splitSelectDataHolder.isBothSplitAppsConfirmed()) @@ -144,7 +152,7 @@ class SplitSelectDataHolderTest { sampleTaskInfo, STAGE_POSITION_TOP_OR_LEFT, null, - null + null, ) splitSelectDataHolder.setSecondTask(sampleIntent, sampleUser, sampleItemInfo2) assertTrue(splitSelectDataHolder.isBothSplitAppsConfirmed()) @@ -157,7 +165,7 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) splitSelectDataHolder.setSecondTask(sampleShortcut, sampleUser, sampleItemInfo2) assertTrue(splitSelectDataHolder.isBothSplitAppsConfirmed()) @@ -169,7 +177,7 @@ class SplitSelectDataHolderTest { sampleTaskInfo, STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, - null + null, ) splitSelectDataHolder.setSecondTask(sampleTaskId2, sampleItemInfo2) val launchData = splitSelectDataHolder.getSplitLaunchData() @@ -177,13 +185,13 @@ class SplitSelectDataHolderTest { assertEquals(launchData.splitLaunchType, SPLIT_TASK_TASK) // should contain a valid task ID for first app, and no intent or shortcut - assertNotEquals(launchData.initialTaskId, INVALID_TASK_ID) - assertNull(launchData.initialPendingIntent) + assertNotEquals(launchData.initialTask.taskId, INVALID_TASK_ID) + assertNull(launchData.initialTask.pendingIntent) assertNull(launchData.initialShortcut) // should contain a valid task ID for second app, and no intent or shortcut - assertNotEquals(launchData.secondTaskId, INVALID_TASK_ID) - assertNull(launchData.secondPendingIntent) + assertNotEquals(launchData.secondTask.taskId, INVALID_TASK_ID) + assertNull(launchData.secondTask.pendingIntent) assertNull(launchData.secondShortcut) } @@ -193,7 +201,7 @@ class SplitSelectDataHolderTest { sampleTaskInfo, STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, - null + null, ) splitSelectDataHolder.setSecondTask(sampleIntent, sampleUser, sampleItemInfo2) val launchData = splitSelectDataHolder.getSplitLaunchData() @@ -201,13 +209,13 @@ class SplitSelectDataHolderTest { assertEquals(launchData.splitLaunchType, SPLIT_TASK_PENDINGINTENT) // should contain a valid task ID for first app, and no intent or shortcut - assertNotEquals(launchData.initialTaskId, INVALID_TASK_ID) - assertNull(launchData.initialPendingIntent) + assertNotEquals(launchData.initialTask.taskId, INVALID_TASK_ID) + assertNull(launchData.initialTask.pendingIntent) assertNull(launchData.initialShortcut) // should contain a valid intent for second app, and no task ID or shortcut - assertNotNull(launchData.secondPendingIntent) - assertEquals(launchData.secondTaskId, INVALID_TASK_ID) + assertNotNull(launchData.secondTask.pendingIntent) + assertEquals(launchData.secondTask.taskId, INVALID_TASK_ID) assertNull(launchData.secondShortcut) } @@ -217,7 +225,7 @@ class SplitSelectDataHolderTest { sampleTaskInfo, STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, - null + null, ) splitSelectDataHolder.setSecondTask(sampleShortcut, sampleUser, sampleItemInfo2) val launchData = splitSelectDataHolder.getSplitLaunchData() @@ -225,14 +233,14 @@ class SplitSelectDataHolderTest { assertEquals(launchData.splitLaunchType, SPLIT_TASK_SHORTCUT) // should contain a valid task ID for first app, and no intent or shortcut - assertNotEquals(launchData.initialTaskId, INVALID_TASK_ID) - assertNull(launchData.initialPendingIntent) + assertNotEquals(launchData.initialTask.taskId, INVALID_TASK_ID) + assertNull(launchData.initialTask.pendingIntent) assertNull(launchData.initialShortcut) // should contain a valid shortcut and intent for second app, and no task ID assertNotNull(launchData.secondShortcut) - assertNotNull(launchData.secondPendingIntent) - assertEquals(launchData.secondTaskId, INVALID_TASK_ID) + assertNotNull(launchData.secondTask.pendingIntent) + assertEquals(launchData.secondTask.taskId, INVALID_TASK_ID) } @Test @@ -242,7 +250,7 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) splitSelectDataHolder.setSecondTask(sampleTaskId, sampleItemInfo2) val launchData = splitSelectDataHolder.getSplitLaunchData() @@ -250,13 +258,13 @@ class SplitSelectDataHolderTest { assertEquals(launchData.splitLaunchType, SPLIT_PENDINGINTENT_TASK) // should contain a valid intent for first app, and no task ID or shortcut - assertNotNull(launchData.initialPendingIntent) - assertEquals(launchData.initialTaskId, INVALID_TASK_ID) + assertNotNull(launchData.initialTask.pendingIntent) + assertEquals(launchData.initialTask.taskId, INVALID_TASK_ID) assertNull(launchData.initialShortcut) // should contain a valid task ID for second app, and no intent or shortcut - assertNotEquals(launchData.secondTaskId, INVALID_TASK_ID) - assertNull(launchData.secondPendingIntent) + assertNotEquals(launchData.secondTask.taskId, INVALID_TASK_ID) + assertNull(launchData.secondTask.pendingIntent) assertNull(launchData.secondShortcut) } @@ -267,7 +275,7 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) splitSelectDataHolder.setSecondTask(sampleTaskId, sampleItemInfo2) val launchData = splitSelectDataHolder.getSplitLaunchData() @@ -276,12 +284,12 @@ class SplitSelectDataHolderTest { // should contain a valid shortcut and intent for first app, and no task ID assertNotNull(launchData.initialShortcut) - assertNotNull(launchData.initialPendingIntent) - assertEquals(launchData.initialTaskId, INVALID_TASK_ID) + assertNotNull(launchData.initialTask.pendingIntent) + assertEquals(launchData.initialTask.taskId, INVALID_TASK_ID) // should contain a valid task ID for second app, and no intent or shortcut - assertNotEquals(launchData.secondTaskId, INVALID_TASK_ID) - assertNull(launchData.secondPendingIntent) + assertNotEquals(launchData.secondTask.taskId, INVALID_TASK_ID) + assertNull(launchData.secondTask.pendingIntent) assertNull(launchData.secondShortcut) } @@ -292,7 +300,7 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) splitSelectDataHolder.setSecondTask(sampleIntent2, sampleUser, sampleItemInfo2) val launchData = splitSelectDataHolder.getSplitLaunchData() @@ -300,13 +308,13 @@ class SplitSelectDataHolderTest { assertEquals(launchData.splitLaunchType, SPLIT_PENDINGINTENT_PENDINGINTENT) // should contain a valid intent for first app, and no task ID or shortcut - assertNotNull(launchData.initialPendingIntent) - assertEquals(launchData.initialTaskId, INVALID_TASK_ID) + assertNotNull(launchData.initialTask.pendingIntent) + assertEquals(launchData.initialTask.taskId, INVALID_TASK_ID) assertNull(launchData.initialShortcut) // should contain a valid intent for second app, and no task ID or shortcut - assertNotNull(launchData.secondPendingIntent) - assertEquals(launchData.secondTaskId, INVALID_TASK_ID) + assertNotNull(launchData.secondTask.pendingIntent) + assertEquals(launchData.secondTask.taskId, INVALID_TASK_ID) assertNull(launchData.secondShortcut) } @@ -316,20 +324,20 @@ class SplitSelectDataHolderTest { sampleTaskInfo, STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, - null + null, ) val launchData = splitSelectDataHolder.getFullscreenLaunchData() assertEquals(launchData.splitLaunchType, SPLIT_SINGLE_TASK_FULLSCREEN) // should contain a valid task ID for first app, and no intent or shortcut - assertNotEquals(launchData.initialTaskId, INVALID_TASK_ID) - assertNull(launchData.initialPendingIntent) + assertNotEquals(launchData.initialTask.taskId, INVALID_TASK_ID) + assertNull(launchData.initialTask.pendingIntent) assertNull(launchData.initialShortcut) // should contain no task ID, intent, or shortcut for second app - assertEquals(launchData.secondTaskId, INVALID_TASK_ID) - assertNull(launchData.secondPendingIntent) + assertEquals(launchData.secondTask.taskId, INVALID_TASK_ID) + assertNull(launchData.secondTask.pendingIntent) assertNull(launchData.secondShortcut) } @@ -340,20 +348,20 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) val launchData = splitSelectDataHolder.getFullscreenLaunchData() assertEquals(launchData.splitLaunchType, SPLIT_SINGLE_INTENT_FULLSCREEN) // should contain a valid intent for first app, and no task ID or shortcut - assertNotNull(launchData.initialPendingIntent) - assertEquals(launchData.initialTaskId, INVALID_TASK_ID) + assertNotNull(launchData.initialTask.pendingIntent) + assertEquals(launchData.initialTask.taskId, INVALID_TASK_ID) assertNull(launchData.initialShortcut) // should contain no task ID, intent, or shortcut for second app - assertEquals(launchData.secondTaskId, INVALID_TASK_ID) - assertNull(launchData.secondPendingIntent) + assertEquals(launchData.secondTask.taskId, INVALID_TASK_ID) + assertNull(launchData.secondTask.pendingIntent) assertNull(launchData.secondShortcut) } @@ -364,7 +372,7 @@ class SplitSelectDataHolderTest { STAGE_POSITION_TOP_OR_LEFT, sampleItemInfo, null, - INVALID_TASK_ID + INVALID_TASK_ID, ) val launchData = splitSelectDataHolder.getFullscreenLaunchData() @@ -372,12 +380,12 @@ class SplitSelectDataHolderTest { // should contain a valid shortcut and intent for first app, and no task ID assertNotNull(launchData.initialShortcut) - assertNotNull(launchData.initialPendingIntent) - assertEquals(launchData.initialTaskId, INVALID_TASK_ID) + assertNotNull(launchData.initialTask.pendingIntent) + assertEquals(launchData.initialTask.taskId, INVALID_TASK_ID) // should contain no task ID, intent, or shortcut for second app - assertEquals(launchData.secondTaskId, INVALID_TASK_ID) - assertNull(launchData.secondPendingIntent) + assertEquals(launchData.secondTask.taskId, INVALID_TASK_ID) + assertNull(launchData.secondTask.pendingIntent) assertNull(launchData.secondShortcut) } @@ -387,24 +395,26 @@ class SplitSelectDataHolderTest { sampleTaskInfo, STAGE_POSITION_TOP_OR_LEFT, null, - null + null, ) splitSelectDataHolder.setSecondTask(sampleIntent, sampleUser, sampleItemInfo2) splitSelectDataHolder.resetState() assertFalse(splitSelectDataHolder.isSplitSelectActive()) + assertFalse(launcherUiState.isSplitSelectActiveRef.value) } @Test fun clearState_intent() { splitSelectDataHolder.setInitialTaskSelect( - sampleIntent, - STAGE_POSITION_TOP_OR_LEFT, - sampleItemInfo, - null, - INVALID_TASK_ID + sampleIntent, + STAGE_POSITION_TOP_OR_LEFT, + sampleItemInfo, + null, + INVALID_TASK_ID, ) splitSelectDataHolder.setSecondTask(sampleIntent, sampleUser, sampleItemInfo2) splitSelectDataHolder.resetState() assertFalse(splitSelectDataHolder.isSplitSelectActive()) + assertFalse(launcherUiState.isSplitSelectActiveRef.value) } } diff --git a/quickstep/tests/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProviderTest.kt b/quickstep/tests/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProviderTest.kt index 6a418a4d8b5..d656d4f05ff 100644 --- a/quickstep/tests/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProviderTest.kt +++ b/quickstep/tests/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProviderTest.kt @@ -65,6 +65,7 @@ class PreemptiveUnfoldTransitionProgressProviderTest { @After fun after() { Log.setWtfHandler(oldWtfHandler) + TestableLooper.remove(this) } @Test diff --git a/res/anim-v33/shared_x_axis_activity_close_enter.xml b/res/anim-v33/shared_x_axis_activity_close_enter.xml deleted file mode 100644 index 3d7ad2bd601..00000000000 --- a/res/anim-v33/shared_x_axis_activity_close_enter.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/res/anim-v33/shared_x_axis_activity_close_exit.xml b/res/anim-v33/shared_x_axis_activity_close_exit.xml deleted file mode 100644 index fb63602d4e0..00000000000 --- a/res/anim-v33/shared_x_axis_activity_close_exit.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/res/anim-v33/shared_x_axis_activity_open_enter.xml b/res/anim-v33/shared_x_axis_activity_open_enter.xml deleted file mode 100644 index cba74ba0ec9..00000000000 --- a/res/anim-v33/shared_x_axis_activity_open_enter.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/res/anim-v33/shared_x_axis_activity_open_exit.xml b/res/anim-v33/shared_x_axis_activity_open_exit.xml deleted file mode 100644 index 22e878d7f10..00000000000 --- a/res/anim-v33/shared_x_axis_activity_open_exit.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface.xml b/res/color-night-v31/material_color_surface.xml deleted file mode 100644 index a645f24dd9c..00000000000 --- a/res/color-night-v31/material_color_surface.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_bright.xml b/res/color-night-v31/material_color_surface_bright.xml deleted file mode 100644 index f34ed6c548b..00000000000 --- a/res/color-night-v31/material_color_surface_bright.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container.xml b/res/color-night-v31/material_color_surface_container.xml deleted file mode 100644 index 002b88eba49..00000000000 --- a/res/color-night-v31/material_color_surface_container.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container_high.xml b/res/color-night-v31/material_color_surface_container_high.xml deleted file mode 100644 index edd36fcd235..00000000000 --- a/res/color-night-v31/material_color_surface_container_high.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container_highest.xml b/res/color-night-v31/material_color_surface_container_highest.xml deleted file mode 100644 index e54f95380e1..00000000000 --- a/res/color-night-v31/material_color_surface_container_highest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container_low.xml b/res/color-night-v31/material_color_surface_container_low.xml deleted file mode 100644 index 40f0d4c9def..00000000000 --- a/res/color-night-v31/material_color_surface_container_low.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container_lowest.xml b/res/color-night-v31/material_color_surface_container_lowest.xml deleted file mode 100644 index 24f559b494f..00000000000 --- a/res/color-night-v31/material_color_surface_container_lowest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_dim.xml b/res/color-night-v31/material_color_surface_dim.xml deleted file mode 100644 index a645f24dd9c..00000000000 --- a/res/color-night-v31/material_color_surface_dim.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_inverse.xml b/res/color-night-v31/material_color_surface_inverse.xml deleted file mode 100644 index ac63072a9e5..00000000000 --- a/res/color-night-v31/material_color_surface_inverse.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_variant.xml b/res/color-night-v31/material_color_surface_variant.xml deleted file mode 100644 index a645f24dd9c..00000000000 --- a/res/color-night-v31/material_color_surface_variant.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/popup_color_background.xml b/res/color-night-v31/popup_color_background.xml deleted file mode 100644 index 13ceaa09e7b..00000000000 --- a/res/color-night-v31/popup_color_background.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/res/color-night-v31/popup_shade_first.xml b/res/color-night-v31/popup_shade_first.xml index 6909f815877..e62ed9c8a9e 100644 --- a/res/color-night-v31/popup_shade_first.xml +++ b/res/color-night-v31/popup_shade_first.xml @@ -12,7 +12,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + diff --git a/res/color-night-v31/taskbar_stroke.xml b/res/color-night-v31/taskbar_stroke.xml deleted file mode 100644 index db7a5106207..00000000000 --- a/res/color-night-v31/taskbar_stroke.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/widget_picker_primary_surface_color_dark.xml b/res/color-night-v31/widget_picker_primary_surface_color_dark.xml deleted file mode 100644 index 13ceaa09e7b..00000000000 --- a/res/color-night-v31/widget_picker_primary_surface_color_dark.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/res/color-v31/home_settings_switch_thumb_color.xml b/res/color-v31/home_settings_switch_thumb_color.xml index 91d3d9b5e4c..be6150e4cd3 100644 --- a/res/color-v31/home_settings_switch_thumb_color.xml +++ b/res/color-v31/home_settings_switch_thumb_color.xml @@ -23,5 +23,5 @@ - + diff --git a/res/color-v31/material_color_surface.xml b/res/color-v31/material_color_surface.xml deleted file mode 100644 index b049851ff4d..00000000000 --- a/res/color-v31/material_color_surface.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_bright.xml b/res/color-v31/material_color_surface_bright.xml deleted file mode 100644 index b049851ff4d..00000000000 --- a/res/color-v31/material_color_surface_bright.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container.xml b/res/color-v31/material_color_surface_container.xml deleted file mode 100644 index b031c081a9e..00000000000 --- a/res/color-v31/material_color_surface_container.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container_high.xml b/res/color-v31/material_color_surface_container_high.xml deleted file mode 100644 index a996d51eba9..00000000000 --- a/res/color-v31/material_color_surface_container_high.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container_highest.xml b/res/color-v31/material_color_surface_container_highest.xml deleted file mode 100644 index e7a535af539..00000000000 --- a/res/color-v31/material_color_surface_container_highest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container_low.xml b/res/color-v31/material_color_surface_container_low.xml deleted file mode 100644 index b8fe01e4846..00000000000 --- a/res/color-v31/material_color_surface_container_low.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container_lowest.xml b/res/color-v31/material_color_surface_container_lowest.xml deleted file mode 100644 index 25e86668626..00000000000 --- a/res/color-v31/material_color_surface_container_lowest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_dim.xml b/res/color-v31/material_color_surface_dim.xml deleted file mode 100644 index e2d226fa896..00000000000 --- a/res/color-v31/material_color_surface_dim.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_inverse.xml b/res/color-v31/material_color_surface_inverse.xml deleted file mode 100644 index e189862856d..00000000000 --- a/res/color-v31/material_color_surface_inverse.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_variant.xml b/res/color-v31/material_color_surface_variant.xml deleted file mode 100644 index e2d226fa896..00000000000 --- a/res/color-v31/material_color_surface_variant.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/nudge_button_color.xml b/res/color-v31/nudge_button_color.xml new file mode 100644 index 00000000000..2f8b1d57089 --- /dev/null +++ b/res/color-v31/nudge_button_color.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/res/color-v31/popup_color_background.xml b/res/color-v31/popup_color_background.xml deleted file mode 100644 index 99155d8972b..00000000000 --- a/res/color-v31/popup_color_background.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/res/color-v31/popup_shade_first.xml b/res/color-v31/popup_shade_first.xml index 4b50cba3c23..9a71caeb51f 100644 --- a/res/color-v31/popup_shade_first.xml +++ b/res/color-v31/popup_shade_first.xml @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + diff --git a/res/color-v31/widget_picker_primary_surface_color_light.xml b/res/color-v31/widget_picker_primary_surface_color_light.xml deleted file mode 100644 index 02dffdddf7e..00000000000 --- a/res/color-v31/widget_picker_primary_surface_color_light.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml index 3cca9c91b70..aa6c618ef7a 100644 --- a/res/color/overview_button.xml +++ b/res/color/overview_button.xml @@ -1,12 +1,11 @@ - + \ No newline at end of file diff --git a/res/color/overview_scrim_foreground_primary.xml b/res/color/overview_scrim_foreground_primary.xml new file mode 100644 index 00000000000..68be32d4fa3 --- /dev/null +++ b/res/color/overview_scrim_foreground_primary.xml @@ -0,0 +1,18 @@ + + + + diff --git a/res/color/overview_scrim_foreground_primary_dark.xml b/res/color/overview_scrim_foreground_primary_dark.xml new file mode 100644 index 00000000000..2b46edc1912 --- /dev/null +++ b/res/color/overview_scrim_foreground_primary_dark.xml @@ -0,0 +1,18 @@ + + + + diff --git a/res/color/overview_scrim_foreground_secondary.xml b/res/color/overview_scrim_foreground_secondary.xml new file mode 100644 index 00000000000..f2555ccc0eb --- /dev/null +++ b/res/color/overview_scrim_foreground_secondary.xml @@ -0,0 +1,18 @@ + + + + diff --git a/res/color/overview_scrim_foreground_secondary_dark.xml b/res/color/overview_scrim_foreground_secondary_dark.xml new file mode 100644 index 00000000000..79e8d8b4ecc --- /dev/null +++ b/res/color/overview_scrim_foreground_secondary_dark.xml @@ -0,0 +1,18 @@ + + + + diff --git a/res/color/popup_color_background.xml b/res/color/popup_color_background.xml deleted file mode 100644 index e87e77231c3..00000000000 --- a/res/color/popup_color_background.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/res/color/popup_shade_first.xml b/res/color/popup_shade_first.xml index 4b50cba3c23..9a71caeb51f 100644 --- a/res/color/popup_shade_first.xml +++ b/res/color/popup_shade_first.xml @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + diff --git a/res/drawable-sw720dp/ic_transient_taskbar_all_apps_button.xml b/res/drawable-sw720dp/ic_transient_taskbar_all_apps_button.xml deleted file mode 100644 index 47f2a5d73a6..00000000000 --- a/res/drawable-sw720dp/ic_transient_taskbar_all_apps_button.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - diff --git a/res/drawable/add_item_dialog_background.xml b/res/drawable/add_item_dialog_background.xml index e279fa051a8..39af989a1d5 100644 --- a/res/drawable/add_item_dialog_background.xml +++ b/res/drawable/add_item_dialog_background.xml @@ -1,7 +1,7 @@ - + diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml index 7b27273f28e..d200b9f9615 100644 --- a/res/drawable/all_apps_tabs_background.xml +++ b/res/drawable/all_apps_tabs_background.xml @@ -13,36 +13,25 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/res/drawable/all_apps_tabs_background_selected.xml b/res/drawable/all_apps_tabs_background_selected.xml new file mode 100644 index 00000000000..f7873dab337 --- /dev/null +++ b/res/drawable/all_apps_tabs_background_selected.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/all_apps_tabs_background_selected_focused.xml b/res/drawable/all_apps_tabs_background_selected_focused.xml new file mode 100644 index 00000000000..28402627ff6 --- /dev/null +++ b/res/drawable/all_apps_tabs_background_selected_focused.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/all_apps_tabs_background_unselected.xml b/res/drawable/all_apps_tabs_background_unselected.xml new file mode 100644 index 00000000000..6c0adf13a57 --- /dev/null +++ b/res/drawable/all_apps_tabs_background_unselected.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/all_apps_tabs_background_unselected_focused.xml b/res/drawable/all_apps_tabs_background_unselected_focused.xml new file mode 100644 index 00000000000..83038926ba0 --- /dev/null +++ b/res/drawable/all_apps_tabs_background_unselected_focused.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/bg_letter_list_text.xml b/res/drawable/bg_letter_list_text.xml new file mode 100644 index 00000000000..073730c7057 --- /dev/null +++ b/res/drawable/bg_letter_list_text.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/bg_ps_header.xml b/res/drawable/bg_ps_header.xml deleted file mode 100644 index da314452ad4..00000000000 --- a/res/drawable/bg_ps_header.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - diff --git a/res/drawable/bg_ps_lock_button.xml b/res/drawable/bg_ps_lock_button.xml index aef1e816efa..7a20e49b22d 100644 --- a/res/drawable/bg_ps_lock_button.xml +++ b/res/drawable/bg_ps_lock_button.xml @@ -21,12 +21,12 @@ android:viewportHeight="36"> + android:fillColor="@color/materialColorPrimaryFixedDim"/> + android:fillColor="@color/materialColorOnPrimaryFixed"/> \ No newline at end of file diff --git a/res/drawable/bg_ps_mask_left_corner.xml b/res/drawable/bg_ps_mask_left_corner.xml index 43eeedb0b4e..f87c497751b 100644 --- a/res/drawable/bg_ps_mask_left_corner.xml +++ b/res/drawable/bg_ps_mask_left_corner.xml @@ -24,7 +24,7 @@ + android:fillColor="@android:color/white" /> \ No newline at end of file diff --git a/res/drawable/bg_ps_mask_right_corner.xml b/res/drawable/bg_ps_mask_right_corner.xml index d63b866f9ce..7a4c0d80c60 100644 --- a/res/drawable/bg_ps_mask_right_corner.xml +++ b/res/drawable/bg_ps_mask_right_corner.xml @@ -24,7 +24,7 @@ + android:fillColor="@android:color/white" /> \ No newline at end of file diff --git a/res/drawable/bg_ps_transition_image.xml b/res/drawable/bg_ps_transition_image.xml index dfad3cf5b3c..694303c5174 100644 --- a/res/drawable/bg_ps_transition_image.xml +++ b/res/drawable/bg_ps_transition_image.xml @@ -23,13 +23,13 @@ + android:fillColor="@color/materialColorOnPrimaryFixed"/> + android:fillColor="@color/materialColorPrimaryFixedDim"/> + android:fillColor="@color/materialColorOnPrimaryFixed"/> \ No newline at end of file diff --git a/res/drawable/bg_ps_unlock_button.xml b/res/drawable/bg_ps_unlock_button.xml index d5eedd293e0..563c3f6d682 100644 --- a/res/drawable/bg_ps_unlock_button.xml +++ b/res/drawable/bg_ps_unlock_button.xml @@ -21,9 +21,9 @@ android:viewportHeight="36"> + android:fillColor="@color/materialColorPrimaryFixedDim"/> \ No newline at end of file diff --git a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml index ca9448964bf..bf5d8425773 100644 --- a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml +++ b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml @@ -15,8 +15,7 @@ --> - + diff --git a/res/drawable/bg_widgets_header_states_two_pane.xml b/res/drawable/bg_widgets_header_states_two_pane.xml index 5f4b8c66b49..1ec41a9a0a0 100644 --- a/res/drawable/bg_widgets_header_states_two_pane.xml +++ b/res/drawable/bg_widgets_header_states_two_pane.xml @@ -14,18 +14,16 @@ limitations under the License. --> - - - - - - + + + + - - - - - - + + + + + + diff --git a/res/drawable/bg_widgets_header_two_pane.xml b/res/drawable/bg_widgets_header_two_pane.xml index ca3feef1f06..e2370028989 100644 --- a/res/drawable/bg_widgets_header_two_pane.xml +++ b/res/drawable/bg_widgets_header_two_pane.xml @@ -14,13 +14,10 @@ limitations under the License. --> - - + android:insetTop="@dimen/widget_list_entry_spacing"> + - - + + \ No newline at end of file diff --git a/res/drawable/bg_widgets_header_two_pane_expanded_focused.xml b/res/drawable/bg_widgets_header_two_pane_expanded_focused.xml new file mode 100644 index 00000000000..0ee3d147153 --- /dev/null +++ b/res/drawable/bg_widgets_header_two_pane_expanded_focused.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/bg_widgets_header_two_pane_expanded_unfocused.xml b/res/drawable/bg_widgets_header_two_pane_expanded_unfocused.xml new file mode 100644 index 00000000000..9028ebe2708 --- /dev/null +++ b/res/drawable/bg_widgets_header_two_pane_expanded_unfocused.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/bg_widgets_header_two_pane_unexpanded_focused.xml b/res/drawable/bg_widgets_header_two_pane_unexpanded_focused.xml new file mode 100644 index 00000000000..12dc907bd3d --- /dev/null +++ b/res/drawable/bg_widgets_header_two_pane_unexpanded_focused.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/bg_widgets_header_two_pane_unexpanded_unfocused.xml b/res/drawable/bg_widgets_header_two_pane_unexpanded_unfocused.xml new file mode 100644 index 00000000000..ba26f9fc3e7 --- /dev/null +++ b/res/drawable/bg_widgets_header_two_pane_unexpanded_unfocused.xml @@ -0,0 +1,23 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/bubble_ic_overflow_button.xml b/res/drawable/bubble_ic_overflow_button.xml index 475639e2e26..ff8fbb65372 100644 --- a/res/drawable/bubble_ic_overflow_button.xml +++ b/res/drawable/bubble_ic_overflow_button.xml @@ -13,12 +13,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - - + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/button_top_rounded_bordered_ripple.xml b/res/drawable/button_top_rounded_bordered_ripple.xml index f5b68866cb9..723668fb393 100644 --- a/res/drawable/button_top_rounded_bordered_ripple.xml +++ b/res/drawable/button_top_rounded_bordered_ripple.xml @@ -25,7 +25,7 @@ android:topRightRadius="12dp" android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" /> - + diff --git a/res/drawable/circle_dismiss_background.xml b/res/drawable/circle_dismiss_background.xml new file mode 100644 index 00000000000..5123ec52b58 --- /dev/null +++ b/res/drawable/circle_dismiss_background.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/res/drawable/cloud_download_24px.xml b/res/drawable/cloud_download_24px.xml new file mode 100644 index 00000000000..6f7c95aac22 --- /dev/null +++ b/res/drawable/cloud_download_24px.xml @@ -0,0 +1,11 @@ + + + + diff --git a/res/drawable/cloud_download_semibold_24px.xml b/res/drawable/cloud_download_semibold_24px.xml new file mode 100644 index 00000000000..ef15f9f7356 --- /dev/null +++ b/res/drawable/cloud_download_semibold_24px.xml @@ -0,0 +1,11 @@ + + + + diff --git a/res/drawable/desktop_mode_ic_taskbar_menu_new_window.xml b/res/drawable/desktop_mode_ic_taskbar_menu_new_window.xml new file mode 100644 index 00000000000..b96a596e947 --- /dev/null +++ b/res/drawable/desktop_mode_ic_taskbar_menu_new_window.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/horizontal_ellipsis.xml b/res/drawable/horizontal_ellipsis.xml deleted file mode 100644 index 65e958d42bd..00000000000 --- a/res/drawable/horizontal_ellipsis.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/drawable/hourglass_24px.xml b/res/drawable/hourglass_24px.xml new file mode 100644 index 00000000000..9ec5df301e4 --- /dev/null +++ b/res/drawable/hourglass_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_add_circle_filled.xml b/res/drawable/ic_add_circle_filled.xml new file mode 100644 index 00000000000..d40c6d2dd25 --- /dev/null +++ b/res/drawable/ic_add_circle_filled.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_aspect_ratio.xml b/res/drawable/ic_aspect_ratio.xml new file mode 100644 index 00000000000..aafaac4618a --- /dev/null +++ b/res/drawable/ic_aspect_ratio.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/drawable/ic_bubble_button.xml b/res/drawable/ic_bubble_button.xml new file mode 100644 index 00000000000..143c5c93fec --- /dev/null +++ b/res/drawable/ic_bubble_button.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_chevron_end.xml b/res/drawable/ic_chevron_end.xml new file mode 100644 index 00000000000..9ca4f3a3b4e --- /dev/null +++ b/res/drawable/ic_chevron_end.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/res/drawable/ic_chevron_left_rounded_700.xml b/res/drawable/ic_chevron_left_rounded_700.xml new file mode 100644 index 00000000000..c3730d3a57d --- /dev/null +++ b/res/drawable/ic_chevron_left_rounded_700.xml @@ -0,0 +1,11 @@ + + + diff --git a/res/drawable/ic_chevron_start.xml b/res/drawable/ic_chevron_start.xml new file mode 100644 index 00000000000..913da026dad --- /dev/null +++ b/res/drawable/ic_chevron_start.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/res/drawable/ic_circle.xml b/res/drawable/ic_circle.xml new file mode 100644 index 00000000000..2f5cf218e1a --- /dev/null +++ b/res/drawable/ic_circle.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/drawable/ic_circle_dismiss.xml b/res/drawable/ic_circle_dismiss.xml new file mode 100644 index 00000000000..632d2e0f350 --- /dev/null +++ b/res/drawable/ic_circle_dismiss.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/res/drawable/ic_close_work_edu.xml b/res/drawable/ic_close_work_edu.xml new file mode 100644 index 00000000000..24f61dd543e --- /dev/null +++ b/res/drawable/ic_close_work_edu.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_corp_off.xml b/res/drawable/ic_corp_off.xml index 117258e3bd5..e58e1729cf2 100644 --- a/res/drawable/ic_corp_off.xml +++ b/res/drawable/ic_corp_off.xml @@ -16,9 +16,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/textColorHint"> + android:viewportHeight="24"> - \ No newline at end of file + android:pathData="M16,6H20C21.11,6 22,6.89 22,8V18.99C22,19.021 21.994,19.05 21.989,19.077C21.984,19.102 21.98,19.126 21.98,19.15L20,17.17V8H10.83L8,5.17V4C8,2.89 8.89,2 10,2H14C15.11,2 16,2.89 16,4V6ZM10,6H14V4H10V6ZM19,19L8,8L6,6L2.81,2.81L1.39,4.22L3.3,6.13C2.54,6.41 2.01,7.14 2.01,8L2,19C2,20.11 2.89,21 4,21H18.17L19.78,22.61L21.19,21.2L20.82,20.83L19,19ZM4,8V19H16.17L5.17,8H4Z" + android:fillColor="@color/materialColorOnPrimary" + android:fillType="evenOdd"/> + diff --git a/res/drawable/ic_desktop_add.xml b/res/drawable/ic_desktop_add.xml new file mode 100644 index 00000000000..d31b04b858c --- /dev/null +++ b/res/drawable/ic_desktop_add.xml @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_desktop_with_bg.xml b/res/drawable/ic_desktop_with_bg.xml new file mode 100644 index 00000000000..f54285c4447 --- /dev/null +++ b/res/drawable/ic_desktop_with_bg.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/res/drawable/ic_game.xml b/res/drawable/ic_game.xml new file mode 100644 index 00000000000..552419fb15b --- /dev/null +++ b/res/drawable/ic_game.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/drawable/ic_info_no_shadow.xml b/res/drawable/ic_info_no_shadow.xml index 29a81bd27c1..31cf51200ac 100644 --- a/res/drawable/ic_info_no_shadow.xml +++ b/res/drawable/ic_info_no_shadow.xml @@ -18,7 +18,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/materialColorOnSurface"> + android:tint="@color/materialColorOnSurface"> + android:tint="@color/materialColorOnSurface"> + android:tint="@color/materialColorOnSurface"> diff --git a/res/drawable/ic_more_horiz_24.xml b/res/drawable/ic_more_horiz_24.xml new file mode 100644 index 00000000000..d46827cede9 --- /dev/null +++ b/res/drawable/ic_more_horiz_24.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/drawable/ic_more_vert_dots.xml b/res/drawable/ic_more_vert_dots.xml new file mode 100644 index 00000000000..c4659f821fc --- /dev/null +++ b/res/drawable/ic_more_vert_dots.xml @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_private_profile_divider_badge.xml b/res/drawable/ic_private_profile_divider_badge.xml new file mode 100644 index 00000000000..92292f6bd70 --- /dev/null +++ b/res/drawable/ic_private_profile_divider_badge.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_private_profile_letter_list_fast_scroller_badge.xml b/res/drawable/ic_private_profile_letter_list_fast_scroller_badge.xml new file mode 100644 index 00000000000..8d125988c16 --- /dev/null +++ b/res/drawable/ic_private_profile_letter_list_fast_scroller_badge.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/res/drawable/ic_private_space_with_background.xml b/res/drawable/ic_private_space_with_background.xml index fe85168d3ba..d66549d90d3 100644 --- a/res/drawable/ic_private_space_with_background.xml +++ b/res/drawable/ic_private_space_with_background.xml @@ -13,20 +13,19 @@ limitations under the License. --> + android:fillColor="@color/materialColorSurfaceContainerLowest" /> + android:fillColor="@color/materialColorOnSurface" /> + android:fillColor="@color/materialColorOnSurface" /> diff --git a/res/drawable/ic_ps_settings.xml b/res/drawable/ic_ps_settings.xml index 47edeb85efe..5453f357764 100644 --- a/res/drawable/ic_ps_settings.xml +++ b/res/drawable/ic_ps_settings.xml @@ -24,9 +24,9 @@ android:pathData="M10,10h20v20h-20z"/> + android:fillColor="@color/materialColorOnSurfaceVariant"/> + android:fillColor="@color/materialColorOnSurfaceVariant"/> \ No newline at end of file diff --git a/res/drawable/ic_schedule.xml b/res/drawable/ic_schedule.xml new file mode 100644 index 00000000000..d57b0a78064 --- /dev/null +++ b/res/drawable/ic_schedule.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/drawable/ic_smartspace.xml b/res/drawable/ic_smartspace.xml index d5a719afb01..3c18c866ae5 100644 --- a/res/drawable/ic_smartspace.xml +++ b/res/drawable/ic_smartspace.xml @@ -1,17 +1,5 @@ - - - + + + + diff --git a/res/drawable/ic_smartspace_off.xml b/res/drawable/ic_smartspace_off.xml new file mode 100644 index 00000000000..156b4bda339 --- /dev/null +++ b/res/drawable/ic_smartspace_off.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/res/drawable/ic_split_horizontal.xml b/res/drawable/ic_split_horizontal.xml index 2efd2b9bc20..26efedc4d98 100644 --- a/res/drawable/ic_split_horizontal.xml +++ b/res/drawable/ic_split_horizontal.xml @@ -1,9 +1,25 @@ + - + android:width="20dp" + android:height="20dp" + android:tint="?attr/colorControlNormal" + android:viewportHeight="960" + android:viewportWidth="960"> + diff --git a/res/drawable/ic_split_vertical.xml b/res/drawable/ic_split_vertical.xml index 9bc97851ab8..787953a52fb 100644 --- a/res/drawable/ic_split_vertical.xml +++ b/res/drawable/ic_split_vertical.xml @@ -1,9 +1,25 @@ + - + android:width="20dp" + android:height="20dp" + android:tint="?attr/colorControlNormal" + android:viewportHeight="960" + android:viewportWidth="960"> + diff --git a/res/drawable/ic_taskbar_all_apps_button.xml b/res/drawable/ic_taskbar_all_apps_button.xml deleted file mode 100644 index 82fbbea6177..00000000000 --- a/res/drawable/ic_taskbar_all_apps_button.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - diff --git a/res/drawable/ic_taskbar_all_apps_search_button_expressive_theme.xml b/res/drawable/ic_taskbar_all_apps_search_button_expressive_theme.xml new file mode 100644 index 00000000000..852a0772219 --- /dev/null +++ b/res/drawable/ic_taskbar_all_apps_search_button_expressive_theme.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_taskbar_minimal_state_all_apps_search_button_expressive_theme.xml b/res/drawable/ic_taskbar_minimal_state_all_apps_search_button_expressive_theme.xml new file mode 100644 index 00000000000..ed4a821c79a --- /dev/null +++ b/res/drawable/ic_taskbar_minimal_state_all_apps_search_button_expressive_theme.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_transient_taskbar_all_apps_button.xml b/res/drawable/ic_transient_taskbar_all_apps_button.xml deleted file mode 100644 index 6e740aed4fa..00000000000 --- a/res/drawable/ic_transient_taskbar_all_apps_button.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - diff --git a/res/drawable/ic_translate.xml b/res/drawable/ic_translate.xml new file mode 100644 index 00000000000..add47bee8dc --- /dev/null +++ b/res/drawable/ic_translate.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/res/drawable/ic_uninstall_no_shadow.xml b/res/drawable/ic_uninstall_no_shadow.xml index 6200054f1ba..829e5907801 100644 --- a/res/drawable/ic_uninstall_no_shadow.xml +++ b/res/drawable/ic_uninstall_no_shadow.xml @@ -18,7 +18,7 @@ android:height="20dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/materialColorOnSurface" > + android:tint="@color/materialColorOnSurface" > diff --git a/res/drawable/ic_unpin.xml b/res/drawable/ic_unpin.xml new file mode 100644 index 00000000000..557b4f9d764 --- /dev/null +++ b/res/drawable/ic_unpin.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/res/drawable/ic_view_carousel.xml b/res/drawable/ic_view_carousel.xml new file mode 100644 index 00000000000..948bfbc75c0 --- /dev/null +++ b/res/drawable/ic_view_carousel.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/res/drawable/ic_visibility_filled.xml b/res/drawable/ic_visibility_filled.xml new file mode 100644 index 00000000000..1e788c9b500 --- /dev/null +++ b/res/drawable/ic_visibility_filled.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/res/drawable/ic_widget.xml b/res/drawable/ic_widget.xml index 460fe94f6fa..4f4358d073c 100644 --- a/res/drawable/ic_widget.xml +++ b/res/drawable/ic_widget.xml @@ -1,26 +1,10 @@ - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="?attr/colorControlNormal"> + diff --git a/res/drawable/icon_menu_arrow_background.xml b/res/drawable/icon_menu_arrow_background.xml index 8af3c00fad1..1de111ab29e 100644 --- a/res/drawable/icon_menu_arrow_background.xml +++ b/res/drawable/icon_menu_arrow_background.xml @@ -15,14 +15,13 @@ limitations under the License. --> + android:centerColor="@color/materialColorSurfaceBright" + android:endColor="@color/materialColorSurfaceBright" /> \ No newline at end of file diff --git a/res/drawable/info_24px.xml b/res/drawable/info_24px.xml new file mode 100644 index 00000000000..38417d29c34 --- /dev/null +++ b/res/drawable/info_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/inset_rounded_action_button.xml b/res/drawable/inset_rounded_action_button.xml new file mode 100644 index 00000000000..7b4c4d03c09 --- /dev/null +++ b/res/drawable/inset_rounded_action_button.xml @@ -0,0 +1,30 @@ + + + + + + + + + diff --git a/res/drawable/keep_24px.xml b/res/drawable/keep_24px.xml new file mode 100644 index 00000000000..ff9bff64bfc --- /dev/null +++ b/res/drawable/keep_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/popup_background.xml b/res/drawable/popup_background.xml index 6eedecb6caf..686456f7ab3 100644 --- a/res/drawable/popup_background.xml +++ b/res/drawable/popup_background.xml @@ -15,6 +15,6 @@ --> - + \ No newline at end of file diff --git a/res/drawable/private_space_app_divider.xml b/res/drawable/private_space_app_divider.xml index 1ea12b3328e..81cb4017b00 100644 --- a/res/drawable/private_space_app_divider.xml +++ b/res/drawable/private_space_app_divider.xml @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/res/drawable/private_space_install_app_icon.xml b/res/drawable/private_space_install_app_icon.xml index cfec2b126d6..011f4b17fb4 100644 --- a/res/drawable/private_space_install_app_icon.xml +++ b/res/drawable/private_space_install_app_icon.xml @@ -13,19 +13,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - - - - - + + + + diff --git a/res/drawable/private_space_install_app_icon_foreground.xml b/res/drawable/private_space_install_app_icon_foreground.xml new file mode 100644 index 00000000000..9710aa29007 --- /dev/null +++ b/res/drawable/private_space_install_app_icon_foreground.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ps_lock_background.xml b/res/drawable/ps_lock_background.xml index 0be83dbd92a..bc66595ac35 100644 --- a/res/drawable/ps_lock_background.xml +++ b/res/drawable/ps_lock_background.xml @@ -21,7 +21,7 @@ - + diff --git a/res/drawable/ps_settings_background.xml b/res/drawable/ps_settings_background.xml index b0c6b5b0d11..7d568dc68e1 100644 --- a/res/drawable/ps_settings_background.xml +++ b/res/drawable/ps_settings_background.xml @@ -18,6 +18,6 @@ android:inset="4dp"> - + \ No newline at end of file diff --git a/res/drawable/rounded_action_button.xml b/res/drawable/rounded_action_button.xml index 9deab6eb570..6ee6d65d1f6 100644 --- a/res/drawable/rounded_action_button.xml +++ b/res/drawable/rounded_action_button.xml @@ -7,7 +7,7 @@ ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ - ~ Unless required by applicable law or agreed to in writing, software + ~ Unless required by applicable law or agreed to in writing, soft]ware ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and @@ -16,15 +16,11 @@ - + - + android:color="@color/materialColorSurfaceContainerLow" /> diff --git a/res/drawable/splitscreen_24px.xml b/res/drawable/splitscreen_24px.xml new file mode 100644 index 00000000000..3485251abf6 --- /dev/null +++ b/res/drawable/splitscreen_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/widget_picker_tabs_background.xml b/res/drawable/widget_picker_tabs_background.xml index a874dd8b901..f6607b7ad11 100644 --- a/res/drawable/widget_picker_tabs_background.xml +++ b/res/drawable/widget_picker_tabs_background.xml @@ -13,36 +13,39 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/widgets_24px.xml b/res/drawable/widgets_24px.xml new file mode 100644 index 00000000000..4f4358d073c --- /dev/null +++ b/res/drawable/widgets_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/widgets_list_expand_button_background.xml b/res/drawable/widgets_list_expand_button_background.xml new file mode 100644 index 00000000000..068b26db433 --- /dev/null +++ b/res/drawable/widgets_list_expand_button_background.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/work_card.xml b/res/drawable/work_card.xml index 1437c6f7d70..ff66971af0f 100644 --- a/res/drawable/work_card.xml +++ b/res/drawable/work_card.xml @@ -17,6 +17,7 @@ - + + diff --git a/res/drawable/work_mode_fab_background.xml b/res/drawable/work_mode_fab_background.xml index 6be33e86ce0..ad795eb4784 100644 --- a/res/drawable/work_mode_fab_background.xml +++ b/res/drawable/work_mode_fab_background.xml @@ -18,7 +18,10 @@ - + + diff --git a/res/drawable/work_scheduler_background.xml b/res/drawable/work_scheduler_background.xml new file mode 100644 index 00000000000..50c81837d8c --- /dev/null +++ b/res/drawable/work_scheduler_background.xml @@ -0,0 +1,26 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml index d113a38ac87..44c95c98164 100644 --- a/res/layout/add_item_confirmation_activity.xml +++ b/res/layout/add_item_confirmation_activity.xml @@ -42,7 +42,7 @@ android:orientation="vertical" > + \ No newline at end of file diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml index e04b207a3e8..f81ea977e76 100644 --- a/res/layout/all_apps_personal_work_tabs.xml +++ b/res/layout/all_apps_personal_work_tabs.xml @@ -21,8 +21,6 @@ android:layout_width="match_parent" android:layout_height="@dimen/all_apps_header_pill_height" android:layout_gravity="center_horizontal" - android:paddingTop="@dimen/all_apps_tabs_vertical_padding" - android:paddingBottom="@dimen/all_apps_tabs_vertical_padding" android:layout_marginTop="@dimen/all_apps_tabs_margin_top" android:orientation="horizontal" style="@style/TextHeadline" @@ -36,9 +34,10 @@ android:layout_weight="1" android:background="@drawable/all_apps_tabs_background" android:text="@string/all_apps_personal_tab" + android:contentDescription="@string/all_apps_personal_tab_content_description" android:textColor="@color/all_apps_tab_text" android:textSize="14sp" - style="?android:attr/borderlessButtonStyle" /> + style="@style/AllAppsPersonalWorkTabStyle" />